ZGlmZiAtLWdpdCBhLy5naXRpZ25vcmUgYi8uZ2l0aWdub3JlCmluZGV4IDQ2NTg5M2QuLmM4N2MyNmYgMTAwNjQ0Ci0tLSBhLy5naXRpZ25vcmUKKysrIGIvLmdpdGlnbm9yZQpAQCAtNiwzICs2LDQgQEAKIC90ZXN0X3NpdGUKIC8uaWRlYQogL2dlcnJpdC1wYXJlbnQuaW1sCisqLnN1YmxpbWUtKgpkaWZmIC0tZ2l0IGEvLmdpdG1vZHVsZXMgYi8uZ2l0bW9kdWxlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zMjQ4M2Q2Ci0tLSAvZGV2L251bGwKKysrIGIvLmdpdG1vZHVsZXMKQEAgLTAsMCArMSwxMSBAQAorW3N1Ym1vZHVsZSAicGx1Z2lucy9yZXBsaWNhdGlvbiJdCisJcGF0aCA9IHBsdWdpbnMvcmVwbGljYXRpb24KKwl1cmwgPSAuLi9wbHVnaW5zL3JlcGxpY2F0aW9uCisKK1tzdWJtb2R1bGUgInBsdWdpbnMvcmV2aWV3bm90ZXMiXQorCXBhdGggPSBwbHVnaW5zL3Jldmlld25vdGVzCisJdXJsID0gLi4vcGx1Z2lucy9yZXZpZXdub3RlcworCitbc3VibW9kdWxlICJwbHVnaW5zL2NvbW1pdC1tZXNzYWdlLWxlbmd0aC12YWxpZGF0b3IiXQorCXBhdGggPSBwbHVnaW5zL2NvbW1pdC1tZXNzYWdlLWxlbmd0aC12YWxpZGF0b3IKKwl1cmwgPSAuLi9wbHVnaW5zL2NvbW1pdC1tZXNzYWdlLWxlbmd0aC12YWxpZGF0b3IKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vTWFrZWZpbGUgYi9Eb2N1bWVudGF0aW9uL01ha2VmaWxlCmluZGV4IDRjNjRkZmUuLjU5ZGUyMDkgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vTWFrZWZpbGUKKysrIGIvRG9jdW1lbnRhdGlvbi9NYWtlZmlsZQpAQCAtMTQsNiArMTQsNyBAQAogCiBBU0NJSURPQyAgICAgICA/PSBhc2NpaWRvYwogQVNDSUlET0NfRVhUUkEgPz0KK0FTQ0lJRE9DX1ZFUiAgID89IDguNi4zCiBTVk4gICAgICAgICAgICA/PSBzdm4KIFBVQl9ST09UICAgICAgID89IGh0dHBzOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24KIApAQCAtMjMsNiArMjQsMTYgQEAKIAlybSAtZiAqLmh0bWwKIAlybSAtcmYgJChMT0NBTF9ST09UKQogCitBU0NJSURPQ19FWEUgOj0gJChzaGVsbCB3aGljaCAkKEFTQ0lJRE9DKSkKK2lmZXEgKCQod2lsZGNhcmQgJChBU0NJSURPQ19FWEUpKSwpCisgICQoZXJyb3IgJChBU0NJSURPQykgbXVzdCBiZSBhdmFpbGFibGUpCitlbHNlCisgIEFTQ0lJRE9DX09LIDo9ICQoc2hlbGwgZXhwciBgYXNjaWlkb2MgLS12ZXJzaW9uIHwgY3V0IC1mMiAtZCcgJ2AgXD49ICQoQVNDSUlET0NfVkVSKSkKKyAgaWZlcSAoJChBU0NJSURPQ19PSyksMCkKKyAgICAkKGVycm9yICQoQVNDSUlET0MpIHZlcnNpb24gJChBU0NJSURPQ19WRVIpIG9yIGhpZ2hlciBpcyByZXF1aXJlZCkKKyAgZW5kaWYKK2VuZGlmCisKIGlmZXEgKCQob3JpZ2luIFZFUlNJT04pLCB1bmRlZmluZWQpCiAgIFZFUlNJT04gOj0gJChzaGVsbCAuL0dFTi1ET0MtVkVSU0lPTiAyPi9kZXYvbnVsbCkKIGVuZGlmCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2FjY2Vzcy1jb250cm9sLnR4dCBiL0RvY3VtZW50YXRpb24vYWNjZXNzLWNvbnRyb2wudHh0CmluZGV4IDg3OWQxYWMuLjEwMGU0NzMgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vYWNjZXNzLWNvbnRyb2wudHh0CisrKyBiL0RvY3VtZW50YXRpb24vYWNjZXNzLWNvbnRyb2wudHh0CkBAIC0xNSw2ICsxNSw3IEBACiBpbiB0aGUgYHN5c3RlbV9jb25maWdgIHRhYmxlIHdpdGhpbiB0aGUgZGF0YWJhc2UsIHNvIHRoZSBncm91cHMKIGNhbiBiZSByZW5hbWVkIGFmdGVyIGluc3RhbGxhdGlvbiBpZiBkZXNpcmVkLgogCisKIFtbYWRtaW5pc3RyYXRvcnNdXQogQWRtaW5pc3RyYXRvcnMKIH5+fn5+fn5+fn5+fn5+CkBAIC0zMyw2ICszNCw3IEBACiB0byBwZXJtaXQgYWRtaW5pc3RyYXRpdmUgdXNlcnMgdG8gb3RoZXJ3aXNlIGFjY2VzcyBHZXJyaXQgYXMgYW55CiBvdGhlciBub3JtYWwgdXNlciB3b3VsZCwgd2l0aG91dCBuZWVkaW5nIHR3byBkaWZmZXJlbnQgYWNjb3VudHMuCiAKKwogW1thbm9ueW1vdXNfdXNlcnNdXQogQW5vbnltb3VzIFVzZXJzCiB+fn5+fn5+fn5+fn5+fn4KQEAgLTQ4LDEyICs1MCwxMyBAQAogdG8gZ3JhbnQgYFJlYWRgIGFjY2VzcyB0byB0aGlzIGdyb3VwIGFzIEdlcnJpdCByZXF1aXJlcyBhbiBhY2NvdW50CiBpZGVudGl0eSBmb3IgYWxsIG90aGVyIG9wZXJhdGlvbnMuCiAKKwogW1tub24taW50ZXJhY3RpdmVfdXNlcnNdXQogTm9uLUludGVyYWN0aXZlIFVzZXJzCiB+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIAogVGhpcyBpcyBhbiBpbnRlcm5hbCB1c2VyIGdyb3VwLCBtZW1iZXJzIG9mIHRoaXMgZ3JvdXAgYXJlIG5vdCBleHBlY3RlZAotdG8gcGVyZm9ybSBpbnRlcmFjdGl2ZSBvcGVyYXRpb25zIG9uIHRoZSBHZXJyaXQgd2ViIGZyb250ZW5kLgordG8gcGVyZm9ybSBpbnRlcmFjdGl2ZSBvcGVyYXRpb25zIG9uIHRoZSBHZXJyaXQgd2ViIGZyb250LWVuZC4KIAogSG93ZXZlciwgc29tZXRpbWVzIHN1Y2ggYSB1c2VyIG1heSBuZWVkIGEgc2VwYXJhdGUgdGhyZWFkIHBvb2wgaW4KIG9yZGVyIHRvIHByZXZlbnQgaXQgZnJvbSBncmFiYmluZyB0aHJlYWRzIGZyb20gdGhlIGludGVyYWN0aXZlIHVzZXJzLgpAQCAtNjMsNiArNjYsNyBAQAogdXNlcnMuIFRoaXMgZW5zdXJlcyB0aGF0IHRoZSBpbnRlcmFjdGl2ZSB1c2VycyBjYW4ga2VlcCB3b3JraW5nIHdoZW4KIHJlc291cmNlcyBhcmUgdGlnaHQuCiAKKwogW1twcm9qZWN0X293bmVyc11dCiBQcm9qZWN0IE93bmVycwogfn5+fn5+fn5+fn5+fn4KQEAgLTgwLDYgKzg0LDcgQEAKIGF2b2lkIHRoZSBuZWVkIHRvIGluaXRpYWxseSBjb25maWd1cmUgYWNjZXNzIHJpZ2h0cyBmb3IKIG5ld2x5IGNyZWF0ZWQgY2hpbGQgcHJvamVjdHMuCiAKKwogW1tyZWdpc3RlcmVkX3VzZXJzXV0KIFJlZ2lzdGVyZWQgVXNlcnMKIH5+fn5+fn5+fn5+fn5+fn4KQEAgLTkzLDcgKzk4LDcgQEAKIGdyb3VwIGlzIHZlcnkgZWFzeS4gIENhdXRpb24gc2hvdWxkIGJlIHRha2VuIHdoZW4gYXNzaWduaW5nIGFueQogcGVybWlzc2lvbnMgdG8gdGhpcyBncm91cC4KIAotSXQgaXMgdHlwaWNhbCB0byBhc3NpZ24gYENvZGUgUmV2aWV3IC0xLi4rMWAgdG8gdGhpcyBncm91cCwKK0l0IGlzIHR5cGljYWwgdG8gYXNzaWduIGBDb2RlLVJldmlldyAtMS4uKzFgIHRvIHRoaXMgZ3JvdXAsCiBhbGxvd2luZyBzaWduZWQtaW4gdXNlcnMgdG8gdm90ZSBvbiBhIGNoYW5nZSwgYnV0IG5vdCBhY3R1YWxseQogY2F1c2UgaXQgdG8gYmVjb21lIGFwcHJvdmVkIG9yIHJlamVjdGVkLgogCkBAIC0xMzUsNiArMTQwLDE4IEBACiBgRm9vLWFkbWluYCB0eXBpY2FsbHkgZG8gbm90IG5lZWQgdG8gaGF2ZSBzdWNoIHJpZ2h0cy4KIAogCitbW2xkYXBfZ3JvdXBzXV0KK0xEQVAgR3JvdXBzCistLS0tLS0tLS0tLQorCitMREFQIGdyb3VwcyBhcmUgQWNjb3VudCBHcm91cHMgdGhhdCBhcmUgbWFpbnRhaW5lZCBpbnNpZGUgb2YgeW91cgorTERBUCBpbnN0YW5jZS4gSWYgeW91IGFyZSB1c2luZyBMREFQIHRvIG1hbmFnZSB5b3VyIGdyb3VwcyB0aGV5IHdpbGwKK25vdCBhcHBlYXIgaW4gdGhlIEdyb3VwcyBsaXN0LiBIb3dldmVyIHlvdSBjYW4gdXNlIHRoZW0ganVzdCBsaWtlCityZWd1bGFyIEFjY291bnQgR3JvdXBzIGJ5IHByZWZpeGluZyB5b3VyIGdyb3VwIHdpdGggImxkYXAvIiBpbiB0aGUKK0FjY2VzcyBDb250cm9sIGZvciBhIHByb2plY3QuIEZvciBleGFtcGxlICJsZGFwL2Zvby1wcm9qZWN0IiB3aWxsCithZGQgdGhlIExEQVAgImZvby1wcm9qZWN0IiBncm91cCB0byB0aGUgYWNjZXNzIGxpc3QuCisKKwogUHJvamVjdCBBY2Nlc3MgQ29udHJvbCBMaXN0cwogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCkBAIC0xNDUsMTYgKzE2MiwxNiBAQAogUGVyLXByb2plY3QgYWNjZXNzIGNvbnRyb2wgbGlzdHMgYXJlIGFsc28gc3VwcG9ydGVkLgogCiBVc2VycyBhcmUgcGVybWl0dGVkIHRvIHVzZSB0aGUgbWF4aW11bSByYW5nZSBncmFudGVkIHRvIGFueSBvZiB0aGVpcgotZ3JvdXBzIGluIGFuIGFwcHJvdmFsIGNhdGVnb3J5LiAgRm9yIGV4YW1wbGUsIGEgdXNlciBpcyBhIG1lbWJlciBvZgotYEZvbyBMZWFkc2AsIGFuZCB0aGUgZm9sbG93aW5nIEFDTHMgYXJlIGdyYW50ZWQgb24gYSBwcm9qZWN0OgorZ3JvdXBzIG9uIGEgbGFiZWwuICBGb3IgZXhhbXBsZSwgYSB1c2VyIGlzIGEgbWVtYmVyIG9mIGBGb28gTGVhZHNgLCBhbmQKK3RoZSBmb2xsb3dpbmcgQUNMcyBhcmUgZ3JhbnRlZCBvbiBhIHByb2plY3Q6CiAKIFtvcHRpb25zPSJoZWFkZXIiXQotfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLXxHcm91cCAgICAgICAgICAgfFJlZmVyZW5jZSBOYW1lIHxDYXRlZ29yeXxSYW5nZQotfEFub255bW91cyBVc2VycyB8cmVmcy9oZWFkcy8qfENvZGUgUmV2aWV3fC0xLi4rMQotfFJlZ2lzdGVyZWQgVXNlcnN8cmVmcy9oZWFkcy8qfENvZGUgUmV2aWV3fC0xLi4rMgotfEZvbyBMZWFkcyAgICAgICB8cmVmcy9oZWFkcy8qfENvZGUgUmV2aWV3fC0yLi4wCi18PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEdyb3VwICAgICAgICAgICB8UmVmZXJlbmNlIE5hbWUgfExhYmVsICAgICAgfFJhbmdlCit8QW5vbnltb3VzIFVzZXJzIHxyZWZzL2hlYWRzLyogICB8Q29kZS1SZXZpZXd8LTEuLisxCit8UmVnaXN0ZXJlZCBVc2Vyc3xyZWZzL2hlYWRzLyogICB8Q29kZS1SZXZpZXd8LTEuLisyCit8Rm9vIExlYWRzICAgICAgIHxyZWZzL2hlYWRzLyogICB8Q29kZS1SZXZpZXd8LTIuLjAKK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAogVGhlbiB0aGUgZWZmZWN0aXZlIHJhbmdlIHBlcm1pdHRlZCB0byBiZSB1c2VkIGJ5IHRoZSB1c2VyIGlzCiBgLTIuLisyYCwgYXMgdGhlIHVzZXIgaXMgYSBtZW1iZXIgb2YgYWxsIHRocmVlIGdyb3VwcyAoc2VlIGFib3ZlCkBAIC0xOTUsMTAgKzIxMiwxMCBAQAogCiBbb3B0aW9ucz0iaGVhZGVyIl0KIHw9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLXxHcm91cCAgICAgICAgICAgIHxSZWZlcmVuY2UgTmFtZXxDYXRlZ29yeSAgIHxSYW5nZSAgIHxFeGNsdXNpdmUKLXxSZWdpc3RlcmVkIFVzZXJzIHxyZWZzL2hlYWRzLyogIHxDb2RlIFJldmlld3wgLTEuLisxIHwKLXxGb28gTGVhZHMgICAgICAgIHxyZWZzL2hlYWRzLyogIHxDb2RlIFJldmlld3wgLTIuLisyIHwKLXxRQSBMZWFkcyAgICAgICAgIHxyZWZzL2hlYWRzL3FhIHxDb2RlIFJldmlld3wgLTIuLisyIHwKK3xHcm91cCAgICAgICAgICAgIHxSZWZlcmVuY2UgTmFtZXxMYWJlbCAgICAgIHxSYW5nZSAgIHxFeGNsdXNpdmUKK3xSZWdpc3RlcmVkIFVzZXJzIHxyZWZzL2hlYWRzLyogIHxDb2RlLVJldmlld3wgLTEuLisxIHwKK3xGb28gTGVhZHMgICAgICAgIHxyZWZzL2hlYWRzLyogIHxDb2RlLVJldmlld3wgLTIuLisyIHwKK3xRQSBMZWFkcyAgICAgICAgIHxyZWZzL2hlYWRzL3FhIHxDb2RlLVJldmlld3wgLTIuLisyIHwKIHw9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAogVGhlbiB0aGUgZWZmZWN0aXZlIHJhbmdlIHBlcm1pdHRlZCB0byBiZSB1c2VkIGJ5IHRoZSB1c2VyIGlzCkBAIC0yMTksMzEgKzIzNiwzMiBAQAogCiBbb3B0aW9ucz0iaGVhZGVyIl0KIHw9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotfEdyb3VwICAgICAgICAgICB8UmVmZXJlbmNlIE5hbWV8Q2F0ZWdvcnkgICB8UmFuZ2UgICB8RXhjbHVzaXZlCi18UmVnaXN0ZXJlZCBVc2Vyc3xyZWZzL2hlYWRzLyogIHxDb2RlIFJldmlld3wgLTEuLisxIHwKLXxGb28gTGVhZHMgICAgICAgfHJlZnMvaGVhZHMvKiAgfENvZGUgUmV2aWV3fCAtMi4uKzIgfAotfFFBIExlYWRzICAgICAgICB8cmVmcy9oZWFkcy9xYSB8Q29kZSBSZXZpZXd8IC0yLi4rMiB8WAorfEdyb3VwICAgICAgICAgICB8UmVmZXJlbmNlIE5hbWV8TGFiZWwgICAgICB8UmFuZ2UgICB8RXhjbHVzaXZlCit8UmVnaXN0ZXJlZCBVc2Vyc3xyZWZzL2hlYWRzLyogIHxDb2RlLVJldmlld3wgLTEuLisxIHwKK3xGb28gTGVhZHMgICAgICAgfHJlZnMvaGVhZHMvKiAgfENvZGUtUmV2aWV3fCAtMi4uKzIgfAorfFFBIExlYWRzICAgICAgICB8cmVmcy9oZWFkcy9xYSB8Q29kZS1SZXZpZXd8IC0yLi4rMiB8WAogfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKLVRoZW4gdGhpcyB1c2VyIHdpbGwgbm90IGhhdmUgYENvZGUgUmV2aWV3YCByaWdodHMgb24gdGhhdCBjaGFuZ2UsCitUaGVuIHRoaXMgdXNlciB3aWxsIG5vdCBoYXZlIGBDb2RlLVJldmlld2AgcmlnaHRzIG9uIHRoYXQgY2hhbmdlLAogc2luY2UgdGhlcmUgaXMgYW4gZXhjbHVzaXZlIGFjY2VzcyByaWdodCBpbiBwbGFjZSBmb3IgdGhlCiBgcmVmcy9oZWFkcy9xYWAgYnJhbmNoLiBUaGlzIGFsbG93cyBsb2NraW5nIGRvd24gYWNjZXNzIGZvciBhCiBwYXJ0aWN1bGFyIGJyYW5jaCB0byBhIGxpbWl0ZWQgc2V0IG9mIHVzZXJzLCBieXBhc3NpbmcgaW5oZXJpdGVkCiByaWdodHMgYW5kIHdpbGRjYXJkcy4KIAotSW4gb3JkZXIgdG8gZ3JhbnQgdGhlIGFiaWxpdHkgdG8gYENvZGUgUmV2aWV3YCB0byB0aGUgbWVtYmVycyBvZgorSW4gb3JkZXIgdG8gZ3JhbnQgdGhlIGFiaWxpdHkgdG8gYENvZGUtUmV2aWV3YCB0byB0aGUgbWVtYmVycyBvZgogYEZvbyBMZWFkc2AsIGluIGByZWZzL2hlYWRzL3FhYCB0aGVuIHRoZSBmb2xsb3dpbmcgYWNjZXNzIHJpZ2h0cwogd291bGQgYmUgbmVlZGVkOgogCiBbb3B0aW9ucz0iaGVhZGVyIl0KIHw9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogfEdyb3VwICAgICAgICAgICB8UmVmZXJlbmNlIE5hbWV8Q2F0ZWdvcnkgICB8UmFuZ2UgICB8RXhjbHVzaXZlCi18UmVnaXN0ZXJlZCBVc2Vyc3xyZWZzL2hlYWRzLyogIHxDb2RlIFJldmlld3wgLTEuLisxIHwKLXxGb28gTGVhZHMgICAgICAgfHJlZnMvaGVhZHMvKiAgfENvZGUgUmV2aWV3fCAtMi4uKzIgfAotfFFBIExlYWRzICAgICAgICB8cmVmcy9oZWFkcy9xYSB8Q29kZSBSZXZpZXd8IC0yLi4rMiB8WAotfEZvbyBMZWFkcyAgICAgICB8cmVmcy9oZWFkcy9xYSB8Q29kZSBSZXZpZXd8IC0yLi4rMiB8Cit8UmVnaXN0ZXJlZCBVc2Vyc3xyZWZzL2hlYWRzLyogIHxDb2RlLVJldmlld3wgLTEuLisxIHwKK3xGb28gTGVhZHMgICAgICAgfHJlZnMvaGVhZHMvKiAgfENvZGUtUmV2aWV3fCAtMi4uKzIgfAorfFFBIExlYWRzICAgICAgICB8cmVmcy9oZWFkcy9xYSB8Q29kZS1SZXZpZXd8IC0yLi4rMiB8WAorfEZvbyBMZWFkcyAgICAgICB8cmVmcy9oZWFkcy9xYSB8Q29kZS1SZXZpZXd8IC0yLi4rMiB8CiB8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAorCiBPcGVuSUQgQXV0aGVudGljYXRpb24KIH5+fn5+fn5+fn5+fn5+fn5+fn5+fgogCkBAIC0yNTMsNiArMjcxLDcgQEAKIG9mIGl0cyBPcGVuSUQgaWRlbnRpdGllcyBtYXRjaCBvbmUgb3IgbW9yZSBvZiB0aGUgcGF0dGVybnMgbGlzdGVkCiBpbiB0aGUgYGF1dGgudHJ1c3RlZE9wZW5JRGAgbGlzdCBmcm9tIGBnZXJyaXQuY29uZmlnYC4KIAorCiBBbGwgUHJvamVjdHMKIH5+fn5+fn5+fn5+fgogCkBAIC0yNzIsNiArMjkxLDcgQEAKIGBBZG1pbmlzdHJhdG9yc2AgZG9lcywgYXMgZ3JvdXAgbWVtYmVycyB3b3VsZCBiZSBhYmxlIHRvIGFsdGVyCiBwZXJtaXNzaW9ucyBmb3IgZXZlcnkgbWFuYWdlZCBwcm9qZWN0IGluY2x1ZGluZyBnbG9iYWwgY2FwYWJpbGl0aWVzLgogCisKIFBlci1Qcm9qZWN0CiB+fn5+fn5+fn5+fgogCkBAIC0yODEsMTMgKzMwMSwxMTQgQEAKIGdyYW50aW5nICdERU5ZJyB3aXRoaW4gYSBzcGVjaWZpYyBwcm9qZWN0IHRvIGRlbnkgYSBncm91cCBhY2Nlc3MuCiAKIAotW1thY2Nlc3NfY2F0ZWdvcnldXQorW1tyZWZlcmVuY2VzXV0KK1NwZWNpYWwgYW5kIG1hZ2ljIHJlZmVyZW5jZXMKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworVGhlIHJlZmVyZW5jZSBuYW1lc3BhY2VzIHVzZWQgaW4gZ2l0IGFyZSBnZW5lcmFsbHkgdHdvLCBvbmUgZm9yIGJyYW5jaGVzIGFuZAorb25lIGZvciB0YWdzOgorCisqICtyZWZzL2hlYWRzLyorCisqICtyZWZzL3RhZ3MvKisKKworSG93ZXZlciwgZXZlcnkgcmVmZXJlbmNlIHVuZGVyICtyZWZzLyorIGlzIHJlYWxseSBhdmFpbGFibGUsIGFuZCBpbiBHZXJyaXQgdGhpcworb3Bwb3J0dW5pdHkgZm9yIGdpdmluZyBvdGhlciByZWZzIGEgc3BlY2lhbCBtZWFuaW5nIGlzIHVzZWQuICBJbiBHZXJyaXQgdGhleQorYXJlIHNvbWV0aW1lcyB1c2VkIGFzIG1hZ2ljL3ZpcnR1YWwgcmVmZXJlbmNlcyB0aGF0IGdpdmUgdGhlIHB1c2ggdG8gR2Vycml0IGEKK3NwZWNpYWwgbWVhbmluZy4KKworCitbW3JlZmVyZW5jZXNfc3BlY2lhbF1dCitTcGVjaWFsIHJlZmVyZW5jZXMKK35+fn5+fn5+fn5+fn5+fn5+fgorCitUaGUgc3BlY2lhbCByZWZlcmVuY2VzIGhhdmUgY29udGVudCB0aGF0J3MgZWl0aGVyIGdlbmVyYXRlZCBieSBHZXJyaXQgb3IKK2NvbnRhaW5zIGltcG9ydGFudCBwcm9qZWN0IGNvbmZpZ3VyYXRpb24gdGhhdCBHZXJyaXQgbmVlZHMuIFdoZW4gbWFraW5nCitjaGFuZ2VzIHRvIHRoZXNlIHJlZmVyZW5jZXMsIEdlcnJpdCB3aWxsIHRha2UgZXh0cmEgcHJlY2F1dGlvbnMgdG8gdmVyaWZ5IHRoZQorY29udGVudHMgY29tcGF0aWJpbGl0eSBhdCB1cGxvYWQgdGltZS4KKworCityZWZzL2NoYW5nZXMvKgorXl5eXl5eXl5eXl5eXl4KKworVW5kZXIgdGhpcyBuYW1lc3BhY2UgZWFjaCB1cGxvYWRlZCBwYXRjaCBzZXQgZm9yIGV2ZXJ5IGNoYW5nZSBnZXRzIGEgc3RhdGljCityZWZlcmVuY2UgaW4gdGhlaXIgZ2l0LiAgVGhlIGZvcm1hdCBpcyBjb252ZW5pZW50IGJ1dCBzdGlsbCBpbnRlbmRlZCB0byBzY2FsZSB0bworaHVuZHJlZHMgb2YgdGhvdXNhbmRzIG9mIHBhdGNoIHNldHMuICBUbyBhY2Nlc3MgYSBnaXZlbiBwYXRjaCBzZXQgeW91IHdpbGwKK25lZWQgdGhlIGNoYW5nZSBudW1iZXIgYW5kIHBhdGNoIHNldCBudW1iZXIuCisKK1t2ZXJzZV0KKydyZWZzL2NoYW5nZXMvJzxsYXN0IHR3byBkaWdpdHMgb2YgY2hhbmdlIG51bWJlcj4vCisgIDxjaGFuZ2UgbnVtYmVyPi8KKyAgPHBhdGNoIHNldCBudW1iZXI+CisKK1lvdSBjYW4gYWxzbyBmaW5kIHRoZXNlIHN0YXRpYyByZWZlcmVuY2VzIGxpbmtlZCBvbiB0aGUgcGFnZSBvZiBlYWNoIGNoYW5nZS4KKworCityZWZzL21ldGEvY29uZmlnCiteXl5eXl5eXl5eXl5eXl5eCisKK1RoaXMgaXMgd2hlcmUgdGhlIEdlcnJpdCBjb25maWd1cmF0aW9uIG9mIGVhY2ggcHJvamVjdCBpcyByZXNpZGluZy4gIFRoaXMKK2JyYW5jaCBjb250YWlucyBzZXZlcmFsIGZpbGVzIG9mIGltcG9ydGFuY2U6ICtwcm9qZWN0LmNvbmZpZyssICtncm91cHMrIGFuZAorK3J1bGVzLnBsKy4gIFRvcmdldGhlciB0aGV5IGNvbnRyb2wgYWNjZXNzIGFuZCBiZWhhdmlvdXIgZHVyaW5nIHRoZSBjaGFuZ2UKK3JldmlldyBwcm9jZXNzLgorCisKK3JlZnMvbWV0YS9kYXNoYm9hcmRzLyoKK15eXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworVGhlcmUncyBhIGRlZGljYXRlZCBwYWdlIHdoZXJlIHlvdSBjYW4gcmVhZCBtb3JlIGFib3V0CitsaW5rOnVzZXItZGFzaGJvYXJkcy5odG1sW1VzZXIgRGFzaGJvYXJkc10uCisKKworcmVmcy9ub3Rlcy9yZXZpZXcKK15eXl5eXl5eXl5eXl5eXl5eCisKK0F1dG9nZW5lcmF0ZWQgY29weSBvZiByZXZpZXcgbm90ZXMgZm9yIGFsbCBjaGFuZ2VzIGluIHRoZSBnaXQuICBFYWNoIGxvZyBlbnRyeQorb24gdGhlIHJlZnMvbm90ZXMvcmV2aWV3IGJyYW5jaCBhbHNvIHJlZmVyZW5jZXMgdGhlIHBhdGNoIHNldCBvbiB3aGljaCB0aGUKK3JldmlldyBpcyBtYWRlLiAgVGhpcyBmdW5jdGlvbmFsaXR5IGlzIHByb3ZpZGVkIGJ5IHRoZSByZXZpZXctbm90ZXMgcGx1Z2luLgorCisKK1tbcmVmZXJlbmNlc19tYWdpY11dCitNYWdpYyByZWZlcmVuY2VzCit+fn5+fn5+fn5+fn5+fn5+CisKK1RoZXNlIGFyZSByZWZlcmVuY2VzIHdpdGggYWRkZWQgZnVuY3Rpb25hbGl0eSB0byB0aGVtIGNvbXBhcmVkIHRvIGEgcmVndWxhcgorZ2l0IHB1c2ggb3BlcmF0aW9uLgorCisKK3JlZnMvZm9yLzxicmFuY2ggcmVmPgorXl5eXl5eXl5eXl5eXl5eXl5eXl5eCisKK01vc3QgcHJvbWluZW50IGlzIHRoZSBgcmVmcy9mb3IvPGJyYW5jaCByZWY+YCByZWZlcmVuY2Ugd2hpY2ggaXMgdGhlIHJlZmVyZW5jZQordXBvbiB3aGljaCB3ZSBidWlsZCB0aGUgY29kZSByZXZpZXcgaW50ZXJjZXB0IGJlZm9yZSBzdWJtaXR0aW5nIGEgY29tbWl0IHRvCit0aGUgYnJhbmNoIGl0J3MgdXBsb2FkZWQgdG8uCisKK0Z1cnRoZXIgZG9jdW1lbnRhdGlvbiBvbiBob3cgdG8gcHVzaCBjYW4gYmUgZm91bmQgb24gdGhlCitsaW5rOnVzZXItdXBsb2FkLmh0bWwjcHVzaF9jcmVhdGVbVXBsb2FkIGNoYW5nZXNdIHBhZ2UuCisKKworcmVmcy9wdWJsaXNoLyoKK15eXl5eXl5eXl5eXl5eCisKK2ByZWZzL3B1Ymxpc2gvKmAgaXMgYW4gYWx0ZXJuYXRpdmUgbmFtZSB0byBgcmVmcy9mb3IvKmAgd2hlbiBwdXNoaW5nIG5ldyBjaGFuZ2VzCithbmQgcGF0Y2ggc2V0cy4KKworCityZWZzL2RyYWZ0cy8qCiteXl5eXl5eXl5eXl5eCisKK1B1c2ggdG8gYHJlZnMvZHJhZnRzLypgIGNyZWF0ZXMgYSBjaGFuZ2UgbGlrZSBwdXNoIHRvIGByZWZzL2Zvci8qYCwgZXhjZXB0IHRoZQorcmVzdWx0aW5nIGNoYW5nZSByZW1haW5zIGhpZGRlbiBmcm9tIHB1YmxpYyByZXZpZXcuICBZb3UgdGhlbiBoYXZlIHRoZSBvcHRpb24KK29mIGFkZGluZyBpbmRpdmlkdWFsIHJldmlld2VycyBiZWZvcmUgbWFraW5nIHRoZSBjaGFuZ2UgcHVibGljIHRvIGFsbC4gIFRoZQorY2hhbmdlIHBhZ2Ugd2lsbCBoYXZlIGEgJ1B1Ymxpc2gnIGJ1dHRvbiB3aGljaCBhbGxvd3MgeW91IHRvIGNvbnZlcnQgaW5kaXZpZHVhbAorZHJhZnQgcGF0Y2ggc2V0cyBvZiBhIGNoYW5nZSBpbnRvIHB1YmxpYyBwYXRjaCBzZXRzIGZvciByZXZpZXcuCisKKworW1thY2Nlc3NfY2F0ZWdvcmllc11dCiBBY2Nlc3MgQ2F0ZWdvcmllcwogLS0tLS0tLS0tLS0tLS0tLS0KIAotR2Vycml0IGNvbWVzIHByZS1jb25maWd1cmVkIHdpdGggc2V2ZXJhbCBkZWZhdWx0IGNhdGVnb3JpZXMgdGhhdAotY2FuIGJlIGdyYW50ZWQgdG8gZ3JvdXBzIHdpdGhpbiBwcm9qZWN0cywgZW5hYmxpbmcgZnVuY3Rpb25hbGl0eQotZm9yIHRoYXQgZ3JvdXAncyBtZW1iZXJzLgorR2Vycml0IGhhcyBzZXZlcmFsIHBlcm1pc3Npb24gY2F0ZWdvcmllcyB0aGF0IGNhbiBiZSBncmFudGVkIHRvIGdyb3Vwcword2l0aGluIHByb2plY3RzLCBlbmFibGluZyBmdW5jdGlvbmFsaXR5IGZvciB0aGF0IGdyb3VwJ3MgbWVtYmVycy4KIAogV2l0aCB0aGUgcmVsZWFzZSBvZiB0aGUgR2Vycml0IDIuMi54IHNlcmllcywgdGhlIHdlYiBHVUkgZm9yIEFDTAogY29uZmlndXJhdGlvbiB3YXMgcmV3cml0dGVuIGZyb20gc2NyYXRjaC4gIFVzZSB0aGlzCkBAIC0yOTUsMTU1ICs0MTYsNiBAQAogY29udmVyc2lvbnMgZnJvbSB0aGUgR2Vycml0IDIuMS54IHRvIHRoZSBHZXJyaXQgMi4yLnggc2VyaWVzLgogCiAKLVtbY2F0ZWdvcnlfbGFiZWwtVmVyaWZpZWRdXQotTGFiZWw6IFZlcmlmaWVkCi1+fn5+fn5+fn5+fn5+fn4KLQotVGhlIHZlcmlmaWVkIGNhdGVnb3J5IGlzIG9uZSBvZiB0d28gZGVmYXVsdCBjYXRlZ29yaWVzIHRoYXQgaXMKLWNvbmZpZ3VyZWQgdXBvbiB0aGUgY3JlYXRpb24gb2YgYSBHZXJyaXQgaW5zdGFuY2UuIEl0IG1heSBoYXZlCi1hbnkgbWVhbmluZyB0aGUgcHJvamVjdCBkZXNpcmVzLiAgSXQgd2FzIG9yaWdpbmFsbHkgaW52ZW50ZWQgYnkKLXRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QgdG8gbWVhbgotJ2NvbXBpbGVzLCBwYXNzZXMgYmFzaWMgdW5pdCB0ZXN0cycuCi0KLVRoZSByYW5nZSBvZiB2YWx1ZXMgaXM6Ci0KLSogLTEgRmFpbHMKLSsKLVRyaWVkIHRvIGNvbXBpbGUsIGJ1dCBnb3QgYSBjb21waWxlIGVycm9yLCBvciB0cmllZCB0byBydW4gdGVzdHMsCi1idXQgb25lIG9yIG1vcmUgdGVzdHMgZGlkIG5vdCBwYXNzLiAgVGhpcyB2YWx1ZSBpcyB2YWxpZAotYWNyb3NzIGFsbCBwYXRjaCBzZXRzIGluIHRoZSBzYW1lIGNoYW5nZSwgaS5lLiB0aGUgcmV2aWV3ZXIgbXVzdAotYWN0aXZlbHkgY2hhbmdlIGhpcy9oZXIgcmV2aWV3IHRvIHNvbWV0aGluZyBlbHNlIGJlZm9yZSB0aGUgY2hhbmdlCi1pcyBzdWJtaXR0YWJsZS4KLSsKLSpBbnkgLTEgYmxvY2tzIHN1Ym1pdC4qCi0KLSogMCBObyBzY29yZQotKwotRGlkbid0IHRyeSB0byBwZXJmb3JtIHRoZSB2ZXJpZmljYXRpb24gdGFza3MuCi0KLSogKzEgVmVyaWZpZWQKLSsKLUNvbXBpbGVkIChhbmQgcmFuIHRlc3RzKSBzdWNjZXNzZnVsbHkuCi0rCi0qQW55ICsxIGVuYWJsZXMgc3VibWl0LioKLQotRm9yIGEgY2hhbmdlIHRvIGJlIHN1Ym1pdHRhYmxlLCB0aGUgY2hhbmdlIG11c3QgaGF2ZSBhIGArMSBWZXJpZmllZGAKLWluIHRoaXMgY2F0ZWdvcnkgZnJvbSBhdCBsZWFzdCBvbmUgYXV0aG9yaXplZCB1c2VyLCBhbmQgbm8gYC0xIEZhaWxzYAotZnJvbSBhbiBhdXRob3JpemVkIHVzZXIuICBUaHVzLCBgLTEgRmFpbHNgIGNhbiBibG9jayBhIHN1Ym1pdCwKLXdoaWxlIGArMSBWZXJpZmllZGAgZW5hYmxlcyBhIHN1Ym1pdC4KLQotSWYgYSBHZXJyaXQgaW5zdGFsbGF0aW9uIGRvZXMgbm90IHdpc2ggdG8gdXNlIHRoaXMgY2F0ZWdvcnkgaW4gYW55Ci1wcm9qZWN0LCBpdCBjYW4gYmUgZGVsZXRlZCBmcm9tIHRoZSBkYXRhYmFzZToKLQotPT09PQotICBERUxFVEUgRlJPTSBhcHByb3ZhbF9jYXRlZ29yaWVzICAgICAgV0hFUkUgY2F0ZWdvcnlfaWQgPSAnVlJJRic7Ci0gIERFTEVURSBGUk9NIGFwcHJvdmFsX2NhdGVnb3J5X3ZhbHVlcyBXSEVSRSBjYXRlZ29yeV9pZCA9ICdWUklGJzsKLT09PT0KLQotSWYgYSBHZXJyaXQgaW5zdGFsbGF0aW9uIHdhbnRzIHRvIG1vZGlmeSB0aGUgZGVzY3JpcHRpb24gdGV4dAotYXNzb2NpYXRlZCB3aXRoIHRoZXNlIGNhdGVnb3J5IHZhbHVlcywgdGhlIHRleHQgY2FuIGJlIHVwZGF0ZWQKLWluIHRoZSBgbmFtZWAgY29sdW1uIG9mIHRoZSBgY2F0ZWdvcnlfaWQgPSAnVlJJRidgIHJvd3MgaW4gdGhlCi1gYXBwcm92YWxfY2F0ZWdvcnlfdmFsdWVzYCB0YWJsZS4KLQotQWRkaXRpb25hbCB2YWx1ZXMgY291bGQgYWxzbyBiZSBhZGRlZCB0byB0aGlzIGNhdGVnb3J5LCB0byBhbGxvdyBpdAotdG8gYmVoYXZlIG1vcmUgbGlrZSBgQ29kZSBSZXZpZXdgIChiZWxvdykuICBJbnNlcnQgLTIgYW5kICsyIHZhbHVlCi1yb3dzIGludG8gdGhlIGBhcHByb3ZhbF9jYXRlZ29yeV92YWx1ZXNgIHdpdGggYGNhdGVnb3J5X2lkYCBzZXQgdG8KLWBWUklGYCB0byBnZXQgdGhlIHNhbWUgYmVoYXZpb3IuCi0KLVtOT1RFXQotQSByZXN0YXJ0IGlzIHJlcXVpcmVkIGFmdGVyIG1ha2luZyBkYXRhYmFzZSBjaGFuZ2VzLgotU2VlIDw8cmVzdGFydF9jaGFuZ2VzLGJlbG93Pj4uCi0KLVtbY2F0ZWdvcnlfbGFiZWwtQ29kZS1SZXZpZXddXQotTGFiZWw6IENvZGUgUmV2aWV3Ci1+fn5+fn5+fn5+fn5+fn5+fn4KLQotVGhlIGNvZGUgcmV2aWV3IGNhdGVnb3J5IGlzIHRoZSBzZWNvbmQgb2YgdHdvIGRlZmF1bHQgY2F0ZWdvcmllcyB0aGF0Ci1pcyBjb25maWd1cmVkIHVwb24gdGhlIGNyZWF0aW9uIG9mIGEgR2Vycml0IGluc3RhbmNlLiBJdCBtYXkgaGF2ZQotYW55IG1lYW5pbmcgdGhlIHByb2plY3QgZGVzaXJlcy4gIEl0IHdhcyBvcmlnaW5hbGx5IGludmVudGVkIGJ5IHRoZQotQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0IHRvIG1lYW4gJ0kgcmVhZCB0aGUgY29kZSBhbmQgaXQgc2VlbXMKLXJlYXNvbmFibHkgY29ycmVjdCcuCi0KLVRoZSByYW5nZSBvZiB2YWx1ZXMgaXM6Ci0KLSogLTIgRG8gbm90IHN1Ym1pdAotKwotVGhlIGNvZGUgaXMgc28gaG9ycmlibHkgaW5jb3JyZWN0L2J1Z2d5L2Jyb2tlbiB0aGF0IGl0IG11c3Qgbm90IGJlCi1zdWJtaXR0ZWQgdG8gdGhpcyBwcm9qZWN0LCBvciB0byB0aGlzIGJyYW5jaC4gIFRoaXMgdmFsdWUgaXMgdmFsaWQKLWFjcm9zcyBhbGwgcGF0Y2ggc2V0cyBpbiB0aGUgc2FtZSBjaGFuZ2UsIGkuZS4gdGhlIHJldmlld2VyIG11c3QKLWFjdGl2ZWx5IGNoYW5nZSBoaXMvaGVyIHJldmlldyB0byBzb21ldGhpbmcgZWxzZSBiZWZvcmUgdGhlIGNoYW5nZQotaXMgc3VibWl0dGFibGUuCi0rCi0qQW55IC0yIGJsb2NrcyBzdWJtaXQuKgotCi0qIC0xIEkgd291bGQgcHJlZmVyIHRoYXQgeW91IGRpZG4ndCBzdWJtaXQgdGhpcwotKwotVGhlIGNvZGUgZG9lc24ndCBsb29rIHJpZ2h0LCBvciBjb3VsZCBiZSBkb25lIGRpZmZlcmVudGx5LCBidXQKLXRoZSByZXZpZXdlciBpcyB3aWxsaW5nIHRvIGxpdmUgd2l0aCBpdCBhcy1pcyBpZiBhbm90aGVyIHJldmlld2VyCi1hY2NlcHRzIGl0LCBwZXJoYXBzIGJlY2F1c2UgaXQgaXMgYmV0dGVyIHRoYW4gd2hhdCBpcyBjdXJyZW50bHkgaW4KLXRoZSBwcm9qZWN0LiAgT2Z0ZW4gdGhpcyBpcyBhbHNvIHVzZWQgYnkgY29udHJpYnV0b3JzIHdobyBkb24ndCBsaWtlCi10aGUgY2hhbmdlLCBidXQgYWxzbyBhcmVuJ3QgcmVzcG9uc2libGUgZm9yIHRoZSBwcm9qZWN0IGxvbmctdGVybQotYW5kIHRodXMgZG9uJ3QgaGF2ZSBmaW5hbCBzYXkgb24gY2hhbmdlIHN1Ym1pc3Npb24uCi0rCi1Eb2VzIG5vdCBibG9jayBzdWJtaXQuCi0KLSogMCBObyBzY29yZQotKwotRGlkbid0IHRyeSB0byBwZXJmb3JtIHRoZSBjb2RlIHJldmlldyB0YXNrLCBvciBnbGFuY2VkIG92ZXIgaXQgYnV0Ci1kb24ndCBoYXZlIGFuIGluZm9ybWVkIG9waW5pb24geWV0LgotCi0qICsxIExvb2tzIGdvb2QgdG8gbWUsIGJ1dCBzb21lb25lIGVsc2UgbXVzdCBhcHByb3ZlCi0rCi1UaGUgY29kZSBsb29rcyByaWdodCB0byB0aGlzIHJldmlld2VyLCBidXQgdGhlIHJldmlld2VyIGRvZXNuJ3QKLWhhdmUgYWNjZXNzIHRvIHRoZSBgKzJgIHZhbHVlIGZvciB0aGlzIGNhdGVnb3J5LiAgT2Z0ZW4gdGhpcyBpcwotdXNlZCBieSBjb250cmlidXRvcnMgdG8gYSBwcm9qZWN0IHdobyB3ZXJlIGFibGUgdG8gcmV2aWV3IHRoZSBjaGFuZ2UKLWFuZCBsaWtlIHdoYXQgaXQgaXMgZG9pbmcsIGJ1dCBkb24ndCBoYXZlIGZpbmFsIGFwcHJvdmFsIG92ZXIgd2hhdAotZ2V0cyBzdWJtaXR0ZWQuCi0KLSogKzIgTG9va3MgZ29vZCB0byBtZSwgYXBwcm92ZWQKLSsKLUJhc2ljYWxseSB0aGUgc2FtZSBhcyBgKzFgLCBidXQgZm9yIHRob3NlIHdobyBoYXZlIGZpbmFsIHNheSBvdmVyCi1ob3cgdGhlIHByb2plY3Qgd2lsbCBkZXZlbG9wLgotKwotKkFueSArMiBlbmFibGVzIHN1Ym1pdC4qCi0KLUZvciBhIGNoYW5nZSB0byBiZSBzdWJtaXR0YWJsZSwgdGhlIGxhdGVzdCBwYXRjaCBzZXQgbXVzdCBoYXZlIGEKLWArMiBMb29rcyBnb29kIHRvIG1lLCBhcHByb3ZlZGAgaW4gdGhpcyBjYXRlZ29yeSBmcm9tIGF0IGxlYXN0IG9uZQotYXV0aG9yaXplZCB1c2VyLCBhbmQgbm8gYC0yIERvIG5vdCBzdWJtaXRgIGZyb20gYW4gYXV0aG9yaXplZCB1c2VyLgotVGh1cyBgLTJgIG9uIGFueSBwYXRjaCBzZXQgY2FuIGJsb2NrIGEgc3VibWl0LCB3aGlsZSBgKzJgIG9uIHRoZQotbGF0ZXN0IHBhdGNoIHNldCBjYW4gZW5hYmxlIGl0LgotCi1JZiBhIEdlcnJpdCBpbnN0YWxsYXRpb24gZG9lcyBub3Qgd2lzaCB0byB1c2UgdGhpcyBjYXRlZ29yeSBpbiBhbnkKLXByb2plY3QsIGl0IGNhbiBiZSBkZWxldGVkIGZyb20gdGhlIGRhdGFiYXNlOgotCi09PT09Ci0gIERFTEVURSBGUk9NIGFwcHJvdmFsX2NhdGVnb3JpZXMgICAgICBXSEVSRSBjYXRlZ29yeV9pZCA9ICdDUlZXJzsKLSAgREVMRVRFIEZST00gYXBwcm92YWxfY2F0ZWdvcnlfdmFsdWVzIFdIRVJFIGNhdGVnb3J5X2lkID0gJ0NSVlcnOwotPT09PQotCi1JZiBhIEdlcnJpdCBpbnN0YWxsYXRpb24gd2FudHMgdG8gbW9kaWZ5IHRoZSBkZXNjcmlwdGlvbiB0ZXh0Ci1hc3NvY2lhdGVkIHdpdGggdGhlc2UgY2F0ZWdvcnkgdmFsdWVzLCB0aGUgdGV4dCBjYW4gYmUgdXBkYXRlZAotaW4gdGhlIGBuYW1lYCBjb2x1bW4gb2YgdGhlIGBjYXRlZ29yeV9pZCA9ICdDUlZXJ2Agcm93cyBpbiB0aGUKLWBhcHByb3ZhbF9jYXRlZ29yeV92YWx1ZXNgIHRhYmxlLgotCi1BZGRpdGlvbmFsIHZhbHVlcyBjb3VsZCBiZSBpbnNlcnRlZCBpbnRvIGBhcHByb3ZhbF9jYXRlZ29yeV92YWx1ZXNgCi10byBmdXJ0aGVyIGV4dGVuZCB0aGUgbmVnYXRpdmUgYW5kIHBvc2l0aXZlIHJhbmdlLCBidXQgdGhlcmUgaXMKLWxpa2VseSBsaXR0bGUgdmFsdWUgaW4gZG9pbmcgc28gYXMgdGhpcyBvbmx5IGV4cGFuZHMgdGhlIG1pZGRsZQotcmVnaW9uLiAgVGhpcyBjYXRlZ29yeSBpcyBhIGBNYXhXaXRoQmxvY2tgIHR5cGUsIHdoaWNoIG1lYW5zIHRoYXQKLXRoZSBsb3dlc3QgbmVnYXRpdmUgdmFsdWUgaWYgcHJlc2VudCBibG9ja3MgYSBzdWJtaXQsIHdoaWxlIHRoZQotaGlnaGVzdCBwb3NpdGl2ZSB2YWx1ZSBpcyByZXF1aXJlZCB0byBlbmFibGUgc3VibWl0LgotCi1bW2Z1bmN0aW9uX01heE5vQmxvY2tdXQotVGhlcmUgaXMgYWxzbyBhIGBNYXhOb0Jsb2NrYCBjYXRlZ29yeSB3aGljaCBzdGlsbCByZXF1aXJlcyB0aGUKLWhpZ2hlc3QgcG9zaXRpdmUgdmFsdWUgdG8gc3VibWl0LCBidXQgdGhlIGxvd2VzdCBuZWdhdGl2ZSB2YWx1ZSB3aWxsCi1ub3QgYmxvY2sgdGhlIGNoYW5nZSwgYW5kIGRvZXMgbm90IGNhcnJ5IG92ZXIgYmV0d2VlbiBwYXRjaCBzZXRzLgotVGhpcyBsZXZlbCBpcyBtb3N0bHkgdXNlZnVsIGZvciBhdXRvbWF0ZWQgY29kZS1yZXZpZXdzIHRoYXQgbWF5Ci1oYXZlIGZhbHNlLW5lZ2F0aXZlcyB0aGF0IHNob3VsZG4ndCBibG9jayB0aGUgY2hhbmdlLgotCi1bTk9URV0KLUEgcmVzdGFydCBpcyByZXF1aXJlZCBhZnRlciBtYWtpbmcgZGF0YWJhc2UgY2hhbmdlcy4KLVNlZSA8PHJlc3RhcnRfY2hhbmdlcyxiZWxvdz4+LgotCiBbW2NhdGVnb3J5X2FiYW5kb25dXQogQWJhbmRvbgogfn5+fn5+fgpAQCAtNDU1LDYgKzQyNyw3IEBACiBUaGlzIGFsc28gZ3JhbnRzIHRoZSBwZXJtaXNzaW9uIHRvIHJlc3RvcmUgYSBjaGFuZ2UgaWYgdGhlIGNoYW5nZQogY2FuIGJlIHVwbG9hZGVkLgogCisKIFtbY2F0ZWdvcnlfY3JlYXRlXV0KIENyZWF0ZSByZWZlcmVuY2UKIH5+fn5+fn5+fn5+fn5+fn4KQEAgLTU2Miw3ICs1MzUsNyBAQAogT3duZXJzaGlwIG92ZXIgYSBwYXJ0aWN1bGFyIGJyYW5jaCBzdWJzcGFjZSBtYXkgYmUgZGVsZWdhdGVkIGJ5CiBlbnRlcmluZyBhIGJyYW5jaCBwYXR0ZXJuLiAgVG8gZGVsZWdhdGUgY29udHJvbCBvdmVyIGFsbCBicmFuY2hlcwogdGhhdCBiZWdpbiB3aXRoIGBxYS9gIHRvIHRoZSBRQSBncm91cCwgYWRkIGBPd25lcmAgY2F0ZWdvcnkKLWZvciByZWZlcmVuY2UgYHJlZnMvaGVhZHMvcWEvXCpgLiAgTWVtYmVycyBvZiB0aGUgUUEgZ3JvdXAgY2FuCitmb3IgcmVmZXJlbmNlIGByZWZzL2hlYWRzL3FhLypgLiAgTWVtYmVycyBvZiB0aGUgUUEgZ3JvdXAgY2FuCiBmdXJ0aGVyIHJlZmluZSBhY2Nlc3MsIGJ1dCBvbmx5IGZvciByZWZlcmVuY2VzIHRoYXQgYmVnaW4gd2l0aAogYHJlZnMvaGVhZHMvcWEvYC4gU2VlIDw8cHJvamVjdF9vd25lcnMscHJvamVjdCBvd25lcnM+PiB0byBmaW5kCiBvdXQgbW9yZSBhYm91dCB0aGlzIHJvbGUuCkBAIC01ODUsNyArNTU4LDcgQEAKIF5eXl5eXl5eXl5eCiAKIEFueSBleGlzdGluZyBicmFuY2ggY2FuIGJlIGZhc3QtZm9yd2FyZGVkIHRvIGEgbmV3IGNvbW1pdC4KLUNyZWF0aW9uIG9mIG5ldyBicmFuY2hlcyBpcyBjb250cm9sbGVkIGJ5IHRoZSAKK0NyZWF0aW9uIG9mIG5ldyBicmFuY2hlcyBpcyBjb250cm9sbGVkIGJ5IHRoZQogbGluazphY2Nlc3MtY29udHJvbC5odG1sI2NhdGVnb3J5X2NyZWF0ZVsnQ3JlYXRlIFJlZmVyZW5jZSddCiBjYXRlZ29yeS4gIERlbGV0aW9uIG9mIGV4aXN0aW5nIGJyYW5jaGVzIGlzIHJlamVjdGVkLiAgVGhpcyBpcyB0aGUKIHNhZmVzdCBtb2RlIGFzIGNvbW1pdHMgY2Fubm90IGJlIGRpc2NhcmRlZC4KQEAgLTYzNCw3ICs2MDcsNyBAQAogfn5+fn5+fn5+fn5+fn5+fn5+fn4KIAogVGhlIGBQdXNoIE1lcmdlIENvbW1pdGAgYWNjZXNzIHJpZ2h0IHBlcm1pdHMgdGhlIHVzZXIgdG8gdXBsb2FkIG1lcmdlCi1jb21taXRzLiAgSXQncyBhbiBhZGRvbiB0byB0aGUgPDxjYXRlZ29yeV9wdXNoLFB1c2g+PiBhY2Nlc3MgcmlnaHQsIGFuZAorY29tbWl0cy4gIEl0J3MgYW4gYWRkLW9uIHRvIHRoZSA8PGNhdGVnb3J5X3B1c2gsUHVzaD4+IGFjY2VzcyByaWdodCwgYW5kCiBzbyBpdCB3b24ndCBiZSBzdWZmaWNpZW50IHdpdGggb25seSBgUHVzaCBNZXJnZSBDb21taXRgIGdyYW50ZWQgZm9yIGEKIHB1c2ggdG8gaGFwcGVuLiAgU29tZSBwcm9qZWN0cyB3aXNoIHRvIHJlc3RyaWN0IG1lcmdlcyB0byBiZWluZyBjcmVhdGVkCiBieSBHZXJyaXQuIEJ5IGdyYW50aW5nIGBQdXNoYCB3aXRob3V0IGBQdXNoIE1lcmdlIENvbW1pdGAsIHRoZSBvbmx5CkBAIC02NDcsMjAgKzYyMCwyNyBAQAogdGhlIGludGVudGlvbiBvZiB0aGUgYFB1c2ggTWVyZ2UgQ29tbWl0YCBlbnRyeSBpcyB0byBhbGxvdyBkaXJlY3QgcHVzaGVzCiBvZiBtZXJnZSBjb21taXRzLgogCisKIFtbY2F0ZWdvcnlfcHVzaF9hbm5vdGF0ZWRdXQogUHVzaCBBbm5vdGF0ZWQgVGFnCiB+fn5+fn5+fn5+fn5+fn5+fn4KIAotVGhpcyBjYXRlZ29yeSBwZXJtaXRzIHVzZXJzIHRvIHB1c2ggYW4gYW5ub3RhdGVkIHRhZyBvYmplY3Qgb3ZlcgotU1NIIGludG8gdGhlIHByb2plY3QncyByZXBvc2l0b3J5LiAgVHlwaWNhbGx5IHRoaXMgd291bGQgYmUgZG9uZQotd2l0aCBhIGNvbW1hbmQgbGluZSBzdWNoIGFzOgorVGhpcyBjYXRlZ29yeSBwZXJtaXRzIHVzZXJzIHRvIHB1c2ggYW4gYW5ub3RhdGVkIHRhZyBvYmplY3QgaW50byB0aGUKK3Byb2plY3QncyByZXBvc2l0b3J5LiAgVHlwaWNhbGx5IHRoaXMgd291bGQgYmUgZG9uZSB3aXRoIGEgY29tbWFuZCBsaW5lCitzdWNoIGFzOgogCiA9PT09CiAgIGdpdCBwdXNoIHNzaDovL1VTRVJASE9TVDpQT1JUL1BST0pFQ1QgdGFnIHYxLjAKID09PT0KIAotVGFncyBtdXN0IGJlIGFubm90YXRlZCAoY3JlYXRlZCB3aXRoIGBnaXQgdGFnIC1hYCBvciBgZ2l0IHRhZyAtc2ApLAotc2hvdWxkIGV4aXN0IGluIHRoZSBgcmVmcy90YWdzL2AgbmFtZXNwYWNlLCBhbmQgc2hvdWxkIGJlIG5ldy4KK09yOgorCis9PT09CisgIGdpdCBwdXNoIGh0dHBzOi8vSE9TVC9QUk9KRUNUIHRhZyB2MS4wCis9PT09CisKK1RhZ3MgbXVzdCBiZSBhbm5vdGF0ZWQgKGNyZWF0ZWQgd2l0aCBgZ2l0IHRhZyAtYWApLCBzaG91bGQgZXhpc3QgaW4KK3RoZSBgcmVmcy90YWdzL2AgbmFtZXNwYWNlLCBhbmQgc2hvdWxkIGJlIG5ldy4KIAogVGhpcyBjYXRlZ29yeSBpcyBpbnRlbmRlZCB0byBiZSB1c2VkIHRvIHB1Ymxpc2ggdGFncyB3aGVuIGEgcHJvamVjdAogcmVhY2hlcyBhIHN0YWJsZSByZWxlYXNlIHBvaW50IHdvcnRoIHJlbWVtYmVyaW5nIGluIGhpc3RvcnkuCkBAIC02ODIsNiArNjYyLDI4IEBACiByZXF1aXJlcyB0aGUgc2FtZSBwZXJtaXNzaW9uIGFzIGRlbGV0aW5nIGEgYnJhbmNoLgogCiAKK1tbY2F0ZWdvcnlfcHVzaF9zaWduZWRdXQorUHVzaCBTaWduZWQgVGFnCit+fn5+fn5+fn5+fn5+fn4KKworVGhpcyBjYXRlZ29yeSBwZXJtaXRzIHVzZXJzIHRvIHB1c2ggYSBQR1Agc2lnbmVkIHRhZyBvYmplY3QgaW50byB0aGUKK3Byb2plY3QncyByZXBvc2l0b3J5LiAgVHlwaWNhbGx5IHRoaXMgd291bGQgYmUgZG9uZSB3aXRoIGEgY29tbWFuZAorbGluZSBzdWNoIGFzOgorCis9PT09CisgIGdpdCBwdXNoIHNzaDovL1VTRVJASE9TVDpQT1JUL1BST0pFQ1QgdGFnIHYxLjAKKz09PT0KKworT3I6CisKKz09PT0KKyAgZ2l0IHB1c2ggaHR0cHM6Ly9IT1NUL1BST0pFQ1QgdGFnIHYxLjAKKz09PT0KKworVGFncyBtdXN0IGJlIHNpZ25lZCAoY3JlYXRlZCB3aXRoIGBnaXQgdGFnIC1zYCksIHNob3VsZCBleGlzdCBpbiB0aGUKK2ByZWZzL3RhZ3MvYCBuYW1lc3BhY2UsIGFuZCBzaG91bGQgYmUgbmV3LgorCisKIFtbY2F0ZWdvcnlfcmVhZF1dCiBSZWFkCiB+fn5+CkBAIC03MjksNiArNzMxLDM1IEBACiBwYXRjaCBzZXQuCiAKIAorW1tjYXRlZ29yeV9yZW1vdmVfcmV2aWV3ZXJdXQorUmVtb3ZlIFJldmlld2VyCit+fn5+fn5+fn5+fn5+fn4KKworVGhpcyBjYXRlZ29yeSBwZXJtaXRzIHVzZXJzIHRvIHJlbW92ZSBvdGhlciB1c2VycyBmcm9tIHRoZSBsaXN0IG9mCityZXZpZXdlcnMgb24gYSBjaGFuZ2UuCisKK1RoZSBjaGFuZ2Ugb3duZXIsIHByb2plY3Qgb3duZXIgYW5kIHNpdGUgYWRtaW5pc3RyYXRvciBjYW4gYWx3YXlzCityZW1vdmUgcmV2aWV3ZXJzIChldmVuIHdpdGhvdXQgaGF2aW5nIHRoZSBgUmVtb3ZlIFJldmlld2VyYCBhY2Nlc3MKK3JpZ2h0IGFzc2lnbmVkKS4KKworVXNlcnMgd2l0aG91dCB0aGlzIGFjY2VzcyByaWdodCBjYW4gb25seSByZW1vdmUgdGhlbXNlbHZlcyBmcm9tIHRoZQorcmV2aWV3ZXIgbGlzdCBvbiBhIGNoYW5nZS4KKworCitbW2NhdGVnb3J5X3Jldmlld19sYWJlbHNdXQorUmV2aWV3IExhYmVscworfn5+fn5+fn5+fn5+fgorCitGb3IgZXZlcnkgY29uZmlndXJlZCBsYWJlbCBgTXktTmFtZWAgaW4gdGhlIHByb2plY3QsIHRoZXJlIGlzIGEKK2NvcnJlc3BvbmRpbmcgcGVybWlzc2lvbiBgbGFiZWwtTXktTmFtZWAgd2l0aCBhIHJhbmdlIGNvcnJlc3BvbmRpbmcgdG8KK3RoZSBkZWZpbmVkIHZhbHVlcy4KKworR2Vycml0IGNvbWVzIHByZS1jb25maWd1cmVkIHdpdGggYSBkZWZhdWx0ICdDb2RlLVJldmlldycgbGFiZWwgdGhhdCBjYW4KK2JlIGdyYW50ZWQgdG8gZ3JvdXBzIHdpdGhpbiBwcm9qZWN0cywgZW5hYmxpbmcgZnVuY3Rpb25hbGl0eSBmb3IgdGhhdAorZ3JvdXAncyBtZW1iZXJzLiBsaW5rOmNvbmZpZy1sYWJlbHMuaHRtbFtDdXN0b20gbGFiZWxzXSBtYXkgYWxzbyBiZQorZGVmaW5lZCBnbG9iYWxseSBvciBvbiBhIHBlci1wcm9qZWN0IGJhc2lzLgorCisKIFtbY2F0ZWdvcnlfc3VibWl0XV0KIFN1Ym1pdAogfn5+fn5+CkBAIC03NDAsODUgKzc3MSw1NSBAQAogYnJhbmNoIGFzIHNvb24gYXMgcG9zc2libGUsIG1ha2luZyBpdCBhIHBlcm1hbmVudCBwYXJ0IG9mIHRoZQogcHJvamVjdCdzIGhpc3RvcnkuCiAKLUluIG9yZGVyIHRvIHN1Ym1pdCwgYWxsIGFwcHJvdmFsIGNhdGVnb3JpZXMgKHN1Y2ggYXMgYFZlcmlmaWVkYCBhbmQKLWBDb2RlIFJldmlld2AsIGFib3ZlKSBtdXN0IGVuYWJsZSBzdWJtaXQsIGFuZCBhbHNvIG11c3Qgbm90IGJsb2NrIGl0LgotU2VlIGFib3ZlIGZvciBkZXRhaWxzIG9uIGVhY2ggY2F0ZWdvcnkuCitJbiBvcmRlciB0byBzdWJtaXQsIGFsbCBsYWJlbHMgKHN1Y2ggYXMgYFZlcmlmaWVkYCBhbmQgYENvZGUtUmV2aWV3YCwKK2Fib3ZlKSBtdXN0IGVuYWJsZSBzdWJtaXQsIGFuZCBhbHNvIG11c3Qgbm90IGJsb2NrIGl0LiAgU2VlIGFib3ZlIGZvcgorZGV0YWlscyBvbiBlYWNoIGxhYmVsLgogCiAKLVtbY2F0ZWdvcnlfbWFrZW9uZXVwXV0KLVlvdXIgQ2F0ZWdvcnkgSGVyZQotfn5+fn5+fn5+fn5+fn5+fn5+CitbW2NhdGVnb3J5X3ZpZXdfZHJhZnRzXV0KK1ZpZXcgRHJhZnRzCit+fn5+fn5+fn5+fgogCi1HZXJyaXQgYWRtaW5pc3RyYXRvcnMgY2FuIGFsc28gbWFrZSB1cCB0aGVpciBvd24gY2F0ZWdvcmllcy4KK1RoaXMgY2F0ZWdvcnkgcGVybWl0cyB1c2VycyB0byB2aWV3IGRyYWZ0IGNoYW5nZXMgdXBsb2FkZWQgYnkgb3RoZXIKK3VzZXJzLgogCi1TZWUgYWJvdmUgZm9yIGRlc2NyaXB0aW9ucyBvZiBob3cgPDxjYXRlZ29yeV92ZXJpZmllZCxgVmVyaWZpZWRgPj4KLWFuZCA8PGNhdGVnb3J5X3JldmlldyxgQ29kZSBSZXZpZXdgPj4gd29yaywgYW5kIGluc2VydCB5b3VyIG93bgotY2F0ZWdvcnkgd2l0aCBgZnVuY3Rpb25fbmFtZSA9ICdNYXhXaXRoQmxvY2snYCB0byBnZXQgdGhlIHNhbWUKLWJlaGF2aW9yIG92ZXIgeW91ciBvd24gcmFuZ2Ugb2YgdmFsdWVzLCBpbiBhbnkgY2F0ZWdvcnkgeW91IGRlc2lyZS4KK1RoZSBjaGFuZ2Ugb3duZXIgYW5kIGFueSBleHBsaWNpdGx5IGFkZGVkIHJldmlld2VycyBjYW4gYWx3YXlzIHNlZQorZHJhZnQgY2hhbmdlcyAoZXZlbiB3aXRob3V0IGhhdmluZyB0aGUgYFZpZXcgRHJhZnRzYCBhY2Nlc3MgcmlnaHQKK2Fzc2lnbmVkKS4KIAotRW5zdXJlIGBjYXRlZ29yeV9pZGAgaXMgdW5pcXVlIHdpdGhpbiB5b3VyIGBhcHByb3ZhbF9jYXRlZ29yaWVzYAotdGFibGUuICBUaGUgZGVmYXVsdCB2YWx1ZXMgYFZSSUZgIGFuZCBgQ1ZSRmAgdXNlZCBmb3IgdGhlIGNhdGVnb3JpZXMKLWRlc2NyaWJlZCBhYm92ZSBhcmUgc2ltcGx5IHRoYXQsIGRlZmF1bHRzLCBhbmQgaGF2ZSBubyBzcGVjaWFsCi1tZWFuaW5nIHRvIEdlcnJpdC4KIAotVGhlIGBwb3NpdGlvbmAgY29sdW1uIG9mIGBhcHByb3ZhbF9jYXRlZ29yaWVzYCBjb250cm9scyB3aGljaCBjb2x1bW4KLW9mIHRoZSAnQXBwcm92YWxzJyB0YWJsZSB0aGUgY2F0ZWdvcnkgYXBwZWFycyBpbiwgcHJvdmlkaW5nIHNvbWUKLWxheW91dCBjb250cm9sIHRvIHRoZSBhZG1pbmlzdHJhdG9yLgorW1tjYXRlZ29yeV9wdWJsaXNoX2RyYWZ0c11dCitQdWJsaXNoIERyYWZ0cworfn5+fn5+fn5+fn5+fn4KIAotQWxsIGBNYXhXaXRoQmxvY2tgIGNhdGVnb3JpZXMgbXVzdCBoYXZlIGF0IGxlYXN0IG9uZSBwb3NpdGl2ZSB2YWx1ZQotaW4gdGhlIGBhcHByb3ZhbF9jYXRlZ29yeV92YWx1ZXNgIHRhYmxlLCBvciBlbHNlIHN1Ym1pdCB3aWxsIG5ldmVyCi1iZSBlbmFibGVkLgorVGhpcyBjYXRlZ29yeSBwZXJtaXRzIHVzZXJzIHRvIHB1Ymxpc2ggZHJhZnQgY2hhbmdlcyB1cGxvYWRlZCBieSBvdGhlcgordXNlcnMuCiAKLVRvIHBlcm1pdCBibG9ja2luZyBzdWJtaXRzLCBlbnN1cmUgYSBuZWdhdGl2ZSB2YWx1ZSBpcyBkZWZpbmVkIGZvcgoteW91ciBuZXcgY2F0ZWdvcnkuICBJZiB5b3UgZG8gbm90IHdpc2ggdG8gaGF2ZSBhIGJsb2NraW5nIHN1Ym1pdAotbGV2ZWwgZm9yIHlvdXIgY2F0ZWdvcnksIGRvIG5vdCBkZWZpbmUgdmFsdWVzIGxlc3MgdGhhbiAwLgorVGhlIGNoYW5nZSBvd25lciBjYW4gYWx3YXlzIHB1Ymxpc2ggZHJhZnQgY2hhbmdlcyAoZXZlbiB3aXRob3V0IGhhdmluZwordGhlIGBQdWJsaXNoIERyYWZ0c2AgYWNjZXNzIHJpZ2h0IGFzc2lnbmVkKS4KIAotS2VlcCBpbiBtaW5kIHRoYXQgY2F0ZWdvcnkgZGVmaW5pdGlvbnMgYXJlIGN1cnJlbnRseSBnbG9iYWwgdG8KLXRoZSBlbnRpcmUgR2Vycml0IGluc3RhbmNlLCBhbmQgYWZmZWN0IGFsbCBwcm9qZWN0cyBob3N0ZWQgb24gaXQuCi1BbnkgY2hhbmdlIHRvIGEgY2F0ZWdvcnkgZGVmaW5pdGlvbiBhZmZlY3RzIGV2ZXJ5b25lLgogCi1Gb3IgZXhhbXBsZSwgdG8gZGVmaW5lIGEgbmV3IDMtdmFsdWVkIGNhdGVnb3J5IHRoYXQgYmVoYXZlcyBleGFjdGx5Ci1saWtlIGBWZXJpZmllZGAsIGJ1dCBoYXMgZGlmZmVyZW50IG5hbWVzL2xhYmVsczoKK1tbY2F0ZWdvcnlfZGVsZXRlX2RyYWZ0c11dCitEZWxldGUgRHJhZnRzCit+fn5+fn5+fn5+fn5+CiAKLT09PT0KLSAgSU5TRVJUIElOVE8gYXBwcm92YWxfY2F0ZWdvcmllcwotICAgIChuYW1lCi0gICAgLHBvc2l0aW9uCi0gICAgLGZ1bmN0aW9uX25hbWUKLSAgICAsY2F0ZWdvcnlfaWQpCi0gIFZBTFVFUwotICAgICgnQ29weXJpZ2h0IENoZWNrJwotICAgICwzCi0gICAgLCdNYXhXaXRoQmxvY2snCi0gICAgLCdjb3B5Jyk7CitUaGlzIGNhdGVnb3J5IHBlcm1pdHMgdXNlcnMgdG8gZGVsZXRlIGRyYWZ0IGNoYW5nZXMgdXBsb2FkZWQgYnkgb3RoZXIKK3VzZXJzLgogCi0gIElOU0VSVCBJTlRPIGFwcHJvdmFsX2NhdGVnb3J5X3ZhbHVlcwotICAgIChjYXRlZ29yeV9pZCx2YWx1ZSxuYW1lKQotICBWQUxVRVMKLSAgICAoJ2NvcHknLCAtMSwgJ0RvIG5vdCBoYXZlIGNvcHlyaWdodCcpOworVGhlIGNoYW5nZSBvd25lciBjYW4gYWx3YXlzIGRlbGV0ZSBkcmFmdCBjaGFuZ2VzIChldmVuIHdpdGhvdXQgaGF2aW5nCit0aGUgYERlbGV0ZSBEcmFmdHNgIGFjY2VzcyByaWdodCBhc3NpZ25lZCkuCiAKLSAgSU5TRVJUIElOVE8gYXBwcm92YWxfY2F0ZWdvcnlfdmFsdWVzCi0gICAgKGNhdGVnb3J5X2lkLHZhbHVlLG5hbWUpCi0gIFZBTFVFUwotICAgICgnY29weScsIDAsICdObyBzY29yZScpOwogCi0gIElOU0VSVCBJTlRPIGFwcHJvdmFsX2NhdGVnb3J5X3ZhbHVlcwotICAgIChjYXRlZ29yeV9pZCx2YWx1ZSxuYW1lKQotICBWQUxVRVMKLSAgICAoJ2NvcHknLCAxLCAnQ29weXJpZ2h0IGNsZWFyJyk7Ci09PT09CitbW2NhdGVnb3J5X2VkaXRfdG9waWNfbmFtZV1dCitFZGl0IFRvcGljIE5hbWUKK35+fn5+fn5+fn5+fn5+fgogCi1UaGUgbmV3IGNvbHVtbiB3aWxsIGFwcGVhciBhdCB0aGUgZW5kIG9mIHRoZSB0YWJsZSAoaW4gcG9zaXRpb24gMyksCi1hbmQgYC0xIERvIG5vdCBoYXZlIGNvcHlyaWdodGAgd2lsbCBibG9jayBzdWJtaXQsIHdoaWxlIGArMSBDb3B5cmlnaHQKLWNsZWFyYCBpcyByZXF1aXJlZCB0byBlbmFibGUgc3VibWl0LgorVGhpcyBjYXRlZ29yeSBwZXJtaXRzIHVzZXJzIHRvIGVkaXQgdGhlIHRvcGljIG5hbWUgb2YgYSBjaGFuZ2UgdGhhdAoraXMgdXBsb2FkZWQgZm9yIHJldmlldy4KIAotW1tyZXN0YXJ0X2NoYW5nZXNdXQotW05PVEVdCi1SZXN0YXJ0IHRoZSBHZXJyaXQgd2ViIGFwcGxpY2F0aW9uIGFuZCByZWxvYWQgYWxsIGJyb3dzZXJzIGFmdGVyCi1tYWtpbmcgYW55IGRhdGFiYXNlIGNoYW5nZXMgdG8gYXBwcm92YWwgY2F0ZWdvcmllcy4gIEJyb3dzZXJzIGFyZQotc2VudCB0aGUgbGlzdCBvZiBrbm93biBjYXRlZ29yaWVzIHdoZW4gdGhleSBmaXJzdCB2aXNpdCB0aGUgc2l0ZSwKLWFuZCBkb24ndCBub3RpY2UgY2hhbmdlcyB1bnRpbCB0aGUgcGFnZSBpcyBjbG9zZWQgYW5kIG9wZW5lZCBhZ2FpbiwKLW9yIGlzIHJlbG9hZGVkLgorVGhlIGNoYW5nZSBvd25lciwgYnJhbmNoIG93bmVycywgcHJvamVjdCBvd25lcnMsIGFuZCBzaXRlIGFkbWluaXN0cmF0b3JzCitjYW4gYWx3YXlzIGVkaXQgdGhlIHRvcGljIG5hbWUgKGV2ZW4gd2l0aG91dCBoYXZpbmcgdGhlIGBFZGl0IFRvcGljIE5hbWVgCithY2Nlc3MgcmlnaHQgYXNzaWduZWQpLgogCiAKIEV4YW1wbGVzIG9mIHR5cGljYWwgcm9sZXMgaW4gYSBwcm9qZWN0CkBAIC04MjksNiArODMwLDcgQEAKIGdlbmVyYWwgZ3VpZGVsaW5lcyBmb3IgYSB0eXBpY2FsIHdheSB0byBzZXQgdXAgeW91ciBwcm9qZWN0IG9uIGEKIGJyYW5kIG5ldyBHZXJyaXQgaW5zdGFuY2UuCiAKKwogW1tleGFtcGxlc19jb250cmlidXRvcl1dCiBDb250cmlidXRvcgogfn5+fn5+fn5+fn4KQEAgLTg0MCw5ICs4NDIsOSBAQAogCiBTdWdnZXN0ZWQgYWNjZXNzIHJpZ2h0cyB0byBncmFudDoKIAotKiA8PGNhdGVnb3J5X3JlYWQsYFJlYWRgPj4gb24gJ3JlZnMvaGVhZHMvXConIGFuZCAncmVmcy90YWdzLyonCi0qIDw8Y2F0ZWdvcnlfcHVzaCxgUHVzaGA+PiB0byAncmVmcy9mb3IvcmVmcy9oZWFkcy9cKicgYW5kICdyZWZzL2NoYW5nZXMvKicKLSogPDxjYXRlZ29yeV9sYWJlbC1Db2RlLVJldmlldyxgQ29kZSByZXZpZXdgPj4gd2l0aCByYW5nZSAnLTEnIHRvICcrMScKKyogeHJlZjpjYXRlZ29yeV9yZWFkW2BSZWFkYF0gb24gJ3JlZnMvaGVhZHMvXConIGFuZCAncmVmcy90YWdzLyonCisqIHhyZWY6Y2F0ZWdvcnlfcHVzaFtgUHVzaGBdIHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzLyonCisqIGxpbms6Y29uZmlnLWxhYmVscy5odG1sI2xhYmVsX0NvZGUtUmV2aWV3W2BDb2RlLVJldmlld2BdIHdpdGggcmFuZ2UgJy0xJyB0byAnKzEnIGZvciAncmVmcy9oZWFkcy8qJwogCiAKIFtbZXhhbXBsZXNfZGV2ZWxvcGVyXV0KQEAgLTg2NCwxMyArODY2LDEzIEBACiAKIFN1Z2dlc3RlZCBhY2Nlc3MgcmlnaHRzIHRvIGdyYW50OgogCi0qIDw8Y2F0ZWdvcnlfcmVhZCxgUmVhZGA+PiBvbiAncmVmcy9oZWFkcy9cKicgYW5kICdyZWZzL3RhZ3MvKicKLSogPDxjYXRlZ29yeV9wdXNoLGBQdXNoYD4+IHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzL1wqJyBhbmQgJ3JlZnMvY2hhbmdlcy8qJwotKiA8PGNhdGVnb3J5X3B1c2hfbWVyZ2UsYFB1c2ggbWVyZ2UgY29tbWl0YD4+IHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzL1wqJyBhbmQgJ3JlZnMvY2hhbmdlcy8qJwotKiA8PGNhdGVnb3J5X2ZvcmdlX2F1dGhvcixgRm9yZ2UgQXV0aG9yIElkZW50aXR5YD4+Ci0qIDw8Y2F0ZWdvcnlfbGFiZWwtQ29kZS1SZXZpZXcsYExhYmVsOiBDb2RlIHJldmlld2A+PiB3aXRoIHJhbmdlICctMicgdG8gJysyJwotKiA8PGNhdGVnb3J5X2xhYmVsLVZlcmlmaWVkLGBMYWJlbDogVmVyaWZ5YD4+IHdpdGggcmFuZ2UgJy0xJyB0byAnKzEnCi0qIDw8Y2F0ZWdvcnlfc3VibWl0LGBTdWJtaXRgPj4KKyogeHJlZjpjYXRlZ29yeV9yZWFkW2BSZWFkYF0gb24gJ3JlZnMvaGVhZHMvXConIGFuZCAncmVmcy90YWdzLyonCisqIHhyZWY6Y2F0ZWdvcnlfcHVzaFtgUHVzaGBdIHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzLyonCisqIHhyZWY6Y2F0ZWdvcnlfcHVzaF9tZXJnZVtgUHVzaCBtZXJnZSBjb21taXRgXSB0byAncmVmcy9mb3IvcmVmcy9oZWFkcy8qJworKiB4cmVmOmNhdGVnb3J5X2ZvcmdlX2F1dGhvcltgRm9yZ2UgQXV0aG9yIElkZW50aXR5YF0gdG8gJ3JlZnMvaGVhZHMvKicKKyogbGluazpjb25maWctbGFiZWxzLmh0bWwjbGFiZWxfQ29kZS1SZXZpZXdbYExhYmVsOiBDb2RlLVJldmlld2BdIHdpdGggcmFuZ2UgJy0yJyB0byAnKzInIGZvciAncmVmcy9oZWFkcy8qJworKiBsaW5rOmNvbmZpZy1sYWJlbHMuaHRtbCNsYWJlbF9WZXJpZmllZFtgTGFiZWw6IFZlcmlmeWBdIHdpdGggcmFuZ2UgJy0xJyB0byAnKzEnIGZvciAncmVmcy9oZWFkcy8qJworKiB4cmVmOmNhdGVnb3J5X3N1Ym1pdFtgU3VibWl0YF0KIAogSWYgdGhlIHByb2plY3QgaXMgc21hbGwgb3IgdGhlIGRldmVsb3BlcnMgYXJlIHNlYXNvbmVkIGl0IG1pZ2h0IG1ha2UKIHNlbnNlIHRvIGdpdmUgdGhlbSB0aGUgZnJlZWRvbSB0byBwdXNoIGNvbW1pdHMgZGlyZWN0bHkgdG8gYSBicmFuY2guCkBAIC04ODUsNyArODg3LDcgQEAKIENJIHN5c3RlbQogfn5+fn5+fn5+CiAKLUEgdHlwaWNhbCBDb250aW5vdXMgSW50ZWdyYXRpb24gc3lzdGVtIHNob3VsZCBiZSBhYmxlIHRvIGRvd25sb2FkIG5ldyBjaGFuZ2VzCitBIHR5cGljYWwgQ29udGludW91cyBJbnRlZ3JhdGlvbiBzeXN0ZW0gc2hvdWxkIGJlIGFibGUgdG8gZG93bmxvYWQgbmV3IGNoYW5nZXMKIHRvIGJ1aWxkIGFuZCB0aGVuIGxlYXZlIGEgdmVyZGljdCBzb21laG93LgogCiBBcyBhbiBleGFtcGxlLCB0aGUgcG9wdWxhcgpAQCAtOTIwLDE0ICs5MjIsMTQgQEAKIAogU3VnZ2VzdGVkIGFjY2VzcyByaWdodHMgdG8gZ3JhbnQsIHRoYXQgd29uJ3QgYmxvY2sgY2hhbmdlczoKIAotKiA8PGNhdGVnb3J5X3JlYWQsYFJlYWRgPj4gb24gJ3JlZnMvaGVhZHMvXConIGFuZCAncmVmcy90YWdzLyonCi0qIDw8Y2F0ZWdvcnlfbGFiZWwtQ29kZS1SZXZpZXcsYExhYmVsOiBDb2RlIHJldmlld2A+PiB3aXRoIHJhbmdlICctMScgdG8gJzAnCi0qIDw8Y2F0ZWdvcnlfbGFiZWwtVmVyaWZpZWQsYExhYmVsOiBWZXJpZnlgPj4gd2l0aCByYW5nZSAnMCcgdG8gJysxJworKiB4cmVmOmNhdGVnb3J5X3JlYWRbYFJlYWRgXSBvbiAncmVmcy9oZWFkcy9cKicgYW5kICdyZWZzL3RhZ3MvKicKKyogbGluazpjb25maWctbGFiZWxzLmh0bWwjbGFiZWxfQ29kZS1SZXZpZXdbYExhYmVsOiBDb2RlLVJldmlld2BdIHdpdGggcmFuZ2UgJy0xJyB0byAnMCcgZm9yICdyZWZzL2hlYWRzLyonCisqIGxpbms6Y29uZmlnLWxhYmVscy5odG1sI2xhYmVsX1ZlcmlmaWVkW2BMYWJlbDogVmVyaWZ5YF0gd2l0aCByYW5nZSAnMCcgdG8gJysxJyBmb3IgJ3JlZnMvaGVhZHMvKicKIAogT3B0aW9uYWwgYWNjZXNzIHJpZ2h0cyB0byBncmFudDoKIAotKiA8PGNhdGVnb3J5X2xhYmVsLUNvZGUtUmV2aWV3LGBMYWJlbDogQ29kZSByZXZpZXdgPj4gd2l0aCByYW5nZSAnLTEnIHRvICcrMScKLSogPDxjYXRlZ29yeV9wdXNoLGBQdXNoYD4+IHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzL1wqJyBhbmQgJ3JlZnMvY2hhbmdlcy8qJworKiBsaW5rOmNvbmZpZy1sYWJlbHMuaHRtbCNsYWJlbF9Db2RlLVJldmlld1tgTGFiZWw6IENvZGUtUmV2aWV3YF0gd2l0aCByYW5nZSAnLTEnIHRvICcrMScgZm9yICdyZWZzL2hlYWRzLyonCisqIHhyZWY6Y2F0ZWdvcnlfcHVzaFtgUHVzaGBdIHRvICdyZWZzL2Zvci9yZWZzL2hlYWRzLyonCiAKIAogW1tleGFtcGxlc19pbnRlZ3JhdG9yXV0KQEAgLTk0NCw3ICs5NDYsNyBAQAogKiA8PGV4YW1wbGVzX2RldmVsb3BlcixEZXZlbG9wZXIgcmlnaHRzPj4KICogPDxjYXRlZ29yeV9wdXNoLGBQdXNoYD4+IHRvICdyZWZzL2hlYWRzLyonCiAqIDw8Y2F0ZWdvcnlfcHVzaF9tZXJnZSxgUHVzaCBtZXJnZSBjb21taXRgPj4gdG8gJ3JlZnMvaGVhZHMvKicKLSogPDxjYXRlZ29yeV9mb3JnZV9jb21taXR0ZXIsYEZvcmdlIENvbW1pdHRlciBJZGVudGl0eWA+PiB0byAncmVmcy9mb3IvcmVmcy9oZWFkcy9cKicgYW5kICdyZWZzL2NoYW5nZXMvKicKKyogPDxjYXRlZ29yeV9mb3JnZV9jb21taXR0ZXIsYEZvcmdlIENvbW1pdHRlciBJZGVudGl0eWA+PiB0byAncmVmcy9mb3IvcmVmcy9oZWFkcy8qJwogKiA8PGNhdGVnb3J5X2NyZWF0ZSxgQ3JlYXRlIFJlZmVyZW5jZWA+PiB0byAncmVmcy9oZWFkcy8qJwogKiA8PGNhdGVnb3J5X3B1c2hfYW5ub3RhdGVkLGBQdXNoIEFubm90YXRlZCBUYWdgPj4gdG8gJ3JlZnMvdGFncy8qJwogCkBAIC05NTgsNyArOTYwLDcgQEAKIGFsc28gaGF2ZSB0aGUgcG93ZXIgdG8gY29uZmlndXJlIGFjY2VzcyByaWdodHMgaW4gZ2l0cyBhc3NpZ25lZCB0byB0aGVtLgogCiBbV0FSTklOR10KLVRoZXNlIHVzZXJzIHNob3VsZCBiZSByZWFsbHkga25vd2xlZGdhYmxlIGFib3V0IGdpdCwgZm9yIGluc3RhbmNlIGtub3dpbmcgd2h5CitUaGVzZSB1c2VycyBzaG91bGQgYmUgcmVhbGx5IGtub3dsZWRnZWFibGUgYWJvdXQgZ2l0LCBmb3IgaW5zdGFuY2Uga25vd2luZyB3aHkKIHRhZ3MgbmV2ZXIgc2hvdWxkIGJlIHJlbW92ZWQgZnJvbSBhIHNlcnZlci4gIFRoaXMgcm9sZSBpcyBncmFudGVkIHBvdGVudGlhbGx5CiBkZXN0cnVjdGl2ZSBhY2Nlc3MgcmlnaHRzIGFuZCBjbGVhbmluZyB1cCBhZnRlciBzdWNoIGEgbWlzaGFwIGNvdWxkIGJlIHRpbWUKIGNvbnN1bWluZyEKQEAgLTk3Miw2ICs5NzQsNyBAQAogCiAqIDw8Y2F0ZWdvcnlfb3duZXIsYE93bmVyYD4+IGluIHRoZSBnaXRzIHRoZXkgbW9zdGx5IHdvcmsgd2l0aC4KIAorCiBbW2V4YW1wbGVzX2FkbWluaXN0cmF0b3JdXQogQWRtaW5pc3RyYXRvcgogfn5+fn5+fn5+fn5+fgpAQCAtOTkwLDYgKzk5MywxMjggQEAKICogPDxleGFtcGxlc19wcm9qZWN0LW93bmVyLFByb2plY3Qgb3duZXIgcmlnaHRzPj4KIAogCitFbmZvcmNpbmcgc2l0ZSB3aWRlIGFjY2VzcyBwb2xpY2llcworLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworQnkgZ3JhbnRpbmcgdGhlIDw8Y2F0ZWdvcnlfb3duZXIsYE93bmVyYD4+IGFjY2VzcyByaWdodCBvbiB0aGUgYHJlZnMvKmAgdG8gYQorZ3JvdXAsIEdlcnJpdCBhZG1pbmlzdHJhdG9ycyBjYW4gZGVsZWdhdGUgdGhlIHJlc3BvbnNpYmlsaXR5IG9mIG1haW50YWluaW5nCithY2Nlc3MgcmlnaHRzIGZvciB0aGF0IHByb2plY3QgdG8gdGhhdCBncm91cC4KKworSW4gYSBjb3Jwb3JhdGUgZGVwbG95bWVudCBpdCBpcyBvZnRlbiBuZWNlc3NhcnkgdG8gZW5mb3JjZSBzb21lIGFjY2VzcworcG9saWNpZXMuIEFuIGV4YW1wbGUgY291bGQgYmUgdGhhdCBuby1vbmUgY2FuIHVwZGF0ZSBvciBkZWxldGUgYSB0YWcsIG5vdCBldmVuCit0aGUgcHJvamVjdCBvd25lcnMuIFRoZSAnQUxMT1cnIGFuZCAnREVOWScgcnVsZXMgYXJlIG5vdCBlbm91Z2ggZm9yIHRoaXMKK3B1cnBvc2UgYXMgcHJvamVjdCBvd25lcnMgY2FuIGdyYW50IHRoZW1zZWx2ZXMgYW55IGFjY2VzcyByaWdodCB0aGV5IHdpc2ggYW5kLAordGh1cywgZWZmZWN0aXZlbHkgb3ZlcnJpZGUgYW55IGluaGVyaXRlZCBhY2Nlc3MgcmlnaHRzIGZyb20gdGhlCisiYEFsbC1Qcm9qZWN0c2AiIG9yIHNvbWUgb3RoZXIgY29tbW9uIHBhcmVudCBwcm9qZWN0LgorCitXaGF0IGlzIG5lZWRlZCBpcyBhIG1lY2hhbmlzbSB0byBibG9jayBhIHBlcm1pc3Npb24gaW4gYSBwYXJlbnQgcHJvamVjdCBzbwordGhhdCBldmVuIHByb2plY3Qgb3duZXJzIGNhbm5vdCBhbGxvdyBhIGJsb2NrZWQgcGVybWlzc2lvbiBpbiB0aGVpciBjaGlsZAorcHJvamVjdC4gU3RpbGwsIHByb2plY3Qgb3duZXJzIHNob3VsZCByZXRhaW4gdGhlIHBvc3NpYmlsaXR5IHRvIG1hbmFnZSBhbGwKK25vbi1ibG9ja2VkIHJ1bGVzIGFzIHRoZXkgd2lzaC4gVGhpcyBnaXZlcyBiZXN0IG9mIGJvdGggd29ybGRzOgorCisqIEdlcnJpdCBhZG1pbmlzdHJhdG9ycyBjYW4gY29uY2VudHJhdGUgb24gZW5mb3JjaW5nIHNpdGUgd2lkZSBwb2xpY2llcworICBhbmQgcHJvdmlkaW5nIGEgbWVhbmluZ2Z1bCBzZXQgb2YgZGVmYXVsdCBhY2Nlc3MgcGVybWlzc2lvbnMKKyogUHJvamVjdCBvd25lcnMgY2FuIG1hbmFnZSBhY2Nlc3MgcmlnaHRzIG9mIHRoZWlyIHByb2plY3RzIHdpdGhvdXQgYSBkYW5nZXIKKyAgb2YgdmlvbGF0aW5nIGEgc2l0ZSB3aWRlIHBvbGljeQorCisKK1tbYmxvY2tdXQorJ0JMT0NLJyBhY2Nlc3MgcnVsZQorfn5+fn5+fn5+fn5+fn5+fn5+fgorCitUaGUgJ0JMT0NLJyBydWxlIGJsb2NrcyBhIHBlcm1pc3Npb24gZ2xvYmFsbHkuIEFuIGluaGVyaXRlZCAnQkxPQ0snIHJ1bGUgY2Fubm90CitiZSBvdmVycmlkZGVuIGluIHRoZSBpbmhlcml0aW5nIHByb2plY3QuIEFueSAnQUxMT1cnIHJ1bGUsIGZyb20gYSBkaWZmZXJlbnQKK2FjY2VzcyBzZWN0aW9uIG9yIGZyb20gYW4gaW5oZXJpdGluZyBwcm9qZWN0LCB3aGljaCBjb25mbGljdHMgd2l0aCBhbgoraW5oZXJpdGVkICdCTE9DSycgcnVsZSB3aWxsIG5vdCBiZSBob25vcmVkLiAgU2VhcmNoaW5nIGZvciAnQkxPQ0snIHJ1bGVzLCBpbgordGhlIGNoYWluIG9mIHBhcmVudCBwcm9qZWN0cywgaWdub3JlcyB0aGUgRXhjbHVzaXZlIGZsYWcgdGhhdCBpcyBub3JtYWxseQorYXBwbGllZCB0byBhY2Nlc3Mgc2VjdGlvbnMuCisKK0EgJ0JMT0NLJyBydWxlIHRoYXQgYmxvY2tzIHRoZSAncHVzaCcgcGVybWlzc2lvbiBibG9ja3MgYW55IHR5cGUgb2YgcHVzaCwKK2ZvcmNlIG9yIG5vdC4gQSBibG9ja2luZyBmb3JjZSBwdXNoIHJ1bGUgYmxvY2tzIG9ubHkgZm9yY2UgcHVzaGVzLCBidXQKK2FsbG93cyBub24tZm9yY2VkIHB1c2hlcyBpZiBhbiAnQUxMT1cnIHJ1bGUgd291bGQgaGF2ZSBwZXJtaXR0ZWQgaXQuCisKK0l0IGlzIGFsc28gcG9zc2libGUgdG8gYmxvY2sgbGFiZWwgcmFuZ2VzLiAgVG8gYmxvY2sgYSBncm91cCAnWCcgZnJvbSB2b3RpbmcKKyctMicgYW5kICcrMicsIGJ1dCBrZWVwIHRoZWlyIGV4aXN0aW5nIHZvdGluZyBwZXJtaXNzaW9ucyBmb3IgdGhlICctMS4uKzEnCityYW5nZSBpbnRhY3Qgd2Ugd291bGQgZGVmaW5lOgorCis9PT09CisgIFthY2Nlc3MgInJlZnMvaGVhZHMvKiJdCisgICAgbGFiZWwtQ29kZS1SZXZpZXcgPSBibG9jayAtMi4uKzIgZ3JvdXAgWAorPT09PQorCitUaGUgaW50ZXJwcmV0YXRpb24gb2YgdGhlICdtaW4uLm1heCcgcmFuZ2UgaW4gY2FzZSBvZiBhIGJsb2NraW5nIHJ1bGUgaXM6IGJsb2NrCitldmVyeSB2b3RlIGZyb20gJy1JTkZJTklURS4ubWluJyBhbmQgJ21heC4uSU5GSU5JVEUnLiBGb3IgdGhlIGV4YW1wbGUgYWJvdmUgaXQKK21lYW5zIHRoYXQgdGhlIHJhbmdlICctMS4uKzEnIGlzIG5vdCBhZmZlY3RlZCBieSB0aGlzIGJsb2NrLgorCisnQkxPQ0snIGFuZCAnQUxMT1cnIHJ1bGVzIGluIHRoZSBzYW1lIGFjY2VzcyBzZWN0aW9uCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CisKK1doZW4gYW4gYWNjZXNzIHNlY3Rpb24gb2YgYSBwcm9qZWN0IGNvbnRhaW5zIGEgJ0JMT0NLJyBhbmQgYW4gJ0FMTE9XJyBydWxlIGZvcgordGhlIHNhbWUgcGVybWlzc2lvbiB0aGVuIHRoaXMgJ0FMTE9XJyBydWxlIG92ZXJyaWRlcyB0aGUgJ0JMT0NLJyBydWxlOgorCis9PT09CisgIFthY2Nlc3MgInJlZnMvaGVhZHMvKiJdCisgICAgcHVzaCA9IGJsb2NrIGdyb3VwIFgKKyAgICBwdXNoID0gZ3JvdXAgWQorPT09PQorCitJbiB0aGlzIGNhc2UgYSB1c2VyIHdoaWNoIGlzIGEgbWVtYmVyIG9mIHRoZSBncm91cCAnWScgd2lsbCBzdGlsbCBiZSBhbGxvd2VkIHRvCitwdXNoIHRvICdyZWZzL2hlYWRzLyonIGV2ZW4gaWYgaXQgaXMgYSBtZW1iZXIgb2YgdGhlIGdyb3VwICdYJy4KKworTk9URTogQW4gJ0FMTE9XJyBydWxlIG92ZXJyaWRlcyBhICdCTE9DSycgcnVsZSBvbmx5IHdoZW4gYm90aCBvZiB0aGVtIGFyZQoraW5zaWRlIHRoZSBzYW1lIGFjY2VzcyBzZWN0aW9uIG9mIHRoZSBzYW1lIHByb2plY3QuIEFuICdBTExPVycgcnVsZSBpbiBhCitkaWZmZXJlbnQgYWNjZXNzIHNlY3Rpb24gb2YgdGhlIHNhbWUgcHJvamVjdCBvciBpbiBhbnkgYWNjZXNzIHNlY3Rpb24gaW4gYW4KK2luaGVyaXRpbmcgcHJvamVjdCBjYW5ub3Qgb3ZlcnJpZGUgYSAnQkxPQ0snIHJ1bGUuCisKKworRXhhbXBsZXMKK35+fn5+fn5+CisKK1RoZSBmb2xsb3dpbmcgZXhhbXBsZXMgc2hvdyBzb21lIHBvc3NpYmxlIHVzZSBjYXNlcyBmb3IgdGhlICdCTE9DSycgcnVsZXMuCisKK01ha2Ugc3VyZSBubyBvbmUgY2FuIHVwZGF0ZSBvciBkZWxldGUgYSB0YWcKK15eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworVGhpcyByZXF1aXJlbWVudCBpcyBxdWl0ZSBjb21tb24gaW4gYSBjb3Jwb3JhdGUgZGVwbG95bWVudCB3aGVyZQorcmVwcm9kdWNpYmlsaXR5IG9mIGEgYnVpbGQgbXVzdCBiZSBndWFyYW50ZWVkLiBUbyBhY2hpZXZlIHRoYXQgd2UgYmxvY2sgJ3B1c2gnCitwZXJtaXNzaW9uIGZvciB0aGUgPDxhbm9ueW1vdXNfdXNlcnMsJ0Fub255bW91cyBVc2Vycyc+PiBpbiAiYEFsbC1Qcm9qZWN0c2AiOgorCis9PT09CisgIFthY2Nlc3MgInJlZnMvdGFncy8qIl0KKyAgICBwdXNoID0gYmxvY2sgZ3JvdXAgQW5vbnltb3VzIFVzZXJzCis9PT09CisKK0J5IGJsb2NraW5nIHRoZSA8PGFub255bW91c191c2VycywnQW5vbnltb3VzIFVzZXJzJz4+IHdlIGVmZmVjdGl2ZWx5IGJsb2NrCitldmVyeW9uZSBhcyBldmVyeW9uZSBpcyBhIG1lbWJlciBvZiB0aGF0IGdyb3VwLiBOb3RlIHRoYXQgdGhlIHBlcm1pc3Npb24gdG8KK2NyZWF0ZSBhIHRhZyBpcyBzdGlsbCBuZWNlc3NhcnkuIEFzc3VtaW5nIHRoYXQgb25seSA8PGNhdGVnb3J5X293bmVyLHByb2plY3QKK293bmVycz4+IGFyZSBhbGxvd2VkIHRvIGNyZWF0ZSB0YWdzLCB3ZSB3b3VsZCBleHRlbmQgdGhlIGV4YW1wbGUgYWJvdmU6CisKKz09PT0KKyAgW2FjY2VzcyAicmVmcy90YWdzLyoiXQorICAgIHB1c2ggPSBibG9jayBncm91cCBBbm9ueW1vdXMgVXNlcnMKKyAgICBjcmVhdGUgPSBncm91cCBQcm9qZWN0IE93bmVycworICAgIHB1c2hUYWcgPSBncm91cCBQcm9qZWN0IE93bmVycworPT09PQorCisKK0xldCBvbmx5IGEgZGVkaWNhdGVkIGdyb3VwIHZvdGUgaW4gYSBzcGVjaWFsIGNhdGVnb3J5CiteXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgorCitBc3N1bWUgdGhlcmUgaXMgYSBtb3JlIHJlc3RyaWN0aXZlIHByb2Nlc3MgZm9yIHN1Ym1pdHRpbmcgY2hhbmdlcyBpbiBzdGFibGUKK3JlbGVhc2UgYnJhbmNoZXMgd2hpY2ggaXMgbWFuaWZlc3RlZCBhcyBhIG5ldyB2b3RpbmcgY2F0ZWdvcnkKKydSZWxlYXNlLVByb2Nlc3MnLiBBc3N1bWUgd2Ugd2FudCB0byBtYWtlIHN1cmUgdGhhdCBvbmx5IGEgJ1JlbGVhc2UgRW5naW5lZXJzJworZ3JvdXAgY2FuIHZvdGUgaW4gdGhpcyBjYXRlZ29yeSBhbmQgdGhhdCBldmVuIHByb2plY3Qgb3duZXJzIGNhbm5vdCBhcHByb3ZlCit0aGlzIGNhdGVnb3J5LiBXZSBoYXZlIHRvIGJsb2NrIGV2ZXJ5b25lIGV4Y2VwdCB0aGUgJ1JlbGVhc2UgRW5naW5lZXJzJyB0byB2b3RlCitpbiB0aGlzIGNhdGVnb3J5IGFuZCwgb2YgY291cnNlLCBhbGxvdyAnUmVsZWFzZSBFbmdpbmVlcnMnIHRvIHZvdGUgaW4gdGhhdAorY2F0ZWdvcnkuIEluIHRoZSAiYEFsbC1Qcm9qZWN0c2AiIHdlIGRlZmluZSB0aGUgZm9sbG93aW5nIHJ1bGVzOgorCis9PT09CisgIFthY2Nlc3MgInJlZnMvaGVhZHMvc3RhYmxlKiJdCisgICAgbGFiZWwtUmVsZWFzZS1Qcm9jZXNzID0gYmxvY2sgLTEuLisxIGdyb3VwIEFub255bW91cyBVc2VycworICAgIGxhYmVsLVJlbGVhc2UtUHJvY2VzcyA9IC0xLi4rMSBncm91cCBSZWxlYXNlIEVuZ2luZWVycworPT09PQorCisKIFtbY29udmVyc2lvbl90YWJsZV1dCiBDb252ZXJzaW9uIHRhYmxlIGZyb20gMi4xLnggc2VyaWVzIHRvIDIuMi54IHNlcmllcwogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTk5Nyw4ICsxMTIyLDggQEAKIFtvcHRpb25zPSJoZWFkZXIiXQogfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogfEdlcnJpdCAyLjEueCAgICAgICAgICAgICAgICAgfEdlcnJpdCAyLjIueAotfENvZGUgcmV2aWV3ICAgICAgICAgICAgICAgICAgfDw8Y2F0ZWdvcnlfbGFiZWwtQ29kZS1SZXZpZXcsTGFiZWw6IENvZGUgcmV2aWV3Pj4KLXxWZXJpZnkgICAgICAgICAgICAgICAgICAgICAgIHw8PGNhdGVnb3J5X2xhYmVsLVZlcmlmaWVkLExhYmVsOiBWZXJpZnk+PgorfENvZGUgcmV2aWV3ICAgICAgICAgICAgICAgICAgfGxpbms6Y29uZmlnLWxhYmVscy5odG1sI2xhYmVsX0NvZGUtUmV2aWV3W0xhYmVsOiBDb2RlLVJldmlld10KK3xWZXJpZnkgICAgICAgICAgICAgICAgICAgICAgIHxsaW5rOmNvbmZpZy1sYWJlbHMuaHRtbCNsYWJlbF9WZXJpZmllZFtMYWJlbDogVmVyaWZ5XQogfEZvcmdlIElkZW50aXR5ICsxICAgICAgICAgICAgfEZvcmdlIDw8Y2F0ZWdvcnlfZm9yZ2VfYXV0aG9yLGF1dGhvcj4+IGlkZW50aXR5CiB8Rm9yZ2UgSWRlbnRpdHkgKzIgICAgICAgICAgICB8Rm9yZ2UgPDxjYXRlZ29yeV9mb3JnZV9jb21taXR0ZXIsY29tbWl0dGVyPj4gJiA8PGNhdGVnb3J5X2ZvcmdlX2F1dGhvcixhdXRob3I+PiBpZGVudGl0eQogfEZvcmdlIElkZW50aXR5ICszICAgICAgICAgICAgfEZvcmdlIDw8Y2F0ZWdvcnlfZm9yZ2Vfc2VydmVyLHNlcnZlcj4+ICYgPDxjYXRlZ29yeV9mb3JnZV9jb21taXR0ZXIsY29tbWl0dGVyPj4gJiA8PGNhdGVnb3J5X2ZvcmdlX2F1dGhvcixhdXRob3I+PiBpZGVudGl0eQpAQCAtMTAyMSwxNSArMTE0NiwxNiBAQAogSW4gR2Vycml0IDIuMi54LCB0aGUgd2F5IHRvIHNldCBwZXJtaXNzaW9ucyBmb3IgdXBsb2FkIGhhcyBjaGFuZ2VkIGVudGlyZWx5LgogVG8gdXBsb2FkIGEgY2hhbmdlIGZvciByZXZpZXcgaXMgbm8gbG9uZ2VyIGEgc2VwYXJhdGUgcGVybWlzc2lvbiB0eXBlLAogaW5zdGVhZCB5b3UgZ3JhbnQgb3JkaW5hcnkgcHVzaCBwZXJtaXNzaW9ucyB0byB0aGUgYWN0dWFsCi1yZWNpZXZpbmcgcmVmZXJlbmNlLiBJbiBwcmFjdGljZSB0aGlzIG1lYW5zIHRoYXQgeW91IHNldCBwdXNoIHBlcm1pc3Npb25zCityZWNlaXZpbmcgcmVmZXJlbmNlLiBJbiBwcmFjdGljZSB0aGlzIG1lYW5zIHRoYXQgeW91IHNldCBwdXNoIHBlcm1pc3Npb25zCiBvbiBgcmVmcy9mb3IvcmVmcy9oZWFkcy88YnJhbmNoPmAgcmF0aGVyIHRoYW4gcGVybWlzc2lvbnMgdG8gdXBsb2FkIGNoYW5nZXMKIG9uIGByZWZzL2hlYWRzLzxicmFuY2g+YC4KIAogCi1TeXN0ZW0gY2FwYWJpbGl0aWVzCitbW2dsb2JhbF9jYXBhYmlsaXRpZXNdXQorR2xvYmFsIENhcGFiaWxpdGllcwogLS0tLS0tLS0tLS0tLS0tLS0tLQogCi1UaGUgc3lzdGVtIGNhcGFiaWxpdGllcyBjb250cm9sIGFjdGlvbnMgdGhhdCB0aGUgYWRtaW5pc3RyYXRvcnMgb2YKK1RoZSBnbG9iYWwgY2FwYWJpbGl0aWVzIGNvbnRyb2wgYWN0aW9ucyB0aGF0IHRoZSBhZG1pbmlzdHJhdG9ycyBvZgogdGhlIHNlcnZlciBjYW4gcGVyZm9ybSB3aGljaCB1c3VhbGx5IGFmZmVjdCB0aGUgZW50aXJlCiBzZXJ2ZXIgaW4gc29tZSB3YXkuICBUaGUgYWRtaW5pc3RyYXRvcnMgbWF5IGRlbGVnYXRlIHRoZXNlCiBjYXBhYmlsaXRpZXMgdG8gdHJ1c3RlZCBncm91cHMgb2YgdXNlcnMuCkBAIC0xMDQwLDYgKzExNjYsOSBAQAoga2VlcCBmZXdlciB1c2VycyBpbiB0aGUgYWRtaW5pc3RyYXRvcnMgZ3JvdXAsIGV2ZW4gd2hpbGUgc3ByZWFkaW5nCiBtdWNoIG9mIHRoZSBzZXJ2ZXIgYWRtaW5pc3RyYXRpb24gYnVyZGVuIG91dCB0byBtb3JlIHVzZXJzLgogCitHbG9iYWwgY2FwYWJpbGl0aWVzIGFyZSBhc3NpZ25lZCB0byBncm91cHMgaW4gdGhlIGFjY2VzcyByaWdodHMgc2V0dGluZ3MKK29mIHRoZSByb290IHByb2plY3QgKCJgQWxsLVByb2plY3RzYCIpLgorCiBCZWxvdyB5b3UgZmluZCBhIGxpc3Qgb2YgY2FwYWJpbGl0aWVzIGF2YWlsYWJsZToKIAogCkBAIC0xMDgxLDYgKzEyMTAsNyBAQAogZWl0aGVyIGxpbms6Y21kLWNyZWF0ZS1wcm9qZWN0Lmh0bWxbY3JlYXRlIG5ldyBnaXQgcHJvamVjdHMgdmlhIHNzaF0KIG9yIHZpYSB0aGUgd2ViIFVJLgogCisKIFtbY2FwYWJpbGl0eV9lbWFpbFJldmlld2Vyc11dCiBFbWFpbCBSZXZpZXdlcnMKIH5+fn5+fn5+fn5+fn5+fgpAQCAtMTA5MSw2ICsxMjIxLDcgQEAKIGVtYWlsZWQuICBUaGUgYWxsb3cgcnVsZXMgYXJlIGV2YWx1YXRlZCBiZWZvcmUgZGVueSBydWxlcywgaG93ZXZlciB0aGUgZGVmYXVsdAogaXMgdG8gYWxsb3cgZW1haWxpbmcsIGlmIG5vIGV4cGxpY2l0IHJ1bGUgaXMgbWF0Y2hlZC4KIAorCiBbW2NhcGFiaWxpdHlfZmx1c2hDYWNoZXNdXQogRmx1c2ggQ2FjaGVzCiB+fn5+fn5+fn5+fn4KQEAgLTExMTAsNyArMTI0MSw3IEBACiBBbGxvdyB0aGUgb3BlcmF0aW9uIG9mIHRoZSBsaW5rOmNtZC1raWxsLmh0bWxba2lsbCBjb21tYW5kIG92ZXIgc3NoXS4gIFRoZQoga2lsbCBjb21tYW5kIGVuZHMgdGFza3MgdGhhdCBjdXJyZW50bHkgb2NjdXB5IHRoZSBHZXJyaXQgc2VydmVyLCB1c3VhbGx5CiBhIHJlcGxpY2F0aW9uIHRhc2sgb3IgYSB1c2VyIGluaXRpYXRlZCB0YXNrIHN1Y2ggYXMgYW4gdXBsb2FkLXBhY2sgb3IKLXJlY2lldmUtcGFjay4KK3JlY2VpdmUtcGFjay4KIAogCiBbW2NhcGFiaWxpdHlfcHJpb3JpdHldXQpAQCAtMTE1OCw2ICsxMjg5LDIxIEBACiBjb21tYW5kLCBidXQgYWxzbyB0byB0aGUgd2ViIFVJIHJlc3VsdHMgcGFnaW5hdGlvbiBzaXplLgogCiAKK1tbY2FwYWJpbGl0eV9hY2Nlc3NEYXRhYmFzZV1dCitBY2Nlc3MgRGF0YWJhc2UKK35+fn5+fn5+fn5+fn5+fgorCitBbGxvdyB1c2VycyB0byBhY2Nlc3MgdGhlIGRhdGFiYXNlIHVzaW5nIHRoZSBgZ3NxbGAgY29tbWFuZC4KKworCitbW2NhcGFiaWxpdHlfcnVuR0NdXQorUnVuIEdhcmJhZ2UgQ29sbGVjdGlvbgorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorCitBbGxvdyB1c2VycyB0byBydW4gdGhlIEdpdCBnYXJiYWdlIGNvbGxlY3Rpb24gZm9yIHRoZSByZXBvc2l0b3JpZXMgb2YKK2FsbCBwcm9qZWN0cy4KKworCiBbW2NhcGFiaWxpdHlfc3RhcnRSZXBsaWNhdGlvbl1dCiBTdGFydCBSZXBsaWNhdGlvbgogfn5+fn5+fn5+fn5+fn5+fn4KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vYXNjaWlkb2MuY29uZiBiL0RvY3VtZW50YXRpb24vYXNjaWlkb2MuY29uZgppbmRleCA5MjQyZjA5Li4yZmU2MjEzIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2FzY2lpZG9jLmNvbmYKKysrIGIvRG9jdW1lbnRhdGlvbi9hc2NpaWRvYy5jb25mCkBAIC0xNiwzICsxNiwxNCBAQAogICBtYXJnaW4tdG9wOiAxLjJlbTsKICAgbWFyZ2luLWJvdHRvbTogMC41ZW07CiAiPgorCitbbWFjcm9zXQorKD91KV4oP1A8bmFtZT5nZXQpOjooP1A8dGFyZ2V0PlxTKj8pJD0jCisKK1tnZXQtYmxvY2ttYWNyb10KKzxhIGlkPSJ7dGFyZ2V0fSIgb25tb3VzZWRvd249ImphdmFzY3JpcHQ6CisgIHZhciBpID0gIGRvY3VtZW50LlVSTC5sYXN0SW5kZXhPZignL0RvY3VtZW50YXRpb24vJyk7CisgIHZhciB1cmwgPSBkb2N1bWVudC5VUkwuc3Vic3RyaW5nKDAsIGkpICsgJ3t0YXJnZXR9JzsKKyAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3t0YXJnZXR9JykuaHJlZiA9IHVybDsiPgorICAgIEdFVCB7dGFyZ2V0fSBIVFRQLzEuMAorPC9hPgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jbWQtY3JlYXRlLWFjY291bnQudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtY3JlYXRlLWFjY291bnQudHh0CmluZGV4IDE2YjJlYjUuLjg1YjliNTYgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vY21kLWNyZWF0ZS1hY2NvdW50LnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2NtZC1jcmVhdGUtYWNjb3VudC50eHQKQEAgLTE4LDkgKzE4LDExIEBACiAKIERFU0NSSVBUSU9OCiAtLS0tLS0tLS0tLQotQ3JlYXRlcyBhIG5ldyBpbnRlcm5hbCBvbmx5IHVzZXIgYWNjb3VudCBmb3IgYmF0Y2gvcm9sZSBhY2Nlc3MsIHN1Y2gKLWFzIGZyb20gYW4gYXV0b21hdGVkIGJ1aWxkIHN5c3RlbSBvciBldmVudCBtb25pdG9yaW5nIG92ZXIKLWxpbms6Y21kLXN0cmVhbS1ldmVudHMuaHRtbFtnZXJyaXQgc3RyZWFtLWV2ZW50c10uCitDcmVhdGVzIGEgbmV3IGludGVybmFsLW9ubHkgdXNlciBhY2NvdW50LgorCitJZiB0aGUgYWNjb3VudCBpcyBjcmVhdGVkIHdpdGhvdXQgYW4gZW1haWwgYWRkcmVzcywgaXQgbWF5IG9ubHkgYmUKK3VzZWQgZm9yIGJhdGNoL3JvbGUgYWNjZXNzLCBzdWNoIGFzIGZyb20gYW4gYXV0b21hdGVkIGJ1aWxkIHN5c3RlbQorb3IgZXZlbnQgbW9uaXRvcmluZyBvdmVyIGxpbms6Y21kLXN0cmVhbS1ldmVudHMuaHRtbFtnZXJyaXQgc3RyZWFtLWV2ZW50c10uCiAKIElmIExEQVAgYXV0aGVudGljYXRpb24gaXMgYmVpbmcgdXNlZCwgdGhlIHVzZXIgYWNjb3VudCBpcyBjcmVhdGVkCiB3aXRob3V0IGNoZWNraW5nIHRoZSBMREFQIGRpcmVjdG9yeS4gIENvbnNlcXVlbnRseSB1c2VycyBjYW4gYmUKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLWdjLnR4dCBiL0RvY3VtZW50YXRpb24vY21kLWdjLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wN2I4OTlhCi0tLSAvZGV2L251bGwKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtZ2MudHh0CkBAIC0wLDAgKzEsNzIgQEAKK2dlcnJpdCBnYworPT09PT09PT09CisKK05BTUUKKy0tLS0KK2dlcnJpdCBnYyAtIFJ1biB0aGUgR2l0IGdhcmJhZ2UgY29sbGVjdGlvbgorCitTWU5PUFNJUworLS0tLS0tLS0KK1t2ZXJzZV0KKydzc2gnIC1wIDxwb3J0PiA8aG9zdD4gJ2dlcnJpdCBnYycKKyAgWy0tYWxsXQorICA8TkFNRT4gLi4uCisKK0RFU0NSSVBUSU9OCistLS0tLS0tLS0tLQorUnVucyB0aGUgR2l0IGdhcmJhZ2UgY29sbGVjdGlvbiBmb3IgdGhlIHNwZWNpZmllZCBwcm9qZWN0cy4KKworQSBHZXJyaXQgc3lzdGVtIGFkbWluaXN0cmF0b3IgY2FuIGRlZmluZSB0aGUgZGVmYXVsdCBwYXJhbWV0ZXJzIHRoYXQKK3Nob3VsZCBiZSB1c2VkIGZvciBydW5uaW5nIHRoZSBnYXJiYWdlIGNvbGxlY3Rpb24gaW4gdGhlIHVzZXIgZ2xvYmFsCitHaXQgY29uZmlndXJhdGlvbiBmaWxlIG9mIHRoZSBzeXN0ZW0gdXNlciB0aGF0IHJ1bnMgdGhlIEdlcnJpdAorc2VydmVyLgorCitTaW5jZSB0aGUgdXNlciBnbG9iYWwgR2l0IGNvbmZpZ3VyYXRpb24gZmlsZSBpcyBvdmVybGFpZCB3aXRoIHRoZSBHaXQKK2NvbmZpZ3VyYXRpb24gb24gcmVwb3NpdG9yeSBsZXZlbCBpdCBpcyBwb3NzaWJsZSB0byBzcGVjaWZ5CityZXBvc2l0b3J5IHNwZWNpZmljIHBhcmFtZXRlcnMgZm9yIHRoZSBnYXJiYWdlIGNvbGxlY3Rpb24gaW4gdGhlIEdpdAorcmVwb3NpdG9yeSBjb25maWd1cmF0aW9uIG9mIGV2ZXJ5IHByb2plY3QuCisKK0FDQ0VTUworLS0tLS0tCitDYWxsZXIgbXVzdCBiZSBhIG1lbWJlciBvZiB0aGUgcHJpdmlsZWdlZCAnQWRtaW5pc3RyYXRvcnMnIGdyb3VwLAorb3IgaGF2ZSBiZWVuIGdyYW50ZWQgdGhlCitsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWwjY2FwYWJpbGl0eV9ydW5HQ1tSdW4gR2FyYmFnZSBDb2xsZWN0aW9uXQorZ2xvYmFsIGNhcGFiaWxpdHkuCisKK1NDUklQVElORworLS0tLS0tLS0tCitUaGlzIGNvbW1hbmQgaXMgaW50ZW5kZWQgdG8gYmUgdXNlZCBpbiBzY3JpcHRzLgorCitPUFRJT05TCistLS0tLS0tCis8TkFNRT46OgorCU5hbWUgb2YgdGhlIHByb2plY3RzIGZvciB3aGljaCB0aGUgR2l0IGdhcmJhZ2UgY29sbGVjdGlvbiBzaG91bGQgYmUgcnVuLgorCistLWFsbDo6CisJSWYgc3BlY2lmaWVkIHRoZSBHaXQgZ2FyYmFnZSBjb2xsZWN0aW9uIGlzIHJ1biBmb3IgYWxsIHByb2plY3RzCisJc2VxdWVudGlhbGx5LgorCitFWEFNUExFUworLS0tLS0tLS0KKworUnVuIHRoZSBHaXQgZ2FyYmFnZSBjb2xsZWN0aW9uIGZvciB0aGUgcHJvamVjdHMgJ215UHJvamVjdCcgYW5kCisneW91clByb2plY3QnOgorPT09PT0KKwkkIHNzaCAtcCAyOTQxOCByZXZpZXcuZXhhbXBsZS5jb20gZ2Vycml0IGdjIG15UHJvamVjdCB5b3VyUHJvamVjdAorCWNvbGxlY3RpbmcgZ2FyYmFnZSBmb3IgIm15UHJvamVjdCI6CisJLi4uCisJZG9uZS4KKworCWNvbGxlY3RpbmcgZ2FyYmFnZSBmb3IgInlvdXJQcm9qZWN0IjoKKwkuLi4KKwlkb25lLgorPT09PT0KKworUnVuIHRoZSBHaXQgZ2FyYmFnZSBjb2xsZWN0aW9uIGZvciBhbGwgcHJvamVjdHM6Cis9PT09PQorCSQgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgZ2MgLS1hbGwKKz09PT09CisKK0dFUlJJVAorLS0tLS0tCitQYXJ0IG9mIGxpbms6aW5kZXguaHRtbFtHZXJyaXQgQ29kZSBSZXZpZXddCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2NtZC1nc3FsLnR4dCBiL0RvY3VtZW50YXRpb24vY21kLWdzcWwudHh0CmluZGV4IDNjNGYxYjUuLmI1MzY3MGIgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vY21kLWdzcWwudHh0CisrKyBiL0RvY3VtZW50YXRpb24vY21kLWdzcWwudHh0CkBAIC00OSw3ICs0OSw3IEBACiAKIAlUeXBlICdcaCcgZm9yIGhlbHAuICBUeXBlICdccicgdG8gY2xlYXIgdGhlIGJ1ZmZlci4KIAotCWdlcnJpdD4gdXBkYXRlIGFjY291bnRzIHNldCBzc2hfdXNlcl9uYW1lID0gJ2FsaWNlJyB3aGVyZSBhY2NvdW50X2lkPTE7ICAgICAgIAorCWdlcnJpdD4gdXBkYXRlIGFjY291bnRzIHNldCBzc2hfdXNlcl9uYW1lID0gJ2FsaWNlJyB3aGVyZSBhY2NvdW50X2lkPTE7CiAJVVBEQVRFIDE7IDEgbXMKIAlnZXJyaXQ+IFxxCiAJQnllCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2NtZC1pbmRleC50eHQgYi9Eb2N1bWVudGF0aW9uL2NtZC1pbmRleC50eHQKaW5kZXggY2NkOWZmYy4uNzgwMjMxYyAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9jbWQtaW5kZXgudHh0CisrKyBiL0RvY3VtZW50YXRpb24vY21kLWluZGV4LnR4dApAQCAtODEsNiArODEsOSBAQAogbGluazpjbWQtc3RyZWFtLWV2ZW50cy5odG1sW2dlcnJpdCBzdHJlYW0tZXZlbnRzXTo6CiAJTW9uaXRvciBldmVudHMgb2NjdXJyaW5nIGluIHJlYWwgdGltZS4KIAorbGluazpjbWQtdmVyc2lvbi5odG1sW2dlcnJpdCB2ZXJzaW9uXTo6CisJU2hvdyB0aGUgY3VycmVudGx5IGV4ZWN1dGluZyB2ZXJzaW9uIG9mIEdlcnJpdC4KKwogZ2l0IHVwbG9hZC1wYWNrOjoKIAlTdGFuZGFyZCBHaXQgc2VydmVyIHNpZGUgY29tbWFuZCBmb3IgY2xpZW50IHNpZGUgYGdpdCBmZXRjaGAuCiAKQEAgLTExMSwxMiArMTE0LDE4IEBACiBsaW5rOmNtZC1mbHVzaC1jYWNoZXMuaHRtbFtnZXJyaXQgZmx1c2gtY2FjaGVzXTo6CiAJRmx1c2ggc29tZS9hbGwgc2VydmVyIGNhY2hlcyBmcm9tIG1lbW9yeS4KIAorbGluazpjbWQtZ2MuaHRtbFtnZXJyaXQgZ2NdOjoKKwlSdW4gdGhlIEdpdCBnYXJiYWdlIGNvbGxlY3Rpb24uCisKIGxpbms6Y21kLWdzcWwuaHRtbFtnZXJyaXQgZ3NxbF06OgogCUFkbWluaXN0cmF0aXZlIGludGVyZmFjZSB0byBhY3RpdmUgZGF0YWJhc2UuCiAKIGxpbms6Y21kLXNldC1wcm9qZWN0LXBhcmVudC5odG1sW2dlcnJpdCBzZXQtcHJvamVjdC1wYXJlbnRdOjoKIAlDaGFuZ2UgdGhlIHByb2plY3QgcGVybWlzc2lvbnMgYXJlIGluaGVyaXRlZCBmcm9tLgogCitsaW5rOmNtZC1scy11c2VyLXJlZnMuaHRtbFtnZXJyaXQgbHMtdXNlci1yZWZzXTo6CisJTGlzdHMgcmVmcyB2aXNpYmxlIGZvciBhIHNwZWNpZmllZCB1c2VyLgorCiBsaW5rOmNtZC1zaG93LWNhY2hlcy5odG1sW2dlcnJpdCBzaG93LWNhY2hlc106OgogCURpc3BsYXkgY3VycmVudCBjYWNoZSBzdGF0aXN0aWNzLgogCkBAIC0xNDcsOSArMTU2LDEyIEBACiBsaW5rOmNtZC1wbHVnaW4tcmVtb3ZlLmh0bWxbZ2Vycml0IHBsdWdpbiBybV06OgogICAgIEFsaWFzIGZvciAnZ2Vycml0IHBsdWdpbiByZW1vdmUnLgogCi1saW5rOmNtZC10ZXN0LXN1Ym1pdC1ydWxlLmh0bWxbZ2Vycml0IHRlc3Qtc3VibWl0LXJ1bGVdOjoKK2xpbms6Y21kLXRlc3Qtc3VibWl0LXJ1bGUuaHRtbFtnZXJyaXQgdGVzdC1zdWJtaXQgcnVsZV06OgogCVRlc3QgcHJvbG9nIHN1Ym1pdCBydWxlcy4KIAorbGluazpjbWQtdGVzdC1zdWJtaXQtdHlwZS5odG1sW2dlcnJpdCB0ZXN0LXN1Ym1pdCB0eXBlXTo6CisJVGVzdCBwcm9sb2cgc3VibWl0IHR5cGUuCisKIGxpbms6Y21kLWtpbGwuaHRtbFtraWxsXTo6CiAJS2lsbHMgYSBzY2hlZHVsZWQgb3IgcnVubmluZyB0YXNrLgogCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2NtZC1scy1ncm91cHMudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtbHMtZ3JvdXBzLnR4dAppbmRleCAzMDZiYjkyLi4xN2ViYmExIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NtZC1scy1ncm91cHMudHh0CisrKyBiL0RvY3VtZW50YXRpb24vY21kLWxzLWdyb3Vwcy50eHQKQEAgLTExLDggKzExLDEwIEBACiAnc3NoJyAtcCA8cG9ydD4gPGhvc3Q+ICdnZXJyaXQgbHMtZ3JvdXBzJwogICBbLS1wcm9qZWN0IDxOQU1FPiB8IC1wIDxOQU1FPl0KICAgWy0tdXNlciA8TkFNRT4gfCAtdSA8TkFNRT5dCisgIFstLW93bmVkXQogICBbLS12aXNpYmxlLXRvLWFsbF0KICAgWy0tdHlwZSB7aW50ZXJuYWwgfCBzeXN0ZW19XQorICBbLXEgPEdST1VQPl0KICAgWy0tdmVyYm9zZSB8IC12XQogCiBERVNDUklQVElPTgpAQCAtNjEsNiArNjMsMTEgQEAKICsKIFRoaXMgb3B0aW9uIGNhbid0IGJlIHVzZWQgdG9nZXRoZXIgd2l0aCB0aGUgJy0tcHJvamVjdCcgb3B0aW9uLgogCistLW93bmVkOjoKKwlMaXN0cyBvbmx5IHRoZSBncm91cHMgdGhhdCBhcmUgb3duZWQgYnkgdGhlIHVzZXIgdGhhdCB3YXMgc3BlY2lmaWVkCisJYnkgdGhlIGAtLXVzZXJgIG9wdGlvbiBvciBpZiBubyB1c2VyIHdhcyBzcGVjaWZpZWQgdGhlIGdyb3VwcyB0aGF0CisJYXJlIG93bmVkIGJ5IHRoZSBjYWxsaW5nIHVzZXIuCisKIC0tdmlzaWJsZS10by1hbGw6OgogCURpc3BsYXlzIG9ubHkgZ3JvdXBzIHRoYXQgYXJlIHZpc2libGUgdG8gYWxsIHJlZ2lzdGVyZWQgdXNlcnMKIAkoZ3JvdXBzIHRoYXQgYXJlIGV4cGxpY2l0bHkgbWFya2VkIGFzIHZpc2libGUgdG8gYWxsIHJlZ2lzdGVyZWQKQEAgLTc1LDEyICs4MiwxOSBAQAogYHN5c3RlbWA6OiBBbnkgc3lzdGVtIGRlZmluZWQgYW5kIG1hbmFnZWQgZ3JvdXAuCiAtLQogCistcTo6CisJR3JvdXAgdGhhdCBzaG91bGQgYmUgaW5zcGVjdGVkLiBUaGUgYC1xYCBvcHRpb24gY2FuIGJlIHNwZWNpZmllZAorCW11bHRpcGxlIHRpbWVzIHRvIGRlZmluZSBzZXZlcmFsIGdyb3VwcyB0byBiZSBpbnNwZWN0ZWQuIElmCisJc3BlY2lmaWVkIHRoZSBsaXN0ZWQgZ3JvdXBzIHdpbGwgb25seSBjb250YWluIGdyb3VwcyB0aGF0IHdlcmUKKwlzcGVjaWZpZWQgdG8gYmUgaW5zcGVjdGVkLiBUaGlzIGlzIGUuZy4gdXNlZnVsIGluIGNvbWJpbmF0aW9uIHdpdGgKKwl0aGUgYC0tb3duZWRgIGFuZCBgLS11c2VyYCBvcHRpb25zIHRvIGNoZWNrIHdoZXRoZXIgYSBncm91cCBpcworCW93bmVkIGJ5IGEgdXNlci4KKwogLS12ZXJib3NlOjoKIC12OjoKIAlFbmFibGUgdmVyYm9zZSBvdXRwdXQgd2l0aCB0YWItc2VwYXJhdGVkIGNvbHVtbnMgZm9yIHRoZQotCWdyb3VwIG5hbWUsIFVVSUQsIGRlc2NyaXB0aW9uLCB0eXBlIChgU1lTVEVNYCBvciBgSU5URVJOQUxgKSwKLQlvd25lciBncm91cCBuYW1lLCBvd25lciBncm91cCBVVUlEIGFuZCB3aGV0aGVyIHRoZSBncm91cCBpcwotCXZpc2libGUgdG8gYWxsIChgdHJ1ZWAgb3IgYGZhbHNlYCkuCisJZ3JvdXAgbmFtZSwgVVVJRCwgZGVzY3JpcHRpb24sIG93bmVyIGdyb3VwIG5hbWUsIG93bmVyIGdyb3VwIFVVSUQKKwlhbmQgd2hldGhlciB0aGUgZ3JvdXAgaXMgdmlzaWJsZSB0byBhbGwgKGB0cnVlYCBvciBgZmFsc2VgKS4KICsKIElmIGEgZ3JvdXAgaGFzIGJlZW4gIm9ycGhhbmVkIiwgaS5lLiBpdHMgb3duZXIgZ3JvdXAgVVVJRCByZWZlcnMgdG8gYQogbm9uZXhpc3RlbnQgZ3JvdXAsIHRoZSBvd25lciBncm91cCBuYW1lIGZpZWxkIHdpbGwgcmVhZCBgbi9hYC4KQEAgLTEwNyw2ICsxMjEsMjEgQEAKIAlSZWdpc3RlcmVkIFVzZXJzCiA9PT09PQogCitMaXN0IGFsbCBncm91cHMgd2hpY2ggYXJlIG93bmVkIGJ5IHRoZSBjYWxsaW5nIHVzZXI6Cis9PT09PQorCSQgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgbHMtZ3JvdXBzIC0tb3duZWQKKwlNeVByb2plY3RfQ29tbWl0dGVycworCU15UHJvamVjdF9WZXJpZmllcnMKKz09PT09CisKK0NoZWNrIGlmIHRoZSBjYWxsaW5nIHVzZXIgb3ducyB0aGUgZ3JvdXAgYE15UHJvamVjdF9Db21taXR0ZXJzYC4gSWYKK2BNeVByb2plY3RfQ29tbWl0dGVyc2AgaXMgcmV0dXJuZWQgdGhlIGNhbGxpbmcgdXNlciBvd25zIHRoaXMgZ3JvdXAuCitJZiB0aGUgcmVzdWx0IGlzIGVtcHR5LCB0aGUgY2FsbGluZyB1c2VyIGRvZXNuJ3Qgb3duIHRoZSBncm91cC4KKz09PT09CisJJCBzc2ggLXAgMjk0MTggcmV2aWV3LmV4YW1wbGUuY29tIGdlcnJpdCBscy1ncm91cHMgLS1vd25lZCAtcSBNeVByb2plY3RfQ29tbWl0dGVycworCU15UHJvamVjdF9Db21taXR0ZXJzCis9PT09PQorCiBFeHRyYWN0IHRoZSBVVUlEIG9mIHRoZSAnQWRtaW5pc3RyYXRvcnMnIGdyb3VwOgogCiA9PT09PQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jbWQtbHMtcHJvamVjdHMudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtbHMtcHJvamVjdHMudHh0CmluZGV4IGQ3ZDVhYTUuLjI2NTMwYmQgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vY21kLWxzLXByb2plY3RzLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2NtZC1scy1wcm9qZWN0cy50eHQKQEAgLTE2LDYgKzE2LDcgQEAKICAgWy0tZm9ybWF0IHt0ZXh0IHwganNvbiB8IGpzb25fY29tcGFjdH1dCiAgIFstLWFsbF0KICAgWy0tbGltaXQgPE4+XQorICBbLS1oYXMtYWNsLWZvciBHUk9VUF0KIAogREVTQ1JJUFRJT04KIC0tLS0tLS0tLS0tCkBAIC05MSw2ICs5MiwxMyBAQAogLS1saW1pdDo6CiAJQ2FwIHRoZSBudW1iZXIgb2YgcmVzdWx0cyB0byB0aGUgZmlyc3QgTiBtYXRjaGVzLgogCistLWhhcy1hY2wtZm9yOjoKKwlEaXNwbGF5IG9ubHkgcHJvamVjdHMgb24gd2hpY2ggYWNjZXNzIHJpZ2h0cyBmb3IgdGhpcyBncm91cCBhcmUKKwlkaXJlY3RseSBhc3NpZ25lZC4gUHJvamVjdHMgd2hpY2ggb25seSBpbmhlcml0IGFjY2VzcyByaWdodHMgZm9yCisJdGhpcyBncm91cCBhcmUgbm90IGxpc3RlZC4KKysKK1dpdGggdGhpcyBvcHRpb24geW91IGNhbiBmaW5kIG91dCBvbiB3aGljaCBwcm9qZWN0cyBhIGdyb3VwIGlzIHVzZWQuCisKIEhUVFAKIC0tLS0KIFRoaXMgY29tbWFuZCBpcyBhbHNvIGF2YWlsYWJsZSBvdmVyIEhUVFAsIGFzIGAvcHJvamVjdHMvYCBmb3IKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLWxzLXVzZXItcmVmcy50eHQgYi9Eb2N1bWVudGF0aW9uL2NtZC1scy11c2VyLXJlZnMudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjI1YTk5ZDEKLS0tIC9kZXYvbnVsbAorKysgYi9Eb2N1bWVudGF0aW9uL2NtZC1scy11c2VyLXJlZnMudHh0CkBAIC0wLDAgKzEsNTUgQEAKK2dlcnJpdCBscy11c2VyLXJlZnMKKz09PT09PT09PT09PT09PT09PT0KKworTkFNRQorLS0tLQorZ2Vycml0IGxzLXVzZXItcmVmcyAtIExpc3QgcmVmcyB2aXNpYmxlIHRvIGEgc3BlY2lmaWMgdXNlcgorCitTWU5PUFNJUworLS0tLS0tLS0KK1t2ZXJzZV0KKydzc2gnIC1wIDxwb3J0PiA8aG9zdD4gJ2dlcnJpdCBscy11c2VyLXJlZnMnCisgIFstLXByb2plY3QgUFJPSkVDVD4gfCAtcCA8UFJPSkVDVD5dCisgIFstLXVzZXIgPFVTRVI+IHwgLXUgPFVTRVI+XQorICBbLS1vbmx5LXJlZnMtaGVhZHNdCisKK0RFU0NSSVBUSU9OCistLS0tLS0tLS0tLQorRGlzcGxheXMgYWxsIHJlZnMgdGhhdCB0aGUgc3BlY2lmaWVkIHVzZXIgY2FuIHNlZS4KKworQWxsb3dzIGFuIGFkbWluaXN0cmF0b3IgdG8gcXVlcnkgd2hpY2ggcmVmcyBhcmUgdmlzaWJsZSBmb3IKK2EgdXNlci4gVGhlIGNvbW1hbmQgaXMgaGVscGZ1bCBmb3IgYWRtaW5zIHdoZW4gZGVidWdnaW5nIHdoeSBhCit1c2VyIGNhbm5vdCBhY2Nlc3MgY2VydGFpbiByZWZzIGFuZCBhbHNvIHRvIGhlbHAgYWRtaW5zCit2ZXJpZnkgdGhhdCBjZXJ0YWluIHNlY3JldCByZWZzIGFyZSBub3QgZXhwb3NlZCB0byB0aGUgd3JvbmcKK2dyb3Vwcy4KKworQUNDRVNTCistLS0tLS0KK0FkbWluaXN0cmF0b3JzCisKK09QVElPTlMKKy0tLS0tLS0KKy0tcHJvamVjdDo6CistcDo6CisJUmVxdWlyZWQ7IE5hbWUgb2YgdGhlIHByb2plY3QgZm9yIHdoaWNoIHRoZSByZWZzIHNob3VsZCBiZSBsaXN0ZWQuCisKKy0tdXNlcjo6CistdTo6CisJUmVxdWlyZWQ7IFVzZXIgZm9yIHdoaWNoIHRoZSB2aXNpYmxlIHJlZnMgc2hvdWxkIGJlIGxpc3RlZC4gR2Vycml0CisJd2lsbCBxdWVyeSB0aGUgZGF0YWJhc2UgdG8gZmluZCBtYXRjaGluZyB1c2Vycywgc28gdGhlCisJZnVsbCBpZGVudGl0eS9uYW1lIGRvZXMgbm90IG5lZWQgdG8gYmUgc3BlY2lmaWVkLgorCistLW9ubHktcmVmcy1oZWFkczo6CisJT25seSBsaXN0IHRoZSByZWZzIGZvdW5kIHVuZGVyIHJlZnMvaGVhZHMvKgorCitFWEFNUExFUworLS0tLS0tLS0KKworTGlzdCB2aXNpYmxlIHJlZnMgZm9yIHRoZSB1c2VyICJtci5kZXZlbG9wZXIiIGluIHByb2plY3QgImdlcnJpdCIKKz09PT09CisJJCBzc2ggLXAgMjk0MTggcmV2aWV3LmV4YW1wbGUuY29tIGdlcnJpdCBscy11c2VyLXJlZnMgLXAgZ2Vycml0IC11IG1yLmRldmVsb3BlcgorPT09PT0KKworR0VSUklUCistLS0tLS0KK1BhcnQgb2YgbGluazppbmRleC5odG1sW0dlcnJpdCBDb2RlIFJldmlld10KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXF1ZXJ5LnR4dCBiL0RvY3VtZW50YXRpb24vY21kLXF1ZXJ5LnR4dAppbmRleCAyZmVlYTExLi42NmJkODQ1IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NtZC1xdWVyeS50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtcXVlcnkudHh0CkBAIC0yOCw3ICsyOCw5IEBACiBRdWVyaWVzIHRoZSBjaGFuZ2UgZGF0YWJhc2UgYW5kIHJldHVybnMgcmVzdWx0cyBkZXNjcmliaW5nIGNoYW5nZXMKIHRoYXQgbWF0Y2ggdGhlIGlucHV0IHF1ZXJ5LiAgTW9yZSByZWNlbnRseSB1cGRhdGVkIGNoYW5nZXMgYXBwZWFyCiBiZWZvcmUgb2xkZXIgY2hhbmdlcywgd2hpY2ggaXMgdGhlIHNhbWUgb3JkZXIgcHJlc2VudGVkIGluIHRoZQotd2ViIGludGVyZmFjZS4KK3dlYiBpbnRlcmZhY2UuICBGb3IgZWFjaCBtYXRjaGluZyBjaGFuZ2UsIHRoZSByZXN1bHQgY29udGFpbnMgZGF0YQorZm9yIHRoZSBjaGFuZ2UncyBsYXRlc3QgcGF0Y2ggc2V0LCBldmVuIGlmIHRoZSBxdWVyeSBtYXRjaGVkIG9uIGFuCitvbGRlciBwYXRjaCBzZXQgKGZvciBleGFtcGxlIGFuIG9sZGVyIHBhdGNoIHNldCdzIHNoYTEgcmV2aXNpb24pLgogCiBBIHF1ZXJ5IG1heSBiZSBsaW1pdGVkIG9uIHRoZSBudW1iZXIgb2YgcmVzdWx0cyBpdCByZXR1cm5zIHdpdGggdGhlCiAnbGltaXQ6JyBvcGVyYXRvci4gIElmIG5vIGxpbWl0IGlzIHN1cHBsaWVkIGFuIGludGVybmFsIGRlZmF1bHQKQEAgLTM3LDE2ICszOSwyMSBAQAogdG8gcmVzdW1lIHRoZSBxdWVyeSBhdCB0aGUgY2hhbmdlIHRoYXQgZm9sbG93cyB0aGUgbGFzdCBjaGFuZ2Ugb2YKIHRoZSBwcmlvciByZXN1bHQgc2V0LgogCi1Ob24tb3B0aW9uIGFyZ3VtZW50cyB0byB0aGlzIGNvbW1hbmQgYXJlIGpvaW5lZCB3aXRoIHNwYWNlcyBhbmQgdGhlbgotcGFyc2VkIGFzIGEgcXVlcnkuICBUaGlzIHNpbXBsaWZpZXMgY2FsbGluZyBjb252ZW50aW9ucyBvdmVyIFNTSAotYnkgcGVybWl0dGluZyBvcGVyYXRvcnMgdG8gYXBwZWFyIGluIGRpZmZlcmVudCBhcmd1bWVudHMgd2l0aG91dAotbXVsdGlwbGUgbGV2ZWxzIG9mIHF1b3RpbmcgcmVxdWlyZWQuCitOb24tb3B0aW9uIGFyZ3VtZW50cyB0byB0aGlzIGNvbW1hbmQgYXJlIGpvaW5lZCB3aXRoIHNwYWNlcyBhbmQKK3RoZW4gcGFyc2VkIGFzIGEgcXVlcnkuIFRoaXMgc2ltcGxpZmllcyBjYWxsaW5nIGNvbnZlbnRpb25zIG92ZXIKK1NTSCBieSBwZXJtaXR0aW5nIG9wZXJhdG9ycyB0byBhcHBlYXIgaW4gZGlmZmVyZW50IGFyZ3VtZW50cy4KKworUXVlcnkgb3BlcmF0b3JzIG1heSBxdW90ZSB2YWx1ZXMgdXNpbmcgbWF0Y2hlZCBjdXJseSBicmFjZXMKKyhlLmcuIGByZXZpZXdlcmluOntEZXZlbG9wZXIgR3JvdXB9YCkgdG8gc2lkZXN0ZXAgaXNzdWVzIHdpdGggMgorbGV2ZWxzIG9mIHNoZWxsIHF1b3RpbmcgKGNhbGxlciBzaGVsbCBpbnZva2luZyBTU0gsIGFuZCB0aGUgU1NICitjb21tYW5kIGxpbmUgcGFyc2VyIGluIHRoZSBzZXJ2ZXIpLgogCiBPUFRJT05TCiAtLS0tLS0tCiAtLWZvcm1hdDo6Ci0JRm9ybWF0dGluZyBtZXRob2QgZm9yIHRoZSByZXN1bHRzLiBURVhUIGlzIHRoZSBkZWZhdWx0LAotCXByZXNlbnRpbmcgYSBodW1hbiByZWFkYWJsZSBkaXNwbGF5LiBKU09OIGNyZWF0ZXMgb25lIGxpbmUKKwlGb3JtYXR0aW5nIG1ldGhvZCBmb3IgdGhlIHJlc3VsdHMuIGBURVhUYCBpcyB0aGUgZGVmYXVsdCwKKwlwcmVzZW50aW5nIGEgaHVtYW4gcmVhZGFibGUgZGlzcGxheS4gYEpTT05gIHJldHVybnMKKwlsaW5rOmpzb24uaHRtbCNjaGFuZ2VbY2hhbmdlIGF0dHJpYnV0ZXNdLCBvbmUgbGluZQogCXBlciBtYXRjaGluZyByZWNvcmQsIHdpdGggZW1iZWRkZWQgTEZzIGVzY2FwZWQuCiAKIC0tY3VycmVudC1wYXRjaC1zZXQ6OgpAQCAtNjUsMTMgKzcyLDE0IEBACiAKIC0tZmlsZXM6OgogCVN1cHBvcnQgZm9yIGxpc3RpbmcgZmlsZXMgd2l0aCBwYXRjaCBzZXRzIGFuZCB0aGVpcgotCWF0dHJpYnV0ZXMgKEFEREVELCBNT0RJRklFRCwgREVMRVRFRCwgUkVOQU1FRCwgQ09QSUVEKS4KKwlhdHRyaWJ1dGVzIChBRERFRCwgTU9ESUZJRUQsIERFTEVURUQsIFJFTkFNRUQsIENPUElFRCkKKwlhbmQgc2l6ZSBpbmZvcm1hdGlvbiAobnVtYmVyIG9mIGluc2VydGlvbnMgYW5kIGRlbGV0aW9ucykuCiAJTm90ZSB0aGF0IHRoaXMgb3B0aW9uIHJlcXVpcmVzIGVpdGhlciB0aGUgLS1jdXJyZW50LXBhdGNoLXNldAogCW9yIHRoZSAtLXBhdGNoLXNldHMgb3B0aW9uIGluIG9yZGVyIHRvIGdpdmUgYW55IGZpbGUgaW5mb3JtYXRpb24uCiAKIC0tY29tbWVudHM6OgogCUluY2x1ZGUgY29tbWVudHMgZm9yIGFsbCBjaGFuZ2VzLiBJZiBjb21iaW5lZCB3aXRoIHRoZQotCS0tcGF0Y2gtc2V0cyBmbGFnIHRoZW4gYWxsIGluLWxpbmUgY29tbWVudHMgYXJlIGluY2x1ZGVkIGZvcgorCS0tcGF0Y2gtc2V0cyBmbGFnIHRoZW4gYWxsIGlubGluZS9maWxlIGNvbW1lbnRzIGFyZSBpbmNsdWRlZCBmb3IKIAllYWNoIHBhdGNoIHNldC4KIAogLS1jb21taXQtbWVzc2FnZTo6CmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2NtZC1yZWNlaXZlLXBhY2sudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtcmVjZWl2ZS1wYWNrLnR4dAppbmRleCA2OGY2ODZkLi45MmJiNjVlIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NtZC1yZWNlaXZlLXBhY2sudHh0CisrKyBiL0RvY3VtZW50YXRpb24vY21kLXJlY2VpdmUtcGFjay50eHQKQEAgLTMyLDI4ICszMiwxMiBAQAogCiAtLXJldmlld2VyIDxhZGRyZXNzPjo6CiAtLXJlIDxhZGRyZXNzPjo6Ci0JQXV0b21hdGljYWxseSBhZGQgPGFkZHJlc3M+IGFzIGEgcmV2aWV3ZXIgdG8gYW55IGNoYW5nZQotCWNyZWF0ZWQgb3IgdXBkYXRlZCBieSB0aGUgcHVzaGVkIGNvbW1pdCBvYmplY3RzLiAgVGhlc2UKLQljaGFuZ2VzIHdpbGwgYXBwZWFyIGluIHRoZSByZXZpZXdlcidzIGRhc2hib2FyZCwgYW5kIHdpbGwKLQlhbHNvIGJlIGVtYWlsZWQgdG8gdGhlIHJldmlld2VyLgotKwotTWF5IGJlIHNwZWNpZmllZCBtb3JlIHRoYW4gb25jZSB0byByZXF1ZXN0IG11bHRpcGxlIHJldmlld2Vycy4KLSsKLVRoaXMgaXMgYSBHZXJyaXQgQ29kZSBSZXZpZXcgc3BlY2lmaWMgZXh0ZW5zaW9uLgorCUF1dG9tYXRpY2FsbHkgYWRkIDxhZGRyZXNzPiBhcyBhIHJldmlld2VyIHRvIGFueSBjaGFuZ2UuCisJRGVwcmVjYXRlZCwgdXNlIGByZWZzL2Zvci9icmFuY2glcj1hZGRyZXNzYCBpbnN0ZWFkLgogCiAtLWNjIDxhZGRyZXNzPjo6Ci0JQ2FyYm9uLWNvcHkgPGFkZHJlc3M+IG9uIHRoZSBjcmVhdGVkIG9yIHVwZGF0ZWQgY2hhbmdlcywKLQlidXQgZG9uJ3QgcmVxdWVzdCB0aGVtIHRvIHBlcmZvcm0gYSByZXZpZXcuICBMaWtlIHdpdGgKLQktLXJldmlld2VyIHRoZSBjaGFuZ2VzIHdpbGwgYXBwZWFyIGluIHRoZSBDQydkIHVzZXIncwotCWRhc2hib2FyZCwgYW5kIHdpbGwgYmUgZW1haWxlZCB0byB0aGVtLgotKwotTWF5IGJlIHNwZWNpZmllZCBtb3JlIHRoYW4gb25jZSB0byBzcGVjaWZ5IG11bHRpcGxlIENDcy4KLSsKLVRoaXMgaXMgYSBHZXJyaXQgQ29kZSBSZXZpZXcgc3BlY2lmaWMgZXh0ZW5zaW9uLgotCi1BYm92ZSA8YWRkcmVzcz4gbWF5IGJlIHRoZSBjb21wbGV0ZSBlbWFpbCBhZGRyZXNzLCBvciwgaWYgR2Vycml0IGlzCi1jb25maWd1cmVkIHdpdGggSFRUUCBhdXRoZW50aWNhdGlvbiAoZS5nLiB3aXRoaW4gYSBzaW5nbGUgZG9tYWluKSwKLWp1c3QgdGhlIGxvY2FsIHBhcnQgKHR5cGljYWxseSB1c2VybmFtZSkuCisJQ2FyYm9uLWNvcHkgPGFkZHJlc3M+IG9uIHRoZSBjcmVhdGVkIG9yIHVwZGF0ZWQgY2hhbmdlcy4KKwlEZXByZWNhdGVkLCB1c2UgYHJlZnMvZm9yL2JyYW5jaCVjYz1hZGRyZXNzYCBpbnN0ZWFkLgogCiBBQ0NFU1MKIC0tLS0tLQpAQCAtNjQsMzIgKzQ4LDMwIEBACiAKIFNlbmQgYSByZXZpZXcgZm9yIGEgY2hhbmdlIG9uIHRoZSBtYXN0ZXIgYnJhbmNoIHRvIGNoYXJsaWVAZXhhbXBsZS5jb206CiA9PT09PQotCWdpdCBwdXNoIC0tcmVjZWl2ZS1wYWNrPSdnaXQgcmVjZWl2ZS1wYWNrIC0tcmV2aWV3ZXIgY2hhcmxpZUBleGFtcGxlLmNvbScgc3NoOi8vcmV2aWV3LmV4YW1wbGUuY29tOjI5NDE4L3Byb2plY3QgSEVBRDpyZWZzL2Zvci9tYXN0ZXIKKwlnaXQgcHVzaCBzc2g6Ly9yZXZpZXcuZXhhbXBsZS5jb206Mjk0MTgvcHJvamVjdCBIRUFEOnJlZnMvZm9yL21hc3RlciVyPWNoYXJsaWVAZXhhbXBsZS5jb20KID09PT09CiAKIFNlbmQgcmV2aWV3cywgYnV0IHRhZ2dpbmcgdGhlbSB3aXRoIHRoZSB0b3BpYyBuYW1lICdidWc0Mic6CiA9PT09PQotCWdpdCBwdXNoIC0tcmVjZWl2ZS1wYWNrPSdnaXQgcmVjZWl2ZS1wYWNrIC0tcmV2aWV3ZXIgY2hhcmxpZUBleGFtcGxlLmNvbScgc3NoOi8vcmV2aWV3LmV4YW1wbGUuY29tOjI5NDE4L3Byb2plY3QgSEVBRDpyZWZzL2Zvci9tYXN0ZXIvYnVnNDIKKwlnaXQgcHVzaCBzc2g6Ly9yZXZpZXcuZXhhbXBsZS5jb206Mjk0MTgvcHJvamVjdCBIRUFEOnJlZnMvZm9yL21hc3RlciVyPWNoYXJsaWVAZXhhbXBsZS5jb20sdG9waWM9YnVnNDIKID09PT09CiAKIEFsc28gQ0MgdHdvIG90aGVyIHBhcnRpZXM6CiA9PT09PQotCWdpdCBwdXNoIC0tcmVjZWl2ZS1wYWNrPSdnaXQgcmVjZWl2ZS1wYWNrIC0tcmV2aWV3ZXIgY2hhcmxpZUBleGFtcGxlLmNvbSAtLWNjIGFsaWNlQGV4YW1wbGUuY29tIC0tY2MgYm9iQGV4YW1wbGUuY29tJyBzc2g6Ly9yZXZpZXcuZXhhbXBsZS5jb206Mjk0MTgvcHJvamVjdCBIRUFEOnJlZnMvZm9yL21hc3RlcgorCWdpdCBwdXNoIHNzaDovL3Jldmlldy5leGFtcGxlLmNvbToyOTQxOC9wcm9qZWN0IEhFQUQ6cmVmcy9mb3IvbWFzdGVyJXI9Y2hhcmxpZUBleGFtcGxlLmNvbSxjYz1hbGljZUBleGFtcGxlLmNvbSxjYz1ib2JAZXhhbXBsZS5jb20KID09PT09CiAKIENvbmZpZ3VyZSBhIHB1c2ggbWFjcm8gdG8gcGVyZm9ybSB0aGUgbGFzdCBhY3Rpb246CiA9PT09CiAJZ2l0IGNvbmZpZyByZW1vdGUuY2hhcmxpZS51cmwgc3NoOi8vcmV2aWV3LmV4YW1wbGUuY29tOjI5NDE4L3Byb2plY3QKLQlnaXQgY29uZmlnIHJlbW90ZS5jaGFybGllLnB1c2ggSEVBRDpyZWZzL2Zvci9tYXN0ZXIKLQlnaXQgY29uZmlnIHJlbW90ZS5jaGFybGllLnJlY2VpdmVwYWNrICdnaXQgcmVjZWl2ZS1wYWNrIC0tcmV2aWV3ZXIgY2hhcmxpZUBleGFtcGxlLmNvbSAtLWNjIGFsaWNlQGV4YW1wbGUuY29tIC0tY2MgYm9iQGV4YW1wbGUuY29tJworCWdpdCBjb25maWcgcmVtb3RlLmNoYXJsaWUucHVzaCBIRUFEOnJlZnMvZm9yL21hc3RlciVyPWNoYXJsaWVAZXhhbXBsZS5jb20sY2M9YWxpY2VAZXhhbXBsZS5jb20sY2M9Ym9iQGV4YW1wbGUuY29tCiA9PT09CiAKIGFmdGVyd2FyZHMgYC5naXQvY29uZmlnYCBjb250YWlucyB0aGUgZm9sbG93aW5nOgogLS0tLQogW3JlbW90ZSAiY2hhcmxpZSJdCiAgIHVybCA9IHNzaDovL3Jldmlldy5leGFtcGxlLmNvbToyOTQxOC9wcm9qZWN0Ci0gIHB1c2ggPSBIRUFEOnJlZnMvZm9yL21hc3RlcgotICByZWNlaXZlcGFjayA9IGdpdCByZWNlaXZlLXBhY2sgLS1yZXZpZXdlciBjaGFybGllQGV4YW1wbGUuY29tIC0tY2MgYWxpY2VAZXhhbXBsZS5jb20gLS1jYyBib2JAZXhhbXBsZS5jb20KKyAgcHVzaCA9IEhFQUQ6cmVmcy9mb3IvbWFzdGVyJXI9Y2hhcmxpZUBleGFtcGxlLmNvbSxjYz1hbGljZUBleGFtcGxlLmNvbSxjYz1ib2JAZXhhbXBsZS5jb20KIC0tLS0KIAogYW5kIG5vdyBzZW5kaW5nIGEgbmV3IGNoYW5nZSBmb3IgcmV2aWV3IHRvIGNoYXJsaWUsIENDJ2luZyBib3RoCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2NtZC1yZXZpZXcudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtcmV2aWV3LnR4dAppbmRleCA1MTNiYzZlLi42NWMyMWRiIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NtZC1yZXZpZXcudHh0CisrKyBiL0RvY3VtZW50YXRpb24vY21kLXJldmlldy50eHQKQEAgLTE3LDYgKzE3LDcgQEAKICAgWy0tcHVibGlzaF0KICAgWy0tZGVsZXRlXQogICBbLS12ZXJpZmllZCA8Tj5dIFstLWNvZGUtcmV2aWV3IDxOPl0KKyAgWy0tbGFiZWwgTGFiZWwtTmFtZT08Tj5dCiAgIHtDT01NSVQgfCBDSEFOR0VJRCxQQVRDSFNFVH0uLi4KIAogREVTQ1JJUFRJT04KQEAgLTk0LDEwICs5NSwxNCBAQAogCiAtLWNvZGUtcmV2aWV3OjoKIC0tdmVyaWZpZWQ6OgotCVNldCB0aGUgYXBwcm92YWwgY2F0ZWdvcnkgdG8gdGhlIHZhbHVlICdOJy4gIFRoZSBleGFjdAotCW9wdGlvbiBuYW1lcyBzdXBwb3J0ZWQgYW5kIHRoZSByYW5nZSBvZiB2YWx1ZXMgcGVybWl0dGVkCi0JZGlmZmVycyBwZXIgc2l0ZSwgY2hlY2sgdGhlIG91dHB1dCBvZiAtLWhlbHAsIG9yIGNvbnRhY3QKLQl5b3VyIHNpdGUgYWRtaW5pc3RyYXRvciBmb3IgZnVydGhlciBkZXRhaWxzLgorICAgICAgICBTZXQgdGhlIGxhYmVsIHRvIHRoZSB2YWx1ZSAnTicuICBUaGUgZXhhY3Qgb3B0aW9uIG5hbWVzCisgICAgICAgIHN1cHBvcnRlZCBhbmQgdGhlIHJhbmdlIG9mIHZhbHVlcyBwZXJtaXR0ZWQgZGlmZmVycyBwZXIgc2l0ZSwKKyAgICAgICAgY2hlY2sgdGhlIG91dHB1dCBvZiAtLWhlbHAsIG9yIGNvbnRhY3QgeW91ciBzaXRlIGFkbWluaXN0cmF0b3IKKyAgICAgICAgZm9yIGZ1cnRoZXIgZGV0YWlscy4gIFRoZXNlIG9wdGlvbnMgYXJlIG9ubHkgYXZhaWxhYmxlIGZvciB0aGVzZQorICAgICAgICBidWlsdC1pbiBsYWJlbHM7IGZvciBvdGhlciBsYWJlbHMsIHNlZSAtLWxhYmVsLgorCistLWxhYmVsOjoKKyAgICAgICAgU2V0IGEgbGFiZWwgYnkgbmFtZSB0byB0aGUgdmFsdWUgJ04nLgogCiBBQ0NFU1MKIC0tLS0tLQpAQCAtMTIyLDcgKzEyNyw3IEBACiAJJCBzc2ggLXAgMjk0MTggcmV2aWV3LmV4YW1wbGUuY29tIGdlcnJpdCByZXZpZXcgLW0gJyJCdWlsZCBTdWNjZXNzZnVsIicgYzBmZjMzCiA9PT09PQogCi1NYXJrIHRoZSB1bm1lcmdlZCBjb21taXRzIGJvdGggIlZlcmlmaWVkICsxIiBhbmQgIkNvZGUgUmV2aWV3ICsyIiBhbmQKK01hcmsgdGhlIHVubWVyZ2VkIGNvbW1pdHMgYm90aCAiVmVyaWZpZWQgKzEiIGFuZCAiQ29kZS1SZXZpZXcgKzIiIGFuZAogc3VibWl0IHRoZW0gZm9yIG1lcmdpbmc6CiA9PT09CiAgICQgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgcmV2aWV3IFwKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXNldC1wcm9qZWN0LnR4dCBiL0RvY3VtZW50YXRpb24vY21kLXNldC1wcm9qZWN0LnR4dAppbmRleCAwNTlmMDYzLi5hMGFmOTEwIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NtZC1zZXQtcHJvamVjdC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtc2V0LXByb2plY3QudHh0CkBAIC0xMSwxMSArMTEsMTEgQEAKICdzc2gnIC1wIDxwb3J0PiA8aG9zdD4gJ2dlcnJpdCBzZXQtcHJvamVjdCcKICAgWy0tZGVzY3JpcHRpb24gPERFU0M+IHwgLWQgPERFU0M+XQogICBbLS1zdWJtaXQtdHlwZSA8VFlQRT4gfCAtdCA8VFlQRT5dCi0gIFstLXVzZXxuby1jb250cmlidXRvci1hZ3JlZW1lbnRzIHwgLS1jYXxuY2FdCi0gIFstLXVzZXxuby1zaWduZWQtb2ZmLWJ5IHwgLS1zb3xuc29dCi0gIFstLXVzZXxuby1jb250ZW50LW1lcmdlXQotICBbLS1yZXF1aXJlfG5vLWNoYW5nZS1pZCB8IC0taWR8bmlkXQotICBbLS1wcm9qZWN0LXN0YXRlIHwgLS1wc10KKyAgWy0tY29udHJpYnV0b3ItYWdyZWVtZW50cyA8dHJ1ZXxmYWxzZXxpbmhlcml0Pl0KKyAgWy0tc2lnbmVkLW9mZi1ieSA8dHJ1ZXxmYWxzZXxpbmhlcml0Pl0KKyAgWy0tY29udGVudC1tZXJnZSA8dHJ1ZXxmYWxzZXxpbmhlcml0Pl0KKyAgWy0tY2hhbmdlLWlkIDx0cnVlfGZhbHNlfGluaGVyaXQ+XQorICBbLS1wcm9qZWN0LXN0YXRlIDxTVEFURT4gfCAtLXBzIDxTVEFURT5dCiAgIDxOQU1FPgogCiBERVNDUklQVElPTgpAQCAtNjMsMjYgKzYzLDIzIEBACiBGb3IgbW9yZSBkZXRhaWxzIHNlZQogbGluazpwcm9qZWN0LXNldHVwLmh0bWwjc3VibWl0X3R5cGVbQ2hhbmdlIFN1Ym1pdCBBY3Rpb25zXS4KIAotLS11c2V8bm8tY29udGVudC1tZXJnZTo6CistLWNvbnRlbnQtbWVyZ2U6OgogICAgIElmIGVuYWJsZWQsIEdlcnJpdCB3aWxsIHRyeSB0byBwZXJmb3JtIGEgMy13YXkgbWVyZ2Ugb2YgdGV4dAogICAgIGZpbGUgY29udGVudCB3aGVuIGEgZmlsZSBoYXMgYmVlbiBtb2RpZmllZCBieSBib3RoIHRoZQogICAgIGRlc3RpbmF0aW9uIGJyYW5jaCBhbmQgdGhlIGNoYW5nZSBiZWluZyBzdWJtaXR0ZWQuICBUaGlzCiAgICAgb3B0aW9uIG9ubHkgdGFrZXMgZWZmZWN0IGlmIHN1Ym1pdCB0eXBlIGlzIG5vdAogICAgIEZBU1RfRk9SV0FSRF9PTkxZLgogCi0tLXVzZXxuby1jb250cmlidXRvci1hZ3JlZW1lbnRzOjoKLS0tY2F8bmNhOjoKKy0tY29udHJpYnV0b3ItYWdyZWVtZW50czo6CiAgICAgSWYgZW5hYmxlZCwgYXV0aG9ycyBtdXN0IGNvbXBsZXRlIGEgY29udHJpYnV0b3IgYWdyZWVtZW50CiAgICAgb24gdGhlIHNpdGUgYmVmb3JlIHB1c2hpbmcgYW55IGNvbW1pdHMgb3IgY2hhbmdlcyB0byB0aGlzCiAgICAgcHJvamVjdC4KIAotLS11c2V8bm8tc2lnbmVkLW9mZi1ieTo6Ci0tLXNvfG5zbzoKKy0tc2lnbmVkLW9mZi1ieTo6CiAgICAgSWYgZW5hYmxlZCwgZWFjaCBjaGFuZ2UgbXVzdCBjb250YWluIGEgU2lnbmVkLW9mZi1ieSBsaW5lCiAgICAgZnJvbSBlaXRoZXIgdGhlIGF1dGhvciBvciB0aGUgdXBsb2FkZXIgaW4gdGhlIGNvbW1pdCBtZXNzYWdlLgogCi0tLXJlcXVpcmV8bm8tY2hhbmdlLWlkOjoKLS0taWR8bmlkOjoKKy0tY2hhbmdlLWlkOjoKICAgICBSZXF1aXJlIGEgdmFsaWQgbGluazp1c2VyLWNoYW5nZWlkLmh0bWxbQ2hhbmdlLUlkXSBmb290ZXIKICAgICBpbiBhbnkgY29tbWl0IHVwbG9hZGVkIGZvciByZXZpZXcuIFRoaXMgZG9lcyBub3QgYXBwbHkgdG8KICAgICBjb21taXRzIHB1c2hlZCBkaXJlY3RseSB0byBhIGJyYW5jaCBvciB0YWcuCkBAIC0xMDMsNyArMTAwLDcgQEAKIAogPT09PQogICAgICQgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgc2V0LXByb2plY3QgZXhhbXBsZSAtLXN1Ym1pdC10eXBlIE1FUkdFX0lGX05FQ0VTU0FSWVwKLSAgICAtLXJlcXVpcmUtY2hhbmdlLWlkIC0tbm8tY29udGVudC1tZXJnZSAtLXByb2plY3Qtc3RhdGUgSElEREVOCisgICAgLS1jaGFuZ2UtaWQgdHJ1ZSAtLWNvbnRlbnQtbWVyZ2UgZmFsc2UgLS1wcm9qZWN0LXN0YXRlIEhJRERFTgogPT09PQogCiBHRVJSSVQKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXN0cmVhbS1ldmVudHMudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtc3RyZWFtLWV2ZW50cy50eHQKaW5kZXggYThjZjNiMC4uY2UyM2RhNiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9jbWQtc3RyZWFtLWV2ZW50cy50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtc3RyZWFtLWV2ZW50cy50eHQKQEAgLTQ0LDcgKzQ0LDggQEAKICpwYXRjaFNldCosICphY2NvdW50KiBpbnZvbHZlZCwgYW5kIG90aGVyIGF0dHJpYnV0ZXMgYXMgYXBwcm9wcmlhdGUuCiBUaGUgY3VycmVudGx5IHN1cHBvcnRlZCBtZXNzYWdlIHR5cGVzIGFyZSAqcGF0Y2hzZXQtY3JlYXRlZCosCiAqZHJhZnQtcHVibGlzaGVkKiwgKmNoYW5nZS1hYmFuZG9uZWQqLCAqY2hhbmdlLXJlc3RvcmVkKiwKLSpjaGFuZ2UtbWVyZ2VkKiwgKmNvbW1lbnQtYWRkZWQqIGFuZCAqcmVmLXVwZGF0ZWQqLgorKmNoYW5nZS1tZXJnZWQqLCAqbWVyZ2UtZmFpbGVkKiwgKmNvbW1lbnQtYWRkZWQqLCAqcmVmLXVwZGF0ZWQqIGFuZAorKnJldmlld2VyLWFkZGVkKi4KIAogTm90ZSB0aGF0IGFueSBmaWVsZCBtYXkgYmUgbWlzc2luZyBpbiB0aGUgSlNPTiBtZXNzYWdlcywgc28gY29uc3VtZXJzIG9mCiB0aGlzIEpTT04gc3RyZWFtIHNob3VsZCBkZWFsIHdpdGggdGhhdCBhcHByb3ByaWF0ZWx5LgpAQCAtMTA1LDYgKzEwNiwxOCBAQAogCiBzdWJtaXR0ZXI6OiBsaW5rOmpzb24uaHRtbCNhY2NvdW50W2FjY291bnQgYXR0cmlidXRlXQogCitNZXJnZSBGYWlsZWQKK15eXl5eXl5eXl5eXgordHlwZTo6ICJtZXJnZS1mYWlsZWQiCisKK2NoYW5nZTo6IGxpbms6anNvbi5odG1sI2NoYW5nZVtjaGFuZ2UgYXR0cmlidXRlXQorCitwYXRjaFNldDo6IGxpbms6anNvbi5odG1sI3BhdGNoU2V0W3BhdGNoU2V0IGF0dHJpYnV0ZV0KKworc3VibWl0dGVyOjogbGluazpqc29uLmh0bWwjYWNjb3VudFthY2NvdW50IGF0dHJpYnV0ZV0KKworcmVhc29uOjogUmVhc29uIHRoYXQgdGhlIG1lcmdlIGZhaWxlZC4KKwogQ29tbWVudCBBZGRlZAogXl5eXl5eXl5eXl5eXgogdHlwZTo6ICJjb21tZW50LWFkZGVkIgpAQCAtMTI3LDYgKzE0MCwxNiBAQAogCiByZWZVcGRhdGU6OiBsaW5rOmpzb24uaHRtbCNyZWZVcGRhdGVbcmVmVXBkYXRlIGF0dHJpYnV0ZV0KIAorUmV2aWV3ZXIgQWRkZWQKK15eXl5eXl5eXl5eXl5eCit0eXBlOjogInJldmlld2VyLWFkZGVkIgorCitjaGFuZ2U6OiBsaW5rOmpzb24uaHRtbCNjaGFuZ2VbY2hhbmdlIGF0dHJpYnV0ZV0KKworcGF0Y2hzZXQ6OiBsaW5rOmpzb24uaHRtbCNwYXRjaFNldFtwYXRjaHNldCBhdHRyaWJ1dGVdCisKK3Jldmlld2VyOjogbGluazpqc29uLmh0bWwjYWNjb3VudFthY2NvdW50IGF0dHJpYnV0ZV0KKwogCiBTRUUgQUxTTwogLS0tLS0tLS0KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXRlc3Qtc3VibWl0LXJ1bGUudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtdGVzdC1zdWJtaXQtcnVsZS50eHQKaW5kZXggNWI3MGJkMS4uYWU2OGI4MCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9jbWQtdGVzdC1zdWJtaXQtcnVsZS50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jbWQtdGVzdC1zdWJtaXQtcnVsZS50eHQKQEAgLTEsMTcgKzEsMTYgQEAKLWdlcnJpdCB0ZXN0LXN1Ym1pdC1ydWxlCitnZXJyaXQgdGVzdC1zdWJtaXQgcnVsZQogPT09PT09PT09PT09PT09PT09PT09PT0KIAogTkFNRQogLS0tLQotZ2Vycml0IHRlc3Qtc3VibWl0LXJ1bGUgLSBUZXN0IHByb2xvZyBzdWJtaXQgcnVsZXMgd2l0aCBhIGNob3NlbiBjaGFuZ2VzZXQuCitnZXJyaXQgdGVzdC1zdWJtaXQgcnVsZSAtIFRlc3QgcHJvbG9nIHN1Ym1pdCBydWxlcyB3aXRoIGEgY2hvc2VuIGNoYW5nZXNldC4KIAogU1lOT1BTSVMKIC0tLS0tLS0tCiBbdmVyc2VdCi0nc3NoJyAtcCA8cG9ydD4gPGhvc3Q+ICdnZXJyaXQgdGVzdC1zdWJtaXQtcnVsZScKKydzc2gnIC1wIDxwb3J0PiA8aG9zdD4gJ2dlcnJpdCB0ZXN0LXN1Ym1pdCBydWxlJwogICBbLXNdCiAgIFstLW5vLWZpbHRlcnNdCi0gIFstLWZvcm1hdCB7VEVYVCB8IEpTT059XQogICBDSEFOR0UKIAogREVTQ1JJUFRJT04KQEAgLTI2LDE1ICsyNSw2IEBACiAtLW5vLWZpbHRlcnM6OgogCURvbid0IHJ1biB0aGUgc3VibWl0X2ZpbHRlci8yIGZyb20gdGhlIHBhcmVudCBwcm9qZWN0cyBvZiB0aGUgc3BlY2lmaWVkIGNoYW5nZS4KIAotLS1mb3JtYXQ6OgotICBXaGF0IG91dHB1dCBmb3JtYXQgdG8gZGlzcGxheSB0aGUgcmVzdWx0cyBpbi4KLSsKLS0tCi1gdGV4dGA6OiBTaW1wbGUgdGV4dCBiYXNlZCBmb3JtYXQuCi1ganNvbmA6OiBBIEpTT04gb2JqZWN0IGRlc2NyaWJlZCBpbiBsaW5rOmpzb24uaHRtbCNzdWJtaXRSZWNvcmRbc3VibWl0IHJlY29yZF0uCi1ganNvbl9jb21wYWN0YDo6IE1pbmltaXplZCBKU09OIG91dHB1dC4KLS0tCi0KIEFDQ0VTUwogLS0tLS0tCiBDYW4gYmUgdXNlZCBieSBhbnlvbmUgdGhhdCBoYXMgcGVybWlzc2lvbiB0byByZWFkIHRoZSBzcGVjaWZpZWQgY2hhbmdlc2V0LgpAQCAtNDIsNDYgKzMyLDMxIEBACiBFWEFNUExFUwogLS0tLS0tLS0KIAotCi1UZXN0IHN1Ym1pdF9ydWxlIGZyb20gc3RkaW4uCi09PT09Ci0gJCBjYXQgbm9uLWF1dGhvci1jb2RlcmV2aWV3LnBsIHwgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgdGVzdC1zdWJtaXQtcnVsZSAtcyBJNzhmMmM2NjczZGIyNGU0ZTkyZWQzMmY2MDRjOTYwZGM5NTI0MzdkOQotIE5vbi1BdXRob3ItQ29kZS1SZXZpZXc6IE5PVF9SRUFEWQotIFZlcmlmaWVkOiBOT1RfUkVBRFkKLSBDb2RlLVJldmlldzogTk9UX1JFQURZIGJ5IEFub255bW91cyBDb3dhcmQgPHRlc3RAZW1haWwuY29tPgotCi0gTk9UX1JFQURZCi09PT09Ci0KIFRlc3Qgc3VibWl0X3J1bGUgZnJvbSBzdGRpbiBhbmQgcmV0dXJuIHRoZSByZXN1bHRzIGFzIEpTT04uCiA9PT09Ci0gY2F0IG5vbi1hdXRob3ItY29kZXJldmlldy5wbCB8IHNzaCAtcCAyOTQxOCByZXZpZXcuZXhhbXBsZS5jb20gZ2Vycml0IHRlc3Qtc3VibWl0LXJ1bGUgLS1mb3JtYXQ9SlNPTiAtcyBJNzhmMmM2NjczZGIyNGU0ZTkyZWQzMmY2MDRjOTYwZGM5NTI0MzdkOQotIHsKLSAgImFwcHJvdmFscyI6IFsKLSAgICB7Ci0gICAgICAidHlwZSI6ICJWZXJpZmllZCIsCi0gICAgICAidmFsdWUiOiAiTkVFRCIKLSAgICB9LAotICAgIHsKLSAgICAgICJ0eXBlIjogIkNvZGUtUmV2aWV3IiwKLSAgICAgICJ2YWx1ZSI6ICJPSyIsCi0gICAgICAiYnkiOiB7Ci0gICAgICAgICJlbWFpbCI6ICJ0ZXN0QGVtYWlsLmNvbSIsCi0gICAgICAgICJ1c2VybmFtZSI6ICJ0ZXN0IgotICAgICAgfQotICAgIH0KLSAgXSwKLSAgInZhbHVlIjogIk5PVF9SRUFEWSIKLSB9CisgY2F0IHJ1bGVzLnBsIHwgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgdGVzdC1zdWJtaXQgcnVsZSAtcyBJNzhmMmM2NjczZGIyNGU0ZTkyZWQzMmY2MDRjOTYwZGM5NTI0MzdkOQorIFsKKyAgIHsKKyAgICAgInN0YXR1cyI6ICJOT1RfUkVBRFkiLAorICAgICAicmVqZWN0IjogeworICAgICAgICJBbnktTGFiZWwtTmFtZSI6IHt9CisgICAgIH0KKyAgIH0KKyBdCiA9PT09CiAKIFRlc3QgdGhlIGFjdGl2ZSBzdWJtaXRfcnVsZSBmcm9tIHRoZSByZWZzL21ldGEvY29uZmlnIGJyYW5jaCwgaWdub3JpbmcgZmlsdGVycyBpbiB0aGUgcHJvamVjdCBwYXJlbnRzLgogPT09PQotICQgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgdGVzdC1zdWJtaXQtcnVsZSBJNzhmMmM2NjczZGIyNGU0ZTkyZWQzMmY2MDRjOTYwZGM5NTI0MzdkOSAtLW5vLWZpbHRlcnMKLSBWZXJpZmllZDogTk9UX1JFQURZCi0gQ29kZS1SZXZpZXc6IE5PVF9SRUFEWSBieSBBbm9ueW1vdXMgQ293YXJkIDx0ZXN0QGVtYWlsLmNvbT4KLQotIE5PVF9SRUFEWQorICQgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgdGVzdC1zdWJtaXQgcnVsZSBJNzhmMmM2NjczZGIyNGU0ZTkyZWQzMmY2MDRjOTYwZGM5NTI0MzdkOSAtLW5vLWZpbHRlcnMKKyBbCisgICB7CisgICAgICJzdGF0dXMiOiAiTk9UX1JFQURZIiwKKyAgICAgIm5lZWQiOiB7CisgICAgICAgIkNvZGUtUmV2aWV3Ijoge30KKyAgICAgICAiVmVyaWZpZWQiOiB7fQorICAgICB9CisgICB9CisgXQogPT09PQogCiBTQ1JJUFRJTkcKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXRlc3Qtc3VibWl0LXR5cGUudHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtdGVzdC1zdWJtaXQtdHlwZS50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjZkNWZiYQotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vY21kLXRlc3Qtc3VibWl0LXR5cGUudHh0CkBAIC0wLDAgKzEsNTMgQEAKK2dlcnJpdCB0ZXN0LXN1Ym1pdCB0eXBlCis9PT09PT09PT09PT09PT09PT09PT09PQorCitOQU1FCistLS0tCitnZXJyaXQgdGVzdC1zdWJtaXQgdHlwZSAtIFRlc3QgcHJvbG9nIHN1Ym1pdCB0eXBlIHdpdGggYSBjaG9zZW4gY2hhbmdlLgorCitTWU5PUFNJUworLS0tLS0tLS0KK1t2ZXJzZV0KKydzc2gnIC1wIDxwb3J0PiA8aG9zdD4gJ2dlcnJpdCB0ZXN0LXN1Ym1pdCB0eXBlJworICBbLXNdCisgIFstLW5vLWZpbHRlcnNdCisgIENIQU5HRQorCitERVNDUklQVElPTgorLS0tLS0tLS0tLS0KK1Byb3ZpZGVzIGEgd2F5IHRvIHRlc3QgcHJvbG9nIHN1Ym1pdCB0eXBlLgorCitPUFRJT05TCistLS0tLS0tCistczo6CisJUmVhZHMgYSBydWxlcy5wbCBmaWxlIGZyb20gc3RkaW4gaW5zdGVhZCBvZiBydWxlcy5wbCBpbiByZWZzL21ldGEvY29uZmlnLgorCistLW5vLWZpbHRlcnM6OgorCURvbid0IHJ1biB0aGUgc3VibWl0X3R5cGVfZmlsdGVyLzIgZnJvbSB0aGUgcGFyZW50IHByb2plY3RzIG9mIHRoZSBzcGVjaWZpZWQgY2hhbmdlLgorCitBQ0NFU1MKKy0tLS0tLQorQ2FuIGJlIHVzZWQgYnkgYW55b25lIHRoYXQgaGFzIHBlcm1pc3Npb24gdG8gcmVhZCB0aGUgc3BlY2lmaWVkIGNoYW5nZS4KKworRVhBTVBMRVMKKy0tLS0tLS0tCisKK1Rlc3Qgc3VibWl0X3R5cGUgZnJvbSBzdGRpbiBhbmQgcmV0dXJuIHRoZSBzdWJtaXQgdHlwZS4KKz09PT0KKyBjYXQgcnVsZXMucGwgfCBzc2ggLXAgMjk0MTggcmV2aWV3LmV4YW1wbGUuY29tIGdlcnJpdCB0ZXN0LXN1Ym1pdCB0eXBlIC1zIEk3OGYyYzY2NzNkYjI0ZTRlOTJlZDMyZjYwNGM5NjBkYzk1MjQzN2Q5CisgIk1FUkdFX0lGX05FQ0VTU0FSWSIKKz09PT0KKworVGVzdCB0aGUgYWN0aXZlIHN1Ym1pdF90eXBlIGZyb20gdGhlIHJlZnMvbWV0YS9jb25maWcgYnJhbmNoLCBpZ25vcmluZyBmaWx0ZXJzIGluIHRoZSBwcm9qZWN0IHBhcmVudHMuCis9PT09CisgJCBzc2ggLXAgMjk0MTggcmV2aWV3LmV4YW1wbGUuY29tIGdlcnJpdCB0ZXN0LXN1Ym1pdCB0eXBlIEk3OGYyYzY2NzNkYjI0ZTRlOTJlZDMyZjYwNGM5NjBkYzk1MjQzN2Q5IC0tbm8tZmlsdGVycworICJNRVJHRV9JRl9ORUNFU1NBUlkiCis9PT09CisKK1NDUklQVElORworLS0tLS0tLS0tCitDYW4gYmUgdXNlZCBlaXRoZXIgaW50ZXJhY3RpdmVseSBmb3IgdGVzdGluZyBuZXcgcHJvbG9nIHN1Ym1pdCB0eXBlLCBvciBmcm9tIGEgc2NyaXB0IHRvIGNoZWNrIHRoZSBzdWJtaXQgdHlwZSBvZiBhIGNoYW5nZS4KKworR0VSUklUCistLS0tLS0KK1BhcnQgb2YgbGluazppbmRleC5odG1sW0dlcnJpdCBDb2RlIFJldmlld10KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY21kLXZlcnNpb24udHh0IGIvRG9jdW1lbnRhdGlvbi9jbWQtdmVyc2lvbi50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDFmOTRlYQotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vY21kLXZlcnNpb24udHh0CkBAIC0wLDAgKzEsNDggQEAKK2dlcnJpdCB2ZXJzaW9uCis9PT09PT09PT09PT09PT09CisKK05BTUUKKy0tLS0KK2dlcnJpdCB2ZXJzaW9uIC0gU2hvdyB0aGUgdmVyc2lvbiBvZiB0aGUgY3VycmVudGx5IGV4ZWN1dGluZyBHZXJyaXQgc2VydmVyCisKK1NZTk9QU0lTCistLS0tLS0tLQorW3ZlcnNlXQorJ3NzaCcgLXAgPHBvcnQ+IDxob3N0PiAnZ2Vycml0IHZlcnNpb24nCisKK0RFU0NSSVBUSU9OCistLS0tLS0tLS0tLQorRGlzcGxheXMgYSBvbmUtbGluZSByZXNwb25zZSB3aXRoIHRoZSBzdHJpbmcgYGdlcnJpdCB2ZXJzaW9uYCBmb2xsb3dlZAorYnkgdGhlIGN1cnJlbnRseSBleGVjdXRpbmcgdmVyc2lvbiBvZiBHZXJyaXQuCisKK1RoZSBgZ2l0IGRlc2NyaWJlYCBjb21tYW5kIGlzIHVzZWQgdG8gZ2VuZXJhdGUgdGhlIHZlcnNpb24gc3RyaW5nIGJhc2VkCitvbiB0aGUgR2l0IGNvbW1pdCB1c2VkIHRvIGJ1aWxkIEdlcnJpdC4gRm9yIG9mZmljaWFsIHJlbGVhc2VzIG9mIEdlcnJpdCwKK3RoZSB2ZXJzaW9uIHN0cmluZyB3aWxsIGJlIGVxdWFsIHRvIHRoZSBHaXQgdGFnIHNldCBpbiB0aGUgR2Vycml0IHNvdXJjZQorY29kZSwgd2hpY2ggaW4gdHVybiBpcyBlcXVhbCB0byB0aGUgbmFtZSBvZiB0aGUgcmVsZWFzZSAoZm9yIGV4YW1wbGUKKzIuNC4yKS4gV2hlbiBidWlsZGluZyBHZXJyaXQgZnJvbSBhbm90aGVyIGNvbW1pdCAob25lIHRoYXQgZG9lc24ndCBoYXZlCithbiBvZmZpY2lhbC1sb29raW5nIHRhZyBwb2ludGluZyB0byBpdCksIHRoZSB2ZXJzaW9uIHN0cmluZyBoYXMgdGhlIGZvcm0KK2A8dGFnbmFtZT4tPG4+LWc8c2hhMT5gLCB3aGVyZSBgPG4+YCBpcyBhbiBpbnRlZ2VyIGluZGljYXRpbmcgdGhlIG51bWJlcgorb2YgY29tbWl0cyBhaGVhZCBvZiB0aGUgYDx0YWduYW1lPmAgdGFnIHRoZSBjb21taXQgaXMsIGFuZCBgPHNoYTE+YCBpcwordGhlIHNldmVuLWNoYXJhY3RlciBhYmJyZXZpYXRlZCBTSEEtMSBvZiB0aGUgY29tbWl0LiBTZWUgdGhlIGBnaXQKK2Rlc2NyaWJlYCBkb2N1bWVudGF0aW9uIGZvciBkZXRhaWxzIG9uIGhvdyBgPHRhZ25hbWU+YCBpcyBjaG9zZW4gYW5kIGhvdworYDxuPmAgaXMgY29tcHV0ZWQuCisKK0FDQ0VTUworLS0tLS0tCitBbnkgdXNlciB3aG8gaGFzIGNvbmZpZ3VyZWQgYW4gU1NIIGtleS4KKworU0NSSVBUSU5HCistLS0tLS0tLS0KK1RoaXMgY29tbWFuZCBpcyBpbnRlbmRlZCB0byBiZSB1c2VkIGluIHNjcmlwdHMuCisKK0VYQU1QTEVTCistLS0tLS0tLQorCis9PT09PQorCSQgc3NoIC1wIDI5NDE4IHJldmlldy5leGFtcGxlLmNvbSBnZXJyaXQgdmVyc2lvbgorCWdlcnJpdCB2ZXJzaW9uIDIuNC4yCis9PT09PQorCitHRVJSSVQKKy0tLS0tLQorUGFydCBvZiBsaW5rOmluZGV4Lmh0bWxbR2Vycml0IENvZGUgUmV2aWV3XQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jb25maWctY2xhLnR4dCBiL0RvY3VtZW50YXRpb24vY29uZmlnLWNsYS50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjQwNGQ0ZQotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vY29uZmlnLWNsYS50eHQKQEAgLTAsMCArMSw4MiBAQAorR2Vycml0IENvZGUgUmV2aWV3IC0gQ29udHJpYnV0b3IgQWdyZWVtZW50cworPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitVc2VycyBjYW4gYmUgcmVxdWlyZWQgdG8gc2lnbiBvbmUgb3IgbW9yZSBjb250cmlidXRvciBhZ3JlZW1lbnRzIGJlZm9yZQorYmVpbmcgYWJsZSB0byBzdWJtaXQgYSBjaGFuZ2UgaW4gYSBwcm9qZWN0LgorCitDb250cmlidXRvciBhZ3JlZW1lbnRzIGFyZSBnbG9iYWwgYW5kIGNhbiBiZSBjb25maWd1cmVkIGJ5IG1vZGlmeWluZwordGhlIGBwcm9qZWN0LmNvbmZpZ2AgZmlsZSBvbiB0aGUgYEFsbC1Qcm9qZWN0c2AgcHJvamVjdC4gUHVzaCBwZXJtaXNzaW9uCituZWVkcyB0byBiZSBncmFudGVkIGZvciB0aGUgYHJlZnMvbWV0YS9jb25maWdgIGJyYW5jaCB0byBiZSBhYmxlIHRvIHB1c2gKK2JhY2sgdGhlIGBwcm9qZWN0LmNvbmZpZ2AgZmlsZS4gQ29uc3VsdAorbGluazphY2Nlc3MtY29udHJvbC5odG1sW2FjY2VzcyBjb250cm9sc10gZm9yIGRldGFpbHMgb24gaG93IGFjY2VzcworcGVybWlzc2lvbnMgd29yay4KKworVG8gcmV0cmlldmUgdGhlIGBwcm9qZWN0LmNvbmZpZ2AgZmlsZSwgaW5pdGlhbGl6ZSBhIHRlbXBvcmFyeSBHaXQKK3JlcG9zaXRvcnkgdG8gZWRpdCB0aGUgY29uZmlndXJhdGlvbjoKKz09PT0KKyAgbWtkaXIgY2ZnX2RpcgorICBjZCBjZmdfZGlyCisgIGdpdCBpbml0Cis9PT09CisKK0Rvd25sb2FkIHRoZSBleGlzdGluZyBjb25maWd1cmF0aW9uIGZyb20gR2Vycml0OgorPT09PQorICBnaXQgZmV0Y2ggc3NoOi8vbG9jYWxob3N0OjI5NDE4L0FsbC1Qcm9qZWN0cyByZWZzL21ldGEvY29uZmlnCisgIGdpdCBjaGVja291dCBGRVRDSF9IRUFECis9PT09CisKK0NvbnRyaWJ1dG9yIGFncmVlbWVudHMgYXJlIGRlZmluZWQgYXMgY29udHJpYnV0b3ItYWdyZWVtZW50IHNlY3Rpb25zIGluCitgcHJvamVjdC5jb25maWdgOgorPT09PQorICBbY29udHJpYnV0b3ItYWdyZWVtZW50ICJJbmRpdmlkdWFsIl0KKyAgICBkZXNjcmlwdGlvbiA9IElmIHlvdSBhcmUgZ29pbmcgdG8gYmUgY29udHJpYnV0aW5nIGNvZGUgb24geW91ciBvd24sIHRoaXMgaXMgdGhlIG9uZSB5b3Ugd2FudC4gWW91IGNhbiBzaWduIHRoaXMgb25lIG9ubGluZS4KKyAgICByZXF1aXJlQ29udGFjdEluZm9ybWF0aW9uID0gdHJ1ZQorICAgIGFncmVlbWVudFVybCA9IHN0YXRpYy9jbGFfaW5kaXZpZHVhbC5odG1sCisgICAgYXV0b1ZlcmlmeSA9IGdyb3VwIENMQSBBY2NlcHRlZCAtIEluZGl2aWR1YWwKKyAgICBhY2NlcHRlZCA9IGdyb3VwIENMQSBBY2NlcHRlZCAtIEluZGl2aWR1YWwKKz09PT0KKworRWFjaCBgY29udHJpYnV0b3ItYWdyZWVtZW50YCBzZWN0aW9uIHdpdGhpbiB0aGUgYHByb2plY3QuY29uZmlnYCBmaWxlIG11c3QKK2hhdmUgYSB1bmlxdWUgbmFtZS4gVGhlIHNlY3Rpb24gbmFtZSB3aWxsIGFwcGVhciBpbiB0aGUgd2ViIFVJLgorCitJZiBub3QgYWxyZWFkeSBwcmVzZW50LCBhZGQgdGhlIFVVSUQgb2YgdGhlIGdyb3VwcyB1c2VkIGluIHRoZQorYGF1dG9WZXJpZnlgIGFuZCBgYWNjZXB0ZWRgIHZhcmlhYmxlcyBpbiB0aGUgZ3JvdXBzIGZpbGUuCisKK0NvbW1pdCB0aGUgY29uZmlndXJhdGlvbiBjaGFuZ2UsIGFuZCBwdXNoIGl0IGJhY2s6Cis9PT09CisgIGdpdCBjb21taXQgLWEgLW0gIkFkZCBJbmRpdmlkdWFsIGNvbnRyaWJ1dG9yIGFncmVlbWVudCIKKyAgZ2l0IHB1c2ggc3NoOi8vbG9jYWxob3N0OjI5NDE4L0FsbC1Qcm9qZWN0cyBIRUFEOnJlZnMvbWV0YS9jb25maWcKKz09PT0KKworW1tjb250cmlidXRvci1hZ3JlZW1lbnQubmFtZS5kZXNjcmlwdGlvbl1dY29udHJpYnV0b3ItYWdyZWVtZW50LjxuYW1lPi5kZXNjcmlwdGlvbjo6CisrCitTaG9ydCB0ZXh0IGRlc2NyaWJpbmcgdGhlIGNvbnRyaWJ1dG9yIGFncmVlbWVudC4gVGhpcyB0ZXh0IHdpbGwgYXBwZWFyCit3aGVuIHRoZSB1c2VyIHNlbGVjdHMgYW4gYWdyZWVtZW50LgorCitbW2NvbnRyaWJ1dG9yLWFncmVlbWVudC5uYW1lLnJlcXVpcmVDb250YWN0SW5mb3JtYXRpb25dXWNvbnRyaWJ1dG9yLWFncmVlbWVudC48bmFtZT4ucmVxdWlyZUNvbnRhY3RJbmZvcm1hdGlvbjo6CisrCitUcnVlIGlmIHRoZSB1c2VyIG11c3QgcHJvdmlkZSBjb250YWN0IGluZm9ybWF0aW9uIHdoZW4gc2lnbmluZyBhCitjb250cmlidXRvciBhZ3JlZW1lbnQuIERlZmF1bHQgaXMgZmFsc2UuCisKK1tbY29udHJpYnV0b3ItYWdyZWVtZW50Lm5hbWUuYWdyZWVtZW50VXJsXV1jb250cmlidXRvci1hZ3JlZW1lbnQuPG5hbWU+LmFncmVlbWVudFVybDo6CisrCitBbiBhYnNvbHV0ZSBVUkwgb3IgYSByZWxhdGl2ZSBwYXRoIHRvIGFuIEhUTUwgZmlsZSBjb250YWluaW5nIHRoZSB0ZXh0CitvZiB0aGUgY29udHJpYnV0b3IgYWdyZWVtZW50LiBUaGUgVVJMIG11c3QgdXNlIHRoZSBodHRwIG9yIGh0dHBzCitzY2hlbWUuIFRoZSBwYXRoIGlzIHJlbGF0aXZlIHRvIHRoZSBgZ2Vycml0LmJhc2VQYXRoYCB2YXJpYWJsZSBpbgorYGdlcnJpdC5jb25maWdgLgorCitbW2NvbnRyaWJ1dG9yLWFncmVlbWVudC5uYW1lLmF1dG9WZXJpZnldXWNvbnRyaWJ1dG9yLWFncmVlbWVudC48bmFtZT4uYXV0b1ZlcmlmeTo6CisrCitJZiBwcmVzZW50LCB0aGUgdXNlciBjYW4gc2lnbiB0aGUgY29udHJpYnV0b3IgYWdyZWVtZW50IG9ubGluZS4gVGhlCit2YWx1ZSBpcyB0aGUgZ3JvdXAgdG8gd2hpY2ggdGhlIHVzZXIgd2lsbCBiZSBhZGRlZCBhZnRlciBzaWduaW5nIHRoZQorYWdyZWVtZW50LiBUaGUgZ3JvdXAncyBVVUlEIG11c3QgYWxzbyBhcHBlYXIgaW4gdGhlIGBncm91cHNgIGZpbGUuCisKK1tbY29udHJpYnV0b3ItYWdyZWVtZW50Lm5hbWUuYWNjZXB0ZWRdXWNvbnRyaWJ1dG9yLWFncmVlbWVudC48bmFtZT4uYWNjZXB0ZWQ6OgorKworTGlzdCBvZiBncm91cHMgdGhhdCB3aWxsIGJlIGNvbnNpZGVyZWQgd2hlbiB2ZXJpZnlpbmcgdGhhdCBhCitjb250cmlidXRvciBhZ3JlZW1lbnQgaGFzIGJlZW4gYWNjZXB0ZWQuIFRoZSBncm91cHMnIFVVSUQgbXVzdCBhbHNvCithcHBlYXIgaW4gdGhlIGBncm91cHNgIGZpbGUuCisKK0dFUlJJVAorLS0tLS0tCitQYXJ0IG9mIGxpbms6aW5kZXguaHRtbFtHZXJyaXQgQ29kZSBSZXZpZXddCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2NvbmZpZy1nZXJyaXQudHh0IGIvRG9jdW1lbnRhdGlvbi9jb25maWctZ2Vycml0LnR4dAppbmRleCBkZTJhYTAyLi42MjI4YTk0IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NvbmZpZy1nZXJyaXQudHh0CisrKyBiL0RvY3VtZW50YXRpb24vY29uZmlnLWdlcnJpdC50eHQKQEAgLTE5LDkgKzE5LDYgQEAKIAogW2NhY2hlXQogICBkaXJlY3RvcnkgPSAvdmFyL2NhY2hlL2dlcnJpdDIKLQotW2NhY2hlICJkaWZmIl0KLSAgZGlza2J1ZmZlciA9IDEwIG0KIC0tLS0KIAogW1thY2NvdW50c11dU2VjdGlvbiBhY2NvdW50cwpAQCAtMTMzLDcgKzEzMCw4IEBACiBUaGUgYWN0dWFsIHVzZXJuYW1lIHVzZWQgaW4gdGhlIExEQVAgc2ltcGxlIGJpbmQgcmVxdWVzdCBpcyB0aGUKIGFjY291bnQncyBmdWxsIEROLCB3aGljaCBpcyBkaXNjb3ZlcmVkIGJ5IGZpcnN0IHF1ZXJ5aW5nIHRoZQogZGlyZWN0b3J5IHVzaW5nIGVpdGhlciBhbiBhbm9ueW1vdXMgcmVxdWVzdCwgb3IgdGhlIGNvbmZpZ3VyZWQKLTw8bGRhcC51c2VybmFtZT4+IGlkZW50aXR5LgorPDxsZGFwLnVzZXJuYW1lLGxkYXAudXNlcm5hbWU+PiBpZGVudGl0eS4gR2Vycml0IGNhbiBhbHNvIHVzZSBrZXJiZXJvcyBpZgorPDxsZGFwLmF1dGhlbnRpY2F0aW9uLGxkYXAuYXV0aGVudGljYXRpb24+PiBpcyBzZXQgdG8gYEdTU0FQSWAuCiAKICogYExEQVBfQklORGAKICsKQEAgLTE0NCw3ICsxNDIsNyBAQAogKwogVW5saWtlIExEQVAgYWJvdmUsIHRoZSB1c2VybmFtZSB1c2VkIHRvIHBlcmZvcm0gdGhlIExEQVAgc2ltcGxlIGJpbmQKIHJlcXVlc3QgaXMgdGhlIGV4YWN0IHN0cmluZyBzdXBwbGllZCBieSBpbiB0aGUgZGlhbG9nIGJ5IHRoZSB1c2VyLgotVGhlIGNvbmZpZ3VyZWQgPDxsZGFwLnVzZXJuYW1lPj4gaWRlbnRpdHkgaXMgbm90IHVzZWQgdG8gb2J0YWluCitUaGUgY29uZmlndXJlZCA8PGxkYXAudXNlcm5hbWUsbGRhcC51c2VybmFtZT4+IGlkZW50aXR5IGlzIG5vdCB1c2VkIHRvIG9idGFpbgogYWNjb3VudCBpbmZvcm1hdGlvbi4KICsKICogYERFVkVMT1BNRU5UX0JFQ09NRV9BTllfQUNDT1VOVGAKQEAgLTE5NSw2ICsxOTMsMTYgQEAKIEJ5IGRlZmF1bHQsIHRoZSBsaXN0IGNvbnRhaW5zIHR3byB2YWx1ZXMsIGBodHRwOi8vYCBhbmQgYGh0dHBzOi8vYCwKIGFsbG93aW5nIEdlcnJpdCB0byB0cnVzdCBhbnkgT3BlbklEIGl0IHJlY2VpdmVzLgogCitbW2F1dGgub3BlbklkRG9tYWluXV1hdXRoLm9wZW5JZERvbWFpbjo6CisrCitMaXN0IG9mIGFsbG93ZWQgT3BlbklEIGVtYWlsIGFkZHJlc3MgZG9tYWlucy4gT25seSB1c2VkIGlmCitgYXV0aC50eXBlYCBpcyBzZXQgdG8gIk9QRU5JRCIgb3IgIk9QRU5JRF9TU08iLgorKworRG9tYWluIGlzIGNhc2UgaW5zZW5zaXRpdmUgYW5kIG11c3QgYmUgaW4gdGhlIHNhbWUgZm9ybSBhcyBpdAorYXBwZWFycyBpbiB0aGUgZW1haWwgYWRkcmVzcywgZm9yIGV4YW1wbGUsICJleGFtcGxlLmNvbSIuCisrCitCeSBkZWZhdWx0LCBhbnkgZG9tYWluIGlzIGFjY2VwdGVkLgorCiBbW2F1dGgubWF4T3BlbklkU2Vzc2lvbkFnZV1dYXV0aC5tYXhPcGVuSWRTZXNzaW9uQWdlOjoKICsKIFRpbWUgaW4gc2Vjb25kcyBiZWZvcmUgYW4gT3BlbklEIHByb3ZpZGVyIG11c3QgZm9yY2UgdGhlIHVzZXIKQEAgLTI2Myw2ICsyNzEsMjQgQEAKICsKIElmIG5vdCBzZXQsIG5vICJSZWdpc3RlciIgbGluayBpcyBkaXNwbGF5ZWQuCiAKK1tbYXV0aC5yZWdpc3RlclRleHRdXWF1dGgucmVnaXN0ZXJUZXh0OjoKKysKK1RleHQgZm9yIHRoZSAiUmVnaXN0ZXIiIGxpbmsgaW4gdGhlIHVwcGVyIHJpZ2h0IGNvcm5lci4gIFVzZWQgb25seQord2hlbiBhdXRoLnR5cGUgaXMgYExEQVBgLgorKworSWYgbm90IHNldCwgZGVmYXVsdHMgdG8gIlJlZ2lzdGVyIi4KKworW1thdXRoLmVkaXRGdWxsTmFtZVVybF1dYXV0aC5lZGl0RnVsbE5hbWVVcmw6OgorKworVGFyZ2V0IGZvciB0aGUgIkVkaXQiIGJ1dHRvbiB3aGVuIHRoZSB1c2VyIGlzIGFsbG93ZWQgdG8gZWRpdCB0aGVpcgorZnVsbCBuYW1lLgorCitbW2F1dGguaHR0cFBhc3N3b3JkVXJsXV1hdXRoLmh0dHBQYXNzd29yZFVybDo6CisrCitUYXJnZXQgZm9yIHRoZSAiT2J0YWluIFBhc3N3b3JkIiBsaW5rLiAgVXNlZCBvbmx5IHdoZW4gYXV0aC50eXBlIGlzCitgTERBUGAsIGBMREFQX0JJTkRgIG9yIGBDVVNUT01fRVhURU5TSU9OYC4KKysKKwogW1thdXRoLmNvb2tpZVBhdGhdXWF1dGguY29va2llUGF0aDo6CiArCiBTZXRzICJwYXRoIiBhdHRyaWJ1dGUgb2YgdGhlIGF1dGhlbnRpY2F0aW9uIGNvb2tpZS4KQEAgLTI5Nyw4ICszMjMsOSBAQAogZW5hYmxlZCBmb3IgdGhlIEdlcnJpdCBzaXRlLiAgSWYgZW5hYmxlZCBhIHVzZXIgbXVzdCBjb21wbGV0ZSBhCiBjb250cmlidXRvciBhZ3JlZW1lbnQgYmVmb3JlIHRoZXkgY2FuIHVwbG9hZCBjaGFuZ2VzLgogKwotSWYgZW5hYmxlZCwgdGhlIGFkbWluIG11c3QgYWxzbyBpbnNlcnQgb25lIG9yIG1vcmUgcm93cyBpbnRvCi1gY29udHJpYnV0b3JfYWdyZWVtZW50c2AgYW5kIGNyZWF0ZSBhZ3JlZW1lbnQgZmlsZXMgdW5kZXIKK0lmIGVuYWJsZWQsIHRoZSBhZG1pbiBtdXN0IGFsc28gYWRkIG9uZSBvciBtb3JlCitsaW5rOmNvbmZpZy1jbGEuaHRtbFtjb250cmlidXRvci1hZ3JlZW1lbnQgc2VjdGlvbnNdCitpbiBwcm9qZWN0LmNvbmZpZyBhbmQgY3JlYXRlIGFncmVlbWVudCBmaWxlcyB1bmRlcgogYCckc2l0ZV9wYXRoJy9zdGF0aWNgLCBzbyB1c2VycyBjYW4gYWN0dWFsbHkgY29tcGxldGUgb25lIG9yCiBtb3JlIGFncmVlbWVudHMuCiArCkBAIC0zOTIsNyArNDE5LDcgQEAKICogeSwgeWVhciwgeWVhcnMgKGAxIHllYXJgIGlzIHRyZWF0ZWQgYXMgYDM2NSBkYXlzYCkKIAogKwotSWYgYSB1bml0IHN1ZmZpeCBpcyBub3Qgc3BlY2lmaWVkLCBgbWludXRlc2AgaXMgYXNzdW1lZC4gIElmIDAgaXMKK0lmIGEgdW5pdCBzdWZmaXggaXMgbm90IHNwZWNpZmllZCwgYHNlY29uZHNgIGlzIGFzc3VtZWQuICBJZiAwIGlzCiBzdXBwbGllZCwgdGhlIG1heGltdW0gYWdlIGlzIGluZmluaXRlIGFuZCBpdGVtcyBhcmUgbmV2ZXIgcHVyZ2VkCiBleGNlcHQgd2hlbiB0aGUgY2FjaGUgaXMgZnVsbC4KICsKQEAgLTQ3NSw2ICs1MDIsMTkgQEAKIHJlcXVpcmVzIHR3byBIVFRQIHJlcXVlc3RzLCBhbmQgdGhpcyBjYWNoZSB0cmllcyB0byBjYXJyeSBzdGF0ZSBmcm9tCiB0aGUgZmlyc3QgcmVxdWVzdCBpbnRvIHRoZSBzZWNvbmQgdG8gZW5zdXJlIGl0IGNhbiBjb21wbGV0ZS4KIAorY2FjaGUgYCJjaGFuZ2VzImA6OgorKworVGhlIHNpemUgb2YgYG1lbW9yeUxpbWl0YCBkZXRlcm1pbmVzIHRoZSBudW1iZXIgb2YgcHJvamVjdHMgZm9yIHdoaWNoCithbGwgY2hhbmdlcyB3aWxsIGJlIGNhY2hlZC4gSWYgdGhlIGNhY2hlIGlzIHNldCB0byAxMDI0LCB0aGlzIG1lYW5zIGFsbAorY2hhbmdlcyBmb3IgdXAgdG8gMTAyNCBwcm9qZWN0cyBjYW4gYmUgaGVsZCBpbiB0aGUgY2FjaGUuCisrCitEZWZhdWx0IHZhbHVlIGlzIDAgKGRpc2FibGVkKS4gSXQgaXMgZGlzYWJsZWQgYnkgZGVmYXVsdCBkdWUgdG8gdGhlIGZhY3QKK3RoYXQgY2hhbmdlIHVwZGF0ZXMgYXJlIG5vdCBjb21tdW5pY2F0ZWQgYmV0d2VlbiBHZXJyaXQgc2VydmVycy4gSGVuY2UKK3RoaXMgY2FjaGUgc2hvdWxkIGJlIGRpc2FibGVkIGluIGFuIG11bHRpLW1hc3Rlci9tdWx0aS1zbGF2ZSBzZXR1cC4KKysKK1RoZSBjYWNoZSBzaG91bGQgYmUgZmx1c2hlZCB3aGVuZXZlciB0aGUgZGF0YWJhc2UgY2hhbmdlcyB0YWJsZSBpcyBtb2RpZmllZAorb3V0c2lkZSBvZiBnZXJyaXQuCisKIGNhY2hlIGAiZGlmZiJgOjoKICsKIEVhY2ggaXRlbSBjYWNoZXMgdGhlIGRpZmZlcmVuY2VzIGJldHdlZW4gdHdvIGNvbW1pdHMsIGF0IGJvdGggdGhlCkBAIC02MDgsOCArNjQ4LDExIEBACiBNYXhpbXVtIG51bWJlciBvZiBtaWxsaXNlY29uZHMgdG8gd2FpdCBmb3IgaW50cmFsaW5lIGRpZmZlcmVuY2UgZGF0YQogYmVmb3JlIGdpdmluZyB1cCBhbmQgZGlzYWJsaW5nIGl0IGZvciBhIHBhcnRpY3VsYXIgZmlsZSBwYWlyLiAgVGhpcyBpcwogYSB3b3JrIGFyb3VuZCBmb3IgYW4gaW5maW5pdGUgbG9vcCBidWcgaW4gdGhlIGludHJhbGluZSBkaWZmZXJlbmNlCi1pbXBsZW1lbnRhdGlvbi4gIElmIGNvbXB1dGF0aW9uIHRha2VzIGxvbmdlciB0aGFuIHRoZSB0aW1lb3V0IHRoZQotd29ya2VyIHRocmVhZCBpcyB0ZXJtaW5hdGVkIGFuZCBubyBpbnRyYWxpbmUgZGlmZmVyZW5jZSBpcyBkaXNwbGF5ZWQuCitpbXBsZW1lbnRhdGlvbi4KKysKK0lmIGNvbXB1dGF0aW9uIHRha2VzIGxvbmdlciB0aGFuIHRoZSB0aW1lb3V0LCB0aGUgd29ya2VyIHRocmVhZCBpcwordGVybWluYXRlZCwgYW4gZXJyb3IgbWVzc2FnZSBpcyBzaG93biwgYW5kIG5vIGludHJhbGluZSBkaWZmZXJlbmNlIGlzCitkaXNwbGF5ZWQgZm9yIHRoZSBmaWxlIHBhaXIuCiArCiBWYWx1ZXMgc2hvdWxkIHVzZSBjb21tb24gdW5pdCBzdWZmaXhlcyB0byBleHByZXNzIHRoZWlyIHNldHRpbmc6CiArCkBAIC02NDQsNiArNjg3LDcgQEAKICgnbXMnLCAnc2VjJywgJ21pbicsIGV0Yy4pLgogKwogSWYgc2V0IHRvIDAsIGNoZWNrcyBvY2N1ciBldmVyeSB0aW1lLCB3aGljaCBtYXkgc2xvdyBkb3duIG9wZXJhdGlvbnMuCitJZiBzZXQgdG8gJ2Rpc2FibGVkJyBvciAnb2ZmJywgbm8gY2hlY2sgd2lsbCBldmVyIGJlIGRvbmUuCiBBZG1pbmlzdHJhdG9ycyBtYXkgZm9yY2UgdGhlIGNhY2hlIHRvIGZsdXNoIHdpdGgKIGxpbms6Y21kLWZsdXNoLWNhY2hlcy5odG1sW2dlcnJpdCBmbHVzaC1jYWNoZXNdLgogKwpAQCAtNjUyLDIzICs2OTYsMzEgQEAKIFtbY2hhbmdlTWVyZ2VdXVNlY3Rpb24gY2hhbmdlTWVyZ2UKIH5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIAorY2hhbmdlTWVyZ2UuY2hlY2tGcmVxdWVuY3k6OgorKworSG93IG9mdGVuIHRoZSBkYXRhYmFzZSBzaG91bGQgYmUgcmVzY2FubmVkIGZvciBjaGFuZ2VzIHRoYXQgaGF2ZSBiZWVuCitzdWJtaXR0ZWQgYnV0IG5vdCBtZXJnZWQgZHVlIHRvIHRyYW5zaWVudCBlcnJvcnMuIFZhbHVlcyBjYW4gYmUKK3NwZWNpZmllZCB1c2luZyBzdGFuZGFyZCB0aW1lIHVuaXQgYWJicmV2aWF0aW9ucyAoJ21zJywgJ3NlYycsICdtaW4nLAorZXRjLikuIFNldCB0byAwIHRvIGRpc2FibGUgcGVyaW9kaWMgcmVzY2FubmluZywgb25seSBzY2FubmluZyBvbmNlIG9uCittYXN0ZXIgbm9kZSBzdGFydHVwLgorKworRGVmYXVsdCBpcyAzMDAgc2Vjb25kcyAoNSBtaW51dGVzKS4KKworY2hhbmdlTWVyZ2UudGVzdDo6CisrCiBDb250cm9scyB3aGV0aGVyIG9yIG5vdCB0aGUgbWVyZ2VhYmlsaXR5IHRlc3Qgb2YgY2hhbmdlcyBpcwogZW5hYmxlZC4gIElmIGVuYWJsZWQsIHdoZW4gdGhlIGNoYW5nZSBwYWdlIGlzIGxvYWRlZCwgdGhlIHRlc3QgaXMKIHRyaWdnZXJlZC4gVGhlIHN1Ym1pdCBidXR0b24gd2lsbCBiZSBlbmFibGVkIG9yIGRpc2FibGVkIGFjY29yZGluZyB0bwogdGhlIHJlc3VsdC4KLQotLS0tLQotW2NoYW5nZU1lcmdlXQotICB0ZXN0ID0gdHJ1ZQotLS0tLQotCisrCiBCeSBkZWZhdWx0IHRoaXMgaXMgZmFsc2UgKHRlc3QgaXMgbm90IGVuYWJsZWQpLgogCiBbW2NvbW1lbnRsaW5rXV1TZWN0aW9uIGNvbW1lbnRsaW5rCiB+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CiBDb21tZW50IGxpbmtzIGFyZSBmaW5kL3JlcGxhY2Ugc3RyaW5ncyBhcHBsaWVkIHRvIGNoYW5nZSBkZXNjcmlwdGlvbnMsCi1wYXRjaCBjb21tZW50cywgYW5kIGluLWxpbmUgY29kZSBjb21tZW50cyB0byB0dXJuIHNldCBzdHJpbmdzIGludG8KLWh5cGVybGlua3MuICBPbmUgY29tbW9uIHVzZSBpcyBmb3IgbGlua2luZyB0byBidWctdHJhY2tpbmcgc3lzdGVtcy4KK3BhdGNoIGNvbW1lbnRzLCBpbi1saW5lIGNvZGUgY29tbWVudHMgYW5kIGFwcHJvdmFsIGNhdGVnb3J5IHZhbHVlIGRlc2NyaXB0aW9ucwordG8gdHVybiBzZXQgc3RyaW5ncyBpbnRvIGh5cGVybGlua3MuICBPbmUgY29tbW9uIHVzZSBpcyBmb3IgbGlua2luZyB0bworYnVnLXRyYWNraW5nIHN5c3RlbXMuCiAKIEluIHRoZSBmb2xsb3dpbmcgZXhhbXBsZSBjb25maWd1cmF0aW9uIHRoZSAnY2hhbmdlaWQnIGNvbW1lbnQgbGluawogd2lsbCBtYXRjaCB0eXBpY2FsIEdlcnJpdCBDaGFuZ2UtSWQgdmFsdWVzIGFuZCBjcmVhdGUgYSBoeXBlcmxpbmsKQEAgLTg5Miw2ICs5NDQsMTQgQEAKICsKIERlZmF1bHQgaXMgNjQgZW50cmllcy4KIAorW1tjb3JlLnVzZVJlY3Vyc2l2ZU1lcmdlXV1jb3JlLnVzZVJlY3Vyc2l2ZU1lcmdlOjoKKysKK1VzZSBKR2l0J3MgbmV3LCBleHBlcmltZW50YWwgcmVjdXJzaXZlIG1lcmdlciBmb3IgdGhyZWUtd2F5IG1lcmdlcy4KK1RoaXMgb25seSBhZmZlY3RzIHByb2plY3RzIGNvbmZpZ3VyZWQgdG8gYXV0b21hdGljYWxseSByZXNvbHZlCitjb25mbGljdHMuCisrCitEZWZhdWx0IGlzIGZhbHNlLCBidXQgaW4gYSBmdXR1cmUgcmVsZWFzZSBtYXkgZGVmYXVsdCB0byB0cnVlLgorCiBbW2RhdGFiYXNlXV1TZWN0aW9uIGRhdGFiYXNlCiB+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CiAKQEAgLTk2OSw2ICsxMDI5LDEzIEBACiBpc24ndCBuZWNlc3NhcnkgYXMgaXQgY2FuIGJlIGNvbnN0cnVjdGVkIGZyb20gdGhlIGFsbCBvZiB0aGUKIGFib3ZlIHByb3BlcnRpZXMuCiAKK1tbZGF0YWJhc2UuY29ubmVjdGlvblBvb2xdXWRhdGFiYXNlLmNvbm5lY3Rpb25Qb29sOjoKKysKK0lmIHRydWUsIHVzZSBjb25uZWN0aW9uIHBvb2xpbmcgZm9yIGRhdGFiYXNlIGNvbm5lY3Rpb25zLiBPdGhlcndpc2UsIGEKK25ldyBkYXRhYmFzZSBjb25uZWN0aW9uIGlzIG9wZW5lZCBmb3IgZWFjaCByZXF1ZXN0LgorKworRGVmYXVsdCBpcyBmYWxzZSBmb3IgTXlTUUwsIGFuZCB0cnVlIGZvciBvdGhlciBkYXRhYmFzZSBiYWNrZW5kcy4KKwogW1tkYXRhYmFzZS5wb29sTGltaXRdXWRhdGFiYXNlLnBvb2xMaW1pdDo6CiArCiBNYXhpbXVtIG51bWJlciBvZiBvcGVuIGRhdGFiYXNlIGNvbm5lY3Rpb25zLiAgSWYgdGhlIHNlcnZlciBuZWVkcwpAQCAtOTgwLDExICsxMDQ3LDE3IEBACiBuZWVkIG11bHRpcGxlIGNvbm5lY3Rpb25zLgogKwogRGVmYXVsdCBpcyA4LgorKworVGhpcyBzZXR0aW5nIG9ubHkgYXBwbGllcyBpZgorPDxkYXRhYmFzZS5jb25uZWN0aW9uUG9vbCxkYXRhYmFzZS5jb25uZWN0aW9uUG9vbD4+IGlzIHRydWUuCiAKIFtbZGF0YWJhc2UucG9vbE1pbklkbGVdXWRhdGFiYXNlLnBvb2xNaW5JZGxlOjoKICsKIE1pbmltdW0gbnVtYmVyIG9mIGNvbm5lY3Rpb25zIHRvIGtlZXAgaWRsZSBpbiB0aGUgcG9vbC4KIERlZmF1bHQgaXMgNC4KKysKK1RoaXMgc2V0dGluZyBvbmx5IGFwcGxpZXMgaWYKKzw8ZGF0YWJhc2UuY29ubmVjdGlvblBvb2wsZGF0YWJhc2UuY29ubmVjdGlvblBvb2w+PiBpcyB0cnVlLgogCiBbW2RhdGFiYXNlLnBvb2xNYXhJZGxlXV1kYXRhYmFzZS5wb29sTWF4SWRsZTo6CiArCkBAIC05OTIsNiArMTA2NSw5IEBACiBhcmUgbW9yZSBpZGxlIGNvbm5lY3Rpb25zLCBjb25uZWN0aW9ucyB3aWxsIGJlIGNsb3NlZCBpbnN0ZWFkIG9mCiBiZWluZyByZXR1cm5lZCBiYWNrIHRvIHRoZSBwb29sLgogRGVmYXVsdCBpcyA0LgorKworVGhpcyBzZXR0aW5nIG9ubHkgYXBwbGllcyBpZgorPDxkYXRhYmFzZS5jb25uZWN0aW9uUG9vbCxkYXRhYmFzZS5jb25uZWN0aW9uUG9vbD4+IGlzIHRydWUuCiAKIFtbZGF0YWJhc2UucG9vbE1heFdhaXRdXWRhdGFiYXNlLnBvb2xNYXhXYWl0OjoKICsKQEAgLTEwMTAsNiArMTA4Niw5IEBACiBJZiBhIHVuaXQgc3VmZml4IGlzIG5vdCBzcGVjaWZpZWQsIGBtaWxsaXNlY29uZHNgIGlzIGFzc3VtZWQuCiArCiBEZWZhdWx0IGlzIGAzMCBzZWNvbmRzYC4KKysKK1RoaXMgc2V0dGluZyBvbmx5IGFwcGxpZXMgaWYKKzw8ZGF0YWJhc2UuY29ubmVjdGlvblBvb2wsZGF0YWJhc2UuY29ubmVjdGlvblBvb2w+PiBpcyB0cnVlLgogCiBbW2Rvd25sb2FkXV1TZWN0aW9uIGRvd25sb2FkCiB+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CkBAIC0xMjQzLDYgKzEzMjIsMTYgQEAKICsKIFZhbGlkIHZhbHVlcyBhcmUgdGhlIGNoYXJhY3RlcnMgJyonLCAnKCcgYW5kICcpJy4KIAorW1tncm91cHNdXVNlY3Rpb24gZ3JvdXBzCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKworW1tncm91cHMubmV3R3JvdXBzVmlzaWJsZVRvQWxsXV1ncm91cHMubmV3R3JvdXBzVmlzaWJsZVRvQWxsOjoKKysKK0NvbnRyb2xzIHdoZXRoZXIgbmV3bHkgY3JlYXRlZCBncm91cHMgc2hvdWxkIGJlIGJ5IGRlZmF1bHQgdmlzaWJsZSB0bworYWxsIHJlZ2lzdGVyZWQgdXNlcnMuCisrCitCeSBkZWZhdWx0LCBmYWxzZS4KKwogW1tob29rc11dU2VjdGlvbiBob29rcwogfn5+fn5+fn5+fn5+fn5+fn5+fn5+fgogCkBAIC0xMjcyLDYgKzEzNjEsMTEgQEAKIE9wdGlvbmFsIGZpbGVuYW1lIGZvciB0aGUgY2hhbmdlIG1lcmdlZCBob29rLCBpZiBub3Qgc3BlY2lmaWVkIHRoZW4KIGBjaGFuZ2UtbWVyZ2VkYCB3aWxsIGJlIHVzZWQuCiAKK1tbaG9va3MubWVyZ2VGYWlsZWRIb29rXV1ob29rcy5tZXJnZUZhaWxlZEhvb2s6OgorKworT3B0aW9uYWwgZmlsZW5hbWUgZm9yIHRoZSBtZXJnZSBmYWlsZWQgaG9vaywgaWYgbm90IHNwZWNpZmllZCB0aGVuCitgbWVyZ2UtZmFpbGVkYCB3aWxsIGJlIHVzZWQuCisKIFtbaG9va3MuY2hhbmdlQWJhbmRvbmVkSG9va11daG9va3MuY2hhbmdlQWJhbmRvbmVkSG9vazo6CiArCiBPcHRpb25hbCBmaWxlbmFtZSBmb3IgdGhlIGNoYW5nZSBhYmFuZG9uZWQgaG9vaywgaWYgbm90IHNwZWNpZmllZCB0aGVuCkBAIC0xMjg3LDExICsxMzgxLDI2IEBACiBPcHRpb25hbCBmaWxlbmFtZSBmb3IgdGhlIHJlZiB1cGRhdGVkIGhvb2ssIGlmIG5vdCBzcGVjaWZpZWQgdGhlbgogYHJlZi11cGRhdGVkYCB3aWxsIGJlIHVzZWQuCiAKK1tbaG9va3MucmV2aWV3ZXJBZGRlZEhvb2tdXWhvb2tzLnJldmlld2VyQWRkZWRIb29rOjoKKysKK09wdGlvbmFsIGZpbGVuYW1lIGZvciB0aGUgcmV2aWV3ZXIgYWRkZWQgaG9vaywgaWYgbm90IHNwZWNpZmllZCB0aGVuCitgcmV2aWV3ZXItYWRkZWRgIHdpbGwgYmUgdXNlZC4KKwogW1tob29rcy5jbGFTaWduZWRIb29rXV1ob29rcy5jbGFTaWduZWRIb29rOjoKICsKIE9wdGlvbmFsIGZpbGVuYW1lIGZvciB0aGUgQ0xBIHNpZ25lZCBob29rLCBpZiBub3Qgc3BlY2lmaWVkIHRoZW4KIGBjbGEtc2lnbmVkYCB3aWxsIGJlIHVzZWQuCiAKK1tbaG9va3MucmVmVXBkYXRlSG9va11daG9va3MucmVmVXBkYXRlSG9vazo6CisrCitPcHRpb25hbCBmaWxlbmFtZSBmb3IgdGhlIHJlZiB1cGRhdGUgaG9vaywgaWYgbm90IHNwZWNpZmllZCB0aGVuCitgcmVmLXVwZGF0ZWAgd2lsbCBiZSB1c2VkLgorCitbW2hvb2tzLnN5bmNIb29rVGltZW91dF1daG9va3Muc3luY0hvb2tUaW1lb3V0OjoKKysKK09wdGlvbmFsIHRpbWVvdXQgdmFsdWUgaW4gc2Vjb25kcyBmb3Igc3luY2hyb25vdXMgaG9va3MsIGlmIG5vdCBzcGVjaWZpZWQKK3RoZW4gMzAgc2Vjb25kcyB3aWxsIGJlIHVzZWQuCisKIFtbaHR0cF1dU2VjdGlvbiBodHRwCiB+fn5+fn5+fn5+fn5+fn5+fn5+fgogCkBAIC0xMzA0LDEzICsxNDEzLDEzIEBACiBbW2h0dHAucHJveHlVc2VybmFtZV1daHR0cC5wcm94eVVzZXJuYW1lOjoKICsKIE9wdGlvbmFsIHVzZXJuYW1lIHRvIGF1dGhlbnRpY2F0ZSB0byB0aGUgSFRUUCBwcm94eSB3aXRoLgotVGhpcyBwcm9wZXJ0eSBpcyBob25vcmVkIG9ubHkgaWYgdGhlIHVzZXJuYW1lIGRvZXMgbm90IAorVGhpcyBwcm9wZXJ0eSBpcyBob25vcmVkIG9ubHkgaWYgdGhlIHVzZXJuYW1lIGRvZXMgbm90CiBhcHBlYXIgaW4gdGhlIGh0dHAucHJveHkgcHJvcGVydHkgYWJvdmUuCiAKIFtbaHR0cC5wcm94eVBhc3N3b3JkXV1odHRwLnByb3h5UGFzc3dvcmQ6OgogKwogT3B0aW9uYWwgcGFzc3dvcmQgdG8gYXV0aGVudGljYXRlIHRvIHRoZSBIVFRQIHByb3h5IHdpdGguCi1UaGlzIHByb3BlcnR5IGlzIGhvbm9yZWQgb25seSBpZiB0aGUgcGFzc3dvcmQgZG9lcyBub3QgCitUaGlzIHByb3BlcnR5IGlzIGhvbm9yZWQgb25seSBpZiB0aGUgcGFzc3dvcmQgZG9lcyBub3QKIGFwcGVhciBpbiB0aGUgaHR0cC5wcm94eSBwcm9wZXJ0eSBhYm92ZS4KIAogCkBAIC0xNzA2LDYgKzE4MTUsMjEgQEAKIERlZmF1bHQgaXMgYChtZW1iZXJVaWQ9JHt1c2VybmFtZX0pYCBmb3IgUkZDIDIzMDcsCiBhbmQgdW5zZXQgKGRpc2FibGVkKSBmb3IgQWN0aXZlIERpcmVjdG9yeS4KIAorW1tsZGFwLmdyb3VwTmFtZV1dbGRhcC5ncm91cE5hbWU6OgorKworXyhPcHRpb25hbClfIE5hbWUgb2YgdGhlIGF0dHJpYnV0ZSBvbiB0aGUgZ3JvdXAgb2JqZWN0IHdoaWNoIGNvbnRhaW5zCit0aGUgdmFsdWUgdG8gdXNlIGFzIHRoZSBncm91cCBuYW1lIGluIEdlcnJpdC4KKysKK1R5cGljYWxseSB0aGUgYXR0cmlidXRlIG5hbWUgaXMgYGNuYCBmb3IgUkZDIDIzMDcgYW5kIEFjdGl2ZSBEaXJlY3RvcnkKK3NlcnZlcnMuICBGb3Igb3RoZXIgc2VydmVycyB0aGUgYXR0cmlidXRlIG5hbWUgbWF5IGRpZmZlciwgZm9yIGV4YW1wbGUKK2BhcHBsZS1ncm91cC1yZWFsbmFtZWAgb24gQXBwbGUgTWFjT1MgWCBTZXJ2ZXIuCisrCitJdCBpcyBhbHNvIHBvc3NpYmxlIHRvIHNwZWNpZnkgYSBsaXRlcmFsIHN0cmluZyBjb250YWluaW5nIGEgcGF0dGVybiBvZgorYXR0cmlidXRlIHZhbHVlcy4gIEZvciBleGFtcGxlIHRvIGNyZWF0ZSBhIEdlcnJpdCBncm91cCBuYW1lIGNvbnNpc3Rpbmcgb2YKK0xEQVAgZ3JvdXAgbmFtZSBhbmQgZ3JvdXAgSUQsIHVzZSB0aGUgcGF0dGVybiBgJHtjbn0gKCR7Z2lkTnVtYmVyfSlgLgorKworRGVmYXVsdCBpcyBgY25gLgorCiBbW2xkYXAubG9jYWxVc2VybmFtZVRvTG93ZXJDYXNlXV1sZGFwLmxvY2FsVXNlcm5hbWVUb0xvd2VyQ2FzZTo6CiArCiBDb252ZXJ0cyB0aGUgbG9jYWwgdXNlcm5hbWUsIHRoYXQgaXMgdXNlZCB0byBsb2dpbiBpbnRvIHRoZSBHZXJyaXQKQEAgLTE3MjUsNiArMTg0OSwzOCBAQAogKwogQnkgZGVmYXVsdCwgdW5zZXQvZmFsc2UuCiAKK1tbbGRhcC5hdXRoZW50aWNhdGlvbl1dbGRhcC5hdXRoZW50aWNhdGlvbjo6CisrCitEZWZpbmVzIGhvdyBHZXJyaXQgYXV0aGVudGljYXRlcyB3aXRoIHRoZSBzZXJ2ZXIuIFdoZW4gc2V0IHRvIGBHU1NBUElgCitHZXJyaXQgd2lsbCB1c2UgS2VyYmVyb3MuIFRvIHVzZSBrZXJiZXJvcyB0aGUKK2BqYXZhLnNlY3VyaXR5LmF1dGgubG9naW4uY29uZmlnYCBzeXN0ZW0gcHJvcGVydHkgbXVzdCBwb2ludCB0byBhCitsb2dpbiB0byBhIEpBQVMgY29uZmlndXJhdGlvbiBmaWxlIGFuZCwgaWYgSmF2YSA2IGlzIHVzZWQsIHRoZSBzeXN0ZW0KK3Byb3BlcnR5IGBqYXZhLnNlY3VyaXR5LmtyYjUuY29uZmAgbXVzdCBwb2ludCB0byB0aGUgYXBwcm9wcmlhdGUKK2tyYjUuaW5pIGZpbGUgd2l0aCByZWZlcmVuY2VzIHRvIHRoZSBLREMuCisKK1R5cGljYWwgamFhcy5jb25mLgorCistLS0tCitLZXJiZXJvc0xvZ2luIHsKKyAgICBjb20uc3VuLnNlY3VyaXR5LmF1dGgubW9kdWxlLktyYjVMb2dpbk1vZHVsZQorICAgICAgICAgICAgcmVxdWlyZWQKKyAgICAgICAgICAgIHVzZVRpY2tldENhY2hlPXRydWUKKyAgICAgICAgICAgIGRvTm90UHJvbXB0PXRydWUKKyAgICAgICAgICAgIHJlbmV3VEdUPXRydWU7Cit9OworLS0tLQorCitTZWUgSmF2YSBkb2N1bWVudGF0aW9uIG9uIGhvdyB0byBjcmVhdGUgdGhlIGtyYjUuaW5pIGZpbGUuCisKK05vdGUgdGhlIGByZW5ld1RHVGAgcHJvcGVydHkgdG8gbWFrZSBzdXJlIHRoZSBUR1QgZG9lcyBub3QgZXhwaXJlLAorYW5kIGB1c2VUaWNrZXRDYWNoZWAgdG8gdXNlIHRoZSBUR1Qgc3VwcGxpZWQgYnkgdGhlIG9wZXJhdGluZyBzeXN0ZW0uIEFzCit0aGUgd2hvbGUgcG9pbnQgb2YgdXNpbmcgR1NTQVBJIGlzIHRvIGhhdmUgcGFzc3dvcmRsZXNzIGF1dGhlbnRpY2F0aW9uCit0byB0aGUgTERBUCBzZXJ2aWNlLCB0aGlzIG9wdGlvbiBkb2VzIG5vdCBhcXVpcmUgYSBuZXcgVEdUIG9uIGl0cyBvd24uCisKK09uIFdpbmRvd3Mgc2VydmVycyB0aGUgcmVnaXN0cnkga2V5IGBIS0VZX0xPQ0FMX01BQ0hJTkVcU3lzdGVtXEN1cnJlbnRDb250cm9sU2V0XENvbnRyb2xcTHNhXEtlcmJlcm9zXFBhcmFtZXRlcnNgCittdXN0IGhhdmUgdGhlIERXT1JEIHZhbHVlIGBhbGxvd3RndHNlc3Npb25rZXlgIHNldCB0byAxIGFuZCB0aGUgYWNjb3VudCBtdXN0IG5vdAoraGF2ZSBsb2NhbCBhZG1pbmlzdHJhdG9yIHByaXZpbGVnZXMuCisKIFtbbWltZXR5cGVdXVNlY3Rpb24gbWltZXR5cGUKIH5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIApAQCAtMTgxMCw2ICsxOTY2LDM0IEBACiAgIG1heE9iamVjdFNpemVMaW1pdCA9IDQwIG0KIC0tLS0KIAorW1tyZWNlaXZlLmNoZWNrTWFnaWNSZWZzXV1yZWNlaXZlLmNoZWNrTWFnaWNSZWZzOjoKKysKK0lmIHRydWUsIEdlcnJpdCB3aWxsIHZlcmlmeSB0aGUgZGVzdGluYXRpb24gcmVwb3NpdG9yeSBoYXMKK25vIHJlZmVyZW5jZXMgdW5kZXIgdGhlIG1hZ2ljICdyZWZzL2RyYWZ0cycsICdyZWZzL2ZvcicsIG9yCisncmVmcy9wdWJsaXNoJyBicmFuY2ggbmFtZXNwYWNlcy4gTmFtZXMgdW5kZXIgdGhlc2UgbG9jYXRpb25zCitjb25mdXNlIGNsaWVudHMgd2hlbiB0cnlpbmcgdG8gdXBsb2FkIGNvZGUgcmV2aWV3cyBzbyBHZXJyaXQKK3JlcXVpcmVzIHRoZW0gdG8gYmUgZW1wdHkuCisrCitJZiBmYWxzZSBHZXJyaXQgc2tpcHMgdGhlIHNhbml0eSBjaGVjayBhbmQgYXNzdW1lcyBhZG1pbmlzdHJhdG9ycworaGF2ZSBlbnN1cmVkIHRoZSByZXBvc2l0b3J5IGRvZXMgbm90IGNvbnRhaW4gYW55IG1hZ2ljIHJlZmVyZW5jZXMuCitTZXR0aW5nIHRvIGZhbHNlIHRvIHNraXAgdGhlIGNoZWNrIGNhbiBkZWNyZWFzZSBsYXRlbmN5IGR1cmluZyBwdXNoLgorKworRGVmYXVsdCBpcyB0cnVlLgorCitbW3JlY2VpdmUuY2hlY2tSZWZlcmVuY2VkT2JqZWN0c0FyZVJlYWNoYWJsZV1dcmVjZWl2ZS5jaGVja1JlZmVyZW5jZWRPYmplY3RzQXJlUmVhY2hhYmxlOjoKKysKK0lmIHNldCB0byB0cnVlLCBHZXJyaXQgd2lsbCB2YWxpZGF0ZSB0aGF0IGFsbCByZWZlcmVuY2VkIG9iamVjdHMgdGhhdAorYXJlIG5vdCBpbmNsdWRlZCBpbiB0aGUgcmVjZWl2ZWQgcGFjayBhcmUgcmVhY2hhYmxlIGJ5IHRoZSB1c2VyLgorKworQ2Fycnlpbmcgb3V0IHRoaXMgY2hlY2sgb24gZ2l0cyB3aXRoIG1hbnkgcmVmcyBhbmQgY29tbWl0cyBjYW4gYmUgYQordmVyeSBDUFUtaGVhdnkgb3BlcmF0aW9uLiBGb3Igbm9uIHB1YmxpYyBHZXJyaXQtc2VydmVycyB0aGlzIGNoZWNrIG1heQorYmUgb3ZlcmtpbGwuCisrCitPbmx5IGRpc2FibGUgdGhpcyBjaGVjayBpZiB5b3UgdHJ1c3QgdGhlIGNsaWVudHMgbm90IHRvIGZvcmdlIFNIQTEKK3JlZmVyZW5jZXMgdG8gYWNjZXNzIGNvbW1pdHMgaW50ZW5kZWQgdG8gYmUgaGlkZGVuIGZyb20gdGhlIHVzZXIuCisrCitEZWZhdWx0IGlzIHRydWUuCisKIFtbcmVjZWl2ZS5hbGxvd0dyb3VwXV1yZWNlaXZlLmFsbG93R3JvdXA6OgogKwogTmFtZSBvZiB0aGUgZ3JvdXBzIG9mIHVzZXJzIHRoYXQgYXJlIGFsbG93ZWQgdG8gZXhlY3V0ZQpAQCAtMTgzOSw2ICsyMDIzLDE4IEBACiArCiBEZWZhdWx0cyB0byB0aGUgbnVtYmVyIG9mIGF2YWlsYWJsZSBDUFVzIGFjY29yZGluZyB0byB0aGUgSmF2YSBydW50aW1lLgogCitbW3JlY2VpdmUuY2hhbmdlVXBkYXRlVGhyZWFkc11dcmVjZWl2ZS5jaGFuZ2VVcGRhdGVUaHJlYWRzOjoKKysKK051bWJlciBvZiB0aHJlYWRzIHRvIHBlcmZvcm0gY2hhbmdlIGNyZWF0aW9uIG9yIHBhdGNoIHNldCB1cGRhdGVzCitjb25jdXJyZW50bHkuIEVhY2ggdGhyZWFkIHVzZXMgaXRzIG93biBkYXRhYmFzZSBjb25uZWN0aW9uIGZyb20KK3RoZSBkYXRhYmFzZSBjb25uZWN0aW9uIHBvb2wsIGFuZCBpZiBhbGwgdGhyZWFkcyBhcmUgYnVzeSB0aGVuCittYWluIHJlY2VpdmUgdGhyZWFkIHdpbGwgYWxzbyBwZXJmb3JtIGEgY2hhbmdlIGNyZWF0aW9uIG9yIHBhdGNoCitzZXQgdXBkYXRlLgorKworRGVmYXVsdHMgdG8gMSwgdXNpbmcgb25seSB0aGUgbWFpbiByZWNlaXZlIHRocmVhZC4gVGhpcyBmZWF0dXJlIGlzIGZvcgorZGF0YWJhc2VzIHdpdGggdmVyeSBoaWdoIGxhdGVuY3kgdGhhdCBjYW4gYmVuZml0IGZyb20gY29uY3VycmVudAorb3BlcmF0aW9ucyB3aGVuIG11bHRpcGxlIGNoYW5nZXMgYXJlIGltcGFjdGVkIGF0IG9uY2UuCisKIFtbcmVjZWl2ZS50aW1lb3V0XV1yZWNlaXZlLnRpbWVvdXQ6OgogKwogT3ZlcmFsbCB0aW1lb3V0IG9uIHRoZSB0aW1lIHRha2VuIHRvIHByb2Nlc3MgdGhlIGNoYW5nZSBkYXRhIGluCkBAIC0xOTc4LDkgKzIxNzQsMTAgQEAKIAogW1tzZW5kZW1haWwuaW5jbHVkZURpZmZdXXNlbmRlbWFpbC5pbmNsdWRlRGlmZjo6CiArCi1JZiB0cnVlLCBuZXcgY2hhbmdlIGVtYWlscyBmcm9tIEdlcnJpdCB3aWxsIGluY2x1ZGUgdGhlIGNvbXBsZXRlCi11bmlmaWVkIGRpZmYgb2YgdGhlIGNoYW5nZS4gVmFyaWFibGUgbWF4bWltdW1EaWZmU2l6ZSBwbGFjZXMgYW4gdXBwZXIKLWxpbWl0IG9uIGhvdyBsYXJnZSB0aGUgZW1haWwgY2FuIGdldCB3aGVuIHRoaXMgb3B0aW9uIGlzIGVuYWJsZWQuCitJZiB0cnVlLCBuZXcgY2hhbmdlIGVtYWlscyBhbmQgbWVyZ2VkIGNoYW5nZSBlbWFpbHMgZnJvbSBHZXJyaXQKK3dpbGwgaW5jbHVkZSB0aGUgY29tcGxldGUgdW5pZmllZCBkaWZmIG9mIHRoZSBjaGFuZ2UuCitWYXJpYWJsZSBtYXhtaW11bURpZmZTaXplIHBsYWNlcyBhbiB1cHBlciBsaW1pdCBvbiBob3cgbGFyZ2UgdGhlCitlbWFpbCBjYW4gZ2V0IHdoZW4gdGhpcyBvcHRpb24gaXMgZW5hYmxlZC4KICsKIEJ5IGRlZmF1bHQsIGZhbHNlLgogCkBAIC0yMTkzLDYgKzIzOTAsMjAgQEAKICsKIEJ5IGRlZmF1bHQsIDIgbWludXRlcy4KIAorW1tzc2hkLmlkbGVUaW1lb3V0XV1zc2hkLmlkbGVUaW1lb3V0OjoKKysKK1RpbWUgaW4gc2Vjb25kcyBhZnRlciB3aGljaCB0aGUgc2VydmVyIGF1dG9tYXRpY2FsbHkgdGVybWluYXRlcyBpZGxlCitjb25uZWN0aW9ucyAob3IgMCB0byBkaXNhYmxlIGNsb3Npbmcgb2YgaWRsZSBjb25uZWN0aW9ucykuICBWYWx1ZXMKK3Nob3VsZCB1c2UgY29tbW9uIHVuaXQgc3VmZml4ZXMgdG8gZXhwcmVzcyB0aGVpciBzZXR0aW5nOgorKworKiBzLCBzZWMsIHNlY29uZCwgc2Vjb25kcworKiBtLCBtaW4sIG1pbnV0ZSwgbWludXRlcworKiBoLCBociwgaG91ciwgaG91cnMKKyogZCwgZGF5LCBkYXlzCisKKysKK0J5IGRlZmF1bHQsIDAuCisKIFtbc3NoZC5tYXhDb25uZWN0aW9uc1BlclVzZXJdXXNzaGQubWF4Q29ubmVjdGlvbnNQZXJVc2VyOjoKICsKIE1heGltdW0gbnVtYmVyIG9mIGNvbmN1cnJlbnQgU1NIIHNlc3Npb25zIHRoYXQgYSB1c2VyIGFjY291bnQKQEAgLTIyNDgsNiArMjQ1OSwxMyBAQAogTmV3IGNvbmZpZ3VyYXRpb25zIHNob3VsZCBwcmVmZXIgdGhlIGJvb2xlYW4gdmFsdWUgZm9yIHRoaXMgZmllbGQKIGFuZCBhbiBlbnVtIHZhbHVlIGZvciBgYWNjb3VudHMudmlzaWJpbGl0eWAuCiAKK1tbc3VnZ2VzdC5mcm9tXV1zdWdnZXN0LmZyb206OgorKworVGhlIG51bWJlciBvZiBjaGFyYWN0ZXJzIHRoYXQgYSB1c2VyIG11c3QgaGF2ZSB0eXBlZCBiZWZvcmUgc3VnZ2VzdGlvbnMKK2FyZSBwcm92aWRlZC4gSWYgc2V0IHRvIDAsIHN1Z2dlc3Rpb25zIGFyZSBhbHdheXMgcHJvdmlkZWQuCisrCitCeSBkZWZhdWx0IDAuCisKIFtbdGhlbWVdXSBTZWN0aW9uIHRoZW1lCiB+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgogCkBAIC0yMjU3LDE0ICsyNDc1LDE1IEBACiBvcGVuIGNoYW5nZXMgdGFibGUgb3IgdGhlIGFjY291bnQgZGFzaGJvYXJkLiBUaGUgdmFsdWUgbXVzdCBiZSBhCiB2YWxpZCBIVE1MIGhleCBjb2xvciBjb2RlLCBvciBzdGFuZGFyZCBjb2xvciBuYW1lLgogKwotQnkgZGVmYXVsdCBgRkNGRUVGYCAoYSBjcmVtZSBjb2xvcikgZm9yIHNpZ25lZC1vdXQgdGhlbWUgYW5kIHdoaXRlCi0oYEZGRkZGRmApIGZvciBzaWduZWQtaW4gdGhlbWUuCitCeSBkZWZhdWx0IHdoaXRlLCBgRkZGRkZGYC4KIAogW1t0aGVtZS50b3BNZW51Q29sb3JdXXRoZW1lLnRvcE1lbnVDb2xvcjo6CiArCiBUaGlzIGlzIHRoZSBjb2xvciBvZiB0aGUgbWFpbiBtZW51IGJhciBhdCB0aGUgdG9wIG9mIHRoZSBwYWdlLgogVGhlIHZhbHVlIG11c3QgYmUgYSB2YWxpZCBIVE1MIGhleCBjb2xvciBjb2RlLCBvciBzdGFuZGFyZCBjb2xvcgotbmFtZS4gIFRoZSB2YWx1ZSBkZWZhdWx0cyB0byA8PHRoZW1lLnRyaW1Db2xvcix0cmltQ29sb3I+Pi4KK25hbWUuCisrCitCeSBkZWZhdWx0IHdoaXRlLCBgRkZGRkZGYC4KIAogW1t0aGVtZS50ZXh0Q29sb3JdXXRoZW1lLnRleHRDb2xvcjo6CiArCkBAIC0yMjcyLDcgKzI0OTEsNyBAQAogb3BlbiBjaGFuZ2VzIHRhYmxlIG9yIHRoZSBhY2NvdW50IGRhc2hib2FyZC4gVGhlIHZhbHVlIG11c3QgYmUgYQogdmFsaWQgSFRNTCBoZXggY29sb3IgY29kZSwgb3Igc3RhbmRhcmQgY29sb3IgbmFtZS4KICsKLUJ5IGRlZmF1bHQgYmxhY2ssIGAwMDAwMDBgLgorQnkgZGVmYXVsdCBkYXJrIGdyZXksIGAzNTM1MzVgLgogCiBbW3RoZW1lLnRyaW1Db2xvcl1ddGhlbWUudHJpbUNvbG9yOjoKICsKQEAgLTIyODIsNyArMjUwMSw3IEBACiBvZiB0aGUgcGFnZS4gIFRoZSB2YWx1ZSBtdXN0IGJlIGEgdmFsaWQgSFRNTCBoZXggY29sb3IgY29kZSwgb3IKIHN0YW5kYXJkIGNvbG9yIG5hbWUuCiArCi1CeSBkZWZhdWx0IGEgc2hhZGUgb2YgZ3JlZW4sIGBENEU5QTlgLgorQnkgZGVmYXVsdCBhIGxpZ2h0IGdyZXksIGBFRUVFRUVgLgogCiBbW3RoZW1lLnNlbGVjdGlvbkNvbG9yXV10aGVtZS5zZWxlY3Rpb25Db2xvcjo6CiArCkBAIC0yMjkxLDcgKzI1MTAsNyBAQAogY3VycmVudGx5IHNlbGVjdGVkIHJvdy4gIFRoZSB2YWx1ZSBtdXN0IGJlIGEgdmFsaWQgSFRNTCBoZXggY29sb3IKIGNvZGUsIG9yIHN0YW5kYXJkIGNvbG9yIG5hbWUuCiArCi1CeSBkZWZhdWx0IGEgc2hhZGUgb2YgeWVsbG93LCBgRkZGRkNDYC4KK0J5IGRlZmF1bHQgYSBwYWxlIGJsdWUsIGBEOEVERjlgLgogCiBbW3RoZW1lLmNoYW5nZVRhYmxlT3V0ZGF0ZWRDb2xvcl1ddGhlbWUuY2hhbmdlVGFibGVPdXRkYXRlZENvbG9yOjoKICsKQEAgLTIzNzAsNyArMjU4OSw3IEBACiBleHRlcm5hbCB0cmFja2luZyBpZCBwYXJ0IG9mIHRoZSBmb290ZXIgbGluZS4gVGhlIG1hdGNoIGNhbgogcmVzdWx0IGluIHNldmVyYWwgZW50cmllcyBpbiB0aGUgREIuICBJZiBncm91cGluZyBpcyB1c2VkIGluIHRoZQogcmVnZXggdGhlIGZpcnN0IGdyb3VwIHdpbGwgYmUgaW50ZXJwcmV0ZWQgYXMgdGhlIHRyYWNraW5nIGlkLgotVHJhY2tpbmcgaWRzIGxvbmdlciB0aGFuIDIwIGNoYXJhY3RlcnMgd2lsbCBiZSBpZ25vcmVkLgorVHJhY2tpbmcgaWRzIGxvbmdlciB0aGFuIDMyIGNoYXJhY3RlcnMgd2lsbCBiZSBpZ25vcmVkLgogKwogVGhlIGNvbmZpZ3VyYXRpb24gZmlsZSBwYXJzZXIgZWF0cyBvbmUgbGV2ZWwgb2YgYmFja3NsYXNoZXMsIHNvIHRoZQogY2hhcmFjdGVyIGNsYXNzIGBcc2AgcmVxdWlyZXMgYFxcc2AgaW4gdGhlIGNvbmZpZ3VyYXRpb24gZmlsZS4gIFRoZQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jb25maWctZ2l0d2ViLnR4dCBiL0RvY3VtZW50YXRpb24vY29uZmlnLWdpdHdlYi50eHQKaW5kZXggMzVkNWMwZC4uZTVlZGRhOCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9jb25maWctZ2l0d2ViLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2NvbmZpZy1naXR3ZWIudHh0CkBAIC0xLDEzICsxLDEyIEBACi1HZXJyaXQgQ29kZSBSZXZpZXcgLSBHaXR3ZWIgSW50ZWdyYXRpb24KLT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorR2l0d2ViIEludGVncmF0aW9uCistLS0tLS0tLS0tLS0tLS0tLS0KIAogR2Vycml0IENvZGUgUmV2aWV3IGNhbiBtYW5hZ2UgYW5kIGdlbmVyYXRlIGh5cGVybGlua3MgdG8gZ2l0d2ViLAogYWxsb3dpbmcgdXNlcnMgdG8ganVtcCBmcm9tIEdlcnJpdCBjb250ZW50IHRvIHRoZSBzYW1lIGluZm9ybWF0aW9uLAogYnV0IHNob3duIGJ5IGdpdHdlYi4KIAotCiBJbnRlcm5hbC9NYW5hZ2VkIGdpdHdlYgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CiAKIEluIHRoZSBpbnRlcm5hbCBjb25maWd1cmF0aW9uLCBHZXJyaXQgaW5zcGVjdHMgdGhlIHJlcXVlc3QsIGVuZm9yY2VzCiBpdHMgcHJvamVjdCBsZXZlbCBhY2Nlc3MgY29udHJvbHMsIGFuZCBkaXJlY3RseSBleGVjdXRlcyBgZ2l0d2ViLmNnaWAKQEAgLTM5LDcgKzM4LDcgQEAKIGJlIHJlc3RhcnRlZCBhbmQgY2xpZW50cyBtdXN0IHJlbG9hZCB0aGUgaG9zdCBwYWdlIHRvIHNlZSB0aGUgY2hhbmdlLgogCiBDb25maWd1cmF0aW9uCi1+fn5+fn5+fn5+fn5+CiteXl5eXl5eXl5eXl5eCiAKIE1vc3Qgb2YgdGhlIGdpdHdlYiBjb25maWd1cmF0aW9uIGZpbGUgaXMgaGFuZGxlZCBhdXRvbWF0aWNhbGx5CiBieSBHZXJyaXQgQ29kZSBSZXZpZXcuICBTaXRlIHNwZWNpZmljIG92ZXJyaWRlcyBjYW4gYmUgcGxhY2VkIGluCkBAIC00Nyw3ICs0Niw3IEBACiBwYXJ0IG9mIHRoZSBnZW5lcmF0ZWQgY29uZmlndXJhdGlvbiBmaWxlLgogCiBMb2dvIGFuZCBDU1MKLX5+fn5+fn5+fn5+fgorXl5eXl5eXl5eXl5eCiAKIElmIHRoZSBwYWNrYWdlLW1hbmFnZXIgaW5zdGFsbGVkIENHSSAoYC91c3IvbGliL2NnaS1iaW4vZ2l0d2ViLmNnaWApCiBpcyBiZWluZyB1c2VkLCB0aGUgc3RvY2sgQ1NTIGFuZCBsb2dvIGZpbGVzIHdpbGwgYmUgc2VydmVkIGZyb20KQEAgLTU4LDE3ICs1NywxNjUgQEAKIHRoZSBkZWZhdWx0IHNvdXJjZSBjb2RlIGRpc3RyaWJ1dGlvbiwgYW5kIG1vc3QgY3VzdG9tIGluc3RhbGxhdGlvbnMuCiAKIEFjY2VzcyBDb250cm9sCi1+fn5+fn5+fn5+fn5+fgorXl5eXl5eXl5eXl5eXl4KIAogQWNjZXNzIGNvbnRyb2xzIGZvciBpbnRlcm5hbGx5IG1hbmFnZWQgZ2l0d2ViIHBhZ2Ugdmlld3MgYXJlIGVuZm9yY2VkCiB1c2luZyB0aGUgc3RhbmRhcmQgcHJvamVjdCBSRUFEICsxIHBlcm1pc3Npb24uCiAKLQogRXh0ZXJuYWwvVW5tYW5hZ2VkIGdpdHdlYgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgogCi1JbiB0aGUgZXh0ZXJuYWwgY29uZmlndXJhdGlvbiwgZ2l0d2ViIHJ1bnMgdW5kZXIgdGhlIGNvbnRyb2wgb2YgYW4KLWV4dGVybmFsIHdlYiBzZXJ2ZXIsIGFuZCBHZXJyaXQgYWNjZXNzIGNvbnRyb2xzIGFyZSBub3QgZW5mb3JjZWQuCitGb3IgdGhlIGV4dGVybmFsIGNvbmZpZ3VyYXRpb24sIGdpdHdlYiBydW5zIHVuZGVyIHRoZSBjb250cm9sIG9mIGFuCitleHRlcm5hbCB3ZWIgc2VydmVyLCBhbmQgR2Vycml0IGFjY2VzcyBjb250cm9scyBhcmUgbm90IGVuZm9yY2VkLiBHZXJyaXQKK3Byb3ZpZGVzIGNvbmZpZ3VyYXRpb24gcGFyYW1ldGVycyBmb3IgaW50ZWdyYXRpb24gd2l0aCBHaXRXZWIuCisKK1tbbGludXhHaXRXZWJdXQorTGludXggSW5zdGFsbGF0aW9uCiteXl5eXl5eXl5eXl5eXl5eXl4KKworSW5zdGFsbCBHaXRXZWIKKysrKysrKysrKysrKysrCisKK09uIFVidW50dToKKworPT09PQorICBzdWRvIGFwdC1nZXQgaW5zdGFsbCBnaXR3ZWIKKz09PT0KKworV2l0aCBZdW06CisKKz09PT0KKyAgJCB5dW0gaW5zdGFsbCBnaXR3ZWIKKz09PT0KKworQ29uZmlndXJlIEdpdFdlYgorKysrKysrKysrKysrKysrKworCisKK1VwZGF0ZSBgL2V0Yy9naXR3ZWIuY29uZmAsIGFkZCB0aGUgcHVibGljIEdJVCByZXBvc2l0b3JpZXM6CisKKy0tLS0KKyRwcm9qZWN0cm9vdCA9ICIvdmFyL3d3dy9yZXBvLyI7CisKKyMgZGlyZWN0b3J5IHRvIHVzZSBmb3IgdGVtcCBmaWxlcworJGdpdF90ZW1wID0gIi90bXAiOworCisjIHRhcmdldCBvZiB0aGUgaG9tZSBsaW5rIG9uIHRvcCBvZiBhbGwgcGFnZXMKKyMkaG9tZV9saW5rID0gJG15X3VyaSB8fCAiLyI7CisKKyMgaHRtbCB0ZXh0IHRvIGluY2x1ZGUgYXQgaG9tZSBwYWdlCiskaG9tZV90ZXh0ID0gImluZGV4dGV4dC5odG1sIjsKKworIyBmaWxlIHdpdGggcHJvamVjdCBsaXN0OyBieSBkZWZhdWx0LCBzaW1wbHkgc2NhbiB0aGUgcHJvamVjdHJvb3QgZGlyLgorJHByb2plY3RzX2xpc3QgPSAkcHJvamVjdHJvb3Q7CisKKyMgc3R5bGVzaGVldCB0byB1c2UKKyMgSSB0b29rIG9mZiB0aGUgcHJlZml4IC8gb2YgdGhlIGZvbGxvd2luZyBwYXRoIHRvIHB1dCB0aGVzZSBmaWxlcyBpbnNpZGUgZ2l0d2ViIGRpcmVjdG9yeSBkaXJlY3RseQorJHN0eWxlc2hlZXQgPSAiZ2l0d2ViLmNzcyI7CisKKyMgbG9nbyB0byB1c2UKKyRsb2dvID0gImdpdC1sb2dvLnBuZyI7CisKKyMgdGhlIJFmYXZpY29ukgorJGZhdmljb24gPSAiZ2l0LWZhdmljb24ucG5nIjsKKy0tLS0KKworQ29uZmlndXJlICYgUmVzdGFydCBBcGFjaGUgV2ViIFNlcnZlcgorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgorCitDb25maWd1cmUgQXBhY2hlCisrKysrKysrKysrKysrKysrCisKKworTGluayBnaXR3ZWIgdG8gYC92YXIvd3d3L2dpdHdlYmAsIGNoZWNrIGAvZXRjL2dpdHdlYi5jb25mYCBpZiB1bnN1cmUgb2YgcGF0aHM6CisKKz09PT0KKyAgJCBzdWRvIGxuIC1zIC91c3Ivc2hhcmUvZ2l0d2ViIC92YXIvd3d3L2dpdHdlYgorPT09PQorCitBZGQgdGhlIGdpdHdlYiBkaXJlY3RvcnkgdG8gdGhlIEFwYWNoZSBjb25maWd1cmF0aW9uIGJ5IGNyZWF0aW5nIGEgImdpdHdlYiIKK2ZpbGUgaW5zaWRlIHRoZSBBcGFjaGUgY29uZi5kIGRpcmVjdG9yeToKKworPT09PQorICAkIHRvdWNoIC9ldGMvYXBhY2hlL2NvbmYuZC9naXR3ZWIKKz09PT0KKworQWRkIHRoZSBmb2xsb3dpbmcgdG8gL2V0Yy9hcGFjaGUvY29uZi5kL2dpdHdlYjoKKworLS0tLQorQWxpYXMgL2dpdHdlYiAvdmFyL3d3dy9naXR3ZWIKKworT3B0aW9ucyBJbmRleGVzIEZvbGxvd1N5bWxpbmtzIEV4ZWNDR0kKK0RpcmVjdG9yeUluZGV4IC9jZ2ktYmluL2dpdHdlYi5jZ2kKK0FsbG93T3ZlcnJpZGUgTm9uZQorLS0tLQorCisqTk9URSogVGhpcyBtYXkgaGF2ZSBhbHJlYWR5IGJlZW4gYWRkZWQgYnkgeXVtL2FwdC1nZXQuIElmIHRoYXQncyB0aGUgY2FzZSwgbGVhdmUgYXMKK2lzLgorCitSZXN0YXJ0IHRoZSBBcGFjaGUgV2ViIFNlcnZlcgorKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKKworPT09PQorJCBzdWRvIC9ldGMvaW5pdC5kL2FwYWNoZTIgcmVzdGFydAorPT09PQorCitOb3cgeW91IHNob3VsZCBiZSBhYmxlIHRvIHZpZXcgeW91ciByZXBvc2l0b3J5IHByb2plY3RzIG9ubGluZToKKworbGluazpodHRwOi8vbG9jYWxob3N0L2dpdHdlYltodHRwOi8vbG9jYWxob3N0L2dpdHdlYl0KKworW1tXaW5kb3dzR2l0V2ViXV0KK1dpbmRvd3MgSW5zdGFsbGF0aW9uCiteXl5eXl5eXl5eXl5eXl5eXl5eXgorCitJbnN0cnVjdGlvbnMgYXJlIGF2YWlsYWJsZSBmb3IgaW5zdGFsbGluZyB0aGUgR2l0V2ViIG1vZHVsZSBkaXN0cmlidXRlZCB3aXRoCitNc3lzR2l0OgorCitsaW5rOmh0dHBzOi8vZ2l0aHViLmNvbS9tc3lzZ2l0L21zeXNnaXQvd2lraS9HaXRXZWJbR2l0V2ViXQorCitJZiB5b3UgZG9uJ3QgaGF2ZSBBcGFjaGUgaW5zdGFsbGVkLCB5b3UgY2FuIGRvd25sb2FkIHRoZSBhcHByb3ByaWF0ZSBidWlsZCBmb3IKK1dpbmRvd3MgZnJvbSBsaW5rOmh0dHA6Ly93d3cuYXBhY2hlbG91bmdlLmNvbS9kb3dubG9hZFthcGFjaGVsb3VuZ2Uub3JnXS4KKworQWZ0ZXIgeW91IGhhdmUgaW5zdGFsbGVkIEFwYWNoZSwgeW91IHdpbGwgd2FudCB0byBjcmVhdGUgYSBsaW5rOmh0dHA6Ly9odHRwZC5hcGFjaGUub3JnL2RvY3MvMi4wL3BsYXRmb3JtL3dpbmRvd3MuaHRtbCN3aW5zdmNbbmV3IHNlcnZpY2UgdXNlcgorYWNjb3VudF0gdG8gdXNlIHdpdGggQXBhY2hlLgorCitJZiB5b3UncmUgc3RpbGwgaGF2aW5nIGRpZmZpY3VsdHkgc2V0dGluZyB1cCBwZXJtaXNzaW9ucywgeW91IG1heSBmaW5kIHRoaXMKK3RlY2ggbm90ZSB1c2VmdWwgZm9yIGNvbmZpZ3VyaW5nIEFwYWNoZSBTZXJ2aWNlIHRvIHJ1biB1bmRlciBhbm90aGVyIGFjY291bnQuCitZb3UgbXVzdCBncmFudCB0aGUgbmV3IGFjY291bnQgbGluazpodHRwOi8vdGVjaG5ldC5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJhcnkvY2M3OTQ5NDQoV1MuMTApLmFzcHhbInJ1biBhcyBzZXJ2aWNlIl0gcGVybWlzc2lvbjoKKworVGhlIEdpdFdlYiB2ZXJzaW9uIGluIG1zeXNnaXQgaXMgbWlzc2luZyBzZXZlcmFsIGltcG9ydGFudCBhbmQgcmVxdWlyZWQKK3BlcmwgbW9kdWxlcywgaW5jbHVkaW5nIENHSS5wbS4gVGhlIHBlcmwgaW5jbHVkZWQgd2l0aCB0aGUgbXN5c2dpdCBkaXN0cm8gMS43LjgKK2lzIGJyb2tlbi4uIFRoZSBsaW5rOmh0dHA6Ly9ncm91cHMuZ29vZ2xlLmNvbS9ncm91cC9tc3lzZ2l0L2Jyb3dzZV90aHJlYWQvdGhyZWFkL2JhMzUwMWYxZjBlZDk1YWZbdW5pY29yZSBmb2xkZXIgaXMgbWlzc2luZyBhbG9uZyB3aXRoIHV0ZjhfaGVhdnkucGwgYW5kIENHSS5wbV0uIFlvdSBjYW4KK3ZlcmlmeSBieSBjaGVja2luZyBmb3IgcGVybCBtb2R1bGVzLiBGcm9tIGFuIG1zeXMgY29uc29sZSwgZXhlY3V0ZSB0aGUKK2ZvbGxvd2luZyB0byBjaGVjazoKKworPT09PQorJCBwZXJsIC1tQ0dJIC1tRW5jb2RlIC1tRmNudGwgLW1GaWxlOjpGaW5kIC1tRmlsZTo6QmFzZW5hbWUgLWUgIiIKKz09PT0KKworWW91IG1heSBlbmNvdW50ZXIgdGhlIGZvbGxvd2luZyBleGNlcHRpb246CisKKy0tLS0KKyQgcGVybCAtbUNHSSAtbUVuY29kZSAtbUZjbnRsIC1tRmlsZTo6RmluZCAtbUZpbGU6OkJhc2VuYW1lIC1lICIiCitDYW4ndCBsb2NhdGUgQ0dJLnBtIGluIEBJTkMgKEBJTkMgY29udGFpbnM6IC91c3IvbGliL3Blcmw1LzUuOC44L21zeXMKKy91c3IvbGliL3AgZXJsNS81LjguOCAvdXNyL2xpYi9wZXJsNS9zaXRlX3BlcmwvNS44LjgvbXN5cworL3Vzci9saWIvcGVybDUvc2l0ZV9wZXJsLzUuOC44IC91IHNyL2xpYi9wZXJsNS9zaXRlX3BlcmwgLikuIEJFR0lOCitmYWlsZWQtLWNvbXBpbGF0aW9uIGFib3J0ZWQuCistLS0tCisKK0lmIHlvdSdyZSBtaXNzaW5nIENHSS5wbSwgeW91J2xsIGhhdmUgdG8gZGVwbG95IHRoZSBtb2R1bGUgdG8gdGhlIG1zeXMKK2Vudmlyb25tZW50OiBZb3Ugd2lsbCBoYXZlIHRvIHJldHJpZXZlIHRoZW0gZnJvbSB0aGUgNS44LjggZGlzdHJvIG9uIDoKKworaHR0cDovL3N0cmF3YmVycnlwZXJsLmNvbS9yZWxlYXNlcy5odG1sCisKK0ZpbGU6IHN0cmF3YmVycnktcGVybC01LjguOC4zLnppcAorCitjb250ZW50czogYGJpbi9gIGBsaWIvYCBgc2l0ZS9gCisKK2NvcHkgdGhlIGNvbnRlbnRzIG9mIGxpYiBpbnRvIGBtc3lzZ2l0L2xpYi9wZXJsNS81LjguOGAgYW5kIG92ZXJ3cml0ZSBleGlzdGluZyBmaWxlcy4KKworRW5hYmxlIEdpdFdlYiBJbnRlZ3JhdGlvbgorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgogCiBUbyBlbmFibGUgdGhlIGV4dGVybmFsIGdpdHdlYiBpbnRlZ3JhdGlvbiwgc2V0CiBsaW5rOmNvbmZpZy1nZXJyaXQuaHRtbCNnaXR3ZWIudXJsW2dpdHdlYi51cmxdIHdpdGggdGhlIFVSTCBvZiB5b3VyCkBAIC03OSwxNiArMjI2LDI3IEBACiBiZWluZyB1c2VkLCBlbnN1cmUgaXQgdXNlcyBhIGZ1bGwgbWlycm9yLCBzbyB0aGUgYHJlZnMvY2hhbmdlcy8qYAogbmFtZXNwYWNlIGlzIGF2YWlsYWJsZS4KIAotPT09PQotICBnaXQgY29uZmlnIC0tZmlsZSAkc2l0ZV9wYXRoL2V0Yy9nZXJyaXQuY29uZmlnIGdpdHdlYi51cmwgaHR0cDovL2V4YW1wbGUuY29tL2dpdHdlYi5jZ2kKLSAgZ2l0IGNvbmZpZyAtLWZpbGUgJHNpdGVfcGF0aC9ldGMvZ2Vycml0LmNvbmZpZyAtLXVuc2V0IGdpdHdlYi5jZ2kKLT09PT0KKy0tLS0KKyQgZ2l0IGNvbmZpZyAtZiAkc2l0ZV9wYXRoL2V0Yy9nZXJyaXQuY29uZmlnIGdpdHdlYi5jZ2kgJFBBVEhfVE9fR0lUV0VCL2dpdHdlYi5jZ2kKKyQgZ2l0IGNvbmZpZyAtZiAkc2l0ZV9wYXRoL2V0Yy9nZXJyaXQuY29uZmlnIGdpdHdlYi51cmwgaHR0cHM6Ly9naXR3ZWIuY29ycG9yYXRpb24uY29tCistLS0tCisKK0lmIHlvdSdyZSBub3QgZm9sbG93aW5nIHRoZSB0cmFkaXRpb25hbCBce3Byb2plY3ROYW1lXH0uZ2l0IHByb2plY3QgbmFtaW5nIGNvbnZlbnRpb25zLAoreW91IHdpbGwgd2FudCB0byBjdXN0b21pemUgR2Vycml0IHRvIHJlYWQgdGhlbS4gQWRkIHRoZSBmb2xsb3dpbmc6CisKKy0tLS0KKyQgZ2l0IGNvbmZpZyAtZiAkc2l0ZV9wYXRoL2V0Yy9nZXJyaXQuY29uZmlnIGdpdHdlYi50eXBlIGN1c3RvbQorJCBnaXQgY29uZmlnIC1mICRzaXRlX3BhdGgvZXRjL2dlcnJpdC5jb25maWcgZ2l0d2ViLnByb2plY3QgP3A9XCR7cHJvamVjdH1cO2E9c3VtbWFyeQorJCBnaXQgY29uZmlnIC1mICRzaXRlX3BhdGgvZXRjL2dlcnJpdC5jb25maWcgZ2l0d2ViLnJldmlzaW9uID9wPVwke3Byb2plY3R9XDthPWNvbW1pdFw7aD1cJHtjb21taXR9CiskIGdpdCBjb25maWcgLWYgJHNpdGVfcGF0aC9ldGMvZ2Vycml0LmNvbmZpZyBnaXR3ZWIuYnJhbmNoID9wPVwke3Byb2plY3R9XDthPXNob3J0bG9nXDtoPVwke2JyYW5jaH0KKyQgZ2l0IGNvbmZpZyAtZiAkc2l0ZV9wYXRoL2V0Yy9nZXJyaXQuY29uZmlnIGdpdHdlYi5maWxlaGlzdG9yeSA/cD1cJHtwcm9qZWN0fVw7YT1oaXN0b3J5XDtoYj1cJHticmFuY2h9XDtmPVwke2ZpbGV9CistLS0tCiAKIEFmdGVyIHVwZGF0aW5nIGAnJHNpdGVfcGF0aCcvZXRjL2dlcnJpdC5jb25maWdgLCB0aGUgR2Vycml0IHNlcnZlciBtdXN0CiBiZSByZXN0YXJ0ZWQgYW5kIGNsaWVudHMgbXVzdCByZWxvYWQgdGhlIGhvc3QgcGFnZSB0byBzZWUgdGhlIGNoYW5nZS4KIAogQWNjZXNzIENvbnRyb2wKLX5+fn5+fn5+fn5+fn5+CisrKysrKysrKysrKysrKwogCiBHaXR3ZWIgYWNjZXNzIGNvbnRyb2xzIGNhbiBiZSBpbXBsZW1lbnRlZCB1c2luZyBzdGFuZGFyZCB3ZWIgc2VydmVyCiBhY2Nlc3MgY29udHJvbHMuICBUaGlzIGlzbid0IHR5cGljYWxseSBpbnRlZ3JhdGVkIHdpdGggR2Vycml0J3Mgb3duCkBAIC05Niw3ICsyNTQsNyBAQAogY29uc2lzdGVudCBpZiBhY2Nlc3MgbmVlZHMgdG8gYmUgcmVzdHJpY3RlZC4KIAogQ2FjaGluZyBHaXR3ZWIKLX5+fn5+fn5+fn5+fn5+CisrKysrKysrKysrKysrKwogCiBJZiB5b3VyIHJlcG9zaXRvcnkgc2V0IGlzIGxhcmdlIGFuZCB5b3UgYXJlIGV4cGVjdGluZyBhIGxvdAogb2YgdXNlcnMsIHlvdSBtYXkgd2FudCB0byBsb29rIGF0IHRoZSBjYWNoaW5nIGZvcmtzIHVzZWQgYnkKQEAgLTExMiw3ICsyNzAsNyBAQAogSXQgaXMgYWxzbyBwb3NzaWJsZSB0byBkZWZpbmUgY3VzdG9tIHBhdHRlcm5zLgogCiBTZWUgQWxzbwotLS0tLS0tLS0KK35+fn5+fn5+CiAKICogbGluazpjb25maWctZ2Vycml0Lmh0bWwjZ2l0d2ViW1NlY3Rpb24gZ2l0d2ViXQogKiBsaW5rOmh0dHA6Ly9oamVtbGkubmV0L2dpdC9jZ2l0L1tjZ2l0XQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jb25maWctaG9va3MudHh0IGIvRG9jdW1lbnRhdGlvbi9jb25maWctaG9va3MudHh0CmluZGV4IGRmZGJhNTIuLjEyMzYwNzcgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vY29uZmlnLWhvb2tzLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2NvbmZpZy1ob29rcy50eHQKQEAgLTExLDE1ICsxMSwzMyBAQAogCiBNYWtlIHN1cmUgeW91ciBob29rIHNjcmlwdHMgYXJlIGV4ZWN1dGFibGUgaWYgcnVubmluZyBvbiAqbml4LgogCi1Ib29rcyBhcmUgcnVuIGluIHRoZSBiYWNrZ3JvdW5kIGFmdGVyIHRoZSByZWxldmFudCBjaGFuZ2UgaGFzCi10YWtlbiBwbGFjZSBzbyBhcmUgdW5hYmxlIHRvIGFmZmVjdCB0aGUgb3V0Y29tZSBvZiBhbnkgZ2l2ZW4KLWNoYW5nZS4gQmVjYXVzZSBvZiB0aGUgZmFjdCB0aGUgaG9va3MgYXJlIHJ1biBpbiB0aGUgYmFja2dyb3VuZAotYWZ0ZXIgdGhlIGFjdGl2aXR5LCBhIGhvb2sgbWlnaHQgbm90IGJlIG5vdGlmaWVkIGFib3V0IGFuIGV2ZW50IGlmCi10aGUgc2VydmVyIGlzIHNodXRkb3duIGJlZm9yZSB0aGUgaG9vayBjYW4gYmUgaW52b2tlZC4KK1dpdGggdGhlIGV4Y2VwdGlvbiBvZiB0aGUgcmVmLXVwZGF0ZSBob29rLCBob29rcyBhcmUgcnVuIGluIHRoZSBiYWNrZ3JvdW5kCithZnRlciB0aGUgcmVsZXZhbnQgY2hhbmdlIGhhcyB0YWtlbiBwbGFjZSBzbyBhcmUgdW5hYmxlIHRvIGFmZmVjdAordGhlIG91dGNvbWUgb2YgYW55IGdpdmVuIGNoYW5nZS4gQmVjYXVzZSBvZiB0aGUgZmFjdCB0aGUgaG9va3MgYXJlCitydW4gaW4gdGhlIGJhY2tncm91bmQgYWZ0ZXIgdGhlIGFjdGl2aXR5LCBhIGhvb2sgbWlnaHQgbm90IGJlIG5vdGlmaWVkCithYm91dCBhbiBldmVudCBpZiB0aGUgc2VydmVyIGlzIHNodXRkb3duIGJlZm9yZSB0aGUgaG9vayBjYW4gYmUgaW52b2tlZC4KIAogU3VwcG9ydGVkIEhvb2tzCiAtLS0tLS0tLS0tLS0tLS0KIAorcmVmLXVwZGF0ZQorfn5+fn5+fn5+fgorCitUaGlzIGlzIGNhbGxlZCB3aGVuIGEgcHVzaCByZXF1ZXN0IGlzIHJlY2VpdmVkIGJ5IEdlcnJpdC4gSXQgYWxsb3dzCithIHB1c2ggdG8gYmUgcmVqZWN0ZWQgYmVmb3JlIGl0IGlzIGNvbW1pdHRlZCB0byB0aGUgR2Vycml0IHJlcG9zaXRvcnkuCitJZiB0aGUgc2NyaXB0IGV4aXRzIHdpdGggbm9uLXplcm8gcmV0dXJuIGNvZGUgdGhlIHB1c2ggd2lsbCBiZSByZWplY3RlZC4KK0FueSBvdXRwdXQgZnJvbSB0aGUgc2NyaXB0IHdpbGwgYmUgcmV0dXJuZWQgdG8gdGhlIHVzZXIsIHJlZ2FyZGxlc3Mgb2YgdGhlCityZXR1cm4gY29kZS4KKworVGhpcyBob29rIGlzIGNhbGxlZCBzeW5jaHJvbm91c2x5IHNvIGl0IGlzIHJlY29tbWVuZGVkIHRoYXQKK2l0IG5vdCBibG9jay4gIEEgZGVmYXVsdCB0aW1lb3V0IG9uIHRoZSBob29rIGlzIHNldCB0byAzMCBzZWNvbmRzIHRvIGF2b2lkCisicnVuYXdheSIgaG9va3MgdXNpbmcgdXAgc2VydmVyIHRocmVhZHMuICBTZWUgbGluazpjb25maWctZ2Vycml0Lmh0bWwjaG9va3Muc3luY0hvb2tUaW1lb3V0W2hvb2tzLnN5bmNIb29rVGltZW91dF0KK2ZvciBjb25maWd1cmF0aW9uIGRldGFpbHMuCisKKz09PT0KKyAgcmVmLXVwZGF0ZSAtLXByb2plY3QgPHByb2plY3QgbmFtZT4gLS1yZWZuYW1lIDxyZWZuYW1lPiAtLXVwbG9hZGVyIDx1cGxvYWRlcj4gLS1vbGRyZXYgPHNoYTE+IC0tbmV3cmV2IDxzaGExPgorPT09PQorCiBwYXRjaHNldC1jcmVhdGVkCiB+fn5+fn5+fn5+fn5+fn5+CiAKQEAgLTQ1LDcgKzYzLDcgQEAKIFRoaXMgaXMgY2FsbGVkIHdoZW5ldmVyIGEgY29tbWVudCBpcyBhZGRlZCB0byBhIGNoYW5nZS4KIAogPT09PQotICBjb21tZW50LWFkZGVkIC0tY2hhbmdlIDxjaGFuZ2UgaWQ+IC0tY2hhbmdlLXVybCA8Y2hhbmdlIHVybD4gLS1wcm9qZWN0IDxwcm9qZWN0IG5hbWU+IC0tYnJhbmNoIDxicmFuY2g+IC0tdG9waWMgPHRvcGljPiAtLWF1dGhvciA8Y29tbWVudCBhdXRob3I+IC0tY29tbWl0IDxjb21taXQ+IC0tY29tbWVudCA8Y29tbWVudD4gWy0tPGFwcHJvdmFsIGNhdGVnb3J5IGlkPiA8c2NvcmU+IC0tPGFwcHJvdmFsIGNhdGVnb3J5IGlkPiA8c2NvcmU+IC4uLl0KKyAgY29tbWVudC1hZGRlZCAtLWNoYW5nZSA8Y2hhbmdlIGlkPiAtLWlzLWRyYWZ0IDxib29sZWFuPiAtLWNoYW5nZS11cmwgPGNoYW5nZSB1cmw+IC0tcHJvamVjdCA8cHJvamVjdCBuYW1lPiAtLWJyYW5jaCA8YnJhbmNoPiAtLXRvcGljIDx0b3BpYz4gLS1hdXRob3IgPGNvbW1lbnQgYXV0aG9yPiAtLWNvbW1pdCA8Y29tbWl0PiAtLWNvbW1lbnQgPGNvbW1lbnQ+IFstLTxhcHByb3ZhbCBjYXRlZ29yeSBpZD4gPHNjb3JlPiAtLTxhcHByb3ZhbCBjYXRlZ29yeSBpZD4gPHNjb3JlPiAuLi5dCiA9PT09CiAKIGNoYW5nZS1tZXJnZWQKQEAgLTU3LDYgKzc1LDE1IEBACiAgIGNoYW5nZS1tZXJnZWQgLS1jaGFuZ2UgPGNoYW5nZSBpZD4gLS1jaGFuZ2UtdXJsIDxjaGFuZ2UgdXJsPiAtLXByb2plY3QgPHByb2plY3QgbmFtZT4gLS1icmFuY2ggPGJyYW5jaD4gLS10b3BpYyA8dG9waWM+IC0tc3VibWl0dGVyIDxzdWJtaXR0ZXI+IC0tY29tbWl0IDxzaGExPgogPT09PQogCittZXJnZS1mYWlsZWQKK35+fn5+fn5+fn5+fgorCitDYWxsZWQgd2hlbmV2ZXIgYSBjaGFuZ2UgaGFzIGZhaWxlZCB0byBtZXJnZS4KKworPT09PQorICBtZXJnZS1mYWlsZWQgLS1jaGFuZ2UgPGNoYW5nZSBpZD4gLS1jaGFuZ2UtdXJsIDxjaGFuZ2UgdXJsPiAtLXByb2plY3QgPHByb2plY3QgbmFtZT4gLS1icmFuY2ggPGJyYW5jaD4gLS10b3BpYyA8dG9waWM+IC0tc3VibWl0dGVyIDxzdWJtaXR0ZXI+IC0tY29tbWl0IDxzaGExPiAtLXJlYXNvbiA8cmVhc29uPgorPT09PQorCiBjaGFuZ2UtYWJhbmRvbmVkCiB+fn5+fn5+fn5+fn5+fn5+CiAKQEAgLTg0LDYgKzExMSwxNSBAQAogICByZWYtdXBkYXRlZCAtLW9sZHJldiA8b2xkIHJldj4gLS1uZXdyZXYgPG5ldyByZXY+IC0tcmVmbmFtZSA8cmVmIG5hbWU+IC0tcHJvamVjdCA8cHJvamVjdCBuYW1lPiAtLXN1Ym1pdHRlciA8c3VibWl0dGVyPgogPT09PQogCityZXZpZXdlci1hZGRlZAorfn5+fn5+fn5+fn5+fn4KKworQ2FsbGVkIHdoZW5ldmVyIGEgcmV2aWV3ZXIgaXMgYWRkZWQgdG8gYSBjaGFuZ2UuCisKKz09PT0KKyAgcmV2aWV3ZXItYWRkZWQgLS1jaGFuZ2UgPGNoYW5nZSBpZD4gLS1jaGFuZ2UtdXJsIDxjaGFuZ2UgdXJsPiAtLXByb2plY3QgPHByb2plY3QgbmFtZT4gLS1icmFuY2ggPGJyYW5jaD4gLS1yZXZpZXdlciA8cmV2aWV3ZXI+Cis9PT09CisKIGNsYS1zaWduZWQKIH5+fn5+fn5+fn4KIApAQCAtMTA0LDggKzE0MCw4IEBACiAKIEZvciB0aGUgaG9vayBmaWxlbmFtZXMsIEdlcnJpdCB3aWxsIHVzZSB0aGUgdmFsdWVzIG9mIGhvb2tzLnBhdGNoc2V0Q3JlYXRlZEhvb2ssCiBob29rcy5kcmFmdFB1Ymxpc2hlZEhvb2ssIGhvb2tzLmNvbW1lbnRBZGRlZEhvb2ssIGhvb2tzLmNoYW5nZU1lcmdlZEhvb2ssCi1ob29rcy5jaGFuZ2VBYmFuZG9uZWRIb29rLCBob29rcy5jaGFuZ2VSZXN0b3JlZEhvb2ssIGhvb2tzLnJlZlVwZGF0ZWRIb29rIGFuZAotaG9va3MuY2xhU2lnbmVkSG9vay4KK2hvb2tzLmNoYW5nZUFiYW5kb25lZEhvb2ssIGhvb2tzLmNoYW5nZVJlc3RvcmVkSG9vaywgaG9va3MucmVmVXBkYXRlZEhvb2ssCitob29rcy5yZWZVcGRhdGVIb29rLCBob29rcy5yZXZpZXdlckFkZGVkSG9vayBhbmQgaG9va3MuY2xhU2lnbmVkSG9vay4KIAogTWlzc2luZyBDaGFuZ2UgVVJMcwogLS0tLS0tLS0tLS0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9jb25maWctbGFiZWxzLnR4dCBiL0RvY3VtZW50YXRpb24vY29uZmlnLWxhYmVscy50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTAxNDI0MgotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vY29uZmlnLWxhYmVscy50eHQKQEAgLTAsMCArMSwyNTUgQEAKK0dlcnJpdCBDb2RlIFJldmlldyAtIFJldmlldyBMYWJlbHMKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworQXMgcGFydCBvZiB0aGUgY29kZSByZXZpZXcgcHJvY2VzcywgcmV2aWV3ZXJzIHNjb3JlIGVhY2ggY2hhbmdlIHdpdGgKK3ZhbHVlcyBmb3IgZWFjaCBsYWJlbCBjb25maWd1cmVkIGZvciB0aGUgcHJvamVjdC4gIFRoZSBsYWJlbCB2YWx1ZXMgdGhhdAorYSBnaXZlbiB1c2VyIGlzIGFsbG93ZWQgdG8gc2V0IGFyZSBkZWZpbmVkIGFjY29yZGluZyB0byB0aGUKK2xpbms6YWNjZXNzLWNvbnRyb2wuaHRtbCNjYXRlZ29yeV9yZXZpZXdfbGFiZWxzW2FjY2VzcyBjb250cm9sc10uICBHZXJyaXQKK2NvbWVzIHByZS1jb25maWd1cmVkIHdpdGggdGhlIENvZGUtUmV2aWV3IGxhYmVsIHRoYXQgY2FuIGJlIGdyYW50ZWQgdG8KK2dyb3VwcyB3aXRoaW4gcHJvamVjdHMsIGVuYWJsaW5nIGZ1bmN0aW9uYWxpdHkgZm9yIHRoYXQgZ3JvdXAncyBtZW1iZXJzLgorCisKK1tbbGFiZWxfQ29kZS1SZXZpZXddXQorTGFiZWw6IENvZGUtUmV2aWV3CistLS0tLS0tLS0tLS0tLS0tLS0KKworVGhlIGNvZGUgcmV2aWV3IGxhYmVsIGlzIHRoZSBzZWNvbmQgb2YgdHdvIGRlZmF1bHQgbGFiZWxzIHRoYXQgaXMKK2NvbmZpZ3VyZWQgdXBvbiB0aGUgY3JlYXRpb24gb2YgYSBHZXJyaXQgaW5zdGFuY2UuICBJdCBtYXkgaGF2ZSBhbnkKK21lYW5pbmcgdGhlIHByb2plY3QgZGVzaXJlcy4gIEl0IHdhcyBvcmlnaW5hbGx5IGludmVudGVkIGJ5IHRoZSBBbmRyb2lkCitPcGVuIFNvdXJjZSBQcm9qZWN0IHRvIG1lYW4gJ0kgcmVhZCB0aGUgY29kZSBhbmQgaXQgc2VlbXMgcmVhc29uYWJseQorY29ycmVjdCcuCisKK1RoZSByYW5nZSBvZiB2YWx1ZXMgaXM6CisKKyogLTIgRG8gbm90IHN1Ym1pdAorKworVGhlIGNvZGUgaXMgc28gaG9ycmlibHkgaW5jb3JyZWN0L2J1Z2d5L2Jyb2tlbiB0aGF0IGl0IG11c3Qgbm90IGJlCitzdWJtaXR0ZWQgdG8gdGhpcyBwcm9qZWN0LCBvciB0byB0aGlzIGJyYW5jaC4gIFRoaXMgdmFsdWUgaXMgdmFsaWQKK2Fjcm9zcyBhbGwgcGF0Y2ggc2V0cyBpbiB0aGUgc2FtZSBjaGFuZ2UsIGkuZS4gdGhlIHJldmlld2VyIG11c3QKK2FjdGl2ZWx5IGNoYW5nZSBoaXMvaGVyIHJldmlldyB0byBzb21ldGhpbmcgZWxzZSBiZWZvcmUgdGhlIGNoYW5nZQoraXMgc3VibWl0dGFibGUuCisrCisqQW55IC0yIGJsb2NrcyBzdWJtaXQuKgorCisqIC0xIEkgd291bGQgcHJlZmVyIHRoYXQgeW91IGRpZG4ndCBzdWJtaXQgdGhpcworKworVGhlIGNvZGUgZG9lc24ndCBsb29rIHJpZ2h0LCBvciBjb3VsZCBiZSBkb25lIGRpZmZlcmVudGx5LCBidXQKK3RoZSByZXZpZXdlciBpcyB3aWxsaW5nIHRvIGxpdmUgd2l0aCBpdCBhcy1pcyBpZiBhbm90aGVyIHJldmlld2VyCithY2NlcHRzIGl0LCBwZXJoYXBzIGJlY2F1c2UgaXQgaXMgYmV0dGVyIHRoYW4gd2hhdCBpcyBjdXJyZW50bHkgaW4KK3RoZSBwcm9qZWN0LiAgT2Z0ZW4gdGhpcyBpcyBhbHNvIHVzZWQgYnkgY29udHJpYnV0b3JzIHdobyBkb24ndCBsaWtlCit0aGUgY2hhbmdlLCBidXQgYWxzbyBhcmVuJ3QgcmVzcG9uc2libGUgZm9yIHRoZSBwcm9qZWN0IGxvbmctdGVybQorYW5kIHRodXMgZG9uJ3QgaGF2ZSBmaW5hbCBzYXkgb24gY2hhbmdlIHN1Ym1pc3Npb24uCisrCitEb2VzIG5vdCBibG9jayBzdWJtaXQuCisKKyogMCBObyBzY29yZQorKworRGlkbid0IHRyeSB0byBwZXJmb3JtIHRoZSBjb2RlIHJldmlldyB0YXNrLCBvciBnbGFuY2VkIG92ZXIgaXQgYnV0Citkb24ndCBoYXZlIGFuIGluZm9ybWVkIG9waW5pb24geWV0LgorCisqICsxIExvb2tzIGdvb2QgdG8gbWUsIGJ1dCBzb21lb25lIGVsc2UgbXVzdCBhcHByb3ZlCisrCitUaGUgY29kZSBsb29rcyByaWdodCB0byB0aGlzIHJldmlld2VyLCBidXQgdGhlIHJldmlld2VyIGRvZXNuJ3QKK2hhdmUgYWNjZXNzIHRvIHRoZSBgKzJgIHZhbHVlIGZvciB0aGlzIGNhdGVnb3J5LiAgT2Z0ZW4gdGhpcyBpcwordXNlZCBieSBjb250cmlidXRvcnMgdG8gYSBwcm9qZWN0IHdobyB3ZXJlIGFibGUgdG8gcmV2aWV3IHRoZSBjaGFuZ2UKK2FuZCBsaWtlIHdoYXQgaXQgaXMgZG9pbmcsIGJ1dCBkb24ndCBoYXZlIGZpbmFsIGFwcHJvdmFsIG92ZXIgd2hhdAorZ2V0cyBzdWJtaXR0ZWQuCisKKyogKzIgTG9va3MgZ29vZCB0byBtZSwgYXBwcm92ZWQKKysKK0Jhc2ljYWxseSB0aGUgc2FtZSBhcyBgKzFgLCBidXQgZm9yIHRob3NlIHdobyBoYXZlIGZpbmFsIHNheSBvdmVyCitob3cgdGhlIHByb2plY3Qgd2lsbCBkZXZlbG9wLgorKworKkFueSArMiBlbmFibGVzIHN1Ym1pdC4qCisKK0ZvciBhIGNoYW5nZSB0byBiZSBzdWJtaXR0YWJsZSwgdGhlIGxhdGVzdCBwYXRjaCBzZXQgbXVzdCBoYXZlIGEKK2ArMiBMb29rcyBnb29kIHRvIG1lLCBhcHByb3ZlZGAgaW4gdGhpcyBjYXRlZ29yeSwgYW5kIG5vCitgLTIgRG8gbm90IHN1Ym1pdGAuICBUaHVzIGAtMmAgb24gYW55IHBhdGNoIHNldCBjYW4gYmxvY2sgYSBzdWJtaXQsCit3aGlsZSBgKzJgIG9uIHRoZSBsYXRlc3QgcGF0Y2ggc2V0IGNhbiBlbmFibGUgaXQuCisKK0lmIGEgR2Vycml0IGluc3RhbGxhdGlvbiBkb2VzIG5vdCB3aXNoIHRvIHVzZSB0aGlzIGxhYmVsIGluIGFueSBwcm9qZWN0LAordGhlIGBbbGFiZWwgIkNvZGUtUmV2aWV3Il1gIHNlY3Rpb24gY2FuIGJlIGRlbGV0ZWQgZnJvbSBgcHJvamVjdC5jb25maWdgCitpbiBgQWxsLVByb2plY3RzYC4KKworSWYgYSBHZXJyaXQgaW5zdGFsbGF0aW9uIG9yIHByb2plY3Qgd2FudHMgdG8gbW9kaWZ5IHRoZSBkZXNjcmlwdGlvbiB0ZXh0Cithc3NvY2lhdGVkIHdpdGggdGhlc2UgbGFiZWwgdmFsdWVzLCB0aGUgdGV4dCBjYW4gYmUgdXBkYXRlZCBpbiB0aGUKK2BsYWJlbC5Db2RlLVJldmlldy52YWx1ZWAgZmllbGRzIGluIGBwcm9qZWN0LmNvbmZpZ2AuCisKK0FkZGl0aW9uYWwgZW50cmllcyBjb3VsZCBiZSBhZGRlZCB0byBgbGFiZWwuQ29kZS1SZXZpZXcudmFsdWVgIHRvCitmdXJ0aGVyIGV4dGVuZCB0aGUgbmVnYXRpdmUgYW5kIHBvc2l0aXZlIHJhbmdlLCBidXQgdGhlcmUgaXMgbGlrZWx5CitsaXR0bGUgdmFsdWUgaW4gZG9pbmcgc28gYXMgdGhpcyBvbmx5IGV4cGFuZHMgdGhlIG1pZGRsZSByZWdpb24uICBUaGlzCitsYWJlbCBpcyBhIGBNYXhXaXRoQmxvY2tgIHR5cGUsIHdoaWNoIG1lYW5zIHRoYXQgdGhlIGxvd2VzdCBuZWdhdGl2ZQordmFsdWUgaWYgcHJlc2VudCBibG9ja3MgYSBzdWJtaXQsIHdoaWxlIHRoZSBoaWdoZXN0IHBvc2l0aXZlIHZhbHVlIGlzCityZXF1aXJlZCB0byBlbmFibGUgc3VibWl0LgorCitbW2xhYmVsX1ZlcmlmaWVkXV0KK0xhYmVsOiBWZXJpZmllZAorLS0tLS0tLS0tLS0tLS0tCisKK1RoZSBWZXJpZmllZCBsYWJlbCB3YXMgb3JpZ2luYWxseSBpbnZlbnRlZCBieSB0aGUgQW5kcm9pZCBPcGVuIFNvdXJjZQorUHJvamVjdCB0byBtZWFuICdjb21waWxlcywgcGFzc2VzIGJhc2ljIHVuaXQgdGVzdHMnLiAgU29tZSBDSSB0b29scworZXhwZWN0IHRvIHVzZSB0aGUgVmVyaWZpZWQgbGFiZWwgdG8gdm90ZSBvbiBhIGNoYW5nZSBhZnRlciBydW5uaW5nLgorCitBZG1pbmlzdHJhdG9ycyBjYW4gaW5zdGFsbCB0aGUgVmVyaWZpZWQgbGFiZWwgYnkgYWRkaW5nIHRoZSBmb2xsb3dpbmcKK3RleHQgdG8gYHByb2plY3QuY29uZmlnYDoKKworPT09PQorICBbbGFiZWwgIlZlcmlmaWVkIl0KKyAgICAgIGZ1bmN0aW9uID0gTWF4V2l0aEJsb2NrCisgICAgICB2YWx1ZSA9IC0xIEZhaWxzCisgICAgICB2YWx1ZSA9ICAwIE5vIHNjb3JlCisgICAgICB2YWx1ZSA9ICsxIFZlcmlmaWVkCis9PT09CisKK1RoZSByYW5nZSBvZiB2YWx1ZXMgaXM6CisKKyogLTEgRmFpbHMKKysKK1RyaWVkIHRvIGNvbXBpbGUsIGJ1dCBnb3QgYSBjb21waWxlIGVycm9yLCBvciB0cmllZCB0byBydW4gdGVzdHMsCitidXQgb25lIG9yIG1vcmUgdGVzdHMgZGlkIG5vdCBwYXNzLgorKworKkFueSAtMSBibG9ja3Mgc3VibWl0LioKKworKiAwIE5vIHNjb3JlCisrCitEaWRuJ3QgdHJ5IHRvIHBlcmZvcm0gdGhlIHZlcmlmaWNhdGlvbiB0YXNrcy4KKworKiArMSBWZXJpZmllZAorKworQ29tcGlsZWQgKGFuZCByYW4gdGVzdHMpIHN1Y2Nlc3NmdWxseS4KKysKKypBbnkgKzEgZW5hYmxlcyBzdWJtaXQuKgorCitGb3IgYSBjaGFuZ2UgdG8gYmUgc3VibWl0dGFibGUsIHRoZSBjaGFuZ2UgbXVzdCBoYXZlIGEgYCsxIFZlcmlmaWVkYAoraW4gdGhpcyBsYWJlbCwgYW5kIG5vIGAtMSBGYWlsc2AuICBUaHVzLCBgLTEgRmFpbHNgIGNhbiBibG9jayBhIHN1Ym1pdCwKK3doaWxlIGArMSBWZXJpZmllZGAgZW5hYmxlcyBhIHN1Ym1pdC4KKworQWRkaXRpb25hbCB2YWx1ZXMgY291bGQgYWxzbyBiZSBhZGRlZCB0byB0aGlzIGxhYmVsLCB0byBhbGxvdyBpdCB0bworYmVoYXZlIG1vcmUgbGlrZSBgQ29kZS1SZXZpZXdgIChiZWxvdykuICBBZGQgLTIgYW5kICsyIGVudHJpZXMgdG8gdGhlCitgbGFiZWwuVmVyaWZpZWQudmFsdWVgIGZpZWxkcyBpbiBgcHJvamVjdC5jb25maWdgIHRvIGdldCB0aGUgc2FtZQorYmVoYXZpb3IuCisKKworW1tsYWJlbF9jdXN0b21dXQorWW91ciBMYWJlbCBIZXJlCistLS0tLS0tLS0tLS0tLS0KKworU2l0ZSBhZG1pbmlzdHJhdG9ycyBhbmQgcHJvamVjdCBvd25lcnMgY2FuIGFsc28gZGVmaW5lIHRoZWlyIG93biBsYWJlbHMuCisKK1NlZSBhYm92ZSBmb3IgZGVzY3JpcHRpb25zIG9mIGhvdyA8PGxhYmVsX1ZlcmlmaWVkLGBWZXJpZmllZGA+PgorYW5kIDw8bGFiZWxfQ29kZS1SZXZpZXcsYENvZGUtUmV2aWV3YD4+IHdvcmssIGFuZCBhZGQgeW91ciBvd24KK2xhYmVsIHRvIGBwcm9qZWN0LmNvbmZpZ2AgdG8gZ2V0IHRoZSBzYW1lIGJlaGF2aW9yIG92ZXIgeW91ciBvd24gcmFuZ2UKK29mIHZhbHVlcywgZm9yIGFueSBsYWJlbCB5b3UgZGVzaXJlLgorCitKdXN0IGxpa2UgdGhlIGJ1aWx0LWluIGxhYmVscywgdXNlcnMgbmVlZCB0byBiZSBnaXZlbiBwZXJtaXNzaW9ucyB0bwordm90ZSBvbiBjdXN0b20gbGFiZWxzLiBQZXJtaXNzaW9ucyBjYW4gZWl0aGVyIGJlIGFkZGVkIGJ5IG1hbnVhbGx5CitlZGl0aW5nIHByb2plY3QuY29uZmlnIHdoZW4gYWRkaW5nIHRoZSBsYWJlbHMsIG9yLCBvbmNlIHRoZSBsYWJlbHMgYXJlCithZGRlZCwgcGVybWlzc2lvbiBjYXRlZ29yaWVzIGZvciB0aG9zZSBsYWJlbHMgd2lsbCBzaG93IHVwIGluIHRoZQorcGVybWlzc2lvbiBlZGl0b3Igd2ViIFVJLgorCitMYWJlbHMgbWF5IGJlIGFkZGVkIHRvIGFueSBwcm9qZWN0J3MgYHByb2plY3QuY29uZmlnYDsgdGhlIGRlZmF1bHQKK2xhYmVscyBhcmUgZGVmaW5lZCBpbiBgQWxsLVByb2plY3RzYC4gTGFiZWxzIGFyZSBpbmhlcml0ZWQgZnJvbSBwYXJlbnQKK3Byb2plY3RzOyBhIGNoaWxkIHByb2plY3QgbWF5IGFkZCwgb3ZlcnJpZGUsIG9yIHJlbW92ZSBsYWJlbHMgZGVmaW5lZCBpbgoraXRzIHBhcmVudHMuICBPdmVycmlkaW5nIGEgbGFiZWwgaW4gYSBjaGlsZCBwcm9qZWN0IG92ZXJyaWRlcyBhbGwgaXRzCitwcm9wZXJ0aWVzIGFuZCB2YWx1ZXMuICBUbyByZW1vdmUgYSBsYWJlbCBpbiBhIGNoaWxkIHByb2plY3QsIGFkZCBhbgorZW1wdHkgbGFiZWwgd2l0aCB0aGUgc2FtZSBuYW1lIGFzIGluIHRoZSBwYXJlbnQuCisKK0xhYmVscyBhcmUgbGFpZCBvdXQgaW4gdGhlIG9yZGVyIHRoZXkgYXJlIHNwZWNpZmllZCBpbiBwcm9qZWN0LmNvbmZpZywKK3dpdGggaW5oZXJpdGVkIGxhYmVscyBhcHBlYXJpbmcgZmlyc3QsIHByb3ZpZGluZyBzb21lIGxheW91dCBjb250cm9sIHRvCit0aGUgYWRtaW5pc3RyYXRvci4KKworW1tsYWJlbF9uYW1lXV0KK2BsYWJlbC5MYWJlbC1OYW1lYAorfn5+fn5+fn5+fn5+fn5+fn5+CisKK1RoZSBuYW1lIGZvciBhIGxhYmVsLCBjb25zaXN0aW5nIG9ubHkgb2YgYWxwaGFudW1lcmljIGNoYXJhY3RlcnMgYW5kCitgLWAuCisKKworW1tsYWJlbF92YWx1ZV1dCitgbGFiZWwuTGFiZWwtTmFtZS52YWx1ZWAKK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorCitBIG11bHRpLXZhbHVlZCBrZXkgd2hvc2UgdmFsdWVzIGFyZSBvZiB0aGUgZm9ybSBgIjwjPiBWYWx1ZSBkZXNjcmlwdGlvbgordGV4dCJgLiBUaGUgYDwjPmAgbWF5IGJlIGFueSBwb3NpdGl2ZSBvciBuZWdhdGl2ZSBudW1iZXIgd2l0aCBhbgorb3B0aW9uYWwgbGVhZGluZyBgK2AuCisKKworW1tsYWJlbF9hYmJyZXZpYXRlZE5hbWVdXQorYGxhYmVsLkxhYmVsLU5hbWUuYWJicmV2aWF0ZWROYW1lYAorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorCitBbiBhYmJyZXZpYXRlZCBuYW1lIGZvciBhIGxhYmVsIHNob3duIGFzIGEgY29tcGFjdCBjb2x1bW4gaGVhZGVyLCBmb3IKK2V4YW1wbGUgb24gcHJvamVjdCBkYXNoYm9hcmRzLiBEZWZhdWx0cyB0byBhbGwgdGhlIHVwcGVyY2FzZSBjaGFyYWN0ZXJzCitpbiB0aGUgbGFiZWwgbmFtZSwgZS5nLiBgTGFiZWwtTmFtZWAgaXMgYWJicmV2aWF0ZWQgYnkgZGVmYXVsdCBhcyBgTE5gLgorCisKK1tbbGFiZWxfZnVuY3Rpb25dXQorYGxhYmVsLkxhYmVsLU5hbWUuZnVuY3Rpb25gCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKworVGhlIG5hbWUgb2YgYSBmdW5jdGlvbiBmb3IgZXZhbHVhdGluZyBtdWx0aXBsZSB2b3RlcyBmb3IgYSBsYWJlbC4gIFRoaXMKK2Z1bmN0aW9uIGlzIG9ubHkgYXBwbGllZCBpZiB0aGUgZGVmYXVsdCBzdWJtaXQgcnVsZSBpcyB1c2VkIGZvciBhIGxhYmVsLgorSWYgeW91IHdyaXRlIGEgbGluazpwcm9sb2ctY29va2Jvb2suaHRtbCNIb3dUb1dyaXRlU3VibWl0UnVsZXNbY3VzdG9tCitzdWJtaXQgcnVsZV0gKGFuZCBkbyBub3QgY2FsbCB0aGUgZGVmYXVsdCBydWxlKSwgdGhlIGZ1bmN0aW9uIG5hbWUgaXMKK2lnbm9yZWQgYW5kIG1heSBiZSB0cmVhdGVkIGFzIG9wdGlvbmFsLgorCitWYWxpZCB2YWx1ZXMgYXJlOgorCisqIGBNYXhXaXRoQmxvY2tgIChkZWZhdWx0KQorKworVGhlIGxvd2VzdCBwb3NzaWJsZSBuZWdhdGl2ZSB2YWx1ZSwgaWYgcHJlc2VudCwgYmxvY2tzIGEgc3VibWl0LCB3aGlsZQordGhlIGhpZ2hlc3QgcG9zc2libGUgcG9zaXRpdmUgdmFsdWUgaXMgcmVxdWlyZWQgdG8gZW5hYmxlIHN1Ym1pdC4gVGhlcmUKK211c3QgYmUgYXQgbGVhc3Qgb25lIHBvc2l0aXZlIHZhbHVlLCBvciBlbHNlIHN1Ym1pdCB3aWxsIG5ldmVyIGJlCitlbmFibGVkLiBUbyBwZXJtaXQgYmxvY2tpbmcgc3VibWl0cywgZW5zdXJlIGEgbmVnYXRpdmUgdmFsdWUgaXMgZGVmaW5lZC4KKworKiBgTWF4Tm9CbG9ja2AKKysKK1RoZSBoaWdoZXN0IHBvc3NpYmxlIHBvc2l0aXZlIHZhbHVlIGlzIHJlcXVpcmVkIHRvIGVuYWJsZSBzdWJtaXQsIGJ1dAordGhlIGxvd2VzdCBwb3NzaWJsZSBuZWdhdGl2ZSB2YWx1ZSB3aWxsIG5vdCBibG9jayB0aGUgY2hhbmdlLgorCisqIGBOb0Jsb2NrYC9gTm9PcGAKKysKK1RoZSBsYWJlbCBpcyBwdXJlbHkgaW5mb3JtYXRpb25hbCBhbmQgdmFsdWVzIGFyZSBub3QgY29uc2lkZXJlZCB3aGVuCitkZXRlcm1pbmluZyB3aGV0aGVyIGEgY2hhbmdlIGlzIHN1Ym1pdHRhYmxlLgorCisKK1tbbGFiZWxfY29weU1pblNjb3JlXV0KK2BsYWJlbC5MYWJlbC1OYW1lLmNvcHlNaW5TY29yZWAKK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKworSWYgdHJ1ZSwgdGhlIGxvd2VzdCBwb3NzaWJsZSBuZWdhdGl2ZSB2YWx1ZSBmb3IgdGhlIGxhYmVsIGlzIGNvcGllZAorZm9yd2FyZCB3aGVuIGEgbmV3IHBhdGNoIHNldCBpcyB1cGxvYWRlZC4KKworCitbW2xhYmVsX2Nhbk92ZXJyaWRlXV0KK2BsYWJlbC5MYWJlbC1OYW1lLmNhbk92ZXJyaWRlYAorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CisKK0lmIGZhbHNlLCB0aGUgbGFiZWwgY2Fubm90IGJlIG92ZXJyaWRkZW4gYnkgY2hpbGQgcHJvamVjdHMuIEFueQorY29uZmlndXJhdGlvbiBmb3IgdGhpcyBsYWJlbCBpbiBjaGlsZCBwcm9qZWN0cyB3aWxsIGJlIGlnbm9yZWQuIERlZmF1bHRzCit0byB0cnVlLgorCisKK1tbbGFiZWxfZXhhbXBsZV1dCitFeGFtcGxlCit+fn5+fn5+CisKK1RvIGRlZmluZSBhIG5ldyAzLXZhbHVlZCBjYXRlZ29yeSB0aGF0IGJlaGF2ZXMgZXhhY3RseSBsaWtlIGBWZXJpZmllZGAsCitidXQgaGFzIGRpZmZlcmVudCBuYW1lcy9sYWJlbHM6CisKKz09PT0KKyAgW2xhYmVsICJDb3B5cmlnaHQtQ2hlY2siXQorICAgICAgZnVuY3Rpb24gPSBNYXhXaXRoQmxvY2sKKyAgICAgIHZhbHVlID0gLTEgRG8gbm90IGhhdmUgY29weXJpZ2h0CisgICAgICB2YWx1ZSA9ICAwIE5vIHNjb3JlCisgICAgICB2YWx1ZSA9ICsxIENvcHlyaWdodCBjbGVhcgorPT09PQorCitUaGUgbmV3IGNvbHVtbiB3aWxsIGFwcGVhciBhdCB0aGUgZW5kIG9mIHRoZSB0YWJsZSwgYW5kIGAtMSBEbyBub3QgaGF2ZQorY29weXJpZ2h0YCB3aWxsIGJsb2NrIHN1Ym1pdCwgd2hpbGUgYCsxIENvcHlyaWdodCBjbGVhcmAgaXMgcmVxdWlyZWQgdG8KK2VuYWJsZSBzdWJtaXQuCisKK0dFUlJJVAorLS0tLS0tCitQYXJ0IG9mIGxpbms6aW5kZXguaHRtbFtHZXJyaXQgQ29kZSBSZXZpZXddCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2NvbmZpZy1sb2dpbi1yZWdpc3Rlci50eHQgYi9Eb2N1bWVudGF0aW9uL2NvbmZpZy1sb2dpbi1yZWdpc3Rlci50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDBlMGZjNQotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vY29uZmlnLWxvZ2luLXJlZ2lzdGVyLnR4dApAQCAtMCwwICsxLDEzOCBAQAorW1t1c2Vyc2V0dXBdXQorSW5pdGFsIExvZ2luCistLS0tLS0tLS0tLS0KK0l0J3MgdGltZSB0byBleGl0IHRoZSBnZXJyaXQyIGFjY291bnQgYXMgeW91IG5vdyBoYXZlIEdlcnJpdCBydW5uaW5nIG9uIHlvdXIKK2hvc3QgYW5kIHNldHVwIHlvdXIgZmlyc3Qgd29ya3NwYWNlLgorCitTdGFydCBhIHNoZWxsIHdpdGggdGhlIGNyZWRlbnRpYWxzIG9mIHRoZSBhY2NvdW50IHlvdSB3aWxsIHBlcmZvcm0KK2RldmVsb3BtZW50IHVuZGVyLgorCitDaGVjayB3aGV0aGVyIHRoZXJlIGFyZSBhbnkgc3NoIGtleXMgYWxyZWFkeS4gWW91J3JlIGxvb2tpbmcgZm9yIHR3byBmaWxlcywKK2lkX3JzYSBhbmQgaWRfcnNhLnB1Yi4KKworLS0tLQorICB1c2VyQGhvc3Q6fiQgbHMgLnNzaAorICBhdXRob3JpemVkX2tleXMgIGNvbmZpZyAgaWRfcnNhICBpZF9yc2EucHViICBrbm93bl9ob3N0cworICB1c2VyQGhvc3Q6fiQKKy0tLS0KKworSWYgeW91IGhhdmUgdGhlIGZpbGVzLCB5b3UgbWF5IHNraXAgdGhlIGtleSBnZW5lcmF0aW5nIHN0ZXAuCisKK0lmIHlvdSBkb24ndCBzZWUgdGhlIGZpbGVzIGluIHlvdXIgbGlzdGluZywgeW91ciB3aWxsIGhhdmUgdG8gZ2VuZXJhdGUgcnNhCitrZXlzIGZvciB5b3VyIHNzaCBzZXNzaW9uczoKKworU1NIIGtleSBnZW5lcmF0aW9uCit+fn5+fn5+fn5+fn5+fn5+fn4KKworKlBsZWFzZSBkb24ndCBnZW5lcmF0ZSBuZXcga2V5cyBpZiB5b3UgYWxyZWFkeSBoYXZlIGEgdmFsaWQga2V5cGFpciEqCisqVGhleSB3aWxsIGJlIG92ZXJ3cml0dGVuISoKKworLS0tLQorICB1c2VyQGhvc3Q6fiQgc3NoLWtleWdlbiAtdCByc2EKKyAgR2VuZXJhdGluZyBwdWJsaWMvcHJpdmF0ZSByc2Ega2V5IHBhaXIuCisgIEVudGVyIGZpbGUgaW4gd2hpY2ggdG8gc2F2ZSB0aGUga2V5ICgvaG9tZS91c2VyLy5zc2gvaWRfcnNhKToKKyAgQ3JlYXRlZCBkaXJlY3RvcnkgJy9ob21lL3VzZXIvLnNzaCcuCisgIEVudGVyIHBhc3NwaHJhc2UgKGVtcHR5IGZvciBubyBwYXNzcGhyYXNlKToKKyAgRW50ZXIgc2FtZSBwYXNzcGhyYXNlIGFnYWluOgorICBZb3VyIGlkZW50aWZpY2F0aW9uIGhhcyBiZWVuIHNhdmVkIGluIC9ob21lL3VzZXIvLnNzaC9pZF9yc2EuCisgIFlvdXIgcHVibGljIGtleSBoYXMgYmVlbiBzYXZlZCBpbiAvaG9tZS91c2VyLy5zc2gvaWRfcnNhLnB1Yi4KKyAgVGhlIGtleSBmaW5nZXJwcmludCBpczoKKyAgMDA6MTE6MjI6MDA6MTE6MjI6MDA6MTE6NDQ6MDA6MTE6MjI6MDA6MTE6MjI6OTkgdXNlckBob3N0CisgIFRoZSBrZXkncyByYW5kb21hcnQgaW1hZ2UgaXM6CisgICstLVsgUlNBIDIwNDhdLS0tLSsKKyAgfCAgICAgLi4rLio9K29vLipFfAorICB8ICAgICAgdS5Pb0IuLiAuICt8CisgIHwgICAgICAgLi4qLiAgICAgIHwKKyAgfCAgICAgICBvICAgICAgICAgfAorICB8ICAgICAgLiBTIC4uICAgICB8CisgIHwgICAgICAgICAgICAgICAgIHwKKyAgfCAgICAgICAgICAgICAgICAgfAorICB8ICAgICAgICAgIC4uICAgICB8CisgIHwgICAgICAgICAgICAgICAgIHwKKyAgKy0tLS0tLS0tLS0tLS0tLS0tKworICB1c2VyQGhvc3Q6fiQKKy0tLS0KKworUmVnaXN0ZXJpbmcgeW91ciBrZXkgaW4gR2Vycml0Cit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKworT3BlbiBhIGJyb3dzZXIgYW5kIGVudGVyIHRoZSBjYW5vbmljYWwgdXJsIG9mIHlvdXIgR2Vycml0IHNlcnZlci4gIFlvdSBjYW4KK2ZpbmQgdGhlIHVybCBpbiB0aGUgc2V0dGluZ3MgZmlsZS4KKworLS0tLQorICBnZXJyaXQyQGhvc3Q6fiQgZ2l0IGNvbmZpZyAtZiB+L2dlcnJpdF90ZXN0c2l0ZS9ldGMvZ2Vycml0LmNvbmZpZyBnZXJyaXQuY2Fub25pY2FsV2ViVXJsCisgIGh0dHA6Ly9sb2NhbGhvc3Q6ODA4MC8KKyAgZ2Vycml0MkBob3N0On4kCistLS0tCisKK1JlZ2lzdGVyIGEgbmV3IGFjY291bnQgaW4gR2Vycml0IHRocm91Z2ggdGhlIHdlYiBpbnRlcmZhY2Ugd2l0aCB0aGUKK2VtYWlsIGFkZHJlc3Mgb2YgeW91ciBjaG9pY2UuCisKK1RoZSBkZWZhdWx0IGF1dGhlbnRpY2F0aW9uIHR5cGUgaXMgT3BlbklELiAgSWYgeW91ciBHZXJyaXQgc2VydmVyIGlzIGJlaGluZCBhCitwcm94eSwgYW5kIHlvdSBhcmUgdXNpbmcgYW4gZXh0ZXJuYWwgT3BlbklEIHByb3ZpZGVyLCB5b3Ugd2lsbCBuZWVkIHRvIGFkZCB0aGUKK3Byb3h5IHNldHRpbmdzIGluIHRoZSBjb25maWd1cmF0aW9uIGZpbGUuCisKKy0tLS0KKyAgZ2Vycml0MkBob3N0On4kIGdpdCBjb25maWcgLWYgfi9nZXJyaXRfdGVzdHNpdGUvZXRjL2dlcnJpdC5jb25maWcgLS1hZGQgaHR0cC5wcm94eSBodHRwOi8vcHJveHk6ODA4MAorICBnZXJyaXQyQGhvc3Q6fiQgZ2l0IGNvbmZpZyAtZiB+L2dlcnJpdF90ZXN0c2l0ZS9ldGMvZ2Vycml0LmNvbmZpZyAtLWFkZCBodHRwLnByb3h5VXNlcm5hbWUgdXNlcm5hbWUKKyAgZ2Vycml0MkBob3N0On4kIGdpdCBjb25maWcgLWYgfi9nZXJyaXRfdGVzdHNpdGUvZXRjL2dlcnJpdC5jb25maWcgLS1hZGQgaHR0cC5wcm94eVBhc3N3b3JkIHBhc3N3b3JkCistLS0tCisKK1JlZmVyIHRvIHRoZSBHZXJyaXQgY29uZmlndXJhdGlvbiBndWlkZSBmb3IgbW9yZSBkZXRhaWxlZCBpbmZvcm1hdGlvbiBhYm91dAorbGluazpjb25maWctZ2Vycml0Lmh0bWwjYXV0aFthdXRoZW50aWNhdGlvbl0gYW5kCitsaW5rOmNvbmZpZy1nZXJyaXQuaHRtbCNodHRwLnByb3h5W3Byb3h5XSBzZXR0aW5ncy4KKworVGhlIGZpcnN0IHVzZXIgdG8gc2lnbi1pbiBhbmQgcmVnaXN0ZXIgYW4gYWNjb3VudCB3aWxsIGJlCithdXRvbWF0aWNhbGx5IHBsYWNlZCBpbnRvIHRoZSBmdWxseSBwcml2aWxlZ2VkIEFkbWluaXN0cmF0b3JzIGdyb3VwLAorcGVybWl0dGluZyBzZXJ2ZXIgbWFuYWdlbWVudCBvdmVyIHRoZSB3ZWIgYW5kIG92ZXIgU1NILiAgU3Vic2VxdWVudAordXNlcnMgd2lsbCBiZSBhdXRvbWF0aWNhbGx5IHJlZ2lzdGVyZWQgYXMgdW5wcml2aWxlZ2VkIHVzZXJzLgorCitPbmNlIHNpZ25lZCBpbiBhcyB5b3VyIHVzZXIsIHlvdSBmaW5kIGEgbGl0dGxlIHdpemFyZCB0byBnZXQgeW91IHN0YXJ0ZWQuCitUaGUgd2l6YXJkIGhlbHBzIHlvdSBmaWxsIG91dDoKKworKiBSZWFsIG5hbWUgKHZpc2libGUgbmFtZSBpbiBHZXJyaXQpCisqIFJlZ2lzdGVyIHlvdXIgZW1haWwgKGl0IG11c3QgYmUgY29uZmlybWVkIGxhdGVyKQorKiBTZWxlY3QgYSB1c2VybmFtZSB3aXRoIHdoaWNoIHRvIGNvbW11bmljYXRlIHdpdGggR2Vycml0IG92ZXIgc3NoK2dpdAorCisqIFRoZSBzZXJ2ZXIgd2lsbCBhc2sgeW91IGZvciBhbiBSU0EgcHVibGljIGtleS4KK1RoYXQncyB0aGUga2V5IHdlIGdlbmVyYXRlZCBhYm92ZSwgYW5kIGl0J3MgdGltZSB0byBtYWtlIHN1cmUgdGhhdCBHZXJyaXQga25vd3MKK2Fib3V0IG91ciBuZXcga2V5IGFuZCBjYW4gaWRlbnRpZnkgdXMgYnkgaXQuCisKKy0tLS0KKyAgdXNlckBob3N0On4kIGNhdCAuc3NoL2lkX3JzYS5wdWIKKyAgc3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBQkl3QUFBUUVBMWJpZE9kOExBcDdWcDk1TTFiOXorTEdPOTZPRVd6ZEFnQlBmWlBxMDVqVWgKKyAgancwbUlkVXV2ZzVsaHdzd25Oc3ZtbkZoR2JzVW9YWnVpNmpkWGo3eFBVV09EOGZlWDJOTkVqVEFFZVg3RFhPaG5vek5Ba2svWjk4V1VWMkIKKyAgeFVCcWhSaTh2aFZtYUNNOEUrSmtIekFjKzcvSFZZQlR1UFVTN2xZUGJ5NXc5NWdzM3pWeHJYOGQxKytJWGcvdS9GLzQ3elV4aGRhRUxNdzIKKyAgZGVEOFhMaHJOUHgyRlE4M0Z4cmpuVnZFS1FKeUQyT29xeGJDMktjVUdZSi8zZmhpdXBuL1lwblpzbDUrNm1mUXVaUkpFb1ovRkgybjRERUgKKyAgd3pnQkJCYWdCcjBaWkNFa2w3NHM0S0ZacDZKSncvWlNqTVJYc1hYWFd2d2NUcGFVRURpaTcwOEhHdz09IEpvaG4gRG9lQE1BQ0hJTkUKKyAgdXNlckBob3N0On4kCistLS0tCisKK0lNUE9SVEFOVDogUGxlYXNlIHRha2Ugbm90ZSBvZiB0aGUgZXh0cmEgbGluZS1icmVha3MgaW50cm9kdWNlZCBpbiB0aGUga2V5IGFib3ZlCitmb3IgZm9ybWF0dGluZyBwdXJwb3Nlcy4gUGxlYXNlIGJlIHN1cmUgdG8gY29weSBhbmQgcGFzdGUgeW91ciBrZXkgd2l0aG91dAorbGluZS1icmVha3MuCisKK0NvcHkgdGhlIHN0cmluZyBzdGFydGluZyB3aXRoIHNzaC1yc2EgdG8geW91ciBjbGlwYm9hcmQgYW5kIHRoZW4gcGFzdGUgaXQKK2ludG8gdGhlIGJveCBmb3IgUlNBIGtleXMuIE1ha2UgKmFic29sdXRlbHkgc3VyZSogbm8gZXh0cmEgc3BhY2VzIG9yIGxpbmUgZmVlZHMKK2FyZSBlbnRlcmVkIGluIHRoZSBtaWRkbGUgb2YgdGhlIFJTQSBzdHJpbmcuCisKK1ZlcmlmeSB0aGF0IHRoZSBzc2ggY29ubmVjdGlvbiB3b3JrcyBmb3IgeW91LgorCistLS0tCisgIHVzZXJAaG9zdDp+JCBzc2ggdXNlckBsb2NhbGhvc3QgLXAgMjk0MTgKKyAgVGhlIGF1dGhlbnRpY2l0eSBvZiBob3N0ICdbbG9jYWxob3N0XToyOTQxOCAoWzEyNy4wLjAuMV06Mjk0MTgpJyBjYW4ndCBiZSBlc3RhYmxpc2hlZC4KKyAgUlNBIGtleSBmaW5nZXJwcmludCBpcyBkYjowNzozZDpjMjo5NDoyNTpiNTo4ZDphYzpiYzpiNTo5ZToyZjo5NTo1Zjo0YS4KKyAgQXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGNvbnRpbnVlIGNvbm5lY3RpbmcgKHllcy9ubyk/IHllcworICBXYXJuaW5nOiBQZXJtYW5lbnRseSBhZGRlZCAnW2xvY2FsaG9zdF06Mjk0MTgnIChSU0EpIHRvIHRoZSBsaXN0IG9mIGtub3duIGhvc3RzLgorCisgICoqKiogICAgV2VsY29tZSB0byBHZXJyaXQgQ29kZSBSZXZpZXcgICAgKioqKgorCisgIEhpIHVzZXIsIHlvdSBoYXZlIHN1Y2Nlc3NmdWxseSBjb25uZWN0ZWQgb3ZlciBTU0guCisKKyAgVW5mb3J0dW5hdGVseSwgaW50ZXJhY3RpdmUgc2hlbGxzIGFyZSBkaXNhYmxlZC4KKyAgVG8gY2xvbmUgYSBob3N0ZWQgR2l0IHJlcG9zaXRvcnksIHVzZToKKworICBnaXQgY2xvbmUgc3NoOi8vdXNlckBsb2NhbGhvc3Q6Mjk0MTgvUkVQT1NJVE9SWV9OQU1FLmdpdAorCisgIHVzZXJAaG9zdDp+JAorLS0tLQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY29uZmlnLW1haWwudHh0IGIvRG9jdW1lbnRhdGlvbi9jb25maWctbWFpbC50eHQKaW5kZXggYWQwNzA0Zi4uOGRlOGU1OSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9jb25maWctbWFpbC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9jb25maWctbWFpbC50eHQKQEAgLTQ5LDcgKzQ5LDIxIEBACiAKIFRoZSBgQ29tbWVudC52bWAgdGVtcGxhdGUgd2lsbCBkZXRlcm1pbmUgdGhlIGNvbnRlbnRzIG9mIHRoZSBlbWFpbCByZWxhdGVkIHRvCiBhIHVzZXIgc3VibWl0dGluZyBjb21tZW50cyBvbiBjaGFuZ2VzLiAgSXQgaXMgYSBgQ2hhbmdlRW1haWxgOiBzZWUKLWBDaGFuZ2VTdWJqZWN0LnZtYCBhbmQgYENoYW5nZUZvb3Rlci52bWAuCitgQ2hhbmdlU3ViamVjdC52bWAsIGBDaGFuZ2VGb290ZXIudm1gIGFuZCBgQ29tbWVudEZvb3Rlci52bWAuCisKK0NvbW1lbnRGb290ZXIudm0KK35+fn5+fn5+fn5+fn5+fn4KKworVGhlIGBDb21tZW50Rm9vdGVyLnZtYCB0ZW1wbGF0ZSB3aWxsIGRldGVybWluZSB0aGUgY29udGVudHMgb2YgdGhlIGZvb3RlcgordGV4dCB0aGF0IHdpbGwgYmUgYXBwZW5kZWQgdG8gZW1haWxzIHJlbGF0ZWQgdG8gYSB1c2VyIHN1Ym1pdHRpbmcgY29tbWVudHMgb24KK2NoYW5nZXMuICBTZWUgYENoYW5nZVN1YmplY3Qudm1gLCBgQ29tbWVudC52bWAgYW5kIGBDaGFuZ2VGb290ZXIudm1gLgorCitDb21taXRNZXNzYWdlRWRpdGVkLnZtCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CisKK1RoZSBgQ29tbWl0TWVzc2FnZUVkaXRlZC52bWAgdGVtcGxhdGUgd2lsbCBkZXRlcm1pbmUgdGhlIGNvbnRlbnRzIG9mIHRoZSBlbWFpbAorcmVsYXRlZCB0byBhIHVzZXIgZWRpdGluZyB0aGUgY29tbWl0IG1lc3NhZ2UgdGhyb3VnaCB0aGUgR2Vycml0IFVJLiAgSXQgaXMgYQorYENoYW5nZUVtYWlsYDogc2VlIGBDaGFuZ2VTdWJqZWN0LnZtYCBhbmQgYENoYW5nZUZvb3Rlci52bWAuCiAKIE1lcmdlZC52bQogfn5+fn5+fn5+CmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2NvbmZpZy1yZXZlcnNlcHJveHkudHh0IGIvRG9jdW1lbnRhdGlvbi9jb25maWctcmV2ZXJzZXByb3h5LnR4dAppbmRleCA3MTYxYzRhLi4wODU3NDQyIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2NvbmZpZy1yZXZlcnNlcHJveHkudHh0CisrKyBiL0RvY3VtZW50YXRpb24vY29uZmlnLXJldmVyc2Vwcm94eS50eHQKQEAgLTI4LDMzICsyOCwzNCBAQAogQXBhY2hlIDIgQ29uZmlndXJhdGlvbgogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi1UbyBydW4gR2Vycml0IGJlaGluZCBhbiBBcGFjaGUgc2VydmVyIHVzaW5nICdtb2RfcHJveHknLCBlbmFibGUgdGhlCitUbyBydW4gR2Vycml0IGJlaGluZCBhbiBBcGFjaGUgc2VydmVyIHdlIGNhbm5vdCB1c2UgJ21vZF9wcm94eScKK2RpcmVjdGx5LCBhcyBHZXJyaXQgcmVsaWVzIG9uIGdldHRpbmcgdW5tb2RpZmllZCBlc2NhcGVkIGZvcndhcmQKK3NsYXNoZXMuIERlcGVuZGluZyBvbiB0aGUgc2V0dGluZyBvZiAnQWxsb3dFbmNvZGVkU2xhc2hlcycsCisnbW9kX3Byb3h5JyB3b3VsZCBlaXRoZXIgZGVjb2RlIGVuY29kZWQgc2xhc2hlcywgb3IgZW5jb2RlIHRoZW0gb25jZQorYWdhaW4uIEhlbmNlLCB3ZSByZXNvcnQgdG8gdXNpbmcgJ21vZF9yZXdyaXRlJy4gVG8gZW5hYmxlIHRoZQogbmVjZXNzYXJ5IEFwYWNoZTIgbW9kdWxlczoKIAogLS0tLQotICBhMmVubW9kIHByb3h5X2h0dHAKKyAgYTJlbm1vZCByZXdyaXRlCiAgIGEyZW5tb2Qgc3NsICAgICAgICAgIDsgIyBvcHRpb25hbCwgbmVlZGVkIGZvciBIVFRQUyAvIFNTTAogLS0tLQogCi1Db25maWd1cmUgYW4gQXBhY2hlIFZpcnR1YWxIb3N0IHRvIHByb3h5IHRvIHRoZSBHZXJyaXQgZGFlbW9uLAotc2V0dGluZyB0aGUgJ1Byb3h5UGFzcycgbGluZSB0byB1c2UgdGhlICdodHRwOi8vJyBVUkwgY29uZmlndXJlZAotYWJvdmUuICBFbnN1cmUgdGhlIHBhdGggb2YgUHJveHlQYXNzIGFuZCBodHRwZC5saXN0ZW5VcmwgbWF0Y2gsCi1vciBsaW5rcyB3aWxsIHJlZGlyZWN0IHRvIGluY29ycmVjdCBsb2NhdGlvbnMuCitDb25maWd1cmUgYW4gQXBhY2hlIFZpcnR1YWxIb3N0IHRvIHByb3h5IHRvIHRoZSBHZXJyaXQgZGFlbW9uLCBzZXR0aW5nCit0aGUgJ1Jld3JpdGVSdWxlJyBsaW5lIHRvIHVzZSB0aGUgJ2h0dHA6Ly8nIFVSTCBjb25maWd1cmVkIGFib3ZlLgorRW5zdXJlIHRoZSBwYXRoIG9mICdSZXdyaXRlUnVsZScgKHRoZSBwYXJ0IGJlZm9yZSAnJDEnKSBhbmQKK2h0dHBkLmxpc3RlblVybCBtYXRjaCwgb3IgbGlua3Mgd2lsbCByZWRpcmVjdCB0byBpbmNvcnJlY3QgbG9jYXRpb25zLgorCitOb3RlIHRoYXQgdGhpcyBjb25maWd1cmF0aW9uIGFsbG93cyB0byBwYXNzIGVuY29kZWQgY2hhcmFjdGVycyB0byB0aGUKK3ZpcnR1YWwgaG9zdCwgd2hpY2ggaXMgcG90ZW50aWFsbHkgZGFuZ2Vyb3VzLiBCZSBzdXJlIHRvIHJlYWQgdXAgb24KK3RoaXMgdG9waWMgYW5kIHRoYXQgeW91IHVuZGVyc3RhbmQgdGhlIHJpc2tzLgogCiAtLS0tCiAJPFZpcnR1YWxIb3N0ICo+CiAJICBTZXJ2ZXJOYW1lIHJldmlldy5leGFtcGxlLmNvbQogCi0JICBQcm94eVJlcXVlc3RzIE9mZgotCSAgUHJveHlWaWEgT2ZmCi0JICBQcm94eVByZXNlcnZlSG9zdCBPbgotCi0JICA8UHJveHkgKj4KLQkJT3JkZXIgZGVueSxhbGxvdwotCQlBbGxvdyBmcm9tIGFsbAotCSAgPC9Qcm94eT4KLQotCSAgUHJveHlQYXNzIC9yLyBodHRwOi8vMTI3LjAuMC4xOjgwODEvci8KKwkgIEFsbG93RW5jb2RlZFNsYXNoZXMgTm9EZWNvZGUKKwkgIFJld3JpdGVFbmdpbmUgT24KKwkgIFJld3JpdGVSdWxlIF4vci8oLiopIGh0dHA6Ly9sb2NhbGhvc3Q6ODA4MS9yLyQxIFtORSxQXQogCTwvVmlydHVhbEhvc3Q+CiAtLS0tCiAKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vY29uZmlnLXZhbGlkYXRpb24udHh0IGIvRG9jdW1lbnRhdGlvbi9jb25maWctdmFsaWRhdGlvbi50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWI1ZDA0YQotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vY29uZmlnLXZhbGlkYXRpb24udHh0CkBAIC0wLDAgKzEsMjEgQEAKK0dlcnJpdCBDb2RlIFJldmlldyAtIENvbW1pdCBWYWxpZGF0aW9uCis9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitHZXJyaXQgc3VwcG9ydHMgbGluazpkZXYtcGx1Z2lucy5odG1sW3BsdWdpbi1iYXNlZF0gdmFsaWRhdGlvbiBvZgordXBsb2FkZWQgY29tbWl0cy4KKworVGhpcyBhbGxvd3MgcGx1Z2lucyB0byBwZXJmb3JtIGFkZGl0aW9uYWwgdmFsaWRhdGlvbiBjaGVja3MgYWdhaW5zdAordXBsb2FkZWQgY29tbWl0cywgYW5kIHNlbmQgYmFjayBhIHdhcm5pbmcgb3IgZXJyb3IgbWVzc2FnZSB0byB0aGUgZ2l0CitjbGllbnQuCisKK1RvIG1ha2UgdXNlIG9mIHRoaXMgZmVhdHVyZSwgYSBwbHVnaW4gbXVzdCBpbXBsZW1lbnQgdGhlIGBDb21taXRWYWxpZGF0aW9uTGlzdGVuZXJgCitpbnRlcmZhY2UuCisKK091dCBvZiB0aGUgYm94LCBHZXJyaXQgaW5jbHVkZXMgYSBwbHVnaW4gdGhhdCBjaGVja3MgdGhlIGxlbmd0aCBvZiB0aGUKK3N1YmplY3QgYW5kIGJvZHkgbGluZXMgb2YgY29tbWl0IG1lc3NhZ2VzIG9uIHVwbG9hZGVkIGNvbW1pdHMuCisKKworR0VSUklUCistLS0tLS0KK1BhcnQgb2YgbGluazppbmRleC5odG1sW0dlcnJpdCBDb2RlIFJldmlld10KKwpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9kYXRhYmFzZS1zZXR1cC50eHQgYi9Eb2N1bWVudGF0aW9uL2RhdGFiYXNlLXNldHVwLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNTU5YjBlCi0tLSAvZGV2L251bGwKKysrIGIvRG9jdW1lbnRhdGlvbi9kYXRhYmFzZS1zZXR1cC50eHQKQEAgLTAsMCArMSw2NSBAQAorW1tjcmVhdGVkYl1dCitEYXRhYmFzZSBTZXR1cAorLS0tLS0tLS0tLS0tLS0KKworRHVyaW5nIHRoZSBpbml0IHBoYXNlIG9mIEdlcnJpdCB5b3Ugd2lsbCBuZWVkIHRvIHNwZWNpZnkgd2hpY2ggZGF0YWJhc2UgdG8gdXNlLgorCitbW2NyZWF0ZWRiX2gyXV0KK0gyCit+fgorCitJZiB5b3UgY2hvb3NlIEgyLCBHZXJyaXQgd2lsbCBhdXRvbWF0aWNhbGx5IHNldCB1cCB0aGUgZW1iZWRkZWQgSDIgZGF0YWJhc2UgYXMKK2JhY2tlbmQgc28gbm8gc2V0IHVwIG9yIGNvbmZpZ3VyYXRpb24gaXMgbmVjZXNzYXJ5LgorCitVc2luZyB0aGUgZW1iZWRkZWQgSDIgZGF0YWJhc2UgaXMgdGhlIGVhc2llc3Qgd2F5IHRvIGdldCBhIEdlcnJpdAorc2l0ZSB1cCBhbmQgcnVubmluZywgbWFraW5nIGl0IGlkZWFsIGZvciBwcm9vZiBvZiBjb25jZXB0cyBvciBzbWFsbCB0ZWFtCitzZXJ2ZXJzLiAgT24gdGhlIGZsaXAgc2lkZSwgSDIgaXMgbm90IHRoZSByZWNvbW1lbmRlZCBvcHRpb24gZm9yIGxhcmdlCitjb3Jwb3JhdGUgaW5zdGFsbGF0aW9ucy4gVGhpcyBpcyBiZWNhdXNlIHRoZXJlIGlzIG5vIGVhc3kgd2F5IHRvIGludGVyYWN0Cit3aXRoIHRoZSBkYXRhYmFzZSB3aGlsZSBHZXJyaXQgaXMgb2ZmbGluZSwgaXQncyBub3QgZWFzeSB0byBiYWNrdXAgdGhlIGRhdGEsCithbmQgaXQncyBub3QgcG9zc2libGUgdG8gc2V0IHVwIEgyIGluIGEgbG9hZCBiYWxhbmNlZC9ob3Rzd2FwIGNvbmZpZ3VyYXRpb24uCisKK0lmIHRoaXMgb3B0aW9uIGludGVyZXN0cyB5b3UsIHlvdSBtaWdodCB3YW50IHRvIGNvbnNpZGVyIGxpbms6aW5zdGFsbC1xdWljay5odG1sW3RoZSBxdWljayBndWlkZV0uCisKK1tbY3JlYXRlZGJfcG9zdGdyZXNdXQorUG9zdGdyZVNRTAorfn5+fn5+fn5+fgorCitUaGlzIG9wdGlvbiBpcyBtb3JlIGNvbXBsaWNhdGVkIHRoYW4gdGhlIEgyIG9wdGlvbiBidXQgaXMgcmVjb21tZW5kZWQKK2ZvciBsYXJnZXIgaW5zdGFsbGF0aW9ucy4gSXQncyB0aGUgZGF0YWJhc2UgYmFja2VuZCB3aXRoIHRoZSBsYXJnZXN0IHVzZXJiYXNlCitpbiB0aGUgR2Vycml0IGNvbW11bml0eS4KKworQ3JlYXRlIGEgdXNlciBmb3IgdGhlIHdlYiBhcHBsaWNhdGlvbiB3aXRoaW4gUG9zdGdyZXMsIGFzc2lnbiBpdCBhCitwYXNzd29yZCwgY3JlYXRlIGEgZGF0YWJhc2UgdG8gc3RvcmUgdGhlIG1ldGFkYXRhLCBhbmQgZ3JhbnQgdGhlIHVzZXIKK2Z1bGwgcmlnaHRzIG9uIHRoZSBuZXdseSBjcmVhdGVkIGRhdGFiYXNlOgorCistLS0tCisgICQgY3JlYXRldXNlciAtLXVzZXJuYW1lPXBvc3RncmVzIC1SRElFbFBTIGdlcnJpdDIKKyAgJCBjcmVhdGVkYiAtLXVzZXJuYW1lPXBvc3RncmVzIC1FIFVURi04IC1PIGdlcnJpdDIgcmV2aWV3ZGIKKy0tLS0KKworVmlzaXQgUG9zdGdyZVNRTCdzIGxpbms6aHR0cDovL3d3dy5wb3N0Z3Jlc3FsLm9yZy9kb2NzLzkuMS9pbnRlcmFjdGl2ZS9pbmRleC5odG1sW2RvY3VtZW50YXRpb25dIGZvciBmdXJ0aGVyIGluZm9ybWF0aW9uIHJlZ2FyZGluZwordXNpbmcgUG9zdGdyZVNRTC4KKworW1tjcmVhdGVkYl9teXNxbF1dCitNeVNRTAorfn5+fn4KKworVGhpcyBvcHRpb24gaXMgYWxzbyBtb3JlIGNvbXBsaWNhdGVkIHRoYW4gdGhlIEgyIG9wdGlvbi4gSnVzdCBhcyB3aXRoCitQb3N0Z3JlU1FMIGl0J3MgYWxzbyByZWNvbW1lbmRlZCBmb3IgbGFyZ2VyIGluc3RhbGxhdGlvbnMuCisKK0NyZWF0ZSBhIHVzZXIgZm9yIHRoZSB3ZWIgYXBwbGljYXRpb24gd2l0aGluIHRoZSBkYXRhYmFzZSwgYXNzaWduIGl0IGEKK3Bhc3N3b3JkLCBjcmVhdGUgYSBkYXRhYmFzZSwgYW5kIGdpdmUgdGhlIG5ld2x5IGNyZWF0ZWQgdXNlciBmdWxsCityaWdodHMgb24gaXQ6CisKKy0tLS0KKyAgbXlzcWwKKworICBDUkVBVEUgVVNFUiAnZ2Vycml0MidAJ2xvY2FsaG9zdCcgSURFTlRJRklFRCBCWSAnc2VjcmV0JzsKKyAgQ1JFQVRFIERBVEFCQVNFIHJldmlld2RiOworICBBTFRFUiBEQVRBQkFTRSByZXZpZXdkYiBjaGFyc2V0PWxhdGluMTsKKyAgR1JBTlQgQUxMIE9OIHJldmlld2RiLiogVE8gJ2dlcnJpdDInQCdsb2NhbGhvc3QnOworICBGTFVTSCBQUklWSUxFR0VTOworLS0tLQorCitWaXNpdCBNeVNRTCdzIGxpbms6aHR0cDovL2Rldi5teXNxbC5jb20vZG9jL1tkb2N1bWVudGF0aW9uXSBmb3IgZnVydGhlcgoraW5mb3JtYXRpb24gcmVnYXJkaW5nIHVzaW5nIE15U1FMLgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9kZXYtY29udHJpYnV0aW5nLnR4dCBiL0RvY3VtZW50YXRpb24vZGV2LWNvbnRyaWJ1dGluZy50eHQKaW5kZXggMDY1ZTlkMS4uODRjYjFlMCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9kZXYtY29udHJpYnV0aW5nLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2Rldi1jb250cmlidXRpbmcudHh0CkBAIC0zMSw3ICszMSw3IEBACiB0aGUgYXBwcm92ZXJzLiAgRXZlbiBpZiB5b3UgYXJlIG5vdCBmYW1pbGlhciB3aXRoIEdlcnJpdCdzCiBpbnRlcm5hbHMsIGl0IHdvdWxkIGJlIG9mIGdyZWF0IGhlbHAgaWYgeW91IGNhbiBkb3dubG9hZCwgdHJ5CiBvdXQsIGFuZCBjb21tZW50IG9uIG5ldyBmZWF0dXJlcy4gIElmIGl0IHdvcmtzIGFzIGFkdmVydGlzZWQsCi1zYXkgc28sIGFuZCBpZiB5b3UgaGF2ZSB0aGUgcHJpdmlsaWdlcyB0byBkbyBzbywgZ28gYWhlYWQKK3NheSBzbywgYW5kIGlmIHlvdSBoYXZlIHRoZSBwcml2aWxlZ2VzIHRvIGRvIHNvLCBnbyBhaGVhZAogYW5kIGdpdmUgaXQgYSArMSBWZXJpZmllZC4gIElmIHlvdSB3b3VsZCBmaW5kIHRoZSBmZWF0dXJlCiB1c2VmdWwsIHNheSBzbyBhbmQgZ2l2ZSBpdCBhICsxIGNvZGUgcmV2aWV3LgogCkBAIC01Nyw2ICs1Nyw3IEBACiBzcGFucywgd2UgcmVhbGx5IGRvIHdhbnQgeW91ciBjb2RlLgogCiAKK1tbY29tbWl0LW1lc3NhZ2VdXQogQ29tbWl0IE1lc3NhZ2UKIC0tLS0tLS0tLS0tLS0tCiAKQEAgLTY4LDYgKzY5LDcgQEAKICAgKiBGb2xsb3dlZCBieSBhIGJsYW5rIGxpbmUKICAgKiBGb2xsb3dlZCBieSBvbmUgb3IgbW9yZSBleHBsYW5hdG9yeSBwYXJhZ3JhcGhzCiAgICogVXNlIHRoZSBwcmVzZW50IHRlbnNlIChmaXggaW5zdGVhZCBvZiBmaXhlZCkKKyAgKiBVc2UgdGhlIHBhc3QgdGVuc2Ugd2hlbiBkZXNjcmliaW5nIHRoZSBzdGF0dXMgYmVmb3JlIHRoaXMgY29tbWl0CiAgICogSW5jbHVkZSBhIEJ1ZzogSXNzdWUgPCM+IGxpbmUgaWYgZml4aW5nIGEgR2Vycml0IGlzc3VlCiAgICogSW5jbHVkZSBhIENoYW5nZS1JZCBsaW5lCiAKQEAgLTkxLDYgKzkzLDI1IEBACiAgIENoYW5nZS1JZDogSWM0YTdjMDdlZWI5OGNkZWFmNDRlOWQyMzFhNjVhNTFmM2ZjZWFlNTIKID09PT0KIAorVGhlIENoYW5nZS1JZCBpcywgYXMgdXN1YWwsIGNyZWF0ZWQgYnkgYSBsb2NhbCBnaXQgaG9vay4gIFRvIGluc3RhbGwgaXQsIHNpbXBseQorY29weSBvbmUgZnJvbSB0aGUgY2hlY2tvdXQgYW5kIG1ha2UgaXQgZXhlY3V0YWJsZToKKworPT09PQorICBjcCAuL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci90b29scy9yb290L2hvb2tzL2NvbW1pdC1tc2cgLmdpdC9ob29rcy8KKyAgY2htb2QgK3ggLmdpdC9ob29rcy9jb21taXQtbXNnCis9PT09CisKK1RvIHNldCB1cCBnaXQncyByZW1vdGUgZm9yIGVhc3kgcHVzaGluZywgcnVuIHRoZSBmb2xsb3dpbmc6CisKKz09PT0KKyAgZ2l0IHJlbW90ZSBhZGQgZ2Vycml0IGh0dHBzOi8vZ2Vycml0Lmdvb2dsZXNvdXJjZS5jb20vZ2Vycml0Cis9PT09CisKK1RoZSBIVFRQUyBhY2Nlc3MgcmVxdWlyZXMgcHJvcGVyIHVzZXJuYW1lIGFuZCBwYXNzd29yZDsgdGhpcyBjYW4gYmUgb2J0YWluZWQKK2J5IGNsaWNraW5nIHRoZSAiT2J0YWluIFBhc3N3b3JkIiBsaW5rIG9uIHRoZQorbGluazpodHRwczovL2dlcnJpdC1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbS8jL3NldHRpbmdzL2h0dHAtcGFzc3dvcmRbSFRUUAorUGFzc3dvcmQgdGFiIG9mIHRoZSB1c2VyIHNldHRpbmdzIHBhZ2VdLgorCiAKIFN0eWxlCiAtLS0tLQpAQCAtMTQwLDcgKzE2MSw3IEBACiAgICogRGVmaW5lIG5vbiBzdGF0aWMgaW50ZXJmYWNlcyBhZnRlciBzdGF0aWMgaW50ZXJmYWNlcyBpbiB5b3VyCiAgICAgY2xhc3MuCiAgICogTmV4dCB5b3Ugc2hvdWxkIGRlZmluZSBzdGF0aWMgdHlwZXMgYW5kIG1lbWJlcnMuCi0gICogRmluYWxseSBpbnN0YW5jZSBtZW1iZXJzLCB0aGVuIGNvbnN0dWN0b3JzLCBhbmQgdGhlbiBpbnN0YW5jZQorICAqIEZpbmFsbHkgaW5zdGFuY2UgbWVtYmVycywgdGhlbiBjb25zdHJ1Y3RvcnMsIGFuZCB0aGVuIGluc3RhbmNlCiAgICAgbWV0aG9kcy4KICAgKiBTb21lIGNvbW1vbiBleGNlcHRpb25zIGFyZSBwcml2YXRlIGhlbHBlciBzdGF0aWMgbWV0aG9kcyB3aGljaAogICAgIG1pZ2h0IGFwcGVhciBuZWFyIHRoZSBpbnN0YW5jZSBtZXRob2RzIHdoaWNoIHRoZXkgaGVscC4KQEAgLTIzOCw2ICsyNTksMTggQEAKICAgICBhbmQgaXQgYWxzbyBtYWtlcyAiZ2l0IHJldmVydCIgbW9yZSB1c2VmdWwuCiAgICogVXNlIHRvcGljIGJyYW5jaGVzIHRvIGxpbmsgeW91ciBzZXBhcmF0ZSBjaGFuZ2VzIHRvZ2V0aGVyLgogCitbW3Byb2Nlc3NdXQorUHJvY2VzcworLS0tLS0tLQorCitCYWNrcG9ydGluZyB0byBzdGFibGUgYnJhbmNoZXMKK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorCitGcm9tIHRpbWUgdG8gdGltZSBidWcgZml4IHJlbGVhc2VzIGFyZSBtYWRlIGZvciBleGlzdGluZyBzdGFibGUgYnJhbmNoZXMuCisKK0RldmVsb3BlcnMgY29uY2VybmVkIHdpdGggc3RhYmxlIGJyYW5jaGVzIGFyZSBlbmNvdXJhZ2VkIHRvIGJhY2twb3J0IG9yIHB1c2gKK3BhdGNoc2V0cyB0byB0aGVzZSBicmFuY2hlcywgZXZlbiBpZiBubyBuZXcgcmVsZWFzZSBpcyBwbGFubmVkLgorCiAKIEdFUlJJVAogLS0tLS0tCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2Rldi1kZXNpZ24udHh0IGIvRG9jdW1lbnRhdGlvbi9kZXYtZGVzaWduLnR4dAppbmRleCBjZTI4NjhjLi4yZTQzYjk2IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2Rldi1kZXNpZ24udHh0CisrKyBiL0RvY3VtZW50YXRpb24vZGV2LWRlc2lnbi50eHQKQEAgLTgsNyArOCw3IEBACiByZXZpZXdzIGZvciBwcm9qZWN0cyB1c2luZyB0aGUgR2l0IHZlcnNpb24gY29udHJvbCBzeXN0ZW0uCiAKIEdlcnJpdCBtYWtlcyByZXZpZXdzIGVhc2llciBieSBzaG93aW5nIGNoYW5nZXMgaW4gYSBzaWRlLWJ5LXNpZGUKLWRpc3BsYXksIGFuZCBhbGxvd2luZyBpbmxpbmUgY29tbWVudHMgdG8gYmUgYWRkZWQgYnkgYW55IHJldmlld2VyLgorZGlzcGxheSwgYW5kIGFsbG93aW5nIGlubGluZS9maWxlIGNvbW1lbnRzIHRvIGJlIGFkZGVkIGJ5IGFueSByZXZpZXdlci4KIAogR2Vycml0IHNpbXBsaWZpZXMgR2l0IGJhc2VkIHByb2plY3QgbWFpbnRhaW5lcnNoaXAgYnkgcGVybWl0dGluZwogYW55IGF1dGhvcml6ZWQgdXNlciB0byBzdWJtaXQgY2hhbmdlcyB0byB0aGUgbWFzdGVyIEdpdCByZXBvc2l0b3J5LApAQCAtOTksMTEgKzk5LDExIEBACiBwZXJtaXNzaW9ucyBpbiB0aGUgcHJvamVjdC4KIAogUmV2aWV3ZXJzIHVzZSB0aGUgd2ViIGludGVyZmFjZSB0byByZWFkIHRoZSBzaWRlLWJ5LXNpZGUgb3IgdW5pZmllZAotZGlmZiBvZiBhIGNoYW5nZSwgYW5kIGluc2VydCBkcmFmdCBpbmxpbmUgY29tbWVudHMgd2hlcmUgYXBwcm9wcmlhdGUuCi1BIGRyYWZ0IGNvbW1lbnQgaXMgdmlzaWJsZSBvbmx5IHRvIHRoZSByZXZpZXdlciwgdW50aWwgdGhleSBwdWJsaXNoCi10aG9zZSBjb21tZW50cy4gIFB1Ymxpc2hlZCBjb21tZW50cyBhcmUgYXV0b21hdGljYWxseSBlbWFpbGVkIHRvCi10aGUgY2hhbmdlIGF1dGhvciBieSBHZXJyaXQsIGFuZCBhcmUgQ0MnZCB0byBhbGwgb3RoZXIgcmV2aWV3ZXJzCi13aG8gaGF2ZSBhbHJlYWR5IGNvbW1lbnRlZCBvbiB0aGUgY2hhbmdlLgorZGlmZiBvZiBhIGNoYW5nZSwgYW5kIGluc2VydCBkcmFmdCBpbmxpbmUvZmlsZSBjb21tZW50cyB3aGVyZQorYXBwcm9wcmlhdGUuIEEgZHJhZnQgY29tbWVudCBpcyB2aXNpYmxlIG9ubHkgdG8gdGhlIHJldmlld2VyLCB1bnRpbAordGhleSBwdWJsaXNoIHRob3NlIGNvbW1lbnRzLiAgUHVibGlzaGVkIGNvbW1lbnRzIGFyZSBhdXRvbWF0aWNhbGx5CitlbWFpbGVkIHRvIHRoZSBjaGFuZ2UgYXV0aG9yIGJ5IEdlcnJpdCwgYW5kIGFyZSBDQydkIHRvIGFsbCBvdGhlcgorcmV2aWV3ZXJzIHdobyBoYXZlIGFscmVhZHkgY29tbWVudGVkIG9uIHRoZSBjaGFuZ2UuCiAKIFdoZW4gcHVibGlzaGluZyBjb21tZW50cyByZXZpZXdlcnMgYXJlIGFsc28gZ2l2ZW4gdGhlIG9wcG9ydHVuaXR5CiB0byBzY29yZSB0aGUgY2hhbmdlLCBpbmRpY2F0aW5nIHdoZXRoZXIgdGhleSBmZWVsIHRoZSBjaGFuZ2UgaXMKQEAgLTU1Myw4ICs1NTMsOCBAQAogCiBHZXJyaXQncyB3ZWIgVUkgd291bGQgcmVxdWlyZSBvbiBhdmVyYWdlIGA0K0YrRipDYCBIVFRQIHJlcXVlc3RzIHRvCiByZXZpZXcgYSBjaGFuZ2UgYW5kIHBvc3QgY29tbWVudHMuICBIZXJlIGBGYCBpcyB0aGUgbnVtYmVyIG9mIGZpbGVzCi1tb2RpZmllZCBieSB0aGUgY2hhbmdlLCBhbmQgYENgIGlzIHRoZSBudW1iZXIgb2YgaW5saW5lIGNvbW1lbnRzIGxlZnQKLWJ5IHRoZSByZXZpZXdlciBwZXIgZmlsZS4gIFRoZSBjb25zdGFudCA0IGFjY291bnRzIGZvciB0aGUgcmVxdWVzdAorbW9kaWZpZWQgYnkgdGhlIGNoYW5nZSwgYW5kIGBDYCBpcyB0aGUgbnVtYmVyIG9mIGlubGluZS9maWxlIGNvbW1lbnRzCitsZWZ0IGJ5IHRoZSByZXZpZXdlciBwZXIgZmlsZS4gIFRoZSBjb25zdGFudCA0IGFjY291bnRzIGZvciB0aGUgcmVxdWVzdAogdG8gbG9hZCB0aGUgcmV2aWV3ZXIncyBkYXNoYm9hcmQsIHRvIGxvYWQgdGhlIGNoYW5nZSBkZXRhaWwgcGFnZSwKIHRvIHB1Ymxpc2ggdGhlIHJldmlldyBjb21tZW50cywgYW5kIHRvIHJlbG9hZCB0aGUgY2hhbmdlIGRldGFpbAogcGFnZSBhZnRlciBjb21tZW50cyBhcmUgcHVibGlzaGVkLgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9kZXYtZWNsaXBzZS50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldi1lY2xpcHNlLnR4dAppbmRleCBiMmJmMDExLi42NGU1OTM1IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2Rldi1lY2xpcHNlLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2Rldi1lY2xpcHNlLnR4dApAQCAtOCwxMiArOCwxNyBAQAogcnVudGltZSBkZWJ1Z2dpbmcgZW52aXJvbm1lbnQuCiAKIAorW1ttYXZlbl1dCiBNYXZlbiBQbHVnaW4KIC0tLS0tLS0tLS0tLQogCi1JbnN0YWxsIHRoZSBNYXZlbiBJbnRlZ3JhdGlvbiBwbHVnaW5zOgorSW5zdGFsbCB0aGUgTWF2ZW4gSW50ZWdyYXRpb24gcGx1Z2lucy4KIAotaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9tMmUvZG93bmxvYWQvW20yZWNsaXBzZV0KK0luIEVjbGlwc2UgdmVyc2lvbiAzLjcgKEluZGlnbykgYW5kIGxhdGVyLCB0aGVzZSBhcmUgYXZhaWxhYmxlIGluIHRoZQorZGVmYXVsdCB1cGRhdGUgc2l0ZSBhbmQgY2FuIGJlIGZvdW5kIHVuZGVyIHRoZSAnQ29sbGFib3JhdGlvbicgY2F0ZWdvcnkuCisKK0ZvciBvbGRlciB2ZXJzaW9ucyB0aGUgdXBkYXRlIHNpdGUgbXVzdCBiZSBtYW51YWxseSBhZGRlZDsgdGhlIGxpbmsgY2FuCitiZSBmb3VuZCBvbiB0aGUgaHR0cDovL3d3dy5lY2xpcHNlLm9yZy9tMmUvZG93bmxvYWQvW20yZWNsaXBzZSBkb3dubG9hZCBwYWdlXS4KIAogCiBbW0Zvcm1hdHRpbmddXQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9kZXYtcGx1Z2lucy50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldi1wbHVnaW5zLnR4dAppbmRleCBkZDBjNDRjLi4xMjgzOGZlIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2Rldi1wbHVnaW5zLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2Rldi1wbHVnaW5zLnR4dApAQCAtMTc2LDYgKzE3Niw2OSBAQAogVG8gcmVsb2FkL3Jlc3RhcnQgYSBwbHVnaW4gdGhlIGxpbms6Y21kLXBsdWdpbi1yZWxvYWQuaHRtbFtwbHVnaW4gcmVsb2FkXQogY29tbWFuZCBjYW4gYmUgdXNlZC4KIAorW1tpbml0X3N0ZXBdXQorSW5pdCBzdGVwCit+fn5+fn5+fn4KKworUGx1Z2lucyBjYW4gY29udHJpYnV0ZSB0aGVpciBvd24gImluaXQgc3RlcCIgZHVyaW5nIHRoZSBHZXJyaXQgaW5pdAord2l6YXJkLiBUaGlzIGlzIHVzZWZ1bCBmb3IgZ3VpZGluZyB0aGUgR2Vycml0IGFkbWluaXN0cmF0b3IgdGhyb3VnaAordGhlIHNldHRpbmdzIG5lZWRlZCBieSB0aGUgcGx1Z2luIHRvIHdvcmsgcHJvcGVydGx5LgorCitGb3IgaW5zdGFuY2UgcGx1Z2lucyB0byBpbnRlZ3JhdGUgSmlyYSBpc3N1ZXMgdG8gR2Vycml0IGNoYW5nZXMgbWF5Citjb250cmlidXRlIHRoZWlyIG93biAiaW5pdCBzdGVwIiB0byBhbGxvdyBjb25maWd1cmluZyB0aGUgSmlyYSBVUkwsCitjcmVkZW50aWFscyBhbmQgcG9zc2libHkgdmVyaWZ5IGNvbm5lY3Rpdml0eSB0byB2YWxpZGF0ZSB0aGVtLgorCis9PT09CisgIEdlcnJpdC1Jbml0U3RlcDogdGxkLmV4YW1wbGUucHJvamVjdC5NeUluaXRTdGVwCis9PT09CisKK015SW5pdFN0ZXAgbmVlZHMgdG8gZm9sbG93IHRoZSBzdGFuZGFyZCBHZXJyaXQgSW5pdFN0ZXAgc3ludGF4CithbmQgYmVoYXZpb3VyOiB3cml0aW5nIHRvIHRoZSBjb25zb2xlIHVzaW5nIHRoZSBpbmplY3RlZCBDb25zb2xlVUkKK2FuZCBhY2Nlc3NpbmcgLyBjaGFuZ2luZyBjb25maWd1cmF0aW9uIHNldHRpbmdzIHVzaW5nIFNlY3Rpb24uRmFjdG9yeS4KKworSW4gYWRkaXRpb24gdG8gdGhlIHN0YW5kYXJkIEdlcnJpdCBpbml0IGluamVjdGlvbnMsIHBsdWdpbnMgcmVjZWl2ZQordGhlIEBQbHVnaW5OYW1lIFN0cmluZyBpbmplY3Rpb24gY29udGFpbmluZyB0aGVpciBvd24gcGx1Z2luIG5hbWUuCisKK0JlYXIgaW4gbWluZCB0aGF0IHRoZSBQbHVnaW4ncyBJbml0U3RlcCBjbGFzcyB3aWxsIGJlIGxvYWRlZCBidXQKK3RoZSBzdGFuZGFyZCBHZXJyaXQgcnVudGltZSBlbnZpcm9ubWVudCBpcyBub3QgYXZhaWxhYmxlIGFuZCB0aGUgcGx1Z2luJ3MKK293biBHdWljZSBtb2R1bGVzIHdlcmUgbm90IGluaXRpYWxpemVkLgorVGhpcyBtZWFucyB0aGUgSW5pdFN0ZXAgZm9yIGEgcGx1Z2luIGlzIG5vdCBleGVjdXRlZCBpbiB0aGUgc2FtZSB3YXkgdGhhdAordGhlIHBsdWdpbiBleGVjdXRlcyB3aXRoaW4gdGhlIHNlcnZlciwgYW5kIG1heSBtZWFuIGEgcGx1Z2luIGF1dGhvciBjYW5ub3QKK3RyaXZpYWxseSByZXVzZSBydW50aW1lIGNvZGUgZHVyaW5nIGluaXQuCisKK0ZvciBpbnN0YW5jZSBhIHBsdWdpbiB0aGF0IHdhbnRzIHRvIHZlcmlmeSBjb25uZWN0aXZpdHkgbWF5IG5lZWQgdG8gc3RhdGljYWxseQorY2FsbCB0aGUgY29uc3RydWN0b3Igb2YgdGhlaXIgY29ubmVjdGlvbiBjbGFzcywgcGFzc2luZyBpbiB2YWx1ZXMgb2J0YWluZWQKK2Zyb20gdGhlIFNlY3Rpb24uRmFjdG9yeSByYXRoZXIgdGhhbiBmcm9tIGFuIGluamVjdGVkIENvbmZpZyBvYmplY3QuCisKK1BsdWdpbnMgSW5pdFN0ZXAgYXJlIGV4ZWN1dGluZyBkdXJpbmcgdGhlICJHZXJyaXQgUGx1Z2luIGluaXQiIHBoYXNlLCBhZnRlcgordGhlIGV4dHJhY3Rpb24gb2YgdGhlIHBsdWdpbnMgZW1iZWRkZWQgaW4gR2Vycml0LndhciBpbnRvICRHRVJSSVRfU0lURS9wbHVnaW5zCithbmQgYmVmb3JlIHRoZSBEQiBTY2hlbWEgaW5pdGlhbGl6YXRpb24gb3IgdXBncmFkZS4KK1BsdWdpbnMgSW5pdFN0ZXAgY2Fubm90IHJlZmVyIHRvIEdlcnJpdCBEQiBTY2hlbWEgb3IgYW55IG90aGVyIEdlcnJpdCBydW50aW1lCitvYmplY3RzIGluamVjdGVkIGF0IHN0YXJ0dXAuCisKKz09PT0KK3B1YmxpYyBjbGFzcyBNeUluaXRTdGVwIGltcGxlbWVudHMgSW5pdFN0ZXAgeworICBwcml2YXRlIGZpbmFsIENvbnNvbGVVSSB1aTsKKyAgcHJpdmF0ZSBmaW5hbCBTZWN0aW9uLkZhY3Rvcnkgc2VjdGlvbnM7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIHBsdWdpbk5hbWU7CisKKyAgQEluamVjdAorICBwdWJsaWMgR2l0QmxpdEluaXRTdGVwKGZpbmFsIENvbnNvbGVVSSB1aSwgU2VjdGlvbi5GYWN0b3J5IHNlY3Rpb25zLCBAUGx1Z2luTmFtZSBTdHJpbmcgcGx1Z2luTmFtZSkgeworICAgIHRoaXMudWkgPSB1aTsKKyAgICB0aGlzLnNlY3Rpb25zID0gc2VjdGlvbnM7CisgICAgdGhpcy5wbHVnaW5OYW1lID0gcGx1Z2luTmFtZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBydW4oKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICB1aS5oZWFkZXIoIlxuTXkgcGx1Z2luIik7CisKKyAgICBTZWN0aW9uIG15U2VjdGlvbiA9IGdldFNlY3Rpb24oIm15cGx1Z2luIiwgbnVsbCk7CisgICAgbXlTZWN0aW9uLnN0cmluZygiTGluayBuYW1lIiwgImxpbmtuYW1lIiwgIk15TGluayIpOworICB9Cit9Cis9PT09CisKIFtbY2xhc3NwYXRoXV0KIENsYXNzcGF0aAogLS0tLS0tLS0tCkBAIC0zMjIsMTAgKzM4NSwxMyBAQAogYXV0b21hdGljYWxseSBleHBvcnQgdGhlc2UgcmVzb3VyY2VzIG92ZXIgSFRUUCBmcm9tIHRoZSBwbHVnaW4gSkFSLgogCiBTdGF0aWMgcmVzb3VyY2VzIHVuZGVyIGBzdGF0aWMvYCBkaXJlY3RvcnkgaW4gdGhlIEpBUiB3aWxsIGJlCi1hdmFpbGFibGUgYXMgYC9wbHVnaW5zL2hlbGxvd29ybGQvc3RhdGljL3Jlc291cmNlYC4KK2F2YWlsYWJsZSBhcyBgL3BsdWdpbnMvaGVsbG93b3JsZC9zdGF0aWMvcmVzb3VyY2VgLiBUaGlzIHByZWZpeCBpcworY29uZmlndXJhYmxlIGJ5IHNldHRpbmcgdGhlIGBHZXJyaXQtSHR0cFN0YXRpY1ByZWZpeGAgYXR0cmlidXRlLgogCiBEb2N1bWVudGF0aW9uIGZpbGVzIHVuZGVyIGBEb2N1bWVudGF0aW9uL2AgZGlyZWN0b3J5IGluIHRoZSBKQVIKLXdpbGwgYmUgYXZhaWxhYmxlIGFzIGAvcGx1Z2lucy9oZWxsb3dvcmxkL0RvY3VtZW50YXRpb24vcmVzb3VyY2VgLgord2lsbCBiZSBhdmFpbGFibGUgYXMgYC9wbHVnaW5zL2hlbGxvd29ybGQvRG9jdW1lbnRhdGlvbi9yZXNvdXJjZWAuIFRoaXMKK3ByZWZpeCBpcyBjb25maWd1cmFibGUgYnkgc2V0dGluZyB0aGUgYEdlcnJpdC1IdHRwRG9jdW1lbnRhdGlvblByZWZpeGAKK2F0dHJpYnV0ZS4KIAogRG9jdW1lbnRhdGlvbiBtYXkgYmUgd3JpdHRlbiBpbgogbGluazpodHRwOi8vZGFyaW5nZmlyZWJhbGwubmV0L3Byb2plY3RzL21hcmtkb3duL1tNYXJrZG93bl0gc3R5bGUKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZGV2LXJlYWRtZS50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWFkbWUudHh0CmluZGV4IDU1MmI1YTguLjY3YjRhYWQgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vZGV2LXJlYWRtZS50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9kZXYtcmVhZG1lLnR4dApAQCAtMTEsMTAgKzExLDEzIEBACiBDcmVhdGUgYSBuZXcgY2xpZW50IHdvcmtzcGFjZToKIAogLS0tLQotICBnaXQgY2xvbmUgaHR0cHM6Ly9nZXJyaXQuZ29vZ2xlc291cmNlLmNvbS9nZXJyaXQKKyAgZ2l0IGNsb25lIC0tcmVjdXJzaXZlIGh0dHBzOi8vZ2Vycml0Lmdvb2dsZXNvdXJjZS5jb20vZ2Vycml0CiAgIGNkIGdlcnJpdAogLS0tLQogCitUaGUgYC0tcmVjdXJzaXZlYCBvcHRpb24gaXMgbmVlZGVkIG9uIGBnaXQgY2xvbmVgIHRvIGVuc3VyZSB0aGF0Cit0aGUgY29yZSBwbHVnaW5zLCB3aGljaCBhcmUgaW5jbHVkZWQgYXMgZ2l0IHN1Ym1vZHVsZXMsIGFyZSBhbHNvCitjbG9uZWQuCiAKIENvbmZpZ3VyaW5nIEVjbGlwc2UKIC0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTMxLDcgKzM0LDIxIEBACiBGcm9tIHRoZSBjb21tYW5kIGxpbmU6CiAKIC0tLS0KLSAgbXZuIHBhY2thZ2UKKyAgbXZuIGNsZWFuIHBhY2thZ2UKKy0tLS0KKworQnkgZGVmYXVsdCB0aGUgYnVpbGQgd2lsbCBydW4gdGVzdHMgYW5kIGJ1aWxkIHRoZSBkb2N1bWVudGF0aW9uLgorCitUbyBidWlsZCB3aXRob3V0IHRlc3RzOgorCistLS0tCisgIG12biBjbGVhbiBwYWNrYWdlIC1Ec2tpcFRlc3RzCistLS0tCisKK1RvIGJ1aWxkIHdpdGhvdXQgZG9jdW1lbnRhdGlvbjoKKworLS0tLQorICBtdm4gY2xlYW4gcGFja2FnZSAtRGdlcnJpdC5kb2N1bWVudGF0aW9uLnNraXAKIC0tLS0KIAogT3V0cHV0IGV4ZWN1dGFibGUgV0FSIHdpbGwgYmUgcGxhY2VkIGluOgpAQCAtODAsNiArOTcsMjcgQEAKIFRlc3RpbmcKIC0tLS0tLS0KIAorW1tydW4tYWNjZXB0YW5jZS10ZXN0c11dCitSdW5uaW5nIHRoZSBBY2NlcHRhbmNlIFRlc3RzCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CisKK0dlcnJpdCBoYXMgYSBzZXQgb2YgaW50ZWdyYXRpb24gdGVzdHMgdGhhdCB0ZXN0IHRoZSBHZXJyaXQgZGFlbW9uIHZpYQorUkVTVCwgU1NIIGFuZCB0aGUgZ2l0IHByb3RvY29sLgorCitBIG5ldyByZXZpZXcgc2l0ZSBpcyBjcmVhdGVkIGZvciBlYWNoIHRlc3QgYW5kIHRoZSBHZXJyaXQgZGFlbW9uIGlzCitzdGFydGVkIG9uIHRoYXQgc2l0ZS4gV2hlbiB0aGUgdGVzdCBoYXMgZmluaXNoZWQgdGhlIEdlcnJpdCBkYWVtb24gaXMKK3NodXRkb3duLgorCitTaW5jZSB0aGUgYWNjZXB0YW5jZSB0ZXN0cyBhcmUgdG9vIGV4cGVuc2l2ZSB0byBydW4gZXZlcnkgdGltZQorR2Vycml0IGlzIGJ1aWx0LCB0aGV5IGFyZSBvbmx5IGV4ZWN1dGVkIGR1cmluZyB0aGUgTWF2ZW4gdmVyaWZ5IHBoYXNlCitpZiB0aGUgTWF2ZW4gcHJvZmlsZSBgYWNjZXB0YW5jZWAgaXMgZW5hYmxlZC4KKworVG8gZXhlY3V0ZSB0aGUgYWNjZXB0YW5jZSB0ZXN0cyBydW46CisKKy0tLS0KKyAgbXZuIGNsZWFuIHZlcmlmeSAtUGFjY2VwdGFuY2UKKy0tLS0KKwogUnVubmluZyB0aGUgRGFlbW9uCiB+fn5+fn5+fn5+fn5+fn5+fn4KIApAQCAtMTA5LDEzICsxNDcsMjEgQEAKIC0tLS0KIAogCitbW2RlYnVnLWphdmFzY3JpcHRdXQogRGVidWdnaW5nIEphdmFTY3JpcHQKIH5+fn5+fn5+fn5+fn5+fn5+fn5+CiAKLVdoZW4gZGVidWdnaW5nIGJyb3dzZXIgc3BlY2lmaWMgaXNzdWVzIHVzZSBgLURnd3Quc3R5bGU9REVUQUlMRURgCi1zbyB0aGUgcmVzdWx0aW5nIEphdmFTY3JpcHQgbW9yZSBjbG9zZWx5IG1hdGNoZXMgdGhlIEphdmEgc291cmNlcy4KLVRoaXMgY2FuIGJlIHVzZWQgdG8gaGVscCBuYXJyb3cgZG93biB3aGF0IGNvZGUgbGluZSAzMCw0MDAgaW4gdGhlCi1KYXZhU2NyaXB0IGhhcHBlbnMgdG8gYmUuCitXaGVuIGRlYnVnZ2luZyBicm93c2VyIHNwZWNpZmljIGlzc3VlcyBhZGQgYD9kYmc9MWAgdG8gdGhlIFVSTCBzbyB0aGUKK3Jlc3VsdGluZyBKYXZhU2NyaXB0IG1vcmUgY2xvc2VseSBtYXRjaGVzIHRoZSBKYXZhIHNvdXJjZXMuICBUaGUgZGVidWcKK3BhZ2VzIHVzZSB0aGUgR1dUIHByZXR0eSBmb3JtYXQsIHdoZXJlIGZ1bmN0aW9uIGFuZCB2YXJpYWJsZSBuYW1lcworbWF0Y2ggdGhlIEphdmEgc291cmNlcy4KKworLS0tLQorICBodHRwOi8vbG9jYWxob3N0OjgwODAvP2RiZz0xCistLS0tCisKK1RvIHVzZSB0aGUgR1dUIERFVEFJTEVEIHN0eWxlIHRoZSBwYWNrYWdlIG11c3QgYmUgcmVjb21waWxlZCBhbmQKK2A/ZGJnPTFgIG11c3QgYmUgb21pdHRlZCBmcm9tIHRoZSBVUkw6CiAKIC0tLS0KICAgbXZuIHBhY2thZ2UgLURnd3Quc3R5bGU9REVUQUlMRUQKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZGV2LXJlbGVhc2UtZGVwbG95LWNvbmZpZy50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLWRlcGxveS1jb25maWcudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJjNTJkNTAKLS0tIC9kZXYvbnVsbAorKysgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLWRlcGxveS1jb25maWcudHh0CkBAIC0wLDAgKzEsMTM1IEBACitEZXBsb3kgR2Vycml0IEFydGlmYWN0cworPT09PT09PT09PT09PT09PT09PT09PT0KKworR2Vycml0IEFydGlmYWN0cyBhcmUgc3RvcmVkIG9uCitsaW5rOmh0dHBzOi8vZGV2ZWxvcGVycy5nb29nbGUuY29tL3N0b3JhZ2UvW0dvb2dsZSBDbG91ZCBTdG9yYWdlXS4KK1ZpYSB0aGUgbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9hcGlzL2NvbnNvbGUvW0FQSSBDb25zb2xlXSB0aGUKK0dlcnJpdCBtYWludGFpbmVycyBoYXZlIGFjY2VzcyB0byB0aGUgYEdlcnJpdCBDb2RlIFJldmlld2AgcHJvamVjdC4KK1RoaXMgcHJvamVjdHMgaG9zdCBzZXZlcmFsIGJ1Y2tldHMgZm9yIHN0b3JpbmcgR2Vycml0IGFydGlmYWN0czoKKworKiBgZ2Vycml0LWFwaWA6CisrCitCdWNrZXQgdG8gc3RvcmUgdGhlIEdlcnJpdCBFeHRlbnNpb24gQVBJIEphciBhbmQgdGhlIEdlcnJpdCBQbHVnaW4gQVBJCitKYXIuCisKKyogYGdlcnJpdC1tYXZlbmA6CisrCitCdWNrZXQgdG8gc3RvcmUgR2Vycml0IFN1YnByb2plY3QgQXJ0aWZhY3RzIChlLmcuIGBnd3RleHB1aWAsCitgZ3d0anNvbnJwY2AgZXRjLikuCisKKyogYGdlcnJpdC1wbHVnaW5zYDoKKysKK0J1Y2tldCB0byBzdG9yZSBHZXJyaXQgQ29yZSBQbHVnaW4gQXJ0aWZhY3RzLgorCitbW2RlcGxveS1jb25maWd1cmF0aW9uLXNldHRpbmdzLXhtbF1dCitEZXBsb3kgQ29uZmlndXJhdGlvbiBpbiBNYXZlbiBgc2V0dGluZ3MueG1sYAorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworVG8gdXBsb2FkIGFydGlmYWN0cyB0byBhIGJ1Y2tldCB0aGUgdXNlciBtdXN0IGF1dGhlbnRpY2F0ZSB3aXRoIGEKK3VzZXJuYW1lIGFuZCBwYXNzd29yZC4gVGhlIHVzZXJuYW1lIGFuZCBwYXNzd29yZCBuZWVkIHRvIGJlIHJldHJpZXZlZAorZnJvbSB0aGUgbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9hcGlzL2NvbnNvbGUvW0FQSSBDb25zb2xlXToKKworKiBHbyB0byB0aGUgYEdlcnJpdCBDb2RlIFJldmlld2AgcHJvamVjdAorKiBJbiB0aGUgbWVudSBvbiB0aGUgbGVmdCBzZWxlY3QgYEdvb2dsZSBDbG91ZCBTdG9yYWdlYCA+CitgSW50ZXJvcGVyYWJsZSBBY2Nlc3NgCisqIFVzZSB0aGUgYEFjY2VzcyBLZXlgIGFzIHVzZXJuYW1lCisqIENsaWNrIHVuZGVyIGBTZWNyZXRgIG9uIHRoZSBgU2hvd2AgYnV0dG9uIHRvIGZpbmQgdGhlIHBhc3N3b3JkCisKK1RvIG1ha2UgdGhlIHVzZXJuYW1lIGFuZCBwYXNzd29yZCBrbm93biB0byBNYXZlbiwgdGhleSBtdXN0IGJlCitjb25maWd1cmVkIGluIHRoZSBgfi8ubTIvc2V0dGluZ3MueG1sYCBmaWxlLgorCistLS0tCisgIDxzZXR0aW5ncyB4bWxucz0iaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvU0VUVElOR1MvMS4wLjAiCisgICAgICAgICAgICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIgorICAgICAgICAgICAgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9TRVRUSU5HUy8xLjAuMCBodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy94c2Qvc2V0dGluZ3MtMS4wLjAueHNkIj4KKyAgICA8c2VydmVycz4KKyAgICAgIDxzZXJ2ZXI+CisgICAgICAgIDxpZD5nZXJyaXQtYXBpLXJlcG9zaXRvcnk8L2lkPgorICAgICAgICA8dXNlcm5hbWU+R09PRy4uRVhBTVBMRS4uLi4uRVhBTVBMRTwvdXNlcm5hbWU+CisgICAgICAgIDxwYXNzd29yZD5FWEFNUExFLi5FWEFNUExFLi5FWEFNUExFPC9wYXNzd29yZD4KKyAgICAgIDwvc2VydmVyPgorICAgICAgPHNlcnZlcj4KKyAgICAgICAgPGlkPmdlcnJpdC1tYXZlbi1yZXBvc2l0b3J5PC9pZD4KKyAgICAgICAgPHVzZXJuYW1lPkdPT0cuLkVYQU1QTEUuLi4uLkVYQU1QTEU8L3VzZXJuYW1lPgorICAgICAgICA8cGFzc3dvcmQ+RVhBTVBMRS4uRVhBTVBMRS4uRVhBTVBMRTwvcGFzc3dvcmQ+CisgICAgICA8L3NlcnZlcj4KKyAgICAgIDxzZXJ2ZXI+CisgICAgICAgIDxpZD5nZXJyaXQtcGx1Z2lucy1yZXBvc2l0b3J5PC9pZD4KKyAgICAgICAgPHVzZXJuYW1lPkdPT0cuLkVYQU1QTEUuLi4uLkVYQU1QTEU8L3VzZXJuYW1lPgorICAgICAgICA8cGFzc3dvcmQ+RVhBTVBMRS4uRVhBTVBMRS4uRVhBTVBMRTwvcGFzc3dvcmQ+CisgICAgICA8L3NlcnZlcj4KKyAgICA8L3NlcnZlcnM+CisgIDwvc2V0dGluZ3M+CistLS0tCisKK1tbZGVwbG95LWNvbmZpZ3VyYXRpb24tc3VicHJvamVjdHNdXQorR2Vycml0IFN1YnByb2plY3RzCit+fn5+fn5+fn5+fn5+fn5+fn4KKworKiBZb3Ugd2lsbCBuZWVkIHRvIGhhdmUgdGhlIGZvbGxvd2luZyBpbiB0aGUgYHBvbS54bWxgIHRvIG1ha2UgaXQKK2RlcGxveWFibGUgdG8gdGhlIGBnZXJyaXQtbWF2ZW5gIHN0b3JhZ2UgYnVja2V0OgorCistLS0tCisgIDxkaXN0cmlidXRpb25NYW5hZ2VtZW50PgorICAgIDxyZXBvc2l0b3J5PgorICAgICAgPGlkPmdlcnJpdC1tYXZlbi1yZXBvc2l0b3J5PC9pZD4KKyAgICAgIDxuYW1lPkdlcnJpdCBNYXZlbiBSZXBvc2l0b3J5PC9uYW1lPgorICAgICAgPHVybD5zMzovL2dlcnJpdC1tYXZlbkBjb21tb25kYXRhc3RvcmFnZS5nb29nbGVhcGlzLmNvbTwvdXJsPgorICAgICAgPHVuaXF1ZVZlcnNpb24+dHJ1ZTwvdW5pcXVlVmVyc2lvbj4KKyAgICA8L3JlcG9zaXRvcnk+CisgIDwvZGlzdHJpYnV0aW9uTWFuYWdlbWVudD4KKy0tLS0KKworCisqIEFkZCB0aGlzIHRvIHRoZSBgcG9tLnhtbGAgdG8gZW5hYmxlIHRoZSB3YWdvbiBwcm92aWRlcjoKKworLS0tLQorICA8YnVpbGQ+CisgICAgPGV4dGVuc2lvbnM+CisgICAgICA8ZXh0ZW5zaW9uPgorICAgICAgICA8Z3JvdXBJZD5uZXQuYW56aXguYXdzPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5zMy1tYXZlbi13YWdvbjwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPHZlcnNpb24+My4yPC92ZXJzaW9uPgorICAgICAgPC9leHRlbnNpb24+CisgICAgPC9leHRlbnNpb25zPgorICA8L2J1aWxkPgorLS0tLQorCisKK1tbZGVwbG95LWNvbmZpZ3VyYXRpb24tY29yZS1wbHVnaW5zXV0KK0dlcnJpdCBDb3JlIFBsdWdpbnMKK35+fn5+fn5+fn5+fn5+fn5+fn4KKworKiBZb3Ugd2lsbCBuZWVkIHRvIGhhdmUgdGhlIGZvbGxvd2luZyBpbiB0aGUgYHBvbS54bWxgIHRvIG1ha2UgaXQKK2RlcGxveWFibGUgdG8gdGhlIGBnZXJyaXQtcGx1Z2luc2Agc3RvcmFnZSBidWNrZXQ6CisKKy0tLS0KKyAgPGRpc3RyaWJ1dGlvbk1hbmFnZW1lbnQ+CisgICAgPHJlcG9zaXRvcnk+CisgICAgICA8aWQ+Z2Vycml0LXBsdWdpbnMtcmVwb3NpdG9yeTwvaWQ+CisgICAgICA8bmFtZT5HZXJyaXQgUGx1Z2lucyBSZXBvc2l0b3J5PC9uYW1lPgorICAgICAgPHVybD5zMzovL2dlcnJpdC1wbHVnaW5zQGNvbW1vbmRhdGFzdG9yYWdlLmdvb2dsZWFwaXMuY29tPC91cmw+CisgICAgICA8dW5pcXVlVmVyc2lvbj50cnVlPC91bmlxdWVWZXJzaW9uPgorICAgIDwvcmVwb3NpdG9yeT4KKyAgPC9kaXN0cmlidXRpb25NYW5hZ2VtZW50PgorLS0tLQorCisKKyogQWRkIHRoaXMgdG8gdGhlIGBwb20ueG1sYCB0byBlbmFibGUgdGhlIHdhZ29uIHByb3ZpZGVyOgorCistLS0tCisgIDxidWlsZD4KKyAgICA8ZXh0ZW5zaW9ucz4KKyAgICAgIDxleHRlbnNpb24+CisgICAgICAgIDxncm91cElkPm5ldC5hbnppeC5hd3M8L2dyb3VwSWQ+CisgICAgICAgIDxhcnRpZmFjdElkPnMzLW1hdmVuLXdhZ29uPC9hcnRpZmFjdElkPgorICAgICAgICA8dmVyc2lvbj4zLjI8L3ZlcnNpb24+CisgICAgICA8L2V4dGVuc2lvbj4KKyAgICA8L2V4dGVuc2lvbnM+CisgIDwvYnVpbGQ+CistLS0tCisKKworR0VSUklUCistLS0tLS0KK1BhcnQgb2YgbGluazppbmRleC5odG1sW0dlcnJpdCBDb2RlIFJldmlld10KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZGV2LXJlbGVhc2Utc3VicHJvamVjdC50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLXN1YnByb2plY3QudHh0CmluZGV4IDc5OWZmMmQuLjVlMzc3MGQgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vZGV2LXJlbGVhc2Utc3VicHJvamVjdC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9kZXYtcmVsZWFzZS1zdWJwcm9qZWN0LnR4dApAQCAtMSw5NiArMSwxMDYgQEAKIE1ha2luZyBhIFJlbGVhc2Ugb2YgYSBHZXJyaXQgU3VicHJvamVjdCAvIENvcmUgUGx1Z2luCiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogCi1QcmVwYXJpbmcgYSBOZXcgU25hcHNob3QgZm9yIFB1Ymxpc2hpbmcKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorW1ttYWtlLXNuYXBzaG90XV0KK01ha2UgYSBTbmFwc2hvdAorLS0tLS0tLS0tLS0tLS0tCiAKLSogWW91IHdpbGwgbmVlZCB0byBoYXZlIHRoZSBmb2xsb3dpbmcgaW4gdGhlIGBwb20ueG1sYCB0byBtYWtlIGl0Ci0gIGRlcGxveWFibGUgdG8gdGhlIGBnZXJyaXQtbWF2ZW5gIHN0b3JhZ2UgYnVja2V0OgorKiBPbmx5IGZvciBwbHVnaW5zOgorKiogSW4gdGhlIGBwb20ueG1sYCB1cGRhdGUgdGhlIEdlcnJpdCB2ZXJzaW9uIHVuZGVyIGBwcm9wZXJ0aWVzYCA+CitgR2Vycml0LUFwaVZlcnNpb25gIHRvIHRoZSB2ZXJzaW9uIG9mIHRoZSBuZXcgR2Vycml0CityZWxlYXNlLgorKiogTWFrZSBzdXJlIHRoYXQgdGhlIFVSTCBmb3IgdGhlIE1hdmVuIHJlcG9zaXRvcnkgd2l0aCB0aGUgaWQKK2BnZXJyaXQtYXBpLXJlcG9zaXRvcnlgIGluIHRoZSBgcG9tLnhtbGAgaXMgY29ycmVjdC4KKysKK0lmIGBHZXJyaXQtQXBpVmVyc2lvbmAgcmVmZXJlbmNlcyBhIHJlbGVhc2VkIEdlcnJpdCB2ZXJzaW9uIGl0IG11c3QgYmUKK2BodHRwczovL2dlcnJpdC1hcGkuY29tbW9uZGF0YXN0b3JhZ2UuZ29vZ2xlYXBpcy5jb20vcmVsZWFzZS9gLCBpZgorYEdlcnJpdC1BcGlWZXJzaW9uYCByZWZlcmVuY2VzIGEgc25hcHNob3QgR2Vycml0IHZlcnNpb24gaXQgbXVzdCBiZQorYGh0dHBzOi8vZ2Vycml0LWFwaS5jb21tb25kYXRhc3RvcmFnZS5nb29nbGVhcGlzLmNvbS9zbmFwc2hvdC9gLgogCi0tLS0tCi0gIDxkaXN0cmlidXRpb25NYW5hZ2VtZW50PgotICAgIDxyZXBvc2l0b3J5PgotICAgICAgPGlkPmdlcnJpdC1tYXZlbjwvaWQ+Ci0gICAgICA8bmFtZT5nZXJyaXQgTWF2ZW4gUmVwb3NpdG9yeTwvbmFtZT4KLSAgICAgIDx1cmw+czM6Ly9nZXJyaXQtbWF2ZW5AY29tbW9uZGF0YXN0b3JhZ2UuZ29vZ2xlYXBpcy5jb208L3VybD4KLSAgICAgIDx1bmlxdWVWZXJzaW9uPnRydWU8L3VuaXF1ZVZlcnNpb24+Ci0gICAgPC9yZXBvc2l0b3J5PgotICA8L2Rpc3RyaWJ1dGlvbk1hbmFnZW1lbnQ+Ci0tLS0tCisqIEJ1aWxkIHRoZSBsYXRlc3Qgc25hcHNob3QgYW5kIGluc3RhbGwgaXQgaW50byB0aGUgbG9jYWwgTWF2ZW4KK3JlcG9zaXRvcnk6CisrCis9PT09CisgIG12biBjbGVhbiBpbnN0YWxsCis9PT09CisKKyogVGVzdCBHZXJyaXQgd2l0aCB0aGlzIHNuYXBzaG90IGxvY2FsbHkKIAogCi0qIEFkZCB0aGlzIHRvIHRoZSBgcG9tLnhtbGAgdG8gZW5hYmxlIHRoZSB3YWdvbiBwcm92aWRlcjoKK1B1Ymxpc2ggU25hcHNob3QKKy0tLS0tLS0tLS0tLS0tLS0KIAotLS0tLQotICA8YnVpbGQ+Ci0gICAgPGV4dGVuc2lvbnM+Ci0gICAgICA8ZXh0ZW5zaW9uPgotICAgICAgICA8Z3JvdXBJZD5uZXQuYW56aXguYXdzPC9ncm91cElkPgotICAgICAgICA8YXJ0aWZhY3RJZD5zMy1tYXZlbi13YWdvbjwvYXJ0aWZhY3RJZD4KLSAgICAgICAgPHZlcnNpb24+My4yPC92ZXJzaW9uPgotICAgICAgPC9leHRlbnNpb24+Ci0gICAgPC9leHRlbnNpb25zPgotICA8L2J1aWxkPgotLS0tLQorSWYgYSBTbmFwc2hvdCBmb3IgYSBTdWJwcm9qZWN0IHdhcyBjcmVhdGVkIHRoYXQgc2hvdWxkIGJlIHJlZmVyZW5jZWQgYnkKK0dlcnJpdCB3aGlsZSBjdXJyZW50IEdlcnJpdCBkZXZlbG9wbWVudCBpcyBvbmdvaW5nLCB0aGlzIFNuYXBzaG90IG5lZWRzCit0byBiZSBwdWJsaXNoZWQuCiAKKyogTWFrZSBzdXJlIHlvdSBoYXZlIGRvbmUgdGhlIGNvbmZpZ3VyYXRpb24gbmVlZGVkIGZvciBkZXBsb3ltZW50OgorKiogbGluazpkZXYtcmVsZWFzZS1kZXBsb3ktY29uZmlnLmh0bWwjZGVwbG95LWNvbmZpZ3VyYXRpb24tc2V0dGluZ3MteG1sWworQ29uZmlndXJhdGlvbiBpbiBNYXZlbiBgc2V0dGluZ3MueG1sYF0KKyoqIGxpbms6ZGV2LXJlbGVhc2UtZGVwbG95LWNvbmZpZy5odG1sI2RlcGxveS1jb25maWd1cmF0aW9uLXN1YnByb2plY3RzWworQ29uZmlndXJhdGlvbiBmb3IgU3VicHJvamVjdHMgaW4gYHBvbS54bWxgXQogCi0qIEFkZCB5b3VyIHVzZXJuYW1lIGFuZCBwYXNzd29yZCB0byB5b3VyIGB+Ly5tMi9zZXR0aW5ncy54bWxgIGZpbGUuCi0gIFRoZXNlIG5lZWQgdG8gY29tZSBmcm9tIHRoZSBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL2FwaXMvY29uc29sZS9bQVBJIENvbnNvbGVdLgotCi0tLS0tCi0gIDxzZXR0aW5ncyB4bWxucz0iaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvU0VUVElOR1MvMS4wLjAiCi0gICAgICAgICAgICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIgotICAgICAgICAgICAgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9TRVRUSU5HUy8xLjAuMCBodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy94c2Qvc2V0dGluZ3MtMS4wLjAueHNkIj4KLSAgICA8c2VydmVycz4KLSAgICAgIDxzZXJ2ZXI+Ci0gICAgICAgIDxpZD5nZXJyaXQtbWF2ZW48L2lkPgotICAgICAgICA8dXNlcm5hbWU+R09PRy4uRVhBTVBMRS4uLi4uRVhBTVBMRTwvdXNlcm5hbWU+Ci0gICAgICAgIDxwYXNzd29yZD5FWEFNUExFLi5FWEFNUExFLi5FWEFNUExFPC9wYXNzd29yZD4KLSAgICAgIDwvc2VydmVyPgotICAgIDwvc2VydmVycz4KLSAgPC9zZXR0aW5ncz4KLS0tLS0KLQotCi1NYWtpbmcgYSBTbmFwc2hvdAotLS0tLS0tLS0tLS0tLS0tLS0KLQotKiBPbmx5IGZvciBwbHVnaW5zOiBpbiB0aGUgYHBvbS54bWxgIHVwZGF0ZSB0aGUgR2Vycml0IHZlcnNpb24gdW5kZXIKLWBwcm9wZXJ0aWVzYCA+IGBHZXJyaXQtQXBpVmVyc2lvbmAgdG8gdGhlIHZlcnNpb24gb2YgdGhlIG5ldyBHZXJyaXQKLXJlbGVhc2UKLSogRmlyc3QgYnVpbGQgYW5kIGRlcGxveSB0aGUgbGF0ZXN0IHNuYXBzaG90IGFuZCBlbnN1cmUgdGhhdCBHZXJyaXQKLWJ1aWxkcy9ydW5zIHdpdGggdGhpcyBzbmFwc2hvdAotCi0qIERlcGxveSB0aGUgc25hcHNob3Q6Ci0KKyogRGVwbG95IHRoZSBuZXcgc25hcHNob3Q6CisrCiA9PT09CiAgIG12biBkZXBsb3kKID09PT0KIAorKiBDaGFuZ2UgdGhlIHZlcnNpb24gaW4gdGhlIEdlcnJpdCBwYXJlbnQgYHBvbS54bWxgIGZvciB0aGUgU3VicHJvamVjdAordG8gdGhlIGBTTkFQU0hPVGAgdmVyc2lvbgorKworV2hlbiBHZXJyaXQgZ2V0cyByZWxlYXNlZCwgYSByZWxlYXNlIG9mIHRoZSBTdWJwcm9qZWN0IGhhcyB0byBiZSBkb25lCithbmQgR2Vycml0IGhhcyB0byByZWZlcmVuY2UgdGhlIHJlbGVhc2VkIFN1YnByb2plY3QgdmVyc2lvbi4KIAotTWFraW5nIGEgUmVsZWFzZQotLS0tLS0tLS0tLS0tLS0tLQogCi0qIEZpcnN0IGRlcGxveSAoYW5kIHRlc3QpIHRoZSBsYXRlc3Qgc25hcHNob3QgZm9yIHRoZSBzdWJwcm9qZWN0L3BsdWdpbgorW1twcmVwYXJlLXJlbGVhc2VdXQorUHJlcGFyZSB0aGUgUmVsZWFzZQorLS0tLS0tLS0tLS0tLS0tLS0tLQorCisqIGxpbms6I21ha2Utc25hcHNob3RbRmlyc3QgY3JlYXRlIChhbmQgdGVzdCkgdGhlIGxhdGVzdCBzbmFwc2hvdCBmb3IKK3RoZSBzdWJwcm9qZWN0L3BsdWdpbl0KIAogKiBVcGRhdGUgdGhlIHRvcCBsZXZlbCBgcG9tLnhtbGAgaW4gdGhlIHN1YnByb2plY3QvcGx1Z2luIHRvIHJlZmxlY3QKIHRoZSBuZXcgcHJvamVjdCB2ZXJzaW9uICh0aGUgZXhhY3QgdmFsdWUgb2YgdGhlIHRhZyB5b3Ugd2lsbCBjcmVhdGUKIGJlbG93KQogCi0qIENvbW1pdCB0aGUgcG9tIGNoYW5nZSBhbmQgcHVzaCB0byB0aGUgcHJvamVjdCdzIHJlcG8KLWByZWZzL2Zvci88bWFzdGVyL3N0YWJsZT5gCi0KLSogVGFnIHRoZSB2ZXJzaW9uIHlvdSBqdXN0IHB1c2hlZCAoYW5kIHB1c2ggdGhlIHRhZykKLQorKiBDcmVhdGUgdGhlIFJlbGVhc2UgVGFnCisrCiA9PT09CiAgZ2l0IHRhZyAtYSAtbSAicHJvbG9nLWNhZmUgMS4zIiB2MS4zCi0gZ2l0IHB1c2ggZ2Vycml0LXJldmlldyByZWZzL3RhZ3MvdjEuMzpyZWZzL3RhZ3MvdjEuMwogPT09PQogCisqIEJ1aWxkIGFuZCBpbnN0YWxsIGludG8gbG9jYWwgTWF2ZW4gcmVwb3NpdG9yeToKKysKKz09PT0KKyAgbXZuIGNsZWFuIGluc3RhbGwKKz09PT0KKworCitbW3B1Ymxpc2gtcmVsZWFzZV1dCitQdWJsaXNoIHRoZSBSZWxlYXNlCistLS0tLS0tLS0tLS0tLS0tLS0tCisKKyogTWFrZSBzdXJlIHlvdSBoYXZlIGRvbmUgdGhlIGNvbmZpZ3VyYXRpb24gbmVlZGVkIGZvciBkZXBsb3ltZW50OgorKiogbGluazpkZXYtcmVsZWFzZS1kZXBsb3ktY29uZmlnLmh0bWwjZGVwbG95LWNvbmZpZ3VyYXRpb24tc2V0dGluZ3MteG1sWworQ29uZmlndXJhdGlvbiBpbiBNYXZlbiBgc2V0dGluZ3MueG1sYF0KKyoqIENvbmZpZ3VyYXRpb24gaW4gYHBvbS54bWxgIGZvcgorbGluazpkZXYtcmVsZWFzZS1kZXBsb3ktY29uZmlnLmh0bWwjZGVwbG95LWNvbmZpZ3VyYXRpb24tc3VicHJvamVjdHNbU3VicHJvamVjdHNdIG9yCitsaW5rOmRldi1yZWxlYXNlLWRlcGxveS1jb25maWcuaHRtbCNkZXBsb3ktY29uZmlndXJhdGlvbi1jb3JlLXBsdWdpbnNbQ29yZSBQbHVnaW5zXQorCiAqIERlcGxveSB0aGUgbmV3IHJlbGVhc2U6Ci0KKysKID09PT0KLSBtdm4gZGVwbG95CisgIG12biBkZXBsb3kKKz09PT0KKworKiBQdXNoIHRoZSBwb20gY2hhbmdlKHMpIHRvIHRoZSBwcm9qZWN0J3MgcmVwb3NpdG9yeQorYHJlZnMvZm9yLzxtYXN0ZXJ8c3RhYmxlPmAKKworKiBQdXNoIHRoZSBSZWxlYXNlIFRhZworKworPT09PQorICBnaXQgcHVzaCBnZXJyaXQtcmV2aWV3IHJlZnMvdGFncy92MS4zOnJlZnMvdGFncy92MS4zCiA9PT09CiAKIApkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9kZXYtcmVsZWFzZS50eHQgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLnR4dAppbmRleCA1ZWEzMDQyLi5hZTJhZWQ2IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2Rldi1yZWxlYXNlLnR4dApAQCAtMTEsNyArMTEsNyBAQAogCiBUbyBtYWtlIGEgR2Vycml0IHJlbGVhc2UgaW52b2x2ZXMgYSBncmVhdCBkZWFsIG9mIGNvbXBsZXgKIHRhc2tzIGFuZCBpdCBpcyBlYXN5IHRvIG1pc3MgYSBzdGVwIHNvIHRoaXMgZG9jdW1lbnQgc2hvdWxkCi1ob3BlZnVseSBzZXJ2ZSBhcyBib3RoIGEgaG93IHRvIGZvciB0aG9zZSBuZXcgdG8gdGhlIHByb2Nlc3MKK2hvcGVmdWxseSBzZXJ2ZSBhcyBib3RoIGEgaG93IHRvIGZvciB0aG9zZSBuZXcgdG8gdGhlIHByb2Nlc3MKIGFuZCBhcyBhIGNoZWNrbGlzdCBmb3IgdGhvc2UgYWxyZWFkeSBmYW1pbGlhciB3aXRoIHRoZXNlCiB0YXNrcy4KIApAQCAtMjAsMTQyICsyMCwyMTUgQEAKIC0tLS0tLS0tLS0tLS0tLS0tLS0KIAogSGVyZSBhcmUgc29tZSBndWlkZWxpbmVzIG9uIHJlbGVhc2UgYXBwcm9hY2hlcyBkZXBlbmRpbmcgb24gdGhlCi10eXBlIG9mIHJlbGVhc2UgeW91IHdhbnQgdG8gbWFrZSAoc3RhYmxlLWZpeCwgc3RhYmxlLCBSQzAsIFJDMS4uLikuCit0eXBlIG9mIHJlbGVhc2UgeW91IHdhbnQgdG8gbWFrZSAoYHN0YWJsZS1maXhgLCBgc3RhYmxlYCwgYFJDMGAsCitgUkMxYC4uLikuCiAKK1tbc3RhYmxlXV0KIFN0YWJsZQogfn5+fn5+CiAKLUEgc3RhYmxlIHJlbGVhc2UgaXMgZ2VuZXJhbGx5IGJ1aWx0IGZyb20gdGhlIG1hc3RlciBicmFuY2ggYW5kIG1heSBuZWVkIHRvCi11bmRlcmdvIHNvbWUgc3RhYmlsaXphdGlvbiBiZWZvcmUgcmVsZWFzaW5nIHRoZSBmaW5hbCByZWxlYXNlLgorQSBgc3RhYmxlYCByZWxlYXNlIGlzIGdlbmVyYWxseSBidWlsdCBmcm9tIHRoZSBgbWFzdGVyYCBicmFuY2ggYW5kIG1heQorbmVlZCB0byB1bmRlcmdvIHNvbWUgc3RhYmlsaXphdGlvbiBiZWZvcmUgcmVsZWFzaW5nIHRoZSBmaW5hbCByZWxlYXNlLgogCiAqIFByb3Bvc2UgdGhlIHJlbGVhc2Ugd2l0aCBhbnkgcGxhbnMvb2JqZWN0aXZlcyB0byB0aGUgbWFpbGluZyBsaXN0CiAKLSogQ3JlYXRlIGEgR2Vycml0IFJDMAorKiBDcmVhdGUgYSBHZXJyaXQgYFJDMGAKIAotKiBJZiBuZWVkZWQgY3JlYXRlIGEgR2Vycml0IFJDMQorKiBJZiBuZWVkZWQgY3JlYXRlIGEgR2Vycml0IGBSQzFgCiAKIFtOT1RFXQogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiBZb3UgbWF5IGxldCBpbiBhIGZldyBmZWF0dXJlcyB0byB0aGlzIHJlbGVhc2UKID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogCi0qIElmIG5lZWRlZCBjcmVhdGUgYSBHZXJyaXQgUkMyCisqIElmIG5lZWRlZCBjcmVhdGUgYSBHZXJyaXQgYFJDMmAKIAogW05PVEVdCiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIFRoZXJlIHNob3VsZCBiZSBubyBuZXcgZmVhdHVyZXMgaW4gdGhpcyByZWxlYXNlLCBvbmx5IGJ1ZyBmaXhlcwogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKLSogRmluYWxseSBjcmVhdGUgdGhlIHN0YWJsZSByZWxlYXNlIChubyBSQykKKyogRmluYWxseSBjcmVhdGUgdGhlIGBzdGFibGVgIHJlbGVhc2UgKG5vIGBSQ2ApCiAKIAogU3RhYmxlLUZpeAogfn5+fn5+fn5+fgogCi1TdGFibGUtZml4IHJlbGVhc2VzIHNob3VsZCBsaWtlbHkgb25seSBjb250YWluIGJ1ZyBmaXhlcyBhbmQgZG9jIHVwZGF0ZXMuCitgc3RhYmxlLWZpeGAgcmVsZWFzZXMgc2hvdWxkIGxpa2VseSBvbmx5IGNvbnRhaW4gYnVnIGZpeGVzIGFuZCBkb2MKK3VwZGF0ZXMuCiAKICogUHJvcG9zZSB0aGUgcmVsZWFzZSB3aXRoIGFueSBwbGFucy9vYmplY3RpdmVzIHRvIHRoZSBtYWlsaW5nIGxpc3QKIAotKiBUaGlzIHR5cGUgb2YgcmVsZWFzZSBkb2VzIG5vdCBuZWVkIGFueSBSQ3MsIHJlbGVhc2Ugd2hlbiB0aGUgb2JqZWN0aXZlcwotICBhcmUgbWV0CisqIFRoaXMgdHlwZSBvZiByZWxlYXNlIGRvZXMgbm90IG5lZWQgYW55IFJDcywgcmVsZWFzZSB3aGVuIHRoZQorb2JqZWN0aXZlcyBhcmUgbWV0CiAKIAorW1tzZWN1cml0eV1dCitTZWN1cml0eS1GaXgKK35+fn5+fn5+fn5+fgorCitgc2VjdXJpdHktZml4YCByZWxlYXNlcyBzaG91bGQgb25seSBjb250YWluIGJ1ZyBmaXhlcyBmb3Igc2VjdXJpdHkKK2lzc3Vlcy4KKworRm9yIHNlY3VyaXR5IGlzc3VlcyBpdCBpcyBpbXBvcnRhbnQgdGhhdCB0aGV5IGFyZSBvbmx5IGFubm91bmNlZAorKmFmdGVyKiBmaXhlZCB2ZXJzaW9ucyBmb3IgYWxsIHJlbGV2YW50IHJlbGVhc2VzIGhhdmUgYmVlbiBwdWJsaXNoZWQuCitCZWNhdXNlIG9mIHRoaXMsIGBzZWN1cml0eS1maXhgIHJlbGVhc2VzIGNhbid0IGJlIHByZXBhcmVkIGluIHRoZSBwdWJsaWMKK2BnZXJyaXRgIHByb2plY3QuCisKK2BzZWN1cml0eS1maXhgIHJlbGVhc2VzIGFyZSBwcmVwYXJlZCBpbiB0aGUgYGdlcnJpdC1zZWN1cml0eS1maXhlc2AKK3Byb2plY3Qgd2hpY2ggaXMgb25seSByZWFkYWJsZSBieSB0aGUgR2Vycml0IE1haW50YWluZXJzLiBPbmx5IGFmdGVyCithIGBzZWN1cml0eS1maXhgIHJlbGVhc2UgaGFzIGJlZW4gcHVibGlzaGVkIHdpbGwgdGhlIGNvbW1pdHMvdGFncyBtYWRlIGluCit0aGUgYGdlcnJpdC1zZWN1cml0eS1maXhlc2AgcHJvamVjdCBiZSB0YWtlbiBvdmVyIGludG8gdGhlIHB1YmxpYworYGdlcnJpdGAgcHJvamVjdC4KKwogCiBDcmVhdGUgdGhlIEFjdHVhbCBSZWxlYXNlCiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAotSW4gdGhlIGV4YW1wbGUgY29tbWFuZHMgYmVsb3cgd2UgYXNzdW1lIHRoYXQgdGhlIGxhc3QgcmVsZWFzZSB3YXMgJzIuNCcgYW5kIHRoYXQKLXdlIGFyZSBwcmVwYXJpbmcgJzIuNScgcmVsZWFzZS4KK1RvIGNyZWF0ZSBhIEdlcnJpdCByZWxlYXNlIHRoZSBmb2xsb3dpbmcgc3RlcHMgaGF2ZSB0byBiZSBkb25lOgogCi1QcmVwYXJlIHRoZSBTdWJwcm9qZWN0cwotfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KLQotKiBQdWJsaXNoIHRoZSBsYXRlc3Qgc25hcHNob3QgZm9yIGFsbCBzdWJwcm9qZWN0cwotKiBGcmVlemUgYWxsIHN1YnByb2plY3RzIGFuZCBsaW5rOmRldi1yZWxlYXNlLXN1YnByb2plY3QuaHRtbFtwdWJsaXNoXQotICB0aGVtIQorLiBsaW5rOiNzdWJwcm9qZWN0W1JlbGVhc2UgU3VicHJvamVjdHNdCisuIGxpbms6I3ByZXBhcmUtZ2Vycml0W1ByZXBhcmUgdGhlIEdlcnJpdCBSZWxlYXNlXQorLi4gbGluazojcHJlcGFyZS13YXItYW5kLXBsdWdpbi1hcGlbUHJlcGFyZSB0aGUgR2Vycml0IFdBUiBhbmQgdGhlIFBsdWdpbiBBUEkgSmFyXQorLi4gbGluazojcHJlcGFyZS1jb3JlLXBsdWdpbnNbUHJlcGFyZSB0aGUgQ29yZSBQbHVnaW5zXQorLi4gbGluazojcHJlcGFyZS13YXItd2l0aC1wbHVnaW5zW1ByZXBhcmUgR2Vycml0IFdBUiB3aXRoIENvcmUgUGx1Z2luc10KKy4gbGluazojcHVibGlzaC1nZXJyaXRbUHVibGlzaCB0aGUgR2Vycml0IFJlbGVhc2VdCisuLiBsaW5rOiNleHRlbnNpb24tYW5kLXBsdWdpbi1hcGlbUHVibGlzaCB0aGUgRXh0ZW5zaW9uIGFuZCBQbHVnaW4gQVBJIEphcnNdCisuLiBsaW5rOiNwdWJsaXNoLWNvcmUtcGx1Z2luc1tQdWJsaXNoIHRoZSBDb3JlIFBsdWdpbnNdCisuLiBsaW5rOiNwdWJsaXNoLWdlcnJpdC13YXJbUHVibGlzaCB0aGUgR2Vycml0IFdBUiAod2l0aCBDb3JlIFBsdWdpbnMpXQorLi4gbGluazojcHVzaC1zdGFibGVbUHVzaCB0aGUgU3RhYmxlIEJyYW5jaF0KKy4uIGxpbms6I3B1c2gtdGFnW1B1c2ggdGhlIFJlbGVhc2UgVGFnXQorLi4gbGluazojdXBsb2FkLWRvY3VtZW50YXRpb25bVXBsb2FkIHRoZSBEb2N1bWVudGF0aW9uXQorLi4gbGluazojdXBkYXRlLWlzc3Vlc1tVcGRhdGUgdGhlIElzc3Vlc10KKy4uIGxpbms6I2Fubm91bmNlW0Fubm91bmNlIG9uIE1haWxpbmcgTGlzdF0KKy4gbGluazojaW5jcmVhc2UtdmVyc2lvbltJbmNyZWFzZSBHZXJyaXQgVmVyc2lvbiBmb3IgQ3VycmVudCBEZXZlbG9wbWVudF0KKy4gbGluazojbWVyZ2Utc3RhYmxlW01lcmdlIGBzdGFibGVgIGludG8gYG1hc3RlcmBdCiAKIAotUHJlcGFyZSBHZXJyaXQKLX5+fn5+fn5+fn5+fn5+CitbW3N1YnByb2plY3RdXQorUmVsZWFzZSBTdWJwcm9qZWN0cworfn5+fn5+fn5+fn5+fn5+fn5+fgogCi0qIENyZWF0ZSBhIGBzdGFibGUtMi41YCBicmFuY2ggZm9yIG1ha2luZyB0aGUgbmV3IHJlbGVhc2UKK1RoZSBzdWJwcm9qZWN0cyB0byBiZSByZWxlYXNlZCBhcmU6CiAKLSogSW4gdGhlIGBtYXN0ZXJgIGJyYW5jaDogVXBkYXRlIHRoZSBwb21zIGZvciB0aGUgR2Vycml0IHZlcnNpb24sIHB1c2ggZm9yCi1yZXZpZXcsIGdldCBtZXJnZWQKKyogYGd3dGV4cHVpYAorKiBgZ3d0anNvbnJwY2AKKyogYGd3dG9ybWAKKyogYHByb2xvZy1jYWZlYAogCitGb3IgZWFjaCBzdWJwcm9qZWN0IGRvOgorCisqIENoZWNrIHRoZSBkZXBlbmRlbmN5IHRvIHRoZSBTdWJwcm9qZWN0IGluIHRoZSBHZXJyaXQgcGFyZW50IGBwb20ueG1sYDoKKysKK0lmIGEgYFNOQVBTSE9UYCB2ZXJzaW9uIG9mIHRoZSBzdWJwcm9qZWN0IGlzIHJlZmVyZW5jZWQgdGhlIHN1YnByb2plY3QKK25lZWRzIHRvIGJlIHJlbGVhc2VkIHNvIHRoYXQgR2Vycml0IGNhbiByZWZlcmVuY2UgYSByZWxlYXNlZCB2ZXJzaW9uIG9mCit0aGUgc3VicHJvamVjdC4KKworKiBsaW5rOmRldi1yZWxlYXNlLXN1YnByb2plY3QuaHRtbCNtYWtlLXNuYXBzaG90W01ha2UgYSBzbmFwc2hvdCBhbmQgdGVzdCBpdF0KKyogbGluazpkZXYtcmVsZWFzZS1zdWJwcm9qZWN0Lmh0bWwjcHJlcGFyZS1yZWxlYXNlW1ByZXBhcmUgdGhlIFJlbGVhc2VdCisqIGxpbms6ZGV2LXJlbGVhc2Utc3VicHJvamVjdC5odG1sI3B1Ymxpc2gtcmVsZWFzZVtQdWJsaXNoIHRoZSBSZWxlYXNlXQorCisqIFVwZGF0ZSB0aGUgdmVyc2lvbiBvZiB0aGUgU3VicHJvamVjdCBpbiB0aGUgR2Vycml0IHBhcmVudCBgcG9tLnhtbGAKK3RvIHRoZSByZWxlYXNlZCB2ZXJzaW9uCisKKworW1tidWlsZC1nZXJyaXRdXQorQnVpbGQgR2Vycml0Cit+fn5+fn5+fn5+fn4KKworKiBCdWlsZCB0aGUgR2Vycml0IFdBUgorKwogPT09PQotIHRvb2xzL3ZlcnNpb24uc2ggLS1zbmFwc2hvdD0yLjUKLT09PT0KLQotKiBDaGVja291dCB0aGUgYHN0YWJsZS0yLjVgIGJyYW5jaAotKiBVcGRhdGUgdGhlIHRvcCBsZXZlbCBgcG9tLnhtbGAgaW4gR2Vycml0IHRvIGVuc3VyZSB0aGF0IG5vbmUgb2YgdGhlCi1TdWJwcm9qZWN0cyBwb2ludCB0byBzbmFwc2hvdCByZWxlYXNlcwotCi0qIFRhZwotCi09PT09Ci0gZ2l0IHRhZyAtYSAtbSAiZ2Vycml0IDIuNS1yYzAiIHYyLjUtcmMwCi0gZ2l0IHRhZyAtYSAtbSAiZ2Vycml0IDIuNSIgdjIuNQotPT09PQotCi0qIEJ1aWxkICh3aXRob3V0IHBsdWdpbnMpCi0KLT09PT0KKyBybSAtZiB+Ly5tMi9zZXR0aW5ncy54bWwKICAuL3Rvb2xzL3JlbGVhc2Uuc2gKID09PT0KKysKK1tXQVJOSU5HXQorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CitNYWtlIHN1cmUgeW91IGFyZSBjb21waWxpbmcgdGhlIHJlbGVhc2UgZm9yIGFsbCBicm93c2Vycy4gQ2hlY2sgaW4geW91cgorTWF2ZW4gYH4vLm0yL3NldHRpbmdzLnhtbGAgZmlsZSB0aGF0IG5vIE1hdmVuIHByb2ZpbGUgaXMgYWN0aXZlIHRoYXQKK2xpbWl0cyB0aGUgY29tcGlsYXRpb24gdG8gYSBjZXJ0YWluIGJyb3dzZXIuCis9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAotW1twbHVnaW4tYXBpXV0KLVB1Ymxpc2ggdGhlIFBsdWdpbiBBUEkgSkFSIEZpbGUKLX5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KLQotKiBQdXNoIEpBUiB0byBgY29tbW9uZGF0YXN0b3JhZ2UuZ29vZ2xlYXBpcy5jb21gCi0qKiBSdW4gYHRvb2xzL2RlcGxveV9hcGkuc2hgCi0KLVByZXBhcmUgdGhlIENvcmUgUGx1Z2lucwotfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+Ci0qIGxpbms6ZGV2LXJlbGVhc2Utc3VicHJvamVjdC5odG1sW1JlbGVhc2UgYW5kIHB1Ymxpc2hdIHRoZSBjb3JlIHBsdWdpbnMKLQotUGFja2FnZSBHZXJyaXQgd2l0aCBQbHVnaW5zCi1+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KLSogRW5zdXJlIHRoYXQgdGhlIGNvcmUgcGx1Z2lucyBsaXN0ZWQgaW4gYGdlcnJpdC1wYWNrYWdlLXBsdWdpbnMvcG9tLnhtbGAKLXBvaW50IHRvIHRoZSBsYXRlc3QgcmVsZWFzZSB2ZXJzaW9uIChubyBkZXBlbmRlbmN5IHRvIHNuYXBzaG90IHZlcnNpb25zKQotKiBJbmNsdWRlIGNvcmUgcGx1Z2lucyBpbnRvIFdBUgotPT09PQotICQgLi90b29scy92ZXJzaW9uLnNoIC0tcmVsZWFzZSAmJiBtdm4gY2xlYW4gcGFja2FnZSAtZiBnZXJyaXQtcGFja2FnZS1wbHVnaW5zL3BvbS54bWwKLSAkIC4vdG9vbHMvdmVyc2lvbi5zaCAtLXJlc2V0Ci09PT09Ci0KLSogRmluZCBXQVIgdGhhdCBpbmNsdWRlcyB0aGUgY29yZSBwbHVnaW5zIGF0Ci1gZ2Vycml0LXBhY2thZ2UtcGx1Z2luc1x0YXJnZXRcZ2Vycml0LWZ1bGwtdjIuNS53YXJgCiAqIFNhbml0eSBjaGVjayBXQVIKKyogVGVzdCB0aGUgbmV3IEdlcnJpdCB2ZXJzaW9uCiAKLVB1Ymxpc2ggdG8gdGhlIFByb2plY3QgTG9jYXRpb25zCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorW1twdWJsaXNoLWdlcnJpdF1dCitQdWJsaXNoIHRoZSBHZXJyaXQgUmVsZWFzZQorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIAotV0FSIEZpbGUKLX5+fn5+fn5+CiAKLSogVXBsb2FkIFdBUiB0byBjb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQgKG1hbnVhbCB3ZWIgYnJvd3NlcikKK1tbZXh0ZW5zaW9uLWFuZC1wbHVnaW4tYXBpXV0KK1B1Ymxpc2ggdGhlIEV4dGVuc2lvbiBhbmQgUGx1Z2luIEFQSSBKYXJzCiteXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgorCisqIE1ha2Ugc3VyZSB5b3UgaGF2ZSBkb25lIHRoZQorbGluazpkZXYtcmVsZWFzZS1kZXBsb3ktY29uZmlnLmh0bWwjZGVwbG95LWNvbmZpZ3VyYXRpb24tc2V0dGluZ3MteG1sWworY29uZmlndXJhdGlvbiBuZWVkZWQgZm9yIGRlcGxveW1lbnRdCisKKyogUHVzaCB0aGUgSmFycyB0byBgY29tbW9uZGF0YXN0b3JhZ2UuZ29vZ2xlYXBpcy5jb21gOgorKworLS0tLQorICAuL3Rvb2xzL2RlcGxveV9hcGkuc2gKKy0tLS0KKworCitbW3B1Ymxpc2gtY29yZS1wbHVnaW5zXV0KK1B1Ymxpc2ggdGhlIENvcmUgUGx1Z2lucworXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eCisKKyogbGluazpkZXYtcmVsZWFzZS1zdWJwcm9qZWN0Lmh0bWwjcHVibGlzaC1yZWxlYXNlW1B1Ymxpc2ggdGhlIFJlbGVhc2VdCisKKworW1twdWJsaXNoLWdlcnJpdC13YXJdXQorUHVibGlzaCB0aGUgR2Vycml0IFdBUiAod2l0aCBDb3JlIFBsdWdpbnMpCiteXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KKworKiBUaGUgV0FSIGZpbGUgdG8gdXBsb2FkIGlzIGBnZXJyaXQtcGFja2FnZS1wbHVnaW5zXHRhcmdldFxnZXJyaXQtZnVsbC12Mi41LndhcmAKKyogVXBsb2FkIFdBUiB0byBgY29kZS5nb29nbGUuY29tL3AvZ2Vycml0YCAobWFudWFsIHZpYSB3ZWIgYnJvd3NlcikKICoqIEdvIHRvIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvZG93bmxvYWRzL2xpc3QKLSoqIFVzZSB0aGUgIk5ldyBEb3dubG9hZCIgYnV0dG9uCisqKiBVc2UgdGhlIGBOZXcgRG93bmxvYWRgIGJ1dHRvbgogCiAqIFVwZGF0ZSBsYWJlbHM6Ci0qKiBuZXcgd2FyOiBbcmVsZWFzZS1jYW5kaWRhdGVdLCBmZWF0dXJlZC4uLgotKiogb2xkIHdhcjogZGVwcmVjYXRlZAorKiogbmV3IHdhcjogW2ByZWxlYXNlLWNhbmRpZGF0ZWBdLCBgZmVhdHVyZWRgLi4uCisqKiBvbGQgd2FyOiBgZGVwcmVjYXRlZGAKIAotVGFnCi1+fn4KIAotKiBQdXNoIHRoZSBOZXcgVGFnCitbW3B1c2gtc3RhYmxlXV0KK1B1c2ggdGhlIFN0YWJsZSBCcmFuY2gKK15eXl5eXl5eXl5eXl5eXl5eXl5eXl4KIAorKiBjcmVhdGUgdGhlIHN0YWJsZSBicmFuY2ggYHN0YWJsZS0yLjVgIGluIHRoZSBgZ2Vycml0YCBwcm9qZWN0CisrCitWaWEgdGhlIGxpbms6aHR0cHM6Ly9nZXJyaXQtcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20vIy9hZG1pbi9wcm9qZWN0cy9nZXJyaXQsYnJhbmNoZXNbCitHZXJyaXQgV2ViVUldIG9yIGJ5IHB1c2guCisKKyogUHVzaCB0aGUgY29tbWl0cyBkb25lIG9uIGBzdGFibGUtMi41YCB0byBgcmVmcy9mb3Ivc3RhYmxlLTIuNWAgYW5kCitnZXQgdGhlbSBtZXJnZWQKKworCitbW3B1c2gtdGFnXV0KK1B1c2ggdGhlIFJlbGVhc2UgVGFnCiteXl5eXl5eXl5eXl5eXl5eXl5eXgorCisqIFB1c2ggdGhlIG5ldyBSZWxlYXNlIFRhZworKworRm9yIGFuIGBSQ2A6CisrCiA9PT09CiAgZ2l0IHB1c2ggZ2Vycml0LXJldmlldyByZWZzL3RhZ3MvdjIuNS1yYzA6cmVmcy90YWdzL3YyLjUtcmMwCis9PT09CisrCitGb3IgYSBmaW5hbCBgc3RhYmxlYCByZWxlYXNlOgorKworPT09PQogIGdpdCBwdXNoIGdlcnJpdC1yZXZpZXcgcmVmcy90YWdzL3YyLjU6cmVmcy90YWdzL3YyLjUKID09PT0KIAogCi1Eb2NzCi1+fn5+CitbW3VwbG9hZC1kb2N1bWVudGF0aW9uXV0KK1VwbG9hZCB0aGUgRG9jdW1lbnRhdGlvbgorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eCiAKID09PT0KICBtYWtlIC1DIERvY3VtZW50YXRpb24gUFJJT1I9Mi40IHVwZGF0ZQpAQCAtMTY3LDE0ICsyNDAsMTQgQEAKICogVXBkYXRlIEdvb2dsZSBDb2RlIHByb2plY3QgbGlua3MKICoqIEdvIHRvIGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvYWRtaW4KICoqIFBvaW50IHRoZSBtYWluIHBhZ2UgdG8gdGhlIG5ldyBkb2NzLiBUaGUgbGluayB0byB0aGUgZG9jdW1lbnRhdGlvbiBoYXMgdG8gYmUKLXVwZGF0ZWQgYXQgdHdvIHBsYWNlczogaW4gdGhlIHByb2plY3QgZGVzY3JpcHRpb24gYW5kIGFsc28gaW4gdGhlIExpbmtzCit1cGRhdGVkIGF0IHR3byBwbGFjZXM6IGluIHRoZSBwcm9qZWN0IGRlc2NyaXB0aW9uIGFuZCBhbHNvIGluIHRoZSBgTGlua3NgCiBzZWN0aW9uLgogKiogUG9pbnQgdGhlIG1haW4gcGFnZSB0byB0aGUgbmV3IHJlbGVhc2Ugbm90ZXMKIAogW05PVEVdCiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLVRoZSBkb2NzIG1ha2VmaWxlIGRvZXMgYW4gc3ZuIGNwIG9mIHRoZSBwcmlvciByZXZpc2lvbiBvZiB0aGUgZG9jcyB0byBicmFuY2gKLXRoZSBkb2NzIHNvIHlvdSBoYXZlIGxlc3MgdG8gdXBsb2FkIG9uIHRoZSBuZXcgZG9jcy4KK1RoZSBkb2NzIG1ha2VmaWxlIGRvZXMgYW4gYHN2biBjcGAgb2YgdGhlIHByaW9yIHJldmlzaW9uIG9mIHRoZSBkb2NzIHRvCiticmFuY2ggdGhlIGRvY3Mgc28geW91IGhhdmUgbGVzcyB0byB1cGxvYWQgb24gdGhlIG5ldyBkb2NzLgogCiBVc2VyIGFuZCBwYXNzd29yZCBmcm9tIGhlcmU6CiAKQEAgLTE4OCwzMCArMjYxLDMzIEBACiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAogCi1Jc3N1ZXMKLX5+fn5+fgorW1t1cGRhdGUtaXNzdWVzXV0KK1VwZGF0ZSB0aGUgSXNzdWVzCiteXl5eXl5eXl5eXl5eXl5eXgogCiA9PT09CiAgSG93IGRvIHRoZSBpc3N1ZXMgZ2V0IHVwZGF0ZWQ/ICBEbyB5b3UgcnVuIGEgc2NyaXB0IHRvIGRvCi0gdGhpcz8gIFdoZW4gZG8geW91IGRvIGl0LCBhZnRlciB0aGUgZmluYWwgMi4yLjIgaXMgcmVsZWFzZWQ/CisgdGhpcz8gIFdoZW4gZG8geW91IGRvIGl0LCBhZnRlciB0aGUgZmluYWwgMi41IGlzIHJlbGVhc2VkPwogPT09PQogCiBCeSBoYW5kLgogCi1PdXIgY3VycmVudCBwcm9jZXNzIGlzIGFuIGlzc3VlIHNob3VsZCBiZSB1cGRhdGVkIHRvIHNheSBTdGF0dXMgPQotU3VibWl0dGVkLCBGaXhlZEluLTIuMi4yIG9uY2UgdGhlIGNoYW5nZSBpcyBzdWJtaXR0ZWQsIGJ1dCBiZWZvcmUgdGhlCitPdXIgY3VycmVudCBwcm9jZXNzIGlzIGFuIGlzc3VlIHNob3VsZCBiZSB1cGRhdGVkIHRvIHNheSBgU3RhdHVzID0KK1N1Ym1pdHRlZCwgRml4ZWRJbi0yLjVgIG9uY2UgdGhlIGNoYW5nZSBpcyBzdWJtaXR0ZWQsIGJ1dCBiZWZvcmUgdGhlCiByZWxlYXNlLgogCiBBZnRlciB0aGUgcmVsZWFzZSBpcyBhY3R1YWxseSBtYWRlLCB5b3UgY2FuIHNlYXJjaCBpbiBHb29nbGUgQ29kZSBmb3IKLWBgU3RhdHVzPVN1Ym1pdHRlZCBGaXhlZEluPTIuMi4yJycgYW5kIHRoZW4gYmF0Y2ggdXBkYXRlIHRoZXNlIGNoYW5nZXMKLXRvIHNheSBTdGF0dXM9UmVsZWFzZWQuIE1ha2Ugc3VyZSB0aGUgcHVsbGRvd24gc2F5cyBgYEFsbCBJc3N1ZXMnJwotYmVjYXVzZSBTdGF0dXM9U3VibWl0dGVkIGlzIGNvbnNpZGVyZWQgYSBjbG9zZWQgaXNzdWUuCitgYFN0YXR1cz1TdWJtaXR0ZWQgRml4ZWRJbj0yLjUnJyBhbmQgdGhlbiBiYXRjaCB1cGRhdGUgdGhlc2UgY2hhbmdlcwordG8gc2F5IGBTdGF0dXM9UmVsZWFzZWRgLiBNYWtlIHN1cmUgdGhlIHB1bGxkb3duIHNheXMgYGBBbGwgSXNzdWVzJycKK2JlY2F1c2UgYFN0YXR1cz1TdWJtaXR0ZWRgIGlzIGNvbnNpZGVyZWQgYSBjbG9zZWQgaXNzdWUuCiAKIAotTWFpbGluZyBMaXN0Ci1+fn5+fn5+fn5+fn4KK1tbYW5ub3VuY2VdXQorQW5ub3VuY2Ugb24gTWFpbGluZyBMaXN0CiteXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KIAotKiBTZW5kIGFuIGVtYWlsIHRvIHRoZSBtYWlsaW5nIGxpc3QgdG8gYW5ub3VuY2UgdGhlIHJlbGVhc2UsIGNvbnNpZGVyIGluY2x1ZGluZyBzb21lIG9yIGFsbCBvZiB0aGUgZm9sbG93aW5nIGluIHRoZSBlbWFpbDoKKyogU2VuZCBhbiBlbWFpbCB0byB0aGUgbWFpbGluZyBsaXN0IHRvIGFubm91bmNlIHRoZSByZWxlYXNlLCBjb25zaWRlcgoraW5jbHVkaW5nIHNvbWUgb3IgYWxsIG9mIHRoZSBmb2xsb3dpbmcgaW4gdGhlIGVtYWlsOgogKiogQSBsaW5rIHRvIHRoZSByZWxlYXNlIGFuZCB0aGUgcmVsZWFzZSBub3RlcyAoaWYgYSBmaW5hbCByZWxlYXNlKQogKiogQSBsaW5rIHRvIHRoZSBkb2NzCiAqKiBEZXNjcmliZSB0aGUgdHlwZSBvZiByZWxlYXNlIChzdGFibGUsIGJ1ZyBmaXgsIFJDKQpAQCAtMjQxLDcgKzMxNyw3IEBACiAtTWFydGluCiAtLS0tCiAKLSogQWRkIGFuIGVudHJ5IHRvIHRoZSBORVdTIHNlY3Rpb24gb2YgdGhlIG1haW4gR2Vycml0IHByb2plY3Qgd2ViIHBhZ2UKKyogQWRkIGFuIGVudHJ5IHRvIHRoZSBgTkVXU2Agc2VjdGlvbiBvZiB0aGUgbWFpbiBHZXJyaXQgcHJvamVjdCB3ZWIgcGFnZQogKiogR28gdG86IGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvYWRtaW4KICoqIEFkZCBlbnRyeSBsaWtlOgogLS0tLQpAQCAtMjUyLDE4ICszMjgsMzMgQEAKICoqIEdvIHRvOiBodHRwOi8vZ3JvdXBzLmdvb2dsZS5jb20vZ3JvdXAvcmVwby1kaXNjdXNzL3RvcGljcwogKiogQ2xpY2sgb24gdGhlIGFubm91bmNlbWVudCB0aHJlYWQKICoqIE5lYXIgdGhlIHRvcCByaWdodCwgY2xpY2sgb24gb3B0aW9ucwotKiogVW5kZXIgb3B0aW9ucywgY2ljayB0aGUgIkRpc3BsYXkgdGhpcyB0b3AgZmlyc3QiIGNoZWNrYm94CisqKiBVbmRlciBvcHRpb25zLCBjbGljayB0aGUgIkRpc3BsYXkgdGhpcyB0b3AgZmlyc3QiIGNoZWNrYm94CiAqKiBhbmQgU2F2ZQogCiAqIFVwZGF0ZSB0aGUgcHJldmlvdXMgZGlzY3Vzc2lvbiBncm91cCBhbm5vdW5jZW1lbnQgdG8gbm8gbG9uZ2VyIGJlIHN0aWNreQogKiogU2VlIGFib3ZlICh1bmNsaWNrIGNoZWNrYm94KQogCiAKLU1lcmdpbmcgU3RhYmxlIEZpeGVzIHRvIG1hc3RlcgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCitbW2luY3JlYXNlLXZlcnNpb25dXQorSW5jcmVhc2UgR2Vycml0IFZlcnNpb24gZm9yIEN1cnJlbnQgRGV2ZWxvcG1lbnQKK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CiAKLUFmdGVyIGV2ZXJ5IHN0YWJsZS1maXggcmVsZWFzZSwgc3RhYmxlIHNob3VsZCBiZSBtZXJnZWQgdG8gbWFzdGVyIHRvCi1lbnN1cmUgdGhhdCBub25lIG9mIHRoZSBmaXhlcyBldmVyIGdldCBsb3N0LgorQWxsIG5ldyBkZXZlbG9wbWVudCB0aGF0IGlzIGRvbmUgaW4gdGhlIGBtYXN0ZXJgIGJyYW5jaCB3aWxsIGJlCitpbmNsdWRlZCBpbiB0aGUgbmV4dCBHZXJyaXQgcmVsZWFzZS4gVXBkYXRlIHRoZSBHZXJyaXQgdmVyc2lvbiBpbiBlYWNoCitgcG9tLnhtbGAgZmlsZSB0byB0aGUgbmV4dCBgU05BUFNIT1RgdmVyc2lvbi4gUHVzaCB0aGUgY2hhbmdlIGZvcgorcmV2aWV3IGFuZCBnZXQgaXQgbWVyZ2VkLgorCis9PT09CisgdG9vbHMvdmVyc2lvbi5zaCAtLXNuYXBzaG90PTIuNgorPT09PQorCisKK1tbbWVyZ2Utc3RhYmxlXV0KK01lcmdlIGBzdGFibGVgIGludG8gYG1hc3RlcmAKK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKworQWZ0ZXIgZXZlcnkgcmVsZWFzZSwgc3RhYmxlIHNob3VsZCBiZSBtZXJnZWQgdG8gbWFzdGVyIHRvIGVuc3VyZSB0aGF0Citub25lIG9mIHRoZSBjaGFuZ2VzL2ZpeGVzIGV2ZXIgZ2V0IGxvc3QuCiAKID09PT0KICBnaXQgY29uZmlnIG1lcmdlLnN1bW1hcnkgdHJ1ZQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9lcnJvci1icmFuY2gtbm90LWZvdW5kLnR4dCBiL0RvY3VtZW50YXRpb24vZXJyb3ItYnJhbmNoLW5vdC1mb3VuZC50eHQKaW5kZXggMmFhZDBlMS4uYmQ4ZDA5MCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9lcnJvci1icmFuY2gtbm90LWZvdW5kLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2Vycm9yLWJyYW5jaC1ub3QtZm91bmQudHh0CkBAIC0xNSwxNCArMTUsMTQgQEAKICogdGhhdCB0aGUgYnJhbmNoIG5hbWUgaW4gdGhlIHB1c2ggc3BlY2lmaWNhdGlvbiBpcyB0eXBlZCBjb3JyZWN0bHkKICAgKGNhc2Ugc2Vuc2l0aXZlKSBhbmQKICogdGhhdCB0aGUgYnJhbmNoIHJlYWxseSBleGlzdHMgZm9yIHRoaXMgcHJvamVjdCAoaW4gdGhlIEdlcnJpdCBXZWJVSQotICBnbyB0byAnQWRtaW4nIC0+ICdQcm9qZWN0cycgYW5kIGJyb3dzZSB5b3VyIHByb2plY3QsIHRoZW4gY2xpY2sgb24KKyAgZ28gdG8gJ1Byb2plY3RzJyA+ICdMaXN0JyBhbmQgYnJvd3NlIHlvdXIgcHJvamVjdCwgdGhlbiBjbGljayBvbgogICAnQnJhbmNoZXMnIHRvIHNlZSBhbGwgZXhpc3RpbmcgYnJhbmNoZXMpLgogCiBJZiBpdCB3YXMgeW91ciBpbnRlbnRpb24gdG8gY3JlYXRlIGEgbmV3IGJyYW5jaCB5b3UgY2FuIGVpdGhlcgogCiAqIGJ5cGFzcyBjb2RlIHJldmlldyBvbiBwdXNoIGFzIGV4cGxhaW5lZCBsaW5rOnVzZXItdXBsb2FkLmh0bWwjYnlwYXNzX3Jldmlld1toZXJlXSBvcgogKiBjcmVhdGUgdGhlIG5ldyBicmFuY2ggaW4gdGhlIEdlcnJpdCBXZWJVSSBiZWZvcmUgcHVzaGluZyAoZ28gdG8KLSAgJ0FkbWluJyAtPiAnUHJvamVjdHMnIGFuZCBicm93c2UgeW91ciBwcm9qZWN0LCBpbiB0aGUgJ0JyYW5jaGVzJworICAnUHJvamVjdHMnID4gJ0xpc3QnIGFuZCBicm93c2UgeW91ciBwcm9qZWN0LCBpbiB0aGUgJ0JyYW5jaGVzJwogICB0YWIgeW91IGNhbiB0aGVuIGNyZWF0ZSBhIG5ldyBicmFuY2gpLgogCiBQbGVhc2Ugbm90ZSB0aGF0IHlvdSBuZWVkIHRvIGJlIGdyYW50ZWQgdGhlCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2Vycm9yLWNvbW1pdC1hbHJlYWR5LWV4aXN0cy50eHQgYi9Eb2N1bWVudGF0aW9uL2Vycm9yLWNvbW1pdC1hbHJlYWR5LWV4aXN0cy50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGMzMmM0YzEKLS0tIC9kZXYvbnVsbAorKysgYi9Eb2N1bWVudGF0aW9uL2Vycm9yLWNvbW1pdC1hbHJlYWR5LWV4aXN0cy50eHQKQEAgLTAsMCArMSwxNCBAQAorY29tbWl0IGFscmVhZHkgZXhpc3RzCis9PT09PT09PT09PT09PT09PT09PT0KKworV2l0aCB0aGlzIGVycm9yIG1lc3NhZ2UgR2Vycml0IHJlamVjdHMgdG8gcHVzaCBhIGNvbW1pdCB0byBhbgorZXhpc3RpbmcgY2hhbmdlIHZpYSBgcmVmcy9jaGFuZ2VzL25gIGlmIHRoZSBjb21taXQgd2FzIGFscmVhZHkKK3N1Y2Nlc3NmdWxseSBwdXNoZWQgdG8gdGhlIGNoYW5nZS4gIEluIHRoaXMgY2FzZSB0aGVyZSBpcyBubworbmV3IGNvbW1pdCBhbmQgY29uc2VxdWVudGx5IHRoZXJlIGlzIG5vdGhpbmcgZm9yIEdlcnJpdCB0byBkby4KKworRm9yIGZ1cnRoZXIgaW5mb3JtYXRpb24gYWJvdXQgaG93IHRvIHJlc29sdmUgdGhpcyBlcnJvciwgcGxlYXNlCityZWZlciB0byBsaW5rOmVycm9yLW5vLW5ldy1jaGFuZ2VzLmh0bWxbbm8gbmV3IGNoYW5nZXNdLgorCitHRVJSSVQKKy0tLS0tLQorUGFydCBvZiBsaW5rOmVycm9yLW1lc3NhZ2VzLmh0bWxbR2Vycml0IEVycm9yIE1lc3NhZ2VzXQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9lcnJvci1pbnZhbGlkLWNoYW5nZWlkLWxpbmUudHh0IGIvRG9jdW1lbnRhdGlvbi9lcnJvci1pbnZhbGlkLWNoYW5nZWlkLWxpbmUudHh0CmluZGV4IDJmNTc1NDIuLjkyMzUyNjYgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vZXJyb3ItaW52YWxpZC1jaGFuZ2VpZC1saW5lLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2Vycm9yLWludmFsaWQtY2hhbmdlaWQtbGluZS50eHQKQEAgLTEsOCArMSw4IEBACi1pbnZhbGlkIENoYW5nZS1JZCBsaW5lIGZvcm1hdCBpbiBjb21taXQgbWVzc2FnZQotPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KK2ludmFsaWQgQ2hhbmdlLUlkIGxpbmUgZm9ybWF0IGluIGNvbW1pdCBtZXNzYWdlIGZvb3RlcgorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKIFdpdGggdGhpcyBlcnJvciBtZXNzYWdlIEdlcnJpdCByZWplY3RzIHRvIHB1c2ggYSBjb21taXQgaWYgaXRzIGNvbW1pdAotbWVzc2FnZSBjb250YWlucyBhbiBpbnZhbGlkIENoYW5nZS1JZCBsaW5lLgorbWVzc2FnZSBmb290ZXIgY29udGFpbnMgYW4gaW52YWxpZCBDaGFuZ2UtSWQgbGluZS4KIAogWW91IGNhbiBzZWUgdGhlIGNvbW1pdCBtZXNzYWdlcyBmb3IgZXhpc3RpbmcgY29tbWl0cyBpbiB0aGUgaGlzdG9yeQogYnkgZG9pbmcgYSBsaW5rOmh0dHA6Ly93d3cua2VybmVsLm9yZy9wdWIvc29mdHdhcmUvc2NtL2dpdC9kb2NzL2dpdC1sb2cuaHRtbFtnaXQgbG9nXS4KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZXJyb3ItbWVzc2FnZXMudHh0IGIvRG9jdW1lbnRhdGlvbi9lcnJvci1tZXNzYWdlcy50eHQKaW5kZXggYzlkZjg4My4uNThlOWUwMiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9lcnJvci1tZXNzYWdlcy50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9lcnJvci1tZXNzYWdlcy50eHQKQEAgLTEzLDI1ICsxMywyNiBAQAogKiBsaW5rOmVycm9yLWNoYW5nZS1jbG9zZWQuaHRtbFtjaGFuZ2UgLi4uIGNsb3NlZF0KICogbGluazplcnJvci1jaGFuZ2UtZG9lcy1ub3QtYmVsb25nLXRvLXByb2plY3QuaHRtbFtjaGFuZ2UgLi4uIGRvZXMgbm90IGJlbG9uZyB0byBwcm9qZWN0IC4uLl0KICogbGluazplcnJvci1jaGFuZ2Utbm90LWZvdW5kLmh0bWxbY2hhbmdlIC4uLiBub3QgZm91bmRdCisqIGxpbms6ZXJyb3ItY29tbWl0LWFscmVhZHktZXhpc3RzLmh0bWxbY29tbWl0IGFscmVhZHkgZXhpc3RzXQogKiBsaW5rOmVycm9yLWNvbnRhaW5zLWJhbm5lZC1jb21taXQuaHRtbFtjb250YWlucyBiYW5uZWQgY29tbWl0IC4uLl0KICogbGluazplcnJvci1oYXMtZHVwbGljYXRlcy5odG1sWy4uLiBoYXMgZHVwbGljYXRlc10KICogbGluazplcnJvci1pbnZhbGlkLWF1dGhvci5odG1sW2ludmFsaWQgYXV0aG9yXQotKiBsaW5rOmVycm9yLWludmFsaWQtY2hhbmdlaWQtbGluZS5odG1sW2ludmFsaWQgQ2hhbmdlLUlkIGxpbmUgZm9ybWF0IGluIGNvbW1pdCBtZXNzYWdlXQorKiBsaW5rOmVycm9yLWludmFsaWQtY2hhbmdlaWQtbGluZS5odG1sW2ludmFsaWQgQ2hhbmdlLUlkIGxpbmUgZm9ybWF0IGluIGNvbW1pdCBtZXNzYWdlIGZvb3Rlcl0KICogbGluazplcnJvci1pbnZhbGlkLWNvbW1pdHRlci5odG1sW2ludmFsaWQgY29tbWl0dGVyXQotKiBsaW5rOmVycm9yLW1pc3NpbmctY2hhbmdlaWQuaHRtbFttaXNzaW5nIENoYW5nZS1JZCBpbiBjb21taXQgbWVzc2FnZV0KLSogbGluazplcnJvci1tdWx0aXBsZS1jaGFuZ2VpZC1saW5lcy5odG1sW211bHRpcGxlIENoYW5nZS1JZCBsaW5lcyBpbiBjb21taXQgbWVzc2FnZV0KKyogbGluazplcnJvci1taXNzaW5nLWNoYW5nZWlkLmh0bWxbbWlzc2luZyBDaGFuZ2UtSWQgaW4gY29tbWl0IG1lc3NhZ2UgZm9vdGVyXQorKiBsaW5rOmVycm9yLW11bHRpcGxlLWNoYW5nZWlkLWxpbmVzLmh0bWxbbXVsdGlwbGUgQ2hhbmdlLUlkIGxpbmVzIGluIGNvbW1pdCBtZXNzYWdlIGZvb3Rlcl0KICogbGluazplcnJvci1uby1jaGFuZ2VzLW1hZGUuaHRtbFtubyBjaGFuZ2VzIG1hZGVdCiAqIGxpbms6ZXJyb3Itbm8tY29tbW9uLWFuY2VzdHJ5Lmh0bWxbbm8gY29tbW9uIGFuY2VzdHJ5XQogKiBsaW5rOmVycm9yLW5vLW5ldy1jaGFuZ2VzLmh0bWxbbm8gbmV3IGNoYW5nZXNdCiAqIGxpbms6ZXJyb3Itbm9uLWZhc3QtZm9yd2FyZC5odG1sW25vbi1mYXN0IGZvcndhcmRdCiAqIGxpbms6ZXJyb3Itbm90LWEtZ2Vycml0LWFkbWluaXN0cmF0b3IuaHRtbFtOb3QgYSBHZXJyaXQgYWRtaW5pc3RyYXRvcl0KLSogbGluazplcnJvci1ub3QtYS1nZXJyaXQtcHJvamVjdC5odG1sW25vdCBhIEdlcnJpdCBwcm9qZWN0XQogKiBsaW5rOmVycm9yLW5vdC1wZXJtaXR0ZWQtdG8tY3JlYXRlLmh0bWxbTm90IHBlcm1pdHRlZCB0byBjcmVhdGUgLi4uXQotKiBsaW5rOmVycm9yLW5vdC1zaWduZWQtb2ZmLWJ5Lmh0bWxbbm90IFNpZ25lZC1vZmYtYnkgYXV0aG9yL2NvbW1pdHRlci91cGxvYWRlcl0KKyogbGluazplcnJvci1ub3Qtc2lnbmVkLW9mZi1ieS5odG1sW25vdCBTaWduZWQtb2ZmLWJ5IGF1dGhvci9jb21taXR0ZXIvdXBsb2FkZXIgaW4gY29tbWl0IG1lc3NhZ2UgZm9vdGVyXQogKiBsaW5rOmVycm9yLW5vdC12YWxpZC1yZWYuaHRtbFtub3QgdmFsaWQgcmVmXQogKiBsaW5rOmVycm9yLWNoYW5nZS11cGxvYWQtYmxvY2tlZC5odG1sW09uZSBvciBtb3JlIHJlZnMvZm9yLyBuYW1lcyBibG9ja3MgY2hhbmdlIHVwbG9hZF0KICogbGluazplcnJvci1wZXJtaXNzaW9uLWRlbmllZC5odG1sW1Blcm1pc3Npb24gZGVuaWVkIChwdWJsaWNrZXkpXQogKiBsaW5rOmVycm9yLXByb2hpYml0ZWQtYnktZ2Vycml0Lmh0bWxbcHJvaGliaXRlZCBieSBHZXJyaXRdCisqIGxpbms6ZXJyb3ItcHJvamVjdC1ub3QtZm91bmQuaHRtbFtQcm9qZWN0IG5vdCBmb3VuZDogLi4uXQogKiBsaW5rOmVycm9yLXNxdWFzaC1jb21taXRzLWZpcnN0Lmh0bWxbc3F1YXNoIGNvbW1pdHMgZmlyc3RdCiAqIGxpbms6ZXJyb3ItdXBsb2FkLWRlbmllZC5odG1sW1VwbG9hZCBkZW5pZWQgZm9yIHByb2plY3QgXCcuLi4nXQogKiBsaW5rOmVycm9yLW5vdC1hbGxvd2VkLXRvLXVwbG9hZC1tZXJnZXMuaHRtbFt5b3UgYXJlIG5vdCBhbGxvd2VkIHRvIHVwbG9hZCBtZXJnZXNdCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2Vycm9yLW1pc3NpbmctY2hhbmdlaWQudHh0IGIvRG9jdW1lbnRhdGlvbi9lcnJvci1taXNzaW5nLWNoYW5nZWlkLnR4dAppbmRleCBkYWExZDQ2Li5iMTNmM2I0IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2Vycm9yLW1pc3NpbmctY2hhbmdlaWQudHh0CisrKyBiL0RvY3VtZW50YXRpb24vZXJyb3ItbWlzc2luZy1jaGFuZ2VpZC50eHQKQEAgLTEsMTAgKzEsMTAgQEAKLW1pc3NpbmcgQ2hhbmdlLUlkIGluIGNvbW1pdCBtZXNzYWdlCi09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorbWlzc2luZyBDaGFuZ2UtSWQgaW4gY29tbWl0IG1lc3NhZ2UgZm9vdGVyCis9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAogV2l0aCB0aGlzIGVycm9yIG1lc3NhZ2UgR2Vycml0IHJlamVjdHMgdG8gcHVzaCBhIGNvbW1pdCB0byBhIHByb2plY3QKIHdoaWNoIGlzIGNvbmZpZ3VyZWQgdG8gYWx3YXlzIHJlcXVpcmUgYSBDaGFuZ2UtSWQgaW4gdGhlIGNvbW1pdAogbWVzc2FnZSBpZiB0aGUgY29tbWl0IG1lc3NhZ2Ugb2YgdGhlIHB1c2hlZCBjb21taXQgZG9lcyBub3QgY29udGFpbgotYSBDaGFuZ2UtSWQuCithIENoYW5nZS1JZCBpbiB0aGUgZm9vdGVyICh0aGUgbGFzdCBwYXJhZ3JhcGgpLgogCiBUaGlzIGVycm9yIG1heSBoYXBwZW4gZm9yIHR3byByZWFzb25zOgogCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2Vycm9yLW11bHRpcGxlLWNoYW5nZWlkLWxpbmVzLnR4dCBiL0RvY3VtZW50YXRpb24vZXJyb3ItbXVsdGlwbGUtY2hhbmdlaWQtbGluZXMudHh0CmluZGV4IGU2MDQ5NzQuLjlmYTJiOTEgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vZXJyb3ItbXVsdGlwbGUtY2hhbmdlaWQtbGluZXMudHh0CisrKyBiL0RvY3VtZW50YXRpb24vZXJyb3ItbXVsdGlwbGUtY2hhbmdlaWQtbGluZXMudHh0CkBAIC0xLDggKzEsOCBAQAotbXVsdGlwbGUgQ2hhbmdlLUlkIGxpbmVzIGluIGNvbW1pdCBtZXNzYWdlCi09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KK211bHRpcGxlIENoYW5nZS1JZCBsaW5lcyBpbiBjb21taXQgbWVzc2FnZSBmb290ZXIKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAogV2l0aCB0aGlzIGVycm9yIG1lc3NhZ2UgR2Vycml0IHJlamVjdHMgdG8gcHVzaCBhIGNvbW1pdCBpZiB0aGUgY29tbWl0Ci1tZXNzYWdlIG9mIHRoZSBwdXNoZWQgY29tbWl0IGNvbnRhaW5zIHNldmVyYWwgQ2hhbmdlLUlkIGxpbmVzLgorbWVzc2FnZSBmb290ZXIgb2YgdGhlIHB1c2hlZCBjb21taXQgY29udGFpbnMgc2V2ZXJhbCBDaGFuZ2UtSWQgbGluZXMuCiAKIFlvdSBjYW4gc2VlIHRoZSBjb21taXQgbWVzc2FnZXMgZm9yIGV4aXN0aW5nIGNvbW1pdHMgaW4gdGhlIGhpc3RvcnkKIGJ5IGRvaW5nIGEgbGluazpodHRwOi8vd3d3Lmtlcm5lbC5vcmcvcHViL3NvZnR3YXJlL3NjbS9naXQvZG9jcy9naXQtbG9nLmh0bWxbZ2l0IGxvZ10uCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2Vycm9yLW5vdC1hLWdlcnJpdC1wcm9qZWN0LnR4dCBiL0RvY3VtZW50YXRpb24vZXJyb3Itbm90LWEtZ2Vycml0LXByb2plY3QudHh0CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBkYWM5OGFlLi4wMDAwMDAwCi0tLSBhL0RvY3VtZW50YXRpb24vZXJyb3Itbm90LWEtZ2Vycml0LXByb2plY3QudHh0CisrKyAvZGV2L251bGwKQEAgLTEsMzQgKzAsMCBAQAotbm90IGEgR2Vycml0IHByb2plY3QKLT09PT09PT09PT09PT09PT09PT09Ci0KLVdpdGggdGhpcyBlcnJvciBtZXNzYWdlIEdlcnJpdCByZWplY3RzIHRvIHB1c2ggYSBjb21taXQgaWYgdGhlIGdpdAotcmVwb3NpdG9yeSB0byB3aGljaCB0aGUgcHVzaCBpcyBkb25lIGRvZXMgbm90IGV4aXN0IGFzIGEgcHJvamVjdCBpbgotdGhlIEdlcnJpdCBzZXJ2ZXIgb3IgaWYgdGhlIHB1c2hpbmcgdXNlciBoYXMgbm8gcmVhZCBhY2Nlc3MgZm9yIHRoaXMKLXByb2plY3QuCi0KLVRoZSBuYW1lIG9mIHRoZSBwcm9qZWN0IGluIEdlcnJpdCBoYXMgdGhlIHNhbWUgbmFtZSBhcyB0aGUgcGF0aCBvZgotaXRzIGdpdCByZXBvc2l0b3J5IChleGNsdWRpbmcgdGhlICcuZ2l0JyBleHRlbnNpb24pLgotCi1JZiB5b3UgYXJlIGZhY2luZyB0aGlzIHByb2JsZW0sIGRvIHRoZSBmb2xsb3dpbmc6Ci0KLS4gVmVyaWZ5IHRoYXQgdGhlIHByb2plY3QgbmFtZSBzcGVjaWZpZWQgYXMgZ2l0IHJlcG9zaXRvcnkgaW4gdGhlCi0gIHB1c2ggY29tbWFuZCBpcyB0eXBlZCBjb3JyZWN0bHkgKGNhc2Ugc2Vuc2l0aXZlKS4KLS4gVmVyaWZ5IHRoYXQgeW91IGFyZSBwdXNoaW5nIHRvIHRoZSBjb3JyZWN0IEdlcnJpdCBzZXJ2ZXIuCi0uIEdvIGluIHRoZSBHZXJyaXQgV2ViVUkgdG8gJ0FkbWluJyAtPiAnUHJvamVjdHMnIGFuZCBjaGVjayB0aGF0IHRoZQotICBwcm9qZWN0IGlzIGxpc3RlZC4gSWYgdGhlIHByb2plY3QgaXMgbm90IGxpc3RlZCB0aGUgcHJvamVjdCBlaXRoZXIKLSAgZG9lcyBub3QgZXhpc3Qgb3IgeW91IGRvbid0IGhhdmUKLSAgbGluazphY2Nlc3MtY29udHJvbC5odG1sI2NhdGVnb3J5X3JlYWRbJ1JlYWQnXSBhY2Nlc3MgZm9yIGl0LiBUaGlzCi0gIG1lYW5zIGlmIHlvdSBhcmUgY2VydGFpbiB0aGF0IHRoZSBwcm9qZWN0IG5hbWUgaXMgcmlnaHQgeW91IHNob3VsZAotICBjb250YWN0IHRoZSBHZXJyaXQgQWRtaW5pc3RyYXRvciBvciBwcm9qZWN0IG93bmVyIHRvIHJlcXVlc3QgYWNjZXNzCi0gIHRvIHRoZSBwcm9qZWN0LgotCi1UaGlzIGVycm9yIG1lc3NhZ2UgbWlnaHQgYmUgbWlzbGVhZGluZyBpZiB0aGUgcHJvamVjdCBhY3R1YWxseSBleGlzdHMKLWJ1dCB0aGUgcHVzaCBpcyBmYWlsaW5nIGJlY2F1c2UgdGhlIHB1c2hpbmcgdXNlciBoYXMgbm8gcmVhZCBhY2Nlc3MKLWZvciB0aGUgcHJvamVjdC4gVGhlIHJlYXNvbiB0aGF0IEdlcnJpdCBpbiB0aGlzIGNhc2UgZGVuaWVzIHRoZQotZXhpc3RlbmNlIG9mIHRoZSBwcm9qZWN0IGlzIHRvIHByZXZlbnQgdXNlcnMgZnJvbSBwcm9iaW5nIHRoZSBHZXJyaXQKLXNlcnZlciB0byBzZWUgaWYgYSBwYXJ0aWN1bGFyIHByb2plY3QgZXhpc3RzLgotCi0KLUdFUlJJVAotLS0tLS0tCi1QYXJ0IG9mIGxpbms6ZXJyb3ItbWVzc2FnZXMuaHRtbFtHZXJyaXQgRXJyb3IgTWVzc2FnZXNdCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2Vycm9yLW5vdC1zaWduZWQtb2ZmLWJ5LnR4dCBiL0RvY3VtZW50YXRpb24vZXJyb3Itbm90LXNpZ25lZC1vZmYtYnkudHh0CmluZGV4IDAwZjE3OWIuLmJkMWY0MGQgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vZXJyb3Itbm90LXNpZ25lZC1vZmYtYnkudHh0CisrKyBiL0RvY3VtZW50YXRpb24vZXJyb3Itbm90LXNpZ25lZC1vZmYtYnkudHh0CkBAIC0xLDEwICsxLDEwIEBACi1ub3QgU2lnbmVkLW9mZi1ieSBhdXRob3IvY29tbWl0dGVyL3VwbG9hZGVyCi09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Citub3QgU2lnbmVkLW9mZi1ieSBhdXRob3IvY29tbWl0dGVyL3VwbG9hZGVyIGluIGNvbW1pdCBtZXNzYWdlIGZvb3RlcgorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAogUHJvamVjdHMgaW4gR2Vycml0IGNhbiBiZSBjb25maWd1cmVkIHRvIHJlcXVpcmUgYSBsaW5rOnVzZXItc2lnbmVkb2ZmYnkuaHRtbCNTaWduZWQtb2ZmLWJ5W1NpZ25lZC1vZmYtYnldIGluCi10aGUgY29tbWl0IG1lc3NhZ2UgdG8gZW5mb3JjZSB0aGF0IGV2ZXJ5IGNoYW5nZSBpcyBzaWduZWQgYnkgdGhlCit0aGUgZm9vdGVyIG9mIHRoZSBjb21taXQgbWVzc2FnZSB0byBlbmZvcmNlIHRoYXQgZXZlcnkgY2hhbmdlIGlzIHNpZ25lZCBieSB0aGUKIGF1dGhvciwgY29tbWl0dGVyIG9yIHVwbG9hZGVyLiBJZiBmb3IgYSBwcm9qZWN0IGEgU2lnbmVkLW9mZi1ieSBpcwotcmVxdWlyZWQgYW5kIHRoZSBjb21taXQgbWVzc2FnZSBkb2VzIG5vdCBjb250YWluIGl0LCBHZXJyaXQgcmVqZWN0cworcmVxdWlyZWQgYW5kIHRoZSBjb21taXQgbWVzc2FnZSBmb290ZXIgZG9lcyBub3QgY29udGFpbiBpdCwgR2Vycml0IHJlamVjdHMKIHRvIHB1c2ggdGhlIGNvbW1pdCB3aXRoIHRoaXMgZXJyb3IgbWVzc2FnZS4KIAogVGhpcyBwb2xpY3kgY2FuIGJlIGJ5cGFzc2VkIGJ5IGhhdmluZyB0aGUgYWNjZXNzIHJpZ2h0CkBAIC0xMywxMSArMTMsMTEgQEAKIFRoaXMgZXJyb3IgbWF5IGhhcHBlbiBmb3IgZGlmZmVyZW50IHJlYXNvbnMgaWYgeW91IGRvIG5vdCBoYXZlIHRoZQogYWNjZXNzIHJpZ2h0IHRvIGZvcmdlIHRoZSBjb21taXR0ZXIgaWRlbnRpdHk6CiAKLS4gbWlzc2luZyBTaWduZWQtb2ZmLWJ5IGluIHRoZSBjb21taXQgbWVzc2FnZQotLiBTaWduZWQtb2ZmLWJ5IGlzIGNvbnRhaW5lZCBpbiB0aGUgY29tbWl0IG1lc3NhZ2UgYnV0IGl0J3MgbmVpdGhlcgorLiBtaXNzaW5nIFNpZ25lZC1vZmYtYnkgaW4gdGhlIGNvbW1pdCBtZXNzYWdlIGZvb3RlcgorLiBTaWduZWQtb2ZmLWJ5IGlzIGNvbnRhaW5lZCBpbiB0aGUgY29tbWl0IG1lc3NhZ2UgZm9vdGVyIGJ1dCBpdCdzIG5laXRoZXIKICAgZnJvbSB0aGUgYXV0aG9yLCBjb21taXR0ZXIgbm9yIHVwbG9hZGVyCiAuIFNpZ25lZC1vZmYtYnkgZnJvbSB0aGUgYXV0aG9yLCBjb21taXR0ZXIgb3IgdXBsb2FkZXIgaXMgY29udGFpbmVkCi0gIGluIHRoZSBjb21taXQgbWVzc2FnZSBidXQgbm90IGluIHRoZSBsYXN0IHBhcmFncmFwaAorICBpbiB0aGUgY29tbWl0IG1lc3NhZ2UgYnV0IG5vdCBpbiB0aGUgZm9vdGVyIChsYXN0IHBhcmFncmFwaCkKIAogVG8gYmUgYWJsZSB0byBwdXNoIHlvdXIgY29tbWl0cyB5b3UgaGF2ZSB0byB1cGRhdGUgdGhlIGNvbW1pdAogbWVzc2FnZXMgYXMgZXhwbGFpbmVkIGxpbms6ZXJyb3ItcHVzaC1mYWlscy1kdWUtdG8tY29tbWl0LW1lc3NhZ2UuaHRtbFtoZXJlXSBzbyB0aGF0IHRoZXkgY29udGFpbiBhIFNpZ25lZC1vZmYtYnkgZnJvbQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9lcnJvci1wcm9qZWN0LW5vdC1mb3VuZC50eHQgYi9Eb2N1bWVudGF0aW9uL2Vycm9yLXByb2plY3Qtbm90LWZvdW5kLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zZmMwMTQxCi0tLSAvZGV2L251bGwKKysrIGIvRG9jdW1lbnRhdGlvbi9lcnJvci1wcm9qZWN0LW5vdC1mb3VuZC50eHQKQEAgLTAsMCArMSwzNCBAQAorUHJvamVjdCBub3QgZm91bmQ6IC4uLgorPT09PT09PT09PT09PT09PT09PT09PQorCitXaXRoIHRoaXMgZXJyb3IgbWVzc2FnZSBHZXJyaXQgcmVqZWN0cyB0byBwdXNoIGEgY29tbWl0IGlmIHRoZSBnaXQKK3JlcG9zaXRvcnkgdG8gd2hpY2ggdGhlIHB1c2ggaXMgZG9uZSBkb2VzIG5vdCBleGlzdCBhcyBhIHByb2plY3QgaW4KK3RoZSBHZXJyaXQgc2VydmVyIG9yIGlmIHRoZSBwdXNoaW5nIHVzZXIgaGFzIG5vIHJlYWQgYWNjZXNzIGZvciB0aGlzCitwcm9qZWN0LgorCitUaGUgbmFtZSBvZiB0aGUgcHJvamVjdCBpbiBHZXJyaXQgaGFzIHRoZSBzYW1lIG5hbWUgYXMgdGhlIHBhdGggb2YKK2l0cyBnaXQgcmVwb3NpdG9yeSAoZXhjbHVkaW5nIHRoZSAnLmdpdCcgZXh0ZW5zaW9uKS4KKworSWYgeW91IGFyZSBmYWNpbmcgdGhpcyBwcm9ibGVtLCBkbyB0aGUgZm9sbG93aW5nOgorCisuIFZlcmlmeSB0aGF0IHRoZSBwcm9qZWN0IG5hbWUgc3BlY2lmaWVkIGFzIGdpdCByZXBvc2l0b3J5IGluIHRoZQorICBwdXNoIGNvbW1hbmQgaXMgdHlwZWQgY29ycmVjdGx5IChjYXNlIHNlbnNpdGl2ZSkuCisuIFZlcmlmeSB0aGF0IHlvdSBhcmUgcHVzaGluZyB0byB0aGUgY29ycmVjdCBHZXJyaXQgc2VydmVyLgorLiBHbyBpbiB0aGUgR2Vycml0IFdlYlVJIHRvICdQcm9qZWN0cycgPiAnTGlzdCcgYW5kIGNoZWNrIHRoYXQgdGhlCisgIHByb2plY3QgaXMgbGlzdGVkLiBJZiB0aGUgcHJvamVjdCBpcyBub3QgbGlzdGVkIHRoZSBwcm9qZWN0IGVpdGhlcgorICBkb2VzIG5vdCBleGlzdCBvciB5b3UgZG9uJ3QgaGF2ZQorICBsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWwjY2F0ZWdvcnlfcmVhZFsnUmVhZCddIGFjY2VzcyBmb3IgaXQuIFRoaXMKKyAgbWVhbnMgaWYgeW91IGFyZSBjZXJ0YWluIHRoYXQgdGhlIHByb2plY3QgbmFtZSBpcyByaWdodCB5b3Ugc2hvdWxkCisgIGNvbnRhY3QgdGhlIEdlcnJpdCBBZG1pbmlzdHJhdG9yIG9yIHByb2plY3Qgb3duZXIgdG8gcmVxdWVzdCBhY2Nlc3MKKyAgdG8gdGhlIHByb2plY3QuCisKK1RoaXMgZXJyb3IgbWVzc2FnZSBtaWdodCBiZSBtaXNsZWFkaW5nIGlmIHRoZSBwcm9qZWN0IGFjdHVhbGx5IGV4aXN0cworYnV0IHRoZSBwdXNoIGlzIGZhaWxpbmcgYmVjYXVzZSB0aGUgcHVzaGluZyB1c2VyIGhhcyBubyByZWFkIGFjY2VzcworZm9yIHRoZSBwcm9qZWN0LiBUaGUgcmVhc29uIHRoYXQgR2Vycml0IGluIHRoaXMgY2FzZSBkZW5pZXMgdGhlCitleGlzdGVuY2Ugb2YgdGhlIHByb2plY3QgaXMgdG8gcHJldmVudCB1c2VycyBmcm9tIHByb2JpbmcgdGhlIEdlcnJpdAorc2VydmVyIHRvIHNlZSBpZiBhIHBhcnRpY3VsYXIgcHJvamVjdCBleGlzdHMuCisKKworR0VSUklUCistLS0tLS0KK1BhcnQgb2YgbGluazplcnJvci1tZXNzYWdlcy5odG1sW0dlcnJpdCBFcnJvciBNZXNzYWdlc10KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vaTE4bi1yZWFkbWUudHh0IGIvRG9jdW1lbnRhdGlvbi9pMThuLXJlYWRtZS50eHQKaW5kZXggYTg0YzNkYy4uMjEzNTU5OCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9pMThuLXJlYWRtZS50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9pMThuLXJlYWRtZS50eHQKQEAgLTUsMjIgKzUsMTIgQEAKIHRoZSB3YXkgdGhlIGNvZGUgcHJvZHVjZXMgb3V0cHV0LiAgTW9zdCBvZiB0aGUgVUkgc2hvdWxkIHN1cHBvcnQKIHJpZ2h0LXRvLWxlZnQgKFJUTCkgbGFuZ3VhZ2VzLgogCitMYWJlbHMKKy0tLS0tLQogCi1BcHByb3ZhbENhdGVnb3J5Ci0tLS0tLS0tLS0tLS0tLS0tCi0KLVRoZSBnZXROYW1lKCkgZnVuY3Rpb24gcHJvZHVjZXMgb25seSBhIHNpbmdsZSB0cmFuc2xhdGlvbiBvZiB0aGUKLWRlc2NyaXB0aW9uIHN0cmluZy4gIFRoaXMgbmFtZSBpcyBzZXQgYnkgdGhlIEdlcnJpdCBhZG1pbmlzdHJhdG9yLAotd2hpY2ggbWF5IGNhdXNlIHByb2JsZW1zIGlmIHRoZSBzaXRlIGlzIHRyYW5zbGF0ZWQgaW50byBtdWx0aXBsZQotbGFuZ3VhZ2VzIGFuZCBkaWZmZXJlbnQgdXNlcnMgd2FudCBkaWZmZXJlbnQgdHJhbnNsYXRpb25zLgotCi1BcHByb3ZhbENhdGVnb3J5VmFsdWUKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotCi1UaGUgZ2V0TmFtZSgpIGZ1bmN0aW9uIHByb2R1Y2VzIG9ubHkgYSBzaW5nbGUgdHJhbnNsYXRpb24gb2YgdGhlCi1kZXNjcmlwdGlvbiBzdHJpbmcuICBUaGlzIG5hbWUgaXMgc2V0IGJ5IHRoZSBHZXJyaXQgYWRtaW5pc3RyYXRvciwKLXdoaWNoIG1heSBjYXVzZSBwcm9ibGVtcyBpZiB0aGUgc2l0ZSBpcyB0cmFuc2xhdGVkIGludG8gbXVsdGlwbGUKLWxhbmd1YWdlcyBhbmQgZGlmZmVyZW50IHVzZXJzIHdhbnQgZGlmZmVyZW50IHRyYW5zbGF0aW9ucy4KK0xhYmVscyBhbmQgdGhlaXIgdmFsdWVzIGFyZSBkZWZpbmVkIGluIHByb2plY3QuY29uZmlnIGJ5IHRoZSBHZXJyaXQKK2FkbWluaXN0cmF0b3Igb3IgcHJvamVjdCBvd25lcnMuICBPbmx5IGEgc2luZ2xlIHRyYW5zbGF0aW9uIG9mIHRoZXNlCitzdHJpbmdzIGlzIHN1cHBvcnRlZC4KIAogL0dlcnJpdCBHZXJyaXQuaHRtbAogLS0tLS0tLS0tLS0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9pbmRleC50eHQgYi9Eb2N1bWVudGF0aW9uL2luZGV4LnR4dAppbmRleCA0YzIzMzVmLi45YjJkOGViIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2luZGV4LnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2luZGV4LnR4dApAQCAtNiwyOCArNiwzNiBAQAogCiAqIGxpbms6aW50cm8tcXVpY2suaHRtbFtBIFF1aWNrIEludHJvZHVjdGlvbiBUbyBHZXJyaXRdCiAKLVVzZXIgR3VpZGUKLS0tLS0tLS0tLS0KK0VuZCBVc2VyIEd1aWRlCistLS0tLS0tLS0tLS0tLQogCi0qIGxpbms6aHR0cDovL3NvdXJjZS5hbmRyb2lkLmNvbS9zdWJtaXQtcGF0Y2hlcy93b3JrZmxvd1tEZWZhdWx0IFdvcmtmbG93XQorKiBFeHRlcm5hbCBsaW5rOiBsaW5rOmh0dHA6Ly9zb3VyY2UuYW5kcm9pZC5jb20vc3VibWl0LXBhdGNoZXMvd29ya2Zsb3dbRGVmYXVsdCBBbmRyb2lkIFdvcmtmbG93XQogKiBsaW5rOnVzZXItc2VhcmNoLmh0bWxbU2VhcmNoaW5nIENoYW5nZXNdCiAqIGxpbms6Y21kLWluZGV4Lmh0bWxbQ29tbWFuZCBMaW5lIFRvb2xzXQotKiBsaW5rOnBnbS1pbmRleC5odG1sW1NlcnZlciBQcm9ncmFtc10KICogbGluazp1c2VyLXVwbG9hZC5odG1sW1VwbG9hZGluZyBDaGFuZ2VzXQogKiBsaW5rOnVzZXItY2hhbmdlaWQuaHRtbFtDaGFuZ2UtSWQgTGluZXNdCiAqIGxpbms6dXNlci1zaWduZWRvZmZieS5odG1sW1NpZ25lZC1vZmYtYnkgTGluZXNdCi0qIGxpbms6YWNjZXNzLWNvbnRyb2wuaHRtbFtBY2Nlc3MgQ29udHJvbHNdCiAqIGxpbms6ZXJyb3ItbWVzc2FnZXMuaHRtbFtFcnJvciBNZXNzYWdlc10KLSogbGluazpyZXN0LWFwaS5odG1sW1JFU1QgQVBJXQotKiBsaW5rOnVzZXItY3VzdG9tLWRhc2hib2FyZHMuaHRtbFtDdXN0b20gRGFzaGJvYXJkc10KICogbGluazp1c2VyLW5vdGlmeS5odG1sW1N1YnNjcmliaW5nIHRvIEVtYWlsIE5vdGlmaWNhdGlvbnNdCisKK1Byb2plY3QgT3duZXIgYW5kIFBvd2VyIFVzZXIgR3VpZGUKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworKiBsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWxbQWNjZXNzIENvbnRyb2xzXQorKiBsaW5rOnJlc3QtYXBpLmh0bWxbUkVTVCBBUEldCisqIGxpbms6dXNlci1kYXNoYm9hcmRzLmh0bWxbRGFzaGJvYXJkc10KICogbGluazp1c2VyLXN1Ym1vZHVsZXMuaHRtbFtTdWJzY3JpYmluZyB0byBHaXQgU3VibW9kdWxlc10KLSogbGluazpyZWZzLW5vdGVzLXJldmlldy5odG1sW1RoZSBgcmVmcy9ub3Rlcy9yZXZpZXdgIG5hbWVzcGFjZV0KICogbGluazpwcm9sb2ctY29va2Jvb2suaHRtbFtQcm9sb2cgQ29va2Jvb2tdCiAqIGxpbms6cHJvbG9nLWNoYW5nZS1mYWN0cy5odG1sW1Byb2xvZyBGYWN0cyBmb3IgR2Vycml0IENoYW5nZXNdCisqIGxpbms6Y29uZmlnLWxhYmVscy5odG1sW1JldmlldyBMYWJlbHNdCisKK0FkbWluIFVzZXIgR3VpZGUKKy0tLS0tLS0tLS0tLS0tLS0KKworKiBsaW5rOnBnbS1pbmRleC5odG1sW1NlcnZlciBTaWRlIEFkbWluaXN0cmF0aXZlIFRvb2xzXQogCiBJbnN0YWxsYXRpb24KLS0tLS0tLS0tLS0tLQorfn5+fn5+fn5+fn5+CiAKICogbGluazpsaWNlbnNlcy5odG1sW0xpY2Vuc2VzIGFuZCBOb3RpY2VzXQogKiBsaW5rOmluc3RhbGwuaHRtbFtJbnN0YWxsYXRpb24gR3VpZGVdCkBAIC0zNSw3ICs0Myw3IEBACiAqIGxpbms6cHJvamVjdC1zZXR1cC5odG1sW1Byb2plY3QgU2V0dXBdCiAKIENvbmZpZ3VyYXRpb24KLS0tLS0tLS0tLS0tLS0KK35+fn5+fn5+fn5+fn4KIAogKiBsaW5rOmNvbmZpZy1nZXJyaXQuaHRtbFtTeXN0ZW0gU2V0dGluZ3NdCiAqIGxpbms6Y29uZmlnLWNvbnRhY3QuaHRtbFtVc2VyIENvbnRhY3QgSW5mb3JtYXRpb25dCkBAIC00NSwxNCArNTMsMTYgQEAKICogbGluazpjb25maWctcmV2ZXJzZXByb3h5Lmh0bWxbUmV2ZXJzZSBQcm94eV0KICogbGluazpjb25maWctaG9va3MuaHRtbFtIb29rc10KICogbGluazpjb25maWctbWFpbC5odG1sW01haWwgVGVtcGxhdGVzXQorKiBsaW5rOmNvbmZpZy1jbGEuaHRtbFtDb250cmlidXRvciBBZ3JlZW1lbnRzXQogCi1EZXZlbG9wZXIgRG9jdW1lbnRhdGlvbgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KK0dlcnJpdCBEZXZlbG9wZXIgRG9jdW1lbnRhdGlvbgorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKICogbGluazpkZXYtcmVhZG1lLmh0bWxbRGV2ZWxvcGVyIFNldHVwXQogKiBsaW5rOmRldi1lY2xpcHNlLmh0bWxbRWNsaXBzZSBTZXR1cF0KICogbGluazpkZXYtY29udHJpYnV0aW5nLmh0bWxbQ29udHJpYnV0aW5nIHRvIEdlcnJpdF0KICogbGluazpkZXYtcGx1Z2lucy5odG1sW0RldmVsb3BpbmcgUGx1Z2luc10KKyogbGluazpjb25maWctdmFsaWRhdGlvbi5odG1sW0NvbW1pdCBWYWxpZGF0aW9uXQogKiBsaW5rOmRldi1kZXNpZ24uaHRtbFtTeXN0ZW0gRGVzaWduXQogKiBsaW5rOmkxOG4tcmVhZG1lLmh0bWxbaTE4biBTdXBwb3J0XQogKiBsaW5rOmRldi1yZWxlYXNlLmh0bWxbRGV2ZWxvcGVyIFJlbGVhc2VdCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2luc3RhbGwtajJlZS50eHQgYi9Eb2N1bWVudGF0aW9uL2luc3RhbGwtajJlZS50eHQKaW5kZXggOTY4MTRhMC4uNDkyNzA0MSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9pbnN0YWxsLWoyZWUudHh0CisrKyBiL0RvY3VtZW50YXRpb24vaW5zdGFsbC1qMmVlLnR4dApAQCAtMjcsMTIgKzI3LDYgQEAKICAgcmV2aWV3X3NpdGUvYmluL2dlcnJpdC5zaCBzdG9wCiAtLS0tCiAKLSogRGVwbG95IHRoZSAnZ2Vycml0LndhcicgZmlsZSB0byB5b3VyIGFwcGxpY2F0aW9uIHNlcnZlci4KLSsKLVRoZSBkZXBsb3ltZW50IHByb2Nlc3MgZGlmZmVycyBiZXR3ZWVuIHNlcnZlcnMsIGJ1dCB0eXBpY2FsbHkgdGhpcwotY2FuIGJlIGFjY29tcGxpc2hlZCBieSBjb3B5aW5nICdnZXJyaXQud2FyJyBpbnRvIHRoZSAnd2ViYXBwcy8nCi1zdWJkaXJlY3Rvcnkgb2YgdGhlIGNvbnRhaW5lcidzIGluc3RhbGxhdGlvbi4KLQogKiBDb25maWd1cmUgSk5ESSBEYXRhU291cmNlICdqZGJjL1Jldmlld0RiJy4KICsKIFRoaXMgRGF0YVNvdXJjZSBtdXN0IHBvaW50IHRvIHRoZSBkYXRhYmFzZSB5b3UgY3JlYXRlZCBhYm92ZS4KQEAgLTQwLDYgKzM0LDEyIEBACiBuZWNlc3NhcnkgSkRCQyBkcml2ZXJzLiAgWW91IG1heSB3aXNoIHRvIGVuc3VyZSBjb25uZWN0aW9uIHBvb2xpbmcKIGlzIGNvbmZpZ3VyZWQgYW5kIGVuYWJsZWQgd2l0aGluIHRoZSBEYXRhU291cmNlLgogCisqIERlcGxveSB0aGUgJ2dlcnJpdC53YXInIGZpbGUgdG8geW91ciBhcHBsaWNhdGlvbiBzZXJ2ZXIuCisrCitUaGUgZGVwbG95bWVudCBwcm9jZXNzIGRpZmZlcnMgYmV0d2VlbiBzZXJ2ZXJzLCBidXQgdHlwaWNhbGx5IHRoaXMKK2NhbiBiZSBhY2NvbXBsaXNoZWQgYnkgY29weWluZyAnZ2Vycml0LndhcicgaW50byB0aGUgJ3dlYmFwcHMvJworc3ViZGlyZWN0b3J5IG9mIHRoZSBjb250YWluZXIncyBpbnN0YWxsYXRpb24uCisKICogKCdPcHRpb25hbCcpIEluc3RhbGwgQm91bmN5IENhc3RsZSBDcnlwdG8gQVBJCiArCiBJZiB5b3UgZW5hYmxlZCBCb3VuY3kgQ2FzdGxlIENyeXB0byBkdXJpbmcgJ2luaXQnLCBjb3B5IHRoZSBKQVIKQEAgLTEwMSw4ICsxMDEsOCBAQAogc2NyaXB0IGFuZCBtb2RpZnkgaXQgZm9yIHlvdXIgY29uZmlndXJhdGlvbjoKIAogLS0tLQotICBqYXZhIC1qYXIgd2ViYXBwcy9nZXJyaXQud2FyIC0tY2F0IGV4dHJhL2pldHR5Ny9nZXJyaXQtamV0dHkuc2ggPi9ldGMvaW5pdC5kL2dlcnJpdC1qZXR0eS5zaAotICB2aSAvZXRjL2luaXQuZC9nZXJyaXQtamV0dHkuc2gKKyAgamF2YSAtamFyIHdlYmFwcHMvZ2Vycml0LndhciAtLWNhdCBleHRyYS9qZXR0eTcvZ2Vycml0LWpldHR5LnNoID4vZXRjL2luaXQuZC9nZXJyaXQtamV0dHkKKyAgdmkgL2V0Yy9pbml0LmQvZ2Vycml0LWpldHR5CiAtLS0tCiAKIFtUSVBdCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2luc3RhbGwtcXVpY2sudHh0IGIvRG9jdW1lbnRhdGlvbi9pbnN0YWxsLXF1aWNrLnR4dAppbmRleCBjMDljMTk3Li5mMWJkMjVjIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2luc3RhbGwtcXVpY2sudHh0CisrKyBiL0RvY3VtZW50YXRpb24vaW5zdGFsbC1xdWljay50eHQKQEAgLTEwOSwxMzcgKzEwOSw3IEBACiAgIGdlcnJpdDJAaG9zdDp+JAogLS0tLQogCi1bW3VzZXJzZXR1cF1dCi1UaGUgZmlyc3QgdXNlcgotLS0tLS0tLS0tLS0tLS0KLQotSXQncyB0aW1lIHRvIGV4aXQgdGhlIGdlcnJpdDIgYWNjb3VudCBhcyB5b3Ugbm93IGhhdmUgR2Vycml0IHJ1bm5pbmcgb24geW91cgotaG9zdCBhbmQgc2V0dXAgeW91ciBmaXJzdCB3b3Jrc3BhY2UuCi0KLVN0YXJ0IGEgc2hlbGwgd2l0aCB0aGUgY3JlZGVudGlhbHMgb2YgdGhlIGFjY291bnQgeW91IHdpbGwgcGVyZm9ybQotZGV2ZWxvcG1lbnQgdW5kZXIuCi0KLUNoZWNrIHdoZXRoZXIgdGhlcmUgYXJlIGFueSBzc2gga2V5cyBhbHJlYWR5LiBZb3UncmUgbG9va2luZyBmb3IgdHdvIGZpbGVzLAotaWRfcnNhIGFuZCBpZF9yc2EucHViLgotCi0tLS0tCi0gIHVzZXJAaG9zdDp+JCBscyAuc3NoCi0gIGF1dGhvcml6ZWRfa2V5cyAgY29uZmlnICBpZF9yc2EgIGlkX3JzYS5wdWIgIGtub3duX2hvc3RzCi0gIHVzZXJAaG9zdDp+JAotLS0tLQotCi1JZiB5b3UgaGF2ZSB0aGUgZmlsZXMsIHlvdSBtYXkgc2tpcCB0aGUga2V5IGdlbmVyYXRpbmcgc3RlcC4KLQotSWYgeW91IGRvbid0IHNlZSB0aGUgZmlsZXMgaW4geW91ciBsaXN0aW5nLCB5b3VyIHdpbGwgaGF2ZSB0byBnZW5lcmF0ZSByc2EKLWtleXMgZm9yIHlvdXIgc3NoIHNlc3Npb25zOgotCi1TU0gga2V5IGdlbmVyYXRpb24KLX5+fn5+fn5+fn5+fn5+fn5+fgotCi0qUGxlYXNlIGRvbid0IGdlbmVyYXRlIG5ldyBrZXlzIGlmIHlvdSBhbHJlYWR5IGhhdmUgYSB2YWxpZCBrZXlwYWlyISoKLSpUaGV5IHdpbGwgYmUgb3ZlcndyaXR0ZW4hKgotCi0tLS0tCi0gIHVzZXJAaG9zdDp+JCBzc2gta2V5Z2VuIC10IHJzYQotICBHZW5lcmF0aW5nIHB1YmxpYy9wcml2YXRlIHJzYSBrZXkgcGFpci4KLSAgRW50ZXIgZmlsZSBpbiB3aGljaCB0byBzYXZlIHRoZSBrZXkgKC9ob21lL3VzZXIvLnNzaC9pZF9yc2EpOgotICBDcmVhdGVkIGRpcmVjdG9yeSAnL2hvbWUvdXNlci8uc3NoJy4KLSAgRW50ZXIgcGFzc3BocmFzZSAoZW1wdHkgZm9yIG5vIHBhc3NwaHJhc2UpOgotICBFbnRlciBzYW1lIHBhc3NwaHJhc2UgYWdhaW46Ci0gIFlvdXIgaWRlbnRpZmljYXRpb24gaGFzIGJlZW4gc2F2ZWQgaW4gL2hvbWUvdXNlci8uc3NoL2lkX3JzYS4KLSAgWW91ciBwdWJsaWMga2V5IGhhcyBiZWVuIHNhdmVkIGluIC9ob21lL3VzZXIvLnNzaC9pZF9yc2EucHViLgotICBUaGUga2V5IGZpbmdlcnByaW50IGlzOgotICAwMDoxMToyMjowMDoxMToyMjowMDoxMTo0NDowMDoxMToyMjowMDoxMToyMjo5OSB1c2VyQGhvc3QKLSAgVGhlIGtleSdzIHJhbmRvbWFydCBpbWFnZSBpczoKLSAgKy0tWyBSU0EgMjA0OF0tLS0tKwotICB8ICAgICAuLisuKj0rb28uKkV8Ci0gIHwgICAgICB1Lk9vQi4uIC4gK3wKLSAgfCAgICAgICAuLiouICAgICAgfAotICB8ICAgICAgIG8gICAgICAgICB8Ci0gIHwgICAgICAuIFMgLi4gICAgIHwKLSAgfCAgICAgICAgICAgICAgICAgfAotICB8ICAgICAgICAgICAgICAgICB8Ci0gIHwgICAgICAgICAgLi4gICAgIHwKLSAgfCAgICAgICAgICAgICAgICAgfAotICArLS0tLS0tLS0tLS0tLS0tLS0rCi0gIHVzZXJAaG9zdDp+JAotLS0tLQotCi1SZWdpc3RlcmluZyB5b3VyIGtleSBpbiBHZXJyaXQKLX5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgotCi1PcGVuIGEgYnJvd3NlciBhbmQgZW50ZXIgdGhlIGNhbm9uaWNhbCB1cmwgb2YgeW91ciBHZXJyaXQgc2VydmVyLiAgWW91IGNhbgotZmluZCB0aGUgdXJsIGluIHRoZSBzZXR0aW5ncyBmaWxlLgotCi0tLS0tCi0gIGdlcnJpdDJAaG9zdDp+JCBnaXQgY29uZmlnIC1mIH4vZ2Vycml0X3Rlc3RzaXRlL2V0Yy9nZXJyaXQuY29uZmlnIGdlcnJpdC5jYW5vbmljYWxXZWJVcmwKLSAgaHR0cDovL2xvY2FsaG9zdDo4MDgwLwotICBnZXJyaXQyQGhvc3Q6fiQKLS0tLS0KLQotUmVnaXN0ZXIgYSBuZXcgYWNjb3VudCBpbiBHZXJyaXQgdGhyb3VnaCB0aGUgd2ViIGludGVyZmFjZSB3aXRoIHRoZQotZW1haWwgYWRkcmVzcyBvZiB5b3VyIGNob2ljZS4KLQotVGhlIGRlZmF1bHQgYXV0aGVudGljYXRpb24gdHlwZSBpcyBPcGVuSUQuICBJZiB5b3VyIEdlcnJpdCBzZXJ2ZXIgaXMgYmVoaW5kIGEKLXByb3h5LCBhbmQgeW91IGFyZSB1c2luZyBhbiBleHRlcm5hbCBPcGVuSUQgcHJvdmlkZXIsIHlvdSB3aWxsIG5lZWQgdG8gYWRkIHRoZQotcHJveHkgc2V0dGluZ3MgaW4gdGhlIGNvbmZpZ3VyYXRpb24gZmlsZS4KLQotLS0tLQotICBnZXJyaXQyQGhvc3Q6fiQgZ2l0IGNvbmZpZyAtZiB+L2dlcnJpdF90ZXN0c2l0ZS9ldGMvZ2Vycml0LmNvbmZpZyAtLWFkZCBodHRwLnByb3h5IGh0dHA6Ly9wcm94eTo4MDgwCi0gIGdlcnJpdDJAaG9zdDp+JCBnaXQgY29uZmlnIC1mIH4vZ2Vycml0X3Rlc3RzaXRlL2V0Yy9nZXJyaXQuY29uZmlnIC0tYWRkIGh0dHAucHJveHlVc2VybmFtZSB1c2VybmFtZQotICBnZXJyaXQyQGhvc3Q6fiQgZ2l0IGNvbmZpZyAtZiB+L2dlcnJpdF90ZXN0c2l0ZS9ldGMvZ2Vycml0LmNvbmZpZyAtLWFkZCBodHRwLnByb3h5UGFzc3dvcmQgcGFzc3dvcmQKLS0tLS0KLQotUmVmZXIgdG8gdGhlIEdlcnJpdCBjb25maWd1cmF0aW9uIGd1aWRlIGZvciBtb3JlIGRldGFpbGVkIGluZm9ybWF0aW9uIGFib3V0Ci1saW5rOmNvbmZpZy1nZXJyaXQuaHRtbCNhdXRoW2F1dGhlbnRpY2F0aW9uXSBhbmQKLWxpbms6Y29uZmlnLWdlcnJpdC5odG1sI2h0dHAucHJveHlbcHJveHldIHNldHRpbmdzLgotCi1UaGUgZmlyc3QgdXNlciB0byBzaWduLWluIGFuZCByZWdpc3RlciBhbiBhY2NvdW50IHdpbGwgYmUKLWF1dG9tYXRpY2FsbHkgcGxhY2VkIGludG8gdGhlIGZ1bGx5IHByaXZpbGVnZWQgQWRtaW5pc3RyYXRvcnMgZ3JvdXAsCi1wZXJtaXR0aW5nIHNlcnZlciBtYW5hZ2VtZW50IG92ZXIgdGhlIHdlYiBhbmQgb3ZlciBTU0guICBTdWJzZXF1ZW50Ci11c2VycyB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVnaXN0ZXJlZCBhcyB1bnByaXZpbGVnZWQgdXNlcnMuCi0KLU9uY2Ugc2lnbmVkIGluIGFzIHlvdXIgdXNlciwgeW91IGZpbmQgYSBsaXR0bGUgd2l6YXJkIHRvIGdldCB5b3Ugc3RhcnRlZC4KLVRoZSB3aXphcmQgaGVscHMgeW91IGZpbGwgb3V0OgotCi0qIFJlYWwgbmFtZSAodmlzaWJsZSBuYW1lIGluIEdlcnJpdCkKLSogUmVnaXN0ZXIgeW91ciBlbWFpbCAoaXQgbXVzdCBiZSBjb25maXJtZWQgbGF0ZXIpCi0qIFNlbGVjdCBhIHVzZXJuYW1lIHdpdGggd2hpY2ggdG8gY29tbXVuaWNhdGUgd2l0aCBHZXJyaXQgb3ZlciBzc2grZ2l0Ci0KLSogVGhlIHNlcnZlciB3aWxsIGFzayB5b3UgZm9yIGFuIFJTQSBwdWJsaWMga2V5LgotVGhhdCdzIHRoZSBrZXkgd2UgZ2VuZXJhdGVkIGFib3ZlLCBhbmQgaXQncyB0aW1lIHRvIG1ha2Ugc3VyZSB0aGF0IEdlcnJpdCBrbm93cwotYWJvdXQgb3VyIG5ldyBrZXkgYW5kIGNhbiBpZGVudGlmeSB1cyBieSBpdC4KLQotLS0tLQotICB1c2VyQGhvc3Q6fiQgY2F0IC5zc2gvaWRfcnNhLnB1YgotICBzc2gtcnNhIEFBQUFCM056YUMxeWMyRUFBQUFCSXdBQUFRRUE1RTc4NW1XdE1ja29yUDV2NDBQeUZldWk5VDUwZEtwYUdZdzY3TWx2MkozYUdCRzN0UzBxQlF4S0VwaVYwSjQrVzBSZ1FIYldmTnFkVVllbjliQzVWVkgvR2F0WVdrcEw5VGpqVWNIekYxclgzRXl2N1BIdUhMQXlkLzhaZHY2UjNzYUYraE5wcDFKVzBCU2E3SFh6SzdpTkNWQTNrQnVCdGh4ZUdoM09vRmJhWEhuMXp3d1ZRdzhJNStMcDlPT0lZN3NKRXNNL2tXNjk5WERWNnoyemxrQnlOVkVwNDVqK2cyNng1ckNuR1M4R0pNN0EwdUhzYVdKZGRPNlRpeVI2LzJTT0JGMVZ0S3c0OVhMVFFjbURJbkZBWnpVc0FaU0RLbGZZbG9Qa3BBNllkcWVHMGVKcWF1K2p0enVpZ3lkb1ZqNGo5eGlkY0o5SHR4WmNKTnVyYXc9PSB1c2VyQGhvc3QKLSAgdXNlckBob3N0On4kCi0tLS0tCi0KLUNvcHkgdGhlIHN0cmluZyBzdGFydGluZyB3aXRoIHNzaC1yc2EgdG8geW91ciBjbGlwYm9hcmQgYW5kIHRoZW4gcGFzdGUgaXQKLWludG8gdGhlIGJveCBmb3IgUlNBIGtleXMuIE1ha2UgKmFic29sdXRlbHkgc3VyZSogbm8gZXh0cmEgc3BhY2VzIG9yIGxpbmUgZmVlZHMKLWFyZSBlbnRlcmVkIGluIHRoZSBtaWRkbGUgb2YgdGhlIFJTQSBzdHJpbmcuCi0KLVZlcmlmeSB0aGF0IHRoZSBzc2ggY29ubmVjdGlvbiB3b3JrcyBmb3IgeW91LgotCi0tLS0tCi0gIHVzZXJAaG9zdDp+JCBzc2ggdXNlckBsb2NhbGhvc3QgLXAgMjk0MTgKLSAgVGhlIGF1dGhlbnRpY2l0eSBvZiBob3N0ICdbbG9jYWxob3N0XToyOTQxOCAoWzEyNy4wLjAuMV06Mjk0MTgpJyBjYW4ndCBiZSBlc3RhYmxpc2hlZC4KLSAgUlNBIGtleSBmaW5nZXJwcmludCBpcyBkYjowNzozZDpjMjo5NDoyNTpiNTo4ZDphYzpiYzpiNTo5ZToyZjo5NTo1Zjo0YS4KLSAgQXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGNvbnRpbnVlIGNvbm5lY3RpbmcgKHllcy9ubyk/IHllcwotICBXYXJuaW5nOiBQZXJtYW5lbnRseSBhZGRlZCAnW2xvY2FsaG9zdF06Mjk0MTgnIChSU0EpIHRvIHRoZSBsaXN0IG9mIGtub3duIGhvc3RzLgotCi0gICoqKiogICAgV2VsY29tZSB0byBHZXJyaXQgQ29kZSBSZXZpZXcgICAgKioqKgotCi0gIEhpIHVzZXIsIHlvdSBoYXZlIHN1Y2Nlc3NmdWxseSBjb25uZWN0ZWQgb3ZlciBTU0guCi0KLSAgVW5mb3J0dW5hdGVseSwgaW50ZXJhY3RpdmUgc2hlbGxzIGFyZSBkaXNhYmxlZC4KLSAgVG8gY2xvbmUgYSBob3N0ZWQgR2l0IHJlcG9zaXRvcnksIHVzZToKLQotICBnaXQgY2xvbmUgc3NoOi8vdXNlckBsb2NhbGhvc3Q6Mjk0MTgvUkVQT1NJVE9SWV9OQU1FLmdpdAotCi0gIHVzZXJAaG9zdDp+JAotLS0tLQoraW5jbHVkZTo6Y29uZmlnLWxvZ2luLXJlZ2lzdGVyLnR4dFtdCiAKIFByb2plY3QgY3JlYXRpb24KIC0tLS0tLS0tLS0tLS0tLS0KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vaW5zdGFsbC50eHQgYi9Eb2N1bWVudGF0aW9uL2luc3RhbGwudHh0CmluZGV4IDk5MjZiOGYuLjRiMTRmZjAgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vaW5zdGFsbC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9pbnN0YWxsLnR4dApAQCAtMSw1ICsxLDUgQEAKLUdlcnJpdCBDb2RlIFJldmlldyAtIEluc3RhbGxhdGlvbiBHdWlkZQotPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CitHZXJyaXQgQ29kZSBSZXZpZXcgLSBTdGFuZGFsb25lIERhZW1vbiBJbnN0YWxsYXRpb24gR3VpZGUKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogCiBbW3JlcXVpcmVtZW50c11dCiBSZXF1aXJlbWVudHMKQEAgLTI5LDY3ICsyOSw3IEBACiBJZiB5b3Ugd291bGQgcHJlZmVyIHRvIGJ1aWxkIEdlcnJpdCBkaXJlY3RseSBmcm9tIHNvdXJjZSwgcmV2aWV3CiB0aGUgbm90ZXMgdW5kZXIgbGluazpkZXYtcmVhZG1lLmh0bWxbZGV2ZWxvcGVyIHNldHVwXS4KIAotCi1bW2NyZWF0ZWRiXV0KLURhdGFiYXNlIFNldHVwCi0tLS0tLS0tLS0tLS0tLQotCi1bW2NyZWF0ZWRiX2gyXV0KLUgyCi1+fgotCi1EdXJpbmcgdGhlIGluaXQgcGhhc2Ugb2YgR2Vycml0IHlvdSB3aWxsIG5lZWQgdG8gc3BlY2lmeSB3aGljaCBkYXRhYmFzZSB0byB1c2UuCi1JZiB5b3UgY2hvb3NlIEgyLCBHZXJyaXQgd2lsbCBhdXRvbWF0aWNhbGx5IHNldCB1cCB0aGUgZW1iZWRkZWQgSDIgZGF0YWJhc2UgYXMKLWJhY2tlbmQgc28gbm8gc2V0IHVwIGluIGFkdmFuY2UgaXMgbmVjZXNzYXJ5LiAgQWxzbywgbm8gYWRkaXRpb25hbCBjb25maWd1cmF0aW9uIGlzCi1uZWNlc3NhcnkuICBVc2luZyB0aGUgZW1iZWRkZWQgSDIgZGF0YWJhc2UgaXMgdGhlIGVhc2llc3Qgd2F5IHRvIGdldCBhIEdlcnJpdAotc2l0ZSB1cCBhbmQgcnVubmluZywgbWFraW5nIGl0IGlkZWFsIGZvciBwcm9vZiBvZiBjb25jZXB0cyBvciBzbWFsbCB0ZWFtCi1zZXJ2ZXJzLiAgT24gdGhlIGZsaXAgc2lkZSwgSDIgaXMgbm90IHRoZSByZWNvbW1lbmRlZCBvcHRpb24gZm9yIGxhcmdlCi1jb3Jwb3JhdGUgaW5zdGFsbGF0aW9ucy4gVGhpcyBpcyBiZWNhdXNlIHRoZXJlIGlzIG5vIGVhc3kgd2F5IHRvIGludGVyYWN0Ci13aXRoIHRoZSBkYXRhYmFzZSB3aGlsZSBHZXJyaXQgaXMgb2ZmbGluZSwgaXQncyBub3QgZWFzeSB0byBiYWNrdXAgdGhlIGRhdGEsCi1hbmQgaXQncyBub3QgcG9zc2libGUgdG8gc2V0IHVwIEgyIGluIGEgbG9hZCBiYWxhbmNlZC9ob3Rzd2FwIGNvbmZpZ3VyYXRpb24uCi0KLQotSWYgdGhpcyBvcHRpb24gaW50ZXJlc3RzIHlvdSwgeW91IG1pZ2h0IHdhbnQgdG8gY29uc2lkZXIgbGluazppbnN0YWxsLXF1aWNrLmh0bWxbdGhlIHF1aWNrIGd1aWRlXS4KLQotW1tjcmVhdGVkYl9wb3N0Z3Jlc11dCi1Qb3N0Z3JlU1FMCi1+fn5+fn5+fn5+Ci0KLVRoaXMgb3B0aW9uIGlzIG1vcmUgY29tcGxpY2F0ZWQgdGhhbiB0aGUgSDIgb3B0aW9uIGJ1dCBpcyByZWNvbW1lbmRlZAotZm9yIGxhcmdlciBpbnN0YWxsYXRpb25zLiBJdCdzIHRoZSBkYXRhYmFzZSBiYWNrZW5kIHdpdGggdGhlIGxhcmdlc3QgdXNlcmJhc2UKLWluIHRoZSBHZXJyaXQgY29tbXVuaXR5LgotCi1DcmVhdGUgYSB1c2VyIGZvciB0aGUgd2ViIGFwcGxpY2F0aW9uIHdpdGhpbiBQb3N0Z3JlcywgYXNzaWduIGl0IGEKLXBhc3N3b3JkLCBjcmVhdGUgYSBkYXRhYmFzZSB0byBzdG9yZSB0aGUgbWV0YWRhdGEsIGFuZCBncmFudCB0aGUgdXNlcgotZnVsbCByaWdodHMgb24gdGhlIG5ld2x5IGNyZWF0ZWQgZGF0YWJhc2U6Ci0KLS0tLS0KLSAgY3JlYXRldXNlciAtQSAtRCAtUCAtRSBnZXJyaXQyCi0gIGNyZWF0ZWRiIC1FIFVURi04IC1PIGdlcnJpdDIgcmV2aWV3ZGIKLS0tLS0KLQotCi1bW2NyZWF0ZWRiX215c3FsXV0KLU15U1FMCi1+fn5+fgotCi1UaGlzIG9wdGlvbiBpcyBhbHNvIG1vcmUgY29tcGxpY2F0ZWQgdGhhbiB0aGUgSDIgb3B0aW9uLiBKdXN0IGFzIHdpdGgKLVBvc3RncmVTUUwgaXQncyBhbHNvIHJlY29tbWVuZGVkIGZvciBsYXJnZXIgaW5zdGFsbGF0aW9ucy4KLQotQ3JlYXRlIGEgdXNlciBmb3IgdGhlIHdlYiBhcHBsaWNhdGlvbiB3aXRoaW4gdGhlIGRhdGFiYXNlLCBhc3NpZ24gaXQgYQotcGFzc3dvcmQsIGNyZWF0ZSBhIGRhdGFiYXNlLCBhbmQgZ2l2ZSB0aGUgbmV3bHkgY3JlYXRlZCB1c2VyIGZ1bGwKLXJpZ2h0cyBvbiBpdDoKLQotLS0tLQotICBteXNxbAotCi0gIENSRUFURSBVU0VSICdnZXJyaXQyJ0AnbG9jYWxob3N0JyBJREVOVElGSUVEIEJZICdzZWNyZXQnOwotICBDUkVBVEUgREFUQUJBU0UgcmV2aWV3ZGI7Ci0gIEFMVEVSIERBVEFCQVNFIHJldmlld2RiIGNoYXJzZXQ9bGF0aW4xOwotICBHUkFOVCBBTEwgT04gcmV2aWV3ZGIuKiBUTyAnZ2Vycml0MidAJ2xvY2FsaG9zdCc7Ci0gIEZMVVNIIFBSSVZJTEVHRVM7Ci0tLS0tCi0KK2luY2x1ZGU6OmRhdGFiYXNlLXNldHVwLnR4dFtdCiAKIFtbaW5pdF1dCiBJbml0aWFsaXplIHRoZSBTaXRlCkBAIC0xODUsOCArMTI1LDggQEAKIGF1dG9tYXRpY2FsbHkgc3RhcnRzIGFuZCBzdG9wcyB3aXRoIHRoZSBvcGVyYXRpbmcgc3lzdGVtOgogCiA9PT09Ci0gIHN1ZG8gbG4gLXNuZiBgcHdkYC9yZXZpZXdfc2l0ZS9iaW4vZ2Vycml0LnNoIC9ldGMvaW5pdC5kL2dlcnJpdC5zaAotICBzdWRvIGxuIC1zbmYgLi4vaW5pdC5kL2dlcnJpdC5zaCAvZXRjL3JjMy5kL1M5MGdlcnJpdAorICBzdWRvIGxuIC1zbmYgYHB3ZGAvcmV2aWV3X3NpdGUvYmluL2dlcnJpdC5zaCAvZXRjL2luaXQuZC9nZXJyaXQKKyAgc3VkbyBsbiAtc25mIC9ldGMvaW5pdC5kL2dlcnJpdCAvZXRjL3JjMy5kL1M5MGdlcnJpdAogPT09PQogCiBUbyBpbnN0YWxsIEdlcnJpdCBpbnRvIGFuIGV4aXN0aW5nIHNlcnZsZXQgY29udGFpbmVyIGluc3RlYWQgb2YgdXNpbmcKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vaW50cm8tcXVpY2sudHh0IGIvRG9jdW1lbnRhdGlvbi9pbnRyby1xdWljay50eHQKaW5kZXggMjVmNWQ1ZS4uYWUyZTdlNyAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9pbnRyby1xdWljay50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9pbnRyby1xdWljay50eHQKQEAgLTEzOCwxMCArMTM4LDEwIEBACiBDb21wcmVzc2luZyBvYmplY3RzOiAxMDAlICgyLzIpLCBkb25lLgogV3JpdGluZyBvYmplY3RzOiAxMDAlICgzLzMpLCA1NDIgYnl0ZXMsIGRvbmUuCiBUb3RhbCAzIChkZWx0YSAwKSwgcmV1c2VkIDAgKGRlbHRhIDApCi1yZW1vdGU6IAorcmVtb3RlOgogcmVtb3RlOiBOZXcgQ2hhbmdlczoKIHJlbW90ZTogICBodHRwOi8vZ2Vycml0aG9zdDo4MDgwLzY4Ci1yZW1vdGU6IAorcmVtb3RlOgogVG8gc3NoOi8vZ2Vycml0aG9zdDoyOTQxOC9SZWNpcGVCb29rLmdpdAogICogW25ldyBicmFuY2hdICAgICAgSEVBRCAtPiByZWZzL2Zvci9tYXN0ZXIKIC0tLS0KQEAgLTIwOSwxMCArMjA5LDEyIEBACiB0aGlzIHdlIGNhbiB2aWV3IGl0IHdpdGhpbiB0aGUgR2Vycml0IHdlYiBpbnRlcmZhY2UgYXMgZWl0aGVyIGEKIHVuaWZpZWQgb3Igc2lkZS1ieS1zaWRlIGRpZmYgYnkgc2VsZWN0aW5nIHRoZSBhcHByb3ByaWF0ZSBvcHRpb24uIEluCiB0aGUgZXhhbXBsZSBiZWxvdyB3ZSd2ZSBzZWxlY3RlZCB0aGUgc2lkZS1ieS1zaWRlIHZpZXcuIEluIGVpdGhlciBvZgotdGhlc2Ugdmlld3MgeW91IGNhbiBhZGQgY29tbWVudHMgYnkgZG91YmxlIGNsaWNraW5nIG9uIHRoZSBsaW5lIChvcgotc2luZ2xlIGNsaWNrIHRoZSBsaW5lIG51bWJlcikgdGhhdCB5b3Ugd2FudCB0byBjb21tZW50IG9uLiBPbmNlCi1wdWJsaXNoZWQgdGhlc2UgY29tbWVudHMgYXJlIHZpZXdhYmxlIHRvIGFsbCwgYWxsb3dpbmcgZGlzY3Vzc2lvbgotb2YgdGhlIGNoYW5nZSB0byB0YWtlIHBsYWNlLgordGhlc2Ugdmlld3MgeW91IGNhbiBhZGQgaW5saW5lIGNvbW1lbnRzIGJ5IGRvdWJsZSBjbGlja2luZyBvbiB0aGUgbGluZQorKG9yIHNpbmdsZSBjbGljayB0aGUgbGluZSBudW1iZXIpIHRoYXQgeW91IHdhbnQgdG8gY29tbWVudCBvbi4gQWxzbyB5b3UKK2NhbiBhZGQgZmlsZSBjb21tZW50IGJ5IGRvdWJsZSBjbGlja2luZyBhbnl3aGVyZSAobm90IGp1c3Qgb24gdGhlCisiUGF0Y2ggU2V0IiB3b3JkcykgaW4gdGhlIHRhYmxlIGhlYWRlciBvciBzaW5nbGUgY2xpY2tpbmcgb24gdGhlIGljb24KK2luIHRoZSBsaW5lLW51bWJlciBjb2x1bW4gaGVhZGVyLiBPbmNlIHB1Ymxpc2hlZCB0aGVzZSBjb21tZW50cyBhcmUKK3ZpZXdhYmxlIHRvIGFsbCwgYWxsb3dpbmcgZGlzY3Vzc2lvbiBvZiB0aGUgY2hhbmdlIHRvIHRha2UgcGxhY2UuCiAKIC5TaWRlIEJ5IFNpZGUgUGF0Y2ggVmlldwogaW1hZ2U6OmltYWdlcy9pbnRyby1xdWljay1yZXZpZXctbGluZS1jb21tZW50LmpwZ1tBZGRpbmcgYSBDb21tZW50XQpAQCAtMzc1LDcgKzM3Nyw3IEBACiBhIHNpbmdsZSBidXR0b24uIElmIHlvdSBjaG9vc2UganVzdCB0byBwdWJsaXNoIGNvbW1lbnRzIGF0IHRoaXMgcG9pbnQgdGhlbgogdGhlIHNjb3JlIHdpbGwgYmUgc3RvcmVkIGJ1dCB0aGUgY2hhbmdlIHdvbid0IHlldCBiZSBhY2NlcHRlZCBpbnRvIHRoZSBjb2RlCiBiYXNlLiBJbiB0aGlzIGNhc2UgdGhlcmUgd2lsbCBiZSBhIF9TdWJtaXQgUGF0Y2ggU2V0IFhfIGJ1dHRvbiBvbiB0aGUKLW1haW4gc2NyZWVuLiBKdXN0IGFzIENvZGUgUmV2aWV3IGFuZCBWZXJpZnkgYXJlIGRpZmZlcmVudCBvcGVyYXRpb25zCittYWluIHNjcmVlbi4gSnVzdCBhcyBDb2RlLVJldmlldyBhbmQgVmVyaWZ5IGFyZSBkaWZmZXJlbnQgb3BlcmF0aW9ucwogdGhhdCBjYW4gYmUgZG9uZSBieSBkaWZmZXJlbnQgdXNlcnMsIFN1Ym1pc3Npb24gaXMgYSB0aGlyZCBvcGVyYXRpb24KIHRoYXQgY2FuIGJlIGxpbWl0ZWQgZG93biB0byBhbm90aGVyIGdyb3VwIG9mIHVzZXJzLgogCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2pzb24udHh0IGIvRG9jdW1lbnRhdGlvbi9qc29uLnR4dAppbmRleCBmMDU4OGNlLi4zODkzZTNmIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2pzb24udHh0CisrKyBiL0RvY3VtZW50YXRpb24vanNvbi50eHQKQEAgLTI4LDcgKzI4LDExIEBACiAKIHVybDo6IENhbm9uaWNhbCBVUkwgdG8gcmVhY2ggdGhpcyBjaGFuZ2UuCiAKLWNvbW1pdE1lc3NhZ2U6OiBUaGUgZnVsbCBjb21taXQgbWVzc2FnZSBmb3IgdGhlIGNoYW5nZS4KK2NvbW1pdE1lc3NhZ2U6OiBUaGUgZnVsbCBjb21taXQgbWVzc2FnZSBmb3IgdGhlIGNoYW5nZSdzIGN1cnJlbnQgcGF0Y2gKK3NldC4KKworY3JlYXRlZE9uOjogVGltZSBpbiBzZWNvbmRzIHNpbmNlIHRoZSBVTklYIGVwb2NoIHdoZW4gdGhpcyBjaGFuZ2UKK3dhcyBjcmVhdGVkLgogCiBsYXN0VXBkYXRlZDo6IFRpbWUgaW4gc2Vjb25kcyBzaW5jZSB0aGUgVU5JWCBlcG9jaCB3aGVuIHRoaXMgY2hhbmdlCiB3YXMgbGFzdCB1cGRhdGVkLgpAQCAtNDEsNiArNDUsOCBAQAogCiAgIE5FVzs7IENoYW5nZSBpcyBzdGlsbCBiZWluZyByZXZpZXdlZC4KIAorICBEUkFGVDs7IENoYW5nZSBpcyBhIGRyYWZ0IGNoYW5nZSB0aGF0IG9ubHkgY29uc2lzdHMgb2YgZHJhZnQgcGF0Y2hzZXRzLgorCiAgIFNVQk1JVFRFRDs7IENoYW5nZSBoYXMgYmVlbiBzdWJtaXR0ZWQgYW5kIGlzIGluIHRoZSBtZXJnZSBxdWV1ZS4KICAgSXQgbWF5IGJlIHdhaXRpbmcgZm9yIG9uZSBvciBtb3JlIGRlcGVuZGVuY2llcy4KIApAQCAtNDgsMTQgKzU0LDIwIEBACiAKICAgQUJBTkRPTkVEOzsgQ2hhbmdlIHdhcyBhYmFuZG9uZWQgYnkgaXRzIG93bmVyIG9yIGFkbWluaXN0cmF0b3IuCiAKK2NvbW1lbnRzOjogQWxsIGlubGluZS9maWxlIGNvbW1lbnRzIGZvciB0aGlzIGNoYW5nZSBpbiA8PG1lc3NhZ2UsbWVzc2FnZSBhdHRyaWJ1dGVzPj4uCisKIHRyYWNraW5nSWRzOjogSXNzdWUgdHJhY2tpbmcgc3lzdGVtIGxpbmtzIGluCi08PHRyYWNraW5naWQsdHJhY2tpbmdpZCBhdHRyaWJ1dGU+Piwgc2NyYXBlZCBvdXQgb2YgdGhlIGNvbW1pdAorPDx0cmFja2luZ2lkLHRyYWNraW5naWQgYXR0cmlidXRlcz4+LCBzY3JhcGVkIG91dCBvZiB0aGUgY29tbWl0CiBtZXNzYWdlIGJhc2VkIG9uIHRoZSBzZXJ2ZXIncwogbGluazpjb25maWctZ2Vycml0Lmh0bWwjdHJhY2tpbmdpZFt0cmFja2luZ2lkXSBzZWN0aW9ucy4KIAogY3VycmVudFBhdGNoU2V0OjogQ3VycmVudCA8PHBhdGNoU2V0LHBhdGNoU2V0IGF0dHJpYnV0ZT4+LgogCi1wYXRjaFNldHM6OiBBbGwgPDxwYXRjaFNldCxwYXRjaFNldCBhdHRyaWJ1dGU+PiBmb3IgdGhpcyBjaGFuZ2UuCitwYXRjaFNldHM6OiBBbGwgPDxwYXRjaFNldCxwYXRjaFNldCBhdHRyaWJ1dGVzPj4gZm9yIHRoaXMgY2hhbmdlLgorCitkZXBlbmRzT246OiBMaXN0IG9mIGNoYW5nZXMgdGhhdCB0aGlzIGNoYW5nZSBkZXBlbmRzIG9uIGluIDw8ZGVwZW5kZW5jeSxkZXBlbmRlbmN5IGF0dHJpYnV0ZXM+Pi4KKworbmVlZGVkQnk6OiBMaXN0IG9mIGNoYW5nZXMgdGhhdCBkZXBlbmQgb24gdGhpcyBjaGFuZ2UgaW4gPDxkZXBlbmRlbmN5LGRlcGVuZGVuY3kgYXR0cmlidXRlcz4+LgogCiBzdWJtaXRSZWNvcmRzOjogVGhlIDw8c3VibWl0UmVjb3JkLHN1Ym1pdFJlY29yZCBhdHRyaWJ1dGU+PiBjb250YWlucwogaW5mb3JtYXRpb24gYWJvdXQgd2hldGhlciB0aGlzIGNoYW5nZSBoYXMgYmVlbiBvciBjYW4gYmUgc3VibWl0dGVkLgpAQCAtOTAsMTQgKzEwMiwyOSBAQAogCiByZXZpc2lvbjo6IEdpdCBjb21taXQgZm9yIHRoaXMgcGF0Y2hzZXQuCiAKK3BhcmVudHM6OiBMaXN0IG9mIHBhcmVudCByZXZpc2lvbnMuCisKIHJlZjo6IEdpdCByZWZlcmVuY2UgcG9pbnRpbmcgYXQgdGhlIHJldmlzaW9uLiAgVGhpcyByZWZlcmVuY2UgaXMKIGF2YWlsYWJsZSB0aHJvdWdoIHRoZSBHZXJyaXQgQ29kZSBSZXZpZXcgc2VydmVyJ3MgR2l0IGludGVyZmFjZQogZm9yIHRoZSBjb250YWluaW5nIGNoYW5nZS4KIAogdXBsb2FkZXI6OiBVcGxvYWRlciBvZiB0aGUgcGF0Y2ggc2V0IGluIDw8YWNjb3VudCxhY2NvdW50IGF0dHJpYnV0ZT4+LgogCithdXRob3I6OiBBdXRob3Igb2YgdGhpcyBwYXRjaHNldCBpbiA8PGFjY291bnQsYWNjb3VudCBhdHRyaWJ1dGU+Pi4KKworY3JlYXRlZE9uOjogVGltZSBpbiBzZWNvbmRzIHNpbmNlIHRoZSBVTklYIGVwb2NoIHdoZW4gdGhpcyBwYXRjaHNldAord2FzIGNyZWF0ZWQuCisKIGFwcHJvdmFsczo6IFRoZSA8PGFwcHJvdmFsLGFwcHJvdmFsIGF0dHJpYnV0ZT4+IGdyYW50ZWQuCiAKK2NvbW1lbnRzOjogQWxsIGNvbW1lbnRzIGZvciB0aGlzIHBhdGNoc2V0IGluIDw8cGF0Y2hzZXRjb21tZW50LHBhdGNoc2V0Q29tbWVudCBhdHRyaWJ1dGVzPj4uCisKK2ZpbGVzOjogQWxsIGNoYW5nZWQgZmlsZXMgaW4gdGhpcyBwYXRjaHNldCBpbiA8PHBhdGNoLHBhdGNoIGF0dHJpYnV0ZXM+Pi4KKworc2l6ZUluc2VydGlvbnM6OiBTaXplIGluZm9ybWF0aW9uIG9mIGluc2VydGlvbnMgb2YgdGhpcyBwYXRjaHNldC4KKworc2l6ZURlbGV0aW9uczo6IFNpemUgaW5mb3JtYXRpb24gb2YgZGVsZXRpb25zIG9mIHRoaXMgcGF0Y2hzZXQuCisKIFtbYXBwcm92YWxdXQogYXBwcm92YWwKIC0tLS0tLS0tCkBAIC0xMjMsMTkgKzE1MCw5IEBACiAKIG5ld1Jldjo6IFRoZSBuZXcgdmFsdWUgdGhlIHJlZiB3YXMgdXBkYXRlZCB0by4KIAotcHJvamVjdDo6IFByb2plY3QgcGF0aCBpbiBHZXJyaXQuCi0KIHJlZk5hbWU6OiBSZWYgbmFtZSB3aXRoaW4gcHJvamVjdC4KIAotW1txdWVyeUxpbWl0XV0KLXF1ZXJ5TGltaXQKLS0tLS0tLS0tLS0KLUluZm9ybWF0aW9uIGFib3V0IHRoZSBsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWwjY2FwYWJpbGl0eV9xdWVyeUxpbWl0W3F1ZXJ5TGltaXRdCi1vZiBhIHVzZXIuCi0KLW1pbjo6IGxvd2VyIGxpbWl0Ci0KLW1heDo6IHVwcGVyIGxpbWl0Citwcm9qZWN0OjogUHJvamVjdCBwYXRoIGluIEdlcnJpdC4KIAogW1tzdWJtaXRSZWNvcmRdXQogc3VibWl0UmVjb3JkCkBAIC0xNzgsNiArMTk1LDczIEBACiAKIGJ5OjogVGhlIDw8YWNjb3VudCxhY2NvdW50Pj4gdGhhdCBhcHBsaWVkIHRoZSBsYWJlbC4KIAorW1tkZXBlbmRlbmN5XV0KK2RlcGVuZGVuY3kKKy0tLS0tLS0tLS0KK0luZm9ybWF0aW9uIGFib3V0IGEgY2hhbmdlIG9yIHBhdGNoc2V0IGRlcGVuZGVuY3kuCisKK2lkOjogQ2hhbmdlIGlkZW50aWZpZXIuCisKK251bWJlcjo6IENoYW5nZSBudW1iZXIuCisKK3JldmlzaW9uOjogUGF0Y2hzZXQgcmV2aXNpb24uCisKK3JlZjo6IFJlZiBuYW1lLgorCitpc0N1cnJlbnRQYXRjaFNldDo6IElmIHRoZSByZXZpc2lvbiBpcyB0aGUgY3VycmVudCBwYXRjaHNldCBvZiB0aGUgY2hhbmdlLgorCitbW21lc3NhZ2VdXQorbWVzc2FnZQorLS0tLS0tLQorQ29tbWVudCBhZGRlZCBvbiBhIGNoYW5nZSBieSBhIHJldmlld2VyLgorCit0aW1lc3RhbXA6OiBUaW1lIGluIHNlY29uZHMgc2luY2UgdGhlIFVOSVggZXBvY2ggd2hlbiB0aGlzIGNvbW1lbnQKK3dhcyBhZGRlZC4KKworcmV2aWV3ZXI6OiBUaGUgPDxhY2NvdW50LGFjY291bnQ+PiB0aGF0IGFkZGVkIHRoZSBjb21tZW50LgorCittZXNzYWdlOjogVGhlIGNvbW1lbnQgdGV4dC4KKworW1twYXRjaHNldGNvbW1lbnRdXQorcGF0Y2hzZXRDb21tZW50CistLS0tLS0tLS0tLS0tLS0KK0NvbW1lbnQgYWRkZWQgb24gYSBwYXRjaHNldCBieSBhIHJldmlld2VyLgorCitmaWxlOjogVGhlIG5hbWUgb2YgdGhlIGZpbGUgb24gd2hpY2ggdGhlIGNvbW1lbnQgd2FzIGFkZGVkLgorCitsaW5lOjogVGhlIGxpbmUgbnVtYmVyIGF0IHdoaWNoIHRoZSBjb21tZW50IHdhcyBhZGRlZC4KKworcmV2aWV3ZXI6OiBUaGUgPDxhY2NvdW50LGFjY291bnQ+PiB0aGF0IGFkZGVkIHRoZSBjb21tZW50LgorCittZXNzYWdlOjogVGhlIGNvbW1lbnQgdGV4dC4KKworW1twYXRjaF1dCitwYXRjaAorLS0tLS0KK0luZm9ybWF0aW9uIGFib3V0IGEgcGF0Y2ggb24gYSBmaWxlLgorCitmaWxlOjogVGhlIG5hbWUgb2YgdGhlIGZpbGUuICBJZiB0aGUgZmlsZSBpcyByZW5hbWVkLCB0aGUgbmV3IG5hbWUuCisKK2ZpbGVPbGQ6OiBUaGUgb2xkIG5hbWUgb2YgdGhlIGZpbGUsIGlmIHRoZSBmaWxlIGlzIHJlbmFtZWQuCisKK3R5cGU6OiBUaGUgdHlwZSBvZiBjaGFuZ2UuCisKKyAgQURERUQ7OyBUaGUgZmlsZSBpcyBiZWluZyBjcmVhdGVkL2ludHJvZHVjZWQgYnkgdGhpcyBwYXRjaC4KKworICBNT0RJRklFRDs7IFRoZSBmaWxlIGFscmVhZHkgZXhpc3RzLCBhbmQgaGFzIHVwZGF0ZWQgY29udGVudC4KKworICBERUxFVEVEOzsgVGhlIGZpbGUgZXhpc3RlZCwgYnV0IGlzIGJlaW5nIHJlbW92ZWQgYnkgdGhpcyBwYXRjaC4KKworICBSRU5BTUVEOzsgVGhlIGZpbGUgaXMgcmVuYW1lZC4KKworICBDT1BJRUQ7OyBUaGUgZmlsZSBpcyBjb3BpZWQgZnJvbSBhbm90aGVyIGZpbGUuCisKKyAgUkVXUklURTs7IFN1ZmZpY2llbnQgYW1vdW50IG9mIGNvbnRlbnQgY2hhbmdlZCB0byBjbGFpbSB0aGUgZmlsZSB3YXMgcmV3cml0dGVuLgorCitpbnNlcnRpb25zOjogbnVtYmVyIG9mIGluc2VydGlvbnMgb2YgdGhpcyBwYXRjaC4KKworZGVsZXRpb25zOjogIG51bWJlciBvZiBkZWxldGlvbnMgb2YgdGhpcyBwYXRjaC4KKwogU0VFIEFMU08KIC0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vbGljZW5zZXMudHh0IGIvRG9jdW1lbnRhdGlvbi9saWNlbnNlcy50eHQKaW5kZXggNzc4N2ZlOC4uNjlhMTJjMyAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9saWNlbnNlcy50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9saWNlbnNlcy50eHQKQEAgLTM4LDYgKzM4LDcgQEAKIHxKZXR0eSAgICAgICAgICAgICAgICAgICAgICB8IDw8YXBhY2hlMixBcGFjaGUgTGljZW5zZSAyLjA+Piwgb3IgbGluazpodHRwOi8vd3d3LmVjbGlwc2Uub3JnL2xlZ2FsL2VwbC12MTAuaHRtbFtFUExdCiB8UHJvbG9nIENhZmUgICAgICAgICAgICAgICAgfCA8PHByb2xvZ19jYWZlLEVQTCBvciBHUEw+PgogfEdvb2dsZSBDb2RlIFByZXR0aWZ5ICAgICAgIHwgPDxhcGFjaGUyLEFwYWNoZSBMaWNlbnNlIDIuMD4+Cit8SmF2YUVXQUggICAgICAgICAgICAgICAgICAgfCA8PGFwYWNoZTIsQXBhY2hlIExpY2Vuc2UgMi4wPj4KIHxKR2l0ICAgICAgICAgICAgICAgICAgICAgICB8IDw8amdpdCxOZXctU3R5bGUgQlNEPj4KIHxKU2NoICAgICAgICAgICAgICAgICAgICAgICB8IDw8c3NoZCxOZXctU3R5bGUgQlNEPj4KIHxQb3N0Z3JlU1FMIEpEQkMgRHJpdmVyICAgICB8IDw8cG9zdGdyZXNxbCxOZXctU3R5bGUgQlNEPj4KQEAgLTQwNyw3ICs0MDgsOCBAQAogCiBPcmlnaW5hbGx5IGRldmVsb3BlZCBieSBNdXRzdW5vcmkgQkFOQkFSQSBhbmQgTmFveXVraSBUQU1VUkEgYXQgdGhlCiBLb2JlIFVuaXZlcnNpdHksIEpBUEFOLiBHZXJyaXQgQ29kZSBSZXZpZXcgdXNlcyBhIGZvcmsgZGVyaXZlZCBmcm9tCi10aGUgMS4yLjUgcmVsZWFzZS4KK3RoZSAxLjIuNSByZWxlYXNlLCBhbmQgb2ZmZXJzIHRoZSBjb3JyZXNwb25kaW5nIHNvdXJjZSBjb2RlIGF0CitsaW5rOmh0dHBzOi8vZ2Vycml0Lmdvb2dsZXNvdXJjZS5jb20vcHJvbG9nLWNhZmVbXS4KIAogUHJvbG9nIENhZmUgaXMgZHVhbCBsaWNlbnNlZCBhbmQgYXZhaWxhYmxlIHVuZGVyIGVpdGhlciB0aGUKIGxpbms6aHR0cDovL29wZW5zb3VyY2Uub3JnL2xpY2Vuc2VzL2VjbGlwc2UtMS4wLnBocFtFY2xpcHNlIFB1YmxpYyBMaWNlbnNlXSwKQEAgLTQxNSw4ICs0MTcsNyBAQAogbGluazpodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTIuMC5odG1sW0dQTCB2ZXJzaW9uIDIuMCAob3IgbGF0ZXIpXS4KIAogSW4gdGhlIGNvbnRleHQgb2YgR2Vycml0IENvZGUgUmV2aWV3LCBQcm9sb2cgQ2FmZSBpcyBjb25zdW1lZAotdW5kZXIgZWl0aGVyIHRoZSBFUEwgb3IgR1BMIHZlcnNpb24gMy4wIGFzIEdQTCB2ZXJzaW9uIDIuMCBpcwotbm90IGNvbXBhdGlibGUgd2l0aCBBcGFjaGUgTGljZW5zZSAyLjAuCit1bmRlciB0aGUgRVBMLgogCiBbW2gyXV0KIEgyIERhdGFiYXNlIC0gRVBMIG9yIG1vZGlmaWVkIE1QTApAQCAtNjQzLDEwICs2NDQsMTAgQEAKICBkaXN0cmlidXRlLCAgc3VibGljZW5zZSwgYW5kL29yIHNlbGwgIGNvcGllcyBvZiAgdGhlIFNvZnR3YXJlLCAgYW5kIHRvCiAgcGVybWl0IHBlcnNvbnMgdG8gd2hvbSB0aGUgU29mdHdhcmUgIGlzIGZ1cm5pc2hlZCB0byBkbyBzbywgc3ViamVjdCB0bwogIHRoZSBmb2xsb3dpbmcgY29uZGl0aW9uczoKLSAKKwogIFRoZSAgYWJvdmUgIGNvcHlyaWdodCAgbm90aWNlICBhbmQgIHRoaXMgcGVybWlzc2lvbiAgbm90aWNlICBzaGFsbCAgYmUKICBpbmNsdWRlZCBpbiBhbGwgY29waWVzIG9yIHN1YnN0YW50aWFsIHBvcnRpb25zIG9mIHRoZSBTb2Z0d2FyZS4KLSAKKwogIFRIRSAgU09GVFdBUkUgSVMgIFBST1ZJREVEICAiQVMgIElTIiwgV0lUSE9VVCAgV0FSUkFOVFkgIE9GIEFOWSAgS0lORCwKICBFWFBSRVNTIE9SICBJTVBMSUVELCBJTkNMVURJTkcgIEJVVCBOT1QgTElNSVRFRCAgVE8gVEhFICBXQVJSQU5USUVTIE9GCiAgTUVSQ0hBTlRBQklMSVRZLCAgICBGSVRORVNTICAgIEZPUiAgICBBICAgUEFSVElDVUxBUiAgICBQVVJQT1NFICAgIEFORApAQCAtNjY0LDkgKzY2NSw5IEBACiAKIC0tLS0KIChUaGUgTUlUIExpY2Vuc2UpCi0gCisKIENvcHlyaWdodCAoYykgMjAwOCBUb20gUHJlc3Rvbi1XZXJuZXIKLSAKKwogUGVybWlzc2lvbiBpcyBoZXJlYnkgZ3JhbnRlZCwgZnJlZSBvZiBjaGFyZ2UsIHRvIGFueSBwZXJzb24gb2J0YWluaW5nCiBhIGNvcHkgb2YgdGhpcyBzb2Z0d2FyZSBhbmQgYXNzb2NpYXRlZCBkb2N1bWVudGF0aW9uIGZpbGVzICh0aGUKICdTb2Z0d2FyZScpLCB0byBkZWFsIGluIHRoZSBTb2Z0d2FyZSB3aXRob3V0IHJlc3RyaWN0aW9uLCBpbmNsdWRpbmcKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vbWFuLy5naXRpZ25vcmUgYi9Eb2N1bWVudGF0aW9uL21hbi8uZ2l0aWdub3JlCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc5OTNhNTUKLS0tIC9kZXYvbnVsbAorKysgYi9Eb2N1bWVudGF0aW9uL21hbi8uZ2l0aWdub3JlCkBAIC0wLDAgKzEgQEAKK2dlcnJpdCoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vbWFuL01ha2VmaWxlIGIvRG9jdW1lbnRhdGlvbi9tYW4vTWFrZWZpbGUKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzVlNjUzMwotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vbWFuL01ha2VmaWxlCkBAIC0wLDAgKzEsNjMgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyMKKyMgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisjIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyMgWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisjCisjIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorIworIyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisjIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisjIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorIyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisjIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitBMlggPz0gYTJ4CisKK2FsbDogbWFuCisKK2NsZWFuOgorCUBybSAtZiBnZXJyaXQtKgorCitDTURfQ09SRV9TU0hfQ01EIDo9IFwKK2NtZC1iYW4tY29tbWl0LnR4dCAgICAgXAorY21kLWNyZWF0ZS1hY2NvdW50LnR4dCBcCitjbWQtY3JlYXRlLWdyb3VwLnR4dCAgIFwKK2NtZC1jcmVhdGUtcHJvamVjdC50eHQgXAorY21kLWZsdXNoLWNhY2hlcy50eHQgICBcCitjbWQtZ2MudHh0ICAgICAgICAgICAgIFwKK2NtZC1nc3FsLnR4dCAgICAgICAgICAgXAorY21kLWxzLWdyb3Vwcy50eHQgICAgICBcCitjbWQtbHMtcHJvamVjdHMudHh0ICAgIFwKK2NtZC1scy11c2VyLXJlZnMudHh0ICAgXAorY21kLXF1ZXJ5LnR4dCAgICAgICAgICBcCitjbWQtcmVuYW1lLWdyb3VwLnR4dCAgIFwKK2NtZC1yZXZpZXcudHh0ICAgICAgICAgXAorY21kLXNldC1hY2NvdW50LnR4dCAgICBcCitjbWQtc2V0LXByb2plY3QtcGFyZW50LnR4dCBcCitjbWQtc2V0LXByb2plY3QudHh0ICAgIFwKK2NtZC1zZXQtcmV2aWV3ZXJzLnR4dCAgXAorY21kLXNob3ctY2FjaGVzLnR4dCAgICBcCitjbWQtc2hvdy1jb25uZWN0aW9ucy50eHQgICBcCitjbWQtc2hvdy1xdWV1ZS50eHQgICAgIFwKK2NtZC1zdHJlYW0tZXZlbnRzLnR4dCAgXAorY21kLXRlc3Qtc3VibWl0LXJ1bGUudHh0ICAgXAorY21kLXZlcnNpb24udHh0CisKK0dFUlJJVF9DT1JFX1NTSF9DTUQgOj0gJChwYXRzdWJzdCBjbWQtJSxnZXJyaXQtJSwkKENNRF9DT1JFX1NTSF9DTUQpKQorRE9DX01BTiA6PSAkKHBhdHN1YnN0ICUudHh0LCUuMSwkKEdFUlJJVF9DT1JFX1NTSF9DTUQpKQorCittYW46ICQoR0VSUklUX0NPUkVfU1NIX0NNRCkgJChET0NfTUFOKQorCiskKEdFUlJJVF9DT1JFX1NTSF9DTUQpIDogZ2Vycml0LSUudHh0IDogLi4vY21kLSUudHh0CisJQGNwICQ8ICRACisKKyQoRE9DX01BTikgOiAlLjEgOiAlLnR4dAorCUBlY2hvICJjcmVhdGluZyBtYW4gcGFnZSBmb3IgJEAgLi4uIgorCUBybSAtZiAkQAorCUAkKGV2YWwgVElUTEUgOj0gJChqb2luICQoYmFzZW5hbWUgJDwpLFwoMVwpKSkKKwlAJChldmFsIFNFUEVSQVRPUiA6PSAkKHNoZWxsIGVjaG8gJChUSVRMRSkgfCBzZWQgJ3MvLi89L2cnKSkKKwlAc2VkIC1pIC1yZSAnMXMvXi4qJC8vJChUSVRMRSkvJyAkPAorCUBzZWQgLWkgLXJlICcycy9ePS4qLyQoU0VQRVJBVE9SKS8nICQ8CisJQHNlZCAtaSAtcmUgJzZzL15nZXJyaXRccysoXHcpL2dlcnJpdC1cMS8nICQ8CisJQCQoQTJYKSAtLWRvY3R5cGUgbWFucGFnZSAtLWZvcm1hdCBtYW5wYWdlICQ8CmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3BnbS1FeHBvcnRSZXZpZXdOb3Rlcy50eHQgYi9Eb2N1bWVudGF0aW9uL3BnbS1FeHBvcnRSZXZpZXdOb3Rlcy50eHQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDFiMDAyMTMuLjAwMDAwMDAKLS0tIGEvRG9jdW1lbnRhdGlvbi9wZ20tRXhwb3J0UmV2aWV3Tm90ZXMudHh0CisrKyAvZGV2L251bGwKQEAgLTEsNTAgKzAsMCBAQAotRXhwb3J0UmV2aWV3Tm90ZXMKLT09PT09PT09PT09PT09PT09Ci0KLU5BTUUKLS0tLS0KLUV4cG9ydFJldmlld05vdGVzIC0gRXhwb3J0IHN1Y2Nlc3NmdWwgcmV2aWV3cyB0byBsaW5rOnJlZnMtbm90ZXMtcmV2aWV3Lmh0bWxbcmVmcy9ub3Rlcy9yZXZpZXddCi0KLVNZTk9QU0lTCi0tLS0tLS0tLQotW3ZlcnNlXQotJ2phdmEnIC1qYXIgZ2Vycml0LndhciAnRXhwb3J0UmV2aWV3Tm90ZXMnIC1kIDxTSVRFX1BBVEg+Ci0KLURFU0NSSVBUSU9OCi0tLS0tLS0tLS0tLQotU2NhbnMgZXZlcnkgc3VibWl0dGVkIGNoYW5nZSBhbmQgY3JlYXRlcyBhbiBpbml0aWFsIG5vdGVzCi1icmFuY2ggZGV0YWlsaW5nIHRoZSBwcmV2aW91cyBzdWJtaXNzaW9uIGluZm9ybWF0aW9uIGZvcgotZWFjaCBtZXJnZWQgY2hhbmdlLgotCi1UaGlzIHRhc2sgY2FuIHRha2UgcXVpdGUgc29tZSB0aW1lLCBidXQgY2FuIHJ1biBpbiB0aGUgYmFja2dyb3VuZAotY29uY3VycmVudGx5IHRvIHRoZSBzZXJ2ZXIgaWYgdGhlIGRhdGFiYXNlIGlzIE15U1FMIG9yIFBvc3RncmVTUUwuCi1JZiB0aGUgZGF0YWJhc2UgaXMgSDIsIHRoaXMgdGFzayBtdXN0IGJlIHJ1biBieSBpdHNlbGYuCi0KLU9QVElPTlMKLS0tLS0tLS0KLQotLWQ6OgotXC0tc2l0ZS1wYXRoOjoKLQlMb2NhdGlvbiBvZiB0aGUgZ2Vycml0LmNvbmZpZyBmaWxlLCBhbmQgYWxsIG90aGVyIHBlci1zaXRlCi0JY29uZmlndXJhdGlvbiBkYXRhLCBzdXBwb3J0aW5nIGxpYnJhcmllcyBhbmQgbG9nIGZpbGVzLgotCi1cLS10aHJlYWRzOjoKLQlOdW1iZXIgb2YgdGhyZWFkcyB0byBwZXJmb3JtIHRoZSBzY2FuIHdvcmsgd2l0aC4gIERlZmF1bHQ6IDIuCi0KLUNPTlRFWFQKLS0tLS0tLS0KLVRoaXMgY29tbWFuZCBjYW4gb25seSBiZSBydW4gb24gYSBzZXJ2ZXIgd2hpY2ggaGFzIGRpcmVjdAotY29ubmVjdGl2aXR5IHRvIHRoZSBtZXRhZGF0YSBkYXRhYmFzZSwgYW5kIGxvY2FsIGFjY2VzcyB0byB0aGUKLW1hbmFnZWQgR2l0IHJlcG9zaXRvcmllcy4KLQotRVhBTVBMRVMKLS0tLS0tLS0tCi1UbyBnZW5lcmF0ZSBhbGwgcmV2aWV3IGluZm9ybWF0aW9uOgotCi09PT09Ci0JJCBqYXZhIC1qYXIgZ2Vycml0LndhciBFeHBvcnRSZXZpZXdOb3RlcyAtZCBzaXRlX3BhdGggLS10aHJlYWRzIDE2Ci09PT09Ci0KLUdFUlJJVAotLS0tLS0tCi1QYXJ0IG9mIGxpbms6aW5kZXguaHRtbFtHZXJyaXQgQ29kZSBSZXZpZXddCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3BnbS1kYWVtb24udHh0IGIvRG9jdW1lbnRhdGlvbi9wZ20tZGFlbW9uLnR4dAppbmRleCAxYzFkMzQzLi4zZmZjYjQwIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL3BnbS1kYWVtb24udHh0CisrKyBiL0RvY3VtZW50YXRpb24vcGdtLWRhZW1vbi50eHQKQEAgLTE0LDYgKzE0LDcgQEAKIAlbXC0tZW5hYmxlLXNzaGQgfCBcLS1kaXNhYmxlLXNzaGRdCiAJW1wtLWNvbnNvbGUtbG9nXQogCVtcLS1zbGF2ZV0KKwlbXC0taGVhZGxlc3NdCiAKIERFU0NSSVBUSU9OCiAtLS0tLS0tLS0tLQpAQCAtNTgsNiArNTksMTAgQEAKIAlTZW5kIGxvZyBtZXNzYWdlcyB0byB0aGUgY29uc29sZSwgaW5zdGVhZCBvZiB0byB0aGUgc3RhbmRhcmQKIAlsb2cgZmlsZSAnJHNpdGVfcGF0aC9sb2dzL2Vycm9yX2xvZycuCiAKK1wtLWhlYWRsZXNzOjoKKwlEb24ndCBzdGFydCB0aGUgZGVmYXVsdCBHZXJyaXQgVUkuIE1heSBiZSB1c2VmdWwgd2hlbiBHZXJyaXQgaXMKKwlydW4gd2l0aCBhbiBhbHRlcm5hdGl2ZSBVSS4KKwogQ09OVEVYVAogLS0tLS0tLQogVGhpcyBjb21tYW5kIGNhbiBvbmx5IGJlIHJ1biBvbiBhIHNlcnZlciB3aGljaCBoYXMgZGlyZWN0CmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3BnbS1nc3FsLnR4dCBiL0RvY3VtZW50YXRpb24vcGdtLWdzcWwudHh0CmluZGV4IGMzYTQ5MmEuLjM3ZmJiNzQgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vcGdtLWdzcWwudHh0CisrKyBiL0RvY3VtZW50YXRpb24vcGdtLWdzcWwudHh0CkBAIC00NSw3ICs0NSw3IEBACiAKIAlUeXBlICdcaCcgZm9yIGhlbHAuICBUeXBlICdccicgdG8gY2xlYXIgdGhlIGJ1ZmZlci4KIAotCWdlcnJpdD4gdXBkYXRlIGFjY291bnRzIHNldCBzc2hfdXNlcl9uYW1lID0gJ2FsaWNlJyB3aGVyZSBhY2NvdW50X2lkPTE7ICAgICAgIAorCWdlcnJpdD4gdXBkYXRlIGFjY291bnRzIHNldCBzc2hfdXNlcl9uYW1lID0gJ2FsaWNlJyB3aGVyZSBhY2NvdW50X2lkPTE7CiAJVVBEQVRFIDE7IDEgbXMKIAlnZXJyaXQ+IFxxCiAJQnllCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3BnbS1pbmRleC50eHQgYi9Eb2N1bWVudGF0aW9uL3BnbS1pbmRleC50eHQKaW5kZXggNWNiZTZiYTAuLjdhMWVkY2YgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vcGdtLWluZGV4LnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL3BnbS1pbmRleC50eHQKQEAgLTEsMTMgKzEsMTUgQEAKLUdlcnJpdCBDb2RlIFJldmlldyAtIFNlcnZlciBQcm9ncmFtcwotPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CitHZXJyaXQgQ29kZSBSZXZpZXcgLSBTZXJ2ZXIgU2lkZSBBZG1pbmlzdHJhdGl2ZSBUb29scworPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAotU2VydmVyIHNpZGUgcHJvZ3JhbXMgY2FuIGJlIHN0YXJ0ZWQgYnkgZXhlY3V0aW5nIHRoZSBXQVIgZmlsZQorU2VydmVyIHNpZGUgdG9vbHMgY2FuIGJlIHN0YXJ0ZWQgYnkgZXhlY3V0aW5nIHRoZSBXQVIgZmlsZQogdGhyb3VnaCB0aGUgSmF2YSBjb21tYW5kIGxpbmUuICBGb3IgZXhhbXBsZToKIAotICAkIGphdmEgLWphciBnZXJyaXQud2FyIHByb2dyYW0gW29wdGlvbnNdCisgICQgamF2YSAtamFyIGdlcnJpdC53YXIgPHRvb2w+IFs8b3B0aW9ucz5dCiAKLVtbcHJvZ3JhbXNdXVByb2dyYW1zCi0tLS0tLS0tLS0tLS0tLS0tLS0tLQorVG9vbCBzaG91bGQgYmUgb25lIG9mIHRoZSBmb2xsb3dpbmcgbmFtZXM6CisKK1Rvb2xzCistLS0tLQogCiBsaW5rOnBnbS1pbml0Lmh0bWxbaW5pdF06OgogCUluaXRpYWxpemUgYSBuZXcgR2Vycml0IHNlcnZlciBpbnN0YWxsYXRpb24uCkBAIC0yOCwxMCArMzAsNyBAQAogCURpc3BsYXkgdGhlIHJlbGVhc2UgdmVyc2lvbiBvZiBHZXJyaXQgQ29kZSBSZXZpZXcuCiAKIFRyYW5zaXRpb24gVXRpbGl0aWVzCi0tLS0tLS0tLS0tLS0tLS0tLS0tLQotCi1saW5rOnBnbS1FeHBvcnRSZXZpZXdOb3Rlcy5odG1sW0V4cG9ydFJldmlld05vdGVzXTo6Ci0JRXhwb3J0IHN1Ym1pdHRlZCByZXZpZXcgaW5mb3JtYXRpb24gdG8gcmVmcy9ub3Rlcy9yZXZpZXcuCit+fn5+fn5+fn5+fn5+fn5+fn5+fgogCiBsaW5rOnBnbS1TY2FuVHJhY2tpbmdJZHMuaHRtbFtTY2FuVHJhY2tpbmdJZHNdOjoKIAlSZXNjYW4gYWxsIGNoYW5nZXMgYWZ0ZXIgY29uZmlndXJpbmcgdHJhY2tpbmdpZHMuCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3Byb2plY3Qtc2V0dXAudHh0IGIvRG9jdW1lbnRhdGlvbi9wcm9qZWN0LXNldHVwLnR4dAppbmRleCAzZDk3OWQzLi4zNmQzYzYwIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL3Byb2plY3Qtc2V0dXAudHh0CisrKyBiL0RvY3VtZW50YXRpb24vcHJvamVjdC1zZXR1cC50eHQKQEAgLTU0LDggKzU0LDggQEAKIC0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIFRoZSBtZXRob2QgR2Vycml0IHVzZXMgdG8gc3VibWl0IGEgY2hhbmdlIHRvIGEgcHJvamVjdCBjYW4gYmUKLW1vZGlmaWVkIGJ5IGFueSBwcm9qZWN0IG93bmVyIHRocm91Z2ggdGhlIHByb2plY3QgY29uc29sZSwgYEFkbWluYCA+Ci1gUHJvamVjdHNgLiAgVGhlIGZvbGxvd2luZyBtZXRob2RzIGFyZSBzdXBwb3J0ZWQ6Cittb2RpZmllZCBieSBhbnkgcHJvamVjdCBvd25lciB0aHJvdWdoIHRoZSBwcm9qZWN0IGNvbnNvbGUsIGBQcm9qZWN0c2AgPgorYExpc3RgID4gbXkvcHJvamVjdC4gIFRoZSBmb2xsb3dpbmcgbWV0aG9kcyBhcmUgc3VwcG9ydGVkOgogCiAqIEZhc3QgRm9yd2FyZCBPbmx5CiArCkBAIC05OSwxMCArOTksMjAgQEAKIHRoZSByaWdodCBvcmRlciBzaW5jZSBpbnRlci1jaGFuZ2UgZGVwZW5kZW5jaWVzIHdpbGwgbm90IGJlCiBlbmZvcmNlZCBmb3IgdGhlbS4KIAorW1tyZWJhc2VfaWZfbmVjZXNzYXJ5XV0KKyogUmViYXNlIElmIE5lY2Vzc2FyeQorKworSWYgdGhlIGNoYW5nZSBiZWluZyBzdWJtaXR0ZWQgaXMgYSBzdHJpY3Qgc3VwZXJzZXQgb2YgdGhlIGRlc3RpbmF0aW9uCiticmFuY2gsIHRoZW4gdGhlIGJyYW5jaCBpcyBmYXN0LWZvcndhcmRlZCB0byB0aGUgY2hhbmdlLiAgSWYgbm90LAordGhlbiB0aGUgY2hhbmdlIGlzIGF1dG9tYXRpY2FsbHkgcmViYXNlZCBhbmQgdGhlbiB0aGUgYnJhbmNoIGlzCitmYXN0LWZvcndhcmRlZCB0byB0aGUgY2hhbmdlLgorCiBXaGVuIEdlcnJpdCB0cmllcyB0byBkbyBhIG1lcmdlLCBieSBkZWZhdWx0IHRoZSBtZXJnZSB3aWxsIG9ubHkKLXN1Y2NlZWQgaWYgdGhlcmUgaXMgbm8gcGF0aCBjb25mbGljdC4gQnkgc2VsZWN0aW5nIHRoZSBjaGVja2JveAotYEF1dG9tYXRpY2FsbHkgcmVzb2x2ZSBjb25mbGljdHNgIEdlcnJpdCB3aWxsIHRyeSBkbyBhIGNvbnRlbnQgbWVyZ2UKLWlmIGEgcGF0aCBjb25mbGljdCBvY2N1cnMuCitzdWNjZWVkIGlmIHRoZXJlIGlzIG5vIHBhdGggY29uZmxpY3QuICBBIHBhdGggY29uZmxpY3Qgb2NjdXJzIHdoZW4KK3RoZSBzYW1lIGZpbGUgaGFzIGFsc28gYmVlbiBjaGFuZ2VkIG9uIHRoZSBvdGhlciBzaWRlIG9mIHRoZSBtZXJnZS4KKworSWYgYEF1dG9tYXRpY2FsbHkgcmVzb2x2ZSBjb25mbGljdHNgIGlzIGVuYWJsZWQsIEdlcnJpdCB3aWxsIHRyeQordG8gZG8gYSBjb250ZW50IG1lcmdlIHdoZW4gYSBwYXRoIGNvbmZsaWN0IG9jY3Vycy4KIAogCiBSZWdpc3RlcmluZyBBZGRpdGlvbmFsIEJyYW5jaGVzCkBAIC0xMTMsOCArMTIzLDggQEAKIAogQWRkaXRpb25hbCBicmFuY2hlcyBjYW4gYWxzbyBiZSBjcmVhdGVkIHRocm91Z2ggdGhlIHdlYiBVSSwgYXNzdW1pbmcKIGF0IGxlYXN0IG9uZSBjb21taXQgYWxyZWFkeSBleGlzdHMgaW4gdGhlIHByb2plY3QgcmVwb3NpdG9yeS4KLUEgcHJvamVjdCBvd25lciBjYW4gY3JlYXRlIGFkZGl0aW9uYWwgYnJhbmNoZXMgdW5kZXIgYEFkbWluYCA+Ci1gUHJvamVjdHNgID4gYEJyYW5jaGVzYC4gIEVudGVyIHRoZSBuZXcgYnJhbmNoIG5hbWUsIGFuZCB0aGUKK0EgcHJvamVjdCBvd25lciBjYW4gY3JlYXRlIGFkZGl0aW9uYWwgYnJhbmNoZXMgdW5kZXIgYFByb2plY3RzYCA+CitgTGlzdGAgPiBteS9wcm9qZWN0ID4gYEJyYW5jaGVzYC4gIEVudGVyIHRoZSBuZXcgYnJhbmNoIG5hbWUsIGFuZCB0aGUKIHN0YXJ0aW5nIEdpdCByZXZpc2lvbi4gIEJyYW5jaCBuYW1lcyB0aGF0IGRvbid0IHN0YXJ0IHdpdGggYHJlZnMvYAogd2lsbCBhdXRvbWF0aWNhbGx5IGhhdmUgYHJlZnMvaGVhZHMvYCBwcmVmaXhlZCB0byBlbnN1cmUgdGhleSBhcmUKIGEgc3RhbmRhcmQgR2l0IGJyYW5jaCBuYW1lLiAgQWxtb3N0IGFueSB2YWxpZCBTSEEtMSBleHByZXNzaW9uIGNhbgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9wcm9sb2ctY2hhbmdlLWZhY3RzLnR4dCBiL0RvY3VtZW50YXRpb24vcHJvbG9nLWNoYW5nZS1mYWN0cy50eHQKaW5kZXggZDVmNjE3NC4uZTIxZGEwMiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9wcm9sb2ctY2hhbmdlLWZhY3RzLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL3Byb2xvZy1jaGFuZ2UtZmFjdHMudHh0CkBAIC00OCw2ICs0OCw5IEBACiB8YGNvbW1pdF9tZXNzYWdlLzFgICAgfGBjb21taXRfbWVzc2FnZSgnRml4IGJ1ZyBYJykuYAogICAgIHxDb21taXQgbWVzc2FnZSBhcyBzdHJpbmcgYXRvbQogCit8YGNvbW1pdF9zdGF0cy8zYCAgIHxgY29tbWl0X3N0YXRzKDUsMjAsNTApLmAKKyAgICB8TnVtYmVyIG9mIGZpbGVzIG1vZGlmaWVkLCBudW1iZXIgb2YgaW5zZXJ0aW9ucyBhbmQgdGhlIG51bWJlciBvZiBkZWxldGlvbnMuCisKIC40K3xgY3VycmVudF91c2VyLzFgICB8YGN1cnJlbnRfdXNlcih1c2VyKDEwMDAwMDApKS5gCiAgICAgLjQrfEN1cnJlbnQgdXNlciBhcyBvbmUgb2YgdGhlIGZvdXIgZ2l2ZW4gcG9zc2liaWxpdGllcwogCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3Byb2xvZy1jb29rYm9vay50eHQgYi9Eb2N1bWVudGF0aW9uL3Byb2xvZy1jb29rYm9vay50eHQKaW5kZXggZTY2MDA2Ny4uNzkxMmNmMiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9wcm9sb2ctY29va2Jvb2sudHh0CisrKyBiL0RvY3VtZW50YXRpb24vcHJvbG9nLWNvb2tib29rLnR4dApAQCAtMjgsNiArMjgsMjcgQEAKIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuMi4yLmh0bWxbR2Vycml0CiAyLjIuMiBSZWxlYXNlTm90ZXNdIGludHJvZHVjZXMgUHJvbG9nIHN1cHBvcnQgaW4gR2Vycml0LgogCitTdWJtaXQgVHlwZQorLS0tLS0tLS0tLS0KK0EgJ1N1Ym1pdCBUeXBlJyBpcyBhIHN0cmF0ZWd5IHRoYXQgaXMgdXNlZCBvbiBzdWJtaXQgdG8gaW50ZWdyYXRlIHRoZQorY2hhbmdlIGludG8gdGhlIGRlc3RpbmF0aW9uIGJyYW5jaC4gU3VwcG9ydGVkIHN1Ym1pdCB0eXBlcyBhcmU6CisKKyogYEZhc3QgRm9yd2FyZCBPbmx5YAorKiBgTWVyZ2UgSWYgTmVjZXNzYXJ5YAorKiBgTWVyZ2UgQWx3YXlzYAorKiBgQ2hlcnJ5IFBpY2tgCisqIGBSZWJhc2UgSWYgTmVjZXNzYXJ5YAorCisnU3VibWl0IFR5cGUnIGlzIGEgcHJvamVjdCBnbG9iYWwgc2V0dGluZy4gVGhpcyBtZWFucyB0aGF0IHRoZSBzYW1lIHN1Ym1pdCB0eXBlCitpcyB1c2VkIGZvciBhbGwgY2hhbmdlcyBvZiBvbmUgcHJvamVjdC4KKworUHJvamVjdHMgd2hpY2ggbmVlZCBtb3JlIGZsZXhpYmlsaXR5IGluIGNob29zaW5nLCBvciBlbmZvcmNpbmcsIGEgc3VibWl0IHR5cGUKK2NhbiB1c2UgUHJvbG9nIGJhc2VkIHN1Ym1pdCB0eXBlIHdoaWNoIHJlcGxhY2VzIHRoZSBwcm9qZWN0J3MgZGVmYXVsdCBzdWJtaXQKK3R5cGUuCisKK1Byb2xvZyBiYXNlZCBzdWJtaXQgdHlwZSBjb21wdXRlcyBhIHN1Ym1pdCB0eXBlIGZvciBlYWNoIGNoYW5nZS4gVGhlIGNvbXB1dGVkCitzdWJtaXQgdHlwZSBpcyBzaG93biBvbiB0aGUgY2hhbmdlIHNjcmVlbiBmb3IgZWFjaCBjaGFuZ2UuCisKIFByb2xvZyBMYW5ndWFnZQogLS0tLS0tLS0tLS0tLS0tCiBUaGlzIGRvY3VtZW50IGlzIG5vdCBhIGNvbXBsZXRlIFByb2xvZyB0dXRvcmlhbC4KQEAgLTc2LDYgKzk3LDcgQEAKICAgJCBnaXQgcHVzaCBvcmlnaW4gSEVBRDpyZWZzL21ldGEvY29uZmlnCiA9PT09CiAKK1tbSG93VG9Xcml0ZVN1Ym1pdFJ1bGVzXV0KIEhvdyB0byB3cml0ZSBzdWJtaXQgcnVsZXMKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIFdoZW5ldmVyIEdlcnJpdCBuZWVkcyB0byBldmFsdWF0ZSBzdWJtaXQgcnVsZXMgZm9yIGEgY2hhbmdlIGBDYCBmcm9tIHByb2plY3QgYFBgIGl0CkBAIC0xNzEsMTMgKzE5MywxNCBAQAogQW5vdGhlciBhc3BlY3Qgb2YgdGhlIHJldHVybiByZXN1bHQgZnJvbSB0aGUgYHN1Ym1pdF9ydWxlYCBwcmVkaWNhdGUgaXMgdGhhdAogR2Vycml0IHVzZXMgaXQgdG8gZGVjaWRlIHdoaWNoIHNldCBvZiBsYWJlbHMgdG8gZGlzcGxheSBvbiB0aGUgY2hhbmdlIHJldmlldwogc2NyZWVuIGZvciB2b3RpbmcuIElmIHRoZSByZXR1cm4gcmVzdWx0IGNvbnRhaW5zIGxhYmVsIGAnQUJDJ2AgYW5kIGlmIHRoZSBsYWJlbAotYCdBQkMnYCBpcyBvbmUgb2YgdGhlIChnbG9iYWwpIHZvdGluZyBjYXRlZ29yaWVzIHRoZW4gdm90aW5nIGZvciB0aGUgbGFiZWwKLWAnQUJDJ2Agd2lsbCBiZSBkaXNwbGF5ZWQuIE90aGVyd2lzZSwgaXQgaXMgbm90IGRpc3BsYXllZC4gTm90ZSB0aGF0IHdlIGRvbid0Ci1uZWVkIGEgKGdsb2JhbCkgdm90aW5nIGNhdGVnb3J5IGZvciBlYWNoIGxhYmVsIGNvbnRhaW5lZCBpbiB0aGUgcmVzdWx0IG9mCitgJ0FCQydgIGlzIGxpbms6Y29uZmlnLWxhYmVscy5odG1sW2RlZmluZWQgZm9yIHRoZSBwcm9qZWN0XSB0aGVuIHZvdGluZyBmb3IgdGhlCitsYWJlbCBgJ0FCQydgIHdpbGwgYmUgZGlzcGxheWVkLiBPdGhlcndpc2UsIGl0IGlzIG5vdCBkaXNwbGF5ZWQuIE5vdGUgdGhhdCB0aGUKK3Byb2plY3QgZG9lc24ndCBuZWVkIGEgZGVmaW5lZCBsYWJlbCBmb3IgZWFjaCBsYWJlbCBjb250YWluZWQgaW4gdGhlIHJlc3VsdCBvZgogYHN1Ym1pdF9ydWxlYCBwcmVkaWNhdGUuICBGb3IgZXhhbXBsZSwgdGhlIGRlY2lzaW9uIHdoZXRoZXIgYCdBdXRob3ItaXMtSm9obi1Eb2UnYAogbGFiZWwgaXMgbWV0IHdpbGwgcHJvYmFibHkgbm90IGJlIG1hZGUgYnkgZXhwbGljaXQgdm90aW5nIGJ1dCwgaW5zdGVhZCwgYnkKIGluc3BlY3RpbmcgdGhlIGZhY3RzIGFib3V0IHRoZSBjaGFuZ2UuCiAKK1tbU3VibWl0RmlsdGVyXV0KIFN1Ym1pdCBGaWx0ZXIKIC0tLS0tLS0tLS0tLS0KIEFub3RoZXIgbWVjaGFuaXNtIG9mIGNoYW5naW5nIHRoZSBkZWZhdWx0IHN1Ym1pdCBydWxlcyBpcyB0byBpbXBsZW1lbnQgdGhlCkBAIC0yMTUsNyArMjM4LDYgQEAKIAogVGhlIGZvbGxvd2luZyAiZHJhd2luZyIgaWxsdXN0cmF0ZXMgdGhlIG9yZGVyIG9mIHRoZSBpbnZvY2F0aW9uIGFuZCB0aGUgY2hhaW5pbmcKIG9mIHRoZSByZXN1bHRzIG9mIHRoZSBgc3VibWl0X3J1bGVgIGFuZCBgc3VibWl0X2ZpbHRlcmAgcHJlZGljYXRlcy4KLQogPT09PQogICBBbGwtUHJvamVjdHMKICAgXiAgIHN1Ym1pdF9maWx0ZXIoQiwgUykgOi0gLi4uICA8ND4KQEAgLTI0Nyw2ICsyNjksMzQgQEAKIGRlZmF1bHQgaW1wbGVtZW50YXRpb24gb2Ygc3VibWl0IHJ1bGUgdGhhdCBpcyBuYW1lZCBgZ2Vycml0OmRlZmF1bHRfc3VibWl0YCBhbmQKIGl0cyByZXN1bHQgd2lsbCBiZSBmaWx0ZXJlZCBhcyBkZXNjcmliZWQgYWJvdmUuCiAKK1tbSG93VG9Xcml0ZVN1Ym1pdFR5cGVdXQorSG93IHRvIHdyaXRlIHN1Ym1pdCB0eXBlCistLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KK1dyaXRpbmcgY3VzdG9tIHN1Ym1pdCB0eXBlIGxvZ2ljIGluIFByb2xvZyBpcyB0aGUgc2ltaWxhciB0b3AKK3hyZWY6SG93VG9Xcml0ZVN1Ym1pdFJ1bGVzW3dyaXRpbmcgc3VibWl0IHJ1bGVzXS4gVGhlIG9ubHkgZGlmZmVyZW5jZSBpcyB0aGF0CitvbmUgaGFzIHRvIGltcGxlbWVudCBhIGBzdWJtaXRfdHlwZWAgcHJlZGljYXRlIChpbnN0ZWFkIG9mIHRoZSBgc3VibWl0X3J1bGVgKQorYW5kIHRoYXQgdGhlIHJldHVybiByZXN1bHQgb2YgdGhlIGBzdWJtaXRfdHlwZWAgaGFzIHRvIGJlIGFuIGF0b20gdGhhdAorcmVwcmVzZW50cyBvbmUgb2YgdGhlIHN1cHBvcnRlZCBzdWJtaXQgdHlwZXM6CisKKyogYGZhc3RfZm9yd2FyZF9vbmx5YAorKiBgbWVyZ2VfaWZfbmVjZXNzYXJ5YAorKiBgbWVyZ2VfYWx3YXlzYAorKiBgY2hlcnJ5X3BpY2tgCisqIGByZWJhc2VfaWZfbmVjZXNzYXJ5YAorCitTdWJtaXQgVHlwZSBGaWx0ZXIKKy0tLS0tLS0tLS0tLS0tLS0tLQorU3VibWl0IHR5cGUgZmlsdGVyIHdvcmtzIHRoZSBzYW1lIHdheSBhcyB0aGUgeHJlZjpTdWJtaXRGaWx0ZXJbU3VibWl0IEZpbHRlcl0KK3doZXJlIHRoZSBuYW1lIG9mIHRoZSBmaWx0ZXIgcHJlZGljYXRlIGlzIGBzdWJtaXRfdHlwZV9maWx0ZXJgLgorCis9PT09CisgIHN1Ym1pdF90eXBlX2ZpbHRlcihJbiwgT3V0KS4KKz09PT0KKworR2Vycml0IHdpbGwgaW52b2tlIGBzdWJtaXRfdHlwZV9maWx0ZXJgIHdpdGggdGhlIGBJbmAgcGFyYW1ldGVyIGNvbnRhaW5pbmcgYQorcmVzdWx0IG9mIHRoZSBgc3VibWl0X3R5cGVgIGFuZCB3aWxsIHRha2UgdGhlIHZhbHVlIG9mIHRoZSBgT3V0YCBwYXJhbWV0ZXIgYXMKK3RoZSByZXN1bHQuCisKIFtbVGVzdGluZ1N1Ym1pdFJ1bGVzXV0KIFRlc3Rpbmcgc3VibWl0IHJ1bGVzCiAtLS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtMjc1LDggKzMyNSwxMSBAQAogdGhlIGNoYW5nZSBleHBvc2VkIHRvIHRoZW0uIEdlcnJpdCBwbHVnaW5zIGdldCBmdWxsIGFjY2VzcyB0byBHZXJyaXQgaW50ZXJuYWxzCiBhbmQgY2FuIHBvdGVudGlhbGx5IGNoZWNrIG1vcmUgdGhpbmdzIHRoYW4gUHJvbG9nIGJhc2VkIHJ1bGVzLgogCi1FeGFtcGxlcwotLS0tLS0tLS0KK0Zyb20gdmVyc2lvbiAyLjYgR2Vycml0IHBsdWdpbnMgY2FuIGNvbnRyaWJ1dGUgUHJvbG9nIHByZWRpY2F0ZXMuIFRoaXMgd2F5LCB3ZQorY2FuIG1ha2UgdXNlIG9mIHRoZSBwbHVnaW4gcHJvdmlkZWQgcHJlZGljYXRlcyB3aGVuIHdyaXRpbmcgUHJvbG9nIGJhc2VkIHJ1bGVzLgorCitFeGFtcGxlcyAtIFN1Ym1pdCBSdWxlCistLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBUaGUgZm9sbG93aW5nIGV4YW1wbGVzIHNob3VsZCBzZXJ2ZSBhcyBhIGNvb2tib29rIGZvciBkZXZlbG9waW5nIG93biBzdWJtaXQgcnVsZXMuCiBTb21lIG9mIHRoZW0gYXJlIHRvbyB0cml2aWFsIHRvIGJlIHVzZWQgaW4gcHJvZHVjdGlvbiBhbmQgdGhlaXIgb25seSBwdXJwb3NlIGlzCiB0byBwcm92aWRlIHN0ZXAgYnkgc3RlcCBpbnRyb2R1Y3Rpb24gYW5kIHVuZGVyc3RhbmRpbmcuCkBAIC0yOTUsNyArMzQ4LDggQEAKIC5ydWxlcy5wbAogW2NhcHRpb249IiJdCiA9PT09Ci0gIHN1Ym1pdF9ydWxlKHN1Ym1pdChsYWJlbCgnQW55LUxhYmVsLU5hbWUnLCBvayhfKSkpKS4KKyAgc3VibWl0X3J1bGUoc3VibWl0KFcpKSA6LQorICAgIFcgPSBsYWJlbCgnQW55LUxhYmVsLU5hbWUnLCBvayhfKSkuCiA9PT09CiAKIEluIHRoaXMgY2FzZSB3ZSBtYWtlIG5vIHVzZSBvZiBmYWN0cyBhYm91dCB0aGUgY2hhbmdlLiBXZSBkb24ndCBuZWVkIGl0IGFzIHdlIGFyZSBzaW1wbHkKQEAgLTMxMyw3ICszNjcsOSBAQAogLnJ1bGVzLnBsCiBbY2FwdGlvbj0iIl0KID09PT0KLSAgc3VibWl0X3J1bGUoc3VibWl0KGxhYmVsKCdDb2RlLVJldmlldycsIG9rKF8pKSwgbGFiZWwoJ1ZlcmlmaWVkJywgb2soXykpKSkuCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChDUiwgVikpIDotCisgICAgQ1IgPSBsYWJlbCgnQ29kZS1SZXZpZXcnLCBvayhfKSksCisgICAgViA9IGxhYmVsKCdWZXJpZmllZCcsIG9rKF8pKS4KID09PT0KIAogU2luY2UgZm9yIGV2ZXJ5IGNoYW5nZSBhbGwgbGFiZWwgc3RhdHVzZXMgYXJlIGAnb2snYCBldmVyeSBjaGFuZ2Ugd2lsbCBiZSBzdWJtaXR0YWJsZS4KQEAgLTMyOCw3ICszODQsOCBAQAogLnJ1bGVzLnBsCiBbY2FwdGlvbj0iIl0KID09PT0KLSAgc3VibWl0X3J1bGUoc3VibWl0KGxhYmVsKCdBbnktTGFiZWwtTmFtZScsIHJlamVjdChfKSkpKS4KKyAgc3VibWl0X3J1bGUoc3VibWl0KFIpKSA6LQorICAgIFIgPSBsYWJlbCgnQW55LUxhYmVsLU5hbWUnLCByZWplY3QoXykpLgogPT09PQogCiBTaW5jZSBmb3IgYW55IGNoYW5nZSB3ZSByZXR1cm4gb25seSBvbmUgbGFiZWwgd2l0aCBzdGF0dXMgYHJlamVjdGAsIG5vIGNoYW5nZQpAQCAtMzQ0LDEzICs0MDEsMTcgQEAKIFtjYXB0aW9uPSIiXQogPT09PQogICAlIEluIHRoZSBVSSB0aGlzIHdpbGwgc2hvdzogTmVlZCBBbnktTGFiZWwtTmFtZQotICBzdWJtaXRfcnVsZShzdWJtaXQobGFiZWwoJ0FueS1MYWJlbC1OYW1lJywgbmVlZChfKSkpKS4KKyAgc3VibWl0X3J1bGUoc3VibWl0KE4pKSA6LQorICAgIE4gPSBsYWJlbCgnQW55LUxhYmVsLU5hbWUnLCBuZWVkKF8pKS4KIAogICAlIFdlIGNvdWxkIGRlZmluZSBtb3JlICJuZWVkIiBsYWJlbHMgYnkgYWRkaW5nIG1vcmUgcnVsZXMKLSAgc3VibWl0X3J1bGUoc3VibWl0KGxhYmVsKCdBbm90aGVyLUxhYmVsLU5hbWUnLCBuZWVkKF8pKSkpLgorICBzdWJtaXRfcnVsZShzdWJtaXQoTikpIDotCisgICAgTiA9IGxhYmVsKCdBbm90aGVyLUxhYmVsLU5hbWUnLCBuZWVkKF8pKS4KIAogICAlIG9yIGJ5IHByb3ZpZGluZyBtb3JlIHRoYW4gb25lIG5lZWQgbGFiZWwgaW4gdGhlIHNhbWUgcnVsZQotICBzdWJtaXRfcnVsZShzdWJtaXQobGFiZWwoJ1gtTGFiZWwtTmFtZScsIG5lZWQoXykpLCBsYWJlbCgnWS1MYWJlbC1OYW1lJywgbmVlZChfKSkpKS4KKyAgc3VibWl0X3J1bGUoc3VibWl0KE5YLCBOWSkpIDotCisgICAgTlggPSBsYWJlbCgnWC1MYWJlbC1OYW1lJywgbmVlZChfKSksCisgICAgTlkgPSBsYWJlbCgnWS1MYWJlbC1OYW1lJywgbmVlZChfKSkuCiA9PT09CiAKIEluIHRoZSBVSSB0aGlzIHdpbGwgc2hvdzoKQEAgLTM3Nyw4ICs0MzgsMTEgQEAKIC5ydWxlcy5wbAogW2NhcHRpb249IiJdCiA9PT09Ci0gIHN1Ym1pdF9ydWxlKGxhYmVsKCdTb21lLUNvbmRpdGlvbicsIG5lZWQoXykpKS4KLSAgc3VibWl0X3J1bGUobGFiZWwoJ0Fub3RoZXItQ29uZGl0aW9uJywgb2soXykpKS4KKyAgc3VibWl0X3J1bGUoc3VibWl0KE4pKSA6LQorICAgIE4gPSBsYWJlbCgnU29tZS1Db25kaXRpb24nLCBuZWVkKF8pKS4KKworICBzdWJtaXRfcnVsZShzdWJtaXQoT0spKSA6LQorICAgIE9LID0gbGFiZWwoJ0Fub3RoZXItQ29uZGl0aW9uJywgb2soXykpLgogPT09PQogCiBUaGUgJ05lZWQgU29tZS1Db25kaXRpb24nIHdpbGwgbm90IGJlIHNob3cgaW4gdGhlIFVJIGJlY2F1c2Ugb2YgdGhlIHJlc3VsdCBvZgpAQCAtMzg5LDggKzQ1MywxMSBAQAogLnJ1bGVzLnBsCiBbY2FwdGlvbj0iIl0KID09PT0KLSAgc3VibWl0X3J1bGUobGFiZWwoJ0Fub3RoZXItQ29uZGl0aW9uJywgb2soXykpKS4KLSAgc3VibWl0X3J1bGUobGFiZWwoJ1NvbWUtQ29uZGl0aW9uJywgbmVlZChfKSkpLgorICBzdWJtaXRfcnVsZShzdWJtaXQoT0spKSA6LQorICAgIE9LID0gbGFiZWwoJ0Fub3RoZXItQ29uZGl0aW9uJywgb2soXykpLgorCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChOKSkgOi0KKyAgICBOID0gbGFiZWwoJ1NvbWUtQ29uZGl0aW9uJywgbmVlZChfKSkuCiA9PT09CiAKIFRoZSByZXN1bHQgb2YgdGhlIGZpcnN0IHJ1bGUgd2lsbCBzdG9wIHNlYXJjaCBmb3IgYW55IGZ1cnRoZXIgc29sdXRpb25zLgpAQCAtNDA3LDcgKzQ3NCw4IEBACiAucnVsZXMucGwKIFtjYXB0aW9uPSIiXQogPT09PQotICBzdWJtaXRfcnVsZShzdWJtaXQobGFiZWwoJ0F1dGhvci1pcy1Kb2huLURvZScsIG5lZWQoXykpKSkuCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChBdXRob3IpKSA6LQorICAgIEF1dGhvciA9IGxhYmVsKCdBdXRob3ItaXMtSm9obi1Eb2UnLCBuZWVkKF8pKS4KID09PT0KIAogVGhpcyB3aWxsIHNob3c6CkBAIC00MjAsOSArNDg4LDEyIEBACiAucnVsZXMucGwKIFtjYXB0aW9uPSIiXQogPT09PQotICBzdWJtaXRfcnVsZShzdWJtaXQobGFiZWwoJ0F1dGhvci1pcy1Kb2huLURvZScsIG5lZWQoXykpKSkuCi0gIHN1Ym1pdF9ydWxlKHN1Ym1pdChsYWJlbCgnQXV0aG9yLWlzLUpvaG4tRG9lJywgb2soXykpKSkKLSAgICA6LSBnZXJyaXQ6Y29tbWl0X2F1dGhvcihfLCAnSm9obiBEb2UnLCBfKS4KKyAgc3VibWl0X3J1bGUoc3VibWl0KEF1dGhvcikpIDotCisgICAgQXV0aG9yID0gbGFiZWwoJ0F1dGhvci1pcy1Kb2huLURvZScsIG5lZWQoXykpLgorCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChBdXRob3IpKSA6LQorICAgIGdlcnJpdDpjb21taXRfYXV0aG9yKF8sICdKb2huIERvZScsIF8pLAorICAgIEF1dGhvciA9IGxhYmVsKCdBdXRob3ItaXMtSm9obi1Eb2UnLCBvayhfKSkuCiA9PT09CiAKIEluIHRoZSBzZWNvbmQgcnVsZSB3ZSByZXR1cm4gYG9rYCBzdGF0dXMgZm9yIHRoZSBgJ0F1dGhvci1pcy1Kb2huLURvZSdgIGxhYmVsCkBAIC00MzgsOSArNTA5LDEyIEBACiAucnVsZXMucGwKIFtjYXB0aW9uPSIiXQogPT09PQotICBzdWJtaXRfcnVsZShzdWJtaXQobGFiZWwoJ0F1dGhvci1pcy1Kb2huLURvZScsIG5lZWQoXykpKSkuCi0gIHN1Ym1pdF9ydWxlKHN1Ym1pdChsYWJlbCgnQXV0aG9yLWlzLUpvaG4tRG9lJywgb2soXykpKSkKLSAgICA6LSBnZXJyaXQ6Y29tbWl0X2F1dGhvcihfLCBfLCAnam9obi5kb2VAZXhhbXBsZS5jb20nKS4KKyAgc3VibWl0X3J1bGUoc3VibWl0KEF1dGhvcikpIDotCisgICAgQXV0aG9yID0gbGFiZWwoJ0F1dGhvci1pcy1Kb2huLURvZScsIG5lZWQoXykpLgorCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChBdXRob3IpKSA6LQorICAgIGdlcnJpdDpjb21taXRfYXV0aG9yKF8sIF8sICdqb2huLmRvZUBleGFtcGxlLmNvbScpLAorICAgIEF1dGhvciA9IGxhYmVsKCdBdXRob3ItaXMtSm9obi1Eb2UnLCBvayhfKSkuCiA9PT09CiAKIG9yIGJ5IHVzZXIgaWQgKGFzc3VtaW5nIGl0IGlzIDEwMDAwMDApOgpAQCAtNDQ4LDkgKzUyMiwxMiBAQAogLnJ1bGVzLnBsCiBbY2FwdGlvbj0iIl0KID09PT0KLSAgc3VibWl0X3J1bGUoc3VibWl0KGxhYmVsKCdBdXRob3ItaXMtSm9obi1Eb2UnLCBuZWVkKF8pKSkpLgotICBzdWJtaXRfcnVsZShzdWJtaXQobGFiZWwoJ0F1dGhvci1pcy1Kb2huLURvZScsIG9rKF8pKSkpCi0gICAgOi0gZ2Vycml0OmNvbW1pdF9hdXRob3IodXNlcigxMDAwMDAwKSwgXywgXykuCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChBdXRob3IpKSA6LQorICAgIEF1dGhvciA9IGxhYmVsKCdBdXRob3ItaXMtSm9obi1Eb2UnLCBuZWVkKF8pKS4KKworICBzdWJtaXRfcnVsZShzdWJtaXQoQXV0aG9yKSkgOi0KKyAgICBnZXJyaXQ6Y29tbWl0X2F1dGhvcih1c2VyKDEwMDAwMDApLCBfLCBfKSwKKyAgICBBdXRob3IgPSBsYWJlbCgnQXV0aG9yLWlzLUpvaG4tRG9lJywgb2soXykpLgogPT09PQogCiBvciBieSBhIGNvbWJpbmF0aW9uIG9mIHRoZXNlIDMgYXR0cmlidXRlczoKQEAgLTQ1OCwxMyArNTM1LDE2IEBACiAucnVsZXMucGwKIFtjYXB0aW9uPSIiXQogPT09PQotICBzdWJtaXRfcnVsZShzdWJtaXQobGFiZWwoJ0F1dGhvci1pcy1Kb2huLURvZScsIG5lZWQoXykpKSkuCi0gIHN1Ym1pdF9ydWxlKHN1Ym1pdChsYWJlbCgnQXV0aG9yLWlzLUpvaG4tRG9lJywgb2soXykpKSkKLSAgICA6LSBnZXJyaXQ6Y29tbWl0X2F1dGhvcihfLCAnSm9obiBEb2UnLCAnam9obi5kb2VAZXhhbXBsZS5jb20nKS4KKyAgc3VibWl0X3J1bGUoc3VibWl0KEF1dGhvcikpIDotCisgICAgQXV0aG9yID0gbGFiZWwoJ0F1dGhvci1pcy1Kb2huLURvZScsIG5lZWQoXykpLgorCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChBdXRob3IpKSA6LQorICAgIGdlcnJpdDpjb21taXRfYXV0aG9yKF8sICdKb2huIERvZScsICdqb2huLmRvZUBleGFtcGxlLmNvbScpLAorICAgIEF1dGhvciA9IGxhYmVsKCdBdXRob3ItaXMtSm9obi1Eb2UnLCBvayhfKSkuCiA9PT09CiAKLUV4YW1wbGUgNzogTWFrZSBjaGFuZ2Ugc3VibWl0dGFibGUgaWYgY29tbWl0IG1lc3NhZ2Ugc3RhcnRzIHdpdGggIlRyaXZpYWwgZml4Igotfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CitFeGFtcGxlIDc6IE1ha2UgY2hhbmdlIHN1Ym1pdHRhYmxlIGlmIGNvbW1pdCBtZXNzYWdlIHN0YXJ0cyB3aXRoICJGaXggIgorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIEJlc2lkZXMgc2hvd2luZyBob3cgdG8gbWFrZSB1c2Ugb2YgdGhlIGNvbW1pdCBtZXNzYWdlIHRleHQgdGhlIHB1cnBvc2Ugb2YgdGhpcwogZXhhbXBsZSBpcyBhbHNvIHRvIHNob3cgaG93IHRvIG1hdGNoIG9ubHkgYSBwYXJ0IG9mIGEgc3RyaW5nIHN5bWJvbC4gU2ltaWxhcmx5CiBsaWtlIGNvbW1pdCBhdXRob3IgdGhlIGNvbW1pdCBtZXNzYWdlIGlzIHByb3ZpZGVkIGFzIGEgc3RyaW5nIHN5bWJvbCB3aGljaCBpcwpAQCAtNDgyLDkgKzU2MiwxMiBAQAogLnJ1bGVzLnBsCiBbY2FwdGlvbj0iIl0KID09PT0KLSAgc3VibWl0X3J1bGUoc3VibWl0KGxhYmVsKCdDb21taXQtTWVzc2FnZS1zdGFydHMtd2l0aC1Ucml2aWFsLUZpeCcsIG5lZWQoXykpKSkuCi0gIHN1Ym1pdF9ydWxlKHN1Ym1pdChsYWJlbCgnQ29tbWl0LU1lc3NhZ2Utc3RhcnRzLXdpdGgtVHJpdmlhbC1GaXgnLCBvayhfKSkpKQotICAgIDotIGdlcnJpdDpjb21taXRfbWVzc2FnZShNKSwgbmFtZShNLCBMKSwgc3RhcnRzX3dpdGgoTCwgIlRyaXZpYWwgRml4IikuCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChGaXgpKSA6LQorICAgIEZpeCA9IGxhYmVsKCdDb21taXQtTWVzc2FnZS1zdGFydHMtd2l0aC1GaXgnLCBuZWVkKF8pKS4KKworICBzdWJtaXRfcnVsZShzdWJtaXQoRml4KSkgOi0KKyAgICBnZXJyaXQ6Y29tbWl0X21lc3NhZ2UoTSksIG5hbWUoTSwgTCksIHN0YXJ0c193aXRoKEwsICJGaXggIiksCisgICAgRml4ID0gbGFiZWwoJ0NvbW1pdC1NZXNzYWdlLXN0YXJ0cy13aXRoLUZpeCcsIG9rKF8pKS4KIAogICBzdGFydHNfd2l0aChMLCBbXSkuCiAgIHN0YXJ0c193aXRoKFtIfFQxXSwgW0h8VDJdKSA6LSBzdGFydHNfd2l0aChUMSwgVDIpLgpAQCAtNTAzLDMwICs1ODYsNzQgQEAKIC5ydWxlcy5wbAogW2NhcHRpb249IiJdCiA9PT09Ci0gIHN1Ym1pdF9ydWxlKHN1Ym1pdChsYWJlbCgnQ29tbWl0LU1lc3NhZ2Utc3RhcnRzLXdpdGgtVHJpdmlhbC1GaXgnLCBuZWVkKF8pKSkpLgotICBzdWJtaXRfcnVsZShzdWJtaXQobGFiZWwoJ0NvbW1pdC1NZXNzYWdlLXN0YXJ0cy13aXRoLVRyaXZpYWwtRml4Jywgb2soXykpKSkKLSAgICA6LSBnZXJyaXQ6Y29tbWl0X21lc3NhZ2VfbWF0Y2hlcygnXlRyaXZpYWwgRml4JykuCisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChGaXgpKSA6LQorICAgIEZpeCA9IGxhYmVsKCdDb21taXQtTWVzc2FnZS1zdGFydHMtd2l0aC1GaXgnLCBuZWVkKF8pKS4KKworICBzdWJtaXRfcnVsZShzdWJtaXQoRml4KSkgOi0KKyAgICBnZXJyaXQ6Y29tbWl0X21lc3NhZ2VfbWF0Y2hlcygnXkZpeCAnKSwKKyAgICBGaXggPSBsYWJlbCgnQ29tbWl0LU1lc3NhZ2Utc3RhcnRzLXdpdGgtRml4Jywgb2soXykpLgogPT09PQogCi1SZXVzaW5nIHRoZSBkZWZhdWx0IHN1Ym1pdCBwb2xpY3kKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorVGhlIHByZXZpb3VzIGV4YW1wbGUgY291bGQgYWxzbyBiZSB3cml0dGVuIHNvIHRoYXQgaXQgZmlyc3QgY2hlY2tzIGlmIHRoZSBjb21taXQKK21lc3NhZ2Ugc3RhcnRzIHdpdGggJ0ZpeCAnLiBJZiB0cnVlIHRoZW4gaXQgc2V0cyBPSyBmb3IgdGhhdCBjYXRlZ29yeSBhbmQgc3RvcHMKK2Z1cnRoZXIgYmFja3RyYWNraW5nIGJ5IHVzaW5nIHRoZSBjdXQgYCFgIG9wZXJhdG9yOgorLnJ1bGVzLnBsCitbY2FwdGlvbj0iIl0KKz09PT0KKyAgc3VibWl0X3J1bGUoc3VibWl0KEZpeCkpIDotCisgICAgZ2Vycml0OmNvbW1pdF9tZXNzYWdlX21hdGNoZXMoJ15GaXggJyksCisgICAgRml4ID0gbGFiZWwoJ0NvbW1pdC1NZXNzYWdlLXN0YXJ0cy13aXRoLUZpeCcsIG9rKF8pKSwKKyAgICAhLgorCisgICUgTWVzc2FnZSBkb2VzIG5vdCBzdGFydCB3aXRoICdGaXggJyBzbyBGaXggaXMgbmVlZGVkIHRvIHN1Ym1pdAorICBzdWJtaXRfcnVsZShzdWJtaXQoRml4KSkgOi0KKyAgICBGaXggPSBsYWJlbCgnQ29tbWl0LU1lc3NhZ2Utc3RhcnRzLXdpdGgtRml4JywgbmVlZChfKSkuCis9PT09CisKK1RoZSBkZWZhdWx0IHN1Ym1pdCBwb2xpY3kKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIEFsbCBleGFtcGxlcyB1bnRpbCBub3cgY29uY2VudHJhdGUgb24gb25lIHBhcnRpY3VsYXIgYXNwZWN0IG9mIGNoYW5nZSBkYXRhLgogSG93ZXZlciwgaW4gcmVhbC1saWZlIHNjZW5hcmlvcyB3ZSB3b3VsZCByYXRoZXIgd2FudCB0byByZXVzZSBHZXJyaXQncyBkZWZhdWx0Ci1zdWJtaXQgcG9saWN5IGFuZCBleHRlbmQvY2hhbmdlIGl0IGZvciBvdXIgc3BlY2lmaWMgcHVycG9zZS4gSW4gb3RoZXIgd29yZHMsIHdlCi13b3VsZCBsaWtlIHRvIGtlZXAgYWxsIHRoZSBkZWZhdWx0IHBvbGljaWVzIChsaWtlIHRoZSBgVmVyaWZpZWRgIGNhdGVnb3J5LAotdmV0b2luZyBjaGFuZ2UsIGV0Yy4uLikgYW5kIG9ubHkgZXh0ZW5kL2NoYW5nZSBhbiBhc3BlY3Qgb2YgaXQuIEZvciBleGFtcGxlLCB3ZQotbWF5IHdhbnQgdG8gZGlzYWJsZSB0aGUgYWJpbGl0eSBmb3IgY2hhbmdlIGF1dGhvcnMgdG8gYXBwcm92ZSB0aGVpciBvd24gY2hhbmdlcwotYnV0IGtlZXAgYWxsIG90aGVyIHBvbGljaWVzIHRoZSBzYW1lLgorc3VibWl0IHBvbGljeSBhbmQgZXh0ZW5kL2NoYW5nZSBpdCBmb3Igb3VyIHNwZWNpZmljIHB1cnBvc2UuICBUaGlzIGNvdWxkIGJlCitkb25lIGluIG9uZSBvZiB0aGUgZm9sbG93aW5nIHdheXM6CiAKKyogdW5kZXJzdGFuZCBob3cgdGhlIGRlZmF1bHQgc3VibWl0IHBvbGljeSBpcyBpbXBsZW1lbnRlZCBhbmQgdXNlIHRoYXQgYXMgYQorICB0ZW1wbGF0ZSBmb3IgaW1wbGVtZW50aW5nIGN1c3RvbSBzdWJtaXQgcnVsZXMsCisqIGludm9rZSB0aGUgZGVmYXVsdCBzdWJtaXQgcnVsZSBpbXBsZW1lbnRhdGlvbiBhbmQgdGhlbiBwZXJmb3JtIGZ1cnRoZXIKKyAgYWN0aW9ucyBvbiBpdHMgcmV0dXJuIHJlc3VsdC4KKworRGVmYXVsdCBzdWJtaXQgcnVsZSBpbXBsZW1lbnRhdGlvbgorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorVGhlIGRlZmF1bHQgc3VibWl0IHJ1bGUgd2l0aCB0aGUgdHdvIGRlZmF1bHQgY2F0ZWdvcmllcywgYENvZGUtUmV2aWV3YCBhbmQKK2BWZXJpZmllZGAsIGNhbiBiZSBpbXBsZW1lbnRlZCBhczoKKworLnJ1bGVzLnBsCitbY2FwdGlvbj0iIl0KKz09PT0KKyAgc3VibWl0X3J1bGUoc3VibWl0KFYsIENSKSkgOi0KKyAgICBnZXJyaXQ6bWF4X3dpdGhfYmxvY2soLTIsIDIsICdDb2RlLVJldmlldycsIENSKSwKKyAgICBnZXJyaXQ6bWF4X3dpdGhfYmxvY2soLTEsIDEsICdWZXJpZmllZCcsIFYpLgorPT09PQorCitPbmNlIHRoaXMgaW1wbGVtZW50YXRpb24gaXMgdW5kZXJzdG9vZCBpdCBjYW4gYmUgY3VzdG9taXplZCB0byBpbXBsZW1lbnQKK3Byb2plY3Qgc3BlY2lmaWMgc3VibWl0IHJ1bGVzLiBOb3RlLCB0aGF0IHRoaXMgaW1wbGVtZW50YXRpb24gaGFyZGNvZGVzCit0aGUgdHdvIGRlZmF1bHQgY2F0ZWdvcmllcy4gSW50cm9kdWNpbmcgYSBuZXcgY2F0ZWdvcnkgaW4gdGhlIGRhdGFiYXNlIHdvdWxkCityZXF1aXJlIGludHJvZHVjaW5nIHRoZSBzYW1lIGNhdGVnb3J5IGhlcmUgb3IgYSBgc3VibWl0X2ZpbHRlcmAgaW4gYSBwYXJlbnQKK3Byb2plY3Qgd291bGQgaGF2ZSB0byBjYXJlIGFib3V0IGluY2x1ZGluZyB0aGUgbmV3IGNhdGVnb3J5IGluIHRoZSByZXN1bHQgb2YKK3RoaXMgYHN1Ym1pdF9ydWxlYC4gIE9uIHRoZSBvdGhlciBzaWRlLCB0aGlzIGV4YW1wbGUgaXMgZWFzeSB0byByZWFkIGFuZAordW5kZXJzdGFuZC4KKworUmV1c2luZyB0aGUgZGVmYXVsdCBzdWJtaXQgcG9saWN5Cit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIFRvIGdldCByZXN1bHRzIG9mIEdlcnJpdHMgZGVmYXVsdCBzdWJtaXQgcG9saWN5IHdlIHVzZSB0aGUKLWBnZXJyaXQ6ZGVmYXVsdF9zdWJtaXRgIHByZWRpY2F0ZS4gVGhpcyBtZWFucyB0aGF0IGlmIHdlIHdyaXRlIGEgc3VibWl0IHJ1bGUgbGlrZToKK2BnZXJyaXQ6ZGVmYXVsdF9zdWJtaXRgIHByZWRpY2F0ZS4gIFRoZSBgZ2Vycml0OmRlZmF1bHRfc3VibWl0KFgpYCBpbmNsdWRlcyBhbGwKK2NhdGVnb3JpZXMgZnJvbSB0aGUgZGF0YWJhc2UuICBUaGlzIG1lYW5zIHRoYXQgaWYgd2Ugd3JpdGUgYSBzdWJtaXQgcnVsZSBsaWtlOgogCiAucnVsZXMucGwKIFtjYXB0aW9uPSIiXQogPT09PQogICBzdWJtaXRfcnVsZShYKSA6LSBnZXJyaXQ6ZGVmYXVsdF9zdWJtaXQoWCkuCiA9PT09Ci0KIHRoZW4gdGhpcyBpcyBlcXVpdmFsZW50IHRvIG5vdCB1c2luZyBgcnVsZXMucGxgIGF0IGFsbC4gV2UganVzdCBkZWxlZ2F0ZSB0bwogZGVmYXVsdCBsb2dpYy4gSG93ZXZlciwgb25jZSB3ZSBpbnZva2UgdGhlIGBnZXJyaXQ6ZGVmYXVsdF9zdWJtaXQoWClgIHdlIGNhbgogcGVyZm9ybSBmdXJ0aGVyIGFjdGlvbnMgb24gdGhlIHJldHVybiByZXN1bHQgYFhgIGFuZCBhcHBseSBvdXIgc3BlY2lmaWMKQEAgLTU0MCw3ICs2NjcsNyBAQAogICBwcm9qZWN0X3NwZWNpZmljX3BvbGljeShSLCBTKSA6LSAuLi4KID09PT0KIAotVGhlIGZvbGxvd2luZyBleGFtcGxlcyBidWlsZCBvbiB0b3Agb2YgdGhlIGRlZmF1bHQgc3VibWl0IHBvbGljeS4KK0luIHRoZSBmb2xsb3dpbmcgZXhhbXBsZXMgYm90aCBzdHlsZXMgd2lsbCBiZSBzaG93bi4KIAogRXhhbXBsZSA4OiBNYWtlIGNoYW5nZSBzdWJtaXR0YWJsZSBvbmx5IGlmIGBDb2RlLVJldmlldysyYCBpcyBnaXZlbiBieSBhIG5vbiBhdXRob3IKIH5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CkBAIC01NDgsNiArNjc1LDggQEAKIHNhdGlzZmllZCBpZiB0aGVyZSBpcyBhdCBsZWFzdCBvbmUgYENvZGUtUmV2aWV3KzJgIGZyb20gYSBub24gYXV0aG9yLiBBbGwgb3RoZXIKIGRlZmF1bHQgcG9saWNpZXMgbGlrZSB0aGUgYFZlcmlmaWVkYCBjYXRlZ29yeSBhbmQgdmV0b2luZyBjaGFuZ2VzIHN0aWxsIGFwcGx5LgogCitSZXVzaW5nIHRoZSBgZ2Vycml0OmRlZmF1bHRfc3VibWl0YAorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl4KIEZpcnN0LCB3ZSBpbnZva2UgYGdlcnJpdDpkZWZhdWx0X3N1Ym1pdGAgdG8gY29tcHV0ZSB0aGUgcmVzdWx0IGZvciB0aGUgZGVmYXVsdAogc3VibWl0IHBvbGljeSBhbmQgdGhlbiBhZGQgdGhlIGBOb24tQXV0aG9yLUNvZGUtUmV2aWV3YCBsYWJlbCB0byBpdC4gIFRoZQogYE5vbi1BdXRob3ItQ29kZS1SZXZpZXdgIGxhYmVsIGlzIGFkZGVkIHdpdGggc3RhdHVzIGBva2AgaWYgc3VjaCBhbiBhcHByb3ZhbApAQCAtNTYzLDcgKzY5Miw4IEBACiAgICAgUyA9Li4gW3N1Ym1pdCB8IFJdLgogCiAgIGFkZF9ub25fYXV0aG9yX2FwcHJvdmFsKFMxLCBTMikgOi0KLSAgICBnZXJyaXQ6Y29tbWl0X2F1dGhvcihBKSwgZ2Vycml0OmNvbW1pdF9sYWJlbChsYWJlbCgnQ29kZS1SZXZpZXcnLCAyKSwgUiksCisgICAgZ2Vycml0OmNvbW1pdF9hdXRob3IoQSksCisgICAgZ2Vycml0OmNvbW1pdF9sYWJlbChsYWJlbCgnQ29kZS1SZXZpZXcnLCAyKSwgUiksCiAgICAgUiBcPSBBLCAhLAogICAgIFMyID0gW2xhYmVsKCdOb24tQXV0aG9yLUNvZGUtUmV2aWV3Jywgb2soUikpIHwgUzFdLgogICBhZGRfbm9uX2F1dGhvcl9hcHByb3ZhbChTMSwgW2xhYmVsKCdOb24tQXV0aG9yLUNvZGUtUmV2aWV3JywgbmVlZChfKSkgfCBTMV0pLgpAQCAtNTg2LDYgKzcxNiw0NCBAQAogaWYgdGhlIGBjdXRgIGluIHRoZSBmaXJzdCBydWxlIGlzIG5vdCByZWFjaGVkIGFuZCBpdCBvbmx5IGhhcHBlbnMgaWYgYQogcHJlZGljYXRlIGJlZm9yZSB0aGUgYGN1dGAgZmFpbHMuCiAKK0Rvbid0IHVzZSBgZ2Vycml0OmRlZmF1bHRfc3VibWl0YAorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eCitMZXQncyBpbXBsZW1lbnQgdGhlIHNhbWUgc3VibWl0IHJ1bGUgdGhlIG90aGVyIHdheSwgd2l0aG91dCByZXVzaW5nIHRoZQorYGdlcnJpdDpkZWZhdWx0X3N1Ym1pdGA6CisKKy5ydWxlcy5wbAorW2NhcHRpb249IiJdCis9PT09CisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChDUiwgVikpIDotCisgICAgYmFzZShDUiwgViksCisgICAgQ1IgPSBsYWJlbChfLCBvayhSZXZpZXdlcikpLAorICAgIGdlcnJpdDpjb21taXRfYXV0aG9yKEF1dGhvciksCisgICAgQXV0aG9yIFw9IFJldmlld2VyLAorICAgICEuCisKKyAgc3VibWl0X3J1bGUoc3VibWl0KENSLCBWLCBOKSkgOi0KKyAgICBiYXNlKENSLCBWKSwKKyAgICBOID0gbGFiZWwoJ05vbi1BdXRob3ItQ29kZS1SZXZpZXcnLCBuZWVkKF8pKS4KKworICBiYXNlKENSLCBWKSA6LQorICAgIGdlcnJpdDptYXhfd2l0aF9ibG9jaygtMiwgMiwgJ0NvZGUtUmV2aWV3JywgQ1IpLAorICAgIGdlcnJpdDptYXhfd2l0aF9ibG9jaygtMSwgMSwgJ1ZlcmlmaWVkJywgVikuCis9PT09CisKK1RoZSBsYXR0ZXIgaW1wbGVtZW50YXRpb24gaXMgcHJvYmFibHkgZWFzaWVyIHRvIHVuZGVyc3RhbmQgYW5kIHRoZSBjb2RlIGxvb2tzCitjbGVhbmVyLiBOb3RlLCBob3dldmVyLCB0aGF0IHRoZSBsYXR0ZXIgaW1wbGVtZW50YXRpb24gd2lsbCBhbHdheXMgcmV0dXJuIHRoZQordHdvIHN0YW5kYXJkIGNhdGVnb3JpZXMgb25seSAoYENvZGUtUmV2aWV3YCBhbmQgYFZlcmlmaWVkYCkgZXZlbiBpZiBhIG5ldworY2F0ZWdvcnkgaGFzIGJlZWVuIGluc2VydGVkIGludG8gdGhlIGRhdGFiYXNlLiBUbyBpbmNsdWRlIHRoZSBuZXcgY2F0ZWdvcnkKK3RoZSBgcnVsZXMucGxgIHdvdWxkIG5lZWQgdG8gYmUgbW9kaWZpZWQgb3IgYSBgc3VibWl0X2ZpbHRlcmAgaW4gYSBwYXJlbnQKK3Byb2plY3Qgd291bGQgaGF2ZSB0byBjYXJlIGFib3V0IGluY2x1ZGluZyB0aGUgbmV3IGNhdGVnb3J5IGluIHRoZSByZXN1bHQKK29mIHRoaXMgYHN1Ym1pdF9ydWxlYC4KKworVGhlIGZvcm1lciBleGFtcGxlLCBob3dldmVyLCB3b3VsZCBpbmNsdWRlIGFueSBuZXdseSBhZGRlZCBjYXRlZ29yeSBhcyBpdAoraW52b2tlcyB0aGUgYGdlcnJpdDpkZWZhdWx0X3N1Ym1pdGAgYW5kIHRoZW4gbW9kaWZpZXMgaXRzIHJlc3VsdC4KKworV2hpY2ggb2YgdGhlc2UgdHdvIGJlaGF2aW9ycyBpcyBkZXNpcmVkIHdpbGwgYWx3YXlzIGRlcGVuZCBvbiBob3cgYSBwYXJ0aWN1bGFyCitHZXJyaXQgc2VydmVyIGlzIG1hbmFnZWQuCisKIEV4YW1wbGUgOTogUmVtb3ZlIHRoZSBgVmVyaWZpZWRgIGNhdGVnb3J5CiB+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIEEgcHJvamVjdCBoYXMgbm8gYnVpbGQgYW5kIHRlc3QuIEl0IGNvbnNpc3RzIG9mIG9ubHkgdGV4dCBmaWxlcyBhbmQgbmVlZHMgb25seQpAQCAtNTk0LDYgKzc2MiwxNyBAQAogV2UgYWxzbyB3YW50IHRoZSBVSSB0byBub3Qgc2hvdyB0aGUgYFZlcmlmaWVkYCBjYXRlZ29yeSBpbiB0aGUgdGFibGUgd2l0aAogdm90ZXMgYW5kIG9uIHRoZSB2b3Rpbmcgc2NyZWVuLgogCitUaGlzIGlzIHF1aXRlIHNpbXBsZSB3aXRob3V0IHJldXNpbmcgdGhlICdnZXJyaXQ6ZGVmYXVsdF9zdWJtaXRgOgorCisucnVsZXMucGwKK1tjYXB0aW9uPSIiXQorPT09PQorICBzdWJtaXRfcnVsZShzdWJtaXQoQ1IpKSA6LQorICAgIGdlcnJpdDptYXhfd2l0aF9ibG9jaygtMiwgMiwgJ0NvZGUtUmV2aWV3JywgQ1IpLgorPT09PQorCitJbXBsZW1lbnRpbmcgdGhlIHNhbWUgcnVsZSBieSByZXVzaW5nIGBnZXJyaXQ6ZGVmYXVsdF9zdWJtaXRgIGlzIGEgYml0IG1vcmUgY29tcGxleDoKKwogLnJ1bGVzLnBsCiBbY2FwdGlvbj0iIl0KID09PT0KQEAgLTYyNyw2ICs4MDYsMjcgQEAKIFRoZSBgcmVtb3ZlX3ZlcmlmaWVkX2NhdGVnb3J5YCBhbmQgYGFkZF9ub25fYXV0aG9yX2FwcHJvdmFsYCBwcmVkaWNhdGVzIGFyZSB0aGUKIHNhbWUgYXMgZGVmaW5lZCBpbiB0aGUgcHJldmlvdXMgdHdvIGV4YW1wbGVzLgogCitXaXRob3V0IHJldXNpbmcgdGhlIGBnZXJyaXQ6ZGVmYXVsdF9zdWJtaXRgIHRoZSBzYW1lIGV4YW1wbGUgbWF5IGJlIGltcGxlbWVudGVkCithczoKKworLnJ1bGVzLnBsCitbY2FwdGlvbj0iIl0KKz09PT0KKyAgc3VibWl0X3J1bGUoc3VibWl0KENSKSkgOi0KKyAgICBiYXNlKENSKSwKKyAgICBDUiA9IGxhYmVsKF8sIG9rKFJldmlld2VyKSksCisgICAgZ2Vycml0OmNvbW1pdF9hdXRob3IoQXV0aG9yKSwKKyAgICBBdXRob3IgXD0gUmV2aWV3ZXIsCisgICAgIS4KKworICBzdWJtaXRfcnVsZShzdWJtaXQoQ1IsIE4pKSA6LQorICAgIGJhc2UoQ1IpLAorICAgIE4gPSBsYWJlbCgnTm9uLUF1dGhvci1Db2RlLVJldmlldycsIG5lZWQoXykpLgorCisgIGJhc2UoQ1IpIDotCisgICAgZ2Vycml0Om1heF93aXRoX2Jsb2NrKC0yLCAyLCAnQ29kZS1SZXZpZXcnLCBDUiksCis9PT09CisKIEV4YW1wbGUgMTE6IFJlbW92ZSB0aGUgYFZlcmlmaWVkYCBjYXRlZ29yeSBmcm9tIGFsbCBwcm9qZWN0cwogfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CiBFeGFtcGxlIDksIGltcGxlbWVudHMgYHN1Ym1pdF9ydWxlYCB0aGF0IHJlbW92ZXMgdGhlIGBWZXJpZmllZGAgY2F0ZWdvcnkgZnJvbQpAQCAtNjQ4LDcgKzg0OCwzMiBAQAogICByZW1vdmVfdmVyaWZpZWRfY2F0ZWdvcnkoW0h8VF0sIFtIfFJdKSA6LSByZW1vdmVfdmVyaWZpZWRfY2F0ZWdvcnkoVCwgUikuCiA9PT09CiAKLUV4YW1wbGUgMTI6IDErMT0yIENvZGUtUmV2aWV3CitFeGFtcGxlIDEyOiBPbiByZWxlYXNlIGJyYW5jaGVzIHJlcXVpcmUgRHJObyBpbiBhZGRpdGlvbiB0byBwcm9qZWN0IHJ1bGVzCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CitBIG5ldyBjYXRlZ29yeSAnRHJObycgaXMgYWRkZWQgdG8gdGhlIGRhdGFiYXNlIGFuZCBpcyByZXF1aXJlZCBmb3IgcmVsZWFzZQorYnJhbmNoZXMuIFRvIG1hcmsgYSBicmFuY2ggYXMgYSByZWxlYXNlIGJyYW5jaCB3ZSB1c2UgYGRybm8oJ3JlZnMvaGVhZHMvYnJhbmNoJylgLgorCisucnVsZXMucGwKK1tjYXB0aW9uPSIiXQorPT09PQorICBkcm5vKCdyZWZzL2hlYWRzL21hc3RlcicpLgorICBkcm5vKCdyZWZzL2hlYWRzL3N0YWJsZS0yLjMnKS4KKyAgZHJubygncmVmcy9oZWFkcy9zdGFibGUtMi40JykuCisgIGRybm8oJ3JlZnMvaGVhZHMvc3RhYmxlLTIuNScpLgorICBkcm5vKCdyZWZzL2hlYWRzL3N0YWJsZS0yLjUnKS4KKworICBzdWJtaXRfZmlsdGVyKEluLCBPdXQpIDotCisgICAgZ2Vycml0OmNoYW5nZV9icmFuY2goQnJhbmNoKSwKKyAgICBkcm5vKEJyYW5jaCksCisgICAgISwKKyAgICBJbiA9Li4gW3N1Ym1pdCB8IEldLAorICAgIGdlcnJpdDptYXhfd2l0aF9ibG9jaygtMSwgMSwgJ0RyTm8nLCBEck5vKSwKKyAgICBPdXQgPS4uIFtzdWJtaXQsIERyTm8gfCBJXS4KKworICBzdWJtaXRfZmlsdGVyKEluLCBPdXQpIDotIEluID0gT3V0LgorPT09PQorCitFeGFtcGxlIDEzOiAxKzE9MiBDb2RlLVJldmlldwogfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIEluIHRoaXMgZXhhbXBsZSB3ZSBpbnRyb2R1Y2UgYWNjdW11bGF0aXZlIHZvdGluZyB0byBkZXRlcm1pbmUgaWYgYSBjaGFuZ2UgaXMKIHN1Ym1pdHRhYmxlIG9yIG5vdC4gV2UgbW9kaWZ5IHRoZSBzdGFuZGFyZCBDb2RlLVJldmlldyB0byBiZSBhY2N1bXVsYXRpdmUsIGFuZCBtYWtlIHRoZQpAQCAtNjg0LDcgKzkwOSwzNCBAQAogICAgIFMgPS4uIFtzdWJtaXQgfCBMYWJlbHNdLgogPT09PQogCi1FeGFtcGxlIDEzOiBNYXN0ZXIgYW5kIGFwcHJlbnRpY2UKK0ltcGxlbWVudGluZyB0aGUgc2FtZSBleGFtcGxlIHdpdGhvdXQgdXNpbmcgYGdlcnJpdDpkZWZhdWx0X3N1Ym1pdGA6CisKKy5ydWxlcy5wbAorW2NhcHRpb249IiJdCis9PT09CisgIHN1Ym1pdF9ydWxlKHN1Ym1pdChDUiwgVikpIDotCisgICAgc3VtKDIsICdDb2RlLVJldmlldycsIENSKSwKKyAgICBnZXJyaXQ6bWF4X3dpdGhfYmxvY2soLTEsIDEsICdWZXJpZmllZCcsIFYpLgorCisgICUgU3VtIHRoZSB2b3RlcyBpbiBhIGNhdGVnb3J5LiBVc2VzIGEgaGVscGVyIGZ1bmN0aW9uIHNjb3JlLzIKKyAgJSB0byBzZWxlY3Qgb3V0IG9ubHkgdGhlIHNjb3JlIHZhbHVlcyB0aGUgZ2l2ZW4gY2F0ZWdvcnkuCisgIHN1bShWb3Rlc05lZWRlZCwgQ2F0ZWdvcnksIGxhYmVsKENhdGVnb3J5LCBvayhfKSkpIDotCisgICAgZmluZGFsbChTY29yZSwgc2NvcmUoQ2F0ZWdvcnksIFNjb3JlKSwgQWxsKSwKKyAgICBzdW1fbGlzdChBbGwsIFN1bSksCisgICAgU3VtID49IFZvdGVzTmVlZGVkLAorICAgICEuCisgIHN1bShWb3Rlc05lZWRlZCwgQ2F0ZWdvcnksIGxhYmVsKENhdGVnb3J5LCBuZWVkKFZvdGVzTmVlZGVkKSkpLgorCisgIHNjb3JlKENhdGVnb3J5LCBTY29yZSkgOi0KKyAgICBnZXJyaXQ6Y29tbWl0X2xhYmVsKGxhYmVsKENhdGVnb3J5LCBTY29yZSksIFVzZXIpLgorCisgICUgU2ltcGxlIFByb2xvZyByb3V0aW5lIHRvIHN1bSBhIGxpc3Qgb2YgaW50ZWdlcnMuCisgIHN1bV9saXN0KExpc3QsIFN1bSkgICA6LSBzdW1fbGlzdChMaXN0LCAwLCBTdW0pLgorICBzdW1fbGlzdChbWHxUXSwgWSwgUykgOi0gWiBpcyBYICsgWSwgc3VtX2xpc3QoVCwgWiwgUykuCisgIHN1bV9saXN0KFtdLCBTLCBTKS4KKz09PT0KKworRXhhbXBsZSAxNDogTWFzdGVyIGFuZCBhcHByZW50aWNlCiB+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIFRoZSBtYXN0ZXIgYW5kIGFwcHJlbnRpY2UgZXhhbXBsZSBhbGxvdyB5b3UgdG8gc3BlY2lmeSBhIHVzZXIgKHRoZSBgbWFzdGVyYCkKIHRoYXQgbXVzdCBhcHByb3ZlIGFsbCBjaGFuZ2VzIGRvbmUgYnkgYW5vdGhlciB1c2VyICh0aGUgYGFwcHJlbnRpY2VgKS4KQEAgLTcyMSw3ICs5NzMsNyBAQAogICBhZGRfYXBwcmVudGljZV9tYXN0ZXIoUywgUykuCiA9PT09CiAKLUV4YW1wbGUgMTQ6IE9ubHkgYWxsb3cgQXV0aG9yIHRvIHN1Ym1pdCBjaGFuZ2UKK0V4YW1wbGUgMTU6IE9ubHkgYWxsb3cgQXV0aG9yIHRvIHN1Ym1pdCBjaGFuZ2UKIH5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIFRoaXMgZXhhbXBsZSBhZGRzIGEgbmV3IG5lZWRlZCBjYXRlZ29yeSBgUGF0Y2hzZXQtQXV0aG9yYCBmb3IgYW55IHVzZXIgdGhhdCBpcwogbm90IHRoZSBhdXRob3Igb2YgdGhlIHBhdGNoLiBUaGlzIGVmZmVjdGl2ZWx5IGJsb2NrcyBhbGwgdXNlcnMgZXhjZXB0IHRoZSBhdXRob3IKQEAgLTc0NSw2ICs5OTcsNjggQEAKICAgb25seV9hbGxvd19hdXRob3JfdG9fc3VibWl0KFMxLCBbbGFiZWwoJ1BhdGNoc2V0LUF1dGhvcicsIG5lZWQoXykpIHwgUzFdKS4KID09PT0KIAorRXhhbXBsZXMgLSBTdWJtaXQgVHlwZQorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorVGhlIGZvbGxvd2luZyBleGFtcGxlcyBzaG93IGhvdyB0byBpbXBsZW1lbnQgb3duIHN1Ym1pdCB0eXBlIHJ1bGVzLgorCitFeGFtcGxlIDE6IFNldCBhIGBDaGVycnkgUGlja2Agc3VibWl0IHR5cGUgZm9yIGFsbCBjaGFuZ2VzCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CitUaGlzIGV4YW1wbGUgc2V0cyB0aGUgYENoZXJyeSBQaWNrYCBzdWJtaXQgdHlwZSBmb3IgYWxsIGNoYW5nZXMuIEl0IG92ZXJyaWRlcword2hhdGV2ZXIgaXMgc2V0IGFzIHByb2plY3QgZGVmYXVsdCBzdWJtaXQgdHlwZS4KKworcnVsZXMucGwKK1tjYXB0aW9uPSIiXQorPT09PQorICBzdWJtaXRfdHlwZShjaGVycnlfcGljaykuCis9PT09CisKKworRXhhbXBsZSAyOiBgRmFzdCBGb3J3YXJkIE9ubHlgIGZvciBhbGwgYHJlZnMvaGVhZHMvc3RhYmxlKmAgYnJhbmNoZXMKK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CitGb3IgYWxsIGByZWZzL2hlYWRzL3N0YWJsZS4qYCBicmFuY2hlcyB3ZSB3b3VsZCBsaWtlIHRvIGVuZm9yY2UgdGhlIGBGYXN0CitGb3J3YXJkIE9ubHlgIHN1Ym1pdCB0eXBlLiBBIHJlYXNvbiBmb3IgdGhpcyBkZWNpc2lvbiBtYXkgYmUgYSBuZWVkIHRvIG5ldmVyCiticmVhayB0aGUgYnVpbGQgaW4gdGhlIHN0YWJsZSBicmFuY2hlcy4gIEZvciBhbGwgb3RoZXIgYnJhbmNoZXMsIHRob3NlIG5vdAorbWF0Y2hpbmcgdGhlIGByZWZzL2hlYWRzL3N0YWJsZS4qYCBwYXR0ZXJuLCB3ZSB3b3VsZCBsaWtlIHRvIHVzZSB0aGUgcHJvamVjdCdzCitkZWZhdWx0IHN1Ym1pdCB0eXBlIGFzIGRlZmluZWQgb24gdGhlIHByb2plY3Qgc2V0dGluZ3MgcGFnZS4KKworLnJ1bGVzLnBsCitbY2FwdGlvbj0iIl0KKz09PT0KKyAgc3VibWl0X3R5cGUoZmFzdF9mb3J3YXJkX29ubHkpIDotCisgICAgZ2Vycml0OmNoYW5nZV9icmFuY2goQiksIHJlZ2V4X21hdGNoZXMoJ3JlZnMvaGVhZHMvc3RhYmxlLionLCBCKSwKKyAgICAhLgorICBzdWJtaXRfdHlwZShUKSA6LSBnZXJyaXQ6cHJvamVjdF9kZWZhdWx0X3N1Ym1pdF90eXBlKFQpCis9PT09CisKK1RoZSBmaXJzdCBgc3VibWl0X3R5cGVgIHByZWRpY2F0ZSBkZWZpbmVzIHRoZSBgRmFzdCBGb3J3YXJkIE9ubHlgIHN1Ym1pdCB0eXBlCitmb3IgYHJlZnMvaGVhZHMvc3RhYmxlLipgIGJyYW5jaGVzLiBUaGUgc2Vjb25kIGBzdWJtaXRfdHlwZWAgcHJlZGljYXRlIHJldHVybnMKK3RoZSBwcm9qZWN0J3MgZGVmYXVsdCBzdWJtaXQgdHlwZS4KKworRXhhbXBsZSAzOiBEb24ndCByZXF1aXJlIGBGYXN0IEZvcndhcmQgT25seWAgaWYgb25seSBkb2N1bWVudGF0aW9uIHdhcyBjaGFuZ2VkCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KK0xpa2UgaW4gdGhlIHByZXZpb3VzIGV4YW1wbGUgd2Ugd2FudCB0aGUgYEZhc3QgRm9yd2FyZCBPbmx5YCBzdWJtaXQgdHlwZSBmb3IKK3RoZSBgcmVmcy9oZWFkcy9zdGFibGUqYCBicmFuY2hlcy4gIEhvd2V2ZXIsIGlmIG9ubHkgZG9jdW1lbnRhdGlvbiB3YXMgY2hhbmdlZAorKG9ubHkgYCoudHh0YCBmaWxlcyksIHRoZW4gd2UgYWxsb3cgcHJvamVjdCdzIGRlZmF1bHQgc3VibWl0IHR5cGUgZm9yIHN1Y2gKK2NoYW5nZXMuCisKKy5ydWxlcy5wbAorW2NhcHRpb249IiJdCis9PT09CisgIHN1Ym1pdF90eXBlKGZhc3RfZm9yd2FyZF9vbmx5KSA6LQorICAgIGdlcnJpdDpjb21taXRfZGVsdGEoJyg/PCFcLnR4dCkkJyksCisgICAgZ2Vycml0OmNoYW5nZV9icmFuY2goQiksIHJlZ2V4X21hdGNoZXMoJ3JlZnMvaGVhZHMvc3RhYmxlLionLCBCKSwKKyAgICAhLgorICBzdWJtaXRfdHlwZShUKSA6LSBnZXJyaXQ6cHJvamVjdF9kZWZhdWx0X3N1Ym1pdF90eXBlKFQpCis9PT09CisKK1RoZSBgZ2Vycml0OmNvbW1pdF9kZWx0YSgnKD88IVwudHh0KSQnKWAgc3VjY2VlZHMgaWYgdGhlIGNoYW5nZSBjb250YWlucyBhIGZpbGUKK3dob3NlIG5hbWUgZG9lc24ndCBlbmQgd2l0aCBgLnR4dGAgVGhlIHJlc3Qgb2YgdGhpcyBydWxlIGlzIHNhbWUgbGlrZSBpbiB0aGUKK3ByZXZpb3VzIGV4YW1wbGUuCisKK0lmIGFsbCBmaWxlIG5hbWVzIGluIHRoZSBjaGFuZ2UgZW5kIHdpdGggYC50eHRgLCB0aGVuIHRoZQorYGdlcnJpdDpjb21taXRfZGVsdGEoJyg/PCFcLnR4dCkkJylgIHdpbGwgZmFpbCBhcyBubyBmaWxlIG5hbWUgd2lsbCBtYXRjaCB0aGlzCityZWd1bGFyIGV4cHJlc3Npb24uCisKIEdFUlJJVAogLS0tLS0tCiBQYXJ0IG9mIGxpbms6aW5kZXguaHRtbFtHZXJyaXQgQ29kZSBSZXZpZXddCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3JlZnMtbm90ZXMtcmV2aWV3LnR4dCBiL0RvY3VtZW50YXRpb24vcmVmcy1ub3Rlcy1yZXZpZXcudHh0CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA2MzJmNTY3Li4wMDAwMDAwCi0tLSBhL0RvY3VtZW50YXRpb24vcmVmcy1ub3Rlcy1yZXZpZXcudHh0CisrKyAvZGV2L251bGwKQEAgLTEsMTExICswLDAgQEAKLVRoZSByZWZzL25vdGVzL3JldmlldyBuYW1lc3BhY2UKLT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLQotU3VtbWFyeQotLS0tLS0tLQotCi1gcmVmcy9ub3Rlcy9yZXZpZXdgIGlzIGEgc3BlY2lhbCByZWZlcmVuY2UgdGhhdCBHZXJyaXQgY3JlYXRlcyBvbiByZXBvc2l0b3JpZXMKLXRvIHN0b3JlIGluZm9ybWF0aW9uIGFib3V0IGNvZGUgcmV2aWV3cy4KLQotV2hlbiBhIHJlcG9zaXRvcnkgaXMgY2xvbmVkIGZyb20gR2Vycml0LCB0aGUgYHJlZnMvbm90ZXMvcmV2aWV3YCByZWZlcmVuY2UgaXMKLW5vdCBpbmNsdWRlZCBieSBkZWZhdWx0LiAgSXQgaGFzIHRvIGJlIG1hbnVhbGx5IGZldGNoZWQ6Ci0KLT09PT0KLSAgJCBnaXQgZmV0Y2ggb3JpZ2luIHJlZnMvbm90ZXMvcmV2aWV3OnJlZnMvbm90ZXMvcmV2aWV3Ci09PT09Ci0KLUl0IGlzIGFsc28gcG9zc2libGUgdG8KLWxpbms6aHR0cDovL3d3dy5rZXJuZWwub3JnL3B1Yi9zb2Z0d2FyZS9zY20vZ2l0L2RvY3MvZ2l0LWNvbmZpZy5odG1sW2NvbmZpZ3VyZSBnaXRdCi10byBhbHdheXMgZmV0Y2ggYHJlZnMvbm90ZXMvcmV2aWV3YDoKLQotPT09PQotICAkIGdpdCBjb25maWcgLS1hZGQgcmVtb3RlLm9yaWdpbi5mZXRjaCByZWZzL25vdGVzL3JldmlldzpyZWZzL25vdGVzL3JldmlldwotICAkIGdpdCBmZXRjaAotPT09PQotCi1XaGVuIGByZWZzL25vdGVzL3Jldmlld2AgaXMgZmV0Y2hlZCBvbiBhIHJlcG9zaXRvcnksIHRoZSBHZXJyaXQgcmV2aWV3Ci1pbmZvcm1hdGlvbiBjYW4gYmUgaW5jbHVkZWQgaW4gdGhlIGdpdCBsb2cgb3V0cHV0OgotCi09PT09Ci0gICAkIGdpdCBsb2cgLS1zaG93LW5vdGVzPXJldmlldwotPT09PQotCi1Db250ZW50IG9mIHJlZnMvbm90ZXMvcmV2aWV3Ci0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0KLUZvciBlYWNoIGNvbW1pdCwgR2Vycml0IHN0b3JlcyB0aGUgZm9sbG93aW5nIHJldmlldyBpbmZvcm1hdGlvbiBpbgotYHJlZnMvbm90ZXMvcmV2aWV3YDoKLQotW1tzdWJtaXR0ZWRfYnldXQotU3VibWl0dGVkLWJ5Ci1+fn5+fn5+fn5+fn4KLQotVGhlIG5hbWUgYW5kIGVtYWlsIGFkZHJlc3Mgb2YgdGhlIEdlcnJpdCB1c2VyIHRoYXQgc3VibWl0dGVkIHRoZSBjaGFuZ2UgaW4KLWxpbms6aHR0cDovL3d3dy5pZXRmLm9yZy9yZmMvcmZjMjgyMi50eHRbUkZDIDI4MjJdIGZvcm1hdC4KLQotPT09PQotICBTdWJtaXR0ZWQtYnk6IFJhbmRvbSBKIERldmVsb3BlciA8cmFuZG9tQGRldmVsb3Blci5leGFtcGxlLm9yZz4KLT09PT0KLQotW1tzdWJtaXR0ZWRfYXRdXQotU3VibWl0dGVkLWF0Ci1+fn5+fn5+fn5+fn4KLQotVGhlIHRpbWUgdGhlIGNvbW1pdCB3YXMgc3VibWl0dGVkIGluIFJGQyAyODIyIHRpbWUgc3RhbXAgZm9ybWF0LgotCi09PT09Ci0gIFN1Ym1pdHRlZC1hdDogTW9uLCAyNSBKdW4gMjAxMiAxNjoxNTo1NyArMDIwMAotPT09PQotCi1bW3Jldmlld2VkX29uXV0KLVJldmlld2VkLW9uCi1+fn5+fn5+fn5+fgotCi1UaGUgVVJMIHRvIHRoZSBjaGFuZ2Ugb24gdGhlIEdlcnJpdCBzZXJ2ZXIuCi0KLT09PT0KLSAgUmV2aWV3ZWQtb246IGh0dHA6Ly9wYXRoLnRvLmdlcnJpdC8xMjM0NQotPT09PQotCi1bW3Jldmlld19zY29yZXNdXQotUmV2aWV3IExhYmVscyBhbmQgU2NvcmVzCi1+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KLQotUmV2aWV3IGxhYmVsIGFuZCBzY29yZSwgYW5kIHRoZSBuYW1lIGFuZCBlbWFpbCBhZGRyZXNzIG9mIHRoZSBHZXJyaXQgdXNlciB0aGF0Ci1nYXZlIGl0IGluIFJGQyAyODIyIGZvcm1hdDoKLQotPT09PQotICBDb2RlLVJldmlldysyOiBBLiBOLiBPdGhlciA8YW5vdGhlckBkZXZlbG9wZXIuZXhhbXBsZS5vcmc+Ci0gIFZlcmlmaWVkKzE6IEEuIE4uIE90aGVyIDxhbm90aGVyQGRldmVsb3Blci5leGFtcGxlLm9yZz4KLT09PT0KLQotQ29tbW9ubHkgdXNlZCByZXZpZXcgbGFiZWxzIGFyZSAiQ29kZS1SZXZpZXciIGFuZCAiVmVyaWZpZWQiLCBidXQgYW55IGxhYmVsCi1jb25maWd1cmVkIGluIEdlcnJpdCBjYW4gYmUgaW5jbHVkZWQuCi0KLUFsbCByZXZpZXcgbGFiZWxzIGFuZCBzY29yZXMgcHJlc2VudCBvbiB0aGUgY2hhbmdlIGF0IHRoZSB0aW1lIG9mIHN1Ym1pdCBhcmUKLWluY2x1ZGVkLgotCi1bW3Byb2plY3RdXQotUHJvamVjdAotfn5+fn5+fgotCi1UaGUgbmFtZSBvZiB0aGUgcHJvamVjdCBpbiB3aGljaCB0aGUgY29tbWl0IHdhcyBtYWRlLgotCi09PT09Ci0gIFByb2plY3Q6IGtlcm5lbC9jb21tb24KLT09PT0KLQotW1ticmFuY2hdXQotQnJhbmNoCi1+fn5+fn4KLQotVGhlIG5hbWUgb2YgdGhlIGJyYW5jaCBvbiB3aGljaCB0aGUgY29tbWl0IHdhcyBtYWRlLgotCi09PT09Ci0gIEJyYW5jaDogcmVmcy9oZWFkcy9tYXN0ZXIKLT09PT0KLQotCi1HRVJSSVQKLS0tLS0tLQotUGFydCBvZiBsaW5rOmluZGV4Lmh0bWxbR2Vycml0IENvZGUgUmV2aWV3XQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS1hY2NvdW50cy50eHQgYi9Eb2N1bWVudGF0aW9uL3Jlc3QtYXBpLWFjY291bnRzLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yY2NkMzlhCi0tLSAvZGV2L251bGwKKysrIGIvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS1hY2NvdW50cy50eHQKQEAgLTAsMCArMSwzNjggQEAKK0dlcnJpdCBDb2RlIFJldmlldyAtIC9hY2NvdW50cy8gUkVTVCBBUEkKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworVGhpcyBwYWdlIGRlc2NyaWJlcyB0aGUgYWNjb3VudCByZWxhdGVkIFJFU1QgZW5kcG9pbnRzLgorUGxlYXNlIGFsc28gdGFrZSBub3RlIG9mIHRoZSBnZW5lcmFsIGluZm9ybWF0aW9uIG9uIHRoZQorbGluazpyZXN0LWFwaS5odG1sW1JFU1QgQVBJXS4KKworRW5kcG9pbnRzCistLS0tLS0tLS0KKworW1tnZXQtYWNjb3VudF1dCitHZXQgQWNjb3VudAorfn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2FjY291bnRzL2xpbms6I2FjY291bnQtaWRbXHthY2NvdW50LWlkXH1dJworCitSZXR1cm5zIGFuIGFjY291bnQgYXMgYW4gbGluazojYWNjb3VudC1pbmZvW0FjY291bnRJbmZvXSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvYWNjb3VudHMvc2VsZiBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk2LAorICAgICJuYW1lIjogIkpvaG4gRG9lIiwKKyAgICAiZW1haWwiOiAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgIH0KKy0tLS0KKworW1tsaXN0LWFjY291bnQtY2FwYWJpbGl0aWVzXV0KK0xpc3QgQWNjb3VudCBDYXBhYmlsaXRpZXMKK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2FjY291bnRzL2xpbms6I2FjY291bnQtaWRbXHthY2NvdW50LWlkXH1dL2NhcGFiaWxpdGllcycKKworUmV0dXJucyB0aGUgZ2xvYmFsIGNhcGFiaWxpdGllcyB0aGF0IGFyZSBlbmFibGVkIGZvciB0aGUgc3BlY2lmaWVkCit1c2VyLgorCitJZiB0aGUgZ2xvYmFsIGNhcGFiaWxpdGllcyBmb3IgdGhlIGNhbGxpbmcgdXNlciBzaG91bGQgYmUgbGlzdGVkLAorYHNlbGZgIGNhbiBiZSB1c2VkIGFzIGFjY291bnQtaWQuIFRoaXMgY2FuIGJlIHVzZWQgYnkgVUkgdG9vbHMgdG8KK2Rpc2NvdmVyIGlmIGFkbWluaXN0cmF0aXZlIGZlYXR1cmVzIGFyZSBhdmFpbGFibGUgdG8gdGhlIGNhbGxlciwgc28KK3RoZXkgY2FuIGhpZGUgKG9yIHNob3cpIHJlbGV2YW50IFVJIGFjdGlvbnMuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvYWNjb3VudHMvc2VsZi9jYXBhYmlsaXRpZXMgSFRUUC8xLjAKKy0tLS0KKworQXMgcmVzcG9uc2UgdGhlIGdsb2JhbCBjYXBhYmlsaXRpZXMgb2YgdGhlIHVzZXIgYXJlIHJldHVybmVkIGFzIGEKK2xpbms6I2NhcGFiaWxpdHktaW5mb1tDYXBhYmlsaXR5SW5mb10gZW50aXR5LgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAicXVlcnlMaW1pdCI6IHsKKyAgICAgICJtaW4iOiAwLAorICAgICAgIm1heCI6IDUwMAorICAgIH0sCisgICAgImVtYWlsUmV2aWV3ZXJzIjogdHJ1ZQorICB9CistLS0tCisKK0FkbWluaXN0cmF0b3IgdGhhdCBoYXMgYXV0aGVudGljYXRlZCB3aXRoIGRpZ2VzdCBhdXRoZW50aWNhdGlvbjoKKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9hL2FjY291bnRzL3NlbGYvY2FwYWJpbGl0aWVzIEhUVFAvMS4wCisgIEF1dGhvcml6YXRpb246IERpZ2VzdCB1c2VybmFtZT0iYWRtaW4iLCByZWFsbT0iR2Vycml0IENvZGUgUmV2aWV3Iiwgbm9uY2U9Ii4uLgorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAiYWRtaW5pc3RyYXRlU2VydmVyIjogdHJ1ZSwKKyAgICAicXVlcnlMaW1pdCI6IHsKKyAgICAgICJtaW4iOiAwLAorICAgICAgIm1heCI6IDUwMAorICAgIH0sCisgICAgImNyZWF0ZUFjY291bnQiOiB0cnVlLAorICAgICJjcmVhdGVHcm91cCI6IHRydWUsCisgICAgImNyZWF0ZVByb2plY3QiOiB0cnVlLAorICAgICJlbWFpbFJldmlld2VycyI6IHRydWUsCisgICAgImtpbGxUYXNrIjogdHJ1ZSwKKyAgICAidmlld0NhY2hlcyI6IHRydWUsCisgICAgImZsdXNoQ2FjaGVzIjogdHJ1ZSwKKyAgICAidmlld0Nvbm5lY3Rpb25zIjogdHJ1ZSwKKyAgICAidmlld1F1ZXVlIjogdHJ1ZSwKKyAgICAicnVuR0MiOiB0cnVlLAorICAgICJzdGFydFJlcGxpY2F0aW9uIjogdHJ1ZQorICB9CistLS0tCisKKy5HZXQgeW91ciBvd24gY2FwYWJpbGl0aWVzCisqKioqCitnZXQ6Oi9hY2NvdW50cy9zZWxmL2NhcGFiaWxpdGllcworKioqKgorCitUbyBmaWx0ZXIgdGhlIHNldCBvZiBnbG9iYWwgY2FwYWJpbGl0aWVzIHRoZSBgcWAgcGFyYW1ldGVyIGNhbiBiZSB1c2VkLgorRmlsdGVyaW5nIG1heSBkZWNyZWFzZSB0aGUgcmVzcG9uc2UgdGltZSBieSBhdm9pZGluZyBsb29raW5nIGF0IGV2ZXJ5Citwb3NzaWJsZSBhbHRlcm5hdGl2ZSBmb3IgdGhlIGNhbGxlci4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9hL2FjY291bnRzL3NlbGYvY2FwYWJpbGl0aWVzP3E9Y3JlYXRlQWNjb3VudCZxPWNyZWF0ZUdyb3VwIEhUVFAvMS4wCisgIEF1dGhvcml6YXRpb246IERpZ2VzdCB1c2VybmFtZT0iYWRtaW4iLCByZWFsbT0iR2Vycml0IENvZGUgUmV2aWV3Iiwgbm9uY2U9Ii4uLgorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAiY3JlYXRlQWNjb3VudCI6IHRydWUsCisgICAgImNyZWF0ZUdyb3VwIjogdHJ1ZQorICB9CistLS0tCisKKy5DaGVjayBpZiB5b3UgY2FuIGNyZWF0ZSBncm91cHMKKyoqKioKK2dldDo6L2FjY291bnRzL3NlbGYvY2FwYWJpbGl0aWVzP3E9Y3JlYXRlR3JvdXAKKyoqKioKKworW1tjaGVjay1hY2NvdW50LWNhcGFiaWxpdHldXQorQ2hlY2sgQWNjb3VudCBDYXBhYmlsaXR5Cit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2FjY291bnRzL2xpbms6I2FjY291bnQtaWRbXHthY2NvdW50LWlkXH1dL2NhcGFiaWxpdGllcy9saW5rOiNjYXBhYmlsaXR5LWlkW1x7Y2FwYWJpbGl0eS1pZFx9XScKKworQ2hlY2tzIGlmIGEgdXNlciBoYXMgYSBjZXJ0YWluIGdsb2JhbCBjYXBhYmlsaXR5LgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL2EvYWNjb3VudHMvc2VsZi9jYXBhYmlsaXRpZXMvY3JlYXRlR3JvdXAgSFRUUC8xLjAKKy0tLS0KKworSWYgdGhlIHVzZXIgaGFzIHRoZSBnbG9iYWwgY2FwYWJpbGl0eSB0aGUgc3RyaW5nIGBva2AgaXMgcmV0dXJuZWQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKworICBvaworLS0tLQorCitJZiB0aGUgdXNlciBkb2Vzbid0IGhhdmUgdGhlIGdsb2JhbCBjYXBhYmlsaXR5IHRoZSByZXNwb25zZSBpcworYDQwNCBOb3QgRm91bmRgLgorCisuQ2hlY2sgaWYgeW91IGNhbiBjcmVhdGUgZ3JvdXBzCisqKioqCitnZXQ6Oi9hY2NvdW50cy9zZWxmL2NhcGFiaWxpdGllcy9jcmVhdGVHcm91cAorKioqKgorCitbW2xpc3QtZ3JvdXBzXV0KK0xpc3QgR3JvdXBzCit+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvYWNjb3VudHMvbGluazojYWNjb3VudC1pZFtce2FjY291bnQtaWRcfV0vZ3JvdXBzLycKKworTGlzdHMgYWxsIGdyb3VwcyB0aGF0IGNvbnRhaW4gdGhlIHNwZWNpZmllZCB1c2VyIGFzIGEgbWVtYmVyLgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL2EvYWNjb3VudHMvc2VsZi9ncm91cHMvIEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3VsdCBhIGxpc3Qgb2YgbGluazpyZXN0LWFwaS1ncm91cHMuaHRtbCNncm91cC1pbmZvW0dyb3VwSW5mb10KK2VudHJpZXMgaXMgcmV0dXJuZWQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgWworICAgIHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICAgImlkIjogImdsb2JhbCUzQUFub255bW91cy1Vc2VycyIsCisgICAgICAidXJsIjogIiMvYWRtaW4vZ3JvdXBzL3V1aWQtZ2xvYmFsJTNBQW5vbnltb3VzLVVzZXJzIiwKKyAgICAgICJvcHRpb25zIjogeworICAgICAgfSwKKyAgICAgICJkZXNjcmlwdGlvbiI6ICJBbnkgdXNlciwgc2lnbmVkLWluIG9yIG5vdCIsCisgICAgICAiZ3JvdXBfaWQiOiAyLAorICAgICAgIm93bmVyX2lkIjogIjZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiCisgICAgfSwKKyAgICB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2dyb3VwIiwKKyAgICAgICJpZCI6ICI4MzRlYzM2ZGQ1ZTBlZDIxYTJmZjVkN2UyMjU1ZGEwODJkNjNiYmQ3IiwKKyAgICAgICJ1cmwiOiAiIy9hZG1pbi9ncm91cHMvdXVpZC04MzRlYzM2ZGQ1ZTBlZDIxYTJmZjVkN2UyMjU1ZGEwODJkNjNiYmQ3IiwKKyAgICAgICJvcHRpb25zIjogeworICAgICAgICAidmlzaWJsZV90b19hbGwiOiB0cnVlLAorICAgICAgfSwKKyAgICAgICJncm91cF9pZCI6IDYsCisgICAgICAib3duZXJfaWQiOiAiODM0ZWMzNmRkNWUwZWQyMWEyZmY1ZDdlMjI1NWRhMDgyZDYzYmJkNyIKKyAgICB9LAorICAgIHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICAgImlkIjogImdsb2JhbCUzQVJlZ2lzdGVyZWQtVXNlcnMiLAorICAgICAgInVybCI6ICIjL2FkbWluL2dyb3Vwcy91dWlkLWdsb2JhbCUzQVJlZ2lzdGVyZWQtVXNlcnMiLAorICAgICAgIm9wdGlvbnMiOiB7CisgICAgICB9LAorICAgICAgImRlc2NyaXB0aW9uIjogIkFueSBzaWduZWQtaW4gdXNlciIsCisgICAgICAiZ3JvdXBfaWQiOiAzLAorICAgICAgIm93bmVyX2lkIjogIjZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiCisgICAgfQorICBdCistLS0tCisKKy5MaXN0IGFsbCBncm91cHMgdGhhdCBjb250YWluIHlvdSBhcyBhIG1lbWJlcgorKioqKgorZ2V0OjovYWNjb3VudHMvc2VsZi9ncm91cHMvCisqKioqCisKK1tbZ2V0LWF2YXRhcl1dCitHZXQgQXZhdGFyCit+fn5+fn5+fn5+CitbdmVyc2VdCisnR0VUIC9hY2NvdW50cy9saW5rOiNhY2NvdW50LWlkW1x7YWNjb3VudC1pZFx9XS9hdmF0YXInCisKK1JldHJpZXZlcyB0aGUgYXZhdGFyIGltYWdlIG9mIHRoZSB1c2VyLgorCitXaXRoIHRoZSBgc2l6ZWAgb3B0aW9uIChhbGlhcyBgc2ApIHlvdSBjYW4gc3BlY2lmeSB0aGUgcHJlZmVycmVkIHNpemUKK2luIHBpeGVscyAoaGVpZ2h0IGFuZCB3aWR0aCkuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvYS9hY2NvdW50cy9qb2huLmRvZUBleGFtcGxlLmNvbS9hdmF0YXI/cz0yMCBIVFRQLzEuMAorLS0tLQorCitUaGUgcmVzcG9uc2UgcmVkaXJlY3RzIHRvIHRoZSBVUkwgb2YgdGhlIGF2YXRhciBpbWFnZS4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDMwMiBGb3VuZAorICBMb2NhdGlvbjogaHR0cHM6Ly9wcm9maWxlcy9hdmF0YXIvam9obl9kb2UuanBlZz9zPTIweDIwCistLS0tCisKKworW1tpZHNdXQorSURzCistLS0KKworW1thY2NvdW50LWlkXV0KK1x7YWNjb3VudC1pZFx9Cit+fn5+fn5+fn5+fn5+fgorSWRlbnRpZmllciB0aGF0IHVuaXF1ZWx5IGlkZW50aWZpZXMgb25lIGFjY291bnQuCisKK1RoaXMgY2FuIGJlOgorCisqIGEgc3RyaW5nIG9mIHRoZSBmb3JtYXQgIkZ1bGwgTmFtZSA8ZW1haWxAZXhhbXBsZS5jb20+IgorKiBqdXN0IHRoZSBlbWFpbCBhZGRyZXNzICgiZW1haWxAZXhhbXBsZSIpCisqIGEgZnVsbCBuYW1lIGlmIGl0IGlzIHVuaXF1ZSAoIkZ1bGwgTmFtZSIpCisqIGFuIGFjY291bnQgSUQgKCIxODQxOSIpCisqIGEgdXNlciBuYW1lICgidXNlcm5hbWUiKQorKiBgc2VsZmAgZm9yIHRoZSBjYWxsaW5nIHVzZXIKKworW1tjYXBhYmlsaXR5LWlkXV0KK1x7Y2FwYWJpbGl0eS1pZFx9Cit+fn5+fn5+fn5+fn5+fn5+fgorSWRlbnRpZmllciBvZiBhIGdsb2JhbCBjYXBhYmlsaXR5LiBWYWxpZCB2YWx1ZXMgYXJlIGFsbCBmaWVsZCBuYW1lcyBvZgordGhlIGxpbms6I2NhcGFiaWxpdHktaW5mb1tDYXBhYmlsaXR5SW5mb10gZW50aXR5LgorCisKK1tbanNvbi1lbnRpdGllc11dCitKU09OIEVudGl0aWVzCistLS0tLS0tLS0tLS0tCisKK1tbYWNjb3VudC1pbmZvXV0KK0FjY291bnRJbmZvCit+fn5+fn5+fn5+fgorVGhlIGBBY2NvdW50SW5mb2AgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IGFuIGFjY291bnQuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICB8fERlc2NyaXB0aW9uCit8YF9hY2NvdW50X2lkYCB8fFRoZSBudW1lcmljIElEIG9mIHRoZSBhY2NvdW50LgorfGBuYW1lYCAgICAgICAgfG9wdGlvbmFsfFRoZSBmdWxsIG5hbWUgb2YgdGhlIHVzZXIuICsKK09ubHkgc2V0IGlmIGRldGFpbGVkIGFjY291bnQgaW5mb3JtYXRpb24gaXMgcmVxdWVzdGVkLgorfGBlbWFpbGAgICAgICAgfG9wdGlvbmFsfAorVGhlIGVtYWlsIGFkZHJlc3MgdGhlIHVzZXIgcHJlZmVycyB0byBiZSBjb250YWN0ZWQgdGhyb3VnaC4gKworT25seSBzZXQgaWYgZGV0YWlsZWQgYWNjb3VudCBpbmZvcm1hdGlvbiBpcyByZXF1ZXN0ZWQuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbY2FwYWJpbGl0eS1pbmZvXV0KK0NhcGFiaWxpdHlJbmZvCit+fn5+fn5+fn5+fn5+fgorVGhlIGBDYXBhYmlsaXR5SW5mb2AgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IHRoZSBnbG9iYWwKK2NhcGFiaWxpdGllcyBvZiBhIHVzZXIuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgICAgICB8fERlc2NyaXB0aW9uCit8YGFkbWluaXN0cmF0ZVNlcnZlcmB8bm90IHNldCBpZiBgZmFsc2VgfFdoZXRoZXIgdGhlIHVzZXIgaGFzIHRoZQorbGluazphY2Nlc3MtY29udHJvbC5odG1sI2NhcGFiaWxpdHlfYWRtaW5pc3RyYXRlU2VydmVyW0FkbWluaXN0cmF0ZQorU2VydmVyXSBjYXBhYmlsaXR5LgorfGBxdWVyeUxpbWl0YHx8VGhlIGxpbms6YWNjZXNzLWNvbnRyb2wuaHRtbCNjYXBhYmlsaXR5X3F1ZXJ5TGltaXRbUXVlcnkKK0xpbWl0XSBvZiB0aGUgdXNlciBhcyBsaW5rOiNxdWVyeS1saW1pdC1pbmZvW1F1ZXJ5TGltaXRJbmZvXS4KK3xgY3JlYXRlQWNjb3VudGAgICAgIHxub3Qgc2V0IGlmIGBmYWxzZWB8V2hldGhlciB0aGUgdXNlciBoYXMgdGhlCitsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWwjY2FwYWJpbGl0eV9jcmVhdGVBY2NvdW50W0NyZWF0ZSBBY2NvdW50XQorY2FwYWJpbGl0eS4KK3xgY3JlYXRlR3JvdXBgICAgICAgIHxub3Qgc2V0IGlmIGBmYWxzZWB8V2hldGhlciB0aGUgdXNlciBoYXMgdGhlCitsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWwjY2FwYWJpbGl0eV9jcmVhdGVHcm91cFtDcmVhdGUgR3JvdXBdCitjYXBhYmlsaXR5LgorfGBjcmVhdGVQcm9qZWN0YCAgICAgfG5vdCBzZXQgaWYgYGZhbHNlYHxXaGV0aGVyIHRoZSB1c2VyIGhhcyB0aGUKK2xpbms6YWNjZXNzLWNvbnRyb2wuaHRtbCNjYXBhYmlsaXR5X2NyZWF0ZVByb2plY3RbQ3JlYXRlIFByb2plY3RdCitjYXBhYmlsaXR5LgorfGBlbWFpbFJldmlld2Vyc2AgICAgfG5vdCBzZXQgaWYgYGZhbHNlYHxXaGV0aGVyIHRoZSB1c2VyIGhhcyB0aGUKK2xpbms6YWNjZXNzLWNvbnRyb2wuaHRtbCNjYXBhYmlsaXR5X2VtYWlsUmV2aWV3ZXJzW0VtYWlsIFJldmlld2Vyc10KK2NhcGFiaWxpdHkuCit8YGtpbGxUYXNrYCAgICAgICAgICB8bm90IHNldCBpZiBgZmFsc2VgfFdoZXRoZXIgdGhlIHVzZXIgaGFzIHRoZQorbGluazphY2Nlc3MtY29udHJvbC5odG1sI2NhcGFiaWxpdHlfa2lsbFtLaWxsIFRhc2tdIGNhcGFiaWxpdHkuCit8YHZpZXdDYWNoZXNgICAgICAgICB8bm90IHNldCBpZiBgZmFsc2VgfFdoZXRoZXIgdGhlIHVzZXIgaGFzIHRoZQorbGluazphY2Nlc3MtY29udHJvbC5odG1sI2NhcGFiaWxpdHlfdmlld0NhY2hlc1tWaWV3IENhY2hlc10gY2FwYWJpbGl0eS4KK3xgZmx1c2hDYWNoZXNgICAgICAgIHxub3Qgc2V0IGlmIGBmYWxzZWB8V2hldGhlciB0aGUgdXNlciBoYXMgdGhlCitsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWwjY2FwYWJpbGl0eV9mbHVzaENhY2hlc1tGbHVzaCBDYWNoZXNdCitjYXBhYmlsaXR5LgorfGB2aWV3Q29ubmVjdGlvbnNgICAgfG5vdCBzZXQgaWYgYGZhbHNlYHxXaGV0aGVyIHRoZSB1c2VyIGhhcyB0aGUKK2xpbms6YWNjZXNzLWNvbnRyb2wuaHRtbCNjYXBhYmlsaXR5X3ZpZXdDb25uZWN0aW9uc1tWaWV3IENvbm5lY3Rpb25zXQorY2FwYWJpbGl0eS4KK3xgdmlld1F1ZXVlYCAgICAgICAgIHxub3Qgc2V0IGlmIGBmYWxzZWB8V2hldGhlciB0aGUgdXNlciBoYXMgdGhlCitsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWwjY2FwYWJpbGl0eV92aWV3UXVldWVbVmlldyBRdWV1ZV0gY2FwYWJpbGl0eS4KK3xgcnVuR0NgICB8bm90IHNldCBpZiBgZmFsc2VgfFdoZXRoZXIgdGhlIHVzZXIgaGFzIHRoZQorbGluazphY2Nlc3MtY29udHJvbC5odG1sI2NhcGFiaWxpdHlfcnVuR0NbUnVuIEdhcmJhZ2UgQ29sbGVjdGlvbl0KK2NhcGFiaWxpdHkuCit8YHN0YXJ0UmVwbGljYXRpb25gICB8bm90IHNldCBpZiBgZmFsc2VgfFdoZXRoZXIgdGhlIHVzZXIgaGFzIHRoZQorbGluazphY2Nlc3MtY29udHJvbC5odG1sI2NhcGFiaWxpdHlfc3RhcnRSZXBsaWNhdGlvbltTdGFydCBSZXBsaWNhdGlvbl0KK2NhcGFiaWxpdHkuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbcXVlcnktbGltaXQtaW5mb11dCitRdWVyeUxpbWl0SW5mbworfn5+fn5+fn5+fn5+fn4KK1RoZSBgUXVlcnlMaW1pdEluZm9gIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCB0aGUKK2xpbms6YWNjZXNzLWNvbnRyb2wuaHRtbCNjYXBhYmlsaXR5X3F1ZXJ5TGltaXRbUXVlcnkgTGltaXRdIG9mIGEgdXNlci4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSw2Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgICAgICAgfERlc2NyaXB0aW9uCit8YG1pbmAgICAgICAgICAgICAgICB8TG93ZXIgbGltaXQuCit8YG1heGAgICAgICAgICAgICAgICB8VXBwZXIgbGltaXQuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworCitHRVJSSVQKKy0tLS0tLQorUGFydCBvZiBsaW5rOmluZGV4Lmh0bWxbR2Vycml0IENvZGUgUmV2aWV3XQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS1jaGFuZ2VzLnR4dCBiL0RvY3VtZW50YXRpb24vcmVzdC1hcGktY2hhbmdlcy50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjk2YTE3NAotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRpb24vcmVzdC1hcGktY2hhbmdlcy50eHQKQEAgLTAsMCArMSwyMTUzIEBACitHZXJyaXQgQ29kZSBSZXZpZXcgLSAvY2hhbmdlcy8gUkVTVCBBUEkKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitUaGlzIHBhZ2UgZGVzY3JpYmVzIHRoZSBjaGFuZ2UgcmVsYXRlZCBSRVNUIGVuZHBvaW50cy4KK1BsZWFzZSBhbHNvIHRha2Ugbm90ZSBvZiB0aGUgZ2VuZXJhbCBpbmZvcm1hdGlvbiBvbiB0aGUKK2xpbms6cmVzdC1hcGkuaHRtbFtSRVNUIEFQSV0uCisKK1tbY2hhbmdlLWVuZHBvaW50c11dCitDaGFuZ2UgRW5kcG9pbnRzCistLS0tLS0tLS0tLS0tLS0tCisKK1tbbGlzdC1jaGFuZ2VzXV0KK1F1ZXJ5IENoYW5nZXMKK35+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2NoYW5nZXMvJworCitRdWVyaWVzIGNoYW5nZXMgdmlzaWJsZSB0byB0aGUgY2FsbGVyLiBUaGUgcXVlcnkgc3RyaW5nIG11c3QgYmUKK3Byb3ZpZGVkIGJ5IHRoZSBgcWAgcGFyYW1ldGVyLiBUaGUgYG5gIHBhcmFtZXRlciBjYW4gYmUgdXNlZCB0byBsaW1pdAordGhlIHJldHVybmVkIHJlc3VsdHMuCisKK0FzIHJlc3VsdCBhIGxpc3Qgb2YgbGluazojY2hhbmdlLWluZm9bQ2hhbmdlSW5mb10gZW50cmllcyBpcyByZXR1cm5lZC4KK1RoZSBjaGFuZ2Ugb3V0cHV0IGlzIHNvcnRlZCBieSB0aGUgbGFzdCB1cGRhdGUgdGltZSwgbW9zdCByZWNlbnRseQordXBkYXRlZCB0byBvbGRlc3QgdXBkYXRlZC4KKworUXVlcnkgZm9yIG9wZW4gY2hhbmdlcyBvZiB3YXRjaGVkIHByb2plY3RzOgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL2NoYW5nZXMvP3E9c3RhdHVzOm9wZW4raXM6d2F0Y2hlZCZuPTIgSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICBbCisgICAgeworICAgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNjaGFuZ2UiLAorICAgICAgImlkIjogImRlbW9+bWFzdGVyfklkYWY1ZTA5OGQ3MDg5OGI3MTE5ZjZmNGFmNWE2YzEzMzQzZDY0YjU3IiwKKyAgICAgICJwcm9qZWN0IjogImRlbW8iLAorICAgICAgImJyYW5jaCI6ICJtYXN0ZXIiLAorICAgICAgImNoYW5nZV9pZCI6ICJJZGFmNWUwOThkNzA4OThiNzExOWY2ZjRhZjVhNmMxMzM0M2Q2NGI1NyIsCisgICAgICAic3ViamVjdCI6ICJPbmUgY2hhbmdlIiwKKyAgICAgICJzdGF0dXMiOiAiTkVXIiwKKyAgICAgICJjcmVhdGVkIjogIjIwMTItMDctMTcgMDc6MTg6MzAuODU0MDAwMDAwIiwKKyAgICAgICJ1cGRhdGVkIjogIjIwMTItMDctMTcgMDc6MTk6MjcuNzY2MDAwMDAwIiwKKyAgICAgICJyZXZpZXdlZCI6IHRydWUsCisgICAgICAibWVyZ2VhYmxlIjogdHJ1ZSwKKyAgICAgICJfc29ydGtleSI6ICIwMDFlNzA1NzAwMDAwNmRjIiwKKyAgICAgICJfbnVtYmVyIjogMTc1NiwKKyAgICAgICJvd25lciI6IHsKKyAgICAgICAgIm5hbWUiOiAiSm9obiBEb2UiCisgICAgICB9LAorICAgIH0sCisgICAgeworICAgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNjaGFuZ2UiLAorICAgICAgImlkIjogImRlbW9+bWFzdGVyfkkwOWM4MDQxYjU4NjdkNWIzMzE3MDMxNmUyYWJjMzRiNzliYmI4NTAxIiwKKyAgICAgICJwcm9qZWN0IjogImRlbW8iLAorICAgICAgImJyYW5jaCI6ICJtYXN0ZXIiLAorICAgICAgImNoYW5nZV9pZCI6ICJJMDljODA0MWI1ODY3ZDViMzMxNzAzMTZlMmFiYzM0Yjc5YmJiODUwMSIsCisgICAgICAic3ViamVjdCI6ICJBbm90aGVyIGNoYW5nZSIsCisgICAgICAic3RhdHVzIjogIk5FVyIsCisgICAgICAiY3JlYXRlZCI6ICIyMDEyLTA3LTE3IDA3OjE4OjMwLjg4NDAwMDAwMCIsCisgICAgICAidXBkYXRlZCI6ICIyMDEyLTA3LTE3IDA3OjE4OjMwLjg4NTAwMDAwMCIsCisgICAgICAibWVyZ2VhYmxlIjogdHJ1ZSwKKyAgICAgICJfc29ydGtleSI6ICIwMDFlNzA1NjAwMDAwNmRkIiwKKyAgICAgICJfbnVtYmVyIjogMTc1NywKKyAgICAgICJvd25lciI6IHsKKyAgICAgICAgIm5hbWUiOiAiSm9obiBEb2UiCisgICAgICB9LAorICAgICAgIl9tb3JlX2NoYW5nZXMiOiB0cnVlCisgICAgfQorICBdCistLS0tCisKK0lmIHRoZSBgbmAgcXVlcnkgcGFyYW1ldGVyIGlzIHN1cHBsaWVkIGFuZCBhZGRpdGlvbmFsIGNoYW5nZXMgZXhpc3QKK3RoYXQgbWF0Y2ggdGhlIHF1ZXJ5IGJleW9uZCB0aGUgZW5kLCB0aGUgbGFzdCBjaGFuZ2Ugb2JqZWN0IGhhcyBhCitgX21vcmVfY2hhbmdlczogdHJ1ZWAgSlNPTiBmaWVsZCBzZXQuIENhbGxlcnMgY2FuIHJlc3VtZSBhIHF1ZXJ5IHdpdGgKK3RoZSBgTmAgcXVlcnkgcGFyYW1ldGVyLCBzdXBwbHlpbmcgdGhlIGxhc3QgY2hhbmdlJ3MgYF9zb3J0a2V5YCBmaWVsZAorYXMgdGhlIHZhbHVlLiBXaGVuIGdvaW5nIGluIHRoZSByZXZlcnNlIGRpcmVjdGlvbiB3aXRoIHRoZSBgUGAgcXVlcnkKK3BhcmFtZXRlciBhIGBfbW9yZV9jaGFuZ2VzOiB0cnVlYCBpcyBwdXQgaW4gdGhlIGZpcnN0IGNoYW5nZSBvYmplY3QgaWYKK3RoZXJlIGFyZSByZXN1bHRzICpiZWZvcmUqIHRoZSBmaXJzdCBjaGFuZ2UgcmV0dXJuZWQuCisKK0NsaWVudHMgYXJlIGFsbG93ZWQgdG8gc3BlY2lmeSBtb3JlIHRoYW4gb25lIHF1ZXJ5IGJ5IHNldHRpbmcgdGhlIGBxYAorcGFyYW1ldGVyIG11bHRpcGxlIHRpbWVzLiBJbiB0aGlzIGNhc2UgdGhlIHJlc3VsdCBpcyBhbiBhcnJheSBvZgorYXJyYXlzLCBvbmUgcGVyIHF1ZXJ5IGluIHRoZSBzYW1lIG9yZGVyIHRoZSBxdWVyaWVzIHdlcmUgZ2l2ZW4gaW4uCisKKy5RdWVyeSBmb3IgdGhlIDI1IG1vc3QgcmVjZW50IG9wZW4gY2hhbmdlcyBvZiB0aGUgcHJvamVjdHMgdGhhdCB5b3Ugd2F0Y2gKKyoqKioKK2dldDo6L2NoYW5nZXMvP3E9c3RhdHVzOm9wZW4raXM6d2F0Y2hlZCZuPTI1CisqKioqCisKK1F1ZXJ5IHRoYXQgcmV0cmlldmVzIGNoYW5nZXMgZm9yIGEgdXNlcidzIGRhc2hib2FyZDoKKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9jaGFuZ2VzLz9xPWlzOm9wZW4rb3duZXI6c2VsZiZxPWlzOm9wZW4rcmV2aWV3ZXI6c2VsZistb3duZXI6c2VsZiZxPWlzOmNsb3NlZCtvd25lcjpzZWxmK2xpbWl0OjUmbz1MQUJFTFMgSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICBbCisgICAgWworICAgICAgeworICAgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NoYW5nZSIsCisgICAgICAgICJpZCI6ICJkZW1vfm1hc3Rlcn5JZGFmNWUwOThkNzA4OThiNzExOWY2ZjRhZjVhNmMxMzM0M2Q2NGI1NyIsCisgICAgICAgICJwcm9qZWN0IjogImRlbW8iLAorICAgICAgICAiYnJhbmNoIjogIm1hc3RlciIsCisgICAgICAgICJjaGFuZ2VfaWQiOiAiSWRhZjVlMDk4ZDcwODk4YjcxMTlmNmY0YWY1YTZjMTMzNDNkNjRiNTciLAorICAgICAgICAic3ViamVjdCI6ICJPbmUgY2hhbmdlIiwKKyAgICAgICAgInN0YXR1cyI6ICJORVciLAorICAgICAgICAiY3JlYXRlZCI6ICIyMDEyLTA3LTE3IDA3OjE4OjMwLjg1NDAwMDAwMCIsCisgICAgICAgICJ1cGRhdGVkIjogIjIwMTItMDctMTcgMDc6MTk6MjcuNzY2MDAwMDAwIiwKKyAgICAgICAgInJldmlld2VkIjogdHJ1ZSwKKyAgICAgICAgIm1lcmdlYWJsZSI6IHRydWUsCisgICAgICAgICJfc29ydGtleSI6ICIwMDFlNzA1NzAwMDAwNmRjIiwKKyAgICAgICAgIl9udW1iZXIiOiAxNzU2LAorICAgICAgICAib3duZXIiOiB7CisgICAgICAgICAgIm5hbWUiOiAiSm9obiBEb2UiCisgICAgICAgIH0sCisgICAgICAgICJsYWJlbHMiOiB7CisgICAgICAgICAgIlZlcmlmaWVkIjoge30sCisgICAgICAgICAgIkNvZGUtUmV2aWV3Ijoge30KKyAgICAgICAgfQorICAgICAgfQorICAgIF0sCisgICAgW10sCisgICAgW10KKyAgXQorLS0tLQorCisuUXVlcnkgdGhlIGNoYW5nZXMgZm9yIHlvdXIgdXNlciBkYXNoYm9hcmQKKyoqKioKK2dldDo6L2NoYW5nZXMvP3E9aXM6b3Blbitvd25lcjpzZWxmJnE9aXM6b3BlbityZXZpZXdlcjpzZWxmKy1vd25lcjpzZWxmJnE9aXM6Y2xvc2VkK293bmVyOnNlbGYrbGltaXQ6NSZvPUxBQkVMUworKioqKgorCitBZGRpdGlvbmFsIGZpZWxkcyBjYW4gYmUgb2J0YWluZWQgYnkgYWRkaW5nIGBvYCBwYXJhbWV0ZXJzLCBlYWNoCitvcHRpb24gcmVxdWlyZXMgbW9yZSBkYXRhYmFzZSBsb29rdXBzIGFuZCBzbG93cyBkb3duIHRoZSBxdWVyeQorcmVzcG9uc2UgdGltZSB0byB0aGUgY2xpZW50IHNvIHRoZXkgYXJlIGdlbmVyYWxseSBkaXNhYmxlZCBieQorZGVmYXVsdC4gT3B0aW9uYWwgZmllbGRzIGFyZToKKworW1tsYWJlbHNdXQorLS0KKyogYExBQkVMU2A6IGEgc3VtbWFyeSBvZiBlYWNoIGxhYmVsIHJlcXVpcmVkIGZvciBzdWJtaXQsIGFuZAorICBhcHByb3ZlcnMgdGhhdCBoYXZlIGdyYW50ZWQgKG9yIHJlamVjdGVkKSB3aXRoIHRoYXQgbGFiZWwuCistLQorCitbW2RldGFpbGVkLWxhYmVsc11dCistLQorKiBgREVUQUlMRURfTEFCRUxTYDogZGV0YWlsZWQgbGFiZWwgaW5mb3JtYXRpb24sIGluY2x1ZGluZyBudW1lcmljCisgIHZhbHVlcyBvZiBhbGwgZXhpc3RpbmcgYXBwcm92YWxzLCByZWNvZ25pemVkIGxhYmVsIHZhbHVlcywgdmFsdWVzCisgIHBlcm1pdHRlZCB0byBiZSBzZXQgYnkgdGhlIGN1cnJlbnQgdXNlciwgYW5kIHJldmlld2VycyB0aGF0IG1heSBiZQorICByZW1vdmVkIGJ5IHRoZSBjdXJyZW50IHVzZXIuCistLQorCitbW2N1cnJlbnQtcmV2aXNpb25dXQorLS0KKyogYENVUlJFTlRfUkVWSVNJT05gOiBkZXNjcmliZSB0aGUgY3VycmVudCByZXZpc2lvbiAocGF0Y2ggc2V0KQorICBvZiB0aGUgY2hhbmdlLCBpbmNsdWRpbmcgdGhlIGNvbW1pdCBTSEEtMSBhbmQgVVJMcyB0byBmZXRjaCBmcm9tLgorLS0KKworW1thbGwtcmV2aXNpb25zXV0KKy0tCisqIGBBTExfUkVWSVNJT05TYDogZGVzY3JpYmUgYWxsIHJldmlzaW9ucywgbm90IGp1c3QgY3VycmVudC4KKy0tCisKK1tbY3VycmVudC1jb21taXRdXQorLS0KKyogYENVUlJFTlRfQ09NTUlUYDogcGFyc2UgYW5kIG91dHB1dCBhbGwgaGVhZGVyIGZpZWxkcyBmcm9tIHRoZQorICBjb21taXQgb2JqZWN0LCBpbmNsdWRpbmcgbWVzc2FnZS4gT25seSB2YWxpZCB3aGVuIHRoZSBjdXJyZW50CisgIHJldmlzaW9uIG9yIGFsbCByZXZpc2lvbnMgYXJlIHNlbGVjdGVkLgorLS0KKworW1thbGwtY29tbWl0c11dCistLQorKiBgQUxMX0NPTU1JVFNgOiBwYXJzZSBhbmQgb3V0cHV0IGFsbCBoZWFkZXIgZmllbGRzIGZyb20gdGhlCisgIG91dHB1dCByZXZpc2lvbnMuIElmIG9ubHkgYENVUlJFTlRfUkVWSVNJT05gIHdhcyByZXF1ZXN0ZWQKKyAgdGhlbiBvbmx5IHRoZSBjdXJyZW50IHJldmlzaW9uJ3MgY29tbWl0IGRhdGEgd2lsbCBiZSBvdXRwdXQuCistLQorCitbW2N1cnJlbnQtZmlsZXNdXQorLS0KKyogYENVUlJFTlRfRklMRVNgOiBsaXN0IGZpbGVzIG1vZGlmaWVkIGJ5IHRoZSBjb21taXQsIGluY2x1ZGluZworICBiYXNpYyBsaW5lIGNvdW50cyBpbnNlcnRlZC9kZWxldGVkIHBlciBmaWxlLiBPbmx5IHZhbGlkIHdoZW4KKyAgdGhlIGN1cnJlbnQgcmV2aXNpb24gb3IgYWxsIHJldmlzaW9ucyBhcmUgc2VsZWN0ZWQuCistLQorCitbW2FsbC1maWxlc11dCistLQorKiBgQUxMX0ZJTEVTYDogbGlzdCBmaWxlcyBtb2RpZmllZCBieSB0aGUgY29tbWl0LCBpbmNsdWRpbmcKKyAgYmFzaWMgbGluZSBjb3VudHMgaW5zZXJ0ZWQvZGVsZXRlZCBwZXIgZmlsZS4gSWYgb25seSB0aGUKKyAgYENVUlJFTlRfUkVWSVNJT05gIHdhcyByZXF1ZXN0ZWQgdGhlIG9ubHkgdGhhdCBjb21taXQncworICBtb2RpZmllZCBmaWxlcyB3aWxsIGJlIG91dHB1dC4KKy0tCisKK1tbZGV0YWlsZWQtYWNjb3VudHNdXQorLS0KKyogYERFVEFJTEVEX0FDQ09VTlRTYDogaW5jbHVkZSBgX2FjY291bnRfaWRgIGFuZCBgZW1haWxgIGZpZWxkcyB3aGVuCisgIHJlZmVyZW5jaW5nIGFjY291bnRzLgorLS0KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9jaGFuZ2VzLz9xPTk3Jm89Q1VSUkVOVF9SRVZJU0lPTiZvPUNVUlJFTlRfQ09NTUlUJm89Q1VSUkVOVF9GSUxFUyBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIFsKKyAgICB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NoYW5nZSIsCisgICAgICAiaWQiOiAiZGVtb35tYXN0ZXJ+STdlYTQ2ZDJlMmVlNWM2NGMwZDgwNzY3Nzg1OWNmYjdkOTBiODk2NmEiLAorICAgICAgInByb2plY3QiOiAiZ2Vycml0IiwKKyAgICAgICJicmFuY2giOiAibWFzdGVyIiwKKyAgICAgICJjaGFuZ2VfaWQiOiAiSTdlYTQ2ZDJlMmVlNWM2NGMwZDgwNzY3Nzg1OWNmYjdkOTBiODk2NmEiLAorICAgICAgInN1YmplY3QiOiAiVXNlIGFuIEV2ZW50QnVzIHRvIG1hbmFnZSBzdGFyIGljb25zIiwKKyAgICAgICJzdGF0dXMiOiAiTkVXIiwKKyAgICAgICJjcmVhdGVkIjogIjIwMTItMDQtMjUgMDA6NTI6MjUuNTgwMDAwMDAwIiwKKyAgICAgICJ1cGRhdGVkIjogIjIwMTItMDQtMjUgMDA6NTI6MjUuNTg2MDAwMDAwIiwKKyAgICAgICJtZXJnZWFibGUiOiB0cnVlLAorICAgICAgIl9zb3J0a2V5IjogIjAwMWM5YmY0MDAwMDAwNjEiLAorICAgICAgIl9udW1iZXIiOiA5NywKKyAgICAgICJvd25lciI6IHsKKyAgICAgICAgIm5hbWUiOiAiU2hhd24gUGVhcmNlIgorICAgICAgfSwKKyAgICAgICJjdXJyZW50X3JldmlzaW9uIjogIjE4NGViZTUzODA1ZTEwMjYwNWQxMWY2YjE0MzQ4NmQxNWMyM2EwOWMiLAorICAgICAgInJldmlzaW9ucyI6IHsKKyAgICAgICAgIjE4NGViZTUzODA1ZTEwMjYwNWQxMWY2YjE0MzQ4NmQxNWMyM2EwOWMiOiB7CisgICAgICAgICAgIl9udW1iZXIiOiAxLAorICAgICAgICAgICJmZXRjaCI6IHsKKyAgICAgICAgICAgICJnaXQiOiB7CisgICAgICAgICAgICAgICJ1cmwiOiAiZ2l0Oi8vbG9jYWxob3N0L2dlcnJpdCIsCisgICAgICAgICAgICAgICJyZWYiOiAicmVmcy9jaGFuZ2VzLzk3Lzk3LzEiCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgImh0dHAiOiB7CisgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo4MDgwL2dlcnJpdCIsCisgICAgICAgICAgICAgICJyZWYiOiAicmVmcy9jaGFuZ2VzLzk3Lzk3LzEiCisgICAgICAgICAgICB9CisgICAgICAgICAgfSwKKyAgICAgICAgICAiY29tbWl0IjogeworICAgICAgICAgICAgInBhcmVudHMiOiBbCisgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAiY29tbWl0IjogIjFlZWUyYzlkOGYzNTI0ODM3ODFlNzcyZjM1ZGM1ODZhNjlmZjU2NDYiLAorICAgICAgICAgICAgICAgICJzdWJqZWN0IjogIk1pZ3JhdGUgY29udHJpYnV0b3IgYWdyZWVtZW50cyB0byBBbGwtUHJvamVjdHMuIgorICAgICAgICAgICAgICB9CisgICAgICAgICAgICBdLAorICAgICAgICAgICAgImF1dGhvciI6IHsKKyAgICAgICAgICAgICAgIm5hbWUiOiAiU2hhd24gTy4gUGVhcmNlIiwKKyAgICAgICAgICAgICAgImVtYWlsIjogInNvcEBnb29nbGUuY29tIiwKKyAgICAgICAgICAgICAgImRhdGUiOiAiMjAxMi0wNC0yNCAxODowODowOC4wMDAwMDAwMDAiLAorICAgICAgICAgICAgICAidHoiOiAtNDIwCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgImNvbW1pdHRlciI6IHsKKyAgICAgICAgICAgICAgIm5hbWUiOiAiU2hhd24gTy4gUGVhcmNlIiwKKyAgICAgICAgICAgICAgImVtYWlsIjogInNvcEBnb29nbGUuY29tIiwKKyAgICAgICAgICAgICAgImRhdGUiOiAiMjAxMi0wNC0yNCAxODowODowOC4wMDAwMDAwMDAiLAorICAgICAgICAgICAgICAidHoiOiAtNDIwCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgInN1YmplY3QiOiAiVXNlIGFuIEV2ZW50QnVzIHRvIG1hbmFnZSBzdGFyIGljb25zIiwKKyAgICAgICAgICAgICJtZXNzYWdlIjogIlVzZSBhbiBFdmVudEJ1cyB0byBtYW5hZ2Ugc3RhciBpY29uc1xuXG5JbWFnZSB3aWRnZXRzIHRoYXQgbmVlZCB0byAuLi4iCisgICAgICAgICAgfSwKKyAgICAgICAgICAiZmlsZXMiOiB7CisgICAgICAgICAgICAiZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlQ2FjaGUuamF2YSI6IHsKKyAgICAgICAgICAgICAgImxpbmVzX2RlbGV0ZWQiOiA4CisgICAgICAgICAgICB9LAorICAgICAgICAgICAgImdlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZURldGFpbENhY2hlLmphdmEiOiB7CisgICAgICAgICAgICAgICJsaW5lc19pbnNlcnRlZCI6IDEKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICAiZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlU2NyZWVuLmphdmEiOiB7CisgICAgICAgICAgICAgICJsaW5lc19pbnNlcnRlZCI6IDExLAorICAgICAgICAgICAgICAibGluZXNfZGVsZXRlZCI6IDE5CisgICAgICAgICAgICB9LAorICAgICAgICAgICAgImdlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZVRhYmxlLmphdmEiOiB7CisgICAgICAgICAgICAgICJsaW5lc19pbnNlcnRlZCI6IDIzLAorICAgICAgICAgICAgICAibGluZXNfZGVsZXRlZCI6IDIwCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgImdlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1N0YXJDYWNoZS5qYXZhIjogeworICAgICAgICAgICAgICAic3RhdHVzIjogIkQiLAorICAgICAgICAgICAgICAibGluZXNfZGVsZXRlZCI6IDEzOQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICJnZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9TdGFycmVkQ2hhbmdlcy5qYXZhIjogeworICAgICAgICAgICAgICAic3RhdHVzIjogIkEiLAorICAgICAgICAgICAgICAibGluZXNfaW5zZXJ0ZWQiOiAyMDQKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICAiZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1NjcmVlbi5qYXZhIjogeworICAgICAgICAgICAgICAibGluZXNfZGVsZXRlZCI6IDkKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgIF0KKy0tLS0KKworW1tnZXQtY2hhbmdlXV0KK0dldCBDaGFuZ2UKK35+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dJworCitSZXRyaWV2ZXMgYSBjaGFuZ2UuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwIEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3BvbnNlIGEgbGluazojY2hhbmdlLWluZm9bQ2hhbmdlSW5mb10gZW50aXR5IGlzIHJldHVybmVkIHRoYXQKK2Rlc2NyaWJlcyB0aGUgY2hhbmdlLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NoYW5nZSIsCisgICAgImlkIjogIm15UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiLAorICAgICJwcm9qZWN0IjogIm15UHJvamVjdCIsCisgICAgImJyYW5jaCI6ICJtYXN0ZXIiLAorICAgICJjaGFuZ2VfaWQiOiAiSTg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiLAorICAgICJzdWJqZWN0IjogIkltcGxlbWVudGluZyBGZWF0dXJlIFgiLAorICAgICJzdGF0dXMiOiAiTkVXIiwKKyAgICAiY3JlYXRlZCI6ICIyMDEzLTAyLTAxIDA5OjU5OjMyLjEyNjAwMDAwMCIsCisgICAgInVwZGF0ZWQiOiAiMjAxMy0wMi0yMSAxMToxNjozNi43NzUwMDAwMDAiLAorICAgICJyZXZpZXdlZCI6IHRydWUsCisgICAgIm1lcmdlYWJsZSI6IHRydWUsCisgICAgIl9zb3J0a2V5IjogIjAwMjM0MTI0MDAwMDBmN2QiLAorICAgICJfbnVtYmVyIjogMzk2NSwKKyAgICAib3duZXIiOiB7CisgICAgICAibmFtZSI6ICJKb2huIERvZSIKKyAgICB9CisgIH0KKy0tLS0KKworW1tnZXQtY2hhbmdlLWRldGFpbF1dCitHZXQgQ2hhbmdlIERldGFpbAorfn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL2RldGFpbCcKKworUmV0cmlldmVzIGEgY2hhbmdlIHdpdGggbGluazojbGFiZWxzW2xhYmVsc10sIGxpbms6I2RldGFpbGVkLWxhYmVsc1sKK2RldGFpbGVkIGxhYmVsc10gYW5kIGxpbms6I2RldGFpbGVkLWFjY291bnRzW2RldGFpbGVkIGFjY291bnRzXS4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvZGV0YWlsIEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3BvbnNlIGEgbGluazojY2hhbmdlLWluZm9bQ2hhbmdlSW5mb10gZW50aXR5IGlzIHJldHVybmVkIHRoYXQKK2Rlc2NyaWJlcyB0aGUgY2hhbmdlLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NoYW5nZSIsCisgICAgImlkIjogIm15UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiLAorICAgICJwcm9qZWN0IjogIm15UHJvamVjdCIsCisgICAgImJyYW5jaCI6ICJtYXN0ZXIiLAorICAgICJjaGFuZ2VfaWQiOiAiSTg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiLAorICAgICJzdWJqZWN0IjogIkltcGxlbWVudGluZyBGZWF0dXJlIFgiLAorICAgICJzdGF0dXMiOiAiTkVXIiwKKyAgICAiY3JlYXRlZCI6ICIyMDEzLTAyLTAxIDA5OjU5OjMyLjEyNjAwMDAwMCIsCisgICAgInVwZGF0ZWQiOiAiMjAxMy0wMi0yMSAxMToxNjozNi43NzUwMDAwMDAiLAorICAgICJyZXZpZXdlZCI6IHRydWUsCisgICAgIm1lcmdlYWJsZSI6IHRydWUsCisgICAgIl9zb3J0a2V5IjogIjAwMjM0MTI0MDAwMDBmN2QiLAorICAgICJfbnVtYmVyIjogMzk2NSwKKyAgICAib3duZXIiOiB7CisgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk2LAorICAgICAgIm5hbWUiOiAiSm9obiBEb2UiLAorICAgICAgImVtYWlsIjogImpvaG4uZG9lQGV4YW1wbGUuY29tIgorICAgIH0sCisgICAgImxhYmVscyI6IHsKKyAgICAgICJWZXJpZmllZCI6IHsKKyAgICAgICAgImFsbCI6IFsKKyAgICAgICAgICB7CisgICAgICAgICAgICAidmFsdWUiOiAwLAorICAgICAgICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NiwKKyAgICAgICAgICAgICJuYW1lIjogIkpvaG4gRG9lIiwKKyAgICAgICAgICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgICAgICAgICB9LAorICAgICAgICAgIHsKKyAgICAgICAgICAgICJ2YWx1ZSI6IDAsCisgICAgICAgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk3LAorICAgICAgICAgICAgIm5hbWUiOiAiSmFuZSBSb2UiLAorICAgICAgICAgICAgImVtYWlsIjogImphbmUucm9lQGV4YW1wbGUuY29tIgorICAgICAgICAgIH0KKyAgICAgICAgXSwKKyAgICAgICAgInZhbHVlcyI6IHsKKyAgICAgICAgICAiLTEiOiAiRmFpbHMiLAorICAgICAgICAgICIgMCI6ICJObyBzY29yZSIsCisgICAgICAgICAgIisxIjogIlZlcmlmaWVkIgorICAgICAgICB9CisgICAgICB9LAorICAgICAgIkNvZGUtUmV2aWV3IjogeworICAgICAgICAicmVjb21tZW5kZWQiOiB7CisgICAgICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NywKKyAgICAgICAgICAibmFtZSI6ICJKYW5lIFJvZSIsCisgICAgICAgICAgImVtYWlsIjogImphbmUucm9lQGV4YW1wbGUuY29tIgorICAgICAgICB9LAorICAgICAgICAiZGlzbGlrZWQiOiB7CisgICAgICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NiwKKyAgICAgICAgICAibmFtZSI6ICJKb2huIERvZSIsCisgICAgICAgICAgImVtYWlsIjogImpvaG4uZG9lQGV4YW1wbGUuY29tIgorICAgICAgICB9LAorICAgICAgICAiYWxsIjogWworICAgICAgICAgIHsKKyAgICAgICAgICAgICJ2YWx1ZSI6IC0xLAorICAgICAgICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NiwKKyAgICAgICAgICAgICJuYW1lIjogIkpvaG4gRG9lIiwKKyAgICAgICAgICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgICAgICAgICB9LAorICAgICAgICAgIHsKKyAgICAgICAgICAgICJ2YWx1ZSI6IDEsCisgICAgICAgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk3LAorICAgICAgICAgICAgIm5hbWUiOiAiSmFuZSBSb2UiLAorICAgICAgICAgICAgImVtYWlsIjogImphbmUucm9lQGV4YW1wbGUuY29tIgorICAgICAgICAgIH0KKyAgICAgICAgXQorICAgICAgICAidmFsdWVzIjogeworICAgICAgICAgICItMiI6ICJEbyBub3Qgc3VibWl0IiwKKyAgICAgICAgICAiLTEiOiAiSSB3b3VsZCBwcmVmZXIgdGhhdCB5b3UgZGlkblx1MDAyN3Qgc3VibWl0IHRoaXMiLAorICAgICAgICAgICIgMCI6ICJObyBzY29yZSIsCisgICAgICAgICAgIisxIjogIkxvb2tzIGdvb2QgdG8gbWUsIGJ1dCBzb21lb25lIGVsc2UgbXVzdCBhcHByb3ZlIiwKKyAgICAgICAgICAiKzIiOiAiTG9va3MgZ29vZCB0byBtZSwgYXBwcm92ZWQiCisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9LAorICAgICJwZXJtaXR0ZWRfbGFiZWxzIjogeworICAgICAgIlZlcmlmaWVkIjogWworICAgICAgICAiLTEiLAorICAgICAgICAiIDAiLAorICAgICAgICAiKzEiCisgICAgICBdLAorICAgICAgIkNvZGUtUmV2aWV3IjogWworICAgICAgICAiLTIiLAorICAgICAgICAiLTEiLAorICAgICAgICAiIDAiLAorICAgICAgICAiKzEiLAorICAgICAgICAiKzIiCisgICAgICBdCisgICAgfSwKKyAgICAicmVtb3ZhYmxlX3Jldmlld2VycyI6IFsKKyAgICAgIHsKKyAgICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NiwKKyAgICAgICAgIm5hbWUiOiAiSm9obiBEb2UiLAorICAgICAgICAiZW1haWwiOiAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgICAgICB9LAorICAgICAgeworICAgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk3LAorICAgICAgICAibmFtZSI6ICJKYW5lIFJvZSIsCisgICAgICAgICJlbWFpbCI6ICJqYW5lLnJvZUBleGFtcGxlLmNvbSIKKyAgICAgIH0KKyAgICBdCisgIH0KKy0tLS0KKworW1tnZXQtdG9waWNdXQorR2V0IFRvcGljCit+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3RvcGljJworCitSZXRyaWV2ZXMgdGhlIHRvcGljIG9mIGEgY2hhbmdlLgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL2NoYW5nZXMvbXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MC90b3BpYyBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgICJEb2N1bWVudGF0aW9uIgorLS0tLQorCitJZiB0aGUgY2hhbmdlIGRvZXMgbm90IGhhdmUgYSB0b3BpYyBhbiBlbXB0eSBzdHJpbmcgaXMgcmV0dXJuZWQuCisKK1tbc2V0LXRvcGljXV0KK1NldCBUb3BpYworfn5+fn5+fn5+CitbdmVyc2VdCisnUFVUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS90b3BpYycKKworU2V0cyB0aGUgdG9waWMgb2YgYSBjaGFuZ2UuCisKK1RoZSBuZXcgdG9waWMgbXVzdCBiZSBwcm92aWRlZCBpbiB0aGUgcmVxdWVzdCBib2R5IGluc2lkZSBhCitsaW5rOiN0b3BpYy1pbnB1dFtUb3BpY0lucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBVVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwL3RvcGljIEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJ0b3BpYyI6ICJEb2N1bWVudGF0aW9uIgorICB9CistLS0tCisKK0FzIHJlc3BvbnNlIHRoZSBuZXcgdG9waWMgaXMgcmV0dXJuZWQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgIkRvY3VtZW50YXRpb24iCistLS0tCisKK0lmIHRoZSB0b3BpYyB3YXMgZGVsZXRlZCB0aGUgcmVzcG9uc2UgaXMgImAyMDQgTm8gQ29udGVudGAiLgorCitbW2RlbGV0ZS10b3BpY11dCitEZWxldGUgVG9waWMKK35+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0RFTEVURSAvY2hhbmdlcy9saW5rOiNjaGFuZ2UtaWRbXHtjaGFuZ2UtaWRcfV0vdG9waWMnCisKK0RlbGV0ZXMgdGhlIHRvcGljIG9mIGEgY2hhbmdlLgorCitUaGUgcmVxdWVzdCBib2R5IGRvZXMgbm90IG5lZWQgdG8gaW5jbHVkZSBhIGxpbms6I3RvcGljLWlucHV0WworVG9waWNJbnB1dF0gZW50aXR5IGlmIG5vIHJldmlldyBjb21tZW50IGlzIGFkZGVkLgorCitQbGVhc2Ugbm90ZSB0aGF0IHNvbWUgcHJveGllcyBwcm9oaWJpdCByZXF1ZXN0IGJvZGllcyBmb3IgREVMRVRFCityZXF1ZXN0cy4gSW4gdGhpcyBjYXNlLCBpZiB5b3Ugd2FudCB0byBzcGVjaWZ5IGEgY29tbWl0IG1lc3NhZ2UsIHVzZQorbGluazojc2V0LXRvcGljW1BVVF0gdG8gZGVsZXRlIHRoZSB0b3BpYy4KKworLlJlcXVlc3QKKy0tLS0KKyAgREVMRVRFIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvdG9waWMgSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwNCBObyBDb250ZW50CistLS0tCisKK1tbYWJhbmRvbi1jaGFuZ2VdXQorQWJhbmRvbiBDaGFuZ2UKK35+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnUE9TVCAvY2hhbmdlcy9saW5rOiNjaGFuZ2UtaWRbXHtjaGFuZ2UtaWRcfV0vYWJhbmRvbicKKworQWJhbmRvbnMgYSBjaGFuZ2UuCisKK1RoZSByZXF1ZXN0IGJvZHkgZG9lcyBub3QgbmVlZCB0byBpbmNsdWRlIGEgbGluazojYWJhbmRvbi1pbnB1dFsKK0FiYW5kb25JbnB1dF0gZW50aXR5IGlmIG5vIHJldmlldyBjb21tZW50IGlzIGFkZGVkLgorCisuUmVxdWVzdAorLS0tLQorICBQT1NUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvYWJhbmRvbiBIVFRQLzEuMAorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I2NoYW5nZS1pbmZvW0NoYW5nZUluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIGFiYW5kb25lZCBjaGFuZ2UuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjY2hhbmdlIiwKKyAgICAiaWQiOiAibXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MCIsCisgICAgInByb2plY3QiOiAibXlQcm9qZWN0IiwKKyAgICAiYnJhbmNoIjogIm1hc3RlciIsCisgICAgImNoYW5nZV9pZCI6ICJJODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MCIsCisgICAgInN1YmplY3QiOiAiSW1wbGVtZW50aW5nIEZlYXR1cmUgWCIsCisgICAgInN0YXR1cyI6ICJBQkFORE9ORUQiLAorICAgICJjcmVhdGVkIjogIjIwMTMtMDItMDEgMDk6NTk6MzIuMTI2MDAwMDAwIiwKKyAgICAidXBkYXRlZCI6ICIyMDEzLTAyLTIxIDExOjE2OjM2Ljc3NTAwMDAwMCIsCisgICAgInJldmlld2VkIjogdHJ1ZSwKKyAgICAibWVyZ2VhYmxlIjogdHJ1ZSwKKyAgICAiX3NvcnRrZXkiOiAiMDAyMzQxMjQwMDAwMGY3ZCIsCisgICAgIl9udW1iZXIiOiAzOTY1LAorICAgICJvd25lciI6IHsKKyAgICAgICJuYW1lIjogIkpvaG4gRG9lIgorICAgIH0KKyAgfQorLS0tLQorCitJZiB0aGUgY2hhbmdlIGNhbm5vdCBiZSBhYmFuZG9uZWQgYmVjYXVzZSB0aGUgY2hhbmdlIHN0YXRlIGRvZXNuJ3QKK2FsbG93IGFiYW5kb25pbmcgb2YgdGhlIGNoYW5nZSwgdGhlIHJlc3BvbnNlIGlzICJgNDA5IENvbmZsaWN0YCIgYW5kCit0aGUgZXJyb3IgbWVzc2FnZSBpcyBjb250YWluZWQgaW4gdGhlIHJlc3BvbnNlIGJvZHkuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSA0MDkgQ29uZmxpY3QKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IHRleHQvcGxhaW47Y2hhcnNldD1VVEYtOAorCisgIGNoYW5nZSBpcyBtZXJnZWQKKy0tLS0KKworW1tyZXN0b3JlLWNoYW5nZV1dCitSZXN0b3JlIENoYW5nZQorfn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQT1NUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXN0b3JlJworCitSZXN0b3JlcyBhIGNoYW5nZS4KKworVGhlIHJlcXVlc3QgYm9keSBkb2VzIG5vdCBuZWVkIHRvIGluY2x1ZGUgYSBsaW5rOiNyZXN0b3JlLWlucHV0WworUmVzdG9yZUlucHV0XSBlbnRpdHkgaWYgbm8gcmV2aWV3IGNvbW1lbnQgaXMgYWRkZWQuCisKKy5SZXF1ZXN0CistLS0tCisgIFBPU1QgL2NoYW5nZXMvbXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MC9yZXN0b3JlIEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3BvbnNlIGEgbGluazojY2hhbmdlLWluZm9bQ2hhbmdlSW5mb10gZW50aXR5IGlzIHJldHVybmVkIHRoYXQKK2Rlc2NyaWJlcyB0aGUgcmVzdG9yZWQgY2hhbmdlLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NoYW5nZSIsCisgICAgImlkIjogIm15UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiLAorICAgICJwcm9qZWN0IjogIm15UHJvamVjdCIsCisgICAgImJyYW5jaCI6ICJtYXN0ZXIiLAorICAgICJjaGFuZ2VfaWQiOiAiSTg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiLAorICAgICJzdWJqZWN0IjogIkltcGxlbWVudGluZyBGZWF0dXJlIFgiLAorICAgICJzdGF0dXMiOiAiTkVXIiwKKyAgICAiY3JlYXRlZCI6ICIyMDEzLTAyLTAxIDA5OjU5OjMyLjEyNjAwMDAwMCIsCisgICAgInVwZGF0ZWQiOiAiMjAxMy0wMi0yMSAxMToxNjozNi43NzUwMDAwMDAiLAorICAgICJyZXZpZXdlZCI6IHRydWUsCisgICAgIm1lcmdlYWJsZSI6IHRydWUsCisgICAgIl9zb3J0a2V5IjogIjAwMjM0MTI0MDAwMDBmN2QiLAorICAgICJfbnVtYmVyIjogMzk2NSwKKyAgICAib3duZXIiOiB7CisgICAgICAibmFtZSI6ICJKb2huIERvZSIKKyAgICB9CisgIH0KKy0tLS0KKworSWYgdGhlIGNoYW5nZSBjYW5ub3QgYmUgcmVzdG9yZWQgYmVjYXVzZSB0aGUgY2hhbmdlIHN0YXRlIGRvZXNuJ3QKK2FsbG93IHJlc3RvcmluZyB0aGUgY2hhbmdlLCB0aGUgcmVzcG9uc2UgaXMgImA0MDkgQ29uZmxpY3RgIiBhbmQKK3RoZSBlcnJvciBtZXNzYWdlIGlzIGNvbnRhaW5lZCBpbiB0aGUgcmVzcG9uc2UgYm9keS4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDQwOSBDb25mbGljdAorICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjtjaGFyc2V0PVVURi04CisKKyAgY2hhbmdlIGlzIG5ldworLS0tLQorCitbW3JldmVydC1jaGFuZ2VdXQorUmV2ZXJ0IENoYW5nZQorfn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BPU1QgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3JldmVydCcKKworUmV2ZXJ0cyBhIGNoYW5nZS4KKworVGhlIHJlcXVlc3QgYm9keSBkb2VzIG5vdCBuZWVkIHRvIGluY2x1ZGUgYSBsaW5rOiNyZXZlcnQtaW5wdXRbCitSZXZlcnRJbnB1dF0gZW50aXR5IGlmIG5vIHJldmlldyBjb21tZW50IGlzIGFkZGVkLgorCisuUmVxdWVzdAorLS0tLQorICBQT1NUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvcmV2ZXJ0IEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3BvbnNlIGEgbGluazojY2hhbmdlLWluZm9bQ2hhbmdlSW5mb10gZW50aXR5IGlzIHJldHVybmVkIHRoYXQKK2Rlc2NyaWJlcyB0aGUgcmV2ZXJ0aW5nIGNoYW5nZS4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICB7CisgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNjaGFuZ2UiLAorICAgICJpZCI6ICJteVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwIiwKKyAgICAicHJvamVjdCI6ICJteVByb2plY3QiLAorICAgICJicmFuY2giOiAibWFzdGVyIiwKKyAgICAiY2hhbmdlX2lkIjogIkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwIiwKKyAgICAic3ViamVjdCI6ICJSZXZlcnQgXCJJbXBsZW1lbnRpbmcgRmVhdHVyZSBYXCIiLAorICAgICJzdGF0dXMiOiAiTkVXIiwKKyAgICAiY3JlYXRlZCI6ICIyMDEzLTAyLTAxIDA5OjU5OjMyLjEyNjAwMDAwMCIsCisgICAgInVwZGF0ZWQiOiAiMjAxMy0wMi0yMSAxMToxNjozNi43NzUwMDAwMDAiLAorICAgICJyZXZpZXdlZCI6IHRydWUsCisgICAgIm1lcmdlYWJsZSI6IHRydWUsCisgICAgIl9zb3J0a2V5IjogIjAwMjM0MTI0MDAwMDBmN2QiLAorICAgICJfbnVtYmVyIjogMzk2NSwKKyAgICAib3duZXIiOiB7CisgICAgICAibmFtZSI6ICJKb2huIERvZSIKKyAgICB9CisgIH0KKy0tLS0KKworSWYgdGhlIGNoYW5nZSBjYW5ub3QgYmUgcmV2ZXJ0ZWQgYmVjYXVzZSB0aGUgY2hhbmdlIHN0YXRlIGRvZXNuJ3QKK2FsbG93IHJldmVydGluZyB0aGUgY2hhbmdlLCB0aGUgcmVzcG9uc2UgaXMgImA0MDkgQ29uZmxpY3RgIiBhbmQKK3RoZSBlcnJvciBtZXNzYWdlIGlzIGNvbnRhaW5lZCBpbiB0aGUgcmVzcG9uc2UgYm9keS4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDQwOSBDb25mbGljdAorICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjtjaGFyc2V0PVVURi04CisKKyAgY2hhbmdlIGlzIG5ldworLS0tLQorCitbW3N1Ym1pdC1jaGFuZ2VdXQorU3VibWl0IENoYW5nZQorfn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BPU1QgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3N1Ym1pdCcKKworU3VibWl0cyBhIGNoYW5nZS4KKworVGhlIHJlcXVlc3QgYm9keSBvbmx5IG5lZWRzIHRvIGluY2x1ZGUgYSBsaW5rOiNzdWJtaXQtaW5wdXRbCitTdWJtaXRJbnB1dF0gZW50aXR5IGlmIHRoZSByZXF1ZXN0IHNob3VsZCB3YWl0IGZvciB0aGUgbWVyZ2UgdG8KK2NvbXBsZXRlLgorCisuUmVxdWVzdAorLS0tLQorICBQT1NUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvc3VibWl0IEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJ3YWl0X2Zvcl9tZXJnZSI6IHRydWUKKyAgfQorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I2NoYW5nZS1pbmZvW0NoYW5nZUluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIHN1Ym1pdHRlZC9tZXJnZWQgY2hhbmdlLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NoYW5nZSIsCisgICAgImlkIjogIm15UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiLAorICAgICJwcm9qZWN0IjogIm15UHJvamVjdCIsCisgICAgImJyYW5jaCI6ICJtYXN0ZXIiLAorICAgICJjaGFuZ2VfaWQiOiAiSTg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiLAorICAgICJzdWJqZWN0IjogIkltcGxlbWVudGluZyBGZWF0dXJlIFgiLAorICAgICJzdGF0dXMiOiAiTUVSR0VEIiwKKyAgICAiY3JlYXRlZCI6ICIyMDEzLTAyLTAxIDA5OjU5OjMyLjEyNjAwMDAwMCIsCisgICAgInVwZGF0ZWQiOiAiMjAxMy0wMi0yMSAxMToxNjozNi43NzUwMDAwMDAiLAorICAgICJyZXZpZXdlZCI6IHRydWUsCisgICAgIl9zb3J0a2V5IjogIjAwMjM0MTI0MDAwMDBmN2QiLAorICAgICJfbnVtYmVyIjogMzk2NSwKKyAgICAib3duZXIiOiB7CisgICAgICAibmFtZSI6ICJKb2huIERvZSIKKyAgICB9CisgIH0KKy0tLS0KKworSWYgdGhlIGNoYW5nZSBjYW5ub3QgYmUgc3VibWl0dGVkIGJlY2F1c2UgdGhlIHN1Ym1pdCBydWxlIGRvZXNuJ3QgYWxsb3cKK3N1Ym1pdHRpbmcgdGhlIGNoYW5nZSwgdGhlIHJlc3BvbnNlIGlzICJgNDA5IENvbmZsaWN0YCIgYW5kIHRoZSBlcnJvcgorbWVzc2FnZSBpcyBjb250YWluZWQgaW4gdGhlIHJlc3BvbnNlIGJvZHkuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSA0MDkgQ29uZmxpY3QKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IHRleHQvcGxhaW47Y2hhcnNldD1VVEYtOAorCisgIGJsb2NrZWQgYnkgVmVyaWZpZWQKKy0tLS0KKworW1tyZXZpZXdlci1lbmRwb2ludHNdXQorUmV2aWV3ZXIgRW5kcG9pbnRzCistLS0tLS0tLS0tLS0tLS0tLS0KKworW1tsaXN0LXJldmlld2Vyc11dCitMaXN0IFJldmlld2Vycworfn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3Jldmlld2Vycy8nCisKK0xpc3RzIHRoZSByZXZpZXdlcnMgb2YgYSBjaGFuZ2UuCisKK0FzIHJlc3VsdCBhIGxpc3Qgb2YgbGluazojcmV2aWV3ZXItaW5mb1tSZXZpZXdlckluZm9dIGVudHJpZXMgaXMgcmV0dXJuZWQuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwL3Jldmlld2Vycy8gSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICBbCisgICAgeworICAgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNyZXZpZXdlciIsCisgICAgICAiYXBwcm92YWxzIjogeworICAgICAgICAiVmVyaWZpZWQiOiAiKzEiLAorICAgICAgICAiQ29kZS1SZXZpZXciOiAiKzIiCisgICAgICB9LAorICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NiwKKyAgICAgICJuYW1lIjogIkpvaG4gRG9lIiwKKyAgICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgICB9LAorICAgIHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjcmV2aWV3ZXIiLAorICAgICAgImFwcHJvdmFscyI6IHsKKyAgICAgICAgIlZlcmlmaWVkIjogIiAwIiwKKyAgICAgICAgIkNvZGUtUmV2aWV3IjogIi0xIgorICAgICAgfSwKKyAgICAgICJfYWNjb3VudF9pZCI6IDEwMDAwOTcsCisgICAgICAibmFtZSI6ICJKYW5lIFJvZSIsCisgICAgICAiZW1haWwiOiAiamFuZS5yb2VAZXhhbXBsZS5jb20iCisgICAgfQorICBdCistLS0tCisKK1tbZ2V0LXJldmlld2VyXV0KK0dldCBSZXZpZXdlcgorfn5+fn5+fn5+fn5+CitbdmVyc2VdCisnR0VUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpZXdlcnMvbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaWRbXHthY2NvdW50LWlkXH1dJworCitSZXRyaWV2ZXMgYSByZXZpZXdlciBvZiBhIGNoYW5nZS4KKworQXMgcmVzcG9uc2UgYSBsaW5rOiNyZXZpZXdlci1pbmZvW1Jldmlld2VySW5mb10gZW50aXR5IGlzIHJldHVybmVkIHRoYXQKK2Rlc2NyaWJlcyB0aGUgcmV2aWV3ZXIuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwL3Jldmlld2Vycy9qb2huLmRvZUBleGFtcGxlLmNvbSBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I3Jldmlld2VyIiwKKyAgICAiYXBwcm92YWxzIjogeworICAgICAgIlZlcmlmaWVkIjogIisxIiwKKyAgICAgICJDb2RlLVJldmlldyI6ICIrMiIKKyAgICB9LAorICAgICJfYWNjb3VudF9pZCI6IDEwMDAwOTYsCisgICAgIm5hbWUiOiAiSm9obiBEb2UiLAorICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgfQorLS0tLQorCitbW2FkZC1yZXZpZXdlcl1dCitBZGQgUmV2aWV3ZXIKK35+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BPU1QgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3Jldmlld2VycycKKworQWRkcyBvbmUgdXNlciBvciBhbGwgbWVtYmVycyBvZiBvbmUgZ3JvdXAgYXMgcmV2aWV3ZXIgdG8gdGhlIGNoYW5nZS4KKworVGhlIHJldmlld2VyIHRvIGJlIGFkZGVkIHRvIHRoZSBjaGFuZ2UgbXVzdCBiZSBwcm92aWRlZCBpbiB0aGUgcmVxdWVzdAorYm9keSBhcyBhIGxpbms6I3Jldmlld2VyLWlucHV0W1Jldmlld2VySW5wdXRdIGVudGl0eS4KKworLlJlcXVlc3QKKy0tLS0KKyAgUE9TVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwL3Jldmlld2VycyBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAicmV2aWV3ZXIiOiAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgIH0KKy0tLS0KKworQXMgcmVzcG9uc2UgYW4gbGluazojYWRkLXJldmlld2VyLXJlc3VsdFtBZGRSZXZpZXdlclJlc3VsdF0gZW50aXR5IGlzCityZXR1cm5lZCB0aGF0IGRlc2NyaWJlcyB0aGUgbmV3bHkgYWRkZWQgcmV2aWV3ZXJzLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAicmV2aWV3ZXJzIjogWworICAgICAgeworICAgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I3Jldmlld2VyIiwKKyAgICAgICAgImFwcHJvdmFscyI6IHsKKyAgICAgICAgICAiVmVyaWZpZWQiOiAiIDAiLAorICAgICAgICAgICJDb2RlLVJldmlldyI6ICIgMCIKKyAgICAgICAgfSwKKyAgICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NiwKKyAgICAgICAgIm5hbWUiOiAiSm9obiBEb2UiLAorICAgICAgICAiZW1haWwiOiAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgICAgICB9CisgICAgXQorICB9CistLS0tCisKK0lmIGEgZ3JvdXAgaXMgc3BlY2lmaWVkLCBhZGRpbmcgdGhlIGdyb3VwIG1lbWJlcnMgYXMgcmV2aWV3ZXJzIGlzIGFuCithdG9taWMgb3BlcmF0aW9uLiBUaGlzIG1lYW5zIGlmIGFuIGVycm9yIGlzIHJldHVybmVkLCBub25lIG9mIHRoZQorbWVtYmVycyBhcmUgYWRkZWQgYXMgcmV2aWV3ZXIuCisKK0lmIGEgZ3JvdXAgd2l0aCBtYW55IG1lbWJlcnMgaXMgYWRkZWQgYXMgcmV2aWV3ZXIgYSBjb25maXJtYXRpb24gbWF5IGJlCityZXF1aXJlZC4KKworLlJlcXVlc3QKKy0tLS0KKyAgUE9TVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwL3Jldmlld2VycyBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAicmV2aWV3ZXIiOiAiTXlQcm9qZWN0VmVyaWZpZXJzIgorICB9CistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJlcnJvciI6ICJUaGUgZ3JvdXAgTXkgR3JvdXAgaGFzIDE1IG1lbWJlcnMuIERvIHlvdSB3YW50IHRvIGFkZCB0aGVtIGFsbCBhcyByZXZpZXdlcnM/IiwKKyAgICAiY29uZmlybSI6IHRydWUKKyAgfQorLS0tLQorCitUbyBjb25maXJtIHRoZSBhZGRpdGlvbiBvZiB0aGUgcmV2aWV3ZXJzLCByZXNlbmQgdGhlIHJlcXVlc3Qgd2l0aCB0aGUKK2Bjb25maXJtZWRgIGZsYWcgYmVpbmcgc2V0LgorCisuUmVxdWVzdAorLS0tLQorICBQT1NUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvcmV2aWV3ZXJzIEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJyZXZpZXdlciI6ICJNeVByb2plY3RWZXJpZmllcnMiLAorICAgICJjb25maXJtZWQiOiB0cnVlCisgIH0KKy0tLS0KKworW1tkZWxldGUtcmV2aWV3ZXJdXQorRGVsZXRlIFJldmlld2VyCit+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydERUxFVEUgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3Jldmlld2Vycy9saW5rOnJlc3QtYXBpLWFjY291bnRzLmh0bWwjYWNjb3VudC1pZFtce2FjY291bnQtaWRcfV0nCisKK0RlbGV0ZXMgYSByZXZpZXdlciBmcm9tIGEgY2hhbmdlLgorCisuUmVxdWVzdAorLS0tLQorICBERUxFVEUgL2NoYW5nZXMvbXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MC9yZXZpZXdlcnMvSm9obiUyMERvZSBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjA0IE5vIENvbnRlbnQKKy0tLS0KKworW1tyZXZpc2lvbi1lbmRwb2ludHNdXQorUmV2aXNpb24gRW5kcG9pbnRzCistLS0tLS0tLS0tLS0tLS0tLS0KKworW1tnZXQtcmV2aWV3XV0KK0dldCBSZXZpZXcKK35+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3JldmlzaW9ucy9saW5rOiNyZXZpc2lvbi1pZFtce3JldmlzaW9uLWlkXH1dL3JldmlldycKKworUmV0cmlldmVzIGEgcmV2aWV3IG9mIGEgcmV2aXNpb24uCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwL3JldmlzaW9ucy82NzRhYzc1NGY5MWU2NGEwZWZiODA4N2U1OWExNzY0ODRiZDUzNGQxL3JldmlldyBIVFRQLzEuMAorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I2NoYW5nZS1pbmZvW0NoYW5nZUluZm9dIGVudGl0eSB3aXRoCitsaW5rOiNkZXRhaWxlZC1sYWJlbHNbZGV0YWlsZWQgbGFiZWxzXSBhbmQgbGluazojZGV0YWlsZWQtYWNjb3VudHNbCitkZXRhaWxlZCBhY2NvdW50c10gaXMgcmV0dXJuZWQgdGhhdCBkZXNjcmliZXMgdGhlIHJldmlldyBvZiB0aGUKK3JldmlzaW9uLiBUaGUgcmV2aXNpb24gZm9yIHdoaWNoIHRoZSByZXZpZXcgaXMgcmV0cmlldmVkIGlzIGNvbnRhaW5lZAoraW4gdGhlIGByZXZpc2lvbnNgIGZpZWxkLiBJbiBhZGRpdGlvbiB0aGUgYGN1cnJlbnRfcmV2aXNpb25gIGZpZWxkIGlzCitzZXQgaWYgdGhlIHJldmlzaW9uIGZvciB3aGljaCB0aGUgcmV2aWV3IGlzIHJldHJpZXZlZCBpcyB0aGUgY3VycmVudAorcmV2aXNpb24gb2YgdGhlIGNoYW5nZS4gUGxlYXNlIG5vdGUgdGhhdCB0aGUgcmV0dXJuZWQgbGFiZWxzIGFyZSBhbHdheXMKK2ZvciB0aGUgY3VycmVudCBwYXRjaCBzZXQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjY2hhbmdlIiwKKyAgICAiaWQiOiAibXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MCIsCisgICAgInByb2plY3QiOiAibXlQcm9qZWN0IiwKKyAgICAiYnJhbmNoIjogIm1hc3RlciIsCisgICAgImNoYW5nZV9pZCI6ICJJODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MCIsCisgICAgInN1YmplY3QiOiAiSW1wbGVtZW50aW5nIEZlYXR1cmUgWCIsCisgICAgInN0YXR1cyI6ICJORVciLAorICAgICJjcmVhdGVkIjogIjIwMTMtMDItMDEgMDk6NTk6MzIuMTI2MDAwMDAwIiwKKyAgICAidXBkYXRlZCI6ICIyMDEzLTAyLTIxIDExOjE2OjM2Ljc3NTAwMDAwMCIsCisgICAgInJldmlld2VkIjogdHJ1ZSwKKyAgICAibWVyZ2VhYmxlIjogdHJ1ZSwKKyAgICAiX3NvcnRrZXkiOiAiMDAyMzQxMjQwMDAwMGY3ZCIsCisgICAgIl9udW1iZXIiOiAzOTY1LAorICAgICJvd25lciI6IHsKKyAgICAgICJfYWNjb3VudF9pZCI6IDEwMDAwOTYsCisgICAgICAibmFtZSI6ICJKb2huIERvZSIsCisgICAgICAiZW1haWwiOiAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgICAgfSwKKyAgICAibGFiZWxzIjogeworICAgICAgIlZlcmlmaWVkIjogeworICAgICAgICAiYWxsIjogWworICAgICAgICAgIHsKKyAgICAgICAgICAgICJ2YWx1ZSI6IDAsCisgICAgICAgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk2LAorICAgICAgICAgICAgIm5hbWUiOiAiSm9obiBEb2UiLAorICAgICAgICAgICAgImVtYWlsIjogImpvaG4uZG9lQGV4YW1wbGUuY29tIgorICAgICAgICAgIH0sCisgICAgICAgICAgeworICAgICAgICAgICAgInZhbHVlIjogMCwKKyAgICAgICAgICAgICJfYWNjb3VudF9pZCI6IDEwMDAwOTcsCisgICAgICAgICAgICAibmFtZSI6ICJKYW5lIFJvZSIsCisgICAgICAgICAgICAiZW1haWwiOiAiamFuZS5yb2VAZXhhbXBsZS5jb20iCisgICAgICAgICAgfQorICAgICAgICBdLAorICAgICAgICAidmFsdWVzIjogeworICAgICAgICAgICItMSI6ICJGYWlscyIsCisgICAgICAgICAgIiAwIjogIk5vIHNjb3JlIiwKKyAgICAgICAgICAiKzEiOiAiVmVyaWZpZWQiCisgICAgICAgIH0KKyAgICAgIH0sCisgICAgICAiQ29kZS1SZXZpZXciOiB7CisgICAgICAgICJhbGwiOiBbCisgICAgICAgICAgeworICAgICAgICAgICAgInZhbHVlIjogLTEsCisgICAgICAgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk2LAorICAgICAgICAgICAgIm5hbWUiOiAiSm9obiBEb2UiLAorICAgICAgICAgICAgImVtYWlsIjogImpvaG4uZG9lQGV4YW1wbGUuY29tIgorICAgICAgICAgIH0sCisgICAgICAgICAgeworICAgICAgICAgICAgInZhbHVlIjogMSwKKyAgICAgICAgICAgICJfYWNjb3VudF9pZCI6IDEwMDAwOTcsCisgICAgICAgICAgICAibmFtZSI6ICJKYW5lIFJvZSIsCisgICAgICAgICAgICAiZW1haWwiOiAiamFuZS5yb2VAZXhhbXBsZS5jb20iCisgICAgICAgICAgfQorICAgICAgICBdCisgICAgICAgICJ2YWx1ZXMiOiB7CisgICAgICAgICAgIi0yIjogIkRvIG5vdCBzdWJtaXQiLAorICAgICAgICAgICItMSI6ICJJIHdvdWxkIHByZWZlciB0aGF0IHlvdSBkaWRuXHUwMDI3dCBzdWJtaXQgdGhpcyIsCisgICAgICAgICAgIiAwIjogIk5vIHNjb3JlIiwKKyAgICAgICAgICAiKzEiOiAiTG9va3MgZ29vZCB0byBtZSwgYnV0IHNvbWVvbmUgZWxzZSBtdXN0IGFwcHJvdmUiLAorICAgICAgICAgICIrMiI6ICJMb29rcyBnb29kIHRvIG1lLCBhcHByb3ZlZCIKKyAgICAgICAgfQorICAgICAgfQorICAgIH0sCisgICAgInBlcm1pdHRlZF9sYWJlbHMiOiB7CisgICAgICAiVmVyaWZpZWQiOiBbCisgICAgICAgICItMSIsCisgICAgICAgICIgMCIsCisgICAgICAgICIrMSIKKyAgICAgIF0sCisgICAgICAiQ29kZS1SZXZpZXciOiBbCisgICAgICAgICItMiIsCisgICAgICAgICItMSIsCisgICAgICAgICIgMCIsCisgICAgICAgICIrMSIsCisgICAgICAgICIrMiIKKyAgICAgIF0KKyAgICB9LAorICAgICJyZW1vdmFibGVfcmV2aWV3ZXJzIjogWworICAgICAgeworICAgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk2LAorICAgICAgICAibmFtZSI6ICJKb2huIERvZSIsCisgICAgICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgICAgIH0sCisgICAgICB7CisgICAgICAgICJfYWNjb3VudF9pZCI6IDEwMDAwOTcsCisgICAgICAgICJuYW1lIjogIkphbmUgUm9lIiwKKyAgICAgICAgImVtYWlsIjogImphbmUucm9lQGV4YW1wbGUuY29tIgorICAgICAgfQorICAgIF0sCisgICAgImN1cnJlbnRfcmV2aXNpb24iOiAiNjc0YWM3NTRmOTFlNjRhMGVmYjgwODdlNTlhMTc2NDg0YmQ1MzRkMSIsCisgICAgInJldmlzaW9ucyI6IHsKKyAgICAgICI2NzRhYzc1NGY5MWU2NGEwZWZiODA4N2U1OWExNzY0ODRiZDUzNGQxIjogeworICAgICAgIl9udW1iZXIiOiAyLAorICAgICAgImZldGNoIjogeworICAgICAgICAiaHR0cCI6IHsKKyAgICAgICAgICAidXJsIjogImh0dHA6Ly9nZXJyaXQvbXlQcm9qZWN0IiwKKyAgICAgICAgICAicmVmIjogInJlZnMvY2hhbmdlcy82NS8zOTY1LzIiCisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgIH0KKy0tLS0KKworW1tzZXQtcmV2aWV3XV0KK1NldCBSZXZpZXcKK35+fn5+fn5+fn4KK1t2ZXJzZV0KKydQT1NUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpc2lvbnMvbGluazojcmV2aXNpb24taWRbXHtyZXZpc2lvbi1pZFx9XS9yZXZpZXcnCisKK1NldHMgYSByZXZpZXcgb24gYSByZXZpc2lvbi4KKworVGhlIHJldmlldyBtdXN0IGJlIHByb3ZpZGVkIGluIHRoZSByZXF1ZXN0IGJvZHkgYXMgYQorbGluazojcmV2aWV3LWlucHV0W1Jldmlld0lucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBPU1QgL2NoYW5nZXMvbXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MC9yZXZpc2lvbnMvNjc0YWM3NTRmOTFlNjRhMGVmYjgwODdlNTlhMTc2NDg0YmQ1MzRkMS9yZXZpZXcgSFRUUC8xLjAKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICB7CisgICAgIm1lc3NhZ2UiOiAiU29tZSBuaXRzIG5lZWQgdG8gYmUgZml4ZWQuIiwKKyAgICAibGFiZWxzIjogeworICAgICAgIkNvZGUtUmV2aWV3IjogLTEKKyAgICB9LAorICAgICJjb21tZW50cyI6IHsKKyAgICAgICJnZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhIjogWworICAgICAgICB7CisgICAgICAgICAgImxpbmUiOiAyMywKKyAgICAgICAgICAibWVzc2FnZSI6ICJbbml0XSB0cmFpbGluZyB3aGl0ZXNwYWNlIgorICAgICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgImxpbmUiOiA0OSwKKyAgICAgICAgICAibWVzc2FnZSI6ICJbbml0XSBzL2NvbnJ0b2wvY29udHJvbCIKKyAgICAgICAgfQorICAgICAgXQorICAgIH0KKyAgfQorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I3Jldmlldy1pbmZvW1Jldmlld0luZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIGFwcGxpZWQgbGFiZWxzLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAibGFiZWxzIjogeworICAgICAgIkNvZGUtUmV2aWV3IjogLTEKKyAgICB9CisgIH0KKy0tLS0KKworW1tzdWJtaXQtcmV2aXNpb25dXQorU3VibWl0IFJldmlzaW9uCit+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQT1NUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpc2lvbnMvbGluazojcmV2aXNpb24taWRbXHtyZXZpc2lvbi1pZFx9XS9zdWJtaXQnCisKK1N1Ym1pdHMgYSByZXZpc2lvbi4KKworVGhlIHJlcXVlc3QgYm9keSBvbmx5IG5lZWRzIHRvIGluY2x1ZGUgYSBsaW5rOiNzdWJtaXQtaW5wdXRbCitTdWJtaXRJbnB1dF0gZW50aXR5IGlmIHRoZSByZXF1ZXN0IHNob3VsZCB3YWl0IGZvciB0aGUgbWVyZ2UgdG8KK2NvbXBsZXRlLgorCisuUmVxdWVzdAorLS0tLQorICBQT1NUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvcmV2aXNpb25zLzY3NGFjNzU0ZjkxZTY0YTBlZmI4MDg3ZTU5YTE3NjQ4NGJkNTM0ZDEvc3VibWl0IEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJ3YWl0X2Zvcl9tZXJnZSI6IHRydWUKKyAgfQorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I3N1Ym1pdC1pbmZvW1N1Ym1pdEluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIHN0YXR1cyBvZiB0aGUgc3VibWl0dGVkIGNoYW5nZS4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICB7CisgICAgInN0YXR1cyI6ICJNRVJHRUQiCisgIH0KKy0tLS0KKworSWYgdGhlIHJldmlzaW9uIGNhbm5vdCBiZSBzdWJtaXR0ZWQsIGUuZy4gYmVjYXVzZSB0aGUgc3VibWl0IHJ1bGUKK2RvZXNuJ3QgYWxsb3cgc3VibWl0dGluZyB0aGUgcmV2aXNpb24gb3IgdGhlIHJldmlzaW9uIGlzIG5vdCB0aGUKK2N1cnJlbnQgcmV2aXNpb24sIHRoZSByZXNwb25zZSBpcyAiYDQwOSBDb25mbGljdGAiIGFuZCB0aGUgZXJyb3IKK21lc3NhZ2UgaXMgY29udGFpbmVkIGluIHRoZSByZXNwb25zZSBib2R5LgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgNDA5IENvbmZsaWN0CisgIENvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjtjaGFyc2V0PVVURi04CisKKyAgInJldmlzaW9uIDY3NGFjNzU0ZjkxZTY0YTBlZmI4MDg3ZTU5YTE3NjQ4NGJkNTM0ZDEgaXMgbm90IGN1cnJlbnQgcmV2aXNpb24iCistLS0tCisKK1tbZ2V0LXN1Ym1pdC10eXBlXV0KK0dldCBTdWJtaXQgVHlwZQorfn5+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnR0VUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpc2lvbnMvbGluazojcmV2aXNpb24taWRbXHtyZXZpc2lvbi1pZFx9XS9zdWJtaXRfdHlwZScKKworR2V0cyB0aGUgbWV0aG9kIHRoZSBzZXJ2ZXIgd2lsbCB1c2UgdG8gc3VibWl0IChtZXJnZSkgdGhlIGNoYW5nZS4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvcmV2aXNpb25zL2N1cnJlbnQvc3VibWl0X3R5cGUgSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICAiTUVSR0VfSUZfTkVDRVNTQVJZIgorLS0tLQorCitbW3Rlc3Qtc3VibWl0LXR5cGVdXQorVGVzdCBTdWJtaXQgVHlwZQorfn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BPU1QgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3JldmlzaW9ucy9saW5rOiNyZXZpc2lvbi1pZFtce3JldmlzaW9uLWlkXH1dL3Rlc3Quc3VibWl0X3R5cGUnCisKK1Rlc3RzIHRoZSBzdWJtaXRfdHlwZSBQcm9sb2cgcnVsZSBpbiB0aGUgcHJvamVjdCwgb3IgdGhlIG9uZSBnaXZlbi4KKworUmVxdWVzdCBib2R5IG1heSBiZSBlaXRoZXIgdGhlIFByb2xvZyBjb2RlIGFzIGB0ZXh0L3BsYWluYCBvciBhCitsaW5rOiNydWxlLWlucHV0W1J1bGVJbnB1dF0gb2JqZWN0LiBUaGUgcXVlcnkgcGFyYW1ldGVyIGBmaWx0ZXJzYAorbWF5IGJlIHNldCB0byBgU0tJUGAgdG8gYnlwYXNzIHBhcmVudCBwcm9qZWN0IGZpbHRlcnMgd2hpbGUgdGVzdGluZworYSBwcm9qZWN0LXNwZWNpZmljIHJ1bGUuCisKKy5SZXF1ZXN0CistLS0tCisgIFBPU1QgL2NoYW5nZXMvbXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MC9yZXZpc2lvbnMvY3VycmVudC90ZXN0LnN1Ym1pdF90eXBlIEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjtjaGFyc2V0LVVURi04CisKKyAgc3VibWl0X3R5cGUoY2hlcnJ5X3BpY2spLgorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgICJjaGVycnlfcGljayIKKy0tLS0KKworW1t0ZXN0LXN1Ym1pdC1ydWxlXV0KK1Rlc3QgU3VibWl0IFJ1bGUKK35+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQT1NUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpc2lvbnMvbGluazojcmV2aXNpb24taWRbXHtyZXZpc2lvbi1pZFx9XS90ZXN0LnN1Ym1pdF9ydWxlJworCitUZXN0cyB0aGUgc3VibWl0X3J1bGUgUHJvbG9nIHJ1bGUgaW4gdGhlIHByb2plY3QsIG9yIHRoZSBvbmUgZ2l2ZW4uCisKK1JlcXVlc3QgYm9keSBtYXkgYmUgZWl0aGVyIHRoZSBQcm9sb2cgY29kZSBhcyBgdGV4dC9wbGFpbmAgb3IgYQorbGluazojcnVsZS1pbnB1dFtSdWxlSW5wdXRdIG9iamVjdC4gVGhlIHF1ZXJ5IHBhcmFtZXRlciBgZmlsdGVyc2AKK21heSBiZSBzZXQgdG8gYFNLSVBgIHRvIGJ5cGFzcyBwYXJlbnQgcHJvamVjdCBmaWx0ZXJzIHdoaWxlIHRlc3RpbmcKK2EgcHJvamVjdC1zcGVjaWZpYyBydWxlLgorCisuUmVxdWVzdAorLS0tLQorICBQT1NUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvcmV2aXNpb25zL2N1cnJlbnQvdGVzdC5zdWJtaXRfdHlwZT9maWx0ZXJzPVNLSVAgSFRUUC8xLjAKKyAgQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluO2NoYXJzZXQtVVRGLTgKKworICBzdWJtaXRfcnVsZShzdWJtaXQoUikpIDotCisgICAgUiA9IGxhYmVsKCdBbnktTGFiZWwtTmFtZScsIHJlamVjdChfKSkuCistLS0tCisKK1RoZSByZXNwb25zZSBpcyBhIGxpc3Qgb2YgbGluazojc3VibWl0LXJlY29yZFtTdWJtaXRSZWNvcmRdIGVudHJpZXMKK2Rlc2NyaWJpbmcgdGhlIHBlcm11dGF0aW9ucyB0aGF0IHNhdGlzZnkgdGhlIHRlc3RlZCBzdWJtaXQgcnVsZS4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICBbCisgICAgeworICAgICAgInN0YXR1cyI6ICJOT1RfUkVBRFkiLAorICAgICAgInJlamVjdCI6IHsKKyAgICAgICAgIkFueS1MYWJlbC1OYW1lIjoge30KKyAgICAgIH0KKyAgICB9CisgIF0KKy0tLS0KKworW1tsaXN0LWRyYWZ0c11dCitMaXN0IERyYWZ0cworfn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3JldmlzaW9ucy9saW5rOiNyZXZpc2lvbi1pZFtce3JldmlzaW9uLWlkXH1dL2RyYWZ0cy8nCisKK0xpc3RzIHRoZSBkcmFmdCBjb21tZW50cyBvZiBhIHJldmlzaW9uIHRoYXQgYmVsb25nIHRvIHRoZSBjYWxsaW5nCit1c2VyLgorCitBcyByZXN1bHQgYSBtYXAgaXMgcmV0dXJuZWQgdGhhdCBtYXBzIHRoZSBmaWxlIHBhdGggdG8gYSBsaXN0IG9mCitsaW5rOiNjb21tZW50LWluZm9bQ29tbWVudEluZm9dIGVudHJpZXMuIFRoZSBlbnRyaWVzIGluIHRoZSBtYXAgYXJlCitzb3J0ZWQgYnkgZmlsZSBwYXRoLgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL2NoYW5nZXMvbXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MC9yZXZpc2lvbnMvNjc0YWM3NTRmOTFlNjRhMGVmYjgwODdlNTlhMTc2NDg0YmQ1MzRkMS9kcmFmdHMvIEhUVFAvMS4wCistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJnZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhIjogWworICAgICAgeworICAgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NvbW1lbnQiLAorICAgICAgICAiaWQiOiAiVHZjWHJtak0iLAorICAgICAgICAibGluZSI6IDIzLAorICAgICAgICAibWVzc2FnZSI6ICJbbml0XSB0cmFpbGluZyB3aGl0ZXNwYWNlIiwKKyAgICAgICAgInVwZGF0ZWQiOiAiMjAxMy0wMi0yNiAxNTo0MDo0My45ODYwMDAwMDAiCisgICAgICB9LAorICAgICAgeworICAgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NvbW1lbnQiLAorICAgICAgICAiaWQiOiAiVHZlWHdGaUEiLAorICAgICAgICAibGluZSI6IDQ5LAorICAgICAgICAiaW5fcmVwbHlfdG8iOiAiVGZZWC1JdW8iLAorICAgICAgICAibWVzc2FnZSI6ICJEb25lIiwKKyAgICAgICAgInVwZGF0ZWQiOiAiMjAxMy0wMi0yNiAxNTo0MDo0NS4zMjgwMDAwMDAiCisgICAgICB9CisgICAgXQorICB9CistLS0tCisKK1tbY3JlYXRlLWRyYWZ0XV0KK0NyZWF0ZSBEcmFmdAorfn5+fn5+fn5+fn5+CitbdmVyc2VdCisnUFVUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpc2lvbnMvbGluazojcmV2aXNpb24taWRbXHtyZXZpc2lvbi1pZFx9XS9kcmFmdHMnCisKK0NyZWF0ZXMgYSBkcmFmdCBjb21tZW50IG9uIGEgcmV2aXNpb24uCisKK1RoZSBuZXcgZHJhZnQgY29tbWVudCBtdXN0IGJlIHByb3ZpZGVkIGluIHRoZSByZXF1ZXN0IGJvZHkgaW5zaWRlIGEKK2xpbms6I2NvbW1lbnQtaW5wdXRbQ29tbWVudElucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBVVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwL3JldmlzaW9ucy82NzRhYzc1NGY5MWU2NGEwZWZiODA4N2U1OWExNzY0ODRiZDUzNGQxL2RyYWZ0cyBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAicGF0aCI6ICJnZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhIiwKKyAgICAibGluZSI6IDIzLAorICAgICJtZXNzYWdlIjogIltuaXRdIHRyYWlsaW5nIHdoaXRlc3BhY2UiCisgIH0KKy0tLS0KKworQXMgcmVzcG9uc2UgYSBsaW5rOiNjb21tZW50LWluZm9bQ29tbWVudEluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIGRyYWZ0IGNvbW1lbnQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjY29tbWVudCIsCisgICAgImlkIjogIlR2Y1hybWpNIiwKKyAgICAicGF0aCI6ICJnZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhIiwKKyAgICAibGluZSI6IDIzLAorICAgICJtZXNzYWdlIjogIltuaXRdIHRyYWlsaW5nIHdoaXRlc3BhY2UiLAorICAgICJ1cGRhdGVkIjogIjIwMTMtMDItMjYgMTU6NDA6NDMuOTg2MDAwMDAwIgorICB9CistLS0tCisKK1tbZ2V0LWRyYWZ0XV0KK0dldCBEcmFmdAorfn5+fn5+fn5+CitbdmVyc2VdCisnR0VUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpc2lvbnMvbGluazojcmV2aXNpb24taWRbXHtyZXZpc2lvbi1pZFx9XS9kcmFmdHMvbGluazojZHJhZnQtaWRbXHtkcmFmdC1pZFx9XScKKworUmV0cmlldmVzIGEgZHJhZnQgY29tbWVudCBvZiBhIHJldmlzaW9uIHRoYXQgYmVsb25ncyB0byB0aGUgY2FsbGluZwordXNlci4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvcmV2aXNpb25zLzY3NGFjNzU0ZjkxZTY0YTBlZmI4MDg3ZTU5YTE3NjQ4NGJkNTM0ZDEvZHJhZnRzL1R2Y1hybWpNIEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3BvbnNlIGEgbGluazojY29tbWVudC1pbmZvW0NvbW1lbnRJbmZvXSBlbnRpdHkgaXMgcmV0dXJuZWQgdGhhdAorZGVzY3JpYmVzIHRoZSBkcmFmdCBjb21tZW50LgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2NvbW1lbnQiLAorICAgICJpZCI6ICJUdmNYcm1qTSIsCisgICAgInBhdGgiOiAiZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1JlZkNvbnRyb2wuamF2YSIsCisgICAgImxpbmUiOiAyMywKKyAgICAibWVzc2FnZSI6ICJbbml0XSB0cmFpbGluZyB3aGl0ZXNwYWNlIiwKKyAgICAidXBkYXRlZCI6ICIyMDEzLTAyLTI2IDE1OjQwOjQzLjk4NjAwMDAwMCIKKyAgfQorLS0tLQorCitbW3VwZGF0ZS1kcmFmdF1dCitVcGRhdGUgRHJhZnQKK35+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BVVCAvY2hhbmdlcy9saW5rOiNjaGFuZ2UtaWRbXHtjaGFuZ2UtaWRcfV0vcmV2aXNpb25zL2xpbms6I3JldmlzaW9uLWlkW1x7cmV2aXNpb24taWRcfV0vZHJhZnRzL2xpbms6I2RyYWZ0LWlkW1x7ZHJhZnQtaWRcfV0nCisKK1VwZGF0ZXMgYSBkcmFmdCBjb21tZW50IG9uIGEgcmV2aXNpb24uCisKK1RoZSBuZXcgZHJhZnQgY29tbWVudCBtdXN0IGJlIHByb3ZpZGVkIGluIHRoZSByZXF1ZXN0IGJvZHkgaW5zaWRlIGEKK2xpbms6I2NvbW1lbnQtaW5wdXRbQ29tbWVudElucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBVVCAvY2hhbmdlcy9teVByb2plY3R+bWFzdGVyfkk4NDczYjk1OTM0YjU3MzJhYzU1ZDI2MzExYTcwNmM5YzJiZGU5OTQwL3JldmlzaW9ucy82NzRhYzc1NGY5MWU2NGEwZWZiODA4N2U1OWExNzY0ODRiZDUzNGQxL2RyYWZ0cy9UdmNYcm1qTSBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAicGF0aCI6ICJnZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhIiwKKyAgICAibGluZSI6IDIzLAorICAgICJtZXNzYWdlIjogIltuaXRdIHRyYWlsaW5nIHdoaXRlc3BhY2UiCisgIH0KKy0tLS0KKworQXMgcmVzcG9uc2UgYSBsaW5rOiNjb21tZW50LWluZm9bQ29tbWVudEluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIGRyYWZ0IGNvbW1lbnQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjY29tbWVudCIsCisgICAgImlkIjogIlR2Y1hybWpNIiwKKyAgICAicGF0aCI6ICJnZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhIiwKKyAgICAibGluZSI6IDIzLAorICAgICJtZXNzYWdlIjogIltuaXRdIHRyYWlsaW5nIHdoaXRlc3BhY2UiLAorICAgICJ1cGRhdGVkIjogIjIwMTMtMDItMjYgMTU6NDA6NDMuOTg2MDAwMDAwIgorICB9CistLS0tCisKK1tbZGVsZXRlLWRyYWZ0XV0KK0RlbGV0ZSBEcmFmdAorfn5+fn5+fn5+fn5+CitbdmVyc2VdCisnREVMRVRFIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpc2lvbnMvbGluazojcmV2aXNpb24taWRbXHtyZXZpc2lvbi1pZFx9XS9kcmFmdHMvbGluazojZHJhZnQtaWRbXHtkcmFmdC1pZFx9XScKKworRGVsZXRlcyBhIGRyYWZ0IGNvbW1lbnQgZnJvbSBhIHJldmlzaW9uLgorCisuUmVxdWVzdAorLS0tLQorICBERUxFVEUgL2NoYW5nZXMvbXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MC9yZXZpc2lvbnMvNjc0YWM3NTRmOTFlNjRhMGVmYjgwODdlNTlhMTc2NDg0YmQ1MzRkMS9kcmFmdHMvVHZjWHJtak0gSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwNCBObyBDb250ZW50CistLS0tCisKK1tbc2V0LXJldmlld2VkXV0KK1NldCBSZXZpZXdlZAorfn5+fn5+fn5+fn5+CitbdmVyc2VdCisnUFVUIC9jaGFuZ2VzL2xpbms6I2NoYW5nZS1pZFtce2NoYW5nZS1pZFx9XS9yZXZpc2lvbnMvbGluazojcmV2aXNpb24taWRbXHtyZXZpc2lvbi1pZFx9XS9maWxlcy9saW5rOiNwYXRjaC1pZFtce3BhdGNoLWlkXH1dL3Jldmlld2VkJworCitNYXJrcyBhIHBhdGNoIG9mIGEgcmV2aXNpb24gYXMgcmV2aWV3ZWQgYnkgdGhlIGNhbGxpbmcgdXNlci4KKworLlJlcXVlc3QKKy0tLS0KKyAgUFVUIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvcmV2aXNpb25zLzY3NGFjNzU0ZjkxZTY0YTBlZmI4MDg3ZTU5YTE3NjQ4NGJkNTM0ZDEvZmlsZXMvZ2Vycml0LXNlcnZlciUyRnNyYyUyRm1haW4lMkZqYXZhJTJGY29tJTJGZ29vZ2xlJTJGZ2Vycml0JTJGc2VydmVyJTJGcHJvamVjdCUyRlJlZkNvbnRyb2wuamF2YS9yZXZpZXdlZCBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAxIENyZWF0ZWQKKy0tLS0KKworSWYgdGhlIHBhdGNoIHdhcyBhbHJlYWR5IG1hcmtlZCBhcyByZXZpZXdlZCBieSB0aGUgY2FsbGluZyB1c2VyIHRoZQorcmVzcG9uc2UgaXMgImAyMDAgT0tgIi4KKworW1tkZWxldGUtcmV2aWV3ZWRdXQorRGVsZXRlIFJldmlld2VkCit+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydERUxFVEUgL2NoYW5nZXMvbGluazojY2hhbmdlLWlkW1x7Y2hhbmdlLWlkXH1dL3JldmlzaW9ucy9saW5rOiNyZXZpc2lvbi1pZFtce3JldmlzaW9uLWlkXH1dL2ZpbGVzL2xpbms6I3BhdGNoLWlkW1x7cGF0Y2gtaWRcfV0vcmV2aWV3ZWQnCisKK0RlbGV0ZXMgdGhlIHJldmlld2VkIGZsYWcgb2YgdGhlIGNhbGxpbmcgdXNlciBmcm9tIGEgcGF0Y2ggb2YgYSByZXZpc2lvbi4KKworLlJlcXVlc3QKKy0tLS0KKyAgREVMRVRFIC9jaGFuZ2VzL215UHJvamVjdH5tYXN0ZXJ+STg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAvcmV2aXNpb25zLzY3NGFjNzU0ZjkxZTY0YTBlZmI4MDg3ZTU5YTE3NjQ4NGJkNTM0ZDEvZmlsZXMvZ2Vycml0LXNlcnZlciUyRnNyYyUyRm1haW4lMkZqYXZhJTJGY29tJTJGZ29vZ2xlJTJGZ2Vycml0JTJGc2VydmVyJTJGcHJvamVjdCUyRlJlZkNvbnRyb2wuamF2YS9yZXZpZXdlZCBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjA0IE5vIENvbnRlbnQKKy0tLS0KKworCitbW2lkc11dCitJRHMKKy0tLQorCitbW2FjY291bnQtaWRdXQorbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaWRbXHthY2NvdW50LWlkXH1dCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKy0tCistLQorCitbW2NoYW5nZS1pZF1dCitce2NoYW5nZS1pZFx9Cit+fn5+fn5+fn5+fn5+CitJZGVudGlmaWVyIHRoYXQgdW5pcXVlbHkgaWRlbnRpZmllcyBvbmUgY2hhbmdlLgorCitUaGlzIGNhbiBiZToKKworKiBhbiBJRCBvZiB0aGUgY2hhbmdlIGluIHRoZSBmb3JtYXQgIickJDxwcm9qZWN0Pn48YnJhbmNoPn48Q2hhbmdlLUlkPiQkJyIsCisgIHdoZXJlIGZvciB0aGUgYnJhbmNoIHRoZSBgcmVmcy9oZWFkcy9gIHByZWZpeCBjYW4gYmUgb21pdHRlZAorICAoIiQkbXlQcm9qZWN0fm1hc3Rlcn5JODQ3M2I5NTkzNGI1NzMyYWM1NWQyNjMxMWE3MDZjOWMyYmRlOTk0MCQkIikKKyogYSBDaGFuZ2UtSWQgaWYgaXQgdW5pcXVlbHkgaWRlbnRpZmllcyBvbmUgY2hhbmdlCisgICgiSTg0NzNiOTU5MzRiNTczMmFjNTVkMjYzMTFhNzA2YzljMmJkZTk5NDAiKQorKiBhIGxlZ2FjeSBudW1lcmljIGNoYW5nZSBJRCAoIjQyNDciKQorCitbW2RyYWZ0LWlkXV0KK1x7ZHJhZnQtaWRcfQorfn5+fn5+fn5+fn5+CitVVUlEIG9mIGEgZHJhZnQgY29tbWVudC4KKworW1twYXRjaC1pZF1dCitce3BhdGNoLWlkXH0KK35+fn5+fn5+fn5+fgorVGhlIGZpbGUgcGF0aCBvZiB0aGUgcGF0Y2guCisKK1tbcmV2aXNpb24taWRdXQorXHtyZXZpc2lvbi1pZFx9Cit+fn5+fn5+fn5+fn5+fn4KK0lkZW50aWZpZXIgdGhhdCB1bmlxdWVseSBpZGVudGlmaWVzIG9uZSByZXZpc2lvbiBvZiBhIGNoYW5nZS4KKworVGhpcyBjYW4gYmU6CisKKyogdGhlIGxpdGVyYWwgYGN1cnJlbnRgIHRvIG5hbWUgdGhlIGN1cnJlbnQgcGF0Y2ggc2V0L3JldmlzaW9uCisqIGEgY29tbWl0IElEICgiNjc0YWM3NTRmOTFlNjRhMGVmYjgwODdlNTlhMTc2NDg0YmQ1MzRkMSIpCisqIGFuIGFiYnJldmlhdGVkIGNvbW1pdCBJRCB0aGF0IHVuaXF1ZWx5IGlkZW50aWZpZXMgb25lIHJldmlzaW9uIG9mIHRoZQorICBjaGFuZ2UgKCI2NzRhYzc1NCIpLCBhdCBsZWFzdCA0IGRpZ2l0cyBhcmUgcmVxdWlyZWQKKyogYSBsZWdhY3kgbnVtZXJpYyBwYXRjaCBudW1iZXIgKCIxIiBmb3IgZmlyc3QgcGF0Y2ggc2V0IG9mIHRoZSBjaGFuZ2UpCisKKworW1tqc29uLWVudGl0aWVzXV0KK0pTT04gRW50aXRpZXMKKy0tLS0tLS0tLS0tLS0KKworW1thYmFuZG9uLWlucHV0XV0KK0FiYW5kb25JbnB1dAorfn5+fn5+fn5+fn5+CitUaGUgYEFiYW5kb25JbnB1dGAgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGZvciBhYmFuZG9uaW5nIGEgY2hhbmdlLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfHxEZXNjcmlwdGlvbgorfGBtZXNzYWdlYCAgICAgfG9wdGlvbmFsfAorTWVzc2FnZSB0byBiZSBhZGRlZCBhcyByZXZpZXcgY29tbWVudCB0byB0aGUgY2hhbmdlIHdoZW4gYWJhbmRvbmluZyB0aGUKK2NoYW5nZS4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1thZGQtcmV2aWV3ZXItcmVzdWx0XV0KK0FkZFJldmlld2VyUmVzdWx0Cit+fn5+fn5+fn5+fn5+fn5+fgorVGhlIGBBZGRSZXZpZXdlclJlc3VsdGAgZW50aXR5IGRlc2NyaWJlcyB0aGUgcmVzdWx0IG9mIGFkZGluZyBhCityZXZpZXdlciB0byBhIGNoYW5nZS4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSxeMSw1Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgIHx8RGVzY3JpcHRpb24KK3xgcmV2aWV3ZXJzYCAgIHxvcHRpb25hbHwKK1RoZSBuZXdseSBhZGRlZCByZXZpZXdlcnMgYXMgYSBsaXN0IG9mIGxpbms6I3Jldmlld2VyLWluZm9bCitSZXZpZXdlckluZm9dIGVudGl0aWVzLgorfGBlcnJvcmAgICAgICAgfG9wdGlvbmFsfAorRXJyb3IgbWVzc2FnZSBleHBsYWluaW5nIHdoeSB0aGUgcmV2aWV3ZXIgY291bGQgbm90IGJlIGFkZGVkLiArCitJZiBhIGdyb3VwIHdhcyBzcGVjaWZpZWQgaW4gdGhlIGlucHV0IGFuZCBhbiBlcnJvciBpcyByZXR1cm5lZCwgaXQKK21lYW5zIHRoYXQgbm9uZSBvZiB0aGUgbWVtYmVycyB3ZXJlIGFkZGVkIGFzIHJldmlld2VyLgorfGBjb25maXJtYCAgICAgfGBmYWxzZWAgaWYgbm90IHNldHwKK1doZXRoZXIgYWRkaW5nIHRoZSByZXZpZXdlciByZXF1aXJlcyBjb25maXJtYXRpb24uCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbYXBwcm92YWwtaW5mb11dCitBcHByb3ZhbEluZm8KK35+fn5+fn5+fn5+fgorVGhlIGBBcHByb3ZhbEluZm9gIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCBhbiBhcHByb3ZhbCBmcm9tIGEKK3VzZXIgZm9yIGEgbGFiZWwgb24gYSBjaGFuZ2UuCisKK2BBcHByb3ZhbEluZm9gIGhhcyB0aGUgc2FtZSBmaWVsZHMgYXMKK2xpbms6cmVzdC1hcGktYWNjb3VudHMuaHRtbCNhY2NvdW50LWluZm9bQWNjb3VudEluZm9dLgorSW4gYWRkaXRpb24gYEFwcHJvdmFsSW5mb2AgaGFzIHRoZSBmb2xsb3dpbmcgZmllbGRzOgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfHxEZXNjcmlwdGlvbgorfGB2YWx1ZWAgICAgICAgfG9wdGlvbmFsfAorVGhlIHZvdGUgdGhhdCB0aGUgdXNlciBoYXMgZ2l2ZW4gZm9yIHRoZSBsYWJlbC4gSWYgcHJlc2VudCBhbmQgemVybywgdGhlCit1c2VyIGlzIHBlcm1pdHRlZCB0byB2b3RlIG9uIHRoZSBsYWJlbC4gSWYgYWJzZW50LCB0aGUgdXNlciBpcyBub3QKK3Blcm1pdHRlZCB0byB2b3RlIG9uIHRoYXQgbGFiZWwuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbY2hhbmdlLWluZm9dXQorQ2hhbmdlSW5mbworfn5+fn5+fn5+fgorVGhlIGBDaGFuZ2VJbmZvYCBlbnRpdHkgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQgYSBjaGFuZ2UuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgICAgICAgIHx8RGVzY3JpcHRpb24KK3xga2luZGAgICAgICAgICAgICAgICB8fGBnZXJyaXRjb2RlcmV2aWV3I2NoYW5nZWAKK3xgaWRgICAgICAgICAgICAgICAgICB8fAorVGhlIElEIG9mIHRoZSBjaGFuZ2UgaW4gdGhlIGZvcm1hdCAiJzxwcm9qZWN0Plx+PGJyYW5jaD5+PENoYW5nZS1JZD4nIiwKK3doZXJlICdwcm9qZWN0JywgJ2JyYW5jaCcgYW5kICdDaGFuZ2UtSWQnIGFyZSBVUkwgZW5jb2RlZC4gRm9yICdicmFuY2gnIHRoZQorYHJlZnMvaGVhZHMvYCBwcmVmaXggaXMgb21pdHRlZC4KK3xgcHJvamVjdGAgICAgICAgICAgICB8fFRoZSBuYW1lIG9mIHRoZSBwcm9qZWN0LgorfGBicmFuY2hgICAgICAgICAgICAgIHx8CitUaGUgbmFtZSBvZiB0aGUgdGFyZ2V0IGJyYW5jaC4gKworVGhlIGByZWZzL2hlYWRzL2AgcHJlZml4IGlzIG9taXR0ZWQuCit8YHRvcGljYCAgICAgICAgICAgICAgfG9wdGlvbmFsfFRoZSB0b3BpYyB0byB3aGljaCB0aGlzIGNoYW5nZSBiZWxvbmdzLgorfGBjaGFuZ2VfaWRgICAgICAgICAgIHx8VGhlIENoYW5nZS1JZCBvZiB0aGUgY2hhbmdlLgorfGBzdWJqZWN0YCAgICAgICAgICAgIHx8CitUaGUgc3ViamVjdCBvZiB0aGUgY2hhbmdlIChoZWFkZXIgbGluZSBvZiB0aGUgY29tbWl0IG1lc3NhZ2UpLgorfGBzdGF0dXNgICAgICAgICAgICAgIHx8CitUaGUgc3RhdHVzIG9mIHRoZSBjaGFuZ2UgKGBORVdgLCBgU1VCTUlUVEVEYCwgYE1FUkdFRGAsIGBBQkFORE9ORURgLAorYERSQUZUYCkuCit8YGNyZWF0ZWRgICAgICAgICAgICAgfHwKK1RoZSBsaW5rOnJlc3QtYXBpLmh0bWwjdGltZXN0YW1wW3RpbWVzdGFtcF0gb2Ygd2hlbiB0aGUgY2hhbmdlIHdhcworY3JlYXRlZC4KK3xgdXBkYXRlZGAgICAgICAgICAgICB8fAorVGhlIGxpbms6cmVzdC1hcGkuaHRtbCN0aW1lc3RhbXBbdGltZXN0YW1wXSBvZiB3aGVuIHRoZSBjaGFuZ2Ugd2FzIGxhc3QKK3VwZGF0ZWQuCit8YHN0YXJyZWRgICAgICAgICAgICAgfG5vdCBzZXQgaWYgYGZhbHNlYHwKK1doZXRoZXIgdGhlIGNhbGxpbmcgdXNlciBoYXMgc3RhcnJlZCB0aGlzIGNoYW5nZS4KK3xgcmV2aWV3ZWRgICAgICAgICAgICB8bm90IHNldCBpZiBgZmFsc2VgfAorV2hldGhlciB0aGUgY2hhbmdlIHdhcyByZXZpZXdlZCBieSB0aGUgY2FsbGluZyB1c2VyLgorfGBtZXJnZWFibGVgICAgICAgICAgIHxvcHRpb25hbHwKK1doZXRoZXIgdGhlIGNoYW5nZSBpcyBtZXJnZWFibGUuICsKK05vdCBzZXQgZm9yIG1lcmdlZCBjaGFuZ2VzLgorfGBfc29ydGtleWAgICAgICAgICAgIHx8VGhlIHNvcnRrZXkgb2YgdGhlIGNoYW5nZS4KK3xgX251bWJlcmAgICAgICAgICAgICB8fFRoZSBsZWdhY3kgbnVtZXJpYyBJRCBvZiB0aGUgY2hhbmdlLgorfGBvd25lcmAgICAgICAgICAgICAgIHx8CitUaGUgb3duZXIgb2YgdGhlIGNoYW5nZSBhcyBhbiBsaW5rOnJlc3QtYXBpLWFjY291bnRzLmh0bWwjYWNjb3VudC1pbmZvWworQWNjb3VudEluZm9dIGVudGl0eS4KK3xgbGFiZWxzYCAgICAgICAgICAgICB8b3B0aW9uYWx8CitUaGUgbGFiZWxzIG9mIHRoZSBjaGFuZ2UgYXMgYSBtYXAgdGhhdCBtYXBzIHRoZSBsYWJlbCBuYW1lcyB0bworbGluazojbGFiZWwtaW5mb1tMYWJlbEluZm9dIGVudHJpZXMuICsKK09ubHkgc2V0IGlmIGxpbms6I2xhYmVsc1tsYWJlbHNdIG9yIGxpbms6I2RldGFpbGVkLWxhYmVsc1tkZXRhaWxlZAorbGFiZWxzXSBhcmUgcmVxdWVzdGVkLgorfGBwZXJtaXR0ZWRfbGFiZWxzYCAgIHxvcHRpb25hbHwKK0EgbWFwIG9mIHRoZSBwZXJtaXR0ZWQgbGFiZWxzIHRoYXQgbWFwcyBhIGxhYmVsIG5hbWUgdG8gdGhlIGxpc3Qgb2YKK3ZhbHVlcyB0aGF0IGFyZSBhbGxvd2VkIGZvciB0aGF0IGxhYmVsLiArCitPbmx5IHNldCBpZiBsaW5rOiNkZXRhaWxlZC1sYWJlbHNbZGV0YWlsZWQgbGFiZWxzXSBhcmUgcmVxdWVzdGVkLgorfGByZW1vdmFibGVfcmV2aWV3ZXJzYHxvcHRpb25hbHwKK1RoZSByZXZpZXdlcnMgdGhhdCBjYW4gYmUgcmVtb3ZlZCBieSB0aGUgY2FsbGluZyB1c2VyIGFzIGEgbGlzdCBvZgorbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1tBY2NvdW50SW5mb10gZW50aXRpZXMuICsKK09ubHkgc2V0IGlmIGxpbms6I2RldGFpbGVkLWxhYmVsc1tkZXRhaWxlZCBsYWJlbHNdIGFyZSByZXF1ZXN0ZWQuCit8YGN1cnJlbnRfcmV2aXNpb25gICAgfG9wdGlvbmFsfAorVGhlIGNvbW1pdCBJRCBvZiB0aGUgY3VycmVudCBwYXRjaCBzZXQgb2YgdGhpcyBjaGFuZ2UuICsKK09ubHkgc2V0IGlmIGxpbms6I2N1cnJlbnQtcmV2aXNpb25bdGhlIGN1cnJlbnQgcmV2aXNpb25dIGlzIHJlcXVlc3RlZAorb3IgaWYgbGluazojYWxsLXJldmlzaW9uc1thbGwgcmV2aXNpb25zXSBhcmUgcmVxdWVzdGVkLgorfGByZXZpc2lvbnNgICAgICAgICAgIHxvcHRpb25hbHwKK0FsbCBwYXRjaCBzZXRzIG9mIHRoaXMgY2hhbmdlIGFzIGEgbWFwIHRoYXQgbWFwcyB0aGUgY29tbWl0IElEIG9mIHRoZQorcGF0Y2ggc2V0IHRvIGEgbGluazojcmV2aXNpb24taW5mb1tSZXZpc2lvbkluZm9dIGVudGl0eS4gKworT25seSBzZXQgaWYgbGluazojYWxsLXJldmlzaW9uc1thbGwgcmV2aXNpb25zXSBhcmUgcmVxdWVzdGVkLgorfGBfbW9yZV9jaGFuZ2VzYCAgICAgIHxvcHRpb25hbCwgbm90IHNldCBpZiBgZmFsc2VgfAorV2hldGhlciB0aGUgcXVlcnkgd291bGQgZGVsaXZlciBtb3JlIHJlc3VsdHMgaWYgbm90IGxpbWl0ZWQuICsKK09ubHkgc2V0IG9uIGVpdGhlciB0aGUgbGFzdCBvciB0aGUgZmlyc3QgY2hhbmdlIHRoYXQgaXMgcmV0dXJuZWQuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW2NvbW1lbnQtaW5mb11dCitDb21tZW50SW5mbworfn5+fn5+fn5+fn4KK1RoZSBgQ29tbWVudEluZm9gIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCBhbiBpbmxpbmUgY29tbWVudC4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSxeMSw1Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgIHx8RGVzY3JpcHRpb24KK3xga2luZGAgICAgICAgIHx8YGdlcnJpdGNvZGVyZXZpZXcjY29tbWVudGAKK3xgaWRgICAgICAgICAgIHx8VGhlIFVSTCBlbmNvZGVkIFVVSUQgb2YgdGhlIGRyYWZ0IGNvbW1lbnQuCit8YHBhdGhgICAgICAgICB8b3B0aW9uYWx8CitUaGUgcGF0aCBvZiB0aGUgZmlsZSBmb3Igd2hpY2ggdGhlIGlubGluZSBjb21tZW50IHdhcyBkb25lLiArCitOb3Qgc2V0IGlmIHJldHVybmVkIGluIGEgbWFwIHdoZXJlIHRoZSBrZXkgaXMgdGhlIGZpbGUgcGF0aC4KK3xgc2lkZWAgICAgICAgIHxvcHRpb25hbHwKK1RoZSBzaWRlIG9uIHdoaWNoIHRoZSBjb21tZW50IHdhcyBhZGRlZC4gKworQWxsb3dlZCB2YWx1ZXMgYXJlIGBSRVZJU0lPTmAgYW5kIGBQQVJFTlRgLiArCitJZiBub3Qgc2V0LCB0aGUgZGVmYXVsdCBpcyBgUkVWSVNJT05gLgorfGBsaW5lYCAgICAgICAgfG9wdGlvbmFsfAorVGhlIG51bWJlciBvZiB0aGUgbGluZSBmb3Igd2hpY2ggdGhlIGNvbW1lbnQgd2FzIGRvbmUuICsKK0lmIG5vdCBzZXQsIGl0J3MgYSBmaWxlIGNvbW1lbnQuCit8YGluX3JlcGx5X3RvYCB8b3B0aW9uYWx8CitUaGUgVVJMIGVuY29kZWQgVVVJRCBvZiB0aGUgY29tbWVudCB0byB3aGljaCB0aGlzIGNvbW1lbnQgaXMgYSByZXBseS4KK3xgbWVzc2FnZWAgICAgIHxvcHRpb25hbHxUaGUgY29tbWVudCBtZXNzYWdlLgorfGB1cGRhdGVkYCAgICAgfHwKK1RoZSBsaW5rOnJlc3QtYXBpLmh0bWwjdGltZXN0YW1wW3RpbWVzdGFtcF0gb2Ygd2hlbiB0aGlzIGNvbW1lbnQgd2FzCit3cml0dGVuLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW2NvbW1lbnQtaW5wdXRdXQorQ29tbWVudElucHV0Cit+fn5+fn5+fn5+fn4KK1RoZSBgQ29tbWl0SW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBmb3IgY3JlYXRpbmcgYW4gaW5saW5lCitjb21tZW50LgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfHxEZXNjcmlwdGlvbgorfGBraW5kYCAgICAgICAgfG9wdGlvbmFsfAorTXVzdCBiZSBgZ2Vycml0Y29kZXJldmlldyNjb21tZW50YCBpZiBwcm92aWRlZC4KK3xgaWRgICAgICAgICAgIHxvcHRpb25hbHwKK1RoZSBVUkwgZW5jb2RlZCBVVUlEIG9mIHRoZSBjb21tZW50IGlmIGFuIGV4aXN0aW5nIGRyYWZ0IGNvbW1lbnQgc2hvdWxkCitiZSB1cGRhdGVkLgorfGBwYXRoYCAgICAgICAgfG9wdGlvbmFsfAorVGhlIHBhdGggb2YgdGhlIGZpbGUgZm9yIHdoaWNoIHRoZSBpbmxpbmUgY29tbWVudCBzaG91bGQgYmUgYWRkZWQuICsKK0RvZXNuJ3QgbmVlZCB0byBiZSBzZXQgaWYgY29udGFpbmVkIGluIGEgbWFwIHdoZXJlIHRoZSBrZXkgaXMgdGhlIGZpbGUKK3BhdGguCit8YHNpZGVgICAgICAgICB8b3B0aW9uYWx8CitUaGUgc2lkZSBvbiB3aGljaCB0aGUgY29tbWVudCBzaG91bGQgYmUgYWRkZWQuICsKK0FsbG93ZWQgdmFsdWVzIGFyZSBgUkVWSVNJT05gIGFuZCBgUEFSRU5UYC4gKworSWYgbm90IHNldCwgdGhlIGRlZmF1bHQgaXMgYFJFVklTSU9OYC4KK3xgbGluZWAgICAgICAgIHxvcHRpb25hbHwKK1RoZSBudW1iZXIgb2YgdGhlIGxpbmUgZm9yIHdoaWNoIHRoZSBjb21tZW50IHNob3VsZCBiZSBhZGRlZC4gKworYDBgIGlmIGl0IGlzIGEgZmlsZSBjb21tZW50LiArCitJZiBub3Qgc2V0LCBhIGZpbGUgY29tbWVudCBpcyBhZGRlZC4KK3xgaW5fcmVwbHlfdG9gIHxvcHRpb25hbHwKK1RoZSBVUkwgZW5jb2RlZCBVVUlEIG9mIHRoZSBjb21tZW50IHRvIHdoaWNoIHRoaXMgY29tbWVudCBpcyBhIHJlcGx5LgorfGB1cGRhdGVkYCAgICAgfG9wdGlvbmFsfAorVGhlIGxpbms6cmVzdC1hcGkuaHRtbCN0aW1lc3RhbXBbdGltZXN0YW1wXSBvZiB0aGlzIGNvbW1lbnQuICsKK0FjY2VwdGVkIGJ1dCBpZ25vcmVkLgorfGBtZXNzYWdlYCAgICAgfG9wdGlvbmFsfAorVGhlIGNvbW1lbnQgbWVzc2FnZS4gKworSWYgbm90IHNldCBhbmQgYW4gZXhpc3RpbmcgZHJhZnQgY29tbWVudCBpcyB1cGRhdGVkLCB0aGUgZXhpc3RpbmcgZHJhZnQKK2NvbW1lbnQgaXMgZGVsZXRlZC4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1tjb21taXQtaW5mb11dCitDb21taXRJbmZvCit+fn5+fn5+fn5+CitUaGUgYENvbW1pdEluZm9gIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCBhIGNvbW1pdC4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSw2Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfERlc2NyaXB0aW9uCit8YGNvbW1pdGAgICAgICB8VGhlIGNvbW1pdCBJRC4KK3xgcGFyZW50YCAgICAgIHwKK1RoZSBwYXJlbnQgY29tbWl0cyBvZiB0aGlzIGNvbW1pdCBhcyBhIGxpc3Qgb2YKK2xpbms6I2NvbW1pdC1pbmZvW0NvbW1pdEluZm9dIGVudGl0aWVzLgorfGBhdXRob3JgICAgICAgfFRoZSBhdXRob3Igb2YgdGhlIGNvbW1pdCBhcyBhCitsaW5rOiNnaXQtcGVyc29uLWluZm9bR2l0UGVyc29uSW5mb10gZW50aXR5LgorfGBjb21taXR0ZXJgICAgfFRoZSBjb21taXR0ZXIgb2YgdGhlIGNvbW1pdCBhcyBhCitsaW5rOiNnaXQtcGVyc29uLWluZm9bR2l0UGVyc29uSW5mb10gZW50aXR5LgorfGBzdWJqZWN0YCAgICAgfAorVGhlIHN1YmplY3Qgb2YgdGhlIGNvbW1pdCAoaGVhZGVyIGxpbmUgb2YgdGhlIGNvbW1pdCBtZXNzYWdlKS4KK3xgbWVzc2FnZWAgICAgIHxUaGUgY29tbWl0IG1lc3NhZ2UuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1tmZXRjaC1pbmZvXV0KK0ZldGNoSW5mbworfn5+fn5+fn5+CitUaGUgYEZldGNoSW5mb2AgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IGhvdyB0byBmZXRjaCBhIHBhdGNoCitzZXQgdmlhIGEgY2VydGFpbiBwcm90b2NvbC4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSw2Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfERlc2NyaXB0aW9uCit8YHVybGAgICAgICAgICB8VGhlIFVSTCBvZiB0aGUgcHJvamVjdC4KK3xgcmVmYCAgICAgICAgIHxUaGUgcmVmIG9mIHRoZSBwYXRjaCBzZXQuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1tmaWxlLWluZm9dXQorRmlsZUluZm8KK35+fn5+fn5+CitUaGUgYEZpbGVJbmZvYCBlbnRpdHkgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQgYSBmaWxlIGluIGEgcGF0Y2ggc2V0LgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgIHx8RGVzY3JpcHRpb24KK3xgc3RhdHVzYCAgICAgICAgfG9wdGlvbmFsfAorVGhlIHN0YXR1cyBvZiB0aGUgZmlsZSAoImBBYCI9QWRkZWQsICJgRGAiPURlbGV0ZWQsICJgUmAiPVJlbmFtZWQsCisiYENgIj1Db3BpZWQsICJgV2AiPVJld3JpdHRlbikuICsKK05vdCBzZXQgaWYgdGhlIGZpbGUgd2FzIE1vZGlmaWVkICgiYE1gIikuCit8YGJpbmFyeWAgICAgICAgIHxub3Qgc2V0IGlmIGBmYWxzZWB8V2hldGhlciB0aGUgZmlsZSBpcyBiaW5hcnkuCit8YG9sZF9wYXRoYCAgICAgIHxvcHRpb25hbHwKK1RoZSBvbGQgZmlsZSBwYXRoLiArCitPbmx5IHNldCBpZiB0aGUgZmlsZSB3YXMgcmVuYW1lZCBvciBjb3BpZWQuCit8YGxpbmVzX2luc2VydGVkYHxvcHRpb25hbHwKK051bWJlciBvZiBpbnNlcnRlZCBsaW5lcy4gKworTm90IHNldCBmb3IgYmluYXJ5IGZpbGVzIG9yIGlmIG5vIGxpbmVzIHdlcmUgaW5zZXJ0ZWQuCit8YGxpbmVzX2RlbGV0ZWRgIHxvcHRpb25hbHwKK051bWJlciBvZiBkZWxldGVkIGxpbmVzLiArCitOb3Qgc2V0IGZvciBiaW5hcnkgZmlsZXMgb3IgaWYgbm8gbGluZXMgd2VyZSBkZWxldGVkLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbZ2l0LXBlcnNvbi1pbmZvXV0KK0dpdFBlcnNvbkluZm8KK35+fn5+fn5+fn5+fn4KK1RoZSBgR2l0UGVyc29uSW5mb2AgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IHRoZQorYXV0aG9yL2NvbW1pdHRlciBvZiBhIGNvbW1pdC4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSw2Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfERlc2NyaXB0aW9uCit8YG5hbWVgICAgICAgICB8VGhlIG5hbWUgb2YgdGhlIGF1dGhvci9jb21taXR0ZXIuCit8YGVtYWlsYCAgICAgICB8VGhlIGVtYWlsIGFkZHJlc3Mgb2YgdGhlIGF1dGhvci9jb21taXR0ZXIuCit8YGRhdGVgICAgICAgICB8VGhlIGxpbms6cmVzdC1hcGkuaHRtbCN0aW1lc3RhbXBbdGltZXN0YW1wXSBvZiB3aGVuCit0aGlzIGlkZW50aXR5IHdhcyBjb25zdHJ1Y3RlZC4KK3xgdHpgICAgICAgICAgIHxUaGUgdGltZXpvbmUgb2Zmc2V0IGZyb20gVVRDIG9mIHdoZW4gdGhpcyBpZGVudGl0eSB3YXMKK2NvbnN0cnVjdGVkLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbbGFiZWwtaW5mb11dCitMYWJlbEluZm8KK35+fn5+fn5+fgorVGhlIGBMYWJlbEluZm9gIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCBhIGxhYmVsIG9uIGEgY2hhbmdlLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfHxEZXNjcmlwdGlvbgorfGBhcHByb3ZlZGAgICAgfG9wdGlvbmFsfFRoZSB1c2VyIHdobyBhcHByb3ZlZCB0aGlzIGxhYmVsIG9uIHRoZSBjaGFuZ2UKK2FzIGEgbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1tBY2NvdW50SW5mb10gZW50aXR5LiArCitPbmx5IHNldCBpZiBsaW5rOiNsYWJlbHNbbGFiZWxzXSBhcmUgcmVxdWVzdGVkLgorfGByZWplY3RlZGAgICAgfG9wdGlvbmFsfFRoZSB1c2VyIHdobyByZWplY3RlZCB0aGlzIGxhYmVsIG9uIHRoZSBjaGFuZ2UKK2FzIGEgbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1tBY2NvdW50SW5mb10gZW50aXR5LiArCitPbmx5IHNldCBpZiBsaW5rOiNsYWJlbHNbbGFiZWxzXSBhcmUgcmVxdWVzdGVkLgorfGByZWNvbW1lbmRlZGAgfG9wdGlvbmFsfFRoZSB1c2VyIHdobyByZWNvbW1lbmRlZCB0aGlzIGxhYmVsIG9uIHRoZQorY2hhbmdlIGFzIGEgbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1tBY2NvdW50SW5mb10gZW50aXR5LiArCitPbmx5IHNldCBpZiBsaW5rOiNsYWJlbHNbbGFiZWxzXSBhcmUgcmVxdWVzdGVkLgorfGBkaXNsaWtlZGAgICAgfG9wdGlvbmFsfFRoZSB1c2VyIHdobyBkaXNsaWtlZCB0aGlzIGxhYmVsIG9uIHRoZSBjaGFuZ2UKK2FzIGEgbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1tBY2NvdW50SW5mb10gZW50aXR5LiArCitPbmx5IHNldCBpZiBsaW5rOiNsYWJlbHNbbGFiZWxzXSBhcmUgcmVxdWVzdGVkLgorfGB2YWx1ZWAgICAgICAgfG9wdGlvbmFsfFRoZSB2b3RpbmcgdmFsdWUgb2YgdGhlIHVzZXIgd2hvCityZWNvbW1lbmRlZC9kaXNsaWtlZCB0aGlzIGxhYmVsIG9uIHRoZSBjaGFuZ2UgaWYgaXQgaXMgbm90CisiYCsxYCIvImAtMWAiLiArCitPbmx5IHNldCBpZiBsaW5rOiNsYWJlbHNbbGFiZWxzXSBhcmUgcmVxdWVzdGVkLgorfGBvcHRpb25hbGAgICAgfG5vdCBzZXQgaWYgYGZhbHNlYHwKK1doZXRoZXIgdGhlIGxhYmVsIGlzIG9wdGlvbmFsLiBPcHRpb25hbCBtZWFucyB0aGUgbGFiZWwgbWF5IGJlIHNldCwgYnV0CitpdCdzIG5laXRoZXIgbmVjZXNzYXJ5IGZvciBzdWJtaXNzaW9uIG5vciBkb2VzIGl0IGJsb2NrIHN1Ym1pc3Npb24gaWYKK3NldC4KK3xgYWxsYCAgICAgICAgIHxvcHRpb25hbHxMaXN0IG9mIGFsbCBhcHByb3ZhbHMgZm9yIHRoaXMgbGFiZWwgYXMgYSBsaXN0CitvZiBsaW5rOiNhcHByb3ZhbC1pbmZvW0FwcHJvdmFsSW5mb10gZW50aXRpZXMuICsKK09ubHkgc2V0IGlmIGxpbms6I2RldGFpbGVkLWxhYmVsc1tkZXRhaWxlZCBsYWJlbHNdIGFyZSByZXF1ZXN0ZWQuCit8YHZhbHVlc2AgICAgICB8b3B0aW9uYWx8QSBtYXAgb2YgYWxsIHZhbHVlcyB0aGF0IGFyZSBhbGxvd2VkIGZvciB0aGlzCitsYWJlbC4gVGhlIG1hcCBtYXBzIHRoZSB2YWx1ZXMgKCJgLTJgIiwgImAtMWAiLCAiIGAwYCIsICJgKzFgIiwgImArMmAiKQordG8gdGhlIHZhbHVlIGRlc2NyaXB0aW9ucy4gKworT25seSBzZXQgaWYgbGluazojZGV0YWlsZWQtbGFiZWxzW2RldGFpbGVkIGxhYmVsc10gYXJlIHJlcXVlc3RlZC4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1tyZXN0b3JlLWlucHV0XV0KK1Jlc3RvcmVJbnB1dAorfn5+fn5+fn5+fn5+CitUaGUgYFJlc3RvcmVJbnB1dGAgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGZvciByZXN0b3JpbmcgYSBjaGFuZ2UuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICB8fERlc2NyaXB0aW9uCit8YG1lc3NhZ2VgICAgICB8b3B0aW9uYWx8CitNZXNzYWdlIHRvIGJlIGFkZGVkIGFzIHJldmlldyBjb21tZW50IHRvIHRoZSBjaGFuZ2Ugd2hlbiByZXN0b3JpbmcgdGhlCitjaGFuZ2UuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbcmV2ZXJ0LWlucHV0XV0KK1JldmVydElucHV0Cit+fn5+fn5+fn5+fgorVGhlIGBSZXZlcnRJbnB1dGAgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGZvciByZXZlcnRpbmcgYSBjaGFuZ2UuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICB8fERlc2NyaXB0aW9uCit8YG1lc3NhZ2VgICAgICB8b3B0aW9uYWx8CitNZXNzYWdlIHRvIGJlIGFkZGVkIGFzIHJldmlldyBjb21tZW50IHRvIHRoZSBjaGFuZ2Ugd2hlbiByZXZlcnRpbmcgdGhlCitjaGFuZ2UuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbcmV2aWV3LWluZm9dXQorUmV2aWV3SW5mbworfn5+fn5+fn5+fgorVGhlIGBSZXZpZXdJbmZvYCBlbnRpdHkgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQgYSByZXZpZXcuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsNiJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgfERlc2NyaXB0aW9uCit8YGxhYmVsc2AgICAgICAgfAorVGhlIGxhYmVscyBvZiB0aGUgcmV2aWV3IGFzIGEgbWFwIHRoYXQgbWFwcyB0aGUgbGFiZWwgbmFtZXMgdG8gdGhlCit2b3RpbmcgdmFsdWVzLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW3Jldmlldy1pbnB1dF1dCitSZXZpZXdJbnB1dAorfn5+fn5+fn5+fn4KK1RoZSBgUmV2aWV3SW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBmb3IgYWRkaW5nIGEgcmV2aWV3IHRvIGEKK3JldmlzaW9uLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgICB8fERlc2NyaXB0aW9uCit8YG1lc3NhZ2VgICAgICAgfG9wdGlvbmFsfAorVGhlIG1lc3NhZ2UgdG8gYmUgYWRkZWQgYXMgcmV2aWV3IGNvbW1lbnQuCit8YGxhYmVsc2AgICAgICAgfG9wdGlvbmFsfAorVGhlIHZvdGVzIHRoYXQgc2hvdWxkIGJlIGFkZGVkIHRvIHRoZSByZXZpc2lvbiBhcyBhIG1hcCB0aGF0IG1hcHMgdGhlCitsYWJlbCBuYW1lcyB0byB0aGUgdm90aW5nIHZhbHVlcy4KK3xgY29tbWVudHNgICAgICB8b3B0aW9uYWx8CitUaGUgY29tbWVudHMgdGhhdCBzaG91bGQgYmUgYWRkZWQgYXMgYSBtYXAgdGhhdCBtYXBzIGEgZmlsZSBwYXRoIHRvIGEKK2xpc3Qgb2YgbGluazojY29tbWVudC1pbnB1dFtDb21tZW50SW5wdXRdIGVudGl0aWVzLgorfGBzdHJpY3RfbGFiZWxzYHxgdHJ1ZWAgaWYgbm90IHNldHwKK1doZXRoZXIgYWxsIGxhYmVscyBhcmUgcmVxdWlyZWQgdG8gYmUgd2l0aGluIHRoZSB1c2VyJ3MgcGVybWl0dGVkIHJhbmdlcworYmFzZWQgb24gYWNjZXNzIGNvbnRyb2xzLiArCitJZiBgdHJ1ZWAsIGF0dGVtcHRpbmcgdG8gdXNlIGEgbGFiZWwgbm90IGdyYW50ZWQgdG8gdGhlIHVzZXIgd2lsbCBmYWlsCit0aGUgZW50aXJlIG1vZGlmeSBvcGVyYXRpb24gZWFybHkuICsKK0lmIGBmYWxzZWAsIHRoZSBvcGVyYXRpb24gd2lsbCBleGVjdXRlIGFueXdheSwgYnV0IHRoZSBwcm9wb3NlZCBsYWJlbHMKK3dpbGwgYmUgbW9kaWZpZWQgdG8gYmUgdGhlICJiZXN0IiB2YWx1ZSBhbGxvd2VkIGJ5IHRoZSBhY2Nlc3MgY29udHJvbHMuCit8YGRyYWZ0c2AgICAgICB8b3B0aW9uYWx8CitEcmFmdCBoYW5kbGluZyB0aGF0IGRlZmluZXMgaG93IGRyYWZ0IGNvbW1lbnRzIGFyZSBoYW5kbGVkIHRoYXQgYXJlCithbHJlYWR5IGluIHRoZSBkYXRhYmFzZSBidXQgdGhhdCB3ZXJlIG5vdCBhbHNvIGRlc2NyaWJlZCBpbiB0aGlzCitpbnB1dC4gKworQWxsb3dlZCB2YWx1ZXMgYXJlIGBERUxFVEVgLCBgUFVCTElTSGAgYW5kIGBLRUVQYC4gKworSWYgbm90IHNldCwgdGhlIGRlZmF1bHQgaXMgYERFTEVURWAuCit8YG5vdGlmeWAgICAgICB8b3B0aW9uYWx8CitOb3RpZnkgaGFuZGxpbmcgdGhhdCBkZWZpbmVzIHRvIHdob20gZW1haWwgbm90aWZpY2F0aW9ucyBzaG91bGQgYmUgc2VudAorYWZ0ZXIgdGhlIHJldmlldyBpcyBzdG9yZWQuICsKK0FsbG93ZWQgdmFsdWVzIGFyZSBgTk9ORWAsIGBPV05FUmAsIGBPV05FUl9SRVZJRVdFUlNgIGFuZCBgQUxMYC4gKworSWYgbm90IHNldCwgdGhlIGRlZmF1bHQgaXMgYEFMTGAuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW3Jldmlld2VyLWluZm9dXQorUmV2aWV3ZXJJbmZvCit+fn5+fn5+fn5+fn4KK1RoZSBgUmV2aWV3ZXJJbmZvYCBlbnRpdHkgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQgYSByZXZpZXdlciBhbmQgaXRzCit2b3RlcyBvbiBhIGNoYW5nZS4KKworYFJldmlld2VySW5mb2AgaGFzIHRoZSBzYW1lIGZpZWxkcyBhcworbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1tBY2NvdW50SW5mb10gYW5kIGluY2x1ZGVzCitsaW5rOiNkZXRhaWxlZC1hY2NvdW50c1tkZXRhaWxlZCBhY2NvdW50IGluZm9ybWF0aW9uXS4KK0luIGFkZGl0aW9uIGBSZXZpZXdlckluZm9gIGhhcyB0aGUgZm9sbG93aW5nIGZpZWxkczoKKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSw2Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfERlc2NyaXB0aW9uCit8YGtpbmRgICAgICAgICB8YGdlcnJpdGNvZGVyZXZpZXcjcmV2aWV3ZXJgCit8YGFwcHJvdmFsc2AgICB8CitUaGUgYXBwcm92YWxzIG9mIHRoZSByZXZpZXdlciBhcyBhIG1hcCB0aGF0IG1hcHMgdGhlIGxhYmVsIG5hbWVzIHRvIHRoZQorYXBwcm92YWwgdmFsdWVzICgiYC0yYCIsICJgLTFgIiwgIiBgMGAiLCAiYCsxYCIsICJgKzJgIikuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1tyZXZpZXdlci1pbnB1dF1dCitSZXZpZXdlcklucHV0Cit+fn5+fn5+fn5+fn5+CitUaGUgYFJldmlld2VySW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBmb3IgYWRkaW5nIGEgcmV2aWV3ZXIKK3RvIGEgY2hhbmdlLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfHxEZXNjcmlwdGlvbgorfGByZXZpZXdlcmAgICAgfHwKK1RoZSBsaW5rOnJlc3QtYXBpLWFjY291bnRzLmh0bWwjYWNjb3VudC1pZFtJRF0gb2Ygb25lIGFjY291bnQgdGhhdAorc2hvdWxkIGJlIGFkZGVkIGFzIHJldmlld2VyIG9yIHRoZSBsaW5rOnJlc3QtYXBpLWdyb3Vwcy5odG1sI2dyb3VwLWlkWworSURdIG9mIG9uZSBncm91cCBmb3Igd2hpY2ggYWxsIG1lbWJlcnMgc2hvdWxkIGJlIGFkZGVkIGFzIHJldmlld2Vycy4gKworSWYgYW4gSUQgaWRlbnRpZmllcyBib3RoIGFuIGFjY291bnQgYW5kIGEgZ3JvdXAsIG9ubHkgdGhlIGFjY291bnQgaXMKK2FkZGVkIGFzIHJldmlld2VyIHRvIHRoZSBjaGFuZ2UuCit8YGNvbmZpcm1lZGAgICB8b3B0aW9uYWx8CitXaGV0aGVyIGFkZGluZyB0aGUgcmV2aWV3ZXIgaXMgY29uZmlybWVkLiArCitUaGUgR2Vycml0IHNlcnZlciBtYXkgYmUgY29uZmlndXJlZCB0bworbGluazpjb25maWctZ2Vycml0Lmh0bWwjYWRkcmV2aWV3ZXIubWF4V2l0aG91dENvbmZpcm1hdGlvbltyZXF1aXJlIGEKK2NvbmZpcm1hdGlvbl0gd2hlbiBhZGRpbmcgYSBncm91cCBhcyByZXZpZXdlciB0aGF0IGhhcyBtYW55IG1lbWJlcnMuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbcmV2aXNpb24taW5mb11dCitSZXZpc2lvbkluZm8KK35+fn5+fn5+fn5+fgorVGhlIGBSZXZpc2lvbkluZm9gIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCBhIHBhdGNoIHNldC4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSxeMSw1Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgIHx8RGVzY3JpcHRpb24KK3xgZHJhZnRgICAgICAgIHxub3Qgc2V0IGlmIGBmYWxzZWB8V2hldGhlciB0aGUgcGF0Y2ggc2V0IGlzIGEgZHJhZnQuCit8YF9udW1iZXJgICAgICB8fFRoZSBwYXRjaCBzZXQgbnVtYmVyLgorfGBmZXRjaGAgICAgICAgfHwKK0luZm9ybWF0aW9uIGFib3V0IGhvdyB0byBmZXRjaCB0aGlzIHBhdGNoIHNldC4gVGhlIGZldGNoIGluZm9ybWF0aW9uIGlzCitwcm92aWRlZCBhcyBhIG1hcCB0aGF0IG1hcHMgdGhlIHByb3RvY29sIG5hbWUgKCJgZ2l0YCIsICJgaHR0cGAiLAorImBzc2hgIikgdG8gbGluazojZmV0Y2gtaW5mb1tGZXRjaEluZm9dIGVudGl0aWVzLgorfGBjb21taXRgICAgICAgfHxUaGUgY29tbWl0IG9mIHRoZSBwYXRjaCBzZXQgYXMKK2xpbms6I2NvbW1pdC1pbmZvW0NvbW1pdEluZm9dIGVudGl0eS4KK3xgZmlsZXNgICAgICAgIHx8CitUaGUgZmlsZXMgb2YgdGhlIHBhdGNoIHNldCBhcyBhIG1hcCB0aGF0IG1hcHMgdGhlIGZpbGUgbmFtZXMgdG8KK2xpbms6I2ZpbGUtaW5mb1tGaWxlSW5mb10gZW50aXRpZXMuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbcnVsZS1pbnB1dF1dCitSdWxlSW5wdXQKK35+fn5+fn5+fgorVGhlIGBSdWxlSW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiB0byB0ZXN0IGEgUHJvbG9nIHJ1bGUuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgIHx8RGVzY3JpcHRpb24KK3xgcnVsZWB8fAorUHJvbG9nIGNvZGUgdG8gZXhlY3V0ZSBpbnN0ZWFkIG9mIHRoZSBjb2RlIGluIGByZWZzL21ldGEvY29uZmlnYC4KK3xgZmlsdGVyc2B8YFJVTmAgaWYgbm90IHNldHwKK1doZW4gYFJVTmAgZmlsdGVyIHJ1bGVzIGluIHRoZSBwYXJlbnQgcHJvamVjdHMgYXJlIGNhbGxlZCB0bworcG9zdC1wcm9jZXNzIHRoZSByZXN1bHRzIG9mIHRoZSBwcm9qZWN0IHNwZWNpZmljIHJ1bGUuIFRoaXMKK2JlaGF2aW9yIG1hdGNoZXMgaG93IHRoZSBydWxlIHdpbGwgZXhlY3V0ZSBpZiBpbnN0YWxsZWQuICsKK0lmIGBTS0lQYCB0aGUgcGFyZW50IGZpbHRlcnMgYXJlIG5vdCBjYWxsZWQsIGFsbG93aW5nIHRoZSB0ZXN0Cit0byByZXR1cm4gcmVzdWx0cyBmcm9tIHRoZSBpbnB1dCBydWxlLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW3N1Ym1pdC1pbmZvXV0KK1N1Ym1pdEluZm8KK35+fn5+fn5+fn4KK1RoZSBgU3VibWl0SW5mb2AgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IHRoZSBjaGFuZ2Ugc3RhdHVzCithZnRlciBzdWJtaXR0aW5nLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLDYiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICB8RGVzY3JpcHRpb24KK3xgc3RhdHVzYCAgICAgIHwKK1RoZSBzdGF0dXMgb2YgdGhlIGNoYW5nZSBhZnRlciBzdWJtaXR0aW5nLCBjYW4gYmUgYE1FUkdFRGAgb3IKK2BTVUJNSVRURURgLiArCitJZiBgd2FpdF9mb3JfbWVyZ2VgIGluIHRoZSBsaW5rOiNzdWJtaXQtaW5wdXRbU3VibWl0SW5wdXRdIHdhcyBzZXQgdG8KK2BmYWxzZWAgdGhlIHJldHVybmVkIHN0YXR1cyBpcyBgU1VCTUlUVEVEYCBhbmQgdGhlIGNhbGxlciBjYW4ndCBrbm93Cit3aGV0aGVyIHRoZSBjaGFuZ2UgY291bGQgYmUgbWVyZ2VkIHN1Y2Nlc3NmdWxseS4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW3N1Ym1pdC1pbnB1dF1dCitTdWJtaXRJbnB1dAorfn5+fn5+fn5+fn4KK1RoZSBgU3VibWl0SW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBmb3Igc3VibWl0dGluZyBhIGNoYW5nZS4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSxeMSw1Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgICAgfHxEZXNjcmlwdGlvbgorfGB3YWl0X2Zvcl9tZXJnZWB8YGZhbHNlYCBpZiBub3Qgc2V0fAorV2hldGhlciB0aGUgcmVxdWVzdCBzaG91bGQgd2FpdCBmb3IgdGhlIG1lcmdlIHRvIGNvbXBsZXRlLiArCitJZiBgZmFsc2VgIHRoZSByZXF1ZXN0IHJldHVybnMgaW1tZWRpYXRlbHkgYWZ0ZXIgdGhlIGNoYW5nZSBoYXMgYmVlbgorYWRkZWQgdG8gdGhlIG1lcmdlIHF1ZXVlIGFuZCB0aGUgY2FsbGVyIGNhbid0IGtub3cgd2hldGhlciB0aGUgY2hhbmdlCitjb3VsZCBiZSBtZXJnZWQgc3VjY2Vzc2Z1bGx5LgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW3N1Ym1pdC1yZWNvcmRdXQorU3VibWl0UmVjb3JkCit+fn5+fn5+fn5+fn4KK1RoZSBgU3VibWl0UmVjb3JkYCBlbnRpdHkgZGVzY3JpYmVzIHJlc3VsdHMgZnJvbSBhIHN1Ym1pdF9ydWxlLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgICB8fERlc2NyaXB0aW9uCit8YHN0YXR1c2B8fAorYE9LYCwgdGhlIGNoYW5nZSBjYW4gYmUgc3VibWl0dGVkLiArCitgTk9UX1JFQURZYCwgYWRkaXRpb25hbCBsYWJlbHMgYXJlIHJlcXVpcmVkIGJlZm9yZSBzdWJtaXQuICsKK2BDTE9TRURgLCBjbG9zZWQgY2hhbmdlcyBjYW5ub3QgYmUgc3VibWl0dGVkLiArCitgUlVMRV9FUlJPUmAsIHJ1bGUgY29kZSBmYWlsZWQgd2l0aCBhbiBlcnJvci4KK3xgb2tgfG9wdGlvbmFsfAorTWFwIG9mIGxhYmVscyB0aGF0IGFyZSBhcHByb3ZlZDsgYW4KK2xpbms6cmVzdC1hcGktYWNjb3VudHMuaHRtbCNhY2NvdW50LWluZm9bQWNjb3VudEluZm9dIGlkZW50aWZpZXMgdGhlCit2b3RlciBjaG9zZW4gYnkgdGhlIHJ1bGUuCit8YHJlamVjdGB8b3B0aW9uYWx8CitNYXAgb2YgbGFiZWxzIHRoYXQgYXJlIHByZXZlbnRpbmcgc3VibWl0OworbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1tBY2NvdW50SW5mb10gaWRlbnRpZmllcyB2b3Rlci4KK3xgbmVlZGB8b3B0aW9uYWx8CitNYXAgb2YgbGFiZWxzIHRoYXQgbmVlZCB0byBiZSBnaXZlbiB0byBzdWJtaXQuIFRoZSB2YWx1ZSBpcworY3VycmVudGx5IGFuIGVtcHR5IG9iamVjdC4KK3xgbWF5YHxvcHRpb25hbHwKK01hcCBvZiBsYWJlbHMgdGhhdCBjYW4gYmUgdXNlZCwgYnV0IGRvIG5vdCBhZmZlY3Qgc3VibWl0LgorbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1tBY2NvdW50SW5mb10gaWRlbnRpZmllcyB2b3RlciwKK2lmIHRoZSBsYWJlbCBoYXMgYmVlbiBhcHBsaWVkLgorfGBpbXBvc3NpYmxlYHxvcHRpb25hbHwKK01hcCBvZiBsYWJlbHMgdGhhdCBzaG91bGQgaGF2ZSBiZWVuIGluIGBuZWVkYCBidXQgY2Fubm90IGJlCit1c2VkIGJ5IGFueSB1c2VyIGJlY2F1c2Ugb2YgYWNjZXNzIHJlc3RyaWN0aW9ucy4gVGhlIHZhbHVlCitpcyBjdXJyZW50bHkgYW4gZW1wdHkgb2JqZWN0LgorfGBlcnJvcl9tZXNzYWdlYHxvcHRpb25hbHwKK1doZW4gc3RhdHVzIGlzIFJVTEVfRVJST1IgdGhpcyBtZXNzYWdlIHByb3ZpZGVzIHNvbWUgdGV4dCBkZXNjcmliaW5nCit0aGUgZmFpbHVyZSBvZiB0aGUgcnVsZSBwcmVkaWNhdGUuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbdG9waWMtaW5wdXRdXQorVG9waWNJbnB1dAorfn5+fn5+fn5+fgorVGhlIGBUb3BpY0lucHV0YCBlbnRpdHkgY29udGFpbnMgaW5mb3JtYXRpb24gZm9yIHNldHRpbmcgYSB0b3BpYy4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSxeMSw1Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgIHx8RGVzY3JpcHRpb24KK3xgdG9waWNgICAgICAgIHxvcHRpb25hbHxUaGUgdG9waWMuICsKK1RoZSB0b3BpYyB3aWxsIGJlIGRlbGV0ZWQgaWYgbm90IHNldC4KK3xgbWVzc2FnZWAgICAgIHxvcHRpb25hbHwKK01lc3NhZ2UgdG8gYmUgYWRkZWQgYXMgcmV2aWV3IGNvbW1lbnQgdG8gdGhlIGNoYW5nZSB3aGVuIHNldHRpbmcgdGhlCit0b3BpYy4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworCitHRVJSSVQKKy0tLS0tLQorUGFydCBvZiBsaW5rOmluZGV4Lmh0bWxbR2Vycml0IENvZGUgUmV2aWV3XQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS1ncm91cHMudHh0IGIvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS1ncm91cHMudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU4MDBkNTYKLS0tIC9kZXYvbnVsbAorKysgYi9Eb2N1bWVudGF0aW9uL3Jlc3QtYXBpLWdyb3Vwcy50eHQKQEAgLTAsMCArMSwxMjI5IEBACitHZXJyaXQgQ29kZSBSZXZpZXcgLSAvZ3JvdXBzLyBSRVNUIEFQSQorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworVGhpcyBwYWdlIGRlc2NyaWJlcyB0aGUgZ3JvdXAgcmVsYXRlZCBSRVNUIGVuZHBvaW50cy4KK1BsZWFzZSBhbHNvIHRha2Ugbm90ZSBvZiB0aGUgZ2VuZXJhbCBpbmZvcm1hdGlvbiBvbiB0aGUKK2xpbms6cmVzdC1hcGkuaHRtbFtSRVNUIEFQSV0uCisKK1tbZ3JvdXAtZW5kcG9pbnRzXV0KK0dyb3VwIEVuZHBvaW50cworLS0tLS0tLS0tLS0tLS0tCisKK1tbbGlzdC1ncm91cHNdXQorTGlzdCBHcm91cHMKK35+fn5+fn5+fn5+CitbdmVyc2VdCisnR0VUIC9ncm91cHMvJworCitMaXN0cyB0aGUgZ3JvdXBzIGFjY2Vzc2libGUgYnkgdGhlIGNhbGxlci4gVGhpcyBpcyB0aGUgc2FtZSBhcwordXNpbmcgdGhlIGxpbms6Y21kLWxzLWdyb3Vwcy5odG1sW2xzLWdyb3Vwc10gY29tbWFuZCBvdmVyIFNTSCwKK2FuZCBhY2NlcHRzIHRoZSBzYW1lIG9wdGlvbnMgYXMgcXVlcnkgcGFyYW1ldGVycy4KKworQXMgcmVzdWx0IGEgbWFwIGlzIHJldHVybmVkIHRoYXQgbWFwcyB0aGUgZ3JvdXAgbmFtZXMgdG8KK2xpbms6I2dyb3VwLWluZm9bR3JvdXBJbmZvXSBlbnRyaWVzLiBUaGUgZW50cmllcyBpbiB0aGUgbWFwIGFyZSBzb3J0ZWQKK2J5IGdyb3VwIG5hbWUuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvZ3JvdXBzLyBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAiQWRtaW5pc3RyYXRvcnMiOiB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2dyb3VwIiwKKyAgICAgICJpZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IiwKKyAgICAgICJ1cmwiOiAiIy9hZG1pbi9ncm91cHMvdXVpZC02YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IiwKKyAgICAgICJvcHRpb25zIjogeworICAgICAgfSwKKyAgICAgICJkZXNjcmlwdGlvbiI6ICJHZXJyaXQgU2l0ZSBBZG1pbmlzdHJhdG9ycyIsCisgICAgICAiZ3JvdXBfaWQiOiAxLAorICAgICAgIm93bmVyIjogIkFkbWluaXN0cmF0b3JzIiwKKyAgICAgICJvd25lcl9pZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IgorICAgIH0sCisgICAgIkFub255bW91cyBVc2VycyI6IHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICAgImlkIjogImdsb2JhbCUzQUFub255bW91cy1Vc2VycyIsCisgICAgICAidXJsIjogIiMvYWRtaW4vZ3JvdXBzL3V1aWQtZ2xvYmFsJTNBQW5vbnltb3VzLVVzZXJzIiwKKyAgICAgICJvcHRpb25zIjogeworICAgICAgfSwKKyAgICAgICJkZXNjcmlwdGlvbiI6ICJBbnkgdXNlciwgc2lnbmVkLWluIG9yIG5vdCIsCisgICAgICAiZ3JvdXBfaWQiOiAyLAorICAgICAgIm93bmVyIjogIkFkbWluaXN0cmF0b3JzIiwKKyAgICAgICJvd25lcl9pZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IgorICAgIH0sCisgICAgIk15UHJvamVjdF9Db21taXR0ZXJzIjogeworICAgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNncm91cCIsCisgICAgICAiaWQiOiAiODM0ZWMzNmRkNWUwZWQyMWEyZmY1ZDdlMjI1NWRhMDgyZDYzYmJkNyIsCisgICAgICAidXJsIjogIiMvYWRtaW4vZ3JvdXBzL3V1aWQtODM0ZWMzNmRkNWUwZWQyMWEyZmY1ZDdlMjI1NWRhMDgyZDYzYmJkNyIsCisgICAgICAib3B0aW9ucyI6IHsKKyAgICAgICAgInZpc2libGVfdG9fYWxsIjogdHJ1ZSwKKyAgICAgIH0sCisgICAgICAiZ3JvdXBfaWQiOiA2LAorICAgICAgIm93bmVyIjogIk15UHJvamVjdF9Db21taXR0ZXJzIiwKKyAgICAgICJvd25lcl9pZCI6ICI4MzRlYzM2ZGQ1ZTBlZDIxYTJmZjVkN2UyMjU1ZGEwODJkNjNiYmQ3IgorICAgIH0sCisgICAgIk5vbi1JbnRlcmFjdGl2ZSBVc2VycyI6IHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICAgImlkIjogIjUwNTdmM2NiZDM1MTlkNmFiNjkzNjQ0MjlhODlmZmRmZmJhNTBmNzMiLAorICAgICAgInVybCI6ICIjL2FkbWluL2dyb3Vwcy91dWlkLTUwNTdmM2NiZDM1MTlkNmFiNjkzNjQ0MjlhODlmZmRmZmJhNTBmNzMiLAorICAgICAgIm9wdGlvbnMiOiB7CisgICAgICB9LAorICAgICAgImRlc2NyaXB0aW9uIjogIlVzZXJzIHdobyBwZXJmb3JtIGJhdGNoIGFjdGlvbnMgb24gR2Vycml0IiwKKyAgICAgICJncm91cF9pZCI6IDQsCisgICAgICAib3duZXIiOiAiQWRtaW5pc3RyYXRvcnMiLAorICAgICAgIm93bmVyX2lkIjogIjZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiCisgICAgfSwKKyAgICAiUHJvamVjdCBPd25lcnMiOiB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2dyb3VwIiwKKyAgICAgICJpZCI6ICJnbG9iYWwlM0FQcm9qZWN0LU93bmVycyIsCisgICAgICAidXJsIjogIiMvYWRtaW4vZ3JvdXBzL3V1aWQtZ2xvYmFsJTNBUHJvamVjdC1Pd25lcnMiLAorICAgICAgIm9wdGlvbnMiOiB7CisgICAgICB9LAorICAgICAgImRlc2NyaXB0aW9uIjogIkFueSBvd25lciBvZiB0aGUgcHJvamVjdCIsCisgICAgICAiZ3JvdXBfaWQiOiA1LAorICAgICAgIm93bmVyIjogIkFkbWluaXN0cmF0b3JzIiwKKyAgICAgICJvd25lcl9pZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IgorICAgIH0sCisgICAgIlJlZ2lzdGVyZWQgVXNlcnMiOiB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2dyb3VwIiwKKyAgICAgICJpZCI6ICJnbG9iYWwlM0FSZWdpc3RlcmVkLVVzZXJzIiwKKyAgICAgICJ1cmwiOiAiIy9hZG1pbi9ncm91cHMvdXVpZC1nbG9iYWwlM0FSZWdpc3RlcmVkLVVzZXJzIiwKKyAgICAgICJvcHRpb25zIjogeworICAgICAgfSwKKyAgICAgICJkZXNjcmlwdGlvbiI6ICJBbnkgc2lnbmVkLWluIHVzZXIiLAorICAgICAgImdyb3VwX2lkIjogMywKKyAgICAgICJvd25lciI6ICJBZG1pbmlzdHJhdG9ycyIsCisgICAgICAib3duZXJfaWQiOiAiNmExZTcwZTFhODg3ODI3NzFhOTE4MDhjOGFmOWJiYjdhOTg3MTM4OSIKKyAgICB9CisgIH0KKy0tLS0KKworLkdldCBhbGwgZ3JvdXBzCisqKioqCitnZXQ6Oi9ncm91cHMvCisqKioqCisKK1tbZ3JvdXAtb3B0aW9uc11dCitHcm91cCBPcHRpb25zCiteXl5eXl5eXl5eXl5eCitBZGRpdGlvbmFsIGZpZWxkcyBjYW4gYmUgb2J0YWluZWQgYnkgYWRkaW5nIGBvYCBwYXJhbWV0ZXJzLCBlYWNoIG9wdGlvbgorcmVxdWlyZXMgbW9yZSBsb29rdXBzIGFuZCBzbG93cyBkb3duIHRoZSBxdWVyeSByZXNwb25zZSB0aW1lIHRvIHRoZQorY2xpZW50IHNvIHRoZXkgYXJlIGdlbmVyYWxseSBkaXNhYmxlZCBieSBkZWZhdWx0LiBPcHRpb25hbCBmaWVsZHMgYXJlOgorCitbW2luY2x1ZGVzXV0KKy0tCisqIGBJTkNMVURFU2A6IGluY2x1ZGUgbGlzdCBvZiBkaXJlY3RseSBpbmNsdWRlZCBncm91cHMuCistLQorCitbW21lbWJlcnNdXQorLS0KKyogYE1FTUJFUlNgOiBpbmNsdWRlIGxpc3Qgb2YgZGlyZWN0IGdyb3VwIG1lbWJlcnMuCistLQorCitDaGVjayBpZiBhIGdyb3VwIGlzIG93bmVkIGJ5IHRoZSBjYWxsaW5nIHVzZXIKK15eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgorQnkgc2V0dGluZyB0aGUgb3B0aW9uIGBvd25lZGAgYW5kIHNwZWNpZnlpbmcgYSBncm91cCB0byBpbnNwZWN0IHdpdGgKK3RoZSBvcHRpb24gYHFgLCBpdCBpcyBwb3NzaWJsZSB0byBmaW5kIG91dCwgaWYgdGhpcyBncm91cCBpcyBvd25lZCBieQordGhlIGNhbGxpbmcgdXNlci4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9ncm91cHMvP293bmVkJnE9TXlQcm9qZWN0LUNvbW1pdHRlcnMgSFRUUC8xLjAKKy0tLS0KKworSWYgdGhlIGdyb3VwIGlzIG93bmVkIGJ5IHRoZSBjYWxsaW5nIHVzZXIsIHRoZSByZXR1cm5lZCBtYXAgY29udGFpbnMKK3RoaXMgZ3JvdXAuIElmIHRoZSBjYWxsaW5nIHVzZXIgZG9lc24ndCBvd24gdGhpcyBncm91cCBhbiBlbXB0eSBtYXAgaXMKK3JldHVybmVkLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAiTXlQcm9qZWN0LUNvbW1pdHRlcnMiOiB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2dyb3VwIiwKKyAgICAgICJpZCI6ICI5OTk5Yzk3MWJiNGFiODcyYWFiNzU5ZDhjNDk4MzNlZTZiOWZmMzIwIiwKKyAgICAgICJ1cmwiOiAiIy9hZG1pbi9ncm91cHMvdXVpZC05OTk5Yzk3MWJiNGFiODcyYWFiNzU5ZDhjNDk4MzNlZTZiOWZmMzIwIiwKKyAgICAgICJvcHRpb25zIjogeworICAgICAgICAidmlzaWJsZV90b19hbGwiOiB0cnVlCisgICAgICB9LAorICAgICAgImRlc2NyaXB0aW9uIjoiY29udGFpbnMgYWxsIGNvbW1pdHRlcnMgZm9yIE15UHJvamVjdCIsCisgICAgICAiZ3JvdXBfaWQiOiA1NTEsCisgICAgICAib3duZXIiOiAiTXlQcm9qZWN0LU93bmVycyIsCisgICAgICAib3duZXJfaWQiOiAiN2NhMDQyZjRkNTg0NzkzNmZjYjkwY2E5MTA1NzY3MzE1N2ZkMDZmYyIKKyAgICB9CisgIH0KKy0tLS0KKworW1tnZXQtZ3JvdXBdXQorR2V0IEdyb3VwCit+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dJworCitSZXRyaWV2ZXMgYSBncm91cC4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9ncm91cHMvNmExZTcwZTFhODg3ODI3NzFhOTE4MDhjOGFmOWJiYjdhOTg3MTM4OSBIVFRQLzEuMAorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I2dyb3VwLWluZm9bR3JvdXBJbmZvXSBlbnRpdHkgaXMgcmV0dXJuZWQgdGhhdAorZGVzY3JpYmVzIHRoZSBncm91cC4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICB7CisgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNncm91cCIsCisgICAgImlkIjogIjZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiLAorICAgICJuYW1lIjogIkFkbWluaXN0cmF0b3JzIiwKKyAgICAidXJsIjogIiMvYWRtaW4vZ3JvdXBzL3V1aWQtNmExZTcwZTFhODg3ODI3NzFhOTE4MDhjOGFmOWJiYjdhOTg3MTM4OSIsCisgICAgIm9wdGlvbnMiOiB7CisgICAgfSwKKyAgICAiZGVzY3JpcHRpb24iOiAiR2Vycml0IFNpdGUgQWRtaW5pc3RyYXRvcnMiLAorICAgICJncm91cF9pZCI6IDEsCisgICAgIm93bmVyIjogIkFkbWluaXN0cmF0b3JzIiwKKyAgICAib3duZXJfaWQiOiAiNmExZTcwZTFhODg3ODI3NzFhOTE4MDhjOGFmOWJiYjdhOTg3MTM4OSIKKyAgfQorLS0tLQorCitbW2NyZWF0ZS1ncm91cF1dCitDcmVhdGUgR3JvdXAKK35+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BVVCAvZ3JvdXBzL2xpbms6I2dyb3VwLW5hbWVbXHtncm91cC1uYW1lXH1dJworCitDcmVhdGVzIGEgbmV3IEdlcnJpdCBpbnRlcm5hbCBncm91cC4KKworSW4gdGhlIHJlcXVlc3QgYm9keSBhZGRpdGlvbmFsIGRhdGEgZm9yIHRoZSBncm91cCBjYW4gYmUgcHJvdmlkZWQgYXMKK2xpbms6I2dyb3VwLWlucHV0W0dyb3VwSW5wdXRdLgorCisuUmVxdWVzdAorLS0tLQorICBQVVQgL2dyb3Vwcy9NeVByb2plY3QtQ29tbWl0dGVycyBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAiZGVzY3JpcHRpb24iOiAiY29udGFpbnMgYWxsIGNvbW1pdHRlcnMgZm9yIE15UHJvamVjdCIsCisgICAgInZpc2libGVfdG9fYWxsIjogdHJ1ZSwKKyAgICAib3duZXIiOiAiTXlQcm9qZWN0LU93bmVycyIsCisgICAgIm93bmVyX2lkIjogIjdjYTA0MmY0ZDU4NDc5MzZmY2I5MGNhOTEwNTc2NzMxNTdmZDA2ZmMiCisgIH0KKy0tLS0KKworQXMgcmVzcG9uc2UgdGhlIGxpbms6I2dyb3VwLWluZm9bR3JvdXBJbmZvXSBlbnRpdHkgaXMgcmV0dXJuZWQgdGhhdAorZGVzY3JpYmVzIHRoZSBjcmVhdGVkIGdyb3VwLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAxIENyZWF0ZWQKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICJpZCI6ICI5OTk5Yzk3MWJiNGFiODcyYWFiNzU5ZDhjNDk4MzNlZTZiOWZmMzIwIiwKKyAgICAibmFtZSI6ICJNeVByb2plY3QtQ29tbWl0dGVycyIsCisgICAgInVybCI6ICIjL2FkbWluL2dyb3Vwcy91dWlkLTk5OTljOTcxYmI0YWI4NzJhYWI3NTlkOGM0OTgzM2VlNmI5ZmYzMjAiLAorICAgICJvcHRpb25zIjogeworICAgICAgInZpc2libGVfdG9fYWxsIjogdHJ1ZQorICAgIH0sCisgICAgImRlc2NyaXB0aW9uIjoiY29udGFpbnMgYWxsIGNvbW1pdHRlcnMgZm9yIE15UHJvamVjdCIsCisgICAgImdyb3VwX2lkIjogNTUxLAorICAgICJvd25lciI6ICJNeVByb2plY3QtT3duZXJzIiwKKyAgICAib3duZXJfaWQiOiAiN2NhMDQyZjRkNTg0NzkzNmZjYjkwY2E5MTA1NzY3MzE1N2ZkMDZmYyIKKyAgfQorLS0tLQorCitJZiB0aGUgZ3JvdXAgY3JlYXRpb24gZmFpbHMgYmVjYXVzZSB0aGUgbmFtZSBpcyBhbHJlYWR5IGluIHVzZSB0aGUKK3Jlc3BvbnNlIGlzICJgNDA5IENvbmZsaWN0YCIuCisKK1tbZ2V0LWdyb3VwLWRldGFpbF1dCitHZXQgR3JvdXAgRGV0YWlsCit+fn5+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnR0VUIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9kZXRhaWwnCisKK1JldHJpZXZlcyBhIGdyb3VwIHdpdGggdGhlIGRpcmVjdCBsaW5rOiNtZW1iZXJzW21lbWJlcnNdIGFuZCB0aGUKK2RpcmVjdGx5IGxpbms6I2luY2x1ZGVzW2luY2x1ZGVkIGdyb3Vwc10uCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvZ3JvdXBzLzZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkvZGV0YWlsIEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3BvbnNlIGEgbGluazojZ3JvdXAtaW5mb1tHcm91cEluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIGdyb3VwLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2dyb3VwIiwKKyAgICAiaWQiOiAiNmExZTcwZTFhODg3ODI3NzFhOTE4MDhjOGFmOWJiYjdhOTg3MTM4OSIsCisgICAgIm5hbWUiOiAiQWRtaW5pc3RyYXRvcnMiLAorICAgICJ1cmwiOiAiIy9hZG1pbi9ncm91cHMvdXVpZC02YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IiwKKyAgICAib3B0aW9ucyI6IHsKKyAgICB9LAorICAgICJkZXNjcmlwdGlvbiI6ICJHZXJyaXQgU2l0ZSBBZG1pbmlzdHJhdG9ycyIsCisgICAgImdyb3VwX2lkIjogMSwKKyAgICAib3duZXIiOiAiQWRtaW5pc3RyYXRvcnMiLAorICAgICJvd25lcl9pZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IiwKKyAgICAibWVtYmVycyI6IFsKKyAgICAgIHsKKyAgICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NywKKyAgICAgICAgIm5hbWUiOiAiSmFuZSBSb2UiLAorICAgICAgICAiZW1haWwiOiAiamFuZS5yb2VAZXhhbXBsZS5jb20iCisgICAgICB9LAorICAgICAgeworICAgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk2LAorICAgICAgICAibmFtZSI6ICJKb2huIERvZSIsCisgICAgICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgICAgIH0KKyAgICBdLAorICAgICJpbmNsdWRlcyI6IFtdCisgIH0KKy0tLS0KKworW1tnZXQtZ3JvdXAtbmFtZV1dCitHZXQgR3JvdXAgTmFtZQorfn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dL25hbWUnCisKK1JldHJpZXZlcyB0aGUgbmFtZSBvZiBhIGdyb3VwLgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL2dyb3Vwcy85OTk5Yzk3MWJiNGFiODcyYWFiNzU5ZDhjNDk4MzNlZTZiOWZmMzIwL25hbWUgSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICAiTXlQcm9qZWN0LUNvbW1pdHRlcnMiCistLS0tCisKK1tbcmVuYW1lLWdyb3VwXV0KK1JlbmFtZSBHcm91cAorfn5+fn5+fn5+fn5+CitbdmVyc2VdCisnUFVUIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9uYW1lJworCitSZW5hbWVzIGEgR2Vycml0IGludGVybmFsIGdyb3VwLgorCitUaGUgbmV3IGdyb3VwIG5hbWUgbXVzdCBiZSBwcm92aWRlZCBpbiB0aGUgcmVxdWVzdCBib2R5LgorCisuUmVxdWVzdAorLS0tLQorICBQVVQgL2dyb3Vwcy9NeVByb2plY3QtQ29tbWl0dGVycy9uYW1lIEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJuYW1lIjogIk15LVByb2plY3QtQ29tbWl0dGVycyIKKyAgfQorLS0tLQorCitBcyByZXNwb25zZSB0aGUgbmV3IGdyb3VwIG5hbWUgaXMgcmV0dXJuZWQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgIk15LVByb2plY3QtQ29tbWl0dGVycyIKKy0tLS0KKworSWYgcmVuYW1pbmcgdGhlIGdyb3VwIGZhaWxzIGJlY2F1c2UgdGhlIG5ldyBuYW1lIGlzIGFscmVhZHkgaW4gdXNlIHRoZQorcmVzcG9uc2UgaXMgImA0MDkgQ29uZmxpY3RgIi4KKworW1tnZXQtZ3JvdXAtZGVzY3JpcHRpb25dXQorR2V0IEdyb3VwIERlc2NyaXB0aW9uCit+fn5+fn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dL2Rlc2NyaXB0aW9uJworCitSZXRyaWV2ZXMgdGhlIGRlc2NyaXB0aW9uIG9mIGEgZ3JvdXAuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvZ3JvdXBzLzk5OTljOTcxYmI0YWI4NzJhYWI3NTlkOGM0OTgzM2VlNmI5ZmYzMjAvZGVzY3JpcHRpb24gSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICAiY29udGFpbnMgYWxsIGNvbW1pdHRlcnMgZm9yIE15UHJvamVjdCIKKy0tLS0KKworSWYgdGhlIGdyb3VwIGRvZXMgbm90IGhhdmUgYSBkZXNjcmlwdGlvbiBhbiBlbXB0eSBzdHJpbmcgaXMgcmV0dXJuZWQuCisKK1tbc2V0LWdyb3VwLWRlc2NyaXB0aW9uXV0KK1NldCBHcm91cCBEZXNjcmlwdGlvbgorfn5+fn5+fn5+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnUFVUIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9kZXNjcmlwdGlvbicKKworU2V0cyB0aGUgZGVzY3JpcHRpb24gb2YgYSBHZXJyaXQgaW50ZXJuYWwgZ3JvdXAuCisKK1RoZSBuZXcgZ3JvdXAgZGVzY3JpcHRpb24gbXVzdCBiZSBwcm92aWRlZCBpbiB0aGUgcmVxdWVzdCBib2R5LgorCisuUmVxdWVzdAorLS0tLQorICBQVVQgL2dyb3Vwcy85OTk5Yzk3MWJiNGFiODcyYWFiNzU5ZDhjNDk4MzNlZTZiOWZmMzIwL2Rlc2NyaXB0aW9uIEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJkZXNjcmlwdGlvbiI6ICJUaGUgY29tbWl0dGVycyBvZiBNeVByb2plY3QuIgorICB9CistLS0tCisKK0FzIHJlc3BvbnNlIHRoZSBuZXcgZ3JvdXAgZGVzY3JpcHRpb24gaXMgcmV0dXJuZWQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgIlRoZSBjb21taXR0ZXJzIG9mIE15UHJvamVjdC4iCistLS0tCisKK0lmIHRoZSBkZXNjcmlwdGlvbiB3YXMgZGVsZXRlZCB0aGUgcmVzcG9uc2UgaXMgImAyMDQgTm8gQ29udGVudGAiLgorCitbW2RlbGV0ZS1ncm91cC1kZXNjcmlwdGlvbl1dCitEZWxldGUgR3JvdXAgRGVzY3JpcHRpb24KK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0RFTEVURSAvZ3JvdXBzL2xpbms6I2dyb3VwLWlkW1x7Z3JvdXAtaWRcfV0vZGVzY3JpcHRpb24nCisKK0RlbGV0ZXMgdGhlIGRlc2NyaXB0aW9uIG9mIGEgR2Vycml0IGludGVybmFsIGdyb3VwLgorCisuUmVxdWVzdAorLS0tLQorICBERUxFVEUgL2dyb3Vwcy85OTk5Yzk3MWJiNGFiODcyYWFiNzU5ZDhjNDk4MzNlZTZiOWZmMzIwL2Rlc2NyaXB0aW9uIEhUVFAvMS4wCistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDQgTm8gQ29udGVudAorLS0tLQorCitbW2dldC1ncm91cC1vcHRpb25zXV0KK0dldCBHcm91cCBPcHRpb25zCit+fn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvZ3JvdXBzL2xpbms6I2dyb3VwLWlkW1x7Z3JvdXAtaWRcfV0vb3B0aW9ucycKKworUmV0cmlldmVzIHRoZSBvcHRpb25zIG9mIGEgZ3JvdXAuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvZ3JvdXBzLzk5OTljOTcxYmI0YWI4NzJhYWI3NTlkOGM0OTgzM2VlNmI5ZmYzMjAvb3B0aW9ucyBIVFRQLzEuMAorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I2dyb3VwLW9wdGlvbnMtaW5mb1tHcm91cE9wdGlvbnNJbmZvXSBlbnRpdHkgaXMKK3JldHVybmVkIHRoYXQgZGVzY3JpYmVzIHRoZSBvcHRpb25zIG9mIHRoZSBncm91cC4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICB7CisgICAgInZpc2libGVfdG9fYWxsIjogdHJ1ZQorICB9CistLS0tCisKK1tbc2V0LWdyb3VwLW9wdGlvbnNdXQorU2V0IEdyb3VwIE9wdGlvbnMKK35+fn5+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnUFVUIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9vcHRpb25zJworCitTZXRzIHRoZSBvcHRpb25zIG9mIGEgR2Vycml0IGludGVybmFsIGdyb3VwLgorCitUaGUgbmV3IGdyb3VwIG9wdGlvbnMgbXVzdCBiZSBwcm92aWRlZCBpbiB0aGUgcmVxdWVzdCBib2R5IGFzIGEKK2xpbms6I2dyb3VwLW9wdGlvbnMtaW5wdXRbR3JvdXBPcHRpb25zSW5wdXRdIGVudGl0eS4KKworLlJlcXVlc3QKKy0tLS0KKyAgUFVUIC9ncm91cHMvOTk5OWM5NzFiYjRhYjg3MmFhYjc1OWQ4YzQ5ODMzZWU2YjlmZjMyMC9vcHRpb25zIEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJ2aXNpYmxlX3RvX2FsbCI6IHRydWUKKyAgfQorLS0tLQorCitBcyByZXNwb25zZSB0aGUgbmV3IGdyb3VwIG9wdGlvbnMgYXJlIHJldHVybmVkIGFzIGEKK2xpbms6I2dyb3VwLW9wdGlvbnMtaW5mb1tHcm91cE9wdGlvbnNJbmZvXSBlbnRpdHkuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJ2aXNpYmxlX3RvX2FsbCI6IHRydWUKKyAgfQorLS0tLQorCitbW2dldC1ncm91cC1vd25lcl1dCitHZXQgR3JvdXAgT3duZXIKK35+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvZ3JvdXBzL2xpbms6I2dyb3VwLWlkW1x7Z3JvdXAtaWRcfV0vb3duZXInCisKK1JldHJpZXZlcyB0aGUgb3duZXIgZ3JvdXAgb2YgYSBHZXJyaXQgaW50ZXJuYWwgZ3JvdXAuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvZ3JvdXBzLzk5OTljOTcxYmI0YWI4NzJhYWI3NTlkOGM0OTgzM2VlNmI5ZmYzMjAvb3duZXIgSFRUUC8xLjAKKy0tLS0KKworQXMgcmVzcG9uc2UgYSBsaW5rOiNncm91cC1pbmZvW0dyb3VwSW5mb10gZW50aXR5IGlzIHJldHVybmVkIHRoYXQKK2Rlc2NyaWJlcyB0aGUgb3duZXIgZ3JvdXAuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICJpZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IiwKKyAgICAibmFtZSI6ICJBZG1pbmlzdHJhdG9ycyIsCisgICAgInVybCI6ICIjL2FkbWluL2dyb3Vwcy91dWlkLTZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiLAorICAgICJvcHRpb25zIjogeworICAgIH0sCisgICAgImRlc2NyaXB0aW9uIjogIkdlcnJpdCBTaXRlIEFkbWluaXN0cmF0b3JzIiwKKyAgICAiZ3JvdXBfaWQiOiAxLAorICAgICJvd25lciI6ICJBZG1pbmlzdHJhdG9ycyIsCisgICAgIm93bmVyX2lkIjogIjZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiCisgIH0KKy0tLS0KKworW1tzZXQtZ3JvdXAtb3duZXJdXQorU2V0IEdyb3VwIE93bmVyCit+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQVVQgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dL293bmVyJworCitTZXRzIHRoZSBvd25lciBncm91cCBvZiBhIEdlcnJpdCBpbnRlcm5hbCBncm91cC4KKworVGhlIG5ldyBvd25lciBncm91cCBtdXN0IGJlIHByb3ZpZGVkIGluIHRoZSByZXF1ZXN0IGJvZHkuCisKK1RoZSBuZXcgb3duZXIgY2FuIGJlIHNwZWNpZmllZCBieSBuYW1lLCBieSBncm91cCBVVUlEIG9yIGJ5IHRoZSBsZWdhY3kKK251bWVyaWMgZ3JvdXAgSUQuCisKKy5SZXF1ZXN0CistLS0tCisgIFBVVCAvZ3JvdXBzLzk5OTljOTcxYmI0YWI4NzJhYWI3NTlkOGM0OTgzM2VlNmI5ZmYzMjAvZGVzY3JpcHRpb24gSFRUUC8xLjAKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICB7CisgICAgIm93bmVyIjogIjZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiCisgIH0KKy0tLS0KKworQXMgcmVzcG9uc2UgYSBsaW5rOiNncm91cC1pbmZvW0dyb3VwSW5mb10gZW50aXR5IGlzIHJldHVybmVkIHRoYXQKK2Rlc2NyaWJlcyB0aGUgbmV3IG93bmVyIGdyb3VwLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2dyb3VwIiwKKyAgICAiaWQiOiAiNmExZTcwZTFhODg3ODI3NzFhOTE4MDhjOGFmOWJiYjdhOTg3MTM4OSIsCisgICAgIm5hbWUiOiAiQWRtaW5pc3RyYXRvcnMiLAorICAgICJ1cmwiOiAiIy9hZG1pbi9ncm91cHMvdXVpZC02YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IiwKKyAgICAib3B0aW9ucyI6IHsKKyAgICB9LAorICAgICJkZXNjcmlwdGlvbiI6ICJHZXJyaXQgU2l0ZSBBZG1pbmlzdHJhdG9ycyIsCisgICAgImdyb3VwX2lkIjogMSwKKyAgICAib3duZXIiOiAiQWRtaW5pc3RyYXRvcnMiLAorICAgICJvd25lcl9pZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IgorICB9CistLS0tCisKK1tbZ3JvdXAtbWVtYmVyLWVuZHBvaW50c11dCitHcm91cCBNZW1iZXIgRW5kcG9pbnRzCistLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisKK1tbZ3JvdXAtbWVtYmVyc11dCitMaXN0IEdyb3VwIE1lbWJlcnMKK35+fn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvZ3JvdXBzL2xpbms6I2dyb3VwLWlkW1x7Z3JvdXAtaWRcfV0vbWVtYmVycy8nCisKK0xpc3RzIHRoZSBkaXJlY3QgbWVtYmVycyBvZiBhIEdlcnJpdCBpbnRlcm5hbCBncm91cC4KKworQXMgcmVzdWx0IGEgbGlzdCBvZiBkZXRhaWxlZCBsaW5rOnJlc3QtYXBpLWFjY291bnRzLmh0bWwjYWNjb3VudC1pbmZvWworQWNjb3VudEluZm9dIGVudHJpZXMgaXMgcmV0dXJuZWQuIFRoZSBlbnRyaWVzIGluIHRoZSBsaXN0IGFyZSBzb3J0ZWQgYnkKK2Z1bGwgbmFtZSwgcHJlZmVycmVkIGVtYWlsIGFuZCBpZC4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9ncm91cHMvODM0ZWMzNmRkNWUwZWQyMWEyZmY1ZDdlMjI1NWRhMDgyZDYzYmJkNy9tZW1iZXJzLyBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIFsKKyAgICB7CisgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk3LAorICAgICAgIm5hbWUiOiAiSmFuZSBSb2UiLAorICAgICAgImVtYWlsIjogImphbmUucm9lQGV4YW1wbGUuY29tIgorICAgIH0sCisgICAgeworICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NiwKKyAgICAgICJuYW1lIjogIkpvaG4gRG9lIiwKKyAgICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgICB9CisgIF0KKy0tLS0KKworLkdldCBhbGwgbWVtYmVycyBvZiB0aGUgJ0FkbWluaXN0cmF0b3JzJyBncm91cCAobm9ybWFsbHkgZ3JvdXAgaWQgPSAxKQorKioqKgorZ2V0OjovZ3JvdXBzLzEvbWVtYmVycy8KKyoqKioKKworVG8gcmVzb2x2ZSB0aGUgaW5jbHVkZWQgZ3JvdXBzIG9mIGEgZ3JvdXAgcmVjdXJzaXZlbHkgYW5kIHRvIGxpc3QgYWxsCittZW1iZXJzIHRoZSBwYXJhbWV0ZXIgYHJlY3Vyc2l2ZWAgY2FuIGJlIHNldC4KKworTWVtYmVycyBmcm9tIGluY2x1ZGVkIGV4dGVybmFsIGdyb3VwcyBhbmQgZnJvbSBpbmNsdWRlZCBncm91cHMgd2hpY2gKK2FyZSBub3QgdmlzaWJsZSB0byB0aGUgY2FsbGluZyB1c2VyIGFyZSBpZ25vcmVkLgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL2dyb3Vwcy84MzRlYzM2ZGQ1ZTBlZDIxYTJmZjVkN2UyMjU1ZGEwODJkNjNiYmQ3L21lbWJlcnMvP3JlY3Vyc2l2ZSBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIFsKKyAgICB7CisgICAgICAiX2FjY291bnRfaWQiOiAxMDAwMDk3LAorICAgICAgIm5hbWUiOiAiSmFuZSBSb2UiLAorICAgICAgImVtYWlsIjogImphbmUucm9lQGV4YW1wbGUuY29tIgorICAgIH0sCisgICAgeworICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA5NiwKKyAgICAgICJuYW1lIjogIkpvaG4gRG9lIiwKKyAgICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgICB9LAorICAgIHsKKyAgICAgICJfYWNjb3VudF9pZCI6IDEwMDAwOTgsCisgICAgICAibmFtZSI6ICJSaWNoYXJkIFJvZSIsCisgICAgICAiZW1haWwiOiAicmljaGFyZC5yb2VAZXhhbXBsZS5jb20iCisgICAgfQorICBdCistLS0tCisKK1tbZ2V0LWdyb3VwLW1lbWJlcl1dCitHZXQgR3JvdXAgTWVtYmVyCit+fn5+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnR0VUIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9tZW1iZXJzL2xpbms6cmVzdC1hcGktYWNjb3VudHMuaHRtbCNhY2NvdW50LWlkW1x7YWNjb3VudC1pZFx9XScKKworUmV0cmlldmVzIGEgZ3JvdXAgbWVtYmVyLgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL2dyb3Vwcy84MzRlYzM2ZGQ1ZTBlZDIxYTJmZjVkN2UyMjU1ZGEwODJkNjNiYmQ3L21lbWJlcnMvMTAwMDA5NiBIVFRQLzEuMAorLS0tLQorCitBcyByZXNwb25zZSBhIGRldGFpbGVkIGxpbms6cmVzdC1hcGktYWNjb3VudHMuaHRtbCNhY2NvdW50LWluZm9bCitBY2NvdW50SW5mb10gZW50aXR5IGlzIHJldHVybmVkIHRoYXQgZGVzY3JpYmVzIHRoZSBncm91cCBtZW1iZXIuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJfYWNjb3VudF9pZCI6IDEwMDAwOTYsCisgICAgIm5hbWUiOiAiSm9obiBEb2UiLAorICAgICJlbWFpbCI6ICJqb2huLmRvZUBleGFtcGxlLmNvbSIKKyAgfQorLS0tLQorCitbW2FkZC1ncm91cC1tZW1iZXJdXQorQWRkIEdyb3VwIE1lbWJlcgorfn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BVVCAvZ3JvdXBzL2xpbms6I2dyb3VwLWlkW1x7Z3JvdXAtaWRcfV0vbWVtYmVycy9saW5rOnJlc3QtYXBpLWFjY291bnRzLmh0bWwjYWNjb3VudC1pZFtce2FjY291bnQtaWRcfV0nCisKK0FkZHMgYSB1c2VyIGFzIG1lbWJlciB0byBhIEdlcnJpdCBpbnRlcm5hbCBncm91cC4KKworLlJlcXVlc3QKKy0tLS0KKyAgUFVUIC9ncm91cHMvTXlQcm9qZWN0LUNvbW1pdHRlcnMvbWVtYmVycy9Kb2huJTIwRG9lIEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3BvbnNlIGEgZGV0YWlsZWQgbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaW5mb1sKK0FjY291bnRJbmZvXSBlbnRpdHkgaXMgcmV0dXJuZWQgdGhhdCBkZXNjcmliZXMgdGhlIGdyb3VwIG1lbWJlci4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMSBDcmVhdGVkCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAiX2FjY291bnRfaWQiOiAxMDAwMDM3LAorICAgICJuYW1lIjogIkpvaG4gRG9lIiwKKyAgICAiZW1haWwiOiAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgIH0KKy0tLS0KKworVGhlIHJlcXVlc3QgYWxzbyBzdWNjZWVkcyBpZiB0aGUgdXNlciBpcyBhbHJlYWR5IGEgbWVtYmVyIG9mIHRoaXMKK2dyb3VwLCBidXQgdGhlbiB0aGUgSFRUUCByZXNwb25zZSBjb2RlIGlzIGAyMDAgT0tgLgorCitBZGQgR3JvdXAgTWVtYmVycworfn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQT1NUIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9tZW1iZXJzJworCitPUgorCitbdmVyc2VdCisnUE9TVCAvZ3JvdXBzL2xpbms6I2dyb3VwLWlkW1x7Z3JvdXAtaWRcfV0vbWVtYmVycy5hZGQnCisKK0FkZHMgb25lIG9yIHNldmVyYWwgdXNlcnMgdG8gYSBHZXJyaXQgaW50ZXJuYWwgZ3JvdXAuCisKK1RoZSB1c2VycyB0byBiZSBhZGRlZCB0byB0aGUgZ3JvdXAgbXVzdCBiZSBwcm92aWRlZCBpbiB0aGUgcmVxdWVzdCBib2R5CithcyBhIGxpbms6I21lbWJlcnMtaW5wdXRbTWVtYmVyc0lucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBPU1QgL2dyb3Vwcy9NeVByb2plY3QtQ29tbWl0dGVycy9tZW1iZXJzLmFkZCBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAibWVtYmVycyI6IHsKKyAgICAgICJqYW5lLnJvZUBleGFtcGxlLmNvbSIsCisgICAgICAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgICAgfQorICB9CistLS0tCisKK0FzIHJlc3BvbnNlIGEgbGlzdCBvZiBkZXRhaWxlZCBsaW5rOnJlc3QtYXBpLWFjY291bnRzLmh0bWwjYWNjb3VudC1pbmZvWworQWNjb3VudEluZm9dIGVudGl0aWVzIGlzIHJldHVybmVkIHRoYXQgZGVzY3JpYmVzIHRoZSBncm91cCBtZW1iZXJzIHRoYXQKK3dlcmUgc3BlY2lmaWVkIGluIHRoZSBsaW5rOiNtZW1iZXJzLWlucHV0W01lbWJlcnNJbnB1dF0uIEFuCitsaW5rOnJlc3QtYXBpLWFjY291bnRzLmh0bWwjYWNjb3VudC1pbmZvW0FjY291bnRJbmZvXSBlbnRpdHkKK2lzIHJldHVybmVkIGZvciBlYWNoIHVzZXIgc3BlY2lmaWVkIGluIHRoZSBpbnB1dCwgaW5kZXBlbmRlbnRseSBvZgord2hldGhlciB0aGUgdXNlciB3YXMgbmV3bHkgYWRkZWQgdG8gdGhlIGdyb3VwIG9yIHdoZXRoZXIgdGhlIHVzZXIgd2FzCithbHJlYWR5IGEgbWVtYmVyIG9mIHRoZSBncm91cC4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICBbCisgICAgeworICAgICAgIl9hY2NvdW50X2lkIjogMTAwMDA1NywKKyAgICAgICJuYW1lIjogIkphbmUgUm9lIiwKKyAgICAgICJlbWFpbCI6ICJqYW5lLnJvZUBleGFtcGxlLmNvbSIKKyAgICB9LAorICAgIHsKKyAgICAgICJfYWNjb3VudF9pZCI6IDEwMDAwMzcsCisgICAgICAibmFtZSI6ICJKb2huIERvZSIsCisgICAgICAiZW1haWwiOiAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgICAgfQorICBdCistLS0tCisKK1tbZGVsZXRlLWdyb3VwLW1lbWJlcl1dCitEZWxldGUgR3JvdXAgTWVtYmVyCit+fn5+fn5+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnREVMRVRFIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9tZW1iZXJzL2xpbms6cmVzdC1hcGktYWNjb3VudHMuaHRtbCNhY2NvdW50LWlkW1x7YWNjb3VudC1pZFx9XScKKworRGVsZXRlcyBhIHVzZXIgZnJvbSBhIEdlcnJpdCBpbnRlcm5hbCBncm91cC4KKworLlJlcXVlc3QKKy0tLS0KKyAgREVMRVRFIC9ncm91cHMvTXlQcm9qZWN0LUNvbW1pdHRlcnMvbWVtYmVycy9Kb2huJTIwRG9lIEhUVFAvMS4wCistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDQgTm8gQ29udGVudAorLS0tLQorCitbW2RlbGV0ZS1ncm91cC1tZW1iZXJzXV0KK0RlbGV0ZSBHcm91cCBNZW1iZXJzCit+fn5+fn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BPU1QgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dL21lbWJlcnMuZGVsZXRlJworCitEZWxldGUgb25lIG9yIHNldmVyYWwgdXNlcnMgZnJvbSBhIEdlcnJpdCBpbnRlcm5hbCBncm91cC4KKworVGhlIHVzZXJzIHRvIGJlIGRlbGV0ZWQgZnJvbSB0aGUgZ3JvdXAgbXVzdCBiZSBwcm92aWRlZCBpbiB0aGUgcmVxdWVzdAorYm9keSBhcyBhIGxpbms6I21lbWJlcnMtaW5wdXRbTWVtYmVyc0lucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBPU1QgL2dyb3Vwcy9NeVByb2plY3QtQ29tbWl0dGVycy9tZW1iZXJzLmRlbGV0ZSBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAibWVtYmVycyI6IHsKKyAgICAgICJqYW5lLnJvZUBleGFtcGxlLmNvbSIsCisgICAgICAiam9obi5kb2VAZXhhbXBsZS5jb20iCisgICAgfQorICB9CistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDQgTm8gQ29udGVudAorLS0tLQorCitbW2dyb3VwLWluY2x1ZGUtZW5kcG9pbnRzXV0KK0dyb3VwIEluY2x1ZGUgRW5kcG9pbnRzCistLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorCitbW2luY2x1ZGVkLWdyb3Vwc11dCitMaXN0IEluY2x1ZGVkIEdyb3Vwcworfn5+fn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dL2dyb3Vwcy8nCisKK0xpc3RzIHRoZSBkaXJlY3RseSBpbmNsdWRlZCBncm91cHMgb2YgYSBncm91cC4KKworQXMgcmVzdWx0IGEgbGlzdCBvZiBsaW5rOiNncm91cC1pbmZvW0dyb3VwSW5mb10gZW50cmllcyBpcyByZXR1cm5lZC4KK1RoZSBlbnRyaWVzIGluIHRoZSBsaXN0IGFyZSBzb3J0ZWQgYnkgZ3JvdXAgbmFtZSBhbmQgVVVJRC4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9ncm91cHMvODM0ZWMzNmRkNWUwZWQyMWEyZmY1ZDdlMjI1NWRhMDgyZDYzYmJkNy9ncm91cHMvIEhUVFAvMS4wCistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgWworICAgIHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICAgImlkIjogIjdjYTA0MmY0ZDU4NDc5MzZmY2I5MGNhOTEwNTc2NzMxNTdmZDA2ZmMiLAorICAgICAgIm5hbWUiOiAiTXlQcm9qZWN0LVZlcmlmaWVycyIsCisgICAgICAidXJsIjogIiMvYWRtaW4vZ3JvdXBzL3V1aWQtN2NhMDQyZjRkNTg0NzkzNmZjYjkwY2E5MTA1NzY3MzE1N2ZkMDZmYyIsCisgICAgICAib3B0aW9ucyI6IHsKKyAgICAgIH0sCisgICAgICAiZ3JvdXBfaWQiOiAzOCwKKyAgICAgICJvd25lciI6ICJNeVByb2plY3QtVmVyaWZpZXJzIiwKKyAgICAgICJvd25lcl9pZCI6ICI3Y2EwNDJmNGQ1ODQ3OTM2ZmNiOTBjYTkxMDU3NjczMTU3ZmQwNmZjIgorICAgIH0KKyAgXQorLS0tLQorCitbW2dldC1pbmNsdWRlZC1ncm91cF1dCitHZXQgSW5jbHVkZWQgR3JvdXAKK35+fn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvZ3JvdXBzL2xpbms6I2dyb3VwLWlkW1x7Z3JvdXAtaWRcfV0vZ3JvdXBzL2xpbms6I2dyb3VwLWlkW1x7Z3JvdXAtaWRcfV0nCisKK1JldHJpZXZlcyBhbiBpbmNsdWRlZCBncm91cC4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9ncm91cHMvODM0ZWMzNmRkNWUwZWQyMWEyZmY1ZDdlMjI1NWRhMDgyZDYzYmJkNy9ncm91cHMvN2NhMDQyZjRkNTg0NzkzNmZjYjkwY2E5MTA1NzY3MzE1N2ZkMDZmYyBIVFRQLzEuMAorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I2dyb3VwLWluZm9bR3JvdXBJbmZvXSBlbnRpdHkgaXMgcmV0dXJuZWQgdGhhdAorZGVzY3JpYmVzIHRoZSBpbmNsdWRlZCBncm91cC4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICB7CisgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNncm91cCIsCisgICAgImlkIjogIjdjYTA0MmY0ZDU4NDc5MzZmY2I5MGNhOTEwNTc2NzMxNTdmZDA2ZmMiLAorICAgICJuYW1lIjogIk15UHJvamVjdC1WZXJpZmllcnMiLAorICAgICJ1cmwiOiAiIy9hZG1pbi9ncm91cHMvdXVpZC03Y2EwNDJmNGQ1ODQ3OTM2ZmNiOTBjYTkxMDU3NjczMTU3ZmQwNmZjIiwKKyAgICAib3B0aW9ucyI6IHsKKyAgICB9LAorICAgICJncm91cF9pZCI6IDM4LAorICAgICJvd25lciI6ICJBZG1pbmlzdHJhdG9ycyIsCisgICAgIm93bmVyX2lkIjogIjZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiCisgIH0KKy0tLS0KKworW1tpbmNsdWRlLWdyb3VwXV0KK0luY2x1ZGUgR3JvdXAKK35+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQVVQgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dJworCitJbmNsdWRlcyBhIGdyb3VwIGludG8gYSBHZXJyaXQgaW50ZXJuYWwgZ3JvdXAuCisKKy5SZXF1ZXN0CistLS0tCisgIFBVVCAvZ3JvdXBzL015UHJvamVjdC1Db21taXR0ZXJzL2dyb3Vwcy9NeUdyb3VwIEhUVFAvMS4wCistLS0tCisKK0FzIHJlc3BvbnNlIGEgbGluazojZ3JvdXAtaW5mb1tHcm91cEluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIGluY2x1ZGVkIGdyb3VwLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAxIENyZWF0ZWQKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICJpZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IiwKKyAgICAibmFtZSI6ICJNeUdyb3VwIiwKKyAgICAidXJsIjogIiMvYWRtaW4vZ3JvdXBzL3V1aWQtNmExZTcwZTFhODg3ODI3NzFhOTE4MDhjOGFmOWJiYjdhOTg3MTM4OSIsCisgICAgIm9wdGlvbnMiOiB7CisgICAgfSwKKyAgICAiZ3JvdXBfaWQiOiA4LAorICAgICJvd25lciI6ICJBZG1pbmlzdHJhdG9ycyIsCisgICAgIm93bmVyX2lkIjogIjZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiCisgIH0KKy0tLS0KKworVGhlIHJlcXVlc3QgYWxzbyBzdWNjZWVkcyBpZiB0aGUgZ3JvdXAgaXMgYWxyZWFkeSBpbmNsdWRlZCBpbiB0aGlzCitncm91cCwgYnV0IHRoZW4gdGhlIEhUVFAgcmVzcG9uc2UgY29kZSBpcyBgMjAwIE9LYC4KKworW1tpbmNsdWRlLWdyb3Vwc11dCitJbmNsdWRlIEdyb3Vwcworfn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQT1NUIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9ncm91cHMnCisKK09SCisKK1t2ZXJzZV0KKydQT1NUIC9ncm91cHMvbGluazojZ3JvdXAtaWRbXHtncm91cC1pZFx9XS9ncm91cHMuYWRkJworCitJbmNsdWRlcyBvbmUgb3Igc2V2ZXJhbCBncm91cHMgaW50byBhIEdlcnJpdCBpbnRlcm5hbCBncm91cC4KKworVGhlIGdyb3VwcyB0byBiZSBpbmNsdWRlZCBpbnRvIHRoZSBncm91cCBtdXN0IGJlIHByb3ZpZGVkIGluIHRoZQorcmVxdWVzdCBib2R5IGFzIGEgbGluazojZ3JvdXBzLWlucHV0W0dyb3Vwc0lucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBPU1QgL2dyb3Vwcy9NeVByb2plY3QtQ29tbWl0dGVycy9ncm91cHMuYWRkIEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJncm91cHMiOiB7CisgICAgICAiTXlHcm91cCIsCisgICAgICAiTXlPdGhlckdyb3VwIgorICAgIH0KKyAgfQorLS0tLQorCitBcyByZXNwb25zZSBhIGxpc3Qgb2YgbGluazojZ3JvdXAtaW5mb1tHcm91cEluZm9dIGVudGl0aWVzIGlzCityZXR1cm5lZCB0aGF0IGRlc2NyaWJlcyB0aGUgZ3JvdXBzIHRoYXQgd2VyZSBzcGVjaWZpZWQgaW4gdGhlCitsaW5rOiNncm91cHMtaW5wdXRbR3JvdXBzSW5wdXRdLiBBIGxpbms6I2dyb3VwLWluZm9bR3JvdXBJbmZvXSBlbnRpdHkKK2lzIHJldHVybmVkIGZvciBlYWNoIGdyb3VwIHNwZWNpZmllZCBpbiB0aGUgaW5wdXQsIGluZGVwZW5kZW50bHkgb2YKK3doZXRoZXIgdGhlIGdyb3VwIHdhcyBuZXdseSBpbmNsdWRlZCBpbnRvIHRoZSBncm91cCBvciB3aGV0aGVyIHRoZQorZ3JvdXAgd2FzIGFscmVhZHkgaW5jbHVkZWQgaW4gdGhlIGdyb3VwLgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIFsKKyAgICB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2dyb3VwIiwKKyAgICAgICJpZCI6ICI2YTFlNzBlMWE4ODc4Mjc3MWE5MTgwOGM4YWY5YmJiN2E5ODcxMzg5IiwKKyAgICAgICJuYW1lIjogIk15R3JvdXAiLAorICAgICAgInVybCI6ICIjL2FkbWluL2dyb3Vwcy91dWlkLTZhMWU3MGUxYTg4NzgyNzcxYTkxODA4YzhhZjliYmI3YTk4NzEzODkiLAorICAgICAgIm9wdGlvbnMiOiB7CisgICAgICB9LAorICAgICAgImdyb3VwX2lkIjogOCwKKyAgICAgICJvd25lciI6ICJBZG1pbmlzdHJhdG9ycyIsCisgICAgICAib3duZXJfaWQiOiAiNmExZTcwZTFhODg3ODI3NzFhOTE4MDhjOGFmOWJiYjdhOTg3MTM4OSIKKyAgICB9LAorICAgIHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiLAorICAgICAgImlkIjogIjUwNTdmM2NiZDM1MTlkNmFiNjkzNjQ0MjlhODlmZmRmZmJhNTBmNzMiLAorICAgICAgIm5hbWUiOiAiTXlPdGhlckdyb3VwIiwKKyAgICAgICJ1cmwiOiAiIy9hZG1pbi9ncm91cHMvdXVpZC01MDU3ZjNjYmQzNTE5ZDZhYjY5MzY0NDI5YTg5ZmZkZmZiYTUwZjczIiwKKyAgICAgICJvcHRpb25zIjogeworICAgICAgfSwKKyAgICAgICJncm91cF9pZCI6IDEwLAorICAgICAgIm93bmVyIjogIk15T3RoZXJHcm91cCIsCisgICAgICAib3duZXJfaWQiOiAiNTA1N2YzY2JkMzUxOWQ2YWI2OTM2NDQyOWE4OWZmZGZmYmE1MGY3MyIKKyAgICB9CisgIF0KKy0tLS0KKworW1tkZWxldGUtaW5jbHVkZWQtZ3JvdXBdXQorRGVsZXRlIEluY2x1ZGVkIEdyb3VwCit+fn5+fn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydERUxFVEUgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dJworCitEZWxldGVzIGFuIGluY2x1ZGVkIGdyb3VwIGZyb20gYSBHZXJyaXQgaW50ZXJuYWwgZ3JvdXAuCisKKy5SZXF1ZXN0CistLS0tCisgIERFTEVURSAvZ3JvdXBzL015UHJvamVjdC1Db21taXR0ZXJzL2dyb3Vwcy9NeUdyb3VwIEhUVFAvMS4wCistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDQgTm8gQ29udGVudAorLS0tLQorCitbW2RlbGV0ZS1pbmNsdWRlZC1ncm91cHNdXQorRGVsZXRlIEluY2x1ZGVkIEdyb3Vwcworfn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ1BPU1QgL2dyb3Vwcy9saW5rOiNncm91cC1pZFtce2dyb3VwLWlkXH1dL2dyb3Vwcy5kZWxldGUnCisKK0RlbGV0ZSBvbmUgb3Igc2V2ZXJhbCBpbmNsdWRlZCBncm91cHMgZnJvbSBhIEdlcnJpdCBpbnRlcm5hbCBncm91cC4KKworVGhlIGdyb3VwcyB0byBiZSBkZWxldGVkIGZyb20gdGhlIGdyb3VwIG11c3QgYmUgcHJvdmlkZWQgaW4gdGhlIHJlcXVlc3QKK2JvZHkgYXMgYSBsaW5rOiNncm91cHMtaW5wdXRbR3JvdXBzSW5wdXRdIGVudGl0eS4KKworLlJlcXVlc3QKKy0tLS0KKyAgUE9TVCAvZ3JvdXBzL015UHJvamVjdC1Db21taXR0ZXJzL2dyb3Vwcy5kZWxldGUgSFRUUC8xLjAKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICB7CisgICAgIm1lbWJlcnMiOiB7CisgICAgICAiTXlHcm91cCIsCisgICAgICAiTXlPdGhlckdyb3VwIgorICAgIH0KKyAgfQorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjA0IE5vIENvbnRlbnQKKy0tLS0KKworCitbW2lkc11dCitJRHMKKy0tLQorCitbW2FjY291bnQtaWRdXQorbGluazpyZXN0LWFwaS1hY2NvdW50cy5odG1sI2FjY291bnQtaWRbXHthY2NvdW50LWlkXH1dCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKy0tCistLQorCitbW2dyb3VwLWlkXV0KK1x7Z3JvdXAtaWRcfQorfn5+fn5+fn5+fn5+CitJZGVudGlmaWVyIGZvciBhIGdyb3VwLgorCitUaGlzIGNhbiBiZToKKworKiB0aGUgVVVJRCBvZiB0aGUgZ3JvdXAKKyogdGhlIGxlZ2FjeSBudW1lcmljIElEIG9mIHRoZSBncm91cAorKiB0aGUgbmFtZSBvZiB0aGUgZ3JvdXAgaWYgaXQgaXMgdW5pcXVlCisKK1tbZ3JvdXAtbmFtZV1dCitce2dyb3VwLW5hbWVcfQorfn5+fn5+fn5+fn5+fn4KK0dyb3VwIG5hbWUgdGhhdCB1bmlxdWVseSBpZGVudGlmaWVzIG9uZSBncm91cC4KKworCitbW2pzb24tZW50aXRpZXNdXQorSlNPTiBFbnRpdGllcworLS0tLS0tLS0tLS0tLQorCitbW2dyb3VwLWluZm9dXQorR3JvdXBJbmZvCit+fn5+fn5+fn4KK1RoZSBgR3JvdXBJbmZvYCBlbnRpdHkgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQgYSBncm91cC4gVGhpcyBjYW4gYmUKK2EgR2Vycml0IGludGVybmFsIGdyb3VwLCBvciBhbiBleHRlcm5hbCBncm91cCB0aGF0IGlzIGtub3duIHRvIEdlcnJpdC4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSxeMSw1Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgIHx8RGVzY3JpcHRpb24KK3xga2luZGAgICAgICAgIHx8YGdlcnJpdGNvZGVyZXZpZXcjZ3JvdXBgCit8YGlkYCAgICAgICAgICB8fFRoZSBVUkwgZW5jb2RlZCBVVUlEIG9mIHRoZSBncm91cC4KK3xgbmFtZWAgICAgICAgIHwKK25vdCBzZXQgaWYgcmV0dXJuZWQgaW4gYSBtYXAgd2hlcmUgdGhlIGdyb3VwIG5hbWUgaXMgdXNlZCBhcyBtYXAga2V5fAorVGhlIG5hbWUgb2YgdGhlIGdyb3VwLgorfGB1cmxgICAgICAgICAgfG9wdGlvbmFsfAorVVJMIHRvIGluZm9ybWF0aW9uIGFib3V0IHRoZSBncm91cC4gVHlwaWNhbGx5IGEgVVJMIHRvIGEgd2ViIHBhZ2UgdGhhdAorcGVybWl0cyB1c2VycyB0byBhcHBseSB0byBqb2luIHRoZSBncm91cCwgb3IgbWFuYWdlIHRoZWlyIG1lbWJlcnNoaXAuCit8YG9wdGlvbnNgICAgICB8fGxpbms6I2dyb3VwLW9wdGlvbnMtaW5mb1tPcHRpb25zIG9mIHRoZSBncm91cF0KK3xgZGVzY3JpcHRpb25gIHxvbmx5IGZvciBpbnRlcm5hbCBncm91cHN8VGhlIGRlc2NyaXB0aW9uIG9mIHRoZSBncm91cC4KK3xgZ3JvdXBfaWRgICAgIHxvbmx5IGZvciBpbnRlcm5hbCBncm91cHN8VGhlIG51bWVyaWMgSUQgb2YgdGhlIGdyb3VwLgorfGBvd25lcmAgICAgICAgfG9ubHkgZm9yIGludGVybmFsIGdyb3Vwc3xUaGUgbmFtZSBvZiB0aGUgb3duZXIgZ3JvdXAuCit8YG93bmVyX2lkYCAgICB8b25seSBmb3IgaW50ZXJuYWwgZ3JvdXBzfFRoZSBVUkwgZW5jb2RlZCBVVUlEIG9mIHRoZSBvd25lciBncm91cC4KK3xgbWVtYmVyc2AgICAgIHxvcHRpb25hbCwgb25seSBmb3IgaW50ZXJuYWwgZ3JvdXBzfAorQSBsaXN0IG9mIGxpbms6cmVzdC1hcGktYWNjb3VudHMuaHRtbCNhY2NvdW50LWluZm9bQWNjb3VudEluZm9dCitlbnRpdGllcyBkZXNjcmliaW5nIHRoZSBkaXJlY3QgbWVtYmVycy4gKworT25seSBzZXQgaWYgbGluazojbWVtYmVyc1ttZW1iZXJzXSBhcmUgcmVxdWVzdGVkLgorfGBpbmNsdWRlc2AgICAgfG9wdGlvbmFsLCBvbmx5IGZvciBpbnRlcm5hbCBncm91cHN8CitBIGxpc3Qgb2YgbGluazojZ3JvdXAtaW5mb1tHcm91cEluZm9dIGVudGl0aWVzIGRlc2NyaWJpbmcgdGhlIGRpcmVjdGx5CitpbmNsdWRlZCBncm91cHMuICsKK09ubHkgc2V0IGlmIGxpbms6I2luY2x1ZGVzW2luY2x1ZGVkIGdyb3Vwc10gYXJlIHJlcXVlc3RlZC4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworVGhlIHR5cGUgb2YgYSBncm91cCBjYW4gYmUgZGVkdWNlZCBmcm9tIHRoZSBncm91cCdzIFVVSUQ6Citbd2lkdGg9IjUwJSJdCit8PT09PT09PT09PT09Cit8VVVJRCBtYXRjaGVzICJeWzAtOWEtZl1cezQwXH0kInxHZXJyaXQgaW50ZXJuYWwgZ3JvdXAKK3xVVUlEIHN0YXJ0cyB3aXRoICJnbG9iYWw6InxHZXJyaXQgc3lzdGVtIGdyb3VwCit8VVVJRCBzdGFydHMgd2l0aCAibGRhcDoifExEQVAgZ3JvdXAKK3xVVUlEIHN0YXJ0cyB3aXRoICI8cHJlZml4PjoifG90aGVyIGV4dGVybmFsIGdyb3VwCit8PT09PT09PT09PT09CisKK1tbZ3JvdXAtaW5wdXRdXQorR3JvdXBJbnB1dAorfn5+fn5+fn5+fgorVGhlICdHcm91cElucHV0JyBlbnRpdHkgY29udGFpbnMgaW5mb3JtYXRpb24gZm9yIHRoZSBjcmVhdGlvbiBvZgorYSBuZXcgaW50ZXJuYWwgZ3JvdXAuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgIHx8RGVzY3JpcHRpb24KK3xgbmFtZWAgICAgICAgICAgfG9wdGlvbmFsfFRoZSBuYW1lIG9mIHRoZSBncm91cCAobm90IGVuY29kZWQpLiArCitJZiBzZXQsIG11c3QgbWF0Y2ggdGhlIGdyb3VwIG5hbWUgaW4gdGhlIFVSTC4KK3xgZGVzY3JpcHRpb25gICAgfG9wdGlvbmFsfFRoZSBkZXNjcmlwdGlvbiBvZiB0aGUgZ3JvdXAuCit8YHZpc2libGVfdG9fYWxsYHxvcHRpb25hbHwKK1doZXRoZXIgdGhlIGdyb3VwIGlzIHZpc2libGUgdG8gYWxsIHJlZ2lzdGVyZWQgdXNlcnMuICsKK2BmYWxzZWAgaWYgbm90IHNldC4KK3xgb3duZXJfaWRgfG9wdGlvbmFsfFRoZSBVUkwgZW5jb2RlZCBJRCBvZiB0aGUgb3duZXIgZ3JvdXAuICsKK1RoaXMgY2FuIGJlIGEgZ3JvdXAgVVVJRCwgYSBsZWdhY3kgbnVtZXJpYyBncm91cCBJRCBvciBhIHVuaXF1ZSBncm91cAorbmFtZS4gKworSWYgbm90IHNldCwgdGhlIG5ldyBncm91cCB3aWxsIGJlIHNlbGYtb3duZWQuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbZ3JvdXBzLWlucHV0XV0KK0dyb3Vwc0lucHV0Cit+fn5+fn5+fn5+fgorVGhlIGBHcm91cHNJbnB1dGAgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IGdyb3VwcyB0aGF0IHNob3VsZAorYmUgaW5jbHVkZWQgaW50byBhIGdyb3VwIG9yIHRoYXQgc2hvdWxkIGJlIGRlbGV0ZWQgZnJvbSBhIGdyb3VwLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgIHx8RGVzY3JpcHRpb24KK3xgX29uZV9ncm91cGAgfG9wdGlvbmFsfAorVGhlIGxpbms6I2dyb3VwLWlkW2lkXSBvZiBvbmUgZ3JvdXAgdGhhdCBzaG91bGQgYmUgaW5jbHVkZWQgb3IgZGVsZXRlZC4KK3xgZ3JvdXBzYCAgICAgfG9wdGlvbmFsfAorQSBsaXN0IG9mIGxpbms6I2dyb3VwLWlkW2dyb3VwIGlkc10gdGhhdCBpZGVudGlmeSB0aGUgZ3JvdXBzIHRoYXQKK3Nob3VsZCBiZSBpbmNsdWRlZCBvciBkZWxldGVkLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbZ3JvdXAtb3B0aW9ucy1pbmZvXV0KK0dyb3VwT3B0aW9uc0luZm8KK35+fn5+fn5+fn5+fn5+fn4KK09wdGlvbnMgb2YgdGhlIGdyb3VwLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4xLDUiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgIHx8RGVzY3JpcHRpb24KK3xgdmlzaWJsZV90b19hbGxgfG5vdCBzZXQgaWYgYGZhbHNlYHwKK1doZXRoZXIgdGhlIGdyb3VwIGlzIHZpc2libGUgdG8gYWxsIHJlZ2lzdGVyZWQgdXNlcnMuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1tncm91cC1vcHRpb25zLWlucHV0XV0KK0dyb3VwT3B0aW9uc0lucHV0Cit+fn5+fn5+fn5+fn5+fn5+fgorTmV3IG9wdGlvbnMgZm9yIGEgZ3JvdXAuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgICAgfHxEZXNjcmlwdGlvbgorfGB2aXNpYmxlX3RvX2FsbGB8bm90IHNldCBpZiBgZmFsc2VgfAorV2hldGhlciB0aGUgZ3JvdXAgaXMgdmlzaWJsZSB0byBhbGwgcmVnaXN0ZXJlZCB1c2Vycy4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW21lbWJlcnMtaW5wdXRdXQorTWVtYmVyc0lucHV0Cit+fn5+fn5+fn5+fgorVGhlIGBNZW1iZXJzSW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCBhY2NvdW50cyB0aGF0IHNob3VsZAorYmUgYWRkZWQgYXMgbWVtYmVycyB0byBhIGdyb3VwIG9yIHRoYXQgc2hvdWxkIGJlIGRlbGV0ZWQgZnJvbSB0aGUgZ3JvdXAuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjEsNSJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgfHxEZXNjcmlwdGlvbgorfGBfb25lX21lbWJlcmB8b3B0aW9uYWx8CitUaGUgbGluazojYWNjb3VudC1pZFtpZF0gb2Ygb25lIGFjY291bnQgdGhhdCBzaG91bGQgYmUgYWRkZWQgb3IKK2RlbGV0ZWQuCit8YG1lbWJlcnNgICAgIHxvcHRpb25hbHwKK0EgbGlzdCBvZiBsaW5rOiNhY2NvdW50LWlkW2FjY291bnQgaWRzXSB0aGF0IGlkZW50aWZ5IHRoZSBhY2NvdW50cyB0aGF0CitzaG91bGQgYmUgYWRkZWQgb3IgZGVsZXRlZC4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PQorCisKK0dFUlJJVAorLS0tLS0tCitQYXJ0IG9mIGxpbms6aW5kZXguaHRtbFtHZXJyaXQgQ29kZSBSZXZpZXddCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3Jlc3QtYXBpLXByb2plY3RzLnR4dCBiL0RvY3VtZW50YXRpb24vcmVzdC1hcGktcHJvamVjdHMudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjlhYmEwZTkKLS0tIC9kZXYvbnVsbAorKysgYi9Eb2N1bWVudGF0aW9uL3Jlc3QtYXBpLXByb2plY3RzLnR4dApAQCAtMCwwICsxLDkwMiBAQAorR2Vycml0IENvZGUgUmV2aWV3IC0gL3Byb2plY3RzLyBSRVNUIEFQSQorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitUaGlzIHBhZ2UgZGVzY3JpYmVzIHRoZSBwcm9qZWN0IHJlbGF0ZWQgUkVTVCBlbmRwb2ludHMuCitQbGVhc2UgYWxzbyB0YWtlIG5vdGUgb2YgdGhlIGdlbmVyYWwgaW5mb3JtYXRpb24gb24gdGhlCitsaW5rOnJlc3QtYXBpLmh0bWxbUkVTVCBBUEldLgorCitFbmRwb2ludHMKKy0tLS0tLS0tLQorCitbW3Byb2plY3QtZW5kcG9pbnRzXV0KK1Byb2plY3QgRW5kcG9pbnRzCistLS0tLS0tLS0tLS0tLS0tLQorCitbW2xpc3QtcHJvamVjdHNdXQorTGlzdCBQcm9qZWN0cworfn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvcHJvamVjdHMvJworCitMaXN0cyB0aGUgcHJvamVjdHMgYWNjZXNzaWJsZSBieSB0aGUgY2FsbGVyLiBUaGlzIGlzIHRoZSBzYW1lIGFzCit1c2luZyB0aGUgbGluazpjbWQtbHMtcHJvamVjdHMuaHRtbFtscy1wcm9qZWN0c10gY29tbWFuZCBvdmVyIFNTSCwKK2FuZCBhY2NlcHRzIHRoZSBzYW1lIG9wdGlvbnMgYXMgcXVlcnkgcGFyYW1ldGVycy4KKworQXMgcmVzdWx0IGEgbWFwIGlzIHJldHVybmVkIHRoYXQgbWFwcyB0aGUgcHJvamVjdCBuYW1lcyB0bworbGluazojcHJvamVjdC1pbmZvW1Byb2plY3RJbmZvXSBlbnRyaWVzLiBUaGUgZW50cmllcyBpbiB0aGUgbWFwIGFyZSBzb3J0ZWQKK2J5IHByb2plY3QgbmFtZS4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9wcm9qZWN0cy8/ZCBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAiZXh0ZXJuYWwvYmlzb24iOiB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I3Byb2plY3QiLAorICAgICAgImlkIjogImV4dGVybmFsJTJGYmlzb24iLAorICAgICAgImRlc2NyaXB0aW9uIjogIkdOVSBwYXJzZXIgZ2VuZXJhdG9yIgorICAgIH0sCisgICAgImV4dGVybmFsL2djYyI6IHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjcHJvamVjdCIsCisgICAgICAiaWQiOiAiZXh0ZXJuYWwlMkZnY2MiLAorICAgIH0sCisgICAgImV4dGVybmFsL29wZW5zc2wiOiB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I3Byb2plY3QiLAorICAgICAgImlkIjogImV4dGVybmFsJTJGb3BlbnNzbCIsCisgICAgICAiZGVzY3JpcHRpb24iOiAiZW5jcnlwdGlvblxuY3J5cHRvIHJvdXRpbmVzIgorICAgIH0sCisgICAgInRlc3QiOiB7CisgICAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I3Byb2plY3QiLAorICAgICAgImlkIjogInRlc3QiLAorICAgICAgImRlc2NyaXB0aW9uIjogIlx1MDAzY2h0bWxcdTAwM2UgaXMgZXNjYXBlZCIKKyAgICB9CisgIH0KKy0tLS0KKworLkdldCBhbGwgcHJvamVjdHMgd2l0aCB0aGVpciBkZXNjcmlwdGlvbgorKioqKgorZ2V0OjovcHJvamVjdHMvP2QKKyoqKioKKworW1tzdWdnZXN0LXByb2plY3RzXV0KK1RoZSBgL3Byb2plY3RzL2AgVVJMIGFsc28gYWNjZXB0cyBhIHByZWZpeCBzdHJpbmcgaW4gdGhlIGBwYCBwYXJhbWV0ZXIuCitUaGlzIGxpbWl0cyB0aGUgcmVzdWx0cyB0byB0aG9zZSBwcm9qZWN0cyB0aGF0IHN0YXJ0IHdpdGggdGhlIHNwZWNpZmllZAorcHJlZml4LgorTGlzdCBhbGwgcHJvamVjdHMgdGhhdCBzdGFydCB3aXRoIGBwbGF0Zm9ybS9gOgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL3Byb2plY3RzLz9wPXBsYXRmb3JtJTJGIEhUVFAvMS4wCistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJwbGF0Zm9ybS9kcml2ZXJzIjogeworICAgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNwcm9qZWN0IiwKKyAgICAgICJpZCI6ICJwbGF0Zm9ybSUyRmRyaXZlcnMiLAorICAgIH0sCisgICAgInBsYXRmb3JtL3Rvb2xzIjogeworICAgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNwcm9qZWN0IiwKKyAgICAgICJpZCI6ICJwbGF0Zm9ybSUyRnRvb2xzIiwKKyAgICB9CisgIH0KKy0tLS0KK0UuZy4gdGhpcyBmZWF0dXJlIGNhbiBiZSB1c2VkIGJ5IHN1Z2dlc3Rpb24gY2xpZW50IFVJJ3MgdG8gbGltaXQgcmVzdWx0cy4KKworW1tnZXQtcHJvamVjdF1dCitHZXQgUHJvamVjdAorfn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydHRVQgL3Byb2plY3RzL2xpbms6I3Byb2plY3QtbmFtZVtce3Byb2plY3QtbmFtZVx9XScKKworUmV0cmlldmVzIGEgcHJvamVjdC4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9wcm9qZWN0cy9wbHVnaW5zJTJGcmVwbGljYXRpb24gSFRUUC8xLjAKKy0tLS0KKworQXMgcmVzcG9uc2UgYSBsaW5rOiNwcm9qZWN0LWluZm9bUHJvamVjdEluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIHByb2plY3QuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgeworICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjcHJvamVjdCIsCisgICAgImlkIjogInBsdWdpbnMlMkZyZXBsaWNhdGlvbiIsCisgICAgIm5hbWUiOiAicGx1Z2lucy9yZXBsaWNhdGlvbiIsCisgICAgInBhcmVudCI6ICJQdWJsaWMtUGx1Z2lucyIsCisgICAgImRlc2NyaXB0aW9uIjogIkNvcGllcyB0byBvdGhlciBzZXJ2ZXJzIHVzaW5nIHRoZSBHaXQgcHJvdG9jb2wiCisgIH0KKy0tLS0KKworW1tjcmVhdGUtcHJvamVjdF1dCitDcmVhdGUgUHJvamVjdAorfn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQVVQgL3Byb2plY3RzL2xpbms6I3Byb2plY3QtbmFtZVtce3Byb2plY3QtbmFtZVx9XScKKworQ3JlYXRlcyBhIG5ldyBwcm9qZWN0LgorCitJbiB0aGUgcmVxdWVzdCBib2R5IGFkZGl0aW9uYWwgZGF0YSBmb3IgdGhlIHByb2plY3QgY2FuIGJlIHByb3ZpZGVkIGFzCitsaW5rOiNwcm9qZWN0LWlucHV0W1Byb2plY3RJbnB1dF0uCisKKy5SZXF1ZXN0CistLS0tCisgIFBVVCAvcHJvamVjdHMvTXlQcm9qZWN0IEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZGVtbyBwcm9qZWN0LiIsCisgICAgInN1Ym1pdF90eXBlIjogIkNIRVJSWV9QSUNLIiwKKyAgICAib3duZXJzIjogWworICAgICAgIk15UHJvamVjdC1Pd25lcnMiCisgICAgXQorICB9CistLS0tCisKK0FzIHJlc3BvbnNlIHRoZSBsaW5rOiNwcm9qZWN0LWluZm9bUHJvamVjdEluZm9dIGVudGl0eSBpcyByZXR1cm5lZCB0aGF0CitkZXNjcmliZXMgdGhlIGNyZWF0ZWQgcHJvamVjdC4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMSBDcmVhdGVkCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I3Byb2plY3QiLAorICAgICJpZCI6ICJNeVByb2plY3QiLAorICAgICJuYW1lIjogIk15UHJvamVjdCIsCisgICAgInBhcmVudCI6ICJBbGwtUHJvamVjdHMiLAorICAgICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZGVtbyBwcm9qZWN0LiIKKyAgfQorLS0tLQorCitbW2dldC1wcm9qZWN0LWRlc2NyaXB0aW9uXV0KK0dldCBQcm9qZWN0IERlc2NyaXB0aW9uCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvcHJvamVjdHMvbGluazojcHJvamVjdC1uYW1lW1x7cHJvamVjdC1uYW1lXH1dL2Rlc2NyaXB0aW9uJworCitSZXRyaWV2ZXMgdGhlIGRlc2NyaXB0aW9uIG9mIGEgcHJvamVjdC4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9wcm9qZWN0cy9wbHVnaW5zJTJGcmVwbGljYXRpb24vZGVzY3JpcHRpb24gSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICAiQ29waWVzIHRvIG90aGVyIHNlcnZlcnMgdXNpbmcgdGhlIEdpdCBwcm90b2NvbCIKKy0tLS0KKworSWYgdGhlIHByb2plY3QgZG9lcyBub3QgaGF2ZSBhIGRlc2NyaXB0aW9uIGFuIGVtcHR5IHN0cmluZyBpcyByZXR1cm5lZC4KKworW1tzZXQtcHJvamVjdC1kZXNjcmlwdGlvbl1dCitTZXQgUHJvamVjdCBEZXNjcmlwdGlvbgorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQVVQgL3Byb2plY3RzL2xpbms6I3Byb2plY3QtbmFtZVtce3Byb2plY3QtbmFtZVx9XS9kZXNjcmlwdGlvbicKKworU2V0cyB0aGUgZGVzY3JpcHRpb24gb2YgYSBwcm9qZWN0LgorCitUaGUgbmV3IHByb2plY3QgZGVzY3JpcHRpb24gbXVzdCBiZSBwcm92aWRlZCBpbiB0aGUgcmVxdWVzdCBib2R5IGluc2lkZQorYSBsaW5rOiNwcm9qZWN0LWRlc2NyaXB0aW9uLWlucHV0W1Byb2plY3REZXNjcmlwdGlvbklucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBVVCAvcHJvamVjdHMvcGx1Z2lucyUyRnJlcGxpY2F0aW9uL2Rlc2NyaXB0aW9uIEhUVFAvMS4wCisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgeworICAgICJkZXNjcmlwdGlvbiI6ICJQbHVnaW4gZm9yIEdlcnJpdCB0aGF0IGhhbmRsZXMgdGhlIHJlcGxpY2F0aW9uLiIsCisgICAgImNvbW1pdF9tZXNzYWdlIjogIlVwZGF0ZSB0aGUgcHJvamVjdCBkZXNjcmlwdGlvbiIKKyAgfQorLS0tLQorCitBcyByZXNwb25zZSB0aGUgbmV3IHByb2plY3QgZGVzY3JpcHRpb24gaXMgcmV0dXJuZWQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgIlBsdWdpbiBmb3IgR2Vycml0IHRoYXQgaGFuZGxlcyB0aGUgcmVwbGljYXRpb24uIgorLS0tLQorCitJZiB0aGUgZGVzY3JpcHRpb24gd2FzIGRlbGV0ZWQgdGhlIHJlc3BvbnNlIGlzICJgMjA0IE5vIENvbnRlbnRgIi4KKworW1tkZWxldGUtcHJvamVjdC1kZXNjcmlwdGlvbl1dCitEZWxldGUgUHJvamVjdCBEZXNjcmlwdGlvbgorfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydERUxFVEUgL3Byb2plY3RzL2xpbms6I3Byb2plY3QtbmFtZVtce3Byb2plY3QtbmFtZVx9XS9kZXNjcmlwdGlvbicKKworRGVsZXRlcyB0aGUgZGVzY3JpcHRpb24gb2YgYSBwcm9qZWN0LgorCitUaGUgcmVxdWVzdCBib2R5IGRvZXMgbm90IG5lZWQgdG8gaW5jbHVkZSBhCitsaW5rOiNwcm9qZWN0LWRlc2NyaXB0aW9uLWlucHV0W1Byb2plY3REZXNjcmlwdGlvbklucHV0XSBlbnRpdHkgaWYgbm8KK2NvbW1pdCBtZXNzYWdlIGlzIHNwZWNpZmllZC4KKworUGxlYXNlIG5vdGUgdGhhdCBzb21lIHByb3hpZXMgcHJvaGliaXQgcmVxdWVzdCBib2RpZXMgZm9yIERFTEVURQorcmVxdWVzdHMuIEluIHRoaXMgY2FzZSwgaWYgeW91IHdhbnQgdG8gc3BlY2lmeSBhIGNvbW1pdCBtZXNzYWdlLCB1c2UKK2xpbms6I3NldC1wcm9qZWN0LWRlc2NyaXB0aW9uW1BVVF0gdG8gZGVsZXRlIHRoZSBkZXNjcmlwdGlvbi4KKworLlJlcXVlc3QKKy0tLS0KKyAgREVMRVRFIC9wcm9qZWN0cy9wbHVnaW5zJTJGcmVwbGljYXRpb24vZGVzY3JpcHRpb24gSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwNCBObyBDb250ZW50CistLS0tCisKK1tbZ2V0LXByb2plY3QtcGFyZW50XV0KK0dldCBQcm9qZWN0IFBhcmVudAorfn5+fn5+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnR0VUIC9wcm9qZWN0cy9saW5rOiNwcm9qZWN0LW5hbWVbXHtwcm9qZWN0LW5hbWVcfV0vcGFyZW50JworCitSZXRyaWV2ZXMgdGhlIG5hbWUgb2YgYSBwcm9qZWN0J3MgcGFyZW50IHByb2plY3QuIEZvciB0aGUKK2BBbGwtUHJvamVjdHNgIHJvb3QgcHJvamVjdCBhbiBlbXB0eSBzdHJpbmcgaXMgcmV0dXJuZWQuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvcHJvamVjdHMvcGx1Z2lucyUyRnJlcGxpY2F0aW9uL3BhcmVudCBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgICJBbGwtUHJvamVjdHMiCistLS0tCisKK1tbc2V0LXByb2plY3QtcGFyZW50XV0KK1NldCBQcm9qZWN0IFBhcmVudAorfn5+fn5+fn5+fn5+fn5+fn5+CitbdmVyc2VdCisnUFVUIC9wcm9qZWN0cy9saW5rOiNwcm9qZWN0LW5hbWVbXHtwcm9qZWN0LW5hbWVcfV0vcGFyZW50JworCitTZXRzIHRoZSBwYXJlbnQgcHJvamVjdCBmb3IgYSBwcm9qZWN0LgorCitUaGUgbmV3IG5hbWUgb2YgdGhlIHBhcmVudCBwcm9qZWN0IG11c3QgYmUgcHJvdmlkZWQgaW4gdGhlIHJlcXVlc3QgYm9keQoraW5zaWRlIGEgbGluazojcHJvamVjdC1wYXJlbnQtaW5wdXRbUHJvamVjdFBhcmVudElucHV0XSBlbnRpdHkuCisKKy5SZXF1ZXN0CistLS0tCisgIFBVVCAvcHJvamVjdHMvcGx1Z2lucyUyRnJlcGxpY2F0aW9uL3BhcmVudCBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAicGFyZW50IjogIlB1YmxpYy1QbHVnaW5zIiwKKyAgICAiY29tbWl0X21lc3NhZ2UiOiAiVXBkYXRlIHRoZSBwcm9qZWN0IHBhcmVudCIKKyAgfQorLS0tLQorCitBcyByZXNwb25zZSB0aGUgbmV3IHBhcmVudCBwcm9qZWN0IG5hbWUgaXMgcmV0dXJuZWQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgIlB1YmxpYy1QbHVnaW5zIgorLS0tLQorCitbW2dldC1oZWFkXV0KK0dldCBIRUFECit+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvcHJvamVjdHMvbGluazojcHJvamVjdC1uYW1lW1x7cHJvamVjdC1uYW1lXH1dL0hFQUQnCisKK1JldHJpZXZlcyBmb3IgYSBwcm9qZWN0IHRoZSBuYW1lIG9mIHRoZSBicmFuY2ggdG8gd2hpY2ggYEhFQURgIHBvaW50cy4KKworLlJlcXVlc3QKKy0tLS0KKyAgR0VUIC9wcm9qZWN0cy9wbHVnaW5zJTJGcmVwbGljYXRpb24vSEVBRCBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgICJyZWZzL2hlYWRzL21hc3RlciIKKy0tLS0KKworW1tzZXQtaGVhZF1dCitTZXQgSEVBRAorfn5+fn5+fn4KK1t2ZXJzZV0KKydQVVQgL3Byb2plY3RzL2xpbms6I3Byb2plY3QtbmFtZVtce3Byb2plY3QtbmFtZVx9XS9IRUFEJworCitTZXRzIGBIRUFEYCBmb3IgYSBwcm9qZWN0LgorCitUaGUgbmV3IHJlZiB0byB3aGljaCBgSEVBRGAgc2hvdWxkIHBvaW50IG11c3QgYmUgcHJvdmlkZWQgaW4gdGhlCityZXF1ZXN0IGJvZHkgaW5zaWRlIGEgbGluazojaGVhZC1pbnB1dFtIZWFkSW5wdXRdIGVudGl0eS4KKworLlJlcXVlc3QKKy0tLS0KKyAgUFVUIC9wcm9qZWN0cy9wbHVnaW5zJTJGcmVwbGljYXRpb24vSEVBRCBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAicmVmIjogInJlZnMvaGVhZHMvc3RhYmxlIgorICB9CistLS0tCisKK0FzIHJlc3BvbnNlIHRoZSBuZXcgcmVmIHRvIHdoaWNoIGBIRUFEYCBwb2ludHMgaXMgcmV0dXJuZWQuCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgInJlZnMvaGVhZHMvc3RhYmxlIgorLS0tLQorCitbW2dldC1yZXBvc2l0b3J5LXN0YXRpc3RpY3NdXQorR2V0IFJlcG9zaXRvcnkgU3RhdGlzdGljcworfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvcHJvamVjdHMvbGluazojcHJvamVjdC1uYW1lW1x7cHJvamVjdC1uYW1lXH1dL3N0YXRpc3RpY3MuZ2l0JworCitSZXR1cm4gc3RhdGlzdGljcyBmb3IgdGhlIHJlcG9zaXRvcnkgb2YgYSBwcm9qZWN0LgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL3Byb2plY3RzL3BsdWdpbnMlMkZyZXBsaWNhdGlvbi9zdGF0aXN0aWNzLmdpdCBIVFRQLzEuMAorLS0tLQorCitUaGUgcmVwb3NpdG9yeSBzdGF0aXN0aWNzIGFyZSByZXR1cm5lZCBhcyBhCitsaW5rOiNyZXBvc2l0b3J5LXN0YXRpc3RpY3MtaW5mb1tSZXBvc2l0b3J5U3RhdGlzdGljc0luZm9dIGVudGl0eS4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICB7CisgICAgIm51bWJlcl9vZl9sb29zZV9vYmplY3RzIjogMTI3LAorICAgICJudW1iZXJfb2ZfbG9vc2VfcmVmcyI6IDE1LAorICAgICJudW1iZXJfb2ZfcGFja19maWxlcyI6IDE1LAorICAgICJudW1iZXJfb2ZfcGFja2VkX29iamVjdHMiOiA2NywKKyAgICAibnVtYmVyX29mX3BhY2tlZF9yZWZzIjogMCwKKyAgICAic2l6ZV9vZl9sb29zZV9vYmplY3RzIjogMjk0NjYsCisgICAgInNpemVfb2ZfcGFja2VkX29iamVjdHMiOiA5NjQ2CisgIH0KKy0tLS0KKworW1tydW4tZ2NdXQorUnVuIEdDCit+fn5+fn4KK1t2ZXJzZV0KKydQT1NUIC9wcm9qZWN0cy9saW5rOiNwcm9qZWN0LW5hbWVbXHtwcm9qZWN0LW5hbWVcfV0vZ2MnCisKK1J1biB0aGUgR2l0IGdhcmJhZ2UgY29sbGVjdGlvbiBmb3IgdGhlIHJlcG9zaXRvcnkgb2YgYSBwcm9qZWN0LgorCisuUmVxdWVzdAorLS0tLQorICBQT1NUIC9wcm9qZWN0cy9wbHVnaW5zJTJGcmVwbGljYXRpb24vZ2MgSFRUUC8xLjAKKy0tLS0KKworVGhlIHJlc3BvbnNlIGlzIHRoZSBzdHJlYW1lZCBvdXRwdXQgb2YgdGhlIGdhcmJhZ2UgY29sbGVjdGlvbi4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjtjaGFyc2V0PVVURi04CisKKyAgY29sbGVjdGluZyBnYXJiYWdlIGZvciAicGx1Z2lucy9yZXBsaWNhdGlvbiI6CisgIFBhY2sgcmVmczogICAgICAgICAgICAgIDEwMCUgKDIxLzIxKQorICBDb3VudGluZyBvYmplY3RzOiAgICAgICAyMAorICBGaW5kaW5nIHNvdXJjZXM6ICAgICAgICAxMDAlICgyMC8yMCkKKyAgR2V0dGluZyBzaXplczogICAgICAgICAgMTAwJSAoMTMvMTMpCisgIENvbXByZXNzaW5nIG9iamVjdHM6ICAgICA4MyUgKDUvNikKKyAgV3JpdGluZyBvYmplY3RzOiAgICAgICAgMTAwJSAoMjAvMjApCisgIFNlbGVjdGluZyBjb21taXRzOiAgICAgIDEwMCUgKDcvNykKKyAgQnVpbGRpbmcgYml0bWFwczogICAgICAgMTAwJSAoNy83KQorICBGaW5kaW5nIHNvdXJjZXM6ICAgICAgICAxMDAlICg0MS80MSkKKyAgR2V0dGluZyBzaXplczogICAgICAgICAgMTAwJSAoMjUvMjUpCisgIENvbXByZXNzaW5nIG9iamVjdHM6ICAgICA1MiUgKDEyLzIzKQorICBXcml0aW5nIG9iamVjdHM6ICAgICAgICAxMDAlICg0MS80MSkKKyAgUHJ1bmUgbG9vc2Ugb2JqZWN0cyBhbHNvIGZvdW5kIGluIHBhY2sgZmlsZXM6IDEwMCUgKDM2LzM2KQorICBQcnVuZSBsb29zZSwgdW5yZWZlcmVuY2VkIG9iamVjdHM6IDEwMCUgKDM2LzM2KQorICBkb25lLgorLS0tLQorCitbW2Rhc2hib2FyZC1lbmRwb2ludHNdXQorRGFzaGJvYXJkIEVuZHBvaW50cworLS0tLS0tLS0tLS0tLS0tLS0tLQorCitbW2xpc3QtZGFzaGJvYXJkc11dCitMaXN0IERhc2hib2FyZHMKK35+fn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvcHJvamVjdHMvbGluazojcHJvamVjdC1uYW1lW1x7cHJvamVjdC1uYW1lXH1dL2Rhc2hib2FyZHMvJworCitMaXN0IGN1c3RvbSBkYXNoYm9hcmRzIGZvciBhIHByb2plY3QuCisKK0FzIHJlc3VsdCBhIGxpc3Qgb2YgbGluazojZGFzaGJvYXJkLWluZm9bRGFzaGJvYXJkSW5mb10gZW50cmllcyBpcworcmV0dXJuZWQuCisKK0xpc3QgYWxsIGRhc2hib2FyZHMgZm9yIHRoZSBgd29yay9teS1wcm9qZWN0YCBwcm9qZWN0OgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL3Byb2plY3RzL3dvcmslMkZteS1wcm9qZWN0L2Rhc2hib2FyZHMvIEhUVFAvMS4wCistLS0tCisKKy5SZXNwb25zZQorLS0tLQorICBIVFRQLzEuMSAyMDAgT0sKKyAgQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgICldfScKKyAgWworICAgIHsKKyAgICAgICJraW5kIjogImdlcnJpdGNvZGVyZXZpZXcjZGFzaGJvYXJkIiwKKyAgICAgICJpZCI6ICJtYWluOmNsb3NlZCIsCisgICAgICAicmVmIjogIm1haW4iLAorICAgICAgInBhdGgiOiAiY2xvc2VkIiwKKyAgICAgICJkZXNjcmlwdGlvbiI6ICJNZXJnZWQgYW5kIGFiYW5kb25lZCBjaGFuZ2VzIGluIGxhc3QgNyB3ZWVrcyIsCisgICAgICAidXJsIjogIi9kYXNoYm9hcmQvP3RpdGxlXHUwMDNkQ2xvc2VkK2NoYW5nZXNcdTAwMjZNZXJnZWRcdTAwM2RzdGF0dXM6bWVyZ2VkK2FnZTo3d1x1MDAyNkFiYW5kb25lZFx1MDAzZHN0YXR1czphYmFuZG9uZWQrYWdlOjd3IiwKKyAgICAgICJkZWZhdWx0IjogdHJ1ZSwKKyAgICAgICJ0aXRsZSI6ICJDbG9zZWQgY2hhbmdlcyIsCisgICAgICAic2VjdGlvbnMiOiBbCisgICAgICAgIHsKKyAgICAgICAgICAibmFtZSI6ICJNZXJnZWQiLAorICAgICAgICAgICJxdWVyeSI6ICJzdGF0dXM6bWVyZ2VkIGFnZTo3dyIKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICJuYW1lIjogIkFiYW5kb25lZCIsCisgICAgICAgICAgInF1ZXJ5IjogInN0YXR1czphYmFuZG9uZWQgYWdlOjd3IgorICAgICAgICB9CisgICAgICBdCisgICAgfQorICBdCistLS0tCisKKy5HZXQgYWxsIGRhc2hib2FyZHMgb2YgdGhlICdBbGwtUHJvamVjdHMnIHByb2plY3QKKyoqKioKK2dldDo6L3Byb2plY3RzL0FsbC1Qcm9qZWN0cy9kYXNoYm9hcmRzLworKioqKgorCitbW2dldC1kYXNoYm9hcmRdXQorR2V0IERhc2hib2FyZAorfn5+fn5+fn5+fn5+fgorW3ZlcnNlXQorJ0dFVCAvcHJvamVjdHMvbGluazojcHJvamVjdC1uYW1lW1x7cHJvamVjdC1uYW1lXH1dL2Rhc2hib2FyZHMvbGluazojZGFzaGJvYXJkLWlkW1x7ZGFzaGJvYXJkLWlkXH1dJworCitSZXRyaWV2ZXMgYSBwcm9qZWN0IGRhc2hib2FyZC4gVGhlIGRhc2hib2FyZCBjYW4gYmUgZGVmaW5lZCBvbiB0aGF0Citwcm9qZWN0IG9yIGJlIGluaGVyaXRlZCBmcm9tIGEgcGFyZW50IHByb2plY3QuCisKKy5SZXF1ZXN0CistLS0tCisgIEdFVCAvcHJvamVjdHMvd29yayUyRm15LXByb2plY3QvZGFzaGJvYXJkcy9tYWluOmNsb3NlZCBIVFRQLzEuMAorLS0tLQorCitBcyByZXNwb25zZSBhIGxpbms6I2Rhc2hib2FyZC1pbmZvW0Rhc2hib2FyZEluZm9dIGVudGl0eSBpcyByZXR1cm5lZAordGhhdCBkZXNjcmliZXMgdGhlIGRhc2hib2FyZC4KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwMCBPSworICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50CisgIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04CisKKyAgKV19JworICB7CisgICAgImtpbmQiOiAiZ2Vycml0Y29kZXJldmlldyNkYXNoYm9hcmQiLAorICAgICJpZCI6ICJtYWluOmNsb3NlZCIsCisgICAgInJlZiI6ICJtYWluIiwKKyAgICAicGF0aCI6ICJjbG9zZWQiLAorICAgICJkZXNjcmlwdGlvbiI6ICJNZXJnZWQgYW5kIGFiYW5kb25lZCBjaGFuZ2VzIGluIGxhc3QgNyB3ZWVrcyIsCisgICAgInVybCI6ICIvZGFzaGJvYXJkLz90aXRsZVx1MDAzZENsb3NlZCtjaGFuZ2VzXHUwMDI2TWVyZ2VkXHUwMDNkc3RhdHVzOm1lcmdlZCthZ2U6N3dcdTAwMjZBYmFuZG9uZWRcdTAwM2RzdGF0dXM6YWJhbmRvbmVkK2FnZTo3dyIsCisgICAgImRlZmF1bHQiOiB0cnVlLAorICAgICJ0aXRsZSI6ICJDbG9zZWQgY2hhbmdlcyIsCisgICAgInNlY3Rpb25zIjogWworICAgICAgeworICAgICAgICAibmFtZSI6ICJNZXJnZWQiLAorICAgICAgICAicXVlcnkiOiAic3RhdHVzOm1lcmdlZCBhZ2U6N3ciCisgICAgICB9LAorICAgICAgeworICAgICAgICAibmFtZSI6ICJBYmFuZG9uZWQiLAorICAgICAgICAicXVlcnkiOiAic3RhdHVzOmFiYW5kb25lZCBhZ2U6N3ciCisgICAgICB9CisgICAgXQorICB9CistLS0tCisKK1RvIHJldHJpZXZlIHRoZSBkZWZhdWx0IGRhc2hib2FyZCBvZiBhIHByb2plY3QgdXNlIGBkZWZhdWx0YCBhcworZGFzaGJvYXJkLWlkLgorCisuUmVxdWVzdAorLS0tLQorICBHRVQgL3Byb2plY3RzL3dvcmslMkZteS1wcm9qZWN0L2Rhc2hib2FyZHMvZGVmYXVsdCBIVFRQLzEuMAorLS0tLQorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2Rhc2hib2FyZCIsCisgICAgImlkIjogIm1haW46Y2xvc2VkIiwKKyAgICAicmVmIjogIm1haW4iLAorICAgICJwYXRoIjogImNsb3NlZCIsCisgICAgImRlc2NyaXB0aW9uIjogIk1lcmdlZCBhbmQgYWJhbmRvbmVkIGNoYW5nZXMgaW4gbGFzdCA3IHdlZWtzIiwKKyAgICAidXJsIjogIi9kYXNoYm9hcmQvP3RpdGxlXHUwMDNkQ2xvc2VkK2NoYW5nZXNcdTAwMjZNZXJnZWRcdTAwM2RzdGF0dXM6bWVyZ2VkK2FnZTo3d1x1MDAyNkFiYW5kb25lZFx1MDAzZHN0YXR1czphYmFuZG9uZWQrYWdlOjd3IiwKKyAgICAiZGVmYXVsdCI6IHRydWUsCisgICAgInRpdGxlIjogIkNsb3NlZCBjaGFuZ2VzIiwKKyAgICAic2VjdGlvbnMiOiBbCisgICAgICB7CisgICAgICAgICJuYW1lIjogIk1lcmdlZCIsCisgICAgICAgICJxdWVyeSI6ICJzdGF0dXM6bWVyZ2VkIGFnZTo3dyIKKyAgICAgIH0sCisgICAgICB7CisgICAgICAgICJuYW1lIjogIkFiYW5kb25lZCIsCisgICAgICAgICJxdWVyeSI6ICJzdGF0dXM6YWJhbmRvbmVkIGFnZTo3dyIKKyAgICAgIH0KKyAgICBdCisgIH0KKy0tLS0KKworW1tzZXQtZGFzaGJvYXJkXV0KK1NldCBEYXNoYm9hcmQKK35+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydQVVQgL3Byb2plY3RzL2xpbms6I3Byb2plY3QtbmFtZVtce3Byb2plY3QtbmFtZVx9XS9kYXNoYm9hcmRzL2xpbms6I2Rhc2hib2FyZC1pZFtce2Rhc2hib2FyZC1pZFx9XScKKworVXBkYXRlcy9DcmVhdGVzIGEgcHJvamVjdCBkYXNoYm9hcmQuCisKK0N1cnJlbnRseSBvbmx5IHN1cHBvcnRlZCBmb3IgdGhlIGBkZWZhdWx0YCBkYXNoYm9hcmQuCisKK1RoZSBjcmVhdGlvbi91cGRhdGUgaW5mb3JtYXRpb24gZm9yIHRoZSBkYXNoYm9hcmQgbXVzdCBiZSBwcm92aWRlZCBpbgordGhlIHJlcXVlc3QgYm9keSBhcyBhIGxpbms6I2Rhc2hib2FyZC1pbnB1dFtEYXNoYm9hcmRJbnB1dF0gZW50aXR5LgorCisuUmVxdWVzdAorLS0tLQorICBQVVQgL3Byb2plY3RzL3dvcmslMkZteS1wcm9qZWN0L2Rhc2hib2FyZHMvZGVmYXVsdCBIVFRQLzEuMAorICBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAorCisgIHsKKyAgICAiaWQiOiAibWFpbjpjbG9zZWQiLAorICAgICJjb21taXRfbWVzc2FnZSI6ICJEZWZpbmUgdGhlIGRlZmF1bHQgZGFzaGJvYXJkIgorICB9CistLS0tCisKK0FzIHJlc3BvbnNlIHRoZSBuZXcvdXBkYXRlZCBkYXNoYm9hcmQgaXMgcmV0dXJuZWQgYXMgYQorbGluazojZGFzaGJvYXJkLWluZm9bRGFzaGJvYXJkSW5mb10gZW50aXR5LgorCisuUmVzcG9uc2UKKy0tLS0KKyAgSFRUUC8xLjEgMjAwIE9LCisgIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKKyAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKworICApXX0nCisgIHsKKyAgICAia2luZCI6ICJnZXJyaXRjb2RlcmV2aWV3I2Rhc2hib2FyZCIsCisgICAgImlkIjogIm1haW46Y2xvc2VkIiwKKyAgICAicmVmIjogIm1haW4iLAorICAgICJwYXRoIjogImNsb3NlZCIsCisgICAgImRlc2NyaXB0aW9uIjogIk1lcmdlZCBhbmQgYWJhbmRvbmVkIGNoYW5nZXMgaW4gbGFzdCA3IHdlZWtzIiwKKyAgICAidXJsIjogIi9kYXNoYm9hcmQvP3RpdGxlXHUwMDNkQ2xvc2VkK2NoYW5nZXNcdTAwMjZNZXJnZWRcdTAwM2RzdGF0dXM6bWVyZ2VkK2FnZTo3d1x1MDAyNkFiYW5kb25lZFx1MDAzZHN0YXR1czphYmFuZG9uZWQrYWdlOjd3IiwKKyAgICAiZGVmYXVsdCI6IHRydWUsCisgICAgInRpdGxlIjogIkNsb3NlZCBjaGFuZ2VzIiwKKyAgICAic2VjdGlvbnMiOiBbCisgICAgICB7CisgICAgICAgICJuYW1lIjogIk1lcmdlZCIsCisgICAgICAgICJxdWVyeSI6ICJzdGF0dXM6bWVyZ2VkIGFnZTo3dyIKKyAgICAgIH0sCisgICAgICB7CisgICAgICAgICJuYW1lIjogIkFiYW5kb25lZCIsCisgICAgICAgICJxdWVyeSI6ICJzdGF0dXM6YWJhbmRvbmVkIGFnZTo3dyIKKyAgICAgIH0KKyAgICBdCisgIH0KKy0tLS0KKworW1tkZWxldGUtZGFzaGJvYXJkXV0KK0RlbGV0ZSBEYXNoYm9hcmQKK35+fn5+fn5+fn5+fn5+fn4KK1t2ZXJzZV0KKydERUxFVEUgL3Byb2plY3RzL2xpbms6I3Byb2plY3QtbmFtZVtce3Byb2plY3QtbmFtZVx9XS9kYXNoYm9hcmRzL2xpbms6I2Rhc2hib2FyZC1pZFtce2Rhc2hib2FyZC1pZFx9XScKKworRGVsZXRlcyBhIHByb2plY3QgZGFzaGJvYXJkLgorCitDdXJyZW50bHkgb25seSBzdXBwb3J0ZWQgZm9yIHRoZSBgZGVmYXVsdGAgZGFzaGJvYXJkLgorCitUaGUgcmVxdWVzdCBib2R5IGRvZXMgbm90IG5lZWQgdG8gaW5jbHVkZSBhIGxpbms6I2Rhc2hib2FyZC1pbnB1dFsKK0Rhc2hib2FyZElucHV0XSBlbnRpdHkgaWYgbm8gY29tbWl0IG1lc3NhZ2UgaXMgc3BlY2lmaWVkLgorCitQbGVhc2Ugbm90ZSB0aGF0IHNvbWUgcHJveGllcyBwcm9oaWJpdCByZXF1ZXN0IGJvZGllcyBmb3IgREVMRVRFCityZXF1ZXN0cy4KKworLlJlcXVlc3QKKy0tLS0KKyAgREVMRVRFIC9wcm9qZWN0cy93b3JrJTJGbXktcHJvamVjdC9kYXNoYm9hcmRzL2RlZmF1bHQgSFRUUC8xLjAKKy0tLS0KKworLlJlc3BvbnNlCistLS0tCisgIEhUVFAvMS4xIDIwNCBObyBDb250ZW50CistLS0tCisKKworW1tpZHNdXQorSURzCistLS0KKworW1tkYXNoYm9hcmQtaWRdXQorXHtkYXNoYm9hcmQtaWRcfQorfn5+fn5+fn5+fn5+fn5+fgorVGhlIElEIG9mIGEgZGFzaGJvYXJkIGluIHRoZSBmb3JtYXQgJzxyZWY+OjxwYXRoPicuCisKK0Egc3BlY2lhbCBkYXNoYm9hcmQgSUQgaXMgYGRlZmF1bHRgIHdoaWNoIHJlcHJlc2VudHMgdGhlIGRlZmF1bHQKK2Rhc2hib2FyZCBvZiBhIHByb2plY3QuCisKK1tbcHJvamVjdC1uYW1lXV0KK1x7cHJvamVjdC1uYW1lXH0KK35+fn5+fn5+fn5+fn5+fn4KK1RoZSBuYW1lIG9mIHRoZSBwcm9qZWN0LgorCisKK1tbanNvbi1lbnRpdGllc11dCitKU09OIEVudGl0aWVzCistLS0tLS0tLS0tLS0tCisKK1tbZGFzaGJvYXJkLWluZm9dXQorRGFzaGJvYXJkSW5mbworfn5+fn5+fn5+fn5+fgorVGhlIGBEYXNoYm9hcmRJbmZvYCBlbnRpdHkgY29udGFpbnMgaW5mb3JtYXRpb24gYWJvdXQgYSBwcm9qZWN0CitkYXNoYm9hcmQuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjIsNCJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgICAgIHx8RGVzY3JpcHRpb24KK3xga2luZGAgICAgICAgICAgICB8fGBnZXJyaXRjb2RlcmV2aWV3I2Rhc2hib2FyZGAKK3xgaWRgICAgICAgICAgICAgICB8fAorVGhlIElEIG9mIHRoZSBkYXNoYm9hcmQuIFRoZSBJRCBoYXMgdGhlIGZvcm1hdCAnPHJlZj46PHBhdGg+JywKK3doZXJlIHJlZiBhbmQgcGF0aCBhcmUgVVJMIGVuY29kZWQuCit8YHByb2plY3RgICAgICAgICAgfHwKK1RoZSBuYW1lIG9mIHRoZSBwcm9qZWN0IGZvciB3aGljaCB0aGlzIGRhc2hib2FyZCBpcyByZXR1cm5lZC4KK3xgZGVmaW5pbmdfcHJvamVjdGB8fAorVGhlIG5hbWUgb2YgdGhlIHByb2plY3QgaW4gd2hpY2ggdGhpcyBkYXNoYm9hcmQgaXMgZGVmaW5lZC4KK1RoaXMgaXMgZGlmZmVyZW50IGZyb20gYHByb2plY3RgIGlmIHRoZSBkYXNoYm9hcmQgaXMgaW5oZXJpdGVkIGZyb20gYQorcGFyZW50IHByb2plY3QuCit8YHJlZmAgICAgICAgICAgICAgfHwKK1RoZSBuYW1lIG9mIHRoZSByZWYgaW4gd2hpY2ggdGhlIGRhc2hib2FyZCBpcyBkZWZpbmVkLCB3aXRob3V0IHRoZQorYHJlZnMvbWV0YS9kYXNoYm9hcmRzL2AgcHJlZml4LCB3aGljaCBpcyBjb21tb24gZm9yIGFsbCBkYXNoYm9hcmQgcmVmcy4KK3xgcGF0aGAgICAgICAgICAgICB8fAorVGhlIHBhdGggb2YgdGhlIGZpbGUgaW4gd2hpY2ggdGhlIGRhc2hib2FyZCBpcyBkZWZpbmVkLgorfGBkZXNjcmlwdGlvbmAgICAgIHxvcHRpb25hbHxUaGUgZGVzY3JpcHRpb24gb2YgdGhlIGRhc2hib2FyZC4KK3xgZm9yZWFjaGAgICAgICAgICB8b3B0aW9uYWx8CitTdWJxdWVyeSB0aGF0IGFwcGxpZXMgdG8gYWxsIHNlY3Rpb25zIGluIHRoZSBkYXNoYm9hcmQuICsKK1Rva2VucyBzdWNoIGFzIGAke3Byb2plY3R9YCBhcmUgbm90IHJlc29sdmVkLgorfGB1cmxgICAgICAgICAgICAgIHx8CitUaGUgVVJMIHVuZGVyIHdoaWNoIHRoZSBkYXNoYm9hcmQgY2FuIGJlIG9wZW5lZCBpbiB0aGUgR2Vycml0IFdlYlVJLiArCitUaGUgVVJMIGlzIHJlbGF0aXZlIHRvIHRoZSBjYW5vbmljYWwgd2ViIFVSTC4gKworVG9rZW5zIGluIHRoZSBxdWVyaWVzIHN1Y2ggYXMgYCR7cHJvamVjdH1gIGFyZSByZXNvbHZlZC4KK3xgZGVmYXVsdGAgICAgICAgICB8bm90IHNldCBpZiBgZmFsc2VgfAorV2hldGhlciB0aGlzIGlzIHRoZSBkZWZhdWx0IGRhc2hib2FyZCBvZiB0aGUgcHJvamVjdC4KK3xgdGl0bGVgICAgICAgICAgICB8b3B0aW9uYWx8VGhlIHRpdGxlIG9mIHRoZSBkYXNoYm9hcmQuCit8YHNlY3Rpb25zYCAgICAgICAgfHwKK1RoZSBsaXN0IG9mIGxpbms6I2Rhc2hib2FyZC1zZWN0aW9uLWluZm9bc2VjdGlvbnNdIGluIHRoZSBkYXNoYm9hcmQuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW2Rhc2hib2FyZC1pbnB1dF1dCitEYXNoYm9hcmRJbnB1dAorfn5+fn5+fn5+fn5+fn4KK1RoZSBgRGFzaGJvYXJkSW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiB0byBjcmVhdGUvdXBkYXRlIGEKK3Byb2plY3QgZGFzaGJvYXJkLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4yLDQiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgIHx8RGVzY3JpcHRpb24KK3xgaWRgICAgICAgICAgICAgfG9wdGlvbmFsfAorVVJMIGVuY29kZWQgSUQgb2YgYSBkYXNoYm9hcmQgdG8gd2hpY2ggdGhpcyBkYXNoYm9hcmQgc2hvdWxkIGxpbmsgdG8uCit8YGNvbW1pdF9tZXNzYWdlYHxvcHRpb25hbHwKK01lc3NhZ2UgdGhhdCBzaG91bGQgYmUgdXNlZCB0byBjb21taXQgdGhlIGNoYW5nZSBvZiB0aGUgZGFzaGJvYXJkLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbZGFzaGJvYXJkLXNlY3Rpb24taW5mb11dCitEYXNoYm9hcmRTZWN0aW9uSW5mbworfn5+fn5+fn5+fn5+fn5+fn5+fn4KK1RoZSBgRGFzaGJvYXJkU2VjdGlvbkluZm9gIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dCBhIHNlY3Rpb24KK2luIGEgZGFzaGJvYXJkLgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLDYiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgfERlc2NyaXB0aW9uCit8YG5hbWVgICAgICAgICB8VGhlIHRpdGxlIG9mIHRoZSBzZWN0aW9uLgorfGBxdWVyeWAgICAgICAgfFRoZSBxdWVyeSBvZiB0aGUgc2VjdGlvbi4gKworVG9rZW5zIHN1Y2ggYXMgYCR7cHJvamVjdH1gIGFyZSBub3QgcmVzb2x2ZWQuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbaGVhZC1pbnB1dF1dCitIZWFkSW5wdXQKK35+fn5+fn5+fgorVGhlIGBIZWFkSW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBmb3Igc2V0dGluZyBgSEVBRGAgZm9yIGEKK3Byb2plY3QuCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsNiJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorfEZpZWxkIE5hbWUgICAgICB8RGVzY3JpcHRpb24KK3xgcmVmYCAgICAgICAgICAgfAorVGhlIHJlZiB0byB3aGljaCBgSEVBRGAgc2hvdWxkIGJlIHNldCwgdGhlIGByZWZzL2hlYWRzYCBwcmVmaXggY2FuIGJlCitvbWl0dGVkLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1twcm9qZWN0LWRlc2NyaXB0aW9uLWlucHV0XV0KK1Byb2plY3REZXNjcmlwdGlvbklucHV0Cit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorVGhlIGBQcm9qZWN0RGVzY3JpcHRpb25JbnB1dGAgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGZvciBzZXR0aW5nIGEKK3Byb2plY3QgZGVzY3JpcHRpb24uCisKK1tvcHRpb25zPSJoZWFkZXIiLHdpZHRoPSI1MCUiLGNvbHM9IjEsXjIsNCJdCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgICAgfHxEZXNjcmlwdGlvbgorfGBkZXNjcmlwdGlvbmAgICB8b3B0aW9uYWx8VGhlIHByb2plY3QgZGVzY3JpcHRpb24uICsKK1RoZSBwcm9qZWN0IGRlc2NyaXB0aW9uIHdpbGwgYmUgZGVsZXRlZCBpZiBub3Qgc2V0LgorfGBjb21taXRfbWVzc2FnZWB8b3B0aW9uYWx8CitNZXNzYWdlIHRoYXQgc2hvdWxkIGJlIHVzZWQgdG8gY29tbWl0IHRoZSBjaGFuZ2Ugb2YgdGhlIHByb2plY3QKK2Rlc2NyaXB0aW9uIGluIHRoZSBgcHJvamVjdC5jb25maWdgIGZpbGUgdG8gdGhlIGByZWZzL21ldGEvY29uZmlnYAorYnJhbmNoLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbcHJvamVjdC1pbmZvXV0KK1Byb2plY3RJbmZvCit+fn5+fn5+fn5+fgorVGhlIGBQcm9qZWN0SW5mb2AgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGFib3V0IGEgcHJvamVjdC4KKworW29wdGlvbnM9ImhlYWRlciIsd2lkdGg9IjUwJSIsY29scz0iMSxeMiw0Il0KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT0KK3xGaWVsZCBOYW1lICAgIHx8RGVzY3JpcHRpb24KK3xga2luZGAgICAgICAgIHx8YGdlcnJpdGNvZGVyZXZpZXcjcHJvamVjdGAKK3xgaWRgICAgICAgICAgIHx8VGhlIFVSTCBlbmNvZGVkIHByb2plY3QgbmFtZS4KK3xgbmFtZWAgICAgICAgIHwKK25vdCBzZXQgaWYgcmV0dXJuZWQgaW4gYSBtYXAgd2hlcmUgdGhlIHByb2plY3QgbmFtZSBpcyB1c2VkIGFzIG1hcCBrZXl8CitUaGUgbmFtZSBvZiB0aGUgcHJvamVjdC4KK3xgcGFyZW50YCAgICAgIHxvcHRpb25hbHwKK1RoZSBuYW1lIG9mIHRoZSBwYXJlbnQgcHJvamVjdC4gKworYD8tPG4+YCBpZiB0aGUgcGFyZW50IHByb2plY3QgaXMgbm90IHZpc2libGUgKGA8bj5gIGlzIGEgbnVtYmVyIHdoaWNoCitpcyBpbmNyZWFzZWQgZm9yIGVhY2ggbm9uLXZpc2libGUgcHJvamVjdCkuCit8YGRlc2NyaXB0aW9uYCB8b3B0aW9uYWx8VGhlIGRlc2NyaXB0aW9uIG9mIHRoZSBwcm9qZWN0LgorfGBicmFuY2hlc2AgICAgfG9wdGlvbmFsfE1hcCBvZiBicmFuY2ggbmFtZXMgdG8gSEVBRCByZXZpc2lvbnMuCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK1tbcHJvamVjdC1pbnB1dF1dCitQcm9qZWN0SW5wdXQKK35+fn5+fn5+fn5+fgorVGhlIGBQcm9qZWN0SW5wdXRgIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBmb3IgdGhlIGNyZWF0aW9uIG9mCithIG5ldyBwcm9qZWN0LgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4yLDQiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgICAgICAgICAgICAgIHx8RGVzY3JpcHRpb24KK3xgbmFtZWAgICAgICAgICAgICAgICAgICAgICAgfG9wdGlvbmFsfAorVGhlIG5hbWUgb2YgdGhlIHByb2plY3QgKG5vdCBlbmNvZGVkKS4gKworSWYgc2V0LCBtdXN0IG1hdGNoIHRoZSBwcm9qZWN0IG5hbWUgaW4gdGhlIFVSTC4KK3xgcGFyZW50YCAgICAgICAgICAgICAgICAgICAgfG9wdGlvbmFsfAorVGhlIG5hbWUgb2YgdGhlIHBhcmVudCBwcm9qZWN0LiArCitJZiBub3Qgc2V0LCB0aGUgYEFsbC1Qcm9qZWN0c2AgcHJvamVjdCB3aWxsIGJlIHRoZSBwYXJlbnQgcHJvamVjdC4KK3xgZGVzY3JpcHRpb25gICAgICAgICAgICAgICAgfG9wdGlvbmFsfFRoZSBkZXNjcmlwdGlvbiBvZiB0aGUgcHJvamVjdC4KK3xgcGVybWlzc2lvbnNfb25seWAgICAgICAgICAgfGBmYWxzZWAgaWYgbm90IHNldHwKK1doZXRoZXIgYSBwZXJtaXNzaW9uLW9ubHkgcHJvamVjdCBzaG91bGQgYmUgY3JlYXRlZC4KK3xgY3JlYXRlX2VtcHR5X2NvbW1pdGAgICAgICAgfGBmYWxzZWAgaWYgbm90IHNldHwKK1doZXRoZXIgYW4gZW1wdHkgaW5pdGlhbCBjb21taXQgc2hvdWxkIGJlIGNyZWF0ZWQuCit8YHN1Ym1pdF90eXBlYCAgICAgICAgICAgICAgIHxvcHRpb25hbHwKK1RoZSBzdWJtaXQgdHlwZSB0aGF0IHNob3VsZCBiZSBzZXQgZm9yIHRoZSBwcm9qZWN0CisoYE1FUkdFX0lGX05FQ0VTU0FSWWAsIGBSRUJBU0VfSUZfTkVDRVNTQVJZYCwgYEZBU1RfRk9SV0FSRF9PTkxZYCwKK2BNRVJHRV9BTFdBWVNgLCBgQ0hFUlJZX1BJQ0tgKS4gKworSWYgbm90IHNldCwgYE1FUkdFX0lGX05FQ0VTU0FSWWAgaXMgc2V0IGFzIHN1Ym1pdCB0eXBlLgorfGBicmFuY2hlc2AgICAgICAgICAgICAgICAgICB8b3B0aW9uYWx8CitBIGxpc3Qgb2YgYnJhbmNoZXMgdGhhdCBzaG91bGQgYmUgaW5pdGlhbGx5IGNyZWF0ZWQuICsKK0ZvciB0aGUgYnJhbmNoIG5hbWVzIHRoZSBgcmVmcy9oZWFkcy9gIHByZWZpeCBjYW4gYmUgb21pdHRlZC4KK3xgb3duZXJzYCAgICAgICAgICAgICAgICAgICAgfG9wdGlvbmFsfAorQSBsaXN0IG9mIGdyb3VwcyB0aGF0IHNob3VsZCBiZSBhc3NpZ25lZCBhcyBwcm9qZWN0IG93bmVyLiArCitFYWNoIGdyb3VwIGluIHRoZSBsaXN0IG11c3QgYmUgc3BlY2lmaWVkIGFzCitsaW5rOnJlc3QtYXBpLWdyb3Vwcy5odG1sI2dyb3VwLWlkW2dyb3VwLWlkXS4gKworSWYgbm90IHNldCwgdGhlIGxpbms6Y29uZmlnLWdlcnJpdC5odG1sI3JlcG9zaXRvcnkubmFtZS5vd25lckdyb3VwWworZ3JvdXBzIHRoYXQgYXJlIGNvbmZpZ3VyZWQgYXMgZGVmYXVsdCBvd25lcnNdIGFyZSBzZXQgYXMgcHJvamVjdAorb3duZXJzLgorfGB1c2VfY29udHJpYnV0b3JfYWdyZWVtZW50c2B8YElOSEVSSVRgIGlmIG5vdCBzZXR8CitXaGV0aGVyIGNvbnRyaWJ1dG9yIGFncmVlbWVudHMgc2hvdWxkIGJlIHVzZWQgZm9yIHRoZSBwcm9qZWN0ICAoYFRSVUVgLAorYEZBTFNFYCwgYElOSEVSSVRgKS4KK3xgdXNlX3NpZ25lZF9vZmZfYnlgICAgICAgICAgfGBJTkhFUklUYCBpZiBub3Qgc2V0fAorV2hldGhlciB0aGUgdXNhZ2Ugb2YgJ1NpZ25lZC1PZmYtQnknIGZvb3RlcnMgaXMgcmVxdWlyZWQgZm9yIHRoZQorcHJvamVjdCAoYFRSVUVgLCBgRkFMU0VgLCBgSU5IRVJJVGApLgorfGB1c2VfY29udGVudF9tZXJnZWAgICAgICAgICB8YElOSEVSSVRgIGlmIG5vdCBzZXR8CitXaGV0aGVyIGNvbnRlbnQgbWVyZ2Ugc2hvdWxkIGJlIGVuYWJsZWQgZm9yIHRoZSBwcm9qZWN0IChgVFJVRWAsCitgRkFMU0VgLCBgSU5IRVJJVGApLiArCitgRkFMU0VgLCBpZiB0aGUgYHN1Ym1pdF90eXBlYCBpcyBgRkFTVF9GT1JXQVJEX09OTFlgLgorfGByZXF1aXJlX2NoYW5nZV9pZGAgICAgICAgICB8YElOSEVSSVRgIGlmIG5vdCBzZXR8CitXaGV0aGVyIHRoZSB1c2FnZSBvZiBDaGFuZ2UtSWRzIGlzIHJlcXVpcmVkIGZvciB0aGUgcHJvamVjdCAoYFRSVUVgLAorYEZBTFNFYCwgYElOSEVSSVRgKS4KK3w9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCitbW3Byb2plY3QtcGFyZW50LWlucHV0XV0KK1Byb2plY3RQYXJlbnRJbnB1dAorfn5+fn5+fn5+fn5+fn5+fn5+CitUaGUgYFByb2plY3RQYXJlbnRJbnB1dGAgZW50aXR5IGNvbnRhaW5zIGluZm9ybWF0aW9uIGZvciBzZXR0aW5nIGEKK3Byb2plY3QgcGFyZW50LgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLF4yLDQiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgIHx8RGVzY3JpcHRpb24KK3xgcGFyZW50YCAgICAgICAgfHxUaGUgbmFtZSBvZiB0aGUgcGFyZW50IHByb2plY3QuCit8YGNvbW1pdF9tZXNzYWdlYHxvcHRpb25hbHwKK01lc3NhZ2UgdGhhdCBzaG91bGQgYmUgdXNlZCB0byBjb21taXQgdGhlIGNoYW5nZSBvZiB0aGUgcHJvamVjdCBwYXJlbnQKK2luIHRoZSBgcHJvamVjdC5jb25maWdgIGZpbGUgdG8gdGhlIGByZWZzL21ldGEvY29uZmlnYCBicmFuY2guCit8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKworW1tyZXBvc2l0b3J5LXN0YXRpc3RpY3MtaW5mb11dCitSZXBvc2l0b3J5U3RhdGlzdGljc0luZm8KK35+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorVGhlIGBSZXBvc2l0b3J5U3RhdGlzdGljc0luZm9gIGVudGl0eSBjb250YWlucyBpbmZvcm1hdGlvbiBhYm91dAorc3RhdGlzdGljcyBvZiBhIEdpdCByZXBvc2l0b3J5LgorCitbb3B0aW9ucz0iaGVhZGVyIix3aWR0aD0iNTAlIixjb2xzPSIxLDYiXQorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Cit8RmllbGQgTmFtZSAgICAgICAgICAgICAgICB8RGVzY3JpcHRpb24KK3xgbnVtYmVyX29mX2xvb3NlX29iamVjdHNgIHxOdW1iZXIgb2YgbG9vc2Ugb2JqZWN0cy4KK3xgbnVtYmVyX29mX2xvb3NlX3JlZnNgICAgIHxOdW1iZXIgb2YgbG9vc2UgcmVmcy4KK3xgbnVtYmVyX29mX3BhY2tfZmlsZXNgICAgIHxOdW1iZXIgb2YgcGFjayBmaWxlcy4KK3xgbnVtYmVyX29mX3BhY2tlZF9vYmplY3RzYHxOdW1iZXIgb2YgcGFja2VkIG9iamVjdHMuCit8YG51bWJlcl9vZl9wYWNrZWRfcmVmc2AgICB8TnVtYmVyIG9mIHBhY2tlZCByZWZzLgorfGBzaXplX29mX2xvb3NlX29iamVjdHNgICAgfFNpemUgb2YgbG9vc2Ugb2JqZWN0cyBpbiBieXRlcy4KK3xgc2l6ZV9vZl9wYWNrZWRfb2JqZWN0c2AgIHxTaXplIG9mIHBhY2tlZCBvYmplY3RzIGluIGJ5dGVzLgorfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKKworR0VSUklUCistLS0tLS0KK1BhcnQgb2YgbGluazppbmRleC5odG1sW0dlcnJpdCBDb2RlIFJldmlld10KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vcmVzdC1hcGkudHh0IGIvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS50eHQKaW5kZXggMmY5ZDAzZi4uMzAzZmM0YiAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9yZXN0LWFwaS50eHQKQEAgLTUsNiArNSwxNyBAQAogVGhlIEFQSSBpcyBzdWl0YWJsZSBmb3IgYXV0b21hdGVkIHRvb2xzIHRvIGJ1aWxkIHVwb24sIGFzIHdlbGwgYXMKIHN1cHBvcnRpbmcgc29tZSBhZC1ob2Mgc2NyaXB0aW5nIHVzZSBjYXNlcy4KIAorRW5kcG9pbnRzCistLS0tLS0tLS0KK2xpbms6cmVzdC1hcGktYWNjb3VudHMuaHRtbFsvYWNjb3VudHMvXTo6CisgIEFjY291bnQgcmVsYXRlZCBSRVNUIGVuZHBvaW50cworbGluazpyZXN0LWFwaS1jaGFuZ2VzLmh0bWxbL2NoYW5nZXMvXTo6CisgIENoYW5nZSByZWxhdGVkIFJFU1QgZW5kcG9pbnRzCitsaW5rOnJlc3QtYXBpLWdyb3Vwcy5odG1sWy9ncm91cHMvXTo6CisgIEdyb3VwIHJlbGF0ZWQgUkVTVCBlbmRwb2ludHMKK2xpbms6cmVzdC1hcGktcHJvamVjdHMuaHRtbFsvcHJvamVjdHMvXTo6CisgIFByb2plY3QgcmVsYXRlZCBSRVNUIGVuZHBvaW50cworCiBQcm90b2NvbCBEZXRhaWxzCiAtLS0tLS0tLS0tLS0tLS0tCiAKQEAgLTIxLDExICszMiwxOSBAQAogcHJlZml4IHRoZSBlbmRwb2ludCBVUkwgd2l0aCBgL2EvYC4gRm9yIGV4YW1wbGUgdG8gYXV0aGVudGljYXRlIHRvCiBgL3Byb2plY3RzL2AgcmVxdWVzdCBVUkwgYC9hL3Byb2plY3RzL2AuCiAKK1tbcHJlY29uZGl0aW9uc11dCitQcmVjb25kaXRpb25zCit+fn5+fn5+fn5+fn5+CitDbGllbnRzIGNhbiByZXF1ZXN0IFBVVCB0byBjcmVhdGUgYSBuZXcgcmVzb3VyY2UgYW5kIG5vdCBvdmVyd3JpdGUKK2FuIGV4aXN0aW5nIG9uZSBieSBhZGRpbmcgYElmLU5vbmUtTWF0Y2g6ICpgIHRvIHRoZSByZXF1ZXN0IEhUVFAKK2hlYWRlcnMuIElmIHRoZSBuYW1lZCByZXNvdXJjZSBhbHJlYWR5IGV4aXN0cyB0aGUgc2VydmVyIHdpbGwgcmVzcG9uZAord2l0aCBIVFRQIDQxMiBQcmVjb25kaXRpb24gRmFpbGVkLgorCiBbW291dHB1dF1dCiBPdXRwdXQgRm9ybWF0CiB+fn5+fn5+fn5+fn5+Ci1Nb3N0IEFQSXMgcmV0dXJuIHRleHQgZm9ybWF0IGJ5IGRlZmF1bHQuIEpTT04gY2FuIGJlIHJlcXVlc3RlZAotYnkgc2V0dGluZyB0aGUgYEFjY2VwdGAgSFRUUCByZXF1ZXN0IGhlYWRlciB0byBpbmNsdWRlCitNb3N0IEFQSXMgcmV0dXJuIHByZXR0eSBwcmludGVkIEpTT04gYnkgZGVmYXVsdC4gQ29tcGFjdCBKU09OIGNhbiBiZQorcmVxdWVzdGVkIGJ5IHNldHRpbmcgdGhlIGBBY2NlcHRgIEhUVFAgcmVxdWVzdCBoZWFkZXIgdG8gaW5jbHVkZQogYGFwcGxpY2F0aW9uL2pzb25gLCBmb3IgZXhhbXBsZToKIAogLS0tLQpAQCAtNDMsMzUwICs2Miw5OSBAQAogICBbIC4uLiB2YWxpZCBKU09OIC4uLiBdCiAtLS0tCiAKLVRoZSBkZWZhdWx0IEpTT04gZm9ybWF0IGlzIGBKU09OX0NPTVBBQ1RgLCB3aGljaCBza2lwcyB1bm5lY2Vzc2FyeQotd2hpdGVzcGFjZS4gVGhpcyBpcyBub3QgdGhlIGVhc2llc3QgZm9ybWF0IGZvciBhIGh1bWFuIHRvIHJlYWQuIE1hbnkKLWV4YW1wbGVzIGluIHRoaXMgZG9jdW1lbnRhdGlvbiB1c2UgYGZvcm1hdD1KU09OYCBhcyBhIHF1ZXJ5IHBhcmFtZXRlcgotdG8gb2J0YWluIHByZXR0eSBmb3JtYXR0aW5nIGluIHRoZSByZXNwb25zZS4gUHJvZHVjaW5nIChhbmQgcGFyc2luZykKLXRoZSBjb21wYWN0IGZvcm1hdCBpcyBtb3JlIGVmZmljaWVudCwgc28gbW9zdCB0b29scyBzaG91bGQgcHJlZmVyIHRoZQotZGVmYXVsdCBjb21wYWN0IGZvcm1hdC4KK1RoZSBkZWZhdWx0IEpTT04gZm9ybWF0IGlzIHByZXR0eSwgd2hpY2ggdXNlcyBleHRyYSB3aGl0ZXNwYWNlIHRvIG1ha2UKK3RoZSBvdXRwdXQgbW9yZSByZWFkYWJsZSBmb3IgYSBodW1hbi4gUHJvZHVjaW5nIChhbmQgcGFyc2luZykgdGhlCitub24tcHJldHR5IGNvbXBhY3QgZm9ybWF0IGlzIG1vcmUgZWZmaWNpZW50IHNvIHRvb2xzIHNob3VsZCByZXF1ZXN0IGl0CitieSB1c2luZyB0aGUgYEFjY2VwdDogYXBwbGljYXRpb24vanNvbmAgaGVhZGVyIG9yIGBwcD0wYCBxdWVyeQorcGFyYW1ldGVyIHdoZW5ldmVyIHBvc3NpYmxlLgogCiBSZXNwb25zZXMgd2lsbCBiZSBnemlwIGNvbXByZXNzZWQgYnkgdGhlIHNlcnZlciBpZiB0aGUgSFRUUAogYEFjY2VwdC1FbmNvZGluZ2AgcmVxdWVzdCBoZWFkZXIgaXMgc2V0IHRvIGBnemlwYC4gVGhpcyBtYXkKIHNhdmUgb24gbmV0d29yayB0cmFuc2ZlciB0aW1lIGZvciBsYXJnZXIgcmVzcG9uc2VzLgogCi1FbmRwb2ludHMKLS0tLS0tLS0tLQorW1t0aW1lc3RhbXBdXQorVGltZXN0YW1wCit+fn5+fn5+fn4KK1RpbWVzdGFtcHMgYXJlIGdpdmVuIGluIFVUQyBhbmQgaGF2ZSB0aGUgZm9ybWF0CisiJ3l5eXktbW0tZGQgaGg6bW06c3MuZmZmZmZmZmZmJyIgd2hlcmUgIidmZmZmZmZmZmZmJyIgaW5kaWNhdGVzIHRoZQorbmFub3NlY29uZHMuCiAKLVtbYWNjb3VudHNfc2VsZl9jYXBhYmlsaXRpZXNdXQotL2FjY291bnRzL3NlbGYvY2FwYWJpbGl0aWVzIChBY2NvdW50IENhcGFiaWxpdGllcykKLX5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+Ci1SZXR1cm5zIHRoZSBnbG9iYWwgY2FwYWJpbGl0aWVzIChzdWNoIGFzIGBjcmVhdGVQcm9qZWN0YCBvcgotYGNyZWF0ZUdyb3VwYCkgdGhhdCBhcmUgZW5hYmxlZCBmb3IgdGhlIGNhbGxpbmcgdXNlci4gVGhpcyBjYW4gYmUgdXNlZAotYnkgVUkgdG9vbHMgdG8gZGlzY292ZXIgaWYgYWRtaW5pc3RyYXRpdmUgZmVhdHVyZXMgYXJlIGF2YWlsYWJsZQotdG8gdGhlIGNhbGxlciwgc28gdGhleSBjYW4gaGlkZSAob3Igc2hvdykgcmVsZXZhbnQgVUkgYWN0aW9ucy4KK1tbZW5jb2RpbmddXQorRW5jb2RpbmcKK35+fn5+fn5+CitBbGwgSURzIHRoYXQgYXBwZWFyIGluIHRoZSBVUkwgb2YgYSBSRVNUIGNhbGwgKGUuZy4gcHJvamVjdCBuYW1lLCBncm91cCBuYW1lKQorbXVzdCBiZSBVUkwgZW5jb2RlZC4KIAotLS0tLQotICBHRVQgL2FjY291bnRzL3NlbGYvY2FwYWJpbGl0aWVzP2Zvcm1hdD1KU09OIEhUVFAvMS4wCitbW3Jlc3BvbnNlLWNvZGVzXV0KK1Jlc3BvbnNlIENvZGVzCit+fn5+fn5+fn5+fn5+fgorSFRUUCBzdGF0dXMgY29kZXMgYXJlIHdlbGwgZGVmaW5lZCBhbmQgdGhlIEdlcnJpdCBSRVNUIGVuZHBvaW50cyB1c2UKK3RoZW0gYXMgZGVzY3JpYmVkIGluIHRoZSBIVFRQIHNwZWMuCiAKLSAgKV19JwotICB7Ci0gICAgInF1ZXJ5TGltaXQiOiB7Ci0gICAgICAibWluIjogMCwKLSAgICAgICJtYXgiOiA1MDAKLSAgICB9Ci0gIH0KLS0tLS0KK0hlcmUgYXJlIGV4YW1wbGVzIGZvciBzb21lIEhUVFAgc3RhdHVzIGNvZGVzIHRoYXQgc2hvdyBob3cgdGhleSBhcmUKK3VzZWQgaW4gdGhlIGNvbnRleHQgb2YgdGhlIEdlcnJpdCBSRVNUIEFQSS4KIAotQWRtaW5pc3RyYXRvciB0aGF0IGhhcyBhdXRoZW50aWNhdGVkIHdpdGggZGlnZXN0IGF1dGhlbnRpY2F0aW9uOgotLS0tLQotICBHRVQgL2EvYWNjb3VudHMvc2VsZi9jYXBhYmlsaXRpZXM/Zm9ybWF0PUpTT04gSFRUUC8xLjAKLSAgQXV0aG9yaXphdGlvbjogRGlnZXN0IHVzZXJuYW1lPSJhZG1pbiIsIHJlYWxtPSJHZXJyaXQgQ29kZSBSZXZpZXciLCBub25jZT0iLi4uCis0MDAgQmFkIFJlcXVlc3QKK15eXl5eXl5eXl5eXl5eXgorYDQwMCBCYWQgUmVxdWVzdGAgaXMgdXNlZCBpZiB0aGUgcmVxdWVzdCBpcyBub3QgdW5kZXJzdG9vZCBieSB0aGUKK3NlcnZlciBkdWUgdG8gbWFsZm9ybWVkIHN5bnRheC4KIAotICApXX0nCi0gIHsKLSAgICAiYWRtaW5pc3RyYXRlU2VydmVyIjogdHJ1ZSwKLSAgICAicXVlcnlMaW1pdCI6IHsKLSAgICAgICJtaW4iOiAwLAotICAgICAgIm1heCI6IDUwMAotICAgIH0sCi0gICAgImNyZWF0ZUFjY291bnQiOiB0cnVlLAotICAgICJjcmVhdGVHcm91cCI6IHRydWUsCi0gICAgImNyZWF0ZVByb2plY3QiOiB0cnVlLAotICAgICJraWxsVGFzayI6IHRydWUsCi0gICAgInZpZXdDYWNoZXMiOiB0cnVlLAotICAgICJmbHVzaENhY2hlcyI6IHRydWUsCi0gICAgInZpZXdDb25uZWN0aW9ucyI6IHRydWUsCi0gICAgInZpZXdRdWV1ZSI6IHRydWUsCi0gICAgInN0YXJ0UmVwbGljYXRpb24iOiB0cnVlCi0gIH0KLS0tLS0KK0UuZy4gYDQwMCBCYWQgUmVxdWVzdGAgaXMgcmV0dXJuZWQgaWYgSlNPTiBpbnB1dCBpcyBleHBlY3RlZCBidXQgdGhlCisnQ29udGVudC1UeXBlJyBvZiB0aGUgcmVxdWVzdCBpcyBub3QgJ2FwcGxpY2F0aW9uL2pzb24nIG9yIHRoZSByZXF1ZXN0Citib2R5IGRvZXNuJ3QgY29udGFpbiB2YWxpZCBKU09OLgogCi1UbyBmaWx0ZXIgdGhlIHNldCBvZiBnbG9iYWwgY2FwYWJpbGl0aWVzIHRoZSBgcWAgcGFyYW1ldGVyIGNhbiBiZSB1c2VkLgotRmlsdGVyaW5nIG1heSBkZWNyZWFzZSB0aGUgcmVzcG9uc2UgdGltZSBieSBhdm9pZGluZyBsb29raW5nIGF0IGV2ZXJ5Ci1wb3NzaWJsZSBhbHRlcm5hdGl2ZSBmb3IgdGhlIGNhbGxlci4KK2A0MDAgQmFkIFJlcXVlc3RgIGlzIGFsc28gdXNlZCBpZiByZXF1aXJlZCBpbnB1dCBmaWVsZHMgYXJlIG5vdCBzZXQgb3IKK2lmIG9wdGlvbnMgYXJlIHNldCB3aGljaCBjYW5ub3QgYmUgdXNlZCB0b2dldGhlci4KIAotLS0tLQotICBHRVQgL2EvYWNjb3VudHMvc2VsZi9jYXBhYmlsaXRpZXM/Zm9ybWF0PUpTT04mcT1jcmVhdGVBY2NvdW50JnE9Y3JlYXRlR3JvdXAgSFRUUC8xLjAKLSAgQXV0aG9yaXphdGlvbjogRGlnZXN0IHVzZXJuYW1lPSJhZG1pbiIsIHJlYWxtPSJHZXJyaXQgQ29kZSBSZXZpZXciLCBub25jZT0iLi4uCis0MDMgRm9yYmlkZGVuCiteXl5eXl5eXl5eXl5eCitgNDAzIEZvcmJpZGRlbmAgaXMgdXNlZCBpZiB0aGUgb3BlcmF0aW9uIGlzIG5vdCBhbGxvd2VkIGJlY2F1c2UgdGhlCitjYWxsaW5nIHVzZXIgaGFzIG5vIHN1ZmZpY2llbnQgcGVybWlzc2lvbnMuCiAKLSAgKV19JwotICB7Ci0gICAgImNyZWF0ZUFjY291bnQiOiB0cnVlLAotICAgICJjcmVhdGVHcm91cCI6IHRydWUKLSAgfQotLS0tLQorRS5nLiBzb21lIFJFU1QgZW5kcG9pbnRzIHJlcXVpcmUgdGhhdCB0aGUgY2FsbGluZyB1c2VyIGhhcyBjZXJ0YWluCitsaW5rOmFjY2Vzcy1jb250cm9sLmh0bWwjZ2xvYmFsX2NhcGFiaWxpdGllc1tnbG9iYWwgY2FwYWJpbGl0aWVzXQorYXNzaWduZWQuCiAKLU1vc3QgcmVzdWx0cyBhcmUgYm9vbGVhbiwgYW5kIGEgZmllbGQgaXMgb25seSBwcmVzZW50IHdoZW4gaXRzIHZhbHVlCi1pcyBgdHJ1ZWAuIGxpbms6anNvbi5odG1sI3F1ZXJ5TGltaXRbYHF1ZXJ5TGltaXRgXSBpcyBhIHJhbmdlIGFuZCBpcwotcHJlc2VudGVkIGFzIGEgbmVzdGVkIEpTT04gb2JqZWN0IHdpdGggYG1pbmAgYW5kIGBtYXhgIG1lbWJlcnMuCitgNDAzIEZvcmJpZGRlbmAgaXMgYWxzbyB1c2VkIGlmIGBzZWxmYCBpcyB1c2VkIGFzIGFjY291bnQgSUQgYW5kIHRoZQorUkVTVCBjYWxsIHdhcyBkb25lIHdpdGhvdXQgYXV0aGVudGljYXRpb24uCiAKLVtbcHJvamVjdHNdXQotL3Byb2plY3RzLyAoTGlzdCBQcm9qZWN0cykKLX5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+Ci1MaXN0cyB0aGUgcHJvamVjdHMgYWNjZXNzaWJsZSBieSB0aGUgY2FsbGVyLiBUaGlzIGlzIHRoZSBzYW1lIGFzCi11c2luZyB0aGUgbGluazpjbWQtbHMtcHJvamVjdHMuaHRtbFtscy1wcm9qZWN0c10gY29tbWFuZCBvdmVyIFNTSCwKLWFuZCBhY2NlcHRzIHRoZSBzYW1lIG9wdGlvbnMgYXMgcXVlcnkgcGFyYW1ldGVycy4KKzQwNCBOb3QgRm91bmQKK15eXl5eXl5eXl5eXl4KK2A0MDQgTm90IEZvdW5kYCBpcyByZXR1cm5lZCBpZiB0aGUgcmVzb3VyY2UgdGhhdCBpcyBzcGVjaWZpZWQgYnkgdGhlCitVUkwgaXMgbm90IGZvdW5kIG9yIGlzIG5vdCB2aXNpYmxlIHRvIHRoZSBjYWxsaW5nIHVzZXIuIEEgcmVzb3VyY2UKK2Nhbm5vdCBiZSBmb3VuZCBpZiB0aGUgVVJMIGNvbnRhaW5zIGEgbm9uLWV4aXN0aW5nIElEIG9yIHZpZXcuCiAKLS0tLS0KLSAgR0VUIC9wcm9qZWN0cy8/Zm9ybWF0PUpTT04mZCBIVFRQLzEuMAorNDA1IE1ldGhvZCBOb3QgQWxsb3dlZAorXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgorYDQwNSBNZXRob2QgTm90IEFsbG93ZWRgIGlzIHVzZWQgaWYgdGhlIHJlc291cmNlIGV4aXN0cyBidXQgZG9lc24ndAorc3VwcG9ydCB0aGUgb3BlcmF0aW9uLgogCi0gIEhUVFAvMS4xIDIwMCBPSwotICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50Ci0gIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04Ci0gICAKLSAgKV19JwotICB7Ci0gICAgImV4dGVybmFsL2Jpc29uIjogewotICAgICAgImRlc2NyaXB0aW9uIjogIkdOVSBwYXJzZXIgZ2VuZXJhdG9yIgotICAgIH0sCi0gICAgImV4dGVybmFsL2djYyI6IHt9LAotICAgICJleHRlcm5hbC9vcGVuc3NsIjogewotICAgICAgImRlc2NyaXB0aW9uIjogImVuY3J5cHRpb25cbmNyeXB0byByb3V0aW5lcyIKLSAgICB9LAotICAgICJ0ZXN0IjogewotICAgICAgImRlc2NyaXB0aW9uIjogIlx1MDAzY2h0bWxcdTAwM2UgaXMgZXNjYXBlZCIKLSAgICB9Ci0gIH0KLS0tLS0KK0UuZy4gc29tZSBvZiB0aGUgYC9ncm91cHMvYCBlbmRwb2ludHMgYXJlIG9ubHkgc3VwcG9ydGVkIGZvciBHZXJyaXQKK2ludGVybmFsIGdyb3VwcywgaWYgdGhleSBhcmUgaW52b2tlZCBmb3IgYW4gZXh0ZXJuYWwgZ3JvdXAgdGhlIHJlc3BvbnNlCitpcyBgNDA1IE1ldGhvZCBOb3QgQWxsb3dlZGAuCiAKLVtbc3VnZ2VzdC1wcm9qZWN0c11dCi1UaGUgYC9wcm9qZWN0cy9gIFVSTCBhbHNvIGFjY2VwdHMgYSBwcmVmaXggc3RyaW5nIGFzIHBhcnQgb2YgdGhlIFVSTC4KLVRoaXMgbGltaXRzIHRoZSByZXN1bHRzIHRvIHRob3NlIHByb2plY3RzIHRoYXQgc3RhcnQgd2l0aCB0aGUgc3BlY2lmaWVkCi1wcmVmaXguCi1MaXN0IGFsbCBwcm9qZWN0cyB0aGF0IHN0YXJ0IHdpdGggYHBsYXRmb3JtL2A6Ci0tLS0tCi1HRVQgL3Byb2plY3RzL3BsYXRmb3JtLz9mb3JtYXQ9SlNPTiBIVFRQLzEuMAotSFRUUC8xLjEgMjAwIE9LCi1Db250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50Ci1Db250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL2pzb247Y2hhcnNldD1VVEYtOAotKV19JwotewotInBsYXRmb3JtL2RyaXZlcnMiOiB7fSwKLSJwbGF0Zm9ybS90b29scyI6IHt9Ci19Ci0tLS0tCi1FLmcuIHRoaXMgZmVhdHVyZSBjYW4gYmUgdXNlZCBieSBzdWdnZXN0aW9uIGNsaWVudCBVSSdzIHRvIGxpbWl0IHJlc3VsdHMuCis0MDkgQ29uZmxpY3QKK15eXl5eXl5eXl5eXgorYDQwOSBDb25mbGljdGAgaXMgdXNlZCBpZiB0aGUgcmVxdWVzdCBjYW5ub3QgYmUgY29tcGxldGVkIGJlY2F1c2UgdGhlCitjdXJyZW50IHN0YXRlIG9mIHRoZSByZXNvdXJjZSBkb2Vzbid0IGFsbG93IHRoZSBvcGVyYXRpb24uCiAKLVtbY2hhbmdlc11dCi0vY2hhbmdlcy8gKFF1ZXJ5IENoYW5nZXMpCi1+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+Ci1RdWVyaWVzIGNoYW5nZXMgdmlzaWJsZSB0byB0aGUgY2FsbGVyLiBUaGUgcXVlcnkgc3RyaW5nIG11c3QgYmUKLXByb3ZpZGVkIGJ5IHRoZSBgcWAgcGFyYW1ldGVyLiBUaGUgYG5gIHBhcmFtZXRlciBjYW4gYmUgdXNlZCB0byBsaW1pdAotdGhlIHJldHVybmVkIHJlc3VsdHMuCitFLmcuIGlmIHlvdSB0cnkgdG8gc3VibWl0IGEgY2hhbmdlIHRoYXQgaXMgYWJhbmRvbmVkLCB0aGlzIGZhaWxzIHdpdGgKK2A0MDkgQ29uZmxpY3RgIGJlY2F1c2UgdGhlIHN0YXRlIG9mIHRoZSBjaGFuZ2UgZG9lc24ndCBhbGxvdyB0aGUgc3VibWl0CitvcGVyYXRpb24uCiAKLVF1ZXJ5IGZvciBvcGVuIGNoYW5nZXMgb2Ygd2F0Y2hlZCBwcm9qZWN0czoKLS0tLS0KLSAgR0VUIC9jaGFuZ2VzLz9mb3JtYXQ9SlNPTiZxPXN0YXR1czpvcGVuK2lzOndhdGNoZWQmbj0yIEhUVFAvMS4wCitgNDA5IENvbmZsaWN0YCBpcyBhbHNvIHVzZWQgaWYgeW91IHRyeSB0byBjcmVhdGUgYSByZXNvdXJjZSBidXQgdGhlCituYW1lIGlzIGFscmVhZHkgb2NjdXBpZWQgYnkgYW4gZXhpc3RpbmcgcmVzb3VyY2UuCiAKLSAgSFRUUC8xLjEgMjAwIE9LCi0gIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKLSAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKKzQxMiBQcmVjb25kaXRpb24gRmFpbGVkCiteXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgorYDQxMiBQcmVjb25kaXRpb24gRmFpbGVkYCBpcyB1c2VkIGlmIGEgcHJlY29uZGl0aW9uIGZyb20gdGhlIHJlcXVlc3QKK2hlYWRlciBmaWVsZHMgaXMgbm90IGZ1bGZpbGxlZCBhcyBkZXNjcmliZWQgaW4gdGhlIGxpbms6I3ByZWNvbmRpdGlvbnNbCitQcmVjb25kaXRpb25zXSBzZWN0aW9uLgogCi0gICldfScKLSAgewotICAgICJwcm9qZWN0IjogImRlbW8iLAotICAgICJicmFuY2giOiAibWFzdGVyIiwKLSAgICAiaWQiOiAiSWRhZjVlMDk4ZDcwODk4YjcxMTlmNmY0YWY1YTZjMTMzNDNkNjRiNTciLAotICAgICJzdWJqZWN0IjogIk9uZSBjaGFuZ2UiLAotICAgICJzdGF0dXMiOiAiTkVXIiwKLSAgICAiY3JlYXRlZCI6ICIyMDEyLTA3LTE3IDA3OjE4OjMwLjg1NDAwMDAwMCIsCi0gICAgInVwZGF0ZWQiOiAiMjAxMi0wNy0xNyAwNzoxOToyNy43NjYwMDAwMDAiLAotICAgICJyZXZpZXdlZCI6IHRydWUsCi0gICAgIl9zb3J0a2V5IjogIjAwMWU3MDU3MDAwMDA2ZGMiLAotICAgICJfbnVtYmVyIjogMTc1NiwKLSAgICAib3duZXIiOiB7Ci0gICAgICAibmFtZSI6ICJKb2huIERvZSIKLSAgICB9LAotICB9LAotICB7Ci0gICAgInByb2plY3QiOiAiZGVtbyIsCi0gICAgImJyYW5jaCI6ICJtYXN0ZXIiLAotICAgICJpZCI6ICJJMDljODA0MWI1ODY3ZDViMzMxNzAzMTZlMmFiYzM0Yjc5YmJiODUwMSIsCi0gICAgInN1YmplY3QiOiAiQW5vdGhlciBjaGFuZ2UiLAotICAgICJzdGF0dXMiOiAiTkVXIiwKLSAgICAiY3JlYXRlZCI6ICIyMDEyLTA3LTE3IDA3OjE4OjMwLjg4NDAwMDAwMCIsCi0gICAgInVwZGF0ZWQiOiAiMjAxMi0wNy0xNyAwNzoxODozMC44ODUwMDAwMDAiLAotICAgICJfc29ydGtleSI6ICIwMDFlNzA1NjAwMDAwNmRkIiwKLSAgICAiX251bWJlciI6IDE3NTcsCi0gICAgIm93bmVyIjogewotICAgICAgIm5hbWUiOiAiSm9obiBEb2UiCi0gICAgfSwKLSAgICAiX21vcmVfY2hhbmdlcyI6IHRydWUKLSAgfQotLS0tLQotCi1UaGUgY2hhbmdlIG91dHB1dCBpcyBzb3J0ZWQgYnkgdGhlIGxhc3QgdXBkYXRlIHRpbWUsIG1vc3QgcmVjZW50bHkKLXVwZGF0ZWQgdG8gb2xkZXN0IHVwZGF0ZS4KLQotSWYgdGhlIGBuYCBxdWVyeSBwYXJhbWV0ZXIgaXMgc3VwcGxpZWQgYW5kIGFkZGl0aW9uYWwgY2hhbmdlcyBleGlzdAotdGhhdCBtYXRjaCB0aGUgcXVlcnkgYmV5b25kIHRoZSBlbmQsIHRoZSBsYXN0IGNoYW5nZSBvYmplY3QgaGFzIGEKLWBfbW9yZV9jaGFuZ2VzOiB0cnVlYCBKU09OIGZpZWxkIHNldC4gQ2FsbGVycyBjYW4gcmVzdW1lIGEgcXVlcnkgd2l0aAotdGhlIGBuYCBxdWVyeSBwYXJhbWV0ZXIsIHN1cHBseWluZyB0aGUgbGFzdCBjaGFuZ2UncyBgX3NvcnRrZXlgIGZpZWxkCi1hcyB0aGUgdmFsdWUuIFdoZW4gZ29pbmcgaW4gdGhlIHJldmVyc2UgZGlyZWN0aW9uIHdpdGggdGhlIGBwYCBxdWVyeQotcGFyYW1ldGVyIGEgYF9tb3JlX2NoYW5nZXM6IHRydWVgIGlzIHB1dCBpbiB0aGUgZmlyc3QgY2hhbmdlIG9iamVjdCBpZgotdGhlcmUgYXJlIHJlc3VsdHMgKmJlZm9yZSogdGhlIGZpcnN0IGNoYW5nZSByZXR1cm5lZC4KLQotQ2xpZW50cyBhcmUgYWxsb3dlZCB0byBzcGVjaWZ5IG1vcmUgdGhhbiBvbmUgcXVlcnkgYnkgc2V0dGluZyB0aGUgYHFgCi1wYXJhbWV0ZXIgbXVsdGlwbGUgdGltZXMuIEluIHRoaXMgY2FzZSB0aGUgcmVzdWx0IGlzIGFuIGFycmF5IG9mCi1hcnJheXMsIG9uZSBwZXIgcXVlcnkgaW4gdGhlIHNhbWUgb3JkZXIgdGhlIHF1ZXJpZXMgd2VyZSBnaXZlbiBpbi4KLQotUXVlcnkgdGhhdCByZXRyaWV2ZXMgY2hhbmdlcyBmb3IgYSB1c2VyJ3MgZGFzaGJvYXJkOgotLS0tLQotICBHRVQgL2NoYW5nZXMvP2Zvcm1hdD1KU09OJnE9aXM6b3Blbitvd25lcjpzZWxmJnE9aXM6b3BlbityZXZpZXdlcjpzZWxmKy1vd25lcjpzZWxmJnE9aXM6Y2xvc2VkK293bmVyOnNlbGYrbGltaXQ6NSZvPUxBQkVMUyBIVFRQLzEuMAotCi0gIEhUVFAvMS4xIDIwMCBPSwotICBDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2htZW50Ci0gIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjtjaGFyc2V0PVVURi04Ci0KLSAgKV19JwotICBbCi0gICAgWwotICAgICAgewotICAgICAgICAicHJvamVjdCI6ICJkZW1vIiwKLSAgICAgICAgImJyYW5jaCI6ICJtYXN0ZXIiLAotICAgICAgICAiaWQiOiAiSWRhZjVlMDk4ZDcwODk4YjcxMTlmNmY0YWY1YTZjMTMzNDNkNjRiNTciLAotICAgICAgICAic3ViamVjdCI6ICJPbmUgY2hhbmdlIiwKLSAgICAgICAgInN0YXR1cyI6ICJORVciLAotICAgICAgICAiY3JlYXRlZCI6ICIyMDEyLTA3LTE3IDA3OjE4OjMwLjg1NDAwMDAwMCIsCi0gICAgICAgICJ1cGRhdGVkIjogIjIwMTItMDctMTcgMDc6MTk6MjcuNzY2MDAwMDAwIiwKLSAgICAgICAgInJldmlld2VkIjogdHJ1ZSwKLSAgICAgICAgIl9zb3J0a2V5IjogIjAwMWU3MDU3MDAwMDA2ZGMiLAotICAgICAgICAiX251bWJlciI6IDE3NTYsCi0gICAgICAgICJvd25lciI6IHsKLSAgICAgICAgICAibmFtZSI6ICJKb2huIERvZSIKLSAgICAgICAgfSwKLSAgICAgICAgImxhYmVscyI6IHsKLSAgICAgICAgICAiVmVyaWZpZWQiOiB7fSwKLSAgICAgICAgICAiQ29kZS1SZXZpZXciOiB7fQotICAgICAgICB9Ci0gICAgICB9Ci0gICAgXSwKLSAgICBbXSwKLSAgICBbXQotICBdCi0tLS0tCi0KLUFkZGl0aW9uYWwgZmllbGRzIGNhbiBiZSBvYnRhaW5lZCBieSBhZGRpbmcgYG9gIHBhcmFtZXRlcnMsIGVhY2gKLW9wdGlvbiByZXF1aXJlcyBtb3JlIGRhdGFiYXNlIGxvb2t1cHMgYW5kIHNsb3dzIGRvd24gdGhlIHF1ZXJ5Ci1yZXNwb25zZSB0aW1lIHRvIHRoZSBjbGllbnQgc28gdGhleSBhcmUgZ2VuZXJhbGx5IGRpc2FibGVkIGJ5Ci1kZWZhdWx0LiBPcHRpb25hbCBmaWVsZHMgYXJlOgotCi0qIGBMQUJFTFNgOiBhIHN1bW1hcnkgb2YgZWFjaCBsYWJlbCByZXF1aXJlZCBmb3Igc3VibWl0LCBhbmQKLSAgYXBwcm92ZXJzIHRoYXQgaGF2ZSBncmFudGVkIChvciByZWplY3RlZCkgd2l0aCB0aGF0IGxhYmVsLgotCi0qIGBDVVJSRU5UX1JFVklTSU9OYDogZGVzY3JpYmUgdGhlIGN1cnJlbnQgcmV2aXNpb24gKHBhdGNoIHNldCkKLSAgb2YgdGhlIGNoYW5nZSwgaW5jbHVkaW5nIHRoZSBjb21taXQgU0hBLTEgYW5kIFVSTHMgdG8gZmV0Y2ggZnJvbS4KLQotKiBgQUxMX1JFVklTSU9OU2A6IGRlc2NyaWJlIGFsbCByZXZpc2lvbnMsIG5vdCBqdXN0IGN1cnJlbnQuCi0KLSogYENVUlJFTlRfQ09NTUlUYDogcGFyc2UgYW5kIG91dHB1dCBhbGwgaGVhZGVyIGZpZWxkcyBmcm9tIHRoZQotICBjb21taXQgb2JqZWN0LCBpbmNsdWRpbmcgbWVzc2FnZS4gT25seSB2YWxpZCB3aGVuIHRoZSBjdXJyZW50Ci0gIHJldmlzaW9uIG9yIGFsbCByZXZpc2lvbnMgYXJlIHNlbGVjdGVkLgotCi0qIGBBTExfQ09NTUlUU2A6IHBhcnNlIGFuZCBvdXRwdXQgYWxsIGhlYWRlciBmaWVsZHMgZnJvbSB0aGUKLSAgb3V0cHV0IHJldmlzaW9ucy4gSWYgb25seSBgQ1VSUkVOVF9SRVZJU0lPTmAgd2FzIHJlcXVlc3RlZAotICB0aGVuIG9ubHkgdGhlIGN1cnJlbnQgcmV2aXNpb24ncyBjb21taXQgZGF0YSB3aWxsIGJlIG91dHB1dC4KLQotKiBgQ1VSUkVOVF9GSUxFU2A6IGxpc3QgZmlsZXMgbW9kaWZpZWQgYnkgdGhlIGNvbW1pdCwgaW5jbHVkaW5nCi0gIGJhc2ljIGxpbmUgY291bnRzIGluc2VydGVkL2RlbGV0ZWQgcGVyIGZpbGUuIE9ubHkgdmFsaWQgd2hlbgotICB0aGUgY3VycmVudCByZXZpc2lvbiBvciBhbGwgcmV2aXNpb25zIGFyZSBzZWxlY3RlZC4KLQotKiBgQUxMX0ZJTEVTYDogbGlzdCBmaWxlcyBtb2RpZmllZCBieSB0aGUgY29tbWl0LCBpbmNsdWRpbmcKLSAgYmFzaWMgbGluZSBjb3VudHMgaW5zZXJ0ZWQvZGVsZXRlZCBwZXIgZmlsZS4gSWYgb25seSB0aGUKLSAgYENVUlJFTlRfUkVWSVNJT05gIHdhcyByZXF1ZXN0ZWQgdGhlIG9ubHkgdGhhdCBjb21taXQncwotICBtb2RpZmllZCBmaWxlcyB3aWxsIGJlIG91dHB1dC4KLQotLS0tLQotICBHRVQgL2NoYW5nZXMvP3E9OTcmZm9ybWF0PUpTT04mbz1DVVJSRU5UX1JFVklTSU9OJm89Q1VSUkVOVF9DT01NSVQmbz1DVVJSRU5UX0ZJTEVTIEhUVFAvMS4wCi0KLSAgSFRUUC8xLjEgMjAwIE9LCi0gIENvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQKLSAgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9qc29uO2NoYXJzZXQ9VVRGLTgKLQotICApXX0nCi0gIFsKLSAgICB7Ci0gICAgICAicHJvamVjdCI6ICJnZXJyaXQiLAotICAgICAgImJyYW5jaCI6ICJtYXN0ZXIiLAotICAgICAgImlkIjogIkk3ZWE0NmQyZTJlZTVjNjRjMGQ4MDc2Nzc4NTljZmI3ZDkwYjg5NjZhIiwKLSAgICAgICJzdWJqZWN0IjogIlVzZSBhbiBFdmVudEJ1cyB0byBtYW5hZ2Ugc3RhciBpY29ucyIsCi0gICAgICAic3RhdHVzIjogIk5FVyIsCi0gICAgICAiY3JlYXRlZCI6ICIyMDEyLTA0LTI1IDAwOjUyOjI1LjU4MDAwMDAwMCIsCi0gICAgICAidXBkYXRlZCI6ICIyMDEyLTA0LTI1IDAwOjUyOjI1LjU4NjAwMDAwMCIsCi0gICAgICAiX3NvcnRrZXkiOiAiMDAxYzliZjQwMDAwMDA2MSIsCi0gICAgICAiX251bWJlciI6IDk3LAotICAgICAgIm93bmVyIjogewotICAgICAgICAibmFtZSI6ICJTaGF3biBQZWFyY2UiCi0gICAgICB9LAotICAgICAgImN1cnJlbnRfcmV2aXNpb24iOiAiMTg0ZWJlNTM4MDVlMTAyNjA1ZDExZjZiMTQzNDg2ZDE1YzIzYTA5YyIsCi0gICAgICAicmV2aXNpb25zIjogewotICAgICAgICAiMTg0ZWJlNTM4MDVlMTAyNjA1ZDExZjZiMTQzNDg2ZDE1YzIzYTA5YyI6IHsKLSAgICAgICAgICAiX251bWJlciI6IDEsCi0gICAgICAgICAgImZldGNoIjogewotICAgICAgICAgICAgImdpdCI6IHsKLSAgICAgICAgICAgICAgInVybCI6ICJnaXQ6Ly9sb2NhbGhvc3QvZ2Vycml0IiwKLSAgICAgICAgICAgICAgInJlZiI6ICJyZWZzL2NoYW5nZXMvOTcvOTcvMSIKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAiaHR0cCI6IHsKLSAgICAgICAgICAgICAgInVybCI6ICJodHRwOi8vMTI3LjAuMC4xOjgwODAvZ2Vycml0IiwKLSAgICAgICAgICAgICAgInJlZiI6ICJyZWZzL2NoYW5nZXMvOTcvOTcvMSIKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9LAotICAgICAgICAgICJjb21taXQiOiB7Ci0gICAgICAgICAgICAicGFyZW50cyI6IFsKLSAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJjb21taXQiOiAiMWVlZTJjOWQ4ZjM1MjQ4Mzc4MWU3NzJmMzVkYzU4NmE2OWZmNTY0NiIsCi0gICAgICAgICAgICAgICAgInN1YmplY3QiOiAiTWlncmF0ZSBjb250cmlidXRvciBhZ3JlZW1lbnRzIHRvIEFsbC1Qcm9qZWN0cy4iCi0gICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAiYXV0aG9yIjogewotICAgICAgICAgICAgICAibmFtZSI6ICJTaGF3biBPLiBQZWFyY2UiLAotICAgICAgICAgICAgICAiZW1haWwiOiAic29wQGdvb2dsZS5jb20iLAotICAgICAgICAgICAgICAiZGF0ZSI6ICIyMDEyLTA0LTI0IDE4OjA4OjA4LjAwMDAwMDAwMCIsCi0gICAgICAgICAgICAgICJ0eiI6IC00MjAKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAiY29tbWl0dGVyIjogewotICAgICAgICAgICAgICAibmFtZSI6ICJTaGF3biBPLiBQZWFyY2UiLAotICAgICAgICAgICAgICAiZW1haWwiOiAic29wQGdvb2dsZS5jb20iLAotICAgICAgICAgICAgICAiZGF0ZSI6ICIyMDEyLTA0LTI0IDE4OjA4OjA4LjAwMDAwMDAwMCIsCi0gICAgICAgICAgICAgICJ0eiI6IC00MjAKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAic3ViamVjdCI6ICJVc2UgYW4gRXZlbnRCdXMgdG8gbWFuYWdlIHN0YXIgaWNvbnMiLAotICAgICAgICAgICAgIm1lc3NhZ2UiOiAiVXNlIGFuIEV2ZW50QnVzIHRvIG1hbmFnZSBzdGFyIGljb25zXG5cbkltYWdlIHdpZGdldHMgdGhhdCBuZWVkIHRvIC4uLiIKLSAgICAgICAgICB9LAotICAgICAgICAgICJmaWxlcyI6IHsKLSAgICAgICAgICAgICJnZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VDYWNoZS5qYXZhIjogewotICAgICAgICAgICAgICAibGluZXNfZGVsZXRlZCI6IDgKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAiZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlRGV0YWlsQ2FjaGUuamF2YSI6IHsKLSAgICAgICAgICAgICAgImxpbmVzX2luc2VydGVkIjogMQotICAgICAgICAgICAgfSwKLSAgICAgICAgICAgICJnZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VTY3JlZW4uamF2YSI6IHsKLSAgICAgICAgICAgICAgImxpbmVzX2luc2VydGVkIjogMTEsCi0gICAgICAgICAgICAgICJsaW5lc19kZWxldGVkIjogMTkKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAiZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlVGFibGUuamF2YSI6IHsKLSAgICAgICAgICAgICAgImxpbmVzX2luc2VydGVkIjogMjMsCi0gICAgICAgICAgICAgICJsaW5lc19kZWxldGVkIjogMjAKLSAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAiZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvU3RhckNhY2hlLmphdmEiOiB7Ci0gICAgICAgICAgICAgICJzdGF0dXMiOiAiRCIsCi0gICAgICAgICAgICAgICJsaW5lc19kZWxldGVkIjogMTM5Ci0gICAgICAgICAgICB9LAotICAgICAgICAgICAgImdlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1N0YXJyZWRDaGFuZ2VzLmphdmEiOiB7Ci0gICAgICAgICAgICAgICJzdGF0dXMiOiAiQSIsCi0gICAgICAgICAgICAgICJsaW5lc19pbnNlcnRlZCI6IDIwNAotICAgICAgICAgICAgfSwKLSAgICAgICAgICAgICJnZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvU2NyZWVuLmphdmEiOiB7Ci0gICAgICAgICAgICAgICJsaW5lc19kZWxldGVkIjogOQotICAgICAgICAgICAgfQotICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLSAgXQotLS0tLQotCis0MjIgVW5wcm9jZXNzYWJsZSBFbnRpdHkKK15eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXgorYDQyMiBVbnByb2Nlc3NhYmxlIEVudGl0eWAgaXMgcmV0dXJuZWQgaWYgdGhlIElEIG9mIGEgcmVzb3VyY2UgdGhhdCBpcworc3BlY2lmaWVkIGluIHRoZSByZXF1ZXN0IGJvZHkgY2Fubm90IGJlIHJlc29sdmVkLgogCiBHRVJSSVQKIC0tLS0tLQpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi91c2VyLWNoYW5nZWlkLnR4dCBiL0RvY3VtZW50YXRpb24vdXNlci1jaGFuZ2VpZC50eHQKaW5kZXggYTMwMTVlMS4uYTQyMjRiZCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi91c2VyLWNoYW5nZWlkLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL3VzZXItY2hhbmdlaWQudHh0CkBAIC0xMCwxMCArMTAsMTAgQEAKIEdlcnJpdCBjYW4gYXV0b21hdGljYWxseSBhc3NvY2lhdGUgYSBuZXcgdmVyc2lvbiBvZiBhIGNoYW5nZSBiYWNrCiB0byBpdHMgb3JpZ2luYWwgcmV2aWV3LCBldmVuIGFjcm9zcyBjaGVycnktcGlja3MgYW5kIHJlYmFzZXMuCiAKLVRvIGJlIHBpY2tlZCB1cCBieSBHZXJyaXQsIGEgQ2hhbmdlLUlkIGxpbmUgbXVzdCBiZSBpbiB0aGUgYm90dG9tCi1wb3J0aW9uIChsYXN0IHBhcmFncmFwaCkgb2YgYSBjb21taXQgbWVzc2FnZSwgYW5kIG1heSBiZSBtaXhlZAotdG9nZXRoZXIgd2l0aCB0aGUgU2lnbmVkLW9mZi1ieSwgQWNrZWQtYnksIG9yIG90aGVyIHN1Y2ggZm9vdGVycy4KLUZvciBleGFtcGxlOgorVG8gYmUgcGlja2VkIHVwIGJ5IEdlcnJpdCwgYSBDaGFuZ2UtSWQgbGluZSBtdXN0IGJlIGluIHRoZSBmb290ZXIKKyhsYXN0IHBhcmFncmFwaCkgb2YgYSBjb21taXQgbWVzc2FnZSwgYW5kIG1heSBiZSBtaXhlZAordG9nZXRoZXIgd2l0aCBsaW5rOnVzZXItc2lnbmVkb2ZmYnkuaHRtbFtTaWduZWQtb2ZmLWJ5XSwgQWNrZWQtYnksCitvciBvdGhlciBzdWNoIGxpbmVzLiBGb3IgZXhhbXBsZToKIAogLS0tLQogICAkIGdpdCBsb2cgLTEKQEAgLTQwLDYgKzQwLDcgQEAKIFRvIGF2b2lkIGNvbmZ1c2lvbiB3aXRoIGNvbW1pdCBuYW1lcywgQ2hhbmdlLUlkcyBhcmUgdHlwaWNhbGx5IHByZWZpeGVkIHdpdGgKIGFuIHVwcGVyY2FzZSBgSWAuCiAKK1tbY3JlYXRpb25dXQogQ3JlYXRpb24KIC0tLS0tLS0tCiAKQEAgLTU0LDYgKzU1LDEwIEBACiAKICAgJCBjdXJsIC1vIC5naXQvaG9va3MvY29tbWl0LW1zZyBodHRwOi8vcmV2aWV3LmV4YW1wbGUuY29tL3Rvb2xzL2hvb2tzL2NvbW1pdC1tc2cKIAorVGhlbiBlbnN1cmUgdGhhdCB0aGUgZXhlY3V0ZSBiaXQgaXMgc2V0IG9uIHRoZSBob29rIHNjcmlwdDoKKworICAkIGNobW9kIHUreCAuZ2l0L2hvb2tzL2NvbW1pdC1tc2cKKwogRm9yIG1vcmUgZGV0YWlscywgc2VlIGxpbms6Y21kLWhvb2stY29tbWl0LW1zZy5odG1sW2NvbW1pdC1tc2ddLgogCiBDaGFuZ2UgVXBsb2FkCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL3VzZXItY3VzdG9tLWRhc2hib2FyZHMudHh0IGIvRG9jdW1lbnRhdGlvbi91c2VyLWN1c3RvbS1kYXNoYm9hcmRzLnR4dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYTAxNWU0Yy4uMDAwMDAwMAotLS0gYS9Eb2N1bWVudGF0aW9uL3VzZXItY3VzdG9tLWRhc2hib2FyZHMudHh0CisrKyAvZGV2L251bGwKQEAgLTEsNDggKzAsMCBAQAotR2Vycml0IENvZGUgUmV2aWV3IC0gQ3VzdG9tIERhc2hib2FyZHMKLT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0KLURlc2NyaXB0aW9uCi0tLS0tLS0tLS0tLQotCi1BIGN1c3RvbSBkYXNoYm9hcmQgaXMgc2hvd24gaW4gYSBsYXlvdXQgc2ltaWxhciB0byB0aGUgcGVyLXVzZXIKLWRhc2hib2FyZCwgYnV0IHRoZSBzZWN0aW9ucyBhcmUgZW50aXJlbHkgY29uZmlndXJlZCBmcm9tIHRoZSBVUkwuCi1CZWNhdXNlIG9mIHRoaXMgY3VzdG9tIGRhc2hib2FyZHMgYXJlIHN0YXRlbGVzcyBvbiB0aGUgc2VydmVyIHNpZGUuCi1Vc2VycyBvciBwcm9qZWN0cyBjYW4gc2ltcGx5IHRyYWRlIFVSTHMgdXNpbmcgYW4gZXh0ZXJuYWwgc3lzdGVtIGxpa2UKLWEgcHJvamVjdCB3aWtpLCBvciBzaXRlIGFkbWluaXN0cmF0b3JzIGNhbiBwdXQgdGhlIGxpbmtzIGludG8gdGhlCi1zaXRlJ3MgYEdlcnJpdEhlYWRlci5odG1sYCBvciBgR2Vycml0Rm9vdGVyLmh0bWxgLgotCi1EYXNoYm9hcmRzIGFyZSBhdmFpbGFibGUgdmlhIFVSTHMgbGlrZToKLS0tLS0KLSAgLyMvZGFzaGJvYXJkLz90aXRsZT1DdXN0b20rVmlldyZUbytSZXZpZXc9cmV2aWV3ZXI6am9obi5kb2VAZXhhbXBsZS5jb20mUGVuZGluZytJbitteXByb2plY3Q9cHJvamVjdDpteXByb2plY3QraXM6b3BlbgotLS0tLQotVGhpcyBvcGVucyBhIHZpZXcgc2hvd2luZyB0aGUgdGl0bGUgIkN1c3RvbSBWaWV3IiB3aXRoIHR3byBzZWN0aW9ucywKLSJUbyBSZXZpZXciIGFuZCAiUGVuZGluZyBpbiBteXByb2plY3QiOgotLS0tLQotICBDdXN0b20gVmlldwotCi0gIFRvIFJldmlldwotCi0gICAgUmVzdWx0cyBvZiBgcmV2aWV3ZXI6am9obi5kb2VAZXhhbXBsZS5jb21gCi0KLSAgUGVuZGluZyBJbiBteXByb2plY3QKLQotICAgIFJlc3VsdHMgb2YgYHByb2plY3Q6bXlwcm9qZWN0IGlzOm9wZW5gCi0tLS0tCi0KLVRoZSBkYXNoYm9hcmQgVVJMcyBhcmUgZWFzeSB0byBjb25maWd1cmUuIEFsbCBrZXlzIGFuZCB2YWx1ZXMgaW4gdGhlCi1VUkwgYXJlIGVuY29kZWQgYXMgcXVlcnkgcGFyYW1ldGVycy4gU2V0IHRoZSBwYWdlIGFuZCB3aW5kb3cgdGl0bGUKLXVzaW5nIGFuIG9wdGlvbmFsIGB0aXRsZT1UZXh0YCBwYXJhbWV0ZXIuCi0KLUVhY2ggc2VjdGlvbidzIHRpdGxlIGlzIGRlZmluZWQgYnkgdGhlIHBhcmFtZXRlciBuYW1lLCB0aGUgc2VjdGlvbgotZGlzcGxheSBvcmRlciBpcyBkZWZpbmVkIGJ5IHRoZSBvcmRlciB0aGUgcGFyYW1ldGVycyBhcHBlYXIgaW4gdGhlCi1VUkwsIGFuZCB0aGUgcXVlcnkgcmVzdWx0cyBhcmUgZGVmaW5lZCBieSB0aGUgcGFyYW1ldGVyIHZhbHVlLiBUbwotbGltaXQgdGhlIG51bWJlciBvZiByb3dzIGluIGEgcXVlcnkgdXNlIGBsaW1pdDpOYCwgb3RoZXJ3aXNlIHRoZQotZW50aXJlIHJlc3VsdCBzZXQgd2lsbCBiZSBzaG93biAodXAgdG8gdGhlIHVzZXIncyBxdWVyeSBsaW1pdCkuCi0KLVBhcmFtZXRlcnMgbWF5IGJlIHNlcGFyYXRlZCBmcm9tIGVhY2ggb3RoZXIgdXNpbmcgYW55IG9mIHRoZSBmb2xsb3dpbmcKLWNoYXJhY3RlcnMsIGFzIHNvbWUgdXNlcnMgbWF5IGZpbmQgb25lIG1vcmUgcmVhZGFibGUgdGhhbiBhbm90aGVyOgotYCZgIG9yIGA7YCBvciBgLGAKLQotR0VSUklUCi0tLS0tLS0KLVBhcnQgb2YgbGluazppbmRleC5odG1sW0dlcnJpdCBDb2RlIFJldmlld10KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vdXNlci1kYXNoYm9hcmRzLnR4dCBiL0RvY3VtZW50YXRpb24vdXNlci1kYXNoYm9hcmRzLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zYTEyYjc2Ci0tLSAvZGV2L251bGwKKysrIGIvRG9jdW1lbnRhdGlvbi91c2VyLWRhc2hib2FyZHMudHh0CkBAIC0wLDAgKzEsMTY5IEBACitHZXJyaXQgQ29kZSBSZXZpZXcgLSBEYXNoYm9hcmRzCis9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK0N1c3RvbSBEYXNoYm9hcmRzCistLS0tLS0tLS0tLS0tLS0tLQorCitBIGN1c3RvbSBkYXNoYm9hcmQgaXMgc2hvd24gaW4gYSBsYXlvdXQgc2ltaWxhciB0byB0aGUgcGVyLXVzZXIKK2Rhc2hib2FyZCwgYnV0IHRoZSBzZWN0aW9ucyBhcmUgZW50aXJlbHkgY29uZmlndXJlZCBmcm9tIHRoZSBVUkwuCitCZWNhdXNlIG9mIHRoaXMgY3VzdG9tIGRhc2hib2FyZHMgYXJlIHN0YXRlbGVzcyBvbiB0aGUgc2VydmVyIHNpZGUuCitVc2VycyBvciBwcm9qZWN0cyBjYW4gc2ltcGx5IHRyYWRlIFVSTHMgdXNpbmcgYW4gZXh0ZXJuYWwgc3lzdGVtIGxpa2UKK2EgcHJvamVjdCB3aWtpLCBvciBzaXRlIGFkbWluaXN0cmF0b3JzIGNhbiBwdXQgdGhlIGxpbmtzIGludG8gdGhlCitzaXRlJ3MgYEdlcnJpdEhlYWRlci5odG1sYCBvciBgR2Vycml0Rm9vdGVyLmh0bWxgLgorCitEYXNoYm9hcmRzIGFyZSBhdmFpbGFibGUgdmlhIFVSTHMgbGlrZToKKy0tLS0KKyAgLyMvZGFzaGJvYXJkLz90aXRsZT1DdXN0b20rVmlldyZUbytSZXZpZXc9cmV2aWV3ZXI6am9obi5kb2VAZXhhbXBsZS5jb20mUGVuZGluZytJbitteXByb2plY3Q9cHJvamVjdDpteXByb2plY3QraXM6b3BlbgorLS0tLQorVGhpcyBvcGVucyBhIHZpZXcgc2hvd2luZyB0aGUgdGl0bGUgIkN1c3RvbSBWaWV3IiB3aXRoIHR3byBzZWN0aW9ucywKKyJUbyBSZXZpZXciIGFuZCAiUGVuZGluZyBpbiBteXByb2plY3QiOgorLS0tLQorICBDdXN0b20gVmlldworCisgIFRvIFJldmlldworCisgICAgUmVzdWx0cyBvZiBgcmV2aWV3ZXI6am9obi5kb2VAZXhhbXBsZS5jb21gCisKKyAgUGVuZGluZyBJbiBteXByb2plY3QKKworICAgIFJlc3VsdHMgb2YgYHByb2plY3Q6bXlwcm9qZWN0IGlzOm9wZW5gCistLS0tCisKK1RoZSBkYXNoYm9hcmQgVVJMcyBhcmUgZWFzeSB0byBjb25maWd1cmUuIEFsbCBrZXlzIGFuZCB2YWx1ZXMgaW4gdGhlCitVUkwgYXJlIGVuY29kZWQgYXMgcXVlcnkgcGFyYW1ldGVycy4gU2V0IHRoZSBwYWdlIGFuZCB3aW5kb3cgdGl0bGUKK3VzaW5nIGFuIG9wdGlvbmFsIGB0aXRsZT1UZXh0YCBwYXJhbWV0ZXIuCisKK0VhY2ggc2VjdGlvbidzIHRpdGxlIGlzIGRlZmluZWQgYnkgdGhlIHBhcmFtZXRlciBuYW1lLCB0aGUgc2VjdGlvbgorZGlzcGxheSBvcmRlciBpcyBkZWZpbmVkIGJ5IHRoZSBvcmRlciB0aGUgcGFyYW1ldGVycyBhcHBlYXIgaW4gdGhlCitVUkwsIGFuZCB0aGUgcXVlcnkgcmVzdWx0cyBhcmUgZGVmaW5lZCBieSB0aGUgcGFyYW1ldGVyIHZhbHVlLiBUbworbGltaXQgdGhlIG51bWJlciBvZiByb3dzIGluIGEgcXVlcnkgdXNlIGBsaW1pdDpOYCwgb3RoZXJ3aXNlIHRoZQorZW50aXJlIHJlc3VsdCBzZXQgd2lsbCBiZSBzaG93biAodXAgdG8gdGhlIHVzZXIncyBxdWVyeSBsaW1pdCkuCisKK1BhcmFtZXRlcnMgbWF5IGJlIHNlcGFyYXRlZCBmcm9tIGVhY2ggb3RoZXIgdXNpbmcgYW55IG9mIHRoZSBmb2xsb3dpbmcKK2NoYXJhY3RlcnMsIGFzIHNvbWUgdXNlcnMgbWF5IGZpbmQgb25lIG1vcmUgcmVhZGFibGUgdGhhbiBhbm90aGVyOgorYCZgIG9yIGA7YCBvciBgLGAKKworVGhlIHNwZWNpYWwgYGZvcmVhY2g9Li4uYCBwYXJhbWV0ZXIgaXMgZGVzaWduZWQgdG8gZmFjaWxpdGF0ZQorbW9yZSBlYXNpbHkgd3JpdHRpbmcgc2ltaWxhciBxdWVyaWVzIGluIGEgZGFzaGJvYXJkLiAgVGhlIHZhbHVlIG9mIHRoZQorZm9yZWFjaCBwYXJhbWV0ZXIgd2lsbCBiZSB1c2VkIGluIGV2ZXJ5IHF1ZXJ5IGluIHRoZSBkYXNoYm9hcmQgYnkKK2FwcGVuZGluZyBpdCB0byB0aGVpciBlbmRzIHdpdGggYSBzcGFjZSAoQU5EaW5nIGl0IHdpdGggdGhlIHF1ZXJpZXMpLgorCitFeGFtcGxlIGN1c3RvbSBkYXNoYm9hcmQgdXNpbmcgZm9yZWFjaCB0byBjb25zdHJhaW4gYSBkYXNoYm9hcmQKK3RvIGNoYW5nZXMgZm9yIHRoZSBjdXJyZW50IHVzZXI6CisKKy0tLS0KKyAgLyMvZGFzaGJvYXJkLz90aXRsZT1NaW5lJmZvcmVhY2g9b3duZXI6c2VsZiZNeStQZW5kaW5nPWlzOm9wZW4mTXkrTWVyZ2VkPWlzOm1lcmdlZAorLS0tLQorCisKK1tbcHJvamVjdC1kYXNoYm9hcmRzXV0KK1Byb2plY3QgRGFzaGJvYXJkcworLS0tLS0tLS0tLS0tLS0tLS0tCisKK0l0IGlzIHBvc3NpYmxlIHRvIHNoYXJlIGN1c3RvbSBkYXNoYm9hcmRzIGF0IGEgcHJvamVjdCBsZXZlbC4gVG8gZG8KK3RoaXMgZGVmaW5lIHRoZSBkYXNoYm9hcmRzIGluIGEgYHJlZnMvbWV0YS9kYXNoYm9hcmRzLypgIGJyYW5jaCBvZiB0aGUKK3Byb2plY3QuIEZvciBlYWNoIGRhc2hib2FyZCBjcmVhdGUgYSBjb25maWcgZmlsZS4gVGhlIGZpbGUgcGF0aC9uYW1lCit3aWxsIGJlIHVzZWQgYXMgbmFtZSAoZXF1aXZhbGVudCB0byBhIHRpdGxlIGluIGEgY3VzdG9tIGRhc2hib2FyZCkgZm9yCit0aGUgZGFzaGJvYXJkLgorCitFeGFtcGxlIGRhc2hib2FyZCBjb25maWcgZmlsZSBgTXlQcm9qZWN0IERhc2hib2FyZGA6CisKKy0tLS0KK1tkYXNoYm9hcmRdCisgIGRlc2NyaXB0aW9uID0gTW9zdCByZWNlbnQgb3BlbiBhbmQgbWVyZ2VkIGNoYW5nZXMuCitbc2VjdGlvbiAiT3BlbiBDaGFuZ2VzIl0KKyAgcXVlcnkgPSBzdGF0dXM6b3BlbiBwcm9qZWN0Om15UHJvamVjdCBsaW1pdDoxNQorW3NlY3Rpb24gIk1lcmdlZCBDaGFuZ2VzIl0KKyAgcXVlcnkgPSBzdGF0dXM6bWVyZ2VkIHByb2plY3Q6bXlQcm9qZWN0IGxpbWl0OjE1CistLS0tCisKK09uY2UgZGVmaW5lZCwgcHJvamVjdCBkYXNoYm9hcmRzIGFyZSBhY2Nlc3NpYmxlIHVzaW5nIHN0YWJsZSBVUkxzIGJ5Cit1c2luZyB0aGUgcHJvamVjdCBuYW1lLCByZWZuYW1lIGFuZCBwYXRobmFtZSBvZiB0aGUgZGFzaGJvYXJkIHZpYSBVUkxzCitsaWtlOgorLS0tLQorICAvIy9wcm9qZWN0cy9BbGwtUHJvamVjdHMsZGFzaGJvYXJkcy9TaXRlOk1haW4KKy0tLS0KKworUHJvamVjdCBkYXNoYm9hcmRzIGFyZSBpbmhlcml0ZWQgZnJvbSBhbmNlc3RvciBwcm9qZWN0cyB1bmxlc3MKK292ZXJyaWRkZW4gYnkgZGFzaGJvYXJkcyB3aXRoIHRoZSBzYW1lIHJlZiBhbmQgbmFtZS4gIFRoaXMgbWFrZXMKK2l0IGVhc3kgdG8gZGVmaW5lIGNvbW1vbiBkYXNoYm9hcmRzIGZvciBldmVyeSBwcm9qZWN0IGJ5IHNpbXBseQorZGVmaW5pbmcgcHJvamVjdCBkYXNoYm9hcmRzIG9uIHRoZSBBbGwtUHJvamVjdHMgcHJvamVjdC4KKworVG9rZW4gYCR7cHJvamVjdH1gCit+fn5+fn5+fn5+fn5+fn5+fn4KKworUHJvamVjdCBkYXNoYm9hcmQgcXVlcmllcyBtYXkgY29udGFpbiB0aGUgc3BlY2lhbCBgJHtwcm9qZWN0fWAgdG9rZW4KK3doaWNoIHdpbGwgYmUgcmVwbGFjZWQgd2l0aCB0aGUgbmFtZSBvZiB0aGUgcHJvamVjdCB0byB3aGljaCB0aGUKK2Rhc2hib2FyZCBpcyBiZWluZyBhcHBsaWVkLiAgVGhpcyBpcyB1c2VmdWwgZm9yIGRlZmluaW5nIGRhc2hib2FyZHMKK2Rlc2lnbmVkIHRvIGJlIGluaGVyaXRlZC4gIFdpdGggdGhpcyB0b2tlbiwgaXQgaXMgcG9zc2libGUgdG8gY2F1c2UgYQorcXVlcnkgaW4gYSBwcm9qZWN0IGRhc2hib2FyZCB0byBiZSByZXN0cmljdGVkIHRvIG9ubHkgY2hhbmdlcyBmb3IgdGhlCitwcm9qZWN0IGluIHdoaWNoIGFuIGluaGVyaXRlZCBkYXNoYm9hcmQgaXMgYmVpbmcgYXBwbGllZCBieSBzaW1wbHkKK2FkZGluZyBgcHJvamVjdDoke3Byb2plY3R9YCB0byB0aGUgcXVlcnkgaW4gdGhlIGRhc2hib2FyZC4KKworVGhlIGAke3Byb2plY3R9YCB0b2tlbiBjYW4gYWxzbyBiZSB1c2VkIGluIHRoZSBsaW5rOiNkYXNoYm9hcmQudGl0bGVbCitkYXNoYm9hcmQgdGl0bGVdIGFuZCBpbiB0aGUgbGluazojZGFzaGJvYXJkLmRlc2NyaXB0aW9uW2Rhc2hib2FyZAorZGVzY3JpcHRpb25dLgorCitTZWN0aW9uIGBkYXNoYm9hcmRgCit+fn5+fn5+fn5+fn5+fn5+fn5+CisKK1tbZGFzaGJvYXJkLnRpdGxlXV1kYXNoYm9hcmQudGl0bGU6OgorKworVGhlIHRpdGxlIG9mIHRoZSBkYXNoYm9hcmQuCisrCitJZiBub3Qgc3BlY2lmaWVkIHRoZSBwYXRoIG9mIHRoZSBkYXNoYm9hcmQgY29uZmlnIGZpbGUgaXMgdXNlZCBhcwordGl0bGUuCisKK1tbZGFzaGJvYXJkLmRlc2NyaXB0aW9uXV1kYXNoYm9hcmQuZGVzY3JpcHRpb246OgorKworVGhlIGRlc2NyaXB0aW9uIG9mIHRoZSBkYXNoYm9hcmQuCisKK2Rhc2hib2FyZC5mb3JlYWNoOjoKKysKK1RoZSB2YWx1ZSBvZiB0aGUgZm9yZWFjaCBwYXJhbWV0ZXIgZ2V0cyBhcHBlbmRlZCB0byBldmVyeSBxdWVyeSBpbiB0aGUKK2Rhc2hib2FyZC4KKysKK0V4YW1wbGUgZGFzaGJvYXJkIGNvbmZpZyBzZWN0aW9uIHRvIGNvbnN0cmFpbiB0aGUgZW50aXJlIGRhc2hib2FyZCB0bwordGhlIHByb2plY3QgdG8gd2hpY2ggaXQgaXMgYXBwbGllZDoKKysKKy0tLS0KK1tkYXNoYm9hcmRdCisgIGZvcmVhY2ggPSBwcm9qZWN0OiR7cHJvamVjdH0KKy0tLS0KKworCitTZWN0aW9uIGBzZWN0aW9uYAorfn5+fn5+fn5+fn5+fn5+fn4KKworc2VjdGlvbi48bmFtZT4ucXVlcnk6OgorKworVGhlIGNoYW5nZSBxdWVyeSB0aGF0IHNob3VsZCBiZSB1c2VkIHRvIHBvcHVsYXRlIHRoZSBzZWN0aW9uIHdpdGggdGhlCitnaXZlbiBuYW1lLgorCitbW3Byb2plY3QtZGVmYXVsdC1kYXNoYm9hcmRdXQorUHJvamVjdCBEZWZhdWx0IERhc2hib2FyZAorLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorCitJdCBpcyBwb3NzaWJsZSB0byBkZWZpbmUgYSBkZWZhdWx0IGRhc2hib2FyZCBmb3IgYSBwcm9qZWN0IGluIHRoZQorcHJvamVjdHMgYHByb2plY3QuY29uZmlnYCBmaWxlIGluIHRoZSBgcmVmcy9tZXRhL2NvbmZpZ2AgYnJhbmNoOgorCistLS0tCitbZGFzaGJvYXJkXQorICBkZWZhdWx0ID0gcmVmcy9tZXRhL2Rhc2hib2FyZHMvbWFpbjpkZWZhdWx0CistLS0tCisKK1RoZSBkYXNoYm9hcmQgc2V0IGFzIHRoZSBkZWZhdWx0IGRhc2hib2FyZCB3aWxsIGJlIGluaGVyaXRlZCBhcyB0aGUKK2RlZmF1bHQgZGFzaGJvYXJkIGJ5IGNoaWxkIHByb2plY3RzIGlmIHRoZXkgZG8gbm90IGRlZmluZSB0aGVpciBvd24KK2RlZmF1bHQgZGFzaGJvYXJkLiBUaGUgYGxvY2FsLWRlZmF1bHRgIGVudHJ5IG1ha2VzIGl0IHBvc3NpYmxlIHRvCitkZWZpbmUgYSBkaWZmZXJlbnQgZGVmYXVsdCBkYXNoYm9hcmQgdGhhdCBpcyBvbmx5IHVzZWQgYnkgdGhpcyBwcm9qZWN0CitidXQgbm90IGluaGVyaXRlZCB0byB0aGUgY2hpbGQgcHJvamVjdHMuCisKKy0tLS0KK1tkYXNoYm9hcmRdCisgIGRlZmF1bHQgPSByZWZzL21ldGEvZGFzaGJvYXJkcy9tYWluOmRlZmF1bHQKKyAgbG9jYWwtZGVmYXVsdCA9IHJlZnMvbWV0YS9kYXNoYm9hcmRzL21haW46bG9jYWwKKy0tLS0KKworR0VSUklUCistLS0tLS0KK1BhcnQgb2YgbGluazppbmRleC5odG1sW0dlcnJpdCBDb2RlIFJldmlld10KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vdXNlci1ub3RpZnkudHh0IGIvRG9jdW1lbnRhdGlvbi91c2VyLW5vdGlmeS50eHQKaW5kZXggYWUzYzJkMDkuLjcxMWQxYWMgMTAwNjQ0Ci0tLSBhL0RvY3VtZW50YXRpb24vdXNlci1ub3RpZnkudHh0CisrKyBiL0RvY3VtZW50YXRpb24vdXNlci1ub3RpZnkudHh0CkBAIC0xOCw5ICsxOCw5IEBACiBgQWxsLVByb2plY3RzYCBjYW4gYmUgd2F0Y2hlZCB0byB3YXRjaCBhbGwgcHJvamVjdHMgdGhhdAogYXJlIHZpc2libGUgdG8gdGhlIHVzZXIuCiAKLUNoYW5nZSBzZWFyY2ggZXhwcmVzc2lvbnMgY2FuIGJlIHVzZWQgdG8gZmlsdGVyIGNoYW5nZSBub3RpZmljYXRpb25zCi10byBzcGVjaWZpYyBzdWJzZXRzLCBmb3IgZXhhbXBsZSBgYnJhbmNoOm1hc3RlcmAgdG8gb25seSBzZWUgY2hhbmdlcwotcHJvcG9zZWQgZm9yIHRoZSBtYXN0ZXIgYnJhbmNoLgorbGluazp1c2VyLXNlYXJjaC5odG1sW0NoYW5nZSBzZWFyY2ggZXhwcmVzc2lvbnNdIGNhbiBiZSB1c2VkIHRvIGZpbHRlcgorY2hhbmdlIG5vdGlmaWNhdGlvbnMgdG8gc3BlY2lmaWMgc3Vic2V0cywgZm9yIGV4YW1wbGUgYGJyYW5jaDptYXN0ZXJgCit0byBvbmx5IHNlZSBjaGFuZ2VzIHByb3Bvc2VkIGZvciB0aGUgbWFzdGVyIGJyYW5jaC4KIAogUHJvamVjdCBMZXZlbCBTZXR0aW5ncwogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtOTIsMTMgKzkyLDI1IEBACiBhcmUgc2VudC4KICsKICogYG5ld19jaGFuZ2VzYDogT25seSBuZXdseSBjcmVhdGVkIGNoYW5nZXMuCisqIGBuZXdfcGF0Y2hzZXRzYDogT25seSBuZXdseSBjcmVhdGVkIHBhdGNoIHNldHMuCiAqIGBhbGxfY29tbWVudHNgOiBPbmx5IGNvbW1lbnRzIG9uIGV4aXN0aW5nIGNoYW5nZXMuCiAqIGBzdWJtaXR0ZWRfY2hhbmdlc2A6IE9ubHkgY2hhbmdlcyB0aGF0IGhhdmUgYmVlbiBzdWJtaXR0ZWQuCisqIGBhYmFuZG9uZWRfY2hhbmdlc2A6IE9ubHkgY2hhbmdlcyB0aGF0IGhhdmUgYmVlbiBhYmFuZG9uZWQuCiAqIGBhbGxgOiBBbGwgbm90aWZpY2F0aW9ucy4KIAogKwogTGlrZSBlbWFpbCwgdGhpcyB2YXJpYWJsZSBtYXkgYmUgYSBsaXN0IG9mIG9wdGlvbnMuCiAKK1tbbm90aWZ5Lm5hbWUuaGVhZGVyXV1ub3RpZnkuPG5hbWU+LmhlYWRlcjo6CisrCitFbWFpbCBoZWFkZXIgdXNlZCB0byBsaXN0IHRoZSBkZXN0aW5hdGlvbi4gSWYgbm90IHNldCBCQ0MgaXMgdXNlZC4KK09ubHkgb25lIHZhbHVlIG1heSBiZSBzcGVjaWZpZWQuIFRvIHVzZSBkaWZmZXJlbnQgaGVhZGVycyBmb3IgZWFjaAorYWRkcmVzcyBsaXN0IHRoZW0gaW4gZGlmZmVyZW50IG5vdGlmeSBibG9ja3MuCisrCisqIGB0b2A6IFRoZSBzdGFuZGFyZCBUbyBmaWVsZCBpcyB1c2VkOyBhZGRyZXNzZXMgYXJlIHZpc2libGUgdG8gYWxsLgorKiBgY2NgOiBUaGUgc3RhbmRhcmQgQ0MgZmllbGQgaXMgdXNlZDsgYWRkcmVzc2VzIGFyZSB2aXNpYmxlIHRvIGFsbC4KKyogYGJjY2A6IFNNVFAgUkNQVCBUTyBpcyB1c2VkIHRvIGhpZGUgdGhlIGFkZHJlc3MuCisKIFtbbm90aWZ5Lm5hbWUuZmlsdGVyXV1ub3RpZnkuPG5hbWU+LmZpbHRlcjo6CiArCiBsaW5rOnVzZXItc2VhcmNoLmh0bWxbQ2hhbmdlIHNlYXJjaCBleHByZXNzaW9uXSB0byBtYXRjaCBjaGFuZ2VzIHRoYXQKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vdXNlci1zZWFyY2gudHh0IGIvRG9jdW1lbnRhdGlvbi91c2VyLXNlYXJjaC50eHQKaW5kZXggOGEyMzFmZS4uZjQzMjhiZSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi91c2VyLXNlYXJjaC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi91c2VyLXNlYXJjaC50eHQKQEAgLTEsNyArMSw3IEBACiBHZXJyaXQgQ29kZSBSZXZpZXcgLSBTZWFyY2hpbmcgQ2hhbmdlcwogPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAotRGVmYXVsdCBTZWFyY2hlcyAKK0RlZmF1bHQgU2VhcmNoZXMKIC0tLS0tLS0tLS0tLS0tLS0KIAogTW9zdCBiYXNpYyBzZWFyY2hlcyBjYW4gYmUgdmlld2VkIGJ5IGNsaWNraW5nIG9uIGEgbGluayBhbG9uZyB0aGUgdG9wCkBAIC0yMyw2ICsyMyw3IEBACiB8T3BlbiBjaGFuZ2VzIGluIEZvbyAgfCBzdGF0dXM6b3BlbiBwcm9qZWN0OkZvbwogfD09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAorCiBCYXNpYyBDaGFuZ2UgU2VhcmNoCiAtLS0tLS0tLS0tLS0tLS0tLS0tCiAKQEAgLTM2LDcgKzM3LDcgQEAKIHxGdWxsIG9yIGFiYnJldmlhdGVkIENoYW5nZS1JZCAgICB8IEljMGZmMzMKIHxGdWxsIG9yIGFiYnJldmlhdGVkIGNvbW1pdCBTSEEtMSB8IGQ4MWIzMmVmCiB8RW1haWwgYWRkcmVzcyAgICAgICAgICAgICAgICAgICAgfCB1c2VyQGV4YW1wbGUuY29tCi18QXBwcm92YWwgcmVxdWlyZW1lbnQgICAgICAgICAgICAgfCBDb2RlUmV2aWV3Pj0rMiwgVmVyaWZpZWQ9MQorfEFwcHJvdmFsIHJlcXVpcmVtZW50ICAgICAgICAgICAgIHwgQ29kZS1SZXZpZXc+PSsyLCBWZXJpZmllZD0xCiB8PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogCiAKQEAgLTEwOSw3ICsxMTAsNiBAQAogbGluazpodHRwOi8vd3d3LmJyaWNzLmRrL2F1dG9tYXRvbi9bZGsuYnJpY3MuYXV0b21hdG9uCiBsaWJyYXJ5XSBpcyB1c2VkIGZvciBldmFsdWF0aW9uIG9mIHN1Y2ggcGF0dGVybnMuCiAKLQogW1ticmFuY2hdXQogYnJhbmNoOidCUkFOQ0gnOjoKICsKQEAgLTI3MSw2ICsyNzEsMTcgQEAKIENoYW5nZSBoYXMgYmVlbiBhYmFuZG9uZWQuCiAKIAorQXJndW1lbnQgUXVvdGluZworLS0tLS0tLS0tLS0tLS0tLQorCitPcGVyYXRvciB2YWx1ZXMgdGhhdCBhcmUgbm90IGJhcmUgd29yZHMgKHJvdWdobHkgQS1aLCBhLXosIDAtOSwgQCwKK2h5cGVuLCBkb3QgYW5kIHVuZGVyc2NvcmUpIG11c3QgYmUgcXVvdGVkIGZvciB0aGUgcXVlcnkgcGFyc2VyLgorCitRdW90aW5nIGlzIGFjY2VwdGVkIGFzIGVpdGhlciBkb3VibGUgcXVvdGVzCisoZS5nLiAgYG1lc3NhZ2U6InRoZSB2YWx1ZSJgKSBvciBhcyBtYXRjaGVkCitjdXJseSBicmFjZXMgKGUuZy4gYG1lc3NhZ2U6e3RoZSB2YWx1ZX1gKS4KKworCiBCb29sZWFuIE9wZXJhdG9ycwogLS0tLS0tLS0tLS0tLS0tLS0KIApAQCAtMzA2LDE4ICszMTcsMTIgQEAKIC0tLS0tLQogTGFiZWwgb3BlcmF0b3JzIGNhbiBiZSB1c2VkIHRvIG1hdGNoIGFwcHJvdmFsIHNjb3JlcyBnaXZlbiBkdXJpbmcKIGEgY29kZSByZXZpZXcuICBUaGUgc3BlY2lmaWMgc2V0IG9mIHN1cHBvcnRlZCBsYWJlbHMgZGVwZW5kcyBvbgotdGhlIHNlcnZlciBjb25maWd1cmF0aW9uLCBob3dldmVyIGBDb2RlUmV2aWV3YCBhbmQgYFZlcmlmaWVkYAordGhlIHNlcnZlciBjb25maWd1cmF0aW9uLCBob3dldmVyIGBDb2RlLVJldmlld2AgYW5kIGBWZXJpZmllZGAKIGFyZSB0aGUgZGVmYXVsdCBsYWJlbHMgcHJvdmlkZWQgb3V0IG9mIHRoZSBib3guCiAKIEEgbGFiZWwgbmFtZSBpcyBhbnkgb2YgdGhlIGZvbGxvd2luZzoKIAotKiBUaGUgY2F0ZWdvcnkgbmFtZS4gIElmIHRoZSBjYXRlZ29yeSBuYW1lIGNvbnRhaW5zIHNwYWNlcywKLSAgaXQgbXVzdCBiZSB3cmFwcGVkIGluIGRvdWJsZSBxdW90ZXMuICBFeGFtcGxlOiBgbGFiZWw6IkNvZGUgUmV2aWV3ImAuCi0KLSogVGhlIG5hbWUsIHdpdGhvdXQgc3BhY2VzLiAgVGhpcyBhdm9pZHMgbmVlZGluZyB0byB1c2UgZG91YmxlIHF1b3RlcwotICBmb3IgdGhlIGNvbW1vbiBjYXRlZ29yeSBDb2RlIFJldmlldy4gIEV4YW1wbGU6IGBsYWJlbDpDb2RlUmV2aWV3YC4KLQotKiBUaGUgaW50ZXJuYWwgc2hvcnQgbmFtZS4gIEV4YW1wbGU6IGBsYWJlbDpDUlZXYCwgb3IgYGxhYmVsOlZSSUZgLgorKiBUaGUgbGFiZWwgbmFtZS4gIEV4YW1wbGU6IGBsYWJlbDpDb2RlLVJldmlld2AuCiAKICogVGhlIG9uZSBvciB0d28gY2hhcmFjdGVyIGFiYnJldmlhdGlvbiBzaG93biBpbiB0aGUgY29sdW1uIGhlYWRlcgogICBvZiBjaGFuZ2UgbGlzdCBwYWdlcy4gIEV4YW1wbGU6IGBsYWJlbDpSYCBvciBgbGFiZWw6VmAuCkBAIC0zMjUsMzggKzMzMCwzOCBAQAogQSBsYWJlbCBuYW1lIG11c3QgYmUgZm9sbG93ZWQgYnkgYSBzY29yZSwgb3IgYW4gb3BlcmF0b3IgYW5kIGEgc2NvcmUuCiBUaGUgZWFzaWVzdCB3YXkgdG8gZXhwbGFpbiB0aGlzIGlzIGJ5IGV4YW1wbGUuCiAKLWBsYWJlbDpDb2RlUmV2aWV3PTJgOjoKLWBsYWJlbDpDb2RlUmV2aWV3PSsyYDo6Ci1gbGFiZWw6Q29kZVJldmlldysyYDo6CitgbGFiZWw6Q29kZS1SZXZpZXc9MmA6OgorYGxhYmVsOkNvZGUtUmV2aWV3PSsyYDo6CitgbGFiZWw6Q29kZS1SZXZpZXcrMmA6OgogKwotTWF0Y2hlcyBjaGFuZ2VzIHdoZXJlIHRoZXJlIGlzIGF0IGxlYXN0IG9uZSArMiBzY29yZSBmb3IgQ29kZSBSZXZpZXcuCitNYXRjaGVzIGNoYW5nZXMgd2hlcmUgdGhlcmUgaXMgYXQgbGVhc3Qgb25lICsyIHNjb3JlIGZvciBDb2RlLVJldmlldy4KIFRoZSArIHByZWZpeCBpcyBvcHRpb25hbCBmb3IgcG9zaXRpdmUgc2NvcmUgdmFsdWVzLiAgSWYgdGhlICsgaXMgdXNlZCwKIHRoZSA9IG9wZXJhdG9yIGlzIG9wdGlvbmFsLgogCi1gbGFiZWw6Q29kZVJldmlldz0tMmA6OgotYGxhYmVsOkNvZGVSZXZpZXctMmA6OgorYGxhYmVsOkNvZGUtUmV2aWV3PS0yYDo6CitgbGFiZWw6Q29kZS1SZXZpZXctMmA6OgogKwotTWF0Y2hlcyBjaGFuZ2VzIHdoZXJlIHRoZXJlIGlzIGF0IGxlYXN0IG9uZSAtMiBzY29yZSBmb3IgQ29kZSBSZXZpZXcuCitNYXRjaGVzIGNoYW5nZXMgd2hlcmUgdGhlcmUgaXMgYXQgbGVhc3Qgb25lIC0yIHNjb3JlIGZvciBDb2RlLVJldmlldy4KIEJlY2F1c2UgdGhlIG5lZ2F0aXZlIHNpZ24gaXMgcmVxdWlyZWQsIHRoZSA9IG9wZXJhdG9yIGlzIG9wdGlvbmFsLgogCi1gbGFiZWw6Q29kZVJldmlldz0xYDo6CitgbGFiZWw6Q29kZS1SZXZpZXc9MWA6OgogKwotTWF0Y2hlcyBjaGFuZ2VzIHdoZXJlIHRoZXJlIGlzIGF0IGxlYXN0IG9uZSArMSBzY29yZSBmb3IgQ29kZSBSZXZpZXcuCitNYXRjaGVzIGNoYW5nZXMgd2hlcmUgdGhlcmUgaXMgYXQgbGVhc3Qgb25lICsxIHNjb3JlIGZvciBDb2RlLVJldmlldy4KIFNjb3JlcyBvZiArMiBhcmUgbm90IG1hdGNoZWQsIGV2ZW4gdGhvdWdoIHRoZXkgYXJlIGhpZ2hlci4KIAotYGxhYmVsOkNvZGVSZXZpZXc+PTFgOjoKK2BsYWJlbDpDb2RlLVJldmlldz49MWA6OgogKwogTWF0Y2hlcyBjaGFuZ2VzIHdpdGggZWl0aGVyIGEgKzEsICsyLCBvciBhbnkgaGlnaGVyIHNjb3JlLgogCi1gbGFiZWw6Q29kZVJldmlldzw9LTFgOjoKK2BsYWJlbDpDb2RlLVJldmlldzw9LTFgOjoKICsKIE1hdGNoZXMgY2hhbmdlcyB3aXRoIGVpdGhlciBhIC0xLCAtMiwgb3IgYW55IGxvd2VyIHNjb3JlLgogCi1gaXM6b3BlbiBDb2RlUmV2aWV3KzIgVmVyaWZpZWQrMSAtVmVyaWZpZWQtMSAtQ29kZVJldmlldy0yYDo6CitgaXM6b3BlbiBDb2RlLVJldmlldysyIFZlcmlmaWVkKzEgLVZlcmlmaWVkLTEgLUNvZGUtUmV2aWV3LTJgOjoKICsKIE1hdGNoZXMgY2hhbmdlcyB0aGF0IGFyZSByZWFkeSB0byBiZSBzdWJtaXR0ZWQuCiAKLWBpczpvcGVuIChWZXJpZmllZC0xIE9SIENvZGVSZXZpZXctMilgOjoKK2BpczpvcGVuIChWZXJpZmllZC0xIE9SIENvZGUtUmV2aWV3LTIpYDo6CiArCiBDaGFuZ2VzIHRoYXQgYXJlIGJsb2NrZWQgZnJvbSBzdWJtaXNzaW9uIGR1ZSB0byBhIGJsb2NraW5nIHNjb3JlLgogCkBAIC00MjcsNiArNDMyLDcgQEAKIG9mIGEgcXVlcnkuICBJbmNsdWRpbmcgZWl0aGVyIHZhbHVlIGluIGEgd2ViIHF1ZXJ5IG1heSBsZWFkIHRvCiB1bnByZWRpY3RhYmxlIHJlc3VsdHMuCiAKKwogR0VSUklUCiAtLS0tLS0KIFBhcnQgb2YgbGluazppbmRleC5odG1sW0dlcnJpdCBDb2RlIFJldmlld10KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vdXNlci1zdWJtb2R1bGVzLnR4dCBiL0RvY3VtZW50YXRpb24vdXNlci1zdWJtb2R1bGVzLnR4dAppbmRleCBjZmFmM2U5Li42YWFiNDNmIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL3VzZXItc3VibW9kdWxlcy50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi91c2VyLXN1Ym1vZHVsZXMudHh0CkBAIC0xLDUgKzEsNSBAQAotR2Vycml0IENvZGUgUmV2aWV3IC0gU3VwZXJwcm9qZWN0cyBzdWJzY3JpYmVkIHRvIHN1Ym1vZHVsZXMgdXBkYXRlcwotPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorR2Vycml0IENvZGUgUmV2aWV3IC0gU3VwZXJwcm9qZWN0IHN1YnNjcmlwdGlvbiB0byBzdWJtb2R1bGVzIHVwZGF0ZXMKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKIERlc2NyaXB0aW9uCiAtLS0tLS0tLS0tLQpAQCAtMjUsNyArMjUsNyBAQAogR2l0IFN1Ym1vZHVsZXMgT3ZlcnZpZXcKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLUl0IGlzIGEgZ2l0IGZlYXR1cmUgdGhhdCBhbGxvd3MgYW4gZXh0ZXJuYWwgcmVwb3NpdG9yeSB0byBiZQorU3VibW9kdWxlcyBhcmUgYSBnaXQgZmVhdHVyZSB0aGF0IGFsbG93cyBhbiBleHRlcm5hbCByZXBvc2l0b3J5IHRvIGJlCiBhdHRhY2hlZCBpbnNpZGUgYSByZXBvc2l0b3J5IGF0IGEgc3BlY2lmaWMgcGF0aC4gVGhlIG9iamVjdGl2ZSBoZXJlCiBpcyB0byBwcm92aWRlIGEgYnJpZWYgb3ZlcnZpZXcsIGZ1cnRoZXIgZGV0YWlscyBjYW4gYmUgZm91bmQKIGluIHRoZSBvZmZpY2lhbCBnaXQgc3VibW9kdWxlIGNvbW1hbmQgZG9jdW1lbnRhdGlvbi4KQEAgLTM3LDIwICszNywyMCBAQAogJ3N1cGVyJzoKID09PT09CiBnaXQgc3VibW9kdWxlIGFkZCBzc2g6Ly9zZXJ2ZXIvYSBhCi09PT09Cis9PT09PQogCiBTdGlsbCBjb25zaWRlcmluZyB0aGUgYWJvdmUgZXhhbXBsZSwgYWZ0ZXIgaXRzIGV4ZWN1dGlvbiBub3RpY2UgdGhhdAogaW5zaWRlIHRoZSBsb2NhbCByZXBvc2l0b3J5ICdzdXBlcicgdGhlICdhJyBmb2xkZXIgaXMgY29uc2lkZXJlZCBhCiBnaXRsaW5rIHRvIHRoZSBleHRlcm5hbCByZXBvc2l0b3J5ICdhJy4gQWxzbyBub3RpY2UgYSBmaWxlIGNhbGxlZAotLmdpdG1vZHVsZXMgaXMgY3JlYXRlZCAoaXQgaXMgYSBjb25maWcgZmlsZSBjb250YWluaW5nIHRoZQotc3Vic2NyaXB0aW9uIG9mICdhJykuIFRvIHByb3ZpZGUgdGhlIHNoYS0xIGVhY2ggZ2l0bGluayBwb2ludHMgdG8gaW4KKy5naXRtb2R1bGVzIGlzIGNyZWF0ZWQgKGl0IGlzIGEgY29uZmlndXJhdGlvbiBmaWxlIGNvbnRhaW5pbmcgdGhlCitzdWJzY3JpcHRpb24gb2YgJ2EnKS4gVG8gcHJvdmlkZSB0aGUgU0hBLTEgZWFjaCBnaXRsaW5rIHBvaW50cyB0byBpbgogdGhlIGV4dGVybmFsIHJlcG9zaXRvcnksIG9uZSBzaG91bGQgdXNlIHRoZSBjb21tYW5kOgogPT09PQogZ2l0IHN1Ym1vZHVsZSBzdGF0dXMKID09PT0KIAogSW4gdGhlIGV4YW1wbGUgcHJvdmlkZWQsIGlmICdhJyBpcyB1cGRhdGVkIGFuZCAnc3VwZXInIGlzIHN1cHBvc2VkCi10byBzZWUgdGhlIGxhdGVzdCBzaGEtMSAoY29uc2lkZXJpbmcgaGVyZSAnYScgaGFzIG9ubHkgdGhlIG1hc3RlcgordG8gc2VlIHRoZSBsYXRlc3QgU0hBLTEgKGNvbnNpZGVyaW5nIGhlcmUgJ2EnIGhhcyBvbmx5IHRoZSBtYXN0ZXIKIGJyYW5jaCksIG9uZSBzaG91bGQgdGhlbiBjb21taXQgdGhlIG1vZGlmaWVkIGdpdGxpbmsgZm9yICdhJyBpbgogdGhlICdzdXBlcicgcHJvamVjdC4gQWN0dWFsbHkgaXQgd291bGQgbm90IGV2ZW4gbmVlZCB0byBiZSBhbgogZXh0ZXJuYWwgdXBkYXRlLCBvbmUgY291bGQgbW92ZSB0byAnYScgZm9sZGVyIChpbnNpZGVyICdzdXBlcicpLApAQCAtNjMsMTEgKzYzLDExIEBACiBEZWZpbmluZyB0aGUgU3VibW9kdWxlIEJyYW5jaAogfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIAotVGhpcyBpcyByZXF1aXJlZCBiZWNhdXNlIFN1Ym1vZHVsZSBzdWJzY3JpcHRpb24gaXMgYWN0dWFsbHkgdGhlCitUaGlzIGlzIHJlcXVpcmVkIGJlY2F1c2Ugc3VibW9kdWxlIHN1YnNjcmlwdGlvbiBpcyBhY3R1YWxseSB0aGUKIHN1YnNjcmlwdGlvbiBvZiBhIHN1Ym1vZHVsZSBwcm9qZWN0IGFuZCBvbmUgb2YgaXRzIGJyYW5jaGVzIGZvcgogYSBicmFuY2ggb2YgYSBzdXBlciBwcm9qZWN0LgogCi1TaW5jZSBpdCBtYW5hZ2VzIHN1YnNjcmlwdGlvbnMgaW4gdGhlIGJyYW5jaCBzY29wZSwgd2UgY291bGQgaGF2ZQorU2luY2UgR2Vycml0IG1hbmFnZXMgc3Vic2NyaXB0aW9ucyBpbiB0aGUgYnJhbmNoIHNjb3BlLCB3ZSBjb3VsZCBoYXZlCiBhIHNjZW5hcmlvIGhhdmluZyBhIHByb2plY3QgY2FsbGVkICdzdXBlcicgaGF2aW5nIGEgYnJhbmNoICdpbnRlZ3JhdGlvbicKIHN1YnNjcmliZWQgdG8gYSBwcm9qZWN0IGNhbGxlZCAnYScgaW4gYnJhbmNoICdpbnRlZ3JhdGlvbicsIGFuZCBhbHNvCiBoYXZpbmcgdGhlIHNhbWUgJ3N1cGVyJyBwcm9qZWN0IGJ1dCBpbiBicmFuY2ggJ2Rldicgc3Vic2NyaWJlZCB0byB0aGUgJ2EnCkBAIC03NywyMiArNzcsMjMgQEAKIHRoZSAuZ2l0bW9kdWxlcyBmaWxlIHRvIGFkZCBhIGJyYW5jaCBmaWVsZCB0byBlYWNoIHN1Ym1vZHVsZQogc2VjdGlvbiB3aGljaCBpcyBzdXBwb3NlZCB0byBiZSBzdWJzY3JpYmVkLgogCi1UaGUgYnJhbmNoIGZpZWxkIGlzIG5vdCBmaWxsZWQgYnkgdGhlIGdpdCBzdWJtb2R1bGUgY29tbWFuZC4gSXRzIHZhbHVlCi1zaG91bGQgaW5kaWNhdGUgdGhlIGJyYW5jaCBvZiBhIHN1Ym1vZHVsZSBwcm9qZWN0IHRoYXQgd2hlbiB1cGRhdGVkCi13aWxsIHRyaWdnZXIgYXV0b21hdGljIHVwZGF0ZSBvZiBpdHMgcmVnaXN0ZXJlZCBnaXRsaW5rLgorQXMgdGhlIGJyYW5jaCBmaWVsZCBpcyBhIEdlcnJpdCBzcGVjaWZpYyBmaWVsZCBpdCB3aWxsIG5vdCBiZSBmaWxsZWQKK2F1dG9tYXRpY2FsbHkgYnkgdGhlIGdpdCBzdWJtb2R1bGUgY29tbWFuZCwgc28gb25lIG5lZWRzIHRvIGVkaXQgaXQKK21hbnVhbGx5LiBJdHMgdmFsdWUgc2hvdWxkIGluZGljYXRlIHRoZSBicmFuY2ggb2YgYSBzdWJtb2R1bGUgcHJvamVjdAordGhhdCB3aGVuIHVwZGF0ZWQgd2lsbCB0cmlnZ2VyIGF1dG9tYXRpYyB1cGRhdGUgb2YgaXRzIHJlZ2lzdGVyZWQKK2dpdGxpbmsuCiAKLVRoZSBicmFuY2ggdmFsdWUgY291bGQgYmUgJy4nIGlmIHRoZSBzdWJtb2R1bGUgcHJvamVjdCBicmFuY2gKK1RoZSBicmFuY2ggdmFsdWUgY291bGQgYmUgIicuJyIgaWYgdGhlIHN1Ym1vZHVsZSBwcm9qZWN0IGJyYW5jaAogaGFzIHRoZSBzYW1lIG5hbWUgYXMgdGhlIGRlc3RpbmF0aW9uIGJyYW5jaCBvZiB0aGUgY29tbWl0IGhhdmluZwogZ2l0bGlua3MvLmdpdG1vZHVsZXMgZmlsZS4KIAotVGhlIGJyYW5jaCBmaWVsZCBvZiBhIHN1Ym1vZHVsZSBzZWN0aW9uIGlzIGEgY3VzdG9tIGdpdCBzdWJtb2R1bGUKLWZlYXR1cmUgZm9yIEdlcnJpdCB1c2UuIE9uZSBzaG91bGQgYWx3YXlzIGJlIHN1cmUgdG8gZmlsbCBpdCBpbgotZWRpdGluZyAuZ2l0bW9kdWxlcyBmaWxlIGFmdGVyIGFkZGluZyBzdWJtb2R1bGVzIHRvIGEgc3VwZXIgcHJvamVjdCwKLWlmIGl0IGlzIHRoZSBpbnRlbnRpb24gdG8gbWFrZSB1c2Ugb2YgdGhlIEdlcnJpdCBmZWF0dXJlIGludHJvZHVjZWQgaGVyZS4KK0lmIHRoZSBpbnRlbnRpb24gaXMgdG8gbWFrZSB1c2Ugb2YgdGhlIEdlcnJpdCBmZWF0dXJlIGRlc2NyaWJlZAoraGVyZSwgb25lIHNob3VsZCBhbHdheXMgYmUgc3VyZSB0byB1cGRhdGUgdGhlIC5naXRtb2R1bGVzIGZpbGUgYWZ0ZXIKK2FkZGluZyBzdWJtb2R1bGVzIHRvIGEgc3VwZXIgcHJvamVjdC4KIAotQW55IGdpdCBzdWJtb2R1bGVzIHdoaWNoIGFyZSBhZGRlZCBhbmQgbm90IGhhdmUgdGhlIGJyYW5jaCBmaWVsZAotYXZhaWxhYmxlIGluIHRoZSAuZ2l0bW9kdWxlcyBmaWxlIHdpbGwgbm90IGJlIHN1YnNjcmliZWQgYnkgR2Vycml0Ci10byBhdXRvbWF0aWNhbGx5IHVwZGF0ZSB0aGUgc3VwZXJwcm9qZWN0LgorSWYgYSBnaXQgc3VibW9kdWxlIGlzIGFkZGVkIGJ1dCB0aGUgYnJhbmNoIGZpZWxkIGlzIG5vdCBhZGRlZCB0byB0aGUKKy5naXRtb2R1bGVzIGZpbGUsIEdlcnJpdCB3aWxsIG5vdCBjcmVhdGUgYSBzdWJzY3JpcHRpb24gZm9yIHRoZQorc3VibW9kdWxlIGFuZCB0aGVyZSB3aWxsIGJlIG5vIGF1dG9tYXRpYyB1cGRhdGVzIHRvIHRoZSBzdXBlcnByb2plY3QuCiAKIERldGVjdGluZyBhbmQgU3Vic2NyaWJpbmcgU3VibW9kdWxlcwogfn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+CkBAIC0xMTgsMTcgKzExOSw2MiBAQAogY3JlYXRlcyBhIG5ldyBjb21taXQgb24gYnJhbmNoICdkZXYnIG9mICdzdXBlcicgdXBkYXRpbmcgdGhlIGdpdGxpbmsKIHRvIHBvaW50IHRvIHRoZSBqdXN0IG1lcmdlZCBjb21taXQuCiAKLUNhbm9uaWNhbCBXZWIgVXJsCi1+fn5+fn5+fn5+fn5+fn5+fgorU3Vic2NyaXB0aW9uIExpbWl0YXRpb25zCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KIAotR2Vycml0IHdpbGwgYXV0b21hdGljYWxseSB1cGRhdGUgb25seSB0aGUgc3VwZXJwcm9qZWN0cyB0aGF0IGFkZGVkCi10aGUgc3VibW9kdWxlcyBvZiB1cmxzIG9mIHRoZSBydW5uaW5nIHNlcnZlciAodGhlIG9uZSBkZXNjcmliZWQgaW4KLXRoZSBjYW5vbmljYWwgd2ViIHVybCB2YWx1ZSBpbiBHZXJyaXQgY29uZmlndXJhdGlvbiBmaWxlKS4KK0dlcnJpdCB3aWxsIG9ubHkgYXV0b21hdGljYWxseSB1cGRhdGUgc3VwZXJwcm9qZWN0cyB3aGVyZSB0aGUKK3N1Ym1vZHVsZXMgYXJlIGhvc3RlZCBvbiB0aGUgc2FtZSBHZXJyaXQgaW5zdGFuY2UgYXMgdGhlCitzdXBlcnByb2plY3QuIEdlcnJpdCBkZXRlcm1pbmVzIHRoaXMgYnkgY2hlY2tpbmcgdGhlIGhvc3RuYW1lIG9mIHRoZQorc3VibW9kdWxlIHNwZWNpZmllZCBpbiB0aGUgLmdpdG1vZHVsZXMgZmlsZSBhbmQgY29tcGFyaW5nIGl0IHRvIHRoZQoraG9zdG5hbWUgZnJvbSB0aGUgY2Fub25pY2FsIHdlYiBVUkwuCisKK0l0IGlzIGN1cnJlbnRseSBub3QgcG9zc2libGUgdG8gdXNlIHRoZSBzdWJtb2R1bGUgc3Vic2NyaXB0aW9uIGZlYXR1cmUKK3dpdGggYSBjYW5vbmljYWwgd2ViIFVSTCBob3N0bmFtZSB0aGF0IGRpZmZlcnMgZnJvbSB0aGUgaG9zdG5hbWUgb2YKK3RoZSBzdWJtb2R1bGUuIEluc3RlYWQgcmVsYXRpdmUgc3VibW9kdWxlcyBzaG91bGQgYmUgdXNlZC4KIAogVGhlIEdlcnJpdCBpbnN0YW5jZSBhZG1pbmlzdHJhdG9yIGdyb3VwIHNob3VsZCBhbHdheXMgY2VydGlmeSB0bwotcHJvdmlkZSB0aGUgY2Fub25pY2FsIHdlYiB1cmwgdmFsdWUgaW4gaXRzIGNvbmZpZ3VyYXRpb24gZmlsZS4gVXNlcnMKLXNob3VsZCBjZXJ0aWZ5IHRvIHVzZSB0aGUgdXJsIHZhbHVlIG9mIHRoZSBydW5uaW5nIEdlcnJpdCBpbnN0YW5jZSB0bwotYWRkL3N1YnNjcmliZSBzdWJtb2R1bGVzLgorcHJvdmlkZSB0aGUgY2Fub25pY2FsIHdlYiBVUkwgdmFsdWUgaW4gaXRzIGNvbmZpZ3VyYXRpb24gZmlsZS4gVXNlcnMKK3Nob3VsZCBjZXJ0aWZ5IHRvIHVzZSB0aGUgY29ycmVjdCBob3N0bmFtZSBvZiB0aGUgcnVubmluZyBHZXJyaXQKK2luc3RhbmNlIHRvIGFkZC9zdWJzY3JpYmUgc3VibW9kdWxlcy4KKworUmVsYXRpdmUgc3VibW9kdWxlcworfn5+fn5+fn5+fn5+fn5+fn5+fgorCitUbyBlbmFibGUgZWFzaWVyIHVzYWdlIG9mIEdlcnJpdCBtaXJyb3JzIGFuZC9vciBkaXN0cmlidXRpb24gb3Zlcgorc2V2ZXJhbCBwcm90b2NvbHMsIHN1Y2ggYXMgcGxhaW4gZ2l0IGFuZCBIVFRQKFMpIGFzIHdlbGwgYXMgU1NILCBvbmUKK2NhbiB1c2UgcmVsYXRpdmUgc3VibW9kdWxlcy4gVGhpcyBtZWFucyB0aGF0IGluc3RlYWQgb2YgcHJvdmlkaW5nIHRoZQorZW50aXJlIFVSTCB0byB0aGUgc3VibW9kdWxlIGEgcmVsYXRpdmUgcGF0aCBpcyBzdGF0ZWQgaW4gdGhlCisuZ2l0bW9kdWxlcyBmaWxlLgorCitHZXJyaXQgd2lsbCB0cnkgdG8gbWF0Y2ggdGhlIGVudGlyZSBwcm9qZWN0IG5hbWUgb2YgdGhlIHN1Ym1vZHVsZQoraW5jbHVkaW5nIGRpcmVjdG9yaWVzLiBUaGVyZWZvcmUgaXQgaXMgaW1wb3J0YW50IHRvIHN1cHBseSB0aGUgZnVsbAorcGF0aCBuYW1lIG9mIHRoZSBHZXJyaXQgcHJvamVjdCwgbm90IG9ubHkgcmVsYXRpdmUgdG8gdGhlIHN1cGVyCityZXBvc2l0b3J5LiBTZWUgdGhlIGZvbGxvd2luZyBleGFtcGxlOgorCitXZSBoYXZlIGEgc3VwZXIgcmVwb3NpdG9yeSBwbGFjZWQgdW5kZXIgYSBzdWIgZGlyZWN0b3J5LgorCisgIHByb2R1Y3Qvc3VwZXJfcmVwb3NpdG9yeS5naXQKKworVG8gdGhpcyByZXBvc2l0b3J5IHdlIHdpc2ggYWRkIGEgc3VibW9kdWxlICJkZWVwZXIiIGludG8gdGhlIGRpcmVjdG9yeQorc3RydWN0dXJlLgorCisgIHByb2R1Y3QvZnJhbWV3b3JrL3N1YmNvbXBvbmVudC5naXQKKworTm93IHdlIG5lZWQgdG8gZWRpdCB0aGUgLmdpdG1vZHVsZXMgdG8gaW5jbHVkZSB0aGUgY29tcGxldGUgcGF0aCB0bwordGhlIEdlcnJpdCBwcm9qZWN0LiBPYnNlcnZlIHRoYXQgd2UgbmVlZCB0byB1c2UgdHdvICIuLi8iIHRvIGluY2x1ZGUKK3RoZSBjb21wbGV0ZSBHZXJyaXQgcHJvamVjdCBwYXRoLgorCisgIHBhdGggPSBzdWJjb21wb25lbnQuZ2l0CisgIHVybCA9IC4uLy4uL3Byb2R1Y3QvZnJhbWV3b3JrL3N1YmNvbXBvbmVudC5naXQKKyAgYnJhbmNoID0gbWFzdGVyCisKK0luIGNvbnRyYXN0IHRoZSBmb2xsb3dpbmcgd2lsbCBub3Qgc2V0dXAgcHJvcGVyIHN1Ym1vZHVsZQorc3Vic2NyaXB0aW9uLCBldmVuIGlmIHRoZSBzdWJtb2R1bGUgd2lsbCBiZSBzdWNjZXNzZnVsbHkgY2xvbmVkIGJ5IGdpdAorZnJvbSBHZXJyaXQuCisKKyAgcGF0aCA9IHN1YmNvbXBvbmVudC5naXQKKyAgdXJsID0gLi4vZnJhbWV3b3JrL3N1YmNvbXBvbmVudC5naXQKKyAgYnJhbmNoID0gbWFzdGVyCiAKIFJlbW92aW5nIFN1YnNjcmlwdGlvbnMKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vdXNlci11cGxvYWQudHh0IGIvRG9jdW1lbnRhdGlvbi91c2VyLXVwbG9hZC50eHQKaW5kZXggNmJkZmY3YS4uNTVhYjg5NSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi91c2VyLXVwbG9hZC50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi91c2VyLXVwbG9hZC50eHQKQEAgLTcsOCArNywzMSBAQAogKiBVc2UgYGdpdCBwdXNoYCwgdG8gY3JlYXRlIGNoYW5nZXMgZm9yIHJldmlldwogKiBVc2UgYGdpdCBwdXNoYCwgYW5kIGJ5cGFzcyBjb2RlIHJldmlldwogCi1BbGwgdGhyZWUgbWV0aG9kcyByZWx5IG9uIFNTSCBwdWJsaWMga2V5IGF1dGhlbnRpY2F0aW9uLCB3aGljaCBtdXN0Ci1maXJzdCBiZSBjb25maWd1cmVkIGJ5IHRoZSB1cGxvYWRpbmcgdXNlci4KK0FsbCB0aHJlZSBtZXRob2RzIHJlbHkgb24gYXV0aGVudGljYXRpb24sIHdoaWNoIG11c3QgZmlyc3QgYmUgY29uZmlndXJlZAorYnkgdGhlIHVwbG9hZGluZyB1c2VyLgorCitHZXJyaXQgc3VwcG9ydHMgdHdvIG1ldGhvZHMgb2YgYXV0aGVudGljYXRpbmcgdGhlIHVwbG9hZGluZyB1c2VyLiAgU1NICitwdWJsaWMga2V5LCBhbmQgSFRUUC9IVFRQUy4KKworW1todHRwXV0KK0hUVFAvSFRUUFMKKy0tLS0tLS0tLS0KKworT24gR2Vycml0IGluc3RhbGxhdGlvbnMgdGhhdCBkbyBub3Qgc3VwcG9ydCBTU0ggYXV0aGVudGljYXRpb24sIHRoZQordXNlciBtdXN0IGF1dGhlbnRpY2F0ZSB2aWEgSFRUUC9IVFRQUy4KKworV2hlbiBsaW5rOmNvbmZpZy1nZXJyaXQuaHRtbCNhdXRoLmdpdEJhc2ljQXV0aFtnaXRCYXNpY0F1dGhdIGlzIGVuYWJsZWQsCit0aGUgdXNlciBpcyBhdXRoZW50aWNhdGVkIHVzaW5nIHN0YW5kYXJkIEJhc2ljQXV0aCBhbmQgY3JlZGVudGlhbHMgdmFsaWRhdGVkCit1c2luZyB0aGUgc2FtZSBhdXRoZW50aWNhdGlvbiBtZXRob2QgY29uZmlndXJlZCBmb3IgdGhlIEdlcnJpdCBXZWIgVUkuCisKK1doZW4gZ2l0QmFzaWNBdXRoIGlzIG5vdCBjb25maWd1cmVkLCB0aGUgdXNlcidzIEhUVFAgY3JlZGVudGlhbHMgY2FuIGJlCithY2Nlc3NlZCB3aXRoaW4gR2Vycml0IGJ5IGdvaW5nIHRvIGBTZXR0aW5nc2AsIGFuZCB0aGVuIGFjY2Vzc2luZyB0aGUgYEhUVFAKK1Bhc3N3b3JkYCB0YWIuCisKK0ZvciBHZXJyaXQgaW5zdGFsbGF0aW9ucyB3aGVyZSBhbiBsaW5rOmNvbmZpZy1nZXJyaXQuaHRtbCNhdXRoLmh0dHBQYXNzd29yZFVybFtIVFRQIHBhc3N3b3JkIFVSTF0KK2lzIGNvbmZpZ3VyZWQsIHRoZSBwYXNzd29yZCBjYW4gYmUgb2J0YWluZWQgYnkgY2xpY2tpbmcgb24gYE9idGFpbiBQYXNzd29yZGAKK2FuZCB0aGVuIGZvbGxvd2luZyB0aGUgc2l0ZS1zcGVjaWZpYyBpbnN0cnVjdGlvbnMuICBPbiBzaXRlcyB3aGVyZSB0aGlzIFVSTCBpcworbm90IGNvbmZpZ3VyZWQsIHRoZSBwYXNzd29yZCBjYW4gYmUgb2J0YWluZWQgYnkgY2xpY2tpbmcgb24gYEdlbmVyYXRlIFBhc3N3b3JkYC4KIAogU1NICiAtLS0KQEAgLTEwOCw3ICsxMzEsNyBAQAogbWFnaWNhbCBgcmVmcy9mb3IvJ2JyYW5jaCdgIHJlZiB1c2luZyBhbnkgR2l0IGNsaWVudCB0b29sOgogCiA9PT09Ci0gIGdpdCBwdXNoIHNzaDovL3NzaHVzZXJuYW1lQGhvc3RuYW1lOjI5NDE4L3Byb2plY3RuYW1lIEhFQUQ6cmVmcy9mb3IvYnJhbmNobmFtZQorICBnaXQgcHVzaCBzc2g6Ly9zc2h1c2VybmFtZUBob3N0bmFtZToyOTQxOC9wcm9qZWN0bmFtZSBIRUFEOnJlZnMvZm9yL2JyYW5jaAogPT09PQogCiBFLmcuIGBqb2huLmRvZWAgY2FuIHVzZSBnaXQgcHVzaCB0byB1cGxvYWQgbmV3IGNoYW5nZXMgZm9yIHRoZQpAQCAtMTMwLDEyICsxNTMsMTIgQEAKIAogVG8gaW5jbHVkZSBhIHNob3J0IHRhZyBhc3NvY2lhdGVkIHdpdGggYWxsIG9mIHRoZSBjaGFuZ2VzIGluIHRoZQogc2FtZSBncm91cCwgc3VjaCBhcyB0aGUgbG9jYWwgdG9waWMgYnJhbmNoIG5hbWUsIGFwcGVuZCBpdCBhZnRlcgotdGhlIGRlc3RpbmF0aW9uIGJyYW5jaCBuYW1lLiAgSW4gdGhpcyBleGFtcGxlIHRoZSBzaG9ydCB0b3BpYyB0YWcKK3RoZSBkZXN0aW5hdGlvbiBicmFuY2ggbmFtZS4gSW4gdGhpcyBleGFtcGxlIHRoZSBzaG9ydCB0b3BpYyB0YWcKICdkcml2ZXIvaTQyJyB3aWxsIGJlIHNhdmVkIG9uIGVhY2ggY2hhbmdlIHRoaXMgcHVzaCBjcmVhdGVzIG9yCiB1cGRhdGVzOgogCiA9PT09Ci0gIGdpdCBwdXNoIHNzaDovL2pvaG4uZG9lQGdpdC5leGFtcGxlLmNvbToyOTQxOC9rZXJuZWwvY29tbW9uIEhFQUQ6cmVmcy9mb3IvZXhwZXJpbWVudGFsL2RyaXZlci9pNDIKKyAgZ2l0IHB1c2ggc3NoOi8vam9obi5kb2VAZ2l0LmV4YW1wbGUuY29tOjI5NDE4L2tlcm5lbC9jb21tb24gSEVBRDpyZWZzL2Zvci9leHBlcmltZW50YWwldG9waWM9ZHJpdmVyL2k0MgogPT09PQogCiBJZiB5b3UgYXJlIGZyZXF1ZW50bHkgdXBsb2FkaW5nIGNoYW5nZXMgdG8gdGhlIHNhbWUgR2Vycml0IHNlcnZlciwKQEAgLTE1NiwxNyArMTc5LDE3IEBACiAKIFNwZWNpZmljIHJldmlld2VycyBjYW4gYmUgcmVxdWVzdGVkIGFuZC9vciBhZGRpdGlvbmFsICdjYXJib24KIGNvcGllcycgb2YgdGhlIG5vdGlmaWNhdGlvbiBtZXNzYWdlIG1heSBiZSBzZW50IGJ5IGluY2x1ZGluZyB0aGVzZQotYXMgYXJndW1lbnRzIHRvIGBnaXQgcmVjZWl2ZS1wYWNrYDoKK2FzIG9wdGlvbnMgaW4gdGhlIHJlZmVyZW5jZQogCiA9PT09Ci0gIGdpdCBwdXNoIC0tcmVjZWl2ZS1wYWNrPSdnaXQgcmVjZWl2ZS1wYWNrIC0tcmV2aWV3ZXI9YUBhLmNvbSAtLWNjPWJAby5jb20nIHRyOmtlcm5lbC9jb21tb24gSEVBRDpyZWZzL2Zvci9leHBlcmltZW50YWwKKyAgZ2l0IHB1c2ggdHI6a2VybmVsL2NvbW1vbiBIRUFEOnJlZnMvZm9yL2V4cGVyaW1lbnRhbCVyPWFAYS5jb20sY2M9YkBvLmNvbQogPT09PQogCi1UaGUgYC0tcmV2aWV3ZXI9J2VtYWlsJ2AgYW5kIGAtLWNjPSdlbWFpbCdgIG9wdGlvbnMgbWF5IGJlCi1zcGVjaWZpZWQgYXMgbWFueSB0aW1lcyBhcyBuZWNlc3NhcnkgdG8gY292ZXIgYWxsIGludGVyZXN0ZWQKLXBhcnRpZXMuICBHZXJyaXQgd2lsbCBhdXRvbWF0aWNhbGx5IGF2b2lkIHNlbmRpbmcgZHVwbGljYXRlIGVtYWlsCi1ub3RpZmljYXRpb25zLCBzdWNoIGFzIGlmIG9uZSBvZiB0aGUgc3BlY2lmaWVkIHJldmlld2VycyBvciBDQwotYWRkcmVzc2VzIGhhZCBhbHNvIHJlcXVlc3RlZCB0byByZWNlaXZlIGFsbCBuZXcgY2hhbmdlIG5vdGlmaWNhdGlvbnMuCitUaGUgYHI9J2VtYWlsJ2AgYW5kIGBjYz0nZW1haWwnYCBvcHRpb25zIG1heSBiZSBzcGVjaWZpZWQgYXMgbWFueQordGltZXMgYXMgbmVjZXNzYXJ5IHRvIGNvdmVyIGFsbCBpbnRlcmVzdGVkIHBhcnRpZXMuIEdlcnJpdCB3aWxsCithdXRvbWF0aWNhbGx5IGF2b2lkIHNlbmRpbmcgZHVwbGljYXRlIGVtYWlsIG5vdGlmaWNhdGlvbnMsIHN1Y2ggYXMKK2lmIG9uZSBvZiB0aGUgc3BlY2lmaWVkIHJldmlld2VycyBvciBDQyBhZGRyZXNzZXMgaGFkIGFsc28gcmVxdWVzdGVkCit0byByZWNlaXZlIGFsbCBuZXcgY2hhbmdlIG5vdGlmaWNhdGlvbnMuCiAKIElmIHlvdSBhcmUgZnJlcXVlbnRseSBzZW5kaW5nIGNoYW5nZXMgdG8gdGhlIHNhbWUgcGFydGllcyBhbmQvb3IKIGJyYW5jaGVzLCBjb25zaWRlciBhZGRpbmcgYSBjdXN0b20gcmVtb3RlIGJsb2NrIHRvIHlvdXIgcHJvamVjdCdzCkBAIC0xNzUsMTIgKzE5OCwxMSBAQAogPT09PQogICAkIGNhdCAuZ2l0L2NvbmZpZwogICAuLi4KLSAgW3JlbW90ZSAiZm9yLWEtZXhwIl0KKyAgW3JlbW90ZSAiZXhwIl0KICAgICB1cmwgPSB0cjprZXJuZWwvY29tbW9uCi0gICAgcmVjZWl2ZXBhY2sgPSBnaXQgcmVjZWl2ZS1wYWNrIC0tcmV2aWV3ZXI9YUBhLmNvbSAtLWNjPWJAby5jb20KLSAgICBwdXNoID0gSEVBRDpyZWZzL2Zvci9leHBlcmltZW50YWwKKyAgICBwdXNoID0gSEVBRDpyZWZzL2Zvci9leHBlcmltZW50YWwlcj1hQGEuY29tLGNjPWJAby5jb20KIAotICAkIGdpdCBwdXNoIGZvci1hLWV4cAorICAkIGdpdCBwdXNoIGV4cAogPT09PQogCiAKZGlmZiAtLWdpdCBhL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi4wLjIxLnR4dCBiL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi4wLjIxLnR4dAppbmRleCA3ZGQ5ZWY0Li40N2JhNjU0IDEwMDY0NAotLS0gYS9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuMC4yMS50eHQKKysrIGIvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjAuMjEudHh0CkBAIC0yMDEsNyArMjAxLDcgQEAKIEdlcnJpdCBubyBsb25nZXIgZm9yZ2VzIHRoZSBGcm9tIGhlYWRlciBpbiBub3RpZmljYXRpb24gZW1haWxzLgogVG8gZW5hYmxlIHRoZSBwcmlvciBmb3JnaW5nIGJlaGF2aW9yLCBzZXQgYHNlbmRlbWFpbC5mcm9tYAogdG8gYFVTRVJgIGluIGdlcnJpdC5jb25maWcuICBGb3IgbW9yZSBkZXRhaWxzIHNlZQotW2h0dHA6Ly9nZXJyaXQuZ29vZ2xlY29kZS5jb20vc3ZuL2RvY3VtZW50YXRpb24vMi4wL2NvbmZpZy1nZXJyaXQuaHRtbCNzZW5kZW1haWwuZnJvbSBzZW5kZW1haWwuZnJvbV0KK2xpbms6aHR0cDovL2dlcnJpdC5nb29nbGVjb2RlLmNvbS9zdm4vZG9jdW1lbnRhdGlvbi8yLjAvY29uZmlnLWdlcnJpdC5odG1sI3NlbmRlbWFpbC5mcm9tW3NlbmRlbWFpbC5mcm9tXQogCiBCdWcgRml4ZXMKIC0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjAuMjQudHh0IGIvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjAuMjQudHh0CmluZGV4IDk0ODFhM2EuLjdlMGE2MTcgMTAwNjQ0Ci0tLSBhL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi4wLjI0LnR4dAorKysgYi9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuMC4yNC50eHQKQEAgLTY3LDcgKzY3LDcgQEAKICogaXNzdWUgMzAwICAgIFN1cHBvcnQgU01UUCBvdmVyIFNTTC9UTFMKICsKIEVuY3J5cHRlZCBTTVRQIGlzIG5vdyBzdXBwb3J0ZWQgbmF0aXZlbHkgd2l0aGluIEdlcnJpdCwgc2VlCi1baHR0cDovL2dlcnJpdC5nb29nbGVjb2RlLmNvbS9zdm4vZG9jdW1lbnRhdGlvbi8yLjAvY29uZmlnLWdlcnJpdC5odG1sI3NlbmRlbWFpbC5zbXRwRW5jcnlwdGlvbiBzZW5kZW1haWwuc210cEVuY3J5cHRpb25dCitsaW5rOmh0dHA6Ly9nZXJyaXQuZ29vZ2xlY29kZS5jb20vc3ZuL2RvY3VtZW50YXRpb24vMi4wL2NvbmZpZy1nZXJyaXQuaHRtbCNzZW5kZW1haWwuc210cEVuY3J5cHRpb25bc2VuZGVtYWlsLnNtdHBFbmNyeXB0aW9uXQogCiBCdWcgRml4ZXMKIC0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjUuMS50eHQgYi9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuNS4xLnR4dAppbmRleCA5NjdkNzhkLi4zYTY0MGQxIDEwMDY0NAotLS0gYS9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuNS4xLnR4dAorKysgYi9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuNS4xLnR4dApAQCAtMzgsOSArMzgsMTAgQEAKIGFkbWluaXN0cmF0b3JzLgogKwogSW4gYWRkaXRpb24gaXQgaXMgbm93IG5vIGxvbmdlciBwb3NzaWJsZSB0bwotLSBzZXQgYSBub24tZXhpc3RpbmcgcHJvamVjdCBhcyBwYXJlbnQgKGFzIHRoaXMgd291bGQgbWFrZSB0aGUgcHJvamVjdAorKworKiogc2V0IGEgbm9uLWV4aXN0aW5nIHByb2plY3QgYXMgcGFyZW50IChhcyB0aGlzIHdvdWxkIG1ha2UgdGhlIHByb2plY3QKICAgYmUgb3JwaGFuZWQpCi0tIHNldCBhIHBhcmVudCBwcm9qZWN0IGZvciB0aGUgYEFsbC1Qcm9qZWN0c2Agcm9vdCBwcm9qZWN0ICh0aGUgcm9vdAorKiogc2V0IGEgcGFyZW50IHByb2plY3QgZm9yIHRoZSBgQWxsLVByb2plY3RzYCByb290IHByb2plY3QgKHRoZSByb290CiAgIHByb2plY3QgYnkgZGVmaW5pdGlvbiBoYXMgbm8gcGFyZW50KQogYnkgcHVzaGluZyBjaGFuZ2VzIG9mIHRoZSBgcHJvamVjdC5jb25maWdgIGZpbGUgdG8gYHJlZnMvbWV0YS9jb25maWdgLgogCmRpZmYgLS1naXQgYS9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuNS4yLnR4dCBiL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi41LjIudHh0CmluZGV4IDVlOTllYmYuLjA4YjRmODYgMTAwNjQ0Ci0tLSBhL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi41LjIudHh0CisrKyBiL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi41LjIudHh0CkBAIC03LDcgKzcsNyBAQAogCiBUaGVyZSBhcmUgbm8gc2NoZW1hIGNoYW5nZXMgZnJvbSAyLjUsIG9yIDIuNS4xLgogCi1Ib3dldmVyLCBpZiB1cGdyYWRpbmcgZnJvbSBhbnl0aGluZyBlYXJsaWVyIHZlcnNpb24sIGZvbGxvdyB0aGUgdXBncmFkZQorSG93ZXZlciwgaWYgdXBncmFkaW5nIGZyb20gYW55IGVhcmxpZXIgdmVyc2lvbiwgZm9sbG93IHRoZSB1cGdyYWRlCiBwcm9jZWR1cmUgaW4gdGhlIDIuNSBsaW5rOlJlbGVhc2VOb3Rlcy0yLjUuaHRtbFtSZWxlYXNlIE5vdGVzXS4KIAogQnVnIEZpeGVzCmRpZmYgLS1naXQgYS9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuNS50eHQgYi9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuNS50eHQKaW5kZXggNTVmYmI2MC4uMDIzYjRiZiAxMDA2NDQKLS0tIGEvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjUudHh0CisrKyBiL1JlbGVhc2VOb3Rlcy9SZWxlYXNlTm90ZXMtMi41LnR4dApAQCAtMjcwLDExICsyNzAsMTEgQEAKICogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi41L3Jlc3QtYXBpLmh0bWxbRG9jdW1lbnRhdGlvbiBvZiB0aGUgUkVTVCBBUEldCiAKICogU3VwcG9ydCBSRVNUIGVuZHBvaW50cyB0bwotKiogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi41L3Jlc3QtYXBpLmh0bWwjY2hhbmdlc1txdWVyeSBjaGFuZ2VzXQotKiogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi41L3Jlc3QtYXBpLmh0bWwjcHJvamVjdHNbbGlzdCBwcm9qZWN0c10KLSoqIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNS9yZXN0LWFwaS5odG1sI3N1Z2dlc3QtcHJvamVjdHNbc3VnZ2VzdAorKiogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi41L3Jlc3QtYXBpLWNoYW5nZXMuaHRtbFtxdWVyeSBjaGFuZ2VzXQorKiogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi41L3Jlc3QtYXBpLXByb2plY3RzLmh0bWxbbGlzdCBwcm9qZWN0c10KKyoqIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNS9yZXN0LWFwaS1wcm9qZWN0cy5odG1sI3N1Z2dlc3QtcHJvamVjdHNbc3VnZ2VzdAogICAgcHJvamVjdHNdCi0qKiBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjUvcmVzdC1hcGkuaHRtbCNhY2NvdW50c19zZWxmX2NhcGFiaWxpdGllc1txdWVyeQorKiogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi41L3Jlc3QtYXBpLWFjY291bnRzLmh0bWwjbGlzdC1hY2NvdW50LWNhcGFiaWxpdGllc1txdWVyeQogICAgdGhlIGdsb2JhbCBjYXBhYmlsaXRpZXMgb2YgdGhlIGNhbGxpbmcgdXNlcl0KIAogKiBTdXBwb3J0IGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNS9yZXN0LWFwaS5odG1sI2F1dGhlbnRpY2F0aW9uW2Fub255bW91cwpAQCAtMTM3Niw3ICsxMzc2LDcgQEAKICogQXZvaWQgc2Vjb25kIHJlbW90ZSBjYWxsIHRvIGxvb2t1cCBhcHByb3ZhbHMgd2hlbiBsb2FkaW5nIGNoYW5nZQogICByZXN1bHRzCiArCi1CeSB1c2luZyB0aGUgbmV3IGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNS9yZXN0LWFwaS5odG1sI2NoYW5nZXNbYC9jaGFuZ2VzL2BdCitCeSB1c2luZyB0aGUgbmV3IGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNS9yZXN0LWFwaS1jaGFuZ2VzLmh0bWxbYC9jaGFuZ2VzL2BdCiBSRVNUIGVuZHBvaW50IHRoZSB3ZWIgVUkgY2xpZW50IG5vdyBvYnRhaW5zIHRoZSBsYWJlbCBpbmZvcm1hdGlvbgogZHVyaW5nIHRoZSBxdWVyeSBhbmQgYXZvaWRzIGEgc2Vjb25kIHJvdW5kIHRyaXAgdG8gbG9va3VwIHRoZSBjdXJyZW50CiBhcHByb3ZhbHMgZm9yIGVhY2ggZGlzcGxheWVkIGNoYW5nZS4gRm9yIG1vc3QgdXNlcnMgdGhpcyBzaG91bGQgaW1wcm92ZQpkaWZmIC0tZ2l0IGEvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjYudHh0IGIvUmVsZWFzZU5vdGVzL1JlbGVhc2VOb3Rlcy0yLjYudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg1ZjI4NDQKLS0tIC9kZXYvbnVsbAorKysgYi9SZWxlYXNlTm90ZXMvUmVsZWFzZU5vdGVzLTIuNi50eHQKQEAgLTAsMCArMSwxNzAyIEBACitSZWxlYXNlIG5vdGVzIGZvciBHZXJyaXQgMi42Cis9PT09PT09PT09PT09PT09PT09PT09PT09PT09CisKK0dlcnJpdCAyLjYgaXMgbm93IGF2YWlsYWJsZToKKworbGluazpodHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2Rvd25sb2Fkcy9kZXRhaWw/bmFtZT1nZXJyaXQtMi42LndhcltodHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2Rvd25sb2Fkcy9kZXRhaWw/bmFtZT1nZXJyaXQtMi42Lndhcl0KKworR2Vycml0IDIuNiBpbmNsdWRlcyB0aGUgYnVnIGZpeGVzIGRvbmUgd2l0aAorbGluazpSZWxlYXNlTm90ZXMtMi41LjEuaHRtbFtHZXJyaXQgMi41LjFdIGFuZAorbGluazpSZWxlYXNlTm90ZXMtMi41LjIuaHRtbFtHZXJyaXQgMi41LjJdLiBUaGVzZSBidWcgZml4ZXMgYXJlICpub3QqCitsaXN0ZWQgaW4gdGhlc2UgcmVsZWFzZSBub3Rlcy4KKworU2NoZW1hIENoYW5nZQorLS0tLS0tLS0tLS0tLQorKldBUk5JTkc6KiBUaGlzIHJlbGVhc2UgY29udGFpbnMgc2NoZW1hIGNoYW5nZXMuICBUbyB1cGdyYWRlOgorLS0tLQorICBqYXZhIC1qYXIgZ2Vycml0LndhciBpbml0IC1kIHNpdGVfcGF0aAorLS0tLQorCisqV0FSTklORzoqIFVwZ3JhZGluZyB0byAyLjYueCByZXF1aXJlcyB0aGUgc2VydmVyIGJlIGZpcnN0IHVwZ3JhZGVkIHRvIDIuMS43IChvcgorYSBsYXRlciAyLjEueCB2ZXJzaW9uKSwgYW5kIHRoZW4gdG8gMi42LnguICBJZiB5b3UgYXJlIHVwZ3JhZGluZyBmcm9tIDIuMi54Lnggb3IKK25ld2VyLCB5b3UgbWF5IGlnbm9yZSB0aGlzIHdhcm5pbmcgYW5kIHVwZ3JhZGUgZGlyZWN0bHkgdG8gMi42LnguCisKK1JlbGVhc2UgSGlnaGxpZ2h0cworLS0tLS0tLS0tLS0tLS0tLS0tCisqIDQyeCBpbXByb3ZlbWVudCBvbiBgZ2l0IGNsb25lYCBhbmQgYGdpdCBmZXRjaGAKKysKK1J1bm5pbmcgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NtZC1nYy5odG1sWworZ2Vycml0IGdjXSBhbGxvd3MgSkdpdCB0byBvcHRpbWl6ZSBhIHJlcG9zaXRvcnkgdG8gc2VydmUgY2xvbmUgYW5kIGZldGNoCitmYXN0ZXIgdGhhbiBDIEdpdCBjYW4sIHdpdGggbWFzc2l2ZWx5IGxvd2VyIHNlcnZlciBDUFUgcmVxdWlyZWQuIFR5cGljYWxseQorR2Vycml0IDIuNiBjYW4gY29tcGxldGVseSB0cmFuc2ZlciBhIHByb2plY3QgdG8gYSBjbGllbnQgZmFzdGVyIHRoYW4gQyBHaXQKK2NhbiBmaW5pc2ggIkNvdW50aW5nIiB0aGUgb2JqZWN0cy4KKworKiBDb21wbGV0ZWx5IGN1c3RvbWl6YWJsZSB3b3JrZmxvdworKworSW5kaXZpZHVhbCBwcm9qZWN0cyBjYW4gYWRkIChvciByZW1vdmUpIHNjb3JlIGNhdGVnb3JpZXMgdGhyb3VnaAorbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NvbmZpZy1sYWJlbHMuaHRtbFsKK2xhYmVsc10gYW5kIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9wcm9sb2ctY29va2Jvb2suaHRtbFsKK1Byb2xvZyBydWxlc10uCisKK05ldyBGZWF0dXJlcworLS0tLS0tLS0tLS0tCisKK1dlYiBVSQorfn5+fn5+CisKK0dsb2JhbAorXl5eXl5eCisKKyogTmV3IExvZ2luIFNjcmVlbnMKKysKK05ldyBmb3JtIGJhc2VkIEhUTUwgc2NyZWVucyBmb3IgbG9naW4gYWxsb3cgYnJvd3NlcnMgdG8gb2ZmZXIgdGhlCitjaG9pY2UgdG8gc2F2ZSB0aGUgbG9naW4gZGF0YSBsb2NhbGx5IGluIHRoZSB1c2VyJ3MgcGFzc3dvcmQgc3RvcmUuCisKKyogUmVuYW1lICJHcm91cHMiIHRvcC1sZXZlbCBtZW51IHRvICJQZW9wbGUiCisKKyogTW92ZSAiRHJhZnQgQ29tbWVudHMiIGxpbmsgbmV4dCB0byAiRHJhZnRzIiBsaW5rCisKKyogSGlnaGxpZ2h0IHRoZSBhY3RpdmUgbWVudSBpdGVtCisKKyogTW92ZSB1c2VyIGluZm8sIHNldHRpbmdzLCBhbmQgbG9nb3V0IHRvIHBvcHVwIGRpYWxvZworCisqIFNob3cgYSBzbWFsbCB2ZXJzaW9uIG9mIHRoZSBhdmF0YXIgaW1hZ2UgbmV4dCB0byB0aGUgdXNlcidzIG5hbWUuCisKKyogU2hvdyBhdmF0YXIgaW1hZ2UgaW4gdXNlciBpbmZvIHBvcHVwIGRpYWxvZworCisqIEFsd2F5cyBzaG93ICdXb3JraW5nIC4uLicgbWVzc2FnZQorKworVGhlICdXb3JraW5nIC4uLicgbWVzc2FnZSBpcyByZWxhdGl2ZWx5IHBvc2l0aW9uZWQgZnJvbSB0aGUgdG9wIG9mCit0aGUgYnJvd3Nlciwgc28gdGhhdCB0aGUgbWVzc2FnZSBpcyBhbHdheXMgdmlzaWJsZSwgZXZlbiBpZiB0aGUgdXNlcgoraGFzIHNjcm9sbGVkIGRvd24gdGhlIHBhZ2UuCisKKyogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NvbmZpZy1nZXJyaXQuaHRtbCNzdWdnZXN0LmZyb21bCisgIHN1Z2dlc3QuZnJvbV0gY29uZmlndXJlcyBhIG1pbmltdW0gbnVtYmVyIG9mIGNoYXJhY3RlcnMgYmVmb3JlCisgIG1hdGNoZXMgZm9yIHJldmlld2VycywgYWNjb3VudHMsIGdyb3VwcyBvciBwcm9qZWN0cyBhcmUgb2ZmZXJlZC4KKworKiBNYWtlIHRoZSBkZWZhdWx0IGZvbnQgc2l6ZSAic21hbGwiLgorCisqIE1hcmsgYWxsIENTUyBjbGFzc2VzIGFzIGV4dGVybmFsIHNvIHVzZXJzIGNhbiByZWx5IG9uIHRoZW0uCisKK1NlYXJjaAorXl5eXl5eCisqIEFuaW1hdGUgc2VhcmNoIGJhciBieSBleHBhbmRpbmcgJiB1bmV4cGFuZGluZworKworV2hlbiB0aGUgc2VhcmNoIGJhciBpcyB1c2VkLCBleHBhbmQgaXQgdG8gYWxsb3cgZm9yIG1vcmUgdGV4dCB0byBiZQordmlzaWJsZS4gV2hlbiBpdCBpcyBibHVycmVkLCBzaHJpbmsgaXQgYmFjayB0byB0aGUgb3JpZ2luYWwgc2l6ZS4KKworKiBTdWdnZXN0IHByb2plY3RzLCBncm91cHMgYW5kIHVzZXJzIGluIHNlYXJjaCBwYW5lbAorKworU3VnZ2VzdCBwcm9qZWN0cywgZ3JvdXBzIGFuZCB1c2VycyBpbiB0aGUgc2VhcmNoIHBhbmVsIGFzIHBhcmFtZXRlciBmb3IKK3Rob3NlIHNlYXJjaCBvcGVyYXRvcnMgdGhhdCBleHBlY3QgYSBwcm9qZWN0LCBncm91cCBvciB1c2VyLgorCisqIEluIHNlYXJjaCBwYW5lbCBzdWdnZXN0ICdzZWxmJyBhcyB2YWx1ZSBmb3Igb3BlcmF0b3JzIHRoYXQgZXhwZWN0IGEgdXNlcgorCisqIFF1b3RlIHZhbHVlcyBzdWdnZXN0ZWQgZm9yIHNlYXJjaCBvcGVyYXRvcnMgb25seSBpZiBuZWVkZWQKKysKK1RoZSB2YWx1ZXMgdGhhdCBhcmUgc3VnZ2VzdGVkIGZvciB0aGUgc2VhcmNoIG9wZXJhdG9ycyBpbiB0aGUgc2VhcmNoCitwYW5lbCBhcmUgbm93IG9ubHkgcXVvdGVkIGlmIHRoZXkgY29udGFpbiBhIHdoaXRlc3BhY2UuCisKK0NoYW5nZSBTY3JlZW5zCiteXl5eXl5eXl5eXl5eXgorCisqIEEgY2hhbmdlJ3MgY29tbWl0IG1lc3NhZ2UgY2FuIGJlIGVkaXRlZCBmcm9tIHRoZSBjaGFuZ2Ugc2NyZWVuLgorCisqIEEgY2hhbmdlJ3MgdG9waWMgY2FuIGJlIGFkZGVkLCByZW1vdmVkIG9yIGNoYW5nZWQgZnJvbSB0aGUKKyAgY2hhbmdlIHNjcmVlbi4KKworKiBBbiAiQWRkIENvbW1lbnQiIGJ1dHRvbiBpcyBhZGRlZCB0byBjaGFuZ2Ugc2NyZWVuCisKKyogVGhlIHJldmlld2VyIG1hdHJpeCBvbiBhIGNoYW5nZSBkaXNwbGF5cyBncmF5IGJveGVzIHdoZXJlIHBlcm1pc3Npb25zCisgIGRvIG5vdCBhbGxvdyB2b3RpbmcgaW4gdGhhdCBjYXRlZ29yeS4KKysKK1RoZSBjb2xvcmluZyBlbmFibGVzIGF1dGhvcnMgdG8gcXVpY2tseSBpZGVudGlmeSBpZiBhbm90aGVyIHJldmlld2VyCitpcyBuZWNlc3NhcnkgdG8gY29udGludWUgdGhlIGNoYW5nZS4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MzUzW0lzc3VlIDM1M10gJgorICBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTEyM1tJc3N1ZSAxMTIzXToKKyAgTmV3IGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9wcm9qZWN0LXNldHVwLmh0bWwjcmViYXNlX2lmX25lY2Vzc2FyeVsKKyAgUmViYXNlIElmIE5lY2Vzc2FyeV0gc3VibWl0IHR5cGUKKysKK1RoaXMgaXMgc2ltaWxhciB0byBjaGVycnkgcGljaywgYnV0IGhvbm9ycyBjaGFuZ2UgZGVwZW5kZW5jeQoraW5mb3JtYXRpb24uCisKKyogVGhlIHJlYmFzZSBidXR0b24gaXMgaGlkZGVuIHdoZW4gdGhlIHBhdGNoIHNldCBpcyBjdXJyZW50LgorCisqIEltcHJvdmVkIHJldmlldyBtZXNzYWdlIHdoZW4gYSBjaGFuZ2UgaXMgcmViYXNlZCBpbiB0aGUgVUkKKysKK1doZW4gYSBjaGFuZ2UgaXMgcmViYXNlZCBpbiB0aGUgVUkgYnkgcHJlc3NpbmcgdGhlIHJlYmFzZSBidXR0b24sIGEKK2NvbW1lbnQgaXMgYWRkZWQgb250byB0aGUgcmV2aWV3LiBJbnN0ZWFkIG9mIG9ubHkgc2F5aW5nICdSZWJhc2VkJyB0aGUKK21lc3NhZ2UgaXMgbm93IG1vcmUgdmVyYm9zZSwgZS5nLiAnUGF0Y2ggU2V0IDEgd2FzIHJlYmFzZWQnLgorCisqIFRoZSBzdWJtaXQgdHlwZSB0aGF0IGlzIHVzZWQgZm9yIHN1Ym1pdHRpbmcgYSBjaGFuZ2UgaXMgc2hvd24gb24gdGhlCisgIGNoYW5nZSBzY3JlZW4gaW4gdGhlIGluZm8gYmxvY2suCisrCitUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIHRoZSBzdWJtaXQgdHlwZSBvZiBhIGNoYW5nZSBjYW4gbm93IGJlCitsaW5rOiNzdWJtaXQtdHlwZS1mcm9tLXByb2xvZ1tjb250cm9sbGVkIGJ5IFByb2xvZ10uCisKKyogUmVwbGFjZSB0aGUgQWxsIERpZmYgYnV0dG9ucyBvbiB0aGUgY2hhbmdlIHNjcmVlbiB3aXRoIGxpbmtzCisrCitUaGUgYWN0aW9uIGJ1dHRvbnMgdG8gb3BlbiB0aGUgZGlmZiBmb3IgYWxsIGZpbGVzIGluIG93biB0YWJzIGNvbnN1bWVkCit0b28gbXVjaCBzcGFjZSBkdWUgdG8gdGhlIGxvbmcgbGFiZWwgdGV4dHMuCisKKyogVGhlIHBhdGNoIHNldCByZXZpZXcgc2NyZWVuIGNhbiBpbmNsdWRlIHJhZGlvIGJ1dHRvbnMgZm9yIGN1c3RvbQorICBsYWJlbHMgaWYgZW5hYmxlZCBieQorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvcHJvbG9nLWNvb2tib29rLmh0bWwjX2hvd190b193cml0ZV9zdWJtaXRfcnVsZXNbc3VibWl0IHJ1bGVzXS4KKworKiBWb3Rpbmcgb24gZHJhZnQgY2hhbmdlcyBpcyBub3cgcG9zc2libGUuCisKKyogUmVjb21tZW5kIHJlYmFzZSBvbiBQYXRoIENvbmZsaWN0CisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE2ODVbSXNzdWUgMTY4NV06CisgIEFmdGVyICdVcCB0byBjaGFuZ2UnIGV4cGFuZCB0aGUgcGF0Y2ggc2V0IHRoYXQgd2FzIGp1c3QgcmV2aWV3ZWQKKysKK0FmdGVyIGNsaWNraW5nIG9uIHRoZSAnVXAgdG8gY2hhbmdlJyBsaW5rIG9uIGEgcGF0Y2ggc2NyZWVuLCB0aGUgcGF0Y2gKK3NldCB0aGF0IHdhcyBqdXN0IHJldmlld2VkIGlzIGF1dG9tYXRpY2FsbHkgZXhwYW5kZWQgb24gdGhlIGNoYW5nZQorc2NyZWVuLgorCisqIEFsbG93IGRpcmVjdCBjaGFuZ2UgVVJMcyB0byBlbmQgd2l0aCAnLycuCisKKyogU2xpZ2h0bHkgaW5jcmVhc2UgY29tbWl0IG1lc3NhZ2UgdGV4dCBzaXplIGZyb20gOHB4IHRvIDlweC4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTM4MVtJc3N1ZSAxMzgxXToKKyAgUmVtb3ZlIHRoZSBJRCBjb2x1bW4gZnJvbSBjaGFuZ2UgdGFibGVzCisrCitVc2VycyBkb24ndCByZWFsbHkgbmVlZCB0aGUgSUQgY29sdW1uIHByZXNlbnQuIEZvciBtb3N0IGNoYW5nZXMgdGhlCitzdWJqZWN0IGlzIGRlc2NyaXB0aXZlIGFuZCB1bmlxdWUgZW5vdWdoIHRvIGlkZW50aWZ5IHRoZSBjb3JyZWN0CitjaGFuZ2UuCisKKyogRG8gbm90IHdyYXAgcHJvamVjdC9icmFuY2gvb3duZXIgZmllbGRzIGluIGNoYW5nZSB0YWJsZQorKworVGhpcyBtYWtlcyBpdCBlYXNpZXIgdG8gdXNlIEdlcnJpdCBvbiBuYXJyb3cgc2NyZWVucy4KKworUGF0Y2ggU2NyZWVucworXl5eXl5eXl5eXl5eXgorCisqIFN1cHBvcnQgZm9yIGZpbGUgY29tbWVudHMKKysKK0l0IGlzIG5vdyBwb3NzaWJsZSB0byBjb21tZW50IG9uIGEgd2hvbGUgZmlsZSBpbiBhIHBhdGNoLgorCisqIEhhdmUgdGhlIHJldmlld2VkIHBhbmVsIGFsc28gYXQgdGhlIGJvdHRvbSBvZiB0aGUgcGF0Y2ggc2NyZWVuCisrCitSZXZpZXdlcnMgbm9ybWFsbHkgcmV2aWV3IHBhdGNoZXMgdG9wIGRvd24sIGZpbmlzaGluZyB0aGUgcmV2aWV3IHdoZW4KK3RoZXkgcmVhY2ggdGhlIGJvdHRvbSBvZiB0aGUgcGF0Y2guIFRvIHVzZSB0aGUgc3RyZWFtbGluZWQgcmV2aWV3Cit3b3JrZmxvdyB0aGV5IG5vdyBkb24ndCBuZWVkIHRvIHNjcm9sbCBiYWNrIHRvIHRoZSB0b3AgdG8gZmluZCB0aGUKK3Jldmlld2VkIGNoZWNrYm94IGFuZCBsaW5rLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNDk0W0lzc3VlIDE0OTRdOgorICBVc2UgbW9uby1mb250IGZvciBkaXNwbGF5aW5nIHRoZSBmaWxlIGNvbnRlbnRzCisrCitUaGlzIGF2b2lkcyBhbGlnbm1lbnQgZXJyb3JzIHdoZW4gc3ludGF4IGhpZ2hsaWdodGluZyBpcyBlbmFibGVkLgorCitQcm9qZWN0IFNjcmVlbnMKK15eXl5eXl5eXl5eXl5eXgorCisqIFN1cHBvcnQgZmlsdGVyaW5nIG9mIHByb2plY3RzIGluIHRoZSBwcm9qZWN0IGxpc3Qgc2NyZWVuCisrCitGaWx0ZXIgbWF0Y2hlcyBhcmUgaGlnaGxpZ2h0ZWQgYnkgYm9sZCBwcmludGluZy4KKysKK1RoZSBmaWx0ZXIgaXMgcmVmbGVjdGVkIGJ5IHRoZSBgZmlsdGVyYCBVUkwgcGFyYW1ldGVyLgorCisqIFN1cHBvcnQgZmlsdGVyaW5nIG9mIHByb2plY3RzIGluIFByb2plY3RMaXN0UG9wdXAKKysKK0ZpbHRlciBtYXRjaGVzIGFyZSBoaWdobGlnaHRlZCBieSBib2xkIHByaW50aW5nLgorCisqIERpc3BsYXkgYSBxdWVyeSBpY29uIGZvciBlYWNoIHByb2plY3QgaW4gdGhlIHByb2plY3QgbGlzdCBzY3JlZW4gdGhhdAorICBsaW5rcyB0byB0aGUgZGVmYXVsdCBxdWVyeS9kYXNoYm9hcmQgb2YgdGhhdCBwcm9qZWN0LgorCisqIFJlcGxhY2UgcHJvamVjdHMgc2lkZSBtZW51cyB3aXRoIHRvcCBtZW51cworKworVGhlIHRvcCBtZW51cyBhcmUgc3VibWVudXMgdG8gdGhlIFByb2plY3QgTWVudSBhbmQgdGhleSBhcHBlYXIgb25seQord2hlbiBhIHByb2plY3QgaGFzIGJlZW4gc2VsZWN0ZWQuCisKKyogUmVtZW1iZXIgdGhlIGxhc3QgUHJvamVjdCBTY3JlZW4gdXNlZAorKworUmVtZW1iZXIgdGhlIGxhc3QgcHJvamVjdCBzY3JlZW4gdXNlZCBldmVyeSB0aW1lIGEgcHJvamVjdCBzY3JlZW4gaXMKK2xvYWRlZC4gR28gdG8gdGhlIHJlbWVtYmVyZWQgc2NyZWVuIHdoZW4gc2VsZWN0aW5nIGEgbmV3IHByb2plY3QgZnJvbQordGhlIHByb2plY3QgbGlzdCBpbnN0ZWFkIG9mIGFsd2F5cyBnb2luZyB0byB0aGUgcHJvamVjdCBpbmZvIHNjcmVlbi4KKworKiBSZW1lbWJlciB0aGUgbGFzdCBwcm9qZWN0IHZpZXdlZAorKworUmVtZW1iZXIgdGhlIGxhc3QgcHJvamVjdCB2aWV3ZWQgd2hlbiBuYXZpZ2F0aW5nIGF3YXkgZnJvbSBhIHByb2plY3QKK3NjcmVlbi4gIElmIHRoZXJlIGlzIGEgcmVtZW1iZXJlZCBwcm9qZWN0LCB0aGVuIHRoZSBleHRyYSBwcm9qZWN0IGxpbmtzCithcmUgbm90IGhpZGRlbi4KKworKiBBZGQgY2xvbmUgcGFuZWwgdG8gdGhlIHByb2plY3QgZ2VuZXJhbCBzY3JlZW4KKworKiBOZXcgc2NyZWVuIGZvciBsaXN0aW5nIGFuZCBhY2Nlc3NpbmcgdGhlIHByb2plY3QgZGFzaGJvYXJkcy4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTY3N1tJc3N1ZSAxNjc3XToKKyAgUGxhY2UgdGhlICdCcm93c2UnIGJ1dHRvbiB0byBzZWxlY3QgYSB3YXRjaGVkIHByb2plY3QgbmV4dCB0byBpbnB1dCBmaWVsZAorCisqIEFzayB1c2VyIHRvIGxvZ2luIGlmIHByb2plY3QgaXMgbm90IGZvdW5kCisrCitBY2Nlc3NpbmcgYSBwcm9qZWN0IFVSTCB3YXMgZmFpbGluZyB3aXRoICdOb3QgRm91bmQgLSBUaGUgcGFnZSB5b3UKK3JlcXVlc3RlZCB3YXMgbm90IGZvdW5kLCBvciB5b3UgZG8gbm90IGhhdmUgcGVybWlzc2lvbiB0byB2aWV3IHRoaXMKK3BhZ2UnIGlmIHRoZSB1c2VyIHdhcyBub3Qgc2lnbmVkIGluIGFuZCB0aGUgcHJvamVjdCB3YXMgbm90IHZpc2libGUgdG8KKydBbm9ueW1vdXMgVXNlcnMnLiBJbnN0ZWFkIEdlcnJpdCBub3cgYXNrcyB0aGUgdXNlciB0byBsb2dpbiBhbmQKK2FmdGVyd2FyZHMgc2hvd3MgdGhlIHByb2plY3QgdG8gdGhlIHVzZXIgaWYgaXQgZXhpc3RzIGFuZCBpcyB2aXNpYmxlLgorSWYgdGhlIHByb2plY3QgZG9lc24ndCBleGlzdCBvciBpcyBub3QgdmlzaWJsZSwgdGhlIHVzZXIgd2lsbCBzdGlsbCBnZXQKK3RoZSBOb3QgRm91bmQgc2NyZWVuIGFmdGVyIHNpZ24gaW4uCisKKyogSW1wcm92ZSBlcnJvciBoYW5kbGluZyBvbiBicmFuY2ggY3JlYXRpb24KKysKK0ltcHJvdmUgdGhlIGVycm9yIG1lc3NhZ2VzIHRoYXQgYXJlIGRpc3BsYXllZCBpbiB0aGUgV2ViVUkgaWYgdGhlCitjcmVhdGlvbiBvZiBhIGJyYW5jaCBmYWlscyBkdWUgdG8gaW52YWxpZCB1c2VyIGlucHV0LgorCitHcm91cCBTY3JlZW5zCiteXl5eXl5eXl5eXl5eCisKKyogU3VwcG9ydCBmaWx0ZXJpbmcgb2YgZ3JvdXBzIGluIHRoZSBncm91cCBsaXN0IHNjcmVlbgorKworRmlsdGVyIG1hdGNoZXMgYXJlIGhpZ2hsaWdodGVkIGJ5IGJvbGQgcHJpbnRpbmcuCisrCitUaGUgZmlsdGVyIGlzIHJlZmxlY3RlZCBieSB0aGUgYGZpbHRlcmAgVVJMIHBhcmFtZXRlci4KKworKiBSZW1vdmUgZ3JvdXAgdHlwZSBmcm9tIGdyb3VwIGluZm8gc2NyZWVuCisrCitUaGUgaW5mb3JtYXRpb24gYWJvdXQgdGhlIGdyb3VwIHR5cGUgd2FzIG5vdCBtdWNoIGhlbHBmdWwuIEFsbCBncm91cHMKK3RoYXQgY2FuIGJlIHNlZW4gaW4gR2Vycml0IGFyZSBvZiB0eXBlICdJTlRFUk5BTCcsIGV4Y2VwdCBhIGZldword2VsbC1rbm93biBzeXN0ZW0gZ3JvdXBzIHdoaWNoIGFyZSBvZiB0eXBlICdTWVNURU0nLiBUaGUgc3lzdGVtIGdyb3VwcworYXJlIHNvIHdlbGwta25vd24gdGhhdCB0aGVyZSBpcyBubyBuZWVkIHRvIGRpc3BsYXkgdGhlIHR5cGUgZm9yIHRoZW0uCisKK0Rhc2hib2FyZCBTY3JlZW5zCiteXl5eXl5eXl5eXl5eXl5eXgorCisqIExpbmsgZGFzaGJvYXJkIHRpdGxlIHRvIGEgVVJMIHZlcnNpb24gb2YgaXRzZWxmCisrCitXaGVuIHVzaW5nIGEgc3RhYmxlIHByb2plY3QgZGFzaGJvYXJkIFVSTCwgdGhlIFVSTCBvYmZ1c2NhdGVzIHRoZQorY29udGVudCBvZiB0aGUgZGFzaGJvYXJkIHdoaWNoIGNhbiBtYWtlIGl0IGhhcmQgdG8gZGVidWcgYSBkYXNoYm9hcmQgb3IKK2NvcHkgYW5kIG1vZGlmeSBpdC4gSW4gdGhlIHNwZWNpYWwgY2FzZSBvZiBzdGFibGUgZGFzaGJvYXJkcywgbWFrZSB0aGUKK3RpdGxlIGEgbGluayB0byBhbiB1bnN0YWJsZSBVUkwgdmVyc2lvbiBvZiB0aGUgZGFzaGJvYXJkIHdpdGggdGhlIFVSTAorcmVmbGVjdGluZyB0aGUgYWN0dWFsIGRhc2hib2FyZCBjb250ZW50cyB0aGUgd2F5IGEgY3VzdG9tIGRhc2hib2FyZAorZG9lcy4KKworKiBJbmNyZWFzZSB0aW1lIHNwYW4gZm9yICJSZWNlbnRseSBDbG9zZWQiIHNlY3Rpb24gaW4gdXNlciBkYXNoYm9hcmQgdG8gNCB3ZWVrcy4KKworQWNjb3VudCBTY3JlZW5zCiteXl5eXl5eXl5eXl5eXl4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTc0MFtJc3N1ZSAxNzQwXToKKyAgRGlzcGxheSBkZXNjcmlwdGlvbiBob3cgdG8gZ2VuZXJhdGUgU1NIIEtleSBpbiBTc2hQYW5lbAorKworRGlzcGxheSBhIGRlc2NyaXB0aW9uIG9mIGhvdyB0byBnZW5lcmF0ZSBhbiBTU0ggS2V5IGluIGFuIGV4cGFuZGFibGUKK3NlY3Rpb24gaW4gdGhlIFNzaFBhbmVsIGluc3RlYWQgb2YgbGlua2luZyB0byB0aGUgR2l0SHViIFNTSCB0dXRvcmlhbC4KK1RoZSBHaXRIdWIgU1NIIHR1dG9yaWFsIHdhcyBwYXJ0aWFsbHkgbm90IHJlbGV2YW50IGFuZCBjb25mdXNlZCB1c2Vycy4KKworKiBNYWtlIHRoZSB0ZXh0IGZvciAiUmVnaXN0ZXIiIGN1c3RvbWl6YWJsZQorCitQbHVnaW4gU2NyZWVucworXl5eXl5eXl5eXl5eXl4KKworKiBTaG93IHN0YXR1cyBmb3IgZW5hYmxlZCBwbHVnaW5zIGluIHRoZSBXZWJVSSBhcyAnRW5hYmxlZCcKKysKK0VhcmxpZXIgbm8gc3RhdHVzIHdhcyBzaG93biBmb3IgZW5hYmxlZCBwbHVnaW5zLCB3aGljaCB3YXMgY29uZnVzaW5nIHRvCitzb21lIHVzZXJzLgorCitSRVNUIEFQSQorfn5+fn5+fn4KKworKiBBIGJpZyBjaHVuayBvZiB0aGUgR2Vycml0IGZ1bmN0aW9uYWxpdHkgaXMgbm93IGF2YWlsYWJsZSB2aWEgdGhlCisgIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9yZXN0LWFwaS5odG1sW1JFU1QgQVBJXS4KKysKK1RoZSBSRVNUIEFQSSBpcyAqTk9UKiBjb21wbGV0ZSB5ZXQgYW5kIHNvbWUgZnVuY3Rpb25hbGl0eSBpcyBzdGlsbCBtaXNzaW5nLgorKworVG8gZmluZCBvdXQgd2hpY2ggZnVuY3Rpb25hbGl0eSBpcyBhdmFpbGFibGUsIGNoZWNrIHRoZSBSRVNUIGVuZHBvaW50IGRvY3VtZW50YXRpb24gZm9yCitsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvcmVzdC1hcGktcHJvamVjdHMuaHRtbFtwcm9qZWN0c10sCitsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvcmVzdC1hcGktY2hhbmdlcy5odG1sW2NoYW5nZXNdLAorbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L3Jlc3QtYXBpLWdyb3Vwcy5odG1sW2dyb3Vwc10gYW5kCitsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvcmVzdC1hcGktYWNjb3VudHMuaHRtbFthY2NvdW50c10uCisKKyogU3VwcG9ydCBzZXR0aW5nIGBIRUFEYCBvZiBhIHByb2plY3QKKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L3Jlc3QtYXBpLXByb2plY3RzLmh0bWwjc2V0LWhlYWRbdmlhIFJFU1RdLgorCisqIEF1ZGl0IHN1cHBvcnQgZm9yIFJFU1QgQVBJLgorKworQWxsb3cgZ2VuZXJhdGluZyBBdWRpdCBldmVudHMgcmVsYXRlZCB0byBSRVNUIEFQSSBleGVjdXRpb24uIFRoZQorc3RydWN0dXJlIG9mIHRoZSBBdWRpdEV2ZW50IGhhcyBiZWVuIGV4dGVuZGVkIHRvIHN1cHBvcnQgdGhlIG5ldworbmFtZS1tdWx0aXZhbHVlIHBhaXJzIHVzZWQgaW4gdGhlIFJFU1QgQVBJLgorKworVGhpcyBpcyBicmVha2luZyBjb21wYXRpYmlsaXR5IHdpdGggdGhlIDIuNSBBUEkgYXMgaXQgY2hhbmdlcyB0aGUKK3BhcmFtcyBkYXRhIHR5cGUsIHRoaXMgaXMgbmVlZGVkIGFueXdheSBhcyB0aGUgcHJldmlvdXMgbGlzdCBvZgorT2JqZWN0cyB3YXMgbm90IHByb3ZpZGluZyBhbGwgdGhlIG5lY2Vzc2FyeSBpbmZvcm1hdGlvbiBvZgorIndoYXQgcmVsYXRlcyB0byB3aGF0IiBpbiB0ZXJtcyBvZiBwYXJhbWV0ZXJzIGluZm8uCisrCitFeGlzdGluZyBzdXBwb3J0IGZvciBTU0ggYW5kIEpTT04tUlBDIGV2ZW50cyBoYXZlIGJlZW4gYWRhcHRlZCBpbgorb3JkZXIgdG8gZml0IGludG8gdGhlIG5ldyBuYW1lLW11bHRpdmFsdWUgc3ludGF4OiB0aGlzIGFsbG93IGEKK2dlbmVyaWMgYXVkaXQgcGx1Zy1pbiB0byBjYXB0dXJlIGFsbCBwYXJhbWV0ZXJzIHJlZ2FyZGxlc3Mgb2Ygd2hlcmUKK3RoZXkgaGF2ZSBiZWVuIGdlbmVyYXRlZC4KKworKiBSZW1vdmUgc3VwcG9ydCBmb3IgZGVwcmVjYXRlZCBgLS1mb3JtYXRgIG9wdGlvbiB3aGVuIGxpc3RpbmcgY2hhbmdlcworKworUXVlcnlpbmcgY2hhbmdlcyB2aWEgUkVTVCBpcyBub3cgYWx3YXlzIHByb2R1Y2luZyBKU09OIG91dHB1dC4KKworKiBJbnRyb2R1Y2UgYGlkYCBwcm9wZXJ0eSBvbiBSRVNUIGVudGl0aWVzCisrCitUaGUgYC9jaGFuZ2VzL2AgZW50aXRpZXMgbm93IHVzZSBgaWRgIHRvIGluY2x1ZGUgYSB0cmlwbGV0IG9mIHRoZQorcHJvamVjdCwgYnJhbmNoIGFuZCBjaGFuZ2UtaWQgc3RyaW5nIHRvIHVuaXF1ZWx5IGlkZW50aWZ5IHRoYXQgY2hhbmdlCitvbiB0aGUgc2VydmVyLiBUaGlzIG1vdmVzIHRoZSBvbGQgYGlkYCBmaWVsZCB0byBiZSBuYW1lZCBgY2hhbmdlX2lkYCwKK3doaWNoIGlzIGEgYnJlYWtpbmcgY2hhbmdlLgorCisqIEFjY2VwdCBjb21tb24gZm9ybXMgb2YgbWFsZm9ybWVkIEpTT04KKysKK1NvbWUgY2xpZW50cyBtYXkgc2VuZCBKU09OLWlzaCBpbnN0ZWFkIG9mIEpTT04uIEJlIG5pY2UgdG8gdGhvc2UKK2NsaWVudHMgYW5kIGFjY2VwdCB2YXJpb3VzIHVzZWZ1bCBmb3JtcyBvZiBpbmNvcnJlY3Qgc3ludGF4OgorKworKiogRW5kIG9mIGxpbmUgY29tbWVudHMgc3RhcnRpbmcgd2l0aCBgLy9gIG9yIGAjYCBhbmQgZW5kaW5nIHdpdGggYQorICAgbmV3bGluZSBjaGFyYWN0ZXIuCisqKiBDLXN0eWxlIGNvbW1lbnRzIHN0YXJ0aW5nIHdpdGggYC8qYCBhbmQgZW5kaW5nIHdpdGggYCovYAorICAgU3VjaCBjb21tZW50cyBtYXkgbm90IGJlIG5lc3RlZC4KKyoqIE5hbWVzIHRoYXQgYXJlIHVucXVvdGVkIG9yIHNpbmdsZSBxdW90ZWQuCisqKiBTdHJpbmdzIHRoYXQgYXJlIHVucXVvdGVkIG9yIHNpbmdsZSBxdW90ZWQuCisqKiBBcnJheSBlbGVtZW50cyBzZXBhcmF0ZWQgYnkgYDtgIGluc3RlYWQgb2YgYCxgLgorKiogVW5uZWNlc3NhcnkgYXJyYXkgc2VwYXJhdG9ycy4gVGhlc2UgYXJlIGludGVycHJldGVkIGFzIGlmIG51bGwgd2FzCisgICB0aGUgb21pdHRlZCB2YWx1ZS4KKyoqIE5hbWVzIGFuZCB2YWx1ZXMgc2VwYXJhdGVkIGJ5IGA9YCBvciBgPT5gIGluc3RlYWQgb2YgYDpgLgorKiogTmFtZS92YWx1ZSBwYWlycyBzZXBhcmF0ZWQgYnkgYDtgIGluc3RlYWQgb2YgYCxgLgorCisqIEJlIG1vcmUgbGliZXJhbCBhYm91dCBwYXJzaW5nIEpTT04gcmVzcG9uc2VzCisrCitJZiB0aGUgcmVzcG9uc2UgYmVnaW5zIHdpdGggdGhlIEpTT04gbWFnaWMgc3RyaW5nLCByZW1vdmUgaXQgYmVmb3JlCitwYXJzaW5nLiBJZiBhIHJlc3BvbnNlIGlzIG1pc3NpbmcgdGhpcyBsZWFkaW5nIHN0cmluZywgcGFyc2UgdGhlCityZXNwb25zZSBhcy1pcy4KKworKiBBY2NlcHQgc2ltcGxlIGZvcm0gZW5jb2RlZCBkYXRhIGZvciBSRVNUIEFQSXMKKysKK1NpbXBsZSBjYXNlcyBsaWtlIGAvcmV2aWV3YCBvciBgL2FiYW5kb25gIGNhbiBub3cgYWNjZXB0IHN0YW5kYXJkIGZvcm0KK3ZhbHVlcyBmb3IgYmFzaWMgcHJvcGVydGllcywgbWFraW5nIGl0IHNpbXBsZSBmb3IgdG9vbHMgdG8gZGlyZWN0bHkKK3Bvc3QgZGF0YToKKysKKy0tLS0KKyAgY3VybCAtbiAtLWRpZ2VzdCBcCisgIC0tZGF0YSAnbWVzc2FnZT1Eb2VzIG5vdCBjb21waWxlLicgXAorICAtLWRhdGEgbGFiZWxzLlZlcmlmaWVkPS0xIFwKKyAgaHR0cDovL2xvY2FsaG9zdDo4MDgwL2EvY2hhbmdlcy8zL3JldmlzaW9ucy8xL3JldmlldworLS0tLQorKworRm9ybSBmaWVsZCBuYW1lcyBhcmUgSlNPTiBmaWVsZCBuYW1lcyBpbiB0aGUgdG9wIGxldmVsIG9iamVjdC4gIElmIGRvdAorYXBwZWFycyBpbiB0aGUgbmFtZSB0aGUgcGFydCB0byB0aGUgbGVmdCBpcyB0YWtlbiBhcyB0aGUgSlNPTiBmaWVsZAorbmFtZSBhbmQgdGhlIHBhcnQgdG8gdGhlIHJpZ2h0IGFzIHRoZSBrZXkgZm9yIGEgTWFwLiBUaGlzIG5pY2VseSBmaXRzCit3aXRoIHRoZSBsYWJlbHMgc3RydWN0dXJlIHVzZWQgYnkgYC9yZXZpZXdgLCBidXQgZG9lc24ndCBzdXBwb3J0IHRoZQorbXVjaCBtb3JlIGNvbXBsZXggaW5saW5lIGNvbW1lbnQgY2FzZS4gQ2xpZW50cyB0aGF0IG5lZWQgdG8gdXNlIG1vcmUKK2NvbXBsZXggZmllbGRzIG11c3QgdXNlIEpTT04gZm9ybWF0dGluZyBmb3IgdGhlIHJlcXVlc3QgYm9keS4KKworKiBBbGxvdyBhZG1pbmlzdHJhdG9ycyB0byBzZWUgb3RoZXIgdXNlciBjYXBhYmlsaXRpZXMKKysKK0V4cGFuZCBgL2FjY291bnRzL3tpZH0vY2FwYWJpbGl0aWVzYCB0byBwZXJtaXQgYW4gYWRtaW5pc3RyYXRvcgordG8gaW5zcGVjdCBhbm90aGVyIHVzZXIncyBlZmZlY3RpdmUgY2FwYWJpbGl0aWVzLgorCisqIERlY2xhcmUga2luZCBpbiBKU09OIEFQSSByZXN1bHRzCisrCitUaGlzIGlzIHJlY29tbWVuZGVkIHRvIGhpbnQgdG8gY2xpZW50cyB3aGF0IHRoZSBlbnRpdHkgdHlwZSBpcyB3aGVuCitwcm9jZXNzaW5nIHRoZSBKU09OIHBheWxvYWQuCisKKyogRm9ybWF0IGgvaGVscCBvdXRwdXQgYXMgcGxhaW4gdGV4dCBub3QgSlNPTgorKworVGhlIG91dHB1dCBwcm9kdWNlZCB3aGVuIHRoZSBjbGllbnQgcmVxdWVzdGVkIHRoZSBoIG9yIGhlbHAgcHJvcGVydHkKK2Zyb20gYSBKU09OIEFQSSBpcyBhbHdheXMgcHJvZHVjZWQgZnJvbSBjb25zdGFudCBjb21waWxlZCBpbnRvIHRoZQorc2VydmVyLiBBc3N1bWUgdGhpcyBzYWZlIHRvIHJldHVybiB0byB0aGUgY2xpZW50IGFzIHRleHQvcGxhaW4gY29udGVudAorYW5kIGF2b2lkIHdyYXBwaW5nIGl0IGludG8gYW4gSFRNTCBlc2NhcGVkIEpTT04gc3RyaW5nLgorCisqIFVzZSBzdHJpbmcgZm9yIEpTT04gZW5jb2RlZCBwbGFpbiB0ZXh0IHJlcGxpZXMKKysKK0luc3RlYWQgb2Ygd3JhcHBpbmcgdGhlIHZhbHVlIGludG8gYW4gb2JqZWN0LCBqdXN0IHJldHVybiB0aGUKK3N0cmluZyBieSBpdHNlbGYuIFRoaXMgYmV0dGVyIG1hdGNoZXMgd2hhdCBoYXBwZW5zIHdpdGggdGhlIHBsYWluCit0ZXh0IHJldHVybiBmb3JtYXQuCisKKyogV3JhcCBwb3NzaWJsZSBIVE1MIHBsYWluIHRleHQgaW4gSlNPTiBvbiBHRVQKKysKK0lmIHRoZSBIVE1MIGFwcGVhcnMgbGlrZSBNU0lFIG1pZ2h0IGd1ZXNzIGl0IGlzIEhUTUwgKHN1Y2ggYXMgaWYgaXQKK2NvbnRhaW5zIGA8YCkgZW5jb2RlIHRoZSByZXNwb25zZSBhcyBhIEpTT04gb2JqZWN0IGluc3RlYWQgb2YgYXMgYQorc2ltcGxlIHBsYWluIHRleHQgc3RyaW5nLiBUaGlzIHdvbid0IHNob3cgdXAgdmVyeSBvZnRlbiBmb3IgY2xpZW50cywKK2FuZCBwcm90ZWN0cyBNU0lFIHVzZXJzIHN0dWNrIG9uIGFuY2llbnQgdmVyc2lvbnMgKHByZSBNU0lFIDgpLgorCisqIEFzayBNU0lFIHRvIG5ldmVyIHNuaWZmIGNvbnRlbnQgdHlwZXMgb24gUkVTVCBBUEkgcmVzcG9uc2VzCisrCitOZXdlciB2ZXJzaW9ucyBvZiBNU0lFIGNhbiBkaXNhYmxlIHRoZSBjb250ZW50IHNuaWZmaW5nIGZlYXR1cmUgaWYgdGhlCitzZXJ2ZXIgYXNrcyBpdCB0byBieSBzZXR0aW5nIGFuIGV4dGVuc2lvbiBoZWFkZXIuIEl0IGlzIGFubm95aW5nLCBidXQKK25lY2Vzc2FyeSwgdGhhdCBhIHNlcnZlciBuZWVkcyB0byBzYXkgIk5vIHJlYWxseSwgSSBfYW1fIHRlbGxpbmcgeW91Cit0aGUgcmlnaHQgQ29udGVudC1UeXBlLCB0cnVzdCBpdC4iCisrCitUaGlzIGZlYXR1cmUgd2FzIGFkZGVkIGluIE1TSUUgOCBCZXRhIDIgc28gaXQgZG9lc24ndCBwcm90ZWN0IHVzZXJzCitydW5uaW5nIE1TSUUgNiBvciA3LCBidXQgdGhvc2UgYXJlIGFuY2llbnQgYW5kIHVzZXJzIHNob3VsZCB1cGdyYWRlLgorKworRW5hYmxlIHRoaXMgb24gdGhlIFJFU1QgQVBJIHJlc3BvbnNlcyBiZWNhdXNlIHdlIHNvbWV0aW1lcyBzZW5kIGJhY2sKK3RleHQvcGxhaW4gcmVzdWx0cyB0aGF0IGFyZSByZWFsbHkganVzdCBwbGFpbiB0ZXh0LiBFeGlzdGluZyBKU09OCityZXNwb25zZXMgYXJlIHByb3RlY3RlZCBmcm9tIGFjY2lkZW50aWFsIHNuaWZmaW5nIGFuZCB0cmVhdG1lbnQgYXMKK0hUTUwgdGhhbmtzIHRvIEdzb24gZW5jb2RpbmcgSFRNTCBjb250cm9sIGNoYXJhY3RlcnMgdXNpbmcgVW5pY29kZQorY2hhcmFjdGVyIGVzY2FwZXMgd2l0aGluIEpTT04gc3RyaW5ncy4KKworKiBBcGFjaGUgcmV2ZXJzZSBwcm94aWVzIG11c3Qgc3dpdGNoIHRvIG1vZF9yZXdyaXRlCisrCitXaGVuIEFwYWNoZSBpcyB1c2VkIGFzIGEgcmV2ZXJzZSBwcm94eSB0aGUgc2VydmVyIG11c3QgYmUgcmVjb25maWd1cmVkCit0byB1c2UgbW9kX3Jld3JpdGUgYW5kIEFsbG93RW5jb2RlZFNsYXNoZXMuICBGb3IgdXBkYXRlZCBpbmZvcm1hdGlvbgorbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NvbmZpZy1yZXZlcnNlcHJveHkuaHRtbCNfYXBhY2hlXzJfY29uZmlndXJhdGlvblsKK3JldmlldyB0aGUgQXBhY2hlIDIgQ29uZmlndXJhdGlvbiBkb2N1bWVudGF0aW9uXS4KKworUHJvamVjdCBEYXNoYm9hcmRzCit+fn5+fn5+fn5+fn5+fn5+fn4KKyogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L3VzZXItZGFzaGJvYXJkcy5odG1sI3Byb2plY3QtZGFzaGJvYXJkc1sKKyAgU3VwcG9ydCBmb3Igc3RvcmluZyBjdXN0b20gZGFzaGJvYXJkcyBmb3IgcHJvamVjdHNdCisrCitDdXN0b20gZGFzaGJvYXJkcyBjYW4gbm93IGJlIHN0b3JlZCBpbiB0aGUgcHJvamVjdHMKK2ByZWZzL21ldGEvZGFzaGJvYXJkcy8qYCBicmFuY2hlcy4KKysKK1RoZSBwcm9qZWN0IGRhc2hib2FyZHMgYXJlIHNob3duIGluIGEgbmV3IHByb2plY3Qgc2NyZWVuIGFuZCBjYW4gYmUKK2xpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9yZXN0LWFwaS1wcm9qZWN0cy5odG1sI2Rhc2hib2FyZC1lbmRwb2ludHNbCithY2Nlc3NlZCB2aWEgUkVTVF0uCisKKyogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L3VzZXItZGFzaGJvYXJkcy5odG1sI3Byb2plY3QtZGVmYXVsdC1kYXNoYm9hcmRbCisgIEFsbG93IGRlZmluaW5nIGEgZGVmYXVsdCBkYXNoYm9hcmQgZm9yIHByb2plY3RzXQorCisqIFN1cHBvcnQgaW5oZXJpdGFuY2UgZm9yIHByb2plY3QgZGFzaGJvYXJkcy4KKysKK0luIGRhc2hib2FyZHMgcXVlcmllcyB0aGUgYCR7cHJvamVjdH1gIHRva2VuIGNhbiBiZSB1c2VkIGFzIHBsYWNlaG9sZGVyCitmb3IgdGhlIHByb2plY3QgbmFtZS4gVGhpcyB0b2tlbiB3aWxsIGJlIHJlcGxhY2VkIHdpdGggdGhlIHByb2plY3QgdG8KK3doaWNoIGEgZGFzaGJvYXJkIGlzIGJlaW5nIGFwcGxpZWQuCisKKyogT24gdGhlIHByb2plY3QgbGlzdCBzY3JlZW4gYSBxdWVyeSBpY29uIGlzIGRpc3BsYXllZCBmb3IgZWFjaCBwcm9qZWN0CisgIHRoYXQgbGlua3MgdG8gdGhlIGRlZmF1bHQgZGFzaGJvYXJkIG9mIHRoYXQgcHJvamVjdC4KKworKiBTdXBwb3J0IGEgYGZvcmVhY2hgIHBhcmFtZXRlciBmb3IgY3VzdG9tIGRhc2hib2FyZHMuCisrCitUaGUgYGZvcmVhY2hgIHBhcmFtZXRlciB3aGljaCB3aWxsIGdldCBhcHBlbmRlZCB0byBhbGwgdGhlIHF1ZXJpZXMgaW4KK3RoZSBkYXNoYm9hcmQuCisKK0FjY2VzcyBDb250cm9scworfn5+fn5+fn5+fn5+fn5+CisqIEFsbG93IHRvIG92ZXJydWxlIGBCTE9DS2AgcGVybWlzc2lvbnMgb24gdGhlIHNhbWUgcHJvamVjdAorKworSXQgd2FzIGltcG9zc2libGUgdG8gYmxvY2sgYSBwZXJtaXNzaW9uIGZvciBhIGdyb3VwIGFuZCBhbGxvdyB0aGUgc2FtZQorcGVybWlzc2lvbiBmb3IgYSBzdWItZ3JvdXAgb2YgdGhhdCBncm91cCBhcyB0aGUgYEJMT0NLYCBwZXJtaXNzaW9uCithbHdheXMgd29uIG92ZXIgYW55IGBBTExPV2AgcGVybWlzc2lvbi4gRm9yIGV4YW1wbGUsIGl0IHdhcyBpbXBvc3NpYmxlCit0byBibG9jayB0aGUgIkZvcmdlIENvbW1pdHRlciIgcGVybWlzc2lvbiBmb3IgYWxsIHVzZXJzIGFuZCB0aGVuIGFsbG93CitpdCBvbmx5IGZvciBhIGNvdXBsZSBvZiBwcml2aWxlZ2VkIHVzZXJzLgorKworQW4gYEFMTE9XYCBwZXJtaXNzaW9uIGhhcyBub3cgIHByaW9yaXR5IG92ZXIgYSBgQkxPQ0tgIHBlcm1pc3Npb24gd2hlbgordGhleSBhcmUgZGVmaW5lZCBpbiB0aGUgc2FtZSBhY2Nlc3Mgc2VjdGlvbiBvZiBhIHByb2plY3QuIFRvIGFjaGlldmUgdGhlCithYm92ZSBtZW50aW9uZWQgcG9saWN5IHRoZSBmb2xsb3dpbmcgY291bGQgYmUgZGVmaW5lZDoKKysKKyAgW2FjY2VzcyAicmVmcy9oZWFkcy8qIl0KKyAgICBmb3JnZUNvbW1pdHRlciA9IGJsb2NrIGdyb3VwIEFub255bW91cyBVc2VycworICAgIGZvcmdlQ29tbWl0dGVyID0gZ3JvdXAgUHJpdmlsZWdlZCBVc2VycworKworQWNyb3NzIHByb2plY3RzIHRoZSBgQkxPQ0tgIHBlcm1pc3Npb24gc3RpbGwgd2lucyBvdmVyIGFueSBgQUxMT1dgCitwZXJtaXNzaW9uLiBUaGlzIHdheSBvbmUgY2Fubm90IG92ZXJyaWRlIGFuIGluaGVyaXRlZCBgQkxPQ0tgCitwZXJtaXNzaW9uIGluIGEgc3VicHJvamVjdC4KKysKK092ZXJydWxpbmcgb2YgYEJMT0NLYCBwZXJtaXNzaW9ucyB3aXRoIGBBTExPV2AgcGVybWlzc2lvbnMgYWxzbyB3b3JrcworZm9yIGxhYmVscyBpLmUuIHBlcm1pc3Npb24gcmFuZ2VzLiBJZiBhIGRlZGljYXRlZCAnVmVyaWZpZXJzJyBncm91cAorbmVlZCB0byBiZSB0aGUgb25seSBncm91cCB3aG8gY2FuIHZvdGUgaW4gdGhlICdWZXJpZmllZCcgbGFiZWwgYW5kIGl0CittdXN0IGJlIGVuc3VyZWQgdGhhdCBldmVuIHByb2plY3Qgb3duZXJzIGNhbm5vdCBjaGFuZ2UgdGhpcyBwb2xpY3ksCit0aGVuIHRoZSBmb2xsb3dpbmcgY2FuIGJlIGRlZmluZWQgaW4gYSBjb21tb24gcGFyZW50IHByb2plY3Q6CisrCisgIFthY2Nlc3MgInJlZnMvaGVhZHMvKiJdCisgICAgbGFiZWwtVmVyaWZpZWQgPSBibG9jayAtMS4uKzEgZ3JvdXAgQW5vbnltb3VzIFVzZXJzCisgICAgbGFiZWwtVmVyaWZpZWQgPSAtMS4uKzEgZ3JvdXAgVmVyaWZpZXJzCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE1MTZbaXNzdWUgMTUxNl06CisgIFNob3cgZ2xvYmFsIGNhcGFiaWxpdGllcyB0byBhbGwgdXNlcnMgdGhhdCBjYW4gcmVhZCBgcmVmcy9tZXRhL2NvbmZpZ2AKKysKK1VzZXJzIGNhbiBub3cgcHJvcG9zZSBjaGFuZ2VzIHRvIHRoZSBnbG9iYWwgY2FwYWJpbGl0aWVzIGZvciByZXZpZXcKK2Zyb20gdGhlIFdlYlVJLgorCisqIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9hY2Nlc3MtY29udHJvbC5odG1sI2NhdGVnb3J5X3JlbW92ZV9yZXZpZXdlclsKKyAgUmVtb3ZlIFJldmlld2VyXSBpcyBhIG5ldyBwZXJtaXNzaW9uLgorCisqIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9hY2Nlc3MtY29udHJvbC5odG1sI2NhdGVnb3J5X3B1c2hfc2lnbmVkWworICBQdXNoaW5nIGEgc2lnbmVkIHRhZ10gaXMgYSBuZXcgcGVybWlzc2lvbi4KKworKiBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvYWNjZXNzLWNvbnRyb2wuaHRtbCNjYXRlZ29yeV9lZGl0X3RvcGljX25hbWVbCisgIEVkaXRpbmcgdGhlIHRvcGljIG5hbWVdIGlzIGEgbmV3IHBlcm1pc3Npb24uCisKKyogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2FjY2Vzcy1jb250cm9sLmh0bWwjY2FwYWJpbGl0eV9hY2Nlc3NEYXRhYmFzZVsKKyAgUmF3IGRhdGFiYXNlIGFjY2Vzc10gd2l0aCB0aGUgYGdzcWxgIGNvbW1hbmQgaXMgYSBuZXcgZ2xvYmFsIGNhcGFiaWxpdHkuCisrCitQcmV2aW91c2x5IHNpdGUgYWRtaW5pc3RyYXRvcnMgaGFkIHRoaXMgY2FwYWJpbGl0eSBieSBkZWZhdWx0LiAgTm93IGl0IGhhcwordG8gYmUgZXhwbGljaXRseSBhc3NpZ25lZCwgZXZlbiBmb3Igc2l0ZSBhZG1pbmlzdHJhdG9ycy4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTU4NVtJc3N1ZSAxNTg1XToKKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2FjY2Vzcy1jb250cm9sLmh0bWwjY2F0ZWdvcnlfdmlld19kcmFmdHNbCisgIFZpZXdpbmcgb3RoZXIgdXNlcnMnIGRyYWZ0IGNoYW5nZXNdIGlzIGEgbmV3IHBlcm1pc3Npb24uCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE2NzVbSXNzdWUgMTY3NV06CisgIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9hY2Nlc3MtY29udHJvbC5odG1sI2NhdGVnb3J5X2RlbGV0ZV9kcmFmdHNbRGVsZXRpbmddIGFuZAorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvYWNjZXNzLWNvbnRyb2wuaHRtbCNjYXRlZ29yeV9wdWJsaXNoX2RyYWZ0c1twdWJsaXNoaW5nXQorICBvdGhlciB1c2VycycgZHJhZnQgY2hhbmdlcyBpcyBhIG5ldyBwZXJtaXNzaW9uLgorCisqIEdyYW50IG1vc3QgcGVybWlzc2lvbnMgd2hlbiBjcmVhdGluZyBgQWxsLVByb2plY3RzYAorKworTWFrZSBHZXJyaXQgbW9yZSBsaWtlIGEgR2l0IHNlcnZlciBvdXQtb2YtdGhlIGJveCBieSBncmFudGluZyBib3RoCitBZG1pbmlzdHJhdG9ycyBhbmQgUHJvamVjdCBPd25lcnMgcGVybWlzc2lvbnMgdG8gcmV2aWV3IGNoYW5nZXMsIHN1Ym1pdAordGhlbSwgY3JlYXRlIGJyYW5jaGVzLCBjcmVhdGUgdGFncywgYW5kIHB1c2ggZGlyZWN0bHkgdG8gYnJhbmNoZXMuCisKKyogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NvbmZpZy1nZXJyaXQuaHRtbCNsZGFwLmdyb3VwTmFtZVsKKyAgTERBUCBncm91cCBuYW1lc10gYXJlIGNvbmZpZ3VyYWJsZSwgYGNuYCBpcyBzdGlsbCB0aGUgZGVmYXVsdC4KKworKiBLZXJiZXJvcyBhdXRoZW50aWNhdGlvbiB0byBMREFQIHNlcnZlcnMgaXMgbm93IHN1cHBvcnRlZC4KKworKiBCYXNpYyBwcm9qZWN0IHByb3BlcnRpZXMgYXJlIG5vdyBpbmhlcml0ZWQgYnkgZGVmYXVsdCBmcm9tIHBhcmVudAorICBwcm9qZWN0czogVXNlIENvbnRlbnQgTWVyZ2UsIFJlcXVpcmUgQ29udHJpYnV0b3IgQWdyZWVtZW50LCBSZXF1aXJlCisgIENoYW5nZSBJZCwgUmVxdWlyZSBTaWduZWQgT2ZmIEJ5LgorCisqIEFsbG93IGFzc2lnbmluZyBgUHVzaGAgZm9yIGByZWZzL21ldGEvY29uZmlnYCBvbiBgQWxsLVByb2plY3RzYAorKworVGhlIGByZWZzL21ldGEvY29uZmlnYCBicmFuY2ggb2YgdGhlIGBBbGwtUHJvamVjdHNgIHByb2plY3Qgc2hvdWxkIG9ubHkKK2JlIG1vZGlmaWVkIGJ5IEdlcnJpdCBhZG1pbmlzdHJhdG9ycyBiZWNhdXNlIGJlaW5nIGFibGUgdG8gZG8KK21vZGlmaWNhdGlvbnMgb24gdGhpcyBicmFuY2ggbWVhbnMgdGhhdCB0aGUgdXNlciBjb3VsZCBhc3NpZ24gaGltc2VsZgorYWRtaW5pc3RyYXRvciBwZXJtaXNzaW9ucy4KKysKK0luIGFkZGl0aW9uIHRvIGJlaW5nIGFkbWluaXN0cmF0b3IgR2Vycml0IHJlcXVpcmVzIHRoYXQgdGhlCithZG1pbmlzdHJhdG9yIGhhcyB0aGUgYFB1c2hgIGFjY2VzcyByaWdodCBmb3IgYHJlZnMvbWV0YS9jb25maWdgIGluCitvcmRlciB0byBiZSBhYmxlIHRvIG1vZGlmeSBpdCAoanVzdCBhcyB3aXRoIGFsbCBvdGhlciBicmFuY2hlcworYWRtaW5pc3RyYXRvcnMgZG8gbm90IGhhdmUgZWRpdCBwZXJtaXNzaW9ucyBieSBkZWZhdWx0KS4KKysKK1RoZSBwcm9ibGVtIHdhcyB0aGF0IGFzc2lnbmluZyB0aGUgYFB1c2hgIGFjY2VzcyByaWdodCBmb3IKK2ByZWZzL21ldGEvY29uZmlnYCBvbiB0aGUgYEFsbC1Qcm9qZWN0c2AgcHJvamVjdCB3YXMgbm90IGFsbG93ZWQuCisrCitIYXZpbmcgdGhlIGBQdXNoYCBhY2Nlc3MgcmlnaHQgZm9yIGByZWZzL21ldGEvY29uZmlnYCBvbiB0aGUKK2BBbGwtUHJvamVjdHNgIHByb2plY3Qgd2l0aG91dCBiZWluZyBhZG1pbmlzdHJhdG9yIGhhcyBubyBlZmZlY3QuCisKK0hvb2tzCit+fn5+fgorKiBDaGFuZ2UgdG9waWMgaXMgcGFzc2VkIHRvIGhvb2tzIGFzIGAtLXRvcGljIE5BTUVgLgorKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTIwMFtJc3N1ZSAxMjAwXToKK05ldyBgcmV2aWV3ZXItYWRkZWRgIGhvb2sgYW5kIHN0cmVhbSBldmVudCB3aGVuIGEgcmV2aWV3ZXIgaXMgYWRkZWQuCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTEyMzdbSXNzdWUgMTIzN106CitOZXcgYG1lcmdlLWZhaWxlZGAgaG9vayBhbmQgc3RyZWFtIGV2ZW50IHdoZW4gYSBjaGFuZ2UgY2Fubm90IGJlIHN1Ym1pdHRlZCBkdWUgdG8gZmFpbGVkIG1lcmdlLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD05MjVbSXNzdWUgOTI1XToKK05ldyBgcmVmLXVwZGF0ZWAgaG9vayBydW4gYmVmb3JlIGEgcHVzaCBpcyBhY2NlcHRlZCBieSBHZXJyaXQuCisKKyogQWRkIGAtLWlzLWRyYWZ0YCBwYXJhbWV0ZXIgdG8gYGNvbW1lbnQtYWRkZWRgIGhvb2sKKworR2l0Cit+fn4KKyogQWRkIG9wdGlvbnMgdG8gYHJlZnMvZm9yL2AgbWFnaWMgYnJhbmNoIHN5bnRheAorKworR2l0IGRvZXNuJ3Qgd2FudCB0byBtb2RpZnkgdGhlIG5ldHdvcmsgcHJvdG9jb2wgdG8gc3VwcG9ydCBwYXNzaW5nCitkYXRhIGZyb20gdGhlIGdpdCBwdXNoIGNsaWVudCB0byB0aGUgc2VydmVyLiBXb3JrIGFyb3VuZCB0aGlzIGJ5CitlbWJlZGRpbmcgb3B0aW9uIGRhdGEgaW50byBhIG5ldyBzdHlsZSBvZiByZWZlcmVuY2Ugc3BlY2lmaWNhdGlvbjoKKysKKy0tLS0KKyAgcmVmcy9mb3IvbWFzdGVyJXI9YWxpY2UsY2M9Ym9iLGNjPWNoYXJsaWUsdG9waWM9b3B0aW9ucworLS0tLQorKworaXMgbm93IHBhcnNlZCBieSB0aGUgc2VydmVyIGFzOgorKworLS0KKyoqIHNldCB0b3BpYyB0byAib3B0aW9ucyIKKyoqIENDIGNoYXJsaWUgYW5kIGJvYgorKiogYWRkIHJldmlld2VyIGFsaWNlCisqKiBmb3IgYnJhbmNoIHJlZnMvaGVhZHMvbWFzdGVyCistLQorKworSWYgYCVgIGlzIHVzZWQgdGhlIGV4dHJhIGluZm9ybWF0aW9uIGFmdGVyIHRoZSBicmFuY2ggbmFtZSBpcworcGFyc2VkIGFzIG9wdGlvbnMgd2l0aCBhcmdzNGouIEVhY2ggb3B0aW9uIGlzIGRlbGltaXRlZCBieSBgLGAuCisrCitTZWxlY3RpbmcgcHVibGlzaCB2cy4gZHJhZnQgc2hvdWxkIGJlIGRvbmUgd2l0aCB0aGUgb3B0aW9ucyBgZHJhZnRgIG9yCitgcHVibGlzaGAsIGFwcGVhcmluZyBhbnl3aGVyZSBpbiB0aGUgcmVmc3BlYyBhZnRlciB0aGUgYCVgIG1hcmtlcjoKKysKKy0tLS0KKyAgcmVmcy9mb3IvbWFzdGVyJWRyYWZ0CisgIHJlZnMvZm9yL21hc3RlciVkcmFmdCxyPWFsaWNlCisgIHJlZnMvZm9yL21hc3RlciVyPWFsaWNlLGRyYWZ0CisgIHJlZnMvZm9yL21hc3RlciVyPWFsaWNlLHB1Ymxpc2gKKy0tLS0KKworKiBFbmFibGUgY29udGVudCBtZXJnZSBieSBkZWZhdWx0CisrCitNb3N0IHRlYW1zIHNlZW0gdG8gZXhwZWN0IEdlcnJpdCB0byBtYW5hZ2Ugc2ltcGxlIG1lcmdlcyB3aXRoaW4gYQorc291cmNlIGNvZGUgZmlsZS4gRW5hYmxlIHRoaXMgb3V0LW9mLXRoZS1ib3guCisKKyogQWRkZWQgYSBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvY29uZmlnLWdlcnJpdC5odG1sI2NvcmUudXNlUmVjdXJzaXZlTWVyZ2VbCisgIHNlcnZlci1sZXZlbCBvcHRpb25dIHRvIHVzZSBKR2l0J3MgbmV3LCBleHBlcmltZW50YWwgcmVjdXJzaXZlIG1lcmdlci4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTYwOFtJc3N1ZSAxNjA4XToKK0NvbW1pdHMgcHVzaGVkIHdpdGhvdXQgYSBDaGFuZ2UtSWQgbm93IHdhcm4gd2l0aCBpbnN0cnVjdGlvbnMgb24gaG93Cit0byBkb3dubG9hZCBhbmQgaW5zdGFsbCB0aGUgY29tbWl0LW1zZyBob29rLgorCisqIEFkZCBgb2xkT2JqZWN0SWRgIGFuZCBgbmV3T2JqZWN0SWRgIHRvIHRoZSBgR2l0UmVmZXJlbmNlVXBkYXRlZExpc3RlbmVyLlVwZGF0ZWAKKworU1NICit+fn4KKyogTmV3IFNTSCBjb21tYW5kIHRvIGh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvY21kLWdjLmh0bWxbCisgIHJ1biBHaXQgZ2FyYmFnZSBjb2xsZWN0aW9uXQorKworQWxsIEdDIHJ1bnMgYXJlIGxvZ2dlZCBpbiBhIEdDIGxvZyBmaWxlLgorCisqIERlc2NyaXB0aW9ucyBhcmUgYWRkZWQgdG8gc3NoIGNvbW1hbmRzLgorKworSWYgYGdlcnJpdGAgaXMgY2FsbGVkIHdpdGhvdXQgYXJndW1lbnRzLCBpdCB3aWxsIG5vdyBzaG93IGEgbGlzdCBvZiBhdmFpbGFibGUKK2NvbW1hbmRzIHdpdGggdGhlaXIgZGVzY3JpcHRpb25zLgorCisqIGBjcmVhdGUtYWNjb3VudCAtLWh0dHAtcGFzc3dvcmRgIGVuYWJsZXMgc2V0dGluZy9yZXNldHRpbmcgdGhlCisgIEhUVFAgcGFzc3dvcmQgb2Ygcm9sZSBhY2NvdW50cywgZm9yIEdpdCBvciBSRVNUIEFQSSBhY2Nlc3MuCisKKyogaHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9jbWQtbHMtdXNlci1yZWZzLmh0bWxbCisgIGxzLXVzZXItcmVmc10gbGlzdHMgd2hpY2ggcmVmcyBhcmUgdmlzaWJsZSBmb3IgYSBnaXZlbiB1c2VyLgorCisqIGBscy1wcm9qZWN0cyAtLWhhcy1hY2wtZm9yYCBsaXN0cyBwcm9qZWN0cyB0aGF0IG1lbnRpb24gYSBncm91cAorICBpbiBhbiBBQ0wsIGlkZW50aWZ5aW5nIHdoZXJlIHJpZ2h0cyBhcmUgZ3JhbnRlZC4KKworKiBgcmV2aWV3YCBjb21tYW5kIHN1cHBvcnRzIHByb2plY3Qtc3BlY2lmaWMgbGFiZWxzCisKKyogYHRlc3Qtc3VibWl0LXJ1bGVgIHdhcyByZW5hbWVkIHRvIGB0ZXN0LXN1Ym1pdCBydWxlYDoKKysKK2BydWxlYCBpcyBub3cgYSBzdWJjb21tYW5kIG9mIHRoZSBgdGVzdC1zdWJtaXRgIGNvbW1hbmQuCisKKyogaHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9jbWQtdGVzdC1zdWJtaXQtdHlwZS5odG1sWworICB0ZXN0LXN1Ym1pdCB0eXBlXSB0ZXN0cyB0aGUgUHJvbG9nIHN1Ym1pdCB0eXBlIHdpdGggYSBjaG9zZW4gY2hhbmdlLgorCitRdWVyeQorfn5+fn4KKyogQWxsb3cgYHt9YCB0byBiZSB1c2VkIGZvciBxdW90aW5nIGluIHF1ZXJ5IGV4cHJlc3Npb25zCisrCitUaGlzIG1ha2VzIGl0IGEgbGl0dGxlIGVhc2llciB0byBxdWVyeSBmb3IgZ3JvdXAgbmFtZXMgdGhhdCBjb250YWluCithIHNwYWNlIG92ZXIgU1NIOgorKworICBzc2ggc3J2IGdlcnJpdCBxdWVyeSAiICdzdGF0dXM6b3BlbiBOT1QgcmV2aWV3ZXJpbjp7RGV2ZWxvcGVyIEdyb3VwfScgIgorCisqIFRoZSBxdWVyeSBzdW1tYXJ5IGJsb2NrIGluY2x1ZGVzIGByZXN1bWVTb3J0S2V5YC4KKworKiBRdWVyeSByZXN1bHRzIGluY2x1ZGUgYXV0aG9yIGFuZCBjaGFuZ2Ugc2l6ZSBpbmZvcm1hdGlvbiB3aGVuIGNlcnRhaW4KKyAgb3B0aW9ucyBhcmUgc3BlY2lmaWVkLgorCisqIFdoZW4gYSBmaWxlIGlzIHJlbmFtZWQgdGhlIG9sZCBmaWxlIG5hbWUgaXMgaW5jbHVkZWQgaW4gdGhlIFBhdGNoCisgIGF0dHJpYnV0ZQorCitQbHVnaW5zCit+fn5+fn5+CisqIFBsdWdpbnMgY2FuIGNvbnRyaWJ1dGUgUHJvbG9nIGZhY3RzL3ByZWRpY2F0ZXMgZnJvbSBKYXZhLgorKiBQbHVnaW5zIGNhbiBwcm9tcHQgZm9yIHBhcmFtZXRlcnMgZHVyaW5nIGBpbml0YCB3aXRoIGBJbml0U3RlcGAuCisqIFBsdWdpbnMgY2FuIG5vdyBjb250cmlidXRlIEphdmFTY3JpcHQgdG8gdGhlIHdlYiBVSS4gVUkgcGx1Z2lucyBjYW4KKyAgYWxzbyBiZSB3cml0dGVuIGFuZCBjb21waWxlZCB3aXRoIEdXVC4KKyogTmV3IE1hdmVuIGFyY2hldHlwZXMgZm9yIEphdmFTY3JpcHQgYW5kIEdXVCBwbHVnaW5zLgorKiBQbHVnaW5zIGNhbiBjb250cmlidXRlIHZhbGlkYXRpb24gc3RlcHMgdG8gcmVjZWl2ZWQgY29tbWl0cy4KKyogQ29tbWl0IG1lc3NhZ2UgbGVuZ3RoIGNoZWNrcyBhcmUgbW92ZWQgdG8gdGhlIGBjb21taXQtbWVzc2FnZS1sZW5ndGgtdmFsaWRhdG9yYAorICBwbHVnaW4gd2hpY2ggaXMgaW5jbHVkZWQgYXMgYSBjb3JlIHBsdWdpbiBpbiB0aGUgR2Vycml0IGRpc3RyaWJ1dGlvbiBhbmQKKyAgY2FuIGJlIGluc3RhbGxlZCBkdXJpbmcgc2l0ZSBpbml0aWFsaXphdGlvbi4KKyogQ3JlYXRpb24gb2YgY29kZSByZXZpZXcgbm90ZXMgaXMgbW92ZWQgdG8gdGhlIGByZXZpZXdub3Rlc2AgcGx1Z2luCisgIHdoaWNoIGlzIGluY2x1ZGVkIGFzIGEgY29yZSBwbHVnaW4gaW4gdGhlIEdlcnJpdCBkaXN0cmlidXRpb24gYW5kIGNhbgorICBiZSBpbnN0YWxsZWQgZHVyaW5nIHNpdGUgaW5pdGlhbGl6YXRpb24uCisqIEEgcGx1Z2luIGV4dGVuc2lvbiBwb2ludCBmb3IgYXZhdGFyIGltYWdlcyB3YXMgYWRkZWQuCisqIEFsbG93IEhUVFAgcGx1Z2lucyB0byBjaGFuZ2UgYHN0YXRpY2Agb3IgYGRvY3NgIHByZWZpeGVzCisrCitBbiBIVFRQIHBsdWdpbiBtYXkgd2FudCBtb3JlIGNvbnRyb2wgb3ZlciBpdHMgVVJMIHNwYWNlLCBidXQgc3RpbGwKK2RlbGVnYXRlIHRvIHRoZSBwbHVnaW4gc2VydmxldCdzIG1hZ2ljIGhhbmRsaW5nIGZvciBzdGF0aWMgZmlsZXMgYW5kCitkb2N1bWVudGF0aW9uLiBBZGQgSkFSIGF0dHJpYnV0ZXMgdG8gY29uZmlndXJlIHRoZXNlIHByZWZpeGVzLgorCitQcm9sb2cKK35+fn5+fgorW1tzdWJtaXQtdHlwZS1mcm9tLXByb2xvZ11dCisqIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9wcm9sb2ctY29va2Jvb2suaHRtbCNIb3dUb1dyaXRlU3VibWl0VHlwZVsKKyAgU3VwcG9ydCBjb250cm9sbGluZyB0aGUgc3VibWl0IHR5cGUgZm9yIGNoYW5nZXMgZnJvbSBQcm9sb2ddCisrCitTaW1pbGFybHkgbGlrZSB0aGUgYHN1Ym1pdF9ydWxlYCB0aGVyZSBpcyBub3cgYSBgc3VibWl0X3R5cGVgIHByZWRpY2F0ZQord2hpY2ggcmV0dXJucyB0aGUgYWxsb3dlZCBzdWJtaXQgdHlwZSBmb3IgYSBjaGFuZ2UuIFdoZW4gdGhlCitgc3VibWl0X3R5cGVgIHByZWRpY2F0ZSBpcyBub3QgcHJvdmlkZWQgaW4gdGhlIGBydWxlcy5wbGAgdGhlbiB0aGUKK3Byb2plY3QgZGVmYXVsdCBzdWJtaXQgdHlwZSBpcyB1c2VkIGZvciBhbGwgY2hhbmdlcyBvZiB0aGF0IHByb2plY3QuCisrCitGaWx0ZXJpbmcgdGhlIHJlc3VsdHMgb2YgdGhlIGBzdWJtaXRfdHlwZWAgaXMgYWxzbyBzdXBwb3J0ZWQgaW4gdGhlCitzYW1lIHdheSBsaWtlIGZpbHRlcmluZyB0aGUgcmVzdWx0cyBvZiB0aGUgYHN1Ym1pdF9ydWxlYC4gVXNpbmcgYQorYHN1Ym1pdF90eXBlX2ZpbHRlcmAgcHJlZGljYXRlIG9uZSBjYW4gZW5mb3JjZSBhIHBhcnRpY3VsYXIgc3VibWl0IHR5cGUKK2Zyb20gYSBwYXJlbnQgcHJvamVjdC4KKworKiBQbHVnaW5zIGNhbiBjb250cmlidXRlIFByb2xvZyBmYWN0cy9wcmVkaWNhdGVzIGZyb20gSmF2YS4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9Mjg4W0lzc3VlIDI4OF06CisgIEV4cG9zZSBiYXNpYyBjb21taXQgc3RhdGlzdGljcyBmb3IgdGhlIFByb2xvZyBydWxlIGVuZ2luZQorKworQSBuZXcgbWV0aG9kIGBnZXJyaXQ6Y29tbWl0X3N0YXRzKC1GaWxlcywtSW5zZXJ0aW9ucywgLURlbGV0aW9ucylgIHdhcworYWRkZWQuCisKKyogQSBuZXcgYG1heF93aXRoX2Jsb2NrYCBwcmVkaWNhdGUgd2FzIGFkZGVkIGZvciBtb3JlIGNvbnZlbmllbnQgdXNhZ2UKKworRW1haWwKK35+fn5+CisqIE5vdGlmeSBwcm9qZWN0IHdhdGNoZXJzIGlmIGRyYWZ0IGNoYW5nZSBpcyBwdWJsaXNoZWQKKyogTm90aWZ5IHVzZXJzIG1lbnRpb25lZCBpbiBjb21taXQgZm9vdGVyIG9uIGRyYWZ0IHB1Ymxpc2gKKyogQWRkIG5ldyBub3RpZnkgdHlwZSB0aGF0IGFsbG93cyB3YXRjaGluZyBvZiBuZXcgcGF0Y2ggc2V0cworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTY4NltJc3N1ZSAxNjg2XToKKyAgQWRkIG5ldyBub3RpZnkgdHlwZSB0aGF0IGFsbG93cyB3YXRjaGluZyBhYmFuZG9uaW5nIG9mIGNoYW5nZXMKKyogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L3VzZXItbm90aWZ5Lmh0bWxbCisgIE5vdGlmaWNhdGlvbnMgY29uZmlndXJlZCBpbiBgcHJvamVjdC5jb25maWdgXSBjYW4gbm93IGJlIGFkZHJlc3NlZAorICB1c2luZyBhbnkgb2YgVG8sIENDLCBvciBCQ0MgaGVhZGVycy4KKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE1MzFbSXNzdWUgMTUzMV06CitFbWFpbCBmb290ZXJzIG5vdyBpbmNsdWRlIGBHZXJyaXQtSGFzQ29tbWVudHM6IHtZZXN8Tm99YC4KKyogYCNpZigkZW1haWwuaGFzSW5saW5lQ29tbWVudHMoKSlgIGNhbiBiZSB1c2VkIGluIHRlbXBsYXRlcyB0byB0ZXN0CisgIGlmIHRoZXJlIGFyZSBjb21tZW50cyB0byBiZSBpbmNsdWRlZCBpbiB0aGlzIGVtYWlsLgorKiBOb3RpZmljYXRpb24gZW1haWxzIGFyZSBzZW50IHRvIGluY2x1ZGVkIGdyb3Vwcy4KKyogQ29tbWVudCBub3RpZmljYXRpb24gZW1haWxzIGFyZSBzZW50IHRvIHByb2plY3Qgd2F0Y2hlcnMuCisqICJDaGFuZ2UgTWVyZ2VkIiBlbWFpbHMgaW5jbHVkZSB0aGUgZGlmZiBvdXRwdXQgd2hlbiBgc2VuZGVtYWlsLmluY2x1ZGVEaWZmYCBpcyBlbmFibGVkLgorKiBXaGVuIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9yZXN0LWFwaS1jaGFuZ2VzLmh0bWwjc2V0LXJldmlld1sKKyAgcG9zdGluZyBhIHJldmlldyB2aWEgUkVTVF0gdGhlIGNhbGxlciBjYW4gY29udHJvbCBlbWFpbCBkZWxpdmVyeQorKworVGhpcyBtYXkgaGVscCBhdXRvbWF0ZWQgc3lzdGVtcyB0byBiZSBsZXNzIG5vaXN5LiBUb29scyBjYW4gbm93IGNob29zZQord2hpY2ggcmV2aWV3IHVwZGF0ZXMgc2hvdWxkIHNlbmQgZW1haWwsIGFuZCB3aGljaCBjYXRlZ29yaWVzIG9mIHVzZXJzCitvbiBhIGNoYW5nZSBzaG91bGQgZ2V0IHRoYXQgZW1haWwuCisKK0xhYmVscworfn5+fn5+CisqIEFwcHJvdmFsIGNhdGVnb3JpZXMgc3RvcmVkIGluIHRoZSBkYXRhYmFzZSBoYXZlIGJlZW4gcmVwbGFjZWQgd2l0aCBsYWJlbHMKKyAgY29uZmlndXJlZCBpbiBgcHJvamVjdC5jb25maWdgLiBFeGlzdGluZyBjYXRlZ29yaWVzIGFyZSBtaWdyYXRlZCB0bworICBgcHJvamVjdC5jb25maWdgIGluIGBBbGwtUHJvamVjdHNgIGFzIHBhcnQgb2YgdGhlIHNjaGVtYSB1cGdyYWRlOyBubyB1c2VyCisgIGFjdGlvbiBpcyByZXF1aXJlZC4KKyogTGFiZWxzIGFyZSBubyBsb25nZXIgZ2xvYmFsOworICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvY29uZmlnLWxhYmVscy5odG1sWworICBwcm9qZWN0cyBtYXkgZGVmaW5lIHRoZWlyIG93biBsYWJlbHNdLCB3aXRoIGluaGVyaXRhbmNlLgorKiBEb24ndCBjcmVhdGUgYFZlcmlmeWAgY2F0ZWdvcnkgYnkgZGVmYXVsdAorKworTW9zdCBwcm9qZWN0IHRlYW1zIHNlZW0gY29uZnVzZWQgd2l0aCB0aGUgb3V0LW9mLXRoZS1ib3ggZXhwZXJpZW5jZQorbmVlZGluZyB0byB2b3RlIG9uIGJvdGggYENvZGUtUmV2aWV3YCBhbmQgYFZlcmlmaWVkYCBjYXRlZ29yaWVzIGluCitvcmRlciB0byBzdWJtaXQgYSBjaGFuZ2UuIFNpbXBsaWZ5IHRoZSBvdXQtb2YtdGhlLWJveCB3b3JrZmxvdyB0byBvbmx5CitoYXZlIGBDb2RlLVJldmlld2AuIFdoZW4gYSB0ZWFtIGluc3RhbGxzIHRoZSBIdWRzb24vSmVua2lucyBpbnRlZ3JhdGlvbgorb3IgdGhlaXIgb3duIGJ1aWxkIHN5c3RlbSB0aGV5IGNhbiBub3cgdHJpdmlhbGx5IGFkZCB0aGUgYFZlcmlmaWVkYAorY2F0ZWdvcnkgYnkgcGFzdGluZyA1IGxpbmVzIGludG8gYHByb2plY3QuY29uZmlnYC4KKworRGV2Cit+fn4KKworKiBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvZGV2LXJlYWRtZS5odG1sI2RlYnVnLWphdmFzY3JpcHRbCisgIFN1cHBvcnQgbG9hZGluZyBkZWJ1ZyBKYXZhU2NyaXB0XQorCisqIEdlcnJpdCBhY2NlcHRhbmNlIHRlc3RzCisrCitBbiBpbmZyYXN0cnVjdHVyZSBmb3IgdGVzdGluZyB0aGUgR2Vycml0IGRhZW1vbiB2aWEgUkVTVCBhbmQvb3IgU1NICitwcm90b2NvbHMgaGFzIGJlZW4gYWRkZWQuIEdlcnJpdCBkYWVtb24gaXMgcnVuIGluIHRoZSBoZWFkbGVzcyBtb2RlIGFuZAoraW4gdGhlIHNhbWUgSlZNIHdoZXJlIHRoZSB0ZXN0cyBydW4uIEJlc2lkZXMgdXNpbmcgUkVTVC9TU0gsIHRoZSB0ZXN0cworY2FuIGFsc28gYWNjZXNzIEdlcnJpdCBzZXJ2ZXIgaW50ZXJuYWxzIHRvIHByZXBhcmUgdGhlIHRlc3QgZW52aXJvbm1lbnQKK2FuZCB0byBwZXJmb3JtIGFzc2VydGlvbnMuCisrCitBIG5ldyByZXZpZXcgc2l0ZSBpcyBjcmVhdGVkIGZvciBlYWNoIHRlc3QgYW5kIHRoZSBHZXJyaXQgZGFlbW9uIGlzCitzdGFydGVkIG9uIHRoYXQgc2l0ZS4gV2hlbiB0aGUgdGVzdCBoYXMgZmluaXNoZWQgdGhlIEdlcnJpdCBkYWVtb24gaXMKK3NodXRkb3duLgorCisqIExpZ2h0d2VpZ2h0IExEQVAgc2VydmVyIGZvciBkZWJ1Z2dpbmcKKworKiBBZGQgYXNjaWlkb2MgY2hlY2tzIGluIHRoZSBkb2N1bWVudGF0aW9uIG1ha2VmaWxlCisrCitFeGl0IHdpdGggZXJyb3IgaWYgdGhlIGFzY2lpZG9jIGV4ZWN1dGFibGUgaXMgbm90IGF2YWlsYWJsZSBvciBoYXMKK3ZlcnNpb24gbG93ZXIgdGhhbiA4LjYuMy4KKysKK1RoZSByZWxlYXNlIHNjcmlwdCBpcyBhYm9ydGVkIGlmIGFzY2lpZG9jIGlzIG1pc3NpbmcuCisKKyogQWRkZWQgc3VibGltZSBwcm9qZWN0IGZpbGVzIHRvIGAuZ2l0aWdub3JlYAorCisqIEV4Y2x1ZGUgYWxsIGBwb20ueG1sYCBmaWxlcyB0aGF0IGFyZSBhcmNoZXR5cGUgcmVzb3VyY2VzIGluIGB2ZXJzaW9uLnNoYAorCitQZXJmb3JtYW5jZQorfn5+fn5+fn5+fn4KKyogQml0bWFwIE9wdGltaXphdGlvbnMKKysKK09uIHJ1bm5pbmcgdGhlIGh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvY21kLWdjLmh0bWxbCitnYXJiYWdlIGNvbGxlY3Rpb25dIEpHaXQgY3JlYXRlcyBiaXRtYXAgZGF0YSB0aGF0IGlzIHNhdmVkIHRvIGFuCithdXhpbGlhcnkgZmlsZS4gVGhlIGJpdG1hcCBvcHRpbWl6YXRpb25zIGltcHJvdmUgdGhlIGNsb25lIGFuZCBmZXRjaAorcGVyZm9ybWFuY2UuIGdpdC1jb3JlIHdpbGwgaWdub3JlIHRoZSBiaXRtYXAgZGF0YS4KKworKiBJbXByb3ZlIHN1Z2dlc3QgdXNlciBwZXJmb3JtYW5jZSB3aGVuIGFkZGluZyBhIHJldmlld2VyLgorKworRG8gbm90IGNoZWNrIHRoZSB2aXNpYmlsaXR5IG9mIHRoZSBjaGFuZ2UgZm9yIGVhY2ggc3VnZ2VzdGVkIGFjY291bnQgaWYKK3RoZSByZWYgaXMgdmlzaWJsZSBieSBhbGwgcmVnaXN0ZXJlZCB1c2Vycy4KKysKK09uIGEgc3lzdGVtIHdpdGggYWJvdXQgMi0zMDAwIHVzZXJzLCB3aGVyZSBtb3N0IG9mIHRoZSBwcm9qZWN0cyBhcmUKK3Zpc2libGUgYnkgZXZlcnkgcmVnaXN0ZXJlZCB1c2VyLCB0aGlzIGltcHJvdmVzIHRoZSBwZXJmb3JtYW5jZSBvZiB0aGUKK3N1Z2dlc3RpbmcgcmV2aWV3ZXIgYnkgYSBmYWN0b3Igb2YgMTAwMCBhdCBsZWFzdC4KKworKiBDYWNoZSBSZWZDb250cm9sLmlzVmlzaWJsZSgpCisrCitGb3IgR2l0IHJlcG9zaXRvcmllcyB3aXRoIG1hbnkgY2hhbmdlcyB0aGUgdGltZSBmb3IgY2FsY3VsYXRpbmcgdmlzaWJsZQorcmVmcyBpcyByZWR1Y2VkIGJ5IDMwLTUwJS4KKworKiBBbGxvdyBhZG1pbnMgdG8gZGlzYWJsZSBtYWdpYyByZWYgY2hlY2sgb24gdXBsb2FkCisrCitTb21lIHNpdGVzIG1hbmFnZSB0byBydW4gdGhlaXIgcmVwb3NpdG9yaWVzIGluIGEgd2F5IHRoYXQgcHJldmVudHMKK3VzZXJzIGZyb20gZXZlciBiZWluZyBhYmxlIHRvIGNyZWF0ZSBgcmVmcy9mb3JgLCBgcmVmcy9kcmFmdHNgIG9yCitgcmVmcy9wdWJsaXNoYCBuYW1lcyBpbiBhIHJlcG9zaXRvcnkuIEFsbG93IGFkbWlucyBvbiB0aG9zZSBzZXJ2ZXJzCit0byBkaXNhYmxlIHRoaXMgKHNvbWV3aGF0KSBleHBlbnNpdmUgY2hlY2sgYmVmb3JlIGV2ZXJ5IHVwbG9hZC4KKworKiBQZXJtaXQgUHJvamVjdENhY2hlQ2xvY2sgdG8gYmUgY29tcGxldGVseSBkaXNhYmxlZAorKworU29tZSBhZG1pbnMgbWF5IGp1c3Qgd2FudCB0byByZXF1aXJlIGFsbCB1cGRhdGVzIHRvIHByb2plY3RzIHRvIGJlCittYWRlIHRocm91Z2ggdGhlIHdlYiBpbnRlcmZhY2UsIGFuZCBhdm9pZCB0aGUgc21hbGwgZXhwZW5zZSBvZiBhCitiYWNrZ3JvdW5kIHRocmVhZCB0aWNraW5nIG9mZiBjaGFuZ2VzLgorCisqIEJhdGNoIHJlYWQgQ2hhbmdlIG9iamVjdHMgZHVyaW5nIHF1ZXJ5CisKKyogRGVmYXVsdCBgY29yZS5zdHJlYW1GaWxlVGhyZXNob2xkYCB0byBhIGxhcmdlciB2YWx1ZQorKworSWYgdGhpcyB2YWx1ZSBpcyBub3QgY29uZmlndXJlZCBieSB0aGUgc2VydmVyIGFkbWluaXN0cmF0b3IKK3BlcmZvcm1hbmNlIG9uIGxhcmdlciB0ZXh0IGZpbGVzIHN1ZmZlcnMgY29uc2lkZXJhYmx5IGFuZAorR2Vycml0IG1heSBncmluZCB0byBhIGhhbHQgYW5kIGJlIHVuYWJsZSB0byBhbnN3ZXIgdXNlcnMuCisrCitEZWZhdWx0IHRvIGVpdGhlciAyNSUgb2YgdGhlIGF2YWlsYWJsZSBKVk0gaGVhcCBvciB+MjA0OG0uCisKKyogSW1wcm92ZSBwZXJmb3JtYW5jZSBvZiBSZWNlaXZlQ29tbWl0cyBmb3IgcmVwb3NpdG9yaWVzIHdpdGggbWFueSByZWZzCisrCitBdm9pZCBhZGRpbmcgYHJlZnMvY2hhbmdlcy9gIGFuZCBgcmVmcy90YWdzL2AgdG8gUmV2V2FsaydzIGFzCit1bmludGVyZXN0aW5nIHNpbmNlIEpHaXQgUmV2V2FsayBkb2Vzbid0IHBlcmZvcm0gd2VsbCB3aGVuIGEgbGFyZ2UKK251bWJlciBvZiBvYmplY3RzIGlzIG1hcmtlZCBhcyB1bmludGVyZXN0aW5nLgorCisqIFBhdGNoU2V0LmlzUmVmKCktb3B0aW1pemF0aW9ucy4KKysKK1BhdGNoU2V0LmlzUmVmKCkgaXMgdXNlZCBleHRlbnNpdmVseSB3aGVuIHByZXBhcmluZyBmb3IgYSByZWYKK2FkdmVydGlzbWVudCBhbmQgdGhlIHJlZ3VsYXIgZXhwcmVzc2lvbiB1c2VkIGJ5IGlzUmVmcygpIHdhcyBub3RhYmx5Citjb3N0bHkgaW4gdGhlc2UgY2lyY3Vtc3RhbmNlcywgZXNwZWNpYWxseSBzaW5jZSBpdCBjb3VsZCBub3QgYmUKK3ByZS1jb21waWxlZC4KKysKK1RoZSByZWd1bGFyIGV4cHJlc3Npb24gaXMgcmVtb3ZlZCBhbmQgdGhlIGNoZWNrIGlzIG5vdyBkaXJlY3RseQoraW1wbGVtZW50ZWQuIEFzIHJlc3VsdCB0aGUgcGVyZm9ybWFuY2Ugb2YgYGdpdCBscy1yZW1vdGVgIGNvdWxkIGJlCitpbmNyZWFzZWQgdXB0byAxNSUuCisKKyogTmV3IGNvbmZpZyBvcHRpb24gYHJlY2VpdmUuY2hlY2tSZWZlcmVuY2VkT2JqZWN0c0FyZVJlYWNoYWJsZWAKKysKK0lmIHNldCB0byB0cnVlLCBHZXJyaXQgd2lsbCB2YWxpZGF0ZSB0aGF0IGFsbCByZWZlcmVuY2VkIG9iamVjdHMgdGhhdAorYXJlIG5vdCBpbmNsdWRlZCBpbiB0aGUgcmVjZWl2ZWQgcGFjayBhcmUgcmVhY2hhYmxlIGJ5IHRoZSB1c2VyLgorKworQ2Fycnlpbmcgb3V0IHRoaXMgY2hlY2sgb24gR2l0IHJlcG9zaXRvcmllcyB3aXRoIG1hbnkgcmVmcyBhbmQgY29tbWl0cworY2FuIGJlIGEgdmVyeSBDUFUtaGVhdnkgb3BlcmF0aW9uLiBGb3Igbm9uIHB1YmxpYyBHZXJyaXQgc2VydmVycyBpdCBtYXkKK21ha2Ugc2Vuc2UgdG8gZGlzYWJsZSB0aGlzIGNoZWNrLCB3aGljaCBpcyBub3cgcG9zc2libGUuCisKKyogQ2FjaGUgY29uZmlnIHZhbHVlIGluIExkYXBBdXRoQmFja2VuZAorCisqIFBlcmZvcm0gYSBzaW5nbGUgL2FjY291bnRzL3NlbGYvY2FwYWJpbGl0aWVzIG9uIHBhZ2UgbG9hZAorKworVGhpcyBqb2lucyB1cCAzIHJlcXVlc3RzIGludG8gYSBzaW5nbGUgY2FsbCwgd2hpY2ggc2hvdWxkIHNwZWVkIHVwCitpbml0aWFsIHBhZ2UgbG9hZCBmb3IgbW9zdCB1c2Vycy4KKworKiBPbmx5IGd6aXAgY29tcHJlc3MgcmVzcG9uc2VzIHRoYXQgYXJlIHNtYWxsZXIgY29tcHJlc3NlZAorCisqIENhY2hpbmcgb2YgY2hhbmdlcworKworRHVyaW5nIFJlZiBBZHZlcnRpc21lbnRzICh2aWEgVmlzaWJsZVJlZkZpbHRlciksIGFsbCBjaGFuZ2VzIG5lZWQgdG8KK2JlIGZldGNoZWQgZnJvbSB0aGUgZGF0YWJhc2UgdG8gYWxsb3cgR2Vycml0IHRvIGZpZ3VyZSBvdXQgd2hpY2ggY2hhbmdlCityZWZzIGFyZSB2aXNpYmxlIGFuZCBzaG91bGQgYmUgYWR2ZXJ0aXNlZCB0byB0aGUgdXNlci4gVG8gcmVkdWNlCitkYXRhYmFzZSB0cmFmZmljIGEgY2FjaGUgZm9yIGNoYW5nZXMgd2FzIGludHJvZHVjZWQuIFRoaXMgY2FjaGUgaXMKK2Rpc2FibGVkIGJ5IGRlZmF1bHQgc2luY2UgaXQgY2FuIG1lc3MtdXAgbXVsdGktc2VydmVyIHNldHVwcy4KKworTWlzYworfn5+fgorKiBBZGQgY29uZmlnIHBhcmFtZXRlciB0byBtYWtlIG5ldyBncm91cHMgYnkgZGVmYXVsdCB2aXNpYmxlIHRvIGFsbAorKworQWRkIGEgbmV3IGh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvY29uZmlnLWdlcnJpdC5odG1sI2dyb3Vwcy5uZXdHcm91cHNWaXNpYmxlVG9BbGxbCitHZXJyaXQgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXJdIHRoYXQgY29udHJvbHMgd2hldGhlciBuZXdseQorY3JlYXRlZCBncm91cHMgc2hvdWxkIGJlIGJ5IGRlZmF1bHQgdmlzaWJsZSB0byBhbGwgcmVnaXN0ZXJlZCB1c2Vycy4KKworKiBTdXBwb3J0IGZvciBPcGVuSUQgZG9tYWluIGZpbHRlcmluZworKworQWRkZWQgdGhlIGFiaWxpdHkgdG8gb25seSBhbGxvdyBlbWFpbCBhZGRyZXNzZXMgdW5kZXIgc3BlY2lmaWMgZG9tYWlucwordG8gYmUgdXNlZCBmb3IgT3BlbklEIGxvZ2luLgorKworVGhlIGFsbG93ZWQgZG9tYWlucyBjYW4gYmUgY29uZmlndXJlZCBieSBzZXR0aW5nCitodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NvbmZpZy1nZXJyaXQuaHRtbCNhdXRoLm9wZW5JZERvbWFpblsKK2F1dGgub3BlbklkRG9tYWluXSBpbiB0aGUgR2Vycml0IGNvbmZpZ3VyYXRpb24uCisKKyogQWx3YXlzIGNvbmZpZ3VyZQorICBodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NvbmZpZy1nZXJyaXQuaHRtbCNnZXJyaXQuY2Fub25pY2FsV2ViVXJsWworICBnZXJyaXQuY2Fub25pY2FsV2ViVXJsXSBvbiBpbml0CisrCitHZXJyaXQgaGFzIGJlZW4gcmVxdWlyaW5nIHRoaXMgZmllbGQgZm9yIHNldmVyYWwgdmVyc2lvbnMgbm93LCBidXQgaW5pdAorZGlkIG5vdCBjb25maWd1cmUgaXQuIEVuc3VyZSB0aGVyZSBpcyBhIHZhbHVlIHNldCBzbyB0aGUgc2VydmVyIGlzIG5vdAorY29uZnVzZWQgYXQgcnVudGltZS4KKworKiBBZGQgc3VibW9kdWxlIHN1YnNjcmlwdGlvbnMgZmV0Y2hpbmcgYnkgcHJvamVjdHMKKysKK1doaWxlIHN1Ym1vZHVsZSBzdWJzY3JpcHRpb25zIGNhbiBiZSBmZXRjaGVkIGJ5IGJyYW5jaCwgc29tZSBwbHVnaW5zCisoZS5nLjogZGVsZXRlLXByb2plY3QpIHdvdWxkIHJhdGhlciBuZWVkIHRvIGFjY2VzcyBhbGwgc3VibW9kdWxlCitzdWJzY3JpcHRpb25zIG9mIGEgcHJvamVjdCAocmVnYXJkbGVzcyBvZiB0aGUgYnJhbmNoKS4gSW5zdGVhZCBvZgoraXRlcmF0aW5nIG92ZXIgYWxsIGJyYW5jaGVzIG9mIGEgcHJvamVjdCwgYW5kIGZldGNoaW5nIHRoZQorc3Vic2NyaXB0aW9uIGZvciBlYWNoIGJyYW5jaCBzZXBhcmF0ZWx5LCB3ZSBhbGxvdyBmZXRjaGluZyBvZgorc3Vic2NyaXB0aW9ucyBkaXJlY3RseSBieSBwcm9qZWN0cy4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTgwNVtJc3N1ZSAxODA1XToKKyAgTWFrZSBjbGllbnQgU1NMIGNlcnRpZmljYXRlcyB0aGF0IGNvbnRhaW4gYW4gZW1haWwgYWRkcmVzcyB3b3JrCisrCitBdXRoZW50aWNhdGlvbiB3aXRoIENMSUVOVF9TU0xfQ0VSVF9MREFQIGRpZG4ndCB3b3JrIGlmIHRoZSBjZXJ0aWZpY2F0ZQorY29udGFpbmVkIGVtYWlsIGFkZHJlc3MuCisKKyogR3Vlc3MgTERBUCB0eXBlIG9mIEFjdGl2ZSBEaXJlY3RvcnkgTERTIGFzIEFjdGl2ZURpcmVjdG9yeQorKworSWYgR2Vycml0IGNvbm5lY3RzIHRvIGFuIEFEIExEUyBbMV0gc2VydmVyIGl0IHdpbGwgZ3Vlc3MgaXRzIHR5cGUgYXMKK1JDRl8yMzA3IGluc3RlYWQgb2YgQWN0aXZlRGlyZWN0b3J5LiBUaGUgcmVhc29uIGlzIHRoYXQgYW4gQUQgTERTCitkb2Vzbid0IHN1cHBvcnQgdGhlICIxLjIuODQwLjExMzU1Ni4xLjQuODAwIiBjYXBhYmlsaXR5LiAgSG93ZXZlciwKK0FEIExEUyBiZWhhdmVzIGxpa2UgQWN0aXZlRGlyZWN0b3J5IGFuZCBHZXJyaXQgYWxzbyBuZWVkcyB0byBndWVzcworaXRzIHR5cGUgYXMgQWN0aXZlRGlyZWN0b3J5IHRvIG1ha2UgdGhlIGRlZmF1bHQgcXVlcnkgcGF0dGVybnMgd29yaworcHJvcGVybHkuCisrCitFeHRlbmQgdGhlIExEQVAgc2VydmVyIHR5cGUgZ3Vlc3NpbmcgYnkgY2hlY2tpbmcgZm9yIHByZXNlbmNlIG9mIHRoZQorIjEuMi44NDAuMTEzNTU2LjEuNC4xODUxIiBjYXBhYmlsaXR5IHdoaWNoIGluZGljYXRlcyB0aGF0IHRoaXMgTERBUAorc2VydmVyIHJ1bnMgQWN0aXZlRGlyZWN0b3J5IGFzIEFEIExEUyBbMl0uCisrCitBbHNvIHJlbW92ZSB0aGUgY2hlY2sgZm9yIHRoZSBwcmVzZW5jZSBvZiB0aGUgImRlZmF1bHROYW1pbmdDb250ZXh0IgorYXR0cmlidXRlIGFzIHdlIGRvbid0IHVzZSBpdCBhbnl3aGVyZSBhbmQsIGJ5IGRlZmF1bHQsIHRoaXMgYXR0cmlidXRlIGlzCitub3Qgc2V0IG9uIGFuIEFEIExEUyBbM10KKysKK1sxXSBodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJhcnkvYWE3MDU4ODYoVlMuODUpLmFzcHggKworWzJdIGh0dHA6Ly9tc2RuLm1pY3Jvc29mdC5jb20vZW4tdXMvbGlicmFyeS9jYzIyMzM2NC5hc3B4ICsKK1szXSBodHRwOi8vdGVjaG5ldC5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJhcnkvY2M4MTY5Mjkodj13cy4xMCkuYXNweAorCisqIEFsbG93IGdyb3VwIGRlc2NyaXB0aW9ucyB0byBzdXBwbHkgZW1haWwgYW5kIFVSTAorKworU29tZSBiYWNrZW5kcyBoYXZlIGV4dGVybmFsIG1hbmFnZW1lbnQgaW50ZXJmYWNlcyB0aGF0IGFyZSBub3QKK2VtYmVkZGVkIGludG8gR2Vycml0IENvZGUgUmV2aWV3LiBBbGxvdyB0aG9zZSBiYWNrZW5kcyB0byBzdXBwbHkKK2EgVVJMIHRvIHRoZSB3ZWIgbWFuYWdlbWVudCBpbnRlcmZhY2UgZm9yIGEgZ3JvdXAsIHNvIGEgdXNlciBjYW4KK21hbmFnZSB0aGVpciBtZW1iZXJzaGlwLCB2aWV3IGN1cnJlbnQgbWVtYmVycywgb3IgZG8gd2hhdGV2ZXIgb3RoZXIKK2ZlYXR1cmVzIHRoZSBncm91cCBzeXN0ZW0gbWlnaHQgc3VwcG9ydC4KKysKK1NvbWUgYmFja2VuZHMgYWxzbyBoYXZlIGFuIGVtYWlsIGFkZHJlc3MgYXNzb2NpYXRlZCB3aXRoIGV2ZXJ5Citncm91cC4gU2VuZGluZyBlbWFpbCB0byB0aGF0IGFkZHJlc3Mgd2lsbCBkaXN0cmlidXRlIHRoZSBtZXNzYWdlIHRvCit0aGUgZ3JvdXAncyBtZW1iZXJzLiBQZXJtaXQgYmFja2VuZHMgdG8gc3VwcGx5IGFuIG9wdGlvbmFsIGVtYWlsCithZGRyZXNzLCBhbmQgdXNlIHRoaXMgaW4gdGhlIHByb2plY3QgbGV2ZWwgbm90aWZpY2F0aW9uIHN5c3RlbSBpZgorYSBncm91cCBpcyBzZWxlY3RlZCBhcyB0aGUgdGFyZ2V0IGZvciBhIG1lc3NhZ2UuCisKKyogQWxsb3cgZ3JvdXAgYmFja2VuZHMgdG8gZ3Vlc3Mgb24gcmVsZXZhbnQgVVVJRHMKKysKK0V4cG9zZSBhbGwgY2hlYXBseSBrbm93biBncm91cCBVVUlEcyBmcm9tIHRoZSBQcm9qZWN0Q2FjaGUsCitlbnVtZXJhdGluZyBncm91cHMgdXNlZCBieSBhY2Nlc3MgY29udHJvbHMuIFRoaXMgYWxsb3dzIGEgYmFja2VuZAordGhhdCBoYXMgYSBsYXJnZSBudW1iZXIgb2YgZ3JvdXBzIHRvIGZpbHRlciBpdHMgZ2V0S25vd25Hcm91cHMoKQorb3V0cHV0IHRvIG9ubHkgZ3JvdXBzIHRoYXQgbWF5IGJlIHJlbGV2YW50IGZvciB0aGlzIEdlcnJpdCBzZXJ2ZXIuCisrCitUaGUgYmVzdCB1c2UgY2FzZSB0byBjb25zaWRlciBpcyBhbiBMREFQIHNlcnZlciBhdCBhIGxhcmdlCitvcmdhbml6YXRpb24uIEEgdHlwaWNhbCB1c2VyIG1heSBiZWxvbmcgdG8gNTAgTERBUCBncm91cHMsIGJ1dCBvbmx5CiszIGFyZSByZWxldmFudCB0byB0aGlzIEdlcnJpdCBzZXJ2ZXIuIFRha2luZyB0aGUgaW50ZXJzZWN0aW9uIG9mCit0aGUgdHdvIGdyb3VwcyBsaW1pdHMgdGhlIG91dHB1dCBHZXJyaXQgZGlzcGxheXMgdG8gdXNlcnMsIG9yIHVzZXMKK3doZW4gY29uc2lkZXJpbmcgc2FtZSBncm91cCB2aXNpYmlsaXR5LgorCisqIEFkZCBtb3JlIGZvcmJpZGRlbiBjaGFyYWN0ZXJzIGZvciBwcm9qZWN0IG5hbWVzCisrCitgP2AsIGAlYCwgYCpgLCBgOmAsIGA8YCwgYD5gLCBgfGAsIGAkYCwgYFxyYCBhcmUgbm93IGZvcmJpZGRlbiBpbgorcHJvamVjdCBuYW1lcy4KKworKiBNYWtlIGBnZXJyaXQuc2hgIExTQiBjb21wbGlhbnQKKysKKyoqIEFkZCBMU0IgaGVhZGVycworKiogQWRkICdzdGF0dXMnIGFzIHN5bm9ueW0gZm9yICdjaGVjaycKKyoqIEZpeCBleGl0IHN0YXR1cyBjb2RlcyBhY2NvcmRpbmcgdG8gaHR0cDovL3JlZnNwZWNzLmxpbnV4LWZvdW5kYXRpb24ub3JnL0xTQl8zLjIuMC9MU0ItQ29yZS1nZW5lcmljL0xTQi1Db3JlLWdlbmVyaWMvaW5pc2NycHRhY3QuaHRtbAorCisqIE9wdGlvbiB0byBzdGFydCBoZWFkbGVzcyBHZXJyaXQgZGFlbW9uCisrCitBZGQgYC0taGVhZGxlc3NgIG9wdGlvbiB0byB0aGUgRGFlbW9uIHdoaWNoIHdpbGwgc3RhcnQgR2Vycml0IGRhZW1vbgord2l0aG91dCB0aGUgV2ViIFVJIGZyb250IGVuZCAoaGVhZGxlc3MgbW9kZSkuCisrCitUaGlzIG1heSBiZSB1c2VmdWwgZm9yIHJ1bm5pbmcgR2Vycml0IHNlcnZlciB3aXRoIGFuIGFsdGVybmF0aXZlIChyZXN0CitiYXNlZCkgVUkgb3Igd2hlbiBzdGFydGluZyBHZXJyaXQgc2VydmVyIGZvciB0aGUgcHVycG9zZSBvZiBhdXRvbWF0ZWQKK1JFU1QvU1NIIGJhc2VkIHRlc3RpbmcuCisrCitDdXJyZW50bHkgdGhpcyBvcHRpb24gaXMgb25seSBzdXBwb3J0ZWQgdmlhIHRoZSBgLS1oZWFkbGVzc2Agb3B0aW9uIG9mCit0aGUgZGFlbW9uIHByb2dyYW0uIFdlIHdvdWxkIG5lZWQgdG8gaW50cm9kdWNlIGEgY29uZmlnIG9wdGlvbiBpbiBvcmRlcgordG8gc3VwcG9ydCB0aGlzIGZlYXR1cmUgZm9yIGRlcGxveWVkIHdhciBtb2RlLgorCisqIFNob3cgcGF0aCB0byBnZXJyaXQud2FyIGluIGNvbW1hbmQgZm9yIHVwZ3JhZGUgc2NoZW1hCisKK1VwZ3JhZGVzCit+fn5+fn5+fgorKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTYxOVtJc3N1ZSAxNjE5XToKK0VtYmVkZGVkIEpldHR5IGlzIG5vdyA4LjEuNy52MjAxMjA5MTAuCisKKyogQVNNIGJ5dGVjb2RlIGxpYnJhcnkgaXMgbm93IDQuMC4KKyogSkdpdCBpcyBub3cgMi4zLjEuMjAxMzAyMjAxODM4LXIuNzgtZzhmY2RlNGIuCisqIGFzY2lpZG9jIDguNi4zIGlzIG5vdyByZXF1aXJlZCB0byBidWlsZCB0aGUgZG9jdW1lbnRhdGlvbi4KKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTExNTVbSXNzdWUgMTE1NV06CitwcmV0dGlmeSBpcyBub3cgcjIyNQorCisqIFRoZSB1c2VkIEdXVCB2ZXJzaW9uIGlzIG5vdyAyLjUuMAorKworRml4ZXMgc29tZSBpc3N1ZXMgd2l0aCBJRTkgYW5kIElFMTAuCisKK0J1ZyBGaXhlcworLS0tLS0tLS0tCisKK1dlYiBVSQorfn5+fn5+CisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNjYyW0lzc3VlIDE2NjJdOgorICBEb24ndCBzaG93IGVycm9yIG9uIEFDTCBtb2RpZmljYXRpb24gaWYgZW1wdHkgcGVybWlzc2lvbnMgYXJlIGFkZGVkCisrCitUaGlzIGVycm9yIG1lc3NhZ2Ugd2FzIGluY29ycmVjdGx5IGRpc3BsYXllZCBpZiBhIHBlcm1pc3Npb24gd2l0aG91dAorcnVsZXMgd2FzIGFkZGVkLCBhbHRob3VnaCB0aGUgc2F2ZSB3YXMgYWN0dWFsbHkgc3VjY2Vzc2Z1bC4KKworKiBEb24ndCBzaG93IGVycm9yIG9uIEFDTCBtb2RpZmljYXRpb24gaWYgYSBzZWN0aW9uIGlzIGFkZGVkIG1vcmUgdGhhbiBvbmNlCisrCitUaGlzIGVycm9yIG1lc3NhZ2Ugd2FzIGluY29ycmVjdGx5IGRpc3BsYXllZCBpZiBtdWx0aXBsZSBzZWN0aW9ucyBmb3IKK3RoZSBzYW1lIHJlZiB3ZXJlIGFkZGVkLCBhbHRob3VnaCB0aGUgc2F2ZSB3YXMgYWN0dWFsbHkgc3VjY2Vzc2Z1bC4KKworKiBMaW5rcyB0byBDR2l0IHdlcmUgYnJva2VuIHdoZW4gYHJlbW92ZS1zdWZmaXhgIHdhcyBlbmFibGVkLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD05MjZbSXNzdWUgOTI2XToKK0ludGVybmV0IEV4cGxvcmVyIHZlcnNpb25zIDkgYW5kIDEwIGFyZSBzdXBwb3J0ZWQuCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE2NjRbSXNzdWUgMTY2NF06CisgIFJldmVydGluZyBhIGNoYW5nZSBkaWQgbm90IHByZXNlcnZlIHRoZSBjaGFuZ2UncyB0b3BpYworCisqIEZpeDogVXNlciBjb3VsZCBnZXQgYXJvdW5kIHJlc3RyaWN0aW9ucyBieSByZXZlcnRpbmcgYSBjb21taXQKKysKK1RoZSBHZXJyaXQgc2VydmVyIG1heSBlbmZvcmNlIHNldmVyYWwgcmVzdHJpY3Rpb25zIG9uIHRoZSBjb21taXQKK21lc3NhZ2UgKGNoYW5nZS1pZCByZXF1aXJlZCwgc2lnbmVkLW9mZi1ieSwgZXRjKS4gQSB1c2VyIHdhcyBhYmxlIHRvCitnZXQgYXJvdW5kIHRoZXNlIHJlc3RyaWN0aW9ucyBieSByZXZlcnRpbmcgYSBjb21taXQgdXNpbmcgdGhlIFVJLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNTE4W0lzc3VlIDE1MThdOgorICBSZXNldCAnT2xkIFZlcnNpb24gSGlzdG9yeScgaWYgZGVwZW5kZW50IGNoYW5nZSBpcyBvcGVuZWQKKysKK0ZvbGxvd2luZyB0aGUgbmF2aWdhdGlvbiBsaW5rIGluIHRoZSBkZXBlbmRlbmNpZXMgdGFibGUgb24gdGhlCitjaGFuZ2Ugc2NyZWVuLCB0aGUgdXNlciBjYW4gZGlyZWN0bHkgbmF2aWdhdGUgdG8gZGVwZW5kZW50IGNoYW5nZXMuCitUaGUgdmFsdWUgZm9yICdPbGQgVmVyc2lvbiBIaXN0b3J5JyBvZiB0aGUgY3VycmVudCBjaGFuZ2Ugd2FzCitpbmNvcnJlY3RseSBhcHBsaWVkIHRvIHRoZSBuZXcgY2hhbmdlLiBJZiB0aGUgdmFsdWUgd2FzIGludmFsaWQgZm9yCit0aGUgbmV3IGNoYW5nZSB0aGUgJ09sZCBWZXJzaW9uIEhpc3RvcnknIGZpZWxkIGJlY2FtZSBibGFuay4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTczNltJc3N1ZSAxNzM2XToKKyAgQ2xlYXIgJ09sZCBWZXJzaW9uIEhpc3RvcnknIExpc3RCb3ggYmVmb3JlIHBvcHVsYXRpbmcgaXQKKysKK1RoZSBMaXN0Qm94IHdhcyBub3QgYWx3YXlzIGNsZWFyZWQgYW5kIGFzIHJlc3VsdCB0aGUgc2FtZSBlbnRyaWVzIHdlcmUKK3NvbWV0aW1lcyBhZGRlZCBtdWx0aXBsZSB0aW1lcyBlLmcuIGFmdGVyIHJlYmFzaW5nIGEgY2hhbmdlIGluIHRoZQorV2ViVUkuCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE2NzNbSXNzdWUgMTY3M106CisgIEZpeCBkaXNhcHBlYXJhbmNlIG9mIHBhdGNoIGhlYWRlcnMgd2hlbiBjb21wYXJlZCBwYXRjaGVzIGFyZSBpZGVudGljYWwKKysKK1doZW4gdHdvIHBhdGNoZXMgd2VyZSBjb21wYXJlZCB0aGF0IHdlcmUgaWRlbnRpY2FsICdObyBEaWZmZXJlbmNlcycgaXMKK2Rpc3BsYXllZCB0byB0aGUgdXNlci4gSW4gdGhpcyBjYXNlIHRoZSBwYXRjaCBoZWFkZXJzIGRpc2FwcGVhcmVkIGFuZAorYXMgcmVzdWx0IHRoZSB1c2VyIGNvdWxkbid0IGNoYW5nZSB0aGUgcGF0Y2ggc2VsZWN0aW9uIGFueW1vcmUuCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE3NTlbSXNzdWUgMTc1OV06CisgIEZpeCBBcnJheUluZGV4T3V0T2ZCb3VuZHNFeGNlcHRpb24gb24gaW50cmFsaW5lIGRpZmYKKysKK0luIHNvbWUgY2FzZXMgZGlzcGxheWluZyB0aGUgaW50cmFsaW5lIGRpZmYgZmFpbGVkIHdpdGggYW4gZXhjZXB0aW9uIGxpa2UKK3RoaXM6CisrCistLS0tCitqYXZhLmxhbmcuQXJyYXlJbmRleE91dE9mQm91bmRzRXhjZXB0aW9uOiBBcnJheSBpbmRleCBvdXQgb2YgcmFuZ2U6IDEwCisgIGF0IGNvbS5nb29nbGUuZ2Vycml0LnByZXR0aWZ5LmNvbW1vbi5TcGFyc2VGaWxlQ29udGVudC5tYXBJbmRleFRvTGluZShTcGFyc2VGaWxlQ29udGVudC5qYXZhOjE0OSkKKyAgYXQgY29tLmdvb2dsZS5nZXJyaXQucHJldHRpZnkuY29tbW9uLlByZXR0eUZvcm1hdHRlci5mb3JtYXQoUHJldHR5Rm9ybWF0dGVyLmphdmE6MTg4KQorICBhdCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucGF0Y2hlcy5BYnN0cmFjdFBhdGNoQ29udGVudFRhYmxlLmdldFNwYXJzZUh0bWxGaWxlQihBYnN0cmFjdFBhdGNoQ29udGVudFRhYmxlLmphdmE6Mjg3KQorICBhdCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucGF0Y2hlcy5TaWRlQnlTaWRlVGFibGUucmVuZGVyKFNpZGVCeVNpZGVUYWJsZS5qYXZhOjExMykKKyAgYXQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBhdGNoZXMuQWJzdHJhY3RQYXRjaENvbnRlbnRUYWJsZS5kaXNwbGF5KEFic3RyYWN0UGF0Y2hDb250ZW50VGFibGUuamF2YToyMzgpCisgIGF0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wYXRjaGVzLlBhdGNoU2NyZWVuLm9uUmVzdWx0KFBhdGNoU2NyZWVuLmphdmE6NDQ0KQorLi4uCistLS0tCisrCitUaGlzIGhhcHBlbmVkIHdoZW4gdGhlIG9sZCBsaW5lIHdhczoKKysKKy0tLS0KKyAgZm9vLW9sZDxMRj4KKy0tLS0KKysKK2FuZCB0aGUgbmV3IGxpbmUgd2FzOgorKworLS0tLQorICBmb28tbmV3PENSTEY+CistLS0tCisKKyogUHJldmVudCBsZWFkaW5nIGFuZCB0cmFpbGluZyBzcGFjZXMgb24gdXNlcidzIEZ1bGwgTmFtZQorKworU3RyaXAgb2ZmIHRoZSBsZWFkaW5nIGFuZCB0cmFpbGluZyBzcGFjZXMgZnJvbSB0aGUgRnVsbCBOYW1lIHRoYXQgdGhlCit1c2VyIGVudGVycyBvbiB0aGUgQ29udGFjdCBJbmZvcm1hdGlvbiBmb3JtLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNDgwW0lzc3VlIDE0ODBdOgorICBTaG93IHByb3BlciBlcnJvciBtZXNzYWdlIGlmIHJlZ2lzdGVyaW5nIGVtYWlsIGFkZHJlc3MgZmFpbHMKKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9ODE2W0lzc3VlIDgxNl06CisgIER1ZSB0byBpc3N1ZXMgd2l0aCB0aGUgZGlmZl9pbnRyYWxpbmUgY2FjaGUgdGhlIGZpbGUgaW5kZW50aW9uIGluIHRoZQorICBTaWRlLUJ5LVNpZGUgZGlmZiB3YXMgc29tZXRpbWVzIHdyb25nLgorCisqIE1ha2UgcmViYXNlIGZhaWxlZCBhbmQgbWVyZ2UgZmFpbGVkIG1lc3NhZ2VzIGNvbnNpc3RlbnQKKworKiBTZWxlY3QgJ1Byb2plY3RzJyBtZW51IG9uIGxvYWRpbmcgb2YgYSBwcm9qZWN0IHNjcmVlbgorKworSWYgaW4gdGhlIHRvcCBsZXZlbCBtZW51ICdBbGwnIGlzIHNlbGVjdGVkIGFuZCB0aGUgdXNlciBuYXZpZ2F0ZXMgdG8KK2EgY2hhbmdlIGFuZCB0aGVuIGZyb20gdGhlIGNoYW5nZSB0byB0aGUgcHJvamVjdCBieSBjbGlja2luZyBvbiB0aGUKK3Byb2plY3QgbGluayBpbiB0aGUgQ2hhbmdlSW5mb0Jsb2NrLCB0aGUgcHJvamVjdCBzY3JlZW4gaXMgbG9hZGVkIGJ1dAordGhlICdQcm9qZWN0cycgbWVudSB3YXMgbm90IHNlbGVjdGVkLgorCisqIEZpeCBkaXNwbGF5IGlzc3VlcyBmb3IgaW5saW5lIGNvbW1lbnRzIGFuZCBpbmxpbmUgY29tbWVudCBlZGl0b3JzCisrCisqKiBTb21ldGltZXMgYSBzZWNvbmQgY29tbWVudCBlZGl0b3Igd2FzIHNob3duIGluc3RlYWQgb2YgdXNpbmcgdGhlCisgICBleGlzdGluZyBjb21tZW50IGVkaXRvci4KKyoqIEZpeCBkb3VibGljYXRlZCBib3JkZXIgbGluZSBiZXR3ZWVuIGNvbW1lbnRzLgorKiogU29tZXRpbWVzIHRoZSBwYXJ0cyBvZiB0aGUgYm9yZGVyIHdlcmUgbWlzc2luZyB3aGVuIGEgY29tbWVudCB3YXMKKyAgIGV4cGFuZGVkLgorKiogRml4IGRpc3BsYXlpbmcgdGhlIGJsdWUgbGluZSB0aGF0IG1hcmtzIHRoZSBjdXJyZW50IGxpbmUgd2hlbiB0aGVyZQorICAgYXJlIHNldmVyYWwgcHVibGlzaGVkIGNvbW1lbnRzLgorKiogU29tZXRpbWVzIG9uIGRpc2NhcmQgb2YgYSBjb21tZW50IHNvbWUgZnJhbWVzIG9mIHRoZSBjb21tZW50IGVkaXRvcgorICAgc3RheWVkIGFuZCBzb21lIGJvcmRlciBsaW5lcyBvZiBuZWlnaGJvdXIgY29tbWVudHMgZGlzYXBwZWFyZWQuCisKKyogSW4gZGlmZiB2aWV3IGRvbid0IGxldCBhcnJvdyBjb2x1bW4gYWNjZXB0IGNsaWNrcy4KKworKiBGaXggZGlzcGxheSBvZiBjb21taXQgbWVzc2FnZQorKworSWYgdGhlcmUgYXJlIG5vIEhUTUwgdGFncyBpbiB0aGUgdGV4dCwganVzdCBicmVhayBvbiBsaW5lcy4KKworKiBVcG9uIHNlbGVjdGlvbiBpbiBBZGRNZW1iZXJCb3gsIGZvY3VzIHRoZSBib3gncyB0ZXh0IGZpZWxkCisrCitJbiB0aGUgY2hhbmdlIHNjcmVlbiwgYWZ0ZXIgY2xpY2tpbmcgb24gYW4gZWxlbWVudCBvZiB0aGUgJ0FkZAorUmV2aWV3ZXInIHN1Z2dlc3Rpb24gbGlzdCwgdXNlcnMgZXhwZWN0IHRvIGJlIGFibGUgdG8gYWRkIHRoZSByZXZpZXdlcgorYnkgaGl0dGluZyBlbnRlci4gVGhpcyBkaWQgbm90IHdvcmsgaW4gRmlyZWZveC4KKworKiBGaXggZW50ZXIga2V5IGRldGVjdGlvbiBpbiBwcm9qZWN0IGNyZWF0aW9uIHNjcmVlbgorKworVGhlIGVudGVyIGtleSBkZXRlY3Rpb24gd2FzIG5vdCB3b3JraW5nIGluIGFsbCBicm93c2VycyAoZS5nLiBGaXJlZm94KS4KKworKiBEaXNwbGF5IGEgdG9vbHRpcCBmb3IgYWxsIHRpbnkgaWNvbnMgYW5kIGVuc3VyZSB0aGF0IHRoZSBjdXJzb3IgaXMKKyAgc2hvd24gYXMgcG9pbnRlciB3aGVuIGhvdmVyaW5nIG92ZXIgdGhlbS4KKworKiBDbGVhbiBxdWVyeSBzdHJpbmcgd2hlbiBzd2l0Y2hpbmcgcGFnZXMKKysKK0lmIHdlIGxvYWQgYSBwYWdlIHdpdGhvdXQgYSBxdWVyeSBzdHJpbmcsIHN1Y2ggYXMgUHJvamVjdHMtPkxpc3QsCitNeS0+Q2hhbmdlcywgb3IgU2V0dGluZ3MsIGl0IG1pZ2h0IGJlIGNvbmZ1c2luZyB0byBzaG93IHRoZSBvbGQgcXVlcnkKK3N0cmluZyBmcm9tIHRoZSBwcmV2aW91cyBwYWdlLiBUaGUgcXVlcnkgc3RyaW5nIGlzIG5vdyBjbGVhcmVkIG91dAord2hlbiBzd2l0Y2hpbmcgcGFnZXMsIGxlYXZpbmcgdGhlIGhlbHAgdGV4dCB2aXNpYmxlLgorCisqIEZpeCBoaWdobGlnaHRpbmcgaW4gc2VhcmNoIHN1Z2dlc3Rpb25zCisrCitUaGUgcHJvdmlkZWQgc3VnZ2VzdGlvbnMgc2hvdWxkIGhpZ2hsaWdodCB0aGUgcGFydCB0aGF0IHRoZSB1c2VyIGhhcworYWxyZWFkeSB0eXBlZCBhcyBib2xkIHRleHQuIFRoaXMgb25seSB3b3JrZWQgZm9yIHRoZSBmaXJzdCBvcGVyYXRvci4KK0ZvciBzdWdnZXN0aW9ucyBvZiBhbnkgZnVydGhlciBvcGVyYXRvciBubyBoaWdodGxpZ2h0aW5nIHdhcyBkb25lLgorCisqIEZpeCBzdHlsZSBvZiBoaW50IHRleHQgaW4gc2VhcmNoIGJveCBvbiBpbml0aWFsIHBhZ2UgbG9hZAorKworVGhlIGhpbnQgdGV4dCBzaG91bGQgYmUgYSBsaWdodCBncmF5IG9uIHRoZSB3aGl0ZSBiYWNrZ3JvdW5kLAorYnV0IHdhcyBjb21pbmcgdXAgYmxhY2sgb24gaW5pdGlhbCBwYWdlIGxvYWQgZHVlIHRvIGEgc3R5bGUgc2V0dXAKK29yZGVyaW5nIGlzc3VlIGJldHdlZW4gdGhlIFNlYXJjaFBhbmVsIGFuZCB0aGUgSGludFRleHRCb3guCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE2NjFbSXNzdWUgMTY2MV06CisgIFVwZGF0ZSBsaW5rcyB0byBDaGFuZ2UtSWQgYW5kIFNpZ25lZC1vZmYtYnkgZG9jdSBvbiBwcm9qZWN0IGluZm8KKyAgc2NyZWVuCisKKyogVXNlIGhyZWY9ImphdmFzY3JpcHQ7IiBmb3IgQWxsIHtTaWRlLWJ5LVNpZGUsVW5pZmllZH0gbGlua3MKKysKK1RoZXNlIGxpbmtzIHNob3VsZG4ndCBoYXZlIGFuIGFuY2hvciBsb2NhdGlvbi4gVGhlcmUgaXMgbm90aGluZyBmb3IKK3RoZSBicm93c2VyIHRvIHJlbWVtYmVyIG9yIHZpc2l0IGlmIGl0IHdlcmUgb3BlbmVkIGluIGEgbmV3IHRhYiBmb3IKK2V4YW1wbGUuCisKKyogSW1wcm92ZSBtZXNzYWdlIGZvciB1bnNhdGlzZmlhYmxlIGRlcGVuZGVuY2llcworKworSWYgYSBjaGFuZ2UgY2Fubm90IGJlIG1lcmdlZCBkdWUgdG8gdW5zYXRpc2ZpYWJsZSBkZXBlbmRlbmNpZXMgYQorY29tbWVudCBpcyBhZGRlZCB0byB0aGUgY2hhbmdlIHRoYXQgbGlzdHMgdGhlIG1pc3NpbmcgY29tbWl0cyBhbmQgc2F5cwordGhhdCBhIHJlYmFzZSBpcyBuZWNlc3NhcnkuCisrCitGb3IgZWFjaCBtaXNzaW5nIGNvbW1pdCB0aGUgY29tbWVudCBzYWlkICJEZXBlbmRzIG9uIHBhdGNoIHNldCBYCitvZiAuLi4sIGhvd2V2ZXIgdGhlIGN1cnJlbnQgcGF0Y2ggc2V0IGlzIFkuIgorKworSWYgbXVsdGlwbGUgY29tbWl0cyBhcmUgbWlzc2luZyBpdCBtYXkgYmUgdGhhdCBmb3Igc29tZSBjb21taXRzIHRoZQorZGVwZW5kZW5jeSBpcyBub3Qgb3V0ZGF0ZWQgKFggPT0gWSkuIEluIHRoaXMgY2FzZSB0aGUgbWVzc2FnZSB3YXMKK2NvbmZ1c2luZy4KKysKKyIsIGhvd2V2ZXIgdGhlIGN1cnJlbnQgcGF0Y2ggc2V0IGlzIFkuIiBpcyBub3cgc2tpcHBlZCBpZiBZID09IFguCisKK1JFU1QgQVBJCit+fn5+fn5+fgorKiBGaXggcmV0dXJuaW5nIG9mICdFbWFpbCBSZXZpZXdlcnMnIGNhcGFiaWxpdHkgdmlhIFJFU1QKKysKK1RoZSBgL2FjY291bnRzL3NlbGYvY2FwYWJpbGl0aWVzL2AgZGlkbid0IHJldHVybiB0aGUgJ0VtYWlsIFJldmlld2VycycKK2NhcGFiaWxpdHkgd2hlbiBpdCB3YXMgbm90IGV4cGxpY2l0bHkgYXNzaWduZWQsIGFsdGhvdWdoIGJ5IGRlZmF1bHQKK2V2ZXJ5b25lIGhhcyB0aGUgJ0VtYWlsIFJldmlld2VycycgY2FwYWJpbGl0eS4KKysKK0lmICdFbWFpbCBSZXZpZXdlcnMnIGNhcGFiaWxpdHkgd2FzIGFsbG93ZWQgb3IgZGVuaWVkLAorYC9hY2NvdW50cy9zZWxmL2NhcGFiaWxpdGllcy9gIHJldHVybmVkIHRoZSAnRW1haWwgUmV2aWV3ZXJzJworY2FwYWJpbGl0eSBhbHdheXMgYXMgdHJ1ZSwgd2hpY2ggd2FzIHdyb25nIGZvciB0aGUgREVOWSBjYXNlLgorCisqIFByb3ZpZGUgYSBtb3JlIGRlc2NyaXB0aXZlIGVycm9yIG1lc3NhZ2UgZm9yIHVuYXV0aGVudGljYXRlZCBSRVNUCisgIEFQSSBhY2Nlc3MKKworR2l0Cit+fn4KKyogVGhlIHdpbGRjYXJkIGAuYCBpcyBub3cgcGVybWl0dGVkIGluIHJlZmVyZW5jZSByZWdleCBydWxlcy4KKworKiBDaGVja2luZyBpZiBhIGNoYW5nZSBpcyBtZXJnZWFibGUgbm8gbG9uZ2VyIHdyaXRlcyB0byB0aGUgcmVwb3NpdG9yeS4KKworKiBTdWJtaXR0ZWQgYnV0IHVubWVyZ2VkIGNoYW5nZXMgYXJlIHBlcmlvZGljYWxseSByZXRyaWVkLiBUaGlzIGlzCisgIG5lY2Vzc2FyeSBmb3IgYSBtdWx0aS1tYXN0ZXIgY29uZmlndXJhdGlvbiB3aGVyZSB0aGUgc2Vjb25kIG1hc3RlcgorICBtYXkgbmVlZCB0byByZXRyeSBhIGNoYW5nZSBub3QgeWV0IG1lcmdlZCBieSB0aGUgZmlyc3QuIFBsZWFzZSBub3RlCisgIHdlIHN0aWxsIGRvIG5vdCBiZWxpZXZlIHRoaXMgaXMgc3VmZmljaWVudCB0byBlbmFibGUgbXVsdGktbWFzdGVyLgorCisqIFJldHJ5IG1lcmdlIGFmdGVyIExPQ0tfRkFJTFVSRSB3aGVuIHVwZGF0aW5nIGJyYW5jaAorKworSWYgdGhlIHByb2plY3QgcmVxdWlyZXMgZmFzdC1mb3J3YXJkcywgdGhlIG1lcmdlIGNhbm5vdCBzdWNjZWVkIG9uY2UKK2EgbG9jayBmYWlsdXJlIG9jY3VycywgYnV0IGluIG90aGVyIGNhc2VzLCBpdCBpcyBzYWZlIHRvIHJldHJ5IHRoZQorbWVyZ2UgaW1tZWRpYXRlbHkuCisKKyogRG8gbm90IGF1dG9tYXRpY2FsbHkgYWRkIHJldmlld2VycyBmcm9tIGZvb3RlciBsaW5lcyB0byBkcmFmdCBwYXRjaCBzZXRzCisrCitHZXJyaXQgYWxyZWFkeSBhdm9pZHMgYWRkaW5nIHJldmlld2VycyBmcm9tIGZvb3RlciBsaW5lcyB3aGVuIGEgbmV3CitkcmFmdCBjaGFuZ2UgaXMgY3JlYXRlZC4gTm93IHRoZSBzYW1lIGlzIGRvbmUgZm9yIGRyYWZ0IHBhdGNoIHNldHMuCisKKyogQWRkIHVzZXJzIG1lbnRpb25lZCBpbiBjb21taXQgZm9vdGVyIGFzIHJldmlld2VycyBvbiBkcmFmdCBwdWJsaXNoCisKKyogSGlkZSBhbnkgZXhpc3RpbmcgbWFnaWMgYnJhbmNoZXMgZHVyaW5nIHB1c2gKKysKK0lmIHRoZXJlIGlzIGEgbWFnaWMgYnJhbmNoIHZpc2libGUgZHVyaW5nIHB1c2gsIGp1c3QgaGlkZSBpdCBmcm9tIHRoZQorY2xpZW50LiBBZG1pbmlzdHJhdG9ycyBjYW4gY2xlYXIgdGhlc2UgYnkgYWNjZXNzaW5nIHRoZSByZXBvc2l0b3J5CitkaXJlY3RseS4KKworKiBQcmV2ZW50IGZyb20gZGVsZXRpbmcgYHJlZnMvY2hhbmdlcy9gCisrCitFdmVyeXRoaW5nIHVuZGVyIGByZWZzL2NoYW5nZXMvYCBzaG91bGQgYmUgcHJvdGVjdGVkIGJ5IEdlcnJpdCwgdXNlcnMKK3Nob3VsZG4ndCBiZSBhYmxlIHRvIGRlbGV0ZSBhIHBhcnRpY3VsYXIgcGF0Y2ggc2V0IG9yIGEgd2hvbGUgY2hhbmdlCitmcm9tIHRoZSByZXZpZXcgcHJvY2Vzcy4KKworKiBVcGRhdGUgZGVzY3JpcHRpb24gZmlsZSBpbiBHaXQKKysKK1doZW4gd3JpdGluZyB0aGUgZGVzY3JpcHRpb24gdG8gYHByb2plY3QuY29uZmlnYCwgaXQgaXMgYWxzbyBuZWNlc3NhcnkKK3RvIHdyaXRlIGl0IHRvIHRoZSBkZXNjcmlwdGlvbiBmaWxlIGluIHRoZSByZXBvc2l0b3J5IHNvIHRoZSBzYW1lIHRleHQKK2lzIHZpc2libGUgaW4gQ0dpdCBvciBHaXRXZWIuCisKKyogV3JpdGUgdmFsaWQgcmVmbG9nIGZvciBgSEVBRGAgd2hlbiBjcmVhdGluZyB0aGUgYEFsbC1Qcm9qZWN0c2AKKyAgcHJvamVjdAorKworV2hlbiB0aGUgYEFsbC1Qcm9qZWN0c2AgcHJvamVjdCBpcyBjcmVhdGVkIGR1cmluZyB0aGUgc2NoZW1hCitpbml0aWFsaXphdGlvbiwgYEhFQURgIGlzIHNldCB0byBwb2ludCB0byB0aGUgYHJlZnMvbWV0YS9jb25maWdgCiticmFuY2guIFdoZW4gYEhFQURgIGlzIHVwZGF0ZWQgYW4gZW50cnkgaW50byB0aGUgcmVmbG9nIGlzIHdyaXR0ZW4uCitUaGlzIHJlZiBsb2cgZW50cnkgc2hvdWxkIGNvbnRhaW4gdGhlIElEIG9mIHRoZSBpbml0aWFsIGNvbW1pdCBhcwordGFyZ2V0LCBidXQgaW5zdGVhZCB0aGUgdGFyZ2V0IHdhcyB0aGUgemVybyBJRC4KKworKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTcwMltJc3N1ZSAxNzAyXToKKyAgRml4OiAnaW50ZXJuYWwgc2VydmVyIGVycm9yJyB3aGVuIHB1c2hpbmcgdGhlIHNhbWUgY29tbWl0IHR3aWNlCisrCitPbiB0aGUgc2Vjb25kIHB1c2ggb2YgdGhlIHNhbWUgY29tbWl0IHRvIGByZWZzL2Zvci88YnJhbmNoIG5hbWU+YCwgR2Vycml0CityZXR1cm5zICdubyBuZXcgY2hhbmdlcycuCisrCitIb3dldmVyIGlmIHRoZSB1c2VyIHB1c2hlZCB0byAncmVmcy9jaGFuZ2VzLzxjaGFuZ2UgaWQ+JywgR2Vycml0IHJldHVybmVkCisnaW50ZXJuYWwgc2VydmVyIGVycm9yJy4KKworKiBNYXRjaCBhbGwgZ2l0IGZldGNoL2Nsb25lL3B1c2ggY29tbWFuZHMgdG8gdGhlIGNvbW1hbmQgZXhlY3V0b3IKKysKK1JvdXRlIG5vdCBqdXN0IGAvcC9gIGJ1dCBhbnkgR2l0IGFjY2VzcyB0byB0aGUgc2FtZSB0aHJlYWQgcG9vbCBhcyB0aGUKK1NTSCBzZXJ2ZXIgaXMgdXNpbmcsIGFsbG93aW5nIGFsbCByZXF1ZXN0cyB0byBjb21wZXRlIGZhaXJseSBmb3IKK3Jlc291cmNlcy4KKworKiBGaXggYXV0byBjbG9zaW5nIG9mIGNoYW5nZXMgb24gZGlyZWN0IHB1c2gKKysKK1doZW4gYSBjb21taXQgd2FzIGRpcmVjdGx5IHB1c2hlZCBpbnRvIGEgcmVwb3NpdG9yeSAoYnlwYXNzaW5nIGNvZGUKK3JldmlldykgYW5kIHRoaXMgY29tbWl0IGhhZCBhIENoYW5nZS1JZCBpbiBpdHMgY29tbWl0IG1lc3NhZ2UgdGhlbiB0aGUKK2NvcnJlc3BvbmRpbmcgY2hhbmdlIHdhcyBub3QgYXV0b21hdGljYWxseSBjbG9zZWQgaWYgaXQgd2FzIG9wZW4uCisKKyogU2V0IGNoYW5nZSBzdGF0ZSB0byBORVcgaWYgbWVyZ2UgZmFpbHMgZHVlIHRvIG5vbi1leGlzdGluZyBkZXN0IGJyYW5jaAorKworSWYgYSBzdWJtaXR0ZWQgY2hhbmdlIGZhaWxlZCB0byBtZXJnZSBiZWNhdXNlIHRoZSBkZXN0aW5hdGlvbiBicmFuY2gKK2RpZG4ndCBleGlzdCBhbnltb3JlLCBpdCBzdGF5ZWQgaW4gc3RhdGUgJ1N1Ym1pdHRlZCwgTWVyZ2UgUGVuZGluZycuCitUaGlzIG1lYW50IEdlcnJpdCB3YXMgcmUtYXR0ZW1wdGluZyB0byBtZXJnZSB0aGlzIGNoYW5nZSAoZS5nLiBvbgorc3RhcnR1cCksIGJ1dCB0aGlzIGRpZG4ndCBtYWtlIHNlbnNlLiBFaXRoZXIgdGhlIGJyYW5jaCBkaWQgc3RpbGwgbm90CitleGlzdCAodGhlbiB0aGVyZSB3YXMgbm8gbmVlZCB0byB0cnkgbWVyZ2luZyBpdCkgb3IgYSBuZXcgYnJhbmNoIHdpdGgKK3RoZSBvbGQgbmFtZSB3YXMgY3JlYXRlZCAodGhlbiBpdCB3YXMgcXVlc3Rpb25hYmxlIGlmIHRoZSBjaGFuZ2Ugc2hvdWxkCitzdGlsbCBiZSBtZXJnZWQgaW50byB0aGlzIGJyYW5jaCkuIFRoaXMgaXMgd2h5IGl0J3MgYmV0dGVyIHRvIHNldCB0aGUKK2NoYW5nZSBiYWNrIHRvIHRoZSAnUmV2aWV3IGluIFByb2dyZXNzJyBzdGF0ZSBhbmQgdXBkYXRlIGl0IHdpdGggYQorbWVzc2FnZSBzYXlpbmcgdGhhdCBpdCBjb3VsZG4ndCBiZSBtZXJnZWQgYmVjYXVzZSB0aGUgZGVzdGluYXRpb24KK2JyYW5jaCBkb2Vzbid0IGV4aXN0IGFueW1vcmUuCisrCitJbiBhZGRpdGlvbiBHZXJyaXQgd2FzIHdyaXRpbmcgYW4gZXJyb3IgaW50byB0aGUgZXJyb3IgbG9nIGlmIGEgY2hhbmdlCitjb3VsZG4ndCBiZSBtZXJnZWQgYmVjYXVzZSB0aGUgZGVzdGluYXRpb24gYnJhbmNoIHdhc3MgbWlzc2luZy4KK1RoYXQgd2FzIG5vdCByZWFsbHkgYSBzZXJ2ZXIgZXJyb3IgYW5kIGlzIG5vdCBsb2dnZWQgYW55bW9yZS4KKworKiBGaXggTlBFIHdoZW4gcHVzaGluZyBhIHBhdGNoIHdpdGggYW4gaW52YWxpZCBhdXRob3Igd2l0aAorICBgRm9yZ2UgQXV0aG9yYCBwZXJtaXNzaW9ucworCisqIEZpeCBkdXBsaWNhdGVkIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZXZlbnQgb24gcHJvamVjdCBjcmVhdGlvbi4KKysKK0NyZWF0aW5nIGEgbmV3IEdlcnJpdCBwcm9qZWN0IHdhcyBmaXJpbmcgdGhlIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZXZlbnQKK2ZvciB0aGUgYHJlZnMvbWV0YS9jb25maWdgIGJyYW5jaCB0d28gdGltZXMuCisKKyogRml4IGVycm9yIGxvZyBtZXNzYWdlIGluIFJlY2VpdmVDb21taXRzCisrCitXaGVuIHRoZSBjcmVhdGlvbiBvZiBvbmUgb3IgbW9yZSByZWZlcmVuY2VzIGZhaWxlZCBSZWNlaXZlQ29tbWl0cyBmYWlsZWQKK3dpdGggJ2ludGVybmFsIHNlcnZlciBlcnJvcicgYW5kIHdyb3RlIHRoZSBmb2xsb3dpbmcgZXJyb3IgbG9nOgorIk9ubHkgWCBvZiBZIG5ldyBjaGFuZ2UgcmVmcyBjcmVhdGVkIGluIHh4eDsgYWJvcnRpbmciCitUaGUgcHJpbnRlZCB2YWx1ZSBmb3IgWSBjb3VsZCBiZSB3cm9uZyBzaW5jZSBpdCBkaWRuJ3QgaW5jbHVkZSB0aGUKK3JlcGxhY2VDb3VudC4gQXMgYSByZXN1bHQsIGEgY29uZnVzaW5nIG1lc3NhZ2UgbGlrZQorIk9ubHkgMCBvZiAwIG5ldyBjaGFuZ2UgcmVmcyBjcmVhdGVkIGluIHh4eDsgYWJvcnRpbmciCitjb3VsZCBhcHBlYXIgaW4gdGhlIGVycm9yIGxvZy4KKworU1NICit+fn4KKyogYHJldmlldyAtLXJlc3RvcmVgIGFsbG93cyBhIHJldmlldyBzY29yZSB0byBiZSBhZGRlZCBvbiB0aGUgcmVzdG9yZWQgY2hhbmdlLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNzIxW0lzc3VlIDE3MjFdOgorICBgcmV2aWV3IC0tbWVzc2FnZWAgb25seSBhZGRzIHRoZSBtZXNzYWdlIG9uY2UuCisKKyogYGxzLWdyb3Vwc2AgcHJpbnRzICJOL0EiIGlmIHRoZSBncm91cCdzIG5hbWUgaXMgbm90IHNldC4KKworKiBgc2V0LXByb2plY3QtcGFyZW50IC0tY2hpbGRyZW4tb2ZgOiBGaXggZ2V0dGluZyBwYXJlbnQgZm9yIGxldmVsIDEgcHJvamVjdHMKKysKK0ZvciBkaXJlY3QgY2hpbGQgcHJvamVjdHMgb2YgdGhlIGBBbGwtUHJvamVjdHNgIHByb2plY3QgdGhlIG5hbWUgb2YgdGhlCitwYXJlbnQgcHJvamVjdCB3YXMgaW5jb3JyZWN0bHkgcmV0cmlldmVkIGlmIHRoZSBwYXJlbnQgbmFtZSB3YXMgbm90CitleHBsaWNpdGx5IHN0b3JlZCBhcyBgQWxsLVByb2plY3RzYCBpbiB0aGUgcHJvamVjdC5jb25maWcgZmlsZS4KKworKiBGaXggTlBFIHdoZW4gYWJhbmRvbmluZyBjaGFuZ2Ugd2l0aCBpbnZhbGlkIGF1dGhvcgorKworSWYgdGhlIGF1dGhvciBvZiBhIGNoYW5nZSBpc24ndCBrbm93biB0byBHZXJyaXQgKHB1c2hlZCB3aXRoCitgRm9yZ2UgQXV0aG9yYCBwZXJtaXNzaW9ucyksIHRyeWluZyB0byBhYmFuZG9uIHRoYXQgY2hhbmdlIG92ZXIgU1NICitmYWlsZWQgd2l0aCBhbiBOUEUuCisKK1F1ZXJ5Cit+fn5+fgorKiBsaW5rOmh0dHBzOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTcyOVtJc3N1ZSAxNzI5XToKKyAgRml4IHF1ZXJ5IGJ5ICdsYWJlbDpWZXJpZmllZD0wJworCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNzcyW0lzc3VlIDE3NzJdOgorICBTZXQgYF9tb3JlX2NoYW5nZXNgIGlmIHJlc3VsdCBpcyBsaW1pdGVkIGR1ZSB0byBjb25maWd1cmVkIHF1ZXJ5IGxpbWl0CisKKyogRml4IHF1ZXJ5IGNvc3QgZm9yICJzdGF0dXM6bWVyZ2VkIGNvbW1pdDpjMGZmZWUiCisKK1BsdWdpbnMKK35+fn5+fn4KKyogU2tpcCBkaXNhYmxlZCBwbHVnaW5zIG9uIHJlc2NhbgorKworSW4gYSBiYWNrZ3JvdW5kIHRocmVhZCBHZXJyaXQgcGVyaW9kaWNhbGx5IHNjYW5zIGZvciBuZXcgb3IgY2hhbmdlZAorcGx1Z2lucy4gT24gZXZlcnkgc3VjaCBhIHJlc2NhbiBkaXNhYmxlZCBwbHVnaW5zIHdlcmUgbG9hZGVkIGFuZCBhIG5ldworY29weSBvZiB0aGVpciBqYXIgZmlsZXMgd2FzIHN0b3JlZCBpbiB0aGUgcmV2aWV3IHNpdGUncyB0bXAgZm9sZGVyLgorCisqIEZpeCBjbGVhbnVwIG9mIHBsdWdpbnMgZnJvbSB0bXAgZm9sZGVyIG9uIGdyYWNlZnVsIEdlcnJpdCBzaHV0ZG93bgorKworTG9hZGVkIHBsdWdpbiBqYXJzIGFyZSBjb3BpZWQgdG8gdGhlIHJldmlldyBzaXRlJ3MgdG1wIGZvbGRlciB0byBzdXBwb3J0Citob3QgdXBkYXRlcyBvZiB0aGUgcGx1Z2luIGphcnMgaW4gdGhlIHBsdWdpbnMgZm9sZGVyLiBPbiBHZXJyaXQgc2h1dGRvd24KK3RoZXNlIGNvcGllcyBvZiB0aGUgamFyIGZpbGVzIHNob3VsZCBiZSBjbGVhbmVkIHVwLiBGb3IgdGhpcyBwdXJwb3NlIGEKK0NsZWFudXBIYW5kbGUgaXMgY3JlYXRlZCwgYnV0IHRoZSBDbGVhbnVwSGFuZGxlIHdhc24ndCBlbnF1ZXVlZCBpbiB0aGUKK2NsZWFudXBRdWV1ZSB3aGljaCBpcyB3aHkgY2xlYW51cCBvbiBHZXJyaXQgc2h1dGRvd24gZGlkbid0IGhhcHBlbi4KKworKiBSZWF0dGVtcHQgZGVsZXRpb24gb2YgcGx1Z2luIGphcnMgZnJvbSB0bXAgZm9sZGVyIG9uIEpWTSB0ZXJtaW5hdGlvbgorKworTG9hZGVkIHBsdWdpbiBqYXJzIGFyZSBjb3BpZWQgdG8gdGhlIHJldmlldyBzaXRlJ3MgdG1wIGZvbGRlciB0byBzdXBwb3J0Citob3QgdXBkYXRlcyBvZiB0aGUgcGx1Z2luIGphcnMgaW4gdGhlIHBsdWdpbnMgZm9sZGVyLiBPbiBHZXJyaXQgc2h1dGRvd24KK3RoZXNlIGNvcGllcyBvZiB0aGUgamFyIGZpbGVzIHNob3VsZCBiZSBjbGVhbmVkIHVwLiBGb3IgdGhpcyBwdXJwb3NlIGEKK0NsZWFudXBIYW5kbGUgaXMgY3JlYXRlZC4gVGhlIGRlbGV0aW9uIG9mIHRoZSB0bXAgZmlsZSBpbiB0aGUKK0NsZWFudXBIYW5kbGUgY2FuIGZhaWwgYWx0aG91Z2ggdGhlIGphciBmaWxlIHdhcyBjbG9zZWQuIEluIHRoaXMgY2FzZQorcmVhdHRlbXB0IHRoZSBkZWxldGlvbiBvbiB0ZXJtaW5hdGlvbiBvZiB0aGUgdmlydHVhbCBtYWNoaW5lLiBUaGlzCitub3JtYWxseSBzdWNjZWVkcy4KKworKiBGaXggdW5sb2FkaW5nIG9mIHBsdWdpbnMKKysKK1doZW4gdHdvIHBsdWdpbnMsIHNheSBwbHVnaW5BLCBhbmQgcGx1Z2luQiBoYWQgYmVlbiBsb2FkZWQsIGFuZCBwbHVnaW5BCit3YXMgcmVtb3ZlZCBmcm9tICRzaXRlUGF0aC9wbHVnaW5zLCBwbHVnaW5BIGdvdCBzdG9wcGVkLCBhbmQgYSBjbGVhbmluZworcnVuIHdhcyBvcmRlcmVkLiBCdXQgdGhpcyBjbGVhbmluZyBydW4gY2xlYW5lZCBib3RoIHBsdWdpbnMgYW5kIGJvdGgKK3BsdWdpbnMgaGFkIHRoZWlyIGphcnMgcmVtb3ZlZC4gVGhpcyBsZWZ0IHBsdWdpbkIgdmlzaWJsZSB0byBHZXJyaXQKK2FsdGhvdWdoIGl0J3MgYmFja2luZyBqYXIgd2FzIGdvbmUuIFVwb24gY2FsbGluZyBub3QgeWV0IGluaXRpYWxpemVkCitwYXJ0cyBvZiBwbHVnaW5CIChlLmcuOiB2aWV3aW5nIG5vdCB5ZXQgdmlld2VkIERvY3VtZW50YXRpb24gcGFnZXMgb2YKK3BsdWdpbkIpLCBleGNlcHRpb25zIGFzIGZvbGxvd2luZyB3ZXJlIHRocm93bjoKKysKKy0tLS0KKyAgamF2YS5sYW5nLklsbGVnYWxTdGF0ZUV4Y2VwdGlvbjogemlwIGZpbGUgY2xvc2VkCisgICAgICAgICAgYXQgamF2YS51dGlsLnppcC5aaXBGaWxlLmVuc3VyZU9wZW4oWmlwRmlsZS5qYXZhOjQyMCkKKyAgICAgICAgICBhdCBqYXZhLnV0aWwuemlwLlppcEZpbGUuZ2V0RW50cnkoWmlwRmlsZS5qYXZhOjE2NSkKKy0tLS0KKworKiBGaXggZG91YmxlIGJvdW5kIGV4Y2VwdGlvbiB3aGVuIGxvYWRpbmcgZXh0ZW5zaW9ucworKworU2VydmVySW5mb3JtYXRpb24gY2xhc3Mgd2FzIGFscmVhZHkgYm91bmQsIHRoZXJlZm9yZSBpdCBzaG91bGRuJ3QgYmUKK2JvdW5kIGEgc2Vjb25kIHRpbWUgZm9yIEdlcnJpdCBleHRlbnNpb25zLgorCisqIERvIG5vdCBjYWxsIG9uTW9kdWxlTG9hZCgpIHNlY29uZCB0aW1lCisrCitvbk1vZHVsZUxvYWQoKSBtZXRob2QgaXMgYXV0b21hdGljYWxseSBjYWxsZWQgYnkgR1dUIGZyYW1ld29yay4gQ2FsbGluZworaXQgb25jZSBhZ2FpbiBpbiBQbHVnaW5HZW5lcmF0b3IgY2F1c2VkIGRvdWJsZSBwbHVnaW4gaW5pdGlhbGl6YXRpb24uCisKKyogUmVxdWlyZSBgQWRtaW5pc3RyYXRlIFNlcnZlcmAgY2FwYWJpbGl0eSB0byBHRVQgL3BsdWdpbnMvCisrCitMaXN0aW5nIHBsdWdpbnMgcmVxdWlyZXMgYmVpbmcgYW4gYWRtaW5pc3RyYXRvci4gVGhpcyB3YXMgbWlzc2VkIGluIHRoZQorUkVTVCBBUEkuCisKK0VtYWlsCit+fn5+fgorKiBNZXJnZSBmYWlsdXJlIGVtYWlscyBhcmUgb25seSBzZW50IG9uY2UgcGVyIGRheS4KKyogVW51c2VkIG1hY3JvcyBhcmUgcmVtb3ZlZCBmcm9tIHRoZSBtYWlsIHRlbXBsYXRlcy4KKyogVW5uZWNlc3NhcnkgZWxsaXBzZXMgYXJlIG5vIGxvbmdlciBhcHBsaWVkIHRvIGVtYWlsIHN1YmplY3RzLgorKiBUaGUgZW1wdHkgZGlmZiBvdXRwdXQgZnJvbSBhbiAib2N0b3B1cyBtZXJnZSIgaXMgbm93IGV4cGxhaW5lZCBpbiBjaGFuZ2Ugbm90aWZpY2F0aW9uIGVtYWlscy4KKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE0ODBbSXNzdWUgMTQ4MF06CitQcm9wZXIgZXJyb3IgbWVzc2FnZSBpcyBzaG93biB3aGVuIHJlZ2lzdGVyaW5nIGFuIGVtYWlsIGFkZHJlc3MgZmFpbHMuCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE2OTJbSXNzdWUgMTY5Ml06CitSZXZpZXcgY29tbWVudHMgYXJlIHNvcnRlZCBiZWZvcmUgYmVpbmcgYWRkZWQgdG8gbm90aWZpY2F0aW9uIGVtYWlscy4KKworKiBGaXggd2F0Y2hpbmcgb2YgJ0FsbCBDb21tZW50cycgb24gYEFsbC1Qcm9qZWN0c2AKKysKK0lmIGEgdXNlciBpcyB3YXRjaGluZyAnQWxsIENvbW1lbnRzJyBvbiBgQWxsLVByb2plY3RzYCB0aGlzIHNob3VsZAorYXBwbHkgdG8gYWxsIHByb2plY3RzLgorCitNaXNjCit+fn5+CisqIFByb3ZpZGUgbW9yZSBkZXNjcmlwdGl2ZSBtZXNzYWdlIGZvciBOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uCisKKyogT24gaW50ZXJuYWwgZXJyb3IgZHVlIHRvIHJlY2VpdmUgdGltZW91dCBpbmNsdWRlIHRoZSB2YWx1ZSBvZgorICBgcmVjZWl2ZS50aW1lb3V0YCBpbnRvIHRoZSBsb2cgbWVzc2FnZQorCisqIFNpbGVuY2UgSU5GTy9ERUJVRyBvdXRwdXQgZnJvbSBhcGFjaGUuaHR0cAorKworVGhpcyBzcGFtbWVkIHRoZSBsb2cgd2hlbiB1c2luZyBPcGVuSUQsIGZvciBlYWNoIGFuZCBldmVyeSBsb2dpbi4KKworKiBSZW1vdmUgYG15c3FsX25leHR2YWxgIHNjcmlwdAorKworVGhpcyBmdW5jdGlvbiBkb2VzIG5vdCB3b3JrIG9uIGJpbmFyeSBsb2dnaW5nIGVuYWJsZWQgc2VydmVycywKK2FzIE15U1FMIGlzIHVuYWJsZSB0byBleGVjdXRlIHRoZSBmdW5jdGlvbiBvbiBzbGF2ZXMgd2l0aG91dAorY2F1c2luZyBwb3NzaWJsZSBjb3JydXB0aW9uLiBEcm9wIHRoZSBmdW5jdGlvbiBzaW5jZSBpdCB3YXMgb25seQorY3JlYXRlZCB0byBoZWxwIGFkbWluaXN0cmF0b3JzLCBhbmQgaXMgdW5zYWZlLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xMzEyW0lzc3VlIDEzMTJdOgorICBGaXggcmVsYXRpdmUgVVJMIGRldGVjdGlvbiBpbiBzdWJtb2R1bGVzCisrCitSZWxhdGl2ZSBzdWJtb2R1bGVzIGRvIG5vdCBzdGFydCB3aXRoIGAvYC4gSW5zdGVhZCB0aGV5IHN0YXJ0IHdpdGgKK2AuLi9gLiAgRml4IHRoZSBTdWJtb2R1bGUgU3Vic2NyaXB0aW9ucyBlbmdpbmUgdG8gcmVjb2duaXplIHJlbGF0aXZlCitzdWJtb2R1bGVzLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNjIyW0lzc3VlIDE2MjJdOgorICBGaXggTlBFIGluIExEQVAgSGVscGVyIGNsYXNzIGlmIHVzZXJuYW1lIGlzIG51bGwKKworKiBGaXggY29tbWl0LW1zZyBob29rIGZhaWx1cmUgd2l0aCBzcGFjZXMgaW4gcGF0aAorKworSWYgdGhlIHByb2plY3QgYWJzb2x1dGUgcGF0aCBoYWQgYW55IHdoaXRlc3BhY2UsIHRoZSBjb21taXQKK2hvb2sgZmFpbGVkIHRvIGNvbXBsZXRlIGJlY2F1c2UgYSBzY3JpcHQgdmFyaWFibGUgd2FzIG5vdAorZW5jbG9zZWQgaW4gZG91YmxlIHF1b3Rlcy4KKworKiBEcm9wIHRoZSB0cmFpbGluZyAiLmdpdCIgc3VmZml4IG9mIHRoZSBuYW1lIG9mIG5ldyBwcm9qZWN0CisKKyogUHJldmVudCBwb3NzaWJsZSBOUEUgd2hlbiBydW5uaW5nIGBjaGFuZ2UtbWVyZ2VkYCBob29rCisrCitJdCdzIHBvc3NpYmxlIHRoYXQgdGhlIHN1Ym1pdHRlciBpcyBudWxsLiBBZGQgYSBjaGVjayBmb3IgdGhpcworYmVmb3JlIGludm9raW5nIHRoZSBgY2hhbmdlLW1lcmdlZGAgaG9vayB3aXRoIGl0LgorCisqIEtlZXAgY2hhbmdlIG9wZW4gaWYgaXRzIGNvbW1pdCBpcyBwdXNoZWQgdG8gYW5vdGhlciBicmFuY2guCisKKyogRmlyZSBHaXRSZWZlcmVuY2VVcGRhdGVkIGV2ZW50IHdoZW4gQmFuQ29tbWl0IHVwZGF0ZXMgdGhlCisgIGByZWZzL21ldGEvcmVqZWN0LWNvbW1pdHNgIGJyYW5jaC4KKworKiBGaXggR2l0V2ViIENhY2hpbmcKKysKK0dpdFdlYiBDYWNoaW5nIHdhcyBub3Qgd29ya2luZyB3aGVuIGl0cyBjZ2kgZmlsZSB3YXMgZXhlY3V0ZWQgZnJvbQorb3V0c2lkZS4gVGhlIHNhbWUgYXBwcm9hY2ggd2lsbCBhbHNvIHdvcmsgd2l0aCB2YW5pbGxhIEdpdFdlYi4KKworKiBGaXggaW5maW5pdGUgbG9vcHMgd2hlbiB3YWxraW5nIHByb2plY3QgaGllcmFyY2h5CisKKyogRml4IHJlc291cmNlIGxlYWsgaW4gTWFya2Rvd25Gb3JtYXR0ZXIKKworKiBRdWVyeSBhbGwgZXh0ZXJuYWwgZ3JvdXBzIGZvciBpbnRlcm5hbCBncm91cCBtZW1iZXJzaGlwcworKworV2hlbiBhc2tpbmcgZm9yIHRoZSBrbm93biBncm91cHMgYSB1c2VyIGJlbG9uZ3MgdG8gdGhleSBtYXkgYmVsb25nCit0byBhbiBpbnRlcm5hbCBncm91cCBieSB3YXkgb2YgbWVtYmVyc2hpcCBpbiBhIG5vbi1pbnRlcm5hbCBncm91cCwKK3N1Y2ggYXMgTERBUC4gQ2FjaGUgaW4gbWVtb3J5IHRoZSBjb21wbGV0ZSBsaXN0IG9mIGFueSBub24taW50ZXJuYWwKK2dyb3VwIFVVSURzIHVzZWQgYXMgbWVtYmVycyBvZiBhbiBpbnRlcm5hbCBncm91cC4gVGhlc2UgbXVzdCBnZXQKK2NoZWNrZWQgZm9yIG1lbWJlcnNoaXAgYmVmb3JlIGNvbXBsZXRpbmcgdGhlIGtub3duIGdyb3VwIGRhdGEgZnJvbQordGhlIGludGVybmFsIGJhY2tlbmQuCisKKyogSGFuZGxlIHNvcnRpbmcgZ3JvdXBzIHdpdGggbm8gbmFtZSB0byBhdm9pZCBOUEUKKworKiBgZ2Vycml0LnNoYAorKiogRG9uJ3Qgc3VnZ2VzdCBzaXRlIGluaXQgaWYgc2NoZW1hIHZlcnNpb24gaXMgbmV3ZXIgdGhhbiBleHBlY3RlZAorKiogSW1wcm92ZSBlcnJvciBtZXNzYWdlcyBpbiBzY2hlbWEgY2hlY2sKKyoqIFN1Z2dlc3QgY2hhbmdpbmcgYGdlcnJpdC5jb25maWdgIHdoZW4gSkRLIG5vdCBmb3VuZAorKiogRXhwbGljaXRseSBzZXQgYSBzaGVsbAorKiogRGV0ZXJtaW5lIGBHRVJSSVRfU0lURWAgZnJvbSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5LgorKiogRml4IGBnZXJyaXQuc2ggcmVzdGFydGAgZm9yIHJlbGF0aXZlIHBhdGhzCisqKiBGaXggc2l0ZSBwYXRoIGNvbXB1dGF0aW9uIGlmICcuJyBvY2N1cnMgaW4gcGF0aAorKiogV2hpdGVzcGFjZSBmaXhlcworCisqIERpc3BsYXkgdGhlIHJlYXNvbiBvZiBhbiBJbml0IGluamVjdGlvbiBmYWlsdXJlLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xODIxW0lzc3VlIDE4MjFdOgorICBXYXJuIGlmIGBjYWNoZS53ZWJfc2Vzc2lvbnMubWF4QWdlYCBpcyB0byBzbWFsbAorKworU2V0dGluZyBgbWF4QWdlYCB0byBhIHNtYWxsIHZhbHVlIGNhbiByZXN1bHQgaW4gdGhlIGJyb3dzZXIgZW5kbGVzc2x5CityZWRpcmVjdGluZyB0cnlpbmcgdG8gc2V0dXAgYSBuZXcgdmFsaWQgc2Vzc2lvbi4gV2FybiBhZG1pbmlzdHJhdG9ycwordGhhdCB0aGUgdmFsdWUgaXMgc2V0IHNtYWxsZXIgdGhhbiA1IG1pbnV0ZXMuCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE4MjFbSXNzdWUgMTgyMV06CisgIFN1cHBvcnQgYGNhY2hlLndlYl9zZXNzaW9ucy5tYXhBZ2VgIDwgMSBtaW51dGUKKworKiBVc2UgU0VDT05EUyBhcyBkZWZhdWx0IHRpbWUgdW5pdCBmb3IgYGNhY2hlLndlYl9zZXNzaW9ucy5tYXhBZ2VgCisrCitEZWZhdWx0Q2FjaGVGYWN0b3J5IGFscmVhZHkgdXNlcyBTRUNPTkRTIGFzIGRlZmF1bHQgdGltZSB1bml0IGZvcgorYGNhY2hlLioubWF4QWdlYC4KKysKK1VwZGF0ZSB0aGUgZGVzY3JpYmVkIGRlZmF1bHQgdGltZSB1bml0IGZvciBgY2FjaGUuKi5tYXhBZ2VgIGluIHRoZQorZG9jdW1lbnRhdGlvbi4KKysKK0FkbWluaXN0cmF0b3JzIG1heSBuZWVkIHRvIHVwZGF0ZSB0aGVpciBjb25maWd1cmF0aW9uIHRvIGZvciB0aGUgbmV3CitkZWZhdWx0IHRpbWUgdW5pdC4KKworKiBBZGQgcHlsaW50IGNvbmZpZ3VyYXRpb24gZm9yIGNvbnRyaWJ1dGVkIFB5dGhvbiBzY3JpcHRzCisKKyogVmFyaW91cyBmaXhlcyBhbmQgaW1wcm92ZW1lbnRzIG9mIHRoZSBgY29udHJpYi90cml2aWFsX3JlYmFzZS5weWAKKyAgc2NyaXB0CisrCisqKiBBZGFwdCBvcHRpb25zIHRvIEdlcnJpdCAyLjYKKyoqIFVzZSBjaGFuZ2UtdXJsIGZsYWcgZm9yIENoYW5nZUlkCisqKiBQcmV2ZW50IGV4Y2VwdGlvbiBmb3IgZW1wdHkgY29tbWl0CisqKiBGaXggcHlsaW50IGVycm9ycworKiogQ2FsbCBgZ2Vycml0IHJldmlld2AgaW5zdGVhZCBvZiBgZ2Vycml0IGFwcHJvdmVgCisqKiBNYWtlIHRoZSBwcml2YXRlIGtleSBhcmd1bWVudCBvcHRpb25hbAorKiogU3VwcG9ydCBhbHRlcm5hdGl2ZSBzc2ggZXhlY3V0YWJsZSwgZm9yIGV4YW1wbGUgYHBsaW5rYAorKiogU3VwcG9ydCBjdXN0b20gcmV2aWV3IGxhYmVscworKiogQ29ycmVjdGx5IGhhbmRsZSBlbXB0eSBwYXRjaCBJRAorKworSWYgb25seSBvbmUgb2YgdGhlIHBhdGNoIElEcyBpcyBlbXB0eSwgaXQgc2hvdWxkIG5vdCBiZSBjb25zaWRlcmVkCithIHRyaXZpYWwgcmViYXNlLgorCisqKiBVc2UgcGxhaW4gcHl0aG9uIGluc3RlYWQgb2YgcHl0aG9uMi42CisrCitXaW5kb3dzIGluc3RhbGxhdGlvbiBvbmx5IGhhcyBweXRob24uZXhlCisKKyogQ29ycmVjdCBNSU1FIHR5cGUgb2YgYGZhdmljb24uaWNvYCByZWZlcmVuY2UKKysKK1RoaXMgaXMgbm90IGEgR0lGLCBpdCBpcyBhbiAiTVMgV2luZG93cyBpY29uIHJlc291cmNlIi4KK1NvbWUgYnJvd3NlcnMgbWF5IHNraXAgdGhlIGltYWdlIGlmIHRoZSB0eXBlIGlzIHdyb25nLgorCisqIFVzZSBgPGxpbmsgcmVsPSJzaG9ydGN1dCBpY29uIj5gIGZvciBgZmF2aWNvbi5pY29gIHJlZmVyZW5jZQorKworSUUgbG9va3MgZm9yIGEgdHdvLXdvcmQgInNob3J0Y3V0IGljb24iIHJlbGF0aW9uc2hpcC4gIE90aGVyIGJyb3dzZXJzCitpbnRlcnByZXQgdGhpcyBhcyB0d28gcmVsYXRpb25zaGlwcywgb25lIG9mIHdoaWNoIGlzICJpY29uIiwgc28gdGhleQorY2FuIGhhbmRsZSB0aGlzIHN5bnRheCBhcyB3ZWxsLgorKworU2VlOgorKworKiogaHR0cDovL21zZG4ubWljcm9zb2Z0LmNvbS9lbi11cy9saWJyYXJ5L21zNTM3NjU2KFZTLjg1KS5hc3B4CisqKiBodHRwOi8vamVmZmNvZGUuYmxvZ3Nwb3QuY29tLzIwMDcvMTIvd2h5LWRvZXNudC1mYXZpY29uLWZvci1teS1zaXRlLWFwcGVhci5odG1sCisKKyogUmVtb3ZlIGBzZXJ2bGV0LWFwaWAgZnJvbSBgV0FSL2xpYmAKKysKK0l0IGlzIHdyb25nIHRvIGluY2x1ZGUgdGhlIHNlcnZsZXQgQVBJIGluIGEgV0FSJ3MgYFdFQi1JTkYvbGliYAorZGlyZWN0b3J5LiBUaGlzIGNvbmZ1c2VzIHNvbWUgc2VydmxldCBjb250YWluZXJzIHdobyByZWZ1c2UgdG8KK2xvYWQgdGhlIEdlcnJpdCBXQVIuIEluc3RlYWQgcGFja2FnZSB0aGUgSmV0dHkgcnVudGltZSBhbmQgdGhlCitzZXJ2bGV0IEFQSSBpbiBhIG5ldyBgV0VCLUlORi9wZ20tbGliYCBkaXJlY3RvcnkuCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE4MjJbSXNzdWUgMTgyMl06CisgIFZlcmlmeSBzZXNzaW9uIG1hdGNoZXMgY29udGFpbmVyIGF1dGhlbnRpYXRpb24gaGVhZGVyCisrCitJZiB0aGUgdXNlciBhbHRlcnMgdGhlaXIgaWRlbnRpdHkgaW4gdGhlIGNvbnRhaW5lciBpbnZhbGlkYXRlCit0aGUgR2Vycml0IHVzZXIgc2Vzc2lvbiBhbmQgZm9yY2UgYSBuZXcgb25lIHRvIGJlZ2luLgorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNzQzW0lzc3VlIDE3NDNdOgorICBNb3ZlIFJQQyBhdXRoIHRva2VuIGZyb20gYEF1dGhvcml6YXRpb25gIGhlYWRlciB0byBgWC1HZXJyaXQtQXV0aGAKKysKK1NlcnZlcnMgdGhhdCBydW4gd2l0aCBhdXRoLnR5cGUgPSBIVFRQIG9yIEhUVFBfTERBUCBhcmUgdW5hYmxlIHRvCit1c2UgdGhlIHdlYiBVSSBiZWNhdXNlIHRoZSBBdXRob3JpemF0aW9uIGNvZGUgc3VwcGxpZWQgYnkgdGhlIFVJCitvdmVycmlkZXMgdGhlIGJyb3dzZXIncyBuYXRpdmUgYEF1dGhvcml6YXRpb25gIGhlYWRlciBhbmQgY2F1c2VzIHRoZQorcmVxdWVzdCB0byBiZSBibG9ja2VkIGF0IHRoZSBIVFRQIHJldmVyc2UgcHJveHksIGJlZm9yZSBHZXJyaXQgZXZlbgorc2VlcyB0aGUgcmVxdWVzdC4KKysKK0luc3RlYWQgaW5zZXJ0IGEgdW5pcXVlIHRva2VuIGludG8gYFgtR2Vycml0LUF1dGhgLCBsZWF2aW5nIHRoZSBIVFRQCitzdGFuZGFyZCBgQXV0aG9yaXphdGlvbmAgaGVhZGVyIHVuc3BlY2lmaWVkIGFuZCBhdmFpbGFibGUgZm9yIHVzZSBpbgorSFRUUCByZXZlcnNlIHByb3hpZXMuCisKK0RvY3VtZW50YXRpb24KKy0tLS0tLS0tLS0tLS0KKworVXNlciBEb2N1bWVudGF0aW9uCit+fn5+fn5+fn5+fn5+fn5+fn4KKyogU3BsaXQgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L3Jlc3QtYXBpLmh0bWxbCisgIFJFU1QgQVBJIGRvY3VtZW50YXRpb25dIGFuZCBoYXZlIG9uZSBwYWdlIHBlciB0b3AgbGV2ZWwgcmVzb3VyY2UKKworKiBBZGQgZXhlY3V0YWJsZSBleGFtcGxlcyBmb3IgR0VUIHJlcXVlc3RzIHRvCisgIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9yZXN0LWFwaS5odG1sWworICBSRVNUIEFQSSBkb2N1bWVudGF0aW9uXQorKworQWRkIGV4YW1wbGVzIGZvciBHRVQgcmVxdWVzdHMgdG8gdGhlIFJFU1QgQVBJIGRvY3VtZW50YXRpb24gb24gd2hpY2gKK3RoZSB1c2VyIGNhbiBjbGljayB0byBmaXJlIHRoZSByZXF1ZXN0cy4gVGhpcyBhbGxvd3MgdXNlcnMgdG8KK2ltbWVkaWF0ZWx5IHRyeSBvdXQgdGhlIHJlcXVlc3RzIGFuZCBwbGF5IGFyb3VuZCB3aXRoIHRoZW0uCisKKyogRG9jdW1lbnQgdGhlIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9hY2Nlc3MtY29udHJvbC5odG1sI2Jsb2NrWworICBCTE9DSyBhY2Nlc3MgcnVsZV0uCisKKyogQWRkZWQgZG9jdW1lbnRhdGlvbiBvZgorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvdXNlci11cGxvYWQuaHRtbCNodHRwWworICBob3cgdG8gYXV0aGVudGljYXRlIHVwbG9hZHMgb3ZlciBIVFRQXS4KKworKiBBZGRlZCBkb2N1bWVudGF0aW9uIG9mIHRoZQorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvY29uZmlnLWdlcnJpdC5odG1sI2F1dGguZWRpdEZ1bGxOYW1lVXJsW2F1dGguZWRpdEZ1bGxOYW1lVXJsXSBhbmQKKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NvbmZpZy1nZXJyaXQuaHRtbCNhdXRoLmh0dHBQYXNzd29yZFVybFthdXRoLmh0dHBQYXNzd29yZFVybF0KKyAgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXJzLgorCisqIEFkZCBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvcHJvbG9nLWNvb2tib29rLmh0bWxbCisgIHN1Ym1pdF9ydWxlIGV4YW1wbGVzXSBmcm9tIEdlcnJpdCBVc2VyIFN1bW1pdCAyMDEyLgorCisqIEltcHJvdmVkIHRoZSBwdXNoIHRhZyBleGFtcGxlcyBpbiB0aGUgYWNjZXNzIGNvbnRyb2wgZG9jdW1lbnRhdGlvbi4KKworKiBJbXByb3ZlZCBkb2N1bWVudGF0aW9uIG9mIGVycm9yIG1lc3NhZ2VzIHJlbGF0ZWQgdG8gY29tbWl0IG1lc3NhZ2UgZm9vdGVyIGNvbnRlbnQuCisKKyogQWRkZWQgZG9jdW1lbnRhdGlvbiBvZiB0aGUKKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2Vycm9yLWNvbW1pdC1hbHJlYWR5LWV4aXN0cy5odG1sWworICBjb21taXQgYWxyZWFkeSBleGlzdHNdIGVycm9yIG1lc3NhZ2UuCisKKyogQWRkZWQgbWlzc2luZyBkb2N1bWVudGF0aW9uIG9mIHRoZSBzc2gKKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NtZC12ZXJzaW9uLmh0bWxbCisgIHZlcnNpb25dIGNvbW1hbmQuCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTEzNjlbSXNzdWUgMTM2OV06CisgIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9jb25maWctZ2l0d2ViLmh0bWxbCisgIEdpdHdlYiBJbnN0cnVjdGlvbiBVcGRhdGVzXQorCisqIGxpbms6aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvaXNzdWVzL2RldGFpbD9pZD0xNTk0W0lzc3VlIDE1OTRdOgorICBEb2N1bWVudCBleGVjdXRlIHBlcm1pc3Npb24gZm9yIGNvbW1pdC1tc2cgaW4KKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L3VzZXItY2hhbmdlaWQuaHRtbCNjcmVhdGlvblsKKyAgQ2hhbmdlLUlkIGRvY3NdCisKKyogbGluazpodHRwczovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC9pc3N1ZXMvZGV0YWlsP2lkPTE2MDJbSXNzdWUgMTYwMl06CitDb3JyZWN0ZWQgcmVmZXJlbmNlcyB0byBgcmVmcy9jaGFuZ2VzYCBpbiB0aGUgYWNjZXNzIGNvbnRyb2wgZG9jdW1lbnRhdGlvbi4KKworKiBVcGRhdGUgZG9jdW1lbnRhdGlvbiBvZgorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvY29uZmlnLWdlcnJpdC5odG1sI3RyYWNraW5naWQubmFtZS5tYXRjaFsKKyAgbWF4aW1hbCBsZW5ndGggZm9yIHRyYWNraW5nIGlkc10KKworKiBBZGRlZCBtaXNzaW5nIGRvY3VtZW50YXRpb24gb2YKKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2pzb24uaHRtbFtKU09OIGF0dHJpYnV0ZXNdLgorCisqIFJlbmFtZSBgY3VzdG9tLWRhc2hib2FyZHMuaHRtbGAgdG8KKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L3VzZXItZGFzaGJvYXJkcy5odG1sW3VzZXItZGFzaGJvYXJkcy5odG1sXQorKworVGhpcyBkb2N1bWVudCBubyBsb25nZXIgZGVhbHMgZXhjbHVzaXZlbHkgd2l0aCBjdXN0b20gZGFzaGJvYXJkcywgaXQgbm93IGRlc2NyaWJlcyBwcm9qZWN0IGxldmVsIGRhc2hib2FyZHMgYWxzby4KKworKiBTZXBhcmF0ZSB0aGUKKyAgbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2NvbmZpZy1sb2dpbi1yZWdpc3Rlci5odG1sWworICBpbml0aWFsIHVzZXIgc2V0dXAgaW5zdHJ1Y3Rpb25zXSB0byBhIHNoYXJlZCBmaWxlCisKKyogU2VwYXJhdGUgdGhlCisgIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9kYXRhYmFzZS1zZXR1cC5odG1sWworICBkYXRhYmFzZSBzZXR1cCBpbnN0cnVjdGlvbnNdIHRvIGEgc2hhcmVkIGZpbGUKKworKiBJbXByb3ZlIHRoZSBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvZGF0YWJhc2Utc2V0dXAuaHRtbFsKKyAgaW5zdHJ1Y3Rpb25zIGZvciBQZ1NRTCBzZXR1cF0KKworKiBGaXggdGhlIG9yZGVyIG9mIHN0ZXBzIGluIHRoZQorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvaW5zdGFsbC1qMmVlLmh0bWxbCisgIEoyRUUgSW5zdGFsbGF0aW9uIGRvY3VtZW50XQorKworSXQgaXMgYmV0dGVyIHRvIGZpcnN0IGRlZmluZSB0aGUgSk5ESSBkYXRhIHNvdXJjZSBpbiB0aGUgYXBwbGljYXRpb24KK3NlcnZlciBhbmQgdGhlbiBkZXBsb3kgR2Vycml0IHRoYW4gb3Bwb3NpdGUuIFRoaXMgc2hvdWxkIGF2b2lkIGVycm9ycworbGlrZSAiTm8gRGF0YVNvdXJjZSIgb24gdGhlIGZpcnN0IGRlcGxveW1lbnQuCisKKyogQ2xhcmlmeSBkb2N1bWVudGF0aW9uIG9mCisgIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9jb25maWctZ2Vycml0Lmh0bWwjbGRhcC5ncm91cE5hbWVbCisgIExEQVAgZ3JvdXAgbmFtZSBzZXR0aW5nXQorCisqIEFkYXB0IGRvY3VtZW50YXRpb24gdG8gaGF2aW5nICdQcm9qZWN0cycgYXMgdG9wIGxldmVsIG1lbnUKKyogQWRkZWQgbWlzc2luZyBkb2N1bWVudGF0aW9uIG9mIG1haWwgdGVtcGxhdGVzLgorKiBBZGRlZCBkb2N1bWVudGF0aW9uIG9mIGNvbnRyaWJ1dG9yIGFncmVlbWVudHMuCisqIEZpeCBgaW5pdC5kYCBzeW1ib2xpYyBsaW5rIGNvbW1hbmRzLgorKiBSZW1vdmUgb2Jzb2xldGUgZGlza2J1ZmZlciBzZXR0aW5nIGZyb20gZXhhbXBsZSBjb25maWcgZmlsZS4KKyogVmFyaW91cyBtaW5vciBncmFtbWF0aWNhbCBhbmQgZm9ybWF0dGluZyBjb3JyZWN0aW9ucy4KKyogRml4IGV4dGVybmFsIGxpbmtzIGluIDIuMC4yMSBhbmQgMi4wLjI0IHJlbGVhc2Ugbm90ZXMKKyogTWFudWFsIHBhZ2VzIGNhbiBiZSBvcHRpb25hbGx5IGNyZWF0ZWQvaW5zdGFsbGVkIGZvciBjb3JlIGdlcnJpdCBzc2ggY29tbWFuZHMuCisKK0RldmVsb3BlciBBbmQgTWFpbnRhaW5lciBEb2N1bWVudGF0aW9uCit+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fgorKiBVcGRhdGVkIHRoZSBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvZGV2LWVjbGlwc2UuaHRtbCNtYXZlblsKKyAgTWF2ZW4gcGx1Z2luIGluc3RhbGxhdGlvbiBpbnN0cnVjdGlvbnNdIGZvciBFY2xpcHNlIDMuNyAoSW5kaWdvKS4KKworKiBEb2N1bWVudCBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvZGV2LWNvbnRyaWJ1dGluZy5odG1sI2NvbW1pdC1tZXNzYWdlWworICB1c2FnZSBvZiB0aGUgcGFzdCB0ZW5zZSBpbiBjb21taXQgbWVzc2FnZXNdCisKKyogQWRkIGxpbms6aHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNi9kZXYtY29udHJpYnV0aW5nLmh0bWxbCisgIGluc3RydWN0aW9uc10gb24gaG93IHRvIGNvbmZpZ3VyZSBnaXQgZm9yIHB1c2hpbmcgdG8gR2Vycml0J3MgR2Vycml0CisKKyogbGluazpodHRwOi8vZ2Vycml0LWRvY3VtZW50YXRpb24uZ29vZ2xlY29kZS5jb20vc3ZuL0RvY3VtZW50YXRpb24vMi42L2Rldi1jb250cmlidXRpbmcuaHRtbCNwcm9jZXNzWworICBTdGFibGUgYnJhbmNoZXMgcHJvY2VzcyBkb2N1bWVudGF0aW9uXQorCisqIEltcHJvdmVkIHRoZQorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvZGV2LXJlbGVhc2UuaHRtbFsKKyAgcmVsZWFzZSBkb2N1bWVudGF0aW9uXS4KKworKiBEb2N1bWVudCB0aGF0IHBsYW5zIGZvcgorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvZGV2LXJlbGVhc2UuaHRtbCNzdGFibGVbCisgIHN0YWJsZS1maXggcmVsZWFzZXNdIHNob3VsZCBiZSBhbm5vdW5jZWQKKworKiBEb2N1bWVudCBwcm9jZXNzIGZvcgorICBsaW5rOmh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjYvZGV2LXJlbGVhc2UuaHRtbCNzZWN1cml0eVsKKyAgc2VjdXJpdHktZml4IHJlbGVhc2VzXQorCisqIFRoZSByZWxlYXNlIG5vdGVzIGFyZSBub3cgbWFkZSB3aGVuIGEgcmVsZWFzZSBpcyBjcmVhdGVkIGJ5IHJ1bm5pbmcgdGhlIGB0b29scy9yZWxlYXNlLnNoYCBzY3JpcHQuCisKZGlmZiAtLWdpdCBhL1JlbGVhc2VOb3Rlcy9pbmRleC50eHQgYi9SZWxlYXNlTm90ZXMvaW5kZXgudHh0CmluZGV4IGUyNDg3YmMuLjI2Y2NhZTcgMTAwNjQ0Ci0tLSBhL1JlbGVhc2VOb3Rlcy9pbmRleC50eHQKKysrIGIvUmVsZWFzZU5vdGVzL2luZGV4LnR4dApAQCAtMSw2ICsxLDExIEBACiBHZXJyaXQgQ29kZSBSZXZpZXcgLSBSZWxlYXNlIE5vdGVzCiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKK1tbMl82XV0KK1ZlcnNpb24gMi42LngKKy0tLS0tLS0tLS0tLS0KKyogbGluazpSZWxlYXNlTm90ZXMtMi42Lmh0bWxbMi42XQorCiBbWzJfNV1dCiBWZXJzaW9uIDIuNS54CiAtLS0tLS0tLS0tLS0tCmRpZmYgLS1naXQgYS9jb250cmliLy5weWxpbnRyYyBiL2NvbnRyaWIvLnB5bGludHJjCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjllODg4MmUKLS0tIC9kZXYvbnVsbAorKysgYi9jb250cmliLy5weWxpbnRyYwpAQCAtMCwwICsxLDMwMSBAQAorIyBsaW50IFB5dGhvbiBtb2R1bGVzIHVzaW5nIGV4dGVybmFsIGNoZWNrZXJzLgorIworIyBUaGlzIGlzIHRoZSBtYWluIGNoZWNrZXIgY29udHJvbGluZyB0aGUgb3RoZXIgb25lcyBhbmQgdGhlIHJlcG9ydHMKKyMgZ2VuZXJhdGlvbi4gSXQgaXMgaXRzZWxmIGJvdGggYSByYXcgY2hlY2tlciBhbmQgYW4gYXN0bmcgY2hlY2tlciBpbiBvcmRlcgorIyB0bzoKKyMgKiBoYW5kbGUgbWVzc2FnZSBhY3RpdmF0aW9uIC8gZGVhY3RpdmF0aW9uIGF0IHRoZSBtb2R1bGUgbGV2ZWwKKyMgKiBoYW5kbGUgc29tZSBiYXNpYyBidXQgbmVjZXNzYXJ5IHN0YXRzJ2RhdGEgKG51bWJlciBvZiBjbGFzc2VzLCBtZXRob2RzLi4uKQorIworW01BU1RFUl0KKworIyBTcGVjaWZ5IGEgY29uZmlndXJhdGlvbiBmaWxlLgorI3JjZmlsZT0KKworIyBQeXRob24gY29kZSB0byBleGVjdXRlLCB1c3VhbGx5IGZvciBzeXMucGF0aCBtYW5pcHVsYXRpb24gc3VjaCBhcworIyBweWd0ay5yZXF1aXJlKCkuCisjaW5pdC1ob29rPQorCisjIFByb2ZpbGVkIGV4ZWN1dGlvbi4KK3Byb2ZpbGU9bm8KKworIyBBZGQgPGZpbGUgb3IgZGlyZWN0b3J5PiB0byB0aGUgYmxhY2sgbGlzdC4gSXQgc2hvdWxkIGJlIGEgYmFzZSBuYW1lLCBub3QgYQorIyBwYXRoLiBZb3UgbWF5IHNldCB0aGlzIG9wdGlvbiBtdWx0aXBsZSB0aW1lcy4KK2lnbm9yZT1TVk4KKworIyBQaWNrbGUgY29sbGVjdGVkIGRhdGEgZm9yIGxhdGVyIGNvbXBhcmlzb25zLgorcGVyc2lzdGVudD15ZXMKKworIyBTZXQgdGhlIGNhY2hlIHNpemUgZm9yIGFzdG5nIG9iamVjdHMuCitjYWNoZS1zaXplPTUwMAorCisjIExpc3Qgb2YgcGx1Z2lucyAoYXMgY29tbWEgc2VwYXJhdGVkIHZhbHVlcyBvZiBweXRob24gbW9kdWxlcyBuYW1lcykgdG8gbG9hZCwKKyMgdXN1YWxseSB0byByZWdpc3RlciBhZGRpdGlvbmFsIGNoZWNrZXJzLgorbG9hZC1wbHVnaW5zPQorCisKK1tNRVNTQUdFUyBDT05UUk9MXQorCisjIEVuYWJsZSBvbmx5IGNoZWNrZXIocykgd2l0aCB0aGUgZ2l2ZW4gaWQocykuIFRoaXMgb3B0aW9uIGNvbmZsaWN0cyB3aXRoIHRoZQorIyBkaXNhYmxlLWNoZWNrZXIgb3B0aW9uCisjZW5hYmxlLWNoZWNrZXI9CisKKyMgRW5hYmxlIGFsbCBjaGVja2VyKHMpIGV4Y2VwdCB0aG9zZSB3aXRoIHRoZSBnaXZlbiBpZChzKS4gVGhpcyBvcHRpb24KKyMgY29uZmxpY3RzIHdpdGggdGhlIGVuYWJsZS1jaGVja2VyIG9wdGlvbgorI2Rpc2FibGUtY2hlY2tlcj0KKworIyBFbmFibGUgYWxsIG1lc3NhZ2VzIGluIHRoZSBsaXN0ZWQgY2F0ZWdvcmllcy4KKyNlbmFibGUtbXNnLWNhdD0KKworIyBEaXNhYmxlIGFsbCBtZXNzYWdlcyBpbiB0aGUgbGlzdGVkIGNhdGVnb3JpZXMuCisjZGlzYWJsZS1tc2ctY2F0PQorCisjIEVuYWJsZSB0aGUgbWVzc2FnZShzKSB3aXRoIHRoZSBnaXZlbiBpZChzKS4KK2VuYWJsZT1SUDAwMDQKKworIyBEaXNhYmxlIHRoZSBtZXNzYWdlKHMpIHdpdGggdGhlIGdpdmVuIGlkKHMpLgorZGlzYWJsZT1SMDkwMyxSMDkxMixSMDkxMyxSMDkxNCxSMDkxNSxXMDE0MSxDMDExMSxDMDEwMyxXMDYwMyxXMDcwMyxSMDkxMSxDMDMwMSxDMDMwMixSMDkwMixSMDkwNCxXMDE0MixXMDIxMixFMTEwMSxFMTEwMyxSMDIwMSxXMDIwMSxXMDEyMixXMDIzMixSUDAwMDEsUlAwMDAzLFJQMDEwMSxSUDAwMDIsUlAwNDAxLFJQMDcwMSxSUDA4MDEKKworW1JFUE9SVFNdCisKKyMgc2V0IHRoZSBvdXRwdXQgZm9ybWF0LiBBdmFpbGFibGUgZm9ybWF0cyBhcmUgdGV4dCwgcGFyc2VhYmxlLCBjb2xvcml6ZWQsIG1zdnMKKyMgKHZpc3VhbCBzdHVkaW8pIGFuZCBodG1sCitvdXRwdXQtZm9ybWF0PXRleHQKKworIyBJbmNsdWRlIG1lc3NhZ2UncyBpZCBpbiBvdXRwdXQKK2luY2x1ZGUtaWRzPXllcworCisjIFB1dCBtZXNzYWdlcyBpbiBhIHNlcGFyYXRlIGZpbGUgZm9yIGVhY2ggbW9kdWxlIC8gcGFja2FnZSBzcGVjaWZpZWQgb24gdGhlCisjIGNvbW1hbmQgbGluZSBpbnN0ZWFkIG9mIHByaW50aW5nIHRoZW0gb24gc3Rkb3V0LiBSZXBvcnRzIChpZiBhbnkpIHdpbGwgYmUKKyMgd3JpdHRlbiBpbiBhIGZpbGUgbmFtZSAicHlsaW50X2dsb2JhbC5bdHh0fGh0bWxdIi4KK2ZpbGVzLW91dHB1dD1ubworCisjIFRlbGxzIHdoZXRoZXIgdG8gZGlzcGxheSBhIGZ1bGwgcmVwb3J0IG9yIG9ubHkgdGhlIG1lc3NhZ2VzCityZXBvcnRzPXllcworCisjIFB5dGhvbiBleHByZXNzaW9uIHdoaWNoIHNob3VsZCByZXR1cm4gYSBub3RlIGxlc3MgdGhhbiAxMCAoMTAgaXMgdGhlIGhpZ2hlc3QKKyMgbm90ZSkuWW91IGhhdmUgYWNjZXNzIHRvIHRoZSB2YXJpYWJsZXMgZXJyb3JzIHdhcm5pbmcsIHN0YXRlbWVudCB3aGljaAorIyByZXNwZWN0aXZseSBjb250YWluIHRoZSBudW1iZXIgb2YgZXJyb3JzIC8gd2FybmluZ3MgbWVzc2FnZXMgYW5kIHRoZSB0b3RhbAorIyBudW1iZXIgb2Ygc3RhdGVtZW50cyBhbmFseXplZC4gVGhpcyBpcyB1c2VkIGJ5IHRoZSBnbG9iYWwgZXZhbHVhdGlvbiByZXBvcnQKKyMgKFIwMDA0KS4KK2V2YWx1YXRpb249MTAuMCAtICgoZmxvYXQoNSAqIGVycm9yICsgd2FybmluZyArIHJlZmFjdG9yICsgY29udmVudGlvbikgLyBzdGF0ZW1lbnQpICogMTApCisKKyMgQWRkIGEgY29tbWVudCBhY2NvcmRpbmcgdG8geW91ciBldmFsdWF0aW9uIG5vdGUuIFRoaXMgaXMgdXNlZCBieSB0aGUgZ2xvYmFsCisjIGV2YWx1YXRpb24gcmVwb3J0IChSMDAwNCkuCitjb21tZW50PW5vCisKKyMgY2hlY2tzIGZvcgorIyAqIHVudXNlZCB2YXJpYWJsZXMgLyBpbXBvcnRzCisjICogdW5kZWZpbmVkIHZhcmlhYmxlcworIyAqIHJlZGVmaW5pdGlvbiBvZiB2YXJpYWJsZSBmcm9tIGJ1aWx0aW5zIG9yIGZyb20gYW4gb3V0ZXIgc2NvcGUKKyMgKiB1c2Ugb2YgdmFyaWFibGUgYmVmb3JlIGFzc2lnbWVudAorIworW1ZBUklBQkxFU10KKworIyBUZWxscyB3aGV0aGVyIHdlIHNob3VsZCBjaGVjayBmb3IgdW51c2VkIGltcG9ydCBpbiBfX2luaXRfXyBmaWxlcy4KK2luaXQtaW1wb3J0PW5vCisKKyMgQSByZWd1bGFyIGV4cHJlc3Npb24gbWF0Y2hpbmcgbmFtZXMgdXNlZCBmb3IgZHVtbXkgdmFyaWFibGVzIChpLmUuIG5vdCB1c2VkKS4KK2R1bW15LXZhcmlhYmxlcy1yZ3g9X3xkdW1teQorCisjIExpc3Qgb2YgYWRkaXRpb25hbCBuYW1lcyBzdXBwb3NlZCB0byBiZSBkZWZpbmVkIGluIGJ1aWx0aW5zLiBSZW1lbWJlciB0aGF0CisjIHlvdSBzaG91bGQgYXZvaWQgdG8gZGVmaW5lIG5ldyBidWlsdGlucyB3aGVuIHBvc3NpYmxlLgorYWRkaXRpb25hbC1idWlsdGlucz0KKworCisjIHRyeSB0byBmaW5kIGJ1Z3MgaW4gdGhlIGNvZGUgdXNpbmcgdHlwZSBpbmZlcmVuY2UKKyMKK1tUWVBFQ0hFQ0tdCisKKyMgVGVsbHMgd2hldGhlciBtaXNzaW5nIG1lbWJlcnMgYWNjZXNzZWQgaW4gbWl4aW4gY2xhc3Mgc2hvdWxkIGJlIGlnbm9yZWQuIEEKKyMgbWl4aW4gY2xhc3MgaXMgZGV0ZWN0ZWQgaWYgaXRzIG5hbWUgZW5kcyB3aXRoICJtaXhpbiIgKGNhc2UgaW5zZW5zaXRpdmUpLgoraWdub3JlLW1peGluLW1lbWJlcnM9eWVzCisKKyMgTGlzdCBvZiBjbGFzc2VzIG5hbWVzIGZvciB3aGljaCBtZW1iZXIgYXR0cmlidXRlcyBzaG91bGQgbm90IGJlIGNoZWNrZWQKKyMgKHVzZWZ1bCBmb3IgY2xhc3NlcyB3aXRoIGF0dHJpYnV0ZXMgZHluYW1pY2FseSBzZXQpLgoraWdub3JlZC1jbGFzc2VzPVNRTE9iamVjdAorCisjIFdoZW4gem9wZSBtb2RlIGlzIGFjdGl2YXRlZCwgY29uc2lkZXIgdGhlIGFjcXVpcmVkLW1lbWJlcnMgb3B0aW9uIHRvIGlnbm9yZQorIyBhY2Nlc3MgdG8gc29tZSB1bmRlZmluZWQgYXR0cmlidXRlcy4KK3pvcGU9bm8KKworIyBMaXN0IG9mIG1lbWJlcnMgd2hpY2ggYXJlIHVzdWFsbHkgZ2V0IHRocm91Z2ggem9wZSdzIGFjcXVpc2l0aW9uIG1lY2FuaXNtIGFuZAorIyBzbyBzaG91bGRuJ3QgdHJpZ2dlciBFMDIwMSB3aGVuIGFjY2Vzc2VkIChuZWVkIHpvcGU9eWVzIHRvIGJlIGNvbnNpZGVyZWQpLgorYWNxdWlyZWQtbWVtYmVycz1SRVFVRVNULGFjbF91c2VycyxhcV9wYXJlbnQKKworCisjIGNoZWNrcyBmb3IgOgorIyAqIGRvYyBzdHJpbmdzCisjICogbW9kdWxlcyAvIGNsYXNzZXMgLyBmdW5jdGlvbnMgLyBtZXRob2RzIC8gYXJndW1lbnRzIC8gdmFyaWFibGVzIG5hbWUKKyMgKiBudW1iZXIgb2YgYXJndW1lbnRzLCBsb2NhbCB2YXJpYWJsZXMsIGJyYW5jaHMsIHJldHVybnMgYW5kIHN0YXRlbWVudHMgaW4KKyMgZnVuY3Rpb25zLCBtZXRob2RzCisjICogcmVxdWlyZWQgbW9kdWxlIGF0dHJpYnV0ZXMKKyMgKiBkYW5nZXJvdXMgZGVmYXVsdCB2YWx1ZXMgYXMgYXJndW1lbnRzCisjICogcmVkZWZpbml0aW9uIG9mIGZ1bmN0aW9uIC8gbWV0aG9kIC8gY2xhc3MKKyMgKiB1c2VzIG9mIHRoZSBnbG9iYWwgc3RhdGVtZW50CisjCitbQkFTSUNdCisKKyMgUmVxdWlyZWQgYXR0cmlidXRlcyBmb3IgbW9kdWxlLCBzZXBhcmF0ZWQgYnkgYSBjb21tYQorcmVxdWlyZWQtYXR0cmlidXRlcz0KKworIyBSZWd1bGFyIGV4cHJlc3Npb24gd2hpY2ggc2hvdWxkIG9ubHkgbWF0Y2ggZnVuY3Rpb25zIG9yIGNsYXNzZXMgbmFtZSB3aGljaCBkbworIyBub3QgcmVxdWlyZSBhIGRvY3N0cmluZworbm8tZG9jc3RyaW5nLXJneD1fbWFpbnxfXy4qX18KKworIyBSZWd1bGFyIGV4cHJlc3Npb24gd2hpY2ggc2hvdWxkIG9ubHkgbWF0Y2ggY29ycmVjdCBtb2R1bGUgbmFtZXMKK21vZHVsZS1yZ3g9KChbYS16X11bYS16MC05X10qKXwoW0EtWl1bYS16QS1aMC05XSspKSQKKworIyBSZWd1bGFyIGV4cHJlc3Npb24gd2hpY2ggc2hvdWxkIG9ubHkgbWF0Y2ggY29ycmVjdCBtb2R1bGUgbGV2ZWwgbmFtZXMKK2NvbnN0LXJneD0oKFtBLVpfXVtBLVoxLTlfXSopfChfXy4qX18pKXwobG9nKSQKKworIyBSZWd1bGFyIGV4cHJlc3Npb24gd2hpY2ggc2hvdWxkIG9ubHkgbWF0Y2ggY29ycmVjdCBjbGFzcyBuYW1lcworY2xhc3Mtcmd4PVtBLVpfXVthLXpBLVowLTldKyQKKworIyBSZWd1bGFyIGV4cHJlc3Npb24gd2hpY2ggc2hvdWxkIG9ubHkgbWF0Y2ggY29ycmVjdCBmdW5jdGlvbiBuYW1lcworZnVuY3Rpb24tcmd4PVthLXpfXVthLXowLTlfXXsyLDMwfSQKKworIyBSZWd1bGFyIGV4cHJlc3Npb24gd2hpY2ggc2hvdWxkIG9ubHkgbWF0Y2ggY29ycmVjdCBtZXRob2QgbmFtZXMKK21ldGhvZC1yZ3g9W2Etel9dW2EtejAtOV9dezIsMzB9JAorCisjIFJlZ3VsYXIgZXhwcmVzc2lvbiB3aGljaCBzaG91bGQgb25seSBtYXRjaCBjb3JyZWN0IGluc3RhbmNlIGF0dHJpYnV0ZSBuYW1lcworYXR0ci1yZ3g9W2Etel9dW2EtejAtOV9dezIsMzB9JAorCisjIFJlZ3VsYXIgZXhwcmVzc2lvbiB3aGljaCBzaG91bGQgb25seSBtYXRjaCBjb3JyZWN0IGFyZ3VtZW50IG5hbWVzCithcmd1bWVudC1yZ3g9W2Etel9dW2EtejAtOV9dezIsMzB9JAorCisjIFJlZ3VsYXIgZXhwcmVzc2lvbiB3aGljaCBzaG91bGQgb25seSBtYXRjaCBjb3JyZWN0IHZhcmlhYmxlIG5hbWVzCit2YXJpYWJsZS1yZ3g9W2Etel9dW2EtejAtOV9dezIsMzB9JAorCisjIFJlZ3VsYXIgZXhwcmVzc2lvbiB3aGljaCBzaG91bGQgb25seSBtYXRjaCBjb3JyZWN0IGxpc3QgY29tcHJlaGVuc2lvbiAvCisjIGdlbmVyYXRvciBleHByZXNzaW9uIHZhcmlhYmxlIG5hbWVzCitpbmxpbmV2YXItcmd4PVtBLVphLXpfXVtBLVphLXowLTlfXSokCisKKyMgR29vZCB2YXJpYWJsZSBuYW1lcyB3aGljaCBzaG91bGQgYWx3YXlzIGJlIGFjY2VwdGVkLCBzZXBhcmF0ZWQgYnkgYSBjb21tYQorZ29vZC1uYW1lcz1pLGosayxleCxSdW4sXyxlLGQxLGQyLHYsZixsLGQKKworIyBCYWQgdmFyaWFibGUgbmFtZXMgd2hpY2ggc2hvdWxkIGFsd2F5cyBiZSByZWZ1c2VkLCBzZXBhcmF0ZWQgYnkgYSBjb21tYQorYmFkLW5hbWVzPWZvbyxiYXIsYmF6LHRvdG8sdHV0dSx0YXRhCisKKyMgTGlzdCBvZiBidWlsdGlucyBmdW5jdGlvbiBuYW1lcyB0aGF0IHNob3VsZCBub3QgYmUgdXNlZCwgc2VwYXJhdGVkIGJ5IGEgY29tbWEKK2JhZC1mdW5jdGlvbnM9bWFwLGZpbHRlcixhcHBseSxpbnB1dAorCisKKyMgY2hlY2tzIGZvciBzaWduIG9mIHBvb3IvbWlzZGVzaWduOgorIyAqIG51bWJlciBvZiBtZXRob2RzLCBhdHRyaWJ1dGVzLCBsb2NhbCB2YXJpYWJsZXMuLi4KKyMgKiBzaXplLCBjb21wbGV4aXR5IG9mIGZ1bmN0aW9ucywgbWV0aG9kcworIworW0RFU0lHTl0KKworIyBNYXhpbXVtIG51bWJlciBvZiBhcmd1bWVudHMgZm9yIGZ1bmN0aW9uIC8gbWV0aG9kCittYXgtYXJncz01CisKKyMgTWF4aW11bSBudW1iZXIgb2YgbG9jYWxzIGZvciBmdW5jdGlvbiAvIG1ldGhvZCBib2R5CittYXgtbG9jYWxzPTE1CisKKyMgTWF4aW11bSBudW1iZXIgb2YgcmV0dXJuIC8geWllbGQgZm9yIGZ1bmN0aW9uIC8gbWV0aG9kIGJvZHkKK21heC1yZXR1cm5zPTYKKworIyBNYXhpbXVtIG51bWJlciBvZiBicmFuY2ggZm9yIGZ1bmN0aW9uIC8gbWV0aG9kIGJvZHkKK21heC1icmFuY2hzPTEyCisKKyMgTWF4aW11bSBudW1iZXIgb2Ygc3RhdGVtZW50cyBpbiBmdW5jdGlvbiAvIG1ldGhvZCBib2R5CittYXgtc3RhdGVtZW50cz01MAorCisjIE1heGltdW0gbnVtYmVyIG9mIHBhcmVudHMgZm9yIGEgY2xhc3MgKHNlZSBSMDkwMSkuCittYXgtcGFyZW50cz03CisKKyMgTWF4aW11bSBudW1iZXIgb2YgYXR0cmlidXRlcyBmb3IgYSBjbGFzcyAoc2VlIFIwOTAyKS4KK21heC1hdHRyaWJ1dGVzPTIwCisKKyMgTWluaW11bSBudW1iZXIgb2YgcHVibGljIG1ldGhvZHMgZm9yIGEgY2xhc3MgKHNlZSBSMDkwMykuCittaW4tcHVibGljLW1ldGhvZHM9MgorCisjIE1heGltdW0gbnVtYmVyIG9mIHB1YmxpYyBtZXRob2RzIGZvciBhIGNsYXNzIChzZWUgUjA5MDQpLgorbWF4LXB1YmxpYy1tZXRob2RzPTMwCisKKworIyBjaGVja3MgZm9yCisjICogZXh0ZXJuYWwgbW9kdWxlcyBkZXBlbmRlbmNpZXMKKyMgKiByZWxhdGl2ZSAvIHdpbGRjYXJkIGltcG9ydHMKKyMgKiBjeWNsaWMgaW1wb3J0cworIyAqIHVzZXMgb2YgZGVwcmVjYXRlZCBtb2R1bGVzCisjCitbSU1QT1JUU10KKworIyBEZXByZWNhdGVkIG1vZHVsZXMgd2hpY2ggc2hvdWxkIG5vdCBiZSB1c2VkLCBzZXBhcmF0ZWQgYnkgYSBjb21tYQorZGVwcmVjYXRlZC1tb2R1bGVzPXJlZ3N1YixzdHJpbmcsVEVSTUlPUyxCYXN0aW9uLHJleGVjCisKKyMgQ3JlYXRlIGEgZ3JhcGggb2YgZXZlcnkgKGkuZS4gaW50ZXJuYWwgYW5kIGV4dGVybmFsKSBkZXBlbmRlbmNpZXMgaW4gdGhlCisjIGdpdmVuIGZpbGUgKHJlcG9ydCBSMDQwMiBtdXN0IG5vdCBiZSBkaXNhYmxlZCkKK2ltcG9ydC1ncmFwaD0KKworIyBDcmVhdGUgYSBncmFwaCBvZiBleHRlcm5hbCBkZXBlbmRlbmNpZXMgaW4gdGhlIGdpdmVuIGZpbGUgKHJlcG9ydCBSMDQwMiBtdXN0CisjIG5vdCBiZSBkaXNhYmxlZCkKK2V4dC1pbXBvcnQtZ3JhcGg9CisKKyMgQ3JlYXRlIGEgZ3JhcGggb2YgaW50ZXJuYWwgZGVwZW5kZW5jaWVzIGluIHRoZSBnaXZlbiBmaWxlIChyZXBvcnQgUjA0MDIgbXVzdAorIyBub3QgYmUgZGlzYWJsZWQpCitpbnQtaW1wb3J0LWdyYXBoPQorCisKKyMgY2hlY2tzIGZvciA6CisjICogbWV0aG9kcyB3aXRob3V0IHNlbGYgYXMgZmlyc3QgYXJndW1lbnQKKyMgKiBvdmVycmlkZGVuIG1ldGhvZHMgc2lnbmF0dXJlCisjICogYWNjZXNzIG9ubHkgdG8gZXhpc3RhbnQgbWVtYmVycyB2aWEgc2VsZgorIyAqIGF0dHJpYnV0ZXMgbm90IGRlZmluZWQgaW4gdGhlIF9faW5pdF9fIG1ldGhvZAorIyAqIHN1cHBvcnRlZCBpbnRlcmZhY2VzIGltcGxlbWVudGF0aW9uCisjICogdW5yZWFjaGFibGUgY29kZQorIworW0NMQVNTRVNdCisKKyMgTGlzdCBvZiBpbnRlcmZhY2UgbWV0aG9kcyB0byBpZ25vcmUsIHNlcGFyYXRlZCBieSBhIGNvbW1hLiBUaGlzIGlzIHVzZWQgZm9yCisjIGluc3RhbmNlIHRvIG5vdCBjaGVjayBtZXRob2RzIGRlZmluZXMgaW4gWm9wZSdzIEludGVyZmFjZSBiYXNlIGNsYXNzLgoraWdub3JlLWlmYWNlLW1ldGhvZHM9aXNJbXBsZW1lbnRlZEJ5LGRlZmVycmVkLGV4dGVuZHMsbmFtZXMsbmFtZXNBbmREZXNjcmlwdGlvbnMscXVlcnlEZXNjcmlwdGlvbkZvcixnZXRCYXNlcyxnZXREZXNjcmlwdGlvbkZvcixnZXREb2MsZ2V0TmFtZSxnZXRUYWdnZWRWYWx1ZSxnZXRUYWdnZWRWYWx1ZVRhZ3MsaXNFcXVhbE9yRXh0ZW5kZWRCeSxzZXRUYWdnZWRWYWx1ZSxpc0ltcGxlbWVudGVkQnlJbnN0YW5jZXNPZixhZGFwdFdpdGgsaXNfaW1wbGVtZW50ZWRfYnkKKworIyBMaXN0IG9mIG1ldGhvZCBuYW1lcyB1c2VkIHRvIGRlY2xhcmUgKGkuZS4gYXNzaWduKSBpbnN0YW5jZSBhdHRyaWJ1dGVzLgorZGVmaW5pbmctYXR0ci1tZXRob2RzPV9faW5pdF9fLF9fbmV3X18sc2V0VXAKKworCisjIGNoZWNrcyBmb3Igc2ltaWxhcml0aWVzIGFuZCBkdXBsaWNhdGVkIGNvZGUuIFRoaXMgY29tcHV0YXRpb24gbWF5IGJlCisjIG1lbW9yeSAvIENQVSBpbnRlbnNpdmUsIHNvIHlvdSBzaG91bGQgZGlzYWJsZSBpdCBpZiB5b3UgZXhwZXJpbWVudHMgc29tZQorIyBwcm9ibGVtcy4KKyMKK1tTSU1JTEFSSVRJRVNdCisKKyMgTWluaW11bSBsaW5lcyBudW1iZXIgb2YgYSBzaW1pbGFyaXR5LgorbWluLXNpbWlsYXJpdHktbGluZXM9NAorCisjIElnbm9yZSBjb21tZW50cyB3aGVuIGNvbXB1dGluZyBzaW1pbGFyaXRpZXMuCitpZ25vcmUtY29tbWVudHM9eWVzCisKKyMgSWdub3JlIGRvY3N0cmluZ3Mgd2hlbiBjb21wdXRpbmcgc2ltaWxhcml0aWVzLgoraWdub3JlLWRvY3N0cmluZ3M9eWVzCisKKworIyBjaGVja3MgZm9yOgorIyAqIHdhcm5pbmcgbm90ZXMgaW4gdGhlIGNvZGUgbGlrZSBGSVhNRSwgWFhYCisjICogUEVQIDI2Mzogc291cmNlIGNvZGUgd2l0aCBub24gYXNjaWkgY2hhcmFjdGVyIGJ1dCBubyBlbmNvZGluZyBkZWNsYXJhdGlvbgorIworW01JU0NFTExBTkVPVVNdCisKKyMgTGlzdCBvZiBub3RlIHRhZ3MgdG8gdGFrZSBpbiBjb25zaWRlcmF0aW9uLCBzZXBhcmF0ZWQgYnkgYSBjb21tYS4KK25vdGVzPUZJWE1FLFhYWCxUT0RPCisKKworIyBjaGVja3MgZm9yIDoKKyMgKiB1bmF1dGhvcml6ZWQgY29uc3RydWN0aW9ucworIyAqIHN0cmljdCBpbmRlbnRhdGlvbgorIyAqIGxpbmUgbGVuZ3RoCisjICogdXNlIG9mIDw+IGluc3RlYWQgb2YgIT0KKyMKK1tGT1JNQVRdCisKKyMgTWF4aW11bSBudW1iZXIgb2YgY2hhcmFjdGVycyBvbiBhIHNpbmdsZSBsaW5lLgorbWF4LWxpbmUtbGVuZ3RoPTgwCisKKyMgTWF4aW11bSBudW1iZXIgb2YgbGluZXMgaW4gYSBtb2R1bGUKK21heC1tb2R1bGUtbGluZXM9MTAwMAorCisjIFN0cmluZyB1c2VkIGFzIGluZGVudGF0aW9uIHVuaXQuIFRoaXMgaXMgdXN1YWxseSAiICAgICIgKDQgc3BhY2VzKSBvciAiXHQiICgxCisjIHRhYikuICBJbiByZXBvIGl0IGlzIDIgc3BhY2VzLgoraW5kZW50LXN0cmluZz0nICAnCmRpZmYgLS1naXQgYS9jb250cmliL2Zha2VfbGRhcC5wbCBiL2NvbnRyaWIvZmFrZV9sZGFwLnBsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjVkNDIzYTc4Ci0tLSAvZGV2L251bGwKKysrIGIvY29udHJpYi9mYWtlX2xkYXAucGwKQEAgLTAsMCArMSwzMzMgQEAKKyMhL3Vzci9iaW4vZW52IHBlcmwKKworIyBGYWtlIExEQVAgc2VydmVyIGZvciBHZXJyaXQKKyMgQXV0aG9yOiBPbGl2aWVyIENyb3F1ZXR0ZSA8b2Nyb3F1ZXR0ZUBmcmVlLmZyPgorIyBMYXN0IGNoYW5nZTogMjAxMi0xMS0xMgorIworIyBBYnN0cmFjdDoKKyMgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKyMKKyMgR2Vycml0IGN1cnJlbnRseSBzdXBwb3J0cyBzZXZlcmFsIGF1dGhlbnRpY2F0aW9uIHNjaGVtZXMsIGJ1dAorIyB1bmZvcnR1bmF0ZWx5IG5vdCB0aGUgbW9zdCBiYXNpYyBvbmUsIGUuZy4gbG9jYWwgYWNjb3VudHMgd2l0aAorIyBsb2NhbCBwYXNzd29yZHMuCisjCisjIEFzIGEgd29ya2Fyb3VuZCwgdGhpcyBzY3JpcHQgaW1wbGVtZW50cyBhIG1pbmltYWwgTERBUCBzZXJ2ZXIKKyMgdGhhdCBjYW4gYmUgdXNlZCB0byBhdXRoZW50aWNhdGUgYWdhaW5zdCBHZXJyaXQuIFRoZSBpbmZvcm1hdGlvbgorIyByZXF1aXJlZCBieSBHZXJyaXQgcmVsYXRpdmUgdG8gdXNlcnMgKHVzZXIgSUQsIHBhc3N3b3JkLCBkaXNwbGF5CisjIG5hbWUsIGVtYWlsKSBpcyBzdG9yZWQgaW4gYSB0ZXh0IGZpbGUgc2ltaWxhciB0byAvZXRjL3Bhc3N3ZAorIworIworIyBVc2FnZSAoc2VlIGJlbG93IGZvciB0aGUgc2V0dXApCisjID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CisjCisjIFRvIGNyZWF0ZSBhIG5ldyBmaWxlIHRvIHN0b3JlIHRoZSB1c2VyIGluZm9ybWF0aW9uOgorIyAgIGZha2UtbGRhcCBlZGl0dXNlciAtLWRhdGFmaWxlIC9wYXRoL2RhdGFmaWxlIC0tdXNlcm5hbWUgbWF4cG93ZXIgXAorIyAgICAgLS1kaXNwbGF5bmFtZSAiTWF4IFBvd2VyIiAtLWVtYWlsIG1heC5wb3dlckBwcm92aWRlci5jb20KKyMKKyMgVG8gbW9kaWZ5IGFuIGV4aXN0aW5nIHVzZXIgKGZvciBpbnN0YW5jZSB0aGUgZW1haWwpOgorIyAgIGZha2UtbGRhcCBlZGl0dXNlciAtLWRhdGFmaWxlIC9wYXRoL2RhdGFmaWxlIC0tdXNlcm5hbWUgb2Nyb3F1ZXR0ZSBcCisjICAgICAtLWVtYWlsIG1heC5wb3dlckBwcm92aWRlcjIuY29tCisjCisjIFRvIHNldCBhIG5ldyBwYXNzd29yZCBmb3IgYW4gZXhpc3RpbmcgdXNlcjoKKyMgICBmYWtlLWxkYXAgZWRpdHVzZXIgLS1kYXRhZmlsZSAvcGF0aC9kYXRhZmlsZSAtLXVzZXJuYW1lIG9jcm9xdWV0dGUgXAorIyAgICAgLS1wYXNzd29yZCAiIgorIworIyBUbyBzdGFydCB0aGUgc2VydmVyOgorIyAgIGZha2UtbGRhcCBzdGFydCAtLWRhdGFmaWxlIC9wYXRoL2RhdGFmaWxlCisjCisjIFRoZSBzZXJ2ZXIgcmVhZHMgdGhlIHVzZXIgZGF0YSBmaWxlIG9uIGVhY2ggbmV3IGNvbm5lY3Rpb24uIEl0J3Mgbm90CisjIHNjYWxhYmxlIGJ1dCBpdCBzaG91bGQgbm90IGJlIGEgcHJvYmxlbSBmb3IgdGhlIGludGVuZGVkIHVzYWdlCisjIChzbWFsbCB0ZWFtcywgdGVzdGluZywuLi4pCisjCisjCisjIFNldHVwCisjID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KKyMKKyMgSW5zdGFsbCB0aGUgZGVwZW5kZW5jaWVzCisjCisjICAgSW5zdGFsbCB0aGUgUGVybCBtb2R1bGUgZGVwZW5kZW5jaWVzLiBPbiBEZWJpYW4gYW5kIE1hY1BvcnRzLAorIyAgIGFsbCBtb2R1bGVzIGFyZSBhdmFpbGFibGUgYXMgcGFja2FnZXMsIGV4Y2VwdCBOZXQ6OkxEQVA6OlNlcnZlci4KKyMKKyMgICBEZWJpYW46IGFwdC1nZXQgaW5zdGFsbCBsaWJ0ZXJtLXJlYWRrZXktcGVybAorIworIyAgIFNpbmNlIE5ldDo6TERBUDo6U2VydmVyIGNvbnNpc3RzIG9ubHkgb2Ygb25lIGZpbGUsIHlvdSBjYW4gcHV0IGl0CisjICAgYWxvbmcgdGhlIHNjcmlwdCBpbiBOZXQvTERBUC9TZXJ2ZXIucG0KKyMKKyMgQ3JlYXRlIHRoZSBkYXRhIGZpbGUgd2l0aCB0aGUgZmlyc3QgdXNlciAoc2VlIGFib3ZlKQorIworIyBTdGFydCBhcyB0aGUgc2NyaXB0IGEgc2VydmVyICgic3RhcnQiIGNvbW1hbmQsIHNlZSBhYm92ZSkKKyMKKyMgQ29uZmlndXJlIEdlcnJpdCB3aXRoIHRoZSBmb2xsb3dpbmcgb3B0aW9uczoKKyMKKyMgICBnZXJyaXQuY2Fub25pY2FsV2ViVXJsID0gLi4uICh3b3JrYXJvdW5kIGZvciBhIGtub3duIEdlcnJpdCBidWcpCisjICAgYXV0aC50eXBlID0gTERBUF9CSU5ECisjICAgbGRhcC5zZXJ2ZXIgPSBsZGFwOi8vbG9jYWxob3N0OjEwMzg5CisjICAgbGRhcC5hY2NvdW50QmFzZSA9IG91PVBlb3BsZSxkYz1ub2RvbWFpbgorIyAgIGxkYXAuZ3JvdXBCYXNlID0gb3U9R3JvdXAsZGM9bm9kb21haW4KKyMKKyMgU3RhcnQgR2Vycml0CisjCisjIExvZyBvbiBpbiB0aGUgV2ViIGludGVyZmFjZQorIworIyBJZiB5b3Ugd2FudCB0aGUgZmFrZSBMREFQIHNlcnZlciB0byBzdGFydCBhdCBib290IHRpbWUsIGFkZCBpdCB0bworIyAvZXRjL2luaXR0YWIsIHdpdGggYSBsaW5lIGxpa2U6CisjCisjIGxkMTo2OnJlc3Bhd246c3Ugc29tZXVzZXIgL3BhdGgvZmFrZS1sZGFwIHN0YXJ0IC0tZGF0YWZpbGUgL3BhdGgvZGF0YWZpbGUKKyMKKyMgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorCit1c2Ugc3RyaWN0OworCisjIEdsb2JhbCB2YXIgY29udGFpbmluZyB0aGUgb3B0aW9ucyBwYXNzZWQgb24gdGhlIGNvbW1hbmQgbGluZToKK215ICVjbWRMaW5lT3B0aW9uczsKKworIyBHbG9iYWwgdmFyIGNvbnRhaW5pbmcgdGhlIHVzZXIgZGF0YSByZWFkIGZyb20gdGhlIGRhdGEgZmlsZToKK215ICV1c2VyRGF0YTsKKworbXkgJGRlZmF1bHRwb3J0ID0gMTAzODk7CisKK3BhY2thZ2UgTXlTZXJ2ZXI7CisKK3VzZSBEYXRhOjpEdW1wZXI7Cit1c2UgTmV0OjpMREFQOjpTZXJ2ZXI7Cit1c2UgTmV0OjpMREFQOjpDb25zdGFudCBxdyhMREFQX1NVQ0NFU1MgTERBUF9JTlZBTElEX0NSRURFTlRJQUxTIExEQVBfT1BFUkFUSU9OU19FUlJPUik7Cit1c2UgSU86OlNvY2tldDsKK3VzZSBJTzo6U2VsZWN0OwordXNlIFRlcm06OlJlYWRLZXk7CisKK3VzZSBHZXRvcHQ6Okxvbmc7CisKK3VzZSBiYXNlICdOZXQ6OkxEQVA6OlNlcnZlcic7CisKK3N1YiBiaW5kIHsKKyAgbXkgJHNlbGYgPSBzaGlmdDsKKyAgbXkgKCRyZXFEYXRhLCAkZnVsbFJlcXVlc3QpID0gQF87CisKKyAgcHJpbnQgImJpbmQgY2FsbGVkXG4iIGlmICRjbWRMaW5lT3B0aW9uc3t2ZXJib3NlfSA+PSAxOworICBwcmludCBEdW1wZXIoXEBfKSBpZiAkY21kTGluZU9wdGlvbnN7dmVyYm9zZX0gPj0gMjsKKyAgbXkgJHNoYTEgPSB1bmRlZjsKKyAgbXkgJHVpZCA9IHVuZGVmOworICBldmFseworICAgICR1aWQgPSAkcmVxRGF0YS0+e25hbWV9OworICAgICRzaGExID0gbWFpbjo6ZW5jcnlwdHB3ZCgkdWlkLCAkcmVxRGF0YS0+e2F1dGhlbnRpY2F0aW9ufS0+e3NpbXBsZX0pCisgIH07CisgIGlmICgkQCkgeworICAgIHdhcm4gJEA7CisgICAgcmV0dXJuKHsKKyAgICAgICAgJ21hdGNoZWRETicgPT4gJycsCisgICAgICAgICdlcnJvck1lc3NhZ2UnID0+ICRALAorICAgICAgICAncmVzdWx0Q29kZScgPT4gTERBUF9PUEVSQVRJT05TX0VSUk9SCisgICAgfSk7CisgIH0KKworICBwcmludCAkc2hhMSAuICJcbiIgaWYgJGNtZExpbmVPcHRpb25ze3ZlcmJvc2V9ID49IDI7CisgIHByaW50IER1bXBlcigkdXNlckRhdGF7JHVpZH0pIC4gIlxuIiBpZiAkY21kTGluZU9wdGlvbnN7dmVyYm9zZX0gPj0gMjsKKworICBpZiAoIGRlZmluZWQoJHNoYTEpICYmICRzaGExICYmICR1c2VyRGF0YXskdWlkfSAmJiAoICRzaGExIGVxICR1c2VyRGF0YXskdWlkfS0+e3Bhc3N3b3JkfSApICkgeworICAgIHByaW50ICJhdXRoZW50aWNhdGlvbiBvZiAkdWlkIHN1Y2NlZWRlZFxuIiBpZiAkY21kTGluZU9wdGlvbnN7dmVyYm9zZX0gPj0gMTsKKyAgICByZXR1cm4oeworICAgICAgJ21hdGNoZWRETicgPT4gImRuPSR1aWQsb3U9UGVvcGxlLGRjPW5vZG9tYWluIiwKKyAgICAgICdlcnJvck1lc3NhZ2UnID0+ICcnLAorICAgICAgJ3Jlc3VsdENvZGUnID0+IExEQVBfU1VDQ0VTUworICAgIH0pOworICB9CisgIGVsc2UgeworICAgIHByaW50ICJhdXRoZW50aWNhdGlvbiBvZiAkdWlkIGZhaWxlZFxuIiBpZiAkY21kTGluZU9wdGlvbnN7dmVyYm9zZX0gPj0gMTsKKyAgICByZXR1cm4oeworICAgICAgJ21hdGNoZWRETicgPT4gJycsCisgICAgICAnZXJyb3JNZXNzYWdlJyA9PiAnJywKKyAgICAgICdyZXN1bHRDb2RlJyA9PiBMREFQX0lOVkFMSURfQ1JFREVOVElBTFMKKyAgICB9KTsKKyAgfQorfQorCitzdWIgc2VhcmNoIHsKKyAgICBteSAkc2VsZiA9IHNoaWZ0OworICAgIG15ICgkcmVxRGF0YSwgJGZ1bGxSZXF1ZXN0KSA9IEBfOworICAgIHByaW50ICJzZWFyY2ggY2FsbGVkXG4iIGlmICRjbWRMaW5lT3B0aW9uc3t2ZXJib3NlfSA+PSAxOworICAgIHByaW50IER1bXBlcigkcmVxRGF0YSkgIGlmICRjbWRMaW5lT3B0aW9uc3t2ZXJib3NlfSA+PSAyOworICAgIG15IEBlbnRyaWVzOworICAgIGlmICggJHJlcURhdGEtPntiYXNlT2JqZWN0fSBlcSAnb3U9UGVvcGxlLGRjPW5vZG9tYWluJyApIHsKKyAgICAgICAgbXkgJHVpZCA9ICRyZXFEYXRhLT57ZmlsdGVyfS0+e2VxdWFsaXR5TWF0Y2h9LT57YXNzZXJ0aW9uVmFsdWV9OworICAgICAgICBwdXNoIEBlbnRyaWVzLCBOZXQ6OkxEQVA6OkVudHJ5LT5uZXcgKCAiZG49JHVpZCxvdT1QZW9wbGUsZGM9bm9kb21haW4iLAorICAgICAgICwgJ29iamVjdE5hbWUnPT4iZG49dWlkLG91PVBlb3BsZSxkYz1ub2RvbWFpbiIsICd1aWQnPT4kdWlkLCAnbWFpbCc9PiR1c2VyRGF0YXskdWlkfS0+e2VtYWlsfSwgJ2Rpc3BsYXlOYW1lJz0+JHVzZXJEYXRheyR1aWR9LT57ZGlzcGxheU5hbWV9KTsKKyAgIH0KKyAgIGVsc2lmICggJHJlcURhdGEtPntiYXNlT2JqZWN0fSBlcSAnb3U9R3JvdXAsZGM9bm9kb21haW4nICApIHsKKyAgICAgICAgcHVzaCBAZW50cmllcywgTmV0OjpMREFQOjpFbnRyeS0+bmV3ICggJ2RuPVVzZXJzLG91PUdyb3VwLGRjPW5vZG9tYWluJywKKyAgICAgICAsICdvYmplY3ROYW1lJz0+J2RuPVVzZXJzLG91PUdyb3VwLGRjPW5vZG9tYWluJyk7CisgICB9CisKKyAgICByZXR1cm4geworICAgICAgICAnbWF0Y2hlZEROJyA9PiAnJywKKyAgICAgICAgJ2Vycm9yTWVzc2FnZScgPT4gJycsCisgICAgICAgICdyZXN1bHRDb2RlJyA9PiBMREFQX1NVQ0NFU1MKKyAgICB9LCBAZW50cmllczsKK30KKworCitwYWNrYWdlIG1haW47CisKK3VzZSBEaWdlc3Q6OlNIQTEgIHF3KHNoYTEgc2hhMV9oZXggc2hhMV9iYXNlNjQpOworCitzdWIgZXhpdFdpdGhFcnJvciB7CisgIG15ICRtc2cgPSBzaGlmdDsKKyAgcHJpbnQgU1RERVJSICRtc2cgLiAiXG4iOworICBleGl0KDEpOworfQorCitzdWIgZW5jcnlwdHB3ZCB7CisgIG15ICgkdWlkLCAkcGFzc3dkKSA9IEBfOworICAjIFVzZSB0aGUgdXNlciBpZCB0byBjb21wdXRlIHRoZSBoYXNoLCB0byBhdm9pZCByYWluYm94IHRhYmxlIGF0dGFja3MKKyAgcmV0dXJuIHNoYTFfaGV4KCR1aWQuJHBhc3N3ZCk7Cit9CisKK215ICRyZXN1bHQgPSBHZXRvcHQ6Okxvbmc6OkdldE9wdGlvbnMgKAorICAicG9ydD1pIiAgICAgICAgPT4gXCRjbWRMaW5lT3B0aW9uc3twb3J0fSwKKyAgImRhdGFmaWxlPXMiICAgID0+IFwkY21kTGluZU9wdGlvbnN7ZGF0YWZpbGV9LAorICAiZW1haWw9cyIgICAgICAgPT4gXCRjbWRMaW5lT3B0aW9uc3tlbWFpbH0sCisgICJkaXNwbGF5bmFtZT1zIiA9PiBcJGNtZExpbmVPcHRpb25ze2Rpc3BsYXlOYW1lfSwKKyAgInVzZXJuYW1lPXMiICAgID0+IFwkY21kTGluZU9wdGlvbnN7dXNlck5hbWV9LAorICAicGFzc3dvcmQ9cyIgICAgPT4gXCRjbWRMaW5lT3B0aW9uc3twYXNzd29yZH0sCisgICJ2ZXJib3NlPWkiICAgICA9PiBcJGNtZExpbmVPcHRpb25ze3ZlcmJvc2V9LAorKTsKK2V4aXRXaXRoRXJyb3IoIkZhaWxlZCB0byBwYXJzZSBjb21tYW5kIGxpbmUgYXJndW1lbnRzIikgaWYgISAkcmVzdWx0OworZXhpdFdpdGhFcnJvcigiUGxlYXNlIHByb3ZpZGUgYSB2YWxpZCBwYXRoIGZvciB0aGUgZGF0YWZpbGUiKSBpZiAhICRjbWRMaW5lT3B0aW9uc3tkYXRhZmlsZX07CisKK215IEBjb21tYW5kcyA9IHF3KHN0YXJ0IGVkaXR1c2VyKTsKK2lmICggQEFSR1YgIT0gMSB8fCAhIGdyZXAgeyRfIGVxICRBUkdWWzBdfSBAY29tbWFuZHMgKSB7CisgIGV4aXRXaXRoRXJyb3IoIlBsZWFzZSBwcm92aWRlIGEgdmFsaWQgY29tbWFuZCBhbW9uZzogIiAuIGpvaW4oIiwiLCBAY29tbWFuZHMpKTsKK30KKworbXkgJGNvbW1hbmQgPSAkQVJHVlswXTsKK2lmICggJGNvbW1hbmQgZXEgInN0YXJ0IikgeworICBzdGFydFNlcnZlcigpOworfQorZWxzaWYgKCAkY29tbWFuZCBlcSAiZWRpdHVzZXIiKSB7CisgIGVkaXRVc2VyKCk7Cit9CisKKworc3ViIHN0YXJ0U2VydmVyKCkgeworCisgIG15ICRwb3J0ID0gJGNtZExpbmVPcHRpb25ze3BvcnR9IHx8ICRkZWZhdWx0cG9ydDsKKworICBwcmludCAic3RhcnRpbmcgb24gcG9ydCAkcG9ydFxuIiBpZiAkY21kTGluZU9wdGlvbnN7dmVyYm9zZX0gPj0gMTsKKworICBteSAkc29jayA9IElPOjpTb2NrZXQ6OklORVQtPm5ldygKKyAgICBMaXN0ZW4gPT4gNSwKKyAgICBQcm90byA9PiAndGNwJywKKyAgICBSZXVzZSA9PiAxLAorICAgIExvY2FsQWRkciA9PiAibG9jYWxob3N0IiwgIyBDb21tZW50IHRoaXMgbGluZSBpZiBHZXJyaXQgZG9lc24ndCBydW4gb24gdGhpcyBob3N0CisgICAgTG9jYWxQb3J0ID0+ICRwb3J0CisgICk7CisKKyAgbXkgJHNlbCA9IElPOjpTZWxlY3QtPm5ldygkc29jayk7CisgIG15ICVIYW5kbGVyczsKKyAgd2hpbGUgKG15IEByZWFkeSA9ICRzZWwtPmNhbl9yZWFkKSB7CisgICAgZm9yZWFjaCBteSAkZmggKEByZWFkeSkgeworICAgICAgaWYgKCRmaCA9PSAkc29jaykgeworICAgICAgICAjIE1ha2Ugc3VyZSB0aGUgZGF0YSBpcyB1cCB0byBkYXRlIG9uIG5ldyBldmVyeSBjb25uZWN0aW9uCisgICAgICAgIHJlYWRVc2VyRGF0YSgpOworCisgICAgICAgICMgbGV0J3MgY3JlYXRlIGEgbmV3IHNvY2tldAorICAgICAgICBteSAkcHNvY2sgPSAkc29jay0+YWNjZXB0OworICAgICAgICAkc2VsLT5hZGQoJHBzb2NrKTsKKyAgICAgICAgJEhhbmRsZXJzeyokcHNvY2t9ID0gTXlTZXJ2ZXItPm5ldygkcHNvY2spOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgbXkgJHJlc3VsdCA9ICRIYW5kbGVyc3sqJGZofS0+aGFuZGxlOworICAgICAgICBpZiAoJHJlc3VsdCkgeworICAgICAgICAgICMgd2UgaGF2ZSBmaW5pc2hlZCB3aXRoIHRoZSBzb2NrZXQKKyAgICAgICAgICAkc2VsLT5yZW1vdmUoJGZoKTsKKyAgICAgICAgICAkZmgtPmNsb3NlOworICAgICAgICAgIGRlbGV0ZSAkSGFuZGxlcnN7KiRmaH07CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgIH0KK30KKworc3ViIHJlYWRVc2VyRGF0YSB7CisgICV1c2VyRGF0YSA9ICgpOworICBvcGVuIChNWUZJTEUsICI8JGNtZExpbmVPcHRpb25ze2RhdGFmaWxlfSIpIHx8IGV4aXRXaXRoRXJyb3IoIkNvdWxkIG5vdCBvcGVuIFwiJGNtZExpbmVPcHRpb25ze2RhdGFmaWxlfVwiIGZvciByZWFkaW5nIik7CisgIHdoaWxlICg8TVlGSUxFPikgeworICAgIGNob21wOworICAgIG15IEBmaWVsZHMgPSBzcGxpdCgvOi8sICRfKTsKKyAgICAkdXNlckRhdGF7JGZpZWxkc1swXX0gPSB7IHBhc3N3b3JkPT4kZmllbGRzWzFdLCBkaXNwbGF5TmFtZT0+JGZpZWxkc1syXSwgZW1haWw9PiRmaWVsZHNbM10gfTsKKyAgfQorICBjbG9zZSAoTVlGSUxFKTsKK30KKworc3ViIHdyaXRlVXNlckRhdGEgeworICBvcGVuIChNWUZJTEUsICI+JGNtZExpbmVPcHRpb25ze2RhdGFmaWxlfSIpIHx8IGV4aXRXaXRoRXJyb3IoIkNvdWxkIG5vdCBvcGVuIFwiJGNtZExpbmVPcHRpb25ze2RhdGFmaWxlfVwiIGZvciB3cml0aW5nIik7CisgIGZvcmVhY2ggbXkgJHVzZXJpZCAoc29ydChrZXlzKCV1c2VyRGF0YSkpKSB7CisgICAgbXkgJHVzZXJJbmZvID0gJHVzZXJEYXRheyR1c2VyaWR9OworICAgIHByaW50IE1ZRklMRSBqb2luKCI6IiwKKyAgICAgICR1c2VyaWQsCisgICAgICAkdXNlckluZm8tPntwYXNzd29yZH0sCisgICAgICAkdXNlckluZm8tPntkaXNwbGF5TmFtZX0sCisgICAgICAkdXNlckluZm8tPntlbWFpbH0KKyAgICAgICkuICJcbiI7CisgIH0KKyAgY2xvc2UgKE1ZRklMRSk7Cit9CisKK3N1YiByZWFkUGFzc3dvcmQgeworICBUZXJtOjpSZWFkS2V5OjpSZWFkTW9kZSgnbm9lY2hvJyk7CisgIG15ICRwYXNzd29yZCA9IFRlcm06OlJlYWRLZXk6OlJlYWRMaW5lKDApOworICBUZXJtOjpSZWFkS2V5OjpSZWFkTW9kZSgnbm9ybWFsJyk7CisgIHByaW50ICJcbiI7CisgIHJldHVybiAkcGFzc3dvcmQ7Cit9CisKK3N1YiByZWFkQW5kQ29uZmlybVBhc3N3b3JkIHsKKyAgcHJpbnQgIlBsZWFzZSBlbnRlciB0aGUgcGFzc3dvcmQ6ICI7CisgIG15ICRwd2QgPSByZWFkUGFzc3dvcmQoKTsKKyAgcHJpbnQgIlBsZWFzZSByZS1lbnRlciB0aGUgcGFzc3dvcmQ6ICI7CisgIG15ICRwd2RDaGVjayA9IHJlYWRQYXNzd29yZCgpOworICBleGl0V2l0aEVycm9yKCJUaGUgcGFzc3dvcmRzIGFyZSBkaWZmZXJlbnQiKSBpZiAkcHdkIG5lICRwd2RDaGVjazsKKyAgcmV0dXJuICRwd2Q7Cit9CisKK3N1YiBlZGl0VXNlciB7CisgIGV4aXRXaXRoRXJyb3IoIlBsZWFzZSBwcm92aWRlIGEgdmFsaWQgdXNlciBuYW1lIikgaWYgISAkY21kTGluZU9wdGlvbnN7dXNlck5hbWV9OworICBteSAkdXNlck5hbWUgPSAkY21kTGluZU9wdGlvbnN7dXNlck5hbWV9OworCisgIHJlYWRVc2VyRGF0YSgpIGlmIC1yICRjbWRMaW5lT3B0aW9uc3tkYXRhZmlsZX07CisKKyAgbXkgJGVuY3J5cHRlZFBhc3N3b3JkID0gdW5kZWY7CisgIGlmICggISBkZWZpbmVkKCR1c2VyRGF0YXskdXNlck5hbWV9KSApIHsKKyAgICAjIE5ldyB1c2VyCisKKyAgICBleGl0V2l0aEVycm9yKCJQbGVhc2UgcHJvdmlkZSBhIHZhbGlkIGRpc3BsYXkgbmFtZSIpIGlmICEgJGNtZExpbmVPcHRpb25ze2Rpc3BsYXlOYW1lfTsKKyAgICBleGl0V2l0aEVycm9yKCJQbGVhc2UgcHJvdmlkZSBhIHZhbGlkIGVtYWlsIikgaWYgISAkY21kTGluZU9wdGlvbnN7ZW1haWx9OworCisgICAgJHVzZXJEYXRheyR1c2VyTmFtZX0gPSB7IH07CisKKyAgICBpZiAoICEgZGVmaW5lZCgkY21kTGluZU9wdGlvbnN7cGFzc3dvcmR9KSApIHsKKyAgICAgICMgTm8gcGFzc3dvcmQgcHJvdmlkZWQgb24gdGhlIGNvbW1hbmQgbGluZS4gRm9yY2UgcmVhZGluZyBmcm9tIHRlcm1pbmFsLgorICAgICAgJGNtZExpbmVPcHRpb25ze3Bhc3N3b3JkfSA9ICIiOworICAgIH0KKyAgfQorCisgIGlmICggZGVmaW5lZCgkY21kTGluZU9wdGlvbnN7cGFzc3dvcmR9KSAmJiAhICRjbWRMaW5lT3B0aW9uc3twYXNzd29yZH0gKSB7CisgICAgJGNtZExpbmVPcHRpb25ze3Bhc3N3b3JkfSA9IHJlYWRBbmRDb25maXJtUGFzc3dvcmQoKTsKKyAgICBleGl0V2l0aEVycm9yKCJQbGVhc2UgcHJvdmlkZSBhIG5vbiBlbXB0eSBwYXNzd29yZCIpIGlmICEgJGNtZExpbmVPcHRpb25ze3Bhc3N3b3JkfTsKKyAgfQorCisKKyAgaWYgKCAkY21kTGluZU9wdGlvbnN7cGFzc3dvcmR9ICkgeworICAgICRlbmNyeXB0ZWRQYXNzd29yZCA9IGVuY3J5cHRwd2QoJHVzZXJOYW1lLCAkY21kTGluZU9wdGlvbnN7cGFzc3dvcmR9KTsKKyAgfQorCisKKyAgJHVzZXJEYXRheyR1c2VyTmFtZX0tPntwYXNzd29yZH0gICAgPSAkZW5jcnlwdGVkUGFzc3dvcmQgaWYgJGVuY3J5cHRlZFBhc3N3b3JkOworICAkdXNlckRhdGF7JHVzZXJOYW1lfS0+e2Rpc3BsYXlOYW1lfSA9ICRjbWRMaW5lT3B0aW9uc3tkaXNwbGF5TmFtZX0gaWYgJGNtZExpbmVPcHRpb25ze2Rpc3BsYXlOYW1lfTsKKyAgJHVzZXJEYXRheyR1c2VyTmFtZX0tPntlbWFpbH0gICAgICAgPSAkY21kTGluZU9wdGlvbnN7ZW1haWx9IGlmICRjbWRMaW5lT3B0aW9uc3tlbWFpbH07CisgICMgcHJpbnQgRGF0YTo6RHVtcGVyOjpEdW1wZXIoXCV1c2VyRGF0YSk7CisKKyAgcHJpbnQgIk5ldyB1c2VyIGRhdGEgZm9yICRjbWRMaW5lT3B0aW9uc3t1c2VyTmFtZX06XG4iOworICBmb3JlYWNoICggc29ydChrZXlzKCV7JHVzZXJEYXRheyR1c2VyTmFtZX19KSkpIHsKKyAgICBwcmludGYgIiAgJS0xNXMgOiAlc1xuIiwgJF8sICR1c2VyRGF0YXskdXNlck5hbWV9LT57JF99CisgIH0KKyAgd3JpdGVVc2VyRGF0YSgpOworfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL2NvbnRyaWIvdGhlbWVzL2RpZmZ5L2V0Yy9HZXJyaXRTaXRlLmNzcyBiL2NvbnRyaWIvdGhlbWVzL2RpZmZ5L2V0Yy9HZXJyaXRTaXRlLmNzcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kNDc2OTU3Ci0tLSAvZGV2L251bGwKKysrIGIvY29udHJpYi90aGVtZXMvZGlmZnkvZXRjL0dlcnJpdFNpdGUuY3NzCkBAIC0wLDAgKzEsMjkgQEAKKy8qIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisgKgorICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisgKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisgKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKyAqCisgKiBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyAqCisgKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisgKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorICogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisgKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKyAqLworI2dlcnJpdF90b3BtZW51IHsKKyAgbGVmdDogNjBweDsKKyAgbWFyZ2luLXJpZ2h0OiA2MHB4OworICBwYWRkaW5nLXJpZ2h0OiAxMHB4OworICBwb3NpdGlvbjogcmVsYXRpdmU7Cit9CisKKyNkaWZmeV9sb2dvIHsKKyAgZGlzcGxheTogYmxvY2sgIWltcG9ydGFudDsKKyAgbWFyZ2luLWJvdHRvbTogLTU1cHg7CisgIHBhZGRpbmctbGVmdDogMjBweDsKKyAgcG9zaXRpb246IHJlbGF0aXZlOworICB0b3A6IC00NXB4OworICB3aWR0aDogNjBweDsKK30KZGlmZiAtLWdpdCBhL2NvbnRyaWIvdGhlbWVzL2RpZmZ5L2V0Yy9HZXJyaXRTaXRlSGVhZGVyLmh0bWwgYi9jb250cmliL3RoZW1lcy9kaWZmeS9ldGMvR2Vycml0U2l0ZUhlYWRlci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg5YjRkYjUKLS0tIC9kZXYvbnVsbAorKysgYi9jb250cmliL3RoZW1lcy9kaWZmeS9ldGMvR2Vycml0U2l0ZUhlYWRlci5odG1sCkBAIC0wLDAgKzEsNSBAQAorPGRpdj4KKyAgPGRpdiBpZD0iZGlmZnlfbG9nbyI+CisgICAgPGltZyB3aWR0aD0iNTAiIGhlaWdodD0iNDYiIHNyYz0ic3RhdGljL2xvZ28ucG5nIi8+CisgIDwvZGl2PgorPC9kaXY+CmRpZmYgLS1naXQgYS9jb250cmliL3RoZW1lcy9kaWZmeS9zdGF0aWMvbG9nby5wbmcgYi9jb250cmliL3RoZW1lcy9kaWZmeS9zdGF0aWMvbG9nby5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTg5YzMwMwotLS0gL2Rldi9udWxsCisrKyBiL2NvbnRyaWIvdGhlbWVzL2RpZmZ5L3N0YXRpYy9sb2dvLnBuZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9jb250cmliL3RoZW1lcy9zcG90aWZ5L2V0Yy9HZXJyaXRTaXRlLmNzcyBiL2NvbnRyaWIvdGhlbWVzL3Nwb3RpZnkvZXRjL0dlcnJpdFNpdGUuY3NzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQ4OTQ1MmEKLS0tIC9kZXYvbnVsbAorKysgYi9jb250cmliL3RoZW1lcy9zcG90aWZ5L2V0Yy9HZXJyaXRTaXRlLmNzcwpAQCAtMCwwICsxLDExMyBAQAorI2dlcnJpdF90b3BtZW51IHsKKwlmb250LXNpemU6IDlwdCAhaW1wb3J0YW50OworCXBhZGRpbmctdG9wOiA1cHggIWltcG9ydGFudDsKKwlwYWRkaW5nLWxlZnQ6IDE1cHggIWltcG9ydGFudDsKKwlwYWRkaW5nLXJpZ2h0OiAxNXB4ICFpbXBvcnRhbnQ7CisJYmFja2dyb3VuZDogdXJsKHN0YXRpYy9iYWNrZ3JvdW5kLXNwb3RpZ3JlZW4uanBnKSAhaW1wb3J0YW50OworCWZsb2F0OiBsZWZ0ICFpbXBvcnRhbnQ7CisJbWFyZ2luLWxlZnQ6IDI1MHB4ICFpbXBvcnRhbnQ7CisJbWFyZ2luLXJpZ2h0OiAxNTBweCAhaW1wb3J0YW50OworCWJvcmRlci1yYWRpdXM6IDAgMCAxMHB4IDEwcHggIWltcG9ydGFudDsKKwlwYWRkaW5nLWJvdHRvbTogMTBweCAhaW1wb3J0YW50OworCWJvcmRlci1ib3R0b206IDFweCBzb2xpZCAjYWJjNTA2ICFpbXBvcnRhbnQ7CisJYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgI2FiYzUwNiAhaW1wb3J0YW50OworCWJvcmRlci1sZWZ0OiAxcHggc29saWQgI2FiYzUwNiAhaW1wb3J0YW50OworfQorCitib2R5LCAuZ3d0LURpYWxvZ0JveCAuZGlhbG9nTWlkZGxlQ2VudGVyIHsKKwliYWNrZ3JvdW5kOiAjRkZGIHVybChzdGF0aWMvYmFja2dyb3VuZC1ncmFkaWVudC5wbmcpIG5vLXJlcGVhdCAhaW1wb3J0YW50OworfQorCisjbG9nby1zcG90aWZ5IHsKKwliYWNrZ3JvdW5kOiB1cmwoc3RhdGljL2xvZ28ucG5nKSBuby1yZXBlYXQ7CisJaGVpZ2h0OiA5OHB4OworCXdpZHRoOiAyMjhweDsKKwltYXJnaW4tbGVmdDogMnB4OworfQorCisjZ2Vycml0X2hlYWRlciB7CisJYmFja2dyb3VuZDogI0ZDRkVFRjsKKwlwYWRkaW5nLWJvdHRvbTogMTBweDsKKwlib3JkZXItYm90dG9tOiBkYXNoZWQgMXB4IHJnYmEoMCwgMCwgMCwgMC4wNSk7Cit9CisKKyNnZXJyaXRfdG9wbWVudSAuZ3d0LVRleHRCb3ggeworCW1hcmdpbi10b3A6IDE1cHg7CisJd2lkdGg6IDI0MHB4OworfQorCisjZ2Vycml0X3RvcG1lbnUgPiB0YWJsZSB7CisgICAgZmxvYXQ6IGxlZnQ7Cit9CisKKyNnZXJyaXRfdG9wbWVudSA+IHRhYmxlID4gdGJvZHkgPiB0ciA+IHRkOm50aC1jaGlsZCgzKSBhIHsKKwltYXJnaW4tbGVmdDogNXB4OworCWJhY2tncm91bmQtY29sb3I6ICNGRkM7CisJYm9yZGVyLXJhZGl1czogM3B4OworCXBhZGRpbmc6IDVweCA1cHg7CisJYm9yZGVyLXJpZ2h0OiBub25lICFpbXBvcnRhbnQ7Cit9CisKKy5nd3QtVGFiUGFuZWxCb3R0b20geworCWJhY2tncm91bmQ6ICNGRkMgIWltcG9ydGFudDsKKwlib3JkZXItcmFkaXVzOiAwIDAgM3B4IDNweCAhaW1wb3J0YW50OworCXBhZGRpbmctYm90dG9tOiA2cHggIWltcG9ydGFudDsKKwlwYWRkaW5nLXRvcDogNnB4ICFpbXBvcnRhbnQ7Cit9CisKKy5nd3QtVGFiQmFyIC5nd3QtVGFiQmFySXRlbSwgLmd3dC1UYWJCYXIgLmd3dC1UYWJCYXJSZXN0LCAuZ3d0LVRhYkJhciAuZ3d0LVRhYlBhbmVsQm90dG9tIHsKKwliYWNrZ3JvdW5kOiB0cmFuc3BhcmVudCAhaW1wb3J0YW50OworfQorCisuZ3d0LVRhYkJhckl0ZW0td3JhcHBlciB7CisJYmFja2dyb3VuZDogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjIpICFpbXBvcnRhbnQ7Cit9CisKKyNnZXJyaXRfdG9wbWVudSAuZ3d0LVRhYkJhciAuZ3d0LVRhYkJhckl0ZW0tc2VsZWN0ZWQgeworCWJhY2tncm91bmQ6ICNGRkMgIWltcG9ydGFudDsKKwlib3JkZXItcmFkaXVzOiAzcHggM3B4IDAgMCAhaW1wb3J0YW50OworfQorCisjZ2Vycml0X3RvcG1lbnUgLmd3dC1UYWJCYXIgLmd3dC1UYWJCYXJJdGVtLXNlbGVjdGVkOmhvdmVyIHsKKwliYWNrZ3JvdW5kOiAjRkZDICFpbXBvcnRhbnQ7Cit9CisKKyNnZXJyaXRfdG9wbWVudSAuZ3d0LVRhYkJhciAuZ3d0LVRhYkJhckl0ZW0tc2VsZWN0ZWQ6Zm9jdXMgeworCW91dGxpbmU6IG5vbmUgIWltcG9ydGFudDsKK30KKworI2dlcnJpdF90b3BtZW51ID4gdGFibGUgPiB0Ym9keSA+IHRyID4gdGQgPiB0YWJsZSB7CisJYm9yZGVyOiBub25lICFpbXBvcnRhbnQ7Cit9CisKKy5nd3QtVGFiQmFyIHsKKwlib3JkZXItYm90dG9tOiAxcHggc29saWQgI0UyRTJBRCAhaW1wb3J0YW50OworfQorCisuZ3d0LVRhYkJhckl0ZW0geworCWJvcmRlci1yaWdodDogMXB4IHNvbGlkIHJnYmEoNzksIDU4LCAwLCAwLjMpICFpbXBvcnRhbnQ7CisJYmFja2dyb3VuZDogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjIpICFpbXBvcnRhbnQ7Cit9CisKKy5nd3QtVGFiQmFySXRlbTpob3ZlciB7CisJYmFja2dyb3VuZDogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjEpICFpbXBvcnRhbnQ7Cit9CisKK2EsIGE6dmlzaXRlZCB7CisJdGV4dC1kZWNvcmF0aW9uOiBub25lICFpbXBvcnRhbnQ7CisJY29sb3I6ICMzRjREMDAgIWltcG9ydGFudDsKK30KKworYTpob3ZlciB7CisJY29sb3I6ICM1ZDcyMDAgIWltcG9ydGFudDsKKwl0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZSAhaW1wb3J0YW50OworfQorCisuZ3d0LUxhYmVsIHsKK2hlaWdodDogMzBweCAhaW1wb3J0YW50OworbGluZS1oZWlnaHQ6IDMwcHggIWltcG9ydGFudDsKK30KKworI2dlcnJpdF9idG1tZW51ID4gZGl2IHsKKwljb2xvcjogcmdiYSgwLCAwLCAwLCAwLjMpICFpbXBvcnRhbnQ7Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvY29udHJpYi90aGVtZXMvc3BvdGlmeS9ldGMvR2Vycml0U2l0ZUhlYWRlci5odG1sIGIvY29udHJpYi90aGVtZXMvc3BvdGlmeS9ldGMvR2Vycml0U2l0ZUhlYWRlci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjhhZjg0YmUKLS0tIC9kZXYvbnVsbAorKysgYi9jb250cmliL3RoZW1lcy9zcG90aWZ5L2V0Yy9HZXJyaXRTaXRlSGVhZGVyLmh0bWwKQEAgLTAsMCArMSBAQAorPGRpdiBpZD0ibG9nby1zcG90aWZ5Ij48L2Rpdj4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9jb250cmliL3RoZW1lcy9zcG90aWZ5L3N0YXRpYy9iYWNrZ3JvdW5kLWdyYWRpZW50LnBuZyBiL2NvbnRyaWIvdGhlbWVzL3Nwb3RpZnkvc3RhdGljL2JhY2tncm91bmQtZ3JhZGllbnQucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI0MGYzNWIKLS0tIC9kZXYvbnVsbAorKysgYi9jb250cmliL3RoZW1lcy9zcG90aWZ5L3N0YXRpYy9iYWNrZ3JvdW5kLWdyYWRpZW50LnBuZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9jb250cmliL3RoZW1lcy9zcG90aWZ5L3N0YXRpYy9iYWNrZ3JvdW5kLXNwb3RpZ3JlZW4uanBnIGIvY29udHJpYi90aGVtZXMvc3BvdGlmeS9zdGF0aWMvYmFja2dyb3VuZC1zcG90aWdyZWVuLmpwZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mY2M3OTgzCi0tLSAvZGV2L251bGwKKysrIGIvY29udHJpYi90aGVtZXMvc3BvdGlmeS9zdGF0aWMvYmFja2dyb3VuZC1zcG90aWdyZWVuLmpwZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9jb250cmliL3RoZW1lcy9zcG90aWZ5L3N0YXRpYy9sb2dvLnBuZyBiL2NvbnRyaWIvdGhlbWVzL3Nwb3RpZnkvc3RhdGljL2xvZ28ucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJmZTFmY2UKLS0tIC9kZXYvbnVsbAorKysgYi9jb250cmliL3RoZW1lcy9zcG90aWZ5L3N0YXRpYy9sb2dvLnBuZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9jb250cmliL3RyaXZpYWxfcmViYXNlLnB5IGIvY29udHJpYi90cml2aWFsX3JlYmFzZS5weQppbmRleCBhNTE0YjRjLi43NzY0NDcwIDEwMDc1NQotLS0gYS9jb250cmliL3RyaXZpYWxfcmViYXNlLnB5CisrKyBiL2NvbnRyaWIvdHJpdmlhbF9yZWJhc2UucHkKQEAgLTEsNCArMSw0IEBACi0jIS91c3IvYmluL2VudiBweXRob24yLjYKKyMhL3Vzci9iaW4vZW52IHB5dGhvbgogCiAjIENvcHlyaWdodCAoYykgMjAxMCwgQ29kZSBBdXJvcmEgRm9ydW0uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCkBAIC0yNywxOTYgKzI3LDIyNCBAQAogIyBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOCiAjIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi0jIFRoaXMgc2NyaXB0IGlzIGRlc2lnbmVkIHRvIGRldGVjdCB3aGVuIGEgcGF0Y2hzZXQgdXBsb2FkZWQgdG8gR2Vycml0IGlzCi0jICdpZGVudGljYWwnIChkZXRlcm1pbmVkIHZpYSBnaXQtcGF0Y2gtaWQpIGFuZCByZWFwcGx5IHJldmlld3Mgb250byB0aGUgbmV3Ci0jIHBhdGNoc2V0IGZyb20gdGhlIHByZXZpb3VzIHBhdGNoc2V0LgorIiIiIFRoaXMgc2NyaXB0IGlzIGRlc2lnbmVkIHRvIGRldGVjdCB3aGVuIGEgcGF0Y2hzZXQgdXBsb2FkZWQgdG8gR2Vycml0IGlzCisnaWRlbnRpY2FsJyAoZGV0ZXJtaW5lZCB2aWEgZ2l0LXBhdGNoLWlkKSBhbmQgcmVhcHBseSByZXZpZXdzIG9udG8gdGhlIG5ldworcGF0Y2hzZXQgZnJvbSB0aGUgcHJldmlvdXMgcGF0Y2hzZXQuCiAKLSMgR2V0IHVzYWdlIGFuZCBoZWxwIGluZm8gYnkgcnVubmluZzogLi90cml2aWFsX3JlYmFzZS5weSAtLWhlbHAKLSMgRG9jdW1lbnRhdGlvbiBpcyBhdmFpbGFibGUgaGVyZTogaHR0cHM6Ly93d3cuY29kZWF1cm9yYS5vcmcveHdpa2kvYmluL1FBRVAvR2Vycml0CitHZXQgdXNhZ2UgYW5kIGhlbHAgaW5mbyBieSBydW5uaW5nOiAuL3RyaXZpYWxfcmViYXNlLnB5IC0taGVscAorRG9jdW1lbnRhdGlvbiBpcyBhdmFpbGFibGUgaGVyZTogaHR0cHM6Ly93d3cuY29kZWF1cm9yYS5vcmcveHdpa2kvYmluL1FBRVAvR2Vycml0CiAKKyIiIgorCitpbXBvcnQgYXJncGFyc2UKIGltcG9ydCBqc29uCi1mcm9tIG9wdHBhcnNlIGltcG9ydCBPcHRpb25QYXJzZXIKK2ltcG9ydCByZQogaW1wb3J0IHN1YnByb2Nlc3MKLWZyb20gc3lzIGltcG9ydCBleGl0CitpbXBvcnQgc3lzCiAKLWNsYXNzIENoZWNrQ2FsbEVycm9yKE9TRXJyb3IpOgotICAiIiJDaGVja0NhbGwoKSByZXR1cm5lZCBub24tMC4iIiIKLSAgZGVmIF9faW5pdF9fKHNlbGYsIGNvbW1hbmQsIGN3ZCwgcmV0Y29kZSwgc3Rkb3V0LCBzdGRlcnI9Tm9uZSk6Ci0gICAgT1NFcnJvci5fX2luaXRfXyhzZWxmLCBjb21tYW5kLCBjd2QsIHJldGNvZGUsIHN0ZG91dCwgc3RkZXJyKQotICAgIHNlbGYuY29tbWFuZCA9IGNvbW1hbmQKLSAgICBzZWxmLmN3ZCA9IGN3ZAotICAgIHNlbGYucmV0Y29kZSA9IHJldGNvZGUKLSAgICBzZWxmLnN0ZG91dCA9IHN0ZG91dAotICAgIHNlbGYuc3RkZXJyID0gc3RkZXJyCitjbGFzcyBUcml2aWFsUmViYXNlOgorICBkZWYgX19pbml0X18oc2VsZik6CisgICAgdXNhZ2UgPSAiJShwcm9nKXMgPHJlcXVpcmVkIG9wdGlvbnM+IFstLXNlcnZlci1wb3J0PVBPUlRdIgorICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKHVzYWdlPXVzYWdlKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoIi0tY2hhbmdlLXVybCIsIGRlc3Q9ImNoYW5nZVVybCIsIGhlbHA9IkNoYW5nZSBVUkwiKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoIi0tcHJvamVjdCIsIGhlbHA9IlByb2plY3QgcGF0aCBpbiBHZXJyaXQiKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoIi0tY29tbWl0IiwgaGVscD0iR2l0IGNvbW1pdC1pc2ggZm9yIHRoaXMgcGF0Y2hzZXQiKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoIi0tcGF0Y2hzZXQiLCB0eXBlPWludCwgaGVscD0iVGhlIHBhdGNoc2V0IG51bWJlciIpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgiLS1wcml2YXRlLWtleS1wYXRoIiwgZGVzdD0icHJpdmF0ZV9rZXlfcGF0aCIsCisgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJGdWxsIHBhdGggdG8gR2Vycml0IFNTSCBkYWVtb24ncyBwcml2YXRlIGhvc3Qga2V5IikKKyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCItLXNlcnZlciIsIGRlZmF1bHQ9J2xvY2FsaG9zdCcsCisgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSJHZXJyaXQgU1NIIHNlcnZlciBbZGVmYXVsdDogJShkZWZhdWx0KXNdIikKKyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCItLXNlcnZlci1wb3J0IiwgZGVzdD0icG9ydCIsIGRlZmF1bHQ9JzI5NDE4JywKKyAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9IlBvcnQgdG8gY29ubmVjdCB0byBHZXJyaXQncyBTU0ggZGFlbW9uICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIltkZWZhdWx0OiAlKGRlZmF1bHQpc10iKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoIi0tc3NoIiwgZGVmYXVsdD0ic3NoIiwgaGVscD0iU1NIIGV4ZWN1dGFibGUiKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoIi0tc3NoLXBvcnQtZmxhZyIsIGRlc3Q9InNzaF9wb3J0X2ZsYWciLCBkZWZhdWx0PSItcCIsIGhlbHA9IlNTSCBwb3J0IGZsYWciKQogCi1kZWYgQ2hlY2tDYWxsKGNvbW1hbmQsIGN3ZD1Ob25lKToKLSAgIiIiTGlrZSBzdWJwcm9jZXNzLmNoZWNrX2NhbGwoKSBidXQgcmV0dXJucyBzdGRvdXQuCisgICAgYXJncyA9IHBhcnNlci5wYXJzZV9rbm93bl9hcmdzKClbMF0KKyAgICBpZiBOb25lIGluIFthcmdzLmNoYW5nZVVybCwgYXJncy5wcm9qZWN0LCBhcmdzLmNvbW1pdCwgYXJncy5wYXRjaHNldF06CisgICAgICBwYXJzZXIuZXJyb3IoIkluY29tcGxldGUgYXJndW1lbnRzIikKKyAgICB0cnk6CisgICAgICBzZWxmLmNoYW5nZUlkID0gcmUuc2VhcmNoKHInXGQrJCcsIGFyZ3MuY2hhbmdlVXJsKS5ncm91cCgpCisgICAgZXhjZXB0IEF0dHJpYnV0ZUVycm9yOgorICAgICAgcGFyc2VyLmVycm9yKCJJbnZhbGlkIGNoYW5nZUlkIikKKyAgICBzZWxmLnByb2plY3QgPSBhcmdzLnByb2plY3QKKyAgICBzZWxmLmNvbW1pdCA9IGFyZ3MuY29tbWl0CisgICAgc2VsZi5wYXRjaHNldCA9IGFyZ3MucGF0Y2hzZXQKKyAgICBzZWxmLnByaXZhdGVfa2V5X3BhdGggPSBhcmdzLnByaXZhdGVfa2V5X3BhdGgKKyAgICBzZWxmLnNlcnZlciA9IGFyZ3Muc2VydmVyCisgICAgc2VsZi5wb3J0ID0gYXJncy5wb3J0CisgICAgc2VsZi5zc2ggPSBhcmdzLnNzaAorICAgIHNlbGYuc3NoX3BvcnRfZmxhZyA9IGFyZ3Muc3NoX3BvcnRfZmxhZwogCi0gIFdvcmtzIG9uIHB5dGhvbiAyLjQKLSAgIiIiCi0gIHRyeToKLSAgICBwcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3Blbihjb21tYW5kLCBjd2Q9Y3dkLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFKQotICAgIHN0ZF9vdXQsIHN0ZF9lcnIgPSBwcm9jZXNzLmNvbW11bmljYXRlKCkKLSAgZXhjZXB0IE9TRXJyb3IsIGU6Ci0gICAgcmFpc2UgQ2hlY2tDYWxsRXJyb3IoY29tbWFuZCwgY3dkLCBlLmVycm5vLCBOb25lKQotICBpZiBwcm9jZXNzLnJldHVybmNvZGU6Ci0gICAgcmFpc2UgQ2hlY2tDYWxsRXJyb3IoY29tbWFuZCwgY3dkLCBwcm9jZXNzLnJldHVybmNvZGUsIHN0ZF9vdXQsIHN0ZF9lcnIpCi0gIHJldHVybiBzdGRfb3V0LCBzdGRfZXJyCisgIGNsYXNzIENoZWNrQ2FsbEVycm9yKE9TRXJyb3IpOgorICAgICIiIkNoZWNrQ2FsbCgpIHJldHVybmVkIG5vbi0wLiIiIgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjb21tYW5kLCBjd2QsIHJldGNvZGUsIHN0ZG91dCwgc3RkZXJyPU5vbmUpOgorICAgICAgT1NFcnJvci5fX2luaXRfXyhzZWxmLCBjb21tYW5kLCBjd2QsIHJldGNvZGUsIHN0ZG91dCwgc3RkZXJyKQorICAgICAgc2VsZi5jb21tYW5kID0gY29tbWFuZAorICAgICAgc2VsZi5jd2QgPSBjd2QKKyAgICAgIHNlbGYucmV0Y29kZSA9IHJldGNvZGUKKyAgICAgIHNlbGYuc3Rkb3V0ID0gc3Rkb3V0CisgICAgICBzZWxmLnN0ZGVyciA9IHN0ZGVycgogCi1kZWYgR3NxbFF1ZXJ5KHNxbF9xdWVyeSwgc2VydmVyLCBwb3J0KToKLSAgIiIiUnVucyBhIGdlcnJpdCBnc3FsIHF1ZXJ5IGFuZCByZXR1cm5zIHRoZSByZXN1bHQiIiIKLSAgZ3NxbF9jbWQgPSBbJ3NzaCcsICctcCcsIHBvcnQsIHNlcnZlciwgJ2dlcnJpdCcsICdnc3FsJywgJy0tZm9ybWF0JywKLSAgICAgICAgICAgICAgJ0pTT04nLCAnLWMnLCBzcWxfcXVlcnldCi0gIHRyeToKLSAgICAoZ3NxbF9vdXQsIGdzcWxfc3RkZXJyKSA9IENoZWNrQ2FsbChnc3FsX2NtZCkKLSAgZXhjZXB0IENoZWNrQ2FsbEVycm9yLCBlOgotICAgIHByaW50ICJyZXR1cm4gY29kZSBpcyAlcyIgJSBlLnJldGNvZGUKLSAgICBwcmludCAic3Rkb3V0IGFuZCBzdGRlcnIgaXNcbiVzJXMiICUgKGUuc3Rkb3V0LCBlLnN0ZGVycikKLSAgICByYWlzZQorICBkZWYgQ2hlY2tDYWxsKHNlbGYsIGNvbW1hbmQsIGN3ZD1Ob25lKToKKyAgICAiIiJMaWtlIHN1YnByb2Nlc3MuY2hlY2tfY2FsbCgpIGJ1dCByZXR1cm5zIHN0ZG91dC4KIAotICBuZXdfb3V0ID0gZ3NxbF9vdXQucmVwbGFjZSgnfX1cbicsICd9fVxuc3BsaXQgaGVyZVxuJykKLSAgcmV0dXJuIG5ld19vdXQuc3BsaXQoJ3NwbGl0IGhlcmVcbicpCisgICAgV29ya3Mgb24gcHl0aG9uIDIuNAogCi1kZWYgRmluZFByZXZSZXYoY2hhbmdlSWQsIHBhdGNoc2V0LCBzZXJ2ZXIsIHBvcnQpOgotICAiIiJGaW5kcyB0aGUgcmV2aXNpb24gb2YgdGhlIHByZXZpb3VzIHBhdGNoIHNldCBvbiB0aGUgY2hhbmdlIiIiCi0gIHNxbF9xdWVyeSA9ICgiXCJTRUxFQ1QgcmV2aXNpb24gRlJPTSBwYXRjaF9zZXRzLGNoYW5nZXMgV0hFUkUgIgotICAgICAgICAgICAgICAgInBhdGNoX3NldHMuY2hhbmdlX2lkID0gY2hhbmdlcy5jaGFuZ2VfaWQgQU5EICIKLSAgICAgICAgICAgICAgICJwYXRjaF9zZXRzLnBhdGNoX3NldF9pZCA9ICVzIEFORCAiCi0gICAgICAgICAgICAgICAiY2hhbmdlcy5jaGFuZ2Vfa2V5ID0gXCclc1wnXCIiICUgKChwYXRjaHNldCAtIDEpLCBjaGFuZ2VJZCkpCi0gIHJldmlzaW9ucyA9IEdzcWxRdWVyeShzcWxfcXVlcnksIHNlcnZlciwgcG9ydCkKKyAgICAiIiIKKyAgICB0cnk6CisgICAgICBwcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3Blbihjb21tYW5kLCBjd2Q9Y3dkLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQorICAgICAgc3RkX291dCwgc3RkX2VyciA9IHByb2Nlc3MuY29tbXVuaWNhdGUoKQorICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgorICAgICAgcmFpc2Ugc2VsZi5DaGVja0NhbGxFcnJvcihjb21tYW5kLCBjd2QsIGUuZXJybm8sIE5vbmUpCisgICAgaWYgcHJvY2Vzcy5yZXR1cm5jb2RlOgorICAgICAgcmFpc2Ugc2VsZi5DaGVja0NhbGxFcnJvcihjb21tYW5kLCBjd2QsIHByb2Nlc3MucmV0dXJuY29kZSwgc3RkX291dCwgc3RkX2VycikKKyAgICByZXR1cm4gc3RkX291dCwgc3RkX2VycgogCi0gIGpzb25fZGljdCA9IGpzb24ubG9hZHMocmV2aXNpb25zWzBdLCBzdHJpY3Q9RmFsc2UpCi0gIHJldHVybiBqc29uX2RpY3RbImNvbHVtbnMiXVsicmV2aXNpb24iXQorICBkZWYgR3NxbFF1ZXJ5KHNlbGYsIHNxbF9xdWVyeSk6CisgICAgIiIiUnVuIGEgZ2Vycml0IGdzcWwgcXVlcnkgYW5kIHJldHVybiB0aGUgcmVzdWx0LiIiIgorICAgIGdzcWxfY21kID0gW3NlbGYuc3NoLCBzZWxmLnNzaF9wb3J0X2ZsYWcsIHNlbGYucG9ydCwgc2VsZi5zZXJ2ZXIsICdnZXJyaXQnLCAnZ3NxbCcsCisgICAgICAgICAgICAgICAgJy0tZm9ybWF0JywgJ0pTT04nLCAnLWMnLCBzcWxfcXVlcnldCisgICAgdHJ5OgorICAgICAgKGdzcWxfb3V0LCBfZ3NxbF9zdGRlcnIpID0gc2VsZi5DaGVja0NhbGwoZ3NxbF9jbWQpCisgICAgZXhjZXB0IHNlbGYuQ2hlY2tDYWxsRXJyb3IsIGU6CisgICAgICBwcmludCAicmV0dXJuIGNvZGUgaXMgJXMiICUgZS5yZXRjb2RlCisgICAgICBwcmludCAic3Rkb3V0IGFuZCBzdGRlcnIgaXNcbiVzJXMiICUgKGUuc3Rkb3V0LCBlLnN0ZGVycikKKyAgICAgIHJhaXNlCiAKLWRlZiBHZXRBcHByb3ZhbHMoY2hhbmdlSWQsIHBhdGNoc2V0LCBzZXJ2ZXIsIHBvcnQpOgotICAiIiJHZXQgYWxsIHRoZSBhcHByb3ZhbHMgb24gYSBzcGVjaWZpYyBwYXRjaCBzZXQKKyAgICBuZXdfb3V0ID0gZ3NxbF9vdXQucmVwbGFjZSgnfX1cbicsICd9fVxuc3BsaXQgaGVyZVxuJykKKyAgICByZXR1cm4gbmV3X291dC5zcGxpdCgnc3BsaXQgaGVyZVxuJykKIAotICBSZXR1cm5zIGEgbGlzdCBvZiBhcHByb3ZhbCBkaWN0cyIiIgotICBzcWxfcXVlcnkgPSAoIlwiU0VMRUNUIHZhbHVlLGFjY291bnRfaWQsY2F0ZWdvcnlfaWQgRlJPTSBwYXRjaF9zZXRfYXBwcm92YWxzICIKLSAgICAgICAgICAgICAgICJXSEVSRSBwYXRjaF9zZXRfaWQgPSAlcyBBTkQgY2hhbmdlX2lkID0gKFNFTEVDVCBjaGFuZ2VfaWQgRlJPTSAiCi0gICAgICAgICAgICAgICAiY2hhbmdlcyBXSEVSRSBjaGFuZ2Vfa2V5ID0gXCclc1wnKSBBTkQgdmFsdWUgPD4gMFwiIgotICAgICAgICAgICAgICAgJSAoKHBhdGNoc2V0IC0gMSksIGNoYW5nZUlkKSkKLSAgZ3NxbF9vdXQgPSBHc3FsUXVlcnkoc3FsX3F1ZXJ5LCBzZXJ2ZXIsIHBvcnQpCi0gIGFwcHJvdmFscyA9IFtdCi0gIGZvciBqc29uX3N0ciBpbiBnc3FsX291dDoKLSAgICBkaWN0ID0ganNvbi5sb2Fkcyhqc29uX3N0ciwgc3RyaWN0PUZhbHNlKQotICAgIGlmIGRpY3RbInR5cGUiXSA9PSAicm93IjoKLSAgICAgIGFwcHJvdmFscy5hcHBlbmQoZGljdFsiY29sdW1ucyJdKQotICByZXR1cm4gYXBwcm92YWxzCisgIGRlZiBGaW5kUHJldlJldihzZWxmKToKKyAgICAiIiJGaW5kIHRoZSByZXZpc2lvbiBvZiB0aGUgcHJldmlvdXMgcGF0Y2ggc2V0IG9uIHRoZSBjaGFuZ2UuIiIiCisgICAgc3FsX3F1ZXJ5ID0gKCJcIlNFTEVDVCByZXZpc2lvbiBGUk9NIHBhdGNoX3NldHMgV0hFUkUgIgorICAgICAgICAgICAgICAgICAiY2hhbmdlX2lkID0gJXMgQU5EIHBhdGNoX3NldF9pZCA9ICVzXCIiICUKKyAgICAgICAgICAgICAgICAgKHNlbGYuY2hhbmdlSWQsIChzZWxmLnBhdGNoc2V0IC0gMSkpKQorICAgIHJldmlzaW9ucyA9IHNlbGYuR3NxbFF1ZXJ5KHNxbF9xdWVyeSkKIAotZGVmIEdldEVtYWlsRnJvbUFjY3RJZChhY2NvdW50X2lkLCBzZXJ2ZXIsIHBvcnQpOgotICAiIiJSZXR1cm5zIHRoZSBwcmVmZXJyZWQgZW1haWwgYWRkcmVzcyBhc3NvY2lhdGVkIHdpdGggdGhlIGFjY291bnRfaWQiIiIKLSAgc3FsX3F1ZXJ5ID0gKCJcIlNFTEVDVCBwcmVmZXJyZWRfZW1haWwgRlJPTSBhY2NvdW50cyBXSEVSRSBhY2NvdW50X2lkID0gJXNcIiIKLSAgICAgICAgICAgICAgICUgYWNjb3VudF9pZCkKLSAgZW1haWxfYWRkciA9IEdzcWxRdWVyeShzcWxfcXVlcnksIHNlcnZlciwgcG9ydCkKKyAgICBqc29uX2RpY3QgPSBqc29uLmxvYWRzKHJldmlzaW9uc1swXSwgc3RyaWN0PUZhbHNlKQorICAgIHJldHVybiBqc29uX2RpY3RbImNvbHVtbnMiXVsicmV2aXNpb24iXQogCi0gIGpzb25fZGljdCA9IGpzb24ubG9hZHMoZW1haWxfYWRkclswXSwgc3RyaWN0PUZhbHNlKQotICByZXR1cm4ganNvbl9kaWN0WyJjb2x1bW5zIl1bInByZWZlcnJlZF9lbWFpbCJdCisgIGRlZiBHZXRBcHByb3ZhbHMoc2VsZik6CisgICAgIiIiR2V0IGFsbCB0aGUgYXBwcm92YWxzIG9uIGEgc3BlY2lmaWMgcGF0Y2ggc2V0LgogCi1kZWYgR2V0UGF0Y2hJZChyZXZpc2lvbik6Ci0gIGdpdF9zaG93X2NtZCA9IFsnZ2l0JywgJ3Nob3cnLCByZXZpc2lvbl0KLSAgcGF0Y2hfaWRfY21kID0gWydnaXQnLCAncGF0Y2gtaWQnXQotICBwYXRjaF9pZF9wcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihwYXRjaF9pZF9jbWQsIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZGluPXN1YnByb2Nlc3MuUElQRSkKLSAgZ2l0X3Nob3dfcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oZ2l0X3Nob3dfY21kLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFKQotICByZXR1cm4gcGF0Y2hfaWRfcHJvY2Vzcy5jb21tdW5pY2F0ZShnaXRfc2hvd19wcm9jZXNzLmNvbW11bmljYXRlKClbMF0pWzBdCisgICAgUmV0dXJucyBhIGxpc3Qgb2YgYXBwcm92YWwgZGljdHMuCiAKLWRlZiBTdUV4ZWMoc2VydmVyLCBwb3J0LCBwcml2YXRlX2tleSwgYXNfdXNlciwgY21kKToKLSAgc3VleGVjX2NtZCA9IFsnc3NoJywgJy1sJywgIkdlcnJpdCBDb2RlIFJldmlldyIsICctcCcsIHBvcnQsIHNlcnZlciwgJy1pJywKLSAgICAgICAgICAgICAgICBwcml2YXRlX2tleSwgJ3N1ZXhlYycsICctLWFzJywgYXNfdXNlciwgJy0tJywgY21kXQotICBDaGVja0NhbGwoc3VleGVjX2NtZCkKKyAgICAiIiIKKyAgICBzcWxfcXVlcnkgPSAoIlwiU0VMRUNUIHZhbHVlLGFjY291bnRfaWQsY2F0ZWdvcnlfaWQgRlJPTSBwYXRjaF9zZXRfYXBwcm92YWxzICIKKyAgICAgICAgICAgICAgICAgIldIRVJFIGNoYW5nZV9pZCA9ICVzIEFORCBwYXRjaF9zZXRfaWQgPSAlcyBBTkQgdmFsdWUgIT0gMFwiIgorICAgICAgICAgICAgICAgICAlIChzZWxmLmNoYW5nZUlkLCAoc2VsZi5wYXRjaHNldCAtIDEpKSkKKyAgICBnc3FsX291dCA9IHNlbGYuR3NxbFF1ZXJ5KHNxbF9xdWVyeSkKKyAgICBhcHByb3ZhbHMgPSBbXQorICAgIGZvciBqc29uX3N0ciBpbiBnc3FsX291dDoKKyAgICAgIGRhdGEgPSBqc29uLmxvYWRzKGpzb25fc3RyLCBzdHJpY3Q9RmFsc2UpCisgICAgICBpZiBkYXRhWyJ0eXBlIl0gPT0gInJvdyI6CisgICAgICAgIGFwcHJvdmFscy5hcHBlbmQoZGF0YVsiY29sdW1ucyJdKQorICAgIHJldHVybiBhcHByb3ZhbHMKIAotZGVmIERpZmZDb21taXRNZXNzYWdlcyhjb21taXQxLCBjb21taXQyKToKLSAgbG9nX2NtZDEgPSBbJ2dpdCcsICdsb2cnLCAnLS1wcmV0dHk9Zm9ybWF0OiIlYW4gJWFlJW4lcyVuJWIiJywKLSAgICAgICAgICAgICAgY29tbWl0MSArICdeISddCi0gIGNvbW1pdDFfbG9nID0gQ2hlY2tDYWxsKGxvZ19jbWQxKQotICBsb2dfY21kMiA9IFsnZ2l0JywgJ2xvZycsICctLXByZXR0eT1mb3JtYXQ6IiVhbiAlYWUlbiVzJW4lYiInLAotICAgICAgICAgICAgICBjb21taXQyICsgJ14hJ10KLSAgY29tbWl0Ml9sb2cgPSBDaGVja0NhbGwobG9nX2NtZDIpCi0gIGlmIGNvbW1pdDFfbG9nICE9IGNvbW1pdDJfbG9nOgotICAgIHJldHVybiBUcnVlCi0gIHJldHVybiBGYWxzZQorICBkZWYgQXBwZW5kQWNjdEFwcHJvdmFsKHNlbGYsIGFjY291bnRfaWQsIHZhbHVlKToKKyAgICB0cnk6CisgICAgICBuZXd2YWwgPSBzZWxmLmFjY3RfYXBwcm92YWxzW2FjY291bnRfaWRdICsgJyAnICsgdmFsdWUKKyAgICBleGNlcHQgS2V5RXJyb3I6CisgICAgICBuZXd2YWwgPSB2YWx1ZQorICAgIHNlbGYuYWNjdF9hcHByb3ZhbHNbYWNjb3VudF9pZF0gPSBuZXd2YWwKIAotZGVmIE1haW4oKToKLSAgc2VydmVyID0gJ2xvY2FsaG9zdCcKLSAgdXNhZ2UgPSAidXNhZ2U6ICVwcm9nIDxyZXF1aXJlZCBvcHRpb25zPiBbLS1zZXJ2ZXItcG9ydD1QT1JUXSIKLSAgcGFyc2VyID0gT3B0aW9uUGFyc2VyKHVzYWdlPXVzYWdlKQotICBwYXJzZXIuYWRkX29wdGlvbigiLS1jaGFuZ2UiLCBkZXN0PSJjaGFuZ2VJZCIsIGhlbHA9IkNoYW5nZSBpZGVudGlmaWVyIikKLSAgcGFyc2VyLmFkZF9vcHRpb24oIi0tcHJvamVjdCIsIGhlbHA9IlByb2plY3QgcGF0aCBpbiBHZXJyaXQiKQotICBwYXJzZXIuYWRkX29wdGlvbigiLS1jb21taXQiLCBoZWxwPSJHaXQgY29tbWl0LWlzaCBmb3IgdGhpcyBwYXRjaHNldCIpCi0gIHBhcnNlci5hZGRfb3B0aW9uKCItLXBhdGNoc2V0IiwgdHlwZT0iaW50IiwgaGVscD0iVGhlIHBhdGNoc2V0IG51bWJlciIpCi0gIHBhcnNlci5hZGRfb3B0aW9uKCItLXByaXZhdGUta2V5LXBhdGgiLCBkZXN0PSJwcml2YXRlX2tleV9wYXRoIiwKLSAgICAgICAgICAgICAgICAgICAgaGVscD0iRnVsbCBwYXRoIHRvIEdlcnJpdCBTU0ggZGFlbW9uJ3MgcHJpdmF0ZSBob3N0IGtleSIpCi0gIHBhcnNlci5hZGRfb3B0aW9uKCItLXNlcnZlci1wb3J0IiwgZGVzdD0icG9ydCIsIGRlZmF1bHQ9JzI5NDE4JywKLSAgICAgICAgICAgICAgICAgICAgaGVscD0iUG9ydCB0byBjb25uZWN0IHRvIEdlcnJpdCdzIFNTSCBkYWVtb24gIgotICAgICAgICAgICAgICAgICAgICAgICAgICJbZGVmYXVsdDogJWRlZmF1bHRdIikKKyAgZGVmIEdldEVtYWlsRnJvbUFjY3RJZChzZWxmLCBhY2NvdW50X2lkKToKKyAgICAiIiJSZXR1cm4gdGhlIHByZWZlcnJlZCBlbWFpbCBhZGRyZXNzIGFzc29jaWF0ZWQgd2l0aCB0aGUgYWNjb3VudF9pZC4iIiIKKyAgICBzcWxfcXVlcnkgPSAoIlwiU0VMRUNUIHByZWZlcnJlZF9lbWFpbCBGUk9NIGFjY291bnRzIFdIRVJFIGFjY291bnRfaWQgPSAlc1wiIgorICAgICAgICAgICAgICAgICAlIGFjY291bnRfaWQpCisgICAgZW1haWxfYWRkciA9IHNlbGYuR3NxbFF1ZXJ5KHNxbF9xdWVyeSkKIAotICAob3B0aW9ucywgYXJncykgPSBwYXJzZXIucGFyc2VfYXJncygpCisgICAganNvbl9kaWN0ID0ganNvbi5sb2FkcyhlbWFpbF9hZGRyWzBdLCBzdHJpY3Q9RmFsc2UpCisgICAgcmV0dXJuIGpzb25fZGljdFsiY29sdW1ucyJdWyJwcmVmZXJyZWRfZW1haWwiXQogCi0gIGlmIG5vdCBvcHRpb25zLmNoYW5nZUlkOgotICAgIHBhcnNlci5wcmludF9oZWxwKCkKLSAgICBleGl0KDApCisgIGRlZiBHZXRQYXRjaElkKHNlbGYsIHJldmlzaW9uKToKKyAgICBnaXRfc2hvd19jbWQgPSBbJ2dpdCcsICdzaG93JywgcmV2aXNpb25dCisgICAgcGF0Y2hfaWRfY21kID0gWydnaXQnLCAncGF0Y2gtaWQnXQorICAgIGdpdF9zaG93X3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGdpdF9zaG93X2NtZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkKKyAgICBwYXRjaF9pZF9wcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihwYXRjaF9pZF9jbWQsIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkaW49Z2l0X3Nob3dfcHJvY2Vzcy5zdGRvdXQpCisgICAgcmVzID0gcGF0Y2hfaWRfcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdIG9yICcwJworICAgIHJldHVybiByZXMuc3BsaXQoKVswXQogCi0gIGlmIG9wdGlvbnMucGF0Y2hzZXQgPT0gMToKLSAgICAjIE5vdGhpbmcgdG8gZGV0ZWN0IG9uIGZpcnN0IHBhdGNoc2V0Ci0gICAgZXhpdCgwKQotICBwcmV2X3JldmlzaW9uID0gTm9uZQotICBwcmV2X3JldmlzaW9uID0gRmluZFByZXZSZXYob3B0aW9ucy5jaGFuZ2VJZCwgb3B0aW9ucy5wYXRjaHNldCwgc2VydmVyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9ucy5wb3J0KQotICBpZiBub3QgcHJldl9yZXZpc2lvbjoKLSAgICAjIENvdWxkbid0IGZpbmQgYSBwcmV2aW91cyByZXZpc2lvbgotICAgIGV4aXQoMCkKLSAgcHJldl9wYXRjaF9pZCA9IEdldFBhdGNoSWQocHJldl9yZXZpc2lvbikKLSAgY3VyX3BhdGNoX2lkID0gR2V0UGF0Y2hJZChvcHRpb25zLmNvbW1pdCkKLSAgaWYgY3VyX3BhdGNoX2lkLnNwbGl0KClbMF0gIT0gcHJldl9wYXRjaF9pZC5zcGxpdCgpWzBdOgotICAgICMgcGF0Y2gtaWRzIGRvbid0IG1hdGNoCi0gICAgZXhpdCgwKQotICAjIFBhdGNoIGlkcyBtYXRjaC4gVGhpcyBpcyBhIHRyaXZpYWwgcmViYXNlLgotICAjIEluIGFkZGl0aW9uIHRvIHBhdGNoLWlkIHdlIHNob3VsZCBjaGVjayBpZiB0aGUgY29tbWl0IG1lc3NhZ2UgY2hhbmdlZC4gTW9zdAotICAjIGFwcHJvdmVycyB3b3VsZCB3YW50IHRvIHJlLXJldmlldyBjaGFuZ2VzIHdoZW4gdGhlIGNvbW1pdCBtZXNzYWdlIGNoYW5nZXMuCi0gIGNoYW5nZWQgPSBEaWZmQ29tbWl0TWVzc2FnZXMocHJldl9yZXZpc2lvbiwgb3B0aW9ucy5jb21taXQpCi0gIGlmIGNoYW5nZWQ6Ci0gICAgIyBJbnNlcnQgYSBjb21tZW50IGludG8gdGhlIGNoYW5nZSBsZXR0aW5nIHRoZSBhcHByb3ZlcnMga25vdyBvbmx5IHRoZQotICAgICMgY29tbWl0IG1lc3NhZ2UgY2hhbmdlZAotICAgIGNvbW1lbnRfbXNnID0gKCJcJy0tbWVzc2FnZT1OZXcgcGF0Y2hzZXQgcGF0Y2gtaWQgbWF0Y2hlcyBwcmV2aW91cyBwYXRjaHNldCIKLSAgICAgICAgICAgICAgICAgICAiLCBidXQgY29tbWl0IG1lc3NhZ2UgaGFzIGNoYW5nZWQuJyIpCi0gICAgY29tbWVudF9jbWQgPSBbJ3NzaCcsICctcCcsIG9wdGlvbnMucG9ydCwgc2VydmVyLCAnZ2Vycml0JywgJ2FwcHJvdmUnLAotICAgICAgICAgICAgICAgICAgICctLXByb2plY3QnLCBvcHRpb25zLnByb2plY3QsIGNvbW1lbnRfbXNnLCBvcHRpb25zLmNvbW1pdF0KLSAgICBDaGVja0NhbGwoY29tbWVudF9jbWQpCi0gICAgZXhpdCgwKQorICBkZWYgU3VFeGVjKHNlbGYsIGFzX3VzZXIsIGNtZCk6CisgICAgc3VleGVjX2NtZCA9IFtzZWxmLnNzaCwgJy1sJywgIkdlcnJpdCBDb2RlIFJldmlldyIsIHNlbGYuc3NoX3BvcnRfZmxhZywgc2VsZi5wb3J0LCBzZWxmLnNlcnZlcl0KKyAgICBpZiBzZWxmLnByaXZhdGVfa2V5X3BhdGg6CisgICAgICBzdWV4ZWNfY21kICs9IFsnLWknLCBzZWxmLnByaXZhdGVfa2V5X3BhdGhdCisgICAgc3VleGVjX2NtZCArPSBbJ3N1ZXhlYycsICctLWFzJywgYXNfdXNlciwgJy0tJywgY21kXQorICAgIHNlbGYuQ2hlY2tDYWxsKHN1ZXhlY19jbWQpCiAKLSAgIyBOZWVkIHRvIGdldCBhbGwgYXBwcm92YWxzIG9uIHByaW9yIHBhdGNoIHNldCwgdGhlbiBzdWV4ZWMgdGhlbSBvbnRvCi0gICMgdGhpcyBwYXRjaHNldC4KLSAgYXBwcm92YWxzID0gR2V0QXBwcm92YWxzKG9wdGlvbnMuY2hhbmdlSWQsIG9wdGlvbnMucGF0Y2hzZXQsIHNlcnZlciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnMucG9ydCkKLSAgZ2Vycml0X2FwcHJvdmVfbXNnID0gKCJcJ0F1dG9tYXRpY2FsbHkgcmUtYWRkZWQgYnkgR2Vycml0IHRyaXZpYWwgcmViYXNlICIKLSAgICAgICAgICAgICAgICAgICAgICAgICJkZXRlY3Rpb24gc2NyaXB0LlwnIikKLSAgZm9yIGFwcHJvdmFsIGluIGFwcHJvdmFsczoKLSAgICAjIE5vdGU6IFNpdGVzIHdpdGggZGlmZmVyZW50ICdjb3B5X21pbl9zY29yZScgdmFsdWVzIGluIHRoZQotICAgICMgYXBwcm92YWxfY2F0ZWdvcmllcyBEQiB0YWJsZSBtaWdodCB3YW50IGRpZmZlcmVudCBiZWhhdmlvciBoZXJlLgotICAgICMgQWRkaXRpb25hbCBjYXRlZ29yaWVzIHNob3VsZCBhbHNvIGJlIGFkZGVkIGlmIGRlc2lyZWQuCi0gICAgaWYgYXBwcm92YWxbImNhdGVnb3J5X2lkIl0gPT0gIkNSVlciOgotICAgICAgYXBwcm92ZV9jYXRlZ29yeSA9ICctLWNvZGUtcmV2aWV3JwotICAgIGVsaWYgYXBwcm92YWxbImNhdGVnb3J5X2lkIl0gPT0gIlZSSUYiOgotICAgICAgIyBEb24ndCByZS1hZGQgdmVyaWZpZXMKLSAgICAgICNhcHByb3ZlX2NhdGVnb3J5ID0gJy0tdmVyaWZpZWQnCi0gICAgICBjb250aW51ZQotICAgIGVsaWYgYXBwcm92YWxbImNhdGVnb3J5X2lkIl0gPT0gIlNVQk0iOgotICAgICAgIyBXZSBkb24ndCBjYXJlIGFib3V0IHByZXZpb3VzIHN1Ym1pdCBhdHRlbXB0cwotICAgICAgY29udGludWUKLSAgICBlbHNlOgotICAgICAgcHJpbnQgIlVuc3VwcG9ydGVkIGNhdGVnb3J5OiAlcyIgJSBhcHByb3ZhbAotICAgICAgZXhpdCgwKQorICBkZWYgRGlmZkNvbW1pdE1lc3NhZ2VzKHNlbGYsIHByZXZfY29tbWl0KToKKyAgICBsb2dfY21kMSA9IFsnZ2l0JywgJ2xvZycsICctLXByZXR0eT1mb3JtYXQ6IiVhbiAlYWUlbiVzJW4lYiInLAorICAgICAgICAgICAgICAgIHByZXZfY29tbWl0ICsgJ14hJ10KKyAgICBjb21taXQxX2xvZyA9IHNlbGYuQ2hlY2tDYWxsKGxvZ19jbWQxKQorICAgIGxvZ19jbWQyID0gWydnaXQnLCAnbG9nJywgJy0tcHJldHR5PWZvcm1hdDoiJWFuICVhZSVuJXMlbiViIicsCisgICAgICAgICAgICAgICAgc2VsZi5jb21taXQgKyAnXiEnXQorICAgIGNvbW1pdDJfbG9nID0gc2VsZi5DaGVja0NhbGwobG9nX2NtZDIpCisgICAgaWYgY29tbWl0MV9sb2cgIT0gY29tbWl0Ml9sb2c6CisgICAgICByZXR1cm4gVHJ1ZQorICAgIHJldHVybiBGYWxzZQogCi0gICAgc2NvcmUgPSBhcHByb3ZhbFsidmFsdWUiXQotICAgIGdlcnJpdF9hcHByb3ZlX2NtZCA9IFsnZ2Vycml0JywgJ2FwcHJvdmUnLCAnLS1wcm9qZWN0Jywgb3B0aW9ucy5wcm9qZWN0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1tZXNzYWdlJywgZ2Vycml0X2FwcHJvdmVfbXNnLCBhcHByb3ZlX2NhdGVnb3J5LAotICAgICAgICAgICAgICAgICAgICAgICAgICBzY29yZSwgb3B0aW9ucy5jb21taXRdCi0gICAgZW1haWxfYWRkciA9IEdldEVtYWlsRnJvbUFjY3RJZChhcHByb3ZhbFsiYWNjb3VudF9pZCJdLCBzZXJ2ZXIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25zLnBvcnQpCi0gICAgU3VFeGVjKHNlcnZlciwgb3B0aW9ucy5wb3J0LCBvcHRpb25zLnByaXZhdGVfa2V5X3BhdGgsIGVtYWlsX2FkZHIsCi0gICAgICAgICAgICcgJy5qb2luKGdlcnJpdF9hcHByb3ZlX2NtZCkpCi0gIGV4aXQoMCkKKyAgZGVmIFJ1bihzZWxmKToKKyAgICBpZiBzZWxmLnBhdGNoc2V0ID09IDE6CisgICAgICAjIE5vdGhpbmcgdG8gZGV0ZWN0IG9uIGZpcnN0IHBhdGNoc2V0CisgICAgICByZXR1cm4KKyAgICBwcmV2X3JldmlzaW9uID0gc2VsZi5GaW5kUHJldlJldigpCisgICAgYXNzZXJ0IHByZXZfcmV2aXNpb24sICJQcmV2aW91cyByZXZpc2lvbiBub3QgZm91bmQiCisgICAgcHJldl9wYXRjaF9pZCA9IHNlbGYuR2V0UGF0Y2hJZChwcmV2X3JldmlzaW9uKQorICAgIGN1cl9wYXRjaF9pZCA9IHNlbGYuR2V0UGF0Y2hJZChzZWxmLmNvbW1pdCkKKyAgICBpZiBwcmV2X3BhdGNoX2lkID09ICcwJyBhbmQgY3VyX3BhdGNoX2lkID09ICcwJzoKKyAgICAgIHByaW50ICJjb21taXRzICVzIGFuZCAlcyBhcmUgYm90aCBlbXB0eSBvciBtZXJnZSBjb21taXRzIiAlIChwcmV2X3JldmlzaW9uLCBzZWxmLmNvbW1pdCkKKyAgICAgIHJldHVybgorICAgIGlmIGN1cl9wYXRjaF9pZCAhPSBwcmV2X3BhdGNoX2lkOgorICAgICAgIyBwYXRjaC1pZHMgZG9uJ3QgbWF0Y2gKKyAgICAgIHJldHVybgorICAgICMgUGF0Y2ggaWRzIG1hdGNoLiBUaGlzIGlzIGEgdHJpdmlhbCByZWJhc2UuCisgICAgIyBJbiBhZGRpdGlvbiB0byBwYXRjaC1pZCB3ZSBzaG91bGQgY2hlY2sgaWYgdGhlIGNvbW1pdCBtZXNzYWdlIGNoYW5nZWQuIE1vc3QKKyAgICAjIGFwcHJvdmVycyB3b3VsZCB3YW50IHRvIHJlLXJldmlldyBjaGFuZ2VzIHdoZW4gdGhlIGNvbW1pdCBtZXNzYWdlIGNoYW5nZXMuCisgICAgY2hhbmdlZCA9IHNlbGYuRGlmZkNvbW1pdE1lc3NhZ2VzKHByZXZfcmV2aXNpb24pCisgICAgaWYgY2hhbmdlZDoKKyAgICAgICMgSW5zZXJ0IGEgY29tbWVudCBpbnRvIHRoZSBjaGFuZ2UgbGV0dGluZyB0aGUgYXBwcm92ZXJzIGtub3cgb25seSB0aGUKKyAgICAgICMgY29tbWl0IG1lc3NhZ2UgY2hhbmdlZAorICAgICAgY29tbWVudF9tc2cgPSAoIlwnLS1tZXNzYWdlPU5ldyBwYXRjaHNldCBwYXRjaC1pZCBtYXRjaGVzIHByZXZpb3VzIHBhdGNoc2V0IgorICAgICAgICAgICAgICAgICAgICAgIiwgYnV0IGNvbW1pdCBtZXNzYWdlIGhhcyBjaGFuZ2VkLiciKQorICAgICAgY29tbWVudF9jbWQgPSBbc2VsZi5zc2gsIHNlbGYuc3NoX3BvcnRfZmxhZywgc2VsZi5wb3J0LCBzZWxmLnNlcnZlciwgJ2dlcnJpdCcsCisgICAgICAgICAgICAgICAgICAgICAncmV2aWV3JywgJy0tcHJvamVjdCcsIHNlbGYucHJvamVjdCwgY29tbWVudF9tc2csIHNlbGYuY29tbWl0XQorICAgICAgc2VsZi5DaGVja0NhbGwoY29tbWVudF9jbWQpCisgICAgICByZXR1cm4KKworICAgICMgTmVlZCB0byBnZXQgYWxsIGFwcHJvdmFscyBvbiBwcmlvciBwYXRjaCBzZXQsIHRoZW4gc3VleGVjIHRoZW0gb250bworICAgICMgdGhpcyBwYXRjaHNldC4KKyAgICBhcHByb3ZhbHMgPSBzZWxmLkdldEFwcHJvdmFscygpCisgICAgc2VsZi5hY2N0X2FwcHJvdmFscyA9IGRpY3QoKQorICAgIGZvciBhcHByb3ZhbCBpbiBhcHByb3ZhbHM6CisgICAgICAjIE5vdGU6IFNpdGVzIHdpdGggZGlmZmVyZW50ICdjb3B5X21pbl9zY29yZScgdmFsdWVzIGluIHRoZQorICAgICAgIyBhcHByb3ZhbF9jYXRlZ29yaWVzIERCIHRhYmxlIG1pZ2h0IHdhbnQgZGlmZmVyZW50IGJlaGF2aW9yIGhlcmUuCisgICAgICAjIEFkZGl0aW9uYWwgY2F0ZWdvcmllcyBzaG91bGQgYWxzbyBiZSBhZGRlZCBpZiBkZXNpcmVkLgorICAgICAgaWYgYXBwcm92YWxbImNhdGVnb3J5X2lkIl0gPT0gIkNvZGUtUmV2aWV3IiBhbmQgYXBwcm92YWxbJ3ZhbHVlJ10gIT0gJy0yJzoKKyAgICAgICAgc2VsZi5BcHBlbmRBY2N0QXBwcm92YWwoYXBwcm92YWxbJ2FjY291bnRfaWQnXSwgJy0tY29kZS1yZXZpZXcgJXMnICUgYXBwcm92YWxbJ3ZhbHVlJ10pCisgICAgICBlbGlmIGFwcHJvdmFsWyJjYXRlZ29yeV9pZCJdID09ICJWZXJpZmllZCI6CisgICAgICAgICMgRG9uJ3QgcmUtYWRkIHZlcmlmaWVzCisgICAgICAgICMgc2VsZi5BcHBlbmRBY2N0QXBwcm92YWwoYXBwcm92YWxbJ2FjY291bnRfaWQnXSwgJy0tdmVyaWZpZWQgJXMnICUgYXBwcm92YWxbJ3ZhbHVlJ10pCisgICAgICAgIGNvbnRpbnVlCisgICAgICBlbGlmIGFwcHJvdmFsWyJjYXRlZ29yeV9pZCJdID09ICJTVUJNIjoKKyAgICAgICAgIyBXZSBkb24ndCBjYXJlIGFib3V0IHByZXZpb3VzIHN1Ym1pdCBhdHRlbXB0cworICAgICAgICBjb250aW51ZQorICAgICAgZWxzZToKKyAgICAgICAgc2VsZi5BcHBlbmRBY2N0QXBwcm92YWwoYXBwcm92YWxbJ2FjY291bnRfaWQnXSwgJy0tJXMgJXMnICUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFwcHJvdmFsWydjYXRlZ29yeV9pZCddLmxvd2VyKCkucmVwbGFjZSgnICcsICctJyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcHByb3ZhbFsndmFsdWUnXSkpCisKKyAgICBnZXJyaXRfcmV2aWV3X21zZyA9ICgiXCdBdXRvbWF0aWNhbGx5IHJlLWFkZGVkIGJ5IEdlcnJpdCB0cml2aWFsIHJlYmFzZSAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICJkZXRlY3Rpb24gc2NyaXB0LlwnIikKKyAgICBmb3IgYWNjdCwgZmxhZ3MgaW4gc2VsZi5hY2N0X2FwcHJvdmFscy5pdGVtcygpOgorICAgICAgZ2Vycml0X3Jldmlld19jbWQgPSBbJ2dlcnJpdCcsICdyZXZpZXcnLCAnLS1wcm9qZWN0Jywgc2VsZi5wcm9qZWN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLW1lc3NhZ2UnLCBnZXJyaXRfcmV2aWV3X21zZywgZmxhZ3MsIHNlbGYuY29tbWl0XQorICAgICAgZW1haWxfYWRkciA9IHNlbGYuR2V0RW1haWxGcm9tQWNjdElkKGFjY3QpCisgICAgICBzZWxmLlN1RXhlYyhlbWFpbF9hZGRyLCAnICcuam9pbihnZXJyaXRfcmV2aWV3X2NtZCkpCiAKIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6Ci0gIE1haW4oKQorICB0cnk6CisgICAgVHJpdmlhbFJlYmFzZSgpLlJ1bigpCisgIGV4Y2VwdCBBc3NlcnRpb25FcnJvciwgZToKKyAgICBwcmludCA+PiBzeXMuc3RkZXJyLCBlCmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy8uZ2l0aWdub3JlIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvLmdpdGlnbm9yZQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lMTkxNGFhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvLmdpdGlnbm9yZQpAQCAtMCwwICsxLDcgQEAKKy9iaW4KKy90YXJnZXQKKy8uY2xhc3NwYXRoCisvLnByb2plY3QKKy8uc2V0dGluZ3Mvb3JnLm1hdmVuLmlkZS5lY2xpcHNlLnByZWZzCisvLnNldHRpbmdzL29yZy5lY2xpcHNlLm0yZS5jb3JlLnByZWZzCisvZ2Vycml0LWNvbW1vbi5pbWwKZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5wcmVmcyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5wcmVmcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44ZGQ5YjFkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvLnNldHRpbmdzL29yZy5lY2xpcHNlLmNvcmUucmVzb3VyY2VzLnByZWZzCkBAIC0wLDAgKzEsMyBAQAorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK2VuY29kaW5nLy9zcmMvdGVzdC9qYXZhPVVURi04CitlbmNvZGluZy88cHJvamVjdD49VVRGLTgKZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5jb3JlLnJ1bnRpbWUucHJlZnMgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjVhMGFkMjIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuY29yZS5ydW50aW1lLnByZWZzCkBAIC0wLDAgKzEsMiBAQAorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK2xpbmUuc2VwYXJhdG9yPVxuCmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTY3NjViMAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtMCwwICsxLDI2MyBAQAorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvZGVnZW4udGFyZ2V0UGxhdGZvcm09MS42CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5jb21wbGlhbmNlPTEuNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5mb3JiaWRkZW5SZWZlcmVuY2U9d2FybmluZworb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuc291cmNlPTEuNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWduX3R5cGVfbWVtYmVyc19vbl9jb2x1bW5zPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9hcmd1bWVudHNfaW5fYWxsb2NhdGlvbl9leHByZXNzaW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9hcmd1bWVudHNfaW5fZW51bV9jb25zdGFudD0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfYXJndW1lbnRzX2luX2V4cGxpY2l0X2NvbnN0cnVjdG9yX2NhbGw9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2FyZ3VtZW50c19pbl9tZXRob2RfaW52b2NhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfYXJndW1lbnRzX2luX3F1YWxpZmllZF9hbGxvY2F0aW9uX2V4cHJlc3Npb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2Fzc2lnbm1lbnQ9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2JpbmFyeV9leHByZXNzaW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9jb21wYWN0X2lmPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9jb25kaXRpb25hbF9leHByZXNzaW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9lbnVtX2NvbnN0YW50cz0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfZXhwcmVzc2lvbnNfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX211bHRpcGxlX2ZpZWxkcz0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfcGFyYW1ldGVyc19pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfcGFyYW1ldGVyc19pbl9tZXRob2RfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3NlbGVjdG9yX2luX21ldGhvZF9pbnZvY2F0aW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9zdXBlcmNsYXNzX2luX3R5cGVfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3N1cGVyaW50ZXJmYWNlc19pbl9lbnVtX2RlY2xhcmF0aW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9zdXBlcmludGVyZmFjZXNfaW5fdHlwZV9kZWNsYXJhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfdGhyb3dzX2NsYXVzZV9pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfdGhyb3dzX2NsYXVzZV9pbl9tZXRob2RfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19hZnRlcl9pbXBvcnRzPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19hZnRlcl9wYWNrYWdlPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfZmllbGQ9MAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2JlZm9yZV9maXJzdF9jbGFzc19ib2R5X2RlY2xhcmF0aW9uPTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfaW1wb3J0cz0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYmxhbmtfbGluZXNfYmVmb3JlX21lbWJlcl90eXBlPTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfbWV0aG9kPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfbmV3X2NodW5rPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfcGFja2FnZT0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYmxhbmtfbGluZXNfYmV0d2Vlbl9pbXBvcnRfZ3JvdXBzPTEKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZXR3ZWVuX3R5cGVfZGVjbGFyYXRpb25zPTIKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfYW5ub3RhdGlvbl90eXBlX2RlY2xhcmF0aW9uPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2Fub255bW91c190eXBlX2RlY2xhcmF0aW9uPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2FycmF5X2luaXRpYWxpemVyPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2Jsb2NrPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2Jsb2NrX2luX2Nhc2U9ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfY29uc3RydWN0b3JfZGVjbGFyYXRpb249ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfZW51bV9jb25zdGFudD1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJyYWNlX3Bvc2l0aW9uX2Zvcl9lbnVtX2RlY2xhcmF0aW9uPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX21ldGhvZF9kZWNsYXJhdGlvbj1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJyYWNlX3Bvc2l0aW9uX2Zvcl9zd2l0Y2g9ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfdHlwZV9kZWNsYXJhdGlvbj1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuY2xlYXJfYmxhbmtfbGluZXNfaW5fYmxvY2tfY29tbWVudD1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuY2xlYXJfYmxhbmtfbGluZXNfaW5famF2YWRvY19jb21tZW50PWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfYmxvY2tfY29tbWVudHM9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuZm9ybWF0X2hlYWRlcj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfaHRtbD10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfamF2YWRvY19jb21tZW50cz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfbGluZV9jb21tZW50cz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfc291cmNlX2NvZGU9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuaW5kZW50X3BhcmFtZXRlcl9kZXNjcmlwdGlvbj1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuaW5kZW50X3Jvb3RfdGFncz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5pbnNlcnRfbmV3X2xpbmVfYmVmb3JlX3Jvb3RfdGFncz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50Lmluc2VydF9uZXdfbGluZV9mb3JfcGFyYW1ldGVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50LmxpbmVfbGVuZ3RoPTgwCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tcGFjdF9lbHNlX2lmPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb250aW51YXRpb25faW5kZW50YXRpb249Mgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbnRpbnVhdGlvbl9pbmRlbnRhdGlvbl9mb3JfYXJyYXlfaW5pdGlhbGl6ZXI9Mgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmZvcm1hdF9ndWFyZGlhbl9jbGF1c2Vfb25fb25lX2xpbmU9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfYm9keV9kZWNsYXJhdGlvbnNfY29tcGFyZV90b19hbm5vdGF0aW9uX2RlY2xhcmF0aW9uX2hlYWRlcj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X2JvZHlfZGVjbGFyYXRpb25zX2NvbXBhcmVfdG9fZW51bV9jb25zdGFudF9oZWFkZXI9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluZGVudF9ib2R5X2RlY2xhcmF0aW9uc19jb21wYXJlX3RvX2VudW1fZGVjbGFyYXRpb25faGVhZGVyPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfYm9keV9kZWNsYXJhdGlvbnNfY29tcGFyZV90b190eXBlX2hlYWRlcj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X2JyZWFrc19jb21wYXJlX3RvX2Nhc2VzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfZW1wdHlfbGluZXM9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfc3RhdGVtZW50c19jb21wYXJlX3RvX2Jsb2NrPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfc3RhdGVtZW50c19jb21wYXJlX3RvX2JvZHk9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluZGVudF9zd2l0Y2hzdGF0ZW1lbnRzX2NvbXBhcmVfdG9fY2FzZXM9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluZGVudF9zd2l0Y2hzdGF0ZW1lbnRzX2NvbXBhcmVfdG9fc3dpdGNoPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRhdGlvbi5zaXplPTQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfYW5ub3RhdGlvbl9vbl9sb2NhbF92YXJpYWJsZT1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfYW5ub3RhdGlvbl9vbl9tZW1iZXI9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2FmdGVyX2Fubm90YXRpb25fb25fcGFyYW1ldGVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfb3BlbmluZ19icmFjZV9pbl9hcnJheV9pbml0aWFsaXplcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2F0X2VuZF9vZl9maWxlX2lmX21pc3Npbmc9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2JlZm9yZV9jYXRjaF9pbl90cnlfc3RhdGVtZW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYmVmb3JlX2Nsb3NpbmdfYnJhY2VfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9iZWZvcmVfZWxzZV9pbl9pZl9zdGF0ZW1lbnQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9iZWZvcmVfZmluYWxseV9pbl90cnlfc3RhdGVtZW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYmVmb3JlX3doaWxlX2luX2RvX3N0YXRlbWVudD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2luX2VtcHR5X2Fubm90YXRpb25fZGVjbGFyYXRpb249aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2luX2VtcHR5X2Fub255bW91c190eXBlX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfaW5fZW1wdHlfYmxvY2s9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2luX2VtcHR5X2VudW1fY29uc3RhbnQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9pbl9lbXB0eV9lbnVtX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9pbl9lbXB0eV9tZXRob2RfYm9keT1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfaW5fZW1wdHlfdHlwZV9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfYW5kX2luX3R5cGVfcGFyYW1ldGVyPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9hc3NpZ25tZW50X29wZXJhdG9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9hdF9pbl9hbm5vdGF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfYXRfaW5fYW5ub3RhdGlvbl90eXBlX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfYmluYXJ5X29wZXJhdG9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jbG9zaW5nX2FuZ2xlX2JyYWNrZXRfaW5fdHlwZV9hcmd1bWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2Nsb3NpbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX3BhcmFtZXRlcnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2Nsb3NpbmdfYnJhY2VfaW5fYmxvY2s9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2Nsb3NpbmdfcGFyZW5faW5fY2FzdD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29sb25faW5fYXNzZXJ0PWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb2xvbl9pbl9jYXNlPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb2xvbl9pbl9jb25kaXRpb25hbD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29sb25faW5fZm9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb2xvbl9pbl9sYWJlbGVkX3N0YXRlbWVudD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fYWxsb2NhdGlvbl9leHByZXNzaW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9hbm5vdGF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9hcnJheV9pbml0aWFsaXplcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb25fcGFyYW1ldGVycz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb25fdGhyb3dzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9lbnVtX2NvbnN0YW50X2FyZ3VtZW50cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fZW51bV9kZWNsYXJhdGlvbnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2V4cGxpY2l0Y29uc3RydWN0b3JjYWxsX2FyZ3VtZW50cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fZm9yX2luY3JlbWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2Zvcl9pbml0cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fbWV0aG9kX2RlY2xhcmF0aW9uX3BhcmFtZXRlcnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX21ldGhvZF9kZWNsYXJhdGlvbl90aHJvd3M9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX21ldGhvZF9pbnZvY2F0aW9uX2FyZ3VtZW50cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fbXVsdGlwbGVfZmllbGRfZGVjbGFyYXRpb25zPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9tdWx0aXBsZV9sb2NhbF9kZWNsYXJhdGlvbnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX3BhcmFtZXRlcml6ZWRfdHlwZV9yZWZlcmVuY2U9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX3N1cGVyaW50ZXJmYWNlcz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fdHlwZV9hcmd1bWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX3R5cGVfcGFyYW1ldGVycz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfZWxsaXBzaXM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfYW5nbGVfYnJhY2tldF9pbl9wYXJhbWV0ZXJpemVkX3R5cGVfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19hbmdsZV9icmFja2V0X2luX3R5cGVfYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19hbmdsZV9icmFja2V0X2luX3R5cGVfcGFyYW1ldGVycz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfYnJhY2VfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX2JyYWNrZXRfaW5fYXJyYXlfYWxsb2NhdGlvbl9leHByZXNzaW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19icmFja2V0X2luX2FycmF5X3JlZmVyZW5jZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fYW5ub3RhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fY2FzdD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fY2F0Y2g9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9lbnVtX2NvbnN0YW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9mb3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX2lmPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9tZXRob2RfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX21ldGhvZF9pbnZvY2F0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9wYXJlbnRoZXNpemVkX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX3N3aXRjaD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fc3luY2hyb25pemVkPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl93aGlsZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX3Bvc3RmaXhfb3BlcmF0b3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9wcmVmaXhfb3BlcmF0b3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9xdWVzdGlvbl9pbl9jb25kaXRpb25hbD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfcXVlc3Rpb25faW5fd2lsZGNhcmQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9zZW1pY29sb25faW5fZm9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl91bmFyeV9vcGVyYXRvcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9hbmRfaW5fdHlwZV9wYXJhbWV0ZXI9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9hc3NpZ25tZW50X29wZXJhdG9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfYXRfaW5fYW5ub3RhdGlvbl90eXBlX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfYmluYXJ5X29wZXJhdG9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19hbmdsZV9icmFja2V0X2luX3BhcmFtZXRlcml6ZWRfdHlwZV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19hbmdsZV9icmFja2V0X2luX3R5cGVfYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19icmFjZV9pbl9hcnJheV9pbml0aWFsaXplcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX2JyYWNrZXRfaW5fYXJyYXlfYWxsb2NhdGlvbl9leHByZXNzaW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfYnJhY2tldF9pbl9hcnJheV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9hbm5vdGF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fY2FzdD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX2NhdGNoPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9lbnVtX2NvbnN0YW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fZm9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5faWY9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9tZXRob2RfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9tZXRob2RfaW52b2NhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3BhcmVudGhlc2l6ZWRfZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3N3aXRjaD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3N5bmNocm9uaXplZD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3doaWxlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2Fzc2VydD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2Nhc2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29sb25faW5fY29uZGl0aW9uYWw9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb2xvbl9pbl9kZWZhdWx0PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2Zvcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2xhYmVsZWRfc3RhdGVtZW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2FsbG9jYXRpb25fZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9hbm5vdGF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2FycmF5X2luaXRpYWxpemVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb25fdGhyb3dzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2VudW1fY29uc3RhbnRfYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2VudW1fZGVjbGFyYXRpb25zPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2V4cGxpY2l0Y29uc3RydWN0b3JjYWxsX2FyZ3VtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9mb3JfaW5jcmVtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9mb3JfaW5pdHM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fbWV0aG9kX2RlY2xhcmF0aW9uX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fbWV0aG9kX2RlY2xhcmF0aW9uX3Rocm93cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9tZXRob2RfaW52b2NhdGlvbl9hcmd1bWVudHM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fbXVsdGlwbGVfZmllbGRfZGVjbGFyYXRpb25zPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX211bHRpcGxlX2xvY2FsX2RlY2xhcmF0aW9ucz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9wYXJhbWV0ZXJpemVkX3R5cGVfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX3N1cGVyaW50ZXJmYWNlcz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl90eXBlX2FyZ3VtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl90eXBlX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfZWxsaXBzaXM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19hbmdsZV9icmFja2V0X2luX3BhcmFtZXRlcml6ZWRfdHlwZV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19hbmdsZV9icmFja2V0X2luX3R5cGVfYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9hbm5vdGF0aW9uX3R5cGVfZGVjbGFyYXRpb249aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNlX2luX2Fub255bW91c190eXBlX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9hcnJheV9pbml0aWFsaXplcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fYmxvY2s9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNlX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9lbnVtX2NvbnN0YW50PWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9lbnVtX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9tZXRob2RfZGVjbGFyYXRpb249aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNlX2luX3N3aXRjaD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fdHlwZV9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2tldF9pbl9hcnJheV9hbGxvY2F0aW9uX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFja2V0X2luX2FycmF5X3JlZmVyZW5jZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNrZXRfaW5fYXJyYXlfdHlwZV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9hbm5vdGF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fYW5ub3RhdGlvbl90eXBlX21lbWJlcl9kZWNsYXJhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX2NhdGNoPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX2VudW1fY29uc3RhbnQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9mb3I9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX2lmPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9tZXRob2RfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9tZXRob2RfaW52b2NhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX3BhcmVudGhlc2l6ZWRfZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX3N3aXRjaD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fc3luY2hyb25pemVkPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl93aGlsZT1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3BhcmVudGhlc2l6ZWRfZXhwcmVzc2lvbl9pbl9yZXR1cm49aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9wYXJlbnRoZXNpemVkX2V4cHJlc3Npb25faW5fdGhyb3c9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9wb3N0Zml4X29wZXJhdG9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3ByZWZpeF9vcGVyYXRvcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9xdWVzdGlvbl9pbl9jb25kaXRpb25hbD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3F1ZXN0aW9uX2luX3dpbGRjYXJkPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3NlbWljb2xvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9zZW1pY29sb25faW5fZm9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3VuYXJ5X29wZXJhdG9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9icmFja2V0c19pbl9hcnJheV90eXBlX3JlZmVyZW5jZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JldHdlZW5fZW1wdHlfYnJhY2VzX2luX2FycmF5X2luaXRpYWxpemVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9icmFja2V0c19pbl9hcnJheV9hbGxvY2F0aW9uX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2VtcHR5X3BhcmVuc19pbl9hbm5vdGF0aW9uX3R5cGVfbWVtYmVyX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9wYXJlbnNfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2VtcHR5X3BhcmVuc19pbl9lbnVtX2NvbnN0YW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9wYXJlbnNfaW5fbWV0aG9kX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9wYXJlbnNfaW5fbWV0aG9kX2ludm9jYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmpvaW5fbGluZXNfaW5fY29tbWVudHM9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmpvaW5fd3JhcHBlZF9saW5lcz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIua2VlcF9lbHNlX3N0YXRlbWVudF9vbl9zYW1lX2xpbmU9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5rZWVwX2VtcHR5X2FycmF5X2luaXRpYWxpemVyX29uX29uZV9saW5lPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIua2VlcF9pbXBsZV9pZl9vbl9vbmVfbGluZT10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIua2VlcF90aGVuX3N0YXRlbWVudF9vbl9zYW1lX2xpbmU9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5saW5lU3BsaXQ9ODAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5uZXZlcl9pbmRlbnRfYmxvY2tfY29tbWVudHNfb25fZmlyc3RfY29sdW1uPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIubmV2ZXJfaW5kZW50X2xpbmVfY29tbWVudHNfb25fZmlyc3RfY29sdW1uPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIubnVtYmVyX29mX2JsYW5rX2xpbmVzX2F0X2JlZ2lubmluZ19vZl9tZXRob2RfYm9keT0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIubnVtYmVyX29mX2VtcHR5X2xpbmVzX3RvX3ByZXNlcnZlPTMKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5wdXRfZW1wdHlfc3RhdGVtZW50X29uX25ld19saW5lPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIudGFidWxhdGlvbi5jaGFyPXNwYWNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIudGFidWxhdGlvbi5zaXplPTIKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci51c2VfdGFic19vbmx5X2Zvcl9sZWFkaW5nX2luZGVudGF0aW9ucz1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLndyYXBfYmVmb3JlX2JpbmFyeV9vcGVyYXRvcj10cnVlCmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LnVpLnByZWZzIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC51aS5wcmVmcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNmRkMzRmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC51aS5wcmVmcwpAQCAtMCwwICsxLDYwIEBACitlY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQorZWRpdG9yX3NhdmVfcGFydGljaXBhbnRfb3JnLmVjbGlwc2UuamR0LnVpLnBvc3RzYXZlbGlzdGVuZXIuY2xlYW51cD10cnVlCitmb3JtYXR0ZXJfcHJvZmlsZT1fR29vZ2xlIEZvcm1hdAorZm9ybWF0dGVyX3NldHRpbmdzX3ZlcnNpb249MTEKK29yZy5lY2xpcHNlLmpkdC51aS5pZ25vcmVsb3dlcmNhc2VuYW1lcz10cnVlCitvcmcuZWNsaXBzZS5qZHQudWkuaW1wb3J0b3JkZXI9Y29tLmdvb2dsZTtjb207anVuaXQ7bmV0O29yZztqYXZhO2phdmF4Oworb3JnLmVjbGlwc2UuamR0LnVpLm9uZGVtYW5kdGhyZXNob2xkPTk5CitvcmcuZWNsaXBzZS5qZHQudWkuc3RhdGljb25kZW1hbmR0aHJlc2hvbGQ9OTkKK29yZy5lY2xpcHNlLmpkdC51aS50ZXh0LmN1c3RvbV9jb2RlX3RlbXBsYXRlcz08P3htbCB2ZXJzaW9uXD0iMS4wIiBlbmNvZGluZ1w9IlVURi04IiBzdGFuZGFsb25lXD0ibm8iPz48dGVtcGxhdGVzLz4KK3NwX2NsZWFudXAuYWRkX2RlZmF1bHRfc2VyaWFsX3ZlcnNpb25faWQ9dHJ1ZQorc3BfY2xlYW51cC5hZGRfZ2VuZXJhdGVkX3NlcmlhbF92ZXJzaW9uX2lkPWZhbHNlCitzcF9jbGVhbnVwLmFkZF9taXNzaW5nX2Fubm90YXRpb25zPWZhbHNlCitzcF9jbGVhbnVwLmFkZF9taXNzaW5nX2RlcHJlY2F0ZWRfYW5ub3RhdGlvbnM9dHJ1ZQorc3BfY2xlYW51cC5hZGRfbWlzc2luZ19tZXRob2RzPWZhbHNlCitzcF9jbGVhbnVwLmFkZF9taXNzaW5nX25sc190YWdzPWZhbHNlCitzcF9jbGVhbnVwLmFkZF9taXNzaW5nX292ZXJyaWRlX2Fubm90YXRpb25zPXRydWUKK3NwX2NsZWFudXAuYWRkX3NlcmlhbF92ZXJzaW9uX2lkPWZhbHNlCitzcF9jbGVhbnVwLmFsd2F5c191c2VfYmxvY2tzPXRydWUKK3NwX2NsZWFudXAuYWx3YXlzX3VzZV9wYXJlbnRoZXNlc19pbl9leHByZXNzaW9ucz1mYWxzZQorc3BfY2xlYW51cC5hbHdheXNfdXNlX3RoaXNfZm9yX25vbl9zdGF0aWNfZmllbGRfYWNjZXNzPWZhbHNlCitzcF9jbGVhbnVwLmFsd2F5c191c2VfdGhpc19mb3Jfbm9uX3N0YXRpY19tZXRob2RfYWNjZXNzPWZhbHNlCitzcF9jbGVhbnVwLmNvbnZlcnRfdG9fZW5oYW5jZWRfZm9yX2xvb3A9ZmFsc2UKK3NwX2NsZWFudXAuY29ycmVjdF9pbmRlbnRhdGlvbj1mYWxzZQorc3BfY2xlYW51cC5mb3JtYXRfc291cmNlX2NvZGU9ZmFsc2UKK3NwX2NsZWFudXAuZm9ybWF0X3NvdXJjZV9jb2RlX2NoYW5nZXNfb25seT1mYWxzZQorc3BfY2xlYW51cC5tYWtlX2xvY2FsX3ZhcmlhYmxlX2ZpbmFsPXRydWUKK3NwX2NsZWFudXAubWFrZV9wYXJhbWV0ZXJzX2ZpbmFsPXRydWUKK3NwX2NsZWFudXAubWFrZV9wcml2YXRlX2ZpZWxkc19maW5hbD10cnVlCitzcF9jbGVhbnVwLm1ha2VfdHlwZV9hYnN0cmFjdF9pZl9taXNzaW5nX21ldGhvZD1mYWxzZQorc3BfY2xlYW51cC5tYWtlX3ZhcmlhYmxlX2RlY2xhcmF0aW9uc19maW5hbD1mYWxzZQorc3BfY2xlYW51cC5uZXZlcl91c2VfYmxvY2tzPWZhbHNlCitzcF9jbGVhbnVwLm5ldmVyX3VzZV9wYXJlbnRoZXNlc19pbl9leHByZXNzaW9ucz10cnVlCitzcF9jbGVhbnVwLm9uX3NhdmVfdXNlX2FkZGl0aW9uYWxfYWN0aW9ucz10cnVlCitzcF9jbGVhbnVwLm9yZ2FuaXplX2ltcG9ydHM9ZmFsc2UKK3NwX2NsZWFudXAucXVhbGlmeV9zdGF0aWNfZmllbGRfYWNjZXNzZXNfd2l0aF9kZWNsYXJpbmdfY2xhc3M9ZmFsc2UKK3NwX2NsZWFudXAucXVhbGlmeV9zdGF0aWNfbWVtYmVyX2FjY2Vzc2VzX3Rocm91Z2hfaW5zdGFuY2VzX3dpdGhfZGVjbGFyaW5nX2NsYXNzPXRydWUKK3NwX2NsZWFudXAucXVhbGlmeV9zdGF0aWNfbWVtYmVyX2FjY2Vzc2VzX3Rocm91Z2hfc3VidHlwZXNfd2l0aF9kZWNsYXJpbmdfY2xhc3M9dHJ1ZQorc3BfY2xlYW51cC5xdWFsaWZ5X3N0YXRpY19tZW1iZXJfYWNjZXNzZXNfd2l0aF9kZWNsYXJpbmdfY2xhc3M9ZmFsc2UKK3NwX2NsZWFudXAucXVhbGlmeV9zdGF0aWNfbWV0aG9kX2FjY2Vzc2VzX3dpdGhfZGVjbGFyaW5nX2NsYXNzPWZhbHNlCitzcF9jbGVhbnVwLnJlbW92ZV9wcml2YXRlX2NvbnN0cnVjdG9ycz10cnVlCitzcF9jbGVhbnVwLnJlbW92ZV90cmFpbGluZ193aGl0ZXNwYWNlcz10cnVlCitzcF9jbGVhbnVwLnJlbW92ZV90cmFpbGluZ193aGl0ZXNwYWNlc19hbGw9dHJ1ZQorc3BfY2xlYW51cC5yZW1vdmVfdHJhaWxpbmdfd2hpdGVzcGFjZXNfaWdub3JlX2VtcHR5PWZhbHNlCitzcF9jbGVhbnVwLnJlbW92ZV91bm5lY2Vzc2FyeV9jYXN0cz1mYWxzZQorc3BfY2xlYW51cC5yZW1vdmVfdW5uZWNlc3NhcnlfbmxzX3RhZ3M9ZmFsc2UKK3NwX2NsZWFudXAucmVtb3ZlX3VudXNlZF9pbXBvcnRzPWZhbHNlCitzcF9jbGVhbnVwLnJlbW92ZV91bnVzZWRfbG9jYWxfdmFyaWFibGVzPWZhbHNlCitzcF9jbGVhbnVwLnJlbW92ZV91bnVzZWRfcHJpdmF0ZV9maWVsZHM9dHJ1ZQorc3BfY2xlYW51cC5yZW1vdmVfdW51c2VkX3ByaXZhdGVfbWVtYmVycz1mYWxzZQorc3BfY2xlYW51cC5yZW1vdmVfdW51c2VkX3ByaXZhdGVfbWV0aG9kcz10cnVlCitzcF9jbGVhbnVwLnJlbW92ZV91bnVzZWRfcHJpdmF0ZV90eXBlcz10cnVlCitzcF9jbGVhbnVwLnNvcnRfbWVtYmVycz1mYWxzZQorc3BfY2xlYW51cC5zb3J0X21lbWJlcnNfYWxsPWZhbHNlCitzcF9jbGVhbnVwLnVzZV9ibG9ja3M9ZmFsc2UKK3NwX2NsZWFudXAudXNlX2Jsb2Nrc19vbmx5X2Zvcl9yZXR1cm5fYW5kX3Rocm93PWZhbHNlCitzcF9jbGVhbnVwLnVzZV9wYXJlbnRoZXNlc19pbl9leHByZXNzaW9ucz1mYWxzZQorc3BfY2xlYW51cC51c2VfdGhpc19mb3Jfbm9uX3N0YXRpY19maWVsZF9hY2Nlc3M9ZmFsc2UKK3NwX2NsZWFudXAudXNlX3RoaXNfZm9yX25vbl9zdGF0aWNfZmllbGRfYWNjZXNzX29ubHlfaWZfbmVjZXNzYXJ5PXRydWUKK3NwX2NsZWFudXAudXNlX3RoaXNfZm9yX25vbl9zdGF0aWNfbWV0aG9kX2FjY2Vzcz1mYWxzZQorc3BfY2xlYW51cC51c2VfdGhpc19mb3Jfbm9uX3N0YXRpY19tZXRob2RfYWNjZXNzX29ubHlfaWZfbmVjZXNzYXJ5PXRydWUKZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3BvbS54bWwgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9wb20ueG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU3OWY4YTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9wb20ueG1sCkBAIC0wLDAgKzEsMTQ4IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/PgorPCEtLQorQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKworTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Cit5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCitZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKworaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisKK1VubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKK2Rpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCitXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KK1NlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKK2xpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorLS0+Cis8cHJvamVjdCB4bWxucz0iaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvUE9NLzQuMC4wIgorICAgICAgICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIgorICAgICAgICB4c2k6c2NoZW1hTG9jYXRpb249Imh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL1BPTS80LjAuMCBodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9tYXZlbi12NF8wXzAueHNkIj4KKyAgPG1vZGVsVmVyc2lvbj40LjAuMDwvbW9kZWxWZXJzaW9uPgorCisgIDxwYXJlbnQ+CisgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CisgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CisgIDwvcGFyZW50PgorCisgIDxhcnRpZmFjdElkPmdlcnJpdC1hY2NlcHRhbmNlLXRlc3RzPC9hcnRpZmFjdElkPgorCisgIDxuYW1lPkdlcnJpdCBDb2RlIFJldmlldyAtIEFjY2VwdGFuY2UgVGVzdHM8L25hbWU+CisKKyAgPGRlc2NyaXB0aW9uPgorICAgIEdlcnJpdCBBY2NlcHRhbmNlIFRlc3RzCisgIDwvZGVzY3JpcHRpb24+CisKKyAgPGRlcGVuZGVuY2llcz4KKyAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPmp1bml0PC9ncm91cElkPgorICAgICAgPGFydGlmYWN0SWQ+anVuaXQ8L2FydGlmYWN0SWQ+CisgICAgICA8c2NvcGU+dGVzdDwvc2NvcGU+CisgICAgPC9kZXBlbmRlbmN5PgorCisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmdlcnJpdC1yZXZpZXdkYjwvYXJ0aWZhY3RJZD4KKyAgICAgIDx2ZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvdmVyc2lvbj4KKyAgICA8L2RlcGVuZGVuY3k+CisKKyAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LW1haW48L2FydGlmYWN0SWQ+CisgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8c2NvcGU+cnVudGltZTwvc2NvcGU+CisgICAgPC9kZXBlbmRlbmN5PgorCisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmdlcnJpdC1zZXJ2ZXI8L2FydGlmYWN0SWQ+CisgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8ZXhjbHVzaW9ucz4KKyAgICAgICAgPGV4Y2x1c2lvbj4KKyAgICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLnRvbWNhdDwvZ3JvdXBJZD4KKyAgICAgICAgICA8YXJ0aWZhY3RJZD5zZXJ2bGV0LWFwaTwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPC9leGNsdXNpb24+CisgICAgICA8L2V4Y2x1c2lvbnM+CisgICAgPC9kZXBlbmRlbmN5PgorCisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5vcmcuc2xmNGo8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5zbGY0ai1sb2c0ajEyPC9hcnRpZmFjdElkPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+bG9nNGo8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5sb2c0ajwvYXJ0aWZhY3RJZD4KKyAgICA8L2RlcGVuZGVuY3k+CisKKyAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LW9wZW5pZDwvYXJ0aWZhY3RJZD4KKyAgICAgIDx2ZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvdmVyc2lvbj4KKyAgICA8L2RlcGVuZGVuY3k+CisKKyAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXNzaGQ8L2FydGlmYWN0SWQ+CisgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CisgICAgPC9kZXBlbmRlbmN5PgorCisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmdlcnJpdC1odHRwZDwvYXJ0aWZhY3RJZD4KKyAgICAgIDx2ZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvdmVyc2lvbj4KKyAgICA8L2RlcGVuZGVuY3k+CisKKyAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBnbTwvYXJ0aWZhY3RJZD4KKyAgICAgIDx2ZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvdmVyc2lvbj4KKyAgICAgIDxleGNsdXNpb25zPgorICAgICAgICA8ZXhjbHVzaW9uPgorICAgICAgICAgIDxncm91cElkPm9yZy5lY2xpcHNlLmpldHR5PC9ncm91cElkPgorICAgICAgICAgIDxhcnRpZmFjdElkPmpldHR5LXNlcnZsZXQ8L2FydGlmYWN0SWQ+CisgICAgICAgIDwvZXhjbHVzaW9uPgorICAgICAgPC9leGNsdXNpb25zPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+b3JnLmVjbGlwc2UuamV0dHk8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5qZXR0eS1zZXJ2bGV0PC9hcnRpZmFjdElkPgorICAgICAgPHNjb3BlPnByb3ZpZGVkPC9zY29wZT4KKyAgICA8L2RlcGVuZGVuY3k+CisgIDwvZGVwZW5kZW5jaWVzPgorCisgIDxwcm9maWxlcz4KKyAgICA8cHJvZmlsZT4KKyAgICAgIDxpZD5hY2NlcHRhbmNlPC9pZD4KKyAgICAgIDxhY3RpdmF0aW9uPgorICAgICAgICA8cHJvcGVydHk+CisgICAgICAgICAgPG5hbWU+IWdlcnJpdC5hY2NlcHRhbmNlLXRlc3RzLnNraXA8L25hbWU+CisgICAgICAgIDwvcHJvcGVydHk+CisgICAgICA8L2FjdGl2YXRpb24+CisgICAgICA8YnVpbGQ+CisgICAgICAgIDxwbHVnaW5zPgorICAgICAgICAgIDxwbHVnaW4+CisgICAgICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+CisgICAgICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi1mYWlsc2FmZS1wbHVnaW48L2FydGlmYWN0SWQ+CisgICAgICAgICAgICA8dmVyc2lvbj4yLjU8L3ZlcnNpb24+CisgICAgICAgICAgICA8ZXhlY3V0aW9ucz4KKyAgICAgICAgICAgICAgPGV4ZWN1dGlvbj4KKyAgICAgICAgICAgICAgICA8aWQ+aW50ZWdyYXRpb24tdGVzdDwvaWQ+CisgICAgICAgICAgICAgICAgPGdvYWxzPgorICAgICAgICAgICAgICAgICAgPGdvYWw+aW50ZWdyYXRpb24tdGVzdDwvZ29hbD4KKyAgICAgICAgICAgICAgICA8L2dvYWxzPgorICAgICAgICAgICAgICA8L2V4ZWN1dGlvbj4KKyAgICAgICAgICAgICAgPGV4ZWN1dGlvbj4KKyAgICAgICAgICAgICAgICA8aWQ+dmVyaWZ5PC9pZD4KKyAgICAgICAgICAgICAgICA8Z29hbHM+CisgICAgICAgICAgICAgICAgICA8Z29hbD52ZXJpZnk8L2dvYWw+CisgICAgICAgICAgICAgICAgPC9nb2Fscz4KKyAgICAgICAgICAgICAgPC9leGVjdXRpb24+CisgICAgICAgICAgICA8L2V4ZWN1dGlvbnM+CisgICAgICAgICAgPC9wbHVnaW4+CisgICAgICAgIDwvcGx1Z2lucz4KKyAgICAgIDwvYnVpbGQ+CisgICAgPC9wcm9maWxlPgorICA8L3Byb2ZpbGVzPgorPC9wcm9qZWN0PgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL0Fic3RyYWN0RGFlbW9uVGVzdC5qYXZhIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL0Fic3RyYWN0RGFlbW9uVGVzdC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUxYzdiM2QKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvQWJzdHJhY3REYWVtb25UZXN0LmphdmEKQEAgLTAsMCArMSwzNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2U7CisKK2ltcG9ydCBvcmcuanVuaXQuQWZ0ZXI7CitpbXBvcnQgb3JnLmp1bml0LkJlZm9yZTsKKworCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgQWJzdHJhY3REYWVtb25UZXN0IHsKKworICBwcml2YXRlIEdlcnJpdFNlcnZlciBzZXJ2ZXI7CisKKyAgQEJlZm9yZQorICBwdWJsaWMgZmluYWwgdm9pZCBiZWZvcmVUZXN0KCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgc2VydmVyID0gR2Vycml0U2VydmVyLnN0YXJ0KCk7CisgICAgc2VydmVyLmdldFRlc3RJbmplY3RvcigpLmluamVjdE1lbWJlcnModGhpcyk7CisgIH0KKworICBAQWZ0ZXIKKyAgcHVibGljIGZpbmFsIHZvaWQgYWZ0ZXJUZXN0KCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgc2VydmVyLnN0b3AoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL0FjY291bnRDcmVhdG9yLmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvQWNjb3VudENyZWF0b3IuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNTZlZjA3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL0FjY291bnRDcmVhdG9yLmphdmEKQEAgLTAsMCArMSwxMzIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlOworCitpbXBvcnQgamF2YS5pby5CeXRlQXJyYXlPdXRwdXRTdHJlYW07CitpbXBvcnQgamF2YS5pby5VbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKKworaW1wb3J0IGphdmF4LmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEV4dGVybmFsSWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTWVtYmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50U3NoS2V5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50QnlFbWFpbENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guU3NoS2V5Q2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuU2NoZW1hRmFjdG9yeTsKK2ltcG9ydCBjb20uamNyYWZ0LmpzY2guSlNjaDsKK2ltcG9ydCBjb20uamNyYWZ0LmpzY2guSlNjaEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uamNyYWZ0LmpzY2guS2V5UGFpcjsKKworcHVibGljIGNsYXNzIEFjY291bnRDcmVhdG9yIHsKKworICBwcml2YXRlIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHJldmlld0RiUHJvdmlkZXI7CisgIHByaXZhdGUgR3JvdXBDYWNoZSBncm91cENhY2hlOworICBwcml2YXRlIFNzaEtleUNhY2hlIHNzaEtleUNhY2hlOworICBwcml2YXRlIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGU7CisgIHByaXZhdGUgQWNjb3VudEJ5RW1haWxDYWNoZSBieUVtYWlsQ2FjaGU7CisKKyAgQEluamVjdAorICBBY2NvdW50Q3JlYXRvcihTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzY2hlbWEsIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZSwKKyAgICAgIFNzaEtleUNhY2hlIHNzaEtleUNhY2hlLCBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlLAorICAgICAgQWNjb3VudEJ5RW1haWxDYWNoZSBieUVtYWlsQ2FjaGUpIHsKKyAgICByZXZpZXdEYlByb3ZpZGVyID0gc2NoZW1hOworICAgIHRoaXMuZ3JvdXBDYWNoZSA9IGdyb3VwQ2FjaGU7CisgICAgdGhpcy5zc2hLZXlDYWNoZSA9IHNzaEtleUNhY2hlOworICAgIHRoaXMuYWNjb3VudENhY2hlID0gYWNjb3VudENhY2hlOworICAgIHRoaXMuYnlFbWFpbENhY2hlID0gYnlFbWFpbENhY2hlOworICB9CisKKyAgcHVibGljIFRlc3RBY2NvdW50IGNyZWF0ZShTdHJpbmcgdXNlcm5hbWUsIFN0cmluZyBlbWFpbCwgU3RyaW5nIGZ1bGxOYW1lLAorICAgICAgU3RyaW5nLi4uIGdyb3VwcykKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24sIFVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb24sIEpTY2hFeGNlcHRpb24geworICAgIFJldmlld0RiIGRiID0gcmV2aWV3RGJQcm92aWRlci5vcGVuKCk7CisgICAgdHJ5IHsKKyAgICAgIEFjY291bnQuSWQgaWQgPSBuZXcgQWNjb3VudC5JZChkYi5uZXh0QWNjb3VudElkKCkpOworICAgICAgS2V5UGFpciBzc2hLZXkgPSBnZW5Tc2hLZXkoKTsKKyAgICAgIEFjY291bnRTc2hLZXkga2V5ID0KKyAgICAgICAgICBuZXcgQWNjb3VudFNzaEtleShuZXcgQWNjb3VudFNzaEtleS5JZChpZCwgMSksIHB1YmxpY0tleShzc2hLZXksIGVtYWlsKSk7CisgICAgICBBY2NvdW50RXh0ZXJuYWxJZCBleHRVc2VyID0KKyAgICAgICAgICBuZXcgQWNjb3VudEV4dGVybmFsSWQoaWQsIG5ldyBBY2NvdW50RXh0ZXJuYWxJZC5LZXkoCisgICAgICAgICAgICAgIEFjY291bnRFeHRlcm5hbElkLlNDSEVNRV9VU0VSTkFNRSwgdXNlcm5hbWUpKTsKKyAgICAgIFN0cmluZyBodHRwUGFzcyA9ICJodHRwLXBhc3MiOworICAgICAgZXh0VXNlci5zZXRQYXNzd29yZChodHRwUGFzcyk7CisgICAgICBkYi5hY2NvdW50RXh0ZXJuYWxJZHMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGV4dFVzZXIpKTsKKworICAgICAgaWYgKGVtYWlsICE9IG51bGwpIHsKKyAgICAgICAgQWNjb3VudEV4dGVybmFsSWQgZXh0TWFpbHRvID0gbmV3IEFjY291bnRFeHRlcm5hbElkKGlkLCBnZXRFbWFpbEtleShlbWFpbCkpOworICAgICAgICBleHRNYWlsdG8uc2V0RW1haWxBZGRyZXNzKGVtYWlsKTsKKyAgICAgICAgZGIuYWNjb3VudEV4dGVybmFsSWRzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihleHRNYWlsdG8pKTsKKyAgICAgIH0KKworICAgICAgQWNjb3VudCBhID0gbmV3IEFjY291bnQoaWQpOworICAgICAgYS5zZXRGdWxsTmFtZShmdWxsTmFtZSk7CisgICAgICBhLnNldFByZWZlcnJlZEVtYWlsKGVtYWlsKTsKKyAgICAgIGRiLmFjY291bnRzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihhKSk7CisKKyAgICAgIGRiLmFjY291bnRTc2hLZXlzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihrZXkpKTsKKworICAgICAgaWYgKGdyb3VwcyAhPSBudWxsKSB7CisgICAgICAgIGZvciAoU3RyaW5nIG4gOiBncm91cHMpIHsKKyAgICAgICAgICBBY2NvdW50R3JvdXAuTmFtZUtleSBrID0gbmV3IEFjY291bnRHcm91cC5OYW1lS2V5KG4pOworICAgICAgICAgIEFjY291bnRHcm91cCBnID0gZ3JvdXBDYWNoZS5nZXQoayk7CisgICAgICAgICAgQWNjb3VudEdyb3VwTWVtYmVyIG0gPQorICAgICAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwTWVtYmVyKG5ldyBBY2NvdW50R3JvdXBNZW1iZXIuS2V5KGlkLCBnLmdldElkKCkpKTsKKyAgICAgICAgICBkYi5hY2NvdW50R3JvdXBNZW1iZXJzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihtKSk7CisgICAgICAgIH0KKyAgICAgIH0KKworICAgICAgc3NoS2V5Q2FjaGUuZXZpY3QodXNlcm5hbWUpOworICAgICAgYWNjb3VudENhY2hlLmV2aWN0QnlVc2VybmFtZSh1c2VybmFtZSk7CisgICAgICBieUVtYWlsQ2FjaGUuZXZpY3QoZW1haWwpOworCisgICAgICByZXR1cm4gbmV3IFRlc3RBY2NvdW50KGlkLCB1c2VybmFtZSwgZW1haWwsIGZ1bGxOYW1lLCBzc2hLZXksIGh0dHBQYXNzKTsKKyAgICB9IGZpbmFsbHkgeworICAgICAgZGIuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgVGVzdEFjY291bnQgY3JlYXRlKFN0cmluZyB1c2VybmFtZSwgU3RyaW5nIGdyb3VwKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiwgSlNjaEV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGNyZWF0ZSh1c2VybmFtZSwgbnVsbCwgdXNlcm5hbWUsIGdyb3VwKTsKKyAgfQorCisgIHB1YmxpYyBUZXN0QWNjb3VudCBjcmVhdGUoU3RyaW5nIHVzZXJuYW1lKQorICAgICAgdGhyb3dzIFVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwgSlNjaEV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGNyZWF0ZSh1c2VybmFtZSwgbnVsbCwgdXNlcm5hbWUsIChTdHJpbmdbXSkgbnVsbCk7CisgIH0KKworICBwcml2YXRlIEFjY291bnRFeHRlcm5hbElkLktleSBnZXRFbWFpbEtleShTdHJpbmcgZW1haWwpIHsKKyAgICByZXR1cm4gbmV3IEFjY291bnRFeHRlcm5hbElkLktleShBY2NvdW50RXh0ZXJuYWxJZC5TQ0hFTUVfTUFJTFRPLCBlbWFpbCk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBLZXlQYWlyIGdlblNzaEtleSgpIHRocm93cyBKU2NoRXhjZXB0aW9uIHsKKyAgICBKU2NoIGpzY2ggPSBuZXcgSlNjaCgpOworICAgIHJldHVybiBLZXlQYWlyLmdlbktleVBhaXIoanNjaCwgS2V5UGFpci5SU0EpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIHB1YmxpY0tleShLZXlQYWlyIHNzaEtleSwgU3RyaW5nIGNvbW1lbnQpCisgICAgICB0aHJvd3MgVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiB7CisgICAgQnl0ZUFycmF5T3V0cHV0U3RyZWFtIG91dCA9IG5ldyBCeXRlQXJyYXlPdXRwdXRTdHJlYW0oKTsKKyAgICBzc2hLZXkud3JpdGVQdWJsaWNLZXkob3V0LCBjb21tZW50KTsKKyAgICByZXR1cm4gb3V0LnRvU3RyaW5nKCJBU0NJSSIpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvR2NBc3NlcnQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9HY0Fzc2VydC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRjNzI4OWIyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL0djQXNzZXJ0LmphdmEKQEAgLTAsMCArMSw3MCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2U7CisKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRUcnVlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5SZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLkZpbGVuYW1lRmlsdGVyOworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CisKK3B1YmxpYyBjbGFzcyBHY0Fzc2VydCB7CisKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcjsKKworICBASW5qZWN0CisgIHB1YmxpYyBHY0Fzc2VydChHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcikgeworICAgIHRoaXMucmVwb01hbmFnZXIgPSByZXBvTWFuYWdlcjsKKyAgfQorCisgIHB1YmxpYyB2b2lkIGFzc2VydEhhc1BhY2tGaWxlKFByb2plY3QuTmFtZUtleS4uLiBwcm9qZWN0cykKKyAgICAgIHRocm93cyBSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKyAgICBmb3IgKFByb2plY3QuTmFtZUtleSBwIDogcHJvamVjdHMpIHsKKyAgICAgIGFzc2VydFRydWUoIlByb2plY3QgIiArIHAuZ2V0KCkgKyAiIGhhcyBubyBwYWNrIGZpbGVzLiIsCisgICAgICAgICAgZ2V0UGFja0ZpbGVzKHApLmxlbmd0aCA+IDApOworICAgIH0KKyAgfQorCisgIHB1YmxpYyB2b2lkIGFzc2VydEhhc05vUGFja0ZpbGUoUHJvamVjdC5OYW1lS2V5Li4uIHByb2plY3RzKQorICAgICAgdGhyb3dzIFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIGZvciAoUHJvamVjdC5OYW1lS2V5IHAgOiBwcm9qZWN0cykgeworICAgICAgYXNzZXJ0VHJ1ZSgiUHJvamVjdCAiICsgcC5nZXQoKSArICIgaGFzIHBhY2sgZmlsZXMuIiwKKyAgICAgICAgICBnZXRQYWNrRmlsZXMocCkubGVuZ3RoID09IDApOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgU3RyaW5nW10gZ2V0UGFja0ZpbGVzKFByb2plY3QuTmFtZUtleSBwKQorICAgICAgdGhyb3dzIFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIFJlcG9zaXRvcnkgcmVwbyA9IHJlcG9NYW5hZ2VyLm9wZW5SZXBvc2l0b3J5KHApOworICAgIHRyeSB7CisgICAgICBGaWxlIHBhY2tEaXIgPSBuZXcgRmlsZShyZXBvLmdldERpcmVjdG9yeSgpLCAib2JqZWN0cy9wYWNrIik7CisgICAgICByZXR1cm4gcGFja0Rpci5saXN0KG5ldyBGaWxlbmFtZUZpbHRlcigpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHB1YmxpYyBib29sZWFuIGFjY2VwdChGaWxlIGRpciwgU3RyaW5nIG5hbWUpIHsKKyAgICAgICAgICByZXR1cm4gbmFtZS5lbmRzV2l0aCgiLnBhY2siKTsKKyAgICAgICAgfQorICAgICAgfSk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIHJlcG8uY2xvc2UoKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9HZXJyaXRTZXJ2ZXIuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9HZXJyaXRTZXJ2ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42NWJhYjZhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL0dlcnJpdFNlcnZlci5qYXZhCkBAIC0wLDAgKzEsMTI4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZTsKKworaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0LkZpZWxkOworaW1wb3J0IGphdmEudGV4dC5EYXRlRm9ybWF0OworaW1wb3J0IGphdmEudGV4dC5TaW1wbGVEYXRlRm9ybWF0OworaW1wb3J0IGphdmEudXRpbC5EYXRlOworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkJyb2tlbkJhcnJpZXJFeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuQ2FsbGFibGU7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuQ3ljbGljQmFycmllcjsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5FeGVjdXRvclNlcnZpY2U7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuRXhlY3V0b3JzOworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQubGlmZWN5Y2xlLkxpZmVjeWNsZU1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucGdtLkRhZW1vbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uSW5pdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkZhY3RvcnlNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuTW9kdWxlOworCitjbGFzcyBHZXJyaXRTZXJ2ZXIgeworCisgIC8qKiBSZXR1cm5zIGZ1bGx5IHN0YXJ0ZWQgR2Vycml0IHNlcnZlciAqLworICBzdGF0aWMgR2Vycml0U2VydmVyIHN0YXJ0KCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisKKyAgICBmaW5hbCBTdHJpbmcgc2l0ZVBhdGggPSBpbml0U2l0ZSgpOworCisgICAgZmluYWwgQ3ljbGljQmFycmllciBzZXJ2ZXJTdGFydGVkID0gbmV3IEN5Y2xpY0JhcnJpZXIoMik7CisKKyAgICBmaW5hbCBEYWVtb24gZGFlbW9uID0gbmV3IERhZW1vbihuZXcgUnVubmFibGUoKSB7CisgICAgICBwdWJsaWMgdm9pZCBydW4oKSB7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgc2VydmVyU3RhcnRlZC5hd2FpdCgpOworICAgICAgICB9IGNhdGNoIChJbnRlcnJ1cHRlZEV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgdGhyb3cgbmV3IFJ1bnRpbWVFeGNlcHRpb24oZSk7CisgICAgICAgIH0gY2F0Y2ggKEJyb2tlbkJhcnJpZXJFeGNlcHRpb24gZSkgeworICAgICAgICAgIHRocm93IG5ldyBSdW50aW1lRXhjZXB0aW9uKGUpOworICAgICAgICB9CisgICAgICB9CisgICAgfSk7CisKKyAgICBFeGVjdXRvclNlcnZpY2UgZGFlbW9uU2VydmljZSA9IEV4ZWN1dG9ycy5uZXdTaW5nbGVUaHJlYWRFeGVjdXRvcigpOworICAgIGRhZW1vblNlcnZpY2Uuc3VibWl0KG5ldyBDYWxsYWJsZTxWb2lkPigpIHsKKyAgICAgIHB1YmxpYyBWb2lkIGNhbGwoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICAgICAgaW50IHJjID0gZGFlbW9uLm1haW4obmV3IFN0cmluZ1tdIHsiLWQiLCBzaXRlUGF0aCwgIi0taGVhZGxlc3MiIH0pOworICAgICAgICBpZiAocmMgIT0gMCkgeworICAgICAgICAgIFN5c3RlbS5vdXQucHJpbnRsbigiRmFpbGVkIHRvIHN0YXJ0IEdlcnJpdCBkYWVtb24uIENoZWNrICIKKyAgICAgICAgICAgICAgKyBzaXRlUGF0aCArICIvbG9ncy9lcnJvcl9sb2ciKTsKKyAgICAgICAgICBzZXJ2ZXJTdGFydGVkLnJlc2V0KCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICB9OworICAgIH0pOworCisgICAgc2VydmVyU3RhcnRlZC5hd2FpdCgpOworICAgIFN5c3RlbS5vdXQucHJpbnRsbigiR2Vycml0IFNlcnZlciBTdGFydGVkIik7CisKKyAgICBJbmplY3RvciBpID0gY3JlYXRlVGVzdEluamVjdG9yKGRhZW1vbik7CisgICAgcmV0dXJuIG5ldyBHZXJyaXRTZXJ2ZXIoaSwgZGFlbW9uLCBkYWVtb25TZXJ2aWNlKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBpbml0U2l0ZSgpIHRocm93cyBFeGNlcHRpb24geworICAgIERhdGVGb3JtYXQgZGYgPSBuZXcgU2ltcGxlRGF0ZUZvcm1hdCgieXl5eU1NZGRISG1tc3MiKTsKKyAgICBTdHJpbmcgcGF0aCA9ICJ0YXJnZXQvdGVzdF9zaXRlXyIgKyBkZi5mb3JtYXQobmV3IERhdGUoKSk7CisgICAgSW5pdCBpbml0ID0gbmV3IEluaXQoKTsKKyAgICBpbnQgcmMgPSBpbml0Lm1haW4obmV3IFN0cmluZ1tdIHsiLWQiLCBwYXRoLCAiLS1iYXRjaCIsICItLW5vLWF1dG8tc3RhcnQifSk7CisgICAgaWYgKHJjICE9IDApIHsKKyAgICAgIHRocm93IG5ldyBSdW50aW1lRXhjZXB0aW9uKCJDb3VsZG4ndCBpbml0aWFsaXplIHNpdGUiKTsKKyAgICB9CisgICAgcmV0dXJuIHBhdGg7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBJbmplY3RvciBjcmVhdGVUZXN0SW5qZWN0b3IoRGFlbW9uIGRhZW1vbikgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgSW5qZWN0b3Igc3lzSW5qZWN0b3IgPSBnZXQoZGFlbW9uLCAic3lzSW5qZWN0b3IiKTsKKyAgICBNb2R1bGUgbW9kdWxlID0gbmV3IEZhY3RvcnlNb2R1bGUoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICAgICAgYmluZChBY2NvdW50Q3JlYXRvci5jbGFzcyk7CisgICAgICB9CisgICAgfTsKKyAgICByZXR1cm4gc3lzSW5qZWN0b3IuY3JlYXRlQ2hpbGRJbmplY3Rvcihtb2R1bGUpOworICB9CisKKyAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgIHByaXZhdGUgc3RhdGljIDxUPiBUIGdldChPYmplY3Qgb2JqLCBTdHJpbmcgZmllbGQpIHRocm93cyBTZWN1cml0eUV4Y2VwdGlvbiwKKyAgICAgIE5vU3VjaEZpZWxkRXhjZXB0aW9uLCBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24sIElsbGVnYWxBY2Nlc3NFeGNlcHRpb24geworICAgIEZpZWxkIGYgPSBvYmouZ2V0Q2xhc3MoKS5nZXREZWNsYXJlZEZpZWxkKGZpZWxkKTsKKyAgICBmLnNldEFjY2Vzc2libGUodHJ1ZSk7CisgICAgcmV0dXJuIChUKSBmLmdldChvYmopOworICB9CisKKyAgcHJpdmF0ZSBEYWVtb24gZGFlbW9uOworICBwcml2YXRlIEV4ZWN1dG9yU2VydmljZSBkYWVtb25TZXJ2aWNlOworICBwcml2YXRlIEluamVjdG9yIHRlc3RJbmplY3RvcjsKKworICBwcml2YXRlIEdlcnJpdFNlcnZlcihJbmplY3RvciB0ZXN0SW5qZWN0b3IsCisgICAgICBEYWVtb24gZGFlbW9uLCBFeGVjdXRvclNlcnZpY2UgZGFlbW9uU2VydmljZSkgeworICAgIHRoaXMudGVzdEluamVjdG9yID0gdGVzdEluamVjdG9yOworICAgIHRoaXMuZGFlbW9uID0gZGFlbW9uOworICAgIHRoaXMuZGFlbW9uU2VydmljZSA9IGRhZW1vblNlcnZpY2U7CisgIH0KKworICBJbmplY3RvciBnZXRUZXN0SW5qZWN0b3IoKSB7CisgICAgcmV0dXJuIHRlc3RJbmplY3RvcjsKKyAgfQorCisgIHZvaWQgc3RvcCgpIHRocm93cyBFeGNlcHRpb24geworICAgIExpZmVjeWNsZU1hbmFnZXIgbWFuYWdlciA9IGdldChkYWVtb24sICJtYW5hZ2VyIik7CisgICAgU3lzdGVtLm91dC5wcmludGxuKCJHZXJyaXQgU2VydmVyIFNodXRkb3duIik7CisgICAgbWFuYWdlci5zdG9wKCk7CisgICAgZGFlbW9uU2VydmljZS5zaHV0ZG93bk5vdygpOworICAgIGRhZW1vblNlcnZpY2UuYXdhaXRUZXJtaW5hdGlvbihMb25nLk1BWF9WQUxVRSwgVGltZVVuaXQuU0VDT05EUyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9SZXN0UmVzcG9uc2UuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9SZXN0UmVzcG9uc2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45ZjkzNDg5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL1Jlc3RSZXNwb25zZS5qYXZhCkBAIC0wLDAgKzEsNTIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlOworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJlc3RhcGkuUmVzdEFwaVNlcnZsZXQuSlNPTl9NQUdJQzsKKworaW1wb3J0IG9yZy5hcGFjaGUuaHR0cC5IdHRwUmVzcG9uc2U7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuaW8uSW5wdXRTdHJlYW1SZWFkZXI7CitpbXBvcnQgamF2YS5pby5SZWFkZXI7CisKK3B1YmxpYyBjbGFzcyBSZXN0UmVzcG9uc2UgeworCisgIHByaXZhdGUgSHR0cFJlc3BvbnNlIHJlc3BvbnNlOworICBwcml2YXRlIFJlYWRlciByZWFkZXI7CisKKyAgUmVzdFJlc3BvbnNlKEh0dHBSZXNwb25zZSByZXNwb25zZSkgeworICAgIHRoaXMucmVzcG9uc2UgPSByZXNwb25zZTsKKyAgfQorCisgIHB1YmxpYyBSZWFkZXIgZ2V0UmVhZGVyKCkgdGhyb3dzIElsbGVnYWxTdGF0ZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIGlmIChyZWFkZXIgPT0gbnVsbCAmJiByZXNwb25zZS5nZXRFbnRpdHkoKSAhPSBudWxsKSB7CisgICAgICByZWFkZXIgPSBuZXcgSW5wdXRTdHJlYW1SZWFkZXIocmVzcG9uc2UuZ2V0RW50aXR5KCkuZ2V0Q29udGVudCgpKTsKKyAgICAgIHJlYWRlci5za2lwKEpTT05fTUFHSUMubGVuZ3RoKTsKKyAgICB9CisgICAgcmV0dXJuIHJlYWRlcjsKKyAgfQorCisgIHB1YmxpYyB2b2lkIGNvbnN1bWUoKSB0aHJvd3MgSWxsZWdhbFN0YXRlRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgUmVhZGVyIHJlYWRlciA9IGdldFJlYWRlcigpOworICAgIGlmIChyZWFkZXIgIT0gbnVsbCkgeworICAgICAgd2hpbGUgKHJlYWRlci5yZWFkKCkgIT0gLTEpOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBpbnQgZ2V0U3RhdHVzQ29kZSgpIHsKKyAgICByZXR1cm4gcmVzcG9uc2UuZ2V0U3RhdHVzTGluZSgpLmdldFN0YXR1c0NvZGUoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL1Jlc3RTZXNzaW9uLmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvUmVzdFNlc3Npb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yYmY2NTIzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL1Jlc3RTZXNzaW9uLmphdmEKQEAgLTAsMCArMSw4NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24uR3NvbjsKKworaW1wb3J0IG9yZy5hcGFjaGUuaHR0cC5hdXRoLkF1dGhTY29wZTsKK2ltcG9ydCBvcmcuYXBhY2hlLmh0dHAuYXV0aC5Vc2VybmFtZVBhc3N3b3JkQ3JlZGVudGlhbHM7CitpbXBvcnQgb3JnLmFwYWNoZS5odHRwLmNsaWVudC5tZXRob2RzLkh0dHBEZWxldGU7CitpbXBvcnQgb3JnLmFwYWNoZS5odHRwLmNsaWVudC5tZXRob2RzLkh0dHBHZXQ7CitpbXBvcnQgb3JnLmFwYWNoZS5odHRwLmNsaWVudC5tZXRob2RzLkh0dHBQb3N0OworaW1wb3J0IG9yZy5hcGFjaGUuaHR0cC5jbGllbnQubWV0aG9kcy5IdHRwUHV0OworaW1wb3J0IG9yZy5hcGFjaGUuaHR0cC5lbnRpdHkuU3RyaW5nRW50aXR5OworaW1wb3J0IG9yZy5hcGFjaGUuaHR0cC5pbXBsLmNsaWVudC5EZWZhdWx0SHR0cENsaWVudDsKK2ltcG9ydCBvcmcuYXBhY2hlLmh0dHAubWVzc2FnZS5CYXNpY0hlYWRlcjsKK2ltcG9ydCBvcmcuYXBhY2hlLmh0dHAucHJvdG9jb2wuSFRUUDsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CisKK3B1YmxpYyBjbGFzcyBSZXN0U2Vzc2lvbiB7CisKKyAgcHJpdmF0ZSBmaW5hbCBUZXN0QWNjb3VudCBhY2NvdW50OworICBEZWZhdWx0SHR0cENsaWVudCBjbGllbnQ7CisKKyAgcHVibGljIFJlc3RTZXNzaW9uKFRlc3RBY2NvdW50IGFjY291bnQpIHsKKyAgICB0aGlzLmFjY291bnQgPSBhY2NvdW50OworICB9CisKKyAgcHVibGljIFJlc3RSZXNwb25zZSBnZXQoU3RyaW5nIGVuZFBvaW50KSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIEh0dHBHZXQgZ2V0ID0gbmV3IEh0dHBHZXQoImh0dHA6Ly9sb2NhbGhvc3Q6ODA4MC9hIiArIGVuZFBvaW50KTsKKyAgICByZXR1cm4gbmV3IFJlc3RSZXNwb25zZShnZXRDbGllbnQoKS5leGVjdXRlKGdldCkpOworICB9CisKKyAgcHVibGljIFJlc3RSZXNwb25zZSBwdXQoU3RyaW5nIGVuZFBvaW50KSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHJldHVybiBwdXQoZW5kUG9pbnQsIG51bGwpOworICB9CisKKyAgcHVibGljIFJlc3RSZXNwb25zZSBwdXQoU3RyaW5nIGVuZFBvaW50LCBPYmplY3QgY29udGVudCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBIdHRwUHV0IHB1dCA9IG5ldyBIdHRwUHV0KCJodHRwOi8vbG9jYWxob3N0OjgwODAvYSIgKyBlbmRQb2ludCk7CisgICAgaWYgKGNvbnRlbnQgIT0gbnVsbCkgeworICAgICAgcHV0LmFkZEhlYWRlcihuZXcgQmFzaWNIZWFkZXIoIkNvbnRlbnQtVHlwZSIsICJhcHBsaWNhdGlvbi9qc29uIikpOworICAgICAgcHV0LnNldEVudGl0eShuZXcgU3RyaW5nRW50aXR5KChuZXcgR3NvbigpKS50b0pzb24oY29udGVudCksIEhUVFAuVVRGXzgpKTsKKyAgICB9CisgICAgcmV0dXJuIG5ldyBSZXN0UmVzcG9uc2UoZ2V0Q2xpZW50KCkuZXhlY3V0ZShwdXQpKTsKKyAgfQorCisgIHB1YmxpYyBSZXN0UmVzcG9uc2UgcG9zdChTdHJpbmcgZW5kUG9pbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgcmV0dXJuIHBvc3QoZW5kUG9pbnQsIG51bGwpOworICB9CisKKyAgcHVibGljIFJlc3RSZXNwb25zZSBwb3N0KFN0cmluZyBlbmRQb2ludCwgT2JqZWN0IGNvbnRlbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgSHR0cFBvc3QgcG9zdCA9IG5ldyBIdHRwUG9zdCgiaHR0cDovL2xvY2FsaG9zdDo4MDgwL2EiICsgZW5kUG9pbnQpOworICAgIGlmIChjb250ZW50ICE9IG51bGwpIHsKKyAgICAgIHBvc3QuYWRkSGVhZGVyKG5ldyBCYXNpY0hlYWRlcigiQ29udGVudC1UeXBlIiwgImFwcGxpY2F0aW9uL2pzb24iKSk7CisgICAgICBwb3N0LnNldEVudGl0eShuZXcgU3RyaW5nRW50aXR5KChuZXcgR3NvbigpKS50b0pzb24oY29udGVudCksIEhUVFAuVVRGXzgpKTsKKyAgICB9CisgICAgcmV0dXJuIG5ldyBSZXN0UmVzcG9uc2UoZ2V0Q2xpZW50KCkuZXhlY3V0ZShwb3N0KSk7CisgIH0KKworICBwdWJsaWMgUmVzdFJlc3BvbnNlIGRlbGV0ZShTdHJpbmcgZW5kUG9pbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgSHR0cERlbGV0ZSBkZWxldGUgPSBuZXcgSHR0cERlbGV0ZSgiaHR0cDovL2xvY2FsaG9zdDo4MDgwL2EiICsgZW5kUG9pbnQpOworICAgIHJldHVybiBuZXcgUmVzdFJlc3BvbnNlKGdldENsaWVudCgpLmV4ZWN1dGUoZGVsZXRlKSk7CisgIH0KKworICBwcml2YXRlIERlZmF1bHRIdHRwQ2xpZW50IGdldENsaWVudCgpIHsKKyAgICBpZiAoY2xpZW50ID09IG51bGwpIHsKKyAgICAgIGNsaWVudCA9IG5ldyBEZWZhdWx0SHR0cENsaWVudCgpOworICAgICAgY2xpZW50LmdldENyZWRlbnRpYWxzUHJvdmlkZXIoKS5zZXRDcmVkZW50aWFscygKKyAgICAgICAgICBuZXcgQXV0aFNjb3BlKCJsb2NhbGhvc3QiLCA4MDgwKSwKKyAgICAgICAgICBuZXcgVXNlcm5hbWVQYXNzd29yZENyZWRlbnRpYWxzKGFjY291bnQudXNlcm5hbWUsIGFjY291bnQuaHR0cFBhc3N3b3JkKSk7CisgICAgfQorICAgIHJldHVybiBjbGllbnQ7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9Tc2hTZXNzaW9uLmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvU3NoU2Vzc2lvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFhZTkyMzYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvU3NoU2Vzc2lvbi5qYXZhCkBAIC0wLDAgKzEsOTEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOworaW1wb3J0IGphdmEudXRpbC5TY2FubmVyOworCitpbXBvcnQgY29tLmpjcmFmdC5qc2NoLkNoYW5uZWxFeGVjOworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5KU2NoOworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5KU2NoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5TZXNzaW9uOworCitwdWJsaWMgY2xhc3MgU3NoU2Vzc2lvbiB7CisKKyAgcHJpdmF0ZSBmaW5hbCBUZXN0QWNjb3VudCBhY2NvdW50OworICBwcml2YXRlIFNlc3Npb24gc2Vzc2lvbjsKKyAgcHJpdmF0ZSBTdHJpbmcgZXJyb3I7CisKKyAgcHVibGljIFNzaFNlc3Npb24oVGVzdEFjY291bnQgYWNjb3VudCkgeworICAgIHRoaXMuYWNjb3VudCA9IGFjY291bnQ7CisgIH0KKworICBwdWJsaWMgU3RyaW5nIGV4ZWMoU3RyaW5nIGNvbW1hbmQpIHRocm93cyBKU2NoRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgQ2hhbm5lbEV4ZWMgY2hhbm5lbCA9IChDaGFubmVsRXhlYykgZ2V0U2Vzc2lvbigpLm9wZW5DaGFubmVsKCJleGVjIik7CisgICAgdHJ5IHsKKyAgICAgIGNoYW5uZWwuc2V0Q29tbWFuZChjb21tYW5kKTsKKyAgICAgIGNoYW5uZWwuc2V0SW5wdXRTdHJlYW0obnVsbCk7CisgICAgICBJbnB1dFN0cmVhbSBpbiA9IGNoYW5uZWwuZ2V0SW5wdXRTdHJlYW0oKTsKKyAgICAgIGNoYW5uZWwuY29ubmVjdCgpOworCisgICAgICBTY2FubmVyIHMgPSBuZXcgU2Nhbm5lcihjaGFubmVsLmdldEVyclN0cmVhbSgpKS51c2VEZWxpbWl0ZXIoIlxcQSIpOworICAgICAgZXJyb3IgPSAgcy5oYXNOZXh0KCkgPyBzLm5leHQoKSA6IG51bGw7CisKKyAgICAgIHMgPSBuZXcgU2Nhbm5lcihpbikudXNlRGVsaW1pdGVyKCJcXEEiKTsKKyAgICAgIHJldHVybiBzLmhhc05leHQoKSA/IHMubmV4dCgpIDogIiI7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGNoYW5uZWwuZGlzY29ubmVjdCgpOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGhhc0Vycm9yKCkgeworICAgIHJldHVybiBlcnJvciAhPSBudWxsOworICB9CisKKyAgcHVibGljIFN0cmluZyBnZXRFcnJvcigpIHsKKyAgICByZXR1cm4gZXJyb3I7CisgIH0KKworICBwdWJsaWMgdm9pZCBjbG9zZSgpIHsKKyAgICBpZiAoc2Vzc2lvbiAhPSBudWxsKSB7CisgICAgICBzZXNzaW9uLmRpc2Nvbm5lY3QoKTsKKyAgICAgIHNlc3Npb24gPSBudWxsOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgU2Vzc2lvbiBnZXRTZXNzaW9uKCkgdGhyb3dzIEpTY2hFeGNlcHRpb24geworICAgIGlmIChzZXNzaW9uID09IG51bGwpIHsKKyAgICAgIEpTY2gganNjaCA9IG5ldyBKU2NoKCk7CisgICAgICBqc2NoLmFkZElkZW50aXR5KCJLZXlQYWlyIiwKKyAgICAgICAgICBhY2NvdW50LnByaXZhdGVLZXkoKSwgYWNjb3VudC5zc2hLZXkuZ2V0UHVibGljS2V5QmxvYigpLCBudWxsKTsKKyAgICAgIHNlc3Npb24gPSBqc2NoLmdldFNlc3Npb24oYWNjb3VudC51c2VybmFtZSwgImxvY2FsaG9zdCIsIDI5NDE4KTsKKyAgICAgIHNlc3Npb24uc2V0Q29uZmlnKCJTdHJpY3RIb3N0S2V5Q2hlY2tpbmciLCAibm8iKTsKKyAgICAgIHNlc3Npb24uY29ubmVjdCgpOworICAgIH0KKyAgICByZXR1cm4gc2Vzc2lvbjsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgZ2V0VXJsKCkgeworICAgIFN0cmluZ0J1aWxkZXIgYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgYi5hcHBlbmQoInNzaDovLyIpOworICAgIGIuYXBwZW5kKHNlc3Npb24uZ2V0VXNlck5hbWUoKSk7CisgICAgYi5hcHBlbmQoIkAiKTsKKyAgICBiLmFwcGVuZChzZXNzaW9uLmdldEhvc3QoKSk7CisgICAgYi5hcHBlbmQoIjoiKTsKKyAgICBiLmFwcGVuZChzZXNzaW9uLmdldFBvcnQoKSk7CisgICAgcmV0dXJuIGIudG9TdHJpbmcoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL1N5c3RlbUdyb3Vwc0lULmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvU3lzdGVtR3JvdXBzSVQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42ZWUyMDQ1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL1N5c3RlbUdyb3Vwc0lULmphdmEKQEAgLTAsMCArMSwxMDUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlOworCitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0VHJ1ZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXAuR3JvdXBJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5Hc29uOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5yZWZsZWN0LlR5cGVUb2tlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5KU2NoRXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmp1bml0LkJlZm9yZTsKK2ltcG9ydCBvcmcuanVuaXQuVGVzdDsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCisvKioKKyAqIEFuIGV4YW1wbGUgdGVzdCB0aGF0IHRlc3RzIHByZXNlbmNlIG9mIHN5c3RlbSBncm91cHMgaW4gYSBuZXdseSBpbml0aWFsaXplZAorICogcmV2aWV3IHNpdGUuCisgKgorICogVGhlIHRlc3Qgc2hvd3MgaG93IHRvIHBlcmZvcm0gdGhlc2UgY2hlY2tzIHZpYSBTU0gsIFJFU1Qgb3IgdXNpbmcgR2Vycml0CisgKiBpbnRlcm5hbHMuCisgKi8KK3B1YmxpYyBjbGFzcyBTeXN0ZW1Hcm91cHNJVCBleHRlbmRzIEFic3RyYWN0RGFlbW9uVGVzdCB7CisKKyAgQEluamVjdAorICBwcml2YXRlIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHJldmlld0RiUHJvdmlkZXI7CisKKyAgQEluamVjdAorICBwcml2YXRlIEFjY291bnRDcmVhdG9yIGFjY291bnRzOworCisgIHByb3RlY3RlZCBUZXN0QWNjb3VudCBhZG1pbjsKKworICBAQmVmb3JlCisgIHB1YmxpYyB2b2lkIHNldFVwKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgYWRtaW4gPSBhY2NvdW50cy5jcmVhdGUoImFkbWluIiwgImFkbWluQHNhcC5jb20iLCAiQWRtaW5pc3RyYXRvciIsCisgICAgICAgICAgICAiQWRtaW5pc3RyYXRvcnMiKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHN5c3RlbUdyb3Vwc0NyZWF0ZWRfc3NoKCkgdGhyb3dzIEpTY2hFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKyAgICBTc2hTZXNzaW9uIHNlc3Npb24gPSBuZXcgU3NoU2Vzc2lvbihhZG1pbik7CisgICAgU3RyaW5nIHJlc3VsdCA9IHNlc3Npb24uZXhlYygiZ2Vycml0IGxzLWdyb3VwcyIpOworICAgIGFzc2VydFRydWUocmVzdWx0LmNvbnRhaW5zKCJBZG1pbmlzdHJhdG9ycyIpKTsKKyAgICBhc3NlcnRUcnVlKHJlc3VsdC5jb250YWlucygiQW5vbnltb3VzIFVzZXJzIikpOworICAgIGFzc2VydFRydWUocmVzdWx0LmNvbnRhaW5zKCJOb24tSW50ZXJhY3RpdmUgVXNlcnMiKSk7CisgICAgYXNzZXJ0VHJ1ZShyZXN1bHQuY29udGFpbnMoIlByb2plY3QgT3duZXJzIikpOworICAgIGFzc2VydFRydWUocmVzdWx0LmNvbnRhaW5zKCJSZWdpc3RlcmVkIFVzZXJzIikpOworICAgIHNlc3Npb24uY2xvc2UoKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHN5c3RlbUdyb3Vwc0NyZWF0ZWRfcmVzdCgpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgUmVzdFNlc3Npb24gc2Vzc2lvbiA9IG5ldyBSZXN0U2Vzc2lvbihhZG1pbik7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLmdldCgiL2dyb3Vwcy8iKTsKKyAgICBHc29uIGdzb24gPSBuZXcgR3NvbigpOworICAgIE1hcDxTdHJpbmcsIEdyb3VwSW5mbz4gcmVzdWx0ID0KKyAgICAgICAgZ3Nvbi5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPE1hcDxTdHJpbmcsIEdyb3VwSW5mbz4+KCkge30uZ2V0VHlwZSgpKTsKKyAgICBTZXQ8U3RyaW5nPiBuYW1lcyA9IHJlc3VsdC5rZXlTZXQoKTsKKyAgICBhc3NlcnRUcnVlKG5hbWVzLmNvbnRhaW5zKCJBZG1pbmlzdHJhdG9ycyIpKTsKKyAgICBhc3NlcnRUcnVlKG5hbWVzLmNvbnRhaW5zKCJBbm9ueW1vdXMgVXNlcnMiKSk7CisgICAgYXNzZXJ0VHJ1ZShuYW1lcy5jb250YWlucygiTm9uLUludGVyYWN0aXZlIFVzZXJzIikpOworICAgIGFzc2VydFRydWUobmFtZXMuY29udGFpbnMoIlByb2plY3QgT3duZXJzIikpOworICAgIGFzc2VydFRydWUobmFtZXMuY29udGFpbnMoIlJlZ2lzdGVyZWQgVXNlcnMiKSk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCBzeXN0ZW1Hcm91cHNDcmVhdGVkX2ludGVybmFscygpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIFJldmlld0RiIGRiID0gcmV2aWV3RGJQcm92aWRlci5vcGVuKCk7CisgICAgdHJ5IHsKKyAgICAgIFNldDxTdHJpbmc+IG5hbWVzID0gU2V0cy5uZXdIYXNoU2V0KCk7CisgICAgICBmb3IgKEFjY291bnRHcm91cCBnIDogZGIuYWNjb3VudEdyb3VwcygpLmFsbCgpKSB7CisgICAgICAgIG5hbWVzLmFkZChnLmdldE5hbWUoKSk7CisgICAgICB9CisgICAgICBhc3NlcnRUcnVlKG5hbWVzLmNvbnRhaW5zKCJBZG1pbmlzdHJhdG9ycyIpKTsKKyAgICAgIGFzc2VydFRydWUobmFtZXMuY29udGFpbnMoIkFub255bW91cyBVc2VycyIpKTsKKyAgICAgIGFzc2VydFRydWUobmFtZXMuY29udGFpbnMoIk5vbi1JbnRlcmFjdGl2ZSBVc2VycyIpKTsKKyAgICAgIGFzc2VydFRydWUobmFtZXMuY29udGFpbnMoIlByb2plY3QgT3duZXJzIikpOworICAgICAgYXNzZXJ0VHJ1ZShuYW1lcy5jb250YWlucygiUmVnaXN0ZXJlZCBVc2VycyIpKTsKKyAgICB9IGZpbmFsbHkgeworICAgICAgZGIuY2xvc2UoKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9UZW1wRmlsZVV0aWwuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9UZW1wRmlsZVV0aWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hZGVlMzYxCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL1RlbXBGaWxlVXRpbC5qYXZhCkBAIC0wLDAgKzEsNDEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlOworCitpbXBvcnQgamF2YS5pby5GaWxlOworaW1wb3J0IGphdmEudGV4dC5EYXRlRm9ybWF0OworaW1wb3J0IGphdmEudGV4dC5TaW1wbGVEYXRlRm9ybWF0OworaW1wb3J0IGphdmEudXRpbC5EYXRlOworCitwdWJsaWMgY2xhc3MgVGVtcEZpbGVVdGlsIHsKKworICBwcml2YXRlIHN0YXRpYyBpbnQgdGVzdENvdW50OworICBwcml2YXRlIHN0YXRpYyBEYXRlRm9ybWF0IGRmID0gbmV3IFNpbXBsZURhdGVGb3JtYXQoInl5eXlNTWRkSEhtbXNzIik7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIEZpbGUgdGVtcCA9IG5ldyBGaWxlKG5ldyBGaWxlKCJ0YXJnZXQiKSwgInRlbXAiKTsKKworICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgY3JlYXRlVW5pcXVlVGVzdEZvbGRlck5hbWUoKSB7CisgICAgcmV0dXJuICJ0ZXN0XyIgKyAoZGYuZm9ybWF0KG5ldyBEYXRlKCkpICsgIl8iICsgKHRlc3RDb3VudCsrKSk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIEZpbGUgY3JlYXRlVGVtcERpcmVjdG9yeSgpIHsKKyAgICBmaW5hbCBTdHJpbmcgbmFtZSA9IGNyZWF0ZVVuaXF1ZVRlc3RGb2xkZXJOYW1lKCk7CisgICAgZmluYWwgRmlsZSBkaXJlY3RvcnkgPSBuZXcgRmlsZSh0ZW1wLCBuYW1lKTsKKyAgICBpZiAoIWRpcmVjdG9yeS5ta2RpcnMoKSkgeworICAgICAgdGhyb3cgbmV3IFJ1bnRpbWVFeGNlcHRpb24oImZhaWxlZCB0byBjcmVhdGUgZm9sZGVyICciCisgICAgICAgICAgKyBkaXJlY3RvcnkuZ2V0QWJzb2x1dGVQYXRoKCkgKyAiJyIpOworICAgIH0KKyAgICByZXR1cm4gZGlyZWN0b3J5OworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvVGVzdEFjY291bnQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9UZXN0QWNjb3VudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjM1ODY4MGYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvVGVzdEFjY291bnQuamF2YQpAQCAtMCwwICsxLDYzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworCitpbXBvcnQgamF2YS5pby5CeXRlQXJyYXlPdXRwdXRTdHJlYW07CisKK2ltcG9ydCBjb20uamNyYWZ0LmpzY2guS2V5UGFpcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlBlcnNvbklkZW50OworCisKK3B1YmxpYyBjbGFzcyBUZXN0QWNjb3VudCB7CisgIHB1YmxpYyBmaW5hbCBBY2NvdW50LklkIGlkOworICBwdWJsaWMgZmluYWwgU3RyaW5nIHVzZXJuYW1lOworICBwdWJsaWMgZmluYWwgU3RyaW5nIGVtYWlsOworICBwdWJsaWMgZmluYWwgU3RyaW5nIGZ1bGxOYW1lOworICBwdWJsaWMgZmluYWwgS2V5UGFpciBzc2hLZXk7CisgIHB1YmxpYyBmaW5hbCBTdHJpbmcgaHR0cFBhc3N3b3JkOworCisgIFRlc3RBY2NvdW50KEFjY291bnQuSWQgaWQsIFN0cmluZyB1c2VybmFtZSwgU3RyaW5nIGVtYWlsLCBTdHJpbmcgZnVsbE5hbWUsCisgICAgICBLZXlQYWlyIHNzaEtleSwgU3RyaW5nIGh0dHBQYXNzd29yZCkgeworICAgIHRoaXMuaWQgPSBpZDsKKyAgICB0aGlzLnVzZXJuYW1lID0gdXNlcm5hbWU7CisgICAgdGhpcy5lbWFpbCA9IGVtYWlsOworICAgIHRoaXMuZnVsbE5hbWUgPSBmdWxsTmFtZTsKKyAgICB0aGlzLnNzaEtleSA9IHNzaEtleTsKKyAgICB0aGlzLmh0dHBQYXNzd29yZCA9IGh0dHBQYXNzd29yZDsKKyAgfQorCisgIHB1YmxpYyBieXRlW10gcHJpdmF0ZUtleSgpIHsKKyAgICBCeXRlQXJyYXlPdXRwdXRTdHJlYW0gb3V0ID0gbmV3IEJ5dGVBcnJheU91dHB1dFN0cmVhbSgpOworICAgIHNzaEtleS53cml0ZVByaXZhdGVLZXkob3V0KTsKKyAgICByZXR1cm4gb3V0LnRvQnl0ZUFycmF5KCk7CisgIH0KKworICBwdWJsaWMgUGVyc29uSWRlbnQgZ2V0SWRlbnQoKSB7CisgICAgcmV0dXJuIG5ldyBQZXJzb25JZGVudCh1c2VybmFtZSwgZW1haWwpOworICB9CisKKyAgcHVibGljIFN0cmluZyBnZXRIdHRwVXJsKCkgeworICAgIFN0cmluZ0J1aWxkZXIgYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgYi5hcHBlbmQoImh0dHA6Ly8iKTsKKyAgICBiLmFwcGVuZCh1c2VybmFtZSk7CisgICAgYi5hcHBlbmQoIjoiKTsKKyAgICBiLmFwcGVuZChodHRwUGFzc3dvcmQpOworICAgIGIuYXBwZW5kKCJAbG9jYWxob3N0OjgwODAiKTsKKyAgICByZXR1cm4gYi50b1N0cmluZygpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvZ2l0L0dpdFV0aWwuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9naXQvR2l0VXRpbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjlmYWYzMmEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvZ2l0L0dpdFV0aWwuamF2YQpAQCAtMCwwICsxLDE0OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuZ2l0OworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JdGVyYWJsZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5Tc2hTZXNzaW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuVGVtcEZpbGVVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuVGVzdEFjY291bnQ7CisKK2ltcG9ydCBjb20uamNyYWZ0LmpzY2guSlNjaDsKK2ltcG9ydCBjb20uamNyYWZ0LmpzY2guSlNjaEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uamNyYWZ0LmpzY2guU2Vzc2lvbjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuYXBpLkFkZENvbW1hbmQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5hcGkuQ2xvbmVDb21tYW5kOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuYXBpLkNvbW1pdENvbW1hbmQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5hcGkuR2l0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuYXBpLlB1c2hDb21tYW5kOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuYXBpLmVycm9ycy5HaXRBUElFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uc3RhbnRzOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdElkOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlBlcnNvbklkZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuSnNjaENvbmZpZ1Nlc3Npb25GYWN0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0Lk9wZW5Tc2hDb25maWcuSG9zdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5QdXNoUmVzdWx0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlJlZlNwZWM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuU3NoU2Vzc2lvbkZhY3Rvcnk7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLkNoYW5nZUlkVXRpbDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuRlM7CisKK2ltcG9ydCBqYXZhLmlvLkJ1ZmZlcmVkV3JpdGVyOworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLkZpbGVXcml0ZXI7CitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuUHJvcGVydGllczsKKworcHVibGljIGNsYXNzIEdpdFV0aWwgeworCisgIHB1YmxpYyBzdGF0aWMgdm9pZCBpbml0U3NoKGZpbmFsIFRlc3RBY2NvdW50IGEpIHsKKyAgICBmaW5hbCBQcm9wZXJ0aWVzIGNvbmZpZyA9IG5ldyBQcm9wZXJ0aWVzKCk7CisgICAgY29uZmlnLnB1dCgiU3RyaWN0SG9zdEtleUNoZWNraW5nIiwgIm5vIik7CisgICAgSlNjaC5zZXRDb25maWcoY29uZmlnKTsKKworICAgIC8vIHJlZ2lzdGVyIGEgSnNjaENvbmZpZ1Nlc3Npb25GYWN0b3J5IHRoYXQgYWRkcyB0aGUgcHJpdmF0ZSBrZXkgYXMgaWRlbnRpdHkKKyAgICAvLyB0byB0aGUgSlNjaCBpbnN0YW5jZSBvZiBKR2l0IHNvIHRoYXQgU1NIIGNvbW11bmljYXRpb24gdmlhIEpHaXQgY2FuCisgICAgLy8gc3VjY2VlZAorICAgIFNzaFNlc3Npb25GYWN0b3J5LnNldEluc3RhbmNlKG5ldyBKc2NoQ29uZmlnU2Vzc2lvbkZhY3RvcnkoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZShIb3N0IGhjLCBTZXNzaW9uIHNlc3Npb24pIHsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICBmaW5hbCBKU2NoIGpzY2ggPSBnZXRKU2NoKGhjLCBGUy5ERVRFQ1RFRCk7CisgICAgICAgICAganNjaC5hZGRJZGVudGl0eSgiS2V5UGFpciIsIGEucHJpdmF0ZUtleSgpLAorICAgICAgICAgICAgICBhLnNzaEtleS5nZXRQdWJsaWNLZXlCbG9iKCksIG51bGwpOworICAgICAgICB9IGNhdGNoIChKU2NoRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICB0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbihlKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0pOworICB9CisKKyAgcHVibGljIHN0YXRpYyB2b2lkIGNyZWF0ZVByb2plY3QoU3NoU2Vzc2lvbiBzLCBTdHJpbmcgbmFtZSkKKyAgICAgIHRocm93cyBKU2NoRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgcy5leGVjKCJnZXJyaXQgY3JlYXRlLXByb2plY3QgLS1lbXB0eS1jb21taXQgLS1uYW1lIFwiIiArIG5hbWUgKyAiXCIiKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgR2l0IGNsb25lUHJvamVjdChTdHJpbmcgdXJsKSB0aHJvd3MgR2l0QVBJRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBGaWxlIGdpdERpciA9IFRlbXBGaWxlVXRpbC5jcmVhdGVUZW1wRGlyZWN0b3J5KCk7CisgICAgZmluYWwgQ2xvbmVDb21tYW5kIGNsb25lQ21kID0gR2l0LmNsb25lUmVwb3NpdG9yeSgpOworICAgIGNsb25lQ21kLnNldFVSSSh1cmwpOworICAgIGNsb25lQ21kLnNldERpcmVjdG9yeShnaXREaXIpOworICAgIHJldHVybiBjbG9uZUNtZC5jYWxsKCk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIHZvaWQgYWRkKEdpdCBnaXQsIFN0cmluZyBwYXRoLCBTdHJpbmcgY29udGVudCkKKyAgICAgIHRocm93cyBHaXRBUElFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKyAgICBGaWxlIGYgPSBuZXcgRmlsZShnaXQuZ2V0UmVwb3NpdG9yeSgpLmdldERpcmVjdG9yeSgpLmdldFBhcmVudEZpbGUoKSwgcGF0aCk7CisgICAgRmlsZSBwID0gZi5nZXRQYXJlbnRGaWxlKCk7CisgICAgaWYgKCFwLmV4aXN0cygpICYmICFwLm1rZGlycygpKSB7CisgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oImZhaWxlZCB0byBjcmVhdGUgZGlyOiAiICsgcC5nZXRBYnNvbHV0ZVBhdGgoKSk7CisgICAgfQorICAgIEZpbGVXcml0ZXIgdyA9IG5ldyBGaWxlV3JpdGVyKGYpOworICAgIEJ1ZmZlcmVkV3JpdGVyIG91dCA9IG5ldyBCdWZmZXJlZFdyaXRlcih3KTsKKyAgICB0cnkgeworICAgICAgb3V0LndyaXRlKGNvbnRlbnQpOworICAgIH0gZmluYWxseSB7CisgICAgICBvdXQuY2xvc2UoKTsKKyAgICB9CisKKyAgICBmaW5hbCBBZGRDb21tYW5kIGFkZENtZCA9IGdpdC5hZGQoKTsKKyAgICBhZGRDbWQuYWRkRmlsZXBhdHRlcm4ocGF0aCk7CisgICAgYWRkQ21kLmNhbGwoKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIGNyZWF0ZUNvbW1pdChHaXQgZ2l0LCBQZXJzb25JZGVudCBpLCBTdHJpbmcgbXNnKQorICAgICAgdGhyb3dzIEdpdEFQSUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIHJldHVybiBjcmVhdGVDb21taXQoZ2l0LCBpLCBtc2csIHRydWUpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgY3JlYXRlQ29tbWl0KEdpdCBnaXQsIFBlcnNvbklkZW50IGksIFN0cmluZyBtc2csCisgICAgICBib29sZWFuIGluc2VydENoYW5nZUlkKSB0aHJvd3MgR2l0QVBJRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgT2JqZWN0SWQgY2hhbmdlSWQgPSBudWxsOworICAgIGlmIChpbnNlcnRDaGFuZ2VJZCkgeworICAgICAgY2hhbmdlSWQgPSBjb21wdXRlQ2hhbmdlSWQoZ2l0LCBpLCBtc2cpOworICAgICAgbXNnID0gQ2hhbmdlSWRVdGlsLmluc2VydElkKG1zZywgY2hhbmdlSWQpOworICAgIH0KKworICAgIGZpbmFsIENvbW1pdENvbW1hbmQgY29tbWl0Q21kID0gZ2l0LmNvbW1pdCgpOworICAgIGNvbW1pdENtZC5zZXRBdXRob3IoaSk7CisgICAgY29tbWl0Q21kLnNldENvbW1pdHRlcihpKTsKKyAgICBjb21taXRDbWQuc2V0TWVzc2FnZShtc2cpOworICAgIGNvbW1pdENtZC5jYWxsKCk7CisKKyAgICByZXR1cm4gY2hhbmdlSWQgIT0gbnVsbCA/ICJJIiArIGNoYW5nZUlkLmdldE5hbWUoKSA6IG51bGw7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBPYmplY3RJZCBjb21wdXRlQ2hhbmdlSWQoR2l0IGdpdCwgUGVyc29uSWRlbnQgaSwgU3RyaW5nIG1zZykKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgUmV2V2FsayBydyA9IG5ldyBSZXZXYWxrKGdpdC5nZXRSZXBvc2l0b3J5KCkpOworICAgIHRyeSB7CisgICAgICBSZXZDb21taXQgcGFyZW50ID0KKyAgICAgICAgICBydy5sb29rdXBDb21taXQoZ2l0LmdldFJlcG9zaXRvcnkoKS5nZXRSZWYoQ29uc3RhbnRzLkhFQUQpLmdldE9iamVjdElkKCkpOworICAgICAgcmV0dXJuIENoYW5nZUlkVXRpbC5jb21wdXRlQ2hhbmdlSWQocGFyZW50LmdldFRyZWUoKSwgcGFyZW50LmdldElkKCksIGksIGksIG1zZyk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIHJ3LnJlbGVhc2UoKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgc3RhdGljIFB1c2hSZXN1bHQgcHVzaEhlYWQoR2l0IGdpdCwgU3RyaW5nIHJlZikgdGhyb3dzIEdpdEFQSUV4Y2VwdGlvbiB7CisgICAgUHVzaENvbW1hbmQgcHVzaENtZCA9IGdpdC5wdXNoKCk7CisgICAgcHVzaENtZC5zZXRSZWZTcGVjcyhuZXcgUmVmU3BlYygiSEVBRDoiICsgcmVmKSk7CisgICAgSXRlcmFibGU8UHVzaFJlc3VsdD4gciA9IHB1c2hDbWQuY2FsbCgpOworICAgIHJldHVybiBJdGVyYWJsZXMuZ2V0T25seUVsZW1lbnQocik7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9naXQvUHVzaEZvclJldmlld0lULmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvZ2l0L1B1c2hGb3JSZXZpZXdJVC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY5MDUzNTAKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvZ2l0L1B1c2hGb3JSZXZpZXdJVC5qYXZhCkBAIC0wLDAgKzEsMzA5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5naXQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5naXQuR2l0VXRpbC5hZGQ7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuZ2l0LkdpdFV0aWwuY2xvbmVQcm9qZWN0OworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLmdpdC5HaXRVdGlsLmNyZWF0ZUNvbW1pdDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5naXQuR2l0VXRpbC5jcmVhdGVQcm9qZWN0OworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLmdpdC5HaXRVdGlsLmluaXRTc2g7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuZ2l0LkdpdFV0aWwucHVzaEhlYWQ7CitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0RXF1YWxzOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydFRydWU7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLkZ1bmN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFic3RyYWN0RGFlbW9uVGVzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFjY291bnRDcmVhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuU3NoU2Vzc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlRlc3RBY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlNjaGVtYUZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgY29tLmpjcmFmdC5qc2NoLkpTY2hFeGNlcHRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmFwaS5HaXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5hcGkuZXJyb3JzLkdpdEFQSUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5QdXNoUmVzdWx0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlJlbW90ZVJlZlVwZGF0ZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5SZW1vdGVSZWZVcGRhdGUuU3RhdHVzOworaW1wb3J0IG9yZy5qdW5pdC5BZnRlcjsKK2ltcG9ydCBvcmcuanVuaXQuQmVmb3JlOworaW1wb3J0IG9yZy5qdW5pdC5UZXN0OworaW1wb3J0IG9yZy5qdW5pdC5ydW5uZXIuUnVuV2l0aDsKK2ltcG9ydCBvcmcuanVuaXQucnVubmVycy5QYXJhbWV0ZXJpemVkOworaW1wb3J0IG9yZy5qdW5pdC5ydW5uZXJzLlBhcmFtZXRlcml6ZWQuUGFyYW1ldGVyczsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitAUnVuV2l0aChQYXJhbWV0ZXJpemVkLmNsYXNzKQorcHVibGljIGNsYXNzIFB1c2hGb3JSZXZpZXdJVCBleHRlbmRzIEFic3RyYWN0RGFlbW9uVGVzdCB7CisKKyAgcHJpdmF0ZSBlbnVtIFByb3RvY29sIHsKKyAgICBTU0gsIEhUVFAKKyAgfQorCisgIEBQYXJhbWV0ZXJzKG5hbWU9InswfSIpCisgIHB1YmxpYyBzdGF0aWMgTGlzdDxPYmplY3RbXT4gZ2V0UGFyYW0oKSB7CisgICAgTGlzdDxPYmplY3RbXT4gcGFyYW1zID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgZm9yKFByb3RvY29sIHAgOiBQcm90b2NvbC52YWx1ZXMoKSkgeworICAgICAgcGFyYW1zLmFkZChuZXcgT2JqZWN0W10ge3B9KTsKKyAgICB9CisgICAgcmV0dXJuIHBhcmFtczsKKyAgfQorCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBBY2NvdW50Q3JlYXRvciBhY2NvdW50czsKKworICBASW5qZWN0CisgIHByaXZhdGUgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gcmV2aWV3RGJQcm92aWRlcjsKKworICBwcml2YXRlIFRlc3RBY2NvdW50IGFkbWluOworICBwcml2YXRlIFByb2plY3QuTmFtZUtleSBwcm9qZWN0OworICBwcml2YXRlIEdpdCBnaXQ7CisgIHByaXZhdGUgUmV2aWV3RGIgZGI7CisgIHByaXZhdGUgUHJvdG9jb2wgcHJvdG9jb2w7CisKKyAgcHVibGljIFB1c2hGb3JSZXZpZXdJVChQcm90b2NvbCBwKSB7CisgICAgdGhpcy5wcm90b2NvbCA9IHA7CisgIH0KKworICBAQmVmb3JlCisgIHB1YmxpYyB2b2lkIHNldFVwKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgYWRtaW4gPQorICAgICAgICBhY2NvdW50cy5jcmVhdGUoImFkbWluIiwgImFkbWluQGV4YW1wbGUuY29tIiwgIkFkbWluaXN0cmF0b3IiLAorICAgICAgICAgICAgIkFkbWluaXN0cmF0b3JzIik7CisKKyAgICBwcm9qZWN0ID0gbmV3IFByb2plY3QuTmFtZUtleSgicCIpOworICAgIGluaXRTc2goYWRtaW4pOworICAgIFNzaFNlc3Npb24gc3NoU2Vzc2lvbiA9IG5ldyBTc2hTZXNzaW9uKGFkbWluKTsKKyAgICBjcmVhdGVQcm9qZWN0KHNzaFNlc3Npb24sIHByb2plY3QuZ2V0KCkpOworICAgIFN0cmluZyB1cmw7CisgICAgc3dpdGNoIChwcm90b2NvbCkgeworICAgICAgY2FzZSBTU0g6CisgICAgICAgIHVybCA9IHNzaFNlc3Npb24uZ2V0VXJsKCk7CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBIVFRQOgorICAgICAgICB1cmwgPSBhZG1pbi5nZXRIdHRwVXJsKCk7CisgICAgICAgIGJyZWFrOworICAgICAgZGVmYXVsdDoKKyAgICAgICAgdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbigidW5leHBlY3RlZCBwcm90b2NvbDogIiArIHByb3RvY29sKTsKKyAgICB9CisgICAgZ2l0ID0gY2xvbmVQcm9qZWN0KHVybCArICIvIiArIHByb2plY3QuZ2V0KCkpOworICAgIHNzaFNlc3Npb24uY2xvc2UoKTsKKworICAgIGRiID0gcmV2aWV3RGJQcm92aWRlci5vcGVuKCk7CisgIH0KKworICBAQWZ0ZXIKKyAgcHVibGljIHZvaWQgY2xlYW51cCgpIHsKKyAgICBkYi5jbG9zZSgpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdFB1c2hGb3JNYXN0ZXIoKSB0aHJvd3MgR2l0QVBJRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sCisgICAgICBJT0V4Y2VwdGlvbiB7CisgICAgUHVzaE9uZUNvbW1pdCBwdXNoID0gbmV3IFB1c2hPbmVDb21taXQoKTsKKyAgICBTdHJpbmcgcmVmID0gInJlZnMvZm9yL21hc3RlciI7CisgICAgUHVzaFJlc3VsdCByID0gcHVzaC50byhyZWYpOworICAgIGFzc2VydE9rU3RhdHVzKHIsIHJlZik7CisgICAgYXNzZXJ0Q2hhbmdlKHB1c2guY2hhbmdlSWQsIENoYW5nZS5TdGF0dXMuTkVXLCBQdXNoT25lQ29tbWl0LlNVQkpFQ1QsIG51bGwpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdFB1c2hGb3JNYXN0ZXJXaXRoVG9waWMoKSB0aHJvd3MgR2l0QVBJRXhjZXB0aW9uLAorICAgICAgT3JtRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgLy8gc3BlY2lmeSB0b3BpYyBpbiByZWYKKyAgICBQdXNoT25lQ29tbWl0IHB1c2ggPSBuZXcgUHVzaE9uZUNvbW1pdCgpOworICAgIFN0cmluZyB0b3BpYyA9ICJteS90b3BpYyI7CisgICAgU3RyaW5nIHJlZiA9ICJyZWZzL2Zvci9tYXN0ZXIvIiArIHRvcGljOworICAgIFB1c2hSZXN1bHQgciA9IHB1c2gudG8ocmVmKTsKKyAgICBhc3NlcnRPa1N0YXR1cyhyLCByZWYpOworICAgIGFzc2VydENoYW5nZShwdXNoLmNoYW5nZUlkLCBDaGFuZ2UuU3RhdHVzLk5FVywgUHVzaE9uZUNvbW1pdC5TVUJKRUNULCB0b3BpYyk7CisKKyAgICAvLyBzcGVjaWZ5IHRvcGljIGFzIG9wdGlvbgorICAgIHB1c2ggPSBuZXcgUHVzaE9uZUNvbW1pdCgpOworICAgIHJlZiA9ICJyZWZzL2Zvci9tYXN0ZXIldG9waWM9IiArIHRvcGljOworICAgIHIgPSBwdXNoLnRvKHJlZik7CisgICAgYXNzZXJ0T2tTdGF0dXMociwgcmVmKTsKKyAgICBhc3NlcnRDaGFuZ2UocHVzaC5jaGFuZ2VJZCwgQ2hhbmdlLlN0YXR1cy5ORVcsIFB1c2hPbmVDb21taXQuU1VCSkVDVCwgdG9waWMpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdFB1c2hGb3JNYXN0ZXJXaXRoQ2MoKSB0aHJvd3MgR2l0QVBJRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sCisgICAgICBJT0V4Y2VwdGlvbiwgSlNjaEV4Y2VwdGlvbiB7CisgICAgLy8gY2Mgb25lIHVzZXIKKyAgICBUZXN0QWNjb3VudCB1c2VyID0gYWNjb3VudHMuY3JlYXRlKCJ1c2VyIiwgInVzZXJAZXhhbXBsZS5jb20iLCAiVXNlciIpOworICAgIFB1c2hPbmVDb21taXQgcHVzaCA9IG5ldyBQdXNoT25lQ29tbWl0KCk7CisgICAgU3RyaW5nIHRvcGljID0gIm15L3RvcGljIjsKKyAgICBTdHJpbmcgcmVmID0gInJlZnMvZm9yL21hc3Rlci8iICsgdG9waWMgKyAiJWNjPSIgKyB1c2VyLmVtYWlsOworICAgIFB1c2hSZXN1bHQgciA9IHB1c2gudG8ocmVmKTsKKyAgICBhc3NlcnRPa1N0YXR1cyhyLCByZWYpOworICAgIGFzc2VydENoYW5nZShwdXNoLmNoYW5nZUlkLCBDaGFuZ2UuU3RhdHVzLk5FVywgUHVzaE9uZUNvbW1pdC5TVUJKRUNULCB0b3BpYyk7CisKKyAgICAvLyBjYyBzZXZlcmFsIHVzZXJzCisgICAgVGVzdEFjY291bnQgdXNlcjIgPQorICAgICAgICBhY2NvdW50cy5jcmVhdGUoImFub3RoZXItdXNlciIsICJhbm90aGVyLnVzZXJAZXhhbXBsZS5jb20iLCAiQW5vdGhlciBVc2VyIik7CisgICAgcHVzaCA9IG5ldyBQdXNoT25lQ29tbWl0KCk7CisgICAgcmVmID0gInJlZnMvZm9yL21hc3Rlci8iICsgdG9waWMgKyAiJWNjPSIgKyBhZG1pbi5lbWFpbCArICIsY2M9IiArIHVzZXIuZW1haWwKKyAgICAgICAgKyAiLGNjPSIgKyB1c2VyMi5lbWFpbDsKKyAgICByID0gcHVzaC50byhyZWYpOworICAgIGFzc2VydE9rU3RhdHVzKHIsIHJlZik7CisgICAgYXNzZXJ0Q2hhbmdlKHB1c2guY2hhbmdlSWQsIENoYW5nZS5TdGF0dXMuTkVXLCBQdXNoT25lQ29tbWl0LlNVQkpFQ1QsIHRvcGljKTsKKworICAgIC8vIGNjIG5vbi1leGlzdGluZyB1c2VyCisgICAgU3RyaW5nIG5vbkV4aXN0aW5nRW1haWwgPSAibm9uLmV4aXN0aW5nQGV4YW1wbGUuY29tIjsKKyAgICBwdXNoID0gbmV3IFB1c2hPbmVDb21taXQoKTsKKyAgICByZWYgPSAicmVmcy9mb3IvbWFzdGVyLyIgKyB0b3BpYyArICIlY2M9IiArIGFkbWluLmVtYWlsICsgIixjYz0iCisgICAgICAgICsgbm9uRXhpc3RpbmdFbWFpbCArICIsY2M9IiArIHVzZXIuZW1haWw7CisgICAgciA9IHB1c2gudG8ocmVmKTsKKyAgICBhc3NlcnRFcnJvclN0YXR1cyhyLCAidXNlciBcIiIgKyBub25FeGlzdGluZ0VtYWlsICsgIlwiIG5vdCBmb3VuZCIsIHJlZik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0UHVzaEZvck1hc3RlcldpdGhSZXZpZXdlcigpIHRocm93cyBHaXRBUElFeGNlcHRpb24sCisgICAgICBPcm1FeGNlcHRpb24sIElPRXhjZXB0aW9uLCBKU2NoRXhjZXB0aW9uIHsKKyAgICAvLyBhZGQgb25lIHJldmlld2VyCisgICAgVGVzdEFjY291bnQgdXNlciA9IGFjY291bnRzLmNyZWF0ZSgidXNlciIsICJ1c2VyQGV4YW1wbGUuY29tIiwgIlVzZXIiKTsKKyAgICBQdXNoT25lQ29tbWl0IHB1c2ggPSBuZXcgUHVzaE9uZUNvbW1pdCgpOworICAgIFN0cmluZyB0b3BpYyA9ICJteS90b3BpYyI7CisgICAgU3RyaW5nIHJlZiA9ICJyZWZzL2Zvci9tYXN0ZXIvIiArIHRvcGljICsgIiVyPSIgKyB1c2VyLmVtYWlsOworICAgIFB1c2hSZXN1bHQgciA9IHB1c2gudG8ocmVmKTsKKyAgICBhc3NlcnRPa1N0YXR1cyhyLCByZWYpOworICAgIGFzc2VydENoYW5nZShwdXNoLmNoYW5nZUlkLCBDaGFuZ2UuU3RhdHVzLk5FVywgUHVzaE9uZUNvbW1pdC5TVUJKRUNULAorICAgICAgICB0b3BpYywgdXNlcik7CisKKyAgICAvLyBhZGQgc2V2ZXJhbCByZXZpZXdlcnMKKyAgICBUZXN0QWNjb3VudCB1c2VyMiA9CisgICAgICAgIGFjY291bnRzLmNyZWF0ZSgiYW5vdGhlci11c2VyIiwgImFub3RoZXIudXNlckBleGFtcGxlLmNvbSIsICJBbm90aGVyIFVzZXIiKTsKKyAgICBwdXNoID0gbmV3IFB1c2hPbmVDb21taXQoKTsKKyAgICByZWYgPSAicmVmcy9mb3IvbWFzdGVyLyIgKyB0b3BpYyArICIlcj0iICsgYWRtaW4uZW1haWwgKyAiLHI9IiArIHVzZXIuZW1haWwKKyAgICAgICAgKyAiLHI9IiArIHVzZXIyLmVtYWlsOworICAgIHIgPSBwdXNoLnRvKHJlZik7CisgICAgYXNzZXJ0T2tTdGF0dXMociwgcmVmKTsKKyAgICAvLyBhZG1pbiBpcyB0aGUgb3duZXIgb2YgdGhlIGNoYW5nZSBhbmQgc2hvdWxkIG5vdCBhcHBlYXIgYXMgcmV2aWV3ZXIKKyAgICBhc3NlcnRDaGFuZ2UocHVzaC5jaGFuZ2VJZCwgQ2hhbmdlLlN0YXR1cy5ORVcsIFB1c2hPbmVDb21taXQuU1VCSkVDVCwKKyAgICAgICAgdG9waWMsIHVzZXIsIHVzZXIyKTsKKworICAgIC8vIGFkZCBub24tZXhpc3RpbmcgdXNlciBhcyByZXZpZXdlcgorICAgIFN0cmluZyBub25FeGlzdGluZ0VtYWlsID0gIm5vbi5leGlzdGluZ0BleGFtcGxlLmNvbSI7CisgICAgcHVzaCA9IG5ldyBQdXNoT25lQ29tbWl0KCk7CisgICAgcmVmID0gInJlZnMvZm9yL21hc3Rlci8iICsgdG9waWMgKyAiJXI9IiArIGFkbWluLmVtYWlsICsgIixyPSIKKyAgICAgICAgKyBub25FeGlzdGluZ0VtYWlsICsgIixyPSIgKyB1c2VyLmVtYWlsOworICAgIHIgPSBwdXNoLnRvKHJlZik7CisgICAgYXNzZXJ0RXJyb3JTdGF0dXMociwgInVzZXIgXCIiICsgbm9uRXhpc3RpbmdFbWFpbCArICJcIiBub3QgZm91bmQiLCByZWYpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdFB1c2hGb3JNYXN0ZXJBc0RyYWZ0KCkgdGhyb3dzIEdpdEFQSUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLAorICAgICAgSU9FeGNlcHRpb24geworICAgIC8vIGNyZWF0ZSBkcmFmdCBieSBwdXNoaW5nIHRvICdyZWZzL2RyYWZ0cy8nCisgICAgUHVzaE9uZUNvbW1pdCBwdXNoID0gbmV3IFB1c2hPbmVDb21taXQoKTsKKyAgICBTdHJpbmcgcmVmID0gInJlZnMvZHJhZnRzL21hc3RlciI7CisgICAgUHVzaFJlc3VsdCByID0gcHVzaC50byhyZWYpOworICAgIGFzc2VydE9rU3RhdHVzKHIsIHJlZik7CisgICAgYXNzZXJ0Q2hhbmdlKHB1c2guY2hhbmdlSWQsIENoYW5nZS5TdGF0dXMuRFJBRlQsIFB1c2hPbmVDb21taXQuU1VCSkVDVCwgbnVsbCk7CisKKyAgICAvLyBjcmVhdGUgZHJhZnQgYnkgdXNpbmcgJ2RyYWZ0JyBvcHRpb24KKyAgICBwdXNoID0gbmV3IFB1c2hPbmVDb21taXQoKTsKKyAgICByZWYgPSAicmVmcy9mb3IvbWFzdGVyJWRyYWZ0IjsKKyAgICByID0gcHVzaC50byhyZWYpOworICAgIGFzc2VydE9rU3RhdHVzKHIsIHJlZik7CisgICAgYXNzZXJ0Q2hhbmdlKHB1c2guY2hhbmdlSWQsIENoYW5nZS5TdGF0dXMuRFJBRlQsIFB1c2hPbmVDb21taXQuU1VCSkVDVCwgbnVsbCk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0UHVzaEZvck5vbkV4aXN0aW5nQnJhbmNoKCkgdGhyb3dzIEdpdEFQSUV4Y2VwdGlvbiwKKyAgICAgIE9ybUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIFB1c2hPbmVDb21taXQgcHVzaCA9IG5ldyBQdXNoT25lQ29tbWl0KCk7CisgICAgU3RyaW5nIGJyYW5jaE5hbWUgPSAibm9uLWV4aXN0aW5nIjsKKyAgICBTdHJpbmcgcmVmID0gInJlZnMvZm9yLyIgKyBicmFuY2hOYW1lOworICAgIFB1c2hSZXN1bHQgciA9IHB1c2gudG8ocmVmKTsKKyAgICBhc3NlcnRFcnJvclN0YXR1cyhyLCAiYnJhbmNoICIgKyBicmFuY2hOYW1lICsgIiBub3QgZm91bmQiLCByZWYpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFzc2VydENoYW5nZShTdHJpbmcgY2hhbmdlSWQsIENoYW5nZS5TdGF0dXMgZXhwZWN0ZWRTdGF0dXMsCisgICAgICBTdHJpbmcgZXhwZWN0ZWRTdWJqZWN0LCBTdHJpbmcgZXhwZWN0ZWRUb3BpYywKKyAgICAgIFRlc3RBY2NvdW50Li4uIGV4cGVjdGVkUmV2aWV3ZXJzKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBDaGFuZ2UgYyA9CisgICAgICAgIEl0ZXJhYmxlcy5nZXRPbmx5RWxlbWVudChkYi5jaGFuZ2VzKCkuYnlLZXkobmV3IENoYW5nZS5LZXkoY2hhbmdlSWQpKS50b0xpc3QoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGV4cGVjdGVkU3ViamVjdCwgYy5nZXRTdWJqZWN0KCkpOworICAgIGFzc2VydEVxdWFscyhleHBlY3RlZFN0YXR1cywgYy5nZXRTdGF0dXMoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGV4cGVjdGVkVG9waWMsIFN0cmluZ3MuZW1wdHlUb051bGwoYy5nZXRUb3BpYygpKSk7CisgICAgYXNzZXJ0UmV2aWV3ZXJzKGMsIGV4cGVjdGVkUmV2aWV3ZXJzKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBhc3NlcnRSZXZpZXdlcnMoQ2hhbmdlIGMsIFRlc3RBY2NvdW50Li4uIGV4cGVjdGVkUmV2aWV3ZXJzKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgU2V0PEFjY291bnQuSWQ+IGV4cGVjdGVkUmV2aWV3ZXJJZHMgPQorICAgICAgICBTZXRzLm5ld0hhc2hTZXQoTGlzdHMudHJhbnNmb3JtKEFycmF5cy5hc0xpc3QoZXhwZWN0ZWRSZXZpZXdlcnMpLAorICAgICAgICAgICAgbmV3IEZ1bmN0aW9uPFRlc3RBY2NvdW50LCBBY2NvdW50LklkPigpIHsKKyAgICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICAgIHB1YmxpYyBBY2NvdW50LklkIGFwcGx5KFRlc3RBY2NvdW50IGEpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gYS5pZDsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSkpOworCisgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIHBzYSA6IGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlQYXRjaFNldCgKKyAgICAgICAgYy5jdXJyZW50UGF0Y2hTZXRJZCgpKSkgeworICAgICAgYXNzZXJ0VHJ1ZSgidW5leHBlY3RlZCByZXZpZXdlciAiICsgcHNhLmdldEFjY291bnRJZCgpLAorICAgICAgICAgIGV4cGVjdGVkUmV2aWV3ZXJJZHMucmVtb3ZlKHBzYS5nZXRBY2NvdW50SWQoKSkpOworICAgIH0KKyAgICBhc3NlcnRUcnVlKCJtaXNzaW5nIHJldmlld2VyczogIiArIGV4cGVjdGVkUmV2aWV3ZXJJZHMsCisgICAgICAgIGV4cGVjdGVkUmV2aWV3ZXJJZHMuaXNFbXB0eSgpKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIHZvaWQgYXNzZXJ0T2tTdGF0dXMoUHVzaFJlc3VsdCByZXN1bHQsIFN0cmluZyByZWYpIHsKKyAgICBhc3NlcnRTdGF0dXMoU3RhdHVzLk9LLCBudWxsLCByZXN1bHQsIHJlZik7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyB2b2lkIGFzc2VydEVycm9yU3RhdHVzKFB1c2hSZXN1bHQgcmVzdWx0LAorICAgICAgU3RyaW5nIGV4cGVjdGVkTWVzc2FnZSwgU3RyaW5nIHJlZikgeworICAgIGFzc2VydFN0YXR1cyhTdGF0dXMuUkVKRUNURURfT1RIRVJfUkVBU09OLCBleHBlY3RlZE1lc3NhZ2UsIHJlc3VsdCwgcmVmKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIHZvaWQgYXNzZXJ0U3RhdHVzKFN0YXR1cyBleHBlY3RlZFN0YXR1cywKKyAgICAgIFN0cmluZyBleHBlY3RlZE1lc3NhZ2UsIFB1c2hSZXN1bHQgcmVzdWx0LCBTdHJpbmcgcmVmKSB7CisgICAgUmVtb3RlUmVmVXBkYXRlIHJlZlVwZGF0ZSA9IHJlc3VsdC5nZXRSZW1vdGVVcGRhdGUocmVmKTsKKyAgICBhc3NlcnRFcXVhbHMocmVmVXBkYXRlLmdldE1lc3NhZ2UoKSArICJcbiIgKyByZXN1bHQuZ2V0TWVzc2FnZXMoKSwKKyAgICAgICAgZXhwZWN0ZWRTdGF0dXMsIHJlZlVwZGF0ZS5nZXRTdGF0dXMoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGV4cGVjdGVkTWVzc2FnZSwgcmVmVXBkYXRlLmdldE1lc3NhZ2UoKSk7CisgIH0KKworICBwcml2YXRlIGNsYXNzIFB1c2hPbmVDb21taXQgeworICAgIGZpbmFsIHN0YXRpYyBTdHJpbmcgRklMRV9OQU1FID0gImEudHh0IjsKKyAgICBmaW5hbCBzdGF0aWMgU3RyaW5nIEZJTEVfQ09OVEVOVCA9ICJzb21lIGNvbnRlbnQiOworICAgIGZpbmFsIHN0YXRpYyBTdHJpbmcgU1VCSkVDVCA9ICJ0ZXN0IGNvbW1pdCI7CisgICAgU3RyaW5nIGNoYW5nZUlkOworCisgICAgcHVibGljIFB1c2hSZXN1bHQgdG8oU3RyaW5nIHJlZikgdGhyb3dzIEdpdEFQSUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgICAgYWRkKGdpdCwgRklMRV9OQU1FLCBGSUxFX0NPTlRFTlQpOworICAgICAgY2hhbmdlSWQgPSBjcmVhdGVDb21taXQoZ2l0LCBhZG1pbi5nZXRJZGVudCgpLCBTVUJKRUNUKTsKKyAgICAgIHJldHVybiBwdXNoSGVhZChnaXQsIHJlZik7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9hY2NvdW50L0FjY291bnRBc3NlcnQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2FjY291bnQvQWNjb3VudEFzc2VydC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZiMjY2NjkKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9hY2NvdW50L0FjY291bnRBc3NlcnQuamF2YQpAQCAtMCwwICsxLDI5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LmFjY291bnQ7CisKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRFcXVhbHM7CitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0VHJ1ZTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuVGVzdEFjY291bnQ7CisKK3B1YmxpYyBjbGFzcyBBY2NvdW50QXNzZXJ0IHsKKworICBwdWJsaWMgc3RhdGljIHZvaWQgYXNzZXJ0QWNjb3VudEluZm8oVGVzdEFjY291bnQgYSwgQWNjb3VudEluZm8gYWkpIHsKKyAgICBhc3NlcnRUcnVlKGEuaWQuZ2V0KCkgPT0gYWkuX2FjY291bnRfaWQpOworICAgIGFzc2VydEVxdWFscyhhLmZ1bGxOYW1lLCBhaS5uYW1lKTsKKyAgICBhc3NlcnRFcXVhbHMoYS5lbWFpbCwgYWkuZW1haWwpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9hY2NvdW50L0FjY291bnRJbmZvLmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9hY2NvdW50L0FjY291bnRJbmZvLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uY2Y4OGJjNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2FjY291bnQvQWNjb3VudEluZm8uamF2YQpAQCAtMCwwICsxLDIxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LmFjY291bnQ7CisKK3B1YmxpYyBjbGFzcyBBY2NvdW50SW5mbyB7CisgIHB1YmxpYyBJbnRlZ2VyIF9hY2NvdW50X2lkOworICBwdWJsaWMgU3RyaW5nIG5hbWU7CisgIHB1YmxpYyBTdHJpbmcgZW1haWw7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9hY2NvdW50L0dldEFjY291bnRJVC5qYXZhIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvYWNjb3VudC9HZXRBY2NvdW50SVQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44ZDc1NDg3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvYWNjb3VudC9HZXRBY2NvdW50SVQuamF2YQpAQCAtMCwwICsxLDg4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LmFjY291bnQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LmFjY291bnQuQWNjb3VudEFzc2VydC5hc3NlcnRBY2NvdW50SW5mbzsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRFcXVhbHM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFic3RyYWN0RGFlbW9uVGVzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFjY291bnRDcmVhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFJlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5UZXN0QWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVXJsOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5Hc29uOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5yZWZsZWN0LlR5cGVUb2tlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcuYXBhY2hlLmh0dHAuSHR0cFN0YXR1czsKK2ltcG9ydCBvcmcuanVuaXQuQmVmb3JlOworaW1wb3J0IG9yZy5qdW5pdC5UZXN0OworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKKworcHVibGljIGNsYXNzIEdldEFjY291bnRJVCBleHRlbmRzIEFic3RyYWN0RGFlbW9uVGVzdCB7CisKKyAgQEluamVjdAorICBwcml2YXRlIEFjY291bnRDcmVhdG9yIGFjY291bnRzOworCisgIHByaXZhdGUgVGVzdEFjY291bnQgYWRtaW47CisgIHByaXZhdGUgUmVzdFNlc3Npb24gc2Vzc2lvbjsKKworICBAQmVmb3JlCisgIHB1YmxpYyB2b2lkIHNldFVwKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgYWRtaW4gPSBhY2NvdW50cy5jcmVhdGUoImFkbWluIiwgImFkbWluQGV4YW1wbGUuY29tIiwgIkFkbWluaXN0cmF0b3IiLAorICAgICAgICAgICAgIkFkbWluaXN0cmF0b3JzIik7CisgICAgc2Vzc2lvbiA9IG5ldyBSZXN0U2Vzc2lvbihhZG1pbik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCBnZXROb25FeGlzdGluZ0FjY291bnRfTm90Rm91bmQoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX05PVF9GT1VORCwgc2Vzc2lvbi5nZXQoIi9hY2NvdW50cy9ub24tZXhpc3RpbmciKQorICAgICAgICAuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGdldEFjY291bnQoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIC8vIGJ5IGZvcm1hdHRlZCBzdHJpbmcKKyAgICB0ZXN0R2V0QWNjb3VudCgiL2FjY291bnRzLyIKKyAgICAgICAgKyBVcmwuZW5jb2RlKGFkbWluLmZ1bGxOYW1lICsgIiA8IiArIGFkbWluLmVtYWlsICsgIj4iKSwgYWRtaW4pOworCisgICAgLy8gYnkgZW1haWwKKyAgICB0ZXN0R2V0QWNjb3VudCgiL2FjY291bnRzLyIgKyBhZG1pbi5lbWFpbCwgYWRtaW4pOworCisgICAgLy8gYnkgZnVsbCBuYW1lCisgICAgdGVzdEdldEFjY291bnQoIi9hY2NvdW50cy8iICsgYWRtaW4uZnVsbE5hbWUsIGFkbWluKTsKKworICAgIC8vIGJ5IGFjY291bnQgSUQKKyAgICB0ZXN0R2V0QWNjb3VudCgiL2FjY291bnRzLyIgKyBhZG1pbi5pZC5nZXQoKSwgYWRtaW4pOworCisgICAgLy8gYnkgdXNlciBuYW1lCisgICAgdGVzdEdldEFjY291bnQoIi9hY2NvdW50cy8iICsgYWRtaW4udXNlcm5hbWUsIGFkbWluKTsKKworICAgIC8vIGJ5ICdzZWxmJworICAgIHRlc3RHZXRBY2NvdW50KCIvYWNjb3VudHMvc2VsZiIsIGFkbWluKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCB0ZXN0R2V0QWNjb3VudChTdHJpbmcgdXJsLCBUZXN0QWNjb3VudCBleHBlY3RlZEFjY291bnQpCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5nZXQodXJsKTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19PSywgci5nZXRTdGF0dXNDb2RlKCkpOworICAgIEFjY291bnRJbmZvIGFjY291bnQgPQorICAgICAgICAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwKKyAgICAgICAgICAgIG5ldyBUeXBlVG9rZW48QWNjb3VudEluZm8+KCkge30uZ2V0VHlwZSgpKTsKKyAgICBhc3NlcnRBY2NvdW50SW5mbyhleHBlY3RlZEFjY291bnQsIGFjY291bnQpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9BZGRSZW1vdmVHcm91cE1lbWJlcnNJVC5qYXZhIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvQWRkUmVtb3ZlR3JvdXBNZW1iZXJzSVQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMjU0ZjE1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvQWRkUmVtb3ZlR3JvdXBNZW1iZXJzSVQuamF2YQpAQCAtMCwwICsxLDI1OSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5ncm91cDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuYWNjb3VudC5BY2NvdW50QXNzZXJ0LmFzc2VydEFjY291bnRJbmZvOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXAuR3JvdXBBc3NlcnQuYXNzZXJ0R3JvdXBJbmZvOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydEVxdWFsczsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRGYWxzZTsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnROb3ROdWxsOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydFRydWU7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5BYnN0cmFjdERhZW1vblRlc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5BY2NvdW50Q3JlYXRvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlJlc3RSZXNwb25zZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlJlc3RTZXNzaW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuVGVzdEFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTWVtYmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5Hc29uOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5yZWZsZWN0LlR5cGVUb2tlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5SZXN1bHRTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlNjaGVtYUZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmFwYWNoZS5odHRwLkh0dHBTdGF0dXM7CitpbXBvcnQgb3JnLmp1bml0LkFmdGVyOworaW1wb3J0IG9yZy5qdW5pdC5CZWZvcmU7CitpbXBvcnQgb3JnLmp1bml0LlRlc3Q7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK3B1YmxpYyBjbGFzcyBBZGRSZW1vdmVHcm91cE1lbWJlcnNJVCBleHRlbmRzIEFic3RyYWN0RGFlbW9uVGVzdCB7CisKKyAgQEluamVjdAorICBwcml2YXRlIEFjY291bnRDcmVhdG9yIGFjY291bnRzOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiByZXZpZXdEYlByb3ZpZGVyOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBHcm91cENhY2hlIGdyb3VwQ2FjaGU7CisKKyAgcHJpdmF0ZSBSZXN0U2Vzc2lvbiBzZXNzaW9uOworICBwcml2YXRlIFRlc3RBY2NvdW50IGFkbWluOworICBwcml2YXRlIFJldmlld0RiIGRiOworCisgIEBCZWZvcmUKKyAgcHVibGljIHZvaWQgc2V0VXAoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICBhZG1pbiA9IGFjY291bnRzLmNyZWF0ZSgiYWRtaW4iLCAiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBzZXNzaW9uID0gbmV3IFJlc3RTZXNzaW9uKGFkbWluKTsKKyAgICBkYiA9IHJldmlld0RiUHJvdmlkZXIub3BlbigpOworICB9CisKKyAgQEFmdGVyCisgIHB1YmxpYyB2b2lkIHRlYXJEb3duKCkgeworICAgIGRiLmNsb3NlKCk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCBhZGRUb05vbkV4aXN0aW5nR3JvdXBfTm90Rm91bmQoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX05PVF9GT1VORCwKKyAgICAgICAgUFVUKCIvZ3JvdXBzL25vbi1leGlzdGluZy9tZW1iZXJzL2FkbWluIikuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHJlbW92ZUZyb21Ob25FeGlzdGluZ0dyb3VwX05vdEZvdW5kKCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19OT1RfRk9VTkQsCisgICAgICAgIERFTEVURSgiL2dyb3Vwcy9ub24tZXhpc3RpbmcvbWVtYmVycy9hZG1pbiIpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGFkZFJlbW92ZU1lbWJlcigpIHRocm93cyBFeGNlcHRpb24geworICAgIFRlc3RBY2NvdW50IHUgPSBhY2NvdW50cy5jcmVhdGUoInVzZXIiLCAidXNlckBleGFtcGxlLmNvbSIsICJGdWxsIE5hbWUiKTsKKyAgICBSZXN0UmVzcG9uc2UgciA9IFBVVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9tZW1iZXJzL3VzZXIiKTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19DUkVBVEVELCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgQWNjb3VudEluZm8gYWkgPSAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwKKyAgICAgICAgbmV3IFR5cGVUb2tlbjxBY2NvdW50SW5mbz4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydEFjY291bnRJbmZvKHUsIGFpKTsKKyAgICBhc3NlcnRNZW1iZXJzKCJBZG1pbmlzdHJhdG9ycyIsIGFkbWluLCB1KTsKKyAgICByLmNvbnN1bWUoKTsKKworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX05PX0NPTlRFTlQsCisgICAgICAgIERFTEVURSgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9tZW1iZXJzL3VzZXIiKSk7CisgICAgYXNzZXJ0TWVtYmVycygiQWRtaW5pc3RyYXRvcnMiLCBhZG1pbik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCBhZGRFeGlzdGluZ01lbWJlcl9PSygpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgYXNzZXJ0RXF1YWxzKEh0dHBTdGF0dXMuU0NfT0ssCisgICAgICAgIFBVVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9tZW1iZXJzL2FkbWluIikuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGFkZE11bHRpcGxlTWVtYmVycygpIHRocm93cyBFeGNlcHRpb24geworICAgIGdyb3VwKCJ1c2VycyIpOworICAgIFRlc3RBY2NvdW50IHUxID0gYWNjb3VudHMuY3JlYXRlKCJ1MSIsICJ1MUBleGFtcGxlLmNvbSIsICJGdWxsIE5hbWUgMSIpOworICAgIFRlc3RBY2NvdW50IHUyID0gYWNjb3VudHMuY3JlYXRlKCJ1MiIsICJ1MkBleGFtcGxlLmNvbSIsICJGdWxsIE5hbWUgMiIpOworICAgIE1lbWJlcnNJbnB1dCBpbnB1dCA9IG5ldyBNZW1iZXJzSW5wdXQoKTsKKyAgICBpbnB1dC5tZW1iZXJzID0gTGlzdHMubmV3TGlua2VkTGlzdCgpOworICAgIGlucHV0Lm1lbWJlcnMuYWRkKHUxLnVzZXJuYW1lKTsKKyAgICBpbnB1dC5tZW1iZXJzLmFkZCh1Mi51c2VybmFtZSk7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBQT1NUKCIvZ3JvdXBzL3VzZXJzL21lbWJlcnMiLCBpbnB1dCk7CisgICAgTGlzdDxBY2NvdW50SW5mbz4gYWkgPSAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwKKyAgICAgICAgbmV3IFR5cGVUb2tlbjxMaXN0PEFjY291bnRJbmZvPj4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydE1lbWJlcnMoYWksIHUxLCB1Mik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCBpbmNsdWRlUmVtb3ZlR3JvdXAoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICBncm91cCgibmV3R3JvdXAiKTsKKyAgICBSZXN0UmVzcG9uc2UgciA9IFBVVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9ncm91cHMvbmV3R3JvdXAiKTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19DUkVBVEVELCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgR3JvdXBJbmZvIGkgPSAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwgbmV3IFR5cGVUb2tlbjxHcm91cEluZm8+KCkge30uZ2V0VHlwZSgpKTsKKyAgICByLmNvbnN1bWUoKTsKKyAgICBhc3NlcnRHcm91cEluZm8oZ3JvdXBDYWNoZS5nZXQobmV3IEFjY291bnRHcm91cC5OYW1lS2V5KCJuZXdHcm91cCIpKSwgaSk7CisgICAgYXNzZXJ0SW5jbHVkZXMoIkFkbWluaXN0cmF0b3JzIiwgIm5ld0dyb3VwIik7CisKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19OT19DT05URU5ULAorICAgICAgICBERUxFVEUoIi9ncm91cHMvQWRtaW5pc3RyYXRvcnMvZ3JvdXBzL25ld0dyb3VwIikpOworICAgIGFzc2VydE5vSW5jbHVkZXMoIkFkbWluaXN0cmF0b3JzIik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCBpbmNsdWRlRXhpc3RpbmdHcm91cF9PSygpIHRocm93cyBFeGNlcHRpb24geworICAgIGdyb3VwKCJuZXdHcm91cCIpOworICAgIFBVVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9ncm91cHMvbmV3R3JvdXAiKS5jb25zdW1lKCk7CisgICAgYXNzZXJ0RXF1YWxzKEh0dHBTdGF0dXMuU0NfT0ssCisgICAgICAgIFBVVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9ncm91cHMvbmV3R3JvdXAiKS5nZXRTdGF0dXNDb2RlKCkpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgYWRkTXVsdGlwbGVJbmNsdWRlcygpIHRocm93cyBFeGNlcHRpb24geworICAgIGdyb3VwKCJuZXdHcm91cDEiKTsKKyAgICBncm91cCgibmV3R3JvdXAyIik7CisgICAgR3JvdXBzSW5wdXQgaW5wdXQgPSBuZXcgR3JvdXBzSW5wdXQoKTsKKyAgICBpbnB1dC5ncm91cHMgPSBMaXN0cy5uZXdMaW5rZWRMaXN0KCk7CisgICAgaW5wdXQuZ3JvdXBzLmFkZCgibmV3R3JvdXAxIik7CisgICAgaW5wdXQuZ3JvdXBzLmFkZCgibmV3R3JvdXAyIik7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBQT1NUKCIvZ3JvdXBzL0FkbWluaXN0cmF0b3JzL2dyb3VwcyIsIGlucHV0KTsKKyAgICBMaXN0PEdyb3VwSW5mbz4gZ2kgPSAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwKKyAgICAgICAgbmV3IFR5cGVUb2tlbjxMaXN0PEdyb3VwSW5mbz4+KCkge30uZ2V0VHlwZSgpKTsKKyAgICBhc3NlcnRJbmNsdWRlcyhnaSwgIm5ld0dyb3VwMSIsICJuZXdHcm91cDIiKTsKKyAgfQorCisgIHByaXZhdGUgUmVzdFJlc3BvbnNlIFBVVChTdHJpbmcgZW5kcG9pbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgcmV0dXJuIHNlc3Npb24ucHV0KGVuZHBvaW50KTsKKyAgfQorCisgIHByaXZhdGUgaW50IERFTEVURShTdHJpbmcgZW5kcG9pbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLmRlbGV0ZShlbmRwb2ludCk7CisgICAgci5jb25zdW1lKCk7CisgICAgcmV0dXJuIHIuZ2V0U3RhdHVzQ29kZSgpOworICB9CisKKyAgcHJpdmF0ZSBSZXN0UmVzcG9uc2UgUE9TVChTdHJpbmcgZW5kUG9pbnQsIE1lbWJlcnNJbnB1dCBtaSkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gc2Vzc2lvbi5wb3N0KGVuZFBvaW50LCBtaSk7CisgIH0KKworICBwcml2YXRlIFJlc3RSZXNwb25zZSBQT1NUKFN0cmluZyBlbmRQb2ludCwgR3JvdXBzSW5wdXQgZ2kpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgcmV0dXJuIHNlc3Npb24ucG9zdChlbmRQb2ludCwgZ2kpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGdyb3VwKFN0cmluZyBuYW1lKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIEdyb3VwSW5wdXQgaW4gPSBuZXcgR3JvdXBJbnB1dCgpOworICAgIHNlc3Npb24ucHV0KCIvZ3JvdXBzLyIgKyBuYW1lLCBpbikuY29uc3VtZSgpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFzc2VydE1lbWJlcnMoU3RyaW5nIGdyb3VwLCBUZXN0QWNjb3VudC4uLiBtZW1iZXJzKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgQWNjb3VudEdyb3VwIGcgPSBncm91cENhY2hlLmdldChuZXcgQWNjb3VudEdyb3VwLk5hbWVLZXkoZ3JvdXApKTsKKyAgICBTZXQ8QWNjb3VudC5JZD4gaWRzID0gU2V0cy5uZXdIYXNoU2V0KCk7CisgICAgUmVzdWx0U2V0PEFjY291bnRHcm91cE1lbWJlcj4gYWxsID0KKyAgICAgICAgZGIuYWNjb3VudEdyb3VwTWVtYmVycygpLmJ5R3JvdXAoZy5nZXRJZCgpKTsKKyAgICBmb3IgKEFjY291bnRHcm91cE1lbWJlciBtIDogYWxsKSB7CisgICAgICBpZHMuYWRkKG0uZ2V0QWNjb3VudElkKCkpOworICAgIH0KKyAgICBhc3NlcnRUcnVlKGlkcy5zaXplKCkgPT0gbWVtYmVycy5sZW5ndGgpOworICAgIGZvciAoVGVzdEFjY291bnQgYSA6IG1lbWJlcnMpIHsKKyAgICAgIGFzc2VydFRydWUoaWRzLmNvbnRhaW5zKGEuaWQpKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgYXNzZXJ0TWVtYmVycyhMaXN0PEFjY291bnRJbmZvPiBhaSwgVGVzdEFjY291bnQuLi4gbWVtYmVycykgeworICAgIE1hcDxJbnRlZ2VyLCBBY2NvdW50SW5mbz4gaW5mb0J5SWQgPSBNYXBzLm5ld0hhc2hNYXAoKTsKKyAgICBmb3IgKEFjY291bnRJbmZvIGkgOiBhaSkgeworICAgICAgaW5mb0J5SWQucHV0KGkuX2FjY291bnRfaWQsIGkpOworICAgIH0KKworICAgIGZvciAoVGVzdEFjY291bnQgYSA6IG1lbWJlcnMpIHsKKyAgICAgIEFjY291bnRJbmZvIGkgPSBpbmZvQnlJZC5nZXQoYS5pZC5nZXQoKSk7CisgICAgICBhc3NlcnROb3ROdWxsKGkpOworICAgICAgYXNzZXJ0QWNjb3VudEluZm8oYSwgaSk7CisgICAgfQorICAgIGFzc2VydEVxdWFscyhhaS5zaXplKCksIG1lbWJlcnMubGVuZ3RoKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBhc3NlcnRJbmNsdWRlcyhTdHJpbmcgZ3JvdXAsIFN0cmluZy4uLiBpbmNsdWRlcykKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIEFjY291bnRHcm91cCBnID0gZ3JvdXBDYWNoZS5nZXQobmV3IEFjY291bnRHcm91cC5OYW1lS2V5KGdyb3VwKSk7CisgICAgU2V0PEFjY291bnRHcm91cC5VVUlEPiBpZHMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICBSZXN1bHRTZXQ8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZD4gYWxsID0KKyAgICAgICAgZGIuYWNjb3VudEdyb3VwSW5jbHVkZXNCeVV1aWQoKS5ieUdyb3VwKGcuZ2V0SWQoKSk7CisgICAgZm9yIChBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIG0gOiBhbGwpIHsKKyAgICAgIGlkcy5hZGQobS5nZXRJbmNsdWRlVVVJRCgpKTsKKyAgICB9CisgICAgYXNzZXJ0VHJ1ZShpZHMuc2l6ZSgpID09IGluY2x1ZGVzLmxlbmd0aCk7CisgICAgZm9yIChTdHJpbmcgaSA6IGluY2x1ZGVzKSB7CisgICAgICBBY2NvdW50R3JvdXAuVVVJRCBpZCA9IGdyb3VwQ2FjaGUuZ2V0KAorICAgICAgICAgIG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleShpKSkuZ2V0R3JvdXBVVUlEKCk7CisgICAgICBhc3NlcnRUcnVlKGlkcy5jb250YWlucyhpZCkpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBhc3NlcnRJbmNsdWRlcyhMaXN0PEdyb3VwSW5mbz4gZ2ksIFN0cmluZy4uLiBpbmNsdWRlcykgeworICAgIE1hcDxTdHJpbmcsIEdyb3VwSW5mbz4gZ3JvdXBzQnlOYW1lID0gTWFwcy5uZXdIYXNoTWFwKCk7CisgICAgZm9yIChHcm91cEluZm8gaSA6IGdpKSB7CisgICAgICBncm91cHNCeU5hbWUucHV0KGkubmFtZSwgaSk7CisgICAgfQorCisgICAgZm9yIChTdHJpbmcgbmFtZSA6IGluY2x1ZGVzKSB7CisgICAgICBHcm91cEluZm8gaSA9IGdyb3Vwc0J5TmFtZS5nZXQobmFtZSk7CisgICAgICBhc3NlcnROb3ROdWxsKGkpOworICAgICAgYXNzZXJ0R3JvdXBJbmZvKGdyb3VwQ2FjaGUuZ2V0KG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleShuYW1lKSksIGkpOworICAgIH0KKyAgICBhc3NlcnRFcXVhbHMoZ2kuc2l6ZSgpLCBpbmNsdWRlcy5sZW5ndGgpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFzc2VydE5vSW5jbHVkZXMoU3RyaW5nIGdyb3VwKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50R3JvdXAgZyA9IGdyb3VwQ2FjaGUuZ2V0KG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleShncm91cCkpOworICAgIEl0ZXJhdG9yPEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ+IGl0ID0KKyAgICAgICAgZGIuYWNjb3VudEdyb3VwSW5jbHVkZXNCeVV1aWQoKS5ieUdyb3VwKGcuZ2V0SWQoKSkuaXRlcmF0b3IoKTsKKyAgICBhc3NlcnRGYWxzZShpdC5oYXNOZXh0KCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9DcmVhdGVHcm91cElULmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9DcmVhdGVHcm91cElULmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDY0MWYwOQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0NyZWF0ZUdyb3VwSVQuamF2YQpAQCAtMCwwICsxLDEwMSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5ncm91cDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXAuR3JvdXBBc3NlcnQuYXNzZXJ0R3JvdXBJbmZvOworCitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0RXF1YWxzOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydE5vdE51bGw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFic3RyYWN0RGFlbW9uVGVzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFjY291bnRDcmVhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFJlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5UZXN0QWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkdzb247CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLnJlZmxlY3QuVHlwZVRva2VuOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgY29tLmpjcmFmdC5qc2NoLkpTY2hFeGNlcHRpb247CisKK2ltcG9ydCBvcmcuYXBhY2hlLmh0dHAuSHR0cFN0YXR1czsKK2ltcG9ydCBvcmcuanVuaXQuQmVmb3JlOworaW1wb3J0IG9yZy5qdW5pdC5UZXN0OworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKKworcHVibGljIGNsYXNzIENyZWF0ZUdyb3VwSVQgZXh0ZW5kcyBBYnN0cmFjdERhZW1vblRlc3QgeworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBBY2NvdW50Q3JlYXRvciBhY2NvdW50czsKKworICBASW5qZWN0CisgIHByaXZhdGUgR3JvdXBDYWNoZSBncm91cENhY2hlOworCisgIHByaXZhdGUgVGVzdEFjY291bnQgYWRtaW47CisgIHByaXZhdGUgUmVzdFNlc3Npb24gc2Vzc2lvbjsKKworICBAQmVmb3JlCisgIHB1YmxpYyB2b2lkIHNldFVwKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgYWRtaW4gPSBhY2NvdW50cy5jcmVhdGUoImFkbWluIiwgImFkbWluQGV4YW1wbGUuY29tIiwgIkFkbWluaXN0cmF0b3IiLAorICAgICAgICAgICAgIkFkbWluaXN0cmF0b3JzIik7CisgICAgc2Vzc2lvbiA9IG5ldyBSZXN0U2Vzc2lvbihhZG1pbik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0Q3JlYXRlR3JvdXAoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGZpbmFsIFN0cmluZyBuZXdHcm91cE5hbWUgPSAibmV3R3JvdXAiOworICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5wdXQoIi9ncm91cHMvIiArIG5ld0dyb3VwTmFtZSk7CisgICAgR3JvdXBJbmZvIGcgPSAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwgbmV3IFR5cGVUb2tlbjxHcm91cEluZm8+KCkge30uZ2V0VHlwZSgpKTsKKyAgICBhc3NlcnRFcXVhbHMobmV3R3JvdXBOYW1lLCBnLm5hbWUpOworICAgIEFjY291bnRHcm91cCBncm91cCA9IGdyb3VwQ2FjaGUuZ2V0KG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleShuZXdHcm91cE5hbWUpKTsKKyAgICBhc3NlcnROb3ROdWxsKGdyb3VwKTsKKyAgICBhc3NlcnRHcm91cEluZm8oZ3JvdXAsIGcpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdENyZWF0ZUdyb3VwV2l0aFByb3BlcnRpZXMoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGZpbmFsIFN0cmluZyBuZXdHcm91cE5hbWUgPSAibmV3R3JvdXAiOworICAgIEdyb3VwSW5wdXQgaW4gPSBuZXcgR3JvdXBJbnB1dCgpOworICAgIGluLmRlc2NyaXB0aW9uID0gIlRlc3QgZGVzY3JpcHRpb24iOworICAgIGluLnZpc2libGVfdG9fYWxsID0gdHJ1ZTsKKyAgICBpbi5vd25lcl9pZCA9IGdyb3VwQ2FjaGUuZ2V0KG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleSgiQWRtaW5pc3RyYXRvcnMiKSkuZ2V0R3JvdXBVVUlEKCkuZ2V0KCk7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLnB1dCgiL2dyb3Vwcy8iICsgbmV3R3JvdXBOYW1lLCBpbik7CisgICAgR3JvdXBJbmZvIGcgPSAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwgbmV3IFR5cGVUb2tlbjxHcm91cEluZm8+KCkge30uZ2V0VHlwZSgpKTsKKyAgICBhc3NlcnRFcXVhbHMobmV3R3JvdXBOYW1lLCBnLm5hbWUpOworICAgIEFjY291bnRHcm91cCBncm91cCA9IGdyb3VwQ2FjaGUuZ2V0KG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleShuZXdHcm91cE5hbWUpKTsKKyAgICBhc3NlcnRFcXVhbHMoaW4uZGVzY3JpcHRpb24sIGdyb3VwLmdldERlc2NyaXB0aW9uKCkpOworICAgIGFzc2VydEVxdWFscyhpbi52aXNpYmxlX3RvX2FsbCwgZ3JvdXAuaXNWaXNpYmxlVG9BbGwoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGluLm93bmVyX2lkLCBncm91cC5nZXRPd25lckdyb3VwVVVJRCgpLmdldCgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHRlc3RDcmVhdGVHcm91cFdpdGhvdXRDYXBhYmlsaXR5X0ZvcmJpZGRlbigpIHRocm93cyBPcm1FeGNlcHRpb24sCisgICAgICBKU2NoRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgVGVzdEFjY291bnQgdXNlciA9IGFjY291bnRzLmNyZWF0ZSgidXNlciIsICJ1c2VyQGV4YW1wbGUuY29tIiwgIlVzZXIiKTsKKyAgICBSZXN0UmVzcG9uc2UgciA9IChuZXcgUmVzdFNlc3Npb24odXNlcikpLnB1dCgiL2dyb3Vwcy9uZXdHcm91cCIpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX0ZPUkJJRERFTiwgci5nZXRTdGF0dXNDb2RlKCkpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdENyZWF0ZUdyb3VwV2hlbkdyb3VwQWxyZWFkeUV4aXN0c19Db25mbGljdCgpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uLCBKU2NoRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLnB1dCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycyIpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX0NPTkZMSUNULCByLmdldFN0YXR1c0NvZGUoKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dldEdyb3VwSVQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dldEdyb3VwSVQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41ZmUzODZkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR2V0R3JvdXBJVC5qYXZhCkBAIC0wLDAgKzEsNzIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXA7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0Lmdyb3VwLkdyb3VwQXNzZXJ0LmFzc2VydEdyb3VwSW5mbzsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuQWJzdHJhY3REYWVtb25UZXN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuQWNjb3VudENyZWF0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5SZXN0UmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5SZXN0U2Vzc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlRlc3RBY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24uR3NvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24ucmVmbGVjdC5UeXBlVG9rZW47CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmp1bml0LkJlZm9yZTsKK2ltcG9ydCBvcmcuanVuaXQuVGVzdDsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CisKK3B1YmxpYyBjbGFzcyBHZXRHcm91cElUIGV4dGVuZHMgQWJzdHJhY3REYWVtb25UZXN0IHsKKworICBASW5qZWN0CisgIHByaXZhdGUgQWNjb3VudENyZWF0b3IgYWNjb3VudHM7CisKKyAgQEluamVjdAorICBwcml2YXRlIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZTsKKworICBwcml2YXRlIFRlc3RBY2NvdW50IGFkbWluOworICBwcml2YXRlIFJlc3RTZXNzaW9uIHNlc3Npb247CisKKyAgQEJlZm9yZQorICBwdWJsaWMgdm9pZCBzZXRVcCgpIHRocm93cyBFeGNlcHRpb24geworICAgIGFkbWluID0gYWNjb3VudHMuY3JlYXRlKCJhZG1pbiIsICJhZG1pbkBleGFtcGxlLmNvbSIsICJBZG1pbmlzdHJhdG9yIiwKKyAgICAgICAgICAgICJBZG1pbmlzdHJhdG9ycyIpOworICAgIHNlc3Npb24gPSBuZXcgUmVzdFNlc3Npb24oYWRtaW4pOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdEdldEdyb3VwKCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50R3JvdXAgYWRtaW5Hcm91cCA9IGdyb3VwQ2FjaGUuZ2V0KG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleSgiQWRtaW5pc3RyYXRvcnMiKSk7CisKKyAgICAvLyBieSBVVUlECisgICAgdGVzdEdldEdyb3VwKCIvZ3JvdXBzLyIgKyBhZG1pbkdyb3VwLmdldEdyb3VwVVVJRCgpLmdldCgpLCBhZG1pbkdyb3VwKTsKKworICAgIC8vIGJ5IG5hbWUKKyAgICB0ZXN0R2V0R3JvdXAoIi9ncm91cHMvIiArIGFkbWluR3JvdXAuZ2V0TmFtZSgpLCBhZG1pbkdyb3VwKTsKKworICAgIC8vIGJ5IGxlZ2FjeSBudW1lcmljIElECisgICAgdGVzdEdldEdyb3VwKCIvZ3JvdXBzLyIgKyBhZG1pbkdyb3VwLmdldElkKCkuZ2V0KCksIGFkbWluR3JvdXApOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHRlc3RHZXRHcm91cChTdHJpbmcgdXJsLCBBY2NvdW50R3JvdXAgZXhwZWN0ZWRHcm91cCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBSZXN0UmVzcG9uc2UgciA9IHNlc3Npb24uZ2V0KHVybCk7CisgICAgR3JvdXBJbmZvIGdyb3VwID0gKG5ldyBHc29uKCkpLmZyb21Kc29uKHIuZ2V0UmVhZGVyKCksIG5ldyBUeXBlVG9rZW48R3JvdXBJbmZvPigpIHt9LmdldFR5cGUoKSk7CisgICAgYXNzZXJ0R3JvdXBJbmZvKGV4cGVjdGVkR3JvdXAsIGdyb3VwKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR3JvdXBBc3NlcnQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dyb3VwQXNzZXJ0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzkyZDhjNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dyb3VwQXNzZXJ0LmphdmEKQEAgLTAsMCArMSw1MyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5ncm91cDsKKworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydEVxdWFsczsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRUcnVlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworCitpbXBvcnQgamF2YS51dGlsLlNldDsKKworcHVibGljIGNsYXNzIEdyb3VwQXNzZXJ0IHsKKworICBwdWJsaWMgc3RhdGljIHZvaWQgYXNzZXJ0R3JvdXBzKEl0ZXJhYmxlPFN0cmluZz4gZXhwZWN0ZWQsIFNldDxTdHJpbmc+IGFjdHVhbCkgeworICAgIGZvciAoU3RyaW5nIGcgOiBleHBlY3RlZCkgeworICAgICAgYXNzZXJ0VHJ1ZSgibWlzc2luZyBncm91cCAiICsgZywgYWN0dWFsLnJlbW92ZShnKSk7CisgICAgfQorICAgIGFzc2VydFRydWUoInVuZXhwZWN0ZWQgZ3JvdXBzOiAiICsgYWN0dWFsLCBhY3R1YWwuaXNFbXB0eSgpKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgdm9pZCBhc3NlcnRHcm91cEluZm8oQWNjb3VudEdyb3VwIGdyb3VwLCBHcm91cEluZm8gaW5mbykgeworICAgIGlmIChpbmZvLm5hbWUgIT0gbnVsbCkgeworICAgICAgLy8gJ25hbWUnIGlzIG5vdCBzZXQgaWYgcmV0dXJuZWQgaW4gYSBtYXAKKyAgICAgIGFzc2VydEVxdWFscyhncm91cC5nZXROYW1lKCksIGluZm8ubmFtZSk7CisgICAgfQorICAgIGFzc2VydEVxdWFscyhncm91cC5nZXRHcm91cFVVSUQoKS5nZXQoKSwgVXJsLmRlY29kZShpbmZvLmlkKSk7CisgICAgYXNzZXJ0RXF1YWxzKEludGVnZXIudmFsdWVPZihncm91cC5nZXRJZCgpLmdldCgpKSwgaW5mby5ncm91cF9pZCk7CisgICAgYXNzZXJ0RXF1YWxzKCIjL2FkbWluL2dyb3Vwcy91dWlkLSIgKyBVcmwuZW5jb2RlKGdyb3VwLmdldEdyb3VwVVVJRCgpLmdldCgpKSwgaW5mby51cmwpOworICAgIGFzc2VydEVxdWFscyhncm91cC5pc1Zpc2libGVUb0FsbCgpLCB0b0Jvb2xlYW4oaW5mby5vcHRpb25zLnZpc2libGVfdG9fYWxsKSk7CisgICAgYXNzZXJ0RXF1YWxzKGdyb3VwLmdldERlc2NyaXB0aW9uKCksIGluZm8uZGVzY3JpcHRpb24pOworICAgIGFzc2VydEVxdWFscyhncm91cC5nZXRPd25lckdyb3VwVVVJRCgpLmdldCgpLCBVcmwuZGVjb2RlKGluZm8ub3duZXJfaWQpKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgYm9vbGVhbiB0b0Jvb2xlYW4oQm9vbGVhbiBiKSB7CisgICAgaWYgKGIgPT0gbnVsbCkgeworICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICByZXR1cm4gYi5ib29sZWFuVmFsdWUoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR3JvdXBJbmZvLmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9Hcm91cEluZm8uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNDhmOTY4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR3JvdXBJbmZvLmphdmEKQEAgLTAsMCArMSwyNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5ncm91cDsKKworcHVibGljIGNsYXNzIEdyb3VwSW5mbyB7CisgIHB1YmxpYyBTdHJpbmcgaWQ7CisgIHB1YmxpYyBTdHJpbmcgbmFtZTsKKyAgcHVibGljIFN0cmluZyB1cmw7CisgIHB1YmxpYyBHcm91cE9wdGlvbnNJbmZvIG9wdGlvbnM7CisgIHB1YmxpYyBTdHJpbmcgZGVzY3JpcHRpb247CisgIHB1YmxpYyBJbnRlZ2VyIGdyb3VwX2lkOworICBwdWJsaWMgU3RyaW5nIG93bmVyX2lkOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR3JvdXBJbnB1dC5qYXZhIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR3JvdXBJbnB1dC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg2ODY0ODM5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR3JvdXBJbnB1dC5qYXZhCkBAIC0wLDAgKzEsMjEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXA7CisKK3B1YmxpYyBjbGFzcyBHcm91cElucHV0IHsKKyAgU3RyaW5nIGRlc2NyaXB0aW9uOworICBCb29sZWFuIHZpc2libGVfdG9fYWxsOworICBTdHJpbmcgb3duZXJfaWQ7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9Hcm91cE9wdGlvbnNJbmZvLmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9Hcm91cE9wdGlvbnNJbmZvLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDQ1N2ZiNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dyb3VwT3B0aW9uc0luZm8uamF2YQpAQCAtMCwwICsxLDE5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0Lmdyb3VwOworCitwdWJsaWMgY2xhc3MgR3JvdXBPcHRpb25zSW5mbyB7CisgIHB1YmxpYyBCb29sZWFuIHZpc2libGVfdG9fYWxsOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR3JvdXBQcm9wZXJ0aWVzSVQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dyb3VwUHJvcGVydGllc0lULmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWIyMjM2NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dyb3VwUHJvcGVydGllc0lULmphdmEKQEAgLTAsMCArMSwyMTcgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXA7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0Lmdyb3VwLkdyb3VwQXNzZXJ0LnRvQm9vbGVhbjsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0Lmdyb3VwLkdyb3VwQXNzZXJ0LmFzc2VydEdyb3VwSW5mbzsKKworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydEVxdWFsczsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnROb3ROdWxsOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydE51bGw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFic3RyYWN0RGFlbW9uVGVzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFjY291bnRDcmVhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFJlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5UZXN0QWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkdzb247CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLnJlZmxlY3QuVHlwZVRva2VuOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5hcGFjaGUuaHR0cC5IdHRwU3RhdHVzOworaW1wb3J0IG9yZy5qdW5pdC5CZWZvcmU7CitpbXBvcnQgb3JnLmp1bml0LlRlc3Q7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitwdWJsaWMgY2xhc3MgR3JvdXBQcm9wZXJ0aWVzSVQgZXh0ZW5kcyBBYnN0cmFjdERhZW1vblRlc3QgeworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBBY2NvdW50Q3JlYXRvciBhY2NvdW50czsKKworICBASW5qZWN0CisgIHByaXZhdGUgR3JvdXBDYWNoZSBncm91cENhY2hlOworCisgIHByaXZhdGUgVGVzdEFjY291bnQgYWRtaW47CisgIHByaXZhdGUgUmVzdFNlc3Npb24gc2Vzc2lvbjsKKworICBAQmVmb3JlCisgIHB1YmxpYyB2b2lkIHNldFVwKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgYWRtaW4gPSBhY2NvdW50cy5jcmVhdGUoImFkbWluIiwgImFkbWluQGV4YW1wbGUuY29tIiwgIkFkbWluaXN0cmF0b3IiLAorICAgICAgICAgICAgIkFkbWluaXN0cmF0b3JzIik7CisgICAgc2Vzc2lvbiA9IG5ldyBSZXN0U2Vzc2lvbihhZG1pbik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0R3JvdXBOYW1lKCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50R3JvdXAuTmFtZUtleSBhZG1pbkdyb3VwTmFtZSA9IG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleSgiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBTdHJpbmcgdXJsID0gIi9ncm91cHMvIiArIGdyb3VwQ2FjaGUuZ2V0KGFkbWluR3JvdXBOYW1lKS5nZXRHcm91cFVVSUQoKS5nZXQoKSArICIvbmFtZSI7CisKKyAgICAvLyBnZXQgbmFtZQorICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5nZXQodXJsKTsKKyAgICBTdHJpbmcgbmFtZSA9IChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPFN0cmluZz4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgYXNzZXJ0RXF1YWxzKCJBZG1pbmlzdHJhdG9ycyIsIG5hbWUpOworICAgIHIuY29uc3VtZSgpOworCisgICAgLy8gc2V0IG5hbWUgd2l0aCBuYW1lIGNvbmZsaWN0CisgICAgR3JvdXBOYW1lSW5wdXQgaW4gPSBuZXcgR3JvdXBOYW1lSW5wdXQoKTsKKyAgICBpbi5uYW1lID0gIlJlZ2lzdGVyZWQgVXNlcnMiOworICAgIHIgPSBzZXNzaW9uLnB1dCh1cmwsIGluKTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19DT05GTElDVCwgci5nZXRTdGF0dXNDb2RlKCkpOworICAgIHIuY29uc3VtZSgpOworCisgICAgLy8gc2V0IG5hbWUgdG8gc2FtZSBuYW1lCisgICAgaW4gPSBuZXcgR3JvdXBOYW1lSW5wdXQoKTsKKyAgICBpbi5uYW1lID0gIkFkbWluaXN0cmF0b3JzIjsKKyAgICByID0gc2Vzc2lvbi5wdXQodXJsLCBpbik7CisgICAgYXNzZXJ0RXF1YWxzKEh0dHBTdGF0dXMuU0NfT0ssIHIuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgICByLmNvbnN1bWUoKTsKKworICAgIC8vIHJlbmFtZQorICAgIGluID0gbmV3IEdyb3VwTmFtZUlucHV0KCk7CisgICAgaW4ubmFtZSA9ICJBZG1pbnMiOworICAgIHIgPSBzZXNzaW9uLnB1dCh1cmwsIGluKTsKKyAgICBTdHJpbmcgbmV3TmFtZSA9IChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPFN0cmluZz4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgYXNzZXJ0Tm90TnVsbChncm91cENhY2hlLmdldChuZXcgQWNjb3VudEdyb3VwLk5hbWVLZXkoaW4ubmFtZSkpKTsKKyAgICBhc3NlcnROdWxsKGdyb3VwQ2FjaGUuZ2V0KGFkbWluR3JvdXBOYW1lKSk7CisgICAgYXNzZXJ0RXF1YWxzKGluLm5hbWUsIG5ld05hbWUpOworICAgIHIuY29uc3VtZSgpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdEdyb3VwRGVzY3JpcHRpb24oKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIEFjY291bnRHcm91cC5OYW1lS2V5IGFkbWluR3JvdXBOYW1lID0gbmV3IEFjY291bnRHcm91cC5OYW1lS2V5KCJBZG1pbmlzdHJhdG9ycyIpOworICAgIEFjY291bnRHcm91cCBhZG1pbkdyb3VwID0gZ3JvdXBDYWNoZS5nZXQoYWRtaW5Hcm91cE5hbWUpOworICAgIFN0cmluZyB1cmwgPSAiL2dyb3Vwcy8iICsgYWRtaW5Hcm91cC5nZXRHcm91cFVVSUQoKS5nZXQoKSArICIvZGVzY3JpcHRpb24iOworCisgICAgLy8gZ2V0IGRlc2NyaXB0aW9uCisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLmdldCh1cmwpOworICAgIFN0cmluZyBkZXNjcmlwdGlvbiA9IChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPFN0cmluZz4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGFkbWluR3JvdXAuZ2V0RGVzY3JpcHRpb24oKSwgZGVzY3JpcHRpb24pOworICAgIHIuY29uc3VtZSgpOworCisgICAgLy8gc2V0IGRlc2NyaXB0aW9uCisgICAgR3JvdXBEZXNjcmlwdGlvbklucHV0IGluID0gbmV3IEdyb3VwRGVzY3JpcHRpb25JbnB1dCgpOworICAgIGluLmRlc2NyaXB0aW9uID0gIkFsbCB1c2VycyB0aGF0IGNhbiBhZG1pbmlzdHJhdGUgdGhlIEdlcnJpdCBTZXJ2ZXIuIjsKKyAgICByID0gc2Vzc2lvbi5wdXQodXJsLCBpbik7CisgICAgU3RyaW5nIG5ld0Rlc2NyaXB0aW9uID0gKG5ldyBHc29uKCkpLmZyb21Kc29uKHIuZ2V0UmVhZGVyKCksIG5ldyBUeXBlVG9rZW48U3RyaW5nPigpIHt9LmdldFR5cGUoKSk7CisgICAgYXNzZXJ0RXF1YWxzKEh0dHBTdGF0dXMuU0NfT0ssIHIuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgICBhc3NlcnRFcXVhbHMoaW4uZGVzY3JpcHRpb24sIG5ld0Rlc2NyaXB0aW9uKTsKKyAgICBhZG1pbkdyb3VwID0gZ3JvdXBDYWNoZS5nZXQoYWRtaW5Hcm91cE5hbWUpOworICAgIGFzc2VydEVxdWFscyhpbi5kZXNjcmlwdGlvbiwgYWRtaW5Hcm91cC5nZXREZXNjcmlwdGlvbigpKTsKKyAgICByLmNvbnN1bWUoKTsKKworICAgIC8vIGRlbGV0ZSBkZXNjcmlwdGlvbgorICAgIHIgPSBzZXNzaW9uLmRlbGV0ZSh1cmwpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX05PX0NPTlRFTlQsIHIuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgICBhZG1pbkdyb3VwID0gZ3JvdXBDYWNoZS5nZXQoYWRtaW5Hcm91cE5hbWUpOworICAgIGFzc2VydE51bGwoYWRtaW5Hcm91cC5nZXREZXNjcmlwdGlvbigpKTsKKworICAgIC8vIHNldCBkZXNjcmlwdGlvbiB0byBlbXB0eSBzdHJpbmcKKyAgICBpbiA9IG5ldyBHcm91cERlc2NyaXB0aW9uSW5wdXQoKTsKKyAgICBpbi5kZXNjcmlwdGlvbiA9ICIiOworICAgIHIgPSBzZXNzaW9uLnB1dCh1cmwsIGluKTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19OT19DT05URU5ULCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgYWRtaW5Hcm91cCA9IGdyb3VwQ2FjaGUuZ2V0KGFkbWluR3JvdXBOYW1lKTsKKyAgICBhc3NlcnROdWxsKGFkbWluR3JvdXAuZ2V0RGVzY3JpcHRpb24oKSk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0R3JvdXBPcHRpb25zKCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50R3JvdXAuTmFtZUtleSBhZG1pbkdyb3VwTmFtZSA9IG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleSgiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBBY2NvdW50R3JvdXAgYWRtaW5Hcm91cCA9IGdyb3VwQ2FjaGUuZ2V0KGFkbWluR3JvdXBOYW1lKTsKKyAgICBTdHJpbmcgdXJsID0gIi9ncm91cHMvIiArIGFkbWluR3JvdXAuZ2V0R3JvdXBVVUlEKCkuZ2V0KCkgKyAiL29wdGlvbnMiOworCisgICAgLy8gZ2V0IG9wdGlvbnMKKyAgICBSZXN0UmVzcG9uc2UgciA9IHNlc3Npb24uZ2V0KHVybCk7CisgICAgR3JvdXBPcHRpb25zSW5mbyBvcHRpb25zID0gKG5ldyBHc29uKCkpLmZyb21Kc29uKHIuZ2V0UmVhZGVyKCksIG5ldyBUeXBlVG9rZW48R3JvdXBPcHRpb25zSW5mbz4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGFkbWluR3JvdXAuaXNWaXNpYmxlVG9BbGwoKSwgdG9Cb29sZWFuKG9wdGlvbnMudmlzaWJsZV90b19hbGwpKTsKKyAgICByLmNvbnN1bWUoKTsKKworICAgIC8vIHNldCBvcHRpb25zCisgICAgR3JvdXBPcHRpb25zSW5wdXQgaW4gPSBuZXcgR3JvdXBPcHRpb25zSW5wdXQoKTsKKyAgICBpbi52aXNpYmxlX3RvX2FsbCA9ICFhZG1pbkdyb3VwLmlzVmlzaWJsZVRvQWxsKCk7CisgICAgciA9IHNlc3Npb24ucHV0KHVybCwgaW4pOworICAgIEdyb3VwT3B0aW9uc0luZm8gbmV3T3B0aW9ucyA9IChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPEdyb3VwT3B0aW9uc0luZm8+KCkge30uZ2V0VHlwZSgpKTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19PSywgci5nZXRTdGF0dXNDb2RlKCkpOworICAgIGFzc2VydEVxdWFscyhpbi52aXNpYmxlX3RvX2FsbCwgdG9Cb29sZWFuKG5ld09wdGlvbnMudmlzaWJsZV90b19hbGwpKTsKKyAgICBhZG1pbkdyb3VwID0gZ3JvdXBDYWNoZS5nZXQoYWRtaW5Hcm91cE5hbWUpOworICAgIGFzc2VydEVxdWFscyhpbi52aXNpYmxlX3RvX2FsbCwgYWRtaW5Hcm91cC5pc1Zpc2libGVUb0FsbCgpKTsKKyAgICByLmNvbnN1bWUoKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHRlc3RHcm91cE93bmVyKCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50R3JvdXAuTmFtZUtleSBhZG1pbkdyb3VwTmFtZSA9IG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleSgiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBBY2NvdW50R3JvdXAgYWRtaW5Hcm91cCA9IGdyb3VwQ2FjaGUuZ2V0KGFkbWluR3JvdXBOYW1lKTsKKyAgICBTdHJpbmcgdXJsID0gIi9ncm91cHMvIiArIGFkbWluR3JvdXAuZ2V0R3JvdXBVVUlEKCkuZ2V0KCkgKyAiL293bmVyIjsKKworICAgIC8vIGdldCBvd25lcgorICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5nZXQodXJsKTsKKyAgICBHcm91cEluZm8gb3B0aW9ucyA9IChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPEdyb3VwSW5mbz4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgYXNzZXJ0R3JvdXBJbmZvKGdyb3VwQ2FjaGUuZ2V0KGFkbWluR3JvdXAuZ2V0T3duZXJHcm91cFVVSUQoKSksIG9wdGlvbnMpOworICAgIHIuY29uc3VtZSgpOworCisgICAgLy8gc2V0IG93bmVyIGJ5IG5hbWUKKyAgICBHcm91cE93bmVySW5wdXQgaW4gPSBuZXcgR3JvdXBPd25lcklucHV0KCk7CisgICAgaW4ub3duZXIgPSAiUmVnaXN0ZXJlZCBVc2VycyI7CisgICAgciA9IHNlc3Npb24ucHV0KHVybCwgaW4pOworICAgIEdyb3VwSW5mbyBuZXdPd25lciA9IChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPEdyb3VwSW5mbz4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGluLm93bmVyLCBuZXdPd25lci5uYW1lKTsKKyAgICBhZG1pbkdyb3VwID0gZ3JvdXBDYWNoZS5nZXQoYWRtaW5Hcm91cE5hbWUpOworICAgIGFzc2VydEdyb3VwSW5mbyhncm91cENhY2hlLmdldChhZG1pbkdyb3VwLmdldE93bmVyR3JvdXBVVUlEKCkpLCBuZXdPd25lcik7CisgICAgci5jb25zdW1lKCk7CisKKyAgICAvLyBzZXQgb3duZXIgYnkgVVVJRAorICAgIGluID0gbmV3IEdyb3VwT3duZXJJbnB1dCgpOworICAgIGluLm93bmVyID0gYWRtaW5Hcm91cC5nZXRHcm91cFVVSUQoKS5nZXQoKTsKKyAgICByID0gc2Vzc2lvbi5wdXQodXJsLCBpbik7CisgICAgYXNzZXJ0RXF1YWxzKEh0dHBTdGF0dXMuU0NfT0ssIHIuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgICBhZG1pbkdyb3VwID0gZ3JvdXBDYWNoZS5nZXQoYWRtaW5Hcm91cE5hbWUpOworICAgIGFzc2VydEVxdWFscyhpbi5vd25lciwgZ3JvdXBDYWNoZS5nZXQoYWRtaW5Hcm91cC5nZXRPd25lckdyb3VwVVVJRCgpKS5nZXRHcm91cFVVSUQoKS5nZXQoKSk7CisgICAgci5jb25zdW1lKCk7CisKKyAgICAvLyBzZXQgbm9uIGV4aXN0aW5nIG93bmVyCisgICAgaW4gPSBuZXcgR3JvdXBPd25lcklucHV0KCk7CisgICAgaW4ub3duZXIgPSAiTm9uLUV4aXN0aW5nIEdyb3VwIjsKKyAgICByID0gc2Vzc2lvbi5wdXQodXJsLCBpbik7CisgICAgYXNzZXJ0RXF1YWxzKEh0dHBTdGF0dXMuU0NfVU5QUk9DRVNTQUJMRV9FTlRJVFksIHIuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgICByLmNvbnN1bWUoKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGNsYXNzIEdyb3VwTmFtZUlucHV0IHsKKyAgICBTdHJpbmcgbmFtZTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGNsYXNzIEdyb3VwRGVzY3JpcHRpb25JbnB1dCB7CisgICAgU3RyaW5nIGRlc2NyaXB0aW9uOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgR3JvdXBPcHRpb25zSW5wdXQgeworICAgIEJvb2xlYW4gdmlzaWJsZV90b19hbGw7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBHcm91cE93bmVySW5wdXQgeworICAgIFN0cmluZyBvd25lcjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvR3JvdXBzSW5wdXQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dyb3Vwc0lucHV0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMWVjZWRhOQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0dyb3Vwc0lucHV0LmphdmEKQEAgLTAsMCArMSwyMSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5ncm91cDsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitwdWJsaWMgY2xhc3MgR3JvdXBzSW5wdXQgeworICBMaXN0PFN0cmluZz4gZ3JvdXBzOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvTGlzdEdyb3VwSW5jbHVkZXNJVC5qYXZhIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvZ3JvdXAvTGlzdEdyb3VwSW5jbHVkZXNJVC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk5N2Y0NzYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9MaXN0R3JvdXBJbmNsdWRlc0lULmphdmEKQEAgLTAsMCArMSwxMjQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXA7CisKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRFcXVhbHM7CitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0VHJ1ZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuRnVuY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5Db2xsZWN0aW9uczI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5BYnN0cmFjdERhZW1vblRlc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5BY2NvdW50Q3JlYXRvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlJlc3RSZXNwb25zZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlJlc3RTZXNzaW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuVGVzdEFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkdzb247CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLnJlZmxlY3QuVHlwZVRva2VuOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5hcGFjaGUuaHR0cC5IdHRwU3RhdHVzOworaW1wb3J0IG9yZy5qdW5pdC5CZWZvcmU7CitpbXBvcnQgb3JnLmp1bml0LlRlc3Q7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKKworcHVibGljIGNsYXNzIExpc3RHcm91cEluY2x1ZGVzSVQgZXh0ZW5kcyBBYnN0cmFjdERhZW1vblRlc3QgeworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBBY2NvdW50Q3JlYXRvciBhY2NvdW50czsKKworICBwcml2YXRlIFJlc3RTZXNzaW9uIHNlc3Npb247CisKKyAgQEJlZm9yZQorICBwdWJsaWMgdm9pZCBzZXRVcCgpIHRocm93cyBFeGNlcHRpb24geworICAgIFRlc3RBY2NvdW50IGFkbWluID0gYWNjb3VudHMuY3JlYXRlKCJhZG1pbiIsICJBZG1pbmlzdHJhdG9ycyIpOworICAgIHNlc3Npb24gPSBuZXcgUmVzdFNlc3Npb24oYWRtaW4pOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgbGlzdE5vbkV4aXN0aW5nR3JvdXBJbmNsdWRlc19Ob3RGb3VuZCgpIHRocm93cyBFeGNlcHRpb24geworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX05PVF9GT1VORCwKKyAgICAgIHNlc3Npb24uZ2V0KCIvZ3JvdXBzL25vbi1leGlzdGluZy9ncm91cHMvIikuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGxpc3RFbXB0eUdyb3VwSW5jbHVkZXMoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICBhc3NlcnRUcnVlKEdFVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9ncm91cHMvIikuaXNFbXB0eSgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGxpc3ROb25FbXB0eUdyb3VwSW5jbHVkZXMoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICBncm91cCgiZ3giLCAiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBncm91cCgiZ3kiLCAiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBQVVQoIi9ncm91cHMvQWRtaW5pc3RyYXRvcnMvZ3JvdXBzL2d4Iik7CisgICAgUFVUKCIvZ3JvdXBzL0FkbWluaXN0cmF0b3JzL2dyb3Vwcy9neSIpOworCisgICAgYXNzZXJ0SW5jbHVkZXMoR0VUKCIvZ3JvdXBzL0FkbWluaXN0cmF0b3JzL2dyb3Vwcy8iKSwgImd4IiwgImd5Iik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCBsaXN0T25lSW5jbHVkZU1lbWJlcigpIHRocm93cyBFeGNlcHRpb24geworICAgIGdyb3VwKCJneCIsICJBZG1pbmlzdHJhdG9ycyIpOworICAgIGdyb3VwKCJneSIsICJBZG1pbmlzdHJhdG9ycyIpOworICAgIFBVVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9ncm91cHMvZ3giKTsKKyAgICBQVVQoIi9ncm91cHMvQWRtaW5pc3RyYXRvcnMvZ3JvdXBzL2d5Iik7CisKKyAgICBhc3NlcnRFcXVhbHMoR0VUX09ORSgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9ncm91cHMvZ3giKS5uYW1lLCAiZ3giKTsKKyAgfQorCisgIHByaXZhdGUgTGlzdDxHcm91cEluZm8+IEdFVChTdHJpbmcgZW5kcG9pbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLmdldChlbmRwb2ludCk7CisgICAgYXNzZXJ0RXF1YWxzKEh0dHBTdGF0dXMuU0NfT0ssIHIuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgICByZXR1cm4gKG5ldyBHc29uKCkpLmZyb21Kc29uKHIuZ2V0UmVhZGVyKCksCisgICAgICAgIG5ldyBUeXBlVG9rZW48TGlzdDxHcm91cEluZm8+PigpIHt9LmdldFR5cGUoKSk7CisgIH0KKworICBwcml2YXRlIEdyb3VwSW5mbyBHRVRfT05FKFN0cmluZyBlbmRwb2ludCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBSZXN0UmVzcG9uc2UgciA9IHNlc3Npb24uZ2V0KGVuZHBvaW50KTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19PSywgci5nZXRTdGF0dXNDb2RlKCkpOworICAgIHJldHVybiAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwKKyAgICAgICAgbmV3IFR5cGVUb2tlbjxHcm91cEluZm8+KCkge30uZ2V0VHlwZSgpKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBQVVQoU3RyaW5nIGVuZHBvaW50KSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHNlc3Npb24ucHV0KGVuZHBvaW50KS5jb25zdW1lKCk7CisgIH0KKworICBwcml2YXRlIHZvaWQgZ3JvdXAoU3RyaW5nIG5hbWUsIFN0cmluZyBvd25lckdyb3VwKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIEdyb3VwSW5wdXQgaW4gPSBuZXcgR3JvdXBJbnB1dCgpOworICAgIGluLm93bmVyX2lkID0gb3duZXJHcm91cDsKKyAgICBzZXNzaW9uLnB1dCgiL2dyb3Vwcy8iICsgbmFtZSwgaW4pLmNvbnN1bWUoKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBhc3NlcnRJbmNsdWRlcyhMaXN0PEdyb3VwSW5mbz4gaW5jbHVkZXMsIFN0cmluZyBuYW1lLAorICAgICAgU3RyaW5nLi4uIG5hbWVzKSB7CisgICAgQ29sbGVjdGlvbjxTdHJpbmc+IGluY2x1ZGVOYW1lcyA9IENvbGxlY3Rpb25zMi50cmFuc2Zvcm0oaW5jbHVkZXMsCisgICAgICAgIG5ldyBGdW5jdGlvbjxHcm91cEluZm8sIFN0cmluZz4oKSB7CisgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgcHVibGljIFN0cmluZyBhcHBseShATnVsbGFibGUgR3JvdXBJbmZvIGluZm8pIHsKKyAgICAgICAgICAgIHJldHVybiBpbmZvLm5hbWU7CisgICAgICAgICAgfQorICAgICAgICB9KTsKKyAgICBhc3NlcnRUcnVlKGluY2x1ZGVOYW1lcy5jb250YWlucyhuYW1lKSk7CisgICAgZm9yIChTdHJpbmcgbiA6IG5hbWVzKSB7CisgICAgICBhc3NlcnRUcnVlKGluY2x1ZGVOYW1lcy5jb250YWlucyhuKSk7CisgICAgfQorICAgIGFzc2VydEVxdWFscyhpbmNsdWRlcy5zaXplKCksIG5hbWVzLmxlbmd0aCArIDEpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9MaXN0R3JvdXBNZW1iZXJzSVQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0xpc3RHcm91cE1lbWJlcnNJVC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE1YWEzZGQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9MaXN0R3JvdXBNZW1iZXJzSVQuamF2YQpAQCAtMCwwICsxLDEzNiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5ncm91cDsKKworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydEVxdWFsczsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRUcnVlOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5GdW5jdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkNvbGxlY3Rpb25zMjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFic3RyYWN0RGFlbW9uVGVzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFjY291bnRDcmVhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFJlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5UZXN0QWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuYWNjb3VudC5BY2NvdW50SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24uR3NvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24ucmVmbGVjdC5UeXBlVG9rZW47CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmFwYWNoZS5odHRwLkh0dHBTdGF0dXM7CitpbXBvcnQgb3JnLmp1bml0LkJlZm9yZTsKK2ltcG9ydCBvcmcuanVuaXQuVGVzdDsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2ltcG9ydCBqYXZheC5hbm5vdGF0aW9uLk51bGxhYmxlOworCitwdWJsaWMgY2xhc3MgTGlzdEdyb3VwTWVtYmVyc0lUIGV4dGVuZHMgQWJzdHJhY3REYWVtb25UZXN0IHsKKworICBASW5qZWN0CisgIHByaXZhdGUgQWNjb3VudENyZWF0b3IgYWNjb3VudHM7CisKKyAgcHJpdmF0ZSBSZXN0U2Vzc2lvbiBzZXNzaW9uOworCisgIEBCZWZvcmUKKyAgcHVibGljIHZvaWQgc2V0VXAoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICBUZXN0QWNjb3VudCBhZG1pbiA9IGFjY291bnRzLmNyZWF0ZSgiYWRtaW4iLCAiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBzZXNzaW9uID0gbmV3IFJlc3RTZXNzaW9uKGFkbWluKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGxpc3ROb25FeGlzdGluZ0dyb3VwTWVtYmVyc19Ob3RGb3VuZCgpIHRocm93cyBFeGNlcHRpb24geworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX05PVF9GT1VORCwKKyAgICAgICAgc2Vzc2lvbi5nZXQoIi9ncm91cHMvbm9uLWV4aXN0aW5nL21lbWJlcnMvIikuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGxpc3RFbXB0eUdyb3VwTWVtYmVycygpIHRocm93cyBFeGNlcHRpb24geworICAgIGdyb3VwKCJlbXB0eSIsICJBZG1pbmlzdHJhdG9ycyIpOworICAgIGFzc2VydFRydWUoR0VUKCIvZ3JvdXBzL2VtcHR5L21lbWJlcnMvIikuaXNFbXB0eSgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGxpc3ROb25FbXB0eUdyb3VwTWVtYmVycygpIHRocm93cyBFeGNlcHRpb24geworICAgIGFzc2VydE1lbWJlcnMoR0VUKCIvZ3JvdXBzL0FkbWluaXN0cmF0b3JzL21lbWJlcnMvIiksICJhZG1pbiIpOworCisgICAgYWNjb3VudHMuY3JlYXRlKCJhZG1pbjIiLCAiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBhc3NlcnRNZW1iZXJzKEdFVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9tZW1iZXJzLyIpLCAiYWRtaW4iLCAiYWRtaW4yIik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCBsaXN0T25lR3JvdXBNZW1iZXIoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGFzc2VydEVxdWFscyhHRVRfT05FKCIvZ3JvdXBzL0FkbWluaXN0cmF0b3JzL21lbWJlcnMvYWRtaW4iKS5uYW1lLAorICAgICAgICAiYWRtaW4iKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIGxpc3RHcm91cE1lbWJlcnNSZWN1cnNpdmVseSgpIHRocm93cyBFeGNlcHRpb24geworICAgIGdyb3VwKCJneCIsICJBZG1pbmlzdHJhdG9ycyIpOworICAgIGFjY291bnRzLmNyZWF0ZSgidXgiLCAiZ3giKTsKKworICAgIGdyb3VwKCJneSIsICJBZG1pbmlzdHJhdG9ycyIpOworICAgIGFjY291bnRzLmNyZWF0ZSgidXkiLCAiZ3kiKTsKKworICAgIFBVVCgiL2dyb3Vwcy9BZG1pbmlzdHJhdG9ycy9ncm91cHMvZ3giKTsKKyAgICBQVVQoIi9ncm91cHMvZ3gvZ3JvdXBzL2d5Iik7CisgICAgYXNzZXJ0TWVtYmVycyhHRVQoIi9ncm91cHMvQWRtaW5pc3RyYXRvcnMvbWVtYmVycy8/cmVjdXJzaXZlIiksCisgICAgICAgICJhZG1pbiIsICJ1eCIsICJ1eSIpOworICB9CisKKyAgcHJpdmF0ZSBMaXN0PEFjY291bnRJbmZvPiBHRVQoU3RyaW5nIGVuZHBvaW50KSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5nZXQoZW5kcG9pbnQpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgcmV0dXJuIChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLAorICAgICAgICBuZXcgVHlwZVRva2VuPExpc3Q8QWNjb3VudEluZm8+PigpIHt9LmdldFR5cGUoKSk7CisgIH0KKworICBwcml2YXRlIEFjY291bnRJbmZvIEdFVF9PTkUoU3RyaW5nIGVuZHBvaW50KSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5nZXQoZW5kcG9pbnQpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgcmV0dXJuIChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLAorICAgICAgICBuZXcgVHlwZVRva2VuPEFjY291bnRJbmZvPigpIHt9LmdldFR5cGUoKSk7CisgIH0KKworICBwcml2YXRlIHZvaWQgUFVUKFN0cmluZyBlbmRwb2ludCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBzZXNzaW9uLnB1dChlbmRwb2ludCkuY29uc3VtZSgpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGdyb3VwKFN0cmluZyBuYW1lLCBTdHJpbmcgb3duZXJHcm91cCkKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgR3JvdXBJbnB1dCBpbiA9IG5ldyBHcm91cElucHV0KCk7CisgICAgaW4ub3duZXJfaWQgPSBvd25lckdyb3VwOworICAgIHNlc3Npb24ucHV0KCIvZ3JvdXBzLyIgKyBuYW1lLCBpbikuY29uc3VtZSgpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFzc2VydE1lbWJlcnMoTGlzdDxBY2NvdW50SW5mbz4gbWVtYmVycywgU3RyaW5nIG5hbWUsCisgICAgICBTdHJpbmcuLi4gbmFtZXMpIHsKKyAgICBDb2xsZWN0aW9uPFN0cmluZz4gbWVtYmVyTmFtZXMgPSBDb2xsZWN0aW9uczIudHJhbnNmb3JtKG1lbWJlcnMsCisgICAgICAgIG5ldyBGdW5jdGlvbjxBY2NvdW50SW5mbywgU3RyaW5nPigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgU3RyaW5nIGFwcGx5KEBOdWxsYWJsZSBBY2NvdW50SW5mbyBpbmZvKSB7CisgICAgICAgICAgICByZXR1cm4gaW5mby5uYW1lOworICAgICAgICAgIH0KKyAgICAgICAgfSk7CisKKyAgICBhc3NlcnRUcnVlKG1lbWJlck5hbWVzLmNvbnRhaW5zKG5hbWUpKTsKKyAgICBmb3IgKFN0cmluZyBuIDogbmFtZXMpIHsKKyAgICAgIGFzc2VydFRydWUobWVtYmVyTmFtZXMuY29udGFpbnMobikpOworICAgIH0KKyAgICBhc3NlcnRFcXVhbHMobWVtYmVycy5zaXplKCksIG5hbWVzLmxlbmd0aCArIDEpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9MaXN0R3JvdXBzSVQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL0xpc3RHcm91cHNJVC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA3YzdjOTMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9MaXN0R3JvdXBzSVQuamF2YQpAQCAtMCwwICsxLDEwMyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5ncm91cDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXAuR3JvdXBBc3NlcnQuYXNzZXJ0R3JvdXBJbmZvOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLnJlc3QuZ3JvdXAuR3JvdXBBc3NlcnQuYXNzZXJ0R3JvdXBzOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5GdW5jdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5BYnN0cmFjdERhZW1vblRlc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5BY2NvdW50Q3JlYXRvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlJlc3RSZXNwb25zZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlJlc3RTZXNzaW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuVGVzdEFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5Hc29uOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5yZWZsZWN0LlR5cGVUb2tlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5KU2NoRXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmp1bml0LkJlZm9yZTsKK2ltcG9ydCBvcmcuanVuaXQuVGVzdDsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKKworcHVibGljIGNsYXNzIExpc3RHcm91cHNJVCBleHRlbmRzIEFic3RyYWN0RGFlbW9uVGVzdCB7CisKKyAgQEluamVjdAorICBwcml2YXRlIEFjY291bnRDcmVhdG9yIGFjY291bnRzOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBHcm91cENhY2hlIGdyb3VwQ2FjaGU7CisKKyAgcHJpdmF0ZSBUZXN0QWNjb3VudCBhZG1pbjsKKyAgcHJpdmF0ZSBSZXN0U2Vzc2lvbiBzZXNzaW9uOworCisgIEBCZWZvcmUKKyAgcHVibGljIHZvaWQgc2V0VXAoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICBhZG1pbiA9IGFjY291bnRzLmNyZWF0ZSgiYWRtaW4iLCAiYWRtaW5AZXhhbXBsZS5jb20iLCAiQWRtaW5pc3RyYXRvciIsCisgICAgICAgICAgICAiQWRtaW5pc3RyYXRvcnMiKTsKKyAgICBzZXNzaW9uID0gbmV3IFJlc3RTZXNzaW9uKGFkbWluKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHRlc3RMaXN0QWxsR3JvdXBzKCkgdGhyb3dzIElPRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24geworICAgIEl0ZXJhYmxlPFN0cmluZz4gZXhwZWN0ZWRHcm91cHMgPSBJdGVyYWJsZXMudHJhbnNmb3JtKGdyb3VwQ2FjaGUuYWxsKCksCisgICAgICAgIG5ldyBGdW5jdGlvbjxBY2NvdW50R3JvdXAsIFN0cmluZz4oKSB7CisgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgQE51bGxhYmxlCisgICAgICAgICAgcHVibGljIFN0cmluZyBhcHBseShATnVsbGFibGUgQWNjb3VudEdyb3VwIGdyb3VwKSB7CisgICAgICAgICAgICByZXR1cm4gZ3JvdXAuZ2V0TmFtZSgpOworICAgICAgICAgIH0KKyAgICAgICAgfSk7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLmdldCgiL2dyb3Vwcy8iKTsKKyAgICBNYXA8U3RyaW5nLCBHcm91cEluZm8+IHJlc3VsdCA9CisgICAgICAgIChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPE1hcDxTdHJpbmcsIEdyb3VwSW5mbz4+KCkge30uZ2V0VHlwZSgpKTsKKyAgICBhc3NlcnRHcm91cHMoZXhwZWN0ZWRHcm91cHMsIHJlc3VsdC5rZXlTZXQoKSk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0T25seVZpc2libGVHcm91cHNSZXR1cm5lZCgpIHRocm93cyBPcm1FeGNlcHRpb24sCisgICAgICBKU2NoRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgU2V0PFN0cmluZz4gZXhwZWN0ZWRHcm91cHMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICBleHBlY3RlZEdyb3Vwcy5hZGQoIkFub255bW91cyBVc2VycyIpOworICAgIGV4cGVjdGVkR3JvdXBzLmFkZCgiUmVnaXN0ZXJlZCBVc2VycyIpOworICAgIFRlc3RBY2NvdW50IHVzZXIgPSBhY2NvdW50cy5jcmVhdGUoInVzZXIiLCAidXNlckBleGFtcGxlLmNvbSIsICJVc2VyIik7CisgICAgUmVzdFJlc3BvbnNlIHIgPSAobmV3IFJlc3RTZXNzaW9uKHVzZXIpKS5nZXQoIi9ncm91cHMvIik7CisgICAgTWFwPFN0cmluZywgR3JvdXBJbmZvPiByZXN1bHQgPQorICAgICAgICAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwgbmV3IFR5cGVUb2tlbjxNYXA8U3RyaW5nLCBHcm91cEluZm8+PigpIHt9LmdldFR5cGUoKSk7CisgICAgYXNzZXJ0R3JvdXBzKGV4cGVjdGVkR3JvdXBzLCByZXN1bHQua2V5U2V0KCkpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdEFsbEdyb3VwSW5mb0ZpZWxkc1NldENvcnJlY3RseSgpIHRocm93cyBJT0V4Y2VwdGlvbiwKKyAgICAgIE9ybUV4Y2VwdGlvbiB7CisgICAgQWNjb3VudEdyb3VwIGFkbWluR3JvdXAgPSBncm91cENhY2hlLmdldChuZXcgQWNjb3VudEdyb3VwLk5hbWVLZXkoIkFkbWluaXN0cmF0b3JzIikpOworICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5nZXQoIi9ncm91cHMvP3E9IiArIGFkbWluR3JvdXAuZ2V0TmFtZSgpKTsKKyAgICBNYXA8U3RyaW5nLCBHcm91cEluZm8+IHJlc3VsdCA9CisgICAgICAgIChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPE1hcDxTdHJpbmcsIEdyb3VwSW5mbz4+KCkge30uZ2V0VHlwZSgpKTsKKyAgICBHcm91cEluZm8gYWRtaW5Hcm91cEluZm8gPSByZXN1bHQuZ2V0KGFkbWluR3JvdXAuZ2V0TmFtZSgpKTsKKyAgICBhc3NlcnRHcm91cEluZm8oYWRtaW5Hcm91cCwgYWRtaW5Hcm91cEluZm8pOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9NZW1iZXJzSW5wdXQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L2dyb3VwL01lbWJlcnNJbnB1dC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjExNzc5ZjQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9ncm91cC9NZW1iZXJzSW5wdXQuamF2YQpAQCAtMCwwICsxLDIxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0Lmdyb3VwOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBNZW1iZXJzSW5wdXQgeworICBMaXN0PFN0cmluZz4gbWVtYmVyczsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L3Byb2plY3QvQ3JlYXRlUHJvamVjdElULmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9wcm9qZWN0L0NyZWF0ZVByb2plY3RJVC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjZhZmU4ZTYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9wcm9qZWN0L0NyZWF0ZVByb2plY3RJVC5qYXZhCkBAIC0wLDAgKzEsMjc0IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LnByb2plY3Q7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LnByb2plY3QuUHJvamVjdEFzc2VydC5hc3NlcnRQcm9qZWN0SW5mbzsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LnByb2plY3QuUHJvamVjdEFzc2VydC5hc3NlcnRQcm9qZWN0T3duZXJzOworCitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0RXF1YWxzOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydEZhbHNlOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydE5vdE51bGw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFic3RyYWN0RGFlbW9uVGVzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFjY291bnRDcmVhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFJlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuUmVzdFNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5UZXN0QWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdFN0YXRlOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5Hc29uOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5yZWZsZWN0LlR5cGVUb2tlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5KU2NoRXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmFwYWNoZS5odHRwLkh0dHBTdGF0dXM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmVld2Fsay5UcmVlV2FsazsKK2ltcG9ydCBvcmcuanVuaXQuQmVmb3JlOworaW1wb3J0IG9yZy5qdW5pdC5UZXN0OworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworcHVibGljIGNsYXNzIENyZWF0ZVByb2plY3RJVCBleHRlbmRzIEFic3RyYWN0RGFlbW9uVGVzdCB7CisKKyAgQEluamVjdAorICBwcml2YXRlIEFjY291bnRDcmVhdG9yIGFjY291bnRzOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBHcm91cENhY2hlIGdyb3VwQ2FjaGU7CisKKyAgQEluamVjdAorICBwcml2YXRlIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIGdpdDsKKworICBwcml2YXRlIFRlc3RBY2NvdW50IGFkbWluOworICBwcml2YXRlIFJlc3RTZXNzaW9uIHNlc3Npb247CisKKyAgQEJlZm9yZQorICBwdWJsaWMgdm9pZCBzZXRVcCgpIHRocm93cyBFeGNlcHRpb24geworICAgIGFkbWluID0gYWNjb3VudHMuY3JlYXRlKCJhZG1pbiIsICJhZG1pbkBleGFtcGxlLmNvbSIsICJBZG1pbmlzdHJhdG9yIiwKKyAgICAgICAgICAgICJBZG1pbmlzdHJhdG9ycyIpOworICAgIHNlc3Npb24gPSBuZXcgUmVzdFNlc3Npb24oYWRtaW4pOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdENyZWF0ZVByb2plY3QoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGZpbmFsIFN0cmluZyBuZXdQcm9qZWN0TmFtZSA9ICJuZXdQcm9qZWN0IjsKKyAgICBSZXN0UmVzcG9uc2UgciA9IHNlc3Npb24ucHV0KCIvcHJvamVjdHMvIiArIG5ld1Byb2plY3ROYW1lKTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19DUkVBVEVELCByLmdldFN0YXR1c0NvZGUoKSk7CisgICAgUHJvamVjdEluZm8gcCA9IChuZXcgR3NvbigpKS5mcm9tSnNvbihyLmdldFJlYWRlcigpLCBuZXcgVHlwZVRva2VuPFByb2plY3RJbmZvPigpIHt9LmdldFR5cGUoKSk7CisgICAgYXNzZXJ0RXF1YWxzKG5ld1Byb2plY3ROYW1lLCBwLm5hbWUpOworICAgIFByb2plY3RTdGF0ZSBwcm9qZWN0U3RhdGUgPSBwcm9qZWN0Q2FjaGUuZ2V0KG5ldyBQcm9qZWN0Lk5hbWVLZXkobmV3UHJvamVjdE5hbWUpKTsKKyAgICBhc3NlcnROb3ROdWxsKHByb2plY3RTdGF0ZSk7CisgICAgYXNzZXJ0UHJvamVjdEluZm8ocHJvamVjdFN0YXRlLmdldFByb2plY3QoKSwgcCk7CisgICAgYXNzZXJ0SGVhZChuZXdQcm9qZWN0TmFtZSwgInJlZnMvaGVhZHMvbWFzdGVyIik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0Q3JlYXRlUHJvamVjdFdpdGhOYW1lTWlzbWF0Y2hfQmFkUmVxdWVzdCgpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgUHJvamVjdElucHV0IGluID0gbmV3IFByb2plY3RJbnB1dCgpOworICAgIGluLm5hbWUgPSAib3RoZXJOYW1lIjsKKyAgICBSZXN0UmVzcG9uc2UgciA9IHNlc3Npb24ucHV0KCIvcHJvamVjdHMvc29tZU5hbWUiLCBpbik7CisgICAgYXNzZXJ0RXF1YWxzKEh0dHBTdGF0dXMuU0NfQkFEX1JFUVVFU1QsIHIuZ2V0U3RhdHVzQ29kZSgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHRlc3RDcmVhdGVQcm9qZWN0V2l0aFByb3BlcnRpZXMoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGZpbmFsIFN0cmluZyBuZXdQcm9qZWN0TmFtZSA9ICJuZXdQcm9qZWN0IjsKKyAgICBQcm9qZWN0SW5wdXQgaW4gPSBuZXcgUHJvamVjdElucHV0KCk7CisgICAgaW4uZGVzY3JpcHRpb24gPSAiVGVzdCBkZXNjcmlwdGlvbiI7CisgICAgaW4uc3VibWl0X3R5cGUgPSBTdWJtaXRUeXBlLkNIRVJSWV9QSUNLOworICAgIGluLnVzZV9jb250cmlidXRvcl9hZ3JlZW1lbnRzID0gSW5oZXJpdGFibGVCb29sZWFuLlRSVUU7CisgICAgaW4udXNlX3NpZ25lZF9vZmZfYnkgPSBJbmhlcml0YWJsZUJvb2xlYW4uVFJVRTsKKyAgICBpbi51c2VfY29udGVudF9tZXJnZSA9IEluaGVyaXRhYmxlQm9vbGVhbi5UUlVFOworICAgIGluLnJlcXVpcmVfY2hhbmdlX2lkID0gSW5oZXJpdGFibGVCb29sZWFuLlRSVUU7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLnB1dCgiL3Byb2plY3RzLyIgKyBuZXdQcm9qZWN0TmFtZSwgaW4pOworICAgIFByb2plY3RJbmZvIHAgPSAobmV3IEdzb24oKSkuZnJvbUpzb24oci5nZXRSZWFkZXIoKSwgbmV3IFR5cGVUb2tlbjxQcm9qZWN0SW5mbz4oKSB7fS5nZXRUeXBlKCkpOworICAgIGFzc2VydEVxdWFscyhuZXdQcm9qZWN0TmFtZSwgcC5uYW1lKTsKKyAgICBQcm9qZWN0IHByb2plY3QgPSBwcm9qZWN0Q2FjaGUuZ2V0KG5ldyBQcm9qZWN0Lk5hbWVLZXkobmV3UHJvamVjdE5hbWUpKS5nZXRQcm9qZWN0KCk7CisgICAgYXNzZXJ0UHJvamVjdEluZm8ocHJvamVjdCwgcCk7CisgICAgYXNzZXJ0RXF1YWxzKGluLmRlc2NyaXB0aW9uLCBwcm9qZWN0LmdldERlc2NyaXB0aW9uKCkpOworICAgIGFzc2VydEVxdWFscyhpbi5zdWJtaXRfdHlwZSwgcHJvamVjdC5nZXRTdWJtaXRUeXBlKCkpOworICAgIGFzc2VydEVxdWFscyhpbi51c2VfY29udHJpYnV0b3JfYWdyZWVtZW50cywgcHJvamVjdC5nZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGluLnVzZV9zaWduZWRfb2ZmX2J5LCBwcm9qZWN0LmdldFVzZVNpZ25lZE9mZkJ5KCkpOworICAgIGFzc2VydEVxdWFscyhpbi51c2VfY29udGVudF9tZXJnZSwgcHJvamVjdC5nZXRVc2VDb250ZW50TWVyZ2UoKSk7CisgICAgYXNzZXJ0RXF1YWxzKGluLnJlcXVpcmVfY2hhbmdlX2lkLCBwcm9qZWN0LmdldFJlcXVpcmVDaGFuZ2VJRCgpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHRlc3RDcmVhdGVDaGlsZFByb2plY3QoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGZpbmFsIFN0cmluZyBwYXJlbnROYW1lID0gInBhcmVudCI7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLnB1dCgiL3Byb2plY3RzLyIgKyBwYXJlbnROYW1lKTsKKyAgICByLmNvbnN1bWUoKTsKKyAgICBmaW5hbCBTdHJpbmcgY2hpbGROYW1lID0gImNoaWxkIjsKKyAgICBQcm9qZWN0SW5wdXQgaW4gPSBuZXcgUHJvamVjdElucHV0KCk7CisgICAgaW4ucGFyZW50ID0gcGFyZW50TmFtZTsKKyAgICByID0gc2Vzc2lvbi5wdXQoIi9wcm9qZWN0cy8iICsgY2hpbGROYW1lLCBpbik7CisgICAgUHJvamVjdCBwcm9qZWN0ID0gcHJvamVjdENhY2hlLmdldChuZXcgUHJvamVjdC5OYW1lS2V5KGNoaWxkTmFtZSkpLmdldFByb2plY3QoKTsKKyAgICBhc3NlcnRFcXVhbHMoaW4ucGFyZW50LCBwcm9qZWN0LmdldFBhcmVudE5hbWUoKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCB0ZXN0Q3JlYXRlQ2hpbGRQcm9qZWN0VW5kZXJOb25FeGlzdGluZ1BhcmVudF9VbnByb2Nlc3NhYmxlRW50aXR5KCkKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgUHJvamVjdElucHV0IGluID0gbmV3IFByb2plY3RJbnB1dCgpOworICAgIGluLnBhcmVudCA9ICJub24tZXhpc3RpbmctcHJvamVjdCI7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLnB1dCgiL3Byb2plY3RzL2NoaWxkIiwgaW4pOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX1VOUFJPQ0VTU0FCTEVfRU5USVRZLCByLmdldFN0YXR1c0NvZGUoKSk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0Q3JlYXRlUHJvamVjdFdpdGhPd25lcigpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgZmluYWwgU3RyaW5nIG5ld1Byb2plY3ROYW1lID0gIm5ld1Byb2plY3QiOworICAgIFByb2plY3RJbnB1dCBpbiA9IG5ldyBQcm9qZWN0SW5wdXQoKTsKKyAgICBpbi5vd25lcnMgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoMyk7CisgICAgaW4ub3duZXJzLmFkZCgiQWRtaW5pc3RyYXRvcnMiKTsgLy8gYnkgbmFtZQorICAgIGluLm93bmVycy5hZGQoZ3JvdXBVdWlkKCJSZWdpc3RlcmVkIFVzZXJzIikuZ2V0KCkpOyAvLyBieSBncm91cCBVVUlECisgICAgaW4ub3duZXJzLmFkZChJbnRlZ2VyLnRvU3RyaW5nKGdyb3VwQ2FjaGUuZ2V0KG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleSgiQW5vbnltb3VzIFVzZXJzIikpCisgICAgICAgIC5nZXRJZCgpLmdldCgpKSk7IC8vIGJ5IGxlZ2FjeSBncm91cCBJRAorICAgIHNlc3Npb24ucHV0KCIvcHJvamVjdHMvIiArIG5ld1Byb2plY3ROYW1lLCBpbik7CisgICAgUHJvamVjdFN0YXRlIHByb2plY3RTdGF0ZSA9IHByb2plY3RDYWNoZS5nZXQobmV3IFByb2plY3QuTmFtZUtleShuZXdQcm9qZWN0TmFtZSkpOworICAgIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZXhwZWN0ZWRPd25lcklkcyA9IFNldHMubmV3SGFzaFNldFdpdGhFeHBlY3RlZFNpemUoMyk7CisgICAgZXhwZWN0ZWRPd25lcklkcy5hZGQoZ3JvdXBVdWlkKCJBZG1pbmlzdHJhdG9ycyIpKTsKKyAgICBleHBlY3RlZE93bmVySWRzLmFkZChncm91cFV1aWQoIlJlZ2lzdGVyZWQgVXNlcnMiKSk7CisgICAgZXhwZWN0ZWRPd25lcklkcy5hZGQoZ3JvdXBVdWlkKCJBbm9ueW1vdXMgVXNlcnMiKSk7CisgICAgYXNzZXJ0UHJvamVjdE93bmVycyhleHBlY3RlZE93bmVySWRzLCBwcm9qZWN0U3RhdGUpOworICB9CisKKyAgcHVibGljIHZvaWQgdGVzdENyZWF0ZVByb2plY3RXaXRoTm9uRXhpc3RpbmdPd25lcl9VbnByb2Nlc3NhYmxlRW50aXR5KCkKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgUHJvamVjdElucHV0IGluID0gbmV3IFByb2plY3RJbnB1dCgpOworICAgIGluLm93bmVycyA9IENvbGxlY3Rpb25zLnNpbmdsZXRvbkxpc3QoIm5vbi1leGlzdGluZy1ncm91cCIpOworICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5wdXQoIi9wcm9qZWN0cy9uZXdQcm9qZWN0IiwgaW4pOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX1VOUFJPQ0VTU0FCTEVfRU5USVRZLCByLmdldFN0YXR1c0NvZGUoKSk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0Q3JlYXRlUGVybWlzc2lvbk9ubHlQcm9qZWN0KCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBTdHJpbmcgbmV3UHJvamVjdE5hbWUgPSAibmV3UHJvamVjdCI7CisgICAgUHJvamVjdElucHV0IGluID0gbmV3IFByb2plY3RJbnB1dCgpOworICAgIGluLnBlcm1pc3Npb25zX29ubHkgPSB0cnVlOworICAgIHNlc3Npb24ucHV0KCIvcHJvamVjdHMvIiArIG5ld1Byb2plY3ROYW1lLCBpbik7CisgICAgYXNzZXJ0SGVhZChuZXdQcm9qZWN0TmFtZSwgR2l0UmVwb3NpdG9yeU1hbmFnZXIuUkVGX0NPTkZJRyk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0Q3JlYXRlUHJvamVjdFdpdGhFbXB0eUNvbW1pdCgpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgZmluYWwgU3RyaW5nIG5ld1Byb2plY3ROYW1lID0gIm5ld1Byb2plY3QiOworICAgIFByb2plY3RJbnB1dCBpbiA9IG5ldyBQcm9qZWN0SW5wdXQoKTsKKyAgICBpbi5jcmVhdGVfZW1wdHlfY29tbWl0ID0gdHJ1ZTsKKyAgICBzZXNzaW9uLnB1dCgiL3Byb2plY3RzLyIgKyBuZXdQcm9qZWN0TmFtZSwgaW4pOworICAgIGFzc2VydEVtcHR5Q29tbWl0KG5ld1Byb2plY3ROYW1lLCAicmVmcy9oZWFkcy9tYXN0ZXIiKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHRlc3RDcmVhdGVQcm9qZWN0V2l0aEJyYW5jaGVzKCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBTdHJpbmcgbmV3UHJvamVjdE5hbWUgPSAibmV3UHJvamVjdCI7CisgICAgUHJvamVjdElucHV0IGluID0gbmV3IFByb2plY3RJbnB1dCgpOworICAgIGluLmNyZWF0ZV9lbXB0eV9jb21taXQgPSB0cnVlOworICAgIGluLmJyYW5jaGVzID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KDMpOworICAgIGluLmJyYW5jaGVzLmFkZCgicmVmcy9oZWFkcy90ZXN0Iik7CisgICAgaW4uYnJhbmNoZXMuYWRkKCJyZWZzL2hlYWRzL21hc3RlciIpOworICAgIGluLmJyYW5jaGVzLmFkZCgicmVsZWFzZSIpOyAvLyB3aXRob3V0ICdyZWZzL2hlYWRzJyBwcmVmaXgKKyAgICBzZXNzaW9uLnB1dCgiL3Byb2plY3RzLyIgKyBuZXdQcm9qZWN0TmFtZSwgaW4pOworICAgIGFzc2VydEhlYWQobmV3UHJvamVjdE5hbWUsICJyZWZzL2hlYWRzL3Rlc3QiKTsKKyAgICBhc3NlcnRFbXB0eUNvbW1pdChuZXdQcm9qZWN0TmFtZSwgInJlZnMvaGVhZHMvdGVzdCIsICJyZWZzL2hlYWRzL21hc3RlciIsCisgICAgICAgICJyZWZzL2hlYWRzL3JlbGVhc2UiKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHRlc3RDcmVhdGVQcm9qZWN0V2l0aG91dENhcGFiaWxpdHlfRm9yYmlkZGVuKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiwKKyAgICAgIEpTY2hFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKyAgICBUZXN0QWNjb3VudCB1c2VyID0gYWNjb3VudHMuY3JlYXRlKCJ1c2VyIiwgInVzZXJAZXhhbXBsZS5jb20iLCAiVXNlciIpOworICAgIFJlc3RSZXNwb25zZSByID0gKG5ldyBSZXN0U2Vzc2lvbih1c2VyKSkucHV0KCIvcHJvamVjdHMvbmV3UHJvamVjdCIpOworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX0ZPUkJJRERFTiwgci5nZXRTdGF0dXNDb2RlKCkpOworICB9CisKKyAgQFRlc3QKKyAgcHVibGljIHZvaWQgdGVzdENyZWF0ZVByb2plY3RXaGVuUHJvamVjdEFscmVhZHlFeGlzdHNfQ29uZmxpY3QoKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgSlNjaEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIFJlc3RSZXNwb25zZSByID0gc2Vzc2lvbi5wdXQoIi9wcm9qZWN0cy9BbGwtUHJvamVjdHMiKTsKKyAgICBhc3NlcnRFcXVhbHMoSHR0cFN0YXR1cy5TQ19DT05GTElDVCwgci5nZXRTdGF0dXNDb2RlKCkpOworICB9CisKKyAgcHJpdmF0ZSBBY2NvdW50R3JvdXAuVVVJRCBncm91cFV1aWQoU3RyaW5nIGdyb3VwTmFtZSkgeworICAgIHJldHVybiBncm91cENhY2hlLmdldChuZXcgQWNjb3VudEdyb3VwLk5hbWVLZXkoZ3JvdXBOYW1lKSkuZ2V0R3JvdXBVVUlEKCk7CisgIH0KKworICBwcml2YXRlIHZvaWQgYXNzZXJ0SGVhZChTdHJpbmcgcHJvamVjdE5hbWUsIFN0cmluZyBleHBlY3RlZFJlZikKKyAgICAgIHRocm93cyBSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKyAgICBSZXBvc2l0b3J5IHJlcG8gPSBnaXQub3BlblJlcG9zaXRvcnkobmV3IFByb2plY3QuTmFtZUtleShwcm9qZWN0TmFtZSkpOworICAgIHRyeSB7CisgICAgICBhc3NlcnRFcXVhbHMoZXhwZWN0ZWRSZWYsIHJlcG8uZ2V0UmVmKENvbnN0YW50cy5IRUFEKS5nZXRUYXJnZXQoKQorICAgICAgICAgIC5nZXROYW1lKCkpOworICAgIH0gZmluYWxseSB7CisgICAgICByZXBvLmNsb3NlKCk7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFzc2VydEVtcHR5Q29tbWl0KFN0cmluZyBwcm9qZWN0TmFtZSwgU3RyaW5nLi4uIHJlZnMpCisgICAgICB0aHJvd3MgUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgICAgUmVwb3NpdG9yeSByZXBvID0gZ2l0Lm9wZW5SZXBvc2l0b3J5KG5ldyBQcm9qZWN0Lk5hbWVLZXkocHJvamVjdE5hbWUpKTsKKyAgICBSZXZXYWxrIHJ3ID0gbmV3IFJldldhbGsocmVwbyk7CisgICAgVHJlZVdhbGsgdHcgPSBuZXcgVHJlZVdhbGsocmVwbyk7CisgICAgdHJ5IHsKKyAgICAgIGZvciAoU3RyaW5nIHJlZiA6IHJlZnMpIHsKKyAgICAgICAgUmV2Q29tbWl0IGNvbW1pdCA9IHJ3Lmxvb2t1cENvbW1pdChyZXBvLmdldFJlZihyZWYpLmdldE9iamVjdElkKCkpOworICAgICAgICBydy5wYXJzZUJvZHkoY29tbWl0KTsKKyAgICAgICAgdHcuYWRkVHJlZShjb21taXQuZ2V0VHJlZSgpKTsKKyAgICAgICAgYXNzZXJ0RmFsc2UoInJlZiAiICsgcmVmICsgIiBoYXMgbm9uIGVtcHR5IGNvbW1pdCIsIHR3Lm5leHQoKSk7CisgICAgICAgIHR3LnJlc2V0KCk7CisgICAgICB9CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIHR3LnJlbGVhc2UoKTsKKyAgICAgIHJ3LnJlbGVhc2UoKTsKKyAgICAgIHJlcG8uY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBAU3VwcHJlc3NXYXJuaW5ncygidW51c2VkIikKKyAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgUHJvamVjdElucHV0IHsKKyAgICBTdHJpbmcgbmFtZTsKKyAgICBTdHJpbmcgcGFyZW50OworICAgIFN0cmluZyBkZXNjcmlwdGlvbjsKKyAgICBib29sZWFuIHBlcm1pc3Npb25zX29ubHk7CisgICAgYm9vbGVhbiBjcmVhdGVfZW1wdHlfY29tbWl0OworICAgIFN1Ym1pdFR5cGUgc3VibWl0X3R5cGU7CisgICAgTGlzdDxTdHJpbmc+IGJyYW5jaGVzOworICAgIExpc3Q8U3RyaW5nPiBvd25lcnM7CisgICAgSW5oZXJpdGFibGVCb29sZWFuIHVzZV9jb250cmlidXRvcl9hZ3JlZW1lbnRzOworICAgIEluaGVyaXRhYmxlQm9vbGVhbiB1c2Vfc2lnbmVkX29mZl9ieTsKKyAgICBJbmhlcml0YWJsZUJvb2xlYW4gdXNlX2NvbnRlbnRfbWVyZ2U7CisgICAgSW5oZXJpdGFibGVCb29sZWFuIHJlcXVpcmVfY2hhbmdlX2lkOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9wcm9qZWN0L0dhcmJhZ2VDb2xsZWN0aW9uSVQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L3Byb2plY3QvR2FyYmFnZUNvbGxlY3Rpb25JVC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU1NWM1MmEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9wcm9qZWN0L0dhcmJhZ2VDb2xsZWN0aW9uSVQuamF2YQpAQCAtMCwwICsxLDEwMiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5wcm9qZWN0OworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuZ2l0LkdpdFV0aWwuY3JlYXRlUHJvamVjdDsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRFcXVhbHM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFic3RyYWN0RGFlbW9uVGVzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLkFjY291bnRDcmVhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuR2NBc3NlcnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5SZXN0UmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5SZXN0U2Vzc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlNzaFNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5UZXN0QWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFsbFByb2plY3RzTmFtZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdhcmJhZ2VDb2xsZWN0aW9uUXVldWU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBjb20uamNyYWZ0LmpzY2guSlNjaEV4Y2VwdGlvbjsKKworaW1wb3J0IG9yZy5hcGFjaGUuaHR0cC5IdHRwU3RhdHVzOworaW1wb3J0IG9yZy5qdW5pdC5CZWZvcmU7CitpbXBvcnQgb3JnLmp1bml0LlRlc3Q7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitwdWJsaWMgY2xhc3MgR2FyYmFnZUNvbGxlY3Rpb25JVCBleHRlbmRzIEFic3RyYWN0RGFlbW9uVGVzdCB7CisKKyAgQEluamVjdAorICBwcml2YXRlIEFjY291bnRDcmVhdG9yIGFjY291bnRzOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHM7CisKKyAgQEluamVjdAorICBwcml2YXRlIEdhcmJhZ2VDb2xsZWN0aW9uUXVldWUgZ2NRdWV1ZTsKKworICBASW5qZWN0CisgIHByaXZhdGUgR2NBc3NlcnQgZ2NBc3NlcnQ7CisKKyAgcHJpdmF0ZSBUZXN0QWNjb3VudCBhZG1pbjsKKyAgcHJpdmF0ZSBSZXN0U2Vzc2lvbiBzZXNzaW9uOworICBwcml2YXRlIFByb2plY3QuTmFtZUtleSBwcm9qZWN0MTsKKyAgcHJpdmF0ZSBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdDI7CisKKyAgQEJlZm9yZQorICBwdWJsaWMgdm9pZCBzZXRVcCgpIHRocm93cyBFeGNlcHRpb24geworICAgIGFkbWluID0KKyAgICAgICAgYWNjb3VudHMuY3JlYXRlKCJhZG1pbiIsICJhZG1pbkBleGFtcGxlLmNvbSIsICJBZG1pbmlzdHJhdG9yIiwKKyAgICAgICAgICAgICJBZG1pbmlzdHJhdG9ycyIpOworCisgICAgU3NoU2Vzc2lvbiBzc2hTZXNzaW9uID0gbmV3IFNzaFNlc3Npb24oYWRtaW4pOworCisgICAgcHJvamVjdDEgPSBuZXcgUHJvamVjdC5OYW1lS2V5KCJwMSIpOworICAgIGNyZWF0ZVByb2plY3Qoc3NoU2Vzc2lvbiwgcHJvamVjdDEuZ2V0KCkpOworCisgICAgcHJvamVjdDIgPSBuZXcgUHJvamVjdC5OYW1lS2V5KCJwMiIpOworICAgIGNyZWF0ZVByb2plY3Qoc3NoU2Vzc2lvbiwgcHJvamVjdDIuZ2V0KCkpOworCisgICAgc2Vzc2lvbiA9IG5ldyBSZXN0U2Vzc2lvbihhZG1pbik7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0R2NOb25FeGlzdGluZ1Byb2plY3RfTm90Rm91bmQoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX05PVF9GT1VORCwgUE9TVCgiL3Byb2plY3RzL25vbi1leGlzdGluZy9nYyIpKTsKKyAgfQorCisgIEBUZXN0CisgIHB1YmxpYyB2b2lkIHRlc3RHY05vdEFsbG93ZWRfRm9yYmlkZGVuKCkgdGhyb3dzIElPRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sIEpTY2hFeGNlcHRpb24geworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX0ZPUkJJRERFTiwKKyAgICAgICAgbmV3IFJlc3RTZXNzaW9uKGFjY291bnRzLmNyZWF0ZSgidXNlciIsICJ1c2VyQGV4YW1wbGUuY29tIiwgIlVzZXIiKSkKKyAgICAgICAgICAgIC5wb3N0KCIvcHJvamVjdHMvIiArIGFsbFByb2plY3RzLmdldCgpICsgIi9nYyIpLmdldFN0YXR1c0NvZGUoKSk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0R2NPbmVQcm9qZWN0KCkgdGhyb3dzIEpTY2hFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKworICAgIGFzc2VydEVxdWFscyhIdHRwU3RhdHVzLlNDX09LLCBQT1NUKCIvcHJvamVjdHMvIiArIGFsbFByb2plY3RzLmdldCgpICsgIi9nYyIpKTsKKyAgICBnY0Fzc2VydC5hc3NlcnRIYXNQYWNrRmlsZShhbGxQcm9qZWN0cyk7CisgICAgZ2NBc3NlcnQuYXNzZXJ0SGFzTm9QYWNrRmlsZShwcm9qZWN0MSwgcHJvamVjdDIpOworICB9CisKKyAgcHJpdmF0ZSBpbnQgUE9TVChTdHJpbmcgZW5kUG9pbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgUmVzdFJlc3BvbnNlIHIgPSBzZXNzaW9uLnBvc3QoZW5kUG9pbnQpOworICAgIHIuY29uc3VtZSgpOworICAgIHJldHVybiByLmdldFN0YXR1c0NvZGUoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvcHJvamVjdC9Qcm9qZWN0QXNzZXJ0LmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9wcm9qZWN0L1Byb2plY3RBc3NlcnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yNWNjYmVlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWFjY2VwdGFuY2UtdGVzdHMvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hY2NlcHRhbmNlL3Jlc3QvcHJvamVjdC9Qcm9qZWN0QXNzZXJ0LmphdmEKQEAgLTAsMCArMSw0OSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UucmVzdC5wcm9qZWN0OworCitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0RXF1YWxzOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydFRydWU7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RTdGF0ZTsKKworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK3B1YmxpYyBjbGFzcyBQcm9qZWN0QXNzZXJ0IHsKKworICBwdWJsaWMgc3RhdGljIHZvaWQgYXNzZXJ0UHJvamVjdEluZm8oUHJvamVjdCBwcm9qZWN0LCBQcm9qZWN0SW5mbyBpbmZvKSB7CisgICAgaWYgKGluZm8ubmFtZSAhPSBudWxsKSB7CisgICAgICAvLyAnbmFtZScgaXMgbm90IHNldCBpZiByZXR1cm5lZCBpbiBhIG1hcAorICAgICAgYXNzZXJ0RXF1YWxzKHByb2plY3QuZ2V0TmFtZSgpLCBpbmZvLm5hbWUpOworICAgIH0KKyAgICBhc3NlcnRFcXVhbHMocHJvamVjdC5nZXROYW1lKCksIFVybC5kZWNvZGUoaW5mby5pZCkpOworICAgIFByb2plY3QuTmFtZUtleSBwYXJlbnROYW1lID0gcHJvamVjdC5nZXRQYXJlbnQobmV3IFByb2plY3QuTmFtZUtleSgiQWxsLVByb2plY3RzIikpOworICAgIGFzc2VydEVxdWFscyhwYXJlbnROYW1lICE9IG51bGwgPyBwYXJlbnROYW1lLmdldCgpIDogbnVsbCwgaW5mby5wYXJlbnQpOworICAgIGFzc2VydEVxdWFscyhwcm9qZWN0LmdldERlc2NyaXB0aW9uKCksIFN0cmluZ3MubnVsbFRvRW1wdHkoaW5mby5kZXNjcmlwdGlvbikpOworICB9CisKKyAgcHVibGljIHN0YXRpYyB2b2lkIGFzc2VydFByb2plY3RPd25lcnMoU2V0PEFjY291bnRHcm91cC5VVUlEPiBleHBlY3RlZE93bmVycywKKyAgICAgIFByb2plY3RTdGF0ZSBzdGF0ZSkgeworICAgIGZvciAoQWNjb3VudEdyb3VwLlVVSUQgZyA6IHN0YXRlLmdldE93bmVycygpKSB7CisgICAgICBhc3NlcnRUcnVlKCJ1bmV4cGVjdGVkIG93bmVyIGdyb3VwICIgKyBnLCBleHBlY3RlZE93bmVycy5yZW1vdmUoZykpOworICAgIH0KKyAgICBhc3NlcnRUcnVlKCJtaXNzaW5nIG93bmVyIGdyb3VwczogIiArIGV4cGVjdGVkT3duZXJzLAorICAgICAgICBleHBlY3RlZE93bmVycy5pc0VtcHR5KCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9wcm9qZWN0L1Byb2plY3RJbmZvLmphdmEgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2UvcmVzdC9wcm9qZWN0L1Byb2plY3RJbmZvLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzJkZDJkNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9yZXN0L3Byb2plY3QvUHJvamVjdEluZm8uamF2YQpAQCAtMCwwICsxLDIyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5yZXN0LnByb2plY3Q7CisKK3B1YmxpYyBjbGFzcyBQcm9qZWN0SW5mbyB7CisgIHB1YmxpYyBTdHJpbmcgaWQ7CisgIHB1YmxpYyBTdHJpbmcgbmFtZTsKKyAgcHVibGljIFN0cmluZyBwYXJlbnQ7CisgIHB1YmxpYyBTdHJpbmcgZGVzY3JpcHRpb247Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2Uvc3NoL0dhcmJhZ2VDb2xsZWN0aW9uSVQuamF2YSBiL2dlcnJpdC1hY2NlcHRhbmNlLXRlc3RzL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYWNjZXB0YW5jZS9zc2gvR2FyYmFnZUNvbGxlY3Rpb25JVC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjljMWU3ZDAKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtYWNjZXB0YW5jZS10ZXN0cy9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2FjY2VwdGFuY2Uvc3NoL0dhcmJhZ2VDb2xsZWN0aW9uSVQuamF2YQpAQCAtMCwwICsxLDEzMSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2Uuc3NoOworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuZ2l0LkdpdFV0aWwuY3JlYXRlUHJvamVjdDsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRFcXVhbHM7CitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0RmFsc2U7CitpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0VHJ1ZTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuQWJzdHJhY3REYWVtb25UZXN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmFjY2VwdGFuY2UuQWNjb3VudENyZWF0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5HY0Fzc2VydDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hY2NlcHRhbmNlLlNzaFNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYWNjZXB0YW5jZS5UZXN0QWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HYXJiYWdlQ29sbGVjdGlvblJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFsbFByb2plY3RzTmFtZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdhcmJhZ2VDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2FyYmFnZUNvbGxlY3Rpb25RdWV1ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5KU2NoRXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmp1bml0LkJlZm9yZTsKK2ltcG9ydCBvcmcuanVuaXQuVGVzdDsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuTG9jYWxlOworCitwdWJsaWMgY2xhc3MgR2FyYmFnZUNvbGxlY3Rpb25JVCBleHRlbmRzIEFic3RyYWN0RGFlbW9uVGVzdCB7CisKKyAgQEluamVjdAorICBwcml2YXRlIEFjY291bnRDcmVhdG9yIGFjY291bnRzOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHM7CisKKyAgQEluamVjdAorICBwcml2YXRlIEdhcmJhZ2VDb2xsZWN0aW9uLkZhY3RvcnkgZ2FyYmFnZUNvbGxlY3Rpb25GYWN0b3J5OworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBHYXJiYWdlQ29sbGVjdGlvblF1ZXVlIGdjUXVldWU7CisKKyAgQEluamVjdAorICBwcml2YXRlIEdjQXNzZXJ0IGdjQXNzZXJ0OworCisgIHByaXZhdGUgVGVzdEFjY291bnQgYWRtaW47CisgIHByaXZhdGUgU3NoU2Vzc2lvbiBzc2hTZXNzaW9uOworICBwcml2YXRlIFByb2plY3QuTmFtZUtleSBwcm9qZWN0MTsKKyAgcHJpdmF0ZSBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdDI7CisgIHByaXZhdGUgUHJvamVjdC5OYW1lS2V5IHByb2plY3QzOworCisgIEBCZWZvcmUKKyAgcHVibGljIHZvaWQgc2V0VXAoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICBhZG1pbiA9CisgICAgICAgIGFjY291bnRzLmNyZWF0ZSgiYWRtaW4iLCAiYWRtaW5AZXhhbXBsZS5jb20iLCAiQWRtaW5pc3RyYXRvciIsCisgICAgICAgICAgICAiQWRtaW5pc3RyYXRvcnMiKTsKKworICAgIHNzaFNlc3Npb24gPSBuZXcgU3NoU2Vzc2lvbihhZG1pbik7CisKKyAgICBwcm9qZWN0MSA9IG5ldyBQcm9qZWN0Lk5hbWVLZXkoInAxIik7CisgICAgY3JlYXRlUHJvamVjdChzc2hTZXNzaW9uLCBwcm9qZWN0MS5nZXQoKSk7CisKKyAgICBwcm9qZWN0MiA9IG5ldyBQcm9qZWN0Lk5hbWVLZXkoInAyIik7CisgICAgY3JlYXRlUHJvamVjdChzc2hTZXNzaW9uLCBwcm9qZWN0Mi5nZXQoKSk7CisKKyAgICBwcm9qZWN0MyA9IG5ldyBQcm9qZWN0Lk5hbWVLZXkoInAzIik7CisgICAgY3JlYXRlUHJvamVjdChzc2hTZXNzaW9uLCBwcm9qZWN0My5nZXQoKSk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0R2MoKSB0aHJvd3MgSlNjaEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIFN0cmluZyByZXNwb25zZSA9CisgICAgICAgIHNzaFNlc3Npb24uZXhlYygiZ2Vycml0IGdjIFwiIiArIHByb2plY3QxLmdldCgpICsgIlwiIFwiIgorICAgICAgICAgICAgKyBwcm9qZWN0Mi5nZXQoKSArICJcIiIpOworICAgIGFzc2VydEZhbHNlKHNzaFNlc3Npb24uaGFzRXJyb3IoKSk7CisgICAgYXNzZXJ0Tm9FcnJvcihyZXNwb25zZSk7CisgICAgZ2NBc3NlcnQuYXNzZXJ0SGFzUGFja0ZpbGUocHJvamVjdDEsIHByb2plY3QyKTsKKyAgICBnY0Fzc2VydC5hc3NlcnRIYXNOb1BhY2tGaWxlKGFsbFByb2plY3RzLCBwcm9qZWN0Myk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0R2NBbGwoKSB0aHJvd3MgSlNjaEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIFN0cmluZyByZXNwb25zZSA9IHNzaFNlc3Npb24uZXhlYygiZ2Vycml0IGdjIC0tYWxsIik7CisgICAgYXNzZXJ0RmFsc2Uoc3NoU2Vzc2lvbi5oYXNFcnJvcigpKTsKKyAgICBhc3NlcnROb0Vycm9yKHJlc3BvbnNlKTsKKyAgICBnY0Fzc2VydC5hc3NlcnRIYXNQYWNrRmlsZShhbGxQcm9qZWN0cywgcHJvamVjdDEsIHByb2plY3QyLCBwcm9qZWN0Myk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0R2NXaXRob3V0Q2FwYWJpbGl0eV9FcnJvcigpIHRocm93cyBJT0V4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLAorICAgICAgSlNjaEV4Y2VwdGlvbiB7CisgICAgU3NoU2Vzc2lvbiBzID0gbmV3IFNzaFNlc3Npb24oYWNjb3VudHMuY3JlYXRlKCJ1c2VyIiwgInVzZXJAZXhhbXBsZS5jb20iLCAiVXNlciIpKTsKKyAgICBzLmV4ZWMoImdlcnJpdCBnYyAtLWFsbCIpOworICAgIGFzc2VydEVycm9yKCJmYXRhbDogdXNlciBkb2VzIG5vdCBoYXZlIFwicnVuR0NcIiBjYXBhYmlsaXR5LiIsIHMuZ2V0RXJyb3IoKSk7CisgIH0KKworICBAVGVzdAorICBwdWJsaWMgdm9pZCB0ZXN0R2NBbHJlYWR5U2NoZWR1bGVkKCkgeworICAgIGdjUXVldWUuYWRkQWxsKEFycmF5cy5hc0xpc3QocHJvamVjdDEpKTsKKyAgICBHYXJiYWdlQ29sbGVjdGlvblJlc3VsdCByZXN1bHQgPSBnYXJiYWdlQ29sbGVjdGlvbkZhY3RvcnkuY3JlYXRlKCkucnVuKAorICAgICAgICBBcnJheXMuYXNMaXN0KGFsbFByb2plY3RzLCBwcm9qZWN0MSwgcHJvamVjdDIsIHByb2plY3QzKSk7CisgICAgYXNzZXJ0VHJ1ZShyZXN1bHQuaGFzRXJyb3JzKCkpOworICAgIGFzc2VydEVxdWFscygxLCByZXN1bHQuZ2V0RXJyb3JzKCkuc2l6ZSgpKTsKKyAgICBHYXJiYWdlQ29sbGVjdGlvblJlc3VsdC5FcnJvciBlcnJvciA9IHJlc3VsdC5nZXRFcnJvcnMoKS5nZXQoMCk7CisgICAgYXNzZXJ0RXF1YWxzKEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0LkVycm9yLlR5cGUuR0NfQUxSRUFEWV9TQ0hFRFVMRUQsIGVycm9yLmdldFR5cGUoKSk7CisgICAgYXNzZXJ0RXF1YWxzKHByb2plY3QxLCBlcnJvci5nZXRQcm9qZWN0TmFtZSgpKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBhc3NlcnRFcnJvcihTdHJpbmcgZXhwZWN0ZWRFcnJvciwgU3RyaW5nIHJlc3BvbnNlKSB7CisgICAgYXNzZXJ0VHJ1ZShyZXNwb25zZSwgcmVzcG9uc2UuY29udGFpbnMoZXhwZWN0ZWRFcnJvcikpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFzc2VydE5vRXJyb3IoU3RyaW5nIHJlc3BvbnNlKSB7CisgICAgYXNzZXJ0RmFsc2UocmVzcG9uc2UsIHJlc3BvbnNlLnRvTG93ZXJDYXNlKExvY2FsZS5VUykuY29udGFpbnMoImVycm9yIikpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtYW50bHIvcG9tLnhtbCBiL2dlcnJpdC1hbnRsci9wb20ueG1sCmluZGV4IDM0Y2I0NmYuLjMxNGQ4ZDIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1hbnRsci9wb20ueG1sCisrKyBiL2dlcnJpdC1hbnRsci9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtYW50bHI8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtYW50bHIvc3JjL21haW4vYW50bHIzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9RdWVyeS5nIGIvZ2Vycml0LWFudGxyL3NyYy9tYWluL2FudGxyMy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvUXVlcnkuZwppbmRleCA3NGI3ODUxLi40MjNhY2I0IDEwMDY0NAotLS0gYS9nZXJyaXQtYW50bHIvc3JjL21haW4vYW50bHIzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9RdWVyeS5nCisrKyBiL2dlcnJpdC1hbnRsci9zcmMvbWFpbi9hbnRscjMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L1F1ZXJ5LmcKQEAgLTE1NSw2ICsxNTUsMTAgQEAKICAgICAgIFN0cmluZyBzID0gJHRleHQ7CiAgICAgICBzZXRUZXh0KHMuc3Vic3RyaW5nKDEsIHMubGVuZ3RoKCkgLSAxKSk7CiAgICAgfQorICB8ICd7JyAoIH4oJ3snfCd9JykgKSogJ30nIHsKKyAgICAgIFN0cmluZyBzID0gJHRleHQ7CisgICAgICBzZXRUZXh0KHMuc3Vic3RyaW5nKDEsIHMubGVuZ3RoKCkgLSAxKSk7CisgICAgfQogICA7CiAKIFNJTkdMRV9XT1JECmRpZmYgLS1naXQgYS9nZXJyaXQtY2FjaGUtaDIvcG9tLnhtbCBiL2dlcnJpdC1jYWNoZS1oMi9wb20ueG1sCmluZGV4IDRkNDMwM2MuLjFhMjZiMjEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jYWNoZS1oMi9wb20ueG1sCisrKyBiL2dlcnJpdC1jYWNoZS1oMi9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtY2FjaGUtaDI8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtY2FjaGUtaDIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2FjaGUvaDIvSDJDYWNoZUZhY3RvcnkuamF2YSBiL2dlcnJpdC1jYWNoZS1oMi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jYWNoZS9oMi9IMkNhY2hlRmFjdG9yeS5qYXZhCmluZGV4IDI3ZGEyMGYuLjg1YTA1MWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jYWNoZS1oMi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jYWNoZS9oMi9IMkNhY2hlRmFjdG9yeS5qYXZhCisrKyBiL2dlcnJpdC1jYWNoZS1oMi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jYWNoZS9oMi9IMkNhY2hlRmFjdG9yeS5qYXZhCkBAIC0xNDYsNyArMTQ2LDcgQEAKICAgICB9CiAgIH0KIAotICBAU3VwcHJlc3NXYXJuaW5ncyh7InVuY2hlY2tlZCIsICJyYXd0eXBlcyIsICJjYXN0In0pCisgIEBTdXBwcmVzc1dhcm5pbmdzKHsidW5jaGVja2VkIiwgImNhc3QifSkKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyA8SywgVj4gQ2FjaGU8SywgVj4gYnVpbGQoQ2FjaGVCaW5kaW5nPEssIFY+IGRlZikgewogICAgIFByZWNvbmRpdGlvbnMuY2hlY2tTdGF0ZSghc3RhcnRlZCwgImNhY2hlIG11c3QgYmUgYnVpbHQgYmVmb3JlIHN0YXJ0Iik7CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3BvbS54bWwgYi9nZXJyaXQtY29tbW9uL3BvbS54bWwKaW5kZXggOWIzZmU1Zi4uMWRiMzU0OSAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9wb20ueG1sCisrKyBiL2dlcnJpdC1jb21tb24vcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LWNvbW1vbjwvYXJ0aWZhY3RJZD4KQEAgLTYxLDYgKzYxLDExIEBACiAgICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGF0Y2gtamdpdDwvYXJ0aWZhY3RJZD4KICAgICAgIDx2ZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvdmVyc2lvbj4KICAgICA8L2RlcGVuZGVuY3k+CisKKyAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGUuY29kZS5maW5kYnVnczwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmpzcjMwNTwvYXJ0aWZhY3RJZD4KKyAgICA8L2RlcGVuZGVuY3k+CiAgIDwvZGVwZW5kZW5jaWVzPgogCiAgIDxidWlsZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vUGFnZUxpbmtzLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL1BhZ2VMaW5rcy5qYXZhCmluZGV4IDJiOWI3MmEuLmJlYWIxZDkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vUGFnZUxpbmtzLmphdmEKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9QYWdlTGlua3MuamF2YQpAQCAtMTUsNiArMTUsNyBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb247CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlLlN0YXR1czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CkBAIC0zNyw2ICszOCw4IEBACiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFRPUCA9ICJuLHoiOwogCiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIE1JTkUgPSAiLyI7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFBST0pFQ1RTID0gIi9wcm9qZWN0cy8iOworICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBEQVNIQk9BUkRTID0gIixkYXNoYm9hcmRzLyI7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEFETUlOX0dST1VQUyA9ICIvYWRtaW4vZ3JvdXBzLyI7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEFETUlOX0NSRUFURV9HUk9VUCA9ICIvYWRtaW4vY3JlYXRlLWdyb3VwLyI7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEFETUlOX1BST0pFQ1RTID0gIi9hZG1pbi9wcm9qZWN0cy8iOwpAQCAtNTUsMTggKzU4LDI2IEBACiAgICAgcmV0dXJuICIvYy8iICsgcHMuZ2V0UGFyZW50S2V5KCkgKyAiLyIgKyBwcy5nZXQoKTsKICAgfQogCisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIHRvUHJvamVjdChmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcCkgeworICAgIHJldHVybiBBRE1JTl9QUk9KRUNUUyArIHAuZ2V0KCk7CisgIH0KKwogICBwdWJsaWMgc3RhdGljIFN0cmluZyB0b1Byb2plY3RBY2NlZXNzKGZpbmFsIFByb2plY3QuTmFtZUtleSBwKSB7CiAgICAgcmV0dXJuICIvYWRtaW4vcHJvamVjdHMvIiArIHAuZ2V0KCkgKyAiLGFjY2VzcyI7CiAgIH0KIAotICBwdWJsaWMgc3RhdGljIFN0cmluZyB0b0FjY291bnRRdWVyeShmaW5hbCBTdHJpbmcgZnVsbG5hbWUpIHsKLSAgICByZXR1cm4gdG9BY2NvdW50UXVlcnkoZnVsbG5hbWUsIFN0YXR1cy5ORVcpOwotICB9Ci0KICAgcHVibGljIHN0YXRpYyBTdHJpbmcgdG9BY2NvdW50UXVlcnkoU3RyaW5nIGZ1bGxuYW1lLCBTdGF0dXMgc3RhdHVzKSB7CiAgICAgcmV0dXJuIHRvQ2hhbmdlUXVlcnkob3AoIm93bmVyIiwgZnVsbG5hbWUpICsgIiAiICsgc3RhdHVzKHN0YXR1cyksIFRPUCk7CiAgIH0KIAorICBwdWJsaWMgc3RhdGljIFN0cmluZyB0b0N1c3RvbURhc2hib2FyZChmaW5hbCBTdHJpbmcgcGFyYW1zKSB7CisgICAgcmV0dXJuICIvZGFzaGJvYXJkLz8iICsgcGFyYW1zOworICB9CisKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgdG9Qcm9qZWN0RGFzaGJvYXJkcyhQcm9qZWN0Lk5hbWVLZXkgcHJvaikgeworICAgIHJldHVybiBBRE1JTl9QUk9KRUNUUyArIHByb2ouZ2V0KCkgKyAiLGRhc2hib2FyZHMiOworICB9CisKICAgcHVibGljIHN0YXRpYyBTdHJpbmcgdG9DaGFuZ2VRdWVyeShmaW5hbCBTdHJpbmcgcXVlcnkpIHsKICAgICByZXR1cm4gdG9DaGFuZ2VRdWVyeShxdWVyeSwgVE9QKTsKICAgfQpAQCAtNzUsMTAgKzg2LDIyIEBACiAgICAgcmV0dXJuICIvcS8iICsgS2V5VXRpbC5lbmNvZGUocXVlcnkpICsgIiwiICsgcGFnZTsKICAgfQogCisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIHRvUHJvamVjdERhc2hib2FyZChQcm9qZWN0Lk5hbWVLZXkgbmFtZSwgU3RyaW5nIGlkKSB7CisgICAgcmV0dXJuIFBST0pFQ1RTICsgbmFtZS5nZXQoKSArIERBU0hCT0FSRFMgKyBpZDsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIHByb2plY3RRdWVyeShQcm9qZWN0Lk5hbWVLZXkgcHJvaikgeworICAgIHJldHVybiBvcCgicHJvamVjdCIsIHByb2ouZ2V0KCkpOworICB9CisKICAgcHVibGljIHN0YXRpYyBTdHJpbmcgcHJvamVjdFF1ZXJ5KFByb2plY3QuTmFtZUtleSBwcm9qLCBTdGF0dXMgc3RhdHVzKSB7CiAgICAgICByZXR1cm4gc3RhdHVzKHN0YXR1cykgKyAiICIgKyBvcCgicHJvamVjdCIsIHByb2ouZ2V0KCkpOwogICB9CiAKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgdG9Hcm91cChBY2NvdW50R3JvdXAuVVVJRCB1dWlkKSB7CisgICAgcmV0dXJuIEFETUlOX0dST1VQUyArICJ1dWlkLSIgKyB1dWlkOworICB9CisKICAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIHN0YXR1cyhTdGF0dXMgc3RhdHVzKSB7CiAgICAgc3dpdGNoIChzdGF0dXMpIHsKICAgICAgIGNhc2UgQUJBTkRPTkVEOgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9Qcm9qZWN0QWNjZXNzVXRpbC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9Qcm9qZWN0QWNjZXNzVXRpbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjEyZTQ3YjEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL1Byb2plY3RBY2Nlc3NVdGlsLmphdmEKQEAgLTAsMCArMSw2OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbjsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY2Vzc1NlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLkxpbmtlZEhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitwdWJsaWMgY2xhc3MgUHJvamVjdEFjY2Vzc1V0aWwgeworICBwdWJsaWMgc3RhdGljIExpc3Q8QWNjZXNzU2VjdGlvbj4gbWVyZ2VTZWN0aW9ucyhmaW5hbCBMaXN0PEFjY2Vzc1NlY3Rpb24+IHNyYykgeworICAgIGZpbmFsIE1hcDxTdHJpbmcsIEFjY2Vzc1NlY3Rpb24+IG1hcCA9CisgICAgICAgIG5ldyBMaW5rZWRIYXNoTWFwPFN0cmluZywgQWNjZXNzU2VjdGlvbj4oKTsKKyAgICBmb3IgKGZpbmFsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbiA6IHNyYykgeworICAgICAgaWYgKHNlY3Rpb24uZ2V0UGVybWlzc2lvbnMoKS5pc0VtcHR5KCkpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisKKyAgICAgIGZpbmFsIEFjY2Vzc1NlY3Rpb24gcHJpb3IgPSBtYXAuZ2V0KHNlY3Rpb24uZ2V0TmFtZSgpKTsKKyAgICAgIGlmIChwcmlvciAhPSBudWxsKSB7CisgICAgICAgIHByaW9yLm1lcmdlRnJvbShzZWN0aW9uKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIG1hcC5wdXQoc2VjdGlvbi5nZXROYW1lKCksIHNlY3Rpb24pOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbmV3IEFycmF5TGlzdDxBY2Nlc3NTZWN0aW9uPihtYXAudmFsdWVzKCkpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBMaXN0PEFjY2Vzc1NlY3Rpb24+IHJlbW92ZUVtcHR5UGVybWlzc2lvbnNBbmRTZWN0aW9ucygKKyAgICAgIGZpbmFsIExpc3Q8QWNjZXNzU2VjdGlvbj4gc3JjKSB7CisgICAgZmluYWwgU2V0PEFjY2Vzc1NlY3Rpb24+IHNlY3Rpb25zVG9SZW1vdmUgPSBuZXcgSGFzaFNldDxBY2Nlc3NTZWN0aW9uPigpOworICAgIGZvciAoZmluYWwgQWNjZXNzU2VjdGlvbiBzZWN0aW9uIDogc3JjKSB7CisgICAgICBmaW5hbCBTZXQ8UGVybWlzc2lvbj4gcGVybWlzc2lvbnNUb1JlbW92ZSA9IG5ldyBIYXNoU2V0PFBlcm1pc3Npb24+KCk7CisgICAgICBmb3IgKGZpbmFsIFBlcm1pc3Npb24gcGVybWlzc2lvbiA6IHNlY3Rpb24uZ2V0UGVybWlzc2lvbnMoKSkgeworICAgICAgICBpZiAocGVybWlzc2lvbi5nZXRSdWxlcygpLmlzRW1wdHkoKSkgeworICAgICAgICAgIHBlcm1pc3Npb25zVG9SZW1vdmUuYWRkKHBlcm1pc3Npb24pOworICAgICAgICB9CisgICAgICB9CisgICAgICBmb3IgKGZpbmFsIFBlcm1pc3Npb24gcGVybWlzc2lvblRvUmVtb3ZlIDogcGVybWlzc2lvbnNUb1JlbW92ZSkgeworICAgICAgICBzZWN0aW9uLnJlbW92ZShwZXJtaXNzaW9uVG9SZW1vdmUpOworICAgICAgfQorICAgICAgaWYgKHNlY3Rpb24uZ2V0UGVybWlzc2lvbnMoKS5pc0VtcHR5KCkpIHsKKyAgICAgICAgc2VjdGlvbnNUb1JlbW92ZS5hZGQoc2VjdGlvbik7CisgICAgICB9CisgICAgfQorICAgIGZvciAoZmluYWwgQWNjZXNzU2VjdGlvbiBzZWN0aW9uVG9SZW1vdmUgOiBzZWN0aW9uc1RvUmVtb3ZlKSB7CisgICAgICBzcmMucmVtb3ZlKHNlY3Rpb25Ub1JlbW92ZSk7CisgICAgfQorICAgIHJldHVybiBzcmM7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vUHJvamVjdFV0aWwuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vUHJvamVjdFV0aWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wZmJhNDFlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9Qcm9qZWN0VXRpbC5qYXZhCkBAIC0wLDAgKzEsMzMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb247CisKK3B1YmxpYyBjbGFzcyBQcm9qZWN0VXRpbCB7CisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIHN0cmlwR2l0U3VmZml4KFN0cmluZyBuYW1lKSB7CisgICAgaWYgKG5hbWUuZW5kc1dpdGgoIi5naXQiKSkgeworICAgICAgLy8gQmUgbmljZSBhbmQgZHJvcCB0aGUgdHJhaWxpbmcgIi5naXQiIHN1ZmZpeCwgd2hpY2ggd2UgbmV2ZXIga2VlcAorICAgICAgLy8gaW4gb3VyIGRhdGFiYXNlLCBidXQgY2xpZW50cyBtaWdodCBtaXN0YWtlbmx5IHByb3ZpZGUgYW55d2F5LgorICAgICAgLy8KKyAgICAgIG5hbWUgPSBuYW1lLnN1YnN0cmluZygwLCBuYW1lLmxlbmd0aCgpIC0gNCk7CisgICAgICB3aGlsZSAobmFtZS5lbmRzV2l0aCgiLyIpKSB7CisgICAgICAgIG5hbWUgPSBuYW1lLnN1YnN0cmluZygwLCBuYW1lLmxlbmd0aCgpIC0gMSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBuYW1lOworICB9CisKKyAgcHJpdmF0ZSBQcm9qZWN0VXRpbCgpIHsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9hdXRoL1NpZ25Jbk1vZGUuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vYXV0aC9TaWduSW5Nb2RlLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDg2N2VkNTYuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9hdXRoL1NpZ25Jbk1vZGUuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDE5ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aDsKLQotcHVibGljIGVudW0gU2lnbkluTW9kZSB7Ci0gIFNJR05fSU4sIExJTktfSURFTlRJWSwgUkVHSVNURVI7Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2F1dGgvb3BlbmlkL0Rpc2NvdmVyeVJlc3VsdC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9hdXRoL29wZW5pZC9EaXNjb3ZlcnlSZXN1bHQuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYWVkMjZmYS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2F1dGgvb3BlbmlkL0Rpc2NvdmVyeVJlc3VsdC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNTAgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZDsKLQotaW1wb3J0IGphdmEudXRpbC5NYXA7Ci0KLXB1YmxpYyBmaW5hbCBjbGFzcyBEaXNjb3ZlcnlSZXN1bHQgewotICBwdWJsaWMgc3RhdGljIGVudW0gU3RhdHVzIHsKLSAgICAvKiogUHJvdmlkZXIgd2FzIGRpc2NvdmVyZWQgYW5kIHtAY29kZSBwcm92aWRlclVybH0gaXMgdmFsaWQuICovCi0gICAgVkFMSUQsCi0KLSAgICAvKiogVGhlIGlkZW50aWZpZXIgaXMgbm90IGFsbG93ZWQgdG8gYmUgdXNlZCwgYnkgc2l0ZSBjb25maWd1cmF0aW9uLiAqLwotICAgIE5PVF9BTExPV0VELAotCi0gICAgLyoqIElkZW50aWZpZXIgaXNuJ3QgZm9yIGFuIE9wZW5JRCBwcm92aWRlci4gKi8KLSAgICBOT19QUk9WSURFUiwKLQotICAgIC8qKiBUaGUgcHJvdmlkZXIgd2FzIGRpc2NvdmVyZWQsIGJ1dCBzb21ldGhpbmcgZWxzZSBmYWlsZWQuICovCi0gICAgRVJST1I7Ci0gIH0KLQotICBwdWJsaWMgU3RhdHVzIHN0YXR1czsKLSAgcHVibGljIFN0cmluZyBwcm92aWRlclVybDsKLSAgcHVibGljIE1hcDxTdHJpbmcsIFN0cmluZz4gcHJvdmlkZXJBcmdzOwotCi0gIHByb3RlY3RlZCBEaXNjb3ZlcnlSZXN1bHQoKSB7Ci0gIH0KLQotICBwdWJsaWMgRGlzY292ZXJ5UmVzdWx0KGZpbmFsIFN0cmluZyByZWRpcmVjdCwgZmluYWwgTWFwPFN0cmluZywgU3RyaW5nPiBhcmdzKSB7Ci0gICAgc3RhdHVzID0gU3RhdHVzLlZBTElEOwotICAgIHByb3ZpZGVyVXJsID0gcmVkaXJlY3Q7Ci0gICAgcHJvdmlkZXJBcmdzID0gYXJnczsKLSAgfQotCi0gIHB1YmxpYyBEaXNjb3ZlcnlSZXN1bHQoZmluYWwgU3RhdHVzIHMpIHsKLSAgICBzdGF0dXMgPSBzOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2F1dGgvb3BlbmlkL09wZW5JZFByb3ZpZGVyUGF0dGVybi5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9hdXRoL29wZW5pZC9PcGVuSWRQcm92aWRlclBhdHRlcm4uamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYzgwZDNlYi4uMDAwMDAwMAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2F1dGgvb3BlbmlkL09wZW5JZFByb3ZpZGVyUGF0dGVybi5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNDUgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50RXh0ZXJuYWxJZDsKLQotcHVibGljIGNsYXNzIE9wZW5JZFByb3ZpZGVyUGF0dGVybiB7Ci0gIHB1YmxpYyBzdGF0aWMgT3BlbklkUHJvdmlkZXJQYXR0ZXJuIGNyZWF0ZShTdHJpbmcgcGF0dGVybikgewotICAgIE9wZW5JZFByb3ZpZGVyUGF0dGVybiByID0gbmV3IE9wZW5JZFByb3ZpZGVyUGF0dGVybigpOwotICAgIHIucmVnZXggPSBwYXR0ZXJuLnN0YXJ0c1dpdGgoIl4iKSAmJiBwYXR0ZXJuLmVuZHNXaXRoKCIkIik7Ci0gICAgci5wYXR0ZXJuID0gcGF0dGVybjsKLSAgICByZXR1cm4gcjsKLSAgfQotCi0gIHByb3RlY3RlZCBib29sZWFuIHJlZ2V4OwotICBwcm90ZWN0ZWQgU3RyaW5nIHBhdHRlcm47Ci0KLSAgcHJvdGVjdGVkIE9wZW5JZFByb3ZpZGVyUGF0dGVybigpIHsKLSAgfQotCi0gIHB1YmxpYyBib29sZWFuIG1hdGNoZXMoU3RyaW5nIGlkKSB7Ci0gICAgcmV0dXJuIHJlZ2V4ID8gaWQubWF0Y2hlcyhwYXR0ZXJuKSA6IGlkLnN0YXJ0c1dpdGgocGF0dGVybik7Ci0gIH0KLQotICBwdWJsaWMgYm9vbGVhbiBtYXRjaGVzKEFjY291bnRFeHRlcm5hbElkIGlkKSB7Ci0gICAgcmV0dXJuIG1hdGNoZXMoaWQuZ2V0RXh0ZXJuYWxJZCgpKTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewotICAgIHJldHVybiBwYXR0ZXJuOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2F1dGgvb3BlbmlkL09wZW5JZFNlcnZpY2UuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vYXV0aC9vcGVuaWQvT3BlbklkU2VydmljZS5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwZGViYTM0Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vYXV0aC9vcGVuaWQvT3BlbklkU2VydmljZS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMzAgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLlNpZ25Jbk1vZGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQWxsb3dDcm9zc1NpdGVSZXF1ZXN0OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uUmVtb3RlSnNvblNlcnZpY2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5ScGNJbXBsOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uUnBjSW1wbC5WZXJzaW9uOwotCi1AUnBjSW1wbCh2ZXJzaW9uID0gVmVyc2lvbi5WMl8wKQotcHVibGljIGludGVyZmFjZSBPcGVuSWRTZXJ2aWNlIGV4dGVuZHMgUmVtb3RlSnNvblNlcnZpY2UgewotICBAQWxsb3dDcm9zc1NpdGVSZXF1ZXN0Ci0gIHZvaWQgZGlzY292ZXIoU3RyaW5nIG9wZW5pZElkZW50aWZpZXIsIFNpZ25Jbk1vZGUgbW9kZSwKLSAgICAgIGJvb2xlYW4gcmVtZW1iZXIsIFN0cmluZyByZXR1cm5Ub2tlbiwKLSAgICAgIEFzeW5jQ2FsbGJhY2s8RGlzY292ZXJ5UmVzdWx0PiBjYWxsYmFjayk7Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2F1dGgvdXNlcnBhc3MvTG9naW5SZXN1bHQuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vYXV0aC91c2VycGFzcy9Mb2dpblJlc3VsdC5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlODljZGQyLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vYXV0aC91c2VycGFzcy9Mb2dpblJlc3VsdC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNTMgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLnVzZXJwYXNzOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkF1dGhUeXBlOwotCi1wdWJsaWMgY2xhc3MgTG9naW5SZXN1bHQgewotICBwdWJsaWMgYm9vbGVhbiBzdWNjZXNzOwotICBwdWJsaWMgYm9vbGVhbiBpc05ldzsKLQotICBwcm90ZWN0ZWQgQXV0aFR5cGUgYXV0aFR5cGU7Ci0gIHByb3RlY3RlZCBFcnJvciBlcnJvcjsKLQotICBwcm90ZWN0ZWQgTG9naW5SZXN1bHQoKSB7Ci0gIH0KLQotICBwdWJsaWMgTG9naW5SZXN1bHQoZmluYWwgQXV0aFR5cGUgYXV0aFR5cGUpIHsKLSAgICB0aGlzLmF1dGhUeXBlID0gYXV0aFR5cGU7Ci0gIH0KLQotICBwdWJsaWMgQXV0aFR5cGUgZ2V0QXV0aFR5cGUoKSB7Ci0gICAgcmV0dXJuIGF1dGhUeXBlOwotICB9Ci0KLSAgcHVibGljIHZvaWQgc2V0RXJyb3IoZmluYWwgRXJyb3IgZXJyb3IpIHsKLSAgICB0aGlzLmVycm9yID0gZXJyb3I7Ci0gICAgc3VjY2VzcyA9IGVycm9yID09IG51bGw7Ci0gIH0KLQotICBwdWJsaWMgRXJyb3IgZ2V0RXJyb3IoKSB7Ci0gICAgcmV0dXJuIGVycm9yOwotICB9Ci0KLSAgcHVibGljIHN0YXRpYyBlbnVtIEVycm9yIHsKLSAgICAvKiogVXNlcm5hbWUgb3IgcGFzc3dvcmQgYXJlIGludmFsaWQgKi8KLSAgICBJTlZBTElEX0xPR0lOLAotCi0gICAgLyoqIFRoZSBhdXRoZW50aWNhdGlvbiBzZXJ2ZXIgaXMgdW5hdmFpbGFibGUgb3IgdGhlIHF1ZXJ5IHRvIGl0IHRpbWVkIG91dCAqLwotICAgIEFVVEhFTlRJQ0FUSU9OX1VOQVZBSUxBQkxFCi0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vYXV0aC91c2VycGFzcy9Vc2VyUGFzc0F1dGhTZXJ2aWNlLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2F1dGgvdXNlcnBhc3MvVXNlclBhc3NBdXRoU2VydmljZS5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwOTM2ZDIzLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vYXV0aC91c2VycGFzcy9Vc2VyUGFzc0F1dGhTZXJ2aWNlLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwzMCArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGgudXNlcnBhc3M7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXVkaXQuQXVkaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQWxsb3dDcm9zc1NpdGVSZXF1ZXN0OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uUmVtb3RlSnNvblNlcnZpY2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5ScGNJbXBsOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uUnBjSW1wbC5WZXJzaW9uOwotCi1AUnBjSW1wbCh2ZXJzaW9uID0gVmVyc2lvbi5WMl8wKQotcHVibGljIGludGVyZmFjZSBVc2VyUGFzc0F1dGhTZXJ2aWNlIGV4dGVuZHMgUmVtb3RlSnNvblNlcnZpY2UgewotICBAQXVkaXQoYWN0aW9uID0gInNpZ24gaW4iLCBvYmZ1c2NhdGU9ezF9KQotICBAQWxsb3dDcm9zc1NpdGVSZXF1ZXN0Ci0gIHZvaWQgYXV0aGVudGljYXRlKFN0cmluZyB1c2VybmFtZSwgU3RyaW5nIHBhc3N3b3JkLAotICAgICAgQXN5bmNDYWxsYmFjazxMb2dpblJlc3VsdD4gY2FsbGJhY2spOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9jaGFuZ2VzL0xpc3RDaGFuZ2VzT3B0aW9uLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2NoYW5nZXMvTGlzdENoYW5nZXNPcHRpb24uamF2YQppbmRleCBhNWFiODUxLi4zZDA4ZDA2IDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2NoYW5nZXMvTGlzdENoYW5nZXNPcHRpb24uamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2NoYW5nZXMvTGlzdENoYW5nZXNPcHRpb24uamF2YQpAQCAtMTksNiArMTksNyBAQAogLyoqIE91dHB1dCBvcHRpb25zIGF2YWlsYWJsZSB3aGVuIHVzaW5nIHtAY29kZSAvY2hhbmdlcy99IFJQQ3MuICovCiBwdWJsaWMgZW51bSBMaXN0Q2hhbmdlc09wdGlvbiB7CiAgIExBQkVMUygwKSwKKyAgREVUQUlMRURfTEFCRUxTKDgpLAogCiAgIC8qKiBSZXR1cm4gaW5mb3JtYXRpb24gb24gdGhlIGN1cnJlbnQgcGF0Y2ggc2V0IG9mIHRoZSBjaGFuZ2UuICovCiAgIENVUlJFTlRfUkVWSVNJT04oMSksCkBAIC0zMCw3ICszMSwxMCBAQAogCiAgIC8qKiBJZiBhIHBhdGNoIHNldCBpcyBpbmNsdWRlZCwgaW5jbHVkZSB0aGUgZmlsZXMgb2YgdGhlIHBhdGNoIHNldC4gKi8KICAgQ1VSUkVOVF9GSUxFUyg1KSwKLSAgQUxMX0ZJTEVTKDYpOworICBBTExfRklMRVMoNiksCisKKyAgLyoqIElmIGFjY291bnRzIGFyZSBpbmNsdWRlZCwgaW5jbHVkZSBkZXRhaWxlZCBhY2NvdW50IGluZm8uICovCisgIERFVEFJTEVEX0FDQ09VTlRTKDcpOwogCiAgIHByaXZhdGUgZmluYWwgaW50IHZhbHVlOwogCkBAIC00MiwxMCArNDYsNiBAQAogICAgIHJldHVybiB2YWx1ZTsKICAgfQogCi0gIHB1YmxpYyBzdGF0aWMgTGlzdENoYW5nZXNPcHRpb24gZnJvbVZhbHVlKGludCB2YWx1ZSkgewotICAgIHJldHVybiBMaXN0Q2hhbmdlc09wdGlvbi52YWx1ZXMoKVt2YWx1ZV07Ci0gIH0KLQogICBwdWJsaWMgc3RhdGljIEVudW1TZXQ8TGlzdENoYW5nZXNPcHRpb24+IGZyb21CaXRzKGludCB2KSB7CiAgICAgRW51bVNldDxMaXN0Q2hhbmdlc09wdGlvbj4gciA9IEVudW1TZXQubm9uZU9mKExpc3RDaGFuZ2VzT3B0aW9uLmNsYXNzKTsKICAgICBmb3IgKExpc3RDaGFuZ2VzT3B0aW9uIG8gOiBMaXN0Q2hhbmdlc09wdGlvbi52YWx1ZXMoKSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FjY291bnREYXNoYm9hcmRJbmZvLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQWNjb3VudERhc2hib2FyZEluZm8uamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTI0OTAwYi4uMDAwMDAwMAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQWNjb3VudERhc2hib2FyZEluZm8uamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDcxICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YTsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwotCi1pbXBvcnQgamF2YS51dGlsLkxpc3Q7Ci0KLS8qKiBTdW1tYXJ5IGluZm9ybWF0aW9uIG5lZWRlZCB0byBkaXNwbGF5IGFuIGFjY291bnQgZGFzaGJvYXJkLiAqLwotcHVibGljIGNsYXNzIEFjY291bnREYXNoYm9hcmRJbmZvIHsKLSAgcHJvdGVjdGVkIEFjY291bnRJbmZvQ2FjaGUgYWNjb3VudHM7Ci0gIHByb3RlY3RlZCBBY2NvdW50LklkIG93bmVyOwotICBwcm90ZWN0ZWQgTGlzdDxDaGFuZ2VJbmZvPiBieU93bmVyOwotICBwcm90ZWN0ZWQgTGlzdDxDaGFuZ2VJbmZvPiBmb3JSZXZpZXc7Ci0gIHByb3RlY3RlZCBMaXN0PENoYW5nZUluZm8+IGNsb3NlZDsKLQotICBwcm90ZWN0ZWQgQWNjb3VudERhc2hib2FyZEluZm8oKSB7Ci0gIH0KLQotICBwdWJsaWMgQWNjb3VudERhc2hib2FyZEluZm8oZmluYWwgQWNjb3VudC5JZCBmb3JVc2VyKSB7Ci0gICAgb3duZXIgPSBmb3JVc2VyOwotICB9Ci0KLSAgcHVibGljIEFjY291bnRJbmZvQ2FjaGUgZ2V0QWNjb3VudHMoKSB7Ci0gICAgcmV0dXJuIGFjY291bnRzOwotICB9Ci0KLSAgcHVibGljIHZvaWQgc2V0QWNjb3VudHMoZmluYWwgQWNjb3VudEluZm9DYWNoZSBhYykgewotICAgIGFjY291bnRzID0gYWM7Ci0gIH0KLQotICBwdWJsaWMgQWNjb3VudC5JZCBnZXRPd25lcigpIHsKLSAgICByZXR1cm4gb3duZXI7Ci0gIH0KLQotICBwdWJsaWMgTGlzdDxDaGFuZ2VJbmZvPiBnZXRCeU93bmVyKCkgewotICAgIHJldHVybiBieU93bmVyOwotICB9Ci0KLSAgcHVibGljIHZvaWQgc2V0QnlPd25lcihMaXN0PENoYW5nZUluZm8+IGMpIHsKLSAgICBieU93bmVyID0gYzsKLSAgfQotCi0gIHB1YmxpYyBMaXN0PENoYW5nZUluZm8+IGdldEZvclJldmlldygpIHsKLSAgICByZXR1cm4gZm9yUmV2aWV3OwotICB9Ci0KLSAgcHVibGljIHZvaWQgc2V0Rm9yUmV2aWV3KExpc3Q8Q2hhbmdlSW5mbz4gYykgewotICAgIGZvclJldmlldyA9IGM7Ci0gIH0KLQotICBwdWJsaWMgTGlzdDxDaGFuZ2VJbmZvPiBnZXRDbG9zZWQoKSB7Ci0gICAgcmV0dXJuIGNsb3NlZDsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldENsb3NlZChMaXN0PENoYW5nZUluZm8+IGMpIHsKLSAgICBjbG9zZWQgPSBjOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQWNjb3VudFNlY3VyaXR5LmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQWNjb3VudFNlY3VyaXR5LmphdmEKaW5kZXggYWEyMTJmOS4uYzJkMDNhYiAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FjY291bnRTZWN1cml0eS5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9BY2NvdW50U2VjdXJpdHkuamF2YQpAQCAtMTgsNyArMTgsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLlNpZ25JblJlcXVpcmVkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50RXh0ZXJuYWxJZDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50U3NoS2V5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Db250YWN0SW5mb3JtYXRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwpAQCAtNjEsOSArNjAsNiBAQAogICBAU2lnbkluUmVxdWlyZWQKICAgdm9pZCBteUV4dGVybmFsSWRzKEFzeW5jQ2FsbGJhY2s8TGlzdDxBY2NvdW50RXh0ZXJuYWxJZD4+IGNhbGxiYWNrKTsKIAotICBAU2lnbkluUmVxdWlyZWQKLSAgdm9pZCBteUdyb3VwcyhBc3luY0NhbGxiYWNrPExpc3Q8QWNjb3VudEdyb3VwPj4gY2FsbGJhY2spOwotCiAgIEBBdWRpdAogICBAU2lnbkluUmVxdWlyZWQKICAgdm9pZCBkZWxldGVFeHRlcm5hbElkcyhTZXQ8QWNjb3VudEV4dGVybmFsSWQuS2V5PiBrZXlzLApkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FkZEJyYW5jaFJlc3VsdC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FkZEJyYW5jaFJlc3VsdC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjI0ZTUyN2RjCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FkZEJyYW5jaFJlc3VsdC5qYXZhCkBAIC0wLDAgKzEsOTYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YTsKKworcHVibGljIGNsYXNzIEFkZEJyYW5jaFJlc3VsdCB7CisgIHByb3RlY3RlZCBMaXN0QnJhbmNoZXNSZXN1bHQgbGlzdEJyYW5jaGVzUmVzdWx0OworICBwcm90ZWN0ZWQgRXJyb3IgZXJyb3I7CisKKyAgcHJvdGVjdGVkIEFkZEJyYW5jaFJlc3VsdCgpIHsKKyAgfQorCisgIHB1YmxpYyBBZGRCcmFuY2hSZXN1bHQoZmluYWwgRXJyb3IgZXJyb3IpIHsKKyAgICB0aGlzLmVycm9yID0gZXJyb3I7CisgIH0KKworICBwdWJsaWMgQWRkQnJhbmNoUmVzdWx0KGZpbmFsIExpc3RCcmFuY2hlc1Jlc3VsdCBsaXN0QnJhbmNoZXNSZXN1bHQpIHsKKyAgICB0aGlzLmxpc3RCcmFuY2hlc1Jlc3VsdCA9IGxpc3RCcmFuY2hlc1Jlc3VsdDsKKyAgfQorCisgIHB1YmxpYyBMaXN0QnJhbmNoZXNSZXN1bHQgZ2V0TGlzdEJyYW5jaGVzUmVzdWx0KCkgeworICAgIHJldHVybiBsaXN0QnJhbmNoZXNSZXN1bHQ7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBoYXNFcnJvcigpIHsKKyAgICByZXR1cm4gZXJyb3IgIT0gbnVsbDsKKyAgfQorCisgIHB1YmxpYyBFcnJvciBnZXRFcnJvcigpIHsKKyAgICByZXR1cm4gZXJyb3I7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIEVycm9yIHsKKyAgICBwdWJsaWMgc3RhdGljIGVudW0gVHlwZSB7CisgICAgICAvKiogVGhlIGJyYW5jaCBjYW5ub3QgYmUgY3JlYXRlZCBiZWNhdXNlIHRoZSBnaXZlbiBicmFuY2ggbmFtZSBpcyBpbnZhbGlkLiAqLworICAgICAgSU5WQUxJRF9OQU1FLAorCisgICAgICAvKiogVGhlIGJyYW5jaCBjYW5ub3QgYmUgY3JlYXRlZCBiZWNhdXNlIHRoZSBnaXZlbiByZXZpc2lvbiBpcyBpbnZhbGlkLiAqLworICAgICAgSU5WQUxJRF9SRVZJU0lPTiwKKworICAgICAgLyoqCisgICAgICAgKiBUaGUgYnJhbmNoIGNhbm5vdCBiZSBjcmVhdGVkIHVuZGVyIHRoZSBnaXZlbiByZWZuYW1lIHByZWZpeCAoZS5nCisgICAgICAgKiBicmFuY2hlcyBjYW5ub3QgYmUgY3JlYXRlZCB1bmRlciBtYWdpYyByZWZuYW1lIHByZWZpeGVzKS4KKyAgICAgICAqLworICAgICAgQlJBTkNIX0NSRUFUSU9OX05PVF9BTExPV0VEX1VOREVSX1JFRk5BTUVfUFJFRklYLAorCisgICAgICAvKiogVGhlIGJyYW5jaCB0aGF0IHNob3VsZCBiZSBjcmVhdGVkIGV4aXN0cyBhbHJlYWR5LiAqLworICAgICAgQlJBTkNIX0FMUkVBRFlfRVhJU1RTLAorCisgICAgICAvKioKKyAgICAgICAqIFRoZSBicmFuY2ggY2Fubm90IGJlIGNyZWF0ZWQgYmVjYXVzZSBpdCBjb25mbGljdHMgd2l0aCBhbiBleGlzdGluZworICAgICAgICogYnJhbmNoIChicmFuY2hlcyBjYW5ub3QgYmUgbmVzdGVkKS4KKyAgICAgICAqLworICAgICAgQlJBTkNIX0NSRUFUSU9OX0NPTkZMSUNUCisgICAgfQorCisgICAgcHJvdGVjdGVkIFR5cGUgdHlwZTsKKyAgICBwcm90ZWN0ZWQgU3RyaW5nIHJlZm5hbWU7CisKKyAgICBwcm90ZWN0ZWQgRXJyb3IoKSB7CisgICAgfQorCisgICAgcHVibGljIEVycm9yKGZpbmFsIFR5cGUgdHlwZSkgeworICAgICAgdGhpcyh0eXBlLCBudWxsKTsKKyAgICB9CisKKyAgICBwdWJsaWMgRXJyb3IoZmluYWwgVHlwZSB0eXBlLCBmaW5hbCBTdHJpbmcgcmVmbmFtZSkgeworICAgICAgdGhpcy50eXBlID0gdHlwZTsKKyAgICAgIHRoaXMucmVmbmFtZSA9IHJlZm5hbWU7CisgICAgfQorCisgICAgcHVibGljIFR5cGUgZ2V0VHlwZSgpIHsKKyAgICAgIHJldHVybiB0eXBlOworICAgIH0KKworICAgIHB1YmxpYyBTdHJpbmcgZ2V0UmVmbmFtZSgpIHsKKyAgICAgIHJldHVybiByZWZuYW1lOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisgICAgICByZXR1cm4gdHlwZSArICIgIiArIHJlZm5hbWU7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQXBwcm92YWxEZXRhaWwuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9BcHByb3ZhbERldGFpbC5qYXZhCmluZGV4IDNkNDM4ZjIuLjM2YTk4MTQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9BcHByb3ZhbERldGFpbC5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9BcHByb3ZhbERldGFpbC5qYXZhCkBAIC0xNSwzOCArMTUsNDEgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKIAotaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIHB1YmxpYyBjbGFzcyBBcHByb3ZhbERldGFpbCB7Ci0gIHB1YmxpYyBzdGF0aWMgZmluYWwgQ29tcGFyYXRvcjxBcHByb3ZhbERldGFpbD4gU09SVCA9Ci0gICAgICBuZXcgQ29tcGFyYXRvcjxBcHByb3ZhbERldGFpbD4oKSB7Ci0gICAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShmaW5hbCBBcHByb3ZhbERldGFpbCBvMSwgZmluYWwgQXBwcm92YWxEZXRhaWwgbzIpIHsKLSAgICAgICAgICBpbnQgY21wOwotICAgICAgICAgIGNtcCA9IG8yLmhhc05vblplcm8gLSBvMS5oYXNOb25aZXJvOwotICAgICAgICAgIGlmIChjbXAgIT0gMCkgcmV0dXJuIGNtcDsKLSAgICAgICAgICByZXR1cm4gbzEuc29ydE9yZGVyLmNvbXBhcmVUbyhvMi5zb3J0T3JkZXIpOwotICAgICAgICB9Ci0gICAgICB9OwotCi0gIHN0YXRpYyBmaW5hbCBUaW1lc3RhbXAgRUdfMCA9IG5ldyBUaW1lc3RhbXAoMCk7Ci0gIHN0YXRpYyBmaW5hbCBUaW1lc3RhbXAgRUdfRCA9IG5ldyBUaW1lc3RhbXAoTG9uZy5NQVhfVkFMVUUpOworICBwdWJsaWMgc3RhdGljIExpc3Q8QXBwcm92YWxEZXRhaWw+IHNvcnQoQ29sbGVjdGlvbjxBcHByb3ZhbERldGFpbD4gYWRzLAorICAgICAgZmluYWwgaW50IG93bmVyKSB7CisgICAgTGlzdDxBcHByb3ZhbERldGFpbD4gc29ydGVkID0gbmV3IEFycmF5TGlzdDxBcHByb3ZhbERldGFpbD4oYWRzKTsKKyAgICBDb2xsZWN0aW9ucy5zb3J0KHNvcnRlZCwgbmV3IENvbXBhcmF0b3I8QXBwcm92YWxEZXRhaWw+KCkgeworICAgICAgcHVibGljIGludCBjb21wYXJlKEFwcHJvdmFsRGV0YWlsIG8xLCBBcHByb3ZhbERldGFpbCBvMikgeworICAgICAgICBpbnQgYnlPd25lciA9IChvMi5hY2NvdW50LmdldCgpID09IG93bmVyID8gMSA6IDApCisgICAgICAgICAgICAtIChvMS5hY2NvdW50LmdldCgpID09IG93bmVyID8gMSA6IDApOworICAgICAgICByZXR1cm4gYnlPd25lciAhPSAwID8gYnlPd25lciA6IChvMS5oYXNOb25aZXJvIC0gbzIuaGFzTm9uWmVybyk7CisgICAgICB9CisgICAgfSk7CisgICAgcmV0dXJuIHNvcnRlZDsKKyAgfQogCiAgIHByb3RlY3RlZCBBY2NvdW50LklkIGFjY291bnQ7CiAgIHByb3RlY3RlZCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGFwcHJvdmFsczsKICAgcHJvdGVjdGVkIGJvb2xlYW4gY2FuUmVtb3ZlOworICBwcml2YXRlIFNldDxTdHJpbmc+IHZvdGFibGU7CiAKICAgcHJpdmF0ZSB0cmFuc2llbnQgU2V0PFN0cmluZz4gYXBwcm92ZWQ7CiAgIHByaXZhdGUgdHJhbnNpZW50IFNldDxTdHJpbmc+IHJlamVjdGVkOworICBwcml2YXRlIHRyYW5zaWVudCBNYXA8U3RyaW5nLCBJbnRlZ2VyPiB2YWx1ZXM7CiAgIHByaXZhdGUgdHJhbnNpZW50IGludCBoYXNOb25aZXJvOwotICBwcml2YXRlIHRyYW5zaWVudCBUaW1lc3RhbXAgc29ydE9yZGVyID0gRUdfRDsKIAogICBwcm90ZWN0ZWQgQXBwcm92YWxEZXRhaWwoKSB7CiAgIH0KQEAgLTY4LDQxICs3MSwxMiBAQAogICAgIGNhblJlbW92ZSA9IHJlbW92ZWFibGU7CiAgIH0KIAotICBwdWJsaWMgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBnZXRQYXRjaFNldEFwcHJvdmFscygpIHsKLSAgICByZXR1cm4gYXBwcm92YWxzOwotICB9Ci0KLSAgcHVibGljIFBhdGNoU2V0QXBwcm92YWwgZ2V0UGF0Y2hTZXRBcHByb3ZhbChBcHByb3ZhbENhdGVnb3J5LklkIGNhdGVnb3J5KSB7Ci0gICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIHBzYSA6IGFwcHJvdmFscykgewotICAgICAgaWYgKHBzYS5nZXRDYXRlZ29yeUlkKCkuZXF1YWxzKGNhdGVnb3J5KSkgewotICAgICAgICByZXR1cm4gcHNhOwotICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gbnVsbDsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNvcnRGaXJzdCgpIHsKLSAgICBoYXNOb25aZXJvID0gMTsKLSAgICBzb3J0T3JkZXIgPSBBcHByb3ZhbERldGFpbC5FR18wOwotICB9Ci0KLSAgcHVibGljIHZvaWQgYWRkKGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgY2EpIHsKLSAgICBhcHByb3ZhbHMuYWRkKGNhKTsKLQotICAgIGZpbmFsIFRpbWVzdGFtcCBnID0gY2EuZ2V0R3JhbnRlZCgpOwotICAgIGlmIChnICE9IG51bGwgJiYgZy5jb21wYXJlVG8oc29ydE9yZGVyKSA8IDApIHsKLSAgICAgIHNvcnRPcmRlciA9IGc7Ci0gICAgfQotICAgIGlmIChjYS5nZXRWYWx1ZSgpICE9IDApIHsKLSAgICAgIGhhc05vblplcm8gPSAxOwotICAgIH0KLSAgfQotCiAgIHB1YmxpYyB2b2lkIGFwcHJvdmVkKFN0cmluZyBsYWJlbCkgewogICAgIGlmIChhcHByb3ZlZCA9PSBudWxsKSB7CiAgICAgICBhcHByb3ZlZCA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKICAgICB9CiAgICAgYXBwcm92ZWQuYWRkKGxhYmVsKTsKKyAgICBoYXNOb25aZXJvID0gMTsKICAgfQogCiAgIHB1YmxpYyB2b2lkIHJlamVjdGVkKFN0cmluZyBsYWJlbCkgewpAQCAtMTEwLDYgKzg0LDI0IEBACiAgICAgICByZWplY3RlZCA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKICAgICB9CiAgICAgcmVqZWN0ZWQuYWRkKGxhYmVsKTsKKyAgICBoYXNOb25aZXJvID0gMTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHZvdGFibGUoU3RyaW5nIGxhYmVsKSB7CisgICAgaWYgKHZvdGFibGUgPT0gbnVsbCkgeworICAgICAgdm90YWJsZSA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKKyAgICB9CisgICAgdm90YWJsZS5hZGQobGFiZWwpOworICB9CisKKyAgcHVibGljIHZvaWQgdmFsdWUoU3RyaW5nIGxhYmVsLCBpbnQgdmFsdWUpIHsKKyAgICBpZiAodmFsdWVzID09IG51bGwpIHsKKyAgICAgIHZhbHVlcyA9IG5ldyBIYXNoTWFwPFN0cmluZywgSW50ZWdlcj4oKTsKKyAgICB9CisgICAgdmFsdWVzLnB1dChsYWJlbCwgdmFsdWUpOworICAgIGlmICh2YWx1ZSAhPSAwKSB7CisgICAgICBoYXNOb25aZXJvID0gMTsKKyAgICB9CiAgIH0KIAogICBwdWJsaWMgYm9vbGVhbiBpc0FwcHJvdmVkKFN0cmluZyBsYWJlbCkgewpAQCAtMTE5LDQgKzExMSwxNiBAQAogICBwdWJsaWMgYm9vbGVhbiBpc1JlamVjdGVkKFN0cmluZyBsYWJlbCkgewogICAgIHJldHVybiByZWplY3RlZCAhPSBudWxsICYmIHJlamVjdGVkLmNvbnRhaW5zKGxhYmVsKTsKICAgfQorCisgIHB1YmxpYyBib29sZWFuIGNhblZvdGUoU3RyaW5nIGxhYmVsKSB7CisgICAgcmV0dXJuIHZvdGFibGUgIT0gbnVsbCAmJiB2b3RhYmxlLmNvbnRhaW5zKGxhYmVsKTsKKyAgfQorCisgIHB1YmxpYyBpbnQgZ2V0VmFsdWUoU3RyaW5nIGxhYmVsKSB7CisgICAgaWYgKHZhbHVlcyA9PSBudWxsKSB7CisgICAgICByZXR1cm4gMDsKKyAgICB9CisgICAgSW50ZWdlciB2ID0gdmFsdWVzLmdldChsYWJlbCk7CisgICAgcmV0dXJuIHYgIT0gbnVsbCA/IHYgOiAwOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQXBwcm92YWxTdW1tYXJ5LmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQXBwcm92YWxTdW1tYXJ5LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDE5YzlkNjcuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FwcHJvdmFsU3VtbWFyeS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNDQgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFwcHJvdmFsQ2F0ZWdvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7Ci0KLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7Ci1pbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7Ci1pbXBvcnQgamF2YS51dGlsLk1hcDsKLQotLyoqIFN1bW1hcml6ZXMgdGhlIGFwcHJvdmFscyAob3IgbmVnYXRpdmUgYXBwcm92YWxzKSBmb3IgYSBwYXRjaCBzZXQuCi0gKiBUaGlzIHdpbGwgdHlwaWNhbGx5IGNvbnRhaW4gemVybyBvciBvbmUgYXBwcm92YWxzIGZvciBlYWNoCi0gKiBjYXRlZ29yeSwgd2l0aCBhbGwgb2YgdGhlIGFwcHJvdmFscyBjb21pbmcgZnJvbSBhIHNpbmdsZSBwYXRjaCBzZXQuCi0gKi8KLXB1YmxpYyBjbGFzcyBBcHByb3ZhbFN1bW1hcnkgewotICBwcm90ZWN0ZWQgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIFBhdGNoU2V0QXBwcm92YWw+IGFwcHJvdmFsczsKLQotICBwcm90ZWN0ZWQgQXBwcm92YWxTdW1tYXJ5KCkgewotICB9Ci0KLSAgcHVibGljIEFwcHJvdmFsU3VtbWFyeShmaW5hbCBJdGVyYWJsZTxQYXRjaFNldEFwcHJvdmFsPiBsaXN0KSB7Ci0gICAgYXBwcm92YWxzID0gbmV3IEhhc2hNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4oKTsKLSAgICBmb3IgKGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgYSA6IGxpc3QpIHsKLSAgICAgIGFwcHJvdmFscy5wdXQoYS5nZXRDYXRlZ29yeUlkKCksIGEpOwotICAgIH0KLSAgfQotCi0gIHB1YmxpYyBNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4gZ2V0QXBwcm92YWxNYXAoKSB7Ci0gICAgcmV0dXJuIENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZU1hcChhcHByb3ZhbHMpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQXBwcm92YWxTdW1tYXJ5U2V0LmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQXBwcm92YWxTdW1tYXJ5U2V0LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDJiMTEwODUuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FwcHJvdmFsU3VtbWFyeVNldC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNDkgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLQotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKLWltcG9ydCBqYXZhLnV0aWwuTWFwOwotCi0vKiogQ29udGFpbnMgYSBzZXQgb2YgQXBwcm92YWxTdW1tYXJ5IG9iamVjdHMsIGtleWVkIGJ5IHRoZSBjaGFuZ2UgaWQKLSAqIGZyb20gd2hpY2ggdGhleSB3ZXJlIGRlcml2ZWQuCi0gKi8KLXB1YmxpYyBjbGFzcyBBcHByb3ZhbFN1bW1hcnlTZXQgewotICBwcm90ZWN0ZWQgQWNjb3VudEluZm9DYWNoZSBhY2NvdW50czsKLQotICBwcm90ZWN0ZWQgTWFwPENoYW5nZS5JZCwgQXBwcm92YWxTdW1tYXJ5PiBzdW1tYXJpZXM7Ci0KLSAgcHJvdGVjdGVkIEFwcHJvdmFsU3VtbWFyeVNldCgpIHsKLSAgfQotCi0gIHB1YmxpYyBBcHByb3ZhbFN1bW1hcnlTZXQoZmluYWwgQWNjb3VudEluZm9DYWNoZSBhY2N0cywKLSAgICAgIGZpbmFsIE1hcDxDaGFuZ2UuSWQsIEFwcHJvdmFsU3VtbWFyeT4gbWFwKSB7Ci0gICAgYWNjb3VudHMgPSBhY2N0czsKLQotICAgIHN1bW1hcmllcyA9IG5ldyBIYXNoTWFwPENoYW5nZS5JZCwgQXBwcm92YWxTdW1tYXJ5PigpOwotICAgIHN1bW1hcmllcy5wdXRBbGwobWFwKTsKLSAgfQotCi0gIHB1YmxpYyBBY2NvdW50SW5mb0NhY2hlIGdldEFjY291bnRJbmZvQ2FjaGUoKSB7Ci0gICAgcmV0dXJuIGFjY291bnRzOwotICB9Ci0KLSAgcHVibGljIE1hcDxDaGFuZ2UuSWQsIEFwcHJvdmFsU3VtbWFyeT4gZ2V0U3VtbWFyeU1hcCgpIHsKLSAgICByZXR1cm4gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlTWFwKHN1bW1hcmllcyk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9BcHByb3ZhbFR5cGUuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9BcHByb3ZhbFR5cGUuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMzMzYjkxYy4uMDAwMDAwMAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQXBwcm92YWxUeXBlLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwxMjYgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA4IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFwcHJvdmFsQ2F0ZWdvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKLQotaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOwotaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotaW1wb3J0IGphdmEudXRpbC5NYXA7Ci0KLXB1YmxpYyBjbGFzcyBBcHByb3ZhbFR5cGUgewotICBwcm90ZWN0ZWQgQXBwcm92YWxDYXRlZ29yeSBjYXRlZ29yeTsKLSAgcHJvdGVjdGVkIExpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPiB2YWx1ZXM7Ci0gIHByb3RlY3RlZCBzaG9ydCBtYXhOZWdhdGl2ZTsKLSAgcHJvdGVjdGVkIHNob3J0IG1heFBvc2l0aXZlOwotCi0gIHByaXZhdGUgdHJhbnNpZW50IExpc3Q8SW50ZWdlcj4gaW50TGlzdDsKLSAgcHJpdmF0ZSB0cmFuc2llbnQgTWFwPFNob3J0LCBBcHByb3ZhbENhdGVnb3J5VmFsdWU+IGJ5VmFsdWU7Ci0KLSAgcHJvdGVjdGVkIEFwcHJvdmFsVHlwZSgpIHsKLSAgfQotCi0gIHB1YmxpYyBBcHByb3ZhbFR5cGUoZmluYWwgQXBwcm92YWxDYXRlZ29yeSBhYywKLSAgICAgIGZpbmFsIExpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPiB2YWx1ZUxpc3QpIHsKLSAgICBjYXRlZ29yeSA9IGFjOwotICAgIHZhbHVlcyA9IG5ldyBBcnJheUxpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPih2YWx1ZUxpc3QpOwotICAgIENvbGxlY3Rpb25zLnNvcnQodmFsdWVzLCBuZXcgQ29tcGFyYXRvcjxBcHByb3ZhbENhdGVnb3J5VmFsdWU+KCkgewotICAgICAgcHVibGljIGludCBjb21wYXJlKEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSBvMSwgQXBwcm92YWxDYXRlZ29yeVZhbHVlIG8yKSB7Ci0gICAgICAgIHJldHVybiBvMS5nZXRWYWx1ZSgpIC0gbzIuZ2V0VmFsdWUoKTsKLSAgICAgIH0KLSAgICB9KTsKLQotICAgIG1heE5lZ2F0aXZlID0gU2hvcnQuTUlOX1ZBTFVFOwotICAgIG1heFBvc2l0aXZlID0gU2hvcnQuTUFYX1ZBTFVFOwotICAgIGlmICh2YWx1ZXMuc2l6ZSgpID4gMCkgewotICAgICAgaWYgKHZhbHVlcy5nZXQoMCkuZ2V0VmFsdWUoKSA8IDApIHsKLSAgICAgICAgbWF4TmVnYXRpdmUgPSB2YWx1ZXMuZ2V0KDApLmdldFZhbHVlKCk7Ci0gICAgICB9Ci0gICAgICBpZiAodmFsdWVzLmdldCh2YWx1ZXMuc2l6ZSgpIC0gMSkuZ2V0VmFsdWUoKSA+IDApIHsKLSAgICAgICAgbWF4UG9zaXRpdmUgPSB2YWx1ZXMuZ2V0KHZhbHVlcy5zaXplKCkgLSAxKS5nZXRWYWx1ZSgpOwotICAgICAgfQotICAgIH0KLQotICAgIC8vIEZvcmNlIHRoZSBsYWJlbCBuYW1lIHRvIHByZS1jb21wdXRlIHNvIHdlIGRvbid0IGhhdmUgZGF0YSByYWNlIGNvbmRpdGlvbnMuCi0gICAgZ2V0Q2F0ZWdvcnkoKS5nZXRMYWJlbE5hbWUoKTsKLSAgfQotCi0gIHB1YmxpYyBBcHByb3ZhbENhdGVnb3J5IGdldENhdGVnb3J5KCkgewotICAgIHJldHVybiBjYXRlZ29yeTsKLSAgfQotCi0gIHB1YmxpYyBMaXN0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZT4gZ2V0VmFsdWVzKCkgewotICAgIHJldHVybiB2YWx1ZXM7Ci0gIH0KLQotICBwdWJsaWMgQXBwcm92YWxDYXRlZ29yeVZhbHVlIGdldE1pbigpIHsKLSAgICBpZiAodmFsdWVzLmlzRW1wdHkoKSkgewotICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfQotICAgIHJldHVybiB2YWx1ZXMuZ2V0KDApOwotICB9Ci0KLSAgcHVibGljIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSBnZXRNYXgoKSB7Ci0gICAgaWYgKHZhbHVlcy5pc0VtcHR5KCkpIHsKLSAgICAgIHJldHVybiBudWxsOwotICAgIH0KLSAgICBmaW5hbCBBcHByb3ZhbENhdGVnb3J5VmFsdWUgdiA9IHZhbHVlcy5nZXQodmFsdWVzLnNpemUoKSAtIDEpOwotICAgIHJldHVybiB2LmdldFZhbHVlKCkgPiAwID8gdiA6IG51bGw7Ci0gIH0KLQotICBwdWJsaWMgYm9vbGVhbiBpc01heE5lZ2F0aXZlKGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgY2EpIHsKLSAgICByZXR1cm4gbWF4TmVnYXRpdmUgPT0gY2EuZ2V0VmFsdWUoKTsKLSAgfQotCi0gIHB1YmxpYyBib29sZWFuIGlzTWF4UG9zaXRpdmUoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBjYSkgewotICAgIHJldHVybiBtYXhQb3NpdGl2ZSA9PSBjYS5nZXRWYWx1ZSgpOwotICB9Ci0KLSAgcHVibGljIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSBnZXRWYWx1ZShmaW5hbCBzaG9ydCB2YWx1ZSkgewotICAgIGluaXRCeVZhbHVlKCk7Ci0gICAgcmV0dXJuIGJ5VmFsdWUuZ2V0KHZhbHVlKTsKLSAgfQotCi0gIHB1YmxpYyBBcHByb3ZhbENhdGVnb3J5VmFsdWUgZ2V0VmFsdWUoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBjYSkgewotICAgIGluaXRCeVZhbHVlKCk7Ci0gICAgcmV0dXJuIGJ5VmFsdWUuZ2V0KGNhLmdldFZhbHVlKCkpOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIGluaXRCeVZhbHVlKCkgewotICAgIGlmIChieVZhbHVlID09IG51bGwpIHsKLSAgICAgIGJ5VmFsdWUgPSBuZXcgSGFzaE1hcDxTaG9ydCwgQXBwcm92YWxDYXRlZ29yeVZhbHVlPigpOwotICAgICAgZm9yIChmaW5hbCBBcHByb3ZhbENhdGVnb3J5VmFsdWUgYWN2IDogdmFsdWVzKSB7Ci0gICAgICAgIGJ5VmFsdWUucHV0KGFjdi5nZXRWYWx1ZSgpLCBhY3YpOwotICAgICAgfQotICAgIH0KLSAgfQotCi0gIHB1YmxpYyBMaXN0PEludGVnZXI+IGdldFZhbHVlc0FzTGlzdCgpIHsKLSAgICBpZiAoaW50TGlzdCA9PSBudWxsKSB7Ci0gICAgICBpbnRMaXN0ID0gbmV3IEFycmF5TGlzdDxJbnRlZ2VyPih2YWx1ZXMuc2l6ZSgpKTsKLSAgICAgIGZvciAoQXBwcm92YWxDYXRlZ29yeVZhbHVlIGFjdiA6IHZhbHVlcykgewotICAgICAgICBpbnRMaXN0LmFkZChJbnRlZ2VyLnZhbHVlT2YoYWN2LmdldFZhbHVlKCkpKTsKLSAgICAgIH0KLSAgICAgIENvbGxlY3Rpb25zLnNvcnQoaW50TGlzdCk7Ci0gICAgICBDb2xsZWN0aW9ucy5yZXZlcnNlKGludExpc3QpOwotICAgIH0KLSAgICByZXR1cm4gaW50TGlzdDsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FwcHJvdmFsVHlwZXMuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9BcHByb3ZhbFR5cGVzLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGIxZTMyZDEuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0FwcHJvdmFsVHlwZXMuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDcxICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YTsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotCi1pbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7Ci1pbXBvcnQgamF2YS51dGlsLkxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLk1hcDsKLQotcHVibGljIGNsYXNzIEFwcHJvdmFsVHlwZXMgewotICBwcm90ZWN0ZWQgTGlzdDxBcHByb3ZhbFR5cGU+IGFwcHJvdmFsVHlwZXM7Ci0gIHByaXZhdGUgdHJhbnNpZW50IE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBBcHByb3ZhbFR5cGU+IGJ5SWQ7Ci0gIHByaXZhdGUgdHJhbnNpZW50IE1hcDxTdHJpbmcsIEFwcHJvdmFsVHlwZT4gYnlMYWJlbDsKLQotICBwcm90ZWN0ZWQgQXBwcm92YWxUeXBlcygpIHsKLSAgfQotCi0gIHB1YmxpYyBBcHByb3ZhbFR5cGVzKGZpbmFsIExpc3Q8QXBwcm92YWxUeXBlPiBhcHByb3ZhbHMpIHsKLSAgICBhcHByb3ZhbFR5cGVzID0gYXBwcm92YWxzOwotICAgIGJ5Q2F0ZWdvcnkoKTsKLSAgfQotCi0gIHB1YmxpYyBMaXN0PEFwcHJvdmFsVHlwZT4gZ2V0QXBwcm92YWxUeXBlcygpIHsKLSAgICByZXR1cm4gYXBwcm92YWxUeXBlczsKLSAgfQotCi0gIHB1YmxpYyBBcHByb3ZhbFR5cGUgYnlJZChmaW5hbCBBcHByb3ZhbENhdGVnb3J5LklkIGlkKSB7Ci0gICAgcmV0dXJuIGJ5Q2F0ZWdvcnkoKS5nZXQoaWQpOwotICB9Ci0KLSAgcHJpdmF0ZSBNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgQXBwcm92YWxUeXBlPiBieUNhdGVnb3J5KCkgewotICAgIGlmIChieUlkID09IG51bGwpIHsKLSAgICAgIGJ5SWQgPSBuZXcgSGFzaE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBBcHByb3ZhbFR5cGU+KCk7Ci0gICAgICBpZiAoYXBwcm92YWxUeXBlcyAhPSBudWxsKSB7Ci0gICAgICAgIGZvciAoZmluYWwgQXBwcm92YWxUeXBlIHQgOiBhcHByb3ZhbFR5cGVzKSB7Ci0gICAgICAgICAgYnlJZC5wdXQodC5nZXRDYXRlZ29yeSgpLmdldElkKCksIHQpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBieUlkOwotICB9Ci0KLSAgcHVibGljIEFwcHJvdmFsVHlwZSBieUxhYmVsKFN0cmluZyBsYWJlbE5hbWUpIHsKLSAgICByZXR1cm4gYnlMYWJlbCgpLmdldChsYWJlbE5hbWUudG9Mb3dlckNhc2UoKSk7Ci0gIH0KLQotICBwcml2YXRlIE1hcDxTdHJpbmcsIEFwcHJvdmFsVHlwZT4gYnlMYWJlbCgpIHsKLSAgICBpZiAoYnlMYWJlbCA9PSBudWxsKSB7Ci0gICAgICBieUxhYmVsID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBBcHByb3ZhbFR5cGU+KCk7Ci0gICAgICBpZiAoYXBwcm92YWxUeXBlcyAhPSBudWxsKSB7Ci0gICAgICAgIGZvciAoQXBwcm92YWxUeXBlIHQgOiBhcHByb3ZhbFR5cGVzKSB7Ci0gICAgICAgICAgYnlMYWJlbC5wdXQodC5nZXRDYXRlZ29yeSgpLmdldExhYmVsTmFtZSgpLnRvTG93ZXJDYXNlKCksIHQpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBieUxhYmVsOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQ2hhbmdlRGV0YWlsLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQ2hhbmdlRGV0YWlsLmphdmEKaW5kZXggNzRkMTk2Mi4uN2FjMjFkYiAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0NoYW5nZURldGFpbC5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9DaGFuZ2VEZXRhaWwuamF2YQpAQCAtMTcsMTAgKzE3LDggQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2VNZXNzYWdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIAotaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247Ci1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogCiAvKiogRGV0YWlsIG5lY2Vzc2FyeSB0byBkaXNwbGF5IGEgY2hhbmdlLiAqLwpAQCAtMjgsNiArMjYsNyBAQAogICBwcm90ZWN0ZWQgQWNjb3VudEluZm9DYWNoZSBhY2NvdW50czsKICAgcHJvdGVjdGVkIGJvb2xlYW4gYWxsb3dzQW5vbnltb3VzOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5BYmFuZG9uOworICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5FZGl0Q29tbWl0TWVzc2FnZTsKICAgcHJvdGVjdGVkIGJvb2xlYW4gY2FuUHVibGlzaDsKICAgcHJvdGVjdGVkIGJvb2xlYW4gY2FuUmViYXNlOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5SZXN0b3JlOwpAQCAtMzgsMTMgKzM3LDE1IEBACiAgIHByb3RlY3RlZCBMaXN0PENoYW5nZUluZm8+IGRlcGVuZHNPbjsKICAgcHJvdGVjdGVkIExpc3Q8Q2hhbmdlSW5mbz4gbmVlZGVkQnk7CiAgIHByb3RlY3RlZCBMaXN0PFBhdGNoU2V0PiBwYXRjaFNldHM7Ci0gIHByb3RlY3RlZCBMaXN0PEFwcHJvdmFsRGV0YWlsPiBhcHByb3ZhbHM7CiAgIHByb3RlY3RlZCBMaXN0PFN1Ym1pdFJlY29yZD4gc3VibWl0UmVjb3JkczsKKyAgcHJvdGVjdGVkIFByb2plY3QuU3VibWl0VHlwZSBzdWJtaXRUeXBlOworICBwcm90ZWN0ZWQgU3VibWl0VHlwZVJlY29yZCBzdWJtaXRUeXBlUmVjb3JkOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5TdWJtaXQ7CiAgIHByb3RlY3RlZCBMaXN0PENoYW5nZU1lc3NhZ2U+IG1lc3NhZ2VzOwogICBwcm90ZWN0ZWQgUGF0Y2hTZXQuSWQgY3VycmVudFBhdGNoU2V0SWQ7CiAgIHByb3RlY3RlZCBQYXRjaFNldERldGFpbCBjdXJyZW50RGV0YWlsOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5FZGl0OworICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5FZGl0VG9waWNOYW1lOwogCiAgIHB1YmxpYyBDaGFuZ2VEZXRhaWwoKSB7CiAgIH0KQEAgLTczLDYgKzc0LDE0IEBACiAgICAgY2FuQWJhbmRvbiA9IGE7CiAgIH0KIAorICBwdWJsaWMgYm9vbGVhbiBjYW5FZGl0Q29tbWl0TWVzc2FnZSgpIHsKKyAgICByZXR1cm4gY2FuRWRpdENvbW1pdE1lc3NhZ2U7CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRDYW5FZGl0Q29tbWl0TWVzc2FnZShmaW5hbCBib29sZWFuIGEpIHsKKyAgICBjYW5FZGl0Q29tbWl0TWVzc2FnZSA9IGE7CisgIH0KKwogICBwdWJsaWMgYm9vbGVhbiBjYW5QdWJsaXNoKCkgewogICAgIHJldHVybiBjYW5QdWJsaXNoOwogICB9CkBAIC0xMjEsNiArMTMwLDE0IEBACiAgICAgY2FuRGVsZXRlRHJhZnQgPSBhOwogICB9CiAKKyAgcHVibGljIGJvb2xlYW4gY2FuRWRpdFRvcGljTmFtZSgpIHsKKyAgICByZXR1cm4gY2FuRWRpdFRvcGljTmFtZTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldENhbkVkaXRUb3BpY05hbWUoYm9vbGVhbiBhKSB7CisgICAgY2FuRWRpdFRvcGljTmFtZSA9IGE7CisgIH0KKwogICBwdWJsaWMgQ2hhbmdlIGdldENoYW5nZSgpIHsKICAgICByZXR1cm4gY2hhbmdlOwogICB9CkBAIC0xNzAsMTUgKzE4Nyw2IEBACiAgICAgcGF0Y2hTZXRzID0gczsKICAgfQogCi0gIHB1YmxpYyBMaXN0PEFwcHJvdmFsRGV0YWlsPiBnZXRBcHByb3ZhbHMoKSB7Ci0gICAgcmV0dXJuIGFwcHJvdmFsczsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldEFwcHJvdmFscyhDb2xsZWN0aW9uPEFwcHJvdmFsRGV0YWlsPiBsaXN0KSB7Ci0gICAgYXBwcm92YWxzID0gbmV3IEFycmF5TGlzdDxBcHByb3ZhbERldGFpbD4obGlzdCk7Ci0gICAgQ29sbGVjdGlvbnMuc29ydChhcHByb3ZhbHMsIEFwcHJvdmFsRGV0YWlsLlNPUlQpOwotICB9Ci0KICAgcHVibGljIHZvaWQgc2V0U3VibWl0UmVjb3JkcyhMaXN0PFN1Ym1pdFJlY29yZD4gYWxsKSB7CiAgICAgc3VibWl0UmVjb3JkcyA9IGFsbDsKICAgfQpAQCAtMTg3LDYgKzE5NSwxNCBAQAogICAgIHJldHVybiBzdWJtaXRSZWNvcmRzOwogICB9CiAKKyAgcHVibGljIHZvaWQgc2V0U3VibWl0VHlwZVJlY29yZChTdWJtaXRUeXBlUmVjb3JkIHN1Ym1pdFR5cGVSZWNvcmQpIHsKKyAgICB0aGlzLnN1Ym1pdFR5cGVSZWNvcmQgPSBzdWJtaXRUeXBlUmVjb3JkOworICB9CisKKyAgcHVibGljIFN1Ym1pdFR5cGVSZWNvcmQgZ2V0U3VibWl0VHlwZVJlY29yZCgpIHsKKyAgICByZXR1cm4gc3VibWl0VHlwZVJlY29yZDsKKyAgfQorCiAgIHB1YmxpYyBib29sZWFuIGlzQ3VycmVudFBhdGNoU2V0KGZpbmFsIFBhdGNoU2V0RGV0YWlsIGRldGFpbCkgewogICAgIHJldHVybiBjdXJyZW50UGF0Y2hTZXRJZCAhPSBudWxsCiAgICAgICAgICYmIGRldGFpbC5nZXRQYXRjaFNldCgpLmdldElkKCkuZXF1YWxzKGN1cnJlbnRQYXRjaFNldElkKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9DaGFuZ2VJbmZvLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQ2hhbmdlSW5mby5qYXZhCmluZGV4IDM5MWQ2MTUuLmYyZTgzM2YgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9DaGFuZ2VJbmZvLmphdmEKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0NoYW5nZUluZm8uamF2YQpAQCAtNTAsNyArNTAsNyBAQAogICAgIGxhc3RVcGRhdGVkT24gPSBjLmdldExhc3RVcGRhdGVkT24oKTsKICAgICBzb3J0S2V5ID0gYy5nZXRTb3J0S2V5KCk7CiAgICAgcGF0Y2hTZXRJZCA9IHBhdGNoSWQ7Ci0gICAgbGF0ZXN0ID0gcGF0Y2hTZXRJZCA9PSBudWxsIHx8IGMuY3VyclBhdGNoU2V0SWQoKS5lcXVhbHMocGF0Y2hTZXRJZCk7CisgICAgbGF0ZXN0ID0gcGF0Y2hTZXRJZCA9PSBudWxsIHx8IHBhdGNoU2V0SWQuZXF1YWxzKGMuY3VycmVudFBhdGNoU2V0SWQoKSk7CiAgIH0KIAogICBwdWJsaWMgQ2hhbmdlSW5mbyhmaW5hbCBDaGFuZ2UgYykgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0NoYW5nZU1hbmFnZVNlcnZpY2UuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9DaGFuZ2VNYW5hZ2VTZXJ2aWNlLmphdmEKaW5kZXggNGVmNmIzZS4uZDBlNTE1NCAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0NoYW5nZU1hbmFnZVNlcnZpY2UuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQ2hhbmdlTWFuYWdlU2VydmljZS5qYXZhCkBAIC0yNywyMiArMjcsOCBAQAogcHVibGljIGludGVyZmFjZSBDaGFuZ2VNYW5hZ2VTZXJ2aWNlIGV4dGVuZHMgUmVtb3RlSnNvblNlcnZpY2UgewogICBAQXVkaXQKICAgQFNpZ25JblJlcXVpcmVkCi0gIHZvaWQgc3VibWl0KFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsIEFzeW5jQ2FsbGJhY2s8Q2hhbmdlRGV0YWlsPiBjYWxsYmFjayk7Ci0KLSAgQEF1ZGl0Ci0gIEBTaWduSW5SZXF1aXJlZAotICB2b2lkIGFiYW5kb25DaGFuZ2UoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwgU3RyaW5nIG1lc3NhZ2UsCi0gICAgICBBc3luY0NhbGxiYWNrPENoYW5nZURldGFpbD4gY2FsbGJhY2spOwotCi0gIEBBdWRpdAotICBAU2lnbkluUmVxdWlyZWQKLSAgdm9pZCByZXZlcnRDaGFuZ2UoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwgU3RyaW5nIG1lc3NhZ2UsCi0gICAgICBBc3luY0NhbGxiYWNrPENoYW5nZURldGFpbD4gY2FsbGJhY2spOwotCi0gIEBBdWRpdAotICBAU2lnbkluUmVxdWlyZWQKLSAgdm9pZCByZXN0b3JlQ2hhbmdlKFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsIFN0cmluZyBtZXNzYWdlLAotICAgICAgQXN5bmNDYWxsYmFjazxDaGFuZ2VEZXRhaWw+IGNhbGxiYWNrKTsKKyAgdm9pZCBjcmVhdGVOZXdQYXRjaFNldChmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLCBmaW5hbCBTdHJpbmcgbmV3Q29tbWl0TWVzc2FnZSwKKyAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Q2hhbmdlRGV0YWlsPiBjYWxsYmFjayk7CiAKICAgQEF1ZGl0CiAgIEBTaWduSW5SZXF1aXJlZApkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0NvbW1lbnREZXRhaWwuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Db21tZW50RGV0YWlsLmphdmEKaW5kZXggMGUwNzliMy4uM2NiM2YwNSAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0NvbW1lbnREZXRhaWwuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvQ29tbWVudERldGFpbC5qYXZhCkBAIC04OSw5ICs4OSw2IEBACiAgIH0KIAogICBwdWJsaWMgTGlzdDxQYXRjaExpbmVDb21tZW50PiBnZXRGb3JBKGZpbmFsIGludCBsaW5lTmJyKSB7Ci0gICAgaWYgKGxpbmVOYnIgPT0gMCkgewotICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwotICAgIH0KICAgICBpZiAoZm9yQSA9PSBudWxsKSB7CiAgICAgICBmb3JBID0gaW5kZXgoYSk7CiAgICAgfQpAQCAtOTksOSArOTYsNiBAQAogICB9CiAKICAgcHVibGljIExpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gZ2V0Rm9yQihmaW5hbCBpbnQgbGluZU5icikgewotICAgIGlmIChsaW5lTmJyID09IDApIHsKLSAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKLSAgICB9CiAgICAgaWYgKGZvckIgPT0gbnVsbCkgewogICAgICAgZm9yQiA9IGluZGV4KGIpOwogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9HYXJiYWdlQ29sbGVjdGlvblJlc3VsdC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTNmMjgzYgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9HYXJiYWdlQ29sbGVjdGlvblJlc3VsdC5qYXZhCkBAIC0wLDAgKzEsODIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworcHVibGljIGNsYXNzIEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0IHsKKyAgcHJvdGVjdGVkIExpc3Q8RXJyb3I+IGVycm9yczsKKworICBwdWJsaWMgR2FyYmFnZUNvbGxlY3Rpb25SZXN1bHQoKSB7CisgICAgZXJyb3JzID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgIH0KKworICBwdWJsaWMgdm9pZCBhZGRFcnJvcihFcnJvciBlKSB7CisgICAgZXJyb3JzLmFkZChlKTsKKyAgfQorCisgIHB1YmxpYyBMaXN0PEVycm9yPiBnZXRFcnJvcnMoKSB7CisgICAgcmV0dXJuIGVycm9yczsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGhhc0Vycm9ycygpIHsKKyAgICByZXR1cm4gIWVycm9ycy5pc0VtcHR5KCk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIEVycm9yIHsKKyAgICBwdWJsaWMgc3RhdGljIGVudW0gVHlwZSB7CisgICAgICAvKiogR2l0IGdhcmJhZ2UgY29sbGVjdGlvbiB3YXMgYWxyZWFkeSBzY2hlZHVsZWQgZm9yIHRoaXMgcHJvamVjdCAqLworICAgICAgR0NfQUxSRUFEWV9TQ0hFRFVMRUQsCisKKyAgICAgIC8qKiBUaGUgcmVwb3NpdG9yeSB3YXMgbm90IGZvdW5kLiAqLworICAgICAgUkVQT1NJVE9SWV9OT1RfRk9VTkQsCisKKyAgICAgIC8qKiBUaGUgR2l0IGdhcmJhZ2UgY29sbGVjdGlvbiBmYWlsZWQuICovCisgICAgICBHQ19GQUlMRUQKKyAgICB9CisKKyAgICBwcm90ZWN0ZWQgVHlwZSB0eXBlOworICAgIHByb3RlY3RlZCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWU7CisKKyAgICBwcm90ZWN0ZWQgRXJyb3IoKSB7CisgICAgfQorCisgICAgcHVibGljIEVycm9yKFR5cGUgdHlwZSwgUHJvamVjdC5OYW1lS2V5IHByb2plY3ROYW1lKSB7CisgICAgICB0aGlzLnR5cGUgPSB0eXBlOworICAgICAgdGhpcy5wcm9qZWN0TmFtZSA9IHByb2plY3ROYW1lOworICAgIH0KKworICAgIHB1YmxpYyBUeXBlIGdldFR5cGUoKSB7CisgICAgICByZXR1cm4gdHlwZTsKKyAgICB9CisKKyAgICBwdWJsaWMgUHJvamVjdC5OYW1lS2V5IGdldFByb2plY3ROYW1lKCkgeworICAgICAgcmV0dXJuIHByb2plY3ROYW1lOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisgICAgICBTdHJpbmdCdWlsZGVyIGIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgYi5hcHBlbmQodHlwZSk7CisgICAgICBpZiAocHJvamVjdE5hbWUgIT0gbnVsbCkgeworICAgICAgICBiLmFwcGVuZCgiICIpLmFwcGVuZChwcm9qZWN0TmFtZSk7CisgICAgICB9CisgICAgICByZXR1cm4gYi50b1N0cmluZygpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dlcnJpdENvbmZpZy5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dlcnJpdENvbmZpZy5qYXZhCmluZGV4IDdjMTYxMjkuLjE2Yjk5ZGMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9HZXJyaXRDb25maWcuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR2Vycml0Q29uZmlnLmphdmEKQEAgLTE0LDcgKzE0LDYgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YTsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZC5PcGVuSWRQcm92aWRlclBhdHRlcm47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQuRmllbGROYW1lOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzLkRvd25sb2FkQ29tbWFuZDsKQEAgLTI4LDEwICsyNyw5IEBACiAKIHB1YmxpYyBjbGFzcyBHZXJyaXRDb25maWcgaW1wbGVtZW50cyBDbG9uZWFibGUgewogICBwcm90ZWN0ZWQgU3RyaW5nIHJlZ2lzdGVyVXJsOworICBwcm90ZWN0ZWQgU3RyaW5nIHJlZ2lzdGVyVGV4dDsKICAgcHJvdGVjdGVkIFN0cmluZyBodHRwUGFzc3dvcmRVcmw7CiAgIHByb3RlY3RlZCBTdHJpbmcgcmVwb3J0QnVnVXJsOwotICBwcm90ZWN0ZWQgU3RyaW5nIG9wZW5JZFNzb1VybDsKLSAgcHJvdGVjdGVkIExpc3Q8T3BlbklkUHJvdmlkZXJQYXR0ZXJuPiBhbGxvd2VkT3BlbklEczsKIAogICBwcm90ZWN0ZWQgR2l0d2ViQ29uZmlnIGdpdHdlYjsKICAgcHJvdGVjdGVkIGJvb2xlYW4gdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzOwpAQCAtNDUsMTIgKzQzLDEyIEBACiAgIHByb3RlY3RlZCBTdHJpbmcgc3NoZEFkZHJlc3M7CiAgIHByb3RlY3RlZCBTdHJpbmcgZWRpdEZ1bGxOYW1lVXJsOwogICBwcm90ZWN0ZWQgUHJvamVjdC5OYW1lS2V5IHdpbGRQcm9qZWN0OwotICBwcm90ZWN0ZWQgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzOwogICBwcm90ZWN0ZWQgU2V0PEFjY291bnQuRmllbGROYW1lPiBlZGl0YWJsZUFjY291bnRGaWVsZHM7CiAgIHByb3RlY3RlZCBMaXN0PFJlZ2V4RmluZFJlcGxhY2U+IGNvbW1lbnRMaW5rczsKICAgcHJvdGVjdGVkIGJvb2xlYW4gZG9jdW1lbnRhdGlvbkF2YWlsYWJsZTsKICAgcHJvdGVjdGVkIGJvb2xlYW4gdGVzdENoYW5nZU1lcmdlOwogICBwcm90ZWN0ZWQgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWU7CisgIHByb3RlY3RlZCBpbnQgc3VnZ2VzdEZyb207CiAKICAgcHVibGljIFN0cmluZyBnZXRSZWdpc3RlclVybCgpIHsKICAgICByZXR1cm4gcmVnaXN0ZXJVcmw7CkBAIC02MCw2ICs1OCwxNCBAQAogICAgIHJlZ2lzdGVyVXJsID0gdTsKICAgfQogCisgIHB1YmxpYyBTdHJpbmcgZ2V0UmVnaXN0ZXJUZXh0KCkgeworICAgIHJldHVybiByZWdpc3RlclRleHQ7CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRSZWdpc3RlclRleHQoZmluYWwgU3RyaW5nIHQpIHsKKyAgICByZWdpc3RlclRleHQgPSB0OworICB9CisKICAgcHVibGljIFN0cmluZyBnZXRSZXBvcnRCdWdVcmwoKSB7CiAgICAgcmV0dXJuIHJlcG9ydEJ1Z1VybDsKICAgfQpAQCAtODQsMjIgKzkwLDYgQEAKICAgICBodHRwUGFzc3dvcmRVcmwgPSB1cmw7CiAgIH0KIAotICBwdWJsaWMgU3RyaW5nIGdldE9wZW5JZFNzb1VybCgpIHsKLSAgICAgIHJldHVybiBvcGVuSWRTc29Vcmw7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBzZXRPcGVuSWRTc29VcmwoZmluYWwgU3RyaW5nIHUpIHsKLSAgICBvcGVuSWRTc29VcmwgPSB1OwotICB9Ci0KLSAgcHVibGljIExpc3Q8T3BlbklkUHJvdmlkZXJQYXR0ZXJuPiBnZXRBbGxvd2VkT3BlbklEcygpIHsKLSAgICByZXR1cm4gYWxsb3dlZE9wZW5JRHM7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBzZXRBbGxvd2VkT3BlbklEcyhMaXN0PE9wZW5JZFByb3ZpZGVyUGF0dGVybj4gbCkgewotICAgIGFsbG93ZWRPcGVuSURzID0gbDsKLSAgfQotCiAgIHB1YmxpYyBBdXRoVHlwZSBnZXRBdXRoVHlwZSgpIHsKICAgICByZXR1cm4gYXV0aFR5cGU7CiAgIH0KQEAgLTE4NiwxNCArMTc2LDYgQEAKICAgICB3aWxkUHJvamVjdCA9IHdwOwogICB9CiAKLSAgcHVibGljIEFwcHJvdmFsVHlwZXMgZ2V0QXBwcm92YWxUeXBlcygpIHsKLSAgICByZXR1cm4gYXBwcm92YWxUeXBlczsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldEFwcHJvdmFsVHlwZXMoZmluYWwgQXBwcm92YWxUeXBlcyBhdCkgewotICAgIGFwcHJvdmFsVHlwZXMgPSBhdDsKLSAgfQotCiAgIHB1YmxpYyBib29sZWFuIGNhbkVkaXQoZmluYWwgQWNjb3VudC5GaWVsZE5hbWUgZikgewogICAgIHJldHVybiBlZGl0YWJsZUFjY291bnRGaWVsZHMuY29udGFpbnMoZik7CiAgIH0KQEAgLTIzOCw2ICsyMjAsMTQgQEAKICAgICB0aGlzLmFub255bW91c0Nvd2FyZE5hbWUgPSBhbm9ueW1vdXNDb3dhcmROYW1lOwogICB9CiAKKyAgcHVibGljIGludCBnZXRTdWdnZXN0RnJvbSgpIHsKKyAgICByZXR1cm4gc3VnZ2VzdEZyb207CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRTdWdnZXN0RnJvbShmaW5hbCBpbnQgc3VnZ2VzdEZyb20pIHsKKyAgICB0aGlzLnN1Z2dlc3RGcm9tID0gc3VnZ2VzdEZyb207CisgIH0KKwogICBwdWJsaWMgYm9vbGVhbiBzaXRlSGFzVXNlcm5hbWVzKCkgewogICAgIGlmIChnZXRBdXRoVHlwZSgpID09IEF1dGhUeXBlLkNVU1RPTV9FWFRFTlNJT04KICAgICAgICAgJiYgZ2V0SHR0cFBhc3N3b3JkVXJsKCkgIT0gbnVsbApkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dpdFdlYlR5cGUuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9HaXRXZWJUeXBlLmphdmEKaW5kZXggMGUyZTUwZC4uMzU4MDc3NCAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dpdFdlYlR5cGUuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR2l0V2ViVHlwZS5qYXZhCkBAIC0zNiwxMCArMzYsMTAgQEAKICAgICB9IGVsc2UgaWYgKG5hbWUuZXF1YWxzSWdub3JlQ2FzZSgiY2dpdCIpKSB7CiAgICAgICB0eXBlID0gbmV3IEdpdFdlYlR5cGUoKTsKICAgICAgIHR5cGUuc2V0TGlua05hbWUoImNnaXQiKTsKLSAgICAgIHR5cGUuc2V0UHJvamVjdCgiJHtwcm9qZWN0fS9zdW1tYXJ5Iik7Ci0gICAgICB0eXBlLnNldFJldmlzaW9uKCIke3Byb2plY3R9L2NvbW1pdC8/aWQ9JHtjb21taXR9Iik7Ci0gICAgICB0eXBlLnNldEJyYW5jaCgiJHtwcm9qZWN0fS9sb2cvP2g9JHticmFuY2h9Iik7Ci0gICAgICB0eXBlLnNldEZpbGVIaXN0b3J5KCIke3Byb2plY3R9L2xvZy8ke2ZpbGV9P2g9JHticmFuY2h9Iik7CisgICAgICB0eXBlLnNldFByb2plY3QoIiR7cHJvamVjdH0uZ2l0L3N1bW1hcnkiKTsKKyAgICAgIHR5cGUuc2V0UmV2aXNpb24oIiR7cHJvamVjdH0uZ2l0L2NvbW1pdC8/aWQ9JHtjb21taXR9Iik7CisgICAgICB0eXBlLnNldEJyYW5jaCgiJHtwcm9qZWN0fS5naXQvbG9nLz9oPSR7YnJhbmNofSIpOworICAgICAgdHlwZS5zZXRGaWxlSGlzdG9yeSgiJHtwcm9qZWN0fS5naXQvbG9nLyR7ZmlsZX0/aD0ke2JyYW5jaH0iKTsKIAogICAgIH0gZWxzZSBpZiAobmFtZS5lcXVhbHNJZ25vcmVDYXNlKCJjdXN0b20iKSkgewogICAgICAgdHlwZSA9IG5ldyBHaXRXZWJUeXBlKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR2xvYmFsQ2FwYWJpbGl0eS5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dsb2JhbENhcGFiaWxpdHkuamF2YQppbmRleCA4MWQ0ZmM5Li43ZGI2OTFkIDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR2xvYmFsQ2FwYWJpbGl0eS5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9HbG9iYWxDYXBhYmlsaXR5LmphdmEKQEAgLTIxLDYgKzIxLDkgQEAKIAogLyoqIFNlcnZlciB3aWRlIGNhcGFiaWxpdGllcy4gUmVwcmVzZW50ZWQgYXMge0BsaW5rIFBlcm1pc3Npb259IG9iamVjdHMuICovCiBwdWJsaWMgY2xhc3MgR2xvYmFsQ2FwYWJpbGl0eSB7CisgIC8qKiBBYmlsaXR5IHRvIGFjY2VzcyB0aGUgZGF0YWJhc2UgKHdpdGggZ3NxbCkuICovCisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEFDQ0VTU19EQVRBQkFTRSA9ICJhY2Nlc3NEYXRhYmFzZSI7CisKICAgLyoqCiAgICAqIERlbm90ZXMgdGhlIHNlcnZlcidzIGFkbWluaXN0cmF0b3JzLgogICAgKiA8cD4KQEAgLTI4LDcgKzMxLDcgQEAKICAgICogaGFzIHRoaXMgY2FwYWJpbGl0eSBjYW4gcGVyZm9ybSBhbG1vc3QgYW55IG90aGVyIGFjdGlvbiwgb3IgY2FuIGdyYW50CiAgICAqIHRoZW1zZWx2ZXMgdGhlIHBvd2VyIHRvIHBlcmZvcm0gYW55IG90aGVyIGFjdGlvbiBvbiB0aGUgc2l0ZS4gTW9zdCBvZgogICAgKiB0aGUgb3RoZXIgY2FwYWJpbGl0aWVzIGFuZCBwZXJtaXNzaW9ucyBmYWxsLWJhY2sgdG8gdGhlIHByZWRpY2F0ZQotICAgKiAiT1IgdXNlciBoYXMgY2FwYWJsaXR5IEFETUlOSVNUUkFURV9TRVJWRVIiLgorICAgKiAiT1IgdXNlciBoYXMgY2FwYWJpbGl0eSBBRE1JTklTVFJBVEVfU0VSVkVSIi4KICAgICovCiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEFETUlOSVNUUkFURV9TRVJWRVIgPSAiYWRtaW5pc3RyYXRlU2VydmVyIjsKIApAQCAtNjQsNiArNjcsOSBAQAogICAvKiogTWF4aW11bSByZXN1bHQgbGltaXQgcGVyIGV4ZWN1dGVkIHF1ZXJ5LiAqLwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBRVUVSWV9MSU1JVCA9ICJxdWVyeUxpbWl0IjsKIAorICAvKiogQ2FuIHJ1biB0aGUgR2l0IGdhcmJhZ2UgY29sbGVjdGlvbi4gKi8KKyAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUlVOX0dDID0gInJ1bkdDIjsKKwogICAvKiogRm9yY2VmdWxseSByZXN0YXJ0IHJlcGxpY2F0aW9uIHRvIGFueSBjb25maWd1cmVkIGRlc3RpbmF0aW9uLiAqLwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBTVEFSVF9SRVBMSUNBVElPTiA9ICJzdGFydFJlcGxpY2F0aW9uIjsKIApAQCAtODEsNiArODcsNyBAQAogCiAgIHN0YXRpYyB7CiAgICAgTkFNRVNfQUxMID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7CisgICAgTkFNRVNfQUxMLmFkZChBQ0NFU1NfREFUQUJBU0UpOwogICAgIE5BTUVTX0FMTC5hZGQoQURNSU5JU1RSQVRFX1NFUlZFUik7CiAgICAgTkFNRVNfQUxMLmFkZChDUkVBVEVfQUNDT1VOVCk7CiAgICAgTkFNRVNfQUxMLmFkZChDUkVBVEVfR1JPVVApOwpAQCAtOTAsNiArOTcsNyBAQAogICAgIE5BTUVTX0FMTC5hZGQoS0lMTF9UQVNLKTsKICAgICBOQU1FU19BTEwuYWRkKFBSSU9SSVRZKTsKICAgICBOQU1FU19BTEwuYWRkKFFVRVJZX0xJTUlUKTsKKyAgICBOQU1FU19BTEwuYWRkKFJVTl9HQyk7CiAgICAgTkFNRVNfQUxMLmFkZChTVEFSVF9SRVBMSUNBVElPTik7CiAgICAgTkFNRVNfQUxMLmFkZChWSUVXX0NBQ0hFUyk7CiAgICAgTkFNRVNfQUxMLmFkZChWSUVXX0NPTk5FQ1RJT05TKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Hcm91cEFkbWluU2VydmljZS5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwQWRtaW5TZXJ2aWNlLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDVjYjdmYTIuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwQWRtaW5TZXJ2aWNlLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw4OSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDggVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXVkaXQuQXVkaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGguU2lnbkluUmVxdWlyZWQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTWVtYmVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLlJlbW90ZUpzb25TZXJ2aWNlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uUnBjSW1wbDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLlZvaWRSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5ScGNJbXBsLlZlcnNpb247Ci0KLWltcG9ydCBqYXZhLnV0aWwuU2V0OwotCi1AUnBjSW1wbCh2ZXJzaW9uID0gVmVyc2lvbi5WMl8wKQotcHVibGljIGludGVyZmFjZSBHcm91cEFkbWluU2VydmljZSBleHRlbmRzIFJlbW90ZUpzb25TZXJ2aWNlIHsKLSAgQEF1ZGl0Ci0gIEBTaWduSW5SZXF1aXJlZAotICB2b2lkIHZpc2libGVHcm91cHMoQXN5bmNDYWxsYmFjazxHcm91cExpc3Q+IGNhbGxiYWNrKTsKLQotICBAQXVkaXQKLSAgQFNpZ25JblJlcXVpcmVkCi0gIHZvaWQgY3JlYXRlR3JvdXAoU3RyaW5nIG5ld05hbWUsIEFzeW5jQ2FsbGJhY2s8QWNjb3VudEdyb3VwLklkPiBjYWxsYmFjayk7Ci0KLSAgQEF1ZGl0Ci0gIEBTaWduSW5SZXF1aXJlZAotICB2b2lkIGdyb3VwRGV0YWlsKEFjY291bnRHcm91cC5JZCBncm91cElkLCBBY2NvdW50R3JvdXAuVVVJRCB1dWlkLAotICAgICAgQXN5bmNDYWxsYmFjazxHcm91cERldGFpbD4gY2FsbGJhY2spOwotCi0gIEBBdWRpdAotICBAU2lnbkluUmVxdWlyZWQKLSAgdm9pZCBjaGFuZ2VHcm91cERlc2NyaXB0aW9uKEFjY291bnRHcm91cC5JZCBncm91cElkLCBTdHJpbmcgZGVzY3JpcHRpb24sCi0gICAgICBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNhbGxiYWNrKTsKLQotICBAQXVkaXQKLSAgQFNpZ25JblJlcXVpcmVkCi0gIHZvaWQgY2hhbmdlR3JvdXBPcHRpb25zKEFjY291bnRHcm91cC5JZCBncm91cElkLCBHcm91cE9wdGlvbnMgZ3JvdXBPcHRpb25zLAotICAgICAgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PiBjYWxsYmFjayk7Ci0KLSAgQEF1ZGl0Ci0gIEBTaWduSW5SZXF1aXJlZAotICB2b2lkIGNoYW5nZUdyb3VwT3duZXIoQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsIFN0cmluZyBuZXdPd25lck5hbWUsCi0gICAgICBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNhbGxiYWNrKTsKLQotICBAQXVkaXQKLSAgQFNpZ25JblJlcXVpcmVkCi0gIHZvaWQgcmVuYW1lR3JvdXAoQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsIFN0cmluZyBuZXdOYW1lLAotICAgICAgQXN5bmNDYWxsYmFjazxHcm91cERldGFpbD4gY2FsbGJhY2spOwotCi0gIEBBdWRpdAotICBAU2lnbkluUmVxdWlyZWQKLSAgdm9pZCBjaGFuZ2VHcm91cFR5cGUoQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsIEFjY291bnRHcm91cC5UeXBlIG5ld1R5cGUsCi0gICAgICBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNhbGxiYWNrKTsKLQotICBAQXVkaXQKLSAgQFNpZ25JblJlcXVpcmVkCi0gIHZvaWQgYWRkR3JvdXBNZW1iZXIoQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsIFN0cmluZyBuYW1lT3JFbWFpbCwKLSAgICAgIEFzeW5jQ2FsbGJhY2s8R3JvdXBEZXRhaWw+IGNhbGxiYWNrKTsKLQotICBAQXVkaXQKLSAgQFNpZ25JblJlcXVpcmVkCi0gIHZvaWQgYWRkR3JvdXBJbmNsdWRlKEFjY291bnRHcm91cC5JZCBncm91cElkLCBTdHJpbmcgZ3JvdXBOYW1lLAotICAgICAgQXN5bmNDYWxsYmFjazxHcm91cERldGFpbD4gY2FsbGJhY2spOwotCi0gIEBBdWRpdAotICBAU2lnbkluUmVxdWlyZWQKLSAgdm9pZCBkZWxldGVHcm91cE1lbWJlcnMoQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsCi0gICAgICBTZXQ8QWNjb3VudEdyb3VwTWVtYmVyLktleT4ga2V5cywgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PiBjYWxsYmFjayk7Ci0KLSAgQEF1ZGl0Ci0gIEBTaWduSW5SZXF1aXJlZAotICB2b2lkIGRlbGV0ZUdyb3VwSW5jbHVkZXMoQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsCi0gICAgICBTZXQ8QWNjb3VudEdyb3VwSW5jbHVkZS5LZXk+IGtleXMsIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gY2FsbGJhY2spOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwRGVzY3JpcHRpb24uamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Hcm91cERlc2NyaXB0aW9uLmphdmEKaW5kZXggODI4YmYyNC4uY2NkNTBmYyAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwRGVzY3JpcHRpb24uamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBEZXNjcmlwdGlvbi5qYXZhCkBAIC0xNiw2ICsxNiw4IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwogCitpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKKwogLyoqCiAgKiBHcm91cCBtZXRob2RzIGV4cG9zZWQgYnkgdGhlIEdyb3VwQmFja2VuZC4KICAqLwpAQCAtMzAsOCArMzIsMjEgQEAKICAgICAvKiogQHJldHVybiB0aGUgbm9uLW51bGwgbmFtZSBvZiB0aGUgZ3JvdXAuICovCiAgICAgU3RyaW5nIGdldE5hbWUoKTsKIAotICAgIC8qKiBAcmV0dXJuIHdoZXRoZXIgdGhlIGdyb3VwIGlzIHZpc2libGUgdG8gYWxsIGFjY291bnRzLiAqLwotICAgIGJvb2xlYW4gaXNWaXNpYmxlVG9BbGwoKTsKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIG9wdGlvbmFsIGVtYWlsIGFkZHJlc3MgdG8gc2VuZCB0byB0aGUgZ3JvdXAncyBtZW1iZXJzLiBJZgorICAgICAqICAgICAgICAgcHJvdmlkZWQsIEdlcnJpdCB3aWxsIHVzZSB0aGlzIGVtYWlsIGFkZHJlc3MgdG8gc2VuZAorICAgICAqICAgICAgICAgY2hhbmdlIG5vdGlmaWNhdGlvbnMgdG8gdGhlIGdyb3VwLgorICAgICAqLworICAgIEBOdWxsYWJsZQorICAgIFN0cmluZyBnZXRFbWFpbEFkZHJlc3MoKTsKKworICAgIC8qKgorICAgICAqIEByZXR1cm4gb3B0aW9uYWwgVVJMIHRvIGluZm9ybWF0aW9uIGFib3V0IHRoZSBncm91cC4gVHlwaWNhbGx5IGEgVVJMIHRvIGEKKyAgICAgKiAgICAgICAgIHdlYiBwYWdlIHRoYXQgcGVybWl0cyB1c2VycyB0byBhcHBseSB0byBqb2luIHRoZSBncm91cCwgb3IgbWFuYWdlCisgICAgICogICAgICAgICB0aGVpciBtZW1iZXJzaGlwLgorICAgICAqLworICAgIEBOdWxsYWJsZQorICAgIFN0cmluZyBnZXRVcmwoKTsKICAgfQogCiAgIC8qKgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwRGVzY3JpcHRpb25zLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBEZXNjcmlwdGlvbnMuamF2YQppbmRleCBlMGJjN2Q4Li5mOTg2NjAwIDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBEZXNjcmlwdGlvbnMuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBEZXNjcmlwdGlvbnMuamF2YQpAQCAtMTQsNiArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwogCiBpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKQEAgLTQ0LDEzICs0NSwyMCBAQAogICAgICAgfQogCiAgICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyBib29sZWFuIGlzVmlzaWJsZVRvQWxsKCkgewotICAgICAgICByZXR1cm4gZ3JvdXAuaXNWaXNpYmxlVG9BbGwoKTsKKyAgICAgIHB1YmxpYyBBY2NvdW50R3JvdXAgZ2V0QWNjb3VudEdyb3VwKCkgeworICAgICAgICByZXR1cm4gZ3JvdXA7CiAgICAgICB9CiAKICAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIEFjY291bnRHcm91cCBnZXRBY2NvdW50R3JvdXAoKSB7Ci0gICAgICAgIHJldHVybiBncm91cDsKKyAgICAgIEBOdWxsYWJsZQorICAgICAgcHVibGljIFN0cmluZyBnZXRFbWFpbEFkZHJlc3MoKSB7CisgICAgICAgIHJldHVybiBudWxsOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIEBOdWxsYWJsZQorICAgICAgcHVibGljIFN0cmluZyBnZXRVcmwoKSB7CisgICAgICAgIHJldHVybiAiIyIgKyBQYWdlTGlua3MudG9Hcm91cChnZXRHcm91cFVVSUQoKSk7CiAgICAgICB9CiAgICAgfTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwRGV0YWlsLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBEZXRhaWwuamF2YQppbmRleCAwMWM3OTg1Li4wZDJiZTUxIDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBEZXRhaWwuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBEZXRhaWwuamF2YQpAQCAtMTUsMTcgKzE1LDE2IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTWVtYmVyOwogCiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIHB1YmxpYyBjbGFzcyBHcm91cERldGFpbCB7CiAgIHB1YmxpYyBBY2NvdW50SW5mb0NhY2hlIGFjY291bnRzOwotICBwdWJsaWMgR3JvdXBJbmZvQ2FjaGUgZ3JvdXBzOwogICBwdWJsaWMgQWNjb3VudEdyb3VwIGdyb3VwOwogICBwdWJsaWMgTGlzdDxBY2NvdW50R3JvdXBNZW1iZXI+IG1lbWJlcnM7Ci0gIHB1YmxpYyBMaXN0PEFjY291bnRHcm91cEluY2x1ZGU+IGluY2x1ZGVzOworICBwdWJsaWMgTGlzdDxBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkPiBpbmNsdWRlczsKICAgcHVibGljIEdyb3VwUmVmZXJlbmNlIG93bmVyR3JvdXA7CiAgIHB1YmxpYyBib29sZWFuIGNhbk1vZGlmeTsKIApAQCAtMzYsMTAgKzM1LDYgQEAKICAgICBhY2NvdW50cyA9IGM7CiAgIH0KIAotICBwdWJsaWMgdm9pZCBzZXRHcm91cHMoR3JvdXBJbmZvQ2FjaGUgYykgewotICAgIGdyb3VwcyA9IGM7Ci0gIH0KLQogICBwdWJsaWMgdm9pZCBzZXRHcm91cChBY2NvdW50R3JvdXAgZykgewogICAgIGdyb3VwID0gZzsKICAgfQpAQCAtNDgsNyArNDMsNyBAQAogICAgIG1lbWJlcnMgPSBtOwogICB9CiAKLSAgcHVibGljIHZvaWQgc2V0SW5jbHVkZXMoTGlzdDxBY2NvdW50R3JvdXBJbmNsdWRlPiBpKSB7CisgIHB1YmxpYyB2b2lkIHNldEluY2x1ZGVzKExpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZD4gaSkgewogICAgIGluY2x1ZGVzID0gaTsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBJbmZvLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBJbmZvLmphdmEKaW5kZXggNTQ3YTVmNC4uMWFjZGQ5YSAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwSW5mby5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Hcm91cEluZm8uamF2YQpAQCAtMTgsOSArMTgsMTAgQEAKIAogLyoqIFN1bW1hcnkgaW5mb3JtYXRpb24gYWJvdXQgYW4ge0BsaW5rIEFjY291bnRHcm91cH0sIGZvciBzaW1wbGUgdGFidWxhciBkaXNwbGF5cy4gKi8KIHB1YmxpYyBjbGFzcyBHcm91cEluZm8gewotICBwcm90ZWN0ZWQgQWNjb3VudEdyb3VwLklkIGlkOworICBwcm90ZWN0ZWQgQWNjb3VudEdyb3VwLlVVSUQgdXVpZDsKICAgcHJvdGVjdGVkIFN0cmluZyBuYW1lOwogICBwcm90ZWN0ZWQgU3RyaW5nIGRlc2NyaXB0aW9uOworICBwcm90ZWN0ZWQgU3RyaW5nIHVybDsKIAogICBwcm90ZWN0ZWQgR3JvdXBJbmZvKCkgewogICB9CkBAIC0zMiw4ICszMyw4IEBACiAgICAqIGxvb2t1cCBoYXMgZmFpbGVkIGFuZCBhIHN0YWxlIGdyb3VwIGlkIGhhcyBiZWVuIGRpc2NvdmVyZWQgaW4gdGhlIGRhdGEKICAgICogc3RvcmUuCiAgICAqLwotICBwdWJsaWMgR3JvdXBJbmZvKGZpbmFsIEFjY291bnRHcm91cC5JZCBpZCkgewotICAgIHRoaXMuaWQgPSBpZDsKKyAgcHVibGljIEdyb3VwSW5mbyhmaW5hbCBBY2NvdW50R3JvdXAuVVVJRCB1dWlkKSB7CisgICAgdGhpcy51dWlkID0gdXVpZDsKICAgfQogCiAgIC8qKgpAQCAtNDEsMTUgKzQyLDIwIEBACiAgICAqCiAgICAqIEBwYXJhbSBhIHRoZSBkYXRhIHN0b3JlIHJlY29yZCBob2xkaW5nIHRoZSBzcGVjaWZpYyBncm91cCBkZXRhaWxzLgogICAgKi8KLSAgcHVibGljIEdyb3VwSW5mbyhmaW5hbCBBY2NvdW50R3JvdXAgYSkgewotICAgIGlkID0gYS5nZXRJZCgpOworICBwdWJsaWMgR3JvdXBJbmZvKEdyb3VwRGVzY3JpcHRpb24uQmFzaWMgYSkgeworICAgIHV1aWQgPSBhLmdldEdyb3VwVVVJRCgpOwogICAgIG5hbWUgPSBhLmdldE5hbWUoKTsKLSAgICBkZXNjcmlwdGlvbiA9IGEuZ2V0RGVzY3JpcHRpb24oKTsKKyAgICB1cmwgPSBhLmdldFVybCgpOworCisgICAgaWYgKGEgaW5zdGFuY2VvZiBHcm91cERlc2NyaXB0aW9uLkludGVybmFsKSB7CisgICAgICBBY2NvdW50R3JvdXAgZ3JvdXAgPSAoKEdyb3VwRGVzY3JpcHRpb24uSW50ZXJuYWwpIGEpLmdldEFjY291bnRHcm91cCgpOworICAgICAgZGVzY3JpcHRpb24gPSBncm91cC5nZXREZXNjcmlwdGlvbigpOworICAgIH0KICAgfQogCiAgIC8qKiBAcmV0dXJuIHRoZSB1bmlxdWUgbG9jYWwgaWQgb2YgdGhlIGdyb3VwICovCi0gIHB1YmxpYyBBY2NvdW50R3JvdXAuSWQgZ2V0SWQoKSB7Ci0gICAgcmV0dXJuIGlkOworICBwdWJsaWMgQWNjb3VudEdyb3VwLlVVSUQgZ2V0SWQoKSB7CisgICAgcmV0dXJuIHV1aWQ7CiAgIH0KIAogICAvKiogQHJldHVybiB0aGUgbmFtZSBvZiB0aGUgZ3JvdXA7IG51bGwgaWYgbm90IHN1cHBsaWVkICovCkBAIC02MSw0ICs2Nyw4IEBACiAgIHB1YmxpYyBTdHJpbmcgZ2V0RGVzY3JpcHRpb24oKSB7CiAgICAgcmV0dXJuIGRlc2NyaXB0aW9uOwogICB9CisKKyAgcHVibGljIFN0cmluZyBnZXRVcmwoKSB7CisgICAgcmV0dXJuIHVybDsKKyAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwSW5mb0NhY2hlLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBJbmZvQ2FjaGUuamF2YQppbmRleCA2YTVkZDVjLi4wODU5NzNjIDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBJbmZvQ2FjaGUuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBJbmZvQ2FjaGUuamF2YQpAQCAtMzMsMTMgKzMzLDEzIEBACiAgICAgcmV0dXJuIEVNUFRZOwogICB9CiAKLSAgcHJvdGVjdGVkIE1hcDxBY2NvdW50R3JvdXAuSWQsIEdyb3VwSW5mbz4gZ3JvdXBzOworICBwcm90ZWN0ZWQgTWFwPEFjY291bnRHcm91cC5VVUlELCBHcm91cEluZm8+IGdyb3VwczsKIAogICBwcm90ZWN0ZWQgR3JvdXBJbmZvQ2FjaGUoKSB7CiAgIH0KIAogICBwdWJsaWMgR3JvdXBJbmZvQ2FjaGUoZmluYWwgSXRlcmFibGU8R3JvdXBJbmZvPiBsaXN0KSB7Ci0gICAgZ3JvdXBzID0gbmV3IEhhc2hNYXA8QWNjb3VudEdyb3VwLklkLCBHcm91cEluZm8+KCk7CisgICAgZ3JvdXBzID0gbmV3IEhhc2hNYXA8QWNjb3VudEdyb3VwLlVVSUQsIEdyb3VwSW5mbz4oKTsKICAgICBmb3IgKGZpbmFsIEdyb3VwSW5mbyBnaSA6IGxpc3QpIHsKICAgICAgIGdyb3Vwcy5wdXQoZ2kuZ2V0SWQoKSwgZ2kpOwogICAgIH0KQEAgLTU4LDE1ICs1OCwxNSBAQAogICAgKiBAcGFyYW0gaWQgdGhlIGlkIGRlc2lyZWQuCiAgICAqIEByZXR1cm4gaW5mbyBibG9jayBmb3IgdGhlIGdyb3VwLgogICAgKi8KLSAgcHVibGljIEdyb3VwSW5mbyBnZXQoZmluYWwgQWNjb3VudEdyb3VwLklkIGlkKSB7Ci0gICAgaWYgKGlkID09IG51bGwpIHsKKyAgcHVibGljIEdyb3VwSW5mbyBnZXQoZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgdXVpZCkgeworICAgIGlmICh1dWlkID09IG51bGwpIHsKICAgICAgIHJldHVybiBudWxsOwogICAgIH0KIAotICAgIEdyb3VwSW5mbyByID0gZ3JvdXBzLmdldChpZCk7CisgICAgR3JvdXBJbmZvIHIgPSBncm91cHMuZ2V0KHV1aWQpOwogICAgIGlmIChyID09IG51bGwpIHsKLSAgICAgIHIgPSBuZXcgR3JvdXBJbmZvKGlkKTsKLSAgICAgIGdyb3Vwcy5wdXQoaWQsIHIpOworICAgICAgciA9IG5ldyBHcm91cEluZm8odXVpZCk7CisgICAgICBncm91cHMucHV0KHV1aWQsIHIpOwogICAgIH0KICAgICByZXR1cm4gcjsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwTGlzdC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0dyb3VwTGlzdC5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBiMzA5NWNkLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Hcm91cExpc3QuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDQ4ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YTsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci0KLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLQotcHVibGljIGNsYXNzIEdyb3VwTGlzdCB7Ci0gIHByb3RlY3RlZCBMaXN0PEFjY291bnRHcm91cD4gZ3JvdXBzOwotICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5DcmVhdGVHcm91cDsKLQotICBwcm90ZWN0ZWQgR3JvdXBMaXN0KCkgewotICB9Ci0KLSAgcHVibGljIEdyb3VwTGlzdChmaW5hbCBMaXN0PEFjY291bnRHcm91cD4gZ3JvdXBzLCBmaW5hbCBib29sZWFuIGNhbkNyZWF0ZUdyb3VwKSB7Ci0gICAgdGhpcy5ncm91cHMgPSBncm91cHM7Ci0gICAgdGhpcy5jYW5DcmVhdGVHcm91cCA9IGNhbkNyZWF0ZUdyb3VwOwotICB9Ci0KLSAgcHVibGljIExpc3Q8QWNjb3VudEdyb3VwPiBnZXRHcm91cHMoKSB7Ci0gICAgcmV0dXJuIGdyb3VwczsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldEdyb3VwcyhMaXN0PEFjY291bnRHcm91cD4gZ3JvdXBzKSB7Ci0gICAgdGhpcy5ncm91cHMgPSBncm91cHM7Ci0gIH0KLQotICBwdWJsaWMgYm9vbGVhbiBpc0NhbkNyZWF0ZUdyb3VwKCkgewotICAgIHJldHVybiBjYW5DcmVhdGVHcm91cDsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldENhbkNyZWF0ZUdyb3VwKGJvb2xlYW4gc2V0KSB7Ci0gICAgY2FuQ3JlYXRlR3JvdXAgPSBzZXQ7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Hcm91cE9wdGlvbnMuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Hcm91cE9wdGlvbnMuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYzZlZDc4MS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvR3JvdXBPcHRpb25zLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwzNiArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTEgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwotCi0vKioKLSAqIE9wdGlvbnMgZm9yIGFuIHtAbGluayBBY2NvdW50R3JvdXB9LgotICovCi1wdWJsaWMgY2xhc3MgR3JvdXBPcHRpb25zIHsKLQotICBwcml2YXRlIGJvb2xlYW4gdmlzaWJsZVRvQWxsOwotCi0gIHByb3RlY3RlZCBHcm91cE9wdGlvbnMoKSB7Ci0gIH0KLQotICBwdWJsaWMgR3JvdXBPcHRpb25zKGZpbmFsIGJvb2xlYW4gdmlzaWJsZVRvQWxsKSB7Ci0gICAgdGhpcy52aXNpYmxlVG9BbGwgPSB2aXNpYmxlVG9BbGw7Ci0gIH0KLQotICBwdWJsaWMgYm9vbGVhbiBpc1Zpc2libGVUb0FsbCgpIHsKLSAgICByZXR1cm4gdmlzaWJsZVRvQWxsOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvSG9zdFBhZ2VEYXRhLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvSG9zdFBhZ2VEYXRhLmphdmEKaW5kZXggZjk5MWY0Yy4uZjAxNGY1ZiAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0hvc3RQYWdlRGF0YS5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Ib3N0UGFnZURhdGEuamF2YQpAQCAtMTcsMTMgKzE3LDE2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnREaWZmUHJlZmVyZW5jZTsKIAoraW1wb3J0IGphdmEudXRpbC5MaXN0OworCiAvKiogRGF0YSBzZW50IGFzIHBhcnQgb2YgdGhlIGhvc3QgcGFnZSwgdG8gYm9vdHN0cmFwIHRoZSBVSS4gKi8KIHB1YmxpYyBjbGFzcyBIb3N0UGFnZURhdGEgewogICBwdWJsaWMgQWNjb3VudCBhY2NvdW50OwogICBwdWJsaWMgQWNjb3VudERpZmZQcmVmZXJlbmNlIGFjY291bnREaWZmUHJlZjsKLSAgcHVibGljIFN0cmluZyB4c3JmVG9rZW47CisgIHB1YmxpYyBTdHJpbmcgeEdlcnJpdEF1dGg7CiAgIHB1YmxpYyBHZXJyaXRDb25maWcgY29uZmlnOwogICBwdWJsaWMgVGhlbWUgdGhlbWU7CisgIHB1YmxpYyBMaXN0PFN0cmluZz4gcGx1Z2luczsKIAogICBwdWJsaWMgc3RhdGljIGNsYXNzIFRoZW1lIHsKICAgICBwdWJsaWMgU3RyaW5nIGJhY2tncm91bmRDb2xvcjsKZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9MYWJlbFR5cGUuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9MYWJlbFR5cGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yMDQ5ODg3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0xhYmVsVHlwZS5qYXZhCkBAIC0wLDAgKzEsMjQ5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMDggVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbC5MYWJlbElkOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKKworcHVibGljIGNsYXNzIExhYmVsVHlwZSB7CisgIHB1YmxpYyBzdGF0aWMgTGFiZWxUeXBlIHdpdGhEZWZhdWx0VmFsdWVzKFN0cmluZyBuYW1lKSB7CisgICAgY2hlY2tOYW1lKG5hbWUpOworICAgIExpc3Q8TGFiZWxWYWx1ZT4gdmFsdWVzID0gbmV3IEFycmF5TGlzdDxMYWJlbFZhbHVlPigyKTsKKyAgICB2YWx1ZXMuYWRkKG5ldyBMYWJlbFZhbHVlKChzaG9ydCkgMCwgIlJlamVjdGVkIikpOworICAgIHZhbHVlcy5hZGQobmV3IExhYmVsVmFsdWUoKHNob3J0KSAxLCAiQXBwcm92ZWQiKSk7CisgICAgcmV0dXJuIG5ldyBMYWJlbFR5cGUobmFtZSwgdmFsdWVzKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBjaGVja05hbWUoU3RyaW5nIG5hbWUpIHsKKyAgICBpZiAoIlNVQk0iLmVxdWFscyhuYW1lKSkgeworICAgICAgdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigKKyAgICAgICAgICAiUmVzZXJ2ZWQgbGFiZWwgbmFtZSBcIiIgKyBuYW1lICsgIlwiIik7CisgICAgfQorICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbmFtZS5sZW5ndGgoKTsgaSsrKSB7CisgICAgICBjaGFyIGMgPSBuYW1lLmNoYXJBdChpKTsKKyAgICAgIGlmICghKChjID49ICdhJyAmJiBjIDw9ICd6JykgfHwKKyAgICAgICAgICAgIChjID49ICdBJyAmJiBjIDw9ICdaJykgfHwKKyAgICAgICAgICAgIChjID49ICcwJyAmJiBjIDw9ICc5JykgfHwKKyAgICAgICAgICAgIGMgPT0gJy0nKSkgeworICAgICAgICB0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKAorICAgICAgICAgICAgIklsbGVnYWwgbGFiZWwgbmFtZSBcIiIgKyBuYW1lICsgIlwiIik7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBuYW1lOworICB9CisKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgZGVmYXVsdEFiYnJldmlhdGlvbihTdHJpbmcgbmFtZSkgeworICAgIFN0cmluZ0J1aWxkZXIgYWJiciA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBuYW1lLmxlbmd0aCgpOyBpKyspIHsKKyAgICAgIGNoYXIgYyA9IG5hbWUuY2hhckF0KGkpOworICAgICAgaWYgKGMgPj0gJ0EnICYmIGMgPD0gJ1onKSB7CisgICAgICAgIGFiYnIuYXBwZW5kKGMpOworICAgICAgfQorICAgIH0KKyAgICBpZiAoYWJici5sZW5ndGgoKSA9PSAwKSB7CisgICAgICBhYmJyLmFwcGVuZChDaGFyYWN0ZXIudG9VcHBlckNhc2UobmFtZS5jaGFyQXQoMCkpKTsKKyAgICB9CisgICAgcmV0dXJuIGFiYnIudG9TdHJpbmcoKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIExpc3Q8TGFiZWxWYWx1ZT4gc29ydFZhbHVlcyhMaXN0PExhYmVsVmFsdWU+IHZhbHVlcykgeworICAgIHZhbHVlcyA9IG5ldyBBcnJheUxpc3Q8TGFiZWxWYWx1ZT4odmFsdWVzKTsKKyAgICBpZiAodmFsdWVzLnNpemUoKSA8PSAxKSB7CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlTGlzdCh2YWx1ZXMpOworICAgIH0KKyAgICBDb2xsZWN0aW9ucy5zb3J0KHZhbHVlcywgbmV3IENvbXBhcmF0b3I8TGFiZWxWYWx1ZT4oKSB7CisgICAgICBwdWJsaWMgaW50IGNvbXBhcmUoTGFiZWxWYWx1ZSBvMSwgTGFiZWxWYWx1ZSBvMikgeworICAgICAgICByZXR1cm4gbzEuZ2V0VmFsdWUoKSAtIG8yLmdldFZhbHVlKCk7CisgICAgICB9CisgICAgfSk7CisgICAgc2hvcnQgbWluID0gdmFsdWVzLmdldCgwKS5nZXRWYWx1ZSgpOworICAgIHNob3J0IG1heCA9IHZhbHVlcy5nZXQodmFsdWVzLnNpemUoKSAtIDEpLmdldFZhbHVlKCk7CisgICAgc2hvcnQgdiA9IG1pbjsKKyAgICBzaG9ydCBpID0gMDsKKyAgICBMaXN0PExhYmVsVmFsdWU+IHJlc3VsdCA9IG5ldyBBcnJheUxpc3Q8TGFiZWxWYWx1ZT4obWF4IC0gbWluICsgMSk7CisgICAgLy8gRmlsbCBpbiBhbnkgbWlzc2luZyB2YWx1ZXMgd2l0aCBlbXB0eSB0ZXh0LgorICAgIHdoaWxlIChpIDwgdmFsdWVzLnNpemUoKSkgeworICAgICAgd2hpbGUgKHYgPCB2YWx1ZXMuZ2V0KGkpLmdldFZhbHVlKCkpIHsKKyAgICAgICAgcmVzdWx0LmFkZChuZXcgTGFiZWxWYWx1ZSh2KyssICIiKSk7CisgICAgICB9CisgICAgICB2Kys7CisgICAgICByZXN1bHQuYWRkKHZhbHVlcy5nZXQoaSsrKSk7CisgICAgfQorICAgIHJldHVybiBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVMaXN0KHJlc3VsdCk7CisgIH0KKworICBwcm90ZWN0ZWQgU3RyaW5nIG5hbWU7CisKKyAgcHJvdGVjdGVkIFN0cmluZyBhYmJyZXZpYXRlZE5hbWU7CisgIHByb3RlY3RlZCBTdHJpbmcgZnVuY3Rpb25OYW1lOworICBwcm90ZWN0ZWQgYm9vbGVhbiBjb3B5TWluU2NvcmU7CisKKyAgcHJvdGVjdGVkIExpc3Q8TGFiZWxWYWx1ZT4gdmFsdWVzOworICBwcm90ZWN0ZWQgc2hvcnQgbWF4TmVnYXRpdmU7CisgIHByb3RlY3RlZCBzaG9ydCBtYXhQb3NpdGl2ZTsKKworICBwcml2YXRlIHRyYW5zaWVudCBib29sZWFuIGNhbk92ZXJyaWRlOworICBwcml2YXRlIHRyYW5zaWVudCBMaXN0PEludGVnZXI+IGludExpc3Q7CisgIHByaXZhdGUgdHJhbnNpZW50IE1hcDxTaG9ydCwgTGFiZWxWYWx1ZT4gYnlWYWx1ZTsKKworICBwcm90ZWN0ZWQgTGFiZWxUeXBlKCkgeworICB9CisKKyAgcHVibGljIExhYmVsVHlwZShTdHJpbmcgbmFtZSwgTGlzdDxMYWJlbFZhbHVlPiB2YWx1ZUxpc3QpIHsKKyAgICB0aGlzLm5hbWUgPSBjaGVja05hbWUobmFtZSk7CisgICAgY2FuT3ZlcnJpZGUgPSB0cnVlOworICAgIHZhbHVlcyA9IHNvcnRWYWx1ZXModmFsdWVMaXN0KTsKKworICAgIGFiYnJldmlhdGVkTmFtZSA9IGRlZmF1bHRBYmJyZXZpYXRpb24obmFtZSk7CisgICAgZnVuY3Rpb25OYW1lID0gIk1heFdpdGhCbG9jayI7CisKKyAgICBtYXhOZWdhdGl2ZSA9IFNob3J0Lk1JTl9WQUxVRTsKKyAgICBtYXhQb3NpdGl2ZSA9IFNob3J0Lk1BWF9WQUxVRTsKKyAgICBpZiAodmFsdWVzLnNpemUoKSA+IDApIHsKKyAgICAgIGlmICh2YWx1ZXMuZ2V0KDApLmdldFZhbHVlKCkgPCAwKSB7CisgICAgICAgIG1heE5lZ2F0aXZlID0gdmFsdWVzLmdldCgwKS5nZXRWYWx1ZSgpOworICAgICAgfQorICAgICAgaWYgKHZhbHVlcy5nZXQodmFsdWVzLnNpemUoKSAtIDEpLmdldFZhbHVlKCkgPiAwKSB7CisgICAgICAgIG1heFBvc2l0aXZlID0gdmFsdWVzLmdldCh2YWx1ZXMuc2l6ZSgpIC0gMSkuZ2V0VmFsdWUoKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwdWJsaWMgU3RyaW5nIGdldE5hbWUoKSB7CisgICAgcmV0dXJuIG5hbWU7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBtYXRjaGVzKFBhdGNoU2V0QXBwcm92YWwgcHNhKSB7CisgICAgcmV0dXJuIHBzYS5nZXRMYWJlbElkKCkuZ2V0KCkuZXF1YWxzSWdub3JlQ2FzZShuYW1lKTsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgZ2V0QWJicmV2aWF0ZWROYW1lKCkgeworICAgIHJldHVybiBhYmJyZXZpYXRlZE5hbWU7CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRBYmJyZXZpYXRlZE5hbWUoU3RyaW5nIGFiYnJldmlhdGVkTmFtZSkgeworICAgIHRoaXMuYWJicmV2aWF0ZWROYW1lID0gYWJicmV2aWF0ZWROYW1lOworICB9CisKKyAgcHVibGljIFN0cmluZyBnZXRGdW5jdGlvbk5hbWUoKSB7CisgICAgcmV0dXJuIGZ1bmN0aW9uTmFtZTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldEZ1bmN0aW9uTmFtZShTdHJpbmcgZnVuY3Rpb25OYW1lKSB7CisgICAgdGhpcy5mdW5jdGlvbk5hbWUgPSBmdW5jdGlvbk5hbWU7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBjYW5PdmVycmlkZSgpIHsKKyAgICByZXR1cm4gY2FuT3ZlcnJpZGU7CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRDYW5PdmVycmlkZShib29sZWFuIGNhbk92ZXJyaWRlKSB7CisgICAgdGhpcy5jYW5PdmVycmlkZSA9IGNhbk92ZXJyaWRlOworICB9CisKKyAgcHVibGljIExpc3Q8TGFiZWxWYWx1ZT4gZ2V0VmFsdWVzKCkgeworICAgIHJldHVybiB2YWx1ZXM7CisgIH0KKworICBwdWJsaWMgTGFiZWxWYWx1ZSBnZXRNaW4oKSB7CisgICAgaWYgKHZhbHVlcy5pc0VtcHR5KCkpIHsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKyAgICByZXR1cm4gdmFsdWVzLmdldCgwKTsKKyAgfQorCisgIHB1YmxpYyBMYWJlbFZhbHVlIGdldE1heCgpIHsKKyAgICBpZiAodmFsdWVzLmlzRW1wdHkoKSkgeworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorICAgIGZpbmFsIExhYmVsVmFsdWUgdiA9IHZhbHVlcy5nZXQodmFsdWVzLnNpemUoKSAtIDEpOworICAgIHJldHVybiB2LmdldFZhbHVlKCkgPiAwID8gdiA6IG51bGw7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBpc0NvcHlNaW5TY29yZSgpIHsKKyAgICByZXR1cm4gY29weU1pblNjb3JlOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0Q29weU1pblNjb3JlKGJvb2xlYW4gY29weU1pblNjb3JlKSB7CisgICAgdGhpcy5jb3B5TWluU2NvcmUgPSBjb3B5TWluU2NvcmU7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBpc01heE5lZ2F0aXZlKFBhdGNoU2V0QXBwcm92YWwgY2EpIHsKKyAgICByZXR1cm4gbWF4TmVnYXRpdmUgPT0gY2EuZ2V0VmFsdWUoKTsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGlzTWF4UG9zaXRpdmUoUGF0Y2hTZXRBcHByb3ZhbCBjYSkgeworICAgIHJldHVybiBtYXhQb3NpdGl2ZSA9PSBjYS5nZXRWYWx1ZSgpOworICB9CisKKyAgcHVibGljIExhYmVsVmFsdWUgZ2V0VmFsdWUoc2hvcnQgdmFsdWUpIHsKKyAgICBpbml0QnlWYWx1ZSgpOworICAgIHJldHVybiBieVZhbHVlLmdldCh2YWx1ZSk7CisgIH0KKworICBwdWJsaWMgTGFiZWxWYWx1ZSBnZXRWYWx1ZShmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGNhKSB7CisgICAgaW5pdEJ5VmFsdWUoKTsKKyAgICByZXR1cm4gYnlWYWx1ZS5nZXQoY2EuZ2V0VmFsdWUoKSk7CisgIH0KKworICBwcml2YXRlIHZvaWQgaW5pdEJ5VmFsdWUoKSB7CisgICAgaWYgKGJ5VmFsdWUgPT0gbnVsbCkgeworICAgICAgYnlWYWx1ZSA9IG5ldyBIYXNoTWFwPFNob3J0LCBMYWJlbFZhbHVlPigpOworICAgICAgZm9yIChmaW5hbCBMYWJlbFZhbHVlIHYgOiB2YWx1ZXMpIHsKKyAgICAgICAgYnlWYWx1ZS5wdXQodi5nZXRWYWx1ZSgpLCB2KTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwdWJsaWMgTGlzdDxJbnRlZ2VyPiBnZXRWYWx1ZXNBc0xpc3QoKSB7CisgICAgaWYgKGludExpc3QgPT0gbnVsbCkgeworICAgICAgaW50TGlzdCA9IG5ldyBBcnJheUxpc3Q8SW50ZWdlcj4odmFsdWVzLnNpemUoKSk7CisgICAgICBmb3IgKExhYmVsVmFsdWUgdiA6IHZhbHVlcykgeworICAgICAgICBpbnRMaXN0LmFkZChJbnRlZ2VyLnZhbHVlT2Yodi5nZXRWYWx1ZSgpKSk7CisgICAgICB9CisgICAgICBDb2xsZWN0aW9ucy5zb3J0KGludExpc3QpOworICAgICAgQ29sbGVjdGlvbnMucmV2ZXJzZShpbnRMaXN0KTsKKyAgICB9CisgICAgcmV0dXJuIGludExpc3Q7CisgIH0KKworICBwdWJsaWMgTGFiZWxJZCBnZXRMYWJlbElkKCkgeworICAgIHJldHVybiBuZXcgTGFiZWxJZChuYW1lKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgIFN0cmluZ0J1aWxkZXIgc2IgPSBuZXcgU3RyaW5nQnVpbGRlcihuYW1lKS5hcHBlbmQoJ1snKTsKKyAgICBMYWJlbFZhbHVlIG1pbiA9IGdldE1pbigpOworICAgIExhYmVsVmFsdWUgbWF4ID0gZ2V0TWF4KCk7CisgICAgaWYgKG1pbiAhPSBudWxsICYmIG1heCAhPSBudWxsKSB7CisgICAgICBzYi5hcHBlbmQobmV3IFBlcm1pc3Npb25SYW5nZShQZXJtaXNzaW9uLmZvckxhYmVsKG5hbWUpLCBtaW4uZ2V0VmFsdWUoKSwKKyAgICAgICAgICBtYXguZ2V0VmFsdWUoKSkudG9TdHJpbmcoKS50cmltKCkpOworICAgIH0gZWxzZSBpZiAobWluICE9IG51bGwpIHsKKyAgICAgIHNiLmFwcGVuZChtaW4uZm9ybWF0VmFsdWUoKS50cmltKCkpOworICAgIH0gZWxzZSBpZiAobWF4ICE9IG51bGwpIHsKKyAgICAgIHNiLmFwcGVuZChtYXguZm9ybWF0VmFsdWUoKS50cmltKCkpOworICAgIH0KKyAgICBzYi5hcHBlbmQoJ10nKTsKKyAgICByZXR1cm4gc2IudG9TdHJpbmcoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0xhYmVsVHlwZXMuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9MYWJlbFR5cGVzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzRhNDVhNAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9MYWJlbFR5cGVzLmphdmEKQEAgLTAsMCArMSwxMDEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsLkxhYmVsSWQ7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitwdWJsaWMgY2xhc3MgTGFiZWxUeXBlcyB7CisgIHByb3RlY3RlZCBMaXN0PExhYmVsVHlwZT4gbGFiZWxUeXBlczsKKyAgcHJpdmF0ZSB0cmFuc2llbnQgTWFwPFN0cmluZywgTGFiZWxUeXBlPiBieUxhYmVsOworICBwcml2YXRlIHRyYW5zaWVudCBNYXA8U3RyaW5nLCBJbnRlZ2VyPiBwb3NpdGlvbnM7CisKKyAgcHJvdGVjdGVkIExhYmVsVHlwZXMoKSB7CisgIH0KKworICBwdWJsaWMgTGFiZWxUeXBlcyhmaW5hbCBMaXN0PD8gZXh0ZW5kcyBMYWJlbFR5cGU+IGFwcHJvdmFscykgeworICAgIGxhYmVsVHlwZXMgPQorICAgICAgICBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVMaXN0KG5ldyBBcnJheUxpc3Q8TGFiZWxUeXBlPihhcHByb3ZhbHMpKTsKKyAgfQorCisgIHB1YmxpYyBMaXN0PExhYmVsVHlwZT4gZ2V0TGFiZWxUeXBlcygpIHsKKyAgICByZXR1cm4gbGFiZWxUeXBlczsKKyAgfQorCisgIHB1YmxpYyBMYWJlbFR5cGUgYnlMYWJlbChMYWJlbElkIGxhYmVsSWQpIHsKKyAgICByZXR1cm4gYnlMYWJlbCgpLmdldChsYWJlbElkLmdldCgpLnRvTG93ZXJDYXNlKCkpOworICB9CisKKyAgcHVibGljIExhYmVsVHlwZSBieUxhYmVsKFN0cmluZyBsYWJlbE5hbWUpIHsKKyAgICByZXR1cm4gYnlMYWJlbCgpLmdldChsYWJlbE5hbWUudG9Mb3dlckNhc2UoKSk7CisgIH0KKworICBwcml2YXRlIE1hcDxTdHJpbmcsIExhYmVsVHlwZT4gYnlMYWJlbCgpIHsKKyAgICBpZiAoYnlMYWJlbCA9PSBudWxsKSB7CisgICAgICBieUxhYmVsID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBMYWJlbFR5cGU+KCk7CisgICAgICBpZiAobGFiZWxUeXBlcyAhPSBudWxsKSB7CisgICAgICAgIGZvciAoTGFiZWxUeXBlIHQgOiBsYWJlbFR5cGVzKSB7CisgICAgICAgICAgYnlMYWJlbC5wdXQodC5nZXROYW1lKCkudG9Mb3dlckNhc2UoKSwgdCk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGJ5TGFiZWw7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKyAgICByZXR1cm4gbGFiZWxUeXBlcy50b1N0cmluZygpOworICB9CisKKyAgcHVibGljIENvbXBhcmF0b3I8U3RyaW5nPiBuYW1lQ29tcGFyYXRvcigpIHsKKyAgICBmaW5hbCBNYXA8U3RyaW5nLCBJbnRlZ2VyPiBwb3NpdGlvbnMgPSBwb3NpdGlvbnMoKTsKKyAgICByZXR1cm4gbmV3IENvbXBhcmF0b3I8U3RyaW5nPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIGludCBjb21wYXJlKFN0cmluZyBsZWZ0LCBTdHJpbmcgcmlnaHQpIHsKKyAgICAgICAgaW50IGxwID0gcG9zaXRpb24obGVmdCk7CisgICAgICAgIGludCBycCA9IHBvc2l0aW9uKHJpZ2h0KTsKKyAgICAgICAgaW50IGNtcCA9IGxwIC0gcnA7CisgICAgICAgIGlmIChjbXAgPT0gMCkgeworICAgICAgICAgIGNtcCA9IGxlZnQuY29tcGFyZVRvKHJpZ2h0KTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gY21wOworICAgICAgfQorCisgICAgICBwcml2YXRlIGludCBwb3NpdGlvbihTdHJpbmcgbmFtZSkgeworICAgICAgICBJbnRlZ2VyIHAgPSBwb3NpdGlvbnMuZ2V0KG5hbWUpOworICAgICAgICByZXR1cm4gcCAhPSBudWxsID8gcCA6IHBvc2l0aW9ucy5zaXplKCk7CisgICAgICB9CisgICAgfTsKKyAgfQorCisgIHByaXZhdGUgTWFwPFN0cmluZywgSW50ZWdlcj4gcG9zaXRpb25zKCkgeworICAgIGlmIChwb3NpdGlvbnMgPT0gbnVsbCkgeworICAgICAgcG9zaXRpb25zID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBJbnRlZ2VyPigpOworICAgICAgaWYgKGxhYmVsVHlwZXMgIT0gbnVsbCkgeworICAgICAgICBpbnQgaSA9IDA7CisgICAgICAgIGZvciAoTGFiZWxUeXBlIHQgOiBsYWJlbFR5cGVzKSB7CisgICAgICAgICAgcG9zaXRpb25zLnB1dCh0LmdldE5hbWUoKSwgaSsrKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gcG9zaXRpb25zOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvTGFiZWxWYWx1ZS5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0xhYmVsVmFsdWUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZDI5ZTA1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL0xhYmVsVmFsdWUuamF2YQpAQCAtMCwwICsxLDYzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7CisKK3B1YmxpYyBjbGFzcyBMYWJlbFZhbHVlIHsKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgZm9ybWF0VmFsdWUoc2hvcnQgdmFsdWUpIHsKKyAgICBpZiAodmFsdWUgPCAwKSB7CisgICAgICByZXR1cm4gU2hvcnQudG9TdHJpbmcodmFsdWUpOworICAgIH0gZWxzZSBpZiAodmFsdWUgPT0gMCkgeworICAgICAgcmV0dXJuICIgMCI7CisgICAgfSBlbHNlIHsKKyAgICAgIHJldHVybiAiKyIgKyBTaG9ydC50b1N0cmluZyh2YWx1ZSk7CisgICAgfQorICB9CisKKyAgcHJvdGVjdGVkIHNob3J0IHZhbHVlOworICBwcm90ZWN0ZWQgU3RyaW5nIHRleHQ7CisKKyAgcHVibGljIExhYmVsVmFsdWUoc2hvcnQgdmFsdWUsIFN0cmluZyB0ZXh0KSB7CisgICAgdGhpcy52YWx1ZSA9IHZhbHVlOworICAgIHRoaXMudGV4dCA9IHRleHQ7CisgIH0KKworICBwcm90ZWN0ZWQgTGFiZWxWYWx1ZSgpIHsKKyAgfQorCisgIHB1YmxpYyBzaG9ydCBnZXRWYWx1ZSgpIHsKKyAgICByZXR1cm4gdmFsdWU7CisgIH0KKworICBwdWJsaWMgU3RyaW5nIGdldFRleHQoKSB7CisgICAgcmV0dXJuIHRleHQ7CisgIH0KKworICBwdWJsaWMgU3RyaW5nIGZvcm1hdFZhbHVlKCkgeworICAgIHJldHVybiBmb3JtYXRWYWx1ZSh2YWx1ZSk7CisgIH0KKworICBwdWJsaWMgU3RyaW5nIGZvcm1hdCgpIHsKKyAgICBTdHJpbmdCdWlsZGVyIHNiID0gbmV3IFN0cmluZ0J1aWxkZXIoZm9ybWF0VmFsdWUoKSk7CisgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkgeworICAgICAgc2IuYXBwZW5kKCcgJykuYXBwZW5kKHRleHQpOworICAgIH0KKyAgICByZXR1cm4gc2IudG9TdHJpbmcoKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgIHJldHVybiBmb3JtYXQoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1BhdGNoRGV0YWlsU2VydmljZS5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1BhdGNoRGV0YWlsU2VydmljZS5qYXZhCmluZGV4IDkxZWNiOTIuLjViMjM0YzcxIDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGF0Y2hEZXRhaWxTZXJ2aWNlLmphdmEKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1BhdGNoRGV0YWlsU2VydmljZS5qYXZhCkBAIC0xNiwyMiArMTYsMTUgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdWRpdC5BdWRpdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5TaWduSW5SZXF1aXJlZDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudERpZmZQcmVmZXJlbmNlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaC5LZXk7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uUmVtb3RlSnNvblNlcnZpY2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5ScGNJbXBsOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uVm9pZFJlc3VsdDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLlJwY0ltcGwuVmVyc2lvbjsKLQotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwogCiBAUnBjSW1wbCh2ZXJzaW9uID0gVmVyc2lvbi5WMl8wKQogcHVibGljIGludGVyZmFjZSBQYXRjaERldGFpbFNlcnZpY2UgZXh0ZW5kcyBSZW1vdGVKc29uU2VydmljZSB7CkBAIC02NCwzMyArNTcsNCBAQAogICBAQXVkaXQKICAgQFNpZ25JblJlcXVpcmVkCiAgIHZvaWQgZGVsZXRlRHJhZnRQYXRjaFNldChQYXRjaFNldC5JZCBwc2lkLCBBc3luY0NhbGxiYWNrPENoYW5nZURldGFpbD4gY2FsbGJhY2spOwotCi0gIEBBdWRpdAotICBAU2lnbkluUmVxdWlyZWQKLSAgdm9pZCBwdWJsaXNoQ29tbWVudHMoUGF0Y2hTZXQuSWQgcHNpZCwgU3RyaW5nIG1lc3NhZ2UsCi0gICAgICBTZXQ8QXBwcm92YWxDYXRlZ29yeVZhbHVlLklkPiBhcHByb3ZhbHMsCi0gICAgICBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNhbGxiYWNrKTsKLQotICBAQXVkaXQKLSAgQFNpZ25JblJlcXVpcmVkCi0gIHZvaWQgYWRkUmV2aWV3ZXJzKENoYW5nZS5JZCBpZCwgTGlzdDxTdHJpbmc+IHJldmlld2VycywgYm9vbGVhbiBjb25maXJtZWQsCi0gICAgICBBc3luY0NhbGxiYWNrPFJldmlld2VyUmVzdWx0PiBjYWxsYmFjayk7Ci0KLSAgQEF1ZGl0Ci0gIEBTaWduSW5SZXF1aXJlZAotICB2b2lkIHJlbW92ZVJldmlld2VyKENoYW5nZS5JZCBpZCwgQWNjb3VudC5JZCByZXZpZXdlcklkLAotICAgICAgQXN5bmNDYWxsYmFjazxSZXZpZXdlclJlc3VsdD4gY2FsbGJhY2spOwotCi0gIHZvaWQgdXNlckFwcHJvdmFscyhTZXQ8Q2hhbmdlLklkPiBjaWRzLCBBY2NvdW50LklkIGFpZCwKLSAgICAgIEFzeW5jQ2FsbGJhY2s8QXBwcm92YWxTdW1tYXJ5U2V0PiBjYWxsYmFjayk7Ci0KLSAgdm9pZCBzdHJvbmdlc3RBcHByb3ZhbHMoU2V0PENoYW5nZS5JZD4gY2lkcywKLSAgICAgIEFzeW5jQ2FsbGJhY2s8QXBwcm92YWxTdW1tYXJ5U2V0PiBjYWxsYmFjayk7Ci0KLSAgLyoqCi0gICAqIFVwZGF0ZSB0aGUgcmV2aWV3ZWQgc3RhdHVzIGZvciB0aGUgcGF0Y2guCi0gICAqLwotICBAQXVkaXQKLSAgQFNpZ25JblJlcXVpcmVkCi0gIHZvaWQgc2V0UmV2aWV3ZWRCeUN1cnJlbnRVc2VyKEtleSBwYXRjaEtleSwgYm9vbGVhbiByZXZpZXdlZCwgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PiBjYWxsYmFjayk7CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGF0Y2hTY3JpcHQuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QYXRjaFNjcmlwdC5qYXZhCmluZGV4IDIzMDhiNzcuLmZlY2JiNzYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QYXRjaFNjcmlwdC5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QYXRjaFNjcmlwdC5qYXZhCkBAIC01Myw2ICs1Myw3IEBACiAgIHByb3RlY3RlZCBib29sZWFuIGh1Z2VGaWxlOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBpbnRyYWxpbmVEaWZmZXJlbmNlOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBpbnRyYWxpbmVGYWlsdXJlOworICBwcm90ZWN0ZWQgYm9vbGVhbiBpbnRyYWxpbmVUaW1lb3V0OwogCiAgIHB1YmxpYyBQYXRjaFNjcmlwdChmaW5hbCBDaGFuZ2UuS2V5IGNrLCBmaW5hbCBDaGFuZ2VUeXBlIGN0LCBmaW5hbCBTdHJpbmcgb24sCiAgICAgICBmaW5hbCBTdHJpbmcgbm4sIGZpbmFsIEZpbGVNb2RlIG9tLCBmaW5hbCBGaWxlTW9kZSBubSwKQEAgLTYwLDcgKzYxLDcgQEAKICAgICAgIGZpbmFsIFNwYXJzZUZpbGVDb250ZW50IGNhLCBmaW5hbCBTcGFyc2VGaWxlQ29udGVudCBjYiwKICAgICAgIGZpbmFsIExpc3Q8RWRpdD4gZSwgZmluYWwgRGlzcGxheU1ldGhvZCBtYSwgZmluYWwgRGlzcGxheU1ldGhvZCBtYiwKICAgICAgIGZpbmFsIENvbW1lbnREZXRhaWwgY2QsIGZpbmFsIExpc3Q8UGF0Y2g+IGhpc3QsIGZpbmFsIGJvb2xlYW4gaGYsCi0gICAgICBmaW5hbCBib29sZWFuIGlkLCBmaW5hbCBib29sZWFuIGlkZikgeworICAgICAgZmluYWwgYm9vbGVhbiBpZCwgZmluYWwgYm9vbGVhbiBpZGYsIGZpbmFsIGJvb2xlYW4gaWR0KSB7CiAgICAgY2hhbmdlSWQgPSBjazsKICAgICBjaGFuZ2VUeXBlID0gY3Q7CiAgICAgb2xkTmFtZSA9IG9uOwpAQCAtNzksNiArODAsNyBAQAogICAgIGh1Z2VGaWxlID0gaGY7CiAgICAgaW50cmFsaW5lRGlmZmVyZW5jZSA9IGlkOwogICAgIGludHJhbGluZUZhaWx1cmUgPSBpZGY7CisgICAgaW50cmFsaW5lVGltZW91dCA9IGlkdDsKICAgfQogCiAgIHByb3RlY3RlZCBQYXRjaFNjcmlwdCgpIHsKQEAgLTE1Miw2ICsxNTQsMTAgQEAKICAgICByZXR1cm4gaW50cmFsaW5lRmFpbHVyZTsKICAgfQogCisgIHB1YmxpYyBib29sZWFuIGhhc0ludHJhbGluZVRpbWVvdXQoKSB7CisgICAgcmV0dXJuIGludHJhbGluZVRpbWVvdXQ7CisgIH0KKwogICBwdWJsaWMgYm9vbGVhbiBpc0V4cGFuZEFsbENvbW1lbnRzKCkgewogICAgIHJldHVybiBkaWZmUHJlZnMuaXNFeHBhbmRBbGxDb21tZW50cygpOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGF0Y2hTZXRQdWJsaXNoRGV0YWlsLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGF0Y2hTZXRQdWJsaXNoRGV0YWlsLmphdmEKaW5kZXggM2M1YzY4OC4uYTliNjMzNSAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1BhdGNoU2V0UHVibGlzaERldGFpbC5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QYXRjaFNldFB1Ymxpc2hEZXRhaWwuamF2YQpAQCAtMTQsMTUgKzE0LDEwIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaExpbmVDb21tZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEluZm87CiAKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogcHVibGljIGNsYXNzIFBhdGNoU2V0UHVibGlzaERldGFpbCB7CkBAIC0zMCw0MyArMjUsMTYgQEAKICAgcHJvdGVjdGVkIFBhdGNoU2V0SW5mbyBwYXRjaFNldEluZm87CiAgIHByb3RlY3RlZCBDaGFuZ2UgY2hhbmdlOwogICBwcm90ZWN0ZWQgTGlzdDxQYXRjaExpbmVDb21tZW50PiBkcmFmdHM7Ci0gIHByb3RlY3RlZCBMaXN0PFBlcm1pc3Npb25SYW5nZT4gbGFiZWxzOwotICBwcm90ZWN0ZWQgTGlzdDxBcHByb3ZhbERldGFpbD4gYXBwcm92YWxzOwogICBwcm90ZWN0ZWQgTGlzdDxTdWJtaXRSZWNvcmQ+IHN1Ym1pdFJlY29yZHM7Ci0gIHByb3RlY3RlZCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGdpdmVuOworICBwcm90ZWN0ZWQgU3VibWl0VHlwZVJlY29yZCBzdWJtaXRUeXBlUmVjb3JkOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5TdWJtaXQ7CiAKLSAgcHVibGljIExpc3Q8UGVybWlzc2lvblJhbmdlPiBnZXRMYWJlbHMoKSB7Ci0gICAgcmV0dXJuIGxhYmVsczsKKyAgcHVibGljIHZvaWQgc2V0U3VibWl0VHlwZVJlY29yZChTdWJtaXRUeXBlUmVjb3JkIHN1Ym1pdFR5cGVSZWNvcmQpIHsKKyAgICB0aGlzLnN1Ym1pdFR5cGVSZWNvcmQgPSBzdWJtaXRUeXBlUmVjb3JkOwogICB9CiAKLSAgcHVibGljIHZvaWQgc2V0TGFiZWxzKExpc3Q8UGVybWlzc2lvblJhbmdlPiBsYWJlbHMpIHsKLSAgICB0aGlzLmxhYmVscyA9IGxhYmVsczsKLSAgfQotCi0gIHB1YmxpYyBMaXN0PEFwcHJvdmFsRGV0YWlsPiBnZXRBcHByb3ZhbHMoKSB7Ci0gICAgcmV0dXJuIGFwcHJvdmFsczsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldEFwcHJvdmFscyhDb2xsZWN0aW9uPEFwcHJvdmFsRGV0YWlsPiBsaXN0KSB7Ci0gICAgYXBwcm92YWxzID0gbmV3IEFycmF5TGlzdDxBcHByb3ZhbERldGFpbD4obGlzdCk7Ci0gICAgQ29sbGVjdGlvbnMuc29ydChhcHByb3ZhbHMsIEFwcHJvdmFsRGV0YWlsLlNPUlQpOwotICB9Ci0KLSAgcHVibGljIHZvaWQgc2V0U3VibWl0UmVjb3JkcyhMaXN0PFN1Ym1pdFJlY29yZD4gYWxsKSB7Ci0gICAgc3VibWl0UmVjb3JkcyA9IGFsbDsKLSAgfQotCi0gIHB1YmxpYyBMaXN0PFN1Ym1pdFJlY29yZD4gZ2V0U3VibWl0UmVjb3JkcygpIHsKLSAgICByZXR1cm4gc3VibWl0UmVjb3JkczsKLSAgfQotCi0gIHB1YmxpYyBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGdldEdpdmVuKCkgewotICAgIHJldHVybiBnaXZlbjsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldEdpdmVuKExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gZ2l2ZW4pIHsKLSAgICB0aGlzLmdpdmVuID0gZ2l2ZW47CisgIHB1YmxpYyBTdWJtaXRUeXBlUmVjb3JkIGdldFN1Ym1pdFR5cGVSZWNvcmQoKSB7CisgICAgcmV0dXJuIHN1Ym1pdFR5cGVSZWNvcmQ7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBzZXRBY2NvdW50cyhBY2NvdW50SW5mb0NhY2hlIGFjY291bnRzKSB7CkBAIC0xMDUsMjQgKzczLDYgQEAKICAgICByZXR1cm4gZHJhZnRzOwogICB9CiAKLSAgcHVibGljIFBlcm1pc3Npb25SYW5nZSBnZXRSYW5nZShmaW5hbCBTdHJpbmcgcGVybWlzc2lvbk5hbWUpIHsKLSAgICBmb3IgKFBlcm1pc3Npb25SYW5nZSBzIDogbGFiZWxzKSB7Ci0gICAgICBpZiAocy5nZXROYW1lKCkuZXF1YWxzKHBlcm1pc3Npb25OYW1lKSkgewotICAgICAgICByZXR1cm4gczsKLSAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIG51bGw7Ci0gIH0KLQotICBwdWJsaWMgUGF0Y2hTZXRBcHByb3ZhbCBnZXRDaGFuZ2VBcHByb3ZhbChBcHByb3ZhbENhdGVnb3J5LklkIGlkKSB7Ci0gICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGEgOiBnaXZlbikgewotICAgICAgaWYgKGEuZ2V0Q2F0ZWdvcnlJZCgpLmVxdWFscyhpZCkpIHsKLSAgICAgICAgcmV0dXJuIGE7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBudWxsOwotICB9Ci0KICAgcHVibGljIGJvb2xlYW4gY2FuU3VibWl0KCkgewogICAgIHJldHVybiBjYW5TdWJtaXQ7CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QZXJtaXNzaW9uLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGVybWlzc2lvbi5qYXZhCmluZGV4IGZkNDA4ODguLjA1ODU2NTEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9QZXJtaXNzaW9uLmphdmEKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Blcm1pc3Npb24uamF2YQpAQCAtMjMsMTcgKzIzLDIzIEBACiBwdWJsaWMgY2xhc3MgUGVybWlzc2lvbiBpbXBsZW1lbnRzIENvbXBhcmFibGU8UGVybWlzc2lvbj4gewogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBBQkFORE9OID0gImFiYW5kb24iOwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBDUkVBVEUgPSAiY3JlYXRlIjsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVMRVRFX0RSQUZUUyA9ICJkZWxldGVEcmFmdHMiOworICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBFRElUX1RPUElDX05BTUUgPSAiZWRpdFRvcGljTmFtZSI7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZPUkdFX0FVVEhPUiA9ICJmb3JnZUF1dGhvciI7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZPUkdFX0NPTU1JVFRFUiA9ICJmb3JnZUNvbW1pdHRlciI7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZPUkdFX1NFUlZFUiA9ICJmb3JnZVNlcnZlckFzQ29tbWl0dGVyIjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTEFCRUwgPSAibGFiZWwtIjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgT1dORVIgPSAib3duZXIiOworICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQVUJMSVNIX0RSQUZUUyA9ICJwdWJsaXNoRHJhZnRzIjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFVTSCA9ICJwdXNoIjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFVTSF9NRVJHRSA9ICJwdXNoTWVyZ2UiOwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQVVNIX1RBRyA9ICJwdXNoVGFnIjsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFVTSF9TSUdORURfVEFHID0gInB1c2hTaWduZWRUYWciOwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBSRUFEID0gInJlYWQiOwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBSRUJBU0UgPSAicmViYXNlIjsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUkVNT1ZFX1JFVklFV0VSID0gInJlbW92ZVJldmlld2VyIjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgU1VCTUlUID0gInN1Ym1pdCI7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFZJRVdfRFJBRlRTID0gInZpZXdEcmFmdHMiOwogCiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIExpc3Q8U3RyaW5nPiBOQU1FU19MQzsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IGxhYmVsSW5kZXg7CkBAIC01MCw5ICs1NiwxNSBAQAogICAgIE5BTUVTX0xDLmFkZChQVVNILnRvTG93ZXJDYXNlKCkpOwogICAgIE5BTUVTX0xDLmFkZChQVVNIX01FUkdFLnRvTG93ZXJDYXNlKCkpOwogICAgIE5BTUVTX0xDLmFkZChQVVNIX1RBRy50b0xvd2VyQ2FzZSgpKTsKKyAgICBOQU1FU19MQy5hZGQoUFVTSF9TSUdORURfVEFHLnRvTG93ZXJDYXNlKCkpOwogICAgIE5BTUVTX0xDLmFkZChMQUJFTC50b0xvd2VyQ2FzZSgpKTsKICAgICBOQU1FU19MQy5hZGQoUkVCQVNFLnRvTG93ZXJDYXNlKCkpOworICAgIE5BTUVTX0xDLmFkZChSRU1PVkVfUkVWSUVXRVIudG9Mb3dlckNhc2UoKSk7CiAgICAgTkFNRVNfTEMuYWRkKFNVQk1JVC50b0xvd2VyQ2FzZSgpKTsKKyAgICBOQU1FU19MQy5hZGQoVklFV19EUkFGVFMudG9Mb3dlckNhc2UoKSk7CisgICAgTkFNRVNfTEMuYWRkKEVESVRfVE9QSUNfTkFNRS50b0xvd2VyQ2FzZSgpKTsKKyAgICBOQU1FU19MQy5hZGQoREVMRVRFX0RSQUZUUy50b0xvd2VyQ2FzZSgpKTsKKyAgICBOQU1FU19MQy5hZGQoUFVCTElTSF9EUkFGVFMudG9Mb3dlckNhc2UoKSk7CiAKICAgICBsYWJlbEluZGV4ID0gTkFNRVNfTEMuaW5kZXhPZihQZXJtaXNzaW9uLkxBQkVMKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Blcm1pc3Npb25SdWxlLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGVybWlzc2lvblJ1bGUuamF2YQppbmRleCA1OTYwMTY1Li5hN2E2NmIxIDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGVybWlzc2lvblJ1bGUuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUGVybWlzc2lvblJ1bGUuamF2YQpAQCAtMTYsNiArMTYsNyBAQAogCiBwdWJsaWMgY2xhc3MgUGVybWlzc2lvblJ1bGUgaW1wbGVtZW50cyBDb21wYXJhYmxlPFBlcm1pc3Npb25SdWxlPiB7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZPUkNFX1BVU0ggPSAiRm9yY2UgUHVzaCI7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEZPUkNFX0VESVQgPSAiRm9yY2UgRWRpdCI7CiAgIHB1YmxpYyBzdGF0aWMgZW51bSBBY3Rpb24gewogICAgIEFMTE9XLCBERU5ZLCBCTE9DSywKIApAQCAtMjUxLDcgKzI1Miw3IEBACiAgICAgcmV0dXJuIHJ1bGU7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBpbnQgcGFyc2VJbnQoU3RyaW5nIHZhbHVlKSB7CisgIHB1YmxpYyBzdGF0aWMgaW50IHBhcnNlSW50KFN0cmluZyB2YWx1ZSkgewogICAgIGlmICh2YWx1ZS5zdGFydHNXaXRoKCIrIikpIHsKICAgICAgIHZhbHVlID0gdmFsdWUuc3Vic3RyaW5nKDEpOwogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Qcm9qZWN0QWNjZXNzLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUHJvamVjdEFjY2Vzcy5qYXZhCmluZGV4IDE4OTM4NDMuLjkwNGM1YzcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Qcm9qZWN0QWNjZXNzLmphdmEKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Byb2plY3RBY2Nlc3MuamF2YQpAQCAtMjcsNiArMjcsNyBAQAogICBwcm90ZWN0ZWQgU2V0PFN0cmluZz4gb3duZXJPZjsKICAgcHJvdGVjdGVkIGJvb2xlYW4gaXNDb25maWdWaXNpYmxlOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBjYW5VcGxvYWQ7CisgIHByb3RlY3RlZCBMYWJlbFR5cGVzIGxhYmVsVHlwZXM7CiAKICAgcHVibGljIFByb2plY3RBY2Nlc3MoKSB7CiAgIH0KQEAgLTEwMyw0ICsxMDQsMTIgQEAKICAgcHVibGljIHZvaWQgc2V0Q2FuVXBsb2FkKGJvb2xlYW4gY2FuVXBsb2FkKSB7CiAgICAgdGhpcy5jYW5VcGxvYWQgPSBjYW5VcGxvYWQ7CiAgIH0KKworICBwdWJsaWMgTGFiZWxUeXBlcyBnZXRMYWJlbFR5cGVzKCkgeworICAgIHJldHVybiBsYWJlbFR5cGVzOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0TGFiZWxUeXBlcyhMYWJlbFR5cGVzIGxhYmVsVHlwZXMpIHsKKyAgICB0aGlzLmxhYmVsVHlwZXMgPSBsYWJlbFR5cGVzOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUHJvamVjdEFkbWluU2VydmljZS5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Byb2plY3RBZG1pblNlcnZpY2UuamF2YQppbmRleCAxM2MwYTQ4Li4wNjM4OTA2IDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUHJvamVjdEFkbWluU2VydmljZS5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Qcm9qZWN0QWRtaW5TZXJ2aWNlLmphdmEKQEAgLTIyLDcgKzIyLDYgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkFzeW5jQ2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5SZW1vdGVKc29uU2VydmljZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLlJwY0ltcGw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uUnBjSW1wbC5WZXJzaW9uOwogCiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CkBAIC0zNSwxMiArMzQsNiBAQAogICB2b2lkIHByb2plY3REZXRhaWwoUHJvamVjdC5OYW1lS2V5IHByb2plY3ROYW1lLAogICAgICAgQXN5bmNDYWxsYmFjazxQcm9qZWN0RGV0YWlsPiBjYWxsYmFjayk7CiAKLSAgQEF1ZGl0Ci0gIEBTaWduSW5SZXF1aXJlZAotICB2b2lkIGNyZWF0ZU5ld1Byb2plY3QoU3RyaW5nIHByb2plY3ROYW1lLCBTdHJpbmcgcGFyZW50TmFtZSwKLSAgICAgIGJvb2xlYW4gZW1wdHlDb21taXQsIGJvb2xlYW4gcGVybWlzc2lvbnNPbmx5LAotICAgICAgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PiBjYWxsYmFjayk7Ci0KICAgdm9pZCBwcm9qZWN0QWNjZXNzKFByb2plY3QuTmFtZUtleSBwcm9qZWN0TmFtZSwKICAgICAgIEFzeW5jQ2FsbGJhY2s8UHJvamVjdEFjY2Vzcz4gY2FsbGJhY2spOwogCkBAIC02Niw3ICs1OSw3IEBACiAgIEBBdWRpdAogICBAU2lnbkluUmVxdWlyZWQKICAgdm9pZCBhZGRCcmFuY2goUHJvamVjdC5OYW1lS2V5IHByb2plY3ROYW1lLCBTdHJpbmcgYnJhbmNoTmFtZSwKLSAgICAgIFN0cmluZyBzdGFydGluZ1JldmlzaW9uLCBBc3luY0NhbGxiYWNrPExpc3RCcmFuY2hlc1Jlc3VsdD4gY2FsbGJhY2spOworICAgICAgU3RyaW5nIHN0YXJ0aW5nUmV2aXNpb24sIEFzeW5jQ2FsbGJhY2s8QWRkQnJhbmNoUmVzdWx0PiBjYWxsYmFjayk7CiAKICAgQEF1ZGl0CiAgIEBTaWduSW5SZXF1aXJlZApkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Byb2plY3REZXRhaWwuamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9Qcm9qZWN0RGV0YWlsLmphdmEKaW5kZXggMWQ4OGNmOC4uMWU3NTg5YiAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Byb2plY3REZXRhaWwuamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUHJvamVjdERldGFpbC5qYXZhCkBAIC0xNCw2ICsxNCw3IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuSW5oZXJpdGVkQm9vbGVhbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIAogcHVibGljIGNsYXNzIFByb2plY3REZXRhaWwgewpAQCAtMjQsNiArMjUsMTAgQEAKICAgcHVibGljIGJvb2xlYW4gY2FuTW9kaWZ5QWNjZXNzOwogICBwdWJsaWMgYm9vbGVhbiBjYW5Nb2RpZnlTdGF0ZTsKICAgcHVibGljIGJvb2xlYW4gaXNQZXJtaXNzaW9uT25seTsKKyAgcHVibGljIEluaGVyaXRlZEJvb2xlYW4gdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzOworICBwdWJsaWMgSW5oZXJpdGVkQm9vbGVhbiB1c2VTaWduZWRPZmZCeTsKKyAgcHVibGljIEluaGVyaXRlZEJvb2xlYW4gdXNlQ29udGVudE1lcmdlOworICBwdWJsaWMgSW5oZXJpdGVkQm9vbGVhbiByZXF1aXJlQ2hhbmdlSUQ7CiAKICAgcHVibGljIFByb2plY3REZXRhaWwoKSB7CiAgIH0KQEAgLTU1LDQgKzYwLDIwIEBACiAgIHB1YmxpYyB2b2lkIHNldFBlcm1pc3Npb25Pbmx5KGZpbmFsIGJvb2xlYW4gaXBvKSB7CiAgICAgaXNQZXJtaXNzaW9uT25seSA9IGlwbzsKICAgfQorCisgIHB1YmxpYyB2b2lkIHNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyhmaW5hbCBJbmhlcml0ZWRCb29sZWFuIHVjYSkgeworICAgIHVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyA9IHVjYTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldFVzZVNpZ25lZE9mZkJ5KGZpbmFsIEluaGVyaXRlZEJvb2xlYW4gdXNvYikgeworICAgIHVzZVNpZ25lZE9mZkJ5ID0gdXNvYjsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldFVzZUNvbnRlbnRNZXJnZShmaW5hbCBJbmhlcml0ZWRCb29sZWFuIHVjbSkgeworICAgIHVzZUNvbnRlbnRNZXJnZSA9IHVjbTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldFJlcXVpcmVDaGFuZ2VJRChmaW5hbCBJbmhlcml0ZWRCb29sZWFuIHJjaWQpIHsKKyAgICByZXF1aXJlQ2hhbmdlSUQgPSByY2lkOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUmVmQ29uZmlnU2VjdGlvbi5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1JlZkNvbmZpZ1NlY3Rpb24uamF2YQppbmRleCA4MTBlOTA2Li5mNzQwNDY0IDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUmVmQ29uZmlnU2VjdGlvbi5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9SZWZDb25maWdTZWN0aW9uLmphdmEKQEAgLTIxLDkgKzIxLDYgQEAKICAgLyoqIFBhdHRlcm4gdGhhdCBtYXRjaGVzIGFsbCBicmFuY2hlcyBpbiBhIHByb2plY3QuICovCiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIEhFQURTID0gInJlZnMvaGVhZHMvKiI7CiAKLSAgLyoqIENvbmZpZ3VyYXRpb24gc2V0dGluZ3MgZm9yIGEgcHJvamVjdCB7QGNvZGUgcmVmcy9tZXRhL2NvbmZpZ30gKi8KLSAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUkVGX0NPTkZJRyA9ICJyZWZzL21ldGEvY29uZmlnIjsKLQogICAvKiogUHJlZml4IHRoYXQgdHJpZ2dlcnMgYSByZWd1bGFyIGV4cHJlc3Npb24gcGF0dGVybi4gKi8KICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUkVHRVhfUFJFRklYID0gIl4iOwogCmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUmV2aWV3UmVzdWx0LmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvUmV2aWV3UmVzdWx0LmphdmEKaW5kZXggYzBiZjgxOC4uMWM4N2M3MSAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1Jldmlld1Jlc3VsdC5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZGF0YS9SZXZpZXdSZXN1bHQuamF2YQpAQCAtODIsNyArODIsMTAgQEAKICAgICAgIEdJVF9FUlJPUiwKIAogICAgICAgLyoqIFRoZSBkZXN0aW5hdGlvbiBicmFuY2ggZG9lcyBub3QgZXhpc3QgKi8KLSAgICAgIERFU1RfQlJBTkNIX05PVF9GT1VORAorICAgICAgREVTVF9CUkFOQ0hfTk9UX0ZPVU5ELAorCisgICAgICAvKiogTm90IHBlcm1pdHRlZCB0byBlZGl0IHRoZSB0b3BpYyBuYW1lICovCisgICAgICBFRElUX1RPUElDX05BTUVfTk9UX1BFUk1JVFRFRAogICAgIH0KIAogICAgIHByb3RlY3RlZCBUeXBlIHR5cGU7CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2RhdGEvU3VibWl0VHlwZVJlY29yZC5qYXZhIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1N1Ym1pdFR5cGVSZWNvcmQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40ZWVhNzk4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9kYXRhL1N1Ym1pdFR5cGVSZWNvcmQuamF2YQpAQCAtMCwwICsxLDU4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGE7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKKworLyoqCisgKiBEZXNjcmliZXMgdGhlIHN1Ym1pdCB0eXBlIGZvciBhIGNoYW5nZS4KKyAqLworcHVibGljIGNsYXNzIFN1Ym1pdFR5cGVSZWNvcmQgeworICBwdWJsaWMgc3RhdGljIGVudW0gU3RhdHVzIHsKKyAgICAvKiogVGhlIHR5cGUgd2FzIGNvbXB1dGVkIHN1Y2Nlc3NmdWxseSAqLworICAgIE9LLAorCisgICAgLyoqIEFuIGludGVybmFsIHNlcnZlciBlcnJvciBvY2N1cnJlZCBwcmV2ZW50aW5nIGNvbXB1dGF0aW9uLgorICAgICAqIDxwPgorICAgICAqIEFkZGl0aW9uYWwgZGV0YWlsIG1heSBiZSBhdmFpbGFibGUgaW4ge0BsaW5rIFN1Ym1pdFR5cGVSZWNvcmQjZXJyb3JNZXNzYWdlfQorICAgICAqLworICAgIFJVTEVfRVJST1IKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgU3VibWl0VHlwZVJlY29yZCBPSyhQcm9qZWN0LlN1Ym1pdFR5cGUgdHlwZSkgeworICAgIFN1Ym1pdFR5cGVSZWNvcmQgciA9IG5ldyBTdWJtaXRUeXBlUmVjb3JkKCk7CisgICAgci5zdGF0dXMgPSBTdGF0dXMuT0s7CisgICAgci50eXBlID0gdHlwZTsKKyAgICByZXR1cm4gcjsKKyAgfQorCisgIHB1YmxpYyBTdGF0dXMgc3RhdHVzOworICBwdWJsaWMgUHJvamVjdC5TdWJtaXRUeXBlIHR5cGU7CisgIHB1YmxpYyBTdHJpbmcgZXJyb3JNZXNzYWdlOworCisgIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisgICAgU3RyaW5nQnVpbGRlciBzYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgc2IuYXBwZW5kKHN0YXR1cyk7CisgICAgaWYgKHN0YXR1cyA9PSBTdGF0dXMuUlVMRV9FUlJPUiAmJiBlcnJvck1lc3NhZ2UgIT0gbnVsbCkgeworICAgICAgc2IuYXBwZW5kKCcoJykuYXBwZW5kKGVycm9yTWVzc2FnZSkuYXBwZW5kKCIpIik7CisgICAgfQorICAgIGlmICh0eXBlICE9IG51bGwpIHsKKyAgICAgIHNiLmFwcGVuZCgnWycpOworICAgICAgc2IuYXBwZW5kKHR5cGUubmFtZSgpKTsKKyAgICAgIHNiLmFwcGVuZCgnXScpOworICAgIH0KKyAgICByZXR1cm4gc2IudG9TdHJpbmcoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9lcnJvcnMvRW1haWxFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZXJyb3JzL0VtYWlsRXhjZXB0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjM1MzM1ZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZXJyb3JzL0VtYWlsRXhjZXB0aW9uLmphdmEKQEAgLTAsMCArMSwyOSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnM7CisKK3B1YmxpYyBjbGFzcyBFbWFpbEV4Y2VwdGlvbiBleHRlbmRzIEV4Y2VwdGlvbiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIE1FU1NBR0UgPSAiTWFpbCBFcnJvcjogIjsKKworICBwdWJsaWMgRW1haWxFeGNlcHRpb24oU3RyaW5nIG1zZykgeworICAgIHN1cGVyKE1FU1NBR0UgKyBtc2cpOworICB9CisKKyAgcHVibGljIEVtYWlsRXhjZXB0aW9uKFN0cmluZyBtc2csIFRocm93YWJsZSB3aHkpIHsKKyAgICBzdXBlcihNRVNTQUdFICsgbXNnLCB3aHkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2Vycm9ycy9OYW1lQWxyZWFkeVVzZWRFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZXJyb3JzL05hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbi5qYXZhCmluZGV4IGEyZDQ4N2IuLmVhMjBlMmUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZXJyb3JzL05hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbi5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZXJyb3JzL05hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbi5qYXZhCkBAIC0xOCw5ICsxOCw5IEBACiBwdWJsaWMgY2xhc3MgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uIGV4dGVuZHMgRXhjZXB0aW9uIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CiAKLSAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTUVTU0FHRSA9ICJOYW1lIEFscmVhZHkgVXNlZCI7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIE1FU1NBR0UgPSAiTmFtZSBBbHJlYWR5IFVzZWQ6ICI7CiAKLSAgcHVibGljIE5hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbigpIHsKLSAgICBzdXBlcihNRVNTQUdFKTsKKyAgcHVibGljIE5hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbihTdHJpbmcgbmFtZSkgeworICAgIHN1cGVyKE1FU1NBR0UgKyBuYW1lKTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9lcnJvcnMvTm9TdWNoRW50aXR5RXhjZXB0aW9uLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2Vycm9ycy9Ob1N1Y2hFbnRpdHlFeGNlcHRpb24uamF2YQppbmRleCBjNDdjZjA3Li4xODI5YzhiIDEwMDY0NAotLS0gYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2Vycm9ycy9Ob1N1Y2hFbnRpdHlFeGNlcHRpb24uamF2YQorKysgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2Vycm9ycy9Ob1N1Y2hFbnRpdHlFeGNlcHRpb24uamF2YQpAQCAtMjMsNCArMjMsOCBAQAogICBwdWJsaWMgTm9TdWNoRW50aXR5RXhjZXB0aW9uKCkgewogICAgIHN1cGVyKE1FU1NBR0UpOwogICB9CisKKyAgcHVibGljIE5vU3VjaEVudGl0eUV4Y2VwdGlvbihTdHJpbmcgbWVzc2FnZSkgeworICAgIHN1cGVyKG1lc3NhZ2UpOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2Vycm9ycy9QZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uLmphdmEgYi9nZXJyaXQtY29tbW9uL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL2Vycm9ycy9QZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uLmphdmEKaW5kZXggNzY1MjBhYS4uMGZhZjQ5OCAxMDA2NDQKLS0tIGEvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9lcnJvcnMvUGVybWlzc2lvbkRlbmllZEV4Y2VwdGlvbi5qYXZhCisrKyBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZXJyb3JzL1Blcm1pc3Npb25EZW5pZWRFeGNlcHRpb24uamF2YQpAQCAtMTQsNyArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnM7CiAKLS8qKiBJbmRpY2F0cyB0aGUgdXNlciBjYW5ub3QgcGVyZm9ybSB0aGlzIHRhc2suICovCisvKiogSW5kaWNhdGVzIHRoZSB1c2VyIGNhbm5vdCBwZXJmb3JtIHRoaXMgdGFzay4gKi8KIHB1YmxpYyBjbGFzcyBQZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uIGV4dGVuZHMgRXhjZXB0aW9uIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZ3JvdXBzL0xpc3RHcm91cHNPcHRpb24uamF2YSBiL2dlcnJpdC1jb21tb24vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vZ3JvdXBzL0xpc3RHcm91cHNPcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45ZGE3ZmQ1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWNvbW1vbi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9ncm91cHMvTGlzdEdyb3Vwc09wdGlvbi5qYXZhCkBAIC0wLDAgKzEsNjIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZ3JvdXBzOworCitpbXBvcnQgamF2YS51dGlsLkVudW1TZXQ7CisKKworLyoqIE91dHB1dCBvcHRpb25zIGF2YWlsYWJsZSB3aGVuIHVzaW5nIHtAY29kZSAvZ3JvdXBzL30gUlBDcy4gKi8KK3B1YmxpYyBlbnVtIExpc3RHcm91cHNPcHRpb24geworICAvKiogUmV0dXJuIGluZm9ybWF0aW9uIG9uIHRoZSBkaXJlY3QgZ3JvdXAgbWVtYmVycy4gKi8KKyAgTUVNQkVSUygwKSwKKworICAvKiogUmV0dXJuIGluZm9ybWF0aW9uIG9uIHRoZSBkaXJlY3RseSBpbmNsdWRlZCBncm91cHMuICovCisgIElOQ0xVREVTKDEpOworCisgIHByaXZhdGUgZmluYWwgaW50IHZhbHVlOworCisgIHByaXZhdGUgTGlzdEdyb3Vwc09wdGlvbihpbnQgdikgeworICAgIHRoaXMudmFsdWUgPSB2OworICB9CisKKyAgcHVibGljIGludCBnZXRWYWx1ZSgpIHsKKyAgICByZXR1cm4gdmFsdWU7CisgIH0KKworICBwdWJsaWMgc3RhdGljIEVudW1TZXQ8TGlzdEdyb3Vwc09wdGlvbj4gZnJvbUJpdHMoaW50IHYpIHsKKyAgICBFbnVtU2V0PExpc3RHcm91cHNPcHRpb24+IHIgPSBFbnVtU2V0Lm5vbmVPZihMaXN0R3JvdXBzT3B0aW9uLmNsYXNzKTsKKyAgICBmb3IgKExpc3RHcm91cHNPcHRpb24gbyA6IExpc3RHcm91cHNPcHRpb24udmFsdWVzKCkpIHsKKyAgICAgIGlmICgodiAmICgxIDw8IG8udmFsdWUpKSAhPSAwKSB7CisgICAgICAgIHIuYWRkKG8pOworICAgICAgICB2ICY9IH4oMSA8PCBvLnZhbHVlKTsKKyAgICAgIH0KKyAgICAgIGlmICh2ID09IDApIHsKKyAgICAgICAgcmV0dXJuIHI7CisgICAgICB9CisgICAgfQorICAgIGlmICh2ICE9IDApIHsKKyAgICAgIHRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oInVua25vd24gIiArIEludGVnZXIudG9IZXhTdHJpbmcodikpOworICAgIH0KKyAgICByZXR1cm4gcjsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgaW50IHRvQml0cyhFbnVtU2V0PExpc3RHcm91cHNPcHRpb24+IHNldCkgeworICAgIGludCByID0gMDsKKyAgICBmb3IgKExpc3RHcm91cHNPcHRpb24gbyA6IHNldCkgeworICAgICAgciB8PSAxIDw8IG8udmFsdWU7CisgICAgfQorICAgIHJldHVybiByOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKaW5kZXggNDcwOTQyZC4uOTQxZmIzMSAxMDA2NDQKLS0tIGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtNyw2ICs3LDcgQEAKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPWlnbm9yZQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hc3NlcnRJZGVudGlmaWVyPWVycm9yCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT13YXJuaW5nCmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9wb20ueG1sIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvcG9tLnhtbAppbmRleCBmZjY3MmQ1Li4xMDgwZWQxIDEwMDY0NAotLS0gYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9wb20ueG1sCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC1leHRlbnNpb24tYXBpPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL2V2ZW50cy9HaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXIuamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9ldmVudHMvR2l0UmVmZXJlbmNlVXBkYXRlZExpc3RlbmVyLmphdmEKaW5kZXggNDM4NTAwZC4uMjkxMWRlZCAxMDA2NDQKLS0tIGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL2V2ZW50cy9HaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXIuamF2YQorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvZXZlbnRzL0dpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lci5qYXZhCkBAIC0yMyw2ICsyMyw4IEBACiBwdWJsaWMgaW50ZXJmYWNlIEdpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lciB7CiAgIHB1YmxpYyBpbnRlcmZhY2UgVXBkYXRlIHsKICAgICBTdHJpbmcgZ2V0UmVmTmFtZSgpOworICAgIFN0cmluZyBnZXRPbGRPYmplY3RJZCgpOworICAgIFN0cmluZyBnZXROZXdPYmplY3RJZCgpOwogICB9CiAKICAgcHVibGljIGludGVyZmFjZSBFdmVudCB7CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVnaXN0cmF0aW9uL0R5bmFtaWNJdGVtLmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVnaXN0cmF0aW9uL0R5bmFtaWNJdGVtLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWExZGM3NgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZWdpc3RyYXRpb24vRHluYW1pY0l0ZW0uamF2YQpAQCAtMCwwICsxLDIyMCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uOworCitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQmluZGVyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LktleTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aXNpb25FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2NvcGVzOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmJpbmRlci5MaW5rZWRCaW5kaW5nQnVpbGRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC51dGlsLlByb3ZpZGVyczsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC51dGlsLlR5cGVzOworCitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuYXRvbWljLkF0b21pY1JlZmVyZW5jZTsKKworLyoqCisgKiBBIHNpbmdsZSBpdGVtIHRoYXQgY2FuIGJlIG1vZGlmaWVkIGFzIHBsdWdpbnMgcmVsb2FkLgorICogPHA+CisgKiBEeW5hbWljSXRlbXMgYXJlIGFsd2F5cyBtYXBwZWQgYXMgc2luZ2xldG9ucyBpbiBHdWljZS4gSXRlbXMgc3RvcmUgYSBQcm92aWRlcgorICogaW50ZXJuYWxseSwgYW5kIHJlc29sdmUgdGhlIHByb3ZpZGVyIHRvIGFuIGluc3RhbmNlIG9uIGRlbWFuZC4gVGhpcyBlbmFibGVzCisgKiByZWdpc3RyYXRpb25zIHRvIGRlY2lkZSBiZXR3ZWVuIHNpbmdsZXRvbiBhbmQgbm9uLXNpbmdsZXRvbiBtZW1iZXJzLiBJZgorICogbXVsdGlwbGUgcGx1Z2lucyB0cnkgdG8gcHJvdmlkZSB0aGUgc2FtZSBQcm92aWRlciwgYW4gZXhjZXB0aW9uIGlzIHRocm93bi4KKyAqLworcHVibGljIGNsYXNzIER5bmFtaWNJdGVtPFQ+IHsKKyAgLyoqIFBhaXIgb2YgcHJvdmlkZXIgaW1wbGVtZW50YXRpb24gYW5kIHBsdWdpbiBwcm92aWRpbmcgaXQuICovCisgIHN0YXRpYyBjbGFzcyBOYW1lZFByb3ZpZGVyPFQ+IHsKKyAgICBmaW5hbCBQcm92aWRlcjxUPiBpbXBsOworICAgIGZpbmFsIFN0cmluZyBwbHVnaW5OYW1lOworCisgICAgTmFtZWRQcm92aWRlcihQcm92aWRlcjxUPiBwcm92aWRlciwgU3RyaW5nIHBsdWdpbk5hbWUpIHsKKyAgICAgIHRoaXMuaW1wbCA9IHByb3ZpZGVyOworICAgICAgdGhpcy5wbHVnaW5OYW1lID0gcGx1Z2luTmFtZTsKKyAgICB9CisgIH0KKworICAvKioKKyAgICogRGVjbGFyZSBhIHNpbmdsZXRvbiB7QGNvZGUgRHluYW1pY0l0ZW08VD59IHdpdGggYSBiaW5kZXIuCisgICAqIDxwPgorICAgKiBJdGVtcyBtdXN0IGJlIGRlZmluZWQgaW4gYSBHdWljZSBtb2R1bGUgYmVmb3JlIHRoZXkgY2FuIGJlIGJvdW5kOgorICAgKiA8cHJlPgorICAgKiAgIER5bmFtaWNJdGVtLml0ZW1PZihiaW5kZXIoKSwgSW50ZXJmYWNlLmNsYXNzKTsKKyAgICogICBEeW5hbWljSXRlbS5iaW5kKGJpbmRlcigpLCBJbnRlcmZhY2UuY2xhc3MpLnRvKEltcGwuY2xhc3MpOworICAgKiA8L3ByZT4KKyAgICoKKyAgICogQHBhcmFtIGJpbmRlciBhIG5ldyBiaW5kZXIgY3JlYXRlZCBpbiB0aGUgbW9kdWxlLgorICAgKiBAcGFyYW0gbWVtYmVyIHR5cGUgb2YgZW50cnkgdG8gc3RvcmUuCisgICAqLworICBwdWJsaWMgc3RhdGljIDxUPiB2b2lkIGl0ZW1PZihCaW5kZXIgYmluZGVyLCBDbGFzczxUPiBtZW1iZXIpIHsKKyAgICBpdGVtT2YoYmluZGVyLCBUeXBlTGl0ZXJhbC5nZXQobWVtYmVyKSk7CisgIH0KKworICAvKioKKyAgICogRGVjbGFyZSBhIHNpbmdsZXRvbiB7QGNvZGUgRHluYW1pY0l0ZW08VD59IHdpdGggYSBiaW5kZXIuCisgICAqIDxwPgorICAgKiBJdGVtcyBtdXN0IGJlIGRlZmluZWQgaW4gYSBHdWljZSBtb2R1bGUgYmVmb3JlIHRoZXkgY2FuIGJlIGJvdW5kOgorICAgKiA8cHJlPgorICAgKiAgIER5bmFtaWNTZXQuaXRlbU9mKGJpbmRlcigpLCBuZXcgVHlwZUxpdGVyYWw8VGhpbmc8Rm9vPj4oKSB7fSk7CisgICAqIDwvcHJlPgorICAgKgorICAgKiBAcGFyYW0gYmluZGVyIGEgbmV3IGJpbmRlciBjcmVhdGVkIGluIHRoZSBtb2R1bGUuCisgICAqIEBwYXJhbSBtZW1iZXIgdHlwZSBvZiBlbnRyeSB0byBzdG9yZS4KKyAgICovCisgIHB1YmxpYyBzdGF0aWMgPFQ+IHZvaWQgaXRlbU9mKEJpbmRlciBiaW5kZXIsIFR5cGVMaXRlcmFsPFQ+IG1lbWJlcikgeworICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICAgIEtleTxEeW5hbWljSXRlbTxUPj4ga2V5ID0gKEtleTxEeW5hbWljSXRlbTxUPj4pIEtleS5nZXQoCisgICAgICAgIFR5cGVzLm5ld1BhcmFtZXRlcml6ZWRUeXBlKER5bmFtaWNJdGVtLmNsYXNzLCBtZW1iZXIuZ2V0VHlwZSgpKSk7CisgICAgYmluZGVyLmJpbmQoa2V5KQorICAgICAgLnRvUHJvdmlkZXIobmV3IER5bmFtaWNJdGVtUHJvdmlkZXI8VD4obWVtYmVyLCBrZXkpKQorICAgICAgLmluKFNjb3Blcy5TSU5HTEVUT04pOworICB9CisKKyAgLyoqCisgICAqIEJpbmQgb25lIGltcGxlbWVudGF0aW9uIGFzIHRoZSBpdGVtIHVzaW5nIGEgdW5pcXVlIGFubm90YXRpb24uCisgICAqCisgICAqIEBwYXJhbSBiaW5kZXIgYSBuZXcgYmluZGVyIGNyZWF0ZWQgaW4gdGhlIG1vZHVsZS4KKyAgICogQHBhcmFtIHR5cGUgdHlwZSBvZiBlbnRyeSB0byBzdG9yZS4KKyAgICogQHJldHVybiBhIGJpbmRlciB0byBjb250aW51ZSBjb25maWd1cmluZyB0aGUgbmV3IGl0ZW0uCisgICAqLworICBwdWJsaWMgc3RhdGljIDxUPiBMaW5rZWRCaW5kaW5nQnVpbGRlcjxUPiBiaW5kKEJpbmRlciBiaW5kZXIsIENsYXNzPFQ+IHR5cGUpIHsKKyAgICByZXR1cm4gYmluZChiaW5kZXIsIFR5cGVMaXRlcmFsLmdldCh0eXBlKSk7CisgIH0KKworICAvKioKKyAgICogQmluZCBvbmUgaW1wbGVtZW50YXRpb24gYXMgdGhlIGl0ZW0uCisgICAqCisgICAqIEBwYXJhbSBiaW5kZXIgYSBuZXcgYmluZGVyIGNyZWF0ZWQgaW4gdGhlIG1vZHVsZS4KKyAgICogQHBhcmFtIHR5cGUgdHlwZSBvZiBlbnRyeSB0byBzdG9yZS4KKyAgICogQHJldHVybiBhIGJpbmRlciB0byBjb250aW51ZSBjb25maWd1cmluZyB0aGUgbmV3IGl0ZW0uCisgICAqLworICBwdWJsaWMgc3RhdGljIDxUPiBMaW5rZWRCaW5kaW5nQnVpbGRlcjxUPiBiaW5kKEJpbmRlciBiaW5kZXIsCisgICAgICBUeXBlTGl0ZXJhbDxUPiB0eXBlKSB7CisgICAgcmV0dXJuIGJpbmRlci5iaW5kKHR5cGUpOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBLZXk8RHluYW1pY0l0ZW08VD4+IGtleTsKKyAgcHJpdmF0ZSBmaW5hbCBBdG9taWNSZWZlcmVuY2U8TmFtZWRQcm92aWRlcjxUPj4gcmVmOworCisgIER5bmFtaWNJdGVtKEtleTxEeW5hbWljSXRlbTxUPj4ga2V5LCBQcm92aWRlcjxUPiBwcm92aWRlciwgU3RyaW5nIHBsdWdpbk5hbWUpIHsKKyAgICBOYW1lZFByb3ZpZGVyPFQ+IGluID0gbnVsbDsKKyAgICBpZiAocHJvdmlkZXIgIT0gbnVsbCkgeworICAgICAgaW4gPSBuZXcgTmFtZWRQcm92aWRlcjxUPihwcm92aWRlciwgcGx1Z2luTmFtZSk7CisgICAgfQorICAgIHRoaXMua2V5ID0ga2V5OworICAgIHRoaXMucmVmID0gbmV3IEF0b21pY1JlZmVyZW5jZTxOYW1lZFByb3ZpZGVyPFQ+Pihpbik7CisgIH0KKworICAvKioKKyAgICogR2V0IHRoZSBjb25maWd1cmVkIGl0ZW0sIG9yIG51bGwuCisgICAqCisgICAqIEByZXR1cm4gdGhlIGNvbmZpZ3VyZWQgaXRlbSBpbnN0YW5jZTsgbnVsbCBpZiBubyBpbXBsZW1lbnRhdGlvbiBoYXMgYmVlbgorICAgKiAgICAgICAgIGJvdW5kIHRvIHRoZSBpdGVtLiBUaGlzIGlzIGNvbW1vbiBpZiBubyBwbHVnaW4gcmVnaXN0ZXJlZCBhbgorICAgKiAgICAgICAgIGltcGxlbWVudGF0aW9uIGZvciB0aGUgdHlwZS4KKyAgICovCisgIHB1YmxpYyBUIGdldCgpIHsKKyAgICBOYW1lZFByb3ZpZGVyPFQ+IGl0ZW0gPSByZWYuZ2V0KCk7CisgICAgcmV0dXJuIGl0ZW0gIT0gbnVsbCA/IGl0ZW0uaW1wbC5nZXQoKSA6IG51bGw7CisgIH0KKworICAvKioKKyAgICogU2V0IHRoZSBlbGVtZW50IHRvIHByb3ZpZGUuCisgICAqCisgICAqIEBwYXJhbSBpdGVtIHRoZSBpdGVtIHRvIHVzZS4gTXVzdCBub3QgYmUgbnVsbC4KKyAgICogQHBhcmFtIHBsdWdpbk5hbWUgdGhlIG5hbWUgb2YgdGhlIHBsdWdpbiBwcm92aWRpbmcgdGhlIGl0ZW0uCisgICAqIEByZXR1cm4gaGFuZGxlIHRvIHJlbW92ZSB0aGUgaXRlbSBhdCBhIGxhdGVyIHBvaW50IGluIHRpbWUuCisgICAqLworICBwdWJsaWMgUmVnaXN0cmF0aW9uSGFuZGxlIHNldChUIGl0ZW0sIFN0cmluZyBwbHVnaW5OYW1lKSB7CisgICAgcmV0dXJuIHNldChQcm92aWRlcnMub2YoaXRlbSksIHBsdWdpbk5hbWUpOworICB9CisKKyAgLyoqCisgICAqIFNldCB0aGUgZWxlbWVudCB0byBwcm92aWRlLgorICAgKgorICAgKiBAcGFyYW0gaW1wbCB0aGUgaXRlbSB0byBhZGQgdG8gdGhlIGNvbGxlY3Rpb24uIE11c3Qgbm90IGJlIG51bGwuCisgICAqIEBwYXJhbSBwbHVnaW5OYW1lIG5hbWUgb2YgdGhlIHNvdXJjZSBwcm92aWRpbmcgdGhlIGltcGxlbWVudGF0aW9uLgorICAgKiBAcmV0dXJuIGhhbmRsZSB0byByZW1vdmUgdGhlIGl0ZW0gYXQgYSBsYXRlciBwb2ludCBpbiB0aW1lLgorICAgKi8KKyAgcHVibGljIFJlZ2lzdHJhdGlvbkhhbmRsZSBzZXQoUHJvdmlkZXI8VD4gaW1wbCwgU3RyaW5nIHBsdWdpbk5hbWUpIHsKKyAgICBmaW5hbCBOYW1lZFByb3ZpZGVyPFQ+IGl0ZW0gPSBuZXcgTmFtZWRQcm92aWRlcjxUPihpbXBsLCBwbHVnaW5OYW1lKTsKKyAgICB3aGlsZSAoIXJlZi5jb21wYXJlQW5kU2V0KG51bGwsIGl0ZW0pKSB7CisgICAgICBOYW1lZFByb3ZpZGVyPFQ+IG9sZCA9IHJlZi5nZXQoKTsKKyAgICAgIGlmIChvbGQgIT0gbnVsbCkgeworICAgICAgICB0aHJvdyBuZXcgUHJvdmlzaW9uRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAiJXMgYWxyZWFkeSBwcm92aWRlZCBieSAlcywgaWdub3JpbmcgcGx1Z2luICVzIiwKKyAgICAgICAgICAgIGtleS5nZXRUeXBlTGl0ZXJhbCgpLCBvbGQucGx1Z2luTmFtZSwgcGx1Z2luTmFtZSkpOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbmV3IFJlZ2lzdHJhdGlvbkhhbmRsZSgpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgcmVtb3ZlKCkgeworICAgICAgICByZWYuY29tcGFyZUFuZFNldChpdGVtLCBudWxsKTsKKyAgICAgIH0KKyAgICB9OworICB9CisKKyAgLyoqCisgICAqIFNldCB0aGUgZWxlbWVudCB0aGF0IG1heSBiZSBob3QtcmVwbGFjZWFibGUgaW4gdGhlIGZ1dHVyZS4KKyAgICoKKyAgICogQHBhcmFtIGtleSB1bmlxdWUgZGVzY3JpcHRpb24gZnJvbSB0aGUgaXRlbSdzIEd1aWNlIGJpbmRpbmcuIFRoaXMgY2FuIGJlCisgICAqICAgICAgICBsYXRlciBvYnRhaW5lZCBmcm9tIHRoZSByZWdpc3RyYXRpb24gaGFuZGxlIHRvIGZhY2lsaXRhdGUgbWF0Y2hpbmcKKyAgICogICAgICAgIHdpdGggdGhlIG5ldyBlcXVpdmFsZW50IGluc3RhbmNlIGR1cmluZyBhIGhvdCByZWxvYWQuCisgICAqIEBwYXJhbSBpbXBsIHRoZSBpdGVtIHRvIHNldCBhcyBvdXIgdmFsdWUgcmlnaHQgbm93LiBNdXN0IG5vdCBiZSBudWxsLgorICAgKiBAcGFyYW0gcGx1Z2luTmFtZSB0aGUgbmFtZSBvZiB0aGUgcGx1Z2luIHByb3ZpZGluZyB0aGUgaXRlbS4KKyAgICogQHJldHVybiBhIGhhbmRsZSB0aGF0IGNhbiByZW1vdmUgdGhpcyBpdGVtIGxhdGVyLCBvciBob3Qtc3dhcCB0aGUgaXRlbS4KKyAgICovCisgIHB1YmxpYyBSZWxvYWRhYmxlUmVnaXN0cmF0aW9uSGFuZGxlPFQ+IHNldChLZXk8VD4ga2V5LCBQcm92aWRlcjxUPiBpbXBsLAorICAgICAgU3RyaW5nIHBsdWdpbk5hbWUpIHsKKyAgICBmaW5hbCBOYW1lZFByb3ZpZGVyPFQ+IGl0ZW0gPSBuZXcgTmFtZWRQcm92aWRlcjxUPihpbXBsLCBwbHVnaW5OYW1lKTsKKyAgICB3aGlsZSAoIXJlZi5jb21wYXJlQW5kU2V0KG51bGwsIGl0ZW0pKSB7CisgICAgICBOYW1lZFByb3ZpZGVyPFQ+IG9sZCA9IHJlZi5nZXQoKTsKKyAgICAgIGlmIChvbGQgIT0gbnVsbCkgeworICAgICAgICB0aHJvdyBuZXcgUHJvdmlzaW9uRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAiJXMgYWxyZWFkeSBwcm92aWRlZCBieSAlcywgaWdub3JpbmcgcGx1Z2luICVzIiwKKyAgICAgICAgICAgIHRoaXMua2V5LmdldFR5cGVMaXRlcmFsKCksIG9sZC5wbHVnaW5OYW1lLCBwbHVnaW5OYW1lKSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBuZXcgUmVsb2FkYWJsZUhhbmRsZShrZXksIGl0ZW0pOworICB9CisKKyAgcHJpdmF0ZSBjbGFzcyBSZWxvYWRhYmxlSGFuZGxlIGltcGxlbWVudHMgUmVsb2FkYWJsZVJlZ2lzdHJhdGlvbkhhbmRsZTxUPiB7CisgICAgcHJpdmF0ZSBmaW5hbCBLZXk8VD4ga2V5OworICAgIHByaXZhdGUgZmluYWwgTmFtZWRQcm92aWRlcjxUPiBpdGVtOworCisgICAgUmVsb2FkYWJsZUhhbmRsZShLZXk8VD4ga2V5LCBOYW1lZFByb3ZpZGVyPFQ+IGl0ZW0pIHsKKyAgICAgIHRoaXMua2V5ID0ga2V5OworICAgICAgdGhpcy5pdGVtID0gaXRlbTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgS2V5PFQ+IGdldEtleSgpIHsKKyAgICAgIHJldHVybiBrZXk7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIHZvaWQgcmVtb3ZlKCkgeworICAgICAgcmVmLmNvbXBhcmVBbmRTZXQoaXRlbSwgbnVsbCk7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIFJlbG9hZGFibGVIYW5kbGUgcmVwbGFjZShLZXk8VD4gbmV3S2V5LCBQcm92aWRlcjxUPiBuZXdJdGVtKSB7CisgICAgICBOYW1lZFByb3ZpZGVyPFQ+IG4gPSBuZXcgTmFtZWRQcm92aWRlcjxUPihuZXdJdGVtLCBpdGVtLnBsdWdpbk5hbWUpOworICAgICAgaWYgKHJlZi5jb21wYXJlQW5kU2V0KGl0ZW0sIG4pKSB7CisgICAgICAgIHJldHVybiBuZXcgUmVsb2FkYWJsZUhhbmRsZShuZXdLZXksIG4pOworICAgICAgfQorICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVnaXN0cmF0aW9uL0R5bmFtaWNJdGVtUHJvdmlkZXIuamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZWdpc3RyYXRpb24vRHluYW1pY0l0ZW1Qcm92aWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjEwNzRlZTUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVnaXN0cmF0aW9uL0R5bmFtaWNJdGVtUHJvdmlkZXIuamF2YQpAQCAtMCwwICsxLDU2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb247CisKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5CaW5kaW5nOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3RvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5LZXk7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlzaW9uRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2NsYXNzIER5bmFtaWNJdGVtUHJvdmlkZXI8VD4gaW1wbGVtZW50cyBQcm92aWRlcjxEeW5hbWljSXRlbTxUPj4geworICBwcml2YXRlIGZpbmFsIFR5cGVMaXRlcmFsPFQ+IHR5cGU7CisgIHByaXZhdGUgZmluYWwgS2V5PER5bmFtaWNJdGVtPFQ+PiBrZXk7CisKKyAgQEluamVjdAorICBwcml2YXRlIEluamVjdG9yIGluamVjdG9yOworCisgIER5bmFtaWNJdGVtUHJvdmlkZXIoVHlwZUxpdGVyYWw8VD4gdHlwZSwgS2V5PER5bmFtaWNJdGVtPFQ+PiBrZXkpIHsKKyAgICB0aGlzLnR5cGUgPSB0eXBlOworICAgIHRoaXMua2V5ID0ga2V5OworICB9CisKKyAgcHVibGljIER5bmFtaWNJdGVtPFQ+IGdldCgpIHsKKyAgICByZXR1cm4gbmV3IER5bmFtaWNJdGVtPFQ+KGtleSwgZmluZChpbmplY3RvciwgdHlwZSksICJnZXJyaXQiKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIDxUPiBQcm92aWRlcjxUPiBmaW5kKEluamVjdG9yIHNyYywgVHlwZUxpdGVyYWw8VD4gdHlwZSkgeworICAgIExpc3Q8QmluZGluZzxUPj4gYmluZGluZ3MgPSBzcmMuZmluZEJpbmRpbmdzQnlUeXBlKHR5cGUpOworICAgIGlmIChiaW5kaW5ncyAhPSBudWxsICYmIGJpbmRpbmdzLnNpemUoKSA9PSAxKSB7CisgICAgICByZXR1cm4gYmluZGluZ3MuZ2V0KDApLmdldFByb3ZpZGVyKCk7CisgICAgfSBlbHNlIGlmIChiaW5kaW5ncyAhPSBudWxsICYmIGJpbmRpbmdzLnNpemUoKSA+IDEpIHsKKyAgICAgIHRocm93IG5ldyBQcm92aXNpb25FeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgIk11bHRpcGxlIHByb3ZpZGVycyBib3VuZCBmb3IgRHluYW1pY0l0ZW08JXM+XG4iCisgICAgICAgICsgIlRoaXMgaXMgbm90IGFsbG93ZWQ7IGNoZWNrIHRoZSBzZXJ2ZXIgY29uZmlndXJhdGlvbi4iLAorICAgICAgICB0eXBlKSk7CisgICAgfSBlbHNlIHsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3JlZ2lzdHJhdGlvbi9EeW5hbWljU2V0UHJvdmlkZXIuamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZWdpc3RyYXRpb24vRHluYW1pY1NldFByb3ZpZGVyLmphdmEKaW5kZXggNmMyMTU1My4uMjFmYTFiOCAxMDA2NDQKLS0tIGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3JlZ2lzdHJhdGlvbi9EeW5hbWljU2V0UHJvdmlkZXIuamF2YQorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVnaXN0cmF0aW9uL0R5bmFtaWNTZXRQcm92aWRlci5qYXZhCkBAIC0xOSw3ICsxOSw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuVHlwZUxpdGVyYWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuaW50ZXJuYWwuVW5pcXVlQW5ub3RhdGlvbnM7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKQEAgLTI3LDggKzI2LDYgQEAKIGltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5hdG9taWMuQXRvbWljUmVmZXJlbmNlOwogCiBjbGFzcyBEeW5hbWljU2V0UHJvdmlkZXI8VD4gaW1wbGVtZW50cyBQcm92aWRlcjxEeW5hbWljU2V0PFQ+PiB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIENsYXNzPD8+IFVOSVFVRV9BTk5PVEFUSU9OID0KLSAgICAgIFVuaXF1ZUFubm90YXRpb25zLmNyZWF0ZSgpLmdldENsYXNzKCk7CiAgIHByaXZhdGUgZmluYWwgVHlwZUxpdGVyYWw8VD4gdHlwZTsKIAogICBASW5qZWN0CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVnaXN0cmF0aW9uL1ByaXZhdGVJbnRlcm5hbHNfRHluYW1pY1R5cGVzLmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVnaXN0cmF0aW9uL1ByaXZhdGVJbnRlcm5hbHNfRHluYW1pY1R5cGVzLmphdmEKaW5kZXggNjZkZDQ1ZC4uOGJjNTdhYiAxMDA2NDQKLS0tIGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3JlZ2lzdHJhdGlvbi9Qcml2YXRlSW50ZXJuYWxzX0R5bmFtaWNUeXBlcy5qYXZhCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZWdpc3RyYXRpb24vUHJpdmF0ZUludGVybmFsc19EeW5hbWljVHlwZXMuamF2YQpAQCAtMzAsNiArMzAsMjIgQEAKIAogLyoqIDxiPkRPIE5PVCBVU0U8L2I+ICovCiBwdWJsaWMgY2xhc3MgUHJpdmF0ZUludGVybmFsc19EeW5hbWljVHlwZXMgeworICBwdWJsaWMgc3RhdGljIE1hcDxUeXBlTGl0ZXJhbDw/PiwgRHluYW1pY0l0ZW08Pz4+IGR5bmFtaWNJdGVtc09mKEluamVjdG9yIHNyYykgeworICAgIE1hcDxUeXBlTGl0ZXJhbDw/PiwgRHluYW1pY0l0ZW08Pz4+IG0gPSBuZXdIYXNoTWFwKCk7CisgICAgZm9yIChNYXAuRW50cnk8S2V5PD8+LCBCaW5kaW5nPD8+PiBlIDogc3JjLmdldEJpbmRpbmdzKCkuZW50cnlTZXQoKSkgeworICAgICAgVHlwZUxpdGVyYWw8Pz4gdHlwZSA9IGUuZ2V0S2V5KCkuZ2V0VHlwZUxpdGVyYWwoKTsKKyAgICAgIGlmICh0eXBlLmdldFJhd1R5cGUoKSA9PSBEeW5hbWljSXRlbS5jbGFzcykgeworICAgICAgICBQYXJhbWV0ZXJpemVkVHlwZSBwID0gKFBhcmFtZXRlcml6ZWRUeXBlKSB0eXBlLmdldFR5cGUoKTsKKyAgICAgICAgbS5wdXQoVHlwZUxpdGVyYWwuZ2V0KHAuZ2V0QWN0dWFsVHlwZUFyZ3VtZW50cygpWzBdKSwKKyAgICAgICAgICAgIChEeW5hbWljSXRlbTw/PikgZS5nZXRWYWx1ZSgpLmdldFByb3ZpZGVyKCkuZ2V0KCkpOworICAgICAgfQorICAgIH0KKyAgICBpZiAobS5pc0VtcHR5KCkpIHsKKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eU1hcCgpOworICAgIH0KKyAgICByZXR1cm4gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlTWFwKG0pOworICB9CisKICAgcHVibGljIHN0YXRpYyBNYXA8VHlwZUxpdGVyYWw8Pz4sIER5bmFtaWNTZXQ8Pz4+IGR5bmFtaWNTZXRzT2YoSW5qZWN0b3Igc3JjKSB7CiAgICAgTWFwPFR5cGVMaXRlcmFsPD8+LCBEeW5hbWljU2V0PD8+PiBtID0gbmV3SGFzaE1hcCgpOwogICAgIGZvciAoTWFwLkVudHJ5PEtleTw/PiwgQmluZGluZzw/Pj4gZSA6IHNyYy5nZXRCaW5kaW5ncygpLmVudHJ5U2V0KCkpIHsKQEAgLTYyLDYgKzc4LDM4IEBACiAgICAgcmV0dXJuIENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZU1hcChtKTsKICAgfQogCisgIHB1YmxpYyBzdGF0aWMgTGlzdDxSZWdpc3RyYXRpb25IYW5kbGU+IGF0dGFjaEl0ZW1zKAorICAgICAgSW5qZWN0b3Igc3JjLAorICAgICAgTWFwPFR5cGVMaXRlcmFsPD8+LCBEeW5hbWljSXRlbTw/Pj4gaXRlbXMsIFN0cmluZyBwbHVnaW5OYW1lKSB7CisgICAgaWYgKHNyYyA9PSBudWxsIHx8IGl0ZW1zID09IG51bGwgfHwgaXRlbXMuaXNFbXB0eSgpKSB7CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CisgICAgfQorCisgICAgTGlzdDxSZWdpc3RyYXRpb25IYW5kbGU+IGhhbmRsZXMgPSBuZXcgQXJyYXlMaXN0PFJlZ2lzdHJhdGlvbkhhbmRsZT4oNCk7CisgICAgdHJ5IHsKKyAgICAgIGZvciAoTWFwLkVudHJ5PFR5cGVMaXRlcmFsPD8+LCBEeW5hbWljSXRlbTw/Pj4gZSA6IGl0ZW1zLmVudHJ5U2V0KCkpIHsKKyAgICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgICAgICAgIFR5cGVMaXRlcmFsPE9iamVjdD4gdHlwZSA9IChUeXBlTGl0ZXJhbDxPYmplY3Q+KSBlLmdldEtleSgpOworCisgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICAgICAgICBEeW5hbWljSXRlbTxPYmplY3Q+IGl0ZW0gPSAoRHluYW1pY0l0ZW08T2JqZWN0PikgZS5nZXRWYWx1ZSgpOworCisgICAgICAgIGZvciAoQmluZGluZzxPYmplY3Q+IGIgOiBiaW5kaW5ncyhzcmMsIHR5cGUpKSB7CisgICAgICAgICAgaWYgKGIuZ2V0S2V5KCkuZ2V0QW5ub3RhdGlvbigpICE9IG51bGwpIHsKKyAgICAgICAgICAgIGhhbmRsZXMuYWRkKGl0ZW0uc2V0KGIuZ2V0S2V5KCksIGIuZ2V0UHJvdmlkZXIoKSwgcGx1Z2luTmFtZSkpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorICAgIH0gY2F0Y2ggKFJ1bnRpbWVFeGNlcHRpb24gZSkgeworICAgICAgcmVtb3ZlKGhhbmRsZXMpOworICAgICAgdGhyb3cgZTsKKyAgICB9IGNhdGNoIChFcnJvciBlKSB7CisgICAgICByZW1vdmUoaGFuZGxlcyk7CisgICAgICB0aHJvdyBlOworICAgIH0KKyAgICByZXR1cm4gaGFuZGxlczsKKyAgfQorCiAgIHB1YmxpYyBzdGF0aWMgTGlzdDxSZWdpc3RyYXRpb25IYW5kbGU+IGF0dGFjaFNldHMoCiAgICAgICBJbmplY3RvciBzcmMsCiAgICAgICBNYXA8VHlwZUxpdGVyYWw8Pz4sIER5bmFtaWNTZXQ8Pz4+IHNldHMpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL0FjY2VwdHNDcmVhdGUuamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL0FjY2VwdHNDcmVhdGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41MDZmMjgxCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvQWNjZXB0c0NyZWF0ZS5qYXZhCkBAIC0wLDAgKzEsMzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKgorICogT3B0aW9uYWwgaW50ZXJmYWNlIGZvciB7QGxpbmsgUmVzdENvbGxlY3Rpb259LgorICogPHA+CisgKiBDb2xsZWN0aW9ucyB0aGF0IGltcGxlbWVudCB0aGlzIGludGVyZmFjZSBjYW4gYWNjZXB0IGEge0Bjb2RlIFBVVH0gb3IKKyAqIHtAY29kZSBQT1NUfSB3aGVuIHRoZSBwYXJzZSBtZXRob2QgdGhyb3dzIHtAbGluayBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9ufS4KKyAqLworcHVibGljIGludGVyZmFjZSBBY2NlcHRzQ3JlYXRlPFAgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+IHsKKyAgLyoqCisgICAqIEhhbmRsZSBjcmVhdGlvbiBvZiBhIGNoaWxkIHJlc291cmNlLgorICAgKgorICAgKiBAcGFyYW0gcGFyZW50IHBhcmVudCBjb2xsZWN0aW9uIGhhbmRsZS4KKyAgICogQHBhcmFtIGlkIGlkIG9mIHRoZSByZXNvdXJjZSBiZWluZyBjcmVhdGVkLgorICAgKiBAcmV0dXJuIGEgdmlldyB0byBwZXJmb3JtIHRoZSBjcmVhdGlvbi4gVGhlIGNyZWF0ZSBtZXRob2QgbXVzdCBlbWJlZCB0aGUgaWQKKyAgICogICAgICAgICBpbnRvIHRoZSBuZXdseSByZXR1cm5lZCB2aWV3IG9iamVjdCwgYXMgaXQgd2lsbCBub3QgYmUgcGFzc2VkLgorICAgKiBAdGhyb3dzIFJlc3RBcGlFeGNlcHRpb24gdGhlIHZpZXcgY2Fubm90IGJlIGNvbnN0cnVjdGVkLgorICAgKi8KKyAgPEk+IFJlc3RNb2RpZnlWaWV3PFAsIEk+IGNyZWF0ZShQIHBhcmVudCwgSWRTdHJpbmcgaWQpIHRocm93cyBSZXN0QXBpRXhjZXB0aW9uOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvQWNjZXB0c1Bvc3QuamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL0FjY2VwdHNQb3N0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDcwZWE4MwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL0FjY2VwdHNQb3N0LmphdmEKQEAgLTAsMCArMSwzNiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaTsKKworLyoqCisgKiBPcHRpb25hbCBpbnRlcmZhY2UgZm9yIHtAbGluayBSZXN0Q29sbGVjdGlvbn0uCisgKiA8cD4KKyAqIENvbGxlY3Rpb25zIHRoYXQgaW1wbGVtZW50IHRoaXMgaW50ZXJmYWNlIGNhbiBhY2NlcHQgYSB7QGNvZGUgUE9TVH0gZGlyZWN0bHkKKyAqIG9uIHRoZSBjb2xsZWN0aW9uIGl0c2VsZiB3aGVuIG5vIGlkIHdhcyBnaXZlbiBpbiB0aGUgcGF0aC4gVGhpcyBpbnRlcmZhY2UgaXMKKyAqIGludGVuZGVkIHRvIGJlIHVzZWQgd2l0aCBUb3BMZXZlbFJlc291cmNlIGNvbGxlY3Rpb25zLiBOZXN0ZWQgY29sbGVjdGlvbnMKKyAqIG9mdGVuIGJpbmQgUE9TVCBvbiB0aGUgcGFyZW50IGNvbGxlY3Rpb24gdG8gdGhlIHZpZXcgaW1wbGVtZW50YXRpb24gaGFuZGxpbmcKKyAqIHRoZSBpbnNlcnRpb24gb2YgYSBuZXcgbWVtYmVyLgorICovCitwdWJsaWMgaW50ZXJmYWNlIEFjY2VwdHNQb3N0PFAgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+IHsKKyAgLyoqCisgICAqIEhhbmRsZSBjcmVhdGlvbiBvZiBhIGNoaWxkIHJlc291cmNlIGJ5IFBPU1Qgb24gdGhlIGNvbGxlY3Rpb24uCisgICAqCisgICAqIEBwYXJhbSBwYXJlbnQgcGFyZW50IGNvbGxlY3Rpb24gaGFuZGxlLgorICAgKiBAcmV0dXJuIGEgdmlldyB0byBwZXJmb3JtIHRoZSBjcmVhdGlvbi4gVGhlIGlkIG9mIHRoZSBuZXdseSBjcmVhdGVkCisgICAqICAgICAgICAgcmVzb3VyY2Ugc2hvdWxkIGJlIGRldGVybWluZWQgZnJvbSB0aGUgaW5wdXQgYm9keS4KKyAgICogQHRocm93cyBSZXN0QXBpRXhjZXB0aW9uIHRoZSB2aWV3IGNhbm5vdCBiZSBjb25zdHJ1Y3RlZC4KKyAgICovCisgIDxJPiBSZXN0TW9kaWZ5VmlldzxQLCBJPiBwb3N0KFAgcGFyZW50KSB0aHJvd3MgUmVzdEFwaUV4Y2VwdGlvbjsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL0F1dGhFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL0F1dGhFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xZDRjZGE3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvQXV0aEV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMjUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKiBDYWxsZXIgY2Fubm90IHBlcmZvcm0gdGhlIHJlcXVlc3Qgb3BlcmF0aW9uIChIVFRQIDQwMyBGb3JiaWRkZW4pLiAqLworcHVibGljIGNsYXNzIEF1dGhFeGNlcHRpb24gZXh0ZW5kcyBSZXN0QXBpRXhjZXB0aW9uIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisKKyAgLyoqIEBwYXJhbSBtc2cgbWVzc2FnZSB0byByZXR1cm4gdG8gdGhlIGNsaWVudC4gKi8KKyAgcHVibGljIEF1dGhFeGNlcHRpb24oU3RyaW5nIG1zZykgeworICAgIHN1cGVyKG1zZyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL0JhZFJlcXVlc3RFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL0JhZFJlcXVlc3RFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kNWE5YzFmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvQmFkUmVxdWVzdEV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMjUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKiBSZXF1ZXN0IGNvdWxkIG5vdCBiZSBwYXJzZWQgYXMgc2VudCAoSFRUUCA0MDAgQmFkIFJlcXVlc3QpLiAqLworcHVibGljIGNsYXNzIEJhZFJlcXVlc3RFeGNlcHRpb24gZXh0ZW5kcyBSZXN0QXBpRXhjZXB0aW9uIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisKKyAgLyoqIEBwYXJhbSBtc2cgZXJyb3IgdGV4dCBmb3IgY2xpZW50IGRlc2NyaWJpbmcgaG93IHJlcXVlc3QgaXMgYmFkLiAqLworICBwdWJsaWMgQmFkUmVxdWVzdEV4Y2VwdGlvbihTdHJpbmcgbXNnKSB7CisgICAgc3VwZXIobXNnKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvQmluYXJ5UmVzdWx0LmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9CaW5hcnlSZXN1bHQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xODgwMTFjCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvQmluYXJ5UmVzdWx0LmphdmEKQEAgLTAsMCArMSwxNzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKK2ltcG9ydCBqYXZhLmlvLkNsb3NlYWJsZTsKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuaW8uSW5wdXRTdHJlYW07CitpbXBvcnQgamF2YS5pby5PdXRwdXRTdHJlYW07CitpbXBvcnQgamF2YS5pby5VbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uOworCisvKioKKyAqIFdyYXBwZXIgYXJvdW5kIGEgbm9uLUpTT04gcmVzdWx0IGZyb20gYSB7QGxpbmsgUmVzdFZpZXd9LgorICogPHA+CisgKiBWaWV3cyBtYXkgcmV0dXJuIHRoaXMgdHlwZSB0byBzaWduYWwgdGhleSB3YW50IHRoZSBzZXJ2ZXIgZ2x1ZSB0byB3cml0ZSByYXcKKyAqIGRhdGEgdG8gdGhlIGNsaWVudCwgaW5zdGVhZCBvZiBhdHRlbXB0aW5nIGF1dG9tYXRpYyBjb252ZXJzaW9uIHRvIEpTT04uIFRoZQorICogY3JlYXRlIGZvcm0gaXMgb3ZlcmxvYWRlZCB0byBoYW5kbGUgcGxhaW4gdGV4dCBmcm9tIGEgU3RyaW5nLCBvciBiaW5hcnkgZGF0YQorICogZnJvbSBhIHtAY29kZSBieXRlW119IG9yIHtAY29kZSBJbnB1dFN0ZWFtfS4KKyAqLworcHVibGljIGFic3RyYWN0IGNsYXNzIEJpbmFyeVJlc3VsdCBpbXBsZW1lbnRzIENsb3NlYWJsZSB7CisgIC8qKiBEZWZhdWx0IE1JTUUgdHlwZSBmb3IgdW5rbm93biBiaW5hcnkgZGF0YS4gKi8KKyAgc3RhdGljIGZpbmFsIFN0cmluZyBPQ1RFVF9TVFJFQU0gPSAiYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIjsKKworICAvKiogUHJvZHVjZSBhIFVURi04IGVuY29kZWQgcmVzdWx0IGZyb20gYSBzdHJpbmcuICovCisgIHB1YmxpYyBzdGF0aWMgQmluYXJ5UmVzdWx0IGNyZWF0ZShTdHJpbmcgZGF0YSkgeworICAgIHRyeSB7CisgICAgICByZXR1cm4gY3JlYXRlKGRhdGEuZ2V0Qnl0ZXMoIlVURi04IikpCisgICAgICAgIC5zZXRDb250ZW50VHlwZSgidGV4dC9wbGFpbiIpCisgICAgICAgIC5zZXRDaGFyYWN0ZXJFbmNvZGluZygiVVRGLTgiKTsKKyAgICB9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBSdW50aW1lRXhjZXB0aW9uKCJKVk0gZG9lcyBub3Qgc3VwcG9ydCBVVEYtOCIsIGUpOworICAgIH0KKyAgfQorCisgIC8qKiBQcm9kdWNlIGFuIHtAY29kZSBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW19IHJlc3VsdCBmcm9tIGEgYnl0ZSBhcnJheS4gKi8KKyAgcHVibGljIHN0YXRpYyBCaW5hcnlSZXN1bHQgY3JlYXRlKGJ5dGVbXSBkYXRhKSB7CisgICAgcmV0dXJuIG5ldyBBcnJheShkYXRhKTsKKyAgfQorCisgIC8qKgorICAgKiBQcm9kdWNlIGFuIHtAY29kZSBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW19IG9mIHVua25vd24gbGVuZ3RoIGJ5IGNvcHlpbmcKKyAgICogdGhlIElucHV0U3RyZWFtIHVudGlsIEVPRi4gVGhlIHNlcnZlciBnbHVlIHdpbGwgYXV0b21hdGljYWxseSBjbG9zZSB0aGlzCisgICAqIHN0cmVhbSB3aGVuIGNvcHlpbmcgaXMgY29tcGxldGUuCisgICAqLworICBwdWJsaWMgc3RhdGljIEJpbmFyeVJlc3VsdCBjcmVhdGUoSW5wdXRTdHJlYW0gZGF0YSkgeworICAgIHJldHVybiBuZXcgU3RyZWFtKGRhdGEpOworICB9CisKKyAgcHJpdmF0ZSBTdHJpbmcgY29udGVudFR5cGUgPSBPQ1RFVF9TVFJFQU07CisgIHByaXZhdGUgU3RyaW5nIGNoYXJhY3RlckVuY29kaW5nOworICBwcml2YXRlIGxvbmcgY29udGVudExlbmd0aCA9IC0xOworICBwcml2YXRlIGJvb2xlYW4gZ3ppcCA9IHRydWU7CisKKyAgLyoqIEByZXR1cm4gdGhlIE1JTUUgdHlwZSBvZiB0aGUgcmVzdWx0LCBmb3IgSFRUUCBjbGllbnRzLiAqLworICBwdWJsaWMgU3RyaW5nIGdldENvbnRlbnRUeXBlKCkgeworICAgIFN0cmluZyBlbmMgPSBnZXRDaGFyYWN0ZXJFbmNvZGluZygpOworICAgIGlmIChlbmMgIT0gbnVsbCkgeworICAgICAgcmV0dXJuIGNvbnRlbnRUeXBlICsgIjsgY2hhcnNldD0iICsgZW5jOworICAgIH0KKyAgICByZXR1cm4gY29udGVudFR5cGU7CisgIH0KKworICAvKiogU2V0IHRoZSBNSU1FIHR5cGUgb2YgdGhlIHJlc3VsdCwgYW5kIHJldHVybiB7QGNvZGUgdGhpc30uICovCisgIHB1YmxpYyBCaW5hcnlSZXN1bHQgc2V0Q29udGVudFR5cGUoU3RyaW5nIGNvbnRlbnRUeXBlKSB7CisgICAgdGhpcy5jb250ZW50VHlwZSA9IGNvbnRlbnRUeXBlICE9IG51bGwgPyBjb250ZW50VHlwZSA6IE9DVEVUX1NUUkVBTTsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIC8qKiBHZXQgdGhlIGNoYXJhY3RlciBlbmNvZGluZzsgbnVsbCBpZiBub3Qga25vd24uICovCisgIHB1YmxpYyBTdHJpbmcgZ2V0Q2hhcmFjdGVyRW5jb2RpbmcoKSB7CisgICAgcmV0dXJuIGNoYXJhY3RlckVuY29kaW5nOworICB9CisKKyAgLyoqIFNldCB0aGUgY2hhcmFjdGVyIHNldCB1c2VkIHRvIGVuY29kZSB0ZXh0IGRhdGEgYW5kIHJldHVybiB7QGNvZGUgdGhpc30uICovCisgIHB1YmxpYyBCaW5hcnlSZXN1bHQgc2V0Q2hhcmFjdGVyRW5jb2RpbmcoU3RyaW5nIGVuY29kaW5nKSB7CisgICAgY2hhcmFjdGVyRW5jb2RpbmcgPSBlbmNvZGluZzsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIC8qKiBAcmV0dXJuIGxlbmd0aCBpbiBieXRlcyBvZiB0aGUgcmVzdWx0OyAtMSBpZiBub3Qga25vd24uICovCisgIHB1YmxpYyBsb25nIGdldENvbnRlbnRMZW5ndGgoKSB7CisgICAgcmV0dXJuIGNvbnRlbnRMZW5ndGg7CisgIH0KKworICAvKiogU2V0IHRoZSBjb250ZW50IGxlbmd0aCBvZiB0aGUgcmVzdWx0OyAtMSBpZiBub3Qga25vd24uICovCisgIHB1YmxpYyBCaW5hcnlSZXN1bHQgc2V0Q29udGVudExlbmd0aChsb25nIGxlbikgeworICAgIHRoaXMuY29udGVudExlbmd0aCA9IGxlbjsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIC8qKiBAcmV0dXJuIHRydWUgaWYgdGhpcyByZXN1bHQgY2FuIGJlIGd6aXAgY29tcHJlc3NlZCB0byBjbGllbnRzLiAqLworICBwdWJsaWMgYm9vbGVhbiBjYW5HemlwKCkgeworICAgIHJldHVybiBnemlwOworICB9CisKKyAgLyoqIERpc2FibGUgZ3ppcCBjb21wcmVzc2lvbiBmb3IgYWxyZWFkeSBjb21wcmVzc2VkIHJlc3BvbnNlcy4gKi8KKyAgcHVibGljIEJpbmFyeVJlc3VsdCBkaXNhYmxlR3ppcCgpIHsKKyAgICB0aGlzLmd6aXAgPSBmYWxzZTsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIC8qKgorICAgKiBXcml0ZSBvciBjb3B5IHRoZSByZXN1bHQgb250byB0aGUgc3BlY2lmaWVkIG91dHB1dCBzdHJlYW0uCisgICAqCisgICAqIEBwYXJhbSBvcyBzdHJlYW0gdG8gd3JpdGUgcmVzdWx0IGRhdGEgb250by4gVGhpcyBzdHJlYW0gd2lsbCBiZSBjbG9zZWQgYnkKKyAgICogICAgICAgIHRoZSBjYWxsZXIgYWZ0ZXIgdGhpcyBtZXRob2QgcmV0dXJucy4KKyAgICogQHRocm93cyBJT0V4Y2VwdGlvbiBpZiB0aGUgZGF0YSBjYW5ub3QgYmUgcHJvZHVjZWQsIG9yIHRoZSBPdXRwdXRTdHJlYW0KKyAgICogICAgICAgICB7QGNvZGUgb3N9IHRocm93cyBhbnkgSU9FeGNlcHRpb24gZHVyaW5nIGEgd3JpdGUgb3IgZmx1c2ggY2FsbC4KKyAgICovCisgIHB1YmxpYyBhYnN0cmFjdCB2b2lkIHdyaXRlVG8oT3V0cHV0U3RyZWFtIG9zKSB0aHJvd3MgSU9FeGNlcHRpb247CisKKyAgLyoqIENsb3NlIHRoZSByZXN1bHQgYW5kIHJlbGVhc2UgYW55IHJlc291cmNlcyBpdCBob2xkcy4gKi8KKyAgcHVibGljIHZvaWQgY2xvc2UoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisgICAgaWYgKGdldENvbnRlbnRMZW5ndGgoKSA+PSAwKSB7CisgICAgICByZXR1cm4gU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAiQmluYXJ5UmVzdWx0W0NvbnRlbnQtVHlwZTogJXMsIENvbnRlbnQtTGVuZ3RoOiAlZF0iLAorICAgICAgICAgIGdldENvbnRlbnRUeXBlKCksIGdldENvbnRlbnRMZW5ndGgoKSk7CisgICAgfQorICAgIHJldHVybiBTdHJpbmcuZm9ybWF0KAorICAgICAgICAiQmluYXJ5UmVzdWx0W0NvbnRlbnQtVHlwZTogJXMsIENvbnRlbnQtTGVuZ3RoOiB1bmtub3duXSIsCisgICAgICAgIGdldENvbnRlbnRUeXBlKCkpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgQXJyYXkgZXh0ZW5kcyBCaW5hcnlSZXN1bHQgeworICAgIHByaXZhdGUgZmluYWwgYnl0ZVtdIGRhdGE7CisKKyAgICBBcnJheShieXRlW10gZGF0YSkgeworICAgICAgdGhpcy5kYXRhID0gZGF0YTsKKyAgICAgIHNldENvbnRlbnRMZW5ndGgoZGF0YS5sZW5ndGgpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIHdyaXRlVG8oT3V0cHV0U3RyZWFtIG9zKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgICAgb3Mud3JpdGUoZGF0YSk7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgU3RyZWFtIGV4dGVuZHMgQmluYXJ5UmVzdWx0IHsKKyAgICBwcml2YXRlIGZpbmFsIElucHV0U3RyZWFtIHNyYzsKKworICAgIFN0cmVhbShJbnB1dFN0cmVhbSBzcmMpIHsKKyAgICAgIHRoaXMuc3JjID0gc3JjOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIHdyaXRlVG8oT3V0cHV0U3RyZWFtIGRzdCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICAgIGJ5dGVbXSB0bXAgPSBuZXcgYnl0ZVs0MDk2XTsKKyAgICAgIGludCBuOworICAgICAgd2hpbGUgKDAgPCAobiA9IHNyYy5yZWFkKHRtcCkpKSB7CisgICAgICAgIGRzdC53cml0ZSh0bXAsIDAsIG4pOworICAgICAgfQorICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIGNsb3NlKCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICAgIHNyYy5jbG9zZSgpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvQ2hpbGRDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9DaGlsZENvbGxlY3Rpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zYmFkOWY4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvQ2hpbGRDb2xsZWN0aW9uLmphdmEKQEAgLTAsMCArMSwyNiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaTsKKworCisvKioKKyAqIE5lc3RlZCBjb2xsZWN0aW9uIG9mIHtAbGluayBSZXN0UmVzb3VyY2V9cyBiZWxvdyBhIHBhcmVudC4KKyAqCisgKiBAcGFyYW0gPFA+IHR5cGUgb2YgdGhlIHBhcmVudCByZXNvdXJjZS4KKyAqIEBwYXJhbSA8Qz4gdHlwZSBvZiByZXNvdXJjZSBvcGVyYXRlZCBvbiBieSBlYWNoIHZpZXcuCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgQ2hpbGRDb2xsZWN0aW9uPFAgZXh0ZW5kcyBSZXN0UmVzb3VyY2UsIEMgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+CisgICAgZXh0ZW5kcyBSZXN0VmlldzxQPiwgUmVzdENvbGxlY3Rpb248UCwgQz4geworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvRGVmYXVsdElucHV0LmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9EZWZhdWx0SW5wdXQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MzM0MmQyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvRGVmYXVsdElucHV0LmphdmEKQEAgLTAsMCArMSwyNyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaTsKKworaW1wb3J0IHN0YXRpYyBqYXZhLmxhbmcuYW5ub3RhdGlvbi5SZXRlbnRpb25Qb2xpY3kuUlVOVElNRTsKKworaW1wb3J0IGphdmEubGFuZy5hbm5vdGF0aW9uLkVsZW1lbnRUeXBlOworaW1wb3J0IGphdmEubGFuZy5hbm5vdGF0aW9uLlJldGVudGlvbjsKK2ltcG9ydCBqYXZhLmxhbmcuYW5ub3RhdGlvbi5UYXJnZXQ7CisKKy8qKiBBcHBsaWVkIHRvIGEgU3RyaW5nIGZpZWxkIHRvIGluZGljYXRlIHRoZSBkZWZhdWx0IGlucHV0IHBhcmFtZXRlci4gKi8KK0BUYXJnZXQoe0VsZW1lbnRUeXBlLkZJRUxEfSkKK0BSZXRlbnRpb24oUlVOVElNRSkKK3B1YmxpYyBAaW50ZXJmYWNlIERlZmF1bHRJbnB1dCB7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9JZFN0cmluZy5qYXZhIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvSWRTdHJpbmcuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mOTg3NDI1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvSWRTdHJpbmcuamF2YQpAQCAtMCwwICsxLDY4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpOworCisvKioKKyAqIFJlc291cmNlIGlkZW50aWZpZXIgc3BsaXQgb3V0IGZyb20gYSBVUkwuCisgKiA8cD4KKyAqIElkZW50aWZpZXJzIGFyZSBVUkwgZW5jb2RlZCBhbmQgdXN1YWxseSBuZWVkIHRvIGJlIGRlY29kZWQuCisgKi8KK3B1YmxpYyBjbGFzcyBJZFN0cmluZyB7CisgIC8qKiBDb25zdHJ1Y3QgYW4gaWRlbnRpZmllciBmcm9tIGFuIGFscmVhZHkgZW5jb2RlZCBzdHJpbmcuICovCisgIHB1YmxpYyBzdGF0aWMgSWRTdHJpbmcgZnJvbVVybChTdHJpbmcgaWQpIHsKKyAgICByZXR1cm4gbmV3IElkU3RyaW5nKGlkKTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgU3RyaW5nIHVybEVuY29kZWQ7CisKKyAgcHJpdmF0ZSBJZFN0cmluZyhTdHJpbmcgcykgeworICAgIHVybEVuY29kZWQgPSBzOworICB9CisKKyAgLyoqIEByZXR1cm4gdGhlIGRlY29kZWQgdmFsdWUgb2YgdGhlIHN0cmluZy4gKi8KKyAgcHVibGljIFN0cmluZyBnZXQoKSB7CisgICAgcmV0dXJuIFVybC5kZWNvZGUodXJsRW5jb2RlZCk7CisgIH0KKworICAvKiogQHJldHVybiB0cnVlIGlmIHRoZSBzdHJpbmcgaXMgdGhlIGVtcHR5IHN0cmluZy4gKi8KKyAgcHVibGljIGJvb2xlYW4gaXNFbXB0eSgpIHsKKyAgICByZXR1cm4gdXJsRW5jb2RlZC5pc0VtcHR5KCk7CisgIH0KKworICAvKiogQHJldHVybiB0aGUgb3JpZ2luYWwgVVJMIGVuY29kaW5nIHN1cHBsaWVkIGJ5IHRoZSBjbGllbnQuICovCisgIHB1YmxpYyBTdHJpbmcgZW5jb2RlZCgpIHsKKyAgICByZXR1cm4gdXJsRW5jb2RlZDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworICAgIHJldHVybiB1cmxFbmNvZGVkLmhhc2hDb2RlKCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvdGhlcikgeworICAgIGlmIChvdGhlciBpbnN0YW5jZW9mIElkU3RyaW5nKSB7CisgICAgICByZXR1cm4gdXJsRW5jb2RlZC5lcXVhbHMoKChJZFN0cmluZykgb3RoZXIpLnVybEVuY29kZWQpOworICAgIH0gZWxzZSBpZiAob3RoZXIgaW5zdGFuY2VvZiBTdHJpbmcpIHsKKyAgICAgIHJldHVybiB1cmxFbmNvZGVkLmVxdWFscyhvdGhlcik7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgIHJldHVybiBlbmNvZGVkKCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL01ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL01ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44YjBmZGQzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMjAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKiBNZXRob2QgaXMgbm90IGFjY2VwdGFibGUgb24gdGhlIHJlc291cmNlIChIVFRQIDQwNSBNZXRob2QgTm90IEFsbG93ZWQpLiAqLworcHVibGljIGNsYXNzIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24gZXh0ZW5kcyBSZXN0QXBpRXhjZXB0aW9uIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9QcmVjb25kaXRpb25GYWlsZWRFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1ByZWNvbmRpdGlvbkZhaWxlZEV4Y2VwdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg2MjA0YzgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9QcmVjb25kaXRpb25GYWlsZWRFeGNlcHRpb24uamF2YQpAQCAtMCwwICsxLDMwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpOworCisvKioKKyAqIFJlc291cmNlIHN0YXRlIGRvZXMgbm90IG1hdGNoIHJlcXVlc3Qgc3RhdGUgKEhUVFAgNDEyIFByZWNvbmRpdGlvbiBmYWlsZWQpLgorICovCitwdWJsaWMgY2xhc3MgUHJlY29uZGl0aW9uRmFpbGVkRXhjZXB0aW9uIGV4dGVuZHMgUmVzdEFwaUV4Y2VwdGlvbiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgIHB1YmxpYyBQcmVjb25kaXRpb25GYWlsZWRFeGNlcHRpb24oKSB7CisgIH0KKworICAvKiogQHBhcmFtIG1zZyBtZXNzYWdlIHRvIHJldHVybiB0byB0aGUgY2xpZW50IGRlc2NyaWJpbmcgdGhlIGVycm9yLiAqLworICBwdWJsaWMgUHJlY29uZGl0aW9uRmFpbGVkRXhjZXB0aW9uKFN0cmluZyBtc2cpIHsKKyAgICBzdXBlcihtc2cpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9QdXRJbnB1dC5qYXZhIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUHV0SW5wdXQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iMmQ2MmIzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUHV0SW5wdXQuamF2YQpAQCAtMCwwICsxLDI2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOworCisKKy8qKiBSYXcgZGF0YSBzdHJlYW0gc3VwcGxpZWQgYnkgdGhlIGJvZHkgb2YgYSBQVVQuICovCitwdWJsaWMgaW50ZXJmYWNlIFB1dElucHV0IHsKKyAgU3RyaW5nIGdldENvbnRlbnRUeXBlKCk7CisgIGxvbmcgZ2V0Q29udGVudExlbmd0aCgpOworICBJbnB1dFN0cmVhbSBnZXRJbnB1dFN0cmVhbSgpIHRocm93cyBJT0V4Y2VwdGlvbjsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc291cmNlQ29uZmxpY3RFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc291cmNlQ29uZmxpY3RFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lYjZkODExCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMzIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKgorICogUmVzb3VyY2Ugc3RhdGUgZG9lcyBub3QgcGVybWl0IHJlcXVlc3RlZCBvcGVyYXRpb24gKEhUVFAgNDA5IENvbmZsaWN0KS4KKyAqIDxwPgorICoge0BsaW5rIFJlc3RNb2RpZnlWaWV3fSBpbXBsZW1lbnRhdGlvbnMgbWF5IGZhaWwgd2l0aCB0aGlzIGV4Y2VwdGlvbiB3aGVuIHRoZQorICogbmFtZWQgcmVzb3VyY2UgZG9lcyBub3QgcGVybWl0IHRoZSBtb2RpZmljYXRpb24gdG8gdGFrZSBwbGFjZSBhdCB0aGlzIHRpbWUuCisgKiBBbiBleGFtcGxlIHVzZSBpcyB0cnlpbmcgdG8gYWJhbmRvbiBhIGNoYW5nZSB0aGF0IGlzIGFscmVhZHkgbWVyZ2VkLiBUaGUKKyAqIGNoYW5nZSBjYW5ub3QgYmUgYWJhbmRvbmVkIG9uY2UgbWVyZ2VkIHNvIGFuIG9wZXJhdGlvbiB3b3VsZCB0aHJvdy4KKyAqLworcHVibGljIGNsYXNzIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24gZXh0ZW5kcyBSZXN0QXBpRXhjZXB0aW9uIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisKKyAgLyoqIEBwYXJhbSBtc2cgbWVzc2FnZSB0byByZXR1cm4gdG8gdGhlIGNsaWVudCBkZXNjcmliaW5nIHRoZSBlcnJvci4gKi8KKyAgcHVibGljIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oU3RyaW5nIG1zZykgeworICAgIHN1cGVyKG1zZyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc291cmNlTm90Rm91bmRFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc291cmNlTm90Rm91bmRFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hYTg5MWM5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKiBOYW1lZCByZXNvdXJjZSBkb2VzIG5vdCBleGlzdCAoSFRUUCA0MDQgTm90IEZvdW5kKS4gKi8KK3B1YmxpYyBjbGFzcyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIGV4dGVuZHMgUmVzdEFwaUV4Y2VwdGlvbiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgIC8qKiBSZXF1ZXN0ZWQgcmVzb3VyY2UgaXMgbm90IGZvdW5kLCBmYWlsaW5nIHBvcnRpb24gbm90IHNwZWNpZmllZC4gKi8KKyAgcHVibGljIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oKSB7CisgIH0KKworICAvKiogQHBhcmFtIGlkIHBvcnRpb24gb2YgdGhlIHJlc291cmNlIFVSSSB0aGF0IGRvZXMgbm90IGV4aXN0LiAqLworICBwdWJsaWMgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihTdHJpbmcgaWQpIHsKKyAgICBzdXBlcihpZCk7CisgIH0KKworICAvKiogQHBhcmFtIGlkIHBvcnRpb24gb2YgdGhlIHJlc291cmNlIFVSSSB0aGF0IGRvZXMgbm90IGV4aXN0LiAqLworICBwdWJsaWMgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihJZFN0cmluZyBpZCkgeworICAgIHN1cGVyKGlkLmdldCgpKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzcG9uc2UuamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc3BvbnNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTdjNGNiYwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc3BvbnNlLmphdmEKQEAgLTAsMCArMSwxMjcgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKiBTcGVjaWFsIHJldHVybiB2YWx1ZSB0byBtZWFuIHNwZWNpZmljIEhUVFAgc3RhdHVzIGNvZGVzIGluIGEgUkVTVCBBUEkuICovCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUmVzcG9uc2U8VD4geworICBAU3VwcHJlc3NXYXJuaW5ncyh7InJhd3R5cGVzIn0pCisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFJlc3BvbnNlIE5PTkUgPSBuZXcgTm9uZSgpOworCisgIC8qKiBIVFRQIDIwMCBPSzogcG9pbnRsZXNzIHdyYXBwZXIgZm9yIHR5cGUgc2FmZXR5LiAqLworICBwdWJsaWMgc3RhdGljIDxUPiBSZXNwb25zZTxUPiBvayhUIHZhbHVlKSB7CisgICAgcmV0dXJuIG5ldyBJbXBsPFQ+KDIwMCwgdmFsdWUpOworICB9CisKKyAgLyoqIEhUVFAgMjAxIENyZWF0ZWQ6IHR5cGljYWxseSB1c2VkIHdoZW4gYSBuZXcgcmVzb3VyY2UgaXMgbWFkZS4gKi8KKyAgcHVibGljIHN0YXRpYyA8VD4gUmVzcG9uc2U8VD4gY3JlYXRlZChUIHZhbHVlKSB7CisgICAgcmV0dXJuIG5ldyBJbXBsPFQ+KDIwMSwgdmFsdWUpOworICB9CisKKyAgLyoqIEhUVFAgMjA0IE5vIENvbnRlbnQ6IHR5cGljYWxseSB1c2VkIHdoZW4gdGhlIHJlc291cmNlIGlzIGRlbGV0ZWQuICovCisgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICBwdWJsaWMgc3RhdGljIDxUPiBSZXNwb25zZTxUPiBub25lKCkgeworICAgIHJldHVybiBOT05FOworICB9CisKKyAgLyoqIEhUVFAgMzAyIEZvdW5kOiB0ZW1wb3JhcnkgcmVkaXJlY3QgdG8gYW5vdGhlciBVUkwuICovCisgIHB1YmxpYyBzdGF0aWMgUmVkaXJlY3QgcmVkaXJlY3QoU3RyaW5nIGxvY2F0aW9uKSB7CisgICAgcmV0dXJuIG5ldyBSZWRpcmVjdChsb2NhdGlvbik7CisgIH0KKworICBAU3VwcHJlc3NXYXJuaW5ncyh7InVuY2hlY2tlZCIsICJyYXd0eXBlcyJ9KQorICBwdWJsaWMgc3RhdGljIDxUPiBUIHVud3JhcChUIG9iaikgeworICAgIHdoaWxlIChvYmogaW5zdGFuY2VvZiBSZXNwb25zZSkgeworICAgICAgb2JqID0gKFQpICgoUmVzcG9uc2UpIG9iaikudmFsdWUoKTsKKyAgICB9CisgICAgcmV0dXJuIG9iajsKKyAgfQorCisgIHB1YmxpYyBhYnN0cmFjdCBpbnQgc3RhdHVzQ29kZSgpOworICBwdWJsaWMgYWJzdHJhY3QgVCB2YWx1ZSgpOworICBwdWJsaWMgYWJzdHJhY3QgU3RyaW5nIHRvU3RyaW5nKCk7CisKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgY2xhc3MgSW1wbDxUPiBleHRlbmRzIFJlc3BvbnNlPFQ+IHsKKyAgICBwcml2YXRlIGZpbmFsIGludCBzdGF0dXNDb2RlOworICAgIHByaXZhdGUgZmluYWwgVCB2YWx1ZTsKKworICAgIHByaXZhdGUgSW1wbChpbnQgc2MsIFQgdmFsKSB7CisgICAgICBzdGF0dXNDb2RlID0gc2M7CisgICAgICB2YWx1ZSA9IHZhbDsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgaW50IHN0YXR1c0NvZGUoKSB7CisgICAgICByZXR1cm4gc3RhdHVzQ29kZTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgVCB2YWx1ZSgpIHsKKyAgICAgIHJldHVybiB2YWx1ZTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgICAgcmV0dXJuICJbIiArIHN0YXR1c0NvZGUoKSArICJdICIgKyB2YWx1ZSgpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGNsYXNzIE5vbmUgZXh0ZW5kcyBSZXNwb25zZTxPYmplY3Q+IHsKKyAgICBwcml2YXRlIE5vbmUoKSB7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIGludCBzdGF0dXNDb2RlKCkgeworICAgICAgcmV0dXJuIDIwNDsKKyAgICB9CisKKyAgICBwdWJsaWMgT2JqZWN0IHZhbHVlKCkgeworICAgICAgdGhyb3cgbmV3IFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uKCk7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKyAgICAgIHJldHVybiAiWzIwNCBObyBDb250ZW50XSBOb25lIjsKKyAgICB9CisgIH0KKworICAvKiogQW4gSFRUUCByZWRpcmVjdCB0byBhbm90aGVyIGxvY2F0aW9uLiAqLworICBwdWJsaWMgc3RhdGljIGZpbmFsIGNsYXNzIFJlZGlyZWN0IHsKKyAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBsb2NhdGlvbjsKKworICAgIHByaXZhdGUgUmVkaXJlY3QoU3RyaW5nIHVybCkgeworICAgICAgdGhpcy5sb2NhdGlvbiA9IHVybDsKKyAgICB9CisKKyAgICBwdWJsaWMgU3RyaW5nIGxvY2F0aW9uKCkgeworICAgICAgcmV0dXJuIGxvY2F0aW9uOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CisgICAgICByZXR1cm4gbG9jYXRpb24uaGFzaENvZGUoKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IG8pIHsKKyAgICAgIHJldHVybiBvIGluc3RhbmNlb2YgUmVkaXJlY3QKKyAgICAgICAgJiYgKChSZWRpcmVjdCkgbykubG9jYXRpb24uZXF1YWxzKGxvY2F0aW9uKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgICAgcmV0dXJuIFN0cmluZy5mb3JtYXQoIlszMDIgUmVkaXJlY3RdICVzIiwgbG9jYXRpb24pOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzdEFwaUV4Y2VwdGlvbi5qYXZhIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzdEFwaUV4Y2VwdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE2ZDI3Y2QKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0QXBpRXhjZXB0aW9uLmphdmEKQEAgLTAsMCArMSwzMSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaTsKKworLyoqIFJvb3QgZXhjZXB0aW9uIHR5cGUgZm9yIEpTT04gQVBJIGZhaWx1cmVzLiAqLworcHVibGljIGFic3RyYWN0IGNsYXNzIFJlc3RBcGlFeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24geworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKKworICBwdWJsaWMgUmVzdEFwaUV4Y2VwdGlvbigpIHsKKyAgfQorCisgIHB1YmxpYyBSZXN0QXBpRXhjZXB0aW9uKFN0cmluZyBtc2cpIHsKKyAgICBzdXBlcihtc2cpOworICB9CisKKyAgcHVibGljIFJlc3RBcGlFeGNlcHRpb24oU3RyaW5nIG1zZywgVGhyb3dhYmxlIGNhdXNlKSB7CisgICAgc3VwZXIobXNnLCBjYXVzZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc3RBcGlNb2R1bGUuamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc3RBcGlNb2R1bGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iM2EwZTE4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzdEFwaU1vZHVsZS5qYXZhCkBAIC0wLDAgKzEsMTc4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5FeHBvcnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5FeHBvcnRzOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkFic3RyYWN0TW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmJpbmRlci5MaW5rZWRCaW5kaW5nQnVpbGRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5iaW5kZXIuU2NvcGVkQmluZGluZ0J1aWxkZXI7CisKKy8qKiBHdWljZSBEU0wgZm9yIGJpbmRpbmcge0BsaW5rIFJlc3RWaWV3fSBpbXBsZW1lbnRhdGlvbnMuICovCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUmVzdEFwaU1vZHVsZSBleHRlbmRzIEFic3RyYWN0TW9kdWxlIHsKKyAgcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgR0VUID0gIkdFVCI7CisgIHByb3RlY3RlZCBzdGF0aWMgZmluYWwgU3RyaW5nIFBVVCA9ICJQVVQiOworICBwcm90ZWN0ZWQgc3RhdGljIGZpbmFsIFN0cmluZyBERUxFVEUgPSAiREVMRVRFIjsKKyAgcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgUE9TVCA9ICJQT1NUIjsKKworICBwcm90ZWN0ZWQgPFIgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+CisgIFJlYWRWaWV3QmluZGVyPFI+IGdldChUeXBlTGl0ZXJhbDxSZXN0VmlldzxSPj4gdmlld1R5cGUpIHsKKyAgICByZXR1cm4gbmV3IFJlYWRWaWV3QmluZGVyPFI+KHZpZXcodmlld1R5cGUsIEdFVCwgIi8iKSk7CisgIH0KKworICBwcm90ZWN0ZWQgPFIgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+CisgIE1vZGlmeVZpZXdCaW5kZXI8Uj4gcHV0KFR5cGVMaXRlcmFsPFJlc3RWaWV3PFI+PiB2aWV3VHlwZSkgeworICAgIHJldHVybiBuZXcgTW9kaWZ5Vmlld0JpbmRlcjxSPih2aWV3KHZpZXdUeXBlLCBQVVQsICIvIikpOworICB9CisKKyAgcHJvdGVjdGVkIDxSIGV4dGVuZHMgUmVzdFJlc291cmNlPgorICBNb2RpZnlWaWV3QmluZGVyPFI+IHBvc3QoVHlwZUxpdGVyYWw8UmVzdFZpZXc8Uj4+IHZpZXdUeXBlKSB7CisgICAgcmV0dXJuIG5ldyBNb2RpZnlWaWV3QmluZGVyPFI+KHZpZXcodmlld1R5cGUsIFBPU1QsICIvIikpOworICB9CisKKyAgcHJvdGVjdGVkIDxSIGV4dGVuZHMgUmVzdFJlc291cmNlPgorICBNb2RpZnlWaWV3QmluZGVyPFI+IGRlbGV0ZShUeXBlTGl0ZXJhbDxSZXN0VmlldzxSPj4gdmlld1R5cGUpIHsKKyAgICByZXR1cm4gbmV3IE1vZGlmeVZpZXdCaW5kZXI8Uj4odmlldyh2aWV3VHlwZSwgREVMRVRFLCAiLyIpKTsKKyAgfQorCisgIHByb3RlY3RlZCA8UiBleHRlbmRzIFJlc3RSZXNvdXJjZT4KKyAgUmVhZFZpZXdCaW5kZXI8Uj4gZ2V0KFR5cGVMaXRlcmFsPFJlc3RWaWV3PFI+PiB2aWV3VHlwZSwgU3RyaW5nIG5hbWUpIHsKKyAgICByZXR1cm4gbmV3IFJlYWRWaWV3QmluZGVyPFI+KHZpZXcodmlld1R5cGUsIEdFVCwgbmFtZSkpOworICB9CisKKyAgcHJvdGVjdGVkIDxSIGV4dGVuZHMgUmVzdFJlc291cmNlPgorICBNb2RpZnlWaWV3QmluZGVyPFI+IHB1dChUeXBlTGl0ZXJhbDxSZXN0VmlldzxSPj4gdmlld1R5cGUsIFN0cmluZyBuYW1lKSB7CisgICAgcmV0dXJuIG5ldyBNb2RpZnlWaWV3QmluZGVyPFI+KHZpZXcodmlld1R5cGUsIFBVVCwgbmFtZSkpOworICB9CisKKyAgcHJvdGVjdGVkIDxSIGV4dGVuZHMgUmVzdFJlc291cmNlPgorICBNb2RpZnlWaWV3QmluZGVyPFI+IHBvc3QoVHlwZUxpdGVyYWw8UmVzdFZpZXc8Uj4+IHZpZXdUeXBlLCBTdHJpbmcgbmFtZSkgeworICAgIHJldHVybiBuZXcgTW9kaWZ5Vmlld0JpbmRlcjxSPih2aWV3KHZpZXdUeXBlLCBQT1NULCBuYW1lKSk7CisgIH0KKworICBwcm90ZWN0ZWQgPFIgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+CisgIE1vZGlmeVZpZXdCaW5kZXI8Uj4gZGVsZXRlKFR5cGVMaXRlcmFsPFJlc3RWaWV3PFI+PiB2aWV3VHlwZSwgU3RyaW5nIG5hbWUpIHsKKyAgICByZXR1cm4gbmV3IE1vZGlmeVZpZXdCaW5kZXI8Uj4odmlldyh2aWV3VHlwZSwgREVMRVRFLCBuYW1lKSk7CisgIH0KKworICBwcm90ZWN0ZWQgPFAgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+CisgIENoaWxkQ29sbGVjdGlvbkJpbmRlcjxQPiBjaGlsZChUeXBlTGl0ZXJhbDxSZXN0VmlldzxQPj4gdHlwZSwgU3RyaW5nIG5hbWUpIHsKKyAgICByZXR1cm4gbmV3IENoaWxkQ29sbGVjdGlvbkJpbmRlcjxQPih2aWV3KHR5cGUsIEdFVCwgbmFtZSkpOworICB9CisKKyAgcHJvdGVjdGVkIDxSIGV4dGVuZHMgUmVzdFJlc291cmNlPgorICBMaW5rZWRCaW5kaW5nQnVpbGRlcjxSZXN0VmlldzxSPj4gdmlldygKKyAgICAgIFR5cGVMaXRlcmFsPFJlc3RWaWV3PFI+PiB2aWV3VHlwZSwKKyAgICAgIFN0cmluZyBtZXRob2QsCisgICAgICBTdHJpbmcgbmFtZSkgeworICAgIHJldHVybiBiaW5kKHZpZXdUeXBlKS5hbm5vdGF0ZWRXaXRoKGV4cG9ydChtZXRob2QsIG5hbWUpKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIEV4cG9ydCBleHBvcnQoU3RyaW5nIG1ldGhvZCwgU3RyaW5nIG5hbWUpIHsKKyAgICBpZiAobmFtZS5sZW5ndGgoKSA+IDEgJiYgbmFtZS5zdGFydHNXaXRoKCIvIikpIHsKKyAgICAgIC8vIFZpZXdzIG1heSBiZSBib3VuZCBhcyAiLyIgdG8gbWVhbiB0aGUgcmVzb3VyY2UgaXRzZWxmLCBvcgorICAgICAgLy8gYXMgInN0YXR1cyIgYXMgaW4gIi90eXBlL3tpZH0vc3RhdHVzIi4gRG9uJ3QgYmluZCAiL3N0YXR1cyIKKyAgICAgIC8vIGlmIHRoZSBjYWxsZXIgYXNrZWQgZm9yIHRoYXQsIGJpbmQgd2hhdCB0aGUgc2VydmVyIGV4cGVjdHMuCisgICAgICBuYW1lID0gbmFtZS5zdWJzdHJpbmcoMSk7CisgICAgfQorICAgIHJldHVybiBFeHBvcnRzLm5hbWVkKG1ldGhvZCArICIuIiArIG5hbWUpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBjbGFzcyBSZWFkVmlld0JpbmRlcjxQIGV4dGVuZHMgUmVzdFJlc291cmNlPiB7CisgICAgcHJpdmF0ZSBmaW5hbCBMaW5rZWRCaW5kaW5nQnVpbGRlcjxSZXN0VmlldzxQPj4gYmluZGVyOworCisgICAgcHJpdmF0ZSBSZWFkVmlld0JpbmRlcihMaW5rZWRCaW5kaW5nQnVpbGRlcjxSZXN0VmlldzxQPj4gYmluZGVyKSB7CisgICAgICB0aGlzLmJpbmRlciA9IGJpbmRlcjsKKyAgICB9CisKKyAgICBwdWJsaWMgPFQgZXh0ZW5kcyBSZXN0UmVhZFZpZXc8UD4+CisgICAgU2NvcGVkQmluZGluZ0J1aWxkZXIgdG8oQ2xhc3M8VD4gaW1wbCkgeworICAgICAgcmV0dXJuIGJpbmRlci50byhpbXBsKTsKKyAgICB9CisKKyAgICBwdWJsaWMgPFQgZXh0ZW5kcyBSZXN0UmVhZFZpZXc8UD4+CisgICAgdm9pZCB0b0luc3RhbmNlKFQgaW1wbCkgeworICAgICAgYmluZGVyLnRvSW5zdGFuY2UoaW1wbCk7CisgICAgfQorCisgICAgcHVibGljIDxUIGV4dGVuZHMgUmVzdFJlYWRWaWV3PFA+PgorICAgIFNjb3BlZEJpbmRpbmdCdWlsZGVyIHRvUHJvdmlkZXIoQ2xhc3M8PyBleHRlbmRzIFByb3ZpZGVyPD8gZXh0ZW5kcyBUPj4gcHJvdmlkZXJUeXBlKSB7CisgICAgICByZXR1cm4gYmluZGVyLnRvUHJvdmlkZXIocHJvdmlkZXJUeXBlKTsKKyAgICB9CisKKyAgICBwdWJsaWMgPFQgZXh0ZW5kcyBSZXN0UmVhZFZpZXc8UD4+CisgICAgU2NvcGVkQmluZGluZ0J1aWxkZXIgdG9Qcm92aWRlcihQcm92aWRlcjw/IGV4dGVuZHMgVD4gcHJvdmlkZXIpIHsKKyAgICAgIHJldHVybiBiaW5kZXIudG9Qcm92aWRlcihwcm92aWRlcik7CisgICAgfQorICB9CisKKyAgcHVibGljIHN0YXRpYyBjbGFzcyBNb2RpZnlWaWV3QmluZGVyPFAgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+IHsKKyAgICBwcml2YXRlIGZpbmFsIExpbmtlZEJpbmRpbmdCdWlsZGVyPFJlc3RWaWV3PFA+PiBiaW5kZXI7CisKKyAgICBwcml2YXRlIE1vZGlmeVZpZXdCaW5kZXIoTGlua2VkQmluZGluZ0J1aWxkZXI8UmVzdFZpZXc8UD4+IGJpbmRlcikgeworICAgICAgdGhpcy5iaW5kZXIgPSBiaW5kZXI7CisgICAgfQorCisgICAgcHVibGljIDxUIGV4dGVuZHMgUmVzdE1vZGlmeVZpZXc8UCwgPz4+CisgICAgU2NvcGVkQmluZGluZ0J1aWxkZXIgdG8oQ2xhc3M8VD4gaW1wbCkgeworICAgICAgcmV0dXJuIGJpbmRlci50byhpbXBsKTsKKyAgICB9CisKKyAgICBwdWJsaWMgPFQgZXh0ZW5kcyBSZXN0TW9kaWZ5VmlldzxQLCA/Pj4KKyAgICB2b2lkIHRvSW5zdGFuY2UoVCBpbXBsKSB7CisgICAgICBiaW5kZXIudG9JbnN0YW5jZShpbXBsKTsKKyAgICB9CisKKyAgICBwdWJsaWMgPFQgZXh0ZW5kcyBSZXN0TW9kaWZ5VmlldzxQLCA/Pj4KKyAgICBTY29wZWRCaW5kaW5nQnVpbGRlciB0b1Byb3ZpZGVyKENsYXNzPD8gZXh0ZW5kcyBQcm92aWRlcjw/IGV4dGVuZHMgVD4+IHByb3ZpZGVyVHlwZSkgeworICAgICAgcmV0dXJuIGJpbmRlci50b1Byb3ZpZGVyKHByb3ZpZGVyVHlwZSk7CisgICAgfQorCisgICAgcHVibGljIDxUIGV4dGVuZHMgUmVzdE1vZGlmeVZpZXc8UCwgPz4+CisgICAgU2NvcGVkQmluZGluZ0J1aWxkZXIgdG9Qcm92aWRlcihQcm92aWRlcjw/IGV4dGVuZHMgVD4gcHJvdmlkZXIpIHsKKyAgICAgIHJldHVybiBiaW5kZXIudG9Qcm92aWRlcihwcm92aWRlcik7CisgICAgfQorICB9CisKKyAgcHVibGljIHN0YXRpYyBjbGFzcyBDaGlsZENvbGxlY3Rpb25CaW5kZXI8UCBleHRlbmRzIFJlc3RSZXNvdXJjZT4geworICAgIHByaXZhdGUgZmluYWwgTGlua2VkQmluZGluZ0J1aWxkZXI8UmVzdFZpZXc8UD4+IGJpbmRlcjsKKworICAgIHByaXZhdGUgQ2hpbGRDb2xsZWN0aW9uQmluZGVyKExpbmtlZEJpbmRpbmdCdWlsZGVyPFJlc3RWaWV3PFA+PiBiaW5kZXIpIHsKKyAgICAgIHRoaXMuYmluZGVyID0gYmluZGVyOworICAgIH0KKworICAgIHB1YmxpYyA8QyBleHRlbmRzIFJlc3RSZXNvdXJjZSwgVCBleHRlbmRzIENoaWxkQ29sbGVjdGlvbjxQLCBDPj4KKyAgICBTY29wZWRCaW5kaW5nQnVpbGRlciB0byhDbGFzczxUPiBpbXBsKSB7CisgICAgICByZXR1cm4gYmluZGVyLnRvKGltcGwpOworICAgIH0KKworICAgIHB1YmxpYyA8QyBleHRlbmRzIFJlc3RSZXNvdXJjZSwgVCBleHRlbmRzIENoaWxkQ29sbGVjdGlvbjxQLCBDPj4KKyAgICB2b2lkIHRvSW5zdGFuY2UoVCBpbXBsKSB7CisgICAgICBiaW5kZXIudG9JbnN0YW5jZShpbXBsKTsKKyAgICB9CisKKyAgICBwdWJsaWMgPEMgZXh0ZW5kcyBSZXN0UmVzb3VyY2UsIFQgZXh0ZW5kcyBDaGlsZENvbGxlY3Rpb248UCwgQz4+CisgICAgU2NvcGVkQmluZGluZ0J1aWxkZXIgdG9Qcm92aWRlcihDbGFzczw/IGV4dGVuZHMgUHJvdmlkZXI8PyBleHRlbmRzIFQ+PiBwcm92aWRlclR5cGUpIHsKKyAgICAgIHJldHVybiBiaW5kZXIudG9Qcm92aWRlcihwcm92aWRlclR5cGUpOworICAgIH0KKworICAgIHB1YmxpYyA8QyBleHRlbmRzIFJlc3RSZXNvdXJjZSwgVCBleHRlbmRzIENoaWxkQ29sbGVjdGlvbjxQLCBDPj4KKyAgICBTY29wZWRCaW5kaW5nQnVpbGRlciB0b1Byb3ZpZGVyKFByb3ZpZGVyPD8gZXh0ZW5kcyBUPiBwcm92aWRlcikgeworICAgICAgcmV0dXJuIGJpbmRlci50b1Byb3ZpZGVyKHByb3ZpZGVyKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc3RDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0Q29sbGVjdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk2ZDBkYmYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0Q29sbGVjdGlvbi5qYXZhCkBAIC0wLDAgKzEsOTYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljTWFwOworCisvKioKKyAqIEEgY29sbGVjdGlvbiBvZiByZXNvdXJjZXMgYWNjZXNzaWJsZSB0aHJvdWdoIGEgUkVTVCBBUEkuCisgKiA8cD4KKyAqIFRvIGJ1aWxkIGEgY29sbGVjdGlvbiBkZWNsYXJlIGEgcmVzb3VyY2UsIHRoZSBtYXAgaW4gYSBtb2R1bGUsIGFuZCB0aGUKKyAqIGNvbGxlY3Rpb24gaXRzZWxmIGFjY2VwdGluZyB0aGUgbWFwOgorICoKKyAqIDxwcmU+CisgKiBwdWJsaWMgY2xhc3MgTXlSZXNvdXJjZSBpbXBsZW1lbnRzIFJlc3RSZXNvdXJjZSB7CisgKiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgVHlwZUxpdGVyYWwmbHQ7UmVzdFZpZXcmbHQ7TXlSZXNvdXJjZSZndDsmZ3Q7IE1ZX0tJTkQgPQorICogICAgICAgbmV3IFR5cGVMaXRlcmFsJmx0O1Jlc3RWaWV3Jmx0O015UmVzb3VyY2UmZ3Q7Jmd0OygpIHt9OworICogfQorICoKKyAqIHB1YmxpYyBjbGFzcyBNeU1vZHVsZSBleHRlbmRzIEFic3RyYWN0TW9kdWxlIHsKKyAqICAgJiMwNjQ7T3ZlcnJpZGUKKyAqICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICogICAgIER5bmFtaWNNYXAubWFwT2YoYmluZGVyKCksIE15UmVzb3VyY2UuTVlfS0lORCk7CisgKgorICogICAgIGdldChNeVJlc291cmNlLk1ZX0tJTkQsICZxdW90O2FjdGlvbiZxdW90OykudG8oTXlBY3Rpb24uY2xhc3MpOworICogICB9CisgKiB9CisgKgorICogcHVibGljIGNsYXNzIE15Q29sbGVjdGlvbiBleHRlbmRzIFJlc3RDb2xsZWN0aW9uJmx0O1RvcExldmVsUmVzb3VyY2UsIE15UmVzb3VyY2UmZ3Q7IHsKKyAqICAgcHJpdmF0ZSBmaW5hbCBEeW5hbWljTWFwJmx0O1Jlc3RWaWV3Jmx0O015UmVzb3VyY2UmZ3Q7Jmd0OyB2aWV3czsKKyAqCisgKiAgICYjMDY0O0luamVjdAorICogICBNeUNvbGxlY3Rpb24oRHluYW1pY01hcCZsdDtSZXN0VmlldyZsdDtNeVJlc291cmNlJmd0OyZndDsgdmlld3MpIHsKKyAqICAgICB0aGlzLnZpZXdzID0gdmlld3M7CisgKiAgIH0KKyAqCisgKiAgIHB1YmxpYyBEeW5hbWljTWFwJmx0O1Jlc3RWaWV3Jmx0O015UmVzb3VyY2UmZ3Q7Jmd0OyB2aWV3cygpIHsKKyAqICAgICByZXR1cm4gdmlld3M7CisgKiAgIH0KKyAqIH0KKyAqIDwvcHJlPgorICoKKyAqIDxwPgorICogVG8gYnVpbGQgYSBuZXN0ZWQgY29sbGVjdGlvbiwgaW1wbGVtZW50IHtAbGluayBDaGlsZENvbGxlY3Rpb259LgorICoKKyAqIEBwYXJhbSA8UD4gdHlwZSBvZiB0aGUgcGFyZW50IHJlc291cmNlLiBGb3IgYSB0b3AgbGV2ZWwgY29sbGVjdGlvbiB0aGlzCisgKiAgICAgICAgc2hvdWxkIGFsd2F5cyBiZSB7QGxpbmsgVG9wTGV2ZWxSZXNvdXJjZX0uCisgKiBAcGFyYW0gPFI+IHR5cGUgb2YgcmVzb3VyY2Ugb3BlcmF0ZWQgb24gYnkgZWFjaCB2aWV3LgorICovCitwdWJsaWMgaW50ZXJmYWNlIFJlc3RDb2xsZWN0aW9uPFAgZXh0ZW5kcyBSZXN0UmVzb3VyY2UsIFIgZXh0ZW5kcyBSZXN0UmVzb3VyY2U+IHsKKyAgLyoqCisgICAqIENyZWF0ZSBhIHZpZXcgdG8gbGlzdCB0aGUgY29udGVudHMgb2YgdGhlIGNvbGxlY3Rpb24uCisgICAqIDxwPgorICAgKiBUaGUgcmV0dXJuZWQgdmlldyBzaG91bGQgYWNjZXB0IHRoZSBwYXJlbnQgdHlwZSB0byBzY29wZSB0aGUgc2VhcmNoLCBhbmQKKyAgICogbWF5IHdhbnQgdG8gdGFrZSBhICJxIiBwYXJhbWV0ZXIgb3B0aW9uIHRvIG5hcnJvdyB0aGUgcmVzdWx0cy4KKyAgICoKKyAgICogQHJldHVybiB2aWV3IHRvIGxpc3QgdGhlIGNvbGxlY3Rpb24uCisgICAqIEB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiBpZiB0aGUgY29sbGVjdGlvbiBjYW5ub3QgYmUgbGlzdGVkLgorICAgKiBAdGhyb3dzIEF1dGhFeGNlcHRpb24gaWYgdGhlIGNvbGxlY3Rpb24gcmVxdWlyZXMgYXV0aGVudGljYXRpb24uCisgICAqLworICBSZXN0VmlldzxQPiBsaXN0KCkgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIEF1dGhFeGNlcHRpb247CisKKyAgLyoqCisgICAqIFBhcnNlIGEgcGF0aCBjb21wb25lbnQgaW50byBhIHJlc291cmNlIGhhbmRsZS4KKyAgICoKKyAgICogQHBhcmFtIHBhcmVudCB0aGUgaGFuZGxlIHRvIHRoZSBjb2xsZWN0aW9uLgorICAgKiBAcGFyYW0gaWQgc3RyaW5nIGlkZW50aWZpZXIgc3VwcGxpZWQgYnkgdGhlIGNsaWVudC4gSW4gYSBVUkwgc3VjaCBhcworICAgKiAgICAgICAge0Bjb2RlIC9jaGFuZ2VzLzEyMzQvYWJhbmRvbn0gdGhpcyBzdHJpbmcgaXMge0Bjb2RlICIxMjM0In0uCisgICAqIEByZXR1cm4gYSByZXNvdXJjZSBoYW5kbGUgZm9yIHRoZSBpZGVudGlmaWVkIG9iamVjdC4KKyAgICogQHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIHRoZSBvYmplY3QgZG9lcyBub3QgZXhpc3QsIG9yIHRoZSBjYWxsZXIKKyAgICogICAgICAgICBpcyBub3QgcGVybWl0dGVkIHRvIGtub3cgaWYgdGhlIHJlc291cmNlIGV4aXN0cy4KKyAgICogQHRocm93cyBFeGNlcHRpb24gaWYgdGhlIGltcGxlbWVudGF0aW9uIGhhZCBhbnkgZXJyb3JzIGNvbnZlcnRpbmcgdG8gYQorICAgKiAgICAgICAgIHJlc291cmNlIGhhbmRsZS4gVGhpcyByZXN1bHRzIGluIGFuIEhUVFAgNTAwIEludGVybmFsIFNlcnZlciBFcnJvci4KKyAgICovCisgIFIgcGFyc2UoUCBwYXJlbnQsIElkU3RyaW5nIGlkKSB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgRXhjZXB0aW9uOworCisgIC8qKgorICAgKiBHZXQgdGhlIHZpZXdzIHRoYXQgc3VwcG9ydCB0aGlzIGNvbGxlY3Rpb24uCisgICAqIDxwPgorICAgKiBXaXRoaW4gYSByZXNvdXJjZSB0aGUgdmlld3MgYXJlIGFjY2Vzc2VkIGFzIHtAY29kZSBSRVNPVVJDRS9wbHVnaW5+dmlld30uCisgICAqCisgICAqIEByZXR1cm4gbWFwIG9mIHZpZXdzLgorICAgKi8KKyAgRHluYW1pY01hcDxSZXN0VmlldzxSPj4gdmlld3MoKTsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc3RNb2RpZnlWaWV3LmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0TW9kaWZ5Vmlldy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJmYTAyNzgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0TW9kaWZ5Vmlldy5qYXZhCkBAIC0wLDAgKzEsNDYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKgorICogUmVzdFZpZXcgdGhhdCBzdXBwb3J0cyBhY2NlcHRpbmcgaW5wdXQgYW5kIGNoYW5naW5nIGEgcmVzb3VyY2UuCisgKiA8cD4KKyAqIFRoZSBpbnB1dCBtdXN0IGJlIHN1cHBsaWVkIGFzIEpTT04gYXMgdGhlIGJvZHkgb2YgdGhlIEhUVFAgcmVxdWVzdC4gTW9kaWZ5CisgKiB2aWV3cyBjYW4gYmUgaW52b2tlZCBieSBhbnkgSFRUUCBtZXRob2QgdGhhdCBpcyBub3Qge0Bjb2RlIEdFVH0sIHdoaWNoCisgKiBpbmNsdWRlcyB7QGNvZGUgUE9TVH0sIHtAY29kZSBQVVR9LCB7QGNvZGUgREVMRVRFfS4KKyAqCisgKiBAcGFyYW0gPFI+IHR5cGUgb2YgdGhlIHJlc291cmNlIHRoZSB2aWV3IG1vZGlmaWVzLgorICogQHBhcmFtIDxJPiB0eXBlIG9mIGlucHV0IHRoZSBKU09OIHBhcnNlciB3aWxsIHBhcnNlIHRoZSBpbnB1dCBpbnRvLgorICovCitwdWJsaWMgaW50ZXJmYWNlIFJlc3RNb2RpZnlWaWV3PFIgZXh0ZW5kcyBSZXN0UmVzb3VyY2UsIEk+IGV4dGVuZHMgUmVzdFZpZXc8Uj4geworICAvKioKKyAgICogUHJvY2VzcyB0aGUgdmlldyBvcGVyYXRpb24gYnkgYWx0ZXJpbmcgdGhlIHJlc291cmNlLgorICAgKgorICAgKiBAcGFyYW0gcmVzb3VyY2UgcmVzb3VyY2UgdG8gbW9kaWZ5LgorICAgKiBAcGFyYW0gaW5wdXQgaW5wdXQgYWZ0ZXIgcGFyc2luZyBmcm9tIHJlcXVlc3QuCisgICAqIEByZXR1cm4gcmVzdWx0IHRvIHJldHVybiB0byB0aGUgY2xpZW50LiBVc2Uge0BsaW5rIEJpbmFyeVJlc3VsdH0gdG8gYXZvaWQKKyAgICogICAgICAgICBhdXRvbWF0aWMgY29udmVyc2lvbiB0byBKU09OLgorICAgKiBAdGhyb3dzIEF1dGhFeGNlcHRpb24gdGhlIGNsaWVudCBpcyBub3QgcGVybWl0dGVkIHRvIGFjY2VzcyB0aGlzIHZpZXcuCisgICAqIEB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiB0aGUgcmVxdWVzdCB3YXMgaW5jb3JyZWN0bHkgc3BlY2lmaWVkIGFuZAorICAgKiAgICAgICAgIGNhbm5vdCBiZSBoYW5kbGVkIGJ5IHRoaXMgdmlldy4KKyAgICogQHRocm93cyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uIHRoZSByZXNvdXJjZSBzdGF0ZSBkb2VzIG5vdCBwZXJtaXQgdGhpcworICAgKiAgICAgICAgIHZpZXcgdG8gbWFrZSB0aGUgY2hhbmdlcyBhdCB0aGlzIHRpbWUuCisgICAqIEB0aHJvd3MgRXhjZXB0aW9uIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgdmlldyBmYWlsZWQuIFRoZSBleGNlcHRpb24gd2lsbAorICAgKiAgICAgICAgIGJlIGxvZ2dlZCBhbmQgSFRUUCA1MDAgSW50ZXJuYWwgU2VydmVyIEVycm9yIHdpbGwgYmUgcmV0dXJuZWQgdG8KKyAgICogICAgICAgICB0aGUgY2xpZW50LgorICAgKi8KKyAgT2JqZWN0IGFwcGx5KFIgcmVzb3VyY2UsIEkgaW5wdXQpIHRocm93cyBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiwgRXhjZXB0aW9uOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzdFJlYWRWaWV3LmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0UmVhZFZpZXcuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zMmMyNTBkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzdFJlYWRWaWV3LmphdmEKQEAgLTAsMCArMSw0MCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaTsKKworLyoqCisgKiBSZXN0VmlldyB0byByZWFkIGEgcmVzb3VyY2Ugd2l0aG91dCBtb2RpZmljYXRpb24uCisgKgorICogQHBhcmFtIDxSPiB0eXBlIG9mIHJlc291cmNlIHRoZSB2aWV3IHJlYWRzLgorICovCitwdWJsaWMgaW50ZXJmYWNlIFJlc3RSZWFkVmlldzxSIGV4dGVuZHMgUmVzdFJlc291cmNlPiBleHRlbmRzIFJlc3RWaWV3PFI+IHsKKyAgLyoqCisgICAqIFByb2Nlc3MgdGhlIHZpZXcgb3BlcmF0aW9uIGJ5IHJlYWRpbmcgZnJvbSB0aGUgcmVzb3VyY2UuCisgICAqCisgICAqIEBwYXJhbSByZXNvdXJjZSByZXNvdXJjZSB0byBtb2RpZnkuCisgICAqIEByZXR1cm4gcmVzdWx0IHRvIHJldHVybiB0byB0aGUgY2xpZW50LiBVc2Uge0BsaW5rIEJpbmFyeVJlc3VsdH0gdG8gYXZvaWQKKyAgICogICAgICAgICBhdXRvbWF0aWMgY29udmVyc2lvbiB0byBKU09OLgorICAgKiBAdGhyb3dzIEF1dGhFeGNlcHRpb24gdGhlIGNsaWVudCBpcyBub3QgcGVybWl0dGVkIHRvIGFjY2VzcyB0aGlzIHZpZXcuCisgICAqIEB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiB0aGUgcmVxdWVzdCB3YXMgaW5jb3JyZWN0bHkgc3BlY2lmaWVkIGFuZAorICAgKiAgICAgICAgIGNhbm5vdCBiZSBoYW5kbGVkIGJ5IHRoaXMgdmlldy4KKyAgICogQHRocm93cyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uIHRoZSByZXNvdXJjZSBzdGF0ZSBkb2VzIG5vdCBwZXJtaXQgdGhpcworICAgKiAgICAgICAgIHZpZXcgdG8gbWFrZSB0aGUgY2hhbmdlcyBhdCB0aGlzIHRpbWUuCisgICAqIEB0aHJvd3MgRXhjZXB0aW9uIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgdmlldyBmYWlsZWQuIFRoZSBleGNlcHRpb24gd2lsbAorICAgKiAgICAgICAgIGJlIGxvZ2dlZCBhbmQgSFRUUCA1MDAgSW50ZXJuYWwgU2VydmVyIEVycm9yIHdpbGwgYmUgcmV0dXJuZWQgdG8KKyAgICogICAgICAgICB0aGUgY2xpZW50LgorICAgKi8KKyAgT2JqZWN0IGFwcGx5KFIgcmVzb3VyY2UpIHRocm93cyBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiwgRXhjZXB0aW9uOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzdFJlc291cmNlLmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0UmVzb3VyY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wNjNhNTcwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvUmVzdFJlc291cmNlLmphdmEKQEAgLTAsMCArMSwyNCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaTsKKworLyoqCisgKiBHZW5lcmljIHJlc291cmNlIGhhbmRsZSBkZWZpbmluZyBhcmd1bWVudHMgdG8gdmlld3MuCisgKiA8cD4KKyAqIFJlc291cmNlIGhhbmRsZSByZXR1cm5lZCBieSB7QGxpbmsgUmVzdENvbGxlY3Rpb259IGFuZCBwYXNzZWQgdG8gYQorICoge0BsaW5rIFJlc3RWaWV3fSBzdWNoIGFzIHtAbGluayBSZXN0UmVhZFZpZXd9IG9yIHtAbGluayBSZXN0TW9kaWZ5Vmlld30uCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgUmVzdFJlc291cmNlIHsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1Jlc3RWaWV3LmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0Vmlldy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjM2YWRmMzQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9SZXN0Vmlldy5qYXZhCkBAIC0wLDAgKzEsMjIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKgorICogQW55IHR5cGUgb2Ygdmlldywgc2VlIHtAbGluayBSZXN0UmVhZFZpZXd9IGZvciByZWFkcywge0BsaW5rIFJlc3RNb2RpZnlWaWV3fQorICogZm9yIHVwZGF0ZXMsIGFuZCB7QGxpbmsgUmVzdENvbGxlY3Rpb259IGZvciBuZXN0ZWQgY29sbGVjdGlvbnMuCisgKi8KK3B1YmxpYyBpbnRlcmZhY2UgUmVzdFZpZXc8UiBleHRlbmRzIFJlc3RSZXNvdXJjZT4geworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvU3RyZWFtaW5nUmVzcG9uc2UuamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1N0cmVhbWluZ1Jlc3BvbnNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjJmYjkwMQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1N0cmVhbWluZ1Jlc3BvbnNlLmphdmEKQEAgLTAsMCArMSwyMyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaTsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5pby5PdXRwdXRTdHJlYW07CisKK3B1YmxpYyBpbnRlcmZhY2UgU3RyZWFtaW5nUmVzcG9uc2UgeworICBwdWJsaWMgU3RyaW5nIGdldENvbnRlbnRUeXBlKCk7CisgIHB1YmxpYyB2b2lkIHN0cmVhbShPdXRwdXRTdHJlYW0gb3V0KSB0aHJvd3MgSU9FeGNlcHRpb247Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9Ub3BMZXZlbFJlc291cmNlLmphdmEgYi9nZXJyaXQtZXh0ZW5zaW9uLWFwaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2V4dGVuc2lvbnMvcmVzdGFwaS9Ub3BMZXZlbFJlc291cmNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGRkZDIwNwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1RvcExldmVsUmVzb3VyY2UuamF2YQpAQCAtMCwwICsxLDIzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRodGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaTsKKworLyoqIFNwZWNpYWwgbWFya2VyIHJlc291cmNlIG5hbWluZyB0aGUgdG9wLWxldmVsIG9mIGEgUkVTVCBzcGFjZS4gKi8KK3B1YmxpYyBjbGFzcyBUb3BMZXZlbFJlc291cmNlIGltcGxlbWVudHMgUmVzdFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUb3BMZXZlbFJlc291cmNlIElOU1RBTkNFID0gbmV3IFRvcExldmVsUmVzb3VyY2UoKTsKKworICBwcml2YXRlIFRvcExldmVsUmVzb3VyY2UoKSB7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1VucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1VucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iNjM2OTdmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMjQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKKy8qKiBSZXNvdXJjZSByZWZlcmVuY2VkIGluIHRoZSByZXF1ZXN0IGJvZHkgaXMgbm90IGZvdW5kIChIVFRQIDQyMiBVbnByb2Nlc3NhYmxlIEVudGl0eSkuICovCitwdWJsaWMgY2xhc3MgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiBleHRlbmRzIFJlc3RBcGlFeGNlcHRpb24geworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKKworICBwdWJsaWMgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbihTdHJpbmcgbXNnKSAgeworICAgIHN1cGVyKG1zZyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1VybC5qYXZhIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3Jlc3RhcGkvVXJsLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGY0ZDkwOQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy9yZXN0YXBpL1VybC5qYXZhCkBAIC0wLDAgKzEsNjUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGk7CisKK2ltcG9ydCBqYXZhLmlvLlVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb247CitpbXBvcnQgamF2YS5uZXQuVVJMRGVjb2RlcjsKK2ltcG9ydCBqYXZhLm5ldC5VUkxFbmNvZGVyOworCisvKiogVVJMIHJlbGF0ZWQgdXRpbGl0eSBmdW5jdGlvbnMuICovCitwdWJsaWMgZmluYWwgY2xhc3MgVXJsIHsKKyAgLyoqCisgICAqIEVuY29kZSBhIHBhdGggc2VnbWVudCwgZXNjYXBpbmcgY2hhcmFjdGVycyBub3QgdmFsaWQgZm9yIGEgVVJMLgorICAgKiA8cD4KKyAgICogVGhlIGZvbGxvd2luZyBjaGFyYWN0ZXJzIGFyZSBub3QgZXNjYXBlZDoKKyAgICogPHVsPgorICAgKiA8bGk+e0Bjb2RlIGEuLnosIEEuLlosIDAuLjl9CisgICAqIDxsaT57QGNvZGUgLiAtICogX30KKyAgICogPC91bD4KKyAgICogPHA+CisgICAqICcgJyAoc3BhY2UpIGlzIGVuY29kZWQgYXMgJysnLgorICAgKiA8cD4KKyAgICogQWxsIG90aGVyIGNoYXJhY3RlcnMgKGluY2x1ZGluZyAnLycpIGFyZSBjb252ZXJ0ZWQgdG8gdGhlIHRyaXBsZXQgIiV4eSIKKyAgICogd2hlcmUgInh5IiBpcyB0aGUgaGV4IHJlcHJlc2VudGF0aW9uIG9mIHRoZSBjaGFyYWN0ZXIgaW4gVVRGLTguCisgICAqCisgICAqIEBwYXJhbSBjb21wb25lbnQgYSBzdHJpbmcgY29udGFpbmluZyB0ZXh0IHRvIGVuY29kZS4KKyAgICogQHJldHVybiBhIHN0cmluZyB3aXRoIGFsbCBpbnZhbGlkIFVSTCBjaGFyYWN0ZXJzIGVzY2FwZWQuCisgICAqLworICBwdWJsaWMgc3RhdGljIFN0cmluZyBlbmNvZGUoU3RyaW5nIGNvbXBvbmVudCkgeworICAgIGlmIChjb21wb25lbnQgIT0gbnVsbCkgeworICAgICAgdHJ5IHsKKyAgICAgICAgcmV0dXJuIFVSTEVuY29kZXIuZW5jb2RlKGNvbXBvbmVudCwgIlVURi04Iik7CisgICAgICB9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgdGhyb3cgbmV3IFJ1bnRpbWVFeGNlcHRpb24oIkpWTSBtdXN0IHN1cHBvcnQgVVRGLTgiLCBlKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG51bGw7CisgIH0KKworICAvKiogRGVjb2RlIGEgVVJMIGVuY29kZWQgc3RyaW5nLCBlLmcuIGZyb20ge0Bjb2RlICIlMkYifSB0byB7QGNvZGUgIi8ifS4gKi8KKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgZGVjb2RlKFN0cmluZyBzdHIpIHsKKyAgICBpZiAoc3RyICE9IG51bGwpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIHJldHVybiBVUkxEZWNvZGVyLmRlY29kZShzdHIsICJVVEYtOCIpOworICAgICAgfSBjYXRjaCAoVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiBlKSB7CisgICAgICAgIHRocm93IG5ldyBSdW50aW1lRXhjZXB0aW9uKCJKVk0gbXVzdCBzdXBwb3J0IFVURi04IiwgZSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBudWxsOworICB9CisKKyAgcHJpdmF0ZSBVcmwoKSB7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy93ZWJ1aS9Hd3RQbHVnaW4uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy93ZWJ1aS9Hd3RQbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNzQxYTNmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL0d3dFBsdWdpbi5qYXZhCkBAIC0wLDAgKzEsMzMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLndlYnVpOworCisvKiogQ29uZmlndXJlcyBhIHdlYiBVSSBwbHVnaW4gY29tcGlsZWQgdXNpbmcgR1dULiAqLworcHVibGljIGNsYXNzIEd3dFBsdWdpbiBleHRlbmRzIFdlYlVpUGx1Z2luIHsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbW9kdWxlTmFtZTsKKworICAvKioKKyAgICogQHBhcmFtIG1vZHVsZU5hbWUgbmFtZSBvZiBHV1QgbW9kdWxlLiBUaGUgcmVzb3VyY2UKKyAgICogICAgICAgIHtAY29kZSBzdGF0aWMvJE1PRFVMRS8kTU9EVUxFLm5vY2FjaGUuanN9IHdpbGwgYmUgdXNlZC4KKyAgICovCisgIHB1YmxpYyBHd3RQbHVnaW4oU3RyaW5nIG1vZHVsZU5hbWUpIHsKKyAgICB0aGlzLm1vZHVsZU5hbWUgPSBtb2R1bGVOYW1lOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0SmF2YVNjcmlwdFJlc291cmNlUGF0aCgpIHsKKyAgICByZXR1cm4gU3RyaW5nLmZvcm1hdCgic3RhdGljLyVzLyVzLm5vY2FjaGUuanMiLCBtb2R1bGVOYW1lLCBtb2R1bGVOYW1lKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL0phdmFTY3JpcHRQbHVnaW4uamF2YSBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy93ZWJ1aS9KYXZhU2NyaXB0UGx1Z2luLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODlhNGYzMwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy93ZWJ1aS9KYXZhU2NyaXB0UGx1Z2luLmphdmEKQEAgLTAsMCArMSwzMyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMud2VidWk7CisKKy8qKiBDb25maWd1cmVzIGEgd2ViIFVJIHBsdWdpbiB3cml0dGVuIHVzaW5nIEphdmFTY3JpcHQuICovCitwdWJsaWMgY2xhc3MgSmF2YVNjcmlwdFBsdWdpbiBleHRlbmRzIFdlYlVpUGx1Z2luIHsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgZmlsZU5hbWU7CisKKyAgLyoqCisgICAqIEBwYXJhbSBmaWxlTmFtZSBvZiBKYXZhU2NyaXB0IHNvdXJjZSBmaWxlIHVuZGVyIHtAY29kZSBzdGF0aWMvfQorICAgKiAgICAgICAgc3ViZGlyZWN0b3J5IHdpdGhpbiB0aGUgcGx1Z2luJ3MgSkFSLgorICAgKi8KKyAgcHVibGljIEphdmFTY3JpcHRQbHVnaW4oU3RyaW5nIGZpbGVOYW1lKSB7CisgICAgdGhpcy5maWxlTmFtZSA9IGZpbGVOYW1lOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0SmF2YVNjcmlwdFJlc291cmNlUGF0aCgpIHsKKyAgICByZXR1cm4gInN0YXRpYy8iICsgZmlsZU5hbWU7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy93ZWJ1aS9XZWJVaVBsdWdpbi5qYXZhIGIvZ2Vycml0LWV4dGVuc2lvbi1hcGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9leHRlbnNpb25zL3dlYnVpL1dlYlVpUGx1Z2luLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWNkMTk4MQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1leHRlbnNpb24tYXBpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvZXh0ZW5zaW9ucy93ZWJ1aS9XZWJVaVBsdWdpbi5qYXZhCkBAIC0wLDAgKzEsNjkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLndlYnVpOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5FeHRlbnNpb25Qb2ludDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlBsdWdpbk5hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCisvKioKKyAqIFNwZWNpZmllcyBKYXZhU2NyaXB0IHRvIGR5bmFtaWNhbGx5IGxvYWQgaW50byB0aGUgd2ViIFVJLgorICogPHA+CisgKiBUbyBhdXRvbWF0aWNhbGx5IHJlZ2lzdGVyIChpbnN0ZWFkIG9mIHdyaXRpbmcgYSBHdWljZSBtb2R1bGUpLCBkZWNsYXJlIHRoZQorICogaW50ZW50aW9uIHdpdGgge0Bjb2RlIEBMaXN0ZW59LCBleHRlbmQgdGhlIGNvcnJlY3QgY2xhc3MgYW5kIGRlZmluZSBhCisgKiBjb25zdHJ1Y3RvciB0byBjb25maWd1cmUgdGhlIGNvcnJlY3QgcmVzb3VyY2U6CisgKgorICogPHByZT4KKyAqICYjMDY0O0xpc3RlbgorICogY2xhc3MgTXlKcyBleHRlbmRzIEphdmFTY3JpcHRQbHVnaW4geworICogICBNeUpzKCkgeworICogICAgIHN1cGVyKCZxdW90O2hlbGxvLmpzJnF1b3Q7KTsKKyAqICAgfQorICogfQorICogPC9wcmU+CisgKgorICogQHNlZSBHd3RQbHVnaW4KKyAqIEBzZWUgSmF2YVNjcmlwdFBsdWdpbgorICovCitARXh0ZW5zaW9uUG9pbnQKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBXZWJVaVBsdWdpbiB7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgR3d0UGx1Z2luIGd3dChTdHJpbmcgbW9kdWxlTmFtZSkgeworICAgIHJldHVybiBuZXcgR3d0UGx1Z2luKG1vZHVsZU5hbWUpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBKYXZhU2NyaXB0UGx1Z2luIGpzKFN0cmluZyBzY3JpcHROYW1lKSB7CisgICAgcmV0dXJuIG5ldyBKYXZhU2NyaXB0UGx1Z2luKHNjcmlwdE5hbWUpOworICB9CisKKyAgcHJpdmF0ZSBTdHJpbmcgcGx1Z2luTmFtZTsKKworICAvKiogQHJldHVybiBpbnN0YWxsZWQgbmFtZSBvZiB0aGUgcGx1Z2luIHRoYXQgcHJvdmlkZXMgdGhpcyBVSSBmZWF0dXJlLiAgKi8KKyAgcHVibGljIGZpbmFsIFN0cmluZyBnZXRQbHVnaW5OYW1lKCkgeworICAgIHJldHVybiBwbHVnaW5OYW1lOworICB9CisKKyAgQEluamVjdAorICB2b2lkIHNldFBsdWdpbk5hbWUoQFBsdWdpbk5hbWUgU3RyaW5nIHBsdWdpbk5hbWUpIHsKKyAgICB0aGlzLnBsdWdpbk5hbWUgPSBwbHVnaW5OYW1lOworICB9CisKKyAgLyoqIEByZXR1cm4gcGF0aCB0byBpbml0aWFsaXphdGlvbiBzY3JpcHQgd2l0aGluIHRoZSBwbHVnaW4ncyBKQVIuICovCisgIHB1YmxpYyBhYnN0cmFjdCBTdHJpbmcgZ2V0SmF2YVNjcmlwdFJlc291cmNlUGF0aCgpOworCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgIHJldHVybiBnZXRKYXZhU2NyaXB0UmVzb3VyY2VQYXRoKCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3RkZWJ1Zy9wb20ueG1sIGIvZ2Vycml0LWd3dGRlYnVnL3BvbS54bWwKaW5kZXggMDFiOTNhNi4uOTQyZjUwNyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dGRlYnVnL3BvbS54bWwKKysrIGIvZ2Vycml0LWd3dGRlYnVnL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC1nd3RkZWJ1ZzwvYXJ0aWZhY3RJZD4KQEAgLTM0LDExICszNCw2IEBACiAKICAgPGRlcGVuZGVuY2llcz4KICAgICA8ZGVwZW5kZW5jeT4KLSAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ3d0PC9ncm91cElkPgotICAgICAgPGFydGlmYWN0SWQ+Z3d0LWRldjwvYXJ0aWZhY3RJZD4KLSAgICA8L2RlcGVuZGVuY3k+Ci0KLSAgICA8ZGVwZW5kZW5jeT4KICAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LWd3dHVpPC9hcnRpZmFjdElkPgogICAgICAgPHZlcnNpb24+JHtwcm9qZWN0LnZlcnNpb259PC92ZXJzaW9uPgpAQCAtNzMsMTQgKzY4LDEyIEBACiAgICAgPGRlcGVuZGVuY3k+CiAgICAgICA8Z3JvdXBJZD5ib3VuY3ljYXN0bGU8L2dyb3VwSWQ+CiAgICAgICA8YXJ0aWZhY3RJZD5iY3Byb3YtamRrMTU8L2FydGlmYWN0SWQ+Ci0gICAgICA8dmVyc2lvbj4xNDA8L3ZlcnNpb24+CiAgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgogICAgIDwvZGVwZW5kZW5jeT4KIAogICAgIDxkZXBlbmRlbmN5PgogICAgICAgPGdyb3VwSWQ+Ym91bmN5Y2FzdGxlPC9ncm91cElkPgogICAgICAgPGFydGlmYWN0SWQ+YmNwZy1qZGsxNTwvYXJ0aWZhY3RJZD4KLSAgICAgIDx2ZXJzaW9uPjE0MDwvdmVyc2lvbj4KICAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+CiAgICAgPC9kZXBlbmRlbmN5PgogCkBAIC05Niw1ICs4OSwxMiBAQAogICAgICAgPGNsYXNzaWZpZXI+c291cmNlczwvY2xhc3NpZmllcj4KICAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+CiAgICAgPC9kZXBlbmRlbmN5PgorCisgICAgIDwhLS0gV29ya2Fyb3VuZCBmb3Igb3ZlcndyaXRpbmcgb3VyIGRlcGVuZGVuY2llcyAobGlrZSBhcmdzNGopIGJ5IGFkZGl0aW9uYWwKKyAgICAgIGNsYXNzZXMgcHV0IGluIGd3dC1kZXYuamFyIC0tPgorICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nd3Q8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5nd3QtZGV2PC9hcnRpZmFjdElkPgorICAgIDwvZGVwZW5kZW5jeT4KICAgPC9kZXBlbmRlbmNpZXM+CiA8L3Byb2plY3Q+CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvcG9tLnhtbCBiL2dlcnJpdC1nd3R1aS9wb20ueG1sCmluZGV4IGIzMjkxZDEuLjhkODA3YTUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9wb20ueG1sCisrKyBiL2dlcnJpdC1nd3R1aS9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtZ3d0dWk8L2FydGlmYWN0SWQ+CkBAIC0yMDIsMTYgKzIwMiwzMiBAQAogICAgICAgPHBsdWdpbj4KICAgICAgICAgPGdyb3VwSWQ+b3JnLmNvZGVoYXVzLm1vam88L2dyb3VwSWQ+CiAgICAgICAgIDxhcnRpZmFjdElkPmd3dC1tYXZlbi1wbHVnaW48L2FydGlmYWN0SWQ+Ci0gICAgICAgIDxjb25maWd1cmF0aW9uPgotICAgICAgICAgIDxtb2R1bGU+JHtHZXJyaXRHd3RVSS5icm93c2VyVHlwZX08L21vZHVsZT4KLSAgICAgICAgICA8ZXh0cmFKdm1BcmdzPi1YbXg1MTJtPC9leHRyYUp2bUFyZ3M+Ci0gICAgICAgICAgPGNvbXBpbGVSZXBvcnQ+JHtnd3QuY29tcGlsZVJlcG9ydH08L2NvbXBpbGVSZXBvcnQ+Ci0gICAgICAgICAgPGRpc2FibGVDbGFzc01ldGFkYXRhPnRydWU8L2Rpc2FibGVDbGFzc01ldGFkYXRhPgotICAgICAgICAgIDxkaXNhYmxlQ2FzdENoZWNraW5nPnRydWU8L2Rpc2FibGVDYXN0Q2hlY2tpbmc+Ci0gICAgICAgICAgPGRyYWZ0Q29tcGlsZT4ke0dlcnJpdEd3dFVJLmRyYWZ0Q29tcGlsZX08L2RyYWZ0Q29tcGlsZT4KLSAgICAgICAgPC9jb25maWd1cmF0aW9uPgogICAgICAgICA8ZXhlY3V0aW9ucz4KICAgICAgICAgICA8ZXhlY3V0aW9uPgorICAgICAgICAgICAgPGlkPm9wdGltaXplZDwvaWQ+CisgICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICAgICAgPG1vZHVsZT4ke0dlcnJpdEd3dFVJLmJyb3dzZXJUeXBlfTwvbW9kdWxlPgorICAgICAgICAgICAgICA8ZXh0cmFKdm1BcmdzPi1YbXg1MTJtPC9leHRyYUp2bUFyZ3M+CisgICAgICAgICAgICAgIDxjb21waWxlUmVwb3J0PiR7Z3d0LmNvbXBpbGVSZXBvcnR9PC9jb21waWxlUmVwb3J0PgorICAgICAgICAgICAgICA8ZGlzYWJsZUNsYXNzTWV0YWRhdGE+dHJ1ZTwvZGlzYWJsZUNsYXNzTWV0YWRhdGE+CisgICAgICAgICAgICAgIDxkaXNhYmxlQ2FzdENoZWNraW5nPnRydWU8L2Rpc2FibGVDYXN0Q2hlY2tpbmc+CisgICAgICAgICAgICAgIDxkcmFmdENvbXBpbGU+JHtHZXJyaXRHd3RVSS5kcmFmdENvbXBpbGV9PC9kcmFmdENvbXBpbGU+CisgICAgICAgICAgICA8L2NvbmZpZ3VyYXRpb24+CisgICAgICAgICAgICA8Z29hbHM+CisgICAgICAgICAgICAgIDxnb2FsPmNvbXBpbGU8L2dvYWw+CisgICAgICAgICAgICA8L2dvYWxzPgorICAgICAgICAgIDwvZXhlY3V0aW9uPgorICAgICAgICAgIDxleGVjdXRpb24+CisgICAgICAgICAgICA8aWQ+ZGVidWc8L2lkPgorICAgICAgICAgICAgPGNvbmZpZ3VyYXRpb24+CisgICAgICAgICAgICAgIDxzdHlsZT5QUkVUVFk8L3N0eWxlPgorICAgICAgICAgICAgICA8bW9kdWxlPiR7R2Vycml0R3d0VUkuYnJvd3NlclR5cGV9PC9tb2R1bGU+CisgICAgICAgICAgICAgIDxleHRyYUp2bUFyZ3M+LVhteDUxMm08L2V4dHJhSnZtQXJncz4KKyAgICAgICAgICAgICAgPGRpc2FibGVDbGFzc01ldGFkYXRhPnRydWU8L2Rpc2FibGVDbGFzc01ldGFkYXRhPgorICAgICAgICAgICAgICA8ZGlzYWJsZVJ1bkFzeW5jPnRydWU8L2Rpc2FibGVSdW5Bc3luYz4KKyAgICAgICAgICAgICAgPGRyYWZ0Q29tcGlsZT50cnVlPC9kcmFmdENvbXBpbGU+CisgICAgICAgICAgICAgIDx3ZWJhcHBEaXJlY3Rvcnk+JHtwcm9qZWN0LmJ1aWxkLmRpcmVjdG9yeX0vJHtwcm9qZWN0LmJ1aWxkLmZpbmFsTmFtZX1fZGJnPC93ZWJhcHBEaXJlY3Rvcnk+CisgICAgICAgICAgICA8L2NvbmZpZ3VyYXRpb24+CiAgICAgICAgICAgICA8Z29hbHM+CiAgICAgICAgICAgICAgIDxnb2FsPmNvbXBpbGU8L2dvYWw+CiAgICAgICAgICAgICA8L2dvYWxzPgpAQCAtMjMyLDcgKzI0OCw4IEBACiAgICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KICAgICAgICAgICAgICAgPHRhcmdldD4KICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iZHN0IiBsb2NhdGlvbj0iJHtwcm9qZWN0LmJ1aWxkLmRpcmVjdG9yeX0vJHtwcm9qZWN0LmJ1aWxkLmZpbmFsTmFtZX0iLz4KLSAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iYXBwIiBsb2NhdGlvbj0iJHtkc3R9L2dlcnJpdCIvPgorICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJkYmciIGxvY2F0aW9uPSIke3Byb2plY3QuYnVpbGQuZGlyZWN0b3J5fS8ke3Byb2plY3QuYnVpbGQuZmluYWxOYW1lfV9kYmciLz4KKyAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iYXBwIiBsb2NhdGlvbj0iJHtkc3R9L2dlcnJpdF91aSIvPgogCiAgICAgICAgICAgICAgICAgPG1rZGlyIGRpcj0iJHthcHB9Ii8+CiAgICAgICAgICAgICAgICAgPGFwcGx5IGV4ZWN1dGFibGU9Imd6aXAiIGFkZHNvdXJjZWZpbGU9ImZhbHNlIj4KQEAgLTI0Nyw2ICsyNjQsMTYgQEAKICAgICAgICAgICAgICAgICAgICAgPG91dHB1dG1hcHBlciB0eXBlPSJnbG9iIiBmcm9tPSIqIiB0bz0iJHthcHB9LyouZ3oiLz4KICAgICAgICAgICAgICAgICAgIDwvcmVkaXJlY3Rvcj4KICAgICAgICAgICAgICAgICA8L2FwcGx5PgorCisgICAgICAgICAgICAgICAgPGNvcHkgZmlsZT0iJHtkYmd9L2dlcnJpdF91aS9nZXJyaXRfdWkubm9jYWNoZS5qcyIKKyAgICAgICAgICAgICAgICAgICAgICB0b2ZpbGU9IiR7YXBwfS9nZXJyaXRfZGJnLm5vY2FjaGUuanMiLz4KKyAgICAgICAgICAgICAgICA8Y29weSB0b2Rpcj0iJHthcHB9IiBvdmVyd3JpdGU9ImZhbHNlIj4KKyAgICAgICAgICAgICAgICAgIDxmaWxlc2V0IGRpcj0iJHtkYmd9L2dlcnJpdF91aSI+CisgICAgICAgICAgICAgICAgICAgIDxpbmNsdWRlIG5hbWU9IioqLyouaHRtbCIvPgorICAgICAgICAgICAgICAgICAgICA8aW5jbHVkZSBuYW1lPSIqKi8qLmNzcyIvPgorICAgICAgICAgICAgICAgICAgICA8aW5jbHVkZSBuYW1lPSJkZWZlcnJlZGpzLyoqLyouanMiLz4KKyAgICAgICAgICAgICAgICAgIDwvZmlsZXNldD4KKyAgICAgICAgICAgICAgICA8L2NvcHk+CiAgICAgICAgICAgICAgIDwvdGFyZ2V0PgogICAgICAgICAgICAgPC9jb25maWd1cmF0aW9uPgogICAgICAgICAgIDwvZXhlY3V0aW9uPgpAQCAtMjU3LDcgKzI4NCw3IEBACiAgICAgICAgIDxncm91cElkPm9yZy5hcGFjaGUubWF2ZW4ucGx1Z2luczwvZ3JvdXBJZD4KICAgICAgICAgPGFydGlmYWN0SWQ+bWF2ZW4td2FyLXBsdWdpbjwvYXJ0aWZhY3RJZD4KICAgICAgICAgPGNvbmZpZ3VyYXRpb24+Ci0gICAgICAgICAgPHBhY2thZ2luZ0V4Y2x1ZGVzPldFQi1JTkYvY2xhc3Nlcy8qKixXRUItSU5GL2xpYi8qKjwvcGFja2FnaW5nRXhjbHVkZXM+CisgICAgICAgICAgPHBhY2thZ2luZ0V4Y2x1ZGVzPldFQi1JTkYvY2xhc3Nlcy8qKixXRUItSU5GL2RlcGxveS8qKixXRUItSU5GL2xpYi8qKjwvcGFja2FnaW5nRXhjbHVkZXM+CiAgICAgICAgICAgPGF0dGFjaENsYXNzZXM+dHJ1ZTwvYXR0YWNoQ2xhc3Nlcz4KICAgICAgICAgICA8YXJjaGl2ZT4KICAgICAgICAgICAgIDxhZGRNYXZlbkRlc2NyaXB0b3I+ZmFsc2U8L2FkZE1hdmVuRGVzY3JpcHRvcj4KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L0dlcnJpdEd3dFVJLmd3dC54bWwgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9HZXJyaXRHd3RVSS5nd3QueG1sCmluZGV4IDg1NTVjNzUuLjVmZGM1YmIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L0dlcnJpdEd3dFVJLmd3dC54bWwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUkuZ3d0LnhtbApAQCAtMTMsNyArMTMsNyBAQAogIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKICBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KIC0tPgotPG1vZHVsZSByZW5hbWUtdG89ImdlcnJpdCI+Cis8bW9kdWxlIHJlbmFtZS10bz0iZ2Vycml0X3VpIj4KICAgPGluaGVyaXRzIG5hbWU9J2NvbS5nb29nbGUuZ3d0LmVkaXRvci5FZGl0b3InLz4KICAgPGluaGVyaXRzIG5hbWU9J2NvbS5nb29nbGUuZ3d0LnVzZXIuVXNlcicvPgogICA8aW5oZXJpdHMgbmFtZT0nY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLlJlc291cmNlcycvPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUlnZWNrbzFfOC5nd3QueG1sIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUlnZWNrbzFfOC5nd3QueG1sCmluZGV4IGQxYTlmZTQuLmQ3ZTgzNWYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L0dlcnJpdEd3dFVJZ2Vja28xXzguZ3d0LnhtbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9HZXJyaXRHd3RVSWdlY2tvMV84Lmd3dC54bWwKQEAgLTEzLDcgKzEzLDcgQEAKICBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCiAgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCiAtLT4KLTxtb2R1bGUgcmVuYW1lLXRvPSJnZXJyaXQiPgorPG1vZHVsZSByZW5hbWUtdG89ImdlcnJpdF91aSI+CiAgIDxpbmhlcml0cyBuYW1lPSdjb20uZ29vZ2xlLmdlcnJpdC5HZXJyaXRHd3RVSScvPgogICA8c2V0LXByb3BlcnR5IG5hbWU9InVzZXIuYWdlbnQiIHZhbHVlPSJnZWNrbzFfOCIgLz4KICAgPHNldC1wcm9wZXJ0eSBuYW1lPSJsb2NhbGUiIHZhbHVlPSJkZWZhdWx0IiAvPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUlzYWZhcmkuZ3d0LnhtbCBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L0dlcnJpdEd3dFVJc2FmYXJpLmd3dC54bWwKaW5kZXggNzY1NWMxZi4uODhiZWE4NCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvR2Vycml0R3d0VUlzYWZhcmkuZ3d0LnhtbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9HZXJyaXRHd3RVSXNhZmFyaS5nd3QueG1sCkBAIC0xMyw3ICsxMyw3IEBACiAgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAogIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgogLS0+Ci08bW9kdWxlIHJlbmFtZS10bz0iZ2Vycml0Ij4KKzxtb2R1bGUgcmVuYW1lLXRvPSJnZXJyaXRfdWkiPgogICA8aW5oZXJpdHMgbmFtZT0nY29tLmdvb2dsZS5nZXJyaXQuR2Vycml0R3d0VUknLz4KICAgPHNldC1wcm9wZXJ0eSBuYW1lPSJ1c2VyLmFnZW50IiB2YWx1ZT0ic2FmYXJpIiAvPgogICA8c2V0LXByb3BlcnR5IG5hbWU9ImxvY2FsZSIgdmFsdWU9ImRlZmF1bHQiIC8+CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvQXZhdGFySW1hZ2UuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9BdmF0YXJJbWFnZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjAwNTk3MjMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvQXZhdGFySW1hZ2UuamF2YQpAQCAtMCwwICsxLDY5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuRXJyb3JFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkVycm9ySGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5JbWFnZTsKKworcHVibGljIGNsYXNzIEF2YXRhckltYWdlIGV4dGVuZHMgSW1hZ2UgeworCisgIC8qKiBBIGRlZmF1bHQgc2l6ZWQgYXZhdGFyIGltYWdlLiAqLworICBwdWJsaWMgQXZhdGFySW1hZ2UoQWNjb3VudC5JZCBhY2NvdW50KSB7CisgICAgdGhpcyhhY2NvdW50LCAwKTsKKyAgfQorCisgIC8qKgorICAgKiBBbiBhdmF0YXIgaW1hZ2UgZm9yIHRoZSBnaXZlbiBhY2NvdW50IHVzaW5nIHRoZSByZXF1ZXN0ZWQgc2l6ZS4KKyAgICoKKyAgICogQHBhcmFtIGFjY291bnQgVGhlIGFjY291bnQgaW4gd2hpY2ggd2UgYXJlIGludGVyZXN0ZWQKKyAgICogQHBhcmFtIHNpemUgQSByZXF1ZXN0ZWQgc2l6ZS4gTm90ZSB0aGF0IHRoZSBzaXplIGNhbiBiZSBpZ25vcmVkIGRlcGVuZGluZworICAgKiAgICAgICAgb24gdGhlIGF2YXRhciBwcm92aWRlci4gQSBzaXplIDw9IDAgaW5kaWNhdGVzIHRvIGxldCB0aGUgcHJvdmlkZXIKKyAgICogICAgICAgIGRlY2lkZSBhIGRlZmF1bHQgc2l6ZS4KKyAgICovCisgIHB1YmxpYyBBdmF0YXJJbWFnZShBY2NvdW50LklkIGFjY291bnQsIGludCBzaXplKSB7CisgICAgc3VwZXIodXJsKGFjY291bnQsIHNpemUpKTsKKworICAgIGlmIChzaXplID4gMCkgeworICAgICAgLy8gSWYgdGhlIHByb3ZpZGVyIGRvZXMgbm90IHJlc2l6ZSB0aGUgaW1hZ2UsIGZvcmNlIGl0IGluIHRoZSBicm93c2VyLgorICAgICAgc2V0U2l6ZShzaXplICsgInB4Iiwgc2l6ZSArICJweCIpOworICAgIH0KKworICAgIGFkZEVycm9ySGFuZGxlcihuZXcgRXJyb3JIYW5kbGVyKCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvbkVycm9yKEVycm9yRXZlbnQgZXZlbnQpIHsKKyAgICAgICAgLy8gV2UgZ290IGEgNDA0LCBkb24ndCBib3RoZXIgc2hvd2luZyB0aGUgaW1hZ2UuIEVpdGhlciB0aGUgdXNlciBkb2Vzbid0CisgICAgICAgIC8vIGhhdmUgYW4gYXZhdGFyIG9yIHRoZXJlIGlzIG5vIGF2YXRhciBwcm92aWRlciBwbHVnaW4gaW5zdGFsbGVkLgorICAgICAgICBzZXRWaXNpYmxlKGZhbHNlKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyB1cmwoQWNjb3VudC5JZCBpZCwgaW50IHNpemUpIHsKKyAgICBTdHJpbmcgdTsKKyAgICBpZiAoR2Vycml0LmlzU2lnbmVkSW4oKSAmJiBpZC5lcXVhbHMoR2Vycml0LmdldFVzZXJBY2NvdW50KCkuZ2V0SWQoKSkpIHsKKyAgICAgIHUgPSAic2VsZiI7CisgICAgfSBlbHNlIHsKKyAgICAgIHUgPSBpZC50b1N0cmluZygpOworICAgIH0KKyAgICBSZXN0QXBpIGFwaSA9IG5ldyBSZXN0QXBpKCIvYWNjb3VudHMvIikuaWQodSkudmlldygiYXZhdGFyIik7CisgICAgaWYgKHNpemUgPiAwKSB7CisgICAgICBhcGkuYWRkUGFyYW1ldGVyKCJzIiwgc2l6ZSk7CisgICAgfQorICAgIHJldHVybiBhcGkudXJsKCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9DdXJyZW50VXNlclBvcHVwUGFuZWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9DdXJyZW50VXNlclBvcHVwUGFuZWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43OTgzZjljCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0N1cnJlbnRVc2VyUG9wdXBQYW5lbC5qYXZhCkBAIC0wLDAgKzEsNjcgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51aWJpbmRlci5jbGllbnQuVWlCaW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudWliaW5kZXIuY2xpZW50LlVpRmllbGQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQW5jaG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkxhYmVsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLldpZGdldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnVzZXIuY2xpZW50LlBsdWdpblNhZmVQb3B1cFBhbmVsOworCitwdWJsaWMgY2xhc3MgQ3VycmVudFVzZXJQb3B1cFBhbmVsIGV4dGVuZHMgUGx1Z2luU2FmZVBvcHVwUGFuZWwgeworICBpbnRlcmZhY2UgQmluZGVyIGV4dGVuZHMgVWlCaW5kZXI8V2lkZ2V0LCBDdXJyZW50VXNlclBvcHVwUGFuZWw+IHsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGZpbmFsIEJpbmRlciBiaW5kZXIgPSBHV1QuY3JlYXRlKEJpbmRlci5jbGFzcyk7CisKKyAgQFVpRmllbGQocHJvdmlkZWQgPSB0cnVlKQorICBBdmF0YXJJbWFnZSBhdmF0YXI7CisgIEBVaUZpZWxkCisgIExhYmVsIHVzZXJOYW1lOworICBAVWlGaWVsZAorICBMYWJlbCB1c2VyRW1haWw7CisgIEBVaUZpZWxkCisgIEFuY2hvciBsb2dvdXQ7CisgIEBVaUZpZWxkCisgIEFuY2hvciBzZXR0aW5nczsKKworICBwdWJsaWMgQ3VycmVudFVzZXJQb3B1cFBhbmVsKEFjY291bnQgYWNjb3VudCwgYm9vbGVhbiBjYW5Mb2dPdXQpIHsKKyAgICBzdXBlcigvKiBhdXRvIGhpZGUgKi90cnVlLCAvKiBtb2RhbCAqL2ZhbHNlKTsKKyAgICBhdmF0YXIgPSBuZXcgQXZhdGFySW1hZ2UoYWNjb3VudC5nZXRJZCgpLCAxMDApOworICAgIHNldFdpZGdldChiaW5kZXIuY3JlYXRlQW5kQmluZFVpKHRoaXMpKTsKKyAgICAvLyBXZSBtdXN0IHNob3cgYW5kIHRoZW4gaGlkZSB0aGlzIHBvcHVwIHNvIHRoYXQgaXQgaXMgcGFydCBvZiB0aGUgRE9NLgorICAgIC8vIE90aGVyd2lzZSB0aGUgaW1hZ2UgZG9lcyBub3QgZ2V0IGFueSBldmVudHMuICBDYWxsaW5nIGhpZGUoKSB3b3VsZAorICAgIC8vIHJlbW92ZSBpdCBmcm9tIHRoZSBET00gc28gd2UgdXNlIHNldFZpc2libGUoZmFsc2UpIGluc3RlYWQuCisgICAgc2hvdygpOworICAgIHNldFZpc2libGUoZmFsc2UpOworICAgIHNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnVzZXJJbmZvUG9wdXAoKSk7CisgICAgaWYgKGFjY291bnQuZ2V0RnVsbE5hbWUoKSAhPSBudWxsKSB7CisgICAgICB1c2VyTmFtZS5zZXRUZXh0KGFjY291bnQuZ2V0RnVsbE5hbWUoKSk7CisgICAgfQorICAgIGlmIChhY2NvdW50LmdldFByZWZlcnJlZEVtYWlsKCkgIT0gbnVsbCkgeworICAgICAgdXNlckVtYWlsLnNldFRleHQoYWNjb3VudC5nZXRQcmVmZXJyZWRFbWFpbCgpKTsKKyAgICB9CisgICAgaWYgKGNhbkxvZ091dCkgeworICAgICAgbG9nb3V0LnNldEhyZWYoR2Vycml0LnNlbGZSZWRpcmVjdCgiL2xvZ291dCIpKTsKKyAgICB9IGVsc2UgeworICAgICAgbG9nb3V0LnNldFZpc2libGUoZmFsc2UpOworICAgIH0KKyAgICBzZXR0aW5ncy5zZXRIcmVmKEdlcnJpdC5zZWxmUmVkaXJlY3QoUGFnZUxpbmtzLlNFVFRJTkdTKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9DdXJyZW50VXNlclBvcHVwUGFuZWwudWkueG1sIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0N1cnJlbnRVc2VyUG9wdXBQYW5lbC51aS54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGRiNTc4OAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9DdXJyZW50VXNlclBvcHVwUGFuZWwudWkueG1sCkBAIC0wLDAgKzEsNjEgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8IS0tCitDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorCitMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKK3lvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KK1lvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorCitodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKworVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKK1dJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCistLT4KKzwhRE9DVFlQRSB1aTpVaUJpbmRlciBTWVNURU0gImh0dHA6Ly9kbC5nb29nbGUuY29tL2d3dC9EVEQveGh0bWwuZW50Ij4KKzx1aTpVaUJpbmRlciB4bWxuczp1aT0ndXJuOnVpOmNvbS5nb29nbGUuZ3d0LnVpYmluZGVyJworICB4bWxuczpnPSd1cm46aW1wb3J0OmNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpJworICB4bWxuczpnZXJyaXQ9J3VybjppbXBvcnQ6Y29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Jz4KKyAgPHVpOndpdGggZmllbGQ9J2NvbnN0YW50cycgdHlwZT0nY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdENvbnN0YW50cycvPgorCisgIDx1aTpzdHlsZT4KKyAgICAucGFuZWwgeworICAgICAgcGFkZGluZzogOHB4OworICAgIH0KKyAgICAuYXZhdGFyIHsKKyAgICAgIHBhZGRpbmctcmlnaHQ6IDRweDsKKyAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgIGhlaWdodDogMTAwcHg7CisgICAgfQorICAgIC5pbmZvQ2VsbCB7CisgICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOworICAgIH0KKyAgICAudXNlck5hbWUgeworICAgICAgZm9udC13ZWlnaHQ6IGJvbGQ7CisgICAgfQorICAgIC5lbWFpbCB7CisgICAgICBwYWRkaW5nLWJvdHRvbTogNnB4OworICAgIH0KKyAgICAubG9nb3V0IHsKKyAgICAgIHBhZGRpbmctbGVmdDogMTZweDsKKyAgICAgIGZsb2F0OiByaWdodDsKKyAgICB9CisgIDwvdWk6c3R5bGU+CisKKyAgPGc6SFRNTFBhbmVsIHN0eWxlTmFtZT0ne3N0eWxlLnBhbmVsfSc+CisgICAgPHRhYmxlPjx0cj48dGQ+CisgICAgICA8Z2Vycml0OkF2YXRhckltYWdlIHVpOmZpZWxkPSdhdmF0YXInIHN0eWxlTmFtZT0ne3N0eWxlLmF2YXRhcn0nIC8+CisgICAgPC90ZD48dGQgY2xhc3M9J3tzdHlsZS5pbmZvQ2VsbH0nPgorICAgICAgPGc6TGFiZWwgdWk6ZmllbGQ9J3VzZXJOYW1lJyBzdHlsZU5hbWU9IntzdHlsZS51c2VyTmFtZX0iIC8+CisgICAgICA8ZzpMYWJlbCB1aTpmaWVsZD0ndXNlckVtYWlsJyBzdHlsZU5hbWU9IntzdHlsZS5lbWFpbH0iIC8+CisgICAgPC90ZD48L3RyPjwvdGFibGU+CisgICAgPGc6QW5jaG9yIHVpOmZpZWxkPSdzZXR0aW5ncyc+CisgICAgICA8dWk6dGV4dCBmcm9tPSd7Y29uc3RhbnRzLm1lbnVTZXR0aW5nc30nIC8+CisgICAgPC9nOkFuY2hvcj4KKyAgICA8ZzpBbmNob3IgdWk6ZmllbGQ9J2xvZ291dCcgc3R5bGVOYW1lPSJ7c3R5bGUubG9nb3V0fSI+CisgICAgICA8dWk6dGV4dCBmcm9tPSd7Y29uc3RhbnRzLm1lbnVTaWduT3V0fScgLz4KKyAgICA8L2c6QW5jaG9yPgorICA8L2c6SFRNTFBhbmVsPgorPC91aTpVaUJpbmRlcj4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvRGlzcGF0Y2hlci5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0Rpc3BhdGNoZXIuamF2YQppbmRleCBhZWZhZDI3Li5jOGIxZTQ4IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvRGlzcGF0Y2hlci5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9EaXNwYXRjaGVyLmphdmEKQEAgLTE3LDkgKzE3LDExIEBACiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3MuQURNSU5fQ1JFQVRFX0dST1VQOwogaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzLkFETUlOX0NSRUFURV9QUk9KRUNUOwogaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzLkFETUlOX0dST1VQUzsKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rcy5BRE1JTl9QUk9KRUNUUzsKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rcy5BRE1JTl9QTFVHSU5TOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzLkFETUlOX1BST0pFQ1RTOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzLkRBU0hCT0FSRFM7CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3MuTUlORTsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rcy5QUk9KRUNUUzsKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rcy5SRUdJU1RFUjsKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rcy5TRVRUSU5HUzsKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rcy5TRVRUSU5HU19BR1JFRU1FTlRTOwpAQCAtNTQsMjQgKzU2LDI2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFkbWluLlBsdWdpbkxpc3RTY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFkbWluLlByb2plY3RBY2Nlc3NTY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFkbWluLlByb2plY3RCcmFuY2hlc1NjcmVlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW4uUHJvamVjdERhc2hib2FyZHNTY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFkbWluLlByb2plY3RJbmZvU2NyZWVuOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbi5Qcm9qZWN0TGlzdFNjcmVlbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW4uUHJvamVjdFNjcmVlbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW4uVXRpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC5vcGVuaWQuT3BlbklkU2lnbkluRGlhbG9nOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hdXRoLnVzZXJwYXNzLlVzZXJQYXNzU2lnbkluRGlhbG9nOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLkFjY291bnREYXNoYm9hcmRTY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXMuQ2hhbmdlU2NyZWVuOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLkN1c3RvbURhc2hib2FyZFNjcmVlbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlcy5QYXRjaFRhYmxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLlByb2plY3REYXNoYm9hcmRTY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXMuUHVibGlzaENvbW1lbnRTY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXMuUXVlcnlTY3JlZW47CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmRhc2hib2FyZHMuRGFzaGJvYXJkSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZGFzaGJvYXJkcy5EYXNoYm9hcmRMaXN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ncm91cHMuR3JvdXBBcGk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lmdyb3Vwcy5Hcm91cEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBhdGNoZXMuUGF0Y2hTY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLlJlc3RBcGk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlNjcmVlbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLlNpZ25Jbk1vZGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXRhaWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGF0Y2hTZXREZXRhaWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKQEAgLTgxLDYgKzg1LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuUnVuQXN5bmNDYWxsYmFjazsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5odHRwLmNsaWVudC5VUkw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuV2luZG93OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5LZXlVdGlsOwogCkBAIC0xMzcsMTYgKzE0MiwyMCBAQAogICAgIHJldHVybiAiL2FkbWluL2dyb3Vwcy8iICsgaWQudG9TdHJpbmcoKSArICIsIiArIHBhbmVsOwogICB9CiAKLSAgcHVibGljIHN0YXRpYyBTdHJpbmcgdG9Hcm91cChmaW5hbCBBY2NvdW50R3JvdXAuVVVJRCB1dWlkKSB7Ci0gICAgcmV0dXJuICIvYWRtaW4vZ3JvdXBzL3V1aWQtIiArIHV1aWQudG9TdHJpbmcoKTsKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgdG9Hcm91cChBY2NvdW50R3JvdXAuVVVJRCB1dWlkKSB7CisgICAgcmV0dXJuIFBhZ2VMaW5rcy50b0dyb3VwKHV1aWQpOwogICB9CiAKICAgcHVibGljIHN0YXRpYyBTdHJpbmcgdG9Hcm91cChBY2NvdW50R3JvdXAuVVVJRCB1dWlkLCBTdHJpbmcgcGFuZWwpIHsKLSAgICByZXR1cm4gIi9hZG1pbi9ncm91cHMvdXVpZC0iICsgdXVpZC50b1N0cmluZygpICsgIiwiICsgcGFuZWw7CisgICAgcmV0dXJuIHRvR3JvdXAodXVpZCkgKyAiLCIgKyBwYW5lbDsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIHRvUHJvamVjdChQcm9qZWN0Lk5hbWVLZXkgbikgeworICAgIHJldHVybiB0b1Byb2plY3RBZG1pbihuLCBQcm9qZWN0U2NyZWVuLmdldFNhdmVkUGFuZWwoKSk7CiAgIH0KIAogICBwdWJsaWMgc3RhdGljIFN0cmluZyB0b1Byb2plY3RBZG1pbihQcm9qZWN0Lk5hbWVLZXkgbiwgU3RyaW5nIHBhbmVsKSB7Ci0gICAgaWYgKFByb2plY3RTY3JlZW4uSU5GTy5lcXVhbHMocGFuZWwpKSB7CisgICAgaWYgKHBhbmVsID09IG51bGwgfHwgUHJvamVjdFNjcmVlbi5JTkZPLmVxdWFscyhwYW5lbCkpIHsKICAgICAgIHJldHVybiAiL2FkbWluL3Byb2plY3RzLyIgKyBuLnRvU3RyaW5nKCk7CiAgICAgfQogICAgIHJldHVybiAiL2FkbWluL3Byb2plY3RzLyIgKyBuLnRvU3RyaW5nKCkgKyAiLCIgKyBwYW5lbDsKQEAgLTE4Niw2ICsxOTUsOSBAQAogICAgIH0gZWxzZSBpZiAobWF0Y2hQcmVmaXgoIi9kYXNoYm9hcmQvIiwgdG9rZW4pKSB7CiAgICAgICBkYXNoYm9hcmQodG9rZW4pOwogCisgICAgfSBlbHNlIGlmIChtYXRjaFByZWZpeChQUk9KRUNUUywgdG9rZW4pKSB7CisgICAgICBwcm9qZWN0cyh0b2tlbik7CisKICAgICB9IGVsc2UgaWYgKG1hdGNoRXhhY3QoU0VUVElOR1MsIHRva2VuKSAvLwogICAgICAgICB8fCBtYXRjaFByZWZpeCgiL3NldHRpbmdzLyIsIHRva2VuKSAvLwogICAgICAgICB8fCBtYXRjaEV4YWN0KCJyZWdpc3RlciIsIHRva2VuKSAvLwpAQCAtMzg0LDYgKzM5Niw1MiBAQAogICAgIEdlcnJpdC5kaXNwbGF5KHRva2VuLCBuZXcgTm90Rm91bmRTY3JlZW4oKSk7CiAgIH0KIAorICBwcml2YXRlIHN0YXRpYyB2b2lkIHByb2plY3RzKGZpbmFsIFN0cmluZyB0b2tlbikgeworICAgIFN0cmluZyByZXN0ID0gc2tpcCh0b2tlbik7CisgICAgaW50IGMgPSByZXN0LmluZGV4T2YoREFTSEJPQVJEUyk7CisgICAgaWYgKDAgPD0gYykgeworICAgICAgZmluYWwgU3RyaW5nIHByb2plY3QgPSBVUkwuZGVjb2RlUGF0aFNlZ21lbnQocmVzdC5zdWJzdHJpbmcoMCwgYykpOworICAgICAgcmVzdCA9IHJlc3Quc3Vic3RyaW5nKGMpOworICAgICAgaWYgKG1hdGNoUHJlZml4KERBU0hCT0FSRFMsIHJlc3QpKSB7CisgICAgICAgIGZpbmFsIFN0cmluZyBkYXNoYm9hcmRJZCA9IHNraXAocmVzdCk7CisgICAgICAgIEdlcnJpdENhbGxiYWNrPERhc2hib2FyZEluZm8+IGNiID0gbmV3IEdlcnJpdENhbGxiYWNrPERhc2hib2FyZEluZm8+KCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhEYXNoYm9hcmRJbmZvIHJlc3VsdCkgeworICAgICAgICAgICAgaWYgKG1hdGNoUHJlZml4KCIvZGFzaGJvYXJkLyIsIHJlc3VsdC51cmwoKSkpIHsKKyAgICAgICAgICAgICAgU3RyaW5nIHBhcmFtcyA9IHNraXAocmVzdWx0LnVybCgpKS5zdWJzdHJpbmcoMSk7CisgICAgICAgICAgICAgIFByb2plY3REYXNoYm9hcmRTY3JlZW4gZGFzaCA9IG5ldyBQcm9qZWN0RGFzaGJvYXJkU2NyZWVuKAorICAgICAgICAgICAgICAgICAgbmV3IFByb2plY3QuTmFtZUtleShwcm9qZWN0KSwgcGFyYW1zKTsKKyAgICAgICAgICAgICAgR2Vycml0LmRpc3BsYXkodG9rZW4sIGRhc2gpOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgY2F1Z2h0KSB7CisgICAgICAgICAgICBpZiAoImRlZmF1bHQiLmVxdWFscyhkYXNoYm9hcmRJZCkgJiYgUmVzdEFwaS5pc05vdEZvdW5kKGNhdWdodCkpIHsKKyAgICAgICAgICAgICAgR2Vycml0LmRpc3BsYXkoUGFnZUxpbmtzLnRvQ2hhbmdlUXVlcnkoCisgICAgICAgICAgICAgICAgICBQYWdlTGlua3MucHJvamVjdFF1ZXJ5KG5ldyBQcm9qZWN0Lk5hbWVLZXkocHJvamVjdCkpKSk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICBzdXBlci5vbkZhaWx1cmUoY2F1Z2h0KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9CisgICAgICAgIH07CisgICAgICAgIGlmICgiZGVmYXVsdCIuZXF1YWxzKGRhc2hib2FyZElkKSkgeworICAgICAgICAgIERhc2hib2FyZExpc3QuZ2V0RGVmYXVsdChuZXcgUHJvamVjdC5OYW1lS2V5KHByb2plY3QpLCBjYik7CisgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGMgPSBkYXNoYm9hcmRJZC5pbmRleE9mKCI6Iik7CisgICAgICAgIGlmICgwIDw9IGMpIHsKKyAgICAgICAgICBmaW5hbCBTdHJpbmcgcmVmID0gVVJMLmRlY29kZVF1ZXJ5U3RyaW5nKGRhc2hib2FyZElkLnN1YnN0cmluZygwLCBjKSk7CisgICAgICAgICAgZmluYWwgU3RyaW5nIHBhdGggPSBVUkwuZGVjb2RlUXVlcnlTdHJpbmcoZGFzaGJvYXJkSWQuc3Vic3RyaW5nKGMgKyAxKSk7CisgICAgICAgICAgRGFzaGJvYXJkTGlzdC5nZXQobmV3IFByb2plY3QuTmFtZUtleShwcm9qZWN0KSwgcmVmICsgIjoiICsgcGF0aCwgY2IpOworICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKworICAgIEdlcnJpdC5kaXNwbGF5KHRva2VuLCBuZXcgTm90Rm91bmRTY3JlZW4oKSk7CisgIH0KKwogICBwcml2YXRlIHN0YXRpYyB2b2lkIGNoYW5nZShmaW5hbCBTdHJpbmcgdG9rZW4pIHsKICAgICBTdHJpbmcgcmVzdCA9IHNraXAodG9rZW4pOwogICAgIGludCBjID0gcmVzdC5sYXN0SW5kZXhPZignLCcpOwpAQCAtNTcyLDMwICs2MzAsNiBAQAogICAgICAgICBpZiAobWF0Y2hQcmVmaXgoIi9WRS8iLCB0b2tlbikgfHwgbWF0Y2hQcmVmaXgoIlZFLCIsIHRva2VuKSkKICAgICAgICAgICByZXR1cm4gbmV3IFZhbGlkYXRlRW1haWxTY3JlZW4oc2tpcCh0b2tlbikpOwogCi0gICAgICAgIGlmIChtYXRjaFByZWZpeCgiL1NpZ25JbkZhaWx1cmUsIiwgdG9rZW4pKSB7Ci0gICAgICAgICAgZmluYWwgU3RyaW5nW10gYXJncyA9IHNraXAodG9rZW4pLnNwbGl0KCIsIik7Ci0gICAgICAgICAgZmluYWwgU2lnbkluTW9kZSBtb2RlID0gU2lnbkluTW9kZS52YWx1ZU9mKGFyZ3NbMF0pOwotICAgICAgICAgIGZpbmFsIFN0cmluZyBtc2cgPSBLZXlVdGlsLmRlY29kZShhcmdzWzFdKTsKLSAgICAgICAgICBmaW5hbCBTdHJpbmcgdG8gPSBNSU5FOwotICAgICAgICAgIHN3aXRjaCAoR2Vycml0LmdldENvbmZpZygpLmdldEF1dGhUeXBlKCkpIHsKLSAgICAgICAgICAgIGNhc2UgT1BFTklEOgotICAgICAgICAgICAgICBuZXcgT3BlbklkU2lnbkluRGlhbG9nKG1vZGUsIHRvLCBtc2cpLmNlbnRlcigpOwotICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgTERBUDoKLSAgICAgICAgICAgIGNhc2UgTERBUF9CSU5EOgotICAgICAgICAgICAgICBuZXcgVXNlclBhc3NTaWduSW5EaWFsb2codG8sIG1zZykuY2VudGVyKCk7Ci0gICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgICAgICAgfQotICAgICAgICAgIHN3aXRjaCAobW9kZSkgewotICAgICAgICAgICAgY2FzZSBTSUdOX0lOOgotICAgICAgICAgICAgICByZXR1cm4gUXVlcnlTY3JlZW4uZm9yUXVlcnkoInN0YXR1czpvcGVuIik7Ci0gICAgICAgICAgICBjYXNlIExJTktfSURFTlRJWToKLSAgICAgICAgICAgICAgcmV0dXJuIG5ldyBNeUlkZW50aXRpZXNTY3JlZW4oKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLQogICAgICAgICBpZiAobWF0Y2hFeGFjdChTRVRUSU5HU19ORVdfQUdSRUVNRU5ULCB0b2tlbikpCiAgICAgICAgICAgcmV0dXJuIG5ldyBOZXdBZ3JlZW1lbnRTY3JlZW4oKTsKIApAQCAtNjE2LDE0ICs2NTAsMzYgQEAKICAgICAgICAgICBHZXJyaXQuZGlzcGxheSh0b2tlbiwgbmV3IEdyb3VwTGlzdFNjcmVlbigpKTsKIAogICAgICAgICB9IGVsc2UgaWYgKG1hdGNoUHJlZml4KCIvYWRtaW4vZ3JvdXBzLyIsIHRva2VuKSkgewotICAgICAgICAgIGdyb3VwKCk7CisgICAgICAgICAgU3RyaW5nIHJlc3QgPSBza2lwKHRva2VuKTsKKyAgICAgICAgICBpZiAocmVzdC5zdGFydHNXaXRoKCI/IikpIHsKKyAgICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KHRva2VuLCBuZXcgR3JvdXBMaXN0U2NyZWVuKHJlc3Quc3Vic3RyaW5nKDEpKSk7CisgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGdyb3VwKCk7CisgICAgICAgICAgfQorCisgICAgICAgIH0gZWxzZSBpZiAobWF0Y2hQcmVmaXgoIi9hZG1pbi9ncm91cHMiLCB0b2tlbikpIHsKKyAgICAgICAgICBTdHJpbmcgcmVzdCA9IHNraXAodG9rZW4pOworICAgICAgICAgIGlmIChyZXN0LnN0YXJ0c1dpdGgoIj8iKSkgeworICAgICAgICAgICAgR2Vycml0LmRpc3BsYXkodG9rZW4sIG5ldyBHcm91cExpc3RTY3JlZW4ocmVzdC5zdWJzdHJpbmcoMSkpKTsKKyAgICAgICAgICB9CiAKICAgICAgICAgfSBlbHNlIGlmIChtYXRjaEV4YWN0KEFETUlOX1BST0pFQ1RTLCB0b2tlbikKICAgICAgICAgICAgIHx8IG1hdGNoRXhhY3QoIi9hZG1pbi9wcm9qZWN0cyIsIHRva2VuKSkgewogICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KHRva2VuLCBuZXcgUHJvamVjdExpc3RTY3JlZW4oKSk7CiAKICAgICAgICAgfSBlbHNlIGlmIChtYXRjaFByZWZpeCgiL2FkbWluL3Byb2plY3RzLyIsIHRva2VuKSkgewotICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KHRva2VuLCBzZWxlY3RQcm9qZWN0KCkpOworICAgICAgICAgICAgU3RyaW5nIHJlc3QgPSBza2lwKHRva2VuKTsKKyAgICAgICAgICAgIGlmIChyZXN0LnN0YXJ0c1dpdGgoIj8iKSkgeworICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheSh0b2tlbiwgbmV3IFByb2plY3RMaXN0U2NyZWVuKHJlc3Quc3Vic3RyaW5nKDEpKSk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheSh0b2tlbiwgc2VsZWN0UHJvamVjdCgpKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICB9IGVsc2UgaWYgKG1hdGNoUHJlZml4KCIvYWRtaW4vcHJvamVjdHMiLCB0b2tlbikpIHsKKyAgICAgICAgICBTdHJpbmcgcmVzdCA9IHNraXAodG9rZW4pOworICAgICAgICAgIGlmIChyZXN0LnN0YXJ0c1dpdGgoIj8iKSkgeworICAgICAgICAgICAgR2Vycml0LmRpc3BsYXkodG9rZW4sIG5ldyBQcm9qZWN0TGlzdFNjcmVlbihyZXN0LnN1YnN0cmluZygxKSkpOworICAgICAgICAgIH0KIAogICAgICAgICB9IGVsc2UgaWYgKG1hdGNoUHJlZml4KEFETUlOX1BMVUdJTlMsIHRva2VuKQogICAgICAgICAgICAgfHwgbWF0Y2hFeGFjdCgiL2FkbWluL3BsdWdpbnMiLCB0b2tlbikpIHsKQEAgLTY0NCwyNyArNzAwLDI2IEBACiAKICAgICAgIHByaXZhdGUgdm9pZCBncm91cCgpIHsKICAgICAgICAgZmluYWwgU3RyaW5nIHBhbmVsOwotICAgICAgICBBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZCA9IG51bGw7Ci0gICAgICAgIEFjY291bnRHcm91cC5VVUlEIGdyb3VwVVVJRCA9IG51bGw7CisgICAgICAgIGZpbmFsIFN0cmluZyBncm91cDsKIAogICAgICAgICBpZiAobWF0Y2hQcmVmaXgoIi9hZG1pbi9ncm91cHMvdXVpZC0iLCB0b2tlbikpIHsKICAgICAgICAgICBTdHJpbmcgcCA9IHNraXAodG9rZW4pOwogICAgICAgICAgIGludCBjID0gcC5pbmRleE9mKCcsJyk7CiAgICAgICAgICAgaWYgKGMgPCAwKSB7Ci0gICAgICAgICAgICBncm91cFVVSUQgPSBBY2NvdW50R3JvdXAuVVVJRC5wYXJzZShwKTsKKyAgICAgICAgICAgIGdyb3VwID0gcDsKICAgICAgICAgICAgIHBhbmVsID0gbnVsbDsKICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgZ3JvdXBVVUlEID0gQWNjb3VudEdyb3VwLlVVSUQucGFyc2UocC5zdWJzdHJpbmcoMCwgYykpOworICAgICAgICAgICAgZ3JvdXAgPSBwLnN1YnN0cmluZygwLCBjKTsKICAgICAgICAgICAgIHBhbmVsID0gcC5zdWJzdHJpbmcoYyArIDEpOwogICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlmIChtYXRjaFByZWZpeCgiL2FkbWluL2dyb3Vwcy8iLCB0b2tlbikpIHsKICAgICAgICAgICBTdHJpbmcgcCA9IHNraXAodG9rZW4pOwogICAgICAgICAgIGludCBjID0gcC5pbmRleE9mKCcsJyk7CiAgICAgICAgICAgaWYgKGMgPCAwKSB7Ci0gICAgICAgICAgICBncm91cElkID0gQWNjb3VudEdyb3VwLklkLnBhcnNlKHApOworICAgICAgICAgICAgZ3JvdXAgPSBwOwogICAgICAgICAgICAgcGFuZWwgPSBudWxsOwogICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBncm91cElkID0gQWNjb3VudEdyb3VwLklkLnBhcnNlKHAuc3Vic3RyaW5nKDAsIGMpKTsKKyAgICAgICAgICAgIGdyb3VwID0gcC5zdWJzdHJpbmcoMCwgYyk7CiAgICAgICAgICAgICBwYW5lbCA9IHAuc3Vic3RyaW5nKGMgKyAxKTsKICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7CkBAIC02NzIsMzcgKzcyNywzMyBAQAogICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIFV0aWwuR1JPVVBfU1ZDLmdyb3VwRGV0YWlsKGdyb3VwSWQsIGdyb3VwVVVJRCwKLSAgICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxHcm91cERldGFpbD4oKSB7Ci0gICAgICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoR3JvdXBEZXRhaWwgZ3JvdXBEZXRhaWwpIHsKLSAgICAgICAgICAgICAgICBpZiAocGFuZWwgPT0gbnVsbCB8fCBwYW5lbC5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICAgIC8vIFRoZSB0b2tlbiBkb2VzIG5vdCBzYXkgd2hpY2ggZ3JvdXAgc2NyZWVuIHNob3VsZCBiZSBzaG93biwKLSAgICAgICAgICAgICAgICAgIC8vIGFzIGRlZmF1bHQgZm9yIGludGVybmFsIGdyb3VwcyBzaG93IHRoZSBtZW1iZXJzLCBhcyBkZWZhdWx0Ci0gICAgICAgICAgICAgICAgICAvLyBmb3IgZXh0ZXJuYWwgYW5kIHN5c3RlbSBncm91cHMgc2hvdyB0aGUgaW5mbyBzY3JlZW4gKHNpbmNlCi0gICAgICAgICAgICAgICAgICAvLyBmb3IgZXh0ZXJuYWwgYW5kIHN5c3RlbSBncm91cHMgdGhlIG1lbWJlcnMgY2Fubm90IGJlCi0gICAgICAgICAgICAgICAgICAvLyBzaG93biBpbiB0aGUgd2ViIFVJKS4KLSAgICAgICAgICAgICAgICAgIC8vCi0gICAgICAgICAgICAgICAgICBpZiAoZ3JvdXBEZXRhaWwuZ3JvdXAuZ2V0VHlwZSgpID09IEFjY291bnRHcm91cC5UeXBlLklOVEVSTkFMKSB7Ci0gICAgICAgICAgICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KHRvR3JvdXAoZ3JvdXBEZXRhaWwuZ3JvdXAuZ2V0SWQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgIEFjY291bnRHcm91cFNjcmVlbi5NRU1CRVJTKSwKLSAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBBY2NvdW50R3JvdXBNZW1iZXJzU2NyZWVuKGdyb3VwRGV0YWlsLCB0b2tlbikpOwotICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgR2Vycml0LmRpc3BsYXkodG9Hcm91cChncm91cERldGFpbC5ncm91cC5nZXRJZCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgQWNjb3VudEdyb3VwU2NyZWVuLklORk8pLAotICAgICAgICAgICAgICAgICAgICAgICAgbmV3IEFjY291bnRHcm91cEluZm9TY3JlZW4oZ3JvdXBEZXRhaWwsIHRva2VuKSk7Ci0gICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChBY2NvdW50R3JvdXBTY3JlZW4uSU5GTy5lcXVhbHMocGFuZWwpKSB7Ci0gICAgICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheSh0b2tlbiwKLSAgICAgICAgICAgICAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5mb1NjcmVlbihncm91cERldGFpbCwgdG9rZW4pKTsKLSAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKEFjY291bnRHcm91cFNjcmVlbi5NRU1CRVJTLmVxdWFscyhwYW5lbCkpIHsKLSAgICAgICAgICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KHRva2VuLAotICAgICAgICAgICAgICAgICAgICAgIG5ldyBBY2NvdW50R3JvdXBNZW1iZXJzU2NyZWVuKGdyb3VwRGV0YWlsLCB0b2tlbikpOwotICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheSh0b2tlbixuZXcgTm90Rm91bmRTY3JlZW4oKSk7Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICBHcm91cEFwaS5nZXRHcm91cERldGFpbChncm91cCwgbmV3IEdlcnJpdENhbGxiYWNrPEdyb3VwSW5mbz4oKSB7CisgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKEdyb3VwSW5mbyBncm91cCkgeworICAgICAgICAgICAgaWYgKHBhbmVsID09IG51bGwgfHwgcGFuZWwuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgIC8vIFRoZSB0b2tlbiBkb2VzIG5vdCBzYXkgd2hpY2ggZ3JvdXAgc2NyZWVuIHNob3VsZCBiZSBzaG93biwKKyAgICAgICAgICAgICAgLy8gYXMgZGVmYXVsdCBmb3IgaW50ZXJuYWwgZ3JvdXBzIHNob3cgdGhlIG1lbWJlcnMsIGFzIGRlZmF1bHQKKyAgICAgICAgICAgICAgLy8gZm9yIGV4dGVybmFsIGFuZCBzeXN0ZW0gZ3JvdXBzIHNob3cgdGhlIGluZm8gc2NyZWVuIChzaW5jZQorICAgICAgICAgICAgICAvLyBmb3IgZXh0ZXJuYWwgYW5kIHN5c3RlbSBncm91cHMgdGhlIG1lbWJlcnMgY2Fubm90IGJlCisgICAgICAgICAgICAgIC8vIHNob3duIGluIHRoZSB3ZWIgVUkpLgorICAgICAgICAgICAgICAvLworICAgICAgICAgICAgICBpZiAoQWNjb3VudEdyb3VwLmlzSW50ZXJuYWxHcm91cChncm91cC5nZXRHcm91cFVVSUQoKSkKKyAgICAgICAgICAgICAgICAgICYmICFBY2NvdW50R3JvdXAuaXNTeXN0ZW1Hcm91cChncm91cC5nZXRHcm91cFVVSUQoKSkpIHsKKyAgICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheSh0b0dyb3VwKGdyb3VwLmdldEdyb3VwSWQoKSwgQWNjb3VudEdyb3VwU2NyZWVuLk1FTUJFUlMpLAorICAgICAgICAgICAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwTWVtYmVyc1NjcmVlbihncm91cCwgdG9rZW4pKTsKKyAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheSh0b0dyb3VwKGdyb3VwLmdldEdyb3VwSWQoKSwgQWNjb3VudEdyb3VwU2NyZWVuLklORk8pLAorICAgICAgICAgICAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5mb1NjcmVlbihncm91cCwgdG9rZW4pKTsKICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKEFjY291bnRHcm91cFNjcmVlbi5JTkZPLmVxdWFscyhwYW5lbCkpIHsKKyAgICAgICAgICAgICAgR2Vycml0LmRpc3BsYXkodG9rZW4sIG5ldyBBY2NvdW50R3JvdXBJbmZvU2NyZWVuKGdyb3VwLCB0b2tlbikpOworICAgICAgICAgICAgfSBlbHNlIGlmIChBY2NvdW50R3JvdXBTY3JlZW4uTUVNQkVSUy5lcXVhbHMocGFuZWwpKSB7CisgICAgICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KHRva2VuLCBuZXcgQWNjb3VudEdyb3VwTWVtYmVyc1NjcmVlbihncm91cCwgdG9rZW4pKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KHRva2VuLCBuZXcgTm90Rm91bmRTY3JlZW4oKSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfQorICAgICAgICB9KTsKICAgICAgIH0KIAogICAgICAgcHJpdmF0ZSBTY3JlZW4gc2VsZWN0UHJvamVjdCgpIHsKQEAgLTcyOSw2ICs3ODAsMTAgQEAKICAgICAgICAgICBpZiAoUHJvamVjdFNjcmVlbi5BQ0NFU1MuZXF1YWxzKHBhbmVsKSkgewogICAgICAgICAgICAgcmV0dXJuIG5ldyBQcm9qZWN0QWNjZXNzU2NyZWVuKGspOwogICAgICAgICAgIH0KKworICAgICAgICAgIGlmIChQcm9qZWN0U2NyZWVuLkRBU0hCT0FSRFMuZXF1YWxzKHBhbmVsKSkgeworICAgICAgICAgICAgcmV0dXJuIG5ldyBQcm9qZWN0RGFzaGJvYXJkc1NjcmVlbihrKTsKKyAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIG5ldyBOb3RGb3VuZFNjcmVlbigpOwogICAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0Vycm9yRGlhbG9nLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvRXJyb3JEaWFsb2cuamF2YQppbmRleCAxM2JiYTEyLi4zYWRlYzhmIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvRXJyb3JEaWFsb2cuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvRXJyb3JEaWFsb2cuamF2YQpAQCAtMTQsMTEgKzE0LDEzIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50OwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuUnBjQ29uc3RhbnRzOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0hhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuaHR0cC5jbGllbnQuUmVzcG9uc2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRE9NOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LldpbmRvdzsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ycGMuU3RhdHVzQ29kZUV4Y2VwdGlvbjsKQEAgLTEwNCwzNCArMTA2LDU0IEBACiAgIHB1YmxpYyBFcnJvckRpYWxvZyhmaW5hbCBUaHJvd2FibGUgd2hhdCkgewogICAgIHRoaXMoKTsKIAotICAgIFN0cmluZyBjbjsKLSAgICBpZiAod2hhdCBpbnN0YW5jZW9mIFJlbW90ZUpzb25FeGNlcHRpb24pIHsKLSAgICAgIGNuID0gUnBjQ29uc3RhbnRzLkMuZXJyb3JSZW1vdGVKc29uRXhjZXB0aW9uKCk7CisgICAgU3RyaW5nIGhkcjsKKyAgICBTdHJpbmcgbXNnOwogCi0gICAgfSBlbHNlIGlmICh3aGF0IGluc3RhbmNlb2YgU3RhdHVzQ29kZUV4Y2VwdGlvbikgewotICAgICAgY24gPSBScGNDb25zdGFudHMuQy5lcnJvclNlcnZlclVuYXZhaWxhYmxlKCk7CisgICAgaWYgKHdoYXQgaW5zdGFuY2VvZiBTdGF0dXNDb2RlRXhjZXB0aW9uKSB7CisgICAgICBTdGF0dXNDb2RlRXhjZXB0aW9uIHNjID0gKFN0YXR1c0NvZGVFeGNlcHRpb24pIHdoYXQ7CisgICAgICBpZiAoUmVzdEFwaS5pc0V4cGVjdGVkKHNjLmdldFN0YXR1c0NvZGUoKSkpIHsKKyAgICAgICAgaGRyID0gbnVsbDsKKyAgICAgICAgbXNnID0gc2MuZ2V0RW5jb2RlZFJlc3BvbnNlKCk7CisgICAgICB9IGVsc2UgaWYgKHNjLmdldFN0YXR1c0NvZGUoKSA9PSBSZXNwb25zZS5TQ19JTlRFUk5BTF9TRVJWRVJfRVJST1IpIHsKKyAgICAgICAgaGRyID0gbnVsbDsKKyAgICAgICAgbXNnID0gd2hhdC5nZXRNZXNzYWdlKCk7CisgICAgICB9IGVsc2UgeworICAgICAgICBoZHIgPSBScGNDb25zdGFudHMuQy5lcnJvclNlcnZlclVuYXZhaWxhYmxlKCk7CisgICAgICAgIG1zZyA9IHdoYXQuZ2V0TWVzc2FnZSgpOworICAgICAgfQorCisgICAgfSBlbHNlIGlmICh3aGF0IGluc3RhbmNlb2YgUmVtb3RlSnNvbkV4Y2VwdGlvbikgeworICAgICAgLy8gVE9ETyBSZW1vdmUgUmVtb3RlSnNvbkV4Y2VwdGlvbiBmcm9tIEdlcnJpdCBzb3VyY2VzLgorICAgICAgaGRyID0gUnBjQ29uc3RhbnRzLkMuZXJyb3JSZW1vdGVKc29uRXhjZXB0aW9uKCk7CisgICAgICBtc2cgPSB3aGF0LmdldE1lc3NhZ2UoKTsKIAogICAgIH0gZWxzZSB7Ci0gICAgICBjbiA9IHdoYXQuZ2V0Q2xhc3MoKS5nZXROYW1lKCk7Ci0gICAgICBpZiAoY24uc3RhcnRzV2l0aCgiamF2YS5sYW5nLiIpKSB7Ci0gICAgICAgIGNuID0gY24uc3Vic3RyaW5nKCJqYXZhLmxhbmcuIi5sZW5ndGgoKSk7Ci0gICAgICB9IGVsc2UgaWYgKGNuLnN0YXJ0c1dpdGgoImNvbS5nb29nbGUuZ2Vycml0LiIpKSB7Ci0gICAgICAgIGNuID0gY24uc3Vic3RyaW5nKGNuLmxhc3RJbmRleE9mKCcuJykgKyAxKTsKKyAgICAgIC8vIFRPRE8gRml4IGNhbGxlcnMgb2YgRXJyb3JEaWFsb2cgdG8gc3RvcCBwYXNzaW5nIHJhbmRvbSB0eXBlcy4KKyAgICAgIGhkciA9IHdoYXQuZ2V0Q2xhc3MoKS5nZXROYW1lKCk7CisgICAgICBpZiAoaGRyLnN0YXJ0c1dpdGgoImphdmEubGFuZy4iKSkgeworICAgICAgICBoZHIgPSBoZHIuc3Vic3RyaW5nKCJqYXZhLmxhbmcuIi5sZW5ndGgoKSk7CisgICAgICB9IGVsc2UgaWYgKGhkci5zdGFydHNXaXRoKCJjb20uZ29vZ2xlLmdlcnJpdC4iKSkgeworICAgICAgICBoZHIgPSBoZHIuc3Vic3RyaW5nKGhkci5sYXN0SW5kZXhPZignLicpICsgMSk7CiAgICAgICB9Ci0gICAgICBpZiAoY24uZW5kc1dpdGgoIkV4Y2VwdGlvbiIpKSB7Ci0gICAgICAgIGNuID0gY24uc3Vic3RyaW5nKDAsIGNuLmxlbmd0aCgpIC0gIkV4Y2VwdGlvbiIubGVuZ3RoKCkpOwotICAgICAgfSBlbHNlIGlmIChjbi5lbmRzV2l0aCgiRXJyb3IiKSkgewotICAgICAgICBjbiA9IGNuLnN1YnN0cmluZygwLCBjbi5sZW5ndGgoKSAtICJFcnJvciIubGVuZ3RoKCkpOworICAgICAgaWYgKGhkci5lbmRzV2l0aCgiRXhjZXB0aW9uIikpIHsKKyAgICAgICAgaGRyID0gaGRyLnN1YnN0cmluZygwLCBoZHIubGVuZ3RoKCkgLSAiRXhjZXB0aW9uIi5sZW5ndGgoKSk7CisgICAgICB9IGVsc2UgaWYgKGhkci5lbmRzV2l0aCgiRXJyb3IiKSkgeworICAgICAgICBoZHIgPSBoZHIuc3Vic3RyaW5nKDAsIGhkci5sZW5ndGgoKSAtICJFcnJvciIubGVuZ3RoKCkpOwogICAgICAgfQorICAgICAgbXNnID0gd2hhdC5nZXRNZXNzYWdlKCk7CiAgICAgfQogCi0gICAgZmluYWwgTGFiZWwgciA9IG5ldyBMYWJlbChjbik7Ci0gICAgci5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5lcnJvckRpYWxvZ0Vycm9yVHlwZSgpKTsKLSAgICBib2R5LmFkZChyKTsKKyAgICBpZiAoaGRyICE9IG51bGwpIHsKKyAgICAgIGZpbmFsIExhYmVsIHIgPSBuZXcgTGFiZWwoaGRyKTsKKyAgICAgIHIuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZXJyb3JEaWFsb2dFcnJvclR5cGUoKSk7CisgICAgICBib2R5LmFkZChyKTsKKyAgICB9CiAKLSAgICBmaW5hbCBMYWJlbCBtID0gbmV3IExhYmVsKHdoYXQuZ2V0TWVzc2FnZSgpKTsKLSAgICBET00uc2V0U3R5bGVBdHRyaWJ1dGUobS5nZXRFbGVtZW50KCksIndoaXRlU3BhY2UiLCJwcmUiKTsKLSAgICBib2R5LmFkZChtKTsKKyAgICBpZiAobXNnICE9IG51bGwpIHsKKyAgICAgIGZpbmFsIExhYmVsIG0gPSBuZXcgTGFiZWwobXNnKTsKKyAgICAgIERPTS5zZXRTdHlsZUF0dHJpYnV0ZShtLmdldEVsZW1lbnQoKSwgIndoaXRlU3BhY2UiLCAicHJlIik7CisgICAgICBib2R5LmFkZChtKTsKKyAgICB9CiAgIH0KIAogICBwdWJsaWMgdm9pZCBzZXRUZXh0KGZpbmFsIFN0cmluZyB0KSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvRm9ybWF0VXRpbC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0Zvcm1hdFV0aWwuamF2YQppbmRleCBmMTA3NjJhLi41NDQ4ZGMwIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvRm9ybWF0VXRpbC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9Gb3JtYXRVdGlsLmphdmEKQEAgLTE0LDcgKzE0LDcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQ7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BY2NvdW50SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWNjb3VudC5BY2NvdW50SW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5pMThuLmNsaWVudC5EYXRlVGltZUZvcm1hdDsKQEAgLTExOSwxMyArMTE5LDggQEAKICAgICB9CiAgIH0KIAotICAvKiogRm9ybWF0IGFuIGFjY291bnQgYXMgYSBuYW1lIGFuZCBlbWFpbCBhZGRyZXNzLiAqLwotICBwdWJsaWMgc3RhdGljIFN0cmluZyBuYW1lRW1haWwoZmluYWwgQWNjb3VudCBhY2N0KSB7Ci0gICAgcmV0dXJuIG5hbWVFbWFpbChuZXcgQWNjb3VudEluZm8oYWNjdCkpOwotICB9Ci0KICAgLyoqCi0gICAqIEZvcm1hdHMgYW4gYWNjb3VudCBhcyBhbiBuYW1lIGFuZCBhbiBlbWFpbCBhZGRyZXNzLgorICAgKiBGb3JtYXRzIGFuIGFjY291bnQgYXMgYSBuYW1lIGFuZCBhbiBlbWFpbCBhZGRyZXNzLgogICAgKiA8cD4KICAgICogRXhhbXBsZSBvdXRwdXQ6CiAgICAqIDx1bD4KQEAgLTEzNSwyMiArMTMwLDE3IEBACiAgICAqIDxsaT48Y29kZT5Bbm9ueW1vdXMgQ293YXJkICgxMik8L2NvZGU+OiBtaXNzaW5nIG5hbWUgYW5kIGVtYWlsIGFkZHJlc3M8L2xpPgogICAgKiA8L3VsPgogICAgKi8KLSAgcHVibGljIHN0YXRpYyBTdHJpbmcgbmFtZUVtYWlsKGZpbmFsIEFjY291bnRJbmZvIGFjY3QpIHsKLSAgICBTdHJpbmcgbmFtZSA9IGFjY3QuZ2V0RnVsbE5hbWUoKTsKLSAgICBpZiAobmFtZSA9PSBudWxsKSB7CisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIG5hbWVFbWFpbChBY2NvdW50SW5mbyBpbmZvKSB7CisgICAgU3RyaW5nIG5hbWUgPSBpbmZvLm5hbWUoKTsKKyAgICBpZiAobmFtZSA9PSBudWxsIHx8IG5hbWUudHJpbSgpLmlzRW1wdHkoKSkgewogICAgICAgbmFtZSA9IEdlcnJpdC5nZXRDb25maWcoKS5nZXRBbm9ueW1vdXNDb3dhcmROYW1lKCk7CiAgICAgfQogCi0gICAgZmluYWwgU3RyaW5nQnVpbGRlciBiID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICBiLmFwcGVuZChuYW1lKTsKLSAgICBpZiAoYWNjdC5nZXRQcmVmZXJyZWRFbWFpbCgpICE9IG51bGwpIHsKLSAgICAgIGIuYXBwZW5kKCIgPCIpOwotICAgICAgYi5hcHBlbmQoYWNjdC5nZXRQcmVmZXJyZWRFbWFpbCgpKTsKLSAgICAgIGIuYXBwZW5kKCI+Iik7Ci0gICAgfSBlbHNlIGlmIChhY2N0LmdldElkKCkgIT0gbnVsbCkgewotICAgICAgYi5hcHBlbmQoIiAoIik7Ci0gICAgICBiLmFwcGVuZChhY2N0LmdldElkKCkuZ2V0KCkpOwotICAgICAgYi5hcHBlbmQoIikiKTsKKyAgICBTdHJpbmdCdWlsZGVyIGIgPSBuZXcgU3RyaW5nQnVpbGRlcigpLmFwcGVuZChuYW1lKTsKKyAgICBpZiAoaW5mby5lbWFpbCgpICE9IG51bGwpIHsKKyAgICAgIGIuYXBwZW5kKCIgPCIpLmFwcGVuZChpbmZvLmVtYWlsKCkpLmFwcGVuZCgiPiIpOworICAgIH0gZWxzZSBpZiAoaW5mby5fYWNjb3VudF9pZCgpID4gMCkgeworICAgICAgYi5hcHBlbmQoIiAoIikuYXBwZW5kKGluZm8uX2FjY291bnRfaWQoKSkuYXBwZW5kKCIpIik7CiAgICAgfQogICAgIHJldHVybiBiLnRvU3RyaW5nKCk7CiAgIH0KQEAgLTE2MSwxMyArMTUxLDQ1IEBACiAgICAqIElmIHRoZSBhY2NvdW50IGhhcyBhIGZ1bGwgbmFtZSwgaXQgcmV0dXJucyBvbmx5IHRoZSBmdWxsIG5hbWUuIE90aGVyd2lzZSBpdAogICAgKiByZXR1cm5zIGEgbG9uZ2VyIGZvcm0gdGhhdCBpbmNsdWRlcyB0aGUgZW1haWwgYWRkcmVzcy4KICAgICovCi0gIHB1YmxpYyBzdGF0aWMgU3RyaW5nIG5hbWUoZmluYWwgQWNjb3VudEluZm8gYWkpIHsKLSAgICBpZiAoYWkuZ2V0RnVsbE5hbWUoKSAhPSBudWxsKSB7Ci0gICAgICByZXR1cm4gYWkuZ2V0RnVsbE5hbWUoKTsKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgbmFtZShBY2NvdW50IGFjY3QpIHsKKyAgICByZXR1cm4gbmFtZShhc0luZm8oYWNjdCkpOworICB9CisKKyAgLyoqCisgICAqIEZvcm1hdHMgYW4gYWNjb3VudCBuYW1lLgorICAgKiA8cD4KKyAgICogSWYgdGhlIGFjY291bnQgaGFzIGEgZnVsbCBuYW1lLCBpdCByZXR1cm5zIG9ubHkgdGhlIGZ1bGwgbmFtZS4gT3RoZXJ3aXNlIGl0CisgICAqIHJldHVybnMgYSBsb25nZXIgZm9ybSB0aGF0IGluY2x1ZGVzIHRoZSBlbWFpbCBhZGRyZXNzLgorICAgKi8KKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgbmFtZShBY2NvdW50SW5mbyBhaSkgeworICAgIGlmIChhaS5uYW1lKCkgIT0gbnVsbCAmJiAhYWkubmFtZSgpLnRyaW0oKS5pc0VtcHR5KCkpIHsKKyAgICAgIHJldHVybiBhaS5uYW1lKCk7CiAgICAgfQotICAgIGlmIChhaS5nZXRQcmVmZXJyZWRFbWFpbCgpICE9IG51bGwpIHsKLSAgICAgIHJldHVybiBhaS5nZXRQcmVmZXJyZWRFbWFpbCgpOworICAgIFN0cmluZyBlbWFpbCA9IGFpLmVtYWlsKCk7CisgICAgaWYgKGVtYWlsICE9IG51bGwpIHsKKyAgICAgIGludCBhdCA9IGVtYWlsLmluZGV4T2YoJ0AnKTsKKyAgICAgIHJldHVybiAwIDwgYXQgPyBlbWFpbC5zdWJzdHJpbmcoMCwgYXQpIDogZW1haWw7CiAgICAgfQogICAgIHJldHVybiBuYW1lRW1haWwoYWkpOwogICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgQWNjb3VudEluZm8gYXNJbmZvKEFjY291bnQgYWNjdCkgeworICAgIGlmIChhY2N0ID09IG51bGwpIHsKKyAgICAgIHJldHVybiBBY2NvdW50SW5mby5jcmVhdGUoMCwgbnVsbCwgbnVsbCk7CisgICAgfQorICAgIHJldHVybiBBY2NvdW50SW5mby5jcmVhdGUoCisgICAgICAgIGFjY3QuZ2V0SWQoKSAhPSBudWxsID8gYWNjdC5nZXRJZCgpLmdldCgpIDogMCwKKyAgICAgICAgYWNjdC5nZXRGdWxsTmFtZSgpLAorICAgICAgICBhY2N0LmdldFByZWZlcnJlZEVtYWlsKCkpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBBY2NvdW50SW5mbyBhc0luZm8oY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm8gYWNjdCkgeworICAgIGlmIChhY2N0ID09IG51bGwpIHsKKyAgICAgIHJldHVybiBBY2NvdW50SW5mby5jcmVhdGUoMCwgbnVsbCwgbnVsbCk7CisgICAgfQorICAgIHJldHVybiBBY2NvdW50SW5mby5jcmVhdGUoCisgICAgICAgIGFjY3QuZ2V0SWQoKSAhPSBudWxsID8gYWNjdC5nZXRJZCgpLmdldCgpIDogMCwKKyAgICAgICAgYWNjdC5nZXRGdWxsTmFtZSgpLAorICAgICAgICBhY2N0LmdldFByZWZlcnJlZEVtYWlsKCkpOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0LmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0LmphdmEKaW5kZXggOGZlNjU4Yi4uZDY3YTRjYSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXQuamF2YQpAQCAtMTUsMTMgKzE1LDExIEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudDsKIAogaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5LkFETUlOSVNUUkFURV9TRVJWRVI7Ci1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuQ1JFQVRFX1BST0pFQ1Q7CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuQ1JFQVRFX0dST1VQOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5LkNSRUFURV9QUk9KRUNUOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFjY291bnQuQWNjb3VudENhcGFiaWxpdGllczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC5vcGVuaWQuT3BlbklkU2lnbkluRGlhbG9nOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hdXRoLm9wZW5pZC5PcGVuSWRTc29QYW5lbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC51c2VycGFzcy5Vc2VyUGFzc1NpZ25JbkRpYWxvZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW4uUHJvamVjdFNjcmVlbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlcy5DaGFuZ2VDb25zdGFudHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXMuQ2hhbmdlTGlzdFNjcmVlbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucGF0Y2hlcy5QYXRjaFNjcmVlbjsKQEAgLTMxLDkgKzI5LDkgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuTW9ycGhpbmdUYWJQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuUGF0Y2hMaW5rOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TY3JlZW47CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlNjcmVlbkxvYWRFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2xpZW50VmVyc2lvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLlNpZ25Jbk1vZGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2Vycml0Q29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdpdHdlYkNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Ib3N0UGFnZURhdGE7CkBAIC00MiwxMiArNDAsMjQgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudERpZmZQcmVmZXJlbmNlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BdXRoVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5hcmlhLmNsaWVudC5Sb2xlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5DYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5FbnRyeVBvaW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5KYXZhU2NyaXB0T2JqZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LlNjcmlwdEluamVjdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmRvbS5jbGllbnQuQW5jaG9yRWxlbWVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5kb20uY2xpZW50LkRvY3VtZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleUNvZGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5RG93bkV2ZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5RG93bkhhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQubG9naWNhbC5zaGFyZWQuVmFsdWVDaGFuZ2VFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5sb2dpY2FsLnNoYXJlZC5WYWx1ZUNoYW5nZUhhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuc2hhcmVkLkV2ZW50QnVzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LnNoYXJlZC5TaW1wbGVFdmVudEJ1czsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5odHRwLmNsaWVudC5VUkw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuaHR0cC5jbGllbnQuVXJsQnVpbGRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5Db21tYW5kOwpAQCAtNTUsOSArNjUsOSBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50Lkhpc3Rvcnk7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuV2luZG93OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LldpbmRvdy5Mb2NhdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BY2Nlc3NpYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRm9jdXNQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5HcmlkOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkhUTUxUYWJsZS5DZWxsRm9ybWF0dGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLklubGluZUhUTUw7CkBAIC02Nyw5ICs3NywxMiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuY2xpcHB5LmNsaWVudC5Db3B5YWJsZUxhYmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkudXNlci5jbGllbnQuVXNlckFnZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkudXNlci5jbGllbnQuVmlld1NpdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNsaWVudC5DYWxsYmFja0hhbmRsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY2xpZW50Lkpzb25EZWZUYXJnZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNsaWVudC5Kc29uVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY2xpZW50LlhzcmZNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jbGllbnQuaW1wbC5SZXN1bHREZXNlcmlhbGl6ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5LZXlVdGlsOwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKQEAgLTgxLDE3ICs5NCwxOSBAQAogICBwdWJsaWMgc3RhdGljIGZpbmFsIEdlcnJpdFJlc291cmNlcyBSRVNPVVJDRVMgPQogICAgICAgR1dULmNyZWF0ZShHZXJyaXRSZXNvdXJjZXMuY2xhc3MpOwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN5c3RlbUluZm9TZXJ2aWNlIFNZU1RFTV9TVkM7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgRXZlbnRCdXMgRVZFTlRfQlVTID0gR1dULmNyZWF0ZShTaW1wbGVFdmVudEJ1cy5jbGFzcyk7CiAKICAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIG15SG9zdDsKICAgcHJpdmF0ZSBzdGF0aWMgR2Vycml0Q29uZmlnIG15Q29uZmlnOwogICBwcml2YXRlIHN0YXRpYyBIb3N0UGFnZURhdGEuVGhlbWUgbXlUaGVtZTsKICAgcHJpdmF0ZSBzdGF0aWMgQWNjb3VudCBteUFjY291bnQ7CiAgIHByaXZhdGUgc3RhdGljIEFjY291bnREaWZmUHJlZmVyZW5jZSBteUFjY291bnREaWZmUHJlZjsKLSAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIHhzcmZUb2tlbjsKKyAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIHhHZXJyaXRBdXRoOwogCiAgIHByaXZhdGUgc3RhdGljIE1vcnBoaW5nVGFiUGFuZWwgbWVudUxlZnQ7CiAgIHByaXZhdGUgc3RhdGljIExpbmtNZW51QmFyIG1lbnVSaWdodDsKICAgcHJpdmF0ZSBzdGF0aWMgTGlua01lbnVCYXIgZGlmZkJhcjsKKyAgcHJpdmF0ZSBzdGF0aWMgTGlua01lbnVCYXIgcHJvamVjdHNCYXI7CiAgIHByaXZhdGUgc3RhdGljIFJvb3RQYW5lbCBzaXRlSGVhZGVyOwogICBwcml2YXRlIHN0YXRpYyBSb290UGFuZWwgc2l0ZUZvb3RlcjsKICAgcHJpdmF0ZSBzdGF0aWMgU2VhcmNoUGFuZWwgc2VhcmNoUGFuZWw7CkBAIC0yMzMsNiArMjQ4LDExIEBACiAgICAgcmV0dXJuIG15QWNjb3VudDsKICAgfQogCisgIC8qKiBAcmV0dXJuIGFjY2VzcyB0b2tlbiB0byBwcm92ZSB1c2VyIGlkZW50aXR5IGR1cmluZyBSRVNUIEFQSSBjYWxscy4gKi8KKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgZ2V0WEdlcnJpdEF1dGgoKSB7CisgICAgcmV0dXJuIHhHZXJyaXRBdXRoOworICB9CisKICAgLyoqIEByZXR1cm4gdGhlIGN1cnJlbnRseSBzaWduZWQgaW4gdXNlcnMncyBkaWZmIHByZWZlcmVuY2VzOyBudWxsIGlmIG5vIGRpZmYgcHJlZmVyZW5jZXMgZGVmaW5lZCBmb3IgdGhlIGFjY291bnQgKi8KICAgcHVibGljIHN0YXRpYyBBY2NvdW50RGlmZlByZWZlcmVuY2UgZ2V0QWNjb3VudERpZmZQcmVmZXJlbmNlKCkgewogICAgIHJldHVybiBteUFjY291bnREaWZmUHJlZjsKQEAgLTI0OSwzNCArMjY5LDcgQEAKIAogICAvKiogU2lnbiB0aGUgdXNlciBpbnRvIHRoZSBhcHBsaWNhdGlvbi4gKi8KICAgcHVibGljIHN0YXRpYyB2b2lkIGRvU2lnbkluKFN0cmluZyB0b2tlbikgewotICAgIHN3aXRjaCAobXlDb25maWcuZ2V0QXV0aFR5cGUoKSkgewotICAgICAgY2FzZSBIVFRQOgotICAgICAgY2FzZSBIVFRQX0xEQVA6Ci0gICAgICBjYXNlIENMSUVOVF9TU0xfQ0VSVF9MREFQOgotICAgICAgY2FzZSBDVVNUT01fRVhURU5TSU9OOgotICAgICAgICBMb2NhdGlvbi5hc3NpZ24obG9naW5SZWRpcmVjdCh0b2tlbikpOwotICAgICAgICBicmVhazsKLQotICAgICAgY2FzZSBERVZFTE9QTUVOVF9CRUNPTUVfQU5ZX0FDQ09VTlQ6Ci0gICAgICAgIExvY2F0aW9uLmFzc2lnbihzZWxmUmVkaXJlY3QoIi9iZWNvbWUiKSk7Ci0gICAgICAgIGJyZWFrOwotCi0gICAgICBjYXNlIE9QRU5JRF9TU086Ci0gICAgICAgIGZpbmFsIFJvb3RQYW5lbCBnQm9keSA9IFJvb3RQYW5lbC5nZXQoImdlcnJpdF9ib2R5Iik7Ci0gICAgICAgIE9wZW5JZFNzb1BhbmVsIHNpbmdsZVNpZ25PblBhbmVsID0gbmV3IE9wZW5JZFNzb1BhbmVsKCk7Ci0gICAgICAgIGdCb2R5LmFkZChzaW5nbGVTaWduT25QYW5lbCk7Ci0gICAgICAgIHNpbmdsZVNpZ25PblBhbmVsLmF1dGhlbnRpY2F0ZShTaWduSW5Nb2RlLlNJR05fSU4sIHRva2VuKTsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICAgIGNhc2UgT1BFTklEOgotICAgICAgICBuZXcgT3BlbklkU2lnbkluRGlhbG9nKFNpZ25Jbk1vZGUuU0lHTl9JTiwgdG9rZW4sIG51bGwpLmNlbnRlcigpOwotICAgICAgICBicmVhazsKLQotICAgICAgY2FzZSBMREFQOgotICAgICAgY2FzZSBMREFQX0JJTkQ6Ci0gICAgICAgIG5ldyBVc2VyUGFzc1NpZ25JbkRpYWxvZyh0b2tlbiwgbnVsbCkuY2VudGVyKCk7Ci0gICAgICAgIGJyZWFrOwotICAgIH0KKyAgICBMb2NhdGlvbi5hc3NpZ24obG9naW5SZWRpcmVjdCh0b2tlbikpOwogICB9CiAKICAgcHVibGljIHN0YXRpYyBTdHJpbmcgbG9naW5SZWRpcmVjdChTdHJpbmcgdG9rZW4pIHsKQEAgLTMyNyw3ICszMjAsNyBAQAogICBzdGF0aWMgdm9pZCBkZWxldGVTZXNzaW9uQ29va2llKCkgewogICAgIG15QWNjb3VudCA9IG51bGw7CiAgICAgbXlBY2NvdW50RGlmZlByZWYgPSBudWxsOwotICAgIHhzcmZUb2tlbiA9IG51bGw7CisgICAgeEdlcnJpdEF1dGggPSBudWxsOwogICAgIHJlZnJlc2hNZW51QmFyKCk7CiAKICAgICAvLyBJZiB0aGUgY29va2llIHdhcyBIdHRwT25seSwgdGhpcyByZXF1ZXN0IHRvIGRlbGV0ZSBpdCB3aWxsCkBAIC0zNzAsMTggKzM2MywyMCBAQAogCiAgICAgZmluYWwgSG9zdFBhZ2VEYXRhU2VydmljZSBocGQgPSBHV1QuY3JlYXRlKEhvc3RQYWdlRGF0YVNlcnZpY2UuY2xhc3MpOwogICAgIGhwZC5sb2FkKG5ldyBHZXJyaXRDYWxsYmFjazxIb3N0UGFnZURhdGE+KCkgeworICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoZmluYWwgSG9zdFBhZ2VEYXRhIHJlc3VsdCkgeworICAgICAgICBEb2N1bWVudC5nZXQoKS5nZXRFbGVtZW50QnlJZCgiZ2Vycml0X2hvc3RwYWdlZGF0YSIpLnJlbW92ZUZyb21QYXJlbnQoKTsKICAgICAgICAgbXlDb25maWcgPSByZXN1bHQuY29uZmlnOwogICAgICAgICBteVRoZW1lID0gcmVzdWx0LnRoZW1lOwogICAgICAgICBpZiAocmVzdWx0LmFjY291bnQgIT0gbnVsbCkgewogICAgICAgICAgIG15QWNjb3VudCA9IHJlc3VsdC5hY2NvdW50OwotICAgICAgICAgIHhzcmZUb2tlbiA9IHJlc3VsdC54c3JmVG9rZW47CisgICAgICAgICAgeEdlcnJpdEF1dGggPSByZXN1bHQueEdlcnJpdEF1dGg7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHJlc3VsdC5hY2NvdW50RGlmZlByZWYgIT0gbnVsbCkgewogICAgICAgICAgIG15QWNjb3VudERpZmZQcmVmID0gcmVzdWx0LmFjY291bnREaWZmUHJlZjsKICAgICAgICAgICBhcHBseVVzZXJQcmVmZXJlbmNlcygpOwogICAgICAgICB9Ci0gICAgICAgIG9uTW9kdWxlTG9hZDIoKTsKKyAgICAgICAgb25Nb2R1bGVMb2FkMihyZXN1bHQpOwogICAgICAgfQogICAgIH0pOwogICB9CkBAIC00NjMsNyArNDU4LDcgQEAKICAgICBidG1tZW51LmFkZChwb3dlcmVkQnkpOwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIG9uTW9kdWxlTG9hZDIoKSB7CisgIHByaXZhdGUgdm9pZCBvbk1vZHVsZUxvYWQyKEhvc3RQYWdlRGF0YSBocGQpIHsKICAgICBSRVNPVVJDRVMuZ3d0X292ZXJyaWRlKCkuZW5zdXJlSW5qZWN0ZWQoKTsKICAgICBSRVNPVVJDRVMuY3NzKCkuZW5zdXJlSW5qZWN0ZWQoKTsKIApAQCAtNDg0LDggKzQ3OSw4IEBACiAgICAgZ1RvcE1lbnUuYWRkKG1lbnVMaW5lKTsKICAgICBmaW5hbCBGbG93UGFuZWwgbWVudVJpZ2h0UGFuZWwgPSBuZXcgRmxvd1BhbmVsKCk7CiAgICAgbWVudVJpZ2h0UGFuZWwuc2V0U3R5bGVOYW1lKFJFU09VUkNFUy5jc3MoKS50b3BtZW51TWVudVJpZ2h0KCkpOwotICAgIG1lbnVSaWdodFBhbmVsLmFkZChtZW51UmlnaHQpOwogICAgIG1lbnVSaWdodFBhbmVsLmFkZChzZWFyY2hQYW5lbCk7CisgICAgbWVudVJpZ2h0UGFuZWwuYWRkKG1lbnVSaWdodCk7CiAgICAgbWVudUxpbmUuc2V0V2lkZ2V0KDAsIDAsIG1lbnVMZWZ0KTsKICAgICBtZW51TGluZS5zZXRXaWRnZXQoMCwgMSwgbmV3IEZsb3dQYW5lbCgpKTsKICAgICBtZW51TGluZS5zZXRXaWRnZXQoMCwgMiwgbWVudVJpZ2h0UGFuZWwpOwpAQCAtNTIyLDcgKzUxNyw3IEBACiAgICAgSnNvblV0aWwuc2V0RGVmYXVsdFhzcmZNYW5hZ2VyKG5ldyBYc3JmTWFuYWdlcigpIHsKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIFN0cmluZyBnZXRUb2tlbihKc29uRGVmVGFyZ2V0IHByb3h5KSB7Ci0gICAgICAgIHJldHVybiB4c3JmVG9rZW47CisgICAgICAgIHJldHVybiB4R2Vycml0QXV0aDsKICAgICAgIH0KIAogICAgICAgQE92ZXJyaWRlCkBAIC01NDEsNiArNTM2LDcgQEAKICAgICByZWZyZXNoTWVudUJhcigpOwogCiAgICAgSGlzdG9yeS5hZGRWYWx1ZUNoYW5nZUhhbmRsZXIobmV3IFZhbHVlQ2hhbmdlSGFuZGxlcjxTdHJpbmc+KCkgeworICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgdm9pZCBvblZhbHVlQ2hhbmdlKGZpbmFsIFZhbHVlQ2hhbmdlRXZlbnQ8U3RyaW5nPiBldmVudCkgewogICAgICAgICBkaXNwbGF5KGV2ZW50LmdldFZhbHVlKCkpOwogICAgICAgfQpAQCAtNTU2LDcgKzU1Miw1MCBAQAogICAgIGlmIChzaWduSW5BbmNob3IgIT0gbnVsbCkgewogICAgICAgc2lnbkluQW5jaG9yLnNldEhyZWYobG9naW5SZWRpcmVjdCh0b2tlbikpOwogICAgIH0KLSAgICBkaXNwbGF5KHRva2VuKTsKKyAgICBsb2FkUGx1Z2lucyhocGQsIHRva2VuKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBsb2FkUGx1Z2lucyhIb3N0UGFnZURhdGEgaHBkLCBmaW5hbCBTdHJpbmcgdG9rZW4pIHsKKyAgICBpZiAoaHBkLnBsdWdpbnMgIT0gbnVsbCkgeworICAgICAgZm9yIChmaW5hbCBTdHJpbmcgdXJsIDogaHBkLnBsdWdpbnMpIHsKKyAgICAgICAgU2NyaXB0SW5qZWN0b3IuZnJvbVVybCh1cmwpCisgICAgICAgICAgICAuc2V0V2luZG93KFNjcmlwdEluamVjdG9yLlRPUF9XSU5ET1cpCisgICAgICAgICAgICAuc2V0Q2FsbGJhY2sobmV3IENhbGxiYWNrPFZvaWQsIEV4Y2VwdGlvbj4oKSB7CisgICAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoVm9pZCByZXN1bHQpIHsKKyAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoRXhjZXB0aW9uIHJlYXNvbikgeworICAgICAgICAgICAgICAgIEVycm9yRGlhbG9nIGQgPSBuZXcgRXJyb3JEaWFsb2cocmVhc29uKTsKKyAgICAgICAgICAgICAgICBkLnNldFRpdGxlKE0ucGx1Z2luRmFpbGVkKHVybCkpOworICAgICAgICAgICAgICAgIGQuY2VudGVyKCk7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pLmluamVjdCgpOworICAgICAgfQorICAgIH0KKworICAgIENhbGxiYWNrSGFuZGxlPFZvaWQ+IGNiID0gbmV3IENhbGxiYWNrSGFuZGxlPFZvaWQ+KAorICAgICAgICBuZXcgUmVzdWx0RGVzZXJpYWxpemVyPFZvaWQ+KCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyBWb2lkIGZyb21SZXN1bHQoSmF2YVNjcmlwdE9iamVjdCByZXNwb25zZU9iamVjdCkgeworICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgICAgfQorICAgICAgICB9LAorICAgICAgICBuZXcgQXN5bmNDYWxsYmFjazxWb2lkPigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoVGhyb3dhYmxlIGNhdWdodCkgeworICAgICAgICAgIH0KKworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhWb2lkIHJlc3VsdCkgeworICAgICAgICAgICAgZGlzcGxheSh0b2tlbik7CisgICAgICAgICAgfQorICAgICAgICB9KTsKKyAgICBjYi5pbnN0YWxsKCk7CisgICAgU2NyaXB0SW5qZWN0b3IuZnJvbVN0cmluZyhjYi5nZXRGdW5jdGlvbk5hbWUoKSArICIoKTsiKQorICAgICAgICAuc2V0V2luZG93KFNjcmlwdEluamVjdG9yLlRPUF9XSU5ET1cpCisgICAgICAgIC5pbmplY3QoKTsKICAgfQogCiAgIHB1YmxpYyBzdGF0aWMgdm9pZCByZWZyZXNoTWVudUJhcigpIHsKQEAgLTU3Nyw5ICs2MTYsOSBAQAogICAgICAgbSA9IG5ldyBMaW5rTWVudUJhcigpOwogICAgICAgYWRkTGluayhtLCBDLm1lbnVNeUNoYW5nZXMoKSwgUGFnZUxpbmtzLk1JTkUpOwogICAgICAgYWRkTGluayhtLCBDLm1lbnVNeURyYWZ0cygpLCBQYWdlTGlua3MudG9DaGFuZ2VRdWVyeSgiaXM6ZHJhZnQiKSk7CisgICAgICBhZGRMaW5rKG0sIEMubWVudU15RHJhZnRDb21tZW50cygpLCBQYWdlTGlua3MudG9DaGFuZ2VRdWVyeSgiaGFzOmRyYWZ0IikpOwogICAgICAgYWRkTGluayhtLCBDLm1lbnVNeVdhdGNoZWRDaGFuZ2VzKCksIFBhZ2VMaW5rcy50b0NoYW5nZVF1ZXJ5KCJpczp3YXRjaGVkIHN0YXR1czpvcGVuIikpOwogICAgICAgYWRkTGluayhtLCBDLm1lbnVNeVN0YXJyZWRDaGFuZ2VzKCksIFBhZ2VMaW5rcy50b0NoYW5nZVF1ZXJ5KCJpczpzdGFycmVkIikpOwotICAgICAgYWRkTGluayhtLCBDLm1lbnVNeURyYWZ0Q29tbWVudHMoKSwgUGFnZUxpbmtzLnRvQ2hhbmdlUXVlcnkoImhhczpkcmFmdCIpKTsKICAgICAgIG1lbnVMZWZ0LmFkZChtLCBDLm1lbnVNaW5lKCkpOwogICAgICAgbWVudUxlZnQuc2VsZWN0VGFiKDEpOwogICAgIH0gZWxzZSB7CkBAIC01OTYsNDQgKzYzNSw0MyBAQAogICAgIGFkZERpZmZMaW5rKGRpZmZCYXIsIEMubWVudURpZmZQYXRjaFNldHMoKSwgUGF0Y2hTY3JlZW4uVG9wVmlldy5QQVRDSF9TRVRTKTsKICAgICBhZGREaWZmTGluayhkaWZmQmFyLCBDLm1lbnVEaWZmRmlsZXMoKSwgUGF0Y2hTY3JlZW4uVG9wVmlldy5GSUxFUyk7CiAKLSAgICBmaW5hbCBMaW5rTWVudUJhciBwcm9qZWN0c0JhciA9IG5ldyBMaW5rTWVudUJhcigpOworICAgIHByb2plY3RzQmFyID0gbmV3IExpbmtNZW51QmFyKCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvblNjcmVlbkxvYWQoU2NyZWVuTG9hZEV2ZW50IGV2ZW50KSB7CisgICAgICAgIGlmIChldmVudC5nZXRTY3JlZW4oKSBpbnN0YW5jZW9mIFByb2plY3RTY3JlZW4pIHsKKyAgICAgICAgICBtZW51TGVmdC5zZWxlY3RUYWIobWVudUxlZnQuZ2V0V2lkZ2V0SW5kZXgodGhpcykpOworICAgICAgICB9CisgICAgICB9CisgICAgfTsKICAgICBhZGRMaW5rKHByb2plY3RzQmFyLCBDLm1lbnVQcm9qZWN0c0xpc3QoKSwgUGFnZUxpbmtzLkFETUlOX1BST0pFQ1RTKTsKLSAgICBpZihzaWduZWRJbikgeworICAgIGFkZFByb2plY3RMaW5rKHByb2plY3RzQmFyLCBDLm1lbnVQcm9qZWN0c0luZm8oKSwgUHJvamVjdFNjcmVlbi5JTkZPKTsKKyAgICBhZGRQcm9qZWN0TGluayhwcm9qZWN0c0JhciwgQy5tZW51UHJvamVjdHNCcmFuY2hlcygpLCBQcm9qZWN0U2NyZWVuLkJSQU5DSCk7CisgICAgYWRkUHJvamVjdExpbmsocHJvamVjdHNCYXIsIEMubWVudVByb2plY3RzQWNjZXNzKCksIFByb2plY3RTY3JlZW4uQUNDRVNTKTsKKyAgICBhZGRQcm9qZWN0TGluayhwcm9qZWN0c0JhciwgQy5tZW51UHJvamVjdHNEYXNoYm9hcmRzKCksIFByb2plY3RTY3JlZW4uREFTSEJPQVJEUyk7CisgICAgbWVudUxlZnQuYWRkKHByb2plY3RzQmFyLCBDLm1lbnVQcm9qZWN0cygpKTsKKworICAgIGlmIChzaWduZWRJbikgeworICAgICAgZmluYWwgTGlua01lbnVCYXIgcGVvcGxlQmFyID0gbmV3IExpbmtNZW51QmFyKCk7CisgICAgICBhZGRMaW5rKHBlb3BsZUJhciwgQy5tZW51UGVvcGxlR3JvdXBzTGlzdCgpLCBQYWdlTGlua3MuQURNSU5fR1JPVVBTKTsKKyAgICAgIG1lbnVMZWZ0LmFkZChwZW9wbGVCYXIsIEMubWVudVBlb3BsZSgpKTsKKworICAgICAgZmluYWwgTGlua01lbnVCYXIgcGx1Z2luc0JhciA9IG5ldyBMaW5rTWVudUJhcigpOwogICAgICAgQWNjb3VudENhcGFiaWxpdGllcy5hbGwobmV3IEdlcnJpdENhbGxiYWNrPEFjY291bnRDYXBhYmlsaXRpZXM+KCkgewogICAgICAgICBAT3ZlcnJpZGUKICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKEFjY291bnRDYXBhYmlsaXRpZXMgcmVzdWx0KSB7CiAgICAgICAgICAgaWYgKHJlc3VsdC5jYW5QZXJmb3JtKENSRUFURV9QUk9KRUNUKSkgewogICAgICAgICAgICAgYWRkTGluayhwcm9qZWN0c0JhciwgQy5tZW51UHJvamVjdHNDcmVhdGUoKSwgUGFnZUxpbmtzLkFETUlOX0NSRUFURV9QUk9KRUNUKTsKICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0sIENSRUFURV9QUk9KRUNUKTsKLSAgICB9Ci0gICAgbWVudUxlZnQuYWRkKHByb2plY3RzQmFyLCBDLm1lbnVQcm9qZWN0cygpKTsKLQotICAgIGlmIChzaWduZWRJbikgewotICAgICAgZmluYWwgTGlua01lbnVCYXIgZ3JvdXBzQmFyID0gbmV3IExpbmtNZW51QmFyKCk7Ci0gICAgICBhZGRMaW5rKGdyb3Vwc0JhciwgQy5tZW51R3JvdXBzTGlzdCgpLCBQYWdlTGlua3MuQURNSU5fR1JPVVBTKTsKLSAgICAgIEFjY291bnRDYXBhYmlsaXRpZXMuYWxsKG5ldyBHZXJyaXRDYWxsYmFjazxBY2NvdW50Q2FwYWJpbGl0aWVzPigpIHsKLSAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhBY2NvdW50Q2FwYWJpbGl0aWVzIHJlc3VsdCkgewogICAgICAgICAgIGlmIChyZXN1bHQuY2FuUGVyZm9ybShDUkVBVEVfR1JPVVApKSB7Ci0gICAgICAgICAgICBhZGRMaW5rKGdyb3Vwc0JhciwgQy5tZW51R3JvdXBzQ3JlYXRlKCksIFBhZ2VMaW5rcy5BRE1JTl9DUkVBVEVfR1JPVVApOworICAgICAgICAgICAgYWRkTGluayhwZW9wbGVCYXIsIEMubWVudVBlb3BsZUdyb3Vwc0NyZWF0ZSgpLCBQYWdlTGlua3MuQURNSU5fQ1JFQVRFX0dST1VQKTsKICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0sIENSRUFURV9HUk9VUCk7Ci0gICAgICBtZW51TGVmdC5hZGQoZ3JvdXBzQmFyLCBDLm1lbnVHcm91cHMoKSk7Ci0KLSAgICAgIGZpbmFsIExpbmtNZW51QmFyIHBsdWdpbnNCYXIgPSBuZXcgTGlua01lbnVCYXIoKTsKLSAgICAgIEFjY291bnRDYXBhYmlsaXRpZXMuYWxsKG5ldyBHZXJyaXRDYWxsYmFjazxBY2NvdW50Q2FwYWJpbGl0aWVzPigpIHsKLSAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhBY2NvdW50Q2FwYWJpbGl0aWVzIHJlc3VsdCkgewogICAgICAgICAgIGlmIChyZXN1bHQuY2FuUGVyZm9ybShBRE1JTklTVFJBVEVfU0VSVkVSKSkgewogICAgICAgICAgICAgYWRkTGluayhwbHVnaW5zQmFyLCBDLm1lbnVQbHVnaW5zSW5zdGFsbGVkKCksIFBhZ2VMaW5rcy5BRE1JTl9QTFVHSU5TKTsKICAgICAgICAgICAgIG1lbnVMZWZ0Lmluc2VydChwbHVnaW5zQmFyLCBDLm1lbnVQbHVnaW5zKCksCi0gICAgICAgICAgICAgICAgbWVudUxlZnQuZ2V0V2lkZ2V0SW5kZXgoZ3JvdXBzQmFyKSArIDEpOworICAgICAgICAgICAgICAgIG1lbnVMZWZ0LmdldFdpZGdldEluZGV4KHBlb3BsZUJhcikgKyAxKTsKICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgIH0sIEFETUlOSVNUUkFURV9TRVJWRVIpOworICAgICAgfSwgQ1JFQVRFX1BST0pFQ1QsIENSRUFURV9HUk9VUCwgQURNSU5JU1RSQVRFX1NFUlZFUik7CiAgICAgfQogCiAgICAgaWYgKGdldENvbmZpZygpLmlzRG9jdW1lbnRhdGlvbkF2YWlsYWJsZSgpKSB7CkBAIC02NDIsMTUgKzY4MCwxMiBAQAogICAgICAgYWRkRG9jTGluayhtLCBDLm1lbnVEb2N1bWVudGF0aW9uU2VhcmNoKCksICJ1c2VyLXNlYXJjaC5odG1sIik7CiAgICAgICBhZGREb2NMaW5rKG0sIEMubWVudURvY3VtZW50YXRpb25VcGxvYWQoKSwgInVzZXItdXBsb2FkLmh0bWwiKTsKICAgICAgIGFkZERvY0xpbmsobSwgQy5tZW51RG9jdW1lbnRhdGlvbkFjY2VzcygpLCAiYWNjZXNzLWNvbnRyb2wuaHRtbCIpOworICAgICAgYWRkRG9jTGluayhtLCBDLm1lbnVEb2N1bWVudGF0aW9uQVBJKCksICJyZXN0LWFwaS5odG1sIik7CiAgICAgICBtZW51TGVmdC5hZGQobSwgQy5tZW51RG9jdW1lbnRhdGlvbigpKTsKICAgICB9CiAKICAgICBpZiAoc2lnbmVkSW4pIHsKLSAgICAgIHdob0FtSSgpOwotICAgICAgYWRkTGluayhtZW51UmlnaHQsIEMubWVudVNldHRpbmdzKCksIFBhZ2VMaW5rcy5TRVRUSU5HUyk7Ci0gICAgICBpZiAoY2ZnLmdldEF1dGhUeXBlKCkgIT0gQXV0aFR5cGUuQ0xJRU5UX1NTTF9DRVJUX0xEQVApIHsKLSAgICAgICAgbWVudVJpZ2h0LmFkZChhbmNob3IoQy5tZW51U2lnbk91dCgpLCBzZWxmUmVkaXJlY3QoIi9sb2dvdXQiKSkpOwotICAgICAgfQorICAgICAgd2hvQW1JKGNmZy5nZXRBdXRoVHlwZSgpICE9IEF1dGhUeXBlLkNMSUVOVF9TU0xfQ0VSVF9MREFQKTsKICAgICB9IGVsc2UgewogICAgICAgc3dpdGNoIChjZmcuZ2V0QXV0aFR5cGUoKSkgewogICAgICAgICBjYXNlIEhUVFA6CkBAIC02NjEsOCArNjk2LDExIEBACiAgICAgICAgIGNhc2UgT1BFTklEOgogICAgICAgICAgIG1lbnVSaWdodC5hZGRJdGVtKEMubWVudVJlZ2lzdGVyKCksIG5ldyBDb21tYW5kKCkgewogICAgICAgICAgICAgcHVibGljIHZvaWQgZXhlY3V0ZSgpIHsKLSAgICAgICAgICAgICAgZmluYWwgU3RyaW5nIHRvID0gSGlzdG9yeS5nZXRUb2tlbigpOwotICAgICAgICAgICAgICBuZXcgT3BlbklkU2lnbkluRGlhbG9nKFNpZ25Jbk1vZGUuUkVHSVNURVIsIHRvLCBudWxsKS5jZW50ZXIoKTsKKyAgICAgICAgICAgICAgU3RyaW5nIHQgPSBIaXN0b3J5LmdldFRva2VuKCk7CisgICAgICAgICAgICAgIGlmICh0ID09IG51bGwpIHsKKyAgICAgICAgICAgICAgICB0ID0gIiI7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgZG9TaWduSW4oUGFnZUxpbmtzLlJFR0lTVEVSICsgdCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgfSk7CiAgICAgICAgICAgbWVudVJpZ2h0LmFkZEl0ZW0oQy5tZW51U2lnbkluKCksIG5ldyBDb21tYW5kKCkgewpAQCAtNjg0LDcgKzcyMiw4IEBACiAgICAgICAgIGNhc2UgTERBUF9CSU5EOgogICAgICAgICBjYXNlIENVU1RPTV9FWFRFTlNJT046CiAgICAgICAgICAgaWYgKGNmZy5nZXRSZWdpc3RlclVybCgpICE9IG51bGwpIHsKLSAgICAgICAgICAgIG1lbnVSaWdodC5hZGQoYW5jaG9yKEMubWVudVJlZ2lzdGVyKCksIGNmZy5nZXRSZWdpc3RlclVybCgpKSk7CisgICAgICAgICAgICBmaW5hbCBTdHJpbmcgcmVnaXN0ZXJUZXh0ID0gY2ZnLmdldFJlZ2lzdGVyVGV4dCgpID09IG51bGwgPyBDLm1lbnVSZWdpc3RlcigpIDogY2ZnLmdldFJlZ2lzdGVyVGV4dCgpOworICAgICAgICAgICAgbWVudVJpZ2h0LmFkZChhbmNob3IocmVnaXN0ZXJUZXh0LCBjZmcuZ2V0UmVnaXN0ZXJVcmwoKSkpOwogICAgICAgICAgIH0KICAgICAgICAgICBtZW51UmlnaHQuYWRkSXRlbShDLm1lbnVTaWduSW4oKSwgbmV3IENvbW1hbmQoKSB7CiAgICAgICAgICAgICBwdWJsaWMgdm9pZCBleGVjdXRlKCkgewpAQCAtNjk0LDcgKzczMyw3IEBACiAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBERVZFTE9QTUVOVF9CRUNPTUVfQU5ZX0FDQ09VTlQ6Ci0gICAgICAgICAgbWVudVJpZ2h0LmFkZChhbmNob3IoIkJlY29tZSIsIHNlbGZSZWRpcmVjdCgiL2JlY29tZSIpKSk7CisgICAgICAgICAgbWVudVJpZ2h0LmFkZChhbmNob3IoIkJlY29tZSIsIGxvZ2luUmVkaXJlY3QoIiIpKSk7CiAgICAgICAgICAgYnJlYWs7CiAgICAgICB9CiAgICAgfQpAQCAtNzE0LDE3ICs3NTMsNTQgQEAKICAgICB9CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyB2b2lkIHdob0FtSSgpIHsKLSAgICBmaW5hbCBTdHJpbmcgbmFtZSA9IEZvcm1hdFV0aWwubmFtZUVtYWlsKGdldFVzZXJBY2NvdW50KCkpOwotICAgIGZpbmFsIElubGluZUxhYmVsIGwgPSBuZXcgSW5saW5lTGFiZWwobmFtZSk7CisgIHByaXZhdGUgc3RhdGljIHZvaWQgd2hvQW1JKGJvb2xlYW4gY2FuTG9nT3V0KSB7CisgICAgQWNjb3VudCBhY2NvdW50ID0gZ2V0VXNlckFjY291bnQoKTsKKyAgICBmaW5hbCBDdXJyZW50VXNlclBvcHVwUGFuZWwgdXNlclBvcHVwID0KKyAgICAgICAgbmV3IEN1cnJlbnRVc2VyUG9wdXBQYW5lbChhY2NvdW50LCBjYW5Mb2dPdXQpOworICAgIGZpbmFsIEZsb3dQYW5lbCB1c2VyU3VtbWFyeVBhbmVsID0gbmV3IEZsb3dQYW5lbCgpOworICAgIGNsYXNzIFBvcHVwSGFuZGxlciBpbXBsZW1lbnRzIEtleURvd25IYW5kbGVyLCBDbGlja0hhbmRsZXIgeworICAgICAgcHJpdmF0ZSB2b2lkIHNob3dIaWRlUG9wdXAoKSB7CisgICAgICAgIGlmICh1c2VyUG9wdXAuaXNTaG93aW5nKCkgJiYgdXNlclBvcHVwLmlzVmlzaWJsZSgpKSB7CisgICAgICAgICAgdXNlclBvcHVwLmhpZGUoKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICB1c2VyUG9wdXAuc2hvd1JlbGF0aXZlVG8odXNlclN1bW1hcnlQYW5lbCk7CisgICAgICAgIH0KKyAgICAgIH0KKworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKKyAgICAgICAgc2hvd0hpZGVQb3B1cCgpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uS2V5RG93bihLZXlEb3duRXZlbnQgZXZlbnQpIHsKKyAgICAgICAgaWYoZXZlbnQuZ2V0TmF0aXZlS2V5Q29kZSgpID09IEtleUNvZGVzLktFWV9FTlRFUikgeworICAgICAgICAgIHNob3dIaWRlUG9wdXAoKTsKKyAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIGZpbmFsIFBvcHVwSGFuZGxlciBwb3B1cEhhbmRsZXIgPSBuZXcgUG9wdXBIYW5kbGVyKCk7CisgICAgZmluYWwgSW5saW5lTGFiZWwgbCA9IG5ldyBJbmxpbmVMYWJlbChGb3JtYXRVdGlsLm5hbWUoYWNjb3VudCkpOwogICAgIGwuc2V0U3R5bGVOYW1lKFJFU09VUkNFUy5jc3MoKS5tZW51QmFyVXNlck5hbWUoKSk7Ci0gICAgbWVudVJpZ2h0LmFkZChsKTsKKyAgICBmaW5hbCBBdmF0YXJJbWFnZSBhdmF0YXIgPSBuZXcgQXZhdGFySW1hZ2UoYWNjb3VudC5nZXRJZCgpLCAyNik7CisgICAgYXZhdGFyLnNldFN0eWxlTmFtZShSRVNPVVJDRVMuY3NzKCkubWVudUJhclVzZXJOYW1lQXZhdGFyKCkpOworICAgIHVzZXJTdW1tYXJ5UGFuZWwuc2V0U3R5bGVOYW1lKFJFU09VUkNFUy5jc3MoKS5tZW51QmFyVXNlck5hbWVQYW5lbCgpKTsKKyAgICB1c2VyU3VtbWFyeVBhbmVsLmFkZChsKTsKKyAgICB1c2VyU3VtbWFyeVBhbmVsLmFkZChhdmF0YXIpOworICAgIHVzZXJTdW1tYXJ5UGFuZWwuYWRkKG5ldyBJbmxpbmVMYWJlbCgiIOKWviIpKTsKKyAgICB1c2VyUG9wdXAuYWRkQXV0b0hpZGVQYXJ0bmVyKHVzZXJTdW1tYXJ5UGFuZWwuZ2V0RWxlbWVudCgpKTsKKyAgICBGb2N1c1BhbmVsIGZwID0gbmV3IEZvY3VzUGFuZWwodXNlclN1bW1hcnlQYW5lbCk7CisgICAgZnAuc2V0U3R5bGVOYW1lKFJFU09VUkNFUy5jc3MoKS5tZW51QmFyVXNlck5hbWVGb2N1c1BhbmVsKCkpOworICAgIGZwLmFkZEtleURvd25IYW5kbGVyKHBvcHVwSGFuZGxlcik7CisgICAgZnAuYWRkQ2xpY2tIYW5kbGVyKHBvcHVwSGFuZGxlcik7CisgICAgbWVudVJpZ2h0LmFkZChmcCk7CiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBBbmNob3IgYW5jaG9yKGZpbmFsIFN0cmluZyB0ZXh0LCBmaW5hbCBTdHJpbmcgdG8pIHsKICAgICBmaW5hbCBBbmNob3IgYSA9IG5ldyBBbmNob3IodGV4dCwgdG8pOwogICAgIGEuc2V0U3R5bGVOYW1lKFJFU09VUkNFUy5jc3MoKS5tZW51SXRlbSgpKTsKLSAgICBBY2Nlc3NpYmlsaXR5LnNldFJvbGUoYS5nZXRFbGVtZW50KCksIEFjY2Vzc2liaWxpdHkuUk9MRV9NRU5VSVRFTSk7CisgICAgUm9sZXMuZ2V0TWVudWl0ZW1Sb2xlKCkuc2V0KGEuZ2V0RWxlbWVudCgpKTsKICAgICByZXR1cm4gYTsKICAgfQogCkBAIC03NDYsNiArODIyLDMwIEBACiAgICAgICB9KTsKICAgfQogCisgIHByaXZhdGUgc3RhdGljIHZvaWQgYWRkUHJvamVjdExpbmsoZmluYWwgTGlua01lbnVCYXIgbSwgZmluYWwgU3RyaW5nIHRleHQsCisgICAgICBmaW5hbCBTdHJpbmcgcGFuZWwpIHsKKyAgICBtLmFkZEl0ZW0obmV3IExpbmtNZW51SXRlbSh0ZXh0LCAiIikgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIHZvaWQgb25TY3JlZW5Mb2FkKFNjcmVlbkxvYWRFdmVudCBldmVudCkgeworICAgICAgICAgIFNjcmVlbiBzY3JlZW4gPSBldmVudC5nZXRTY3JlZW4oKTsKKyAgICAgICAgICBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdEtleTsKKyAgICAgICAgICBpZiAoc2NyZWVuIGluc3RhbmNlb2YgUHJvamVjdFNjcmVlbikgeworICAgICAgICAgICAgcHJvamVjdEtleSA9ICgoUHJvamVjdFNjcmVlbilzY3JlZW4pLmdldFByb2plY3RLZXkoKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgcHJvamVjdEtleSA9IFByb2plY3RTY3JlZW4uZ2V0U2F2ZWRLZXkoKTsKKyAgICAgICAgICB9CisKKyAgICAgICAgICBpZiAocHJvamVjdEtleSAhPSBudWxsKSB7CisgICAgICAgICAgICBzZXRWaXNpYmxlKHRydWUpOworICAgICAgICAgICAgc2V0VGFyZ2V0SGlzdG9yeVRva2VuKERpc3BhdGNoZXIudG9Qcm9qZWN0QWRtaW4ocHJvamVjdEtleSwgcGFuZWwpKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgc2V0VmlzaWJsZShmYWxzZSk7CisgICAgICAgICAgfQorICAgICAgICAgIHN1cGVyLm9uU2NyZWVuTG9hZChldmVudCk7CisgICAgICAgIH0KKyAgICAgIH0pOworICB9CisKICAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBhZGREaWZmTGluayhmaW5hbCBMaW5rTWVudUJhciBtLCBmaW5hbCBTdHJpbmcgdGV4dCwKICAgICAgIGZpbmFsIFBhdGNoU2NyZWVuLlR5cGUgdHlwZSkgewogICAgIG0uYWRkSXRlbShuZXcgTGlua01lbnVJdGVtKHRleHQsICIiKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0Q29uc3RhbnRzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0Q29uc3RhbnRzLmphdmEKaW5kZXggODdjMDFjYy4uNjgzZjA1OCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdENvbnN0YW50cy5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDb25zdGFudHMuamF2YQpAQCAtNDQsNyArNDQsNiBAQAogCiAgIFN0cmluZyBub3RGb3VuZFRpdGxlKCk7CiAgIFN0cmluZyBub3RGb3VuZEJvZHkoKTsKLSAgU3RyaW5nIG5hbWVBbHJlYWR5VXNlZEJvZHkoKTsKICAgU3RyaW5nIG5vU3VjaEFjY291bnRUaXRsZSgpOwogCiAgIFN0cmluZyBub1N1Y2hHcm91cFRpdGxlKCk7CkBAIC03MSwxMiArNzAsMTYgQEAKIAogICBTdHJpbmcgbWVudVByb2plY3RzKCk7CiAgIFN0cmluZyBtZW51UHJvamVjdHNMaXN0KCk7CisgIFN0cmluZyBtZW51UHJvamVjdHNJbmZvKCk7CisgIFN0cmluZyBtZW51UHJvamVjdHNCcmFuY2hlcygpOworICBTdHJpbmcgbWVudVByb2plY3RzQWNjZXNzKCk7CisgIFN0cmluZyBtZW51UHJvamVjdHNEYXNoYm9hcmRzKCk7CiAgIFN0cmluZyBtZW51UHJvamVjdHNDcmVhdGUoKTsKIAogICBTdHJpbmcgbWVudVBlb3BsZSgpOwotICBTdHJpbmcgbWVudUdyb3VwcygpOwotICBTdHJpbmcgbWVudUdyb3Vwc0xpc3QoKTsKLSAgU3RyaW5nIG1lbnVHcm91cHNDcmVhdGUoKTsKKyAgU3RyaW5nIG1lbnVQZW9wbGVHcm91cHNMaXN0KCk7CisgIFN0cmluZyBtZW51UGVvcGxlR3JvdXBzQ3JlYXRlKCk7CisKICAgU3RyaW5nIG1lbnVQbHVnaW5zKCk7CiAgIFN0cmluZyBtZW51UGx1Z2luc0luc3RhbGxlZCgpOwogCkBAIC04NSw2ICs4OCw3IEBACiAgIFN0cmluZyBtZW51RG9jdW1lbnRhdGlvblNlYXJjaCgpOwogICBTdHJpbmcgbWVudURvY3VtZW50YXRpb25VcGxvYWQoKTsKICAgU3RyaW5nIG1lbnVEb2N1bWVudGF0aW9uQWNjZXNzKCk7CisgIFN0cmluZyBtZW51RG9jdW1lbnRhdGlvbkFQSSgpOwogCiAgIFN0cmluZyBzZWFyY2hIaW50KCk7CiAgIFN0cmluZyBzZWFyY2hCdXR0b24oKTsKQEAgLTEwOCw0ICsxMTIsNiBAQAogCiAgIFN0cmluZyBwcm9qZWN0QWNjZXNzRXJyb3IoKTsKICAgU3RyaW5nIHByb2plY3RBY2Nlc3NQcm9wb3NlRm9yUmV2aWV3SGludCgpOworCisgIFN0cmluZyB1c2VyQ2Fubm90Vm90ZVRvb2xUaXAoKTsKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDb25zdGFudHMucHJvcGVydGllcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDb25zdGFudHMucHJvcGVydGllcwppbmRleCA1OTZiM2FkLi5kZWZjN2U0IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0Q29uc3RhbnRzLnByb3BlcnRpZXMKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdENvbnN0YW50cy5wcm9wZXJ0aWVzCkBAIC0xMSw3ICsxMSw3IEBACiByZWdpc3RlckRpYWxvZ1RpdGxlID0gQ29kZSBSZXZpZXcgLSBSZWdpc3RlciBOZXcgQWNjb3VudAogbG9naW5UeXBlVW5zdXBwb3J0ZWQgPSBTaWduIGluIGlzIG5vdCBhdmFpbGFibGUuCiAKLWVycm9yRGlhbG9nVGl0bGUgPSBBcHBsaWNhdGlvbiBFcnJvcgorZXJyb3JEaWFsb2dUaXRsZSA9IENvZGUgUmV2aWV3IC0gRXJyb3IKIGVycm9yRGlhbG9nQ29udGludWUgPSBDb250aW51ZQogCiBjb25maXJtYXRpb25EaWFsb2dPayA9IE9LCkBAIC0yNyw3ICsyNyw2IEBACiAKIG5vdEZvdW5kVGl0bGUgPSBOb3QgRm91bmQKIG5vdEZvdW5kQm9keSA9IFRoZSBwYWdlIHlvdSByZXF1ZXN0ZWQgd2FzIG5vdCBmb3VuZCwgb3IgeW91IGRvIG5vdCBoYXZlIHBlcm1pc3Npb24gdG8gdmlldyB0aGlzIHBhZ2UuCi1uYW1lQWxyZWFkeVVzZWRCb2R5ID0gVGhlIG5hbWUgaXMgYWxyZWFkeSBpbiB1c2UuCiBub1N1Y2hBY2NvdW50VGl0bGUgPSBDb2RlIFJldmlldyAtIFVua25vd24gVXNlcgogCiBub1N1Y2hHcm91cFRpdGxlID0gQ29kZSBSZXZpZXcgLSBVbmtub3duIEdyb3VwCkBAIC01NCwxMiArNTMsMTUgQEAKIAogbWVudVByb2plY3RzID0gUHJvamVjdHMKIG1lbnVQcm9qZWN0c0xpc3QgPSBMaXN0CittZW51UHJvamVjdHNJbmZvID0gR2VuZXJhbAorbWVudVByb2plY3RzQnJhbmNoZXMgPSBCcmFuY2hlcworbWVudVByb2plY3RzQWNjZXNzID0gQWNjZXNzCittZW51UHJvamVjdHNEYXNoYm9hcmRzID0gRGFzaGJvYXJkcwogbWVudVByb2plY3RzQ3JlYXRlID0gQ3JlYXRlIE5ldyBQcm9qZWN0CiAKIG1lbnVQZW9wbGUgPSBQZW9wbGUKLW1lbnVHcm91cHMgPSBHcm91cHMKLW1lbnVHcm91cHNMaXN0ID0gTGlzdAotbWVudUdyb3Vwc0NyZWF0ZSA9IENyZWF0ZSBOZXcgR3JvdXAKK21lbnVQZW9wbGVHcm91cHNMaXN0ID0gTGlzdCBHcm91cHMKK21lbnVQZW9wbGVHcm91cHNDcmVhdGUgPSBDcmVhdGUgTmV3IEdyb3VwCiAKIG1lbnVQbHVnaW5zID0gUGx1Z2lucwogbWVudVBsdWdpbnNJbnN0YWxsZWQgPSBJbnN0YWxsZWQKQEAgLTY5LDggKzcxLDkgQEAKIG1lbnVEb2N1bWVudGF0aW9uU2VhcmNoID0gU2VhcmNoaW5nCiBtZW51RG9jdW1lbnRhdGlvblVwbG9hZCA9IFVwbG9hZGluZwogbWVudURvY3VtZW50YXRpb25BY2Nlc3MgPSBBY2Nlc3MgQ29udHJvbHMKK21lbnVEb2N1bWVudGF0aW9uQVBJID0gUkVTVCBBUEkKIAotc2VhcmNoSGludCA9IENoYW5nZSAjLCBTSEEtMSwgdHI6aWQsIG93bmVyOmVtYWlsIG9yIHJldmlld2VyOmVtYWlsCitzZWFyY2hIaW50ID0gQ2hhbmdlICMsIFNIQS0xLCB0cjppZCBvciBvd25lcjplbWFpbAogc2VhcmNoQnV0dG9uID0gU2VhcmNoCiAKIHJwY1N0YXR1c1dvcmtpbmcgPSBXb3JraW5nIC4uLgpAQCAtOTIsMyArOTUsNSBAQAogCiBwcm9qZWN0QWNjZXNzRXJyb3IgPSBZb3UgZG9uJ3QgaGF2ZSBwZXJtaXNzaW9ucyB0byBtb2RpZnkgdGhlIGFjY2VzcyByaWdodHMgZm9yIHRoZSBmb2xsb3dpbmcgcmVmczoKIHByb2plY3RBY2Nlc3NQcm9wb3NlRm9yUmV2aWV3SGludCA9IFlvdSBtYXkgcHJvcG9zZSB0aGVzZSBtb2RpZmljYXRpb25zIHRvIHRoZSBwcm9qZWN0IG93bmVycyBieSBjbGlja2luZyBvbiAnU2F2ZSBmb3IgUmV2aWV3Jy4KKwordXNlckNhbm5vdFZvdGVUb29sVGlwID0gVXNlciBjYW5ub3Qgdm90ZSBpbiB0aGlzIGNhdGVnb3J5CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0Q3NzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0Q3NzLmphdmEKaW5kZXggOWNiZjVjZC4uNDg5ZmYwMCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdENzcy5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRDc3MuamF2YQpAQCAtMTcsMjIgKzE3LDE5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLmNsaWVudC5Dc3NSZXNvdXJjZTsKIAogcHVibGljIGludGVyZmFjZSBHZXJyaXRDc3MgZXh0ZW5kcyBDc3NSZXNvdXJjZSB7Ci0gIFN0cmluZyBncmVlbkNoZWNrQ2xhc3MoKTsKICAgU3RyaW5nIGFjY291bnRDb250YWN0T25GaWxlKCk7CiAgIFN0cmluZyBhY2NvdW50Q29udGFjdFByaXZhY3lEZXRhaWxzKCk7CiAgIFN0cmluZyBhY2NvdW50RGFzaGJvYXJkKCk7CiAgIFN0cmluZyBhY2NvdW50SW5mb0Jsb2NrKCk7CiAgIFN0cmluZyBhY2NvdW50TmFtZSgpOwotICBTdHJpbmcgYWNjb3VudFVzZXJuYW1lKCk7CiAgIFN0cmluZyBhY2NvdW50UGFzc3dvcmQoKTsKKyAgU3RyaW5nIGFjY291bnRVc2VybmFtZSgpOwogICBTdHJpbmcgYWN0aXZlUm93KCk7CisgIFN0cmluZyBhZGRCcmFuY2goKTsKICAgU3RyaW5nIGFkZE1lbWJlclRleHRCb3goKTsKICAgU3RyaW5nIGFkZFJldmlld2VyKCk7Ci0gIFN0cmluZyByZW1vdmVSZXZpZXdlcigpOwotICBTdHJpbmcgcmVtb3ZlUmV2aWV3ZXJDZWxsKCk7CiAgIFN0cmluZyBhZGRTc2hLZXlQYW5lbCgpOwogICBTdHJpbmcgYWRkV2F0Y2hQYW5lbCgpOwotICBTdHJpbmcgYXBwcm92YWxDYXRlZ29yeUxpc3QoKTsKICAgU3RyaW5nIGFwcHJvdmFsVGFibGUoKTsKICAgU3RyaW5nIGFwcHJvdmFsaGludCgpOwogICBTdHJpbmcgYXBwcm92YWxyb2xlKCk7CkBAIC00MCwxMiArMzcsMTMgQEAKICAgU3RyaW5nIGJsb2NrSGVhZGVyKCk7CiAgIFN0cmluZyBib3R0b21oZWFkZXIoKTsKICAgU3RyaW5nIGNBUFBST1ZBTCgpOwotICBTdHJpbmcgY0lEKCk7CiAgIFN0cmluZyBjTGFzdFVwZGF0ZSgpOwotICBTdHJpbmcgY1BST0pFQ1QoKTsKKyAgU3RyaW5nIGNPV05FUigpOwogICBTdHJpbmcgY1NVQkpFQ1QoKTsKKyAgU3RyaW5nIGNlbGxzTmV4dFRvRmlsZUNvbW1lbnQoKTsKICAgU3RyaW5nIGNoYW5nZUNvbW1lbnRzKCk7CiAgIFN0cmluZyBjaGFuZ2VJbmZvQmxvY2soKTsKKyAgU3RyaW5nIGNoYW5nZUluZm9Ub3BpY1BhbmVsKCk7CiAgIFN0cmluZyBjaGFuZ2VTY3JlZW4oKTsKICAgU3RyaW5nIGNoYW5nZVNjcmVlbkRlc2NyaXB0aW9uKCk7CiAgIFN0cmluZyBjaGFuZ2VTY3JlZW5TdGFySWNvbigpOwpAQCAtNTQsMjMgKzUyLDI0IEBACiAgIFN0cmluZyBjaGFuZ2VUeXBlQ2VsbCgpOwogICBTdHJpbmcgY2hhbmdlaWQoKTsKICAgU3RyaW5nIGNsb3NlZHN0YXRlKCk7Ci0gIFN0cmluZyBjb21tZW50ZWRBY3Rpb25EaWFsb2coKTsKLSAgU3RyaW5nIGNvbW1lbnRlZEFjdGlvbk1lc3NhZ2UoKTsKICAgU3RyaW5nIGNvbW1lbnRDZWxsKCk7CiAgIFN0cmluZyBjb21tZW50RWRpdG9yUGFuZWwoKTsKICAgU3RyaW5nIGNvbW1lbnRIb2xkZXIoKTsKKyAgU3RyaW5nIGNvbW1lbnRIb2xkZXJMZWZ0bW9zdCgpOwogICBTdHJpbmcgY29tbWVudFBhbmVsKCk7Ci0gIFN0cmluZyBjb21tZW50UGFuZWxCb3JkZXIoKTsKICAgU3RyaW5nIGNvbW1lbnRQYW5lbEF1dGhvckNlbGwoKTsKKyAgU3RyaW5nIGNvbW1lbnRQYW5lbEJvcmRlcigpOwogICBTdHJpbmcgY29tbWVudFBhbmVsQnV0dG9ucygpOwogICBTdHJpbmcgY29tbWVudFBhbmVsQ29udGVudCgpOwogICBTdHJpbmcgY29tbWVudFBhbmVsRGF0ZUNlbGwoKTsKICAgU3RyaW5nIGNvbW1lbnRQYW5lbEhlYWRlcigpOwogICBTdHJpbmcgY29tbWVudFBhbmVsTGFzdCgpOwotICBTdHJpbmcgY29tbWVudFBhbmVsTWVzc2FnZSgpOwogICBTdHJpbmcgY29tbWVudFBhbmVsTWVudUJhcigpOworICBTdHJpbmcgY29tbWVudFBhbmVsTWVzc2FnZSgpOwogICBTdHJpbmcgY29tbWVudFBhbmVsU3VtbWFyeSgpOwogICBTdHJpbmcgY29tbWVudFBhbmVsU3VtbWFyeUNlbGwoKTsKKyAgU3RyaW5nIGNvbW1lbnRlZEFjdGlvbkRpYWxvZygpOworICBTdHJpbmcgY29tbWVudGVkQWN0aW9uTWVzc2FnZSgpOwogICBTdHJpbmcgY29tcGxleEhlYWRlcigpOwogICBTdHJpbmcgY29udGVudCgpOwogICBTdHJpbmcgY29udHJpYnV0b3JBZ3JlZW1lbnRBbHJlYWR5U3VibWl0dGVkKCk7CkBAIC04NywyNSArODYsMjcgQEAKICAgU3RyaW5nIGRpZmZUZXh0Q09OVEVYVCgpOwogICBTdHJpbmcgZGlmZlRleHRERUxFVEUoKTsKICAgU3RyaW5nIGRpZmZUZXh0RmlsZUhlYWRlcigpOworICBTdHJpbmcgZGlmZlRleHRGb3JCaW5hcnlJblNpZGVCeVNpZGUoKTsKICAgU3RyaW5nIGRpZmZUZXh0SHVua0hlYWRlcigpOwogICBTdHJpbmcgZGlmZlRleHRJTlNFUlQoKTsKICAgU3RyaW5nIGRpZmZUZXh0Tm9MRigpOwogICBTdHJpbmcgZG93bmxvYWRMaW5rKCk7Ci0gIFN0cmluZyBkb3dubG9hZExpbmtfQWN0aXZlKCk7Ci0gIFN0cmluZyBkb3dubG9hZExpbmtMaXN0Q2VsbCgpOwogICBTdHJpbmcgZG93bmxvYWRMaW5rQ29weUxhYmVsKCk7CiAgIFN0cmluZyBkb3dubG9hZExpbmtIZWFkZXIoKTsKICAgU3RyaW5nIGRvd25sb2FkTGlua0hlYWRlckdhcCgpOwogICBTdHJpbmcgZG93bmxvYWRMaW5rTGlzdCgpOworICBTdHJpbmcgZG93bmxvYWRMaW5rTGlzdENlbGwoKTsKKyAgU3RyaW5nIGRvd25sb2FkTGlua19BY3RpdmUoKTsKICAgU3RyaW5nIGRyYWZ0cygpOwogICBTdHJpbmcgZW1wdHlTZWN0aW9uKCk7CiAgIFN0cmluZyBlcnJvckRpYWxvZygpOwotICBTdHJpbmcgZXJyb3JEaWFsb2dHbGFzcygpOwotICBTdHJpbmcgZXJyb3JEaWFsb2dUaXRsZSgpOwogICBTdHJpbmcgZXJyb3JEaWFsb2dCdXR0b25zKCk7CiAgIFN0cmluZyBlcnJvckRpYWxvZ0Vycm9yVHlwZSgpOworICBTdHJpbmcgZXJyb3JEaWFsb2dHbGFzcygpOwogICBTdHJpbmcgZXJyb3JEaWFsb2dUZXh0KCk7CisgIFN0cmluZyBlcnJvckRpYWxvZ1RpdGxlKCk7CiAgIFN0cmluZyBmaWxlQ29sdW1uSGVhZGVyKCk7CisgIFN0cmluZyBmaWxlQ29tbWVudEJvcmRlcigpOwogICBTdHJpbmcgZmlsZUxpbmUoKTsKICAgU3RyaW5nIGZpbGVMaW5lQ09OVEVYVCgpOwogICBTdHJpbmcgZmlsZUxpbmVERUxFVEUoKTsKQEAgLTExMyw4ICsxMTQsOSBAQAogICBTdHJpbmcgZmlsZUxpbmVNb2RlKCk7CiAgIFN0cmluZyBmaWxlTGluZU5vbmUoKTsKICAgU3RyaW5nIGZpbGVQYXRoQ2VsbCgpOwotICBTdHJpbmcgZ2Vycml0VG9wTWVudSgpOwogICBTdHJpbmcgZ2Vycml0Qm9keSgpOworICBTdHJpbmcgZ2Vycml0VG9wTWVudSgpOworICBTdHJpbmcgZ3JlZW5DaGVja0NsYXNzKCk7CiAgIFN0cmluZyBncm91cERlc2NyaXB0aW9uUGFuZWwoKTsKICAgU3RyaW5nIGdyb3VwRXh0ZXJuYWxOYW1lRmlsdGVyVGV4dEJveCgpOwogICBTdHJpbmcgZ3JvdXBJbmNsdWRlc1RhYmxlKCk7CkBAIC0xMjUsMjQgKzEyNywyOSBAQAogICBTdHJpbmcgZ3JvdXBPcHRpb25zUGFuZWwoKTsKICAgU3RyaW5nIGdyb3VwT3duZXJQYW5lbCgpOwogICBTdHJpbmcgZ3JvdXBPd25lclRleHRCb3goKTsKLSAgU3RyaW5nIGdyb3VwVHlwZVBhbmVsKCk7CiAgIFN0cmluZyBncm91cFR5cGVTZWxlY3RMaXN0Qm94KCk7CiAgIFN0cmluZyBncm91cFVVSURQYW5lbCgpOwogICBTdHJpbmcgaGVhZGVyKCk7CiAgIFN0cmluZyBoeXBlcmxpbmsoKTsKICAgU3RyaW5nIGljb25DZWxsKCk7CisgIFN0cmluZyBpY29uQ2VsbE9mRmlsZUNvbW1lbnRSb3coKTsKICAgU3RyaW5nIGljb25IZWFkZXIoKTsKICAgU3RyaW5nIGlkZW50aXR5VW50cnVzdGVkRXh0ZXJuYWxJZCgpOwogICBTdHJpbmcgaW5mb0Jsb2NrKCk7CiAgIFN0cmluZyBpbmZvVGFibGUoKTsKICAgU3RyaW5nIGlucHV0RmllbGRUeXBlSGludCgpOwogICBTdHJpbmcga2V5aGVscCgpOworICBTdHJpbmcgbGFiZWxMaXN0KCk7CiAgIFN0cmluZyBsZWZ0TW9zdENlbGwoKTsKICAgU3RyaW5nIGxpbmVIZWFkZXIoKTsKICAgU3RyaW5nIGxpbmVOdW1iZXIoKTsKKyAgU3RyaW5nIGxpbmsoKTsKICAgU3RyaW5nIGxpbmtNZW51QmFyKCk7CiAgIFN0cmluZyBsaW5rTWVudUl0ZW1Ob3RMYXN0KCk7CiAgIFN0cmluZyBtZW51QmFyVXNlck5hbWUoKTsKKyAgU3RyaW5nIG1lbnVCYXJVc2VyTmFtZUF2YXRhcigpOworICBTdHJpbmcgbWVudUJhclVzZXJOYW1lRm9jdXNQYW5lbCgpOworICBTdHJpbmcgbWVudUJhclVzZXJOYW1lUGFuZWwoKTsKICAgU3RyaW5nIG1lbnVJdGVtKCk7CiAgIFN0cmluZyBtZW51U2NyZWVuTWVudUJhcigpOwogICBTdHJpbmcgbWlzc2luZ0FwcHJvdmFsKCk7CkBAIC0xNTIsMTAgKzE1OSwxMiBAQAogICBTdHJpbmcgbmVnc2NvcmUoKTsKICAgU3RyaW5nIG5vTGluZUxpbmVOdW1iZXIoKTsKICAgU3RyaW5nIG5vYm9yZGVyKCk7CisgIFN0cmluZyBub3RWb3RhYmxlKCk7CiAgIFN0cmluZyBvdXRkYXRlZCgpOwogICBTdHJpbmcgcGFyZW50c1RhYmxlKCk7CiAgIFN0cmluZyBwYXRjaEJyb3dzZXJQb3B1cCgpOwogICBTdHJpbmcgcGF0Y2hCcm93c2VyUG9wdXBCb2R5KCk7CisgIFN0cmluZyBwYXRjaENlbGxSZXZlcnNlRGlmZigpOwogICBTdHJpbmcgcGF0Y2hDb21tZW50cygpOwogICBTdHJpbmcgcGF0Y2hDb250ZW50VGFibGUoKTsKICAgU3RyaW5nIHBhdGNoSGlzdG9yeVRhYmxlKCk7CkBAIC0xNzAsMTIgKzE3OSwxOCBAQAogICBTdHJpbmcgcGF0Y2hTaXplQ2VsbCgpOwogICBTdHJpbmcgcGx1Z2luc1RhYmxlKCk7CiAgIFN0cmluZyBwb3NzY29yZSgpOwotICBTdHJpbmcgcHJvamVjdEFkbWluQXBwcm92YWxDYXRlZ29yeVJhbmdlTGluZSgpOwotICBTdHJpbmcgcHJvamVjdEFkbWluQXBwcm92YWxDYXRlZ29yeVZhbHVlKCk7CisgIFN0cmluZyBwcm9qZWN0QWRtaW5MYWJlbFJhbmdlTGluZSgpOworICBTdHJpbmcgcHJvamVjdEFkbWluTGFiZWxWYWx1ZSgpOworICBTdHJpbmcgcHJvamVjdEZpbHRlckxhYmVsKCk7CisgIFN0cmluZyBwcm9qZWN0RmlsdGVyUGFuZWwoKTsKICAgU3RyaW5nIHB1Ymxpc2hDb21tZW50c1NjcmVlbigpOwogICBTdHJpbmcgcmVnaXN0ZXJTY3JlZW5FeHBsYWluKCk7CiAgIFN0cmluZyByZWdpc3RlclNjcmVlbk5leHRMaW5rcygpOwogICBTdHJpbmcgcmVnaXN0ZXJTY3JlZW5TZWN0aW9uKCk7CisgIFN0cmluZyByZW1vdmVSZXZpZXdlcigpOworICBTdHJpbmcgcmVtb3ZlUmV2aWV3ZXJDZWxsKCk7CisgIFN0cmluZyByZXZpZXdlZFBhbmVsQm90dG9tKCk7CisgIFN0cmluZyByaWdodEJvcmRlcigpOwogICBTdHJpbmcgcmlnaHRtb3N0KCk7CiAgIFN0cmluZyBycGNTdGF0dXMoKTsKICAgU3RyaW5nIHJwY1N0YXR1c0xvYWRpbmcoKTsKQEAgLTE4NSw4ICsyMDAsMTAgQEAKICAgU3RyaW5nIHNjcmVlbk5vSGVhZGVyKCk7CiAgIFN0cmluZyBzZWFyY2hQYW5lbCgpOwogICBTdHJpbmcgc2VjdGlvbkhlYWRlcigpOworICBTdHJpbmcgc2VsZWN0UGF0Y2hTZXRPbGRWZXJzaW9uKCk7CiAgIFN0cmluZyBzaWRlQnlTaWRlU2NyZWVuTGlua1RhYmxlKCk7CiAgIFN0cmluZyBzaWRlQnlTaWRlU2NyZWVuU2lkZUJ5U2lkZVRhYmxlKCk7CisgIFN0cmluZyBzaWRlQnlTaWRlVGFibGVCaW5hcnlIZWFkZXIoKTsKICAgU3RyaW5nIHNpbmdsZUxpbmUoKTsKICAgU3RyaW5nIHNraXBMaW5lKCk7CiAgIFN0cmluZyBzbWFsbEhlYWRpbmcoKTsKQEAgLTE5OSwxNyArMjE2LDE4IEBACiAgIFN0cmluZyBzc2hIb3N0S2V5UGFuZWxLbm93bkhvc3RFbnRyeSgpOwogICBTdHJpbmcgc3NoS2V5UGFuZWxFbmNvZGVkS2V5KCk7CiAgIFN0cmluZyBzc2hLZXlQYW5lbEludmFsaWQoKTsKKyAgU3RyaW5nIHRvcE1vc3RDZWxsKCk7CiAgIFN0cmluZyB0b3BtZW51KCk7CiAgIFN0cmluZyB0b3BtZW51TWVudUxlZnQoKTsKICAgU3RyaW5nIHRvcG1lbnVNZW51UmlnaHQoKTsKICAgU3RyaW5nIHRvcG1lbnVURGdsdWUoKTsKICAgU3RyaW5nIHRvcG1lbnVURG1lbnUoKTsKICAgU3RyaW5nIHRvcG1vc3QoKTsKLSAgU3RyaW5nIHRvcE1vc3RDZWxsKCk7CisgIFN0cmluZyB1bmlmaWVkVGFibGUoKTsKKyAgU3RyaW5nIHVuaWZpZWRUYWJsZUhlYWRlcigpOworICBTdHJpbmcgdXNlckluZm9Qb3B1cCgpOwogICBTdHJpbmcgdXNlcmlkZW50aXR5KCk7CiAgIFN0cmluZyB1c2VybmFtZUZpZWxkKCk7CiAgIFN0cmluZyB2ZXJzaW9uKCk7CiAgIFN0cmluZyB3YXRjaGVkUHJvamVjdEZpbHRlcigpOwotICBTdHJpbmcgc2VsZWN0UGF0Y2hTZXRPbGRWZXJzaW9uKCk7Ci0gIFN0cmluZyBwYXRjaENlbGxSZXZlcnNlRGlmZigpOwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdE1lc3NhZ2VzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0TWVzc2FnZXMuamF2YQppbmRleCBhZWZhM2E1Li44ZmMxOTZhIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0TWVzc2FnZXMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0TWVzc2FnZXMuamF2YQpAQCAtMjIsNiArMjIsMTUgQEAKICAgU3RyaW5nIHBvd2VyZWRCeShTdHJpbmcgdmVyc2lvbik7CiAKICAgU3RyaW5nIG5vU3VjaEFjY291bnRNZXNzYWdlKFN0cmluZyB3aG8pOwotCiAgIFN0cmluZyBub1N1Y2hHcm91cE1lc3NhZ2UoU3RyaW5nIHdobyk7CisgIFN0cmluZyBuYW1lQWxyZWFkeVVzZWRCb2R5KFN0cmluZyBhbHJlYWR5VXNlZE5hbWUpOworCisgIFN0cmluZyBicmFuY2hDcmVhdGlvbkZhaWxlZChTdHJpbmcgYnJhbmNoTmFtZSwgU3RyaW5nIGVycm9yKTsKKyAgU3RyaW5nIGludmFsaWRCcmFuY2hOYW1lKFN0cmluZyBicmFuY2hOYW1lKTsKKyAgU3RyaW5nIGludmFsaWRSZXZpc2lvbihTdHJpbmcgcmV2aXNpb24pOworICBTdHJpbmcgYnJhbmNoQ3JlYXRpb25Ob3RBbGxvd2VkVW5kZXJSZWZuYW1lUHJlZml4KFN0cmluZyByZWZuYW1lUHJlZml4KTsKKyAgU3RyaW5nIGJyYW5jaEFscmVhZHlFeGlzdHMoU3RyaW5nIGJyYW5jaE5hbWUpOworICBTdHJpbmcgYnJhbmNoQ3JlYXRpb25Db25mbGljdChTdHJpbmcgYnJhbmNoTmFtZSwgU3RyaW5nIGV4aXN0aW5nQnJhbmNoTmFtZSk7CisKKyAgU3RyaW5nIHBsdWdpbkZhaWxlZChTdHJpbmcgc2NyaXB0UGF0aCk7CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0TWVzc2FnZXMucHJvcGVydGllcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRNZXNzYWdlcy5wcm9wZXJ0aWVzCmluZGV4IDc5NzcyYmQuLjQxY2FhNDQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRNZXNzYWdlcy5wcm9wZXJ0aWVzCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRNZXNzYWdlcy5wcm9wZXJ0aWVzCkBAIC0zLDUgKzMsMTQgQEAKIHBvd2VyZWRCeSA9IFBvd2VyZWQgYnkgPGEgaHJlZj0iaHR0cDovL2NvZGUuZ29vZ2xlLmNvbS9wL2dlcnJpdC8iIHRhcmdldD0iX2JsYW5rIj5HZXJyaXQgQ29kZSBSZXZpZXc8L2E+ICh7MH0pCiAKIG5vU3VjaEFjY291bnRNZXNzYWdlID0gezB9IGlzIG5vdCBhIHJlZ2lzdGVyZWQgdXNlci4KLQogbm9TdWNoR3JvdXBNZXNzYWdlID0gR3JvdXAgezB9IGRvZXMgbm90IGV4aXN0IG9yIGlzIG5vdCB2aXNpYmxlIHRvIHlvdS4KK25hbWVBbHJlYWR5VXNlZEJvZHkgPSBUaGUgbmFtZSB7MH0gaXMgYWxyZWFkeSBpbiB1c2UuCisKK2JyYW5jaENyZWF0aW9uRmFpbGVkID0gQ3JlYXRpbmcgYnJhbmNoIHswfSBmYWlsZWQuIEVycm9yOiB7MX0KK2ludmFsaWRCcmFuY2hOYW1lID0gVGhlIGJyYW5jaCBuYW1lIHswfSBpcyBub3QgdmFsaWQuCitpbnZhbGlkUmV2aXNpb24gPSBUaGUgcmV2aXNpb24gezB9IGlzIG5vdCB2YWxpZC4KK2JyYW5jaENyZWF0aW9uTm90QWxsb3dlZFVuZGVyUmVmbmFtZVByZWZpeCA9IEJyYW5jaCBjcmVhdGlvbiBpcyBub3QgYWxsb3dlZCB1bmRlciB7MH0uCiticmFuY2hBbHJlYWR5RXhpc3RzID0gQSBicmFuY2ggd2l0aCB0aGUgbmFtZSB7MH0gYWxyZWFkeSBleGlzdHMuCiticmFuY2hDcmVhdGlvbkNvbmZsaWN0ID0gQ2Fubm90IGNyZWF0ZSBicmFuY2ggezB9IHNpbmNlIGl0IGNvbmZsaWN0cyB3aXRoIGJyYW5jaCB7MX0uCisKK3BsdWdpbkZhaWxlZCA9IFBsdWdpbiBKYXZhU2NyaXB0IHswfSBmYWlsZWQgdG8gbG9hZApkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdFJlc291cmNlcy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L0dlcnJpdFJlc291cmNlcy5qYXZhCmluZGV4IGQ3NjNmZjEuLmZjN2VhNTMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9HZXJyaXRSZXNvdXJjZXMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvR2Vycml0UmVzb3VyY2VzLmphdmEKQEAgLTI4LDYgKzI4LDkgQEAKICAgQFNvdXJjZSgiYXJyb3dSaWdodC5naWYiKQogICBwdWJsaWMgSW1hZ2VSZXNvdXJjZSBhcnJvd1JpZ2h0KCk7CiAKKyAgQFNvdXJjZSgiZWRpdFRleHQucG5nIikKKyAgcHVibGljIEltYWdlUmVzb3VyY2UgZWRpdCgpOworCiAgIEBTb3VyY2UoInN0YXJPcGVuLmdpZiIpCiAgIHB1YmxpYyBJbWFnZVJlc291cmNlIHN0YXJPcGVuKCk7CiAKQEAgLTQyLDQgKzQ1LDEwIEBACiAKICAgQFNvdXJjZSgiZG93bmxvYWRJY29uLnBuZyIpCiAgIHB1YmxpYyBJbWFnZVJlc291cmNlIGRvd25sb2FkSWNvbigpOworCisgIEBTb3VyY2UoInF1ZXJ5SWNvbi5wbmciKQorICBwdWJsaWMgSW1hZ2VSZXNvdXJjZSBxdWVyeUljb24oKTsKKworICBAU291cmNlKCJhZGRGaWxlQ29tbWVudC5wbmciKQorICBwdWJsaWMgSW1hZ2VSZXNvdXJjZSBhZGRGaWxlQ29tbWVudCgpOwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L1NlYXJjaFBhbmVsLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvU2VhcmNoUGFuZWwuamF2YQppbmRleCA3ZTdiOTI3Li4yYWU2MDA1IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvU2VhcmNoUGFuZWwuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvU2VhcmNoUGFuZWwuamF2YQpAQCAtMTgsNiArMTgsOSBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5IaW50VGV4dEJveDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuYW5pbWF0aW9uLmNsaWVudC5BbmltYXRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5CbHVyRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5CbHVySGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlDb2RlczsKQEAgLTMzLDIxICszNiw1MSBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuZ2xvYmFsa2V5LmNsaWVudC5LZXlDb21tYW5kOwogCiBjbGFzcyBTZWFyY2hQYW5lbCBleHRlbmRzIENvbXBvc2l0ZSB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBGVUxMX1NJWkUgPSA3MDsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFNNQUxMX1NJWkUgPSA0NTsKKworICBwcml2YXRlIGNsYXNzIFNpemVBbmltYXRpb24gZXh0ZW5kcyBBbmltYXRpb24geworICAgIGludCB0YXJnZXRTaXplOworICAgIGludCBzdGFydFNpemU7CisgICAgcHVibGljIHZvaWQgcnVuKGJvb2xlYW4gZXhwYW5kKSB7CisgICAgICBpZihleHBhbmQpIHsKKyAgICAgICAgdGFyZ2V0U2l6ZSA9IEZVTExfU0laRTsKKyAgICAgICAgc3RhcnRTaXplID0gU01BTExfU0laRTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHRhcmdldFNpemUgPSBTTUFMTF9TSVpFOworICAgICAgICBzdGFydFNpemUgPSBGVUxMX1NJWkU7CisgICAgICB9CisgICAgICBzdXBlci5ydW4oMzAwKTsKKyAgICB9CisgICAgQE92ZXJyaWRlCisgICAgcHJvdGVjdGVkIHZvaWQgb25VcGRhdGUoZG91YmxlIHByb2dyZXNzKSB7CisgICAgICBpbnQgc2l6ZSA9IChpbnQpICh0YXJnZXRTaXplICogcHJvZ3Jlc3MgKyBzdGFydFNpemUgKiAoMS1wcm9ncmVzcykpOworICAgICAgc2VhcmNoQm94LnNldFZpc2libGVMZW5ndGgoc2l6ZSk7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHJvdGVjdGVkIHZvaWQgb25Db21wbGV0ZSgpIHsKKyAgICAgIHNlYXJjaEJveC5zZXRWaXNpYmxlTGVuZ3RoKHRhcmdldFNpemUpOworICAgIH0KKyAgfQogICBwcml2YXRlIGZpbmFsIEhpbnRUZXh0Qm94IHNlYXJjaEJveDsKICAgcHJpdmF0ZSBIYW5kbGVyUmVnaXN0cmF0aW9uIHJlZ0ZvY3VzOworICBwcml2YXRlIGZpbmFsIFNpemVBbmltYXRpb24gc2l6ZUFuaW1hdGlvbjsKIAogICBTZWFyY2hQYW5lbCgpIHsKICAgICBmaW5hbCBGbG93UGFuZWwgYm9keSA9IG5ldyBGbG93UGFuZWwoKTsKKyAgICBzaXplQW5pbWF0aW9uID0gbmV3IFNpemVBbmltYXRpb24oKTsKICAgICBpbml0V2lkZ2V0KGJvZHkpOwogICAgIHNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnNlYXJjaFBhbmVsKCkpOwogCiAgICAgc2VhcmNoQm94ID0gbmV3IEhpbnRUZXh0Qm94KCk7Ci0gICAgc2VhcmNoQm94LnNldFZpc2libGVMZW5ndGgoNzApOwotICAgIHNlYXJjaEJveC5zZXRIaW50VGV4dChHZXJyaXQuQy5zZWFyY2hIaW50KCkpOwogICAgIGZpbmFsIE15U3VnZ2VzdGlvbkRpc3BsYXkgc3VnZ2VzdGlvbkRpc3BsYXkgPSBuZXcgTXlTdWdnZXN0aW9uRGlzcGxheSgpOwogICAgIHNlYXJjaEJveC5hZGRLZXlQcmVzc0hhbmRsZXIobmV3IEtleVByZXNzSGFuZGxlcigpIHsKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIHZvaWQgb25LZXlQcmVzcyhmaW5hbCBLZXlQcmVzc0V2ZW50IGV2ZW50KSB7CisgICAgICAgIGlmIChzZWFyY2hCb3guZ2V0VmlzaWJsZUxlbmd0aCgpID09IFNNQUxMX1NJWkUpIHsKKyAgICAgICAgICBzaXplQW5pbWF0aW9uLnJ1bih0cnVlKTsKKyAgICAgICAgfQogICAgICAgICBpZiAoZXZlbnQuZ2V0TmF0aXZlRXZlbnQoKS5nZXRLZXlDb2RlKCkgPT0gS2V5Q29kZXMuS0VZX0VOVEVSKSB7CiAgICAgICAgICAgaWYgKCFzdWdnZXN0aW9uRGlzcGxheS5pc1N1Z2dlc3Rpb25TZWxlY3RlZCkgewogICAgICAgICAgICAgZG9TZWFyY2goKTsKQEAgLTU1LDEwICs4OCwyMCBAQAogICAgICAgICB9CiAgICAgICB9CiAgICAgfSk7CisgICAgc2VhcmNoQm94LmFkZEJsdXJIYW5kbGVyKG5ldyBCbHVySGFuZGxlcigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgb25CbHVyKEJsdXJFdmVudCBldmVudCkgeworICAgICAgICBpZiAoc2VhcmNoQm94LmdldFZpc2libGVMZW5ndGgoKSAhPSBTTUFMTF9TSVpFKSB7CisgICAgICAgICAgc2l6ZUFuaW1hdGlvbi5ydW4oZmFsc2UpOworICAgICAgICB9CisgICAgICB9CisgICAgfSk7CiAKICAgICBmaW5hbCBTdWdnZXN0Qm94IHN1Z2dlc3RCb3ggPQogICAgICAgICBuZXcgU3VnZ2VzdEJveChuZXcgU2VhcmNoU3VnZ2VzdE9yYWNsZSgpLCBzZWFyY2hCb3gsIHN1Z2dlc3Rpb25EaXNwbGF5KTsKICAgICBzZWFyY2hCb3guc2V0U3R5bGVOYW1lKCJnd3QtVGV4dEJveCIpOworICAgIHNlYXJjaEJveC5zZXRWaXNpYmxlTGVuZ3RoKFNNQUxMX1NJWkUpOworICAgIHNlYXJjaEJveC5zZXRIaW50VGV4dChHZXJyaXQuQy5zZWFyY2hIaW50KCkpOwogCiAgICAgZmluYWwgQnV0dG9uIHNlYXJjaEJ1dHRvbiA9IG5ldyBCdXR0b24oR2Vycml0LkMuc2VhcmNoQnV0dG9uKCkpOwogICAgIHNlYXJjaEJ1dHRvbi5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9TZWFyY2hTdWdnZXN0T3JhY2xlLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvU2VhcmNoU3VnZ2VzdE9yYWNsZS5qYXZhCmluZGV4IDE3MmEyYWYuLmRkNGRlMzMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9TZWFyY2hTdWdnZXN0T3JhY2xlLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L1NlYXJjaFN1Z2dlc3RPcmFjbGUuamF2YQpAQCAtMTQsMTMgKzE0LDU0IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50OwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkFjY291bnRHcm91cFN1Z2dlc3RPcmFjbGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkFjY291bnRTdWdnZXN0T3JhY2xlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5Qcm9qZWN0TmFtZVN1Z2dlc3RPcmFjbGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuU3VnZ2VzdE9yYWNsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5IaWdobGlnaHRTdWdnZXN0T3JhY2xlOwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuVHJlZVNldDsKIAogcHVibGljIGNsYXNzIFNlYXJjaFN1Z2dlc3RPcmFjbGUgZXh0ZW5kcyBIaWdobGlnaHRTdWdnZXN0T3JhY2xlIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTGlzdDxQYXJhbVN1Z2dlc3Rlcj4gcGFyYW1TdWdnZXN0ZXIgPSBBcnJheXMuYXNMaXN0KAorICAgICAgbmV3IFBhcmFtU3VnZ2VzdGVyKCJwcm9qZWN0OiIsIG5ldyBQcm9qZWN0TmFtZVN1Z2dlc3RPcmFjbGUoKSksCisgICAgICBuZXcgUGFyYW1TdWdnZXN0ZXIoQXJyYXlzLmFzTGlzdCgib3duZXI6IiwgInJldmlld2VyOiIpLAorICAgICAgICAgIG5ldyBBY2NvdW50U3VnZ2VzdE9yYWNsZSgpIHsKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIHZvaWQgb25SZXF1ZXN0U3VnZ2VzdGlvbnMoZmluYWwgUmVxdWVzdCByZXF1ZXN0LCBmaW5hbCBDYWxsYmFjayBkb25lKSB7CisgICAgICAgICAgICAgIHN1cGVyLm9uUmVxdWVzdFN1Z2dlc3Rpb25zKHJlcXVlc3QsIG5ldyBDYWxsYmFjaygpIHsKKyAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Z2dlc3Rpb25zUmVhZHkoZmluYWwgUmVxdWVzdCByZXF1ZXN0LAorICAgICAgICAgICAgICAgICAgICBmaW5hbCBSZXNwb25zZSByZXNwb25zZSkgeworICAgICAgICAgICAgICAgICAgaWYgKCJzZWxmIi5zdGFydHNXaXRoKHJlcXVlc3QuZ2V0UXVlcnkoKSkpIHsKKyAgICAgICAgICAgICAgICAgICAgZmluYWwgQXJyYXlMaXN0PFN1Z2dlc3RPcmFjbGUuU3VnZ2VzdGlvbj4gciA9CisgICAgICAgICAgICAgICAgICAgICAgICBuZXcgQXJyYXlMaXN0PFN1Z2dlc3RPcmFjbGUuU3VnZ2VzdGlvbj4ocmVzcG9uc2UKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAuZ2V0U3VnZ2VzdGlvbnMoKS5zaXplKCkgKyAxKTsKKyAgICAgICAgICAgICAgICAgICAgci5hZGRBbGwocmVzcG9uc2UuZ2V0U3VnZ2VzdGlvbnMoKSk7CisgICAgICAgICAgICAgICAgICAgIHIuYWRkKG5ldyBTdWdnZXN0T3JhY2xlLlN1Z2dlc3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICAgICAgICAgICAgcHVibGljIFN0cmluZyBnZXREaXNwbGF5U3RyaW5nKCkgeworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGdldFJlcGxhY2VtZW50U3RyaW5nKCk7CisgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgICAgICAgICAgIHB1YmxpYyBTdHJpbmcgZ2V0UmVwbGFjZW1lbnRTdHJpbmcoKSB7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gInNlbGYiOworICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgICAgIHJlc3BvbnNlLnNldFN1Z2dlc3Rpb25zKHIpOworICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgZG9uZS5vblN1Z2dlc3Rpb25zUmVhZHkocmVxdWVzdCwgcmVzcG9uc2UpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSksCisgICAgICBuZXcgUGFyYW1TdWdnZXN0ZXIoQXJyYXlzLmFzTGlzdCgib3duZXJpbjoiLCAicmV2aWV3ZXJpbjoiKSwKKyAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwU3VnZ2VzdE9yYWNsZSgpKSk7CisKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgVHJlZVNldDxTdHJpbmc+IHN1Z2dlc3Rpb25zID0gbmV3IFRyZWVTZXQ8U3RyaW5nPigpOwogCiAgIHN0YXRpYyB7CkBAIC05MywxNyArMTM0LDE5IEBACiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBvblJlcXVlc3RTdWdnZXN0aW9ucyhSZXF1ZXN0IHJlcXVlc3QsIENhbGxiYWNrIGRvbmUpIHsKICAgICBmaW5hbCBTdHJpbmcgcXVlcnkgPSByZXF1ZXN0LmdldFF1ZXJ5KCk7Ci0gICAgaW50IGxhc3RTcGFjZSA9IHF1ZXJ5Lmxhc3RJbmRleE9mKCcgJyk7Ci0gICAgZmluYWwgU3RyaW5nIGxhc3RXb3JkOwotICAgIC8vIE5PVEU6IHRoaXMgbWV0aG9kIGlzIG5vdCBjYWxsZWQgaWYgdGhlIHF1ZXJ5IGlzIGVtcHR5LgotICAgIGlmIChsYXN0U3BhY2UgPT0gcXVlcnkubGVuZ3RoKCkgLSAxKSB7CisKKyAgICBmaW5hbCBTdHJpbmcgbGFzdFdvcmQgPSBnZXRMYXN0V29yZChxdWVyeSk7CisgICAgaWYgKGxhc3RXb3JkID09IG51bGwpIHsKICAgICAgIC8vIFN0YXJ0aW5nIGEgbmV3IHdvcmQgLSBkb24ndCBzaG93IHN1Z2dlc3Rpb25zIHlldC4KICAgICAgIGRvbmUub25TdWdnZXN0aW9uc1JlYWR5KHJlcXVlc3QsIG51bGwpOwogICAgICAgcmV0dXJuOwotICAgIH0gZWxzZSBpZiAobGFzdFNwYWNlID09IC0xKSB7Ci0gICAgICBsYXN0V29yZCA9IHF1ZXJ5OwotICAgIH0gZWxzZSB7Ci0gICAgICBsYXN0V29yZCA9IHF1ZXJ5LnN1YnN0cmluZyhsYXN0U3BhY2UgKyAxKTsKKyAgICB9CisKKyAgICBmb3IgKGZpbmFsIFBhcmFtU3VnZ2VzdGVyIHBzIDogcGFyYW1TdWdnZXN0ZXIpIHsKKyAgICAgIGlmIChwcy5hcHBsaWNhYmxlKGxhc3RXb3JkKSkgeworICAgICAgICBwcy5zdWdnZXN0KGxhc3RXb3JkLCByZXF1ZXN0LCBkb25lKTsKKyAgICAgICAgcmV0dXJuOworICAgICAgfQogICAgIH0KIAogICAgIGZpbmFsIEFycmF5TGlzdDxTZWFyY2hTdWdnZXN0aW9uPiByID0gbmV3IEFycmF5TGlzdDxTZWFyY2hTdWdnZXN0T3JhY2xlLlNlYXJjaFN1Z2dlc3Rpb24+KCk7CkBAIC0xMTgsNiArMTYxLDI3IEBACiAgICAgZG9uZS5vblN1Z2dlc3Rpb25zUmVhZHkocmVxdWVzdCwgbmV3IFJlc3BvbnNlKHIpKTsKICAgfQogCisgIHByaXZhdGUgU3RyaW5nIGdldExhc3RXb3JkKGZpbmFsIFN0cmluZyBxdWVyeSkgeworICAgIGZpbmFsIGludCBsYXN0U3BhY2UgPSBxdWVyeS5sYXN0SW5kZXhPZignICcpOworICAgIGlmIChsYXN0U3BhY2UgPT0gcXVlcnkubGVuZ3RoKCkgLSAxKSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisgICAgaWYgKGxhc3RTcGFjZSA9PSAtMSkgeworICAgICAgcmV0dXJuIHF1ZXJ5OworICAgIH0KKyAgICByZXR1cm4gcXVlcnkuc3Vic3RyaW5nKGxhc3RTcGFjZSArIDEpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCBTdHJpbmcgZ2V0UXVlcnlQYXR0ZXJuKGZpbmFsIFN0cmluZyBxdWVyeSkgeworICAgIHJldHVybiBzdXBlci5nZXRRdWVyeVBhdHRlcm4oZ2V0TGFzdFdvcmQocXVlcnkpKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgYm9vbGVhbiBpc0hUTUwoKSB7CisgICAgcmV0dXJuIHRydWU7CisgIH0KKwogICBwcml2YXRlIHN0YXRpYyBjbGFzcyBTZWFyY2hTdWdnZXN0aW9uIGltcGxlbWVudHMgU3VnZ2VzdE9yYWNsZS5TdWdnZXN0aW9uIHsKICAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBzdWdnZXN0aW9uOwogICAgIHByaXZhdGUgZmluYWwgU3RyaW5nIGZ1bGxRdWVyeTsKQEAgLTEzNyw0ICsyMDEsNjUgQEAKICAgICAgIHJldHVybiBmdWxsUXVlcnk7CiAgICAgfQogICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgUGFyYW1TdWdnZXN0ZXIgeworICAgIHByaXZhdGUgZmluYWwgTGlzdDxTdHJpbmc+IG9wZXJhdG9yczsKKyAgICBwcml2YXRlIGZpbmFsIFN1Z2dlc3RPcmFjbGUgcGFyYW1ldGVyU3VnZ2VzdGlvbk9yYWNsZTsKKworICAgIFBhcmFtU3VnZ2VzdGVyKGZpbmFsIFN0cmluZyBvcGVyYXRvciwKKyAgICAgICAgZmluYWwgU3VnZ2VzdE9yYWNsZSBwYXJhbWV0ZXJTdWdnZXN0aW9uT3JhY2xlKSB7CisgICAgICB0aGlzKENvbGxlY3Rpb25zLnNpbmdsZXRvbkxpc3Qob3BlcmF0b3IpLCBwYXJhbWV0ZXJTdWdnZXN0aW9uT3JhY2xlKTsKKyAgICB9CisKKyAgICBQYXJhbVN1Z2dlc3RlcihmaW5hbCBMaXN0PFN0cmluZz4gb3BlcmF0b3JzLAorICAgICAgICBmaW5hbCBTdWdnZXN0T3JhY2xlIHBhcmFtZXRlclN1Z2dlc3Rpb25PcmFjbGUpIHsKKyAgICAgIHRoaXMub3BlcmF0b3JzID0gb3BlcmF0b3JzOworICAgICAgdGhpcy5wYXJhbWV0ZXJTdWdnZXN0aW9uT3JhY2xlID0gcGFyYW1ldGVyU3VnZ2VzdGlvbk9yYWNsZTsKKyAgICB9CisKKyAgICBib29sZWFuIGFwcGxpY2FibGUoZmluYWwgU3RyaW5nIHF1ZXJ5KSB7CisgICAgICBmaW5hbCBTdHJpbmcgb3BlcmF0b3IgPSBnZXRBcHBsaWNhYmxlT3BlcmF0b3IocXVlcnksIG9wZXJhdG9ycyk7CisgICAgICByZXR1cm4gb3BlcmF0b3IgIT0gbnVsbCAmJiBxdWVyeS5sZW5ndGgoKSA+IG9wZXJhdG9yLmxlbmd0aCgpOworICAgIH0KKworICAgIHByaXZhdGUgU3RyaW5nIGdldEFwcGxpY2FibGVPcGVyYXRvcihmaW5hbCBTdHJpbmcgbGFzdFdvcmQsCisgICAgICAgIGZpbmFsIExpc3Q8U3RyaW5nPiBvcGVyYXRvcnMpIHsKKyAgICAgIGZvciAoZmluYWwgU3RyaW5nIG9wZXJhdG9yIDogb3BlcmF0b3JzKSB7CisgICAgICAgIGlmIChsYXN0V29yZC5zdGFydHNXaXRoKG9wZXJhdG9yKSkgeworICAgICAgICAgIHJldHVybiBvcGVyYXRvcjsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorCisgICAgdm9pZCBzdWdnZXN0KGZpbmFsIFN0cmluZyBsYXN0V29yZCwgZmluYWwgUmVxdWVzdCByZXF1ZXN0LCBmaW5hbCBDYWxsYmFjayBkb25lKSB7CisgICAgICBmaW5hbCBTdHJpbmcgb3BlcmF0b3IgPSBnZXRBcHBsaWNhYmxlT3BlcmF0b3IobGFzdFdvcmQsIG9wZXJhdG9ycyk7CisgICAgICBwYXJhbWV0ZXJTdWdnZXN0aW9uT3JhY2xlLnJlcXVlc3RTdWdnZXN0aW9ucygKKyAgICAgICAgICBuZXcgUmVxdWVzdChsYXN0V29yZC5zdWJzdHJpbmcob3BlcmF0b3IubGVuZ3RoKCkpLCByZXF1ZXN0LmdldExpbWl0KCkpLAorICAgICAgICAgIG5ldyBDYWxsYmFjaygpIHsKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWdnZXN0aW9uc1JlYWR5KGZpbmFsIFJlcXVlc3QgcmVxLAorICAgICAgICAgICAgICAgIGZpbmFsIFJlc3BvbnNlIHJlc3BvbnNlKSB7CisgICAgICAgICAgICAgIGZpbmFsIFN0cmluZyBxdWVyeSA9IHJlcXVlc3QuZ2V0UXVlcnkoKTsKKyAgICAgICAgICAgICAgZmluYWwgTGlzdDxTZWFyY2hTdWdnZXN0T3JhY2xlLlN1Z2dlc3Rpb24+IHIgPQorICAgICAgICAgICAgICAgICAgbmV3IEFycmF5TGlzdDxTdWdnZXN0T3JhY2xlLlN1Z2dlc3Rpb24+KHJlc3BvbnNlCisgICAgICAgICAgICAgICAgICAgICAgLmdldFN1Z2dlc3Rpb25zKCkuc2l6ZSgpKTsKKyAgICAgICAgICAgICAgZm9yIChmaW5hbCBTZWFyY2hTdWdnZXN0T3JhY2xlLlN1Z2dlc3Rpb24gcyA6IHJlc3BvbnNlCisgICAgICAgICAgICAgICAgICAuZ2V0U3VnZ2VzdGlvbnMoKSkgeworICAgICAgICAgICAgICAgIHIuYWRkKG5ldyBTZWFyY2hTdWdnZXN0aW9uKHMuZ2V0RGlzcGxheVN0cmluZygpLAorICAgICAgICAgICAgICAgICAgICBxdWVyeS5zdWJzdHJpbmcoMCwgcXVlcnkubGVuZ3RoKCkgLSBsYXN0V29yZC5sZW5ndGgoKSkgKworICAgICAgICAgICAgICAgICAgICBvcGVyYXRvciArIHF1b3RlSWZOZWVkZWQocy5nZXRSZXBsYWNlbWVudFN0cmluZygpKSkpOworICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIGRvbmUub25TdWdnZXN0aW9uc1JlYWR5KHJlcXVlc3QsIG5ldyBSZXNwb25zZShyKSk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIHByaXZhdGUgU3RyaW5nIHF1b3RlSWZOZWVkZWQoZmluYWwgU3RyaW5nIHMpIHsKKyAgICAgICAgICAgICAgaWYgKCFzLm1hdGNoZXMoIl5cXFMqJCIpKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuICJcIiIgKyBzICsgIlwiIjsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICByZXR1cm4gczsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKKyAgICB9CisgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9TaWduSW5EaWFsb2cuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9TaWduSW5EaWFsb2cuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggODZmZGI4NS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvU2lnbkluRGlhbG9nLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw1NyArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDggVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50OwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGguU2lnbkluTW9kZTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuR2xvYmFsS2V5OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkudXNlci5jbGllbnQuQXV0b0NlbnRlckRpYWxvZ0JveDsKLQotLyoqIFByb21wdHMgdGhlIHVzZXIgdG8gc2lnbiBpbiB0byB0aGVpciBhY2NvdW50LiAqLwotcHVibGljIGFic3RyYWN0IGNsYXNzIFNpZ25JbkRpYWxvZyBleHRlbmRzIEF1dG9DZW50ZXJEaWFsb2dCb3ggewotICBwcm90ZWN0ZWQgZmluYWwgU2lnbkluTW9kZSBtb2RlOwotICBwcm90ZWN0ZWQgZmluYWwgU3RyaW5nIHRva2VuOwotCi0gIC8qKgotICAgKiBDcmVhdGUgYSBuZXcgZGlhbG9nIHRvIGhhbmRsZSB1c2VyIHNpZ24gaW4uCi0gICAqCi0gICAqIEBwYXJhbSBzaWduSW5Nb2RlIHR5cGUgb2YgbW9kZSB0aGUgbG9naW4gd2lsbCBwZXJmb3JtLgotICAgKiBAcGFyYW0gdG9rZW4gdGhlIHRva2VuIHRvIGp1bXAgdG8gYWZ0ZXIgc2lnbi1pbiBpcyBjb21wbGV0ZS4KLSAgICovCi0gIHByb3RlY3RlZCBTaWduSW5EaWFsb2coZmluYWwgU2lnbkluTW9kZSBzaWduSW5Nb2RlLCBmaW5hbCBTdHJpbmcgdG9rZW4pIHsKLSAgICBzdXBlcigvKiBhdXRvIGhpZGUgKi90cnVlLCAvKiBtb2RhbCAqL3RydWUpOwotICAgIHNldEdsYXNzRW5hYmxlZCh0cnVlKTsKLQotICAgIHRoaXMubW9kZSA9IHNpZ25Jbk1vZGU7Ci0gICAgdGhpcy50b2tlbiA9IHRva2VuOwotCi0gICAgc3dpdGNoIChzaWduSW5Nb2RlKSB7Ci0gICAgICBjYXNlIExJTktfSURFTlRJWToKLSAgICAgICAgc2V0VGV4dChHZXJyaXQuQy5saW5rSWRlbnRpdHlEaWFsb2dUaXRsZSgpKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgICBjYXNlIFJFR0lTVEVSOgotICAgICAgICBzZXRUZXh0KEdlcnJpdC5DLnJlZ2lzdGVyRGlhbG9nVGl0bGUoKSk7Ci0gICAgICAgIGJyZWFrOwotICAgICAgZGVmYXVsdDoKLSAgICAgICAgc2V0VGV4dChHZXJyaXQuQy5zaWduSW5EaWFsb2dUaXRsZSgpKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgfQotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIHNob3coKSB7Ci0gICAgc3VwZXIuc2hvdygpOwotICAgIEdsb2JhbEtleS5kaWFsb2codGhpcyk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9Wb2lkUmVzdWx0LmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvVm9pZFJlc3VsdC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQ3YmNkMGMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvVm9pZFJlc3VsdC5qYXZhCkBAIC0wLDAgKzEsMjYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5KYXZhU2NyaXB0T2JqZWN0OworCitwdWJsaWMgZmluYWwgY2xhc3MgVm9pZFJlc3VsdCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3QgeworICBwcm90ZWN0ZWQgVm9pZFJlc3VsdCgpIHsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgVm9pZFJlc3VsdCBjcmVhdGUoKSB7CisgICAgcmV0dXJuIGNyZWF0ZU9iamVjdCgpLmNhc3QoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQWNjb3VudENhcGFiaWxpdGllcy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQWNjb3VudENhcGFiaWxpdGllcy5qYXZhCmluZGV4IDA1NjVkM2UuLjQyMzk5ZWUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L0FjY291bnRDYXBhYmlsaXRpZXMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9BY2NvdW50Q2FwYWJpbGl0aWVzLmphdmEKQEAgLTE2LDE2ICsxNiwxNCBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkphdmFTY3JpcHRPYmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOwogCiAvKiogQ2FwYWJpbGl0aWVzIHRoZSBjYWxsZXIgaGFzIGZyb20ge0Bjb2RlIC9hY2NvdW50cy9zZWxmL2NhcGFiaWxpdGllc30uICAqLwogcHVibGljIGNsYXNzIEFjY291bnRDYXBhYmlsaXRpZXMgZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKICAgcHVibGljIHN0YXRpYyB2b2lkIGFsbChBc3luY0NhbGxiYWNrPEFjY291bnRDYXBhYmlsaXRpZXM+IGNiLCBTdHJpbmcuLi4gZmlsdGVyKSB7Ci0gICAgUmVzdEFwaSBhcGkgPSBuZXcgUmVzdEFwaSgiL2FjY291bnRzL3NlbGYvY2FwYWJpbGl0aWVzIik7Ci0gICAgZm9yIChTdHJpbmcgbmFtZSA6IGZpbHRlcikgewotICAgICAgYXBpLmFkZFBhcmFtZXRlcigicSIsIG5hbWUpOwotICAgIH0KLSAgICBhcGkuc2VuZChjYik7CisgICAgbmV3IFJlc3RBcGkoIi9hY2NvdW50cy9zZWxmL2NhcGFiaWxpdGllcyIpCisgICAgICAuYWRkUGFyYW1ldGVyKCJxIiwgZmlsdGVyKQorICAgICAgLmdldChjYik7CiAgIH0KIAogICBwcm90ZWN0ZWQgQWNjb3VudENhcGFiaWxpdGllcygpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L0FjY291bnRDb25zdGFudHMuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L0FjY291bnRDb25zdGFudHMuamF2YQppbmRleCBkMzc0ZDM1Li5mYTJjNWZkIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9BY2NvdW50Q29uc3RhbnRzLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQWNjb3VudENvbnN0YW50cy5qYXZhCkBAIC02OSw2ICs2OSw3IEBACiAgIFN0cmluZyBzc2hLZXlTdGF0dXMoKTsKIAogICBTdHJpbmcgYWRkU3NoS2V5UGFuZWxIZWFkZXIoKTsKKyAgU3RyaW5nIGFkZFNzaEtleUhlbHBUaXRsZSgpOwogICBTdHJpbmcgYWRkU3NoS2V5SGVscCgpOwogICBTdHJpbmcgc3NoSmF2YUFwcGxldE5vdEF2YWlsYWJsZSgpOwogICBTdHJpbmcgaW52YWxpZFNzaEtleUVycm9yKCk7CkBAIC05NSw4ICs5NiwxMCBAQAogICBTdHJpbmcgd2F0Y2hlZFByb2plY3RGaWx0ZXIoKTsKICAgU3RyaW5nIHdhdGNoZWRQcm9qZWN0Q29sdW1uRW1haWxOb3RpZmljYXRpb25zKCk7CiAgIFN0cmluZyB3YXRjaGVkUHJvamVjdENvbHVtbk5ld0NoYW5nZXMoKTsKKyAgU3RyaW5nIHdhdGNoZWRQcm9qZWN0Q29sdW1uTmV3UGF0Y2hTZXRzKCk7CiAgIFN0cmluZyB3YXRjaGVkUHJvamVjdENvbHVtbkFsbENvbW1lbnRzKCk7CiAgIFN0cmluZyB3YXRjaGVkUHJvamVjdENvbHVtblN1Ym1pdHRlZENoYW5nZXMoKTsKKyAgU3RyaW5nIHdhdGNoZWRQcm9qZWN0Q29sdW1uQWJhbmRvbmVkQ2hhbmdlcygpOwogCiAgIFN0cmluZyBjb250YWN0RmllbGRGdWxsTmFtZSgpOwogICBTdHJpbmcgY29udGFjdEZpZWxkRW1haWwoKTsKQEAgLTExMCw2ICsxMTMsNyBAQAogICBTdHJpbmcgYnV0dG9uQ2FuY2VsKCk7CiAgIFN0cmluZyB0aXRsZVJlZ2lzdGVyTmV3RW1haWwoKTsKICAgU3RyaW5nIGRlc2NSZWdpc3Rlck5ld0VtYWlsKCk7CisgIFN0cmluZyBlcnJvckRpYWxvZ1RpdGxlUmVnaXN0ZXJOZXdFbWFpbCgpOwogCiAgIFN0cmluZyBuZXdBZ3JlZW1lbnQoKTsKICAgU3RyaW5nIGFncmVlbWVudFN0YXR1cygpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQWNjb3VudENvbnN0YW50cy5wcm9wZXJ0aWVzIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQWNjb3VudENvbnN0YW50cy5wcm9wZXJ0aWVzCmluZGV4IDhiMzIxNzQuLmZkNTQzNjMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L0FjY291bnRDb25zdGFudHMucHJvcGVydGllcworKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9BY2NvdW50Q29uc3RhbnRzLnByb3BlcnRpZXMKQEAgLTYwLDcgKzYwLDI3IEBACiBidXR0b25MaW5rSWRlbnRpdHkgPSBMaW5rIEFub3RoZXIgSWRlbnRpdHkKIAogYWRkU3NoS2V5UGFuZWxIZWFkZXIgPSBBZGQgU1NIIFB1YmxpYyBLZXkKLWFkZFNzaEtleUhlbHAgPSAoPGEgaHJlZj0iaHR0cDovL2hlbHAuZ2l0aHViLmNvbS9rZXktc2V0dXAtcmVkaXJlY3QiIHRhcmdldD0iX2JsYW5rIj5HaXRIdWIncyBHdWlkZSB0byBTU0ggS2V5czwvYT4pCithZGRTc2hLZXlIZWxwVGl0bGUgPSBIb3cgdG8gR2VuZXJhdGUgYW4gU1NIIEtleQorYWRkU3NoS2V5SGVscCA9IFwKKyAgPG9sPlwKKyAgICA8bGk+XAorICAgICAgRnJvbSB0aGUgVGVybWluYWwgb3IgR2l0IEJhc2gsIHJ1biA8ZW0+c3NoLWtleWdlbjwvZW0+XAorICAgIDwvbGk+XAorICAgIDxsaT5cCisgICAgICBDb25maXJtIHRoZSBkZWZhdWx0IHBhdGggPGVtPi5zc2gvaWRfcnNhPC9lbT5cCisgICAgPC9saT5cCisgICAgPGxpPlwKKyAgICAgIEVudGVyIGEgcGFzc3BocmFzZSAocmVjb21tZW5kZWQpIG9yIGxlYXZlIGl0IGJsYW5rLjxicj5cCisgICAgICBSZW1lbWJlciB0aGlzIHBhc3NwaHJhc2UsIGFzIHlvdSB3aWxsIG5lZWQgaXQgdG8gdW5sb2NrIHRoZTxicj5cCisgICAgICBrZXkgd2hlbmV2ZXIgeW91IHVzZSBpdC5cCisgICAgPC9saT5cCisgICAgPGxpPlwKKyAgICAgIE9wZW4gPGVtPn4vLnNzaC9pZF9yc2EucHViPC9lbT4gYW5kIGNvcHkgJiBwYXN0ZSB0aGUgY29udGVudHMgaW50bzxicj5cCisgICAgICB0aGUgYm94IGJlbG93LCB0aGVuIGNsaWNrIG9uICJBZGQiLjxicj5cCisgICAgICBOb3RlIHRoYXQgPGVtPmlkX3JzYS5wdWI8L2VtPiBpcyB5b3VyIHB1YmxpYyBrZXkgYW5kIGNhbiBiZSBzaGFyZWQsPGJyPlwKKyAgICAgIHdoaWxlIDxlbT5pZF9yc2E8L2VtPiBpcyB5b3VyIHByaXZhdGUga2V5IGFuZCBzaG91bGQgYmUga2VwdCBzZWNyZXQuXAorICAgIDwvbGk+XAorICA8XG9sPgogaW52YWxpZFNzaEtleUVycm9yID0gSW52YWxpZCBTU0ggS2V5CiBzc2hKYXZhQXBwbGV0Tm90QXZhaWxhYmxlID0gT3BlbiBLZXkgVW5hdmFpbGFibGU6IEphdmEgbm90IGVuYWJsZWQKIApAQCAtNzUsOCArOTUsMTAgQEAKIHdhdGNoZWRQcm9qZWN0RmlsdGVyID0gT25seSBJZgogd2F0Y2hlZFByb2plY3RDb2x1bW5FbWFpbE5vdGlmaWNhdGlvbnMgPSBFbWFpbCBOb3RpZmljYXRpb25zCiB3YXRjaGVkUHJvamVjdENvbHVtbk5ld0NoYW5nZXMgPSBOZXcgQ2hhbmdlcword2F0Y2hlZFByb2plY3RDb2x1bW5OZXdQYXRjaFNldHMgPSBOZXcgUGF0Y2ggU2V0cwogd2F0Y2hlZFByb2plY3RDb2x1bW5BbGxDb21tZW50cyA9IEFsbCBDb21tZW50cwogd2F0Y2hlZFByb2plY3RDb2x1bW5TdWJtaXR0ZWRDaGFuZ2VzID0gU3VibWl0dGVkIENoYW5nZXMKK3dhdGNoZWRQcm9qZWN0Q29sdW1uQWJhbmRvbmVkQ2hhbmdlcyA9IEFiYW5kb25lZCBDaGFuZ2VzCiAKIGNvbnRhY3RGaWVsZEZ1bGxOYW1lID0gRnVsbCBOYW1lCiBjb250YWN0RmllbGRFbWFpbCA9IFByZWZlcnJlZCBFbWFpbApAQCAtOTksNiArMTIxLDcgQEAKIGRlc2NSZWdpc3Rlck5ld0VtYWlsID0gXAogICA8cD5BIGNvbmZpcm1hdGlvbiBsaW5rIHdpbGwgYmUgc2VudCBieSBlbWFpbCB0byB0aGlzIGFkZHJlc3MuPC9wPlwKICAgPHA+WW91IG11c3QgY2xpY2sgb24gdGhlIGxpbmsgdG8gY29tcGxldGUgdGhlIHJlZ2lzdHJhdGlvbiBhbmQgbWFrZSB0aGUgYWRkcmVzcyBhdmFpbGFibGUgZm9yIHNlbGVjdGlvbi48L3A+CitlcnJvckRpYWxvZ1RpdGxlUmVnaXN0ZXJOZXdFbWFpbCA9IEVtYWlsIFJlZ2lzdHJhdGlvbiBGYWlsZWQKIAogCiBuZXdBZ3JlZW1lbnQgPSBOZXcgQ29udHJpYnV0b3IgQWdyZWVtZW50CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9BY2NvdW50SW5mby5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQWNjb3VudEluZm8uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42MDFkODA3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQWNjb3VudEluZm8uamF2YQpAQCAtMCwwICsxLDMxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFjY291bnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5KYXZhU2NyaXB0T2JqZWN0OworCitwdWJsaWMgY2xhc3MgQWNjb3VudEluZm8gZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBpbnQgX2FjY291bnRfaWQoKSAvKi17IHJldHVybiB0aGlzLl9hY2NvdW50X2lkIHx8IDA7IH0tKi87CisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIG5hbWUoKSAvKi17IHJldHVybiB0aGlzLm5hbWU7IH0tKi87CisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIGVtYWlsKCkgLyoteyByZXR1cm4gdGhpcy5lbWFpbDsgfS0qLzsKKworICBwdWJsaWMgc3RhdGljIG5hdGl2ZSBBY2NvdW50SW5mbyBjcmVhdGUoaW50IGlkLCBTdHJpbmcgbmFtZSwKKyAgICAgIFN0cmluZyBlbWFpbCkgLyoteworICAgIHJldHVybiB7J19hY2NvdW50X2lkJzogaWQsICduYW1lJzogbmFtZSwgJ2VtYWlsJzogZW1haWx9OworICB9LSovOworCisgIHByb3RlY3RlZCBBY2NvdW50SW5mbygpIHsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQ29udGFjdFBhbmVsU2hvcnQuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L0NvbnRhY3RQYW5lbFNob3J0LmphdmEKaW5kZXggNGZiZTdhMC4uZjM1YmQ0YiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvQ29udGFjdFBhbmVsU2hvcnQuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9Db250YWN0UGFuZWxTaG9ydC5qYXZhCkBAIC0xOSw2ICsxOSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuT25FZGl0RW5hYmxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuRW1haWxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQuRmllbGROYW1lOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50RXh0ZXJuYWxJZDsKQEAgLTMwMCw3ICszMDEsMTUgQEAKICAgICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoZmluYWwgVGhyb3dhYmxlIGNhdWdodCkgewogICAgICAgICAgICAgaW5FbWFpbC5zZXRFbmFibGVkKHRydWUpOwogICAgICAgICAgICAgcmVnaXN0ZXIuc2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgICAgICAgIHN1cGVyLm9uRmFpbHVyZShjYXVnaHQpOworICAgICAgICAgICAgaWYgKGNhdWdodC5nZXRNZXNzYWdlKCkuc3RhcnRzV2l0aChFbWFpbEV4Y2VwdGlvbi5NRVNTQUdFKSkgeworICAgICAgICAgICAgICBmaW5hbCBFcnJvckRpYWxvZyBkID0KKyAgICAgICAgICAgICAgICAgIG5ldyBFcnJvckRpYWxvZyhjYXVnaHQuZ2V0TWVzc2FnZSgpLnN1YnN0cmluZygKKyAgICAgICAgICAgICAgICAgICAgICBFbWFpbEV4Y2VwdGlvbi5NRVNTQUdFLmxlbmd0aCgpKSk7CisgICAgICAgICAgICAgIGQuc2V0VGV4dChVdGlsLkMuZXJyb3JEaWFsb2dUaXRsZVJlZ2lzdGVyTmV3RW1haWwoKSk7CisgICAgICAgICAgICAgIGQuY2VudGVyKCk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICBzdXBlci5vbkZhaWx1cmUoY2F1Z2h0KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICB9CiAgICAgICAgIH0pOwogICAgICAgfQpAQCAtMzM5LDcgKzM0OCw3IEBACiAKICAgdm9pZCBkb1NhdmUoZmluYWwgQXN5bmNDYWxsYmFjazxBY2NvdW50PiBvblNhdmUpIHsKICAgICBTdHJpbmcgbmV3TmFtZSA9IGNhbkVkaXRGdWxsTmFtZSgpID8gbmFtZVR4dC5nZXRUZXh0KCkgOiBudWxsOwotICAgIGlmICgiIi5lcXVhbHMobmV3TmFtZSkpIHsKKyAgICBpZiAobmV3TmFtZSAhPSBudWxsICYmIG5ld05hbWUudHJpbSgpLmlzRW1wdHkoKSkgewogICAgICAgbmV3TmFtZSA9IG51bGw7CiAgICAgfQogCkBAIC0zODMsNiArMzkyLDcgQEAKICAgICBtZS5zZXRGdWxsTmFtZShyZXN1bHQuZ2V0RnVsbE5hbWUoKSk7CiAgICAgbWUuc2V0UHJlZmVycmVkRW1haWwocmVzdWx0LmdldFByZWZlcnJlZEVtYWlsKCkpOwogICAgIEdlcnJpdC5yZWZyZXNoTWVudUJhcigpOworICAgIGRpc3BsYXkobWUpOwogICB9CiAKICAgQ29udGFjdEluZm9ybWF0aW9uIHRvQ29udGFjdEluZm9ybWF0aW9uKCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlHcm91cHNTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L015R3JvdXBzU2NyZWVuLmphdmEKaW5kZXggNmNiNzQ5ZC4uZjgzZTllYyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlHcm91cHNTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9NeUdyb3Vwc1NjcmVlbi5qYXZhCkBAIC0xNSwxMCArMTUsOCBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWNjb3VudDsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbi5Hcm91cFRhYmxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ncm91cHMuR3JvdXBMaXN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuU2NyZWVuTG9hZENhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci0KLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogcHVibGljIGNsYXNzIE15R3JvdXBzU2NyZWVuIGV4dGVuZHMgU2V0dGluZ3NTY3JlZW4gewogICBwcml2YXRlIEdyb3VwVGFibGUgZ3JvdXBzOwpAQCAtMjYsMTggKzI0LDE4IEBACiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBvbkluaXRVSSgpIHsKICAgICBzdXBlci5vbkluaXRVSSgpOwotICAgIGdyb3VwcyA9IG5ldyBHcm91cFRhYmxlKHRydWUgLyogaHlwZXJsaW5rIHRvIGFkbWluICovKTsKKyAgICBncm91cHMgPSBuZXcgR3JvdXBUYWJsZSgpOwogICAgIGFkZChncm91cHMpOwogICB9CiAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIG9uTG9hZCgpIHsKICAgICBzdXBlci5vbkxvYWQoKTsKLSAgICBVdGlsLkFDQ09VTlRfU0VDLm15R3JvdXBzKG5ldyBTY3JlZW5Mb2FkQ2FsbGJhY2s8TGlzdDxBY2NvdW50R3JvdXA+Pih0aGlzKSB7CisgICAgR3JvdXBMaXN0Lm15KG5ldyBTY3JlZW5Mb2FkQ2FsbGJhY2s8R3JvdXBMaXN0Pih0aGlzKSB7CiAgICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIHByZURpc3BsYXkoZmluYWwgTGlzdDxBY2NvdW50R3JvdXA+IHJlc3VsdCkgeworICAgICAgcHJvdGVjdGVkIHZvaWQgcHJlRGlzcGxheShHcm91cExpc3QgcmVzdWx0KSB7CiAgICAgICAgIGdyb3Vwcy5kaXNwbGF5KHJlc3VsdCk7Ci0gICAgICB9Ci0gICAgfSk7CisgICAgICAgIGdyb3Vwcy5maW5pc2hEaXNwbGF5KCk7CisgICAgICB9fSk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L015SWRlbnRpdGllc1NjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlJZGVudGl0aWVzU2NyZWVuLmphdmEKaW5kZXggODk5YWEwMy4uY2E4NzJjYyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlJZGVudGl0aWVzU2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlJZGVudGl0aWVzU2NyZWVuLmphdmEKQEAgLTE1LDE5ICsxNSwxOSBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWNjb3VudDsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmF1dGgub3BlbmlkLk9wZW5JZFNpZ25JbkRpYWxvZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC5vcGVuaWQuT3BlbklkVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuU2NyZWVuTG9hZENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5GYW5jeUZsZXhUYWJsZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5TaWduSW5Nb2RlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZC5PcGVuSWRVcmxzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50RXh0ZXJuYWxJZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXV0aFR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmxvZ2ljYWwuc2hhcmVkLlZhbHVlQ2hhbmdlRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQubG9naWNhbC5zaGFyZWQuVmFsdWVDaGFuZ2VIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50Lkhpc3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuV2luZG93LkxvY2F0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkJ1dHRvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5DaGVja0JveDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbGV4VGFibGUuRmxleENlbGxGb3JtYXR0ZXI7CkBAIC01OSwxOSArNTksMTUgQEAKICAgICB9KTsKICAgICBhZGQoZGVsZXRlSWRlbnRpdHkpOwogCi0gICAgc3dpdGNoIChHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0QXV0aFR5cGUoKSkgewotICAgICAgY2FzZSBPUEVOSUQ6IHsKLSAgICAgICAgZmluYWwgQnV0dG9uIGxpbmtJZGVudGl0eSA9IG5ldyBCdXR0b24oVXRpbC5DLmJ1dHRvbkxpbmtJZGVudGl0eSgpKTsKLSAgICAgICAgbGlua0lkZW50aXR5LmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgewotICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgIHB1YmxpYyB2b2lkIG9uQ2xpY2soZmluYWwgQ2xpY2tFdmVudCBldmVudCkgewotICAgICAgICAgICAgZmluYWwgU3RyaW5nIHRvID0gSGlzdG9yeS5nZXRUb2tlbigpOwotICAgICAgICAgICAgbmV3IE9wZW5JZFNpZ25JbkRpYWxvZyhTaWduSW5Nb2RlLkxJTktfSURFTlRJWSwgdG8sIG51bGwpLmNlbnRlcigpOwotICAgICAgICAgIH0KLSAgICAgICAgfSk7Ci0gICAgICAgIGFkZChsaW5rSWRlbnRpdHkpOwotICAgICAgICBicmVhazsKLSAgICAgIH0KKyAgICBpZiAoR2Vycml0LmdldENvbmZpZygpLmdldEF1dGhUeXBlKCkgPT0gQXV0aFR5cGUuT1BFTklEKSB7CisgICAgICBCdXR0b24gbGlua0lkZW50aXR5ID0gbmV3IEJ1dHRvbihVdGlsLkMuYnV0dG9uTGlua0lkZW50aXR5KCkpOworICAgICAgbGlua0lkZW50aXR5LmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIHZvaWQgb25DbGljayhmaW5hbCBDbGlja0V2ZW50IGV2ZW50KSB7CisgICAgICAgICAgTG9jYXRpb24uYXNzaWduKEdlcnJpdC5sb2dpblJlZGlyZWN0KEhpc3RvcnkuZ2V0VG9rZW4oKSkgKyAiP2xpbmsiKTsKKyAgICAgICAgfQorICAgICAgfSk7CisgICAgICBhZGQobGlua0lkZW50aXR5KTsKICAgICB9CiAgIH0KIApkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlQcmVmZXJlbmNlc1NjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlQcmVmZXJlbmNlc1NjcmVlbi5qYXZhCmluZGV4IGRlNmU2NjYuLmMxN2EwYWEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L015UHJlZmVyZW5jZXNTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9NeVByZWZlcmVuY2VzU2NyZWVuLmphdmEKQEAgLTIwLDEwICsyMCw5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuU2NyZWVuTG9hZENhbGxiYWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5PbkVkaXRFbmFibGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2hhbmdlRXZlbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DaGFuZ2VIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5pMThuLmNsaWVudC5EYXRlVGltZUZvcm1hdDsKQEAgLTUyLDM5ICs1MSwxNSBAQAogICBwcm90ZWN0ZWQgdm9pZCBvbkluaXRVSSgpIHsKICAgICBzdXBlci5vbkluaXRVSSgpOwogCi0gICAgZmluYWwgQ2xpY2tIYW5kbGVyIG9uQ2xpY2tTYXZlID0gbmV3IENsaWNrSGFuZGxlcigpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgb25DbGljayhmaW5hbCBDbGlja0V2ZW50IGV2ZW50KSB7Ci0gICAgICAgIHNhdmUuc2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgIH0KLSAgICB9OwotICAgIGZpbmFsIENoYW5nZUhhbmRsZXIgb25DaGFuZ2VTYXZlID0gbmV3IENoYW5nZUhhbmRsZXIoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIG9uQ2hhbmdlKGZpbmFsIENoYW5nZUV2ZW50IGV2ZW50KSB7Ci0gICAgICAgIHNhdmUuc2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgIH0KLSAgICB9OwotCiAgICAgc2hvd1NpdGVIZWFkZXIgPSBuZXcgQ2hlY2tCb3goVXRpbC5DLnNob3dTaXRlSGVhZGVyKCkpOwotICAgIHNob3dTaXRlSGVhZGVyLmFkZENsaWNrSGFuZGxlcihvbkNsaWNrU2F2ZSk7Ci0KICAgICB1c2VGbGFzaENsaXBib2FyZCA9IG5ldyBDaGVja0JveChVdGlsLkMudXNlRmxhc2hDbGlwYm9hcmQoKSk7Ci0gICAgdXNlRmxhc2hDbGlwYm9hcmQuYWRkQ2xpY2tIYW5kbGVyKG9uQ2xpY2tTYXZlKTsKLQogICAgIGNvcHlTZWxmT25FbWFpbHMgPSBuZXcgQ2hlY2tCb3goVXRpbC5DLmNvcHlTZWxmT25FbWFpbHMoKSk7Ci0gICAgY29weVNlbGZPbkVtYWlscy5hZGRDbGlja0hhbmRsZXIob25DbGlja1NhdmUpOwotCiAgICAgcmV2ZXJzZVBhdGNoU2V0T3JkZXIgPSBuZXcgQ2hlY2tCb3goVXRpbC5DLnJldmVyc2VQYXRjaFNldE9yZGVyKCkpOwotICAgIHJldmVyc2VQYXRjaFNldE9yZGVyLmFkZENsaWNrSGFuZGxlcihvbkNsaWNrU2F2ZSk7Ci0KICAgICBzaG93VXNlcm5hbWVJblJldmlld0NhdGVnb3J5ID0gbmV3IENoZWNrQm94KFV0aWwuQy5zaG93VXNlcm5hbWVJblJldmlld0NhdGVnb3J5KCkpOwotICAgIHNob3dVc2VybmFtZUluUmV2aWV3Q2F0ZWdvcnkuYWRkQ2xpY2tIYW5kbGVyKG9uQ2xpY2tTYXZlKTsKLQogICAgIG1heGltdW1QYWdlU2l6ZSA9IG5ldyBMaXN0Qm94KCk7CiAgICAgZm9yIChmaW5hbCBzaG9ydCB2IDogUEFHRVNJWkVfQ0hPSUNFUykgewogICAgICAgbWF4aW11bVBhZ2VTaXplLmFkZEl0ZW0oVXRpbC5NLnJvd3NQZXJQYWdlKHYpLCBTdHJpbmcudmFsdWVPZih2KSk7CiAgICAgfQotICAgIG1heGltdW1QYWdlU2l6ZS5hZGRDaGFuZ2VIYW5kbGVyKG9uQ2hhbmdlU2F2ZSk7CiAKICAgICBEYXRlIG5vdyA9IG5ldyBEYXRlKCk7CiAgICAgZGF0ZUZvcm1hdCA9IG5ldyBMaXN0Qm94KCk7CkBAIC05Niw3ICs3MSw2IEBACiAgICAgICByLmFwcGVuZChEYXRlVGltZUZvcm1hdC5nZXRGb3JtYXQoZm10LmdldExvbmdGb3JtYXQoKSkuZm9ybWF0KG5vdykpOwogICAgICAgZGF0ZUZvcm1hdC5hZGRJdGVtKHIudG9TdHJpbmcoKSwgZm10Lm5hbWUoKSk7CiAgICAgfQotICAgIGRhdGVGb3JtYXQuYWRkQ2hhbmdlSGFuZGxlcihvbkNoYW5nZVNhdmUpOwogCiAgICAgdGltZUZvcm1hdCA9IG5ldyBMaXN0Qm94KCk7CiAgICAgZm9yIChBY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzLlRpbWVGb3JtYXQgZm10IDogQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlcy5UaW1lRm9ybWF0CkBAIC0xMDUsNyArNzksNiBAQAogICAgICAgci5hcHBlbmQoRGF0ZVRpbWVGb3JtYXQuZ2V0Rm9ybWF0KGZtdC5nZXRGb3JtYXQoKSkuZm9ybWF0KG5vdykpOwogICAgICAgdGltZUZvcm1hdC5hZGRJdGVtKHIudG9TdHJpbmcoKSwgZm10Lm5hbWUoKSk7CiAgICAgfQotICAgIHRpbWVGb3JtYXQuYWRkQ2hhbmdlSGFuZGxlcihvbkNoYW5nZVNhdmUpOwogCiAgICAgRmxvd1BhbmVsIGRhdGVUaW1lUGFuZWwgPSBuZXcgRmxvd1BhbmVsKCk7CiAKQEAgLTE2Myw2ICsxMzYsMTYgQEAKICAgICAgIH0KICAgICB9KTsKICAgICBhZGQoc2F2ZSk7CisKKyAgICBmaW5hbCBPbkVkaXRFbmFibGVyIGUgPSBuZXcgT25FZGl0RW5hYmxlcihzYXZlKTsKKyAgICBlLmxpc3RlblRvKHNob3dTaXRlSGVhZGVyKTsKKyAgICBlLmxpc3RlblRvKHVzZUZsYXNoQ2xpcGJvYXJkKTsKKyAgICBlLmxpc3RlblRvKGNvcHlTZWxmT25FbWFpbHMpOworICAgIGUubGlzdGVuVG8ocmV2ZXJzZVBhdGNoU2V0T3JkZXIpOworICAgIGUubGlzdGVuVG8oc2hvd1VzZXJuYW1lSW5SZXZpZXdDYXRlZ29yeSk7CisgICAgZS5saXN0ZW5UbyhtYXhpbXVtUGFnZVNpemUpOworICAgIGUubGlzdGVuVG8oZGF0ZUZvcm1hdCk7CisgICAgZS5saXN0ZW5Ubyh0aW1lRm9ybWF0KTsKICAgfQogCiAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlXYXRjaGVkUHJvamVjdHNTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L015V2F0Y2hlZFByb2plY3RzU2NyZWVuLmphdmEKaW5kZXggZDM4MDE1Yy4uYTUyODkxMiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlXYXRjaGVkUHJvamVjdHNTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9NeVdhdGNoZWRQcm9qZWN0c1NjcmVlbi5qYXZhCkBAIC0zMyw2ICszMyw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxvd1BhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkdyaWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSFRNTFRhYmxlLkNlbGxGb3JtYXR0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSG9yaXpvbnRhbFBhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlN1Z2dlc3RCb3g7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuU3VnZ2VzdEJveC5EZWZhdWx0U3VnZ2VzdGlvbkRpc3BsYXk7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuU3VnZ2VzdE9yYWNsZS5TdWdnZXN0aW9uOwpAQCAtNjAsNyArNjEsMTAgQEAKICAgICBncmlkID0gbmV3IEdyaWQoMiwgMik7CiAgICAgZ3JpZC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5pbmZvQmxvY2soKSk7CiAgICAgZ3JpZC5zZXRUZXh0KDAsIDAsIFV0aWwuQy53YXRjaGVkUHJvamVjdE5hbWUoKSk7Ci0gICAgZ3JpZC5zZXRXaWRnZXQoMCwgMSwgbmFtZVR4dCk7CisgICAgZmluYWwgSG9yaXpvbnRhbFBhbmVsIGhwID0gbmV3IEhvcml6b250YWxQYW5lbCgpOworICAgIGhwLmFkZChuYW1lVHh0KTsKKyAgICBocC5hZGQoYnJvd3NlKTsKKyAgICBncmlkLnNldFdpZGdldCgwLCAxLCBocCk7CiAKICAgICBncmlkLnNldFRleHQoMSwgMCwgVXRpbC5DLndhdGNoZWRQcm9qZWN0RmlsdGVyKCkpOwogICAgIGdyaWQuc2V0V2lkZ2V0KDEsIDEsIGZpbHRlclR4dCk7CkBAIC03Niw3ICs4MCw2IEBACiAgICAgZnAuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuYWRkV2F0Y2hQYW5lbCgpKTsKICAgICBmcC5hZGQoZ3JpZCk7CiAgICAgZnAuYWRkKGFkZE5ldyk7Ci0gICAgZnAuYWRkKGJyb3dzZSk7CiAgICAgYWRkKGZwKTsKIAogCkBAIC05MCw3ICs5Myw3IEBACiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHByb3RlY3RlZCB2b2lkIG9uTW92ZVBvaW50ZXJUbyhTdHJpbmcgcHJvamVjdE5hbWUpIHsKICAgICAgICAgLy8gcHJldmVudCB1c2VyIGlucHV0IGZyb20gYmVpbmcgb3ZlcndyaXR0ZW4gYnkgc2ltcGx5IHBvcGluZyB1cAotICAgICAgICBpZiAoIXByb2plY3RzUG9wdXAuaXNQb3BpbmdVcCgpIHx8ICIiLmVxdWFscyhuYW1lQm94LmdldFRleHQoKSkpIHsKKyAgICAgICAgaWYgKCFwcm9qZWN0c1BvcHVwLmlzUG9wcGluZ1VwKCkgfHwgIiIuZXF1YWxzKG5hbWVCb3guZ2V0VGV4dCgpKSkgewogICAgICAgICAgIG5hbWVCb3guc2V0VGV4dChwcm9qZWN0TmFtZSk7CiAgICAgICAgIH0KICAgICAgIH0KQEAgLTE5Myw3ICsxOTYsNyBAQAogICB9CiAKICAgcHJvdGVjdGVkIHZvaWQgZG9BZGROZXcoKSB7Ci0gICAgZmluYWwgU3RyaW5nIHByb2plY3ROYW1lID0gbmFtZVR4dC5nZXRUZXh0KCk7CisgICAgZmluYWwgU3RyaW5nIHByb2plY3ROYW1lID0gbmFtZVR4dC5nZXRUZXh0KCkudHJpbSgpOwogICAgIGlmICgiIi5lcXVhbHMocHJvamVjdE5hbWUpKSB7CiAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlXYXRjaGVzVGFibGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L015V2F0Y2hlc1RhYmxlLmphdmEKaW5kZXggYzE1OGMyYy4uZTIyODY0NyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvTXlXYXRjaGVzVGFibGUuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWNjb3VudC9NeVdhdGNoZXNUYWJsZS5qYXZhCkBAIC01MSwxMyArNTEsMTcgQEAKICAgICBmbXQuc2V0Um93U3BhbigwLCAyLCAyKTsKICAgICBET00uc2V0RWxlbWVudFByb3BlcnR5KGZtdC5nZXRFbGVtZW50KDAsIDMpLCAiYWxpZ24iLCAiY2VudGVyIik7CiAKLSAgICBmbXQuc2V0Q29sU3BhbigwLCAzLCAzKTsKKyAgICBmbXQuc2V0Q29sU3BhbigwLCAzLCA1KTsKICAgICB0YWJsZS5zZXRUZXh0KDEsIDAsIFV0aWwuQy53YXRjaGVkUHJvamVjdENvbHVtbk5ld0NoYW5nZXMoKSk7Ci0gICAgdGFibGUuc2V0VGV4dCgxLCAxLCBVdGlsLkMud2F0Y2hlZFByb2plY3RDb2x1bW5BbGxDb21tZW50cygpKTsKLSAgICB0YWJsZS5zZXRUZXh0KDEsIDIsIFV0aWwuQy53YXRjaGVkUHJvamVjdENvbHVtblN1Ym1pdHRlZENoYW5nZXMoKSk7CisgICAgdGFibGUuc2V0VGV4dCgxLCAxLCBVdGlsLkMud2F0Y2hlZFByb2plY3RDb2x1bW5OZXdQYXRjaFNldHMoKSk7CisgICAgdGFibGUuc2V0VGV4dCgxLCAyLCBVdGlsLkMud2F0Y2hlZFByb2plY3RDb2x1bW5BbGxDb21tZW50cygpKTsKKyAgICB0YWJsZS5zZXRUZXh0KDEsIDMsIFV0aWwuQy53YXRjaGVkUHJvamVjdENvbHVtblN1Ym1pdHRlZENoYW5nZXMoKSk7CisgICAgdGFibGUuc2V0VGV4dCgxLCA0LCBVdGlsLkMud2F0Y2hlZFByb2plY3RDb2x1bW5BYmFuZG9uZWRDaGFuZ2VzKCkpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUoMSwgMCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhSGVhZGVyKCkpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUoMSwgMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhSGVhZGVyKCkpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUoMSwgMiwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhSGVhZGVyKCkpOworICAgIGZtdC5hZGRTdHlsZU5hbWUoMSwgMywgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhSGVhZGVyKCkpOworICAgIGZtdC5hZGRTdHlsZU5hbWUoMSwgNCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhSGVhZGVyKCkpOwogICB9CiAKICAgcHVibGljIHZvaWQgZGVsZXRlQ2hlY2tlZCgpIHsKQEAgLTEzNSw4ICsxMzksMTAgQEAKICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAyLCBmcCk7CiAKICAgICBhZGROb3RpZnlCdXR0b24oQWNjb3VudFByb2plY3RXYXRjaC5Ob3RpZnlUeXBlLk5FV19DSEFOR0VTLCBpbmZvLCByb3csIDMpOwotICAgIGFkZE5vdGlmeUJ1dHRvbihBY2NvdW50UHJvamVjdFdhdGNoLk5vdGlmeVR5cGUuQUxMX0NPTU1FTlRTLCBpbmZvLCByb3csIDQpOwotICAgIGFkZE5vdGlmeUJ1dHRvbihBY2NvdW50UHJvamVjdFdhdGNoLk5vdGlmeVR5cGUuU1VCTUlUVEVEX0NIQU5HRVMsIGluZm8sIHJvdywgNSk7CisgICAgYWRkTm90aWZ5QnV0dG9uKEFjY291bnRQcm9qZWN0V2F0Y2guTm90aWZ5VHlwZS5ORVdfUEFUQ0hTRVRTLCBpbmZvLCByb3csIDQpOworICAgIGFkZE5vdGlmeUJ1dHRvbihBY2NvdW50UHJvamVjdFdhdGNoLk5vdGlmeVR5cGUuQUxMX0NPTU1FTlRTLCBpbmZvLCByb3csIDUpOworICAgIGFkZE5vdGlmeUJ1dHRvbihBY2NvdW50UHJvamVjdFdhdGNoLk5vdGlmeVR5cGUuU1VCTUlUVEVEX0NIQU5HRVMsIGluZm8sIHJvdywgNik7CisgICAgYWRkTm90aWZ5QnV0dG9uKEFjY291bnRQcm9qZWN0V2F0Y2guTm90aWZ5VHlwZS5BQkFORE9ORURfQ0hBTkdFUywgaW5mbywgcm93LCA3KTsKIAogICAgIGZpbmFsIEZsZXhDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCk7CiAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuaWNvbkNlbGwoKSk7CkBAIC0xNDQsNiArMTUwLDggQEAKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgMywgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhQ2VsbCgpKTsKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgNCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhQ2VsbCgpKTsKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgNSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhQ2VsbCgpKTsKKyAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgNiwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhQ2VsbCgpKTsKKyAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgNywgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhQ2VsbCgpKTsKIAogICAgIHNldFJvd0l0ZW0ocm93LCBpbmZvKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvU3NoUGFuZWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L1NzaFBhbmVsLmphdmEKaW5kZXggNzMxMjdmMC4uYWFhZGM1ZTYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hY2NvdW50L1NzaFBhbmVsLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FjY291bnQvU3NoUGFuZWwuamF2YQpAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5FcnJvckRpYWxvZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkNvbXBsZXhEaXNjbG9zdXJlUGFuZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkZhbmN5RmxleFRhYmxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TbWFsbEhlYWRpbmc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3NoSG9zdEtleTsKQEAgLTkyLDcgKzkzLDExIEBACiAgICAgYWRkS2V5QmxvY2suc2V0VmlzaWJsZShmYWxzZSk7CiAgICAgYWRkS2V5QmxvY2suc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuYWRkU3NoS2V5UGFuZWwoKSk7CiAgICAgYWRkS2V5QmxvY2suYWRkKG5ldyBTbWFsbEhlYWRpbmcoVXRpbC5DLmFkZFNzaEtleVBhbmVsSGVhZGVyKCkpKTsKLSAgICBhZGRLZXlCbG9jay5hZGQobmV3IEhUTUwoVXRpbC5DLmFkZFNzaEtleUhlbHAoKSkpOworCisgICAgZmluYWwgQ29tcGxleERpc2Nsb3N1cmVQYW5lbCBhZGRTc2hLZXlIZWxwID0KKyAgICAgICAgbmV3IENvbXBsZXhEaXNjbG9zdXJlUGFuZWwoVXRpbC5DLmFkZFNzaEtleUhlbHBUaXRsZSgpLCBmYWxzZSk7CisgICAgYWRkU3NoS2V5SGVscC5zZXRDb250ZW50KG5ldyBIVE1MKFV0aWwuQy5hZGRTc2hLZXlIZWxwKCkpKTsKKyAgICBhZGRLZXlCbG9jay5hZGQoYWRkU3NoS2V5SGVscCk7CiAKICAgICBhZGRUeHQgPSBuZXcgTnBUZXh0QXJlYSgpOwogICAgIGFkZFR4dC5zZXRWaXNpYmxlTGluZXMoMTIpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkZEZpbGVDb21tZW50LnBuZyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZGRGaWxlQ29tbWVudC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGFlM2FlOAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZGRGaWxlQ29tbWVudC5wbmcKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FjY2Vzc1NlY3Rpb25FZGl0b3IuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BY2Nlc3NTZWN0aW9uRWRpdG9yLmphdmEKaW5kZXggYTlhYTQxOC4uMzQ0MTA0ZCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FjY2Vzc1NlY3Rpb25FZGl0b3IuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWNjZXNzU2VjdGlvbkVkaXRvci5qYXZhCkBAIC0xNiw3ICsxNiw3IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY2Vzc1NlY3Rpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlByb2plY3RBY2Nlc3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUmVmQ29uZmlnU2VjdGlvbjsKQEAgLTIyNiwxMCArMjI2LDggQEAKICAgICAgICAgYWRkUGVybWlzc2lvbih2YXJOYW1lLCBwZXJtcyk7CiAgICAgICB9CiAgICAgfSBlbHNlIGlmIChSZWZDb25maWdTZWN0aW9uLmlzVmFsaWQodmFsdWUuZ2V0TmFtZSgpKSkgewotICAgICAgZm9yIChBcHByb3ZhbFR5cGUgdCA6IEdlcnJpdC5nZXRDb25maWcoKS5nZXRBcHByb3ZhbFR5cGVzKCkKLSAgICAgICAgICAuZ2V0QXBwcm92YWxUeXBlcygpKSB7Ci0gICAgICAgIFN0cmluZyB2YXJOYW1lID0gUGVybWlzc2lvbi5MQUJFTCArIHQuZ2V0Q2F0ZWdvcnkoKS5nZXRMYWJlbE5hbWUoKTsKLSAgICAgICAgYWRkUGVybWlzc2lvbih2YXJOYW1lLCBwZXJtcyk7CisgICAgICBmb3IgKExhYmVsVHlwZSB0IDogcHJvamVjdEFjY2Vzcy5nZXRMYWJlbFR5cGVzKCkuZ2V0TGFiZWxUeXBlcygpKSB7CisgICAgICAgIGFkZFBlcm1pc3Npb24oUGVybWlzc2lvbi5MQUJFTCArIHQuZ2V0TmFtZSgpLCBwZXJtcyk7CiAgICAgICB9CiAgICAgICBmb3IgKFN0cmluZyB2YXJOYW1lIDogVXRpbC5DLnBlcm1pc3Npb25OYW1lcygpLmtleVNldCgpKSB7CiAgICAgICAgIGFkZFBlcm1pc3Npb24odmFyTmFtZSwgcGVybXMpOwpAQCAtMjg0LDcgKzI4Miw4IEBACiAgICAgQE92ZXJyaWRlCiAgICAgcHVibGljIFBlcm1pc3Npb25FZGl0b3IgY3JlYXRlKGludCBpbmRleCkgewogICAgICAgUGVybWlzc2lvbkVkaXRvciBzdWJFZGl0b3IgPQotICAgICAgICAgIG5ldyBQZXJtaXNzaW9uRWRpdG9yKHByb2plY3RBY2Nlc3MuZ2V0UHJvamVjdE5hbWUoKSwgcmVhZE9ubHksIHZhbHVlKTsKKyAgICAgICAgICBuZXcgUGVybWlzc2lvbkVkaXRvcihwcm9qZWN0QWNjZXNzLmdldFByb2plY3ROYW1lKCksIHJlYWRPbmx5LCB2YWx1ZSwKKyAgICAgICAgICAgICAgcHJvamVjdEFjY2Vzcy5nZXRMYWJlbFR5cGVzKCkpOwogICAgICAgcGVybWlzc2lvbkNvbnRhaW5lci5pbnNlcnQoc3ViRWRpdG9yLCBpbmRleCk7CiAgICAgICByZXR1cm4gc3ViRWRpdG9yOwogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BY2Nlc3NTZWN0aW9uRWRpdG9yLnVpLnhtbCBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BY2Nlc3NTZWN0aW9uRWRpdG9yLnVpLnhtbAppbmRleCA1MDFjM2ZjLi5iMzFlMDJlIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWNjZXNzU2VjdGlvbkVkaXRvci51aS54bWwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FjY2Vzc1NlY3Rpb25FZGl0b3IudWkueG1sCkBAIC0yOSw2ICsyOSw3IEBACiAgIEBldmFsIHRyaW1Db2xvciBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0LmdldFRoZW1lKCkudHJpbUNvbG9yOwogCiAgIC5wYW5lbCB7CisgICAgd2lkdGg6IDUwZW07CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BY2NvdW50R3JvdXBJbmZvU2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWNjb3VudEdyb3VwSW5mb1NjcmVlbi5qYXZhCmluZGV4IGVhN2MwNGIuLmVhODM2YzYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BY2NvdW50R3JvdXBJbmZvU2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FjY291bnRHcm91cEluZm9TY3JlZW4uamF2YQpAQCAtMTUsMjggKzE1LDI0IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbjsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LlZvaWRSZXN1bHQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lmdyb3Vwcy5Hcm91cEFwaTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZ3JvdXBzLkdyb3VwSW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5BY2NvdW50R3JvdXBTdWdnZXN0T3JhY2xlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5PbkVkaXRFbmFibGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5SUENTdWdnZXN0T3JhY2xlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TbWFsbEhlYWRpbmc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXRhaWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBPcHRpb25zOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DaGFuZ2VFdmVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNoYW5nZUhhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkJ1dHRvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5DaGVja0JveDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5MYWJlbDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5MaXN0Qm94OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlN1Z2dlc3RCb3g7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVmVydGljYWxQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmNsaXBweS5jbGllbnQuQ29weWFibGVMYWJlbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuTnBUZXh0QXJlYTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuTnBUZXh0Qm94OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uVm9pZFJlc3VsdDsKIAogcHVibGljIGNsYXNzIEFjY291bnRHcm91cEluZm9TY3JlZW4gZXh0ZW5kcyBBY2NvdW50R3JvdXBTY3JlZW4gewogICBwcml2YXRlIENvcHlhYmxlTGFiZWwgZ3JvdXBVVUlETGFiZWw7CkBAIC01MSwxNCArNDcsMTAgQEAKICAgcHJpdmF0ZSBOcFRleHRBcmVhIGRlc2NUeHQ7CiAgIHByaXZhdGUgQnV0dG9uIHNhdmVEZXNjOwogCi0gIHByaXZhdGUgTGFiZWwgdHlwZVN5c3RlbTsKLSAgcHJpdmF0ZSBMaXN0Qm94IHR5cGVTZWxlY3Q7Ci0gIHByaXZhdGUgQnV0dG9uIHNhdmVUeXBlOwotCiAgIHByaXZhdGUgQ2hlY2tCb3ggdmlzaWJsZVRvQWxsQ2hlY2tCb3g7CiAgIHByaXZhdGUgQnV0dG9uIHNhdmVHcm91cE9wdGlvbnM7CiAKLSAgcHVibGljIEFjY291bnRHcm91cEluZm9TY3JlZW4oZmluYWwgR3JvdXBEZXRhaWwgdG9TaG93LCBmaW5hbCBTdHJpbmcgdG9rZW4pIHsKKyAgcHVibGljIEFjY291bnRHcm91cEluZm9TY3JlZW4oZmluYWwgR3JvdXBJbmZvIHRvU2hvdywgZmluYWwgU3RyaW5nIHRva2VuKSB7CiAgICAgc3VwZXIodG9TaG93LCB0b2tlbik7CiAgIH0KIApAQCAtNzAsMTQgKzYyLDEyIEBACiAgICAgaW5pdE93bmVyKCk7CiAgICAgaW5pdERlc2NyaXB0aW9uKCk7CiAgICAgaW5pdEdyb3VwT3B0aW9ucygpOwotICAgIGluaXRHcm91cFR5cGUoKTsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBlbmFibGVGb3JtKGZpbmFsIGJvb2xlYW4gY2FuTW9kaWZ5KSB7CiAgICAgZ3JvdXBOYW1lVHh0LnNldEVuYWJsZWQoY2FuTW9kaWZ5KTsKICAgICBvd25lclR4dEJveC5zZXRFbmFibGVkKGNhbk1vZGlmeSk7CiAgICAgZGVzY1R4dC5zZXRFbmFibGVkKGNhbk1vZGlmeSk7Ci0gICAgdHlwZVNlbGVjdC5zZXRFbmFibGVkKGNhbk1vZGlmeSk7CiAgICAgdmlzaWJsZVRvQWxsQ2hlY2tCb3guc2V0RW5hYmxlZChjYW5Nb2RpZnkpOwogICB9CiAKQEAgLTEwNCwxMiArOTQsMTUgQEAKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIHZvaWQgb25DbGljayhmaW5hbCBDbGlja0V2ZW50IGV2ZW50KSB7CiAgICAgICAgIGZpbmFsIFN0cmluZyBuZXdOYW1lID0gZ3JvdXBOYW1lVHh0LmdldFRleHQoKS50cmltKCk7Ci0gICAgICAgIFV0aWwuR1JPVVBfU1ZDLnJlbmFtZUdyb3VwKGdldEdyb3VwSWQoKSwgbmV3TmFtZSwKLSAgICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxHcm91cERldGFpbD4oKSB7Ci0gICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBHcm91cERldGFpbCBncm91cERldGFpbCkgeworICAgICAgICBHcm91cEFwaS5yZW5hbWVHcm91cChnZXRHcm91cFVVSUQoKSwgbmV3TmFtZSwKKyAgICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuVm9pZFJlc3VsdD4oKSB7CisgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuVm9pZFJlc3VsdCByZXN1bHQpIHsKICAgICAgICAgICAgICAgICBzYXZlTmFtZS5zZXRFbmFibGVkKGZhbHNlKTsKLSAgICAgICAgICAgICAgICBzZXRQYWdlVGl0bGUoVXRpbC5NLmdyb3VwKGdyb3VwRGV0YWlsLmdyb3VwLmdldE5hbWUoKSkpOwotICAgICAgICAgICAgICAgIGRpc3BsYXkoZ3JvdXBEZXRhaWwpOworICAgICAgICAgICAgICAgIHNldFBhZ2VUaXRsZShVdGlsLk0uZ3JvdXAobmV3TmFtZSkpOworICAgICAgICAgICAgICAgIGdyb3VwTmFtZVR4dC5zZXRUZXh0KG5ld05hbWUpOworICAgICAgICAgICAgICAgIGlmIChnZXRHcm91cFVVSUQoKS5lcXVhbHMoZ2V0T3duZXJHcm91cFVVSUQoKSkpIHsKKyAgICAgICAgICAgICAgICAgIG93bmVyVHh0LnNldFRleHQobmV3TmFtZSk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9KTsKICAgICAgIH0KQEAgLTEzOSw5ICsxMzIsMTAgQEAKICAgICAgIHB1YmxpYyB2b2lkIG9uQ2xpY2soZmluYWwgQ2xpY2tFdmVudCBldmVudCkgewogICAgICAgICBmaW5hbCBTdHJpbmcgbmV3T3duZXIgPSBvd25lclR4dC5nZXRUZXh0KCkudHJpbSgpOwogICAgICAgICBpZiAobmV3T3duZXIubGVuZ3RoKCkgPiAwKSB7Ci0gICAgICAgICAgVXRpbC5HUk9VUF9TVkMuY2hhbmdlR3JvdXBPd25lcihnZXRHcm91cElkKCksIG5ld093bmVyLAotICAgICAgICAgICAgICBuZXcgR2Vycml0Q2FsbGJhY2s8Vm9pZFJlc3VsdD4oKSB7Ci0gICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIFZvaWRSZXN1bHQgcmVzdWx0KSB7CisgICAgICAgICAgR3JvdXBBcGkuc2V0R3JvdXBPd25lcihnZXRHcm91cFVVSUQoKSwgbmV3T3duZXIsCisgICAgICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxHcm91cEluZm8+KCkgeworICAgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBHcm91cEluZm8gcmVzdWx0KSB7CisgICAgICAgICAgICAgICAgICB1cGRhdGVPd25lckdyb3VwKHJlc3VsdCk7CiAgICAgICAgICAgICAgICAgICBzYXZlT3duZXIuc2V0RW5hYmxlZChmYWxzZSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICB9KTsKQEAgLTE3MCw3ICsxNjQsNyBAQAogICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKGZpbmFsIENsaWNrRXZlbnQgZXZlbnQpIHsKICAgICAgICAgZmluYWwgU3RyaW5nIHR4dCA9IGRlc2NUeHQuZ2V0VGV4dCgpLnRyaW0oKTsKLSAgICAgICAgVXRpbC5HUk9VUF9TVkMuY2hhbmdlR3JvdXBEZXNjcmlwdGlvbihnZXRHcm91cElkKCksIHR4dCwKKyAgICAgICAgR3JvdXBBcGkuc2V0R3JvdXBEZXNjcmlwdGlvbihnZXRHcm91cFVVSUQoKSwgdHh0LAogICAgICAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPFZvaWRSZXN1bHQ+KCkgewogICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoZmluYWwgVm9pZFJlc3VsdCByZXN1bHQpIHsKICAgICAgICAgICAgICAgICBzYXZlRGVzYy5zZXRFbmFibGVkKGZhbHNlKTsKQEAgLTIwMCwxMCArMTk0LDggQEAKICAgICBzYXZlR3JvdXBPcHRpb25zLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKGZpbmFsIENsaWNrRXZlbnQgZXZlbnQpIHsKLSAgICAgICAgZmluYWwgR3JvdXBPcHRpb25zIGdyb3VwT3B0aW9ucyA9Ci0gICAgICAgICAgICBuZXcgR3JvdXBPcHRpb25zKHZpc2libGVUb0FsbENoZWNrQm94LmdldFZhbHVlKCkpOwotICAgICAgICBVdGlsLkdST1VQX1NWQy5jaGFuZ2VHcm91cE9wdGlvbnMoZ2V0R3JvdXBJZCgpLCBncm91cE9wdGlvbnMsCi0gICAgICAgICAgICBuZXcgR2Vycml0Q2FsbGJhY2s8Vm9pZFJlc3VsdD4oKSB7CisgICAgICAgIEdyb3VwQXBpLnNldEdyb3VwT3B0aW9ucyhnZXRHcm91cFVVSUQoKSwKKyAgICAgICAgICAgIHZpc2libGVUb0FsbENoZWNrQm94LmdldFZhbHVlKCksIG5ldyBHZXJyaXRDYWxsYmFjazxWb2lkUmVzdWx0PigpIHsKICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIFZvaWRSZXN1bHQgcmVzdWx0KSB7CiAgICAgICAgICAgICAgICAgc2F2ZUdyb3VwT3B0aW9ucy5zZXRFbmFibGVkKGZhbHNlKTsKICAgICAgICAgICAgICAgfQpAQCAtMjE4LDExNCArMjEwLDIwIEBACiAgICAgZW5hYmxlci5saXN0ZW5Ubyh2aXNpYmxlVG9BbGxDaGVja0JveCk7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgaW5pdEdyb3VwVHlwZSgpIHsKLSAgICB0eXBlU3lzdGVtID0gbmV3IExhYmVsKFV0aWwuQy5ncm91cFR5cGVfU1lTVEVNKCkpOwotCi0gICAgdHlwZVNlbGVjdCA9IG5ldyBMaXN0Qm94KCk7Ci0gICAgdHlwZVNlbGVjdC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5ncm91cFR5cGVTZWxlY3RMaXN0Qm94KCkpOwotICAgIHR5cGVTZWxlY3QuYWRkSXRlbShVdGlsLkMuZ3JvdXBUeXBlX0lOVEVSTkFMKCksIEFjY291bnRHcm91cC5UeXBlLklOVEVSTkFMLm5hbWUoKSk7Ci0gICAgdHlwZVNlbGVjdC5hZGRDaGFuZ2VIYW5kbGVyKG5ldyBDaGFuZ2VIYW5kbGVyKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBvbkNoYW5nZShDaGFuZ2VFdmVudCBldmVudCkgewotICAgICAgICBzYXZlVHlwZS5zZXRFbmFibGVkKHRydWUpOwotICAgICAgfQotICAgIH0pOwotCi0gICAgc2F2ZVR5cGUgPSBuZXcgQnV0dG9uKFV0aWwuQy5idXR0b25DaGFuZ2VHcm91cFR5cGUoKSk7Ci0gICAgc2F2ZVR5cGUuc2V0RW5hYmxlZChmYWxzZSk7Ci0gICAgc2F2ZVR5cGUuYWRkQ2xpY2tIYW5kbGVyKG5ldyBDbGlja0hhbmRsZXIoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIG9uQ2xpY2soQ2xpY2tFdmVudCBldmVudCkgewotICAgICAgICBvblNhdmVUeXBlKCk7Ci0gICAgICB9Ci0gICAgfSk7Ci0KLSAgICBzd2l0Y2ggKEdlcnJpdC5nZXRDb25maWcoKS5nZXRBdXRoVHlwZSgpKSB7Ci0gICAgICBjYXNlIEhUVFBfTERBUDoKLSAgICAgIGNhc2UgTERBUDoKLSAgICAgIGNhc2UgTERBUF9CSU5EOgotICAgICAgY2FzZSBDTElFTlRfU1NMX0NFUlRfTERBUDoKLSAgICAgICAgYnJlYWs7Ci0gICAgICBkZWZhdWx0OgotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgZmluYWwgVmVydGljYWxQYW5lbCBmcCA9IG5ldyBWZXJ0aWNhbFBhbmVsKCk7Ci0gICAgZnAuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZ3JvdXBUeXBlUGFuZWwoKSk7Ci0gICAgZnAuYWRkKG5ldyBTbWFsbEhlYWRpbmcoVXRpbC5DLmhlYWRpbmdHcm91cFR5cGUoKSkpOwotICAgIGZwLmFkZCh0eXBlU3lzdGVtKTsKLSAgICBmcC5hZGQodHlwZVNlbGVjdCk7Ci0gICAgZnAuYWRkKHNhdmVUeXBlKTsKLSAgICBhZGQoZnApOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHNldFR5cGUoZmluYWwgQWNjb3VudEdyb3VwLlR5cGUgbmV3VHlwZSkgewotICAgIGZpbmFsIGJvb2xlYW4gc3lzdGVtID0gbmV3VHlwZSA9PSBBY2NvdW50R3JvdXAuVHlwZS5TWVNURU07Ci0KLSAgICB0eXBlU3lzdGVtLnNldFZpc2libGUoc3lzdGVtKTsKLSAgICB0eXBlU2VsZWN0LnNldFZpc2libGUoIXN5c3RlbSk7Ci0gICAgc2F2ZVR5cGUuc2V0VmlzaWJsZSghc3lzdGVtKTsKLQotICAgIGlmICghc3lzdGVtKSB7Ci0gICAgICBmb3IgKGludCBpID0gMDsgaSA8IHR5cGVTZWxlY3QuZ2V0SXRlbUNvdW50KCk7IGkrKykgewotICAgICAgICBpZiAobmV3VHlwZS5uYW1lKCkuZXF1YWxzKHR5cGVTZWxlY3QuZ2V0VmFsdWUoaSkpKSB7Ci0gICAgICAgICAgdHlwZVNlbGVjdC5zZXRTZWxlY3RlZEluZGV4KGkpOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfQotCi0gICAgc2F2ZVR5cGUuc2V0RW5hYmxlZChmYWxzZSk7Ci0KLSAgICBzZXRNZW1iZXJzVGFiVmlzaWJsZShuZXdUeXBlID09IEFjY291bnRHcm91cC5UeXBlLklOVEVSTkFMKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBvblNhdmVUeXBlKCkgewotICAgIGZpbmFsIGludCBpZHggPSB0eXBlU2VsZWN0LmdldFNlbGVjdGVkSW5kZXgoKTsKLSAgICBmaW5hbCBBY2NvdW50R3JvdXAuVHlwZSBuZXdUeXBlID0KLSAgICAgICAgQWNjb3VudEdyb3VwLlR5cGUudmFsdWVPZih0eXBlU2VsZWN0LmdldFZhbHVlKGlkeCkpOwotCi0gICAgdHlwZVNlbGVjdC5zZXRFbmFibGVkKGZhbHNlKTsKLSAgICBzYXZlVHlwZS5zZXRFbmFibGVkKGZhbHNlKTsKLQotICAgIFV0aWwuR1JPVVBfU1ZDLmNoYW5nZUdyb3VwVHlwZShnZXRHcm91cElkKCksIG5ld1R5cGUsCi0gICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxWb2lkUmVzdWx0PigpIHsKLSAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoVm9pZFJlc3VsdCByZXN1bHQpIHsKLSAgICAgICAgICAgIHR5cGVTZWxlY3Quc2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgICAgICAgIHNldFR5cGUobmV3VHlwZSk7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKLSAgICAgICAgICAgIHR5cGVTZWxlY3Quc2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgICAgICAgIHNhdmVUeXBlLnNldEVuYWJsZWQodHJ1ZSk7Ci0gICAgICAgICAgICBzdXBlci5vbkZhaWx1cmUoY2F1Z2h0KTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0pOwotICB9Ci0KICAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCB2b2lkIGRpc3BsYXkoZmluYWwgR3JvdXBEZXRhaWwgZ3JvdXBEZXRhaWwpIHsKLSAgICBmaW5hbCBBY2NvdW50R3JvdXAgZ3JvdXAgPSBncm91cERldGFpbC5ncm91cDsKKyAgcHJvdGVjdGVkIHZvaWQgZGlzcGxheShmaW5hbCBHcm91cEluZm8gZ3JvdXAsIGZpbmFsIGJvb2xlYW4gY2FuTW9kaWZ5KSB7CiAgICAgZ3JvdXBVVUlETGFiZWwuc2V0VGV4dChncm91cC5nZXRHcm91cFVVSUQoKS5nZXQoKSk7Ci0gICAgZ3JvdXBOYW1lVHh0LnNldFRleHQoZ3JvdXAuZ2V0TmFtZSgpKTsKLSAgICBpZiAoZ3JvdXBEZXRhaWwub3duZXJHcm91cCAhPSBudWxsKSB7Ci0gICAgICBvd25lclR4dC5zZXRUZXh0KGdyb3VwRGV0YWlsLm93bmVyR3JvdXAuZ2V0TmFtZSgpKTsKLSAgICB9IGVsc2UgewotICAgICAgb3duZXJUeHQuc2V0VGV4dChVdGlsLk0uZGVsZXRlZFJlZmVyZW5jZShncm91cC5nZXRPd25lckdyb3VwVVVJRCgpLmdldCgpKSk7Ci0gICAgfQotICAgIGRlc2NUeHQuc2V0VGV4dChncm91cC5nZXREZXNjcmlwdGlvbigpKTsKKyAgICBncm91cE5hbWVUeHQuc2V0VGV4dChncm91cC5uYW1lKCkpOworICAgIG93bmVyVHh0LnNldFRleHQoZ3JvdXAub3duZXIoKSAhPSBudWxsP2dyb3VwLm93bmVyKCk6VXRpbC5NLmRlbGV0ZWRSZWZlcmVuY2UoZ3JvdXAuZ2V0T3duZXJVVUlEKCkuZ2V0KCkpKTsKKyAgICBkZXNjVHh0LnNldFRleHQoZ3JvdXAuZGVzY3JpcHRpb24oKSk7CisgICAgdmlzaWJsZVRvQWxsQ2hlY2tCb3guc2V0VmFsdWUoZ3JvdXAub3B0aW9ucygpLmlzVmlzaWJsZVRvQWxsKCkpOworICAgIHNldE1lbWJlcnNUYWJWaXNpYmxlKEFjY291bnRHcm91cC5pc0ludGVybmFsR3JvdXAoZ3JvdXAuZ2V0R3JvdXBVVUlEKCkpCisgICAgICAgICYmICFBY2NvdW50R3JvdXAuaXNTeXN0ZW1Hcm91cChncm91cC5nZXRHcm91cFVVSUQoKSkpOwogCi0gICAgdmlzaWJsZVRvQWxsQ2hlY2tCb3guc2V0VmFsdWUoZ3JvdXAuaXNWaXNpYmxlVG9BbGwoKSk7Ci0KLSAgICBzZXRUeXBlKGdyb3VwLmdldFR5cGUoKSk7Ci0KLSAgICBlbmFibGVGb3JtKGdyb3VwRGV0YWlsLmNhbk1vZGlmeSk7Ci0gICAgc2F2ZU5hbWUuc2V0VmlzaWJsZShncm91cERldGFpbC5jYW5Nb2RpZnkpOwotICAgIHNhdmVPd25lci5zZXRWaXNpYmxlKGdyb3VwRGV0YWlsLmNhbk1vZGlmeSk7Ci0gICAgc2F2ZURlc2Muc2V0VmlzaWJsZShncm91cERldGFpbC5jYW5Nb2RpZnkpOwotICAgIHNhdmVHcm91cE9wdGlvbnMuc2V0VmlzaWJsZShncm91cERldGFpbC5jYW5Nb2RpZnkpOwotICAgIHNhdmVUeXBlLnNldFZpc2libGUoZ3JvdXBEZXRhaWwuY2FuTW9kaWZ5KTsKKyAgICBlbmFibGVGb3JtKGNhbk1vZGlmeSk7CisgICAgc2F2ZU5hbWUuc2V0VmlzaWJsZShjYW5Nb2RpZnkpOworICAgIHNhdmVPd25lci5zZXRWaXNpYmxlKGNhbk1vZGlmeSk7CisgICAgc2F2ZURlc2Muc2V0VmlzaWJsZShjYW5Nb2RpZnkpOworICAgIHNhdmVHcm91cE9wdGlvbnMuc2V0VmlzaWJsZShjYW5Nb2RpZnkpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWNjb3VudEdyb3VwTWVtYmVyc1NjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FjY291bnRHcm91cE1lbWJlcnNTY3JlZW4uamF2YQppbmRleCA0YzBiMWJhLi5jMjc2YTg5IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWNjb3VudEdyb3VwTWVtYmVyc1NjcmVlbi5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BY2NvdW50R3JvdXBNZW1iZXJzU2NyZWVuLmphdmEKQEAgLTE2LDM3ICsxNiwzNiBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkRpc3BhdGNoZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuVm9pZFJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWNjb3VudC5BY2NvdW50SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZ3JvdXBzLkdyb3VwQXBpOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ncm91cHMuR3JvdXBJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5BY2NvdW50R3JvdXBTdWdnZXN0T3JhY2xlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5BY2NvdW50TGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQWRkTWVtYmVyQm94OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5GYW5jeUZsZXhUYWJsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSHlwZXJsaW5rOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TbWFsbEhlYWRpbmc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm9DYWNoZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cERldGFpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cEluZm87Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBJbmZvQ2FjaGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTWVtYmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BbmNob3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQnV0dG9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkNoZWNrQm94OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsZXhUYWJsZS5GbGV4Q2VsbEZvcm1hdHRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuUGFuZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwogCitpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKK2ltcG9ydCBqYXZheC5hbm5vdGF0aW9uLk51bGxhYmxlOworCiBwdWJsaWMgY2xhc3MgQWNjb3VudEdyb3VwTWVtYmVyc1NjcmVlbiBleHRlbmRzIEFjY291bnRHcm91cFNjcmVlbiB7CiAKLSAgcHJpdmF0ZSBBY2NvdW50SW5mb0NhY2hlIGFjY291bnRzID0gQWNjb3VudEluZm9DYWNoZS5lbXB0eSgpOwotICBwcml2YXRlIEdyb3VwSW5mb0NhY2hlIGdyb3VwcyA9IEdyb3VwSW5mb0NhY2hlLmVtcHR5KCk7CiAgIHByaXZhdGUgTWVtYmVyVGFibGUgbWVtYmVyczsKICAgcHJpdmF0ZSBJbmNsdWRlVGFibGUgaW5jbHVkZXM7CiAKQEAgLTYwLDcgKzU5LDcgQEAKIAogICBwcml2YXRlIEZsb3dQYW5lbCBub01lbWJlcnNJbmZvOwogCi0gIHB1YmxpYyBBY2NvdW50R3JvdXBNZW1iZXJzU2NyZWVuKGZpbmFsIEdyb3VwRGV0YWlsIHRvU2hvdywgZmluYWwgU3RyaW5nIHRva2VuKSB7CisgIHB1YmxpYyBBY2NvdW50R3JvdXBNZW1iZXJzU2NyZWVuKGZpbmFsIEdyb3VwSW5mbyB0b1Nob3csIGZpbmFsIFN0cmluZyB0b2tlbikgewogICAgIHN1cGVyKHRvU2hvdywgdG9rZW4pOwogICB9CiAKQEAgLTExMSw4ICsxMTAsOCBAQAogCiAgIHByaXZhdGUgdm9pZCBpbml0SW5jbHVkZUxpc3QoKSB7CiAgICAgYWRkSW5jbHVkZUJveCA9Ci0gICAgICBuZXcgQWRkTWVtYmVyQm94KFV0aWwuQy5idXR0b25BZGRJbmNsdWRlZEdyb3VwKCksCi0gICAgICAgICAgVXRpbC5DLmRlZmF1bHRBY2NvdW50R3JvdXBOYW1lKCksIG5ldyBBY2NvdW50R3JvdXBTdWdnZXN0T3JhY2xlKCkpOworICAgICAgICBuZXcgQWRkTWVtYmVyQm94KFV0aWwuQy5idXR0b25BZGRJbmNsdWRlZEdyb3VwKCksCisgICAgICAgICAgICBVdGlsLkMuZGVmYXVsdEFjY291bnRHcm91cE5hbWUoKSwgbmV3IEFjY291bnRHcm91cFN1Z2dlc3RPcmFjbGUoKSk7CiAKICAgICBhZGRJbmNsdWRlQm94LmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgewogICAgICAgQE92ZXJyaWRlCkBAIC0xNDgsMjQgKzE0NywyMCBAQAogICB9CiAKICAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCB2b2lkIGRpc3BsYXkoZmluYWwgR3JvdXBEZXRhaWwgZ3JvdXBEZXRhaWwpIHsKLSAgICBzd2l0Y2ggKGdyb3VwRGV0YWlsLmdyb3VwLmdldFR5cGUoKSkgewotICAgICAgY2FzZSBJTlRFUk5BTDoKLSAgICAgICAgYWNjb3VudHMgPSBncm91cERldGFpbC5hY2NvdW50czsKLSAgICAgICAgZ3JvdXBzID0gZ3JvdXBEZXRhaWwuZ3JvdXBzOwotICAgICAgICBtZW1iZXJzLmRpc3BsYXkoZ3JvdXBEZXRhaWwubWVtYmVycyk7Ci0gICAgICAgIGluY2x1ZGVzLmRpc3BsYXkoZ3JvdXBEZXRhaWwuaW5jbHVkZXMpOwotICAgICAgICBicmVhazsKLSAgICAgIGRlZmF1bHQ6Ci0gICAgICAgIG1lbWJlclBhbmVsLnNldFZpc2libGUoZmFsc2UpOwotICAgICAgICBpbmNsdWRlUGFuZWwuc2V0VmlzaWJsZShmYWxzZSk7Ci0gICAgICAgIG5vTWVtYmVyc0luZm8uc2V0VmlzaWJsZSh0cnVlKTsKLSAgICAgICAgYnJlYWs7CisgIHByb3RlY3RlZCB2b2lkIGRpc3BsYXkoZmluYWwgR3JvdXBJbmZvIGdyb3VwLCBmaW5hbCBib29sZWFuIGNhbk1vZGlmeSkgeworICAgIGlmIChBY2NvdW50R3JvdXAuaXNJbnRlcm5hbEdyb3VwKGdyb3VwLmdldEdyb3VwVVVJRCgpKQorICAgICAgICAmJiAhQWNjb3VudEdyb3VwLmlzU3lzdGVtR3JvdXAoZ3JvdXAuZ2V0R3JvdXBVVUlEKCkpKSB7CisgICAgICBtZW1iZXJzLmRpc3BsYXkoTmF0aXZlcy5hc0xpc3QoZ3JvdXAubWVtYmVycygpKSk7CisgICAgICBpbmNsdWRlcy5kaXNwbGF5KE5hdGl2ZXMuYXNMaXN0KGdyb3VwLmluY2x1ZGVzKCkpKTsKKyAgICB9IGVsc2UgeworICAgICAgbWVtYmVyUGFuZWwuc2V0VmlzaWJsZShmYWxzZSk7CisgICAgICBpbmNsdWRlUGFuZWwuc2V0VmlzaWJsZShmYWxzZSk7CisgICAgICBub01lbWJlcnNJbmZvLnNldFZpc2libGUodHJ1ZSk7CiAgICAgfQogCi0gICAgZW5hYmxlRm9ybShncm91cERldGFpbC5jYW5Nb2RpZnkpOwotICAgIGRlbE1lbWJlci5zZXRWaXNpYmxlKGdyb3VwRGV0YWlsLmNhbk1vZGlmeSk7Ci0gICAgZGVsSW5jbHVkZS5zZXRWaXNpYmxlKGdyb3VwRGV0YWlsLmNhbk1vZGlmeSk7CisgICAgZW5hYmxlRm9ybShjYW5Nb2RpZnkpOworICAgIGRlbE1lbWJlci5zZXRWaXNpYmxlKGNhbk1vZGlmeSk7CisgICAgZGVsSW5jbHVkZS5zZXRWaXNpYmxlKGNhbk1vZGlmeSk7CiAgIH0KIAogICB2b2lkIGRvQWRkTmV3TWVtYmVyKCkgewpAQCAtMTc1LDE1ICsxNzAsMTIgQEAKICAgICB9CiAKICAgICBhZGRNZW1iZXJCb3guc2V0RW5hYmxlZChmYWxzZSk7Ci0gICAgVXRpbC5HUk9VUF9TVkMuYWRkR3JvdXBNZW1iZXIoZ2V0R3JvdXBJZCgpLCBuYW1lRW1haWwsCi0gICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxHcm91cERldGFpbD4oKSB7Ci0gICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIEdyb3VwRGV0YWlsIHJlc3VsdCkgeworICAgIEdyb3VwQXBpLmFkZE1lbWJlcihnZXRHcm91cFVVSUQoKSwgbmFtZUVtYWlsLAorICAgICAgICBuZXcgR2Vycml0Q2FsbGJhY2s8QWNjb3VudEluZm8+KCkgeworICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBBY2NvdW50SW5mbyBtZW1iZXJJbmZvKSB7CiAgICAgICAgICAgICBhZGRNZW1iZXJCb3guc2V0RW5hYmxlZCh0cnVlKTsKICAgICAgICAgICAgIGFkZE1lbWJlckJveC5zZXRUZXh0KCIiKTsKLSAgICAgICAgICAgIGlmIChyZXN1bHQuYWNjb3VudHMgIT0gbnVsbCAmJiByZXN1bHQubWVtYmVycyAhPSBudWxsKSB7Ci0gICAgICAgICAgICAgIGFjY291bnRzLm1lcmdlKHJlc3VsdC5hY2NvdW50cyk7Ci0gICAgICAgICAgICAgIG1lbWJlcnMuZGlzcGxheShyZXN1bHQubWVtYmVycyk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBtZW1iZXJzLmluc2VydChtZW1iZXJJbmZvKTsKICAgICAgICAgICB9CiAKICAgICAgICAgICBAT3ZlcnJpZGUKQEAgLTIwMSwxNSArMTkzLDEyIEBACiAgICAgfQogCiAgICAgYWRkSW5jbHVkZUJveC5zZXRFbmFibGVkKGZhbHNlKTsKLSAgICBVdGlsLkdST1VQX1NWQy5hZGRHcm91cEluY2x1ZGUoZ2V0R3JvdXBJZCgpLCBncm91cE5hbWUsCi0gICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxHcm91cERldGFpbD4oKSB7Ci0gICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIEdyb3VwRGV0YWlsIHJlc3VsdCkgeworICAgIEdyb3VwQXBpLmFkZEluY2x1ZGVkR3JvdXAoZ2V0R3JvdXBVVUlEKCksIGdyb3VwTmFtZSwKKyAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPEdyb3VwSW5mbz4oKSB7CisgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIEdyb3VwSW5mbyByZXN1bHQpIHsKICAgICAgICAgICAgIGFkZEluY2x1ZGVCb3guc2V0RW5hYmxlZCh0cnVlKTsKICAgICAgICAgICAgIGFkZEluY2x1ZGVCb3guc2V0VGV4dCgiIik7Ci0gICAgICAgICAgICBpZiAocmVzdWx0Lmdyb3VwcyAhPSBudWxsICYmIHJlc3VsdC5pbmNsdWRlcyAhPSBudWxsKSB7Ci0gICAgICAgICAgICAgIGdyb3Vwcy5tZXJnZShyZXN1bHQuZ3JvdXBzKTsKLSAgICAgICAgICAgICAgaW5jbHVkZXMuZGlzcGxheShyZXN1bHQuaW5jbHVkZXMpOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgaW5jbHVkZXMuaW5zZXJ0KHJlc3VsdCk7CiAgICAgICAgICAgfQogCiAgICAgICAgICAgQE92ZXJyaWRlCkBAIC0yMjAsNyArMjA5LDcgQEAKICAgICAgICAgfSk7CiAgIH0KIAotICBwcml2YXRlIGNsYXNzIE1lbWJlclRhYmxlIGV4dGVuZHMgRmFuY3lGbGV4VGFibGU8QWNjb3VudEdyb3VwTWVtYmVyPiB7CisgIHByaXZhdGUgY2xhc3MgTWVtYmVyVGFibGUgZXh0ZW5kcyBGYW5jeUZsZXhUYWJsZTxBY2NvdW50SW5mbz4gewogICAgIHByaXZhdGUgYm9vbGVhbiBlbmFibGVkID0gdHJ1ZTsKIAogICAgIE1lbWJlclRhYmxlKCkgewpAQCAtMjM2LDI5ICsyMjUsMjggQEAKICAgICB2b2lkIHNldEVuYWJsZWQoZmluYWwgYm9vbGVhbiBlbmFibGVkKSB7CiAgICAgICB0aGlzLmVuYWJsZWQgPSBlbmFibGVkOwogICAgICAgZm9yIChpbnQgcm93ID0gMTsgcm93IDwgdGFibGUuZ2V0Um93Q291bnQoKTsgcm93KyspIHsKLSAgICAgICAgZmluYWwgQWNjb3VudEdyb3VwTWVtYmVyIGsgPSBnZXRSb3dJdGVtKHJvdyk7Ci0gICAgICAgIGlmIChrICE9IG51bGwpIHsKKyAgICAgICAgZmluYWwgQWNjb3VudEluZm8gaSA9IGdldFJvd0l0ZW0ocm93KTsKKyAgICAgICAgaWYgKGkgIT0gbnVsbCkgewogICAgICAgICAgICgoQ2hlY2tCb3gpIHRhYmxlLmdldFdpZGdldChyb3csIDEpKS5zZXRFbmFibGVkKGVuYWJsZWQpOwogICAgICAgICB9CiAgICAgICB9CiAgICAgfQogCiAgICAgdm9pZCBkZWxldGVDaGVja2VkKCkgewotICAgICAgZmluYWwgSGFzaFNldDxBY2NvdW50R3JvdXBNZW1iZXIuS2V5PiBpZHMgPQotICAgICAgICAgIG5ldyBIYXNoU2V0PEFjY291bnRHcm91cE1lbWJlci5LZXk+KCk7CisgICAgICBmaW5hbCBIYXNoU2V0PEludGVnZXI+IGlkcyA9IG5ldyBIYXNoU2V0PEludGVnZXI+KCk7CiAgICAgICBmb3IgKGludCByb3cgPSAxOyByb3cgPCB0YWJsZS5nZXRSb3dDb3VudCgpOyByb3crKykgewotICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXBNZW1iZXIgayA9IGdldFJvd0l0ZW0ocm93KTsKLSAgICAgICAgaWYgKGsgIT0gbnVsbCAmJiAoKENoZWNrQm94KSB0YWJsZS5nZXRXaWRnZXQocm93LCAxKSkuZ2V0VmFsdWUoKSkgewotICAgICAgICAgIGlkcy5hZGQoay5nZXRLZXkoKSk7CisgICAgICAgIGZpbmFsIEFjY291bnRJbmZvIGkgPSBnZXRSb3dJdGVtKHJvdyk7CisgICAgICAgIGlmIChpICE9IG51bGwgJiYgKChDaGVja0JveCkgdGFibGUuZ2V0V2lkZ2V0KHJvdywgMSkpLmdldFZhbHVlKCkpIHsKKyAgICAgICAgICBpZHMuYWRkKGkuX2FjY291bnRfaWQoKSk7CiAgICAgICAgIH0KICAgICAgIH0KICAgICAgIGlmICghaWRzLmlzRW1wdHkoKSkgewotICAgICAgICBVdGlsLkdST1VQX1NWQy5kZWxldGVHcm91cE1lbWJlcnMoZ2V0R3JvdXBJZCgpLCBpZHMsCisgICAgICAgIEdyb3VwQXBpLnJlbW92ZU1lbWJlcnMoZ2V0R3JvdXBVVUlEKCksIGlkcywKICAgICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxWb2lkUmVzdWx0PigpIHsKICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIFZvaWRSZXN1bHQgcmVzdWx0KSB7CiAgICAgICAgICAgICAgICAgZm9yIChpbnQgcm93ID0gMTsgcm93IDwgdGFibGUuZ2V0Um93Q291bnQoKTspIHsKLSAgICAgICAgICAgICAgICAgIGZpbmFsIEFjY291bnRHcm91cE1lbWJlciBrID0gZ2V0Um93SXRlbShyb3cpOwotICAgICAgICAgICAgICAgICAgaWYgKGsgIT0gbnVsbCAmJiBpZHMuY29udGFpbnMoay5nZXRLZXkoKSkpIHsKKyAgICAgICAgICAgICAgICAgIGZpbmFsIEFjY291bnRJbmZvIGkgPSBnZXRSb3dJdGVtKHJvdyk7CisgICAgICAgICAgICAgICAgICBpZiAoaSAhPSBudWxsICYmIGlkcy5jb250YWlucyhpLl9hY2NvdW50X2lkKCkpKSB7CiAgICAgICAgICAgICAgICAgICAgIHRhYmxlLnJlbW92ZVJvdyhyb3cpOwogICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgcm93Kys7CkBAIC0yNjksMzYgKzI1Nyw4MCBAQAogICAgICAgfQogICAgIH0KIAotICAgIHZvaWQgZGlzcGxheShmaW5hbCBMaXN0PEFjY291bnRHcm91cE1lbWJlcj4gcmVzdWx0KSB7CisgICAgdm9pZCBkaXNwbGF5KGZpbmFsIExpc3Q8QWNjb3VudEluZm8+IHJlc3VsdCkgewogICAgICAgd2hpbGUgKDEgPCB0YWJsZS5nZXRSb3dDb3VudCgpKQogICAgICAgICB0YWJsZS5yZW1vdmVSb3codGFibGUuZ2V0Um93Q291bnQoKSAtIDEpOwogCi0gICAgICBmb3IgKGZpbmFsIEFjY291bnRHcm91cE1lbWJlciBrIDogcmVzdWx0KSB7CisgICAgICBmb3IgKGZpbmFsIEFjY291bnRJbmZvIGkgOiByZXN1bHQpIHsKICAgICAgICAgZmluYWwgaW50IHJvdyA9IHRhYmxlLmdldFJvd0NvdW50KCk7CiAgICAgICAgIHRhYmxlLmluc2VydFJvdyhyb3cpOwogICAgICAgICBhcHBseURhdGFSb3dTdHlsZShyb3cpOwotICAgICAgICBwb3B1bGF0ZShyb3csIGspOworICAgICAgICBwb3B1bGF0ZShyb3csIGkpOwogICAgICAgfQogICAgIH0KIAotICAgIHZvaWQgcG9wdWxhdGUoZmluYWwgaW50IHJvdywgZmluYWwgQWNjb3VudEdyb3VwTWVtYmVyIGspIHsKLSAgICAgIGZpbmFsIEFjY291bnQuSWQgYWNjb3VudElkID0gay5nZXRBY2NvdW50SWQoKTsKKyAgICB2b2lkIGluc2VydChBY2NvdW50SW5mbyBpbmZvKSB7CisgICAgICBDb21wYXJhdG9yPEFjY291bnRJbmZvPiBjID0gbmV3IENvbXBhcmF0b3I8QWNjb3VudEluZm8+KCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIGludCBjb21wYXJlKEFjY291bnRJbmZvIGEsIEFjY291bnRJbmZvIGIpIHsKKyAgICAgICAgICBpbnQgY21wID0gbnVsbFRvRW1wdHkoYS5uYW1lKCkpLmNvbXBhcmVUbyhudWxsVG9FbXB0eShiLm5hbWUoKSkpOworICAgICAgICAgIGlmIChjbXAgIT0gMCkgeworICAgICAgICAgICAgcmV0dXJuIGNtcDsKKyAgICAgICAgICB9CisKKyAgICAgICAgICBjbXAgPSBudWxsVG9FbXB0eShhLmVtYWlsKCkpLmNvbXBhcmVUbyhudWxsVG9FbXB0eShiLmVtYWlsKCkpKTsKKyAgICAgICAgICBpZiAoY21wICE9IDApIHsKKyAgICAgICAgICAgIHJldHVybiBjbXA7CisgICAgICAgICAgfQorCisgICAgICAgICAgcmV0dXJuIGEuX2FjY291bnRfaWQoKSAtIGIuX2FjY291bnRfaWQoKTsKKyAgICAgICAgfQorCisgICAgICAgIHB1YmxpYyBTdHJpbmcgbnVsbFRvRW1wdHkoU3RyaW5nIHN0cikgeworICAgICAgICAgIHJldHVybiBzdHIgPT0gbnVsbCA/ICIiIDogc3RyOworICAgICAgICB9CisgICAgICB9OworICAgICAgaW50IGluc2VydFBvc2l0aW9uID0gdGFibGUuZ2V0Um93Q291bnQoKTsKKyAgICAgIGludCBsZWZ0ID0gMTsKKyAgICAgIGludCByaWdodCA9IHRhYmxlLmdldFJvd0NvdW50KCkgLSAxOworICAgICAgd2hpbGUgKGxlZnQgPD0gcmlnaHQpIHsKKyAgICAgICAgaW50IG1pZGRsZSA9IChsZWZ0ICsgcmlnaHQpID4+PiAxOyAvLyAobGVmdCtyaWdodCkvMgorICAgICAgICBBY2NvdW50SW5mbyBpID0gZ2V0Um93SXRlbShtaWRkbGUpOworICAgICAgICBpbnQgY21wID0gYy5jb21wYXJlKGksIGluZm8pOworCisgICAgICAgIGlmIChjbXAgPCAwKSB7CisgICAgICAgICAgbGVmdCA9IG1pZGRsZSArIDE7CisgICAgICAgIH0gZWxzZSBpZiAoY21wID4gMCkgeworICAgICAgICAgIHJpZ2h0ID0gbWlkZGxlIC0gMTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAvLyBncm91cCBpcyBhbHJlYWR5IGNvbnRhaW5lZCBpbiB0aGUgdGFibGUKKyAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIGluc2VydFBvc2l0aW9uID0gbGVmdDsKKworICAgICAgdGFibGUuaW5zZXJ0Um93KGluc2VydFBvc2l0aW9uKTsKKyAgICAgIGFwcGx5RGF0YVJvd1N0eWxlKGluc2VydFBvc2l0aW9uKTsKKyAgICAgIHBvcHVsYXRlKGluc2VydFBvc2l0aW9uLCBpbmZvKTsKKyAgICB9CisKKyAgICB2b2lkIHBvcHVsYXRlKGZpbmFsIGludCByb3csIGZpbmFsIEFjY291bnRJbmZvIGkpIHsKICAgICAgIENoZWNrQm94IGNoZWNrQm94ID0gbmV3IENoZWNrQm94KCk7CiAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAxLCBjaGVja0JveCk7CiAgICAgICBjaGVja0JveC5zZXRFbmFibGVkKGVuYWJsZWQpOwotICAgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgMiwgQWNjb3VudExpbmsubGluayhhY2NvdW50cywgYWNjb3VudElkKSk7Ci0gICAgICB0YWJsZS5zZXRUZXh0KHJvdywgMywgYWNjb3VudHMuZ2V0KGFjY291bnRJZCkuZ2V0UHJlZmVycmVkRW1haWwoKSk7CisgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAyLCBuZXcgQWNjb3VudExpbmsoaSkpOworICAgICAgdGFibGUuc2V0VGV4dChyb3csIDMsIGkuZW1haWwoKSk7CiAKICAgICAgIGZpbmFsIEZsZXhDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCk7CiAgICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5pY29uQ2VsbCgpKTsKICAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCAyLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRhdGFDZWxsKCkpOwogICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDMsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CiAKLSAgICAgIHNldFJvd0l0ZW0ocm93LCBrKTsKKyAgICAgIHNldFJvd0l0ZW0ocm93LCBpKTsKICAgICB9CiAgIH0KIAotICBwcml2YXRlIGNsYXNzIEluY2x1ZGVUYWJsZSBleHRlbmRzIEZhbmN5RmxleFRhYmxlPEFjY291bnRHcm91cEluY2x1ZGU+IHsKKyAgcHJpdmF0ZSBjbGFzcyBJbmNsdWRlVGFibGUgZXh0ZW5kcyBGYW5jeUZsZXhUYWJsZTxHcm91cEluZm8+IHsKICAgICBwcml2YXRlIGJvb2xlYW4gZW5hYmxlZCA9IHRydWU7CiAKICAgICBJbmNsdWRlVGFibGUoKSB7CkBAIC0zMTQsMjkgKzM0NiwyOCBAQAogICAgIHZvaWQgc2V0RW5hYmxlZChmaW5hbCBib29sZWFuIGVuYWJsZWQpIHsKICAgICAgIHRoaXMuZW5hYmxlZCA9IGVuYWJsZWQ7CiAgICAgICBmb3IgKGludCByb3cgPSAxOyByb3cgPCB0YWJsZS5nZXRSb3dDb3VudCgpOyByb3crKykgewotICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlIGsgPSBnZXRSb3dJdGVtKHJvdyk7Ci0gICAgICAgIGlmIChrICE9IG51bGwpIHsKKyAgICAgICAgZmluYWwgR3JvdXBJbmZvIGkgPSBnZXRSb3dJdGVtKHJvdyk7CisgICAgICAgIGlmIChpICE9IG51bGwpIHsKICAgICAgICAgICAoKENoZWNrQm94KSB0YWJsZS5nZXRXaWRnZXQocm93LCAxKSkuc2V0RW5hYmxlZChlbmFibGVkKTsKICAgICAgICAgfQogICAgICAgfQogICAgIH0KIAogICAgIHZvaWQgZGVsZXRlQ2hlY2tlZCgpIHsKLSAgICAgIGZpbmFsIEhhc2hTZXQ8QWNjb3VudEdyb3VwSW5jbHVkZS5LZXk+IGtleXMgPQotICAgICAgICAgIG5ldyBIYXNoU2V0PEFjY291bnRHcm91cEluY2x1ZGUuS2V5PigpOworICAgICAgZmluYWwgSGFzaFNldDxBY2NvdW50R3JvdXAuVVVJRD4gaWRzID0gbmV3IEhhc2hTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+KCk7CiAgICAgICBmb3IgKGludCByb3cgPSAxOyByb3cgPCB0YWJsZS5nZXRSb3dDb3VudCgpOyByb3crKykgewotICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlIGsgPSBnZXRSb3dJdGVtKHJvdyk7Ci0gICAgICAgIGlmIChrICE9IG51bGwgJiYgKChDaGVja0JveCkgdGFibGUuZ2V0V2lkZ2V0KHJvdywgMSkpLmdldFZhbHVlKCkpIHsKLSAgICAgICAgICBrZXlzLmFkZChrLmdldEtleSgpKTsKKyAgICAgICAgZmluYWwgR3JvdXBJbmZvIGkgPSBnZXRSb3dJdGVtKHJvdyk7CisgICAgICAgIGlmIChpICE9IG51bGwgJiYgKChDaGVja0JveCkgdGFibGUuZ2V0V2lkZ2V0KHJvdywgMSkpLmdldFZhbHVlKCkpIHsKKyAgICAgICAgICBpZHMuYWRkKGkuZ2V0R3JvdXBVVUlEKCkpOwogICAgICAgICB9CiAgICAgICB9Ci0gICAgICBpZiAoIWtleXMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIFV0aWwuR1JPVVBfU1ZDLmRlbGV0ZUdyb3VwSW5jbHVkZXMoZ2V0R3JvdXBJZCgpLCBrZXlzLAorICAgICAgaWYgKCFpZHMuaXNFbXB0eSgpKSB7CisgICAgICAgIEdyb3VwQXBpLnJlbW92ZUluY2x1ZGVkR3JvdXBzKGdldEdyb3VwVVVJRCgpLCBpZHMsCiAgICAgICAgICAgICBuZXcgR2Vycml0Q2FsbGJhY2s8Vm9pZFJlc3VsdD4oKSB7CiAgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBWb2lkUmVzdWx0IHJlc3VsdCkgewogICAgICAgICAgICAgICAgIGZvciAoaW50IHJvdyA9IDE7IHJvdyA8IHRhYmxlLmdldFJvd0NvdW50KCk7KSB7Ci0gICAgICAgICAgICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlIGsgPSBnZXRSb3dJdGVtKHJvdyk7Ci0gICAgICAgICAgICAgICAgICBpZiAoayAhPSBudWxsICYmIGtleXMuY29udGFpbnMoay5nZXRLZXkoKSkpIHsKKyAgICAgICAgICAgICAgICAgIGZpbmFsIEdyb3VwSW5mbyBpID0gZ2V0Um93SXRlbShyb3cpOworICAgICAgICAgICAgICAgICAgaWYgKGkgIT0gbnVsbCAmJiBpZHMuY29udGFpbnMoaS5nZXRHcm91cFVVSUQoKSkpIHsKICAgICAgICAgICAgICAgICAgICAgdGFibGUucmVtb3ZlUm93KHJvdyk7CiAgICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICByb3crKzsKQEAgLTM0NywzNCArMzc4LDg3IEBACiAgICAgICB9CiAgICAgfQogCi0gICAgdm9pZCBkaXNwbGF5KGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZT4gcmVzdWx0KSB7CisgICAgdm9pZCBkaXNwbGF5KExpc3Q8R3JvdXBJbmZvPiBsaXN0KSB7CiAgICAgICB3aGlsZSAoMSA8IHRhYmxlLmdldFJvd0NvdW50KCkpCiAgICAgICAgIHRhYmxlLnJlbW92ZVJvdyh0YWJsZS5nZXRSb3dDb3VudCgpIC0gMSk7CiAKLSAgICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwSW5jbHVkZSBrIDogcmVzdWx0KSB7CisgICAgICBmb3IgKGZpbmFsIEdyb3VwSW5mbyBpIDogbGlzdCkgewogICAgICAgICBmaW5hbCBpbnQgcm93ID0gdGFibGUuZ2V0Um93Q291bnQoKTsKICAgICAgICAgdGFibGUuaW5zZXJ0Um93KHJvdyk7CiAgICAgICAgIGFwcGx5RGF0YVJvd1N0eWxlKHJvdyk7Ci0gICAgICAgIHBvcHVsYXRlKHJvdywgayk7CisgICAgICAgIHBvcHVsYXRlKHJvdywgaSk7CiAgICAgICB9CiAgICAgfQogCi0gICAgdm9pZCBwb3B1bGF0ZShmaW5hbCBpbnQgcm93LCBmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlIGspIHsKLSAgICAgIEFjY291bnRHcm91cC5JZCBpZCA9IGsuZ2V0SW5jbHVkZUlkKCk7Ci0gICAgICBHcm91cEluZm8gZ3JvdXAgPSBncm91cHMuZ2V0KGlkKTsKKyAgICB2b2lkIGluc2VydChHcm91cEluZm8gaW5mbykgeworICAgICAgQ29tcGFyYXRvcjxHcm91cEluZm8+IGMgPSBuZXcgQ29tcGFyYXRvcjxHcm91cEluZm8+KCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIGludCBjb21wYXJlKEdyb3VwSW5mbyBhLCBHcm91cEluZm8gYikgeworICAgICAgICAgIGludCBjbXAgPSBudWxsVG9FbXB0eShhLm5hbWUoKSkuY29tcGFyZVRvKG51bGxUb0VtcHR5KGIubmFtZSgpKSk7CisgICAgICAgICAgaWYgKGNtcCAhPSAwKSB7CisgICAgICAgICAgICByZXR1cm4gY21wOworICAgICAgICAgIH0KKyAgICAgICAgICByZXR1cm4gYS5nZXRHcm91cFVVSUQoKS5jb21wYXJlVG8oYi5nZXRHcm91cFVVSUQoKSk7CisgICAgICAgIH0KKworICAgICAgICBwcml2YXRlIFN0cmluZyBudWxsVG9FbXB0eShATnVsbGFibGUgU3RyaW5nIHN0cikgeworICAgICAgICAgIHJldHVybiAoc3RyID09IG51bGwpID8gIiIgOiBzdHI7CisgICAgICAgIH0KKyAgICAgIH07CisKKyAgICAgIGludCBpbnNlcnRQb3NpdGlvbiA9IHRhYmxlLmdldFJvd0NvdW50KCk7CisgICAgICBpbnQgbGVmdCA9IDE7CisgICAgICBpbnQgcmlnaHQgPSB0YWJsZS5nZXRSb3dDb3VudCgpIC0gMTsKKyAgICAgIHdoaWxlIChsZWZ0IDw9IHJpZ2h0KSB7CisgICAgICAgIGludCBtaWRkbGUgPSAobGVmdCArIHJpZ2h0KSA+Pj4gMTsgLy8gKGxlZnQrcmlnaHQpLzIKKyAgICAgICAgR3JvdXBJbmZvIGkgPSBnZXRSb3dJdGVtKG1pZGRsZSk7CisgICAgICAgIGludCBjbXAgPSBjLmNvbXBhcmUoaSwgaW5mbyk7CisKKyAgICAgICAgaWYgKGNtcCA8IDApIHsKKyAgICAgICAgICBsZWZ0ID0gbWlkZGxlICsgMTsKKyAgICAgICAgfSBlbHNlIGlmIChjbXAgPiAwKSB7CisgICAgICAgICAgcmlnaHQgPSBtaWRkbGUgLSAxOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIC8vIGdyb3VwIGlzIGFscmVhZHkgY29udGFpbmVkIGluIHRoZSB0YWJsZQorICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgaW5zZXJ0UG9zaXRpb24gPSBsZWZ0OworCisgICAgICB0YWJsZS5pbnNlcnRSb3coaW5zZXJ0UG9zaXRpb24pOworICAgICAgYXBwbHlEYXRhUm93U3R5bGUoaW5zZXJ0UG9zaXRpb24pOworICAgICAgcG9wdWxhdGUoaW5zZXJ0UG9zaXRpb24sIGluZm8pOworICAgIH0KKworICAgIHZvaWQgcG9wdWxhdGUoZmluYWwgaW50IHJvdywgZmluYWwgR3JvdXBJbmZvIGkpIHsKKyAgICAgIGZpbmFsIEZsZXhDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCk7CisKKyAgICAgIEFjY291bnRHcm91cC5VVUlEIHV1aWQgPSBpLmdldEdyb3VwVVVJRCgpOwogICAgICAgQ2hlY2tCb3ggY2hlY2tCb3ggPSBuZXcgQ2hlY2tCb3goKTsKICAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIDEsIGNoZWNrQm94KTsKICAgICAgIGNoZWNrQm94LnNldEVuYWJsZWQoZW5hYmxlZCk7Ci0gICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAyLAotICAgICAgICAgIG5ldyBIeXBlcmxpbmsoZ3JvdXAuZ2V0TmFtZSgpLCBEaXNwYXRjaGVyLnRvR3JvdXAoaWQpKSk7Ci0gICAgICB0YWJsZS5zZXRUZXh0KHJvdywgMywgZ3JvdXBzLmdldChpZCkuZ2V0RGVzY3JpcHRpb24oKSk7CisgICAgICBpZiAoQWNjb3VudEdyb3VwLmlzSW50ZXJuYWxHcm91cCh1dWlkKSkgeworICAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAyLAorICAgICAgICAgICAgbmV3IEh5cGVybGluayhpLm5hbWUoKSwgRGlzcGF0Y2hlci50b0dyb3VwKHV1aWQpKSk7CisgICAgICAgIGZtdC5nZXRFbGVtZW50KHJvdywgMikuc2V0VGl0bGUobnVsbCk7CisgICAgICAgIHRhYmxlLnNldFRleHQocm93LCAzLCBpLmRlc2NyaXB0aW9uKCkpOworICAgICAgfSBlbHNlIGlmIChpLnVybCgpICE9IG51bGwpIHsKKyAgICAgICAgQW5jaG9yIGEgPSBuZXcgQW5jaG9yKCk7CisgICAgICAgIGEuc2V0VGV4dChpLm5hbWUoKSk7CisgICAgICAgIGEuc2V0SHJlZihpLnVybCgpKTsKKyAgICAgICAgYS5zZXRUaXRsZSgiVVVJRCAiICsgdXVpZC5nZXQoKSk7CisgICAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIDIsIGEpOworICAgICAgICBmbXQuZ2V0RWxlbWVudChyb3csIDIpLnNldFRpdGxlKG51bGwpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgdGFibGUuc2V0VGV4dChyb3csIDIsIGkubmFtZSgpKTsKKyAgICAgICAgZm10LmdldEVsZW1lbnQocm93LCAyKS5zZXRUaXRsZSgiVVVJRCAiICsgdXVpZC5nZXQoKSk7CisgICAgICB9CiAKLSAgICAgIGZpbmFsIEZsZXhDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCk7CiAgICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5pY29uQ2VsbCgpKTsKICAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCAyLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRhdGFDZWxsKCkpOwogICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDMsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CiAKLSAgICAgIHNldFJvd0l0ZW0ocm93LCBrKTsKKyAgICAgIHNldFJvd0l0ZW0ocm93LCBpKTsKICAgICB9CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BY2NvdW50R3JvdXBTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BY2NvdW50R3JvdXBTY3JlZW4uamF2YQppbmRleCA5YWM2YzlhLi5hZGUwMGI5IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQWNjb3VudEdyb3VwU2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FjY291bnRHcm91cFNjcmVlbi5qYXZhCkBAIC0xNiw0OCArMTYsNjUgQEAKIAogaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuRGlzcGF0Y2hlci50b0dyb3VwOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lmdyb3Vwcy5Hcm91cEFwaTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZ3JvdXBzLkdyb3VwSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5NZW51U2NyZWVuOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiAKIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBBY2NvdW50R3JvdXBTY3JlZW4gZXh0ZW5kcyBNZW51U2NyZWVuIHsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgSU5GTyA9ICJpbmZvIjsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgTUVNQkVSUyA9ICJtZW1iZXJzIjsKIAotICBwcml2YXRlIGZpbmFsIEdyb3VwRGV0YWlsIGdyb3VwRGV0YWlsOworICBwcml2YXRlIGZpbmFsIEdyb3VwSW5mbyBncm91cDsKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbWVtYmVyc1RhYlRva2VuOwogCi0gIHB1YmxpYyBBY2NvdW50R3JvdXBTY3JlZW4oZmluYWwgR3JvdXBEZXRhaWwgdG9TaG93LCBmaW5hbCBTdHJpbmcgdG9rZW4pIHsKKyAgcHVibGljIEFjY291bnRHcm91cFNjcmVlbihmaW5hbCBHcm91cEluZm8gdG9TaG93LCBmaW5hbCBTdHJpbmcgdG9rZW4pIHsKICAgICBzZXRSZXF1aXJlc1NpZ25Jbih0cnVlKTsKIAotICAgIHRoaXMuZ3JvdXBEZXRhaWwgPSB0b1Nob3c7CisgICAgdGhpcy5ncm91cCA9IHRvU2hvdzsKICAgICB0aGlzLm1lbWJlcnNUYWJUb2tlbiA9IGdldFRhYlRva2VuKHRva2VuLCBNRU1CRVJTKTsKIAogICAgIGxpbmsoVXRpbC5DLmdyb3VwVGFiR2VuZXJhbCgpLCBnZXRUYWJUb2tlbih0b2tlbiwgSU5GTykpOwogICAgIGxpbmsoVXRpbC5DLmdyb3VwVGFiTWVtYmVycygpLCBtZW1iZXJzVGFiVG9rZW4sCi0gICAgICAgIGdyb3VwRGV0YWlsLmdyb3VwLmdldFR5cGUoKSA9PSBBY2NvdW50R3JvdXAuVHlwZS5JTlRFUk5BTCk7CisgICAgICAgIEFjY291bnRHcm91cC5pc0ludGVybmFsR3JvdXAoZ3JvdXAuZ2V0R3JvdXBVVUlEKCkpCisgICAgICAgICYmICFBY2NvdW50R3JvdXAuaXNTeXN0ZW1Hcm91cChncm91cC5nZXRHcm91cFVVSUQoKSkpOwogICB9CiAKICAgcHJpdmF0ZSBTdHJpbmcgZ2V0VGFiVG9rZW4oZmluYWwgU3RyaW5nIHRva2VuLCBmaW5hbCBTdHJpbmcgdGFiKSB7CiAgICAgaWYgKHRva2VuLnN0YXJ0c1dpdGgoIi9hZG1pbi9ncm91cHMvdXVpZC0iKSkgewotICAgICAgcmV0dXJuIHRvR3JvdXAoZ3JvdXBEZXRhaWwuZ3JvdXAuZ2V0R3JvdXBVVUlEKCksIHRhYik7CisgICAgICByZXR1cm4gdG9Hcm91cChncm91cC5nZXRHcm91cFVVSUQoKSwgdGFiKTsKICAgICB9IGVsc2UgewotICAgICAgcmV0dXJuIHRvR3JvdXAoZ3JvdXBEZXRhaWwuZ3JvdXAuZ2V0SWQoKSwgdGFiKTsKKyAgICAgIHJldHVybiB0b0dyb3VwKGdyb3VwLmdldEdyb3VwSWQoKSwgdGFiKTsKICAgICB9CiAgIH0KIAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgb25Mb2FkKCkgewogICAgIHN1cGVyLm9uTG9hZCgpOwotICAgIHNldFBhZ2VUaXRsZShVdGlsLk0uZ3JvdXAoZ3JvdXBEZXRhaWwuZ3JvdXAuZ2V0TmFtZSgpKSk7CisgICAgc2V0UGFnZVRpdGxlKFV0aWwuTS5ncm91cChncm91cC5uYW1lKCkpKTsKICAgICBkaXNwbGF5KCk7Ci0gICAgZGlzcGxheShncm91cERldGFpbCk7CisgICAgR3JvdXBBcGkuaXNHcm91cE93bmVyKGdyb3VwLm5hbWUoKSwgbmV3IEdlcnJpdENhbGxiYWNrPEJvb2xlYW4+KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoQm9vbGVhbiByZXN1bHQpIHsKKyAgICAgICAgZGlzcGxheShncm91cCwgcmVzdWx0KTsKKyAgICAgIH0KKyAgICB9KTsKICAgfQogCi0gIHByb3RlY3RlZCBhYnN0cmFjdCB2b2lkIGRpc3BsYXkoZmluYWwgR3JvdXBEZXRhaWwgZ3JvdXBEZXRhaWwpOworICBwcm90ZWN0ZWQgYWJzdHJhY3Qgdm9pZCBkaXNwbGF5KGZpbmFsIEdyb3VwSW5mbyBncm91cCwgZmluYWwgYm9vbGVhbiBjYW5Nb2RpZnkpOwogCi0gIHByb3RlY3RlZCBBY2NvdW50R3JvdXAuSWQgZ2V0R3JvdXBJZCgpIHsKLSAgICByZXR1cm4gZ3JvdXBEZXRhaWwuZ3JvdXAuZ2V0SWQoKTsKKyAgcHJvdGVjdGVkIEFjY291bnRHcm91cC5VVUlEIGdldEdyb3VwVVVJRCgpIHsKKyAgICByZXR1cm4gZ3JvdXAuZ2V0R3JvdXBVVUlEKCk7CisgIH0KKworICBwcm90ZWN0ZWQgdm9pZCB1cGRhdGVPd25lckdyb3VwKEdyb3VwSW5mbyBvd25lckdyb3VwKSB7CisgICAgZ3JvdXAuc2V0T3duZXJVVUlEKG93bmVyR3JvdXAuZ2V0R3JvdXBVVUlEKCkpOworICAgIGdyb3VwLm93bmVyKG93bmVyR3JvdXAubmFtZSgpKTsKKyAgfQorCisgIHByb3RlY3RlZCBBY2NvdW50R3JvdXAuVVVJRCBnZXRPd25lckdyb3VwVVVJRCgpIHsKKyAgICByZXR1cm4gZ3JvdXAuZ2V0T3duZXJVVUlEKCk7CiAgIH0KIAogICBwcm90ZWN0ZWQgdm9pZCBzZXRNZW1iZXJzVGFiVmlzaWJsZShmaW5hbCBib29sZWFuIHZpc2libGUpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BZG1pbkNvbnN0YW50cy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLmphdmEKaW5kZXggMGMxODE2OS4uZjRjMGI1NSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLmphdmEKQEAgLTU1LDcgKzU1LDYgQEAKICAgU3RyaW5nIGhlYWRpbmdPd25lcigpOwogICBTdHJpbmcgaGVhZGluZ0Rlc2NyaXB0aW9uKCk7CiAgIFN0cmluZyBoZWFkaW5nUHJvamVjdE9wdGlvbnMoKTsKLSAgU3RyaW5nIGhlYWRpbmdHcm91cFR5cGUoKTsKICAgU3RyaW5nIGhlYWRpbmdNZW1iZXJzKCk7CiAgIFN0cmluZyBoZWFkaW5nSW5jbHVkZWRHcm91cHMoKTsKICAgU3RyaW5nIG5vTWVtYmVyc0luZm8oKTsKQEAgLTY1LDE5ICs2NCwxOCBAQAogICBTdHJpbmcgY29sdW1uUHJvamVjdE5hbWUoKTsKICAgU3RyaW5nIGhlYWRpbmdBZ3JlZW1lbnRzKCk7CiAKKyAgU3RyaW5nIGhlYWRpbmdQcm9qZWN0U3VibWl0VHlwZSgpOwogICBTdHJpbmcgcHJvamVjdFN1Ym1pdFR5cGVfRkFTVF9GT1JXQVJEX09OTFkoKTsKICAgU3RyaW5nIHByb2plY3RTdWJtaXRUeXBlX01FUkdFX0FMV0FZUygpOwogICBTdHJpbmcgcHJvamVjdFN1Ym1pdFR5cGVfTUVSR0VfSUZfTkVDRVNTQVJZKCk7CisgIFN0cmluZyBwcm9qZWN0U3VibWl0VHlwZV9SRUJBU0VfSUZfTkVDRVNTQVJZKCk7CiAgIFN0cmluZyBwcm9qZWN0U3VibWl0VHlwZV9DSEVSUllfUElDSygpOwogCisgIFN0cmluZyBoZWFkaW5nUHJvamVjdFN0YXRlKCk7CiAgIFN0cmluZyBwcm9qZWN0U3RhdGVfQUNUSVZFKCk7CiAgIFN0cmluZyBwcm9qZWN0U3RhdGVfUkVBRF9PTkxZKCk7CiAgIFN0cmluZyBwcm9qZWN0U3RhdGVfSElEREVOKCk7CiAKLSAgU3RyaW5nIGdyb3VwVHlwZV9TWVNURU0oKTsKLSAgU3RyaW5nIGdyb3VwVHlwZV9JTlRFUk5BTCgpOwotICBTdHJpbmcgZ3JvdXBUeXBlX0xEQVAoKTsKLQogICBTdHJpbmcgY29sdW1uTWVtYmVyKCk7CiAgIFN0cmluZyBjb2x1bW5FbWFpbEFkZHJlc3MoKTsKICAgU3RyaW5nIGNvbHVtbkdyb3VwTmFtZSgpOwpAQCAtOTMsMjEgKzkxLDIwIEBACiAgIFN0cmluZyBidXR0b25EZWxldGVCcmFuY2goKTsKICAgU3RyaW5nIGJyYW5jaERlbGV0aW9uT3BlbkNoYW5nZXMoKTsKIAotICBTdHJpbmcgZ3JvdXBMaXN0UHJldigpOwotICBTdHJpbmcgZ3JvdXBMaXN0TmV4dCgpOwotICBTdHJpbmcgZ3JvdXBMaXN0T3BlbigpOworICBTdHJpbmcgZ3JvdXBJdGVtSGVscCgpOwogCiAgIFN0cmluZyBncm91cExpc3RUaXRsZSgpOworICBTdHJpbmcgZ3JvdXBGaWx0ZXIoKTsKICAgU3RyaW5nIGNyZWF0ZUdyb3VwVGl0bGUoKTsKICAgU3RyaW5nIGdyb3VwVGFiR2VuZXJhbCgpOwogICBTdHJpbmcgZ3JvdXBUYWJNZW1iZXJzKCk7CiAgIFN0cmluZyBwcm9qZWN0TGlzdFRpdGxlKCk7CisgIFN0cmluZyBwcm9qZWN0RmlsdGVyKCk7CiAgIFN0cmluZyBjcmVhdGVQcm9qZWN0VGl0bGUoKTsKLSAgU3RyaW5nIHByb2plY3RBZG1pblRhYkdlbmVyYWwoKTsKLSAgU3RyaW5nIHByb2plY3RBZG1pblRhYkJyYW5jaGVzKCk7Ci0gIFN0cmluZyBwcm9qZWN0QWRtaW5UYWJBY2Nlc3MoKTsKKyAgU3RyaW5nIHByb2plY3RMaXN0UXVlcnlMaW5rKCk7CiAKICAgU3RyaW5nIHBsdWdpbnMoKTsKKyAgU3RyaW5nIHBsdWdpbkVuYWJsZWQoKTsKICAgU3RyaW5nIHBsdWdpbkRpc2FibGVkKCk7CiAKICAgU3RyaW5nIGNvbHVtblBsdWdpbk5hbWUoKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9BZG1pbkNvbnN0YW50cy5wcm9wZXJ0aWVzIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLnByb3BlcnRpZXMKaW5kZXggM2ZmM2Y0My4uMTYzNzkxOSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLnByb3BlcnRpZXMKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0FkbWluQ29uc3RhbnRzLnByb3BlcnRpZXMKQEAgLTIyLDggKzIyLDggQEAKIHByb2plY3RSZXBvQnJvd3NlciA9IFJlcG9zaXRvcnkgQnJvd3NlcgogdXNlQ29udGVudE1lcmdlID0gQXV0b21hdGljYWxseSByZXNvbHZlIGNvbmZsaWN0cwogdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzID0gUmVxdWlyZSBhIHZhbGlkIGNvbnRyaWJ1dG9yIGFncmVlbWVudCB0byB1cGxvYWQKLXVzZVNpZ25lZE9mZkJ5ID0gUmVxdWlyZSA8YSBocmVmPSJodHRwOi8vZ2Vycml0Lmdvb2dsZWNvZGUuY29tL3N2bi9kb2N1bWVudGF0aW9uLzIuMC91c2VyLXNpZ25lZG9mZmJ5Lmh0bWwjU2lnbmVkLW9mZi1ieSIgdGFyZ2V0PSJfYmxhbmsiPjxjb2RlPlNpZ25lZC1vZmYtYnk8L2NvZGU+PC9hPiBpbiBjb21taXQgbWVzc2FnZQotcmVxdWlyZUNoYW5nZUlEID0gUmVxdWlyZSA8YSBocmVmPSJodHRwOi8vZ2Vycml0Lmdvb2dsZWNvZGUuY29tL3N2bi9kb2N1bWVudGF0aW9uLzIuMC91c2VyLWNoYW5nZWlkLmh0bWwiIHRhcmdldD0iX2JsYW5rIj48Y29kZT5DaGFuZ2UtSWQ8L2NvZGU+PC9hPiBpbiBjb21taXQgbWVzc2FnZQordXNlU2lnbmVkT2ZmQnkgPSBSZXF1aXJlIDxhIGhyZWY9Imh0dHA6Ly9nZXJyaXQtZG9jdW1lbnRhdGlvbi5nb29nbGVjb2RlLmNvbS9zdm4vRG9jdW1lbnRhdGlvbi8yLjUvdXNlci1zaWduZWRvZmZieS5odG1sI1NpZ25lZC1vZmYtYnkiIHRhcmdldD0iX2JsYW5rIj48Y29kZT5TaWduZWQtb2ZmLWJ5PC9jb2RlPjwvYT4gaW4gY29tbWl0IG1lc3NhZ2UKK3JlcXVpcmVDaGFuZ2VJRCA9IFJlcXVpcmUgPGEgaHJlZj0iaHR0cDovL2dlcnJpdC1kb2N1bWVudGF0aW9uLmdvb2dsZWNvZGUuY29tL3N2bi9Eb2N1bWVudGF0aW9uLzIuNS91c2VyLWNoYW5nZWlkLmh0bWwiIHRhcmdldD0iX2JsYW5rIj48Y29kZT5DaGFuZ2UtSWQ8L2NvZGU+PC9hPiBpbiBjb21taXQgbWVzc2FnZQogaGVhZGluZ0dyb3VwT3B0aW9ucyA9IEdyb3VwIE9wdGlvbnMKIGlzVmlzaWJsZVRvQWxsID0gTWFrZSBncm91cCB2aXNpYmxlIHRvIGFsbCByZWdpc3RlcmVkIHVzZXJzLgogYnV0dG9uU2F2ZUdyb3VwT3B0aW9ucyA9IFNhdmUgR3JvdXAgT3B0aW9ucwpAQCAtMzYsNyArMzYsNiBAQAogaGVhZGluZ093bmVyID0gT3duZXJzCiBoZWFkaW5nRGVzY3JpcHRpb24gPSBEZXNjcmlwdGlvbgogaGVhZGluZ1Byb2plY3RPcHRpb25zID0gUHJvamVjdCBPcHRpb25zCi1oZWFkaW5nR3JvdXBUeXBlID0gR3JvdXAgVHlwZQogaGVhZGluZ01lbWJlcnMgPSBNZW1iZXJzCiBoZWFkaW5nSW5jbHVkZWRHcm91cHMgPSBJbmNsdWRlZCBHcm91cHMKIG5vTWVtYmVyc0luZm8gPSBHcm91cCBNZW1iZXJzIGNhbiBvbmx5IGJlIHZpZXdlZCBmb3IgR2Vycml0IGludGVybmFsIGdyb3Vwcy4gRm9yIGV4dGVybmFsIGdyb3VwcyBhbmQgR2Vycml0IHN5c3RlbSBncm91cHMgdGhlIG1lbWJlcnMgY2Fubm90IGJlIGRpc3BsYXllZC4KQEAgLTQ0LDE5ICs0MywxOCBAQAogaGVhZGluZ0NyZWF0ZUdyb3VwID0gQ3JlYXRlIE5ldyBHcm91cAogaGVhZGluZ0FncmVlbWVudHMgPSBDb250cmlidXRvciBBZ3JlZW1lbnRzCiAKK2hlYWRpbmdQcm9qZWN0U3VibWl0VHlwZSA9IFN1Ym1pdCBUeXBlCiBwcm9qZWN0U3VibWl0VHlwZV9GQVNUX0ZPUldBUkRfT05MWSA9IEZhc3QgRm9yd2FyZCBPbmx5Ci1wcm9qZWN0U3VibWl0VHlwZV9NRVJHRV9JRl9ORUNFU1NBUlkgPSBNZXJnZSBJZiBOZWNlc3NhcnkKK3Byb2plY3RTdWJtaXRUeXBlX01FUkdFX0lGX05FQ0VTU0FSWSA9IE1lcmdlIGlmIE5lY2Vzc2FyeQorcHJvamVjdFN1Ym1pdFR5cGVfUkVCQVNFX0lGX05FQ0VTU0FSWSA9IFJlYmFzZSBpZiBOZWNlc3NhcnkKIHByb2plY3RTdWJtaXRUeXBlX01FUkdFX0FMV0FZUyA9IEFsd2F5cyBNZXJnZQogcHJvamVjdFN1Ym1pdFR5cGVfQ0hFUlJZX1BJQ0sgPSBDaGVycnkgUGljawogCitoZWFkaW5nUHJvamVjdFN0YXRlID0gU3RhdGUKIHByb2plY3RTdGF0ZV9BQ1RJVkUgPSBBY3RpdmUKIHByb2plY3RTdGF0ZV9SRUFEX09OTFkgPSBSZWFkIE9ubHkKIHByb2plY3RTdGF0ZV9ISURERU4gPSBIaWRkZW4KIAotZ3JvdXBUeXBlX1NZU1RFTSA9IFN5c3RlbSBHcm91cAotZ3JvdXBUeXBlX0lOVEVSTkFMID0gSW50ZXJuYWwgR3JvdXAKLWdyb3VwVHlwZV9MREFQID0gTERBUCBHcm91cAotCiBjb2x1bW5NZW1iZXIgPSBNZW1iZXIKIGNvbHVtbkVtYWlsQWRkcmVzcyA9IEVtYWlsIEFkZHJlc3MKIGNvbHVtbkdyb3VwTmFtZSA9IEdyb3VwIE5hbWUKQEAgLTczLDIxICs3MSwyMCBAQAogYnJhbmNoRGVsZXRpb25PcGVuQ2hhbmdlcyA9IFRoZSBmb2xsb3dpbmcgYnJhbmNoZXMgd2VyZSBub3QgZGVsZXRlZCBcCiBiZWNhdXNlIHRoZXkgaGF2ZSBvcGVuIGNoYW5nZXM6CiAKLWdyb3VwTGlzdFByZXYgPSBQcmV2aW91cyBncm91cAotZ3JvdXBMaXN0TmV4dCA9IE5leHQgZ3JvdXAKLWdyb3VwTGlzdE9wZW4gPSBPcGVuIGdyb3VwCitncm91cEl0ZW1IZWxwID0gZ3JvdXAKIAogZ3JvdXBMaXN0VGl0bGUgPSBHcm91cHMKK2dyb3VwRmlsdGVyID0gRmlsdGVyCiBjcmVhdGVHcm91cFRpdGxlID0gQ3JlYXRlIEdyb3VwCiBncm91cFRhYkdlbmVyYWwgPSBHZW5lcmFsCiBncm91cFRhYk1lbWJlcnMgPSBNZW1iZXJzCiBwcm9qZWN0TGlzdFRpdGxlID0gUHJvamVjdHMKK3Byb2plY3RGaWx0ZXIgPSBGaWx0ZXIKIGNyZWF0ZVByb2plY3RUaXRsZSA9IENyZWF0ZSBQcm9qZWN0Ci1wcm9qZWN0QWRtaW5UYWJHZW5lcmFsID0gR2VuZXJhbAotcHJvamVjdEFkbWluVGFiQnJhbmNoZXMgPSBCcmFuY2hlcwotcHJvamVjdEFkbWluVGFiQWNjZXNzID0gQWNjZXNzCitwcm9qZWN0TGlzdFF1ZXJ5TGluayA9IFNlYXJjaCBmb3IgY2hhbmdlcyBvbiB0aGlzIHByb2plY3QKIAogcGx1Z2lucyA9IFBsdWdpbnMKK3BsdWdpbkVuYWJsZWQgPSBFbmFibGVkCiBwbHVnaW5EaXNhYmxlZCA9IERpc2FibGVkCiBjb2x1bW5QbHVnaW5OYW1lID0gUGx1Z2luIE5hbWUKIGNvbHVtblBsdWdpblZlcnNpb24gPSBWZXJzaW9uCkBAIC0xMDQsMjggKzEwMSw0MSBAQAogcGVybWlzc2lvbk5hbWVzID0gXAogCWFiYW5kb24sIFwKIAljcmVhdGUsIFwKKwlkZWxldGVEcmFmdHMsIFwKKwllZGl0VG9waWNOYW1lLCBcCiAJZm9yZ2VBdXRob3IsIFwKIAlmb3JnZUNvbW1pdHRlciwgXAogCWZvcmdlU2VydmVyQXNDb21taXR0ZXIsIFwKIAlvd25lciwgXAorCXB1Ymxpc2hEcmFmdHMsIFwKIAlwdXNoLCBcCiAJcHVzaE1lcmdlLCBcCiAJcHVzaFRhZywgXAorCXB1c2hTaWduZWRUYWcsIFwKIAlyZWFkLCBcCiAJcmViYXNlLCBcCi0Jc3VibWl0CisJcmVtb3ZlUmV2aWV3ZXIsIFwKKwlzdWJtaXQsIFwKKwl2aWV3RHJhZnRzCisKIGFiYW5kb24gPSBBYmFuZG9uCiBjcmVhdGUgPSBDcmVhdGUgUmVmZXJlbmNlCitkZWxldGVEcmFmdHMgPSBEZWxldGUgRHJhZnRzCitlZGl0VG9waWNOYW1lID0gRWRpdCBUb3BpYyBOYW1lCiBmb3JnZUF1dGhvciA9IEZvcmdlIEF1dGhvciBJZGVudGl0eQogZm9yZ2VDb21taXR0ZXIgPSBGb3JnZSBDb21taXR0ZXIgSWRlbnRpdHkKIGZvcmdlU2VydmVyQXNDb21taXR0ZXIgPSBGb3JnZSBTZXJ2ZXIgSWRlbnRpdHkKIG93bmVyID0gT3duZXIKK3B1Ymxpc2hEcmFmdHMgPSBQdWJsaXNoIERyYWZ0cwogcHVzaCA9IFB1c2gKIHB1c2hNZXJnZSA9IFB1c2ggTWVyZ2UgQ29tbWl0CiBwdXNoVGFnID0gUHVzaCBBbm5vdGF0ZWQgVGFnCitwdXNoU2lnbmVkVGFnID0gUHVzaCBTaWduZWQgVGFnCiByZWFkID0gUmVhZAogcmViYXNlID0gUmViYXNlCityZW1vdmVSZXZpZXdlciA9IFJlbW92ZSBSZXZpZXdlcgogc3VibWl0ID0gU3VibWl0Cit2aWV3RHJhZnRzID0gVmlldyBEcmFmdHMKIAogcmVmRXJyb3JFbXB0eSA9IFJlZmVyZW5jZSBtdXN0IGJlIHN1cHBsaWVkCiByZWZFcnJvckJlZ2luU2xhc2ggPSBSZWZlcmVuY2UgbXVzdCBub3Qgc3RhcnQgd2l0aCAnLycKQEAgLTEzNiw2ICsxNDYsNyBAQAogCiAjIENhcGFiaWxpdHkgTmFtZXMKIGNhcGFiaWxpdHlOYW1lcyA9IFwKKyAgYWNjZXNzRGF0YWJhc2UsIFwKICAgYWRtaW5pc3RyYXRlU2VydmVyLCBcCiAgIGNyZWF0ZUFjY291bnQsIFwKICAgY3JlYXRlR3JvdXAsIFwKQEAgLTE0NSwxMSArMTU2LDEzIEBACiAgIGtpbGxUYXNrLCBcCiAgIHByaW9yaXR5LCBcCiAgIHF1ZXJ5TGltaXQsIFwKKyAgcnVuR0MsIFwKICAgc3RhcnRSZXBsaWNhdGlvbiwgXAogICB2aWV3Q2FjaGVzLCBcCiAgIHZpZXdDb25uZWN0aW9ucywgXAogICB2aWV3UXVldWUKLWFkbWluaXN0cmF0ZVNlcnZlciA9IEFkbWluaXN0cmF0ZSBTZXJ2ZXIgCithY2Nlc3NEYXRhYmFzZSA9IEFjY2VzcyBEYXRhYmFzZQorYWRtaW5pc3RyYXRlU2VydmVyID0gQWRtaW5pc3RyYXRlIFNlcnZlcgogY3JlYXRlQWNjb3VudCA9IENyZWF0ZSBBY2NvdW50CiBjcmVhdGVHcm91cCA9IENyZWF0ZSBHcm91cAogY3JlYXRlUHJvamVjdCA9IENyZWF0ZSBQcm9qZWN0CkBAIC0xNTgsNiArMTcxLDcgQEAKIGtpbGxUYXNrID0gS2lsbCBUYXNrCiBwcmlvcml0eSA9IFByaW9yaXR5CiBxdWVyeUxpbWl0ID0gUXVlcnkgTGltaXQKK3J1bkdDID0gUnVuIEdhcmJhZ2UgQ29sbGVjdGlvbgogc3RhcnRSZXBsaWNhdGlvbiA9IFN0YXJ0IFJlcGxpY2F0aW9uCiB2aWV3Q2FjaGVzID0gVmlldyBDYWNoZXMKIHZpZXdDb25uZWN0aW9ucyA9IFZpZXcgQ29ubmVjdGlvbnMKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9DcmVhdGVHcm91cFNjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0NyZWF0ZUdyb3VwU2NyZWVuLmphdmEKaW5kZXggNDU3NGM2ZC4uNjlkZmY1YyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0NyZWF0ZUdyb3VwU2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0NyZWF0ZUdyb3VwU2NyZWVuLmphdmEKQEAgLTIwLDE3ICsyMCwyMSBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lk5vdEZvdW5kU2NyZWVuOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hY2NvdW50LkFjY291bnRDYXBhYmlsaXRpZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lmdyb3Vwcy5Hcm91cEFwaTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZ3JvdXBzLkdyb3VwSW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5PbkVkaXRFbmFibGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlNtYWxsSGVhZGluZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuU2NoZWR1bGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LlNjaGVkdWxlci5TY2hlZHVsZWRDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleUNvZGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5UHJlc3NFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5FdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5IaXN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkJ1dHRvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5WZXJ0aWNhbFBhbmVsOwpAQCAtNzMsNyArNzcsMjQgQEAKICAgICBhZGRQYW5lbC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5hZGRTc2hLZXlQYW5lbCgpKTsKICAgICBhZGRQYW5lbC5hZGQobmV3IFNtYWxsSGVhZGluZyhVdGlsLkMuaGVhZGluZ0NyZWF0ZUdyb3VwKCkpKTsKIAotICAgIGFkZFR4dCA9IG5ldyBOcFRleHRCb3goKTsKKyAgICBhZGRUeHQgPSBuZXcgTnBUZXh0Qm94KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvbkJyb3dzZXJFdmVudChFdmVudCBldmVudCkgeworICAgICAgICBzdXBlci5vbkJyb3dzZXJFdmVudChldmVudCk7CisgICAgICAgIGlmIChldmVudC5nZXRUeXBlSW50KCkgPT0gRXZlbnQuT05QQVNURSkgeworICAgICAgICAgIFNjaGVkdWxlci5nZXQoKS5zY2hlZHVsZURlZmVycmVkKG5ldyBTY2hlZHVsZWRDb21tYW5kKCkgeworICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICBwdWJsaWMgdm9pZCBleGVjdXRlKCkgeworICAgICAgICAgICAgICBpZiAoYWRkVHh0LmdldFZhbHVlKCkudHJpbSgpLmxlbmd0aCgpICE9IDApIHsKKyAgICAgICAgICAgICAgICBhZGROZXcuc2V0RW5hYmxlZCh0cnVlKTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgIH0pOworICAgICAgICB9CisgICAgICB9CisgICAgfTsKKyAgICBhZGRUeHQuc2lua0V2ZW50cyhFdmVudC5PTlBBU1RFKTsKKwogICAgIGFkZFR4dC5zZXRWaXNpYmxlTGVuZ3RoKDYwKTsKICAgICBhZGRUeHQuYWRkS2V5UHJlc3NIYW5kbGVyKG5ldyBLZXlQcmVzc0hhbmRsZXIoKSB7CiAgICAgICBAT3ZlcnJpZGUKQEAgLTEwNiw5ICsxMjcsMTAgQEAKICAgICB9CiAKICAgICBhZGROZXcuc2V0RW5hYmxlZChmYWxzZSk7Ci0gICAgVXRpbC5HUk9VUF9TVkMuY3JlYXRlR3JvdXAobmV3TmFtZSwgbmV3IEdlcnJpdENhbGxiYWNrPEFjY291bnRHcm91cC5JZD4oKSB7Ci0gICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoZmluYWwgQWNjb3VudEdyb3VwLklkIHJlc3VsdCkgewotICAgICAgICBIaXN0b3J5Lm5ld0l0ZW0oRGlzcGF0Y2hlci50b0dyb3VwKHJlc3VsdCwgQWNjb3VudEdyb3VwU2NyZWVuLk1FTUJFUlMpKTsKKyAgICBHcm91cEFwaS5jcmVhdGVHcm91cChuZXdOYW1lLCBuZXcgR2Vycml0Q2FsbGJhY2s8R3JvdXBJbmZvPigpIHsKKyAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBHcm91cEluZm8gcmVzdWx0KSB7CisgICAgICAgIEhpc3RvcnkubmV3SXRlbShEaXNwYXRjaGVyLnRvR3JvdXAocmVzdWx0LmdldEdyb3VwSWQoKSwKKyAgICAgICAgICAgIEFjY291bnRHcm91cFNjcmVlbi5NRU1CRVJTKSk7CiAgICAgICB9CiAKICAgICAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0NyZWF0ZVByb2plY3RTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9DcmVhdGVQcm9qZWN0U2NyZWVuLmphdmEKaW5kZXggYjQ5NTBkOC4uNzc0OWU5YyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0NyZWF0ZVByb2plY3RTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vQ3JlYXRlUHJvamVjdFNjcmVlbi5qYXZhCkBAIC0yMCwyMyArMjAsMzEgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuRXJyb3JEaWFsb2c7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuTm90Rm91bmRTY3JlZW47CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LlZvaWRSZXN1bHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFjY291bnQuQWNjb3VudENhcGFiaWxpdGllczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucHJvamVjdHMuUHJvamVjdEFwaTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucHJvamVjdHMuUHJvamVjdEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnByb2plY3RzLlByb2plY3RNYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSGludFRleHRCb3g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLk9uRWRpdEVuYWJsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlByb2plY3RMaXN0UG9wdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlByb2plY3ROYW1lU3VnZ2VzdE9yYWNsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuUHJvamVjdHNUYWJsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuU2NyZWVuOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlByb2plY3RVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LlNjaGVkdWxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5TY2hlZHVsZXIuU2NoZWR1bGVkQ29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlDb2RlczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0hhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuSGlzdG9yeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ycGMuQXN5bmNDYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BbmNob3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQnV0dG9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkNoZWNrQm94OwpAQCAtNDQsNyArNTIsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlN1Z2dlc3RCb3g7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVmVydGljYWxQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuTnBUZXh0Qm94OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uVm9pZFJlc3VsdDsKIAogcHVibGljIGNsYXNzIENyZWF0ZVByb2plY3RTY3JlZW4gZXh0ZW5kcyBTY3JlZW4gewogICBwcml2YXRlIEdyaWQgZ3JpZDsKQEAgLTUyLDcgKzU5LDcgQEAKICAgcHJpdmF0ZSBCdXR0b24gY3JlYXRlOwogICBwcml2YXRlIEJ1dHRvbiBicm93c2U7CiAgIHByaXZhdGUgSGludFRleHRCb3ggcGFyZW50OwotICBwcml2YXRlIFN1Z2dlc3RCb3ggc3VnZXN0UGFyZW50OworICBwcml2YXRlIFN1Z2dlc3RCb3ggc3VnZ2VzdFBhcmVudDsKICAgcHJpdmF0ZSBDaGVja0JveCBlbXB0eUNvbW1pdDsKICAgcHJpdmF0ZSBDaGVja0JveCBwZXJtaXNzaW9uc09ubHk7CiAgIHByaXZhdGUgUHJvamVjdHNUYWJsZSBzdWdnZXN0ZWRQYXJlbnRzVGFiOwpAQCAtOTUsOCArMTAyLDggQEAKICAgICAgIEBPdmVycmlkZQogICAgICAgcHJvdGVjdGVkIHZvaWQgb25Nb3ZlUG9pbnRlclRvKFN0cmluZyBwcm9qZWN0TmFtZSkgewogICAgICAgICAvLyBwcmV2ZW50IHVzZXIgaW5wdXQgZnJvbSBiZWluZyBvdmVyd3JpdHRlbiBieSBzaW1wbHkgcG9waW5nIHVwCi0gICAgICAgIGlmICghcHJvamVjdHNQb3B1cC5pc1BvcGluZ1VwKCkgfHwgIiIuZXF1YWxzKHN1Z2VzdFBhcmVudC5nZXRUZXh0KCkpKSB7Ci0gICAgICAgICAgc3VnZXN0UGFyZW50LnNldFRleHQocHJvamVjdE5hbWUpOworICAgICAgICBpZiAoIXByb2plY3RzUG9wdXAuaXNQb3BwaW5nVXAoKSB8fCAiIi5lcXVhbHMoc3VnZ2VzdFBhcmVudC5nZXRUZXh0KCkpKSB7CisgICAgICAgICAgc3VnZ2VzdFBhcmVudC5zZXRUZXh0KHByb2plY3ROYW1lKTsKICAgICAgICAgfQogICAgICAgfQogICAgIH07CkBAIC0xMDcsOCArMTE0LDggQEAKICAgICBmaW5hbCBWZXJ0aWNhbFBhbmVsIGZwID0gbmV3IFZlcnRpY2FsUGFuZWwoKTsKICAgICBmcC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jcmVhdGVQcm9qZWN0UGFuZWwoKSk7CiAKLSAgICBpbml0Q3JlYXRlVHh0KCk7CiAgICAgaW5pdENyZWF0ZUJ1dHRvbigpOworICAgIGluaXRDcmVhdGVUeHQoKTsKICAgICBpbml0UGFyZW50Qm94KCk7CiAKICAgICBhZGRHcmlkKGZwKTsKQEAgLTEyNiwyMCArMTMzLDM4IEBACiAgIH0KIAogICBwcml2YXRlIHZvaWQgaW5pdENyZWF0ZVR4dCgpIHsKLSAgICBwcm9qZWN0ID0gbmV3IE5wVGV4dEJveCgpOworICAgIHByb2plY3QgPSBuZXcgTnBUZXh0Qm94KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvbkJyb3dzZXJFdmVudChFdmVudCBldmVudCkgeworICAgICAgICBzdXBlci5vbkJyb3dzZXJFdmVudChldmVudCk7CisgICAgICAgIGlmIChldmVudC5nZXRUeXBlSW50KCkgPT0gRXZlbnQuT05QQVNURSkgeworICAgICAgICAgIFNjaGVkdWxlci5nZXQoKS5zY2hlZHVsZURlZmVycmVkKG5ldyBTY2hlZHVsZWRDb21tYW5kKCkgeworICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICBwdWJsaWMgdm9pZCBleGVjdXRlKCkgeworICAgICAgICAgICAgICBpZiAocHJvamVjdC5nZXRWYWx1ZSgpLnRyaW0oKS5sZW5ndGgoKSAhPSAwKSB7CisgICAgICAgICAgICAgICAgY3JlYXRlLnNldEVuYWJsZWQodHJ1ZSk7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH07CisgICAgcHJvamVjdC5zaW5rRXZlbnRzKEV2ZW50Lk9OUEFTVEUpOwogICAgIHByb2plY3Quc2V0VmlzaWJsZUxlbmd0aCg1MCk7CiAgICAgcHJvamVjdC5hZGRLZXlQcmVzc0hhbmRsZXIobmV3IEtleVByZXNzSGFuZGxlcigpIHsKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIHZvaWQgb25LZXlQcmVzcyhLZXlQcmVzc0V2ZW50IGV2ZW50KSB7Ci0gICAgICAgIGlmIChldmVudC5nZXRDaGFyQ29kZSgpID09IEtleUNvZGVzLktFWV9FTlRFUikgeworICAgICAgICBpZiAoZXZlbnQuZ2V0TmF0aXZlRXZlbnQoKS5nZXRLZXlDb2RlKCkgPT0gS2V5Q29kZXMuS0VZX0VOVEVSKSB7CiAgICAgICAgICAgZG9DcmVhdGVQcm9qZWN0KCk7CiAgICAgICAgIH0KICAgICAgIH0KICAgICB9KTsKKyAgICBuZXcgT25FZGl0RW5hYmxlcihjcmVhdGUsIHByb2plY3QpOwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGluaXRDcmVhdGVCdXR0b24oKSB7CiAgICAgY3JlYXRlID0gbmV3IEJ1dHRvbihVdGlsLkMuYnV0dG9uQ3JlYXRlUHJvamVjdCgpKTsKKyAgICBjcmVhdGUuc2V0RW5hYmxlZChmYWxzZSk7CiAgICAgY3JlYXRlLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKGZpbmFsIENsaWNrRXZlbnQgZXZlbnQpIHsKQEAgLTE2Nyw3ICsxOTIsNyBAQAogCiAgIHByaXZhdGUgdm9pZCBpbml0UGFyZW50Qm94KCkgewogICAgIHBhcmVudCA9IG5ldyBIaW50VGV4dEJveCgpOwotICAgIHN1Z2VzdFBhcmVudCA9CisgICAgc3VnZ2VzdFBhcmVudCA9CiAgICAgICAgIG5ldyBTdWdnZXN0Qm94KG5ldyBQcm9qZWN0TmFtZVN1Z2dlc3RPcmFjbGUoKSwgcGFyZW50KTsKICAgICBwYXJlbnQuc2V0VmlzaWJsZUxlbmd0aCg1MCk7CiAgIH0KQEAgLTE4NSw3ICsyMTAsNyBAQAogCiAgICAgICAgICAgQE92ZXJyaWRlCiAgICAgICAgICAgcHVibGljIHZvaWQgb25DbGljayhDbGlja0V2ZW50IGV2ZW50KSB7Ci0gICAgICAgICAgICBzdWdlc3RQYXJlbnQuc2V0VGV4dChnZXRSb3dJdGVtKHJvdykubmFtZSgpKTsKKyAgICAgICAgICAgIHN1Z2dlc3RQYXJlbnQuc2V0VGV4dChnZXRSb3dJdGVtKHJvdykubmFtZSgpKTsKICAgICAgICAgICB9CiAgICAgICAgIH0pOwogCkBAIC0yMTUsMTQgKzI0MCwxNCBAQAogICAgIGdyaWQuc2V0VGV4dCgwLCAwLCBVdGlsLkMuY29sdW1uUHJvamVjdE5hbWUoKSArICI6Iik7CiAgICAgZ3JpZC5zZXRXaWRnZXQoMCwgMSwgcHJvamVjdCk7CiAgICAgZ3JpZC5zZXRUZXh0KDEsIDAsIFV0aWwuQy5oZWFkaW5nUGFyZW50UHJvamVjdE5hbWUoKSArICI6Iik7Ci0gICAgZ3JpZC5zZXRXaWRnZXQoMSwgMSwgc3VnZXN0UGFyZW50KTsKKyAgICBncmlkLnNldFdpZGdldCgxLCAxLCBzdWdnZXN0UGFyZW50KTsKICAgICBncmlkLnNldFdpZGdldCgxLCAyLCBicm93c2UpOwogICAgIGZwLmFkZChncmlkKTsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBkb0NyZWF0ZVByb2plY3QoKSB7CiAgICAgZmluYWwgU3RyaW5nIHByb2plY3ROYW1lID0gcHJvamVjdC5nZXRUZXh0KCkudHJpbSgpOwotICAgIGZpbmFsIFN0cmluZyBwYXJlbnROYW1lID0gc3VnZXN0UGFyZW50LmdldFRleHQoKS50cmltKCk7CisgICAgZmluYWwgU3RyaW5nIHBhcmVudE5hbWUgPSBzdWdnZXN0UGFyZW50LmdldFRleHQoKS50cmltKCk7CiAKICAgICBpZiAoIiIuZXF1YWxzKHByb2plY3ROYW1lKSkgewogICAgICAgcHJvamVjdC5zZXRGb2N1cyh0cnVlKTsKQEAgLTIzMCwxMyArMjU1LDEzIEBACiAgICAgfQogCiAgICAgZW5hYmxlRm9ybShmYWxzZSk7Ci0gICAgVXRpbC5QUk9KRUNUX1NWQy5jcmVhdGVOZXdQcm9qZWN0KHByb2plY3ROYW1lLCBwYXJlbnROYW1lLAotICAgICAgICBlbXB0eUNvbW1pdC5nZXRWYWx1ZSgpLCBwZXJtaXNzaW9uc09ubHkuZ2V0VmFsdWUoKSwKLSAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPFZvaWRSZXN1bHQ+KCkgeworICAgIFByb2plY3RBcGkuY3JlYXRlUHJvamVjdChwcm9qZWN0TmFtZSwgcGFyZW50TmFtZSwgZW1wdHlDb21taXQuZ2V0VmFsdWUoKSwKKyAgICAgICAgcGVybWlzc2lvbnNPbmx5LmdldFZhbHVlKCksIG5ldyBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+KCkgewogICAgICAgICAgIEBPdmVycmlkZQogICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhWb2lkUmVzdWx0IHJlc3VsdCkgeworICAgICAgICAgICAgU3RyaW5nIG5hbWVXaXRob3V0U3VmZml4ID0gUHJvamVjdFV0aWwuc3RyaXBHaXRTdWZmaXgocHJvamVjdE5hbWUpOwogICAgICAgICAgICAgSGlzdG9yeS5uZXdJdGVtKERpc3BhdGNoZXIudG9Qcm9qZWN0QWRtaW4obmV3IFByb2plY3QuTmFtZUtleSgKLSAgICAgICAgICAgICAgICBwcm9qZWN0TmFtZSksIFByb2plY3RTY3JlZW4uSU5GTykpOworICAgICAgICAgICAgICAgIG5hbWVXaXRob3V0U3VmZml4KSwgUHJvamVjdFNjcmVlbi5JTkZPKSk7CiAgICAgICAgICAgfQogCiAgICAgICAgICAgQE92ZXJyaWRlCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vR3JvdXBMaXN0U2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vR3JvdXBMaXN0U2NyZWVuLmphdmEKaW5kZXggMzE1N2Q5Ny4uZGFjMGI2YSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0dyb3VwTGlzdFNjcmVlbi5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Hcm91cExpc3RTY3JlZW4uamF2YQpAQCAtMTQsMzYgKzE0LDEwNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbjsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuU2NyZWVuTG9hZENhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5BY2NvdW50U2NyZWVuOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBMaXN0OworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzLkFETUlOX0dST1VQUzsKIAotcHVibGljIGNsYXNzIEdyb3VwTGlzdFNjcmVlbiBleHRlbmRzIEFjY291bnRTY3JlZW4geworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lmdyb3Vwcy5Hcm91cE1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5BY2NvdW50U2NyZWVuOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5GaWx0ZXJlZFVzZXJJbnRlcmZhY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLklnbm9yZU91dGRhdGVkRmlsdGVyUmVzdWx0c0NhbGxiYWNrV3JhcHBlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5VXBFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVVwSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5odHRwLmNsaWVudC5VUkw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSG9yaXpvbnRhbFBhbmVsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkxhYmVsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuZ2xvYmFsa2V5LmNsaWVudC5OcFRleHRCb3g7CisKK3B1YmxpYyBjbGFzcyBHcm91cExpc3RTY3JlZW4gZXh0ZW5kcyBBY2NvdW50U2NyZWVuIGltcGxlbWVudHMgRmlsdGVyZWRVc2VySW50ZXJmYWNlIHsKICAgcHJpdmF0ZSBHcm91cFRhYmxlIGdyb3VwczsKKyAgcHJpdmF0ZSBOcFRleHRCb3ggZmlsdGVyVHh0OworICBwcml2YXRlIFN0cmluZyBzdWJuYW1lOworCisgIHB1YmxpYyBHcm91cExpc3RTY3JlZW4oKSB7CisgIH0KKworICBwdWJsaWMgR3JvdXBMaXN0U2NyZWVuKFN0cmluZyBwYXJhbXMpIHsKKyAgICBmb3IgKFN0cmluZyBrdlBhaXIgOiBwYXJhbXMuc3BsaXQoIlssOyZdIikpIHsKKyAgICAgIFN0cmluZ1tdIGt2ID0ga3ZQYWlyLnNwbGl0KCI9IiwgMik7CisgICAgICBpZiAoa3YubGVuZ3RoICE9IDIgfHwga3ZbMF0uaXNFbXB0eSgpKSB7CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBpZiAoImZpbHRlciIuZXF1YWxzKGt2WzBdKSkgeworICAgICAgICBzdWJuYW1lID0gVVJMLmRlY29kZVF1ZXJ5U3RyaW5nKGt2WzFdKTsKKyAgICAgIH0KKyAgICB9CisgIH0KIAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgb25Mb2FkKCkgewogICAgIHN1cGVyLm9uTG9hZCgpOwotICAgIFV0aWwuR1JPVVBfU1ZDCi0gICAgICAgIC52aXNpYmxlR3JvdXBzKG5ldyBTY3JlZW5Mb2FkQ2FsbGJhY2s8R3JvdXBMaXN0Pih0aGlzKSB7Ci0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHJvdGVjdGVkIHZvaWQgcHJlRGlzcGxheShHcm91cExpc3QgcmVzdWx0KSB7Ci0gICAgICAgICAgICBncm91cHMuZGlzcGxheShyZXN1bHQuZ2V0R3JvdXBzKCkpOwotICAgICAgICAgICAgZ3JvdXBzLmZpbmlzaERpc3BsYXkoKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0pOworICAgIGRpc3BsYXkoKTsKKyAgICByZWZyZXNoKCk7CisgIH0KKworICBwcml2YXRlIHZvaWQgcmVmcmVzaCgpIHsKKyAgICBzZXRUb2tlbihzdWJuYW1lID09IG51bGwgfHwgIiIuZXF1YWxzKHN1Ym5hbWUpID8gQURNSU5fR1JPVVBTCisgICAgICAgIDogQURNSU5fR1JPVVBTICsgIj9maWx0ZXI9IiArIFVSTC5lbmNvZGVRdWVyeVN0cmluZyhzdWJuYW1lKSk7CisgICAgR3JvdXBNYXAubWF0Y2goc3VibmFtZSwKKyAgICAgICAgbmV3IElnbm9yZU91dGRhdGVkRmlsdGVyUmVzdWx0c0NhbGxiYWNrV3JhcHBlcjxHcm91cE1hcD4odGhpcywKKyAgICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxHcm91cE1hcD4oKSB7CisgICAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoR3JvdXBNYXAgcmVzdWx0KSB7CisgICAgICAgICAgICAgICAgZ3JvdXBzLmRpc3BsYXkocmVzdWx0LCBzdWJuYW1lKTsKKyAgICAgICAgICAgICAgICBncm91cHMuZmluaXNoRGlzcGxheSgpOworICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9KSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRDdXJyZW50RmlsdGVyKCkgeworICAgIHJldHVybiBzdWJuYW1lOwogICB9CiAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIG9uSW5pdFVJKCkgewogICAgIHN1cGVyLm9uSW5pdFVJKCk7CiAgICAgc2V0UGFnZVRpdGxlKFV0aWwuQy5ncm91cExpc3RUaXRsZSgpKTsKKyAgICBpbml0UGFnZUhlYWRlcigpOwogCi0gICAgZ3JvdXBzID0gbmV3IEdyb3VwVGFibGUodHJ1ZSAvKiBoeXBlcmxpbmsgdG8gYWRtaW4gKi8sIFBhZ2VMaW5rcy5BRE1JTl9HUk9VUFMpOworICAgIGdyb3VwcyA9IG5ldyBHcm91cFRhYmxlKFBhZ2VMaW5rcy5BRE1JTl9HUk9VUFMpOwogICAgIGFkZChncm91cHMpOwogICB9CiAKKyAgcHJpdmF0ZSB2b2lkIGluaXRQYWdlSGVhZGVyKCkgeworICAgIGZpbmFsIEhvcml6b250YWxQYW5lbCBocCA9IG5ldyBIb3Jpem9udGFsUGFuZWwoKTsKKyAgICBocC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5wcm9qZWN0RmlsdGVyUGFuZWwoKSk7CisgICAgZmluYWwgTGFiZWwgZmlsdGVyTGFiZWwgPSBuZXcgTGFiZWwoVXRpbC5DLnByb2plY3RGaWx0ZXIoKSk7CisgICAgZmlsdGVyTGFiZWwuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucHJvamVjdEZpbHRlckxhYmVsKCkpOworICAgIGhwLmFkZChmaWx0ZXJMYWJlbCk7CisgICAgZmlsdGVyVHh0ID0gbmV3IE5wVGV4dEJveCgpOworICAgIGZpbHRlclR4dC5zZXRWYWx1ZShzdWJuYW1lKTsKKyAgICBmaWx0ZXJUeHQuYWRkS2V5VXBIYW5kbGVyKG5ldyBLZXlVcEhhbmRsZXIoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uS2V5VXAoS2V5VXBFdmVudCBldmVudCkgeworICAgICAgICBzdWJuYW1lID0gZmlsdGVyVHh0LmdldFZhbHVlKCk7CisgICAgICAgIHJlZnJlc2goKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgICBocC5hZGQoZmlsdGVyVHh0KTsKKyAgICBhZGQoaHApOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIG9uU2hvd1ZpZXcoKSB7CisgICAgc3VwZXIub25TaG93VmlldygpOworICAgIGlmIChzdWJuYW1lICE9IG51bGwpIHsKKyAgICAgIGZpbHRlclR4dC5zZXRDdXJzb3JQb3Moc3VibmFtZS5sZW5ndGgoKSk7CisgICAgfQorICAgIGZpbHRlclR4dC5zZXRGb2N1cyh0cnVlKTsKKyAgfQorCiAgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCByZWdpc3RlcktleXMoKSB7CiAgICAgc3VwZXIucmVnaXN0ZXJLZXlzKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vR3JvdXBUYWJsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL0dyb3VwVGFibGUuamF2YQppbmRleCA2ODE4ODQxLi43NmEwY2ZiIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vR3JvdXBUYWJsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Hcm91cFRhYmxlLmphdmEKQEAgLTE0LDQ0ICsxNCw0NSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbjsKIAoraW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW4uVXRpbC5DOworCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkRpc3BhdGNoZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSHlwZXJsaW5rOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ncm91cHMuR3JvdXBJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ncm91cHMuR3JvdXBMaXN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ncm91cHMuR3JvdXBNYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5IaWdobGlnaHRpbmdJbmxpbmVIeXBlcmxpbms7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLk5hdmlnYXRpb25UYWJsZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5VdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5Q29kZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuSGlzdG9yeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BbmNob3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxleFRhYmxlLkZsZXhDZWxsRm9ybWF0dGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkhUTUxUYWJsZS5DZWxsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkltYWdlOwogCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogCiAKLXB1YmxpYyBjbGFzcyBHcm91cFRhYmxlIGV4dGVuZHMgTmF2aWdhdGlvblRhYmxlPEFjY291bnRHcm91cD4geworcHVibGljIGNsYXNzIEdyb3VwVGFibGUgZXh0ZW5kcyBOYXZpZ2F0aW9uVGFibGU8R3JvdXBJbmZvPiB7CiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBOVU1fQ09MUyA9IDM7CiAKLSAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIGVuYWJsZUxpbms7Ci0KLSAgcHVibGljIEdyb3VwVGFibGUoZmluYWwgYm9vbGVhbiBlbmFibGVMaW5rKSB7Ci0gICAgdGhpcyhlbmFibGVMaW5rLCBudWxsKTsKKyAgcHVibGljIEdyb3VwVGFibGUoKSB7CisgICAgdGhpcyhudWxsKTsKICAgfQogCi0gIHB1YmxpYyBHcm91cFRhYmxlKGZpbmFsIGJvb2xlYW4gZW5hYmxlTGluaywgZmluYWwgU3RyaW5nIHBvaW50ZXJJZCkgewotICAgIHRoaXMuZW5hYmxlTGluayA9IGVuYWJsZUxpbms7Ci0KKyAgcHVibGljIEdyb3VwVGFibGUoZmluYWwgU3RyaW5nIHBvaW50ZXJJZCkgeworICAgIHN1cGVyKEMuZ3JvdXBJdGVtSGVscCgpKTsKICAgICBzZXRTYXZlUG9pbnRlcklkKHBvaW50ZXJJZCk7Ci0gICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBQcmV2S2V5Q29tbWFuZCgwLCAnaycsIFV0aWwuQy5ncm91cExpc3RQcmV2KCkpKTsKLSAgICBrZXlzTmF2aWdhdGlvbi5hZGQobmV3IE5leHRLZXlDb21tYW5kKDAsICdqJywgVXRpbC5DLmdyb3VwTGlzdE5leHQoKSkpOwotICAgIGtleXNOYXZpZ2F0aW9uLmFkZChuZXcgT3BlbktleUNvbW1hbmQoMCwgJ28nLCBVdGlsLkMuZ3JvdXBMaXN0T3BlbigpKSk7Ci0gICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBPcGVuS2V5Q29tbWFuZCgwLCBLZXlDb2Rlcy5LRVlfRU5URVIsIFV0aWwuQwotICAgICAgICAuZ3JvdXBMaXN0T3BlbigpKSk7CiAKLSAgICB0YWJsZS5zZXRUZXh0KDAsIDEsIFV0aWwuQy5jb2x1bW5Hcm91cE5hbWUoKSk7Ci0gICAgdGFibGUuc2V0VGV4dCgwLCAyLCBVdGlsLkMuY29sdW1uR3JvdXBEZXNjcmlwdGlvbigpKTsKLSAgICB0YWJsZS5zZXRUZXh0KDAsIDMsIFV0aWwuQy5jb2x1bW5Hcm91cFZpc2libGVUb0FsbCgpKTsKKyAgICB0YWJsZS5zZXRUZXh0KDAsIDEsIEMuY29sdW1uR3JvdXBOYW1lKCkpOworICAgIHRhYmxlLnNldFRleHQoMCwgMiwgQy5jb2x1bW5Hcm91cERlc2NyaXB0aW9uKCkpOworICAgIHRhYmxlLnNldFRleHQoMCwgMywgQy5jb2x1bW5Hcm91cFZpc2libGVUb0FsbCgpKTsKICAgICB0YWJsZS5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIHZvaWQgb25DbGljayhDbGlja0V2ZW50IGV2ZW50KSB7CkBAIC03MCwzNiArNzEsNTcgQEAKICAgfQogCiAgIEBPdmVycmlkZQotICBwcm90ZWN0ZWQgT2JqZWN0IGdldFJvd0l0ZW1LZXkoZmluYWwgQWNjb3VudEdyb3VwIGl0ZW0pIHsKLSAgICByZXR1cm4gaXRlbS5nZXRJZCgpOworICBwcm90ZWN0ZWQgT2JqZWN0IGdldFJvd0l0ZW1LZXkoZmluYWwgR3JvdXBJbmZvIGl0ZW0pIHsKKyAgICByZXR1cm4gaXRlbS5nZXRHcm91cElkKCk7CiAgIH0KIAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgb25PcGVuUm93KGZpbmFsIGludCByb3cpIHsKLSAgICBIaXN0b3J5Lm5ld0l0ZW0oRGlzcGF0Y2hlci50b0dyb3VwKGdldFJvd0l0ZW0ocm93KS5nZXRJZCgpKSk7CisgICAgSGlzdG9yeS5uZXdJdGVtKERpc3BhdGNoZXIudG9Hcm91cChnZXRSb3dJdGVtKHJvdykuZ2V0R3JvdXBJZCgpKSk7CiAgIH0KIAotICBwdWJsaWMgdm9pZCBkaXNwbGF5KGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwPiByZXN1bHQpIHsKKyAgcHVibGljIHZvaWQgZGlzcGxheShHcm91cE1hcCBncm91cHMsIFN0cmluZyB0b0hpZ2hsaWdodCkgeworICAgIGRpc3BsYXkoTmF0aXZlcy5hc0xpc3QoZ3JvdXBzLnZhbHVlcygpKSwgdG9IaWdobGlnaHQpOworICB9CisKKyAgcHVibGljIHZvaWQgZGlzcGxheShHcm91cExpc3QgZ3JvdXBzKSB7CisgICAgZGlzcGxheShOYXRpdmVzLmFzTGlzdChncm91cHMpLCBudWxsKTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIGRpc3BsYXkoTGlzdDxHcm91cEluZm8+IGxpc3QsIFN0cmluZyB0b0hpZ2hsaWdodCkgewogICAgIHdoaWxlICgxIDwgdGFibGUuZ2V0Um93Q291bnQoKSkKICAgICAgIHRhYmxlLnJlbW92ZVJvdyh0YWJsZS5nZXRSb3dDb3VudCgpIC0gMSk7CiAKLSAgICBmb3IoQWNjb3VudEdyb3VwIGdyb3VwIDogcmVzdWx0KSB7CisgICAgQ29sbGVjdGlvbnMuc29ydChsaXN0LCBuZXcgQ29tcGFyYXRvcjxHcm91cEluZm8+KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgaW50IGNvbXBhcmUoR3JvdXBJbmZvIGEsIEdyb3VwSW5mbyBiKSB7CisgICAgICAgIHJldHVybiBhLm5hbWUoKS5jb21wYXJlVG8oYi5uYW1lKCkpOworICAgICAgfQorICAgIH0pOworICAgIGZvcihHcm91cEluZm8gZ3JvdXAgOiBsaXN0KSB7CiAgICAgICBmaW5hbCBpbnQgcm93ID0gdGFibGUuZ2V0Um93Q291bnQoKTsKICAgICAgIHRhYmxlLmluc2VydFJvdyhyb3cpOwogICAgICAgYXBwbHlEYXRhUm93U3R5bGUocm93KTsKLSAgICAgIHBvcHVsYXRlKHJvdywgZ3JvdXApOworICAgICAgcG9wdWxhdGUocm93LCBncm91cCwgdG9IaWdobGlnaHQpOwogICAgIH0KICAgfQogCi0gIHZvaWQgcG9wdWxhdGUoZmluYWwgaW50IHJvdywgZmluYWwgQWNjb3VudEdyb3VwIGspIHsKLSAgICBpZiAoZW5hYmxlTGluaykgewotICAgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgMSwgbmV3IEh5cGVybGluayhrLmdldE5hbWUoKSwKLSAgICAgICAgICBEaXNwYXRjaGVyLnRvR3JvdXAoay5nZXRJZCgpKSkpOworICB2b2lkIHBvcHVsYXRlKGZpbmFsIGludCByb3csIGZpbmFsIEdyb3VwSW5mbyBrLCBmaW5hbCBTdHJpbmcgdG9IaWdobGlnaHQpIHsKKyAgICBpZiAoay51cmwoKSAhPSBudWxsKSB7CisgICAgICBpZiAoay51cmwoKS5zdGFydHNXaXRoKCIjIiArIFBhZ2VMaW5rcy5BRE1JTl9HUk9VUFMpKSB7CisgICAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIDEsIG5ldyBIaWdobGlnaHRpbmdJbmxpbmVIeXBlcmxpbmsoay5uYW1lKCksCisgICAgICAgICAgICBEaXNwYXRjaGVyLnRvR3JvdXAoay5nZXRHcm91cElkKCkpLCB0b0hpZ2hsaWdodCkpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgQW5jaG9yIGxpbmsgPSBuZXcgQW5jaG9yKCk7CisgICAgICAgIGxpbmsuc2V0SFRNTChVdGlsLmhpZ2hsaWdodChrLm5hbWUoKSwgdG9IaWdobGlnaHQpKTsKKyAgICAgICAgbGluay5zZXRIcmVmKGsudXJsKCkpOworICAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAxLCBsaW5rKTsKKyAgICAgIH0KICAgICB9IGVsc2UgewotICAgICAgdGFibGUuc2V0VGV4dChyb3csIDEsIGsuZ2V0TmFtZSgpKTsKKyAgICAgIHRhYmxlLnNldEhUTUwocm93LCAxLCBVdGlsLmhpZ2hsaWdodChrLm5hbWUoKSwgdG9IaWdobGlnaHQpKTsKICAgICB9Ci0gICAgdGFibGUuc2V0VGV4dChyb3csIDIsIGsuZ2V0RGVzY3JpcHRpb24oKSk7Ci0gICAgaWYgKGsuaXNWaXNpYmxlVG9BbGwoKSkgeworICAgIHRhYmxlLnNldFRleHQocm93LCAyLCBrLmRlc2NyaXB0aW9uKCkpOworICAgIGlmIChrLm9wdGlvbnMoKS5pc1Zpc2libGVUb0FsbCgpKSB7CiAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAzLCBuZXcgSW1hZ2UoR2Vycml0LlJFU09VUkNFUy5ncmVlbkNoZWNrKCkpKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9QZXJtaXNzaW9uRWRpdG9yLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUGVybWlzc2lvbkVkaXRvci5qYXZhCmluZGV4IDJjNDMyMzMuLjk4NDhjMTggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9QZXJtaXNzaW9uRWRpdG9yLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Blcm1pc3Npb25FZGl0b3IuamF2YQpAQCAtMTQsMTMgKzE0LDEzIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFkbWluOwogCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TdWdnZXN0VXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BY2Nlc3NTZWN0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwUmVmZXJlbmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvblJhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb25SdWxlOwpAQCAtMTAyLDE2ICsxMDIsMTkgQEAKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWU7CiAgIHByaXZhdGUgZmluYWwgYm9vbGVhbiByZWFkT25seTsKICAgcHJpdmF0ZSBmaW5hbCBBY2Nlc3NTZWN0aW9uIHNlY3Rpb247CisgIHByaXZhdGUgZmluYWwgTGFiZWxUeXBlcyBsYWJlbFR5cGVzOwogICBwcml2YXRlIFBlcm1pc3Npb24gdmFsdWU7CiAgIHByaXZhdGUgUGVybWlzc2lvblJhbmdlLldpdGhEZWZhdWx0cyB2YWxpZFJhbmdlOwogICBwcml2YXRlIGJvb2xlYW4gaXNEZWxldGVkOwogCiAgIHB1YmxpYyBQZXJtaXNzaW9uRWRpdG9yKFByb2plY3QuTmFtZUtleSBwcm9qZWN0TmFtZSwKICAgICAgIGJvb2xlYW4gcmVhZE9ubHksCi0gICAgICBBY2Nlc3NTZWN0aW9uIHNlY3Rpb24pIHsKKyAgICAgIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbiwKKyAgICAgIExhYmVsVHlwZXMgbGFiZWxUeXBlcykgewogICAgIHRoaXMucmVhZE9ubHkgPSByZWFkT25seTsKICAgICB0aGlzLnNlY3Rpb24gPSBzZWN0aW9uOwogICAgIHRoaXMucHJvamVjdE5hbWUgPSBwcm9qZWN0TmFtZTsKKyAgICB0aGlzLmxhYmVsVHlwZXMgPSBsYWJlbFR5cGVzOwogCiAgICAgbm9ybWFsTmFtZSA9IG5ldyBWYWx1ZUxhYmVsPFN0cmluZz4oUGVybWlzc2lvbk5hbWVSZW5kZXJlci5JTlNUQU5DRSk7CiAgICAgZGVsZXRlZE5hbWUgPSBuZXcgVmFsdWVMYWJlbDxTdHJpbmc+KFBlcm1pc3Npb25OYW1lUmVuZGVyZXIuSU5TVEFOQ0UpOwpAQCAtMjYwLDEyICsyNjMsMTIgQEAKICAgICB0aGlzLnZhbHVlID0gdmFsdWU7CiAKICAgICBpZiAodmFsdWUuaXNMYWJlbCgpKSB7Ci0gICAgICBBcHByb3ZhbFR5cGUgYXQgPSBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0QXBwcm92YWxUeXBlcygpLmJ5TGFiZWwodmFsdWUuZ2V0TGFiZWwoKSk7Ci0gICAgICBpZiAoYXQgIT0gbnVsbCkgeworICAgICAgTGFiZWxUeXBlIGx0ID0gbGFiZWxUeXBlcy5ieUxhYmVsKHZhbHVlLmdldExhYmVsKCkpOworICAgICAgaWYgKGx0ICE9IG51bGwpIHsKICAgICAgICAgdmFsaWRSYW5nZSA9IG5ldyBQZXJtaXNzaW9uUmFuZ2UuV2l0aERlZmF1bHRzKAogICAgICAgICAgICAgdmFsdWUuZ2V0TmFtZSgpLAotICAgICAgICAgICAgYXQuZ2V0TWluKCkuZ2V0VmFsdWUoKSwgYXQuZ2V0TWF4KCkuZ2V0VmFsdWUoKSwKLSAgICAgICAgICAgIGF0LmdldE1pbigpLmdldFZhbHVlKCksIGF0LmdldE1heCgpLmdldFZhbHVlKCkpOworICAgICAgICAgICAgbHQuZ2V0TWluKCkuZ2V0VmFsdWUoKSwgbHQuZ2V0TWF4KCkuZ2V0VmFsdWUoKSwKKyAgICAgICAgICAgIGx0LmdldE1pbigpLmdldFZhbHVlKCksIGx0LmdldE1heCgpLmdldFZhbHVlKCkpOwogICAgICAgfQogICAgIH0gZWxzZSBpZiAoR2xvYmFsQ2FwYWJpbGl0eS5pc0NhcGFiaWxpdHkodmFsdWUuZ2V0TmFtZSgpKSkgewogICAgICAgdmFsaWRSYW5nZSA9IEdsb2JhbENhcGFiaWxpdHkuZ2V0UmFuZ2UodmFsdWUuZ2V0TmFtZSgpKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9QZXJtaXNzaW9uUnVsZUVkaXRvci5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Blcm1pc3Npb25SdWxlRWRpdG9yLmphdmEKaW5kZXggNWRkOGIzYy4uMGMyNjI5YyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Blcm1pc3Npb25SdWxlRWRpdG9yLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Blcm1pc3Npb25SdWxlRWRpdG9yLmphdmEKQEAgLTE0LDYgKzE0LDcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW47CiAKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbi5FRElUX1RPUElDX05BTUU7CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb24uUFVTSDsKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbi5QVVNIX1RBRzsKIApAQCAtMTM3LDggKzEzOCwxMSBAQAogICAgIGlmIChjYW5Gb3JjZSkgewogICAgICAgU3RyaW5nIHJlZiA9IHNlY3Rpb24uZ2V0TmFtZSgpOwogICAgICAgY2FuRm9yY2UgPSAhcmVmLnN0YXJ0c1dpdGgoInJlZnMvZm9yLyIpICYmICFyZWYuc3RhcnRzV2l0aCgiXnJlZnMvZm9yLyIpOworICAgICAgZm9yY2Uuc2V0VGV4dChQZXJtaXNzaW9uUnVsZS5GT1JDRV9QVVNIKTsKKyAgICB9IGVsc2UgeworICAgICAgY2FuRm9yY2UgPSBFRElUX1RPUElDX05BTUUuZXF1YWxzKG5hbWUpOworICAgICAgZm9yY2Uuc2V0VGV4dChQZXJtaXNzaW9uUnVsZS5GT1JDRV9FRElUKTsKICAgICB9Ci0gICAgZm9yY2Uuc2V0VGV4dChQZXJtaXNzaW9uUnVsZS5GT1JDRV9QVVNIKTsKICAgICBmb3JjZS5zZXRWaXNpYmxlKGNhbkZvcmNlKTsKICAgICBmb3JjZS5zZXRFbmFibGVkKCFyZWFkT25seSk7CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9QbHVnaW5MaXN0U2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUGx1Z2luTGlzdFNjcmVlbi5qYXZhCmluZGV4IDM5NDhiMzUuLjllNGI4MWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9QbHVnaW5MaXN0U2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1BsdWdpbkxpc3RTY3JlZW4uamF2YQpAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBsdWdpbnMuUGx1Z2luSW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucGx1Z2lucy5QbHVnaW5NYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuU2NyZWVuTG9hZENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5GYW5jeUZsZXhUYWJsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BbmNob3I7CkBAIC03Myw3ICs3NCw3IEBACiAgICAgICAgIHRhYmxlLnJlbW92ZVJvdyh0YWJsZS5nZXRSb3dDb3VudCgpIC0gMSk7CiAgICAgICB9CiAKLSAgICAgIGZvciAoZmluYWwgUGx1Z2luSW5mbyBwIDogcGx1Z2lucy52YWx1ZXMoKS5hc0xpc3QoKSkgeworICAgICAgZm9yIChmaW5hbCBQbHVnaW5JbmZvIHAgOiBOYXRpdmVzLmFzTGlzdChwbHVnaW5zLnZhbHVlcygpKSkgewogICAgICAgICBmaW5hbCBpbnQgcm93ID0gdGFibGUuZ2V0Um93Q291bnQoKTsKICAgICAgICAgdGFibGUuaW5zZXJ0Um93KHJvdyk7CiAgICAgICAgIGFwcGx5RGF0YVJvd1N0eWxlKHJvdyk7CkBAIC05Miw5ICs5Myw4IEBACiAgICAgICAgICAgICAgICAgKyBwbHVnaW4ubmFtZSgpICsgIi8iKSkpOwogICAgICAgfQogICAgICAgdGFibGUuc2V0VGV4dChyb3csIDIsIHBsdWdpbi52ZXJzaW9uKCkpOwotICAgICAgaWYgKHBsdWdpbi5pc0Rpc2FibGVkKCkpIHsKLSAgICAgICAgdGFibGUuc2V0VGV4dChyb3csIDMsIFV0aWwuQy5wbHVnaW5EaXNhYmxlZCgpKTsKLSAgICAgIH0KKyAgICAgIHRhYmxlLnNldFRleHQocm93LCAzLCBwbHVnaW4uaXNEaXNhYmxlZCgpID8gVXRpbC5DLnBsdWdpbkRpc2FibGVkKCkKKyAgICAgICAgICA6IFV0aWwuQy5wbHVnaW5FbmFibGVkKCkpOwogCiAgICAgICBmaW5hbCBGbGV4Q2VsbEZvcm1hdHRlciBmbXQgPSB0YWJsZS5nZXRGbGV4Q2VsbEZvcm1hdHRlcigpOwogICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdEFjY2Vzc1NjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RBY2Nlc3NTY3JlZW4uamF2YQppbmRleCA0NDAzY2U2Li45NjgyNGYzIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdEFjY2Vzc1NjcmVlbi5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Qcm9qZWN0QWNjZXNzU2NyZWVuLmphdmEKQEAgLTE0LDYgKzE0LDkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW47CiAKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlByb2plY3RBY2Nlc3NVdGlsLm1lcmdlU2VjdGlvbnM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5Qcm9qZWN0QWNjZXNzVXRpbC5yZW1vdmVFbXB0eVBlcm1pc3Npb25zQW5kU2VjdGlvbnM7CisKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5TY3JlZW5Mb2FkQ2FsbGJhY2s7CkBAIC0zOSw2ICs0Miw3IEBACiAKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIAogcHVibGljIGNsYXNzIFByb2plY3RBY2Nlc3NTY3JlZW4gZXh0ZW5kcyBQcm9qZWN0U2NyZWVuIHsKQEAgLTExMCw2ICsxMTQsNyBAQAogICAgICAgICAgICAgZGlzcGxheVJlYWRPbmx5KGFjY2Vzcyk7CiAgICAgICAgICAgfQogICAgICAgICB9KTsKKyAgICBzYXZlZFBhbmVsID0gQUNDRVNTOwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGRpc3BsYXlSZWFkT25seShQcm9qZWN0QWNjZXNzIGFjY2VzcykgewpAQCAtMTk0LDEyICsxOTksMTQgQEAKIAogICAgICAgICAgIHByaXZhdGUgU2V0PFN0cmluZz4gZ2V0RGlmZnMoUHJvamVjdEFjY2VzcyB3YW50ZWRBY2Nlc3MsCiAgICAgICAgICAgICAgIFByb2plY3RBY2Nlc3MgbmV3QWNjZXNzKSB7CisgICAgICAgICAgICBmaW5hbCBMaXN0PEFjY2Vzc1NlY3Rpb24+IHdhbnRlZFNlY3Rpb25zID0KKyAgICAgICAgICAgICAgICBtZXJnZVNlY3Rpb25zKHJlbW92ZUVtcHR5UGVybWlzc2lvbnNBbmRTZWN0aW9ucyh3YW50ZWRBY2Nlc3MuZ2V0TG9jYWwoKSkpOwogICAgICAgICAgICAgZmluYWwgSGFzaFNldDxBY2Nlc3NTZWN0aW9uPiBzYW1lID0KLSAgICAgICAgICAgICAgICBuZXcgSGFzaFNldDxBY2Nlc3NTZWN0aW9uPih3YW50ZWRBY2Nlc3MuZ2V0TG9jYWwoKSk7CisgICAgICAgICAgICAgICAgbmV3IEhhc2hTZXQ8QWNjZXNzU2VjdGlvbj4od2FudGVkU2VjdGlvbnMpOwogICAgICAgICAgICAgZmluYWwgSGFzaFNldDxBY2Nlc3NTZWN0aW9uPiBkaWZmZXJlbnQgPQotICAgICAgICAgICAgICAgIG5ldyBIYXNoU2V0PEFjY2Vzc1NlY3Rpb24+KHdhbnRlZEFjY2Vzcy5nZXRMb2NhbCgpLnNpemUoKQorICAgICAgICAgICAgICAgIG5ldyBIYXNoU2V0PEFjY2Vzc1NlY3Rpb24+KHdhbnRlZFNlY3Rpb25zLnNpemUoKQogICAgICAgICAgICAgICAgICAgICArIG5ld0FjY2Vzcy5nZXRMb2NhbCgpLnNpemUoKSk7Ci0gICAgICAgICAgICBkaWZmZXJlbnQuYWRkQWxsKHdhbnRlZEFjY2Vzcy5nZXRMb2NhbCgpKTsKKyAgICAgICAgICAgIGRpZmZlcmVudC5hZGRBbGwod2FudGVkU2VjdGlvbnMpOwogICAgICAgICAgICAgZGlmZmVyZW50LmFkZEFsbChuZXdBY2Nlc3MuZ2V0TG9jYWwoKSk7CiAgICAgICAgICAgICBzYW1lLnJldGFpbkFsbChuZXdBY2Nlc3MuZ2V0TG9jYWwoKSk7CiAgICAgICAgICAgICBkaWZmZXJlbnQucmVtb3ZlQWxsKHNhbWUpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RBY2Nlc3NTY3JlZW4udWkueG1sIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RBY2Nlc3NTY3JlZW4udWkueG1sCmluZGV4IGE2NjQxOTEuLmFiMjZiYTggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Qcm9qZWN0QWNjZXNzU2NyZWVuLnVpLnhtbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdEFjY2Vzc1NjcmVlbi51aS54bWwKQEAgLTgzLDYgKzgzLDUgQEAKICAgICAgIDx1aTphdHRyaWJ1dGUgbmFtZT0ndGV4dCcvPgogICAgIDwvZzpCdXR0b24+CiAgIDwvZGl2PgotICA8ZGl2IHN0eWxlPSd3aWR0aDogMzVlbTsgdmlzaWJpbGl0eTogaGlkZGVuOycgLz4KIDwvZzpIVE1MUGFuZWw+CiA8L3VpOlVpQmluZGVyPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RCcmFuY2hlc1NjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RCcmFuY2hlc1NjcmVlbi5qYXZhCmluZGV4IDU2ZDk0MTcuLmE3YzZhMjMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Qcm9qZWN0QnJhbmNoZXNTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdEJyYW5jaGVzU2NyZWVuLmphdmEKQEAgLTI0LDkgKzI0LDggQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQnJhbmNoTGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuRmFuY3lGbGV4VGFibGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkhpbnRUZXh0Qm94OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFkZEJyYW5jaFJlc3VsdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MaXN0QnJhbmNoZXNSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5JbnZhbGlkTmFtZUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkludmFsaWRSZXZpc2lvbkV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CkBAIC00NCw5ICs0Myw5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxvd1BhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkdyaWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuTGFiZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVGV4dEJveDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5WZXJ0aWNhbFBhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2FmZWh0bWwuY2xpZW50LlNhZmVIdG1sQnVpbGRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY2xpZW50LlJlbW90ZUpzb25FeGNlcHRpb247CiAKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKQEAgLTg3LDYgKzg2LDcgQEAKICAgICAgICAgICAgIH0KICAgICAgICAgICB9CiAgICAgICAgIH0pOworICAgIHNhdmVkUGFuZWwgPSBCUkFOQ0g7CiAgIH0KIAogICBwcml2YXRlIHZvaWQgZGlzcGxheShmaW5hbCBMaXN0PEJyYW5jaD4gbGlzdEJyYW5jaGVzKSB7CkBAIC0xMDYsMTIgKzEwNiwxMyBAQAogICAgIHN1cGVyLm9uSW5pdFVJKCk7CiAKICAgICBhZGRQYW5lbCA9IG5ldyBGbG93UGFuZWwoKTsKLSAgICBhZGRQYW5lbC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5hZGRTc2hLZXlQYW5lbCgpKTsKIAogICAgIGZpbmFsIEdyaWQgYWRkR3JpZCA9IG5ldyBHcmlkKDIsIDIpOworICAgIGFkZEdyaWQuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuYWRkQnJhbmNoKCkpOworICAgIGZpbmFsIGludCB0ZXhCb3hMZW5ndGggPSA1MDsKIAogICAgIG5hbWVUeHRCb3ggPSBuZXcgSGludFRleHRCb3goKTsKLSAgICBuYW1lVHh0Qm94LnNldFZpc2libGVMZW5ndGgoNTApOworICAgIG5hbWVUeHRCb3guc2V0VmlzaWJsZUxlbmd0aCh0ZXhCb3hMZW5ndGgpOwogICAgIG5hbWVUeHRCb3guc2V0SGludFRleHQoVXRpbC5DLmRlZmF1bHRCcmFuY2hOYW1lKCkpOwogICAgIG5hbWVUeHRCb3guYWRkS2V5UHJlc3NIYW5kbGVyKG5ldyBLZXlQcmVzc0hhbmRsZXIoKSB7CiAgICAgICBAT3ZlcnJpZGUKQEAgLTEyNSw3ICsxMjYsNyBAQAogICAgIGFkZEdyaWQuc2V0V2lkZ2V0KDAsIDEsIG5hbWVUeHRCb3gpOwogCiAgICAgaXJldlR4dEJveCA9IG5ldyBIaW50VGV4dEJveCgpOwotICAgIGlyZXZUeHRCb3guc2V0VmlzaWJsZUxlbmd0aCg1MCk7CisgICAgaXJldlR4dEJveC5zZXRWaXNpYmxlTGVuZ3RoKHRleEJveExlbmd0aCk7CiAgICAgaXJldlR4dEJveC5zZXRIaW50VGV4dChVdGlsLkMuZGVmYXVsdFJldmlzaW9uU3BlYygpKTsKICAgICBpcmV2VHh0Qm94LmFkZEtleVByZXNzSGFuZGxlcihuZXcgS2V5UHJlc3NIYW5kbGVyKCkgewogICAgICAgQE92ZXJyaWRlCkBAIC0xNjQsMTMgKzE2NSwxMyBAQAogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGRvQWRkTmV3QnJhbmNoKCkgewotICAgIFN0cmluZyBicmFuY2hOYW1lID0gbmFtZVR4dEJveC5nZXRUZXh0KCk7CisgICAgZmluYWwgU3RyaW5nIGJyYW5jaE5hbWUgPSBuYW1lVHh0Qm94LmdldFRleHQoKTsKICAgICBpZiAoIiIuZXF1YWxzKGJyYW5jaE5hbWUpKSB7CiAgICAgICBuYW1lVHh0Qm94LnNldEZvY3VzKHRydWUpOwogICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFN0cmluZyByZXYgPSBpcmV2VHh0Qm94LmdldFRleHQoKTsKKyAgICBmaW5hbCBTdHJpbmcgcmV2ID0gaXJldlR4dEJveC5nZXRUZXh0KCk7CiAgICAgaWYgKCIiLmVxdWFscyhyZXYpKSB7CiAgICAgICBpcmV2VHh0Qm94LnNldFRleHQoIkhFQUQiKTsKICAgICAgIFNjaGVkdWxlci5nZXQoKS5zY2hlZHVsZURlZmVycmVkKG5ldyBTY2hlZHVsZWRDb21tYW5kKCkgewpAQCAtMTgzLDQxICsxODQsNzAgQEAKICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoIWJyYW5jaE5hbWUuc3RhcnRzV2l0aChCcmFuY2guUl9SRUZTKSkgewotICAgICAgYnJhbmNoTmFtZSA9IEJyYW5jaC5SX0hFQURTICsgYnJhbmNoTmFtZTsKLSAgICB9Ci0KICAgICBhZGRCcmFuY2guc2V0RW5hYmxlZChmYWxzZSk7CiAgICAgVXRpbC5QUk9KRUNUX1NWQy5hZGRCcmFuY2goZ2V0UHJvamVjdEtleSgpLCBicmFuY2hOYW1lLCByZXYsCi0gICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxMaXN0QnJhbmNoZXNSZXN1bHQ+KCkgewotICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBMaXN0QnJhbmNoZXNSZXN1bHQgcmVzdWx0KSB7CisgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxBZGRCcmFuY2hSZXN1bHQ+KCkgeworICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhmaW5hbCBBZGRCcmFuY2hSZXN1bHQgcmVzdWx0KSB7CiAgICAgICAgICAgICBhZGRCcmFuY2guc2V0RW5hYmxlZCh0cnVlKTsKLSAgICAgICAgICAgIG5hbWVUeHRCb3guc2V0VGV4dCgiIik7Ci0gICAgICAgICAgICBpcmV2VHh0Qm94LnNldFRleHQoIiIpOwotICAgICAgICAgICAgZGlzcGxheShyZXN1bHQuZ2V0QnJhbmNoZXMoKSk7CisgICAgICAgICAgICBpZiAoIXJlc3VsdC5oYXNFcnJvcigpKSB7CisgICAgICAgICAgICAgIG5hbWVUeHRCb3guc2V0VGV4dCgiIik7CisgICAgICAgICAgICAgIGlyZXZUeHRCb3guc2V0VGV4dCgiIik7CisgICAgICAgICAgICAgIGRpc3BsYXkocmVzdWx0LmdldExpc3RCcmFuY2hlc1Jlc3VsdCgpLmdldEJyYW5jaGVzKCkpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgZmluYWwgQWRkQnJhbmNoUmVzdWx0LkVycm9yIGVycm9yID0gcmVzdWx0LmdldEVycm9yKCk7CisgICAgICAgICAgICAgIGZpbmFsIFN0cmluZyBtc2c7CisgICAgICAgICAgICAgIHN3aXRjaCAoZXJyb3IuZ2V0VHlwZSgpKSB7CisgICAgICAgICAgICAgICAgY2FzZSBJTlZBTElEX05BTUU6CisgICAgICAgICAgICAgICAgICBzZWxlY3RBbGxBbmRGb2N1cyhuYW1lVHh0Qm94KTsKKyAgICAgICAgICAgICAgICAgIG1zZyA9IEdlcnJpdC5NLmludmFsaWRCcmFuY2hOYW1lKGJyYW5jaE5hbWUpOworICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBjYXNlIElOVkFMSURfUkVWSVNJT046CisgICAgICAgICAgICAgICAgICBzZWxlY3RBbGxBbmRGb2N1cyhpcmV2VHh0Qm94KTsKKyAgICAgICAgICAgICAgICAgIG1zZyA9IEdlcnJpdC5NLmludmFsaWRSZXZpc2lvbihyZXYpOworICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBjYXNlIEJSQU5DSF9DUkVBVElPTl9OT1RfQUxMT1dFRF9VTkRFUl9SRUZOQU1FX1BSRUZJWDoKKyAgICAgICAgICAgICAgICAgIHNlbGVjdEFsbEFuZEZvY3VzKG5hbWVUeHRCb3gpOworICAgICAgICAgICAgICAgICAgbXNnID0KKyAgICAgICAgICAgICAgICAgICAgICBHZXJyaXQuTS5icmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRVbmRlclJlZm5hbWVQcmVmaXgoZXJyb3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgLmdldFJlZm5hbWUoKSk7CisgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgIGNhc2UgQlJBTkNIX0FMUkVBRFlfRVhJU1RTOgorICAgICAgICAgICAgICAgICAgc2VsZWN0QWxsQW5kRm9jdXMobmFtZVR4dEJveCk7CisgICAgICAgICAgICAgICAgICBtc2cgPSBHZXJyaXQuTS5icmFuY2hBbHJlYWR5RXhpc3RzKGVycm9yLmdldFJlZm5hbWUoKSk7CisgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgIGNhc2UgQlJBTkNIX0NSRUFUSU9OX0NPTkZMSUNUOgorICAgICAgICAgICAgICAgICAgc2VsZWN0QWxsQW5kRm9jdXMobmFtZVR4dEJveCk7CisgICAgICAgICAgICAgICAgICBtc2cgPQorICAgICAgICAgICAgICAgICAgICAgIEdlcnJpdC5NLmJyYW5jaENyZWF0aW9uQ29uZmxpY3QoYnJhbmNoTmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IuZ2V0UmVmbmFtZSgpKTsKKyAgICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgIG1zZyA9CisgICAgICAgICAgICAgICAgICAgICAgR2Vycml0Lk0uYnJhbmNoQ3JlYXRpb25GYWlsZWQoYnJhbmNoTmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IudG9TdHJpbmcoKSk7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgbmV3IEVycm9yRGlhbG9nKG1zZykuY2VudGVyKCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgfQogCiAgICAgICAgICAgQE92ZXJyaWRlCiAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKGZpbmFsIFRocm93YWJsZSBjYXVnaHQpIHsKLSAgICAgICAgICAgIGlmIChjYXVnaHQgaW5zdGFuY2VvZiBJbnZhbGlkTmFtZUV4Y2VwdGlvbgotICAgICAgICAgICAgICAgIHx8IGNhdWdodCBpbnN0YW5jZW9mIFJlbW90ZUpzb25FeGNlcHRpb24KLSAgICAgICAgICAgICAgICAmJiBjYXVnaHQuZ2V0TWVzc2FnZSgpLmVxdWFscyhJbnZhbGlkTmFtZUV4Y2VwdGlvbi5NRVNTQUdFKSkgewotICAgICAgICAgICAgICBuYW1lVHh0Qm94LnNlbGVjdEFsbCgpOwotICAgICAgICAgICAgICBuYW1lVHh0Qm94LnNldEZvY3VzKHRydWUpOwotCi0gICAgICAgICAgICB9IGVsc2UgaWYgKGNhdWdodCBpbnN0YW5jZW9mIEludmFsaWRSZXZpc2lvbkV4Y2VwdGlvbgotICAgICAgICAgICAgICAgIHx8IGNhdWdodCBpbnN0YW5jZW9mIFJlbW90ZUpzb25FeGNlcHRpb24KLSAgICAgICAgICAgICAgICAmJiBjYXVnaHQuZ2V0TWVzc2FnZSgpLmVxdWFscyhJbnZhbGlkUmV2aXNpb25FeGNlcHRpb24uTUVTU0FHRSkpIHsKLSAgICAgICAgICAgICAgaXJldlR4dEJveC5zZWxlY3RBbGwoKTsKLSAgICAgICAgICAgICAgaXJldlR4dEJveC5zZXRGb2N1cyh0cnVlKTsKLSAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgYWRkQnJhbmNoLnNldEVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICBzdXBlci5vbkZhaWx1cmUoY2F1Z2h0KTsKICAgICAgICAgICB9CiAgICAgICAgIH0pOwogICB9CiAKKyAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBzZWxlY3RBbGxBbmRGb2N1cyhmaW5hbCBUZXh0Qm94IHRleHRCb3gpIHsKKyAgICB0ZXh0Qm94LnNlbGVjdEFsbCgpOworICAgIHRleHRCb3guc2V0Rm9jdXModHJ1ZSk7CisgIH0KKwogICBwcml2YXRlIGNsYXNzIEJyYW5jaGVzVGFibGUgZXh0ZW5kcyBGYW5jeUZsZXhUYWJsZTxCcmFuY2g+IHsKICAgICBib29sZWFuIGNhbkRlbGV0ZTsKIApkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3REYXNoYm9hcmRzU2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdERhc2hib2FyZHNTY3JlZW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNzc5ODYxCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3REYXNoYm9hcmRzU2NyZWVuLmphdmEKQEAgLTAsMCArMSw2MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbjsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kYXNoYm9hcmRzLkRhc2hib2FyZExpc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmRhc2hib2FyZHMuRGFzaGJvYXJkc1RhYmxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuU2NyZWVuTG9hZENhbGxiYWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkpzQXJyYXk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxvd1BhbmVsOworCitwdWJsaWMgY2xhc3MgUHJvamVjdERhc2hib2FyZHNTY3JlZW4gZXh0ZW5kcyBQcm9qZWN0U2NyZWVuIHsKKyAgcHJpdmF0ZSBEYXNoYm9hcmRzVGFibGUgZGFzaGVzOworICBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdDsKKworICBwdWJsaWMgUHJvamVjdERhc2hib2FyZHNTY3JlZW4oZmluYWwgUHJvamVjdC5OYW1lS2V5IHByb2plY3QpIHsKKyAgICBzdXBlcihwcm9qZWN0KTsKKyAgICB0aGlzLnByb2plY3QgPSBwcm9qZWN0OworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIG9uTG9hZCgpIHsKKyAgICBzdXBlci5vbkxvYWQoKTsKKyAgICBEYXNoYm9hcmRMaXN0LmFsbChnZXRQcm9qZWN0S2V5KCksCisgICAgICAgIG5ldyBTY3JlZW5Mb2FkQ2FsbGJhY2s8SnNBcnJheTxEYXNoYm9hcmRMaXN0Pj4odGhpcykgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwcm90ZWN0ZWQgdm9pZCBwcmVEaXNwbGF5KEpzQXJyYXk8RGFzaGJvYXJkTGlzdD4gcmVzdWx0KSB7CisgICAgICAgIGRhc2hlcy5kaXNwbGF5KHJlc3VsdCk7CisgICAgICB9CisgICAgfSk7CisgICAgc2F2ZWRQYW5lbCA9IERBU0hCT0FSRFM7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgb25Jbml0VUkoKSB7CisgICAgc3VwZXIub25Jbml0VUkoKTsKKyAgICBkYXNoZXMgPSBuZXcgRGFzaGJvYXJkc1RhYmxlKHByb2plY3QpOworICAgIEZsb3dQYW5lbCBmcCA9IG5ldyBGbG93UGFuZWwoKTsKKyAgICBmcC5hZGQoZGFzaGVzKTsKKyAgICBhZGQoZnApOworICAgIGRhc2hlcy5zZXRTYXZlUG9pbnRlcklkKCJkYXNoYm9hcmRzL3Byb2plY3QvIiArIGdldFByb2plY3RLZXkoKS5nZXQoKSk7CisgICAgZGlzcGxheSgpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIHJlZ2lzdGVyS2V5cygpIHsKKyAgICBzdXBlci5yZWdpc3RlcktleXMoKTsKKyAgICBkYXNoZXMuc2V0UmVnaXN0ZXJLZXlzKHRydWUpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdEluZm9TY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Qcm9qZWN0SW5mb1NjcmVlbi5qYXZhCmluZGV4IDk0NGExNjkuLjQwOTIxMzA5IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdEluZm9TY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdEluZm9TY3JlZW4uamF2YQpAQCAtMTUsMzYgKzE1LDQzIEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbjsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmRvd25sb2FkLkRvd25sb2FkUGFuZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLlNjcmVlbkxvYWRDYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuT25FZGl0RW5hYmxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuU21hbGxIZWFkaW5nOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlByb2plY3REZXRhaWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Jbmhlcml0ZWRCb29sZWFuOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2hhbmdlRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DaGFuZ2VIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5CdXR0b247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQ2hlY2tCb3g7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxleFRhYmxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkxpc3RCb3g7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuUGFuZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVmVydGljYWxQYW5lbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5nbG9iYWxrZXkuY2xpZW50Lk5wVGV4dEFyZWE7CiAKIHB1YmxpYyBjbGFzcyBQcm9qZWN0SW5mb1NjcmVlbiBleHRlbmRzIFByb2plY3RTY3JlZW4geworICBwcml2YXRlIFN0cmluZyBwcm9qZWN0TmFtZTsKICAgcHJpdmF0ZSBQcm9qZWN0IHByb2plY3Q7CiAKLSAgcHJpdmF0ZSBQYW5lbCBwcm9qZWN0T3B0aW9uc1BhbmVsOwotICBwcml2YXRlIENoZWNrQm94IHJlcXVpcmVDaGFuZ2VJRDsKKyAgcHJpdmF0ZSBMYWJlbGVkV2lkZ2V0c0dyaWQgZ3JpZDsKKworICAvLyBTZWN0aW9uOiBQcm9qZWN0IE9wdGlvbnMKKyAgcHJpdmF0ZSBMaXN0Qm94IHJlcXVpcmVDaGFuZ2VJRDsKICAgcHJpdmF0ZSBMaXN0Qm94IHN1Ym1pdFR5cGU7CiAgIHByaXZhdGUgTGlzdEJveCBzdGF0ZTsKLSAgcHJpdmF0ZSBDaGVja0JveCB1c2VDb250ZW50TWVyZ2U7CisgIHByaXZhdGUgTGlzdEJveCBjb250ZW50TWVyZ2U7CiAKLSAgcHJpdmF0ZSBQYW5lbCBhZ3JlZW1lbnRzUGFuZWw7Ci0gIHByaXZhdGUgQ2hlY2tCb3ggdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzOwotICBwcml2YXRlIENoZWNrQm94IHVzZVNpZ25lZE9mZkJ5OworICAvLyBTZWN0aW9uOiBDb250cmlidXRvciBBZ3JlZW1lbnRzCisgIHByaXZhdGUgTGlzdEJveCBjb250cmlidXRvckFncmVlbWVudHM7CisgIHByaXZhdGUgTGlzdEJveCBzaWduZWRPZmZCeTsKIAogICBwcml2YXRlIE5wVGV4dEFyZWEgZGVzY1R4dDsKICAgcHJpdmF0ZSBCdXR0b24gc2F2ZVByb2plY3Q7CkBAIC01Myw2ICs2MCw3IEBACiAKICAgcHVibGljIFByb2plY3RJbmZvU2NyZWVuKGZpbmFsIFByb2plY3QuTmFtZUtleSB0b1Nob3cpIHsKICAgICBzdXBlcih0b1Nob3cpOworICAgIHByb2plY3ROYW1lID0gdG9TaG93LmdldCgpOwogICB9CiAKICAgQE92ZXJyaWRlCkBAIC02Nyw5ICs3NSwxMyBAQAogICAgICAgfQogICAgIH0pOwogCisgICAgYWRkKG5ldyBQcm9qZWN0RG93bmxvYWRQYW5lbChwcm9qZWN0TmFtZSwgdHJ1ZSkpOworCiAgICAgaW5pdERlc2NyaXB0aW9uKCk7CisgICAgZ3JpZCA9IG5ldyBMYWJlbGVkV2lkZ2V0c0dyaWQoKTsKICAgICBpbml0UHJvamVjdE9wdGlvbnMoKTsKICAgICBpbml0QWdyZWVtZW50cygpOworICAgIGFkZChncmlkKTsKICAgICBhZGQoc2F2ZVByb2plY3QpOwogICB9CiAKQEAgLTg5LDYgKzEwMSw3IEBACiAgICAgICAgICAgICBkaXNwbGF5KHJlc3VsdCk7CiAgICAgICAgICAgfQogICAgICAgICB9KTsKKyAgICBzYXZlZFBhbmVsID0gSU5GTzsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBlbmFibGVGb3JtKGZpbmFsIGJvb2xlYW4gY2FuTW9kaWZ5QWdyZWVtZW50cywKQEAgLTk2LDEwICsxMDksMTAgQEAKICAgICAgIGZpbmFsIGJvb2xlYW4gY2FuTW9kaWZ5U3RhdGUpIHsKICAgICBzdWJtaXRUeXBlLnNldEVuYWJsZWQoY2FuTW9kaWZ5TWVyZ2VUeXBlKTsKICAgICBzdGF0ZS5zZXRFbmFibGVkKGNhbk1vZGlmeVN0YXRlKTsKLSAgICB1c2VDb250ZW50TWVyZ2Uuc2V0RW5hYmxlZChjYW5Nb2RpZnlNZXJnZVR5cGUpOworICAgIGNvbnRlbnRNZXJnZS5zZXRFbmFibGVkKGNhbk1vZGlmeU1lcmdlVHlwZSk7CiAgICAgZGVzY1R4dC5zZXRFbmFibGVkKGNhbk1vZGlmeURlc2NyaXB0aW9uKTsKLSAgICB1c2VDb250cmlidXRvckFncmVlbWVudHMuc2V0RW5hYmxlZChjYW5Nb2RpZnlBZ3JlZW1lbnRzKTsKLSAgICB1c2VTaWduZWRPZmZCeS5zZXRFbmFibGVkKGNhbk1vZGlmeUFncmVlbWVudHMpOworICAgIGNvbnRyaWJ1dG9yQWdyZWVtZW50cy5zZXRFbmFibGVkKGNhbk1vZGlmeUFncmVlbWVudHMpOworICAgIHNpZ25lZE9mZkJ5LnNldEVuYWJsZWQoY2FuTW9kaWZ5QWdyZWVtZW50cyk7CiAgICAgcmVxdWlyZUNoYW5nZUlELnNldEVuYWJsZWQoY2FuTW9kaWZ5TWVyZ2VUeXBlKTsKICAgfQogCkBAIC0xMTgsOCArMTMxLDcgQEAKICAgfQogCiAgIHByaXZhdGUgdm9pZCBpbml0UHJvamVjdE9wdGlvbnMoKSB7Ci0gICAgcHJvamVjdE9wdGlvbnNQYW5lbCA9IG5ldyBWZXJ0aWNhbFBhbmVsKCk7Ci0gICAgcHJvamVjdE9wdGlvbnNQYW5lbC5hZGQobmV3IFNtYWxsSGVhZGluZyhVdGlsLkMuaGVhZGluZ1Byb2plY3RPcHRpb25zKCkpKTsKKyAgICBncmlkLmFkZEhlYWRlcihuZXcgU21hbGxIZWFkaW5nKFV0aWwuQy5oZWFkaW5nUHJvamVjdE9wdGlvbnMoKSkpOwogCiAgICAgc3VibWl0VHlwZSA9IG5ldyBMaXN0Qm94KCk7CiAgICAgZm9yIChmaW5hbCBQcm9qZWN0LlN1Ym1pdFR5cGUgdHlwZSA6IFByb2plY3QuU3VibWl0VHlwZS52YWx1ZXMoKSkgewpAQCAtMTMyLDI5ICsxNDQsMzQgQEAKICAgICAgIH0KICAgICB9KTsKICAgICBzYXZlRW5hYmxlci5saXN0ZW5UbyhzdWJtaXRUeXBlKTsKLSAgICBwcm9qZWN0T3B0aW9uc1BhbmVsLmFkZChzdWJtaXRUeXBlKTsKKyAgICBncmlkLmFkZChVdGlsLkMuaGVhZGluZ1Byb2plY3RTdWJtaXRUeXBlKCksIHN1Ym1pdFR5cGUpOwogCiAgICAgc3RhdGUgPSBuZXcgTGlzdEJveCgpOwogICAgIGZvciAoZmluYWwgUHJvamVjdC5TdGF0ZSBzdGF0ZVZhbHVlIDogUHJvamVjdC5TdGF0ZS52YWx1ZXMoKSkgewogICAgICAgc3RhdGUuYWRkSXRlbShVdGlsLnRvTG9uZ1N0cmluZyhzdGF0ZVZhbHVlKSwgc3RhdGVWYWx1ZS5uYW1lKCkpOwogICAgIH0KLQogICAgIHNhdmVFbmFibGVyLmxpc3RlblRvKHN0YXRlKTsKLSAgICBwcm9qZWN0T3B0aW9uc1BhbmVsLmFkZChzdGF0ZSk7CisgICAgZ3JpZC5hZGQoVXRpbC5DLmhlYWRpbmdQcm9qZWN0U3RhdGUoKSwgc3RhdGUpOwogCi0gICAgdXNlQ29udGVudE1lcmdlID0gbmV3IENoZWNrQm94KFV0aWwuQy51c2VDb250ZW50TWVyZ2UoKSwgdHJ1ZSk7Ci0gICAgc2F2ZUVuYWJsZXIubGlzdGVuVG8odXNlQ29udGVudE1lcmdlKTsKLSAgICBwcm9qZWN0T3B0aW9uc1BhbmVsLmFkZCh1c2VDb250ZW50TWVyZ2UpOworICAgIGNvbnRlbnRNZXJnZSA9IG5ld0luaGVyaXRlZEJvb2xlYW5Cb3goKTsKKyAgICBzYXZlRW5hYmxlci5saXN0ZW5Ubyhjb250ZW50TWVyZ2UpOworICAgIGdyaWQuYWRkKFV0aWwuQy51c2VDb250ZW50TWVyZ2UoKSwgY29udGVudE1lcmdlKTsKIAotICAgIHJlcXVpcmVDaGFuZ2VJRCA9IG5ldyBDaGVja0JveChVdGlsLkMucmVxdWlyZUNoYW5nZUlEKCksIHRydWUpOworICAgIHJlcXVpcmVDaGFuZ2VJRCA9IG5ld0luaGVyaXRlZEJvb2xlYW5Cb3goKTsKICAgICBzYXZlRW5hYmxlci5saXN0ZW5UbyhyZXF1aXJlQ2hhbmdlSUQpOwotICAgIHByb2plY3RPcHRpb25zUGFuZWwuYWRkKHJlcXVpcmVDaGFuZ2VJRCk7CisgICAgZ3JpZC5hZGRIdG1sKFV0aWwuQy5yZXF1aXJlQ2hhbmdlSUQoKSwgcmVxdWlyZUNoYW5nZUlEKTsKKyAgfQogCi0gICAgYWRkKHByb2plY3RPcHRpb25zUGFuZWwpOworICBwcml2YXRlIHN0YXRpYyBMaXN0Qm94IG5ld0luaGVyaXRlZEJvb2xlYW5Cb3goKSB7CisgICAgTGlzdEJveCBib3ggPSBuZXcgTGlzdEJveCgpOworICAgIGZvciAoSW5oZXJpdGFibGVCb29sZWFuIGIgOiBJbmhlcml0YWJsZUJvb2xlYW4udmFsdWVzKCkpIHsKKyAgICAgIGJveC5hZGRJdGVtKGIubmFtZSgpLCBiLm5hbWUoKSk7CisgICAgfQorICAgIHJldHVybiBib3g7CiAgIH0KIAogICAvKioKLSAgICogRW5hYmxlcyB0aGUge0BsaW5rICN1c2VDb250ZW50TWVyZ2V9IGNoZWNrYm94IGlmIHRoZSBzZWxlY3RlZCBzdWJtaXQgdHlwZQorICAgKiBFbmFibGVzIHRoZSB7QGxpbmsgI2NvbnRlbnRNZXJnZX0gY2hlY2tib3ggaWYgdGhlIHNlbGVjdGVkIHN1Ym1pdCB0eXBlCiAgICAqIGFsbG93cyB0aGUgdXNhZ2Ugb2YgY29udGVudCBtZXJnZS4KICAgICogSWYgdGhlIHN1Ym1pdCB0eXBlIChjdXJyZW50bHkgb25seSAnRmFzdCBGb3J3YXJkIE9ubHknKSBkb2VzIG5vdCBhbGxvdwogICAgKiBjb250ZW50IG1lcmdlIHRoZSB1c2VDb250ZW50TWVyZ2UgY2hlY2tib3ggZ2V0cyBkaXNhYmxlZC4KQEAgLTE2MiwyNiArMTc5LDI3IEBACiAgIHByaXZhdGUgdm9pZCBzZXRFbmFibGVkRm9yVXNlQ29udGVudE1lcmdlKCkgewogICAgIGlmIChTdWJtaXRUeXBlLkZBU1RfRk9SV0FSRF9PTkxZLmVxdWFscyhQcm9qZWN0LlN1Ym1pdFR5cGUKICAgICAgICAgLnZhbHVlT2Yoc3VibWl0VHlwZS5nZXRWYWx1ZShzdWJtaXRUeXBlLmdldFNlbGVjdGVkSW5kZXgoKSkpKSkgewotICAgICAgdXNlQ29udGVudE1lcmdlLnNldEVuYWJsZWQoZmFsc2UpOwotICAgICAgdXNlQ29udGVudE1lcmdlLnNldFZhbHVlKGZhbHNlKTsKKyAgICAgIGNvbnRlbnRNZXJnZS5zZXRFbmFibGVkKGZhbHNlKTsKKyAgICAgIGZpbmFsIEluaGVyaXRlZEJvb2xlYW4gaW5oZXJpdGVkQm9vbGVhbiA9IG5ldyBJbmhlcml0ZWRCb29sZWFuKCk7CisgICAgICBpbmhlcml0ZWRCb29sZWFuLnNldFZhbHVlKEluaGVyaXRhYmxlQm9vbGVhbi5GQUxTRSk7CisgICAgICBzZXRCb29sKGNvbnRlbnRNZXJnZSwgaW5oZXJpdGVkQm9vbGVhbik7CiAgICAgfSBlbHNlIHsKLSAgICAgIHVzZUNvbnRlbnRNZXJnZS5zZXRFbmFibGVkKHN1Ym1pdFR5cGUuaXNFbmFibGVkKCkpOworICAgICAgY29udGVudE1lcmdlLnNldEVuYWJsZWQoc3VibWl0VHlwZS5pc0VuYWJsZWQoKSk7CiAgICAgfQogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGluaXRBZ3JlZW1lbnRzKCkgewotICAgIGFncmVlbWVudHNQYW5lbCA9IG5ldyBWZXJ0aWNhbFBhbmVsKCk7Ci0gICAgYWdyZWVtZW50c1BhbmVsLmFkZChuZXcgU21hbGxIZWFkaW5nKFV0aWwuQy5oZWFkaW5nQWdyZWVtZW50cygpKSk7CisgICAgZ3JpZC5hZGRIZWFkZXIobmV3IFNtYWxsSGVhZGluZyhVdGlsLkMuaGVhZGluZ0FncmVlbWVudHMoKSkpOwogCi0gICAgdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzID0gbmV3IENoZWNrQm94KFV0aWwuQy51c2VDb250cmlidXRvckFncmVlbWVudHMoKSk7Ci0gICAgc2F2ZUVuYWJsZXIubGlzdGVuVG8odXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzKTsKLSAgICBhZ3JlZW1lbnRzUGFuZWwuYWRkKHVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyk7CisgICAgY29udHJpYnV0b3JBZ3JlZW1lbnRzID0gbmV3SW5oZXJpdGVkQm9vbGVhbkJveCgpOworICAgIGlmIChHZXJyaXQuZ2V0Q29uZmlnKCkuaXNVc2VDb250cmlidXRvckFncmVlbWVudHMoKSkgeworICAgICAgc2F2ZUVuYWJsZXIubGlzdGVuVG8oY29udHJpYnV0b3JBZ3JlZW1lbnRzKTsKKyAgICAgIGdyaWQuYWRkKFV0aWwuQy51c2VDb250cmlidXRvckFncmVlbWVudHMoKSwgY29udHJpYnV0b3JBZ3JlZW1lbnRzKTsKKyAgICB9CiAKLSAgICB1c2VTaWduZWRPZmZCeSA9IG5ldyBDaGVja0JveChVdGlsLkMudXNlU2lnbmVkT2ZmQnkoKSwgdHJ1ZSk7Ci0gICAgc2F2ZUVuYWJsZXIubGlzdGVuVG8odXNlU2lnbmVkT2ZmQnkpOwotICAgIGFncmVlbWVudHNQYW5lbC5hZGQodXNlU2lnbmVkT2ZmQnkpOwotCi0gICAgYWRkKGFncmVlbWVudHNQYW5lbCk7CisgICAgc2lnbmVkT2ZmQnkgPSBuZXdJbmhlcml0ZWRCb29sZWFuQm94KCk7CisgICAgc2F2ZUVuYWJsZXIubGlzdGVuVG8oc2lnbmVkT2ZmQnkpOworICAgIGdyaWQuYWRkSHRtbChVdGlsLkMudXNlU2lnbmVkT2ZmQnkoKSwgc2lnbmVkT2ZmQnkpOwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIHNldFN1Ym1pdFR5cGUoZmluYWwgUHJvamVjdC5TdWJtaXRUeXBlIG5ld1N1Ym1pdFR5cGUpIHsKQEAgLTIwOSwyMSArMjI3LDU0IEBACiAgICAgfQogICB9CiAKKyAgcHJpdmF0ZSB2b2lkIHNldEJvb2woTGlzdEJveCBib3gsIEluaGVyaXRlZEJvb2xlYW4gaW5oZXJpdGVkQm9vbGVhbikgeworICAgIGludCBpbmhlcml0ZWRJbmRleCA9IC0xOworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgYm94LmdldEl0ZW1Db3VudCgpOyBpKyspIHsKKyAgICAgIGlmIChib3guZ2V0VmFsdWUoaSkuc3RhcnRzV2l0aChJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVC5uYW1lKCkpKSB7CisgICAgICAgIGluaGVyaXRlZEluZGV4ID0gaTsKKyAgICAgIH0KKyAgICAgIGlmIChib3guZ2V0VmFsdWUoaSkuc3RhcnRzV2l0aChpbmhlcml0ZWRCb29sZWFuLnZhbHVlLm5hbWUoKSkpIHsKKyAgICAgICAgYm94LnNldFNlbGVjdGVkSW5kZXgoaSk7CisgICAgICB9CisgICAgfQorICAgIGlmIChpbmhlcml0ZWRJbmRleCA+PSAwKSB7CisgICAgICBpZiAocHJvamVjdC5nZXRQYXJlbnQoR2Vycml0LmdldENvbmZpZygpLmdldFdpbGRQcm9qZWN0KCkpID09IG51bGwpIHsKKyAgICAgICAgaWYgKGJveC5nZXRTZWxlY3RlZEluZGV4KCkgPT0gaW5oZXJpdGVkSW5kZXgpIHsKKyAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGJveC5nZXRJdGVtQ291bnQoKTsgaSsrKSB7CisgICAgICAgICAgICBpZiAoYm94LmdldFZhbHVlKGkpLmVxdWFscyhJbmhlcml0YWJsZUJvb2xlYW4uRkFMU0UubmFtZSgpKSkgeworICAgICAgICAgICAgICBib3guc2V0U2VsZWN0ZWRJbmRleChpKTsKKyAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGJveC5yZW1vdmVJdGVtKGluaGVyaXRlZEluZGV4KTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGJveC5zZXRJdGVtVGV4dChpbmhlcml0ZWRJbmRleCwgSW5oZXJpdGFibGVCb29sZWFuLklOSEVSSVQubmFtZSgpICsgIiAoIgorICAgICAgICAgICAgKyBpbmhlcml0ZWRCb29sZWFuLmluaGVyaXRlZFZhbHVlICsgIikiKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBJbmhlcml0YWJsZUJvb2xlYW4gZ2V0Qm9vbChMaXN0Qm94IGJveCkgeworICAgIGludCBpID0gYm94LmdldFNlbGVjdGVkSW5kZXgoKTsKKyAgICBpZiAoaSA+PSAwKSB7CisgICAgICBmaW5hbCBTdHJpbmcgc2VsZWN0ZWRWYWx1ZSA9IGJveC5nZXRWYWx1ZShpKTsKKyAgICAgIGlmIChzZWxlY3RlZFZhbHVlLnN0YXJ0c1dpdGgoSW5oZXJpdGFibGVCb29sZWFuLklOSEVSSVQubmFtZSgpKSkgeworICAgICAgICByZXR1cm4gSW5oZXJpdGFibGVCb29sZWFuLklOSEVSSVQ7CisgICAgICB9CisgICAgICByZXR1cm4gSW5oZXJpdGFibGVCb29sZWFuLnZhbHVlT2Yoc2VsZWN0ZWRWYWx1ZSk7CisgICAgfQorICAgIHJldHVybiBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKyAgfQorCiAgIHZvaWQgZGlzcGxheShmaW5hbCBQcm9qZWN0RGV0YWlsIHJlc3VsdCkgewogICAgIHByb2plY3QgPSByZXN1bHQucHJvamVjdDsKIAotICAgIGZpbmFsIGJvb2xlYW4gaXNhbGwgPQotICAgICAgICBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0V2lsZFByb2plY3QoKS5lcXVhbHMocHJvamVjdC5nZXROYW1lS2V5KCkpOwotICAgIHByb2plY3RPcHRpb25zUGFuZWwuc2V0VmlzaWJsZSghaXNhbGwpOwotICAgIGFncmVlbWVudHNQYW5lbC5zZXRWaXNpYmxlKCFpc2FsbCk7Ci0gICAgdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzLnNldFZpc2libGUoR2Vycml0LmdldENvbmZpZygpCi0gICAgICAgIC5pc1VzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cygpKTsKLQogICAgIGRlc2NUeHQuc2V0VGV4dChwcm9qZWN0LmdldERlc2NyaXB0aW9uKCkpOwotICAgIHVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cy5zZXRWYWx1ZShwcm9qZWN0LmlzVXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzKCkpOwotICAgIHVzZVNpZ25lZE9mZkJ5LnNldFZhbHVlKHByb2plY3QuaXNVc2VTaWduZWRPZmZCeSgpKTsKLSAgICB1c2VDb250ZW50TWVyZ2Uuc2V0VmFsdWUocHJvamVjdC5pc1VzZUNvbnRlbnRNZXJnZSgpKTsKLSAgICByZXF1aXJlQ2hhbmdlSUQuc2V0VmFsdWUocHJvamVjdC5pc1JlcXVpcmVDaGFuZ2VJRCgpKTsKKyAgICBzZXRCb29sKGNvbnRyaWJ1dG9yQWdyZWVtZW50cywgcmVzdWx0LnVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyk7CisgICAgc2V0Qm9vbChzaWduZWRPZmZCeSwgcmVzdWx0LnVzZVNpZ25lZE9mZkJ5KTsKKyAgICBzZXRCb29sKGNvbnRlbnRNZXJnZSwgcmVzdWx0LnVzZUNvbnRlbnRNZXJnZSk7CisgICAgc2V0Qm9vbChyZXF1aXJlQ2hhbmdlSUQsIHJlc3VsdC5yZXF1aXJlQ2hhbmdlSUQpOwogICAgIHNldFN1Ym1pdFR5cGUocHJvamVjdC5nZXRTdWJtaXRUeXBlKCkpOwogICAgIHNldFN0YXRlKHByb2plY3QuZ2V0U3RhdGUoKSk7CiAKQEAgLTIzMiwxMCArMjgzLDEwIEBACiAKICAgcHJpdmF0ZSB2b2lkIGRvU2F2ZSgpIHsKICAgICBwcm9qZWN0LnNldERlc2NyaXB0aW9uKGRlc2NUeHQuZ2V0VGV4dCgpLnRyaW0oKSk7Ci0gICAgcHJvamVjdC5zZXRVc2VDb250cmlidXRvckFncmVlbWVudHModXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzLmdldFZhbHVlKCkpOwotICAgIHByb2plY3Quc2V0VXNlU2lnbmVkT2ZmQnkodXNlU2lnbmVkT2ZmQnkuZ2V0VmFsdWUoKSk7Ci0gICAgcHJvamVjdC5zZXRVc2VDb250ZW50TWVyZ2UodXNlQ29udGVudE1lcmdlLmdldFZhbHVlKCkpOwotICAgIHByb2plY3Quc2V0UmVxdWlyZUNoYW5nZUlEKHJlcXVpcmVDaGFuZ2VJRC5nZXRWYWx1ZSgpKTsKKyAgICBwcm9qZWN0LnNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyhnZXRCb29sKGNvbnRyaWJ1dG9yQWdyZWVtZW50cykpOworICAgIHByb2plY3Quc2V0VXNlU2lnbmVkT2ZmQnkoZ2V0Qm9vbChzaWduZWRPZmZCeSkpOworICAgIHByb2plY3Quc2V0VXNlQ29udGVudE1lcmdlKGdldEJvb2woY29udGVudE1lcmdlKSk7CisgICAgcHJvamVjdC5zZXRSZXF1aXJlQ2hhbmdlSUQoZ2V0Qm9vbChyZXF1aXJlQ2hhbmdlSUQpKTsKICAgICBpZiAoc3VibWl0VHlwZS5nZXRTZWxlY3RlZEluZGV4KCkgPj0gMCkgewogICAgICAgcHJvamVjdC5zZXRTdWJtaXRUeXBlKFByb2plY3QuU3VibWl0VHlwZS52YWx1ZU9mKHN1Ym1pdFR5cGUKICAgICAgICAgICAuZ2V0VmFsdWUoc3VibWl0VHlwZS5nZXRTZWxlY3RlZEluZGV4KCkpKSk7CkBAIC0yNTYsNCArMzA3LDU4IEBACiAgICAgICAgICAgfQogICAgICAgICB9KTsKICAgfQorCisgIHB1YmxpYyBjbGFzcyBQcm9qZWN0RG93bmxvYWRQYW5lbCBleHRlbmRzIERvd25sb2FkUGFuZWwgeworICAgIHB1YmxpYyBQcm9qZWN0RG93bmxvYWRQYW5lbChTdHJpbmcgcHJvamVjdCwgYm9vbGVhbiBpc0FsbG93c0Fub255bW91cykgeworICAgICAgc3VwZXIocHJvamVjdCwgbnVsbCwgaXNBbGxvd3NBbm9ueW1vdXMpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIHBvcHVsYXRlRG93bmxvYWRDb21tYW5kTGlua3MoKSB7CisgICAgICBpZiAoIXVybHMuaXNFbXB0eSgpKSB7CisgICAgICAgIGlmIChhbGxvd2VkQ29tbWFuZHMuY29udGFpbnMoRG93bmxvYWRDb21tYW5kLkNIRUNLT1VUKQorICAgICAgICAgICAgfHwgYWxsb3dlZENvbW1hbmRzLmNvbnRhaW5zKERvd25sb2FkQ29tbWFuZC5ERUZBVUxUX0RPV05MT0FEUykpIHsKKyAgICAgICAgICBjb21tYW5kcy5hZGQoY21kTGlua2ZhY3RvcnkubmV3IENsb25lQ29tbWFuZExpbmsoKSk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwcml2YXRlIGNsYXNzIExhYmVsZWRXaWRnZXRzR3JpZCBleHRlbmRzIEZsZXhUYWJsZSB7CisgICAgcHJpdmF0ZSBTdHJpbmcgbGFiZWxTdWZmaXg7CisKKyAgICBwdWJsaWMgTGFiZWxlZFdpZGdldHNHcmlkKCkgeworICAgICAgc3VwZXIoKTsKKyAgICAgIGxhYmVsU3VmZml4ID0gIjoiOworICAgIH0KKworICAgIHByaXZhdGUgdm9pZCBhZGRIZWFkZXIoV2lkZ2V0IHdpZGdldCkgeworICAgICAgaW50IHJvdyA9IGdldFJvd0NvdW50KCk7CisgICAgICBpbnNlcnRSb3cocm93KTsKKyAgICAgIHNldFdpZGdldChyb3csIDAsIHdpZGdldCk7CisgICAgICBnZXRDZWxsRm9ybWF0dGVyKCkuZ2V0RWxlbWVudChyb3csIDApLnNldEF0dHJpYnV0ZSgiY29sU3BhbiIsICIyIik7CisgICAgfQorCisgICAgcHJpdmF0ZSB2b2lkIGFkZChTdHJpbmcgbGFiZWwsIGJvb2xlYW4gbGFiZWxJc0h0bWwsIFdpZGdldCB3aWRnZXQpIHsKKyAgICAgIGludCByb3cgPSBnZXRSb3dDb3VudCgpOworICAgICAgaW5zZXJ0Um93KHJvdyk7CisgICAgICBpZiAobGFiZWwgIT0gbnVsbCkgeworICAgICAgICBpZiAobGFiZWxJc0h0bWwpIHsKKyAgICAgICAgICBzZXRIVE1MKHJvdywgMCwgbGFiZWwgKyBsYWJlbFN1ZmZpeCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgc2V0VGV4dChyb3csIDAsIGxhYmVsICsgbGFiZWxTdWZmaXgpOworICAgICAgICB9CisgICAgICB9CisgICAgICBzZXRXaWRnZXQocm93LCAxLCB3aWRnZXQpOworICAgIH0KKworICAgIHB1YmxpYyB2b2lkIGFkZChTdHJpbmcgbGFiZWwsIFdpZGdldCB3aWRnZXQpIHsKKyAgICAgIGFkZChsYWJlbCwgZmFsc2UsIHdpZGdldCk7CisgICAgfQorCisgICAgcHVibGljIHZvaWQgYWRkSHRtbChTdHJpbmcgbGFiZWwsIFdpZGdldCB3aWRnZXQpIHsKKyAgICAgIGFkZChsYWJlbCwgdHJ1ZSwgd2lkZ2V0KTsKKyAgICB9CisKKyAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RMaXN0U2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdExpc3RTY3JlZW4uamF2YQppbmRleCA5MTI1NjIyLi5lZTU4NDIwIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdExpc3RTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdExpc3RTY3JlZW4uamF2YQpAQCAtMTQsMzggKzE0LDgyIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFkbWluOwogCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3MuQURNSU5fUFJPSkVDVFM7CisKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuRGlzcGF0Y2hlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HaXR3ZWJMaW5rOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wcm9qZWN0cy5Qcm9qZWN0SW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucHJvamVjdHMuUHJvamVjdE1hcDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLlNjcmVlbkxvYWRDYWxsYmFjazsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSHlwZXJsaW5rOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkZpbHRlcmVkVXNlckludGVyZmFjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSGlnaGxpZ2h0aW5nSW5saW5lSHlwZXJsaW5rOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5JZ25vcmVPdXRkYXRlZEZpbHRlclJlc3VsdHNDYWxsYmFja1dyYXBwZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlByb2plY3RTZWFyY2hMaW5rOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5Qcm9qZWN0c1RhYmxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVVwRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlVcEhhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuaHR0cC5jbGllbnQuVVJMOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50Lkhpc3Rvcnk7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQW5jaG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Ib3Jpem9udGFsUGFuZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuTGFiZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5nbG9iYWxrZXkuY2xpZW50Lk5wVGV4dEJveDsKIAotcHVibGljIGNsYXNzIFByb2plY3RMaXN0U2NyZWVuIGV4dGVuZHMgU2NyZWVuIHsKK3B1YmxpYyBjbGFzcyBQcm9qZWN0TGlzdFNjcmVlbiBleHRlbmRzIFNjcmVlbiBpbXBsZW1lbnRzIEZpbHRlcmVkVXNlckludGVyZmFjZSB7CiAgIHByaXZhdGUgUHJvamVjdHNUYWJsZSBwcm9qZWN0czsKKyAgcHJpdmF0ZSBOcFRleHRCb3ggZmlsdGVyVHh0OworICBwcml2YXRlIFN0cmluZyBzdWJuYW1lOworCisgIHB1YmxpYyBQcm9qZWN0TGlzdFNjcmVlbigpIHsKKyAgfQorCisgIHB1YmxpYyBQcm9qZWN0TGlzdFNjcmVlbihTdHJpbmcgcGFyYW1zKSB7CisgICAgZm9yIChTdHJpbmcga3ZQYWlyIDogcGFyYW1zLnNwbGl0KCJbLDsmXSIpKSB7CisgICAgICBTdHJpbmdbXSBrdiA9IGt2UGFpci5zcGxpdCgiPSIsIDIpOworICAgICAgaWYgKGt2Lmxlbmd0aCAhPSAyIHx8IGt2WzBdLmlzRW1wdHkoKSkgeworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKworICAgICAgaWYgKCJmaWx0ZXIiLmVxdWFscyhrdlswXSkpIHsKKyAgICAgICAgc3VibmFtZSA9IFVSTC5kZWNvZGVRdWVyeVN0cmluZyhrdlsxXSk7CisgICAgICB9CisgICAgfQorICB9CiAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIG9uTG9hZCgpIHsKICAgICBzdXBlci5vbkxvYWQoKTsKLSAgICBQcm9qZWN0TWFwLmFsbChuZXcgU2NyZWVuTG9hZENhbGxiYWNrPFByb2plY3RNYXA+KHRoaXMpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHJvdGVjdGVkIHZvaWQgcHJlRGlzcGxheShmaW5hbCBQcm9qZWN0TWFwIHJlc3VsdCkgewotICAgICAgICBwcm9qZWN0cy5kaXNwbGF5KHJlc3VsdCk7Ci0gICAgICAgIHByb2plY3RzLmZpbmlzaERpc3BsYXkoKTsKLSAgICAgIH0KLSAgICB9KTsKKyAgICBkaXNwbGF5KCk7CisgICAgcmVmcmVzaCgpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHJlZnJlc2goKSB7CisgICAgc2V0VG9rZW4oc3VibmFtZSA9PSBudWxsIHx8ICIiLmVxdWFscyhzdWJuYW1lKSA/IEFETUlOX1BST0pFQ1RTCisgICAgICAgIDogQURNSU5fUFJPSkVDVFMgKyAiP2ZpbHRlcj0iICsgVVJMLmVuY29kZVF1ZXJ5U3RyaW5nKHN1Ym5hbWUpKTsKKyAgICBQcm9qZWN0TWFwLm1hdGNoKHN1Ym5hbWUsCisgICAgICAgIG5ldyBJZ25vcmVPdXRkYXRlZEZpbHRlclJlc3VsdHNDYWxsYmFja1dyYXBwZXI8UHJvamVjdE1hcD4odGhpcywKKyAgICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxQcm9qZWN0TWFwPigpIHsKKyAgICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhQcm9qZWN0TWFwIHJlc3VsdCkgeworICAgICAgICAgICAgICAgIHByb2plY3RzLmRpc3BsYXkocmVzdWx0KTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSkpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0Q3VycmVudEZpbHRlcigpIHsKKyAgICByZXR1cm4gc3VibmFtZTsKICAgfQogCiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBvbkluaXRVSSgpIHsKICAgICBzdXBlci5vbkluaXRVSSgpOwogICAgIHNldFBhZ2VUaXRsZShVdGlsLkMucHJvamVjdExpc3RUaXRsZSgpKTsKKyAgICBpbml0UGFnZUhlYWRlcigpOwogCiAgICAgcHJvamVjdHMgPSBuZXcgUHJvamVjdHNUYWJsZSgpIHsKICAgICAgIEBPdmVycmlkZQpAQCAtNjQsNyArMTA4LDcgQEAKICAgICAgIH0KIAogICAgICAgcHJpdmF0ZSBTdHJpbmcgbGluayhmaW5hbCBQcm9qZWN0SW5mbyBpdGVtKSB7Ci0gICAgICAgIHJldHVybiBEaXNwYXRjaGVyLnRvUHJvamVjdEFkbWluKGl0ZW0ubmFtZV9rZXkoKSwgUHJvamVjdFNjcmVlbi5JTkZPKTsKKyAgICAgICAgcmV0dXJuIERpc3BhdGNoZXIudG9Qcm9qZWN0KGl0ZW0ubmFtZV9rZXkoKSk7CiAgICAgICB9CiAKICAgICAgIEBPdmVycmlkZQpAQCAtNzgsNyArMTIyLDEwIEBACiAKICAgICAgIEBPdmVycmlkZQogICAgICAgcHJvdGVjdGVkIHZvaWQgcG9wdWxhdGUoZmluYWwgaW50IHJvdywgZmluYWwgUHJvamVjdEluZm8gaykgewotICAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAxLCBuZXcgSHlwZXJsaW5rKGsubmFtZSgpLCBsaW5rKGspKSk7CisgICAgICAgIEZsb3dQYW5lbCBmcCA9IG5ldyBGbG93UGFuZWwoKTsKKyAgICAgICAgZnAuYWRkKG5ldyBQcm9qZWN0U2VhcmNoTGluayhrLm5hbWVfa2V5KCkpKTsKKyAgICAgICAgZnAuYWRkKG5ldyBIaWdobGlnaHRpbmdJbmxpbmVIeXBlcmxpbmsoay5uYW1lKCksIGxpbmsoayksIHN1Ym5hbWUpKTsKKyAgICAgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgMSwgZnApOwogICAgICAgICB0YWJsZS5zZXRUZXh0KHJvdywgMiwgay5kZXNjcmlwdGlvbigpKTsKICAgICAgICAgR2l0d2ViTGluayBsID0gR2Vycml0LmdldEdpdHdlYkxpbmsoKTsKICAgICAgICAgaWYgKGwgIT0gbnVsbCkgewpAQCAtOTQsNiArMTQxLDM0IEBACiAgICAgYWRkKHByb2plY3RzKTsKICAgfQogCisgIHByaXZhdGUgdm9pZCBpbml0UGFnZUhlYWRlcigpIHsKKyAgICBmaW5hbCBIb3Jpem9udGFsUGFuZWwgaHAgPSBuZXcgSG9yaXpvbnRhbFBhbmVsKCk7CisgICAgaHAuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucHJvamVjdEZpbHRlclBhbmVsKCkpOworICAgIGZpbmFsIExhYmVsIGZpbHRlckxhYmVsID0gbmV3IExhYmVsKFV0aWwuQy5wcm9qZWN0RmlsdGVyKCkpOworICAgIGZpbHRlckxhYmVsLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnByb2plY3RGaWx0ZXJMYWJlbCgpKTsKKyAgICBocC5hZGQoZmlsdGVyTGFiZWwpOworICAgIGZpbHRlclR4dCA9IG5ldyBOcFRleHRCb3goKTsKKyAgICBmaWx0ZXJUeHQuc2V0VmFsdWUoc3VibmFtZSk7CisgICAgZmlsdGVyVHh0LmFkZEtleVVwSGFuZGxlcihuZXcgS2V5VXBIYW5kbGVyKCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvbktleVVwKEtleVVwRXZlbnQgZXZlbnQpIHsKKyAgICAgICAgc3VibmFtZSA9IGZpbHRlclR4dC5nZXRWYWx1ZSgpOworICAgICAgICByZWZyZXNoKCk7CisgICAgICB9CisgICAgfSk7CisgICAgaHAuYWRkKGZpbHRlclR4dCk7CisgICAgYWRkKGhwKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBvblNob3dWaWV3KCkgeworICAgIHN1cGVyLm9uU2hvd1ZpZXcoKTsKKyAgICBpZiAoc3VibmFtZSAhPSBudWxsKSB7CisgICAgICBmaWx0ZXJUeHQuc2V0Q3Vyc29yUG9zKHN1Ym5hbWUubGVuZ3RoKCkpOworICAgIH0KKyAgICBmaWx0ZXJUeHQuc2V0Rm9jdXModHJ1ZSk7CisgIH0KKwogICBAT3ZlcnJpZGUKICAgcHVibGljIHZvaWQgcmVnaXN0ZXJLZXlzKCkgewogICAgIHN1cGVyLnJlZ2lzdGVyS2V5cygpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9Qcm9qZWN0U2NyZWVuLmphdmEKaW5kZXggZGQ1YjA3MC4uZmRmM2FiOCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1Byb2plY3RTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vUHJvamVjdFNjcmVlbi5qYXZhCkBAIC0xNCwyNyArMTQsMzMgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW47CiAKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkRpc3BhdGNoZXIudG9Qcm9qZWN0QWRtaW47Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuTWVudVNjcmVlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuU2NyZWVuOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogCi1wdWJsaWMgYWJzdHJhY3QgY2xhc3MgUHJvamVjdFNjcmVlbiBleHRlbmRzIE1lbnVTY3JlZW4geworcHVibGljIGFic3RyYWN0IGNsYXNzIFByb2plY3RTY3JlZW4gZXh0ZW5kcyBTY3JlZW4gewogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBJTkZPID0gImluZm8iOwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBCUkFOQ0ggPSAiYnJhbmNoZXMiOwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBBQ0NFU1MgPSAiYWNjZXNzIjsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgREFTSEJPQVJEUyA9ICJkYXNoYm9hcmRzIjsKKworICBwcm90ZWN0ZWQgc3RhdGljIFN0cmluZyBzYXZlZFBhbmVsOworICBwcm90ZWN0ZWQgc3RhdGljIFByb2plY3QuTmFtZUtleSBzYXZlZEtleTsKKworICBwdWJsaWMgc3RhdGljIFN0cmluZyBnZXRTYXZlZFBhbmVsKCkgeworICAgIHJldHVybiBzYXZlZFBhbmVsOworICB9CisKKyAgcHVibGljIHN0YXRpYyBQcm9qZWN0Lk5hbWVLZXkgZ2V0U2F2ZWRLZXkoKSB7CisgICAgcmV0dXJuIHNhdmVkS2V5OworICB9CiAKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgbmFtZTsKIAogICBwdWJsaWMgUHJvamVjdFNjcmVlbihmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgdG9TaG93KSB7CiAgICAgbmFtZSA9IHRvU2hvdzsKLQotICAgIGxpbmsoVXRpbC5DLnByb2plY3RBZG1pblRhYkdlbmVyYWwoKSwgdG9Qcm9qZWN0QWRtaW4obmFtZSwgSU5GTykpOwotICAgIGxpbmsoVXRpbC5DLnByb2plY3RBZG1pblRhYkJyYW5jaGVzKCksIHRvUHJvamVjdEFkbWluKG5hbWUsIEJSQU5DSCkpOwotICAgIGxpbmsoVXRpbC5DLnByb2plY3RBZG1pblRhYkFjY2VzcygpLCB0b1Byb2plY3RBZG1pbihuYW1lLCBBQ0NFU1MpKTsKICAgfQogCi0gIHByb3RlY3RlZCBQcm9qZWN0Lk5hbWVLZXkgZ2V0UHJvamVjdEtleSgpIHsKKyAgcHVibGljIFByb2plY3QuTmFtZUtleSBnZXRQcm9qZWN0S2V5KCkgewogICAgIHJldHVybiBuYW1lOwogICB9CiAKQEAgLTQzLDQgKzQ5LDEwIEBACiAgICAgc3VwZXIub25Jbml0VUkoKTsKICAgICBzZXRQYWdlVGl0bGUoVXRpbC5NLnByb2plY3QobmFtZS5nZXQoKSkpOwogICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIG9uTG9hZCgpIHsKKyAgICBzdXBlci5vbkxvYWQoKTsKKyAgICBzYXZlZEtleSA9IG5hbWU7CisgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9VdGlsLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYWRtaW4vVXRpbC5qYXZhCmluZGV4IGFhNWI3YjYuLjE2OTZjNDMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hZG1pbi9VdGlsLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2FkbWluL1V0aWwuamF2YQpAQCAtMTQsNyArMTQsNiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbjsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwQWRtaW5TZXJ2aWNlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlByb2plY3RBZG1pblNlcnZpY2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuR1dUOwpAQCAtMjMsMTMgKzIyLDkgQEAKIHB1YmxpYyBjbGFzcyBVdGlsIHsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBBZG1pbkNvbnN0YW50cyBDID0gR1dULmNyZWF0ZShBZG1pbkNvbnN0YW50cy5jbGFzcyk7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgQWRtaW5NZXNzYWdlcyBNID0gR1dULmNyZWF0ZShBZG1pbk1lc3NhZ2VzLmNsYXNzKTsKLSAgcHVibGljIHN0YXRpYyBmaW5hbCBHcm91cEFkbWluU2VydmljZSBHUk9VUF9TVkM7CiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgUHJvamVjdEFkbWluU2VydmljZSBQUk9KRUNUX1NWQzsKIAogICBzdGF0aWMgewotICAgIEdST1VQX1NWQyA9IEdXVC5jcmVhdGUoR3JvdXBBZG1pblNlcnZpY2UuY2xhc3MpOwotICAgIEpzb25VdGlsLmJpbmQoR1JPVVBfU1ZDLCAicnBjL0dyb3VwQWRtaW5TZXJ2aWNlIik7Ci0KICAgICBQUk9KRUNUX1NWQyA9IEdXVC5jcmVhdGUoUHJvamVjdEFkbWluU2VydmljZS5jbGFzcyk7CiAgICAgSnNvblV0aWwuYmluZChQUk9KRUNUX1NWQywgInJwYy9Qcm9qZWN0QWRtaW5TZXJ2aWNlIik7CiAKQEAgLTQ1LDYgKzQwLDggQEAKICAgICAgICAgcmV0dXJuIEMucHJvamVjdFN1Ym1pdFR5cGVfRkFTVF9GT1JXQVJEX09OTFkoKTsKICAgICAgIGNhc2UgTUVSR0VfSUZfTkVDRVNTQVJZOgogICAgICAgICByZXR1cm4gQy5wcm9qZWN0U3VibWl0VHlwZV9NRVJHRV9JRl9ORUNFU1NBUlkoKTsKKyAgICAgIGNhc2UgUkVCQVNFX0lGX05FQ0VTU0FSWToKKyAgICAgICAgcmV0dXJuIEMucHJvamVjdFN1Ym1pdFR5cGVfUkVCQVNFX0lGX05FQ0VTU0FSWSgpOwogICAgICAgY2FzZSBNRVJHRV9BTFdBWVM6CiAgICAgICAgIHJldHVybiBDLnByb2plY3RTdWJtaXRUeXBlX01FUkdFX0FMV0FZUygpOwogICAgICAgY2FzZSBDSEVSUllfUElDSzoKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRDb25zdGFudHMuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRDb25zdGFudHMuamF2YQppbmRleCBhOWI5MmMyLi41ZDc1NmExIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkQ29uc3RhbnRzLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZENvbnN0YW50cy5qYXZhCkBAIC0xNywxOCArMTcsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmkxOG4uY2xpZW50LkNvbnN0YW50czsKIAogcHVibGljIGludGVyZmFjZSBPcGVuSWRDb25zdGFudHMgZXh0ZW5kcyBDb25zdGFudHMgewotICBTdHJpbmcgYnV0dG9uU2lnbkluKCk7Ci0gIFN0cmluZyBidXR0b25SZWdpc3RlcigpOwotICBTdHJpbmcgYnV0dG9uTGlua0lkKCk7Ci0KLSAgU3RyaW5nIHJlbWVtYmVyTWUoKTsKLQotICBTdHJpbmcgbm90QWxsb3dlZCgpOwotICBTdHJpbmcgbm9Qcm92aWRlcigpOwotICBTdHJpbmcgZXJyb3IoKTsKLQogICBTdHJpbmcgbmFtZUdvb2dsZSgpOwogICBTdHJpbmcgbmFtZVlhaG9vKCk7Ci0KLSAgU3RyaW5nIHdoYXRJc09wZW5JREh0bWwoKTsKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRDb25zdGFudHMucHJvcGVydGllcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRDb25zdGFudHMucHJvcGVydGllcwppbmRleCBhZjlhNjNkLi4xYThhY2MxIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkQ29uc3RhbnRzLnByb3BlcnRpZXMKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZENvbnN0YW50cy5wcm9wZXJ0aWVzCkBAIC0xLDIwICsxLDIgQEAKLWJ1dHRvblNpZ25JbiA9IFNpZ24gSW4KLWJ1dHRvblJlZ2lzdGVyID0gUmVnaXN0ZXIKLWJ1dHRvbkxpbmtJZCA9IExpbmsgSWRlbnRpdHkKLQotcmVtZW1iZXJNZSA9IFJlbWVtYmVyIE1lCi0KLW5vdEFsbG93ZWQgPSBQcm92aWRlciBpcyBub3QgYWxsb3dlZC4KLW5vUHJvdmlkZXIgPSBQcm92aWRlciBpcyBub3Qgc3VwcG9ydGVkLCBvciB3YXMgaW5jb3JyZWN0bHkgZW50ZXJlZC4KLWVycm9yID0gVW5hYmxlIHRvIGNvbm5lY3Qgd2l0aCBPcGVuSUQgcHJvdmlkZXIuCi0KIG5hbWVHb29nbGUgPSBHb29nbGUgQWNjb3VudAogbmFtZVlhaG9vID0gWWFob28hIElECi0KLXdoYXRJc09wZW5JREh0bWwgPSBcCi0gIDxoMiBjbGFzcz0ic21hbGxIZWFkaW5nIiBzdHlsZT0ibWFyZ2luLXRvcDogMjVweDsiPldoYXQgaXMgT3BlbklEPzwvaDI+XAotICA8cD5PcGVuSUQgcHJvdmlkZXMgc2VjdXJlIHNpbmdsZS1zaWduLW9uLCB3aXRob3V0IFwKLSAgcmV2ZWFsaW5nIHlvdXIgcGFzc3dvcmRzIHRvIHRoaXMgd2Vic2l0ZS48L3A+XAotICA8cD5UaGVyZSBhcmUgbWFueSBPcGVuSUQgcHJvdmlkZXJzIGF2YWlsYWJsZS4gIFlvdSBtYXkgYWxyZWFkeSBcCi0gIGJlIG1lbWJlciBvZiBvbmUhPC9wPlwKLSAgPHA+PGEgaHJlZj0iaHR0cDovL29wZW5pZC5uZXQvZ2V0LyIgdGFyZ2V0PSJfYmxhbmsiPkdldCBPcGVuSUQ8L2E+PC9wPlwKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRDc3MuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRDc3MuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNWY0MGNiYi4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkQ3NzLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwyNiArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmF1dGgub3BlbmlkOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLmNsaWVudC5Dc3NSZXNvdXJjZTsKLQotaW50ZXJmYWNlIE9wZW5JZENzcyBleHRlbmRzIENzc1Jlc291cmNlIHsKLSAgU3RyaW5nIGxvZ2luRm9ybSgpOwotICBTdHJpbmcgbG9nbygpOwotICBTdHJpbmcgbG9naW5MaW5lKCk7Ci0gIFN0cmluZyBpZGVudGlmaWVyKCk7Ci0gIFN0cmluZyBkaXJlY3RMaW5rKCk7Ci0gIFN0cmluZyBlcnJvcigpOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZE1lc3NhZ2VzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkTWVzc2FnZXMuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMWY0ZmM1Zi4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkTWVzc2FnZXMuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDI3ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC5vcGVuaWQ7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5pMThuLmNsaWVudC5NZXNzYWdlczsKLQotcHVibGljIGludGVyZmFjZSBPcGVuSWRNZXNzYWdlcyBleHRlbmRzIE1lc3NhZ2VzIHsKLSAgU3RyaW5nIHNpZ25JbkF0KFN0cmluZyBob3N0bmFtZSk7Ci0gIFN0cmluZyByZWdpc3RlckF0KFN0cmluZyBob3N0bmFtZSk7Ci0gIFN0cmluZyBsaW5rQXQoU3RyaW5nIGhvc3RuYW1lKTsKLQotICBTdHJpbmcgc2lnbkluV2l0aChTdHJpbmcgd2hvKTsKLSAgU3RyaW5nIHJlZ2lzdGVyV2l0aChTdHJpbmcgd2hvKTsKLSAgU3RyaW5nIGxpbmtXaXRoKFN0cmluZyB3aG8pOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZE1lc3NhZ2VzLnByb3BlcnRpZXMgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkTWVzc2FnZXMucHJvcGVydGllcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZWE4NjZjYy4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkTWVzc2FnZXMucHJvcGVydGllcworKysgL2Rldi9udWxsCkBAIC0xLDcgKzAsMCBAQAotc2lnbkluQXQgPSBTaWduIEluIHRvIEdlcnJpdCBDb2RlIFJldmlldyBhdCB7MH0KLXJlZ2lzdGVyQXQgPSBSZWdpc3RlciB3aXRoIEdlcnJpdCBDb2RlIFJldmlldyBhdCB7MH0KLWxpbmtBdCA9IExpbmsgQW5vdGhlciBJZGVudGl0eSB0byBHZXJyaXQgQ29kZSBSZXZpZXcgYXQgezB9Ci0KLXNpZ25JbldpdGggPSBTaWduIGluIHdpdGggYSB7MH0KLXJlZ2lzdGVyV2l0aCA9IFJlZ2lzdGVyIHdpdGggYSB7MH0KLWxpbmtXaXRoID0gTGluayBhIHswfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZFJlc291cmNlcy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZFJlc291cmNlcy5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5OTJlZDBiLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRSZXNvdXJjZXMuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDM5ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC5vcGVuaWQ7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLmNsaWVudC5DbGllbnRCdW5kbGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLmNsaWVudC5EYXRhUmVzb3VyY2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLmNsaWVudC5JbWFnZVJlc291cmNlOwotCi1pbnRlcmZhY2UgT3BlbklkUmVzb3VyY2VzIGV4dGVuZHMgQ2xpZW50QnVuZGxlIHsKLSAgc3RhdGljIGZpbmFsIE9wZW5JZFJlc291cmNlcyBJID0gR1dULmNyZWF0ZShPcGVuSWRSZXNvdXJjZXMuY2xhc3MpOwotCi0gIEBTb3VyY2UoIm9wZW5pZC5jc3MiKQotICBPcGVuSWRDc3MgY3NzKCk7Ci0KLSAgQFNvdXJjZSgiaWRlbnRpZmllckJhY2tncm91bmQuZ2lmIikKLSAgRGF0YVJlc291cmNlIGlkZW50aWZpZXJCYWNrZ3JvdW5kKCk7Ci0KLSAgQFNvdXJjZSgib3BlbmlkTG9nby5wbmciKQotICBJbWFnZVJlc291cmNlIG9wZW5pZExvZ28oKTsKLQotICBAU291cmNlKCJpY29uR29vZ2xlLmdpZiIpCi0gIEltYWdlUmVzb3VyY2UgaWNvbkdvb2dsZSgpOwotCi0gIEBTb3VyY2UoImljb25ZYWhvby5naWYiKQotICBJbWFnZVJlc291cmNlIGljb25ZYWhvbygpOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZFNpZ25JbkRpYWxvZy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZFNpZ25JbkRpYWxvZy5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBjZDJjNDkzLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRTaWduSW5EaWFsb2cuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDM4OCArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmF1dGgub3BlbmlkOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuU2lnbkluRGlhbG9nOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlNtYWxsSGVhZGluZzsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5TaWduSW5Nb2RlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZC5EaXNjb3ZlcnlSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGgub3BlbmlkLk9wZW5JZFByb3ZpZGVyUGF0dGVybjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5vcGVuaWQuT3BlbklkVXJsczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5TY2hlZHVsZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuU2NoZWR1bGVyLlNjaGVkdWxlZENvbW1hbmQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZG9tLmNsaWVudC5Gb3JtRWxlbWVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlDb2RlczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzRXZlbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0hhbmRsZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLmNsaWVudC5JbWFnZVJlc291cmNlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LkNvb2tpZXM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRE9NOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LldpbmRvdzsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BbmNob3I7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQnV0dG9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkNoZWNrQm94OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Gb3JtUGFuZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRm9ybVBhbmVsLlN1Ym1pdEV2ZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZvcm1TdWJtaXRDb21wbGV0ZUV2ZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkhUTUw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSGlkZGVuOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkltYWdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLklubGluZUxhYmVsOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuZ2xvYmFsa2V5LmNsaWVudC5OcFRleHRCb3g7Ci0KLWltcG9ydCBqYXZhLnV0aWwuTWFwOwotCi1wdWJsaWMgY2xhc3MgT3BlbklkU2lnbkluRGlhbG9nIGV4dGVuZHMgU2lnbkluRGlhbG9nIGltcGxlbWVudHMKLSAgICBGb3JtUGFuZWwuU3VibWl0SGFuZGxlciB7Ci0gIHN0YXRpYyB7Ci0gICAgT3BlbklkUmVzb3VyY2VzLkkuY3NzKCkuZW5zdXJlSW5qZWN0ZWQoKTsKLSAgfQotCi0gIHByaXZhdGUgZmluYWwgRmxvd1BhbmVsIHBhbmVsV2lkZ2V0OwotICBwcml2YXRlIGZpbmFsIEZvcm1QYW5lbCBmb3JtOwotICBwcml2YXRlIGZpbmFsIEZsb3dQYW5lbCBmb3JtQm9keTsKLSAgcHJpdmF0ZSBmaW5hbCBGb3JtUGFuZWwgcmVkaXJlY3RGb3JtOwotICBwcml2YXRlIGZpbmFsIEZsb3dQYW5lbCByZWRpcmVjdEJvZHk7Ci0KLSAgcHJpdmF0ZSBGbG93UGFuZWwgZXJyb3JMaW5lOwotICBwcml2YXRlIElubGluZUxhYmVsIGVycm9yTXNnOwotCi0gIHByaXZhdGUgQnV0dG9uIGxvZ2luOwotICBwcml2YXRlIE5wVGV4dEJveCBwcm92aWRlcklkOwotICBwcml2YXRlIENoZWNrQm94IHJlbWVtYmVySWQ7Ci0gIHByaXZhdGUgYm9vbGVhbiBkaXNjb3ZlcmluZzsKLQotICBwdWJsaWMgT3BlbklkU2lnbkluRGlhbG9nKGZpbmFsIFNpZ25Jbk1vZGUgcmVxdWVzdGVkTW9kZSwgZmluYWwgU3RyaW5nIHRva2VuLAotICAgICAgZmluYWwgU3RyaW5nIGluaXRpYWxFcnJvck1zZykgewotICAgIHN1cGVyKHJlcXVlc3RlZE1vZGUsIHRva2VuKTsKLQotICAgIGZvcm1Cb2R5ID0gbmV3IEZsb3dQYW5lbCgpOwotICAgIGZvcm1Cb2R5LnNldFN0eWxlTmFtZShPcGVuSWRSZXNvdXJjZXMuSS5jc3MoKS5sb2dpbkZvcm0oKSk7Ci0KLSAgICBmb3JtID0gbmV3IEZvcm1QYW5lbCgpOwotICAgIGZvcm0uc2V0TWV0aG9kKEZvcm1QYW5lbC5NRVRIT0RfR0VUKTsKLSAgICBmb3JtLmFkZFN1Ym1pdEhhbmRsZXIodGhpcyk7Ci0gICAgZm9ybS5hZGQoZm9ybUJvZHkpOwotCi0gICAgcmVkaXJlY3RCb2R5ID0gbmV3IEZsb3dQYW5lbCgpOwotICAgIHJlZGlyZWN0Qm9keS5zZXRWaXNpYmxlKGZhbHNlKTsKLSAgICByZWRpcmVjdEZvcm0gPSBuZXcgRm9ybVBhbmVsKCk7Ci0gICAgcmVkaXJlY3RGb3JtLmFkZChyZWRpcmVjdEJvZHkpOwotCi0gICAgcGFuZWxXaWRnZXQgPSBuZXcgRmxvd1BhbmVsKCk7Ci0gICAgcGFuZWxXaWRnZXQuYWRkKGZvcm0pOwotICAgIHBhbmVsV2lkZ2V0LmFkZChyZWRpcmVjdEZvcm0pOwotICAgIGFkZChwYW5lbFdpZGdldCk7Ci0KLSAgICBjcmVhdGVIZWFkZXJMb2dvKCk7Ci0gICAgY3JlYXRlSGVhZGVyVGV4dCgpOwotICAgIGNyZWF0ZUVycm9yQm94KCk7Ci0gICAgY3JlYXRlSWRlbnRCb3goKTsKLQotICAgIGxpbmsoT3BlbklkVXJscy5VUkxfR09PR0xFLCBPcGVuSWRVdGlsLkMubmFtZUdvb2dsZSgpLCBPcGVuSWRSZXNvdXJjZXMuSQotICAgICAgICAuaWNvbkdvb2dsZSgpKTsKLSAgICBsaW5rKE9wZW5JZFVybHMuVVJMX1lBSE9PLCBPcGVuSWRVdGlsLkMubmFtZVlhaG9vKCksIE9wZW5JZFJlc291cmNlcy5JCi0gICAgICAgIC5pY29uWWFob28oKSk7Ci0KLSAgICBpZiAoaW5pdGlhbEVycm9yTXNnICE9IG51bGwpIHsKLSAgICAgIHNob3dFcnJvcihpbml0aWFsRXJyb3JNc2cpOwotICAgIH0KLSAgICBmb3JtQm9keS5hZGQobmV3IEhUTUwoT3BlbklkVXRpbC5DLndoYXRJc09wZW5JREh0bWwoKSkpOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIHNob3coKSB7Ci0gICAgc3VwZXIuc2hvdygpOwotICAgIHByb3ZpZGVySWQuc2VsZWN0QWxsKCk7Ci0gICAgU2NoZWR1bGVyLmdldCgpLnNjaGVkdWxlRGVmZXJyZWQobmV3IFNjaGVkdWxlZENvbW1hbmQoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIGV4ZWN1dGUoKSB7Ci0gICAgICAgIHByb3ZpZGVySWQuc2V0Rm9jdXModHJ1ZSk7Ci0gICAgICB9Ci0gICAgfSk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgY3JlYXRlSGVhZGVyTG9nbygpIHsKLSAgICBmaW5hbCBGbG93UGFuZWwgaGVhZGVyTG9nbyA9IG5ldyBGbG93UGFuZWwoKTsKLSAgICBoZWFkZXJMb2dvLnNldFN0eWxlTmFtZShPcGVuSWRSZXNvdXJjZXMuSS5jc3MoKS5sb2dvKCkpOwotICAgIGhlYWRlckxvZ28uYWRkKG5ldyBJbWFnZShPcGVuSWRSZXNvdXJjZXMuSS5vcGVuaWRMb2dvKCkpKTsKLSAgICBmb3JtQm9keS5hZGQoaGVhZGVyTG9nbyk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgY3JlYXRlSGVhZGVyVGV4dCgpIHsKLSAgICBmaW5hbCBGbG93UGFuZWwgaGVhZGVyVGV4dCA9IG5ldyBGbG93UGFuZWwoKTsKLSAgICBmaW5hbCBTdHJpbmcgbWUgPSBXaW5kb3cuTG9jYXRpb24uZ2V0SG9zdE5hbWUoKTsKLSAgICBmaW5hbCBTbWFsbEhlYWRpbmcgaGVhZGVyTGFiZWwgPSBuZXcgU21hbGxIZWFkaW5nKCk7Ci0gICAgc3dpdGNoIChtb2RlKSB7Ci0gICAgICBjYXNlIExJTktfSURFTlRJWToKLSAgICAgICAgaGVhZGVyTGFiZWwuc2V0VGV4dChPcGVuSWRVdGlsLk0ubGlua0F0KG1lKSk7Ci0gICAgICAgIGJyZWFrOwotICAgICAgY2FzZSBSRUdJU1RFUjoKLSAgICAgICAgaGVhZGVyTGFiZWwuc2V0VGV4dChPcGVuSWRVdGlsLk0ucmVnaXN0ZXJBdChtZSkpOwotICAgICAgICBicmVhazsKLSAgICAgIGNhc2UgU0lHTl9JTjoKLSAgICAgIGRlZmF1bHQ6Ci0gICAgICAgIGhlYWRlckxhYmVsLnNldFRleHQoT3BlbklkVXRpbC5NLnNpZ25JbkF0KG1lKSk7Ci0gICAgICAgIGJyZWFrOwotICAgIH0KLSAgICBoZWFkZXJUZXh0LmFkZChoZWFkZXJMYWJlbCk7Ci0gICAgZm9ybUJvZHkuYWRkKGhlYWRlclRleHQpOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIGNyZWF0ZUVycm9yQm94KCkgewotICAgIGVycm9yTGluZSA9IG5ldyBGbG93UGFuZWwoKTsKLSAgICBET00uc2V0U3R5bGVBdHRyaWJ1dGUoZXJyb3JMaW5lLmdldEVsZW1lbnQoKSwgInZpc2liaWxpdHkiLCAiaGlkZGVuIik7Ci0gICAgZXJyb3JMaW5lLnNldFN0eWxlTmFtZShPcGVuSWRSZXNvdXJjZXMuSS5jc3MoKS5lcnJvcigpKTsKLQotICAgIGVycm9yTXNnID0gbmV3IElubGluZUxhYmVsKCk7Ci0gICAgZXJyb3JMaW5lLmFkZChlcnJvck1zZyk7Ci0gICAgZm9ybUJvZHkuYWRkKGVycm9yTGluZSk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgc2hvd0Vycm9yKGZpbmFsIFN0cmluZyBtc2dUZXh0KSB7Ci0gICAgZXJyb3JNc2cuc2V0VGV4dChtc2dUZXh0KTsKLSAgICBET00uc2V0U3R5bGVBdHRyaWJ1dGUoZXJyb3JMaW5lLmdldEVsZW1lbnQoKSwgInZpc2liaWxpdHkiLCAiIik7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgaGlkZUVycm9yKCkgewotICAgIERPTS5zZXRTdHlsZUF0dHJpYnV0ZShlcnJvckxpbmUuZ2V0RWxlbWVudCgpLCAidmlzaWJpbGl0eSIsICJoaWRkZW4iKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBjcmVhdGVJZGVudEJveCgpIHsKLSAgICBib29sZWFuIHJlbWVtYmVyID0gbW9kZSA9PSBTaWduSW5Nb2RlLlNJR05fSU4gfHwgbW9kZSA9PSBTaWduSW5Nb2RlLlJFR0lTVEVSOwotCi0gICAgZmluYWwgRmxvd1BhbmVsIGdyb3VwID0gbmV3IEZsb3dQYW5lbCgpOwotICAgIGdyb3VwLnNldFN0eWxlTmFtZShPcGVuSWRSZXNvdXJjZXMuSS5jc3MoKS5sb2dpbkxpbmUoKSk7Ci0KLSAgICBmaW5hbCBGbG93UGFuZWwgbGluZTEgPSBuZXcgRmxvd1BhbmVsKCk7Ci0gICAgZ3JvdXAuYWRkKGxpbmUxKTsKLQotICAgIHByb3ZpZGVySWQgPSBuZXcgTnBUZXh0Qm94KCk7Ci0gICAgcHJvdmlkZXJJZC5zZXRWaXNpYmxlTGVuZ3RoKDYwKTsKLSAgICBwcm92aWRlcklkLnNldFN0eWxlTmFtZShPcGVuSWRSZXNvdXJjZXMuSS5jc3MoKS5pZGVudGlmaWVyKCkpOwotICAgIHByb3ZpZGVySWQuc2V0VGFiSW5kZXgoMCk7Ci0gICAgcHJvdmlkZXJJZC5hZGRLZXlQcmVzc0hhbmRsZXIobmV3IEtleVByZXNzSGFuZGxlcigpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgb25LZXlQcmVzcyhmaW5hbCBLZXlQcmVzc0V2ZW50IGV2ZW50KSB7Ci0gICAgICAgIGlmIChldmVudC5nZXROYXRpdmVFdmVudCgpLmdldEtleUNvZGUoKSA9PSBLZXlDb2Rlcy5LRVlfRU5URVIpIHsKLSAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwotICAgICAgICAgIGZvcm0uc3VibWl0KCk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9KTsKLSAgICBsaW5lMS5hZGQocHJvdmlkZXJJZCk7Ci0KLSAgICBsb2dpbiA9IG5ldyBCdXR0b24oKTsKLSAgICBzd2l0Y2ggKG1vZGUpIHsKLSAgICAgIGNhc2UgTElOS19JREVOVElZOgotICAgICAgICBsb2dpbi5zZXRUZXh0KE9wZW5JZFV0aWwuQy5idXR0b25MaW5rSWQoKSk7Ci0gICAgICAgIGJyZWFrOwotICAgICAgY2FzZSBSRUdJU1RFUjoKLSAgICAgICAgbG9naW4uc2V0VGV4dChPcGVuSWRVdGlsLkMuYnV0dG9uUmVnaXN0ZXIoKSk7Ci0gICAgICAgIGJyZWFrOwotICAgICAgY2FzZSBTSUdOX0lOOgotICAgICAgZGVmYXVsdDoKLSAgICAgICAgbG9naW4uc2V0VGV4dChPcGVuSWRVdGlsLkMuYnV0dG9uU2lnbkluKCkpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0gICAgbG9naW4uYWRkQ2xpY2tIYW5kbGVyKG5ldyBDbGlja0hhbmRsZXIoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIG9uQ2xpY2soZmluYWwgQ2xpY2tFdmVudCBldmVudCkgewotICAgICAgICBmb3JtLnN1Ym1pdCgpOwotICAgICAgfQotICAgIH0pOwotICAgIGxvZ2luLnNldFRhYkluZGV4KHJlbWVtYmVyID8gMiA6IDEpOwotICAgIGxpbmUxLmFkZChsb2dpbik7Ci0KLSAgICBCdXR0b24gY2xvc2UgPSBuZXcgQnV0dG9uKEdlcnJpdC5DLnNpZ25JbkRpYWxvZ0Nsb3NlKCkpOwotICAgIGNsb3NlLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKLSAgICAgICAgaGlkZSgpOwotICAgICAgfQotICAgIH0pOwotICAgIGNsb3NlLnNldFRhYkluZGV4KHJlbWVtYmVyID8gMyA6IDIpOwotICAgIGxpbmUxLmFkZChjbG9zZSk7Ci0KLSAgICBpZiAocmVtZW1iZXIpIHsKLSAgICAgIHJlbWVtYmVySWQgPSBuZXcgQ2hlY2tCb3goT3BlbklkVXRpbC5DLnJlbWVtYmVyTWUoKSk7Ci0gICAgICByZW1lbWJlcklkLnNldFRhYkluZGV4KDEpOwotICAgICAgZ3JvdXAuYWRkKHJlbWVtYmVySWQpOwotCi0gICAgICBTdHJpbmcgbGFzdCA9IENvb2tpZXMuZ2V0Q29va2llKE9wZW5JZFVybHMuTEFTVElEX0NPT0tJRSk7Ci0gICAgICBpZiAobGFzdCAhPSBudWxsICYmICEiIi5lcXVhbHMobGFzdCkpIHsKLSAgICAgICAgaWYgKGxhc3Quc3RhcnRzV2l0aCgiXCIiKSAmJiBsYXN0LmVuZHNXaXRoKCJcIiIpKSB7Ci0gICAgICAgICAgLy8gRGVxdW90ZSB0aGUgdmFsdWUuIFdlIHNob3VsZG4ndCBoYXZlIHRvIGRvIHRoaXMsIGJ1dAotICAgICAgICAgIC8vIHNvbWV0aGluZyBpcyBjYXVzaW5nIHNvbWUgR29vZ2xlIEFjY291bnQgdG9rZW5zIHRvIGdldAotICAgICAgICAgIC8vIHdyYXBwZWQgdXAgaW4gZG91YmxlIHF1b3RlcyB3aGVuIG9idGFpbmVkIGZyb20gdGhlIGNvb2tpZS4KLSAgICAgICAgICAvLwotICAgICAgICAgIGxhc3QgPSBsYXN0LnN1YnN0cmluZygxLCBsYXN0Lmxlbmd0aCgpIC0gMik7Ci0gICAgICAgIH0KLSAgICAgICAgcHJvdmlkZXJJZC5zZXRUZXh0KGxhc3QpOwotICAgICAgICByZW1lbWJlcklkLnNldFZhbHVlKHRydWUpOwotICAgICAgfQotICAgIH0KLQotICAgIGZvcm1Cb2R5LmFkZChncm91cCk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgbGluayhmaW5hbCBTdHJpbmcgaWRlbnRVcmwsIGZpbmFsIFN0cmluZyB3aG8sCi0gICAgICBmaW5hbCBJbWFnZVJlc291cmNlIGljb24pIHsKLSAgICBpZiAoIWlzQWxsb3dlZFByb3ZpZGVyKGlkZW50VXJsKSkgewotICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGZpbmFsIENsaWNrSGFuZGxlciBpID0gbmV3IENsaWNrSGFuZGxlcigpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgb25DbGljayhmaW5hbCBDbGlja0V2ZW50IGV2ZW50KSB7Ci0gICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7Ci0gICAgICAgIGlmICghZGlzY292ZXJpbmcpIHsKLSAgICAgICAgICBwcm92aWRlcklkLnNldFRleHQoaWRlbnRVcmwpOwotICAgICAgICAgIGZvcm0uc3VibWl0KCk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9OwotCi0gICAgZmluYWwgRmxvd1BhbmVsIGxpbmUgPSBuZXcgRmxvd1BhbmVsKCk7Ci0gICAgbGluZS5hZGRTdHlsZU5hbWUoT3BlbklkUmVzb3VyY2VzLkkuY3NzKCkuZGlyZWN0TGluaygpKTsKLQotICAgIGZpbmFsIEltYWdlIGltZyA9IG5ldyBJbWFnZShpY29uKTsKLSAgICBpbWcuYWRkQ2xpY2tIYW5kbGVyKGkpOwotICAgIGxpbmUuYWRkKGltZyk7Ci0KLSAgICBmaW5hbCBBbmNob3IgdGV4dCA9IG5ldyBBbmNob3IoKTsKLSAgICBzd2l0Y2ggKG1vZGUpIHsKLSAgICAgIGNhc2UgTElOS19JREVOVElZOgotICAgICAgICB0ZXh0LnNldFRleHQoT3BlbklkVXRpbC5NLmxpbmtXaXRoKHdobykpOwotICAgICAgICBicmVhazsKLSAgICAgIGNhc2UgUkVHSVNURVI6Ci0gICAgICAgIHRleHQuc2V0VGV4dChPcGVuSWRVdGlsLk0ucmVnaXN0ZXJXaXRoKHdobykpOwotICAgICAgICBicmVhazsKLSAgICAgIGNhc2UgU0lHTl9JTjoKLSAgICAgIGRlZmF1bHQ6Ci0gICAgICAgIHRleHQuc2V0VGV4dChPcGVuSWRVdGlsLk0uc2lnbkluV2l0aCh3aG8pKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgfQotICAgIHRleHQuc2V0SHJlZihpZGVudFVybCk7Ci0gICAgdGV4dC5hZGRDbGlja0hhbmRsZXIoaSk7Ci0gICAgbGluZS5hZGQodGV4dCk7Ci0KLSAgICBmb3JtQm9keS5hZGQobGluZSk7Ci0gIH0KLQotICBwcml2YXRlIHN0YXRpYyBib29sZWFuIGlzQWxsb3dlZFByb3ZpZGVyKGZpbmFsIFN0cmluZyBpZGVudFVybCkgewotICAgIGZvciAoT3BlbklkUHJvdmlkZXJQYXR0ZXJuIHAgOiBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0QWxsb3dlZE9wZW5JRHMoKSkgewotICAgICAgaWYgKHAubWF0Y2hlcyhpZGVudFVybCkpIHsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBlbmFibGUoZmluYWwgYm9vbGVhbiBvbikgewotICAgIHByb3ZpZGVySWQuc2V0RW5hYmxlZChvbik7Ci0gICAgbG9naW4uc2V0RW5hYmxlZChvbik7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgb25EaXNjb3ZlcnkoZmluYWwgRGlzY292ZXJ5UmVzdWx0IHJlc3VsdCkgewotICAgIGRpc2NvdmVyaW5nID0gZmFsc2U7Ci0KLSAgICBzd2l0Y2ggKHJlc3VsdC5zdGF0dXMpIHsKLSAgICAgIGNhc2UgVkFMSUQ6Ci0gICAgICAgIC8vIFRoZSBwcm92aWRlciB3b24ndCBzdXBwb3J0IG9wZXJhdGlvbiBpbnNpZGUgYW4gSUZSQU1FLAotICAgICAgICAvLyBzbyB3ZSByZXBsYWNlIG91ciBlbnRpcmUgYXBwbGljYXRpb24uCi0gICAgICAgIC8vCi0gICAgICAgIHJlZGlyZWN0Rm9ybS5zZXRNZXRob2QoRm9ybVBhbmVsLk1FVEhPRF9QT1NUKTsKLSAgICAgICAgcmVkaXJlY3RGb3JtLnNldEFjdGlvbihyZXN1bHQucHJvdmlkZXJVcmwpOwotICAgICAgICByZWRpcmVjdEJvZHkuY2xlYXIoKTsKLSAgICAgICAgZm9yIChmaW5hbCBNYXAuRW50cnk8U3RyaW5nLCBTdHJpbmc+IGUgOiByZXN1bHQucHJvdmlkZXJBcmdzLmVudHJ5U2V0KCkpIHsKLSAgICAgICAgICByZWRpcmVjdEJvZHkuYWRkKG5ldyBIaWRkZW4oZS5nZXRLZXkoKSwgZS5nZXRWYWx1ZSgpKSk7Ci0gICAgICAgIH0KLSAgICAgICAgRm9ybUVsZW1lbnQuYXMocmVkaXJlY3RGb3JtLmdldEVsZW1lbnQoKSkuc2V0VGFyZ2V0KCJfdG9wIik7Ci0gICAgICAgIHJlZGlyZWN0Rm9ybS5zdWJtaXQoKTsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICAgIGNhc2UgTk9UX0FMTE9XRUQ6Ci0gICAgICAgIHNob3dFcnJvcihPcGVuSWRVdGlsLkMubm90QWxsb3dlZCgpKTsKLSAgICAgICAgZW5hYmxlUmV0cnlEaXNjb3ZlcnkoKTsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICAgIGNhc2UgTk9fUFJPVklERVI6Ci0gICAgICAgIHNob3dFcnJvcihPcGVuSWRVdGlsLkMubm9Qcm92aWRlcigpKTsKLSAgICAgICAgZW5hYmxlUmV0cnlEaXNjb3ZlcnkoKTsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICAgIGNhc2UgRVJST1I6Ci0gICAgICBkZWZhdWx0OgotICAgICAgICBzaG93RXJyb3IoT3BlbklkVXRpbC5DLmVycm9yKCkpOwotICAgICAgICBlbmFibGVSZXRyeURpc2NvdmVyeSgpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgZW5hYmxlUmV0cnlEaXNjb3ZlcnkoKSB7Ci0gICAgZW5hYmxlKHRydWUpOwotICAgIHByb3ZpZGVySWQuc2VsZWN0QWxsKCk7Ci0gICAgcHJvdmlkZXJJZC5zZXRGb2N1cyh0cnVlKTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgdm9pZCBvblN1Ym1pdChmaW5hbCBTdWJtaXRFdmVudCBldmVudCkgewotICAgIGV2ZW50LmNhbmNlbCgpOwotCi0gICAgU3RyaW5nIG9wZW5pZElkZW50aWZpZXIgPSBwcm92aWRlcklkLmdldFRleHQoKTsKLSAgICBpZiAob3BlbmlkSWRlbnRpZmllciA9PSBudWxsIHx8IG9wZW5pZElkZW50aWZpZXIuZXF1YWxzKCIiKSkgewotICAgICAgZW5hYmxlKHRydWUpOwotICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGlmICghb3BlbmlkSWRlbnRpZmllci5zdGFydHNXaXRoKCJodHRwOi8vIikKLSAgICAgICAgJiYgIW9wZW5pZElkZW50aWZpZXIuc3RhcnRzV2l0aCgiaHR0cHM6Ly8iKSkgewotICAgICAgb3BlbmlkSWRlbnRpZmllciA9ICJodHRwOi8vIiArIG9wZW5pZElkZW50aWZpZXI7Ci0gICAgfQotCi0gICAgaWYgKCFpc0FsbG93ZWRQcm92aWRlcihvcGVuaWRJZGVudGlmaWVyKSkgewotICAgICAgc2hvd0Vycm9yKE9wZW5JZFV0aWwuQy5ub3RBbGxvd2VkKCkpOwotICAgICAgZW5hYmxlUmV0cnlEaXNjb3ZlcnkoKTsKLSAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBkaXNjb3ZlcmluZyA9IHRydWU7Ci0gICAgZW5hYmxlKGZhbHNlKTsKLSAgICBoaWRlRXJyb3IoKTsKLQotICAgIGZpbmFsIGJvb2xlYW4gcmVtZW1iZXIgPSByZW1lbWJlcklkICE9IG51bGwgJiYgcmVtZW1iZXJJZC5nZXRWYWx1ZSgpOwotICAgIE9wZW5JZFV0aWwuU1ZDLmRpc2NvdmVyKG9wZW5pZElkZW50aWZpZXIsIG1vZGUsIHJlbWVtYmVyLCB0b2tlbiwKLSAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPERpc2NvdmVyeVJlc3VsdD4oKSB7Ci0gICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIERpc2NvdmVyeVJlc3VsdCByZXN1bHQpIHsKLSAgICAgICAgICAgIG9uRGlzY292ZXJ5KHJlc3VsdCk7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKGZpbmFsIFRocm93YWJsZSBjYXVnaHQpIHsKLSAgICAgICAgICAgIHN1cGVyLm9uRmFpbHVyZShjYXVnaHQpOwotICAgICAgICAgICAgZW5hYmxlUmV0cnlEaXNjb3ZlcnkoKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0pOwotICB9Ci0KLSAgcHVibGljIHZvaWQgb25TdWJtaXRDb21wbGV0ZShmaW5hbCBGb3JtU3VibWl0Q29tcGxldGVFdmVudCBldmVudCkgewotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkU3NvUGFuZWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRTc29QYW5lbC5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA4NWRkNzk0Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRTc29QYW5lbC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNjggKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hdXRoLm9wZW5pZDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5TaWduSW5Nb2RlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZC5EaXNjb3ZlcnlSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZG9tLmNsaWVudC5Gb3JtRWxlbWVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRm9ybVBhbmVsOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkhpZGRlbjsKLQotaW1wb3J0IGphdmEudXRpbC5NYXA7Ci0KLXB1YmxpYyBjbGFzcyBPcGVuSWRTc29QYW5lbCBleHRlbmRzIEZsb3dQYW5lbCB7Ci0gIHByaXZhdGUgZmluYWwgRm9ybVBhbmVsIHJlZGlyZWN0Rm9ybTsKLSAgcHJpdmF0ZSBmaW5hbCBGbG93UGFuZWwgcmVkaXJlY3RCb2R5OwotICBwcml2YXRlIGZpbmFsIFN0cmluZyBzc29Vcmw7Ci0KLSAgcHVibGljIE9wZW5JZFNzb1BhbmVsKCkgewotICAgIHN1cGVyKCk7Ci0gICAgcmVkaXJlY3RCb2R5ID0gbmV3IEZsb3dQYW5lbCgpOwotICAgIHJlZGlyZWN0Qm9keS5zZXRWaXNpYmxlKGZhbHNlKTsKLSAgICByZWRpcmVjdEZvcm0gPSBuZXcgRm9ybVBhbmVsKCk7Ci0gICAgcmVkaXJlY3RGb3JtLmFkZChyZWRpcmVjdEJvZHkpOwotCi0gICAgYWRkKHJlZGlyZWN0Rm9ybSk7Ci0KLSAgICBzc29VcmwgPSBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0T3BlbklkU3NvVXJsKCk7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBhdXRoZW50aWNhdGUoU2lnbkluTW9kZSByZXF1ZXN0ZWRNb2RlLCBmaW5hbCBTdHJpbmcgdG9rZW4pIHsKLSAgICBPcGVuSWRVdGlsLlNWQy5kaXNjb3Zlcihzc29VcmwsIHJlcXVlc3RlZE1vZGUsIC8qIHJlbWVtYmVyICovIGZhbHNlLCB0b2tlbiwKLSAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPERpc2NvdmVyeVJlc3VsdD4oKSB7Ci0gICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIERpc2NvdmVyeVJlc3VsdCByZXN1bHQpIHsKLSAgICAgICAgICAgIG9uRGlzY292ZXJ5KHJlc3VsdCk7Ci0gICAgICAgICAgfQotICAgICAgICB9KTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBvbkRpc2NvdmVyeShmaW5hbCBEaXNjb3ZlcnlSZXN1bHQgcmVzdWx0KSB7Ci0gICAgc3dpdGNoIChyZXN1bHQuc3RhdHVzKSB7Ci0gICAgICBjYXNlIFZBTElEOgotICAgICAgICByZWRpcmVjdEZvcm0uc2V0TWV0aG9kKEZvcm1QYW5lbC5NRVRIT0RfUE9TVCk7Ci0gICAgICAgIHJlZGlyZWN0Rm9ybS5zZXRBY3Rpb24ocmVzdWx0LnByb3ZpZGVyVXJsKTsKLSAgICAgICAgcmVkaXJlY3RCb2R5LmNsZWFyKCk7Ci0gICAgICAgIGZvciAoZmluYWwgTWFwLkVudHJ5PFN0cmluZywgU3RyaW5nPiBlIDogcmVzdWx0LnByb3ZpZGVyQXJncy5lbnRyeVNldCgpKSB7Ci0gICAgICAgICAgcmVkaXJlY3RCb2R5LmFkZChuZXcgSGlkZGVuKGUuZ2V0S2V5KCksIGUuZ2V0VmFsdWUoKSkpOwotICAgICAgICB9Ci0gICAgICAgIEZvcm1FbGVtZW50LmFzKHJlZGlyZWN0Rm9ybS5nZXRFbGVtZW50KCkpLnNldFRhcmdldCgiX3RvcCIpOwotICAgICAgICByZWRpcmVjdEZvcm0uc3VibWl0KCk7Ci0gICAgICAgIGJyZWFrOwotICAgIH0KLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZFV0aWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9PcGVuSWRVdGlsLmphdmEKaW5kZXggMTVhZWIzNC4uZDViNzY4NCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL09wZW5JZFV0aWwuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvT3BlbklkVXRpbC5qYXZhCkBAIC0xNCwxOSArMTQsMTIgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC5vcGVuaWQ7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5vcGVuaWQuT3BlbklkU2VydmljZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNsaWVudC5Kc29uVXRpbDsKIAogcHVibGljIGNsYXNzIE9wZW5JZFV0aWwgewogICBwdWJsaWMgc3RhdGljIGZpbmFsIE9wZW5JZENvbnN0YW50cyBDOwotICBwdWJsaWMgc3RhdGljIGZpbmFsIE9wZW5JZE1lc3NhZ2VzIE07Ci0gIHB1YmxpYyBzdGF0aWMgZmluYWwgT3BlbklkU2VydmljZSBTVkM7CiAKICAgc3RhdGljIHsKICAgICBDID0gR1dULmNyZWF0ZShPcGVuSWRDb25zdGFudHMuY2xhc3MpOwotICAgIE0gPSBHV1QuY3JlYXRlKE9wZW5JZE1lc3NhZ2VzLmNsYXNzKTsKLSAgICBTVkMgPSBHV1QuY3JlYXRlKE9wZW5JZFNlcnZpY2UuY2xhc3MpOwotICAgIEpzb25VdGlsLmJpbmQoU1ZDLCAicnBjL09wZW5JZFNlcnZpY2UiKTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL2ljb25Hb29nbGUuZ2lmIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL2ljb25Hb29nbGUuZ2lmCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA3NDhmZDIwLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9pY29uR29vZ2xlLmdpZgorKysgL2Rldi9udWxsCkJpbmFyeSBmaWxlcyBkaWZmZXIKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL29wZW5pZC9pY29uWWFob28uZ2lmIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL2ljb25ZYWhvby5naWYKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDA4MjA0NTUuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL2ljb25ZYWhvby5naWYKKysrIC9kZXYvbnVsbApCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvaWRlbnRpZmllckJhY2tncm91bmQuZ2lmIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL2lkZW50aWZpZXJCYWNrZ3JvdW5kLmdpZgpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggY2RlODM2Yy4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvaWRlbnRpZmllckJhY2tncm91bmQuZ2lmCisrKyAvZGV2L251bGwKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL29wZW5pZC5jc3MgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvb3BlbmlkLmNzcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMWU0NzVlZS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvb3BlbmlkLmNzcworKysgL2Rldi9udWxsCkBAIC0xLDY5ICswLDAgQEAKLS8qIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0gKgotICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0gKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0gKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLSAqCi0gKiBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLSAqCi0gKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0gKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotICogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0gKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0gKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLSAqLwotCi1AZXh0ZXJuYWwgLmd3dC1CdXR0b247Ci0KLUB1cmwgaWRlbnRpZmllckJhY2tncm91bmQgaWRlbnRpZmllckJhY2tncm91bmQ7Ci0KLS5sb2dpbkZvcm0gewotICBtYXJnaW4tbGVmdDogMTBweDsKLSAgbWFyZ2luLXJpZ2h0OiAxMHB4OwotfQotCi0ubG9nbyB7Ci0gIHRleHQtYWxpZ246IHJpZ2h0OwotfQotCi0ubG9naW5MaW5lIHsKLSAgbWFyZ2luLWJvdHRvbTogMTBweDsKLX0KLS5sb2dpbkxpbmUgZGl2IHsKLSAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKLX0KLS5sb2dpbkxpbmUgLmd3dC1CdXR0b24gewotICBtYXJnaW4tbGVmdDogMnB4OwotfQotCi0uaWRlbnRpZmllciB7Ci0gIGJhY2tncm91bmQ6ICNmZmZmZmYgaWRlbnRpZmllckJhY2tncm91bmQgbm8tcmVwZWF0IHNjcm9sbCA1cHggNTAlOwotICBwYWRkaW5nLWxlZnQ6IDI1cHg7Ci0gIGJvcmRlcjogMXB4IHNvbGlkICM5OTk5OTk7Ci19Ci0KLS5kaXJlY3RMaW5rIHsKLSAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKLSAgbWFyZ2luLXJpZ2h0OiA1cHg7Ci0gIGNvbG9yOiBibHVlOwotICBjdXJzb3I6IHBvaW50ZXI7Ci19Ci0uZGlyZWN0TGluazpob3ZlciB7Ci0gIHRleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOwotfQotLmRpcmVjdExpbmsgaW1nIHsKLSAgbWFyZ2luLXJpZ2h0OiAzcHg7Ci0gIGJvcmRlcjogMCBub25lOwotfQotCi0uZXJyb3IgewotICBwYWRkaW5nLXRvcDogNXB4OwotICBwYWRkaW5nLWJvdHRvbTogNXB4OwotfQotLmVycm9yIHNwYW4gewotICBwYWRkaW5nLXRvcDogNHB4OwotICBwYWRkaW5nLWJvdHRvbTogNHB4OwotICBwYWRkaW5nLWxlZnQ6IDEwcHg7Ci0gIHBhZGRpbmctcmlnaHQ6IDEwcHg7Ci0gIGJhY2tncm91bmQ6ICNmZmYxYTg7Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvb3BlbmlkTG9nby5wbmcgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC9vcGVuaWQvb3BlbmlkTG9nby5wbmcKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDlmOGZhNzMuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvb3BlbmlkL29wZW5pZExvZ28ucG5nCisrKyAvZGV2L251bGwKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NDb25zdGFudHMuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1VzZXJQYXNzQ29uc3RhbnRzLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDFhZjYzNjkuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NDb25zdGFudHMuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDI2ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC51c2VycGFzczsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmkxOG4uY2xpZW50LkNvbnN0YW50czsKLQotcHVibGljIGludGVyZmFjZSBVc2VyUGFzc0NvbnN0YW50cyBleHRlbmRzIENvbnN0YW50cyB7Ci0gIFN0cmluZyBidXR0b25TaWduSW4oKTsKLSAgU3RyaW5nIHVzZXJuYW1lKCk7Ci0gIFN0cmluZyBwYXNzd29yZCgpOwotICBTdHJpbmcgaW52YWxpZExvZ2luKCk7Ci0gIFN0cmluZyB1c2VybmFtZVJlcXVpcmVkKCk7Ci0gIFN0cmluZyBwYXNzd29yZFJlcXVpcmVkKCk7Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC91c2VycGFzcy9Vc2VyUGFzc0NvbnN0YW50cy5wcm9wZXJ0aWVzIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NDb25zdGFudHMucHJvcGVydGllcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOTEyMDRmN2IuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NDb25zdGFudHMucHJvcGVydGllcworKysgL2Rldi9udWxsCkBAIC0xLDYgKzAsMCBAQAotYnV0dG9uU2lnbkluID0gU2lnbiBJbgotdXNlcm5hbWUgPSBVc2VybmFtZQotcGFzc3dvcmQgPSBQYXNzd29yZAotaW52YWxpZExvZ2luID0gSW5jb3JyZWN0IHVzZXJuYW1lIG9yIHBhc3N3b3JkLgotdXNlcm5hbWVSZXF1aXJlZCA9IFBsZWFzZSBlbnRlciBhIHVzZXJuYW1lLgotcGFzc3dvcmRSZXF1aXJlZCA9IFBsZWFzZSBlbnRlciBhIHBhc3N3b3JkLgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NDc3MuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1VzZXJQYXNzQ3NzLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDZkOTdjY2ExLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1VzZXJQYXNzQ3NzLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwyMiArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmF1dGgudXNlcnBhc3M7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5yZXNvdXJjZXMuY2xpZW50LkNzc1Jlc291cmNlOwotCi1wdWJsaWMgaW50ZXJmYWNlIFVzZXJQYXNzQ3NzIGV4dGVuZHMgQ3NzUmVzb3VyY2UgewotICBTdHJpbmcgbG9naW5Gb3JtKCk7Ci0gIFN0cmluZyBlcnJvcigpOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NNZXNzYWdlcy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NNZXNzYWdlcy5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBjY2RkMWVjLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1VzZXJQYXNzTWVzc2FnZXMuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDIzICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC51c2VycGFzczsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BdXRoVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5pMThuLmNsaWVudC5NZXNzYWdlczsKLQotcHVibGljIGludGVyZmFjZSBVc2VyUGFzc01lc3NhZ2VzIGV4dGVuZHMgTWVzc2FnZXMgewotICBTdHJpbmcgc2lnbkluQXQoU3RyaW5nIGhvc3RuYW1lKTsKLSAgU3RyaW5nIGF1dGhlbnRpY2F0aW9uVW5hdmFpbGFibGUoQXV0aFR5cGUgYXV0aFR5cGUpOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NNZXNzYWdlcy5wcm9wZXJ0aWVzIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NNZXNzYWdlcy5wcm9wZXJ0aWVzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBiMWVhYjM1Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1VzZXJQYXNzTWVzc2FnZXMucHJvcGVydGllcworKysgL2Rldi9udWxsCkBAIC0xLDIgKzAsMCBAQAotc2lnbkluQXQgPSBTaWduIEluIHRvIEdlcnJpdCBDb2RlIFJldmlldyBhdCB7MH0KLWF1dGhlbnRpY2F0aW9uVW5hdmFpbGFibGUgPSB7MH0gYXV0aGVudGljYXRpb24gdW5hdmFpbGFibGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1VzZXJQYXNzUmVzb3VyY2VzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC91c2VycGFzcy9Vc2VyUGFzc1Jlc291cmNlcy5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBiOTQ3NGNkLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1VzZXJQYXNzUmVzb3VyY2VzLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwyNSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmF1dGgudXNlcnBhc3M7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLmNsaWVudC5DbGllbnRCdW5kbGU7Ci0KLWludGVyZmFjZSBVc2VyUGFzc1Jlc291cmNlcyBleHRlbmRzIENsaWVudEJ1bmRsZSB7Ci0gIHN0YXRpYyBmaW5hbCBVc2VyUGFzc1Jlc291cmNlcyBJID0gR1dULmNyZWF0ZShVc2VyUGFzc1Jlc291cmNlcy5jbGFzcyk7Ci0KLSAgQFNvdXJjZSgidXNlcnBhc3MuY3NzIikKLSAgVXNlclBhc3NDc3MgY3NzKCk7Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC91c2VycGFzcy9Vc2VyUGFzc1NpZ25JbkRpYWxvZy5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvVXNlclBhc3NTaWduSW5EaWFsb2cuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMzQ2MzY0MC4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC91c2VycGFzcy9Vc2VyUGFzc1NpZ25JbkRpYWxvZy5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMjQwICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYXV0aC51c2VycGFzczsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LlNpZ25JbkRpYWxvZzsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TbWFsbEhlYWRpbmc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5TaWduSW5Nb2RlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLnVzZXJwYXNzLkxvZ2luUmVzdWx0OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LlNjaGVkdWxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5TY2hlZHVsZXIuU2NoZWR1bGVkQ29tbWFuZDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlDb2RlczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzRXZlbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0hhbmRsZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRE9NOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LldpbmRvdy5Mb2NhdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5CdXR0b247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxvd1BhbmVsOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkdyaWQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW5saW5lTGFiZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuUGFzc3dvcmRUZXh0Qm94OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlRleHRCb3g7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5nbG9iYWxrZXkuY2xpZW50Lkdsb2JhbEtleTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuTnBUZXh0Qm94OwotCi1wdWJsaWMgY2xhc3MgVXNlclBhc3NTaWduSW5EaWFsb2cgZXh0ZW5kcyBTaWduSW5EaWFsb2cgewotICBzdGF0aWMgewotICAgIFVzZXJQYXNzUmVzb3VyY2VzLkkuY3NzKCkuZW5zdXJlSW5qZWN0ZWQoKTsKLSAgfQotCi0gIHByaXZhdGUgZmluYWwgRmxvd1BhbmVsIGZvcm1Cb2R5OwotCi0gIHByaXZhdGUgRmxvd1BhbmVsIGVycm9yTGluZTsKLSAgcHJpdmF0ZSBJbmxpbmVMYWJlbCBlcnJvck1zZzsKLQotICBwcml2YXRlIEJ1dHRvbiBsb2dpbjsKLSAgcHJpdmF0ZSBCdXR0b24gY2xvc2U7Ci0gIHByaXZhdGUgVGV4dEJveCB1c2VybmFtZTsKLSAgcHJpdmF0ZSBUZXh0Qm94IHBhc3N3b3JkOwotCi0gIHB1YmxpYyBVc2VyUGFzc1NpZ25JbkRpYWxvZyhmaW5hbCBTdHJpbmcgdG9rZW4sIGZpbmFsIFN0cmluZyBpbml0aWFsRXJyb3JNc2cpIHsKLSAgICBzdXBlcihTaWduSW5Nb2RlLlNJR05fSU4sIHRva2VuKTsKLSAgICBzZXRBdXRvSGlkZUVuYWJsZWQoZmFsc2UpOwotCi0gICAgZm9ybUJvZHkgPSBuZXcgRmxvd1BhbmVsKCk7Ci0gICAgZm9ybUJvZHkuc2V0U3R5bGVOYW1lKFVzZXJQYXNzUmVzb3VyY2VzLkkuY3NzKCkubG9naW5Gb3JtKCkpOwotICAgIGFkZChmb3JtQm9keSk7Ci0KLSAgICBjcmVhdGVIZWFkZXJUZXh0KCk7Ci0gICAgY3JlYXRlRXJyb3JCb3goKTsKLSAgICBjcmVhdGVVc2VybmFtZUJveCgpOwotICAgIGlmIChpbml0aWFsRXJyb3JNc2cgIT0gbnVsbCkgewotICAgICAgc2hvd0Vycm9yKGluaXRpYWxFcnJvck1zZyk7Ci0gICAgfQotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIHNob3coKSB7Ci0gICAgc3VwZXIuc2hvdygpOwotICAgIFNjaGVkdWxlci5nZXQoKS5zY2hlZHVsZURlZmVycmVkKG5ldyBTY2hlZHVsZWRDb21tYW5kKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBleGVjdXRlKCkgewotICAgICAgICB1c2VybmFtZS5zZXRGb2N1cyh0cnVlKTsKLSAgICAgIH0KLSAgICB9KTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBjcmVhdGVIZWFkZXJUZXh0KCkgewotICAgIGZpbmFsIEZsb3dQYW5lbCBoZWFkZXJUZXh0ID0gbmV3IEZsb3dQYW5lbCgpOwotICAgIGZpbmFsIFNtYWxsSGVhZGluZyBoZWFkZXJMYWJlbCA9IG5ldyBTbWFsbEhlYWRpbmcoKTsKLSAgICBoZWFkZXJMYWJlbC5zZXRUZXh0KFV0aWwuTS5zaWduSW5BdChMb2NhdGlvbi5nZXRIb3N0TmFtZSgpKSk7Ci0gICAgaGVhZGVyVGV4dC5hZGQoaGVhZGVyTGFiZWwpOwotICAgIGZvcm1Cb2R5LmFkZChoZWFkZXJUZXh0KTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBjcmVhdGVFcnJvckJveCgpIHsKLSAgICBlcnJvckxpbmUgPSBuZXcgRmxvd1BhbmVsKCk7Ci0gICAgRE9NLnNldFN0eWxlQXR0cmlidXRlKGVycm9yTGluZS5nZXRFbGVtZW50KCksICJ2aXNpYmlsaXR5IiwgImhpZGRlbiIpOwotICAgIGVycm9yTGluZS5zZXRTdHlsZU5hbWUoVXNlclBhc3NSZXNvdXJjZXMuSS5jc3MoKS5lcnJvcigpKTsKLQotICAgIGVycm9yTXNnID0gbmV3IElubGluZUxhYmVsKCk7Ci0gICAgZXJyb3JMaW5lLmFkZChlcnJvck1zZyk7Ci0gICAgZm9ybUJvZHkuYWRkKGVycm9yTGluZSk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgc2hvd0Vycm9yKGZpbmFsIFN0cmluZyBtc2dUZXh0KSB7Ci0gICAgZXJyb3JNc2cuc2V0VGV4dChtc2dUZXh0KTsKLSAgICBET00uc2V0U3R5bGVBdHRyaWJ1dGUoZXJyb3JMaW5lLmdldEVsZW1lbnQoKSwgInZpc2liaWxpdHkiLCAiIik7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgaGlkZUVycm9yKCkgewotICAgIERPTS5zZXRTdHlsZUF0dHJpYnV0ZShlcnJvckxpbmUuZ2V0RWxlbWVudCgpLCAidmlzaWJpbGl0eSIsICJoaWRkZW4iKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBjcmVhdGVVc2VybmFtZUJveCgpIHsKLSAgICB1c2VybmFtZSA9IG5ldyBOcFRleHRCb3goKTsKLSAgICB1c2VybmFtZS5zZXRWaXNpYmxlTGVuZ3RoKDI1KTsKLSAgICB1c2VybmFtZS5hZGRLZXlQcmVzc0hhbmRsZXIobmV3IEtleVByZXNzSGFuZGxlcigpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgb25LZXlQcmVzcyhmaW5hbCBLZXlQcmVzc0V2ZW50IGV2ZW50KSB7Ci0gICAgICAgIGlmIChldmVudC5nZXROYXRpdmVFdmVudCgpLmdldEtleUNvZGUoKSA9PSBLZXlDb2Rlcy5LRVlfRU5URVIpIHsKLSAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwotICAgICAgICAgIHBhc3N3b3JkLnNlbGVjdEFsbCgpOwotICAgICAgICAgIHBhc3N3b3JkLnNldEZvY3VzKHRydWUpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfSk7Ci0KLSAgICBwYXNzd29yZCA9IG5ldyBQYXNzd29yZFRleHRCb3goKTsKLSAgICBwYXNzd29yZC5zZXRWaXNpYmxlTGVuZ3RoKDI1KTsKLSAgICBwYXNzd29yZC5hZGRLZXlQcmVzc0hhbmRsZXIoR2xvYmFsS2V5LlNUT1BfUFJPUEFHQVRJT04pOwotICAgIHBhc3N3b3JkLmFkZEtleVByZXNzSGFuZGxlcihuZXcgS2V5UHJlc3NIYW5kbGVyKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBvbktleVByZXNzKGZpbmFsIEtleVByZXNzRXZlbnQgZXZlbnQpIHsKLSAgICAgICAgaWYgKGV2ZW50LmdldE5hdGl2ZUV2ZW50KCkuZ2V0S2V5Q29kZSgpID09IEtleUNvZGVzLktFWV9FTlRFUikgewotICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7Ci0gICAgICAgICAgb25Mb2dpbigpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfSk7Ci0KLSAgICBmaW5hbCBGbG93UGFuZWwgYnV0dG9ucyA9IG5ldyBGbG93UGFuZWwoKTsKLSAgICBidXR0b25zLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmVycm9yRGlhbG9nQnV0dG9ucygpKTsKLQotICAgIGxvZ2luID0gbmV3IEJ1dHRvbigpOwotICAgIGxvZ2luLnNldFRleHQoVXRpbC5DLmJ1dHRvblNpZ25JbigpKTsKLSAgICBsb2dpbi5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgb25DbGljayhmaW5hbCBDbGlja0V2ZW50IGV2ZW50KSB7Ci0gICAgICAgIG9uTG9naW4oKTsKLSAgICAgIH0KLSAgICB9KTsKLSAgICBidXR0b25zLmFkZChsb2dpbik7Ci0KLSAgICBjbG9zZSA9IG5ldyBCdXR0b24oKTsKLSAgICBET00uc2V0U3R5bGVBdHRyaWJ1dGUoY2xvc2UuZ2V0RWxlbWVudCgpLCAibWFyZ2luTGVmdCIsICI0NXB4Iik7Ci0gICAgY2xvc2Uuc2V0VGV4dChHZXJyaXQuQy5zaWduSW5EaWFsb2dDbG9zZSgpKTsKLSAgICBjbG9zZS5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgb25DbGljayhDbGlja0V2ZW50IGV2ZW50KSB7Ci0gICAgICAgIGhpZGUoKTsKLSAgICAgIH0KLSAgICB9KTsKLSAgICBidXR0b25zLmFkZChjbG9zZSk7Ci0KLSAgICBmaW5hbCBHcmlkIGZvcm1HcmlkID0gbmV3IEdyaWQoMywgMik7Ci0gICAgZm9ybUdyaWQuc2V0VGV4dCgwLCAwLCBVdGlsLkMudXNlcm5hbWUoKSk7Ci0gICAgZm9ybUdyaWQuc2V0VGV4dCgxLCAwLCBVdGlsLkMucGFzc3dvcmQoKSk7Ci0gICAgZm9ybUdyaWQuc2V0V2lkZ2V0KDAsIDEsIHVzZXJuYW1lKTsKLSAgICBmb3JtR3JpZC5zZXRXaWRnZXQoMSwgMSwgcGFzc3dvcmQpOwotICAgIGZvcm1HcmlkLnNldFdpZGdldCgyLCAxLCBidXR0b25zKTsKLSAgICBmb3JtQm9keS5hZGQoZm9ybUdyaWQpOwotCi0gICAgdXNlcm5hbWUuc2V0VGFiSW5kZXgoMSk7Ci0gICAgcGFzc3dvcmQuc2V0VGFiSW5kZXgoMik7Ci0gICAgbG9naW4uc2V0VGFiSW5kZXgoMyk7Ci0gICAgY2xvc2Uuc2V0VGFiSW5kZXgoNCk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgZW5hYmxlKGZpbmFsIGJvb2xlYW4gb24pIHsKLSAgICB1c2VybmFtZS5zZXRFbmFibGVkKG9uKTsKLSAgICBwYXNzd29yZC5zZXRFbmFibGVkKG9uKTsKLSAgICBsb2dpbi5zZXRFbmFibGVkKG9uKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBvbkxvZ2luKCkgewotICAgIGhpZGVFcnJvcigpOwotCi0gICAgZmluYWwgU3RyaW5nIHVzZXIgPSB1c2VybmFtZS5nZXRUZXh0KCk7Ci0gICAgaWYgKHVzZXIgPT0gbnVsbCB8fCB1c2VyLmVxdWFscygiIikpIHsKLSAgICAgIHNob3dFcnJvcihVdGlsLkMudXNlcm5hbWVSZXF1aXJlZCgpKTsKLSAgICAgIHVzZXJuYW1lLnNldEZvY3VzKHRydWUpOwotICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGZpbmFsIFN0cmluZyBwYXNzID0gcGFzc3dvcmQuZ2V0VGV4dCgpOwotICAgIGlmIChwYXNzID09IG51bGwgfHwgcGFzcy5lcXVhbHMoIiIpKSB7Ci0gICAgICBzaG93RXJyb3IoVXRpbC5DLnBhc3N3b3JkUmVxdWlyZWQoKSk7Ci0gICAgICBwYXNzd29yZC5zZXRGb2N1cyh0cnVlKTsKLSAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBlbmFibGUoZmFsc2UpOwotICAgIFV0aWwuU1ZDLmF1dGhlbnRpY2F0ZSh1c2VyLCBwYXNzLCBuZXcgR2Vycml0Q2FsbGJhY2s8TG9naW5SZXN1bHQ+KCkgewotICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIExvZ2luUmVzdWx0IHJlc3VsdCkgewotICAgICAgICBpZiAocmVzdWx0LnN1Y2Nlc3MpIHsKLSAgICAgICAgICBTdHJpbmcgdG8gPSB0b2tlbjsKLSAgICAgICAgICBpZiAoIXRvLnN0YXJ0c1dpdGgoIi8iKSkgewotICAgICAgICAgICAgdG8gPSAiLyIgKyB0bzsKLSAgICAgICAgICB9Ci0gICAgICAgICAgaWYgKHJlc3VsdC5pc05ldyAmJiAhdG9rZW4uc3RhcnRzV2l0aChQYWdlTGlua3MuUkVHSVNURVIgKyAiLyIpKSB7Ci0gICAgICAgICAgICB0byA9IFBhZ2VMaW5rcy5SRUdJU1RFUiArIHRvOwotICAgICAgICAgIH0KLSAgICAgICAgICBMb2NhdGlvbi5yZXBsYWNlKExvY2F0aW9uLmdldFBhdGgoKSArICJsb2dpbiIgKyB0byk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgZmluYWwgU3RyaW5nIG1lc3NhZ2U7Ci0gICAgICAgICAgc3dpdGNoIChyZXN1bHQuZ2V0RXJyb3IoKSkgewotICAgICAgICAgICAgY2FzZSBBVVRIRU5USUNBVElPTl9VTkFWQUlMQUJMRToKLSAgICAgICAgICAgICAgbWVzc2FnZSA9IFV0aWwuTS5hdXRoZW50aWNhdGlvblVuYXZhaWxhYmxlKHJlc3VsdC5nZXRBdXRoVHlwZSgpKTsKLSAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIElOVkFMSURfTE9HSU46Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICBtZXNzYWdlID0gVXRpbC5DLmludmFsaWRMb2dpbigpOwotICAgICAgICAgIH0KLSAgICAgICAgICBzaG93RXJyb3IobWVzc2FnZSk7Ci0gICAgICAgICAgZW5hYmxlKHRydWUpOwotICAgICAgICAgIHBhc3N3b3JkLnNlbGVjdEFsbCgpOwotICAgICAgICAgIFNjaGVkdWxlci5nZXQoKS5zY2hlZHVsZURlZmVycmVkKG5ldyBTY2hlZHVsZWRDb21tYW5kKCkgewotICAgICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgICBwdWJsaWMgdm9pZCBleGVjdXRlKCkgewotICAgICAgICAgICAgICBwYXNzd29yZC5zZXRGb2N1cyh0cnVlKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9KTsKLSAgICAgICAgfQotICAgICAgfQotCi0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShmaW5hbCBUaHJvd2FibGUgY2F1Z2h0KSB7Ci0gICAgICAgIHN1cGVyLm9uRmFpbHVyZShjYXVnaHQpOwotICAgICAgICBlbmFibGUodHJ1ZSk7Ci0gICAgICB9Ci0gICAgfSk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1V0aWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL1V0aWwuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggN2NmY2UwNC4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvYXV0aC91c2VycGFzcy9VdGlsLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwzMCArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmF1dGgudXNlcnBhc3M7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC51c2VycGFzcy5Vc2VyUGFzc0F1dGhTZXJ2aWNlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY2xpZW50Lkpzb25VdGlsOwotCi1wdWJsaWMgY2xhc3MgVXRpbCB7Ci0gIHB1YmxpYyBzdGF0aWMgZmluYWwgVXNlclBhc3NDb25zdGFudHMgQyA9IEdXVC5jcmVhdGUoVXNlclBhc3NDb25zdGFudHMuY2xhc3MpOwotICBwdWJsaWMgc3RhdGljIGZpbmFsIFVzZXJQYXNzTWVzc2FnZXMgTSA9IEdXVC5jcmVhdGUoVXNlclBhc3NNZXNzYWdlcy5jbGFzcyk7Ci0gIHB1YmxpYyBzdGF0aWMgZmluYWwgVXNlclBhc3NBdXRoU2VydmljZSBTVkM7Ci0KLSAgc3RhdGljIHsKLSAgICBTVkMgPSBHV1QuY3JlYXRlKFVzZXJQYXNzQXV0aFNlcnZpY2UuY2xhc3MpOwotICAgIEpzb25VdGlsLmJpbmQoU1ZDLCAicnBjL1VzZXJQYXNzQXV0aFNlcnZpY2UiKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvdXNlcnBhc3MuY3NzIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2F1dGgvdXNlcnBhc3MvdXNlcnBhc3MuY3NzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBiNGEzMmM5Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9hdXRoL3VzZXJwYXNzL3VzZXJwYXNzLmNzcworKysgL2Rldi9udWxsCkBAIC0xLDMyICswLDAgQEAKLS8qIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0gKgotICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0gKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0gKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLSAqCi0gKiBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLSAqCi0gKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0gKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotICogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0gKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0gKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLSAqLwotCi0ubG9naW5Gb3JtIHsKLSAgbWFyZ2luLWxlZnQ6IDEwcHg7Ci0gIG1hcmdpbi1yaWdodDogMTBweDsKLX0KLQotLmVycm9yIHsKLSAgcGFkZGluZy10b3A6IDVweDsKLSAgcGFkZGluZy1ib3R0b206IDVweDsKLX0KLQotLmVycm9yIHNwYW4gewotICBwYWRkaW5nLXRvcDogNHB4OwotICBwYWRkaW5nLWJvdHRvbTogNHB4OwotICBwYWRkaW5nLWxlZnQ6IDEwcHg7Ci0gIHBhZGRpbmctcmlnaHQ6IDEwcHg7Ci0gIGJhY2tncm91bmQ6ICNmZmYxYTg7Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9BY2NvdW50RGFzaGJvYXJkU2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9BY2NvdW50RGFzaGJvYXJkU2NyZWVuLmphdmEKaW5kZXggMDVkZDVkOS4uMjU4MDU0MiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQWNjb3VudERhc2hib2FyZFNjcmVlbi5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0FjY291bnREYXNoYm9hcmRTY3JlZW4uamF2YQpAQCAtMTYsMTAgKzE2LDExIEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5Ob3RGb3VuZFNjcmVlbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLk5hdGl2ZUxpc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuU2NyZWVuTG9hZENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSnNBcnJheTsKIAogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKQEAgLTY0LDE1ICs2NSwxNSBAQAogICAgIHN1cGVyLm9uTG9hZCgpOwogICAgIFN0cmluZyB3aG8gPSBtaW5lID8gInNlbGYiIDogb3duZXJJZC50b1N0cmluZygpOwogICAgIENoYW5nZUxpc3QucXVlcnkoCi0gICAgICAgIG5ldyBTY3JlZW5Mb2FkQ2FsbGJhY2s8TmF0aXZlTGlzdDxDaGFuZ2VMaXN0Pj4odGhpcykgeworICAgICAgICBuZXcgU2NyZWVuTG9hZENhbGxiYWNrPEpzQXJyYXk8Q2hhbmdlTGlzdD4+KHRoaXMpIHsKICAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwcm90ZWN0ZWQgdm9pZCBwcmVEaXNwbGF5KE5hdGl2ZUxpc3Q8Q2hhbmdlTGlzdD4gcmVzdWx0KSB7CisgICAgICAgICAgcHJvdGVjdGVkIHZvaWQgcHJlRGlzcGxheShKc0FycmF5PENoYW5nZUxpc3Q+IHJlc3VsdCkgewogICAgICAgICAgICAgZGlzcGxheShyZXN1bHQpOwogICAgICAgICAgIH0KICAgICAgICAgfSwKICAgICAgICAgImlzOm9wZW4gb3duZXI6IiArIHdobywKICAgICAgICAgImlzOm9wZW4gcmV2aWV3ZXI6IiArIHdobyArICIgLW93bmVyOiIgKyB3aG8sCi0gICAgICAgICJpczpjbG9zZWQgb3duZXI6IiArIHdobyArICIgLWFnZToxdyBsaW1pdDoxMCIpOworICAgICAgICAiaXM6Y2xvc2VkIG93bmVyOiIgKyB3aG8gKyAiIC1hZ2U6NHcgbGltaXQ6MTAiKTsKICAgfQogCiAgIEBPdmVycmlkZQpAQCAtODEsNyArODIsNyBAQAogICAgIHRhYmxlLnNldFJlZ2lzdGVyS2V5cyh0cnVlKTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBkaXNwbGF5KE5hdGl2ZUxpc3Q8Q2hhbmdlTGlzdD4gcmVzdWx0KSB7CisgIHByaXZhdGUgdm9pZCBkaXNwbGF5KEpzQXJyYXk8Q2hhbmdlTGlzdD4gcmVzdWx0KSB7CiAgICAgaWYgKCFtaW5lICYmICFoYXNDaGFuZ2VzKHJlc3VsdCkpIHsKICAgICAgIC8vIFdoZW4gbm8gcmVzdWx0cyBhcmUgcmV0dXJuZWQgYW5kIHRoZSBkYXRhIGlzIG5vdCBmb3IgdGhlCiAgICAgICAvLyBjdXJyZW50IHVzZXIsIHRoZSB0YXJnZXQgdXNlciBpcyBwcmVzdW1lZCB0byBub3QgZXhpc3QuCkBAIC0xMTIsNyArMTEzLDcgQEAKICAgICAgIH0KICAgICB9CiAKLSAgICBDb2xsZWN0aW9ucy5zb3J0KG91dC5hc0xpc3QoKSwgb3V0Q29tcGFyYXRvcigpKTsKKyAgICBDb2xsZWN0aW9ucy5zb3J0KE5hdGl2ZXMuYXNMaXN0KG91dCksIG91dENvbXBhcmF0b3IoKSk7CiAKICAgICB0YWJsZS51cGRhdGVDb2x1bW5zRm9yTGFiZWxzKG91dCwgaW4sIGRvbmUpOwogICAgIG91dGdvaW5nLmRpc3BsYXkob3V0KTsKQEAgLTEzMiw5ICsxMzMsOSBAQAogICAgIH07CiAgIH0KIAotICBwcml2YXRlIGJvb2xlYW4gaGFzQ2hhbmdlcyhOYXRpdmVMaXN0PENoYW5nZUxpc3Q+IHJlc3VsdCkgewotICAgIGZvciAoQ2hhbmdlTGlzdCBsaXN0IDogcmVzdWx0LmFzTGlzdCgpKSB7Ci0gICAgICBpZiAoIWxpc3QuaXNFbXB0eSgpKSB7CisgIHByaXZhdGUgYm9vbGVhbiBoYXNDaGFuZ2VzKEpzQXJyYXk8Q2hhbmdlTGlzdD4gcmVzdWx0KSB7CisgICAgZm9yIChDaGFuZ2VMaXN0IGxpc3QgOiBOYXRpdmVzLmFzTGlzdChyZXN1bHQpKSB7CisgICAgICBpZiAobGlzdC5sZW5ndGgoKSAhPSAwKSB7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgfQogICAgIH0KQEAgLTE0Miw3ICsxNDMsNyBAQAogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGd1ZXNzTmFtZShDaGFuZ2VMaXN0IGxpc3QpIHsKLSAgICBmb3IgKENoYW5nZUluZm8gY2hhbmdlIDogbGlzdC5hc0xpc3QoKSkgeworICAgIGZvciAoQ2hhbmdlSW5mbyBjaGFuZ2UgOiBOYXRpdmVzLmFzTGlzdChsaXN0KSkgewogICAgICAgaWYgKGNoYW5nZS5vd25lcigpICE9IG51bGwgJiYgY2hhbmdlLm93bmVyKCkubmFtZSgpICE9IG51bGwpIHsKICAgICAgICAgcmV0dXJuIGNoYW5nZS5vd25lcigpLm5hbWUoKTsKICAgICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0FwcHJvdmFsVGFibGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0FwcHJvdmFsVGFibGUuamF2YQppbmRleCA3MzAzNmZmLi5kZWI4NjdjIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9BcHByb3ZhbFRhYmxlLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQXBwcm92YWxUYWJsZS5qYXZhCkBAIC0xNCwyNyArMTQsMjggQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlczsKIAoraW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFZhbHVlLmZvcm1hdFZhbHVlOworCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkNvbmZpcm1hdGlvbkNhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5Db25maXJtYXRpb25EaWFsb2c7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkVycm9yRGlhbG9nOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5Gb3JtYXRVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBhdGNoZXMuUGF0Y2hVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hY2NvdW50LkFjY291bnRJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLkNoYW5nZUluZm8uQXBwcm92YWxJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLkNoYW5nZUluZm8uTGFiZWxJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVNYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVTdHJpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5BY2NvdW50TGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQWRkTWVtYmVyQm94OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5SZXZpZXdlclN1Z2dlc3RPcmFjbGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm9DYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbERldGFpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VEZXRhaWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGF0Y2hTZXRQdWJsaXNoRGV0YWlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlJldmlld2VyUmVzdWx0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlN1Ym1pdFJlY29yZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkphdmFTY3JpcHRPYmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSnNBcnJheTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRE9NOwpAQCAtNTAsMjUgKzUxLDI2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuU2FmZUh0bWxCdWlsZGVyOwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7Ci1pbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLkxpbmtlZEhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiAvKiogRGlzcGxheXMgYSB0YWJsZSBvZiB7QGxpbmsgQXBwcm92YWxEZXRhaWx9IG9iamVjdHMgZm9yIGEgY2hhbmdlIHJlY29yZC4gKi8KIHB1YmxpYyBjbGFzcyBBcHByb3ZhbFRhYmxlIGV4dGVuZHMgQ29tcG9zaXRlIHsKLSAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbFR5cGVzIHR5cGVzOwogICBwcml2YXRlIGZpbmFsIEdyaWQgdGFibGU7CiAgIHByaXZhdGUgZmluYWwgV2lkZ2V0IG1pc3Npbmc7CiAgIHByaXZhdGUgZmluYWwgUGFuZWwgYWRkUmV2aWV3ZXI7CiAgIHByaXZhdGUgZmluYWwgUmV2aWV3ZXJTdWdnZXN0T3JhY2xlIHJldmlld2VyU3VnZ2VzdE9yYWNsZTsKICAgcHJpdmF0ZSBmaW5hbCBBZGRNZW1iZXJCb3ggYWRkTWVtYmVyQm94OwotICBwcml2YXRlIENoYW5nZS5JZCBjaGFuZ2VJZDsKLSAgcHJpdmF0ZSBBY2NvdW50SW5mb0NhY2hlIGFjY291bnRDYWNoZSA9IEFjY291bnRJbmZvQ2FjaGUuZW1wdHkoKTsKKyAgcHJpdmF0ZSBDaGFuZ2VJbmZvIGxhc3RDaGFuZ2U7CisgIHByaXZhdGUgTWFwPEludGVnZXIsIEludGVnZXI+IHJvd3M7CiAKICAgcHVibGljIEFwcHJvdmFsVGFibGUoKSB7Ci0gICAgdHlwZXMgPSBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0QXBwcm92YWxUeXBlcygpOworICAgIHJvd3MgPSBuZXcgSGFzaE1hcDxJbnRlZ2VyLCBJbnRlZ2VyPigpOwogICAgIHRhYmxlID0gbmV3IEdyaWQoMSwgMyk7CiAgICAgdGFibGUuYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuaW5mb1RhYmxlKCkpOwogCkBAIC0xMDMsNyArMTA1LDcgQEAKICAgICBzZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5hcHByb3ZhbFRhYmxlKCkpOwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIGRpc3BsYXlIZWFkZXIoTGlzdDxTdHJpbmc+IGxhYmVscykgeworICBwcml2YXRlIHZvaWQgZGlzcGxheUhlYWRlcihDb2xsZWN0aW9uPFN0cmluZz4gbGFiZWxzKSB7CiAgICAgdGFibGUucmVzaXplQ29sdW1ucygyICsgbGFiZWxzLnNpemUoKSk7CiAKICAgICBmaW5hbCBDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKTsKQEAgLTEyNSwyNjQgKzEyNywyMTggQEAKICAgICBmbXQuYWRkU3R5bGVOYW1lKDAsIGNvbCAtIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucmlnaHRtb3N0KCkpOwogICB9CiAKLSAgcHVibGljIHZvaWQgc2V0QWNjb3VudEluZm9DYWNoZShmaW5hbCBBY2NvdW50SW5mb0NhY2hlIGFpYykgewotICAgIGFzc2VydCBhaWMgIT0gbnVsbDsKLSAgICBhY2NvdW50Q2FjaGUgPSBhaWM7Ci0gIH0KKyAgdm9pZCBkaXNwbGF5KENoYW5nZUluZm8gY2hhbmdlKSB7CisgICAgbGFzdENoYW5nZSA9IGNoYW5nZTsKKyAgICByZXZpZXdlclN1Z2dlc3RPcmFjbGUuc2V0Q2hhbmdlKGNoYW5nZS5sZWdhY3lfaWQoKSk7CisgICAgTWFwPEludGVnZXIsIEFwcHJvdmFsRGV0YWlsPiBieVVzZXIgPQorICAgICAgICBuZXcgTGlua2VkSGFzaE1hcDxJbnRlZ2VyLCBBcHByb3ZhbERldGFpbD4oKTsKKyAgICBNYXA8SW50ZWdlciwgQWNjb3VudEluZm8+IGFjY291bnRzID0KKyAgICAgICAgbmV3IExpbmtlZEhhc2hNYXA8SW50ZWdlciwgQWNjb3VudEluZm8+KCk7CisgICAgTGlzdDxTdHJpbmc+IG1pc3NpbmdMYWJlbHMgPSBpbml0TGFiZWxzKGNoYW5nZSwgYWNjb3VudHMsIGJ5VXNlcik7CiAKLSAgcHJpdmF0ZSBBY2NvdW50TGluayBsaW5rKGZpbmFsIEFjY291bnQuSWQgaWQpIHsKLSAgICByZXR1cm4gQWNjb3VudExpbmsubGluayhhY2NvdW50Q2FjaGUsIGlkKTsKLSAgfQotCi0gIHZvaWQgZGlzcGxheShQYXRjaFNldFB1Ymxpc2hEZXRhaWwgZGV0YWlsKSB7Ci0gICAgZG9EaXNwbGF5KGRldGFpbC5nZXRDaGFuZ2UoKSwgZGV0YWlsLmdldEFwcHJvdmFscygpLAotICAgICAgICBkZXRhaWwuZ2V0U3VibWl0UmVjb3JkcygpKTsKLSAgfQotCi0gIHZvaWQgZGlzcGxheShDaGFuZ2VEZXRhaWwgZGV0YWlsKSB7Ci0gICAgZG9EaXNwbGF5KGRldGFpbC5nZXRDaGFuZ2UoKSwgZGV0YWlsLmdldEFwcHJvdmFscygpLAotICAgICAgICBkZXRhaWwuZ2V0U3VibWl0UmVjb3JkcygpKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBkb0Rpc3BsYXkoQ2hhbmdlIGNoYW5nZSwgTGlzdDxBcHByb3ZhbERldGFpbD4gYXBwcm92YWxzLAotICAgICAgTGlzdDxTdWJtaXRSZWNvcmQ+IHN1Ym1pdFJlY29yZHMpIHsKLSAgICBjaGFuZ2VJZCA9IGNoYW5nZS5nZXRJZCgpOwotICAgIHJldmlld2VyU3VnZ2VzdE9yYWNsZS5zZXRDaGFuZ2UoY2hhbmdlSWQpOwotCi0gICAgTGlzdDxTdHJpbmc+IGNvbHVtbnMgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKLQotICAgIGZpbmFsIEVsZW1lbnQgbWlzc2luZ0xpc3QgPSBtaXNzaW5nLmdldEVsZW1lbnQoKTsKLSAgICB3aGlsZSAoRE9NLmdldENoaWxkQ291bnQobWlzc2luZ0xpc3QpID4gMCkgewotICAgICAgRE9NLnJlbW92ZUNoaWxkKG1pc3NpbmdMaXN0LCBET00uZ2V0Q2hpbGQobWlzc2luZ0xpc3QsIDApKTsKLSAgICB9Ci0gICAgbWlzc2luZy5zZXRWaXNpYmxlKGZhbHNlKTsKLQotICAgIGlmIChzdWJtaXRSZWNvcmRzICE9IG51bGwpIHsKLSAgICAgIEhhc2hTZXQ8U3RyaW5nPiByZXBvcnRlZE1pc3NpbmcgPSBuZXcgSGFzaFNldDxTdHJpbmc+KCk7Ci0KLSAgICAgIEhhc2hNYXA8QWNjb3VudC5JZCwgQXBwcm92YWxEZXRhaWw+IGJ5VXNlciA9Ci0gICAgICAgICAgbmV3IEhhc2hNYXA8QWNjb3VudC5JZCwgQXBwcm92YWxEZXRhaWw+KCk7Ci0gICAgICBmb3IgKEFwcHJvdmFsRGV0YWlsIGFkIDogYXBwcm92YWxzKSB7Ci0gICAgICAgIGJ5VXNlci5wdXQoYWQuZ2V0QWNjb3VudCgpLCBhZCk7Ci0gICAgICB9Ci0KLSAgICAgIGZvciAoU3VibWl0UmVjb3JkIHJlYyA6IHN1Ym1pdFJlY29yZHMpIHsKLSAgICAgICAgaWYgKHJlYy5sYWJlbHMgPT0gbnVsbCkgewotICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgZm9yIChTdWJtaXRSZWNvcmQuTGFiZWwgbGJsIDogcmVjLmxhYmVscykgewotICAgICAgICAgIGlmICghY29sdW1ucy5jb250YWlucyhsYmwubGFiZWwpKSB7Ci0gICAgICAgICAgICBjb2x1bW5zLmFkZChsYmwubGFiZWwpOwotICAgICAgICAgIH0KLQotICAgICAgICAgIHN3aXRjaCAobGJsLnN0YXR1cykgewotICAgICAgICAgICAgY2FzZSBPSzogewotICAgICAgICAgICAgICBBcHByb3ZhbERldGFpbCBhZCA9IGJ5VXNlci5nZXQobGJsLmFwcGxpZWRCeSk7Ci0gICAgICAgICAgICAgIGlmIChhZCAhPSBudWxsKSB7Ci0gICAgICAgICAgICAgICAgYWQuYXBwcm92ZWQobGJsLmxhYmVsKTsKLSAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgY2FzZSBSRUpFQ1Q6IHsKLSAgICAgICAgICAgICAgQXBwcm92YWxEZXRhaWwgYWQgPSBieVVzZXIuZ2V0KGxibC5hcHBsaWVkQnkpOwotICAgICAgICAgICAgICBpZiAoYWQgIT0gbnVsbCkgewotICAgICAgICAgICAgICAgIGFkLnJlamVjdGVkKGxibC5sYWJlbCk7Ci0gICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGNhc2UgTUFZOgotICAgICAgICAgICAgICBicmVhazsKLQotICAgICAgICAgICAgY2FzZSBORUVEOgotICAgICAgICAgICAgY2FzZSBJTVBPU1NJQkxFOgotICAgICAgICAgICAgICBpZiAocmVwb3J0ZWRNaXNzaW5nLmFkZChsYmwubGFiZWwpKSB7Ci0gICAgICAgICAgICAgICAgRWxlbWVudCBsaSA9IERPTS5jcmVhdGVFbGVtZW50KCJsaSIpOwotICAgICAgICAgICAgICAgIGxpLnNldENsYXNzTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLm1pc3NpbmdBcHByb3ZhbCgpKTsKLSAgICAgICAgICAgICAgICBET00uc2V0SW5uZXJUZXh0KGxpLCBVdGlsLk0ubmVlZEFwcHJvdmFsKGxibC5sYWJlbCkpOwotICAgICAgICAgICAgICAgIERPTS5hcHBlbmRDaGlsZChtaXNzaW5nTGlzdCwgbGkpOwotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgfQotICAgICAgbWlzc2luZy5zZXRWaXNpYmxlKCFyZXBvcnRlZE1pc3NpbmcuaXNFbXB0eSgpKTsKLQotICAgIH0gZWxzZSB7Ci0gICAgICBmb3IgKEFwcHJvdmFsRGV0YWlsIGFkIDogYXBwcm92YWxzKSB7Ci0gICAgICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBwc2EgOiBhZC5nZXRQYXRjaFNldEFwcHJvdmFscygpKSB7Ci0gICAgICAgICAgQXBwcm92YWxUeXBlIGxlZ2FjeVR5cGUgPSB0eXBlcy5ieUlkKHBzYS5nZXRDYXRlZ29yeUlkKCkpOwotICAgICAgICAgIGlmIChsZWdhY3lUeXBlID09IG51bGwpIHsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgIH0KLSAgICAgICAgICBTdHJpbmcgbGFiZWxOYW1lID0gbGVnYWN5VHlwZS5nZXRDYXRlZ29yeSgpLmdldExhYmVsTmFtZSgpOwotICAgICAgICAgIGlmIChwc2EuZ2V0VmFsdWUoKSAhPSAwICkgewotICAgICAgICAgICAgaWYgKHBzYS5nZXRWYWx1ZSgpID09IGxlZ2FjeVR5cGUuZ2V0TWF4KCkuZ2V0VmFsdWUoKSkgewotICAgICAgICAgICAgICBhZC5hcHByb3ZlZChsYWJlbE5hbWUpOwotICAgICAgICAgICAgfSBlbHNlIGlmIChwc2EuZ2V0VmFsdWUoKSA9PSBsZWdhY3lUeXBlLmdldE1pbigpLmdldFZhbHVlKCkpIHsKLSAgICAgICAgICAgICAgYWQucmVqZWN0ZWQobGFiZWxOYW1lKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9Ci0gICAgICAgICAgaWYgKCFjb2x1bW5zLmNvbnRhaW5zKGxhYmVsTmFtZSkpIHsKLSAgICAgICAgICAgIGNvbHVtbnMuYWRkKGxhYmVsTmFtZSk7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIENvbGxlY3Rpb25zLnNvcnQoY29sdW1ucywgbmV3IENvbXBhcmF0b3I8U3RyaW5nPigpIHsKLSAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwdWJsaWMgaW50IGNvbXBhcmUoU3RyaW5nIG8xLCBTdHJpbmcgbzIpIHsKLSAgICAgICAgICAgIEFwcHJvdmFsVHlwZSBhID0gdHlwZXMuYnlMYWJlbChvMSk7Ci0gICAgICAgICAgICBBcHByb3ZhbFR5cGUgYiA9IHR5cGVzLmJ5TGFiZWwobzIpOwotICAgICAgICAgICAgaW50IGNtcCA9IDA7Ci0gICAgICAgICAgICBpZiAoYSAhPSBudWxsICYmIGIgIT0gbnVsbCkgewotICAgICAgICAgICAgICBjbXAgPSBhLmdldENhdGVnb3J5KCkuZ2V0UG9zaXRpb24oKSAtIGIuZ2V0Q2F0ZWdvcnkoKS5nZXRQb3NpdGlvbigpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKGNtcCA9PSAwKSB7Ci0gICAgICAgICAgICAgIGNtcCA9IG8xLmNvbXBhcmVUbyhvMik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gY21wOwotICAgICAgICAgIH0KLSAgICAgICAgfSk7Ci0gICAgICB9CisgICAgcmVtb3ZlQWxsQ2hpbGRyZW4obWlzc2luZy5nZXRFbGVtZW50KCkpOworICAgIGZvciAoU3RyaW5nIGxhYmVsIDogbWlzc2luZ0xhYmVscykgeworICAgICAgYWRkTWlzc2luZ0xhYmVsKFV0aWwuTS5uZWVkQXBwcm92YWwobGFiZWwpKTsKICAgICB9CiAKLSAgICBpZiAoYXBwcm92YWxzLmlzRW1wdHkoKSkgeworICAgIGlmIChieVVzZXIuaXNFbXB0eSgpKSB7CiAgICAgICB0YWJsZS5zZXRWaXNpYmxlKGZhbHNlKTsKICAgICB9IGVsc2UgewotICAgICAgZGlzcGxheUhlYWRlcihjb2x1bW5zKTsKLSAgICAgIHRhYmxlLnJlc2l6ZVJvd3MoMSArIGFwcHJvdmFscy5zaXplKCkpOwotICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBhcHByb3ZhbHMuc2l6ZSgpOyBpKyspIHsKLSAgICAgICAgZGlzcGxheVJvdyhpICsgMSwgYXBwcm92YWxzLmdldChpKSwgY2hhbmdlLCBjb2x1bW5zKTsKKyAgICAgIGRpc3BsYXlIZWFkZXIoY2hhbmdlLmxhYmVscygpKTsKKyAgICAgIHRhYmxlLnJlc2l6ZVJvd3MoMSArIGJ5VXNlci5zaXplKCkpOworICAgICAgaW50IGkgPSAxOworICAgICAgZm9yIChBcHByb3ZhbERldGFpbCBhZCA6IEFwcHJvdmFsRGV0YWlsLnNvcnQoCisgICAgICAgICAgYnlVc2VyLnZhbHVlcygpLCBjaGFuZ2Uub3duZXIoKS5fYWNjb3VudF9pZCgpKSkgeworICAgICAgICBkaXNwbGF5Um93KGkrKywgYWQsIGNoYW5nZSwgYWNjb3VudHMuZ2V0KGFkLmdldEFjY291bnQoKS5nZXQoKSkpOwogICAgICAgfQogICAgICAgdGFibGUuc2V0VmlzaWJsZSh0cnVlKTsKICAgICB9CiAKLSAgICBhZGRSZXZpZXdlci5zZXRWaXNpYmxlKEdlcnJpdC5pc1NpZ25lZEluKCkpOwotCiAgICAgaWYgKEdlcnJpdC5nZXRDb25maWcoKS50ZXN0Q2hhbmdlTWVyZ2UoKQotICAgICAgICAmJiAhY2hhbmdlLmlzTWVyZ2VhYmxlKCkpIHsKLSAgICAgIEVsZW1lbnQgbGkgPSBET00uY3JlYXRlRWxlbWVudCgibGkiKTsKLSAgICAgIGxpLnNldENsYXNzTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLm1pc3NpbmdBcHByb3ZhbCgpKTsKLSAgICAgIERPTS5zZXRJbm5lclRleHQobGksIFV0aWwuQy5tZXNzYWdlTmVlZHNSZWJhc2VPckhhc0RlcGVuZGVuY3koKSk7Ci0gICAgICBET00uYXBwZW5kQ2hpbGQobWlzc2luZ0xpc3QsIGxpKTsKLSAgICAgIG1pc3Npbmcuc2V0VmlzaWJsZSh0cnVlKTsKKyAgICAgICAgJiYgY2hhbmdlLnN0YXR1cygpICE9IENoYW5nZS5TdGF0dXMuTUVSR0VECisgICAgICAgICYmICFjaGFuZ2UubWVyZ2VhYmxlKCkpIHsKKyAgICAgIGFkZE1pc3NpbmdMYWJlbChVdGlsLkMubWVzc2FnZU5lZWRzUmViYXNlT3JIYXNEZXBlbmRlbmN5KCkpOwogICAgIH0KKyAgICBtaXNzaW5nLnNldFZpc2libGUoRE9NLmdldENoaWxkQ291bnQobWlzc2luZy5nZXRFbGVtZW50KCkpID4gMCk7CisgICAgYWRkUmV2aWV3ZXIuc2V0VmlzaWJsZShHZXJyaXQuaXNTaWduZWRJbigpKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCByZW1vdmVBbGxDaGlsZHJlbihFbGVtZW50IGVsKSB7CisgICAgZm9yIChpbnQgaSA9IERPTS5nZXRDaGlsZENvdW50KGVsKSAtIDE7IGkgPj0gMDsgaS0tKSB7CisgICAgICBET00ucmVtb3ZlQ2hpbGQoZWwsIERPTS5nZXRDaGlsZChlbCwgaSkpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBhZGRNaXNzaW5nTGFiZWwoU3RyaW5nIHRleHQpIHsKKyAgICBFbGVtZW50IGxpID0gRE9NLmNyZWF0ZUVsZW1lbnQoImxpIik7CisgICAgbGkuc2V0Q2xhc3NOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubWlzc2luZ0FwcHJvdmFsKCkpOworICAgIERPTS5zZXRJbm5lclRleHQobGksIHRleHQpOworICAgIERPTS5hcHBlbmRDaGlsZChtaXNzaW5nLmdldEVsZW1lbnQoKSwgbGkpOworICB9CisKKyAgcHJpdmF0ZSBTZXQ8SW50ZWdlcj4gcmVtb3ZhYmxlUmV2aWV3ZXJzKENoYW5nZUluZm8gY2hhbmdlKSB7CisgICAgU2V0PEludGVnZXI+IHJlc3VsdCA9CisgICAgICAgIG5ldyBIYXNoU2V0PEludGVnZXI+KGNoYW5nZS5yZW1vdmFibGVfcmV2aWV3ZXJzKCkubGVuZ3RoKCkpOworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgY2hhbmdlLnJlbW92YWJsZV9yZXZpZXdlcnMoKS5sZW5ndGgoKTsgaSsrKSB7CisgICAgICByZXN1bHQuYWRkKGNoYW5nZS5yZW1vdmFibGVfcmV2aWV3ZXJzKCkuZ2V0KGkpLl9hY2NvdW50X2lkKCkpOworICAgIH0KKyAgICByZXR1cm4gcmVzdWx0OworICB9CisKKyAgcHJpdmF0ZSBMaXN0PFN0cmluZz4gaW5pdExhYmVscyhDaGFuZ2VJbmZvIGNoYW5nZSwKKyAgICAgIE1hcDxJbnRlZ2VyLCBBY2NvdW50SW5mbz4gYWNjb3VudHMsCisgICAgICBNYXA8SW50ZWdlciwgQXBwcm92YWxEZXRhaWw+IGJ5VXNlcikgeworICAgIFNldDxJbnRlZ2VyPiByZW1vdmFibGVSZXZpZXdlcnMgPSByZW1vdmFibGVSZXZpZXdlcnMoY2hhbmdlKTsKKyAgICBMaXN0PFN0cmluZz4gbWlzc2luZyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOworICAgIGZvciAoU3RyaW5nIG5hbWUgOiBjaGFuZ2UubGFiZWxzKCkpIHsKKyAgICAgIExhYmVsSW5mbyBsYWJlbCA9IGNoYW5nZS5sYWJlbChuYW1lKTsKKworICAgICAgU3RyaW5nIG1pbiA9IG51bGw7CisgICAgICBTdHJpbmcgbWF4ID0gbnVsbDsKKyAgICAgIGZvciAoU3RyaW5nIHYgOiBsYWJlbC52YWx1ZXMoKSkgeworICAgICAgICBpZiAobWluID09IG51bGwpIHsKKyAgICAgICAgICBtaW4gPSB2OworICAgICAgICB9CisgICAgICAgIGlmICh2LnN0YXJ0c1dpdGgoIisiKSkgeworICAgICAgICAgIG1heCA9IHY7CisgICAgICAgIH0KKyAgICAgIH0KKworICAgICAgaWYgKGxhYmVsLnN0YXR1cygpID09IFN1Ym1pdFJlY29yZC5MYWJlbC5TdGF0dXMuTkVFRCkgeworICAgICAgICBtaXNzaW5nLmFkZChuYW1lKTsKKyAgICAgIH0KKworICAgICAgaWYgKGxhYmVsLmFsbCgpICE9IG51bGwpIHsKKyAgICAgICAgZm9yIChBcHByb3ZhbEluZm8gYWkgOiBOYXRpdmVzLmFzTGlzdChsYWJlbC5hbGwoKSkpIHsKKyAgICAgICAgICBpZiAoIWFjY291bnRzLmNvbnRhaW5zS2V5KGFpLl9hY2NvdW50X2lkKCkpKSB7CisgICAgICAgICAgICBhY2NvdW50cy5wdXQoYWkuX2FjY291bnRfaWQoKSwgYWkpOworICAgICAgICAgIH0KKyAgICAgICAgICBpbnQgaWQgPSBhaS5fYWNjb3VudF9pZCgpOworICAgICAgICAgIEFwcHJvdmFsRGV0YWlsIGFkID0gYnlVc2VyLmdldChpZCk7CisgICAgICAgICAgaWYgKGFkID09IG51bGwpIHsKKyAgICAgICAgICAgIGFkID0gbmV3IEFwcHJvdmFsRGV0YWlsKG5ldyBBY2NvdW50LklkKGlkKSk7CisgICAgICAgICAgICBhZC5zZXRDYW5SZW1vdmUocmVtb3ZhYmxlUmV2aWV3ZXJzLmNvbnRhaW5zKGlkKSk7CisgICAgICAgICAgICBieVVzZXIucHV0KGlkLCBhZCk7CisgICAgICAgICAgfQorICAgICAgICAgIGlmIChhaS5oYXNfdmFsdWUoKSkgeworICAgICAgICAgICAgYWQudm90YWJsZShuYW1lKTsKKyAgICAgICAgICAgIGFkLnZhbHVlKG5hbWUsIGFpLnZhbHVlKCkpOworICAgICAgICAgICAgU3RyaW5nIGZ2ID0gZm9ybWF0VmFsdWUoYWkudmFsdWUoKSk7CisgICAgICAgICAgICBpZiAoZnYuZXF1YWxzKG1heCkpIHsKKyAgICAgICAgICAgICAgYWQuYXBwcm92ZWQobmFtZSk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKGFpLnZhbHVlKCkgPCAwICYmIGZ2LmVxdWFscyhtaW4pKSB7CisgICAgICAgICAgICAgIGFkLnJlamVjdGVkKG5hbWUpOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbWlzc2luZzsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBkb0FkZFJldmlld2VyKCkgewotICAgIGZpbmFsIFN0cmluZyByZXZpZXdlciA9IGFkZE1lbWJlckJveC5nZXRUZXh0KCk7Ci0gICAgaWYgKHJldmlld2VyLmxlbmd0aCgpID09IDApIHsKLSAgICAgIHJldHVybjsKKyAgICBTdHJpbmcgcmV2aWV3ZXIgPSBhZGRNZW1iZXJCb3guZ2V0VGV4dCgpOworICAgIGlmICghcmV2aWV3ZXIuaXNFbXB0eSgpKSB7CisgICAgICBhZGRNZW1iZXJCb3guc2V0RW5hYmxlZChmYWxzZSk7CisgICAgICBhZGRSZXZpZXdlcihyZXZpZXdlciwgZmFsc2UpOwogICAgIH0KLQotICAgIGFkZE1lbWJlckJveC5zZXRFbmFibGVkKGZhbHNlKTsKLSAgICBmaW5hbCBMaXN0PFN0cmluZz4gcmV2aWV3ZXJzID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7Ci0gICAgcmV2aWV3ZXJzLmFkZChyZXZpZXdlcik7Ci0KLSAgICBhZGRSZXZpZXdlcnMocmV2aWV3ZXJzLCBmYWxzZSk7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgYWRkUmV2aWV3ZXJzKGZpbmFsIExpc3Q8U3RyaW5nPiByZXZpZXdlcnMsCi0gICAgICBmaW5hbCBib29sZWFuIGNvbmZpcm1lZCkgewotICAgIFBhdGNoVXRpbC5ERVRBSUxfU1ZDLmFkZFJldmlld2VycyhjaGFuZ2VJZCwgcmV2aWV3ZXJzLCBjb25maXJtZWQsCi0gICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxSZXZpZXdlclJlc3VsdD4oKSB7Ci0gICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIFJldmlld2VyUmVzdWx0IHJlc3VsdCkgeworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBQb3N0SW5wdXQgZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKKyAgICBzdGF0aWMgUG9zdElucHV0IGNyZWF0ZShTdHJpbmcgcmV2aWV3ZXIsIGJvb2xlYW4gY29uZmlybWVkKSB7CisgICAgICBQb3N0SW5wdXQgaW5wdXQgPSBjcmVhdGVPYmplY3QoKS5jYXN0KCk7CisgICAgICBpbnB1dC5pbml0KHJldmlld2VyLCBjb25maXJtZWQpOworICAgICAgcmV0dXJuIGlucHV0OworICAgIH0KKworICAgIHByaXZhdGUgbmF0aXZlIHZvaWQgaW5pdChTdHJpbmcgcmV2aWV3ZXIsIGJvb2xlYW4gY29uZmlybWVkKSAvKi17CisgICAgICB0aGlzLnJldmlld2VyID0gcmV2aWV3ZXI7CisgICAgICBpZiAoY29uZmlybWVkKSB7CisgICAgICAgIHRoaXMuY29uZmlybWVkID0gdHJ1ZTsKKyAgICAgIH0KKyAgICB9LSovOworCisgICAgcHJvdGVjdGVkIFBvc3RJbnB1dCgpIHsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBSZXZpZXdlckluZm8gZXh0ZW5kcyBBY2NvdW50SW5mbyB7CisgICAgZmluYWwgU2V0PFN0cmluZz4gYXBwcm92YWxzKCkgeworICAgICAgcmV0dXJuIE5hdGl2ZXMua2V5cyhfYXBwcm92YWxzKCkpOworICAgIH0KKyAgICBmaW5hbCBuYXRpdmUgU3RyaW5nIGFwcHJvdmFsKFN0cmluZyBsKSAvKi17IHJldHVybiB0aGlzLmFwcHJvdmFsc1tsXTsgfS0qLzsKKyAgICBwcml2YXRlIGZpbmFsIG5hdGl2ZSBOYXRpdmVNYXA8TmF0aXZlU3RyaW5nPiBfYXBwcm92YWxzKCkgLyoteyByZXR1cm4gdGhpcy5hcHByb3ZhbHM7IH0tKi87CisKKyAgICBwcm90ZWN0ZWQgUmV2aWV3ZXJJbmZvKCkgeworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGNsYXNzIFBvc3RSZXN1bHQgZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKKyAgICBmaW5hbCBuYXRpdmUgSnNBcnJheTxSZXZpZXdlckluZm8+IHJldmlld2VycygpIC8qLXsgcmV0dXJuIHRoaXMucmV2aWV3ZXJzOyB9LSovOworICAgIGZpbmFsIG5hdGl2ZSBib29sZWFuIGNvbmZpcm0oKSAvKi17IHJldHVybiB0aGlzLmNvbmZpcm0gfHwgZmFsc2U7IH0tKi87CisgICAgZmluYWwgbmF0aXZlIFN0cmluZyBlcnJvcigpIC8qLXsgcmV0dXJuIHRoaXMuZXJyb3I7IH0tKi87CisKKyAgICBwcm90ZWN0ZWQgUG9zdFJlc3VsdCgpIHsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgYWRkUmV2aWV3ZXIoZmluYWwgU3RyaW5nIHJldmlld2VyLCBib29sZWFuIGNvbmZpcm1lZCkgeworICAgIENoYW5nZUFwaS5yZXZpZXdlcnMobGFzdENoYW5nZS5sZWdhY3lfaWQoKS5nZXQoKSkucG9zdCgKKyAgICAgICAgUG9zdElucHV0LmNyZWF0ZShyZXZpZXdlciwgY29uZmlybWVkKSwKKyAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPFBvc3RSZXN1bHQ+KCkgeworICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhQb3N0UmVzdWx0IHJlc3VsdCkgewogICAgICAgICAgICAgYWRkTWVtYmVyQm94LnNldEVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICBhZGRNZW1iZXJCb3guc2V0VGV4dCgiIik7Ci0KLSAgICAgICAgICAgIGZpbmFsIENoYW5nZURldGFpbCBjaGFuZ2VEZXRhaWwgPSByZXN1bHQuZ2V0Q2hhbmdlKCk7Ci0gICAgICAgICAgICBpZiAoY2hhbmdlRGV0YWlsICE9IG51bGwpIHsKLSAgICAgICAgICAgICAgc2V0QWNjb3VudEluZm9DYWNoZShjaGFuZ2VEZXRhaWwuZ2V0QWNjb3VudHMoKSk7Ci0gICAgICAgICAgICAgIGRpc3BsYXkoY2hhbmdlRGV0YWlsKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgaWYgKCFyZXN1bHQuZ2V0RXJyb3JzKCkuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgIGZpbmFsIFNhZmVIdG1sQnVpbGRlciByID0gbmV3IFNhZmVIdG1sQnVpbGRlcigpOwotICAgICAgICAgICAgICBmb3IgKGZpbmFsIFJldmlld2VyUmVzdWx0LkVycm9yIGUgOiByZXN1bHQuZ2V0RXJyb3JzKCkpIHsKLSAgICAgICAgICAgICAgICBzd2l0Y2ggKGUuZ2V0VHlwZSgpKSB7Ci0gICAgICAgICAgICAgICAgICBjYXNlIFJFVklFV0VSX05PVF9GT1VORDoKLSAgICAgICAgICAgICAgICAgICAgci5hcHBlbmQoVXRpbC5NLnJldmlld2VyTm90Rm91bmQoZS5nZXROYW1lKCkpKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICAgIGNhc2UgQUNDT1VOVF9JTkFDVElWRToKLSAgICAgICAgICAgICAgICAgICAgci5hcHBlbmQoVXRpbC5NLmFjY291bnRJbmFjdGl2ZShlLmdldE5hbWUoKSkpOwotICAgICAgICAgICAgICAgICAgICBicmVhazsKLQotICAgICAgICAgICAgICAgICAgY2FzZSBDSEFOR0VfTk9UX1ZJU0lCTEU6Ci0gICAgICAgICAgICAgICAgICAgIHIuYXBwZW5kKFV0aWwuTS5jaGFuZ2VOb3RWaXNpYmxlVG8oZS5nZXROYW1lKCkpKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICAgIGNhc2UgR1JPVVBfRU1QVFk6Ci0gICAgICAgICAgICAgICAgICAgIHIuYXBwZW5kKFV0aWwuTS5ncm91cElzRW1wdHkoZS5nZXROYW1lKCkpKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICAgIGNhc2UgR1JPVVBfSEFTX1RPT19NQU5ZX01FTUJFUlM6Ci0gICAgICAgICAgICAgICAgICAgIGlmIChyZXN1bHQuYXNrRm9yQ29uZmlybWF0aW9uKCkgJiYgIWNvbmZpcm1lZCkgewotICAgICAgICAgICAgICAgICAgICAgIGFza0ZvckNvbmZpcm1hdGlvbihlLmdldE5hbWUoKSwgcmVzdWx0LmdldE1lbWJlckNvdW50KCkpOwotICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICByLmFwcGVuZChVdGlsLk0uZ3JvdXBIYXNUb29NYW55TWVtYmVycyhlLmdldE5hbWUoKSkpOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgICAgICAgICAgICBjYXNlIEdST1VQX05PVF9BTExPV0VEOgotICAgICAgICAgICAgICAgICAgICByLmFwcGVuZChVdGlsLk0uZ3JvdXBJc05vdEFsbG93ZWQoZS5nZXROYW1lKCkpKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAgIHIuYXBwZW5kKGUuZ2V0TmFtZSgpKTsKLSAgICAgICAgICAgICAgICAgICAgci5hcHBlbmQoIiAtICIpOwotICAgICAgICAgICAgICAgICAgICByLmFwcGVuZChlLmdldFR5cGUoKSk7Ci0gICAgICAgICAgICAgICAgICAgIHIuYnIoKTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIG5ldyBFcnJvckRpYWxvZyhyKS5jZW50ZXIoKTsKKyAgICAgICAgICAgIGlmIChyZXN1bHQuZXJyb3IoKSA9PSBudWxsKSB7CisgICAgICAgICAgICAgIHJlbG9hZCgpOworICAgICAgICAgICAgfSBlbHNlIGlmIChyZXN1bHQuY29uZmlybSgpKSB7CisgICAgICAgICAgICAgIGFza0ZvckNvbmZpcm1hdGlvbihyZXN1bHQuZXJyb3IoKSk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICBuZXcgRXJyb3JEaWFsb2cobmV3IFNhZmVIdG1sQnVpbGRlcigpLmFwcGVuZChyZXN1bHQuZXJyb3IoKSkpOwogICAgICAgICAgICAgfQogICAgICAgICAgIH0KIAotICAgICAgICAgIHByaXZhdGUgdm9pZCBhc2tGb3JDb25maXJtYXRpb24oZmluYWwgU3RyaW5nIGdyb3VwTmFtZSwKLSAgICAgICAgICAgICAgZmluYWwgaW50IG1lbWJlckNvdW50KSB7Ci0gICAgICAgICAgICBmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgYiA9IG5ldyBTYWZlSHRtbEJ1aWxkZXIoKTsKLSAgICAgICAgICAgIGIub3BlbkVsZW1lbnQoImIiKTsKLSAgICAgICAgICAgIGIuYXBwZW5kKFV0aWwuTQotICAgICAgICAgICAgICAgIC5ncm91cE1hbnlNZW1iZXJzQ29uZmlybWF0aW9uKGdyb3VwTmFtZSwgbWVtYmVyQ291bnQpKTsKLSAgICAgICAgICAgIGIuY2xvc2VFbGVtZW50KCJiIik7Ci0gICAgICAgICAgICBmaW5hbCBDb25maXJtYXRpb25EaWFsb2cgY29uZmlybWF0aW9uRGlhbG9nID0KLSAgICAgICAgICAgICAgICBuZXcgQ29uZmlybWF0aW9uRGlhbG9nKFV0aWwuQwotICAgICAgICAgICAgICAgICAgICAuYXBwcm92YWxUYWJsZUFkZE1hbnlSZXZpZXdlcnNDb25maXJtYXRpb25EaWFsb2dUaXRsZSgpLAotICAgICAgICAgICAgICAgICAgICBiLnRvU2FmZUh0bWwoKSwgbmV3IENvbmZpcm1hdGlvbkNhbGxiYWNrKCkgewotICAgICAgICAgICAgICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uT2soKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBhZGRSZXZpZXdlcnMocmV2aWV3ZXJzLCB0cnVlKTsKLSAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgIHByaXZhdGUgdm9pZCBhc2tGb3JDb25maXJtYXRpb24oU3RyaW5nIHRleHQpIHsKKyAgICAgICAgICAgIFN0cmluZyB0aXRsZSA9IFV0aWwuQworICAgICAgICAgICAgICAgIC5hcHByb3ZhbFRhYmxlQWRkTWFueVJldmlld2Vyc0NvbmZpcm1hdGlvbkRpYWxvZ1RpdGxlKCk7CisgICAgICAgICAgICBDb25maXJtYXRpb25EaWFsb2cgY29uZmlybWF0aW9uRGlhbG9nID0gbmV3IENvbmZpcm1hdGlvbkRpYWxvZygKKyAgICAgICAgICAgICAgICB0aXRsZSwgbmV3IFNhZmVIdG1sQnVpbGRlcigpLmFwcGVuZCh0ZXh0KSwKKyAgICAgICAgICAgICAgICBuZXcgQ29uZmlybWF0aW9uQ2FsbGJhY2soKSB7CisgICAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uT2soKSB7CisgICAgICAgICAgICAgICAgICAgIGFkZFJldmlld2VyKHJldmlld2VyLCB0cnVlKTsKKyAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIGNvbmZpcm1hdGlvbkRpYWxvZy5jZW50ZXIoKTsKICAgICAgICAgICB9CiAKICAgICAgICAgICBAT3ZlcnJpZGUKICAgICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoZmluYWwgVGhyb3dhYmxlIGNhdWdodCkgewogICAgICAgICAgICAgYWRkTWVtYmVyQm94LnNldEVuYWJsZWQodHJ1ZSk7Ci0gICAgICAgICAgICBzdXBlci5vbkZhaWx1cmUoY2F1Z2h0KTsKKyAgICAgICAgICAgIGlmIChpc05vU3VjaEVudGl0eShjYXVnaHQpKSB7CisgICAgICAgICAgICAgIG5ldyBFcnJvckRpYWxvZyhVdGlsLk0ucmV2aWV3ZXJOb3RGb3VuZChyZXZpZXdlcikpLmNlbnRlcigpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgc3VwZXIub25GYWlsdXJlKGNhdWdodCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgfQogICAgICAgICB9KTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBkaXNwbGF5Um93KGZpbmFsIGludCByb3csIGZpbmFsIEFwcHJvdmFsRGV0YWlsIGFkLAotICAgICAgZmluYWwgQ2hhbmdlIGNoYW5nZSwgTGlzdDxTdHJpbmc+IGNvbHVtbnMpIHsKKyAgcHJpdmF0ZSB2b2lkIGRpc3BsYXlSb3coaW50IHJvdywgZmluYWwgQXBwcm92YWxEZXRhaWwgYWQsIENoYW5nZUluZm8gY2hhbmdlLAorICAgICAgQWNjb3VudEluZm8gYWNjb3VudCkgewogICAgIGZpbmFsIENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0Q2VsbEZvcm1hdHRlcigpOwogICAgIGludCBjb2wgPSAwOwogCi0gICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgY29sKyssIGxpbmsoYWQuZ2V0QWNjb3VudCgpKSk7CisgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgY29sKyssIG5ldyBBY2NvdW50TGluayhhY2NvdW50KSk7CisgICAgcm93cy5wdXQoYWNjb3VudC5fYWNjb3VudF9pZCgpLCByb3cpOwogCiAgICAgaWYgKGFkLmNhblJlbW92ZSgpKSB7CiAgICAgICBmaW5hbCBQdXNoQnV0dG9uIHJlbW92ZSA9IG5ldyBQdXNoQnV0dG9uKCAvLwogICAgICAgICAgIG5ldyBJbWFnZShVdGlsLlIucmVtb3ZlUmV2aWV3ZXJOb3JtYWwoKSksIC8vCiAgICAgICAgICAgbmV3IEltYWdlKFV0aWwuUi5yZW1vdmVSZXZpZXdlclByZXNzZWQoKSkpOwotICAgICAgcmVtb3ZlLnNldFRpdGxlKFV0aWwuTS5yZW1vdmVSZXZpZXdlciggLy8KLSAgICAgICAgICBGb3JtYXRVdGlsLm5hbWUoYWNjb3VudENhY2hlLmdldChhZC5nZXRBY2NvdW50KCkpKSkpOworICAgICAgcmVtb3ZlLnNldFRpdGxlKFV0aWwuTS5yZW1vdmVSZXZpZXdlcihhY2NvdW50Lm5hbWUoKSkpOwogICAgICAgcmVtb3ZlLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnJlbW92ZVJldmlld2VyKCkpOworICAgICAgcmVtb3ZlLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmxpbmsoKSk7CiAgICAgICByZW1vdmUuYWRkQ2xpY2tIYW5kbGVyKG5ldyBDbGlja0hhbmRsZXIoKSB7CiAgICAgICAgIEBPdmVycmlkZQogICAgICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKQEAgLTM5NSw4ICszNTEsMTIgQEAKICAgICB9CiAgICAgZm10LnNldFN0eWxlTmFtZShyb3csIGNvbCsrLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnJlbW92ZVJldmlld2VyQ2VsbCgpKTsKIAotICAgIGZvciAoU3RyaW5nIGxhYmVsTmFtZSA6IGNvbHVtbnMpIHsKKyAgICBmb3IgKFN0cmluZyBsYWJlbE5hbWUgOiBjaGFuZ2UubGFiZWxzKCkpIHsKICAgICAgIGZtdC5zZXRTdHlsZU5hbWUocm93LCBjb2wsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuYXBwcm92YWxzY29yZSgpKTsKKyAgICAgIGlmICghYWQuY2FuVm90ZShsYWJlbE5hbWUpKSB7CisgICAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBjb2wsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubm90Vm90YWJsZSgpKTsKKyAgICAgICAgZm10LmdldEVsZW1lbnQocm93LCBjb2wpLnNldFRpdGxlKEdlcnJpdC5DLnVzZXJDYW5ub3RWb3RlVG9vbFRpcCgpKTsKKyAgICAgIH0KIAogICAgICAgaWYgKGFkLmlzUmVqZWN0ZWQobGFiZWxOYW1lKSkgewogICAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBjb2wsIG5ldyBJbWFnZShHZXJyaXQuUkVTT1VSQ0VTLnJlZE5vdCgpKSk7CkBAIC00MDUsMjIgKzM2NSwxNCBAQAogICAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBjb2wsIG5ldyBJbWFnZShHZXJyaXQuUkVTT1VSQ0VTLmdyZWVuQ2hlY2soKSkpOwogCiAgICAgICB9IGVsc2UgewotICAgICAgICBBcHByb3ZhbFR5cGUgbGVnYWN5VHlwZSA9IHR5cGVzLmJ5TGFiZWwobGFiZWxOYW1lKTsKLSAgICAgICAgaWYgKGxlZ2FjeVR5cGUgPT0gbnVsbCkgeworICAgICAgICBpbnQgdiA9IGFkLmdldFZhbHVlKGxhYmVsTmFtZSk7CisgICAgICAgIGlmICh2ID09IDApIHsKICAgICAgICAgICB0YWJsZS5jbGVhckNlbGwocm93LCBjb2wpOwogICAgICAgICAgIGNvbCsrOwogICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0KLSAgICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBjYSA9IGFkLmdldFBhdGNoU2V0QXBwcm92YWwobGVnYWN5VHlwZS5nZXRDYXRlZ29yeSgpLmdldElkKCkpOwotICAgICAgICBpZiAoY2EgPT0gbnVsbCB8fCBjYS5nZXRWYWx1ZSgpID09IDApIHsKLSAgICAgICAgICB0YWJsZS5jbGVhckNlbGwocm93LCBjb2wpOwotICAgICAgICAgIGNvbCsrOwotICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgU3RyaW5nIHZzdHIgPSBTdHJpbmcudmFsdWVPZihjYS5nZXRWYWx1ZSgpKTsKLSAgICAgICAgaWYgKGNhLmdldFZhbHVlKCkgPiAwKSB7CisgICAgICAgIFN0cmluZyB2c3RyID0gU3RyaW5nLnZhbHVlT2YoYWQuZ2V0VmFsdWUobGFiZWxOYW1lKSk7CisgICAgICAgIGlmICh2ID4gMCkgewogICAgICAgICAgIHZzdHIgPSAiKyIgKyB2c3RyOwogICAgICAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBjb2wsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucG9zc2NvcmUoKSk7CiAgICAgICAgIH0gZWxzZSB7CkBAIC00MzUsMjkgKzM4NywyMyBAQAogICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBjb2wgLSAxLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnJpZ2h0bW9zdCgpKTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBkb1JlbW92ZShmaW5hbCBBcHByb3ZhbERldGFpbCBhZCwgZmluYWwgUHVzaEJ1dHRvbiByZW1vdmUpIHsKLSAgICByZW1vdmUuc2V0RW5hYmxlZChmYWxzZSk7Ci0gICAgUGF0Y2hVdGlsLkRFVEFJTF9TVkMucmVtb3ZlUmV2aWV3ZXIoY2hhbmdlSWQsIGFkLmdldEFjY291bnQoKSwKLSAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPFJldmlld2VyUmVzdWx0PigpIHsKKyAgcHJpdmF0ZSB2b2lkIHJlbG9hZCgpIHsKKyAgICBDaGFuZ2VBcGkuZGV0YWlsKGxhc3RDaGFuZ2UubGVnYWN5X2lkKCkuZ2V0KCksCisgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxDaGFuZ2VJbmZvPigpIHsKICAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoUmV2aWV3ZXJSZXN1bHQgcmVzdWx0KSB7Ci0gICAgICAgICAgICBpZiAocmVzdWx0LmdldEVycm9ycygpLmlzRW1wdHkoKSkgewotICAgICAgICAgICAgICBmaW5hbCBDaGFuZ2VEZXRhaWwgciA9IHJlc3VsdC5nZXRDaGFuZ2UoKTsKLSAgICAgICAgICAgICAgZGlzcGxheShyKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgIGZpbmFsIFJldmlld2VyUmVzdWx0LkVycm9yIHJlc3VsdEVycm9yID0KLSAgICAgICAgICAgICAgICAgIHJlc3VsdC5nZXRFcnJvcnMoKS5nZXQoMCk7Ci0gICAgICAgICAgICAgIFN0cmluZyBtZXNzYWdlOwotICAgICAgICAgICAgICBzd2l0Y2ggKHJlc3VsdEVycm9yLmdldFR5cGUoKSkgewotICAgICAgICAgICAgICAgIGNhc2UgUkVNT1ZFX05PVF9QRVJNSVRURUQ6Ci0gICAgICAgICAgICAgICAgICBtZXNzYWdlID0gVXRpbC5DLmFwcHJvdmFsVGFibGVSZW1vdmVOb3RQZXJtaXR0ZWQoKTsKLSAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgQ09VTERfTk9UX1JFTU9WRToKLSAgICAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgICAgbWVzc2FnZSA9IFV0aWwuQy5hcHByb3ZhbFRhYmxlQ291bGROb3RSZW1vdmUoKTsKLSAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICBuZXcgRXJyb3JEaWFsb2cobWVzc2FnZSArICIgIiArIHJlc3VsdEVycm9yLmdldE5hbWUoKSkuY2VudGVyKCk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKENoYW5nZUluZm8gcmVzdWx0KSB7CisgICAgICAgICAgICBkaXNwbGF5KHJlc3VsdCk7CisgICAgICAgICAgfQorICAgICAgICB9KTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBkb1JlbW92ZShBcHByb3ZhbERldGFpbCBhZCwgZmluYWwgUHVzaEJ1dHRvbiByZW1vdmUpIHsKKyAgICByZW1vdmUuc2V0RW5hYmxlZChmYWxzZSk7CisgICAgQ2hhbmdlQXBpLnJldmlld2VyKGxhc3RDaGFuZ2UubGVnYWN5X2lkKCkuZ2V0KCksIGFkLmdldEFjY291bnQoKS5nZXQoKSkKKyAgICAgIC5kZWxldGUobmV3IEdlcnJpdENhbGxiYWNrPEphdmFTY3JpcHRPYmplY3Q+KCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhKYXZhU2NyaXB0T2JqZWN0IHJlc3VsdCkgeworICAgICAgICAgICAgcmVsb2FkKCk7CiAgICAgICAgICAgfQogCiAgICAgICAgICAgQE92ZXJyaWRlCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VBcGkuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUFwaS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFiZDk0YzkKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VBcGkuamF2YQpAQCAtMCwwICsxLDEzMCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVTdHJpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5KYXZhU2NyaXB0T2JqZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOworCisvKioKKyAqIEEgY29sbGVjdGlvbiBvZiBzdGF0aWMgbWV0aG9kcyB3aGljaCB3b3JrIG9uIHRoZSBHZXJyaXQgUkVTVCBBUEkgZm9yIHNwZWNpZmljCisgKiBjaGFuZ2VzLgorICovCitwdWJsaWMgY2xhc3MgQ2hhbmdlQXBpIHsKKyAgLyoqIEFiYW5kb24gdGhlIGNoYW5nZSwgZW5kaW5nIGl0cyByZXZpZXcuICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCBhYmFuZG9uKGludCBpZCwgU3RyaW5nIG1zZywgQXN5bmNDYWxsYmFjazxDaGFuZ2VJbmZvPiBjYikgeworICAgIElucHV0IGlucHV0ID0gSW5wdXQuY3JlYXRlKCk7CisgICAgaW5wdXQubWVzc2FnZShlbXB0eVRvTnVsbChtc2cpKTsKKyAgICBjYWxsKGlkLCAiYWJhbmRvbiIpLnBvc3QoaW5wdXQsIGNiKTsKKyAgfQorCisgIC8qKiBSZXN0b3JlIGEgcHJldmlvdXNseSBhYmFuZG9uZWQgY2hhbmdlIHRvIGJlIG9wZW4gYWdhaW4uICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCByZXN0b3JlKGludCBpZCwgU3RyaW5nIG1zZywgQXN5bmNDYWxsYmFjazxDaGFuZ2VJbmZvPiBjYikgeworICAgIElucHV0IGlucHV0ID0gSW5wdXQuY3JlYXRlKCk7CisgICAgaW5wdXQubWVzc2FnZShlbXB0eVRvTnVsbChtc2cpKTsKKyAgICBjYWxsKGlkLCAicmVzdG9yZSIpLnBvc3QoaW5wdXQsIGNiKTsKKyAgfQorCisgIC8qKiBDcmVhdGUgYSBuZXcgY2hhbmdlIHRoYXQgcmV2ZXJ0cyB0aGUgZGVsdGEgY2F1c2VkIGJ5IHRoaXMgY2hhbmdlLiAqLworICBwdWJsaWMgc3RhdGljIHZvaWQgcmV2ZXJ0KGludCBpZCwgU3RyaW5nIG1zZywgQXN5bmNDYWxsYmFjazxDaGFuZ2VJbmZvPiBjYikgeworICAgIElucHV0IGlucHV0ID0gSW5wdXQuY3JlYXRlKCk7CisgICAgaW5wdXQubWVzc2FnZShlbXB0eVRvTnVsbChtc2cpKTsKKyAgICBjYWxsKGlkLCAicmV2ZXJ0IikucG9zdChpbnB1dCwgY2IpOworICB9CisKKyAgLyoqIFVwZGF0ZSB0aGUgdG9waWMgb2YgYSBjaGFuZ2UuICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCB0b3BpYyhpbnQgaWQsIFN0cmluZyB0b3BpYywgU3RyaW5nIG1zZywgQXN5bmNDYWxsYmFjazxTdHJpbmc+IGNiKSB7CisgICAgUmVzdEFwaSBjYWxsID0gY2FsbChpZCwgInRvcGljIik7CisgICAgdG9waWMgPSBlbXB0eVRvTnVsbCh0b3BpYyk7CisgICAgbXNnID0gZW1wdHlUb051bGwobXNnKTsKKyAgICBpZiAodG9waWMgIT0gbnVsbCB8fCBtc2cgIT0gbnVsbCkgeworICAgICAgSW5wdXQgaW5wdXQgPSBJbnB1dC5jcmVhdGUoKTsKKyAgICAgIGlucHV0LnRvcGljKHRvcGljKTsKKyAgICAgIGlucHV0Lm1lc3NhZ2UobXNnKTsKKyAgICAgIGNhbGwucHV0KGlucHV0LCBOYXRpdmVTdHJpbmcudW53cmFwKGNiKSk7CisgICAgfSBlbHNlIHsKKyAgICAgIGNhbGwuZGVsZXRlKE5hdGl2ZVN0cmluZy51bndyYXAoY2IpKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgc3RhdGljIHZvaWQgZGV0YWlsKGludCBpZCwgQXN5bmNDYWxsYmFjazxDaGFuZ2VJbmZvPiBjYikgeworICAgIGNhbGwoaWQsICJkZXRhaWwiKS5nZXQoY2IpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBSZXN0QXBpIHJldmlzaW9uKFBhdGNoU2V0LklkIGlkKSB7CisgICAgcmV0dXJuIGNoYW5nZShpZC5nZXRQYXJlbnRLZXkoKS5nZXQoKSkudmlldygicmV2aXNpb25zIikuaWQoaWQuZ2V0KCkpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBSZXN0QXBpIHJldmlld2VycyhpbnQgaWQpIHsKKyAgICByZXR1cm4gY2hhbmdlKGlkKS52aWV3KCJyZXZpZXdlcnMiKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgUmVzdEFwaSByZXZpZXdlcihpbnQgaWQsIGludCByZXZpZXdlcikgeworICAgIHJldHVybiBjaGFuZ2UoaWQpLnZpZXcoInJldmlld2VycyIpLmlkKHJldmlld2VyKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgUmVzdEFwaSByZXZpZXdlcihpbnQgaWQsIFN0cmluZyByZXZpZXdlcikgeworICAgIHJldHVybiBjaGFuZ2UoaWQpLnZpZXcoInJldmlld2VycyIpLmlkKHJldmlld2VyKTsKKyAgfQorCisgIC8qKiBTdWJtaXQgYSBzcGVjaWZpYyByZXZpc2lvbiBvZiBhIGNoYW5nZS4gKi8KKyAgcHVibGljIHN0YXRpYyB2b2lkIHN1Ym1pdChpbnQgaWQsIFN0cmluZyBjb21taXQsIEFzeW5jQ2FsbGJhY2s8U3VibWl0SW5mbz4gY2IpIHsKKyAgICBTdWJtaXRJbnB1dCBpbiA9IFN1Ym1pdElucHV0LmNyZWF0ZSgpOworICAgIGluLndhaXRfZm9yX21lcmdlKHRydWUpOworICAgIGNhbGwoaWQsIGNvbW1pdCwgInN1Ym1pdCIpLnBvc3QoaW4sIGNiKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGNsYXNzIElucHV0IGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdCB7CisgICAgZmluYWwgbmF0aXZlIHZvaWQgdG9waWMoU3RyaW5nIHQpIC8qLXsgaWYodCl0aGlzLnRvcGljPXQ7IH0tKi87CisgICAgZmluYWwgbmF0aXZlIHZvaWQgbWVzc2FnZShTdHJpbmcgbSkgLyoteyBpZihtKXRoaXMubWVzc2FnZT1tOyB9LSovOworCisgICAgc3RhdGljIElucHV0IGNyZWF0ZSgpIHsKKyAgICAgIHJldHVybiAoSW5wdXQpIGNyZWF0ZU9iamVjdCgpOworICAgIH0KKworICAgIHByb3RlY3RlZCBJbnB1dCgpIHsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBTdWJtaXRJbnB1dCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3QgeworICAgIGZpbmFsIG5hdGl2ZSB2b2lkIHdhaXRfZm9yX21lcmdlKGJvb2xlYW4gYikgLyoteyB0aGlzLndhaXRfZm9yX21lcmdlPWI7IH0tKi87CisKKyAgICBzdGF0aWMgU3VibWl0SW5wdXQgY3JlYXRlKCkgeworICAgICAgcmV0dXJuIChTdWJtaXRJbnB1dCkgY3JlYXRlT2JqZWN0KCk7CisgICAgfQorCisgICAgcHJvdGVjdGVkIFN1Ym1pdElucHV0KCkgeworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFJlc3RBcGkgY2FsbChpbnQgaWQsIFN0cmluZyBhY3Rpb24pIHsKKyAgICByZXR1cm4gY2hhbmdlKGlkKS52aWV3KGFjdGlvbik7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBSZXN0QXBpIGNhbGwoaW50IGlkLCBTdHJpbmcgY29tbWl0LCBTdHJpbmcgYWN0aW9uKSB7CisgICAgcmV0dXJuIGNoYW5nZShpZCkudmlldygicmV2aXNpb25zIikuaWQoY29tbWl0KS52aWV3KGFjdGlvbik7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBSZXN0QXBpIGNoYW5nZShpbnQgaWQpIHsKKyAgICAvLyBUT0RPIFN3aXRjaCB0byB0cmlwbGV0IHByb2plY3R+YnJhbmNofmlkIGZvcm1hdCBpbiBVUkkuCisgICAgcmV0dXJuIG5ldyBSZXN0QXBpKCIvY2hhbmdlcy8iKS5pZChTdHJpbmcudmFsdWVPZihpZCkpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBTdHJpbmcgZW1wdHlUb051bGwoU3RyaW5nIHN0cikgeworICAgIHJldHVybiBzdHIgPT0gbnVsbCB8fCBzdHIuaXNFbXB0eSgpID8gbnVsbCA6IHN0cjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlQ29uc3RhbnRzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VDb25zdGFudHMuamF2YQppbmRleCBkNDI5OTJmLi41MDBmMDZlIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VDb25zdGFudHMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VDb25zdGFudHMuamF2YQpAQCAtMzYsNyArMzYsNiBAQAogICBTdHJpbmcgYWxsQWJhbmRvbmVkQ2hhbmdlcygpOwogICBTdHJpbmcgYWxsTWVyZ2VkQ2hhbmdlcygpOwogCi0gIFN0cmluZyBjaGFuZ2VUYWJsZUNvbHVtbklEKCk7CiAgIFN0cmluZyBjaGFuZ2VUYWJsZUNvbHVtblN1YmplY3QoKTsKICAgU3RyaW5nIGNoYW5nZVRhYmxlQ29sdW1uT3duZXIoKTsKICAgU3RyaW5nIGNoYW5nZVRhYmxlQ29sdW1uUmV2aWV3ZXJzKCk7CkBAIC00NSw5ICs0NCw3IEBACiAgIFN0cmluZyBjaGFuZ2VUYWJsZUNvbHVtbkxhc3RVcGRhdGUoKTsKICAgU3RyaW5nIGNoYW5nZVRhYmxlTm9uZSgpOwogCi0gIFN0cmluZyBjaGFuZ2VUYWJsZVByZXYoKTsKLSAgU3RyaW5nIGNoYW5nZVRhYmxlTmV4dCgpOwotICBTdHJpbmcgY2hhbmdlVGFibGVPcGVuKCk7CisgIFN0cmluZyBjaGFuZ2VJdGVtSGVscCgpOwogICBTdHJpbmcgY2hhbmdlVGFibGVTdGFyKCk7CiAgIFN0cmluZyBjaGFuZ2VUYWJsZVBhZ2VQcmV2KCk7CiAgIFN0cmluZyBjaGFuZ2VUYWJsZVBhZ2VOZXh0KCk7CkBAIC02Niw2ICs2Myw3IEBACiAgIFN0cmluZyBwYXRjaFRhYmxlRG93bmxvYWRQcmVJbWFnZSgpOwogICBTdHJpbmcgcGF0Y2hUYWJsZURvd25sb2FkUG9zdEltYWdlKCk7CiAgIFN0cmluZyBjb21taXRNZXNzYWdlKCk7CisgIFN0cmluZyBmaWxlQ29tbWVudEhlYWRlcigpOwogCiAgIFN0cmluZyBwYXRjaFRhYmxlUHJldigpOwogICBTdHJpbmcgcGF0Y2hUYWJsZU5leHQoKTsKQEAgLTgwLDYgKzc4LDcgQEAKICAgU3RyaW5nIGNoYW5nZVNjcmVlbkRlcGVuZHNPbigpOwogICBTdHJpbmcgY2hhbmdlU2NyZWVuTmVlZGVkQnkoKTsKICAgU3RyaW5nIGNoYW5nZVNjcmVlbkNvbW1lbnRzKCk7CisgIFN0cmluZyBjaGFuZ2VTY3JlZW5BZGRDb21tZW50KCk7CiAKICAgU3RyaW5nIGFwcHJvdmFsVGFibGVSZXZpZXdlcigpOwogICBTdHJpbmcgYXBwcm92YWxUYWJsZUFkZFJldmlld2VyKCk7CkBAIC05MiwxNCArOTEsMjQgQEAKICAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja1Byb2plY3QoKTsKICAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja0JyYW5jaCgpOwogICBTdHJpbmcgY2hhbmdlSW5mb0Jsb2NrVG9waWMoKTsKKyAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja1RvcGljQWx0ZXJUb3BpY1Rvb2xUaXAoKTsKICAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja1VwbG9hZGVkKCk7CiAgIFN0cmluZyBjaGFuZ2VJbmZvQmxvY2tVcGRhdGVkKCk7CiAgIFN0cmluZyBjaGFuZ2VJbmZvQmxvY2tTdGF0dXMoKTsKKyAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja1N1Ym1pdFR5cGUoKTsKICAgU3RyaW5nIGNoYW5nZVBlcm1hbGluaygpOwogICBTdHJpbmcgY2hhbmdlSW5mb0Jsb2NrQ2FuTWVyZ2UoKTsKICAgU3RyaW5nIGNoYW5nZUluZm9CbG9ja0Nhbk1lcmdlWWVzKCk7CiAgIFN0cmluZyBjaGFuZ2VJbmZvQmxvY2tDYW5NZXJnZU5vKCk7CiAKKyAgU3RyaW5nIGJ1dHRvbkFsdGVyVG9waWMoKTsKKyAgU3RyaW5nIGJ1dHRvbkFsdGVyVG9waWNCZWdpbigpOworICBTdHJpbmcgYnV0dG9uQWx0ZXJUb3BpY1NlbmQoKTsKKyAgU3RyaW5nIGJ1dHRvbkFsdGVyVG9waWNDYW5jZWwoKTsKKyAgU3RyaW5nIGhlYWRpbmdBbHRlclRvcGljTWVzc2FnZSgpOworICBTdHJpbmcgYWx0ZXJUb3BpY1RpdGxlKCk7CisgIFN0cmluZyBhbHRlclRvcGljTGFiZWwoKTsKKwogICBTdHJpbmcgaW5jbHVkZWRJblRhYmxlQnJhbmNoKCk7CiAgIFN0cmluZyBpbmNsdWRlZEluVGFibGVUYWcoKTsKIApAQCAtMTIyLDExICsxMzEsMTUgQEAKICAgU3RyaW5nIGhlYWRpbmdSZXZlcnRNZXNzYWdlKCk7CiAgIFN0cmluZyByZXZlcnRDaGFuZ2VUaXRsZSgpOwogCisgIFN0cmluZyBoZWFkaW5nRWRpdENvbW1pdE1lc3NhZ2UoKTsKKyAgU3RyaW5nIGVkaXRDb21taXRNZXNzYWdlVG9vbFRpcCgpOworICBTdHJpbmcgdGl0bGVFZGl0Q29tbWl0TWVzc2FnZSgpOworCiAgIFN0cmluZyBidXR0b25BYmFuZG9uQ2hhbmdlQmVnaW4oKTsKICAgU3RyaW5nIGJ1dHRvbkFiYW5kb25DaGFuZ2VTZW5kKCk7CiAgIFN0cmluZyBoZWFkaW5nQWJhbmRvbk1lc3NhZ2UoKTsKICAgU3RyaW5nIGFiYW5kb25DaGFuZ2VUaXRsZSgpOwotICBTdHJpbmcgb2xkVmVyc2lvbkhpc3RvcnkoKTsKKyAgU3RyaW5nIHJlZmVyZW5jZVZlcnNpb24oKTsKICAgU3RyaW5nIGJhc2VEaWZmSXRlbSgpOwogICBTdHJpbmcgYXV0b01lcmdlKCk7CiAKQEAgLTE1Niw2ICsxNjksNiBAQAogICBTdHJpbmcgc3VibWl0RmFpbGVkKCk7CiAgIFN0cmluZyBidXR0b25DbG9zZSgpOwogCi0gIFN0cmluZyBidXR0b25EaWZmQWxsU2lkZUJ5U2lkZSgpOwotICBTdHJpbmcgYnV0dG9uRGlmZkFsbFVuaWZpZWQoKTsKKyAgU3RyaW5nIGRpZmZBbGxTaWRlQnlTaWRlKCk7CisgIFN0cmluZyBkaWZmQWxsVW5pZmllZCgpOwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlQ29uc3RhbnRzLnByb3BlcnRpZXMgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VDb25zdGFudHMucHJvcGVydGllcwppbmRleCA4Y2ViNzRjLi4wNmJkNjRkIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VDb25zdGFudHMucHJvcGVydGllcworKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VDb25zdGFudHMucHJvcGVydGllcwpAQCAtMTYsNyArMTYsNiBAQAogYWxsQWJhbmRvbmVkQ2hhbmdlcyA9IEFsbCBhYmFuZG9uZWQgY2hhbmdlcwogYWxsTWVyZ2VkQ2hhbmdlcyA9IEFsbCBtZXJnZWQgY2hhbmdlcwogCi1jaGFuZ2VUYWJsZUNvbHVtbklEID0gSUQKIGNoYW5nZVRhYmxlQ29sdW1uU3ViamVjdCA9IFN1YmplY3QKIGNoYW5nZVRhYmxlQ29sdW1uT3duZXIgPSBPd25lcgogY2hhbmdlVGFibGVDb2x1bW5SZXZpZXdlcnMgPSBSZXZpZXdlcnMKQEAgLTI1LDkgKzI0LDcgQEAKIGNoYW5nZVRhYmxlQ29sdW1uTGFzdFVwZGF0ZSA9IFVwZGF0ZWQKIGNoYW5nZVRhYmxlTm9uZSA9IChOb25lKQogCi1jaGFuZ2VUYWJsZVByZXYgPSBQcmV2aW91cyBjaGFuZ2UKLWNoYW5nZVRhYmxlTmV4dCA9IE5leHQgY2hhbmdlCi1jaGFuZ2VUYWJsZU9wZW4gPSBPcGVuIGNoYW5nZQorY2hhbmdlSXRlbUhlbHAgPSBjaGFuZ2UKIGNoYW5nZVRhYmxlU3RhciA9IFN0YXIgKG9yIHVuc3RhcikgY2hhbmdlCiBjaGFuZ2VUYWJsZVBhZ2VQcmV2ID0gUHJldmlvdXMgcGFnZSBvZiBjaGFuZ2VzCiBjaGFuZ2VUYWJsZVBhZ2VOZXh0ID0gTmV4dCBwYWdlIG9mIGNoYW5nZXMKQEAgLTQ2LDYgKzQzLDcgQEAKIHBhdGNoVGFibGVEb3dubG9hZFByZUltYWdlID0gb2xkCiBwYXRjaFRhYmxlRG93bmxvYWRQb3N0SW1hZ2UgPSBuZXcKIGNvbW1pdE1lc3NhZ2UgPSBDb21taXQgTWVzc2FnZQorZmlsZUNvbW1lbnRIZWFkZXIgPSBGaWxlIENvbW1lbnQ6CiAKIHBhdGNoVGFibGVQcmV2ID0gUHJldmlvdXMgZmlsZQogcGF0Y2hUYWJsZU5leHQgPSBOZXh0IGZpbGUKQEAgLTU3LDYgKzU1LDcgQEAKIGNoYW5nZVNjcmVlbkRlcGVuZHNPbiA9IERlcGVuZHMgT24KIGNoYW5nZVNjcmVlbk5lZWRlZEJ5ID0gTmVlZGVkIEJ5CiBjaGFuZ2VTY3JlZW5Db21tZW50cyA9IENvbW1lbnRzCitjaGFuZ2VTY3JlZW5BZGRDb21tZW50ID0gQWRkIENvbW1lbnQKIAogYXBwcm92YWxUYWJsZVJldmlld2VyID0gUmV2aWV3ZXIKIGFwcHJvdmFsVGFibGVBZGRSZXZpZXdlciA9IEFkZCBSZXZpZXdlcgpAQCAtNjksMTQgKzY4LDI0IEBACiBjaGFuZ2VJbmZvQmxvY2tQcm9qZWN0ID0gUHJvamVjdAogY2hhbmdlSW5mb0Jsb2NrQnJhbmNoID0gQnJhbmNoCiBjaGFuZ2VJbmZvQmxvY2tUb3BpYyA9IFRvcGljCitjaGFuZ2VJbmZvQmxvY2tUb3BpY0FsdGVyVG9waWNUb29sVGlwID0gRWRpdCBUb3BpYwogY2hhbmdlSW5mb0Jsb2NrVXBsb2FkZWQgPSBVcGxvYWRlZAogY2hhbmdlSW5mb0Jsb2NrVXBkYXRlZCA9IFVwZGF0ZWQKIGNoYW5nZUluZm9CbG9ja1N0YXR1cyA9IFN0YXR1cworY2hhbmdlSW5mb0Jsb2NrU3VibWl0VHlwZSA9IFN1Ym1pdCBUeXBlCiBjaGFuZ2VQZXJtYWxpbmsgPSBQZXJtYWxpbmsKIGNoYW5nZUluZm9CbG9ja0Nhbk1lcmdlID0gQ2FuIE1lcmdlCiBjaGFuZ2VJbmZvQmxvY2tDYW5NZXJnZVllcyA9IFllcwogY2hhbmdlSW5mb0Jsb2NrQ2FuTWVyZ2VObyA9IE5vCiAKK2J1dHRvbkFsdGVyVG9waWMgPSBFZGl0IFRvcGljCitidXR0b25BbHRlclRvcGljQmVnaW4gPSBFZGl0IFRvcGljCitidXR0b25BbHRlclRvcGljU2VuZCA9IFVwZGF0ZSBUb3BpYworYnV0dG9uQWx0ZXJUb3BpY0NhbmNlbCA9IENhbmNlbAoraGVhZGluZ0FsdGVyVG9waWNNZXNzYWdlID0gRWRpdCBUb3BpYyBNZXNzYWdlOgorYWx0ZXJUb3BpY1RpdGxlID0gQ29kZSBSZXZpZXcgLSBFZGl0IFRvcGljCithbHRlclRvcGljTGFiZWwgPSBOZXcgVG9waWMgTmFtZToKKwogaW5jbHVkZWRJblRhYmxlQnJhbmNoID0gQnJhbmNoIE5hbWUKIGluY2x1ZGVkSW5UYWJsZVRhZyA9IFRhZyBOYW1lCiAKQEAgLTk2LDcgKzEwNSw3IEBACiBidXR0b25BYmFuZG9uQ2hhbmdlU2VuZCA9IEFiYW5kb24gQ2hhbmdlCiBoZWFkaW5nQWJhbmRvbk1lc3NhZ2UgPSBBYmFuZG9uIE1lc3NhZ2U6CiBhYmFuZG9uQ2hhbmdlVGl0bGUgPSBDb2RlIFJldmlldyAtIEFiYW5kb24gQ2hhbmdlCi1vbGRWZXJzaW9uSGlzdG9yeSA9IE9sZCBWZXJzaW9uIEhpc3Rvcnk6CityZWZlcmVuY2VWZXJzaW9uID0gUmVmZXJlbmNlIFZlcnNpb246CiBiYXNlRGlmZkl0ZW0gPSBCYXNlCiBhdXRvTWVyZ2UgPSBBdXRvIE1lcmdlCiAKQEAgLTEwNyw2ICsxMTYsMTAgQEAKIGhlYWRpbmdSZXZlcnRNZXNzYWdlID0gUmV2ZXJ0IENvbW1pdCBNZXNzYWdlOgogcmV2ZXJ0Q2hhbmdlVGl0bGUgPSBDb2RlIFJldmlldyAtIFJldmVydCBNZXJnZWQgQ2hhbmdlCiAKK2hlYWRpbmdFZGl0Q29tbWl0TWVzc2FnZSA9IENvbW1pdCBNZXNzYWdlCitlZGl0Q29tbWl0TWVzc2FnZVRvb2xUaXAgPSBFZGl0IENvbW1pdCBNZXNzYWdlCit0aXRsZUVkaXRDb21taXRNZXNzYWdlID0gQ3JlYXRlIE5ldyBQYXRjaCBTZXQKKwogYnV0dG9uUmVzdG9yZUNoYW5nZUJlZ2luID0gUmVzdG9yZSBDaGFuZ2UKIHJlc3RvcmVDaGFuZ2VUaXRsZSA9IENvZGUgUmV2aWV3IC0gUmVzdG9yZSBDaGFuZ2UKIGhlYWRpbmdSZXN0b3JlTWVzc2FnZSA9IFJlc3RvcmUgTWVzc2FnZToKQEAgLTEzNyw1ICsxNTAsNSBAQAogc3VibWl0RmFpbGVkID0gU3VibWl0IEZhaWxlZAogYnV0dG9uQ2xvc2UgPSBDbG9zZQogCi1idXR0b25EaWZmQWxsU2lkZUJ5U2lkZSA9IERpZmYgQWxsIFNpZGUtYnktU2lkZQotYnV0dG9uRGlmZkFsbFVuaWZpZWQgPSBEaWZmIEFsbCBVbmlmaWVkCitkaWZmQWxsU2lkZUJ5U2lkZSA9IEFsbCBTaWRlLWJ5LVNpZGUKK2RpZmZBbGxVbmlmaWVkID0gQWxsIFVuaWZpZWQKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZURlc2NyaXB0aW9uQmxvY2suamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZURlc2NyaXB0aW9uQmxvY2suamF2YQppbmRleCBjOGIyYTY2Li41Y2Q2Y2RiIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VEZXNjcmlwdGlvbkJsb2NrLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlRGVzY3JpcHRpb25CbG9jay5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm9DYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5TdWJtaXRUeXBlUmVjb3JkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0SW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Db21wb3NpdGU7CkBAIC0zNSw5ICszNiwxMSBAQAogICAgIGluaXRXaWRnZXQoaHApOwogICB9CiAKLSAgcHVibGljIHZvaWQgZGlzcGxheShDaGFuZ2UgY2hnLCBCb29sZWFuIHN0YXJyZWQsIFBhdGNoU2V0SW5mbyBpbmZvLAotICAgICAgZmluYWwgQWNjb3VudEluZm9DYWNoZSBhY2MpIHsKLSAgICBpbmZvQmxvY2suZGlzcGxheShjaGcsIGFjYyk7Ci0gICAgbWVzc2FnZUJsb2NrLmRpc3BsYXkoY2hnLmdldElkKCksIHN0YXJyZWQsIGluZm8uZ2V0TWVzc2FnZSgpKTsKKyAgcHVibGljIHZvaWQgZGlzcGxheShDaGFuZ2UgY2hnLCBCb29sZWFuIHN0YXJyZWQsIEJvb2xlYW4gY2FuRWRpdENvbW1pdE1lc3NhZ2UsCisgICAgICBQYXRjaFNldEluZm8gaW5mbywKKyAgICAgIGZpbmFsIEFjY291bnRJbmZvQ2FjaGUgYWNjLCBTdWJtaXRUeXBlUmVjb3JkIHN1Ym1pdFR5cGVSZWNvcmQpIHsKKyAgICBpbmZvQmxvY2suZGlzcGxheShjaGcsIGFjYywgc3VibWl0VHlwZVJlY29yZCk7CisgICAgbWVzc2FnZUJsb2NrLmRpc3BsYXkoY2hnLmN1cnJlbnRQYXRjaFNldElkKCksIHN0YXJyZWQsCisgICAgICBjYW5FZGl0Q29tbWl0TWVzc2FnZSwgIGluZm8uZ2V0TWVzc2FnZSgpKTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlSW5mby5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlSW5mby5qYXZhCmluZGV4IDBjOGUwM2UuLjAwNjkzZDkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUluZm8uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VJbmZvLmphdmEKQEAgLTE0LDE3ICsxNCwyOCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVNYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVTdHJpbmc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlN1Ym1pdFJlY29yZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkphdmFTY3JpcHRPYmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSnNBcnJheTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5Kc0FycmF5U3RyaW5nOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jbGllbnQuaW1wbC5zZXIuSmF2YVNxbFRpbWVzdGFtcF9Kc29uU2VyaWFsaXplcjsKIAogaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiBwdWJsaWMgY2xhc3MgQ2hhbmdlSW5mbyBleHRlbmRzIEphdmFTY3JpcHRPYmplY3QgeworICBwdWJsaWMgZmluYWwgdm9pZCBpbml0KCkgeworICAgIGlmIChsYWJlbHMwKCkgIT0gbnVsbCkgeworICAgICAgbGFiZWxzMCgpLmNvcHlLZXlzSW50b0NoaWxkcmVuKCJfbmFtZSIpOworICAgIH0KKyAgfQorCiAgIHB1YmxpYyBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdF9uYW1lX2tleSgpIHsKICAgICByZXR1cm4gbmV3IFByb2plY3QuTmFtZUtleShwcm9qZWN0KCkpOwogICB9CkBAIC01MCw3ICs2MSw3IEBACiAgIH0KIAogICBwdWJsaWMgZmluYWwgU3RyaW5nIGlkX2FiYnJldmlhdGVkKCkgewotICAgIHJldHVybiBuZXcgQ2hhbmdlLktleShpZCgpKS5hYmJyZXZpYXRlKCk7CisgICAgcmV0dXJuIG5ldyBDaGFuZ2UuS2V5KGNoYW5nZV9pZCgpKS5hYmJyZXZpYXRlKCk7CiAgIH0KIAogICBwdWJsaWMgZmluYWwgQ2hhbmdlLlN0YXR1cyBzdGF0dXMoKSB7CkBAIC01OCwxMyArNjksMTUgQEAKICAgfQogCiAgIHB1YmxpYyBmaW5hbCBTZXQ8U3RyaW5nPiBsYWJlbHMoKSB7Ci0gICAgcmV0dXJuIE5hdGl2ZXMua2V5cyhsYWJlbHMwKCkpOworICAgIHJldHVybiBsYWJlbHMwKCkua2V5U2V0KCk7CiAgIH0KIAorICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyBpZCgpIC8qLXsgcmV0dXJuIHRoaXMuaWQ7IH0tKi87CiAgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIHByb2plY3QoKSAvKi17IHJldHVybiB0aGlzLnByb2plY3Q7IH0tKi87CiAgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIGJyYW5jaCgpIC8qLXsgcmV0dXJuIHRoaXMuYnJhbmNoOyB9LSovOwogICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyB0b3BpYygpIC8qLXsgcmV0dXJuIHRoaXMudG9waWM7IH0tKi87Ci0gIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIGlkKCkgLyoteyByZXR1cm4gdGhpcy5pZDsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBTdHJpbmcgY2hhbmdlX2lkKCkgLyoteyByZXR1cm4gdGhpcy5jaGFuZ2VfaWQ7IH0tKi87CisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgYm9vbGVhbiBtZXJnZWFibGUoKSAvKi17IHJldHVybiB0aGlzLm1lcmdlYWJsZTsgfS0qLzsKICAgcHJpdmF0ZSBmaW5hbCBuYXRpdmUgU3RyaW5nIHN0YXR1c1JhdygpIC8qLXsgcmV0dXJuIHRoaXMuc3RhdHVzOyB9LSovOwogICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyBzdWJqZWN0KCkgLyoteyByZXR1cm4gdGhpcy5zdWJqZWN0OyB9LSovOwogICBwdWJsaWMgZmluYWwgbmF0aXZlIEFjY291bnRJbmZvIG93bmVyKCkgLyoteyByZXR1cm4gdGhpcy5vd25lcjsgfS0qLzsKQEAgLTczLDggKzg2LDIyIEBACiAgIHB1YmxpYyBmaW5hbCBuYXRpdmUgYm9vbGVhbiBzdGFycmVkKCkgLyoteyByZXR1cm4gdGhpcy5zdGFycmVkID8gdHJ1ZSA6IGZhbHNlOyB9LSovOwogICBwdWJsaWMgZmluYWwgbmF0aXZlIGJvb2xlYW4gcmV2aWV3ZWQoKSAvKi17IHJldHVybiB0aGlzLnJldmlld2VkID8gdHJ1ZSA6IGZhbHNlOyB9LSovOwogICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyBfc29ydGtleSgpIC8qLXsgcmV0dXJuIHRoaXMuX3NvcnRrZXk7IH0tKi87Ci0gIHByaXZhdGUgZmluYWwgbmF0aXZlIEphdmFTY3JpcHRPYmplY3QgbGFiZWxzMCgpIC8qLXsgcmV0dXJuIHRoaXMubGFiZWxzOyB9LSovOworICBwcml2YXRlIGZpbmFsIG5hdGl2ZSBOYXRpdmVNYXA8TGFiZWxJbmZvPiBsYWJlbHMwKCkgLyoteyByZXR1cm4gdGhpcy5sYWJlbHM7IH0tKi87CiAgIHB1YmxpYyBmaW5hbCBuYXRpdmUgTGFiZWxJbmZvIGxhYmVsKFN0cmluZyBuKSAvKi17IHJldHVybiB0aGlzLmxhYmVsc1tuXTsgfS0qLzsKKworICBwdWJsaWMgZmluYWwgbmF0aXZlIGJvb2xlYW4gaGFzX3Blcm1pdHRlZF9sYWJlbHMoKQorICAvKi17IHJldHVybiB0aGlzLmhhc093blByb3BlcnR5KCdwZXJtaXR0ZWRfbGFiZWxzJykgfS0qLzsKKyAgcHJpdmF0ZSBmaW5hbCBuYXRpdmUgTmF0aXZlTWFwPEphdmFTY3JpcHRPYmplY3Q+IF9wZXJtaXR0ZWRfbGFiZWxzKCkKKyAgLyoteyByZXR1cm4gdGhpcy5wZXJtaXR0ZWRfbGFiZWxzOyB9LSovOworICBwdWJsaWMgZmluYWwgU2V0PFN0cmluZz4gcGVybWl0dGVkX2xhYmVscygpIHsKKyAgICByZXR1cm4gTmF0aXZlcy5rZXlzKF9wZXJtaXR0ZWRfbGFiZWxzKCkpOworICB9CisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgSnNBcnJheVN0cmluZyBwZXJtaXR0ZWRfdmFsdWVzKFN0cmluZyBuKQorICAvKi17IHJldHVybiB0aGlzLnBlcm1pdHRlZF9sYWJlbHNbbl07IH0tKi87CisKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBKc0FycmF5PEFjY291bnRJbmZvPiByZW1vdmFibGVfcmV2aWV3ZXJzKCkKKyAgLyoteyByZXR1cm4gdGhpcy5yZW1vdmFibGVfcmV2aWV3ZXJzOyB9LSovOworCiAgIGZpbmFsIG5hdGl2ZSBpbnQgX251bWJlcigpIC8qLXsgcmV0dXJuIHRoaXMuX251bWJlcjsgfS0qLzsKICAgZmluYWwgbmF0aXZlIGJvb2xlYW4gX21vcmVfY2hhbmdlcygpCiAgIC8qLXsgcmV0dXJuIHRoaXMuX21vcmVfY2hhbmdlcyA/IHRydWUgOiBmYWxzZTsgfS0qLzsKQEAgLTgyLDEzICsxMDksNiBAQAogICBwcm90ZWN0ZWQgQ2hhbmdlSW5mbygpIHsKICAgfQogCi0gIHB1YmxpYyBzdGF0aWMgY2xhc3MgQWNjb3VudEluZm8gZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKLSAgICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyBuYW1lKCkgLyoteyByZXR1cm4gdGhpcy5uYW1lOyB9LSovOwotCi0gICAgcHJvdGVjdGVkIEFjY291bnRJbmZvKCkgewotICAgIH0KLSAgfQotCiAgIHB1YmxpYyBzdGF0aWMgY2xhc3MgTGFiZWxJbmZvIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdCB7CiAgICAgcHVibGljIGZpbmFsIFN1Ym1pdFJlY29yZC5MYWJlbC5TdGF0dXMgc3RhdHVzKCkgewogICAgICAgaWYgKGFwcHJvdmVkKCkgIT0gbnVsbCkgewpAQCAtMTA4LDYgKzEyOCwxNiBAQAogCiAgICAgcHVibGljIGZpbmFsIG5hdGl2ZSBBY2NvdW50SW5mbyByZWNvbW1lbmRlZCgpIC8qLXsgcmV0dXJuIHRoaXMucmVjb21tZW5kZWQ7IH0tKi87CiAgICAgcHVibGljIGZpbmFsIG5hdGl2ZSBBY2NvdW50SW5mbyBkaXNsaWtlZCgpIC8qLXsgcmV0dXJuIHRoaXMuZGlzbGlrZWQ7IH0tKi87CisKKyAgICBwdWJsaWMgZmluYWwgbmF0aXZlIEpzQXJyYXk8QXBwcm92YWxJbmZvPiBhbGwoKSAvKi17IHJldHVybiB0aGlzLmFsbDsgfS0qLzsKKworICAgIHByaXZhdGUgZmluYWwgbmF0aXZlIE5hdGl2ZU1hcDxOYXRpdmVTdHJpbmc+IF92YWx1ZXMoKSAvKi17IHJldHVybiB0aGlzLnZhbHVlczsgfS0qLzsKKworICAgIHB1YmxpYyBmaW5hbCBTZXQ8U3RyaW5nPiB2YWx1ZXMoKSB7CisgICAgICByZXR1cm4gTmF0aXZlcy5rZXlzKF92YWx1ZXMoKSk7CisgICAgfQorICAgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIHZhbHVlX3RleHQoU3RyaW5nIG4pIC8qLXsgcmV0dXJuIHRoaXMudmFsdWVzW25dOyB9LSovOworCiAgICAgcHVibGljIGZpbmFsIG5hdGl2ZSBib29sZWFuIG9wdGlvbmFsKCkgLyoteyByZXR1cm4gdGhpcy5vcHRpb25hbCA/IHRydWUgOiBmYWxzZTsgfS0qLzsKICAgICBmaW5hbCBuYXRpdmUgc2hvcnQgX3ZhbHVlKCkKICAgICAvKi17CkBAIC0xMjAsNCArMTUwLDEyIEBACiAgICAgcHJvdGVjdGVkIExhYmVsSW5mbygpIHsKICAgICB9CiAgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIEFwcHJvdmFsSW5mbyBleHRlbmRzIEFjY291bnRJbmZvIHsKKyAgICBwdWJsaWMgZmluYWwgbmF0aXZlIGJvb2xlYW4gaGFzX3ZhbHVlKCkgLyoteyByZXR1cm4gdGhpcy5oYXNPd25Qcm9wZXJ0eSgndmFsdWUnKTsgfS0qLzsKKyAgICBwdWJsaWMgZmluYWwgbmF0aXZlIHNob3J0IHZhbHVlKCkgLyoteyByZXR1cm4gdGhpcy52YWx1ZTsgfS0qLzsKKworICAgIHByb3RlY3RlZCBBcHByb3ZhbEluZm8oKSB7CisgICAgfQorICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VJbmZvQmxvY2suamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUluZm9CbG9jay5qYXZhCmluZGV4IDNmZmFjYzMuLmU0ZGJjMzIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUluZm9CbG9jay5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUluZm9CbG9jay5qYXZhCkBAIC0xNywxNSArMTcsMzEgQEAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkZvcm1hdFV0aWwubWVkaXVtRm9ybWF0OwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5BY2NvdW50TGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQnJhbmNoTGluazsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuUHJvamVjdExpbms7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkNvbW1lbnRlZEFjdGlvbkRpYWxvZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSW5saW5lSHlwZXJsaW5rOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5Qcm9qZWN0U2VhcmNoTGluazsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY291bnRJbmZvQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlRGV0YWlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlN1Ym1pdFR5cGVSZWNvcmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleUNvZGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5UHJlc3NFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Db21wb3NpdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxvd1BhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkdyaWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSFRNTFRhYmxlLkNlbGxGb3JtYXR0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW1hZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW5saW5lTGFiZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVGV4dEJveDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5jbGlwcHkuY2xpZW50LkNvcHlhYmxlTGFiZWw7CiAKIHB1YmxpYyBjbGFzcyBDaGFuZ2VJbmZvQmxvY2sgZXh0ZW5kcyBDb21wb3NpdGUgewpAQCAtMzYsOSArNTIsMTAgQEAKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFJfVE9QSUMgPSA0OwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9VUExPQURFRCA9IDU7CiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBSX1VQREFURUQgPSA2OwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9TVEFUVVMgPSA3OwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9NRVJHRV9URVNUID0gODsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFJfQ05UID0gOTsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFJfU1VCTUlUX1RZUEUgPSA3OworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9TVEFUVVMgPSA4OworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUl9NRVJHRV9URVNUID0gOTsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFJfQ05UID0gMTA7CiAKICAgcHJpdmF0ZSBmaW5hbCBHcmlkIHRhYmxlOwogCkBAIC01OSw2ICs3Niw3IEBACiAgICAgaW5pdFJvdyhSX1VQTE9BREVELCBVdGlsLkMuY2hhbmdlSW5mb0Jsb2NrVXBsb2FkZWQoKSk7CiAgICAgaW5pdFJvdyhSX1VQREFURUQsIFV0aWwuQy5jaGFuZ2VJbmZvQmxvY2tVcGRhdGVkKCkpOwogICAgIGluaXRSb3coUl9TVEFUVVMsIFV0aWwuQy5jaGFuZ2VJbmZvQmxvY2tTdGF0dXMoKSk7CisgICAgaW5pdFJvdyhSX1NVQk1JVF9UWVBFLCBVdGlsLkMuY2hhbmdlSW5mb0Jsb2NrU3VibWl0VHlwZSgpKTsKICAgICBpZiAoR2Vycml0LmdldENvbmZpZygpLnRlc3RDaGFuZ2VNZXJnZSgpKSB7CiAgICAgICBpbml0Um93KFJfTUVSR0VfVEVTVCwgVXRpbC5DLmNoYW5nZUluZm9CbG9ja0Nhbk1lcmdlKCkpOwogICAgIH0KQEAgLTc3LDcgKzk1LDggQEAKICAgICB0YWJsZS5nZXRDZWxsRm9ybWF0dGVyKCkuYWRkU3R5bGVOYW1lKHJvdywgMCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5oZWFkZXIoKSk7CiAgIH0KIAotICBwdWJsaWMgdm9pZCBkaXNwbGF5KGZpbmFsIENoYW5nZSBjaGcsIGZpbmFsIEFjY291bnRJbmZvQ2FjaGUgYWNjKSB7CisgIHB1YmxpYyB2b2lkIGRpc3BsYXkoZmluYWwgQ2hhbmdlIGNoZywgZmluYWwgQWNjb3VudEluZm9DYWNoZSBhY2MsCisgICAgICBTdWJtaXRUeXBlUmVjb3JkIHN1Ym1pdFR5cGVSZWNvcmQpIHsKICAgICBmaW5hbCBCcmFuY2guTmFtZUtleSBkc3QgPSBjaGcuZ2V0RGVzdCgpOwogCiAgICAgQ29weWFibGVMYWJlbCBjaGFuZ2VJZExhYmVsID0KQEAgLTg2LDE0ICsxMDUsMjcgQEAKICAgICB0YWJsZS5zZXRXaWRnZXQoUl9DSEFOR0VfSUQsIDEsIGNoYW5nZUlkTGFiZWwpOwogCiAgICAgdGFibGUuc2V0V2lkZ2V0KFJfT1dORVIsIDEsIEFjY291bnRMaW5rLmxpbmsoYWNjLCBjaGcuZ2V0T3duZXIoKSkpOwotICAgIHRhYmxlLnNldFdpZGdldChSX1BST0pFQ1QsIDEsIG5ldyBQcm9qZWN0TGluayhjaGcuZ2V0UHJvamVjdCgpLCBjaGcuZ2V0U3RhdHVzKCkpKTsKKworICAgIGZpbmFsIEZsb3dQYW5lbCBwID0gbmV3IEZsb3dQYW5lbCgpOworICAgIHAuYWRkKG5ldyBQcm9qZWN0U2VhcmNoTGluayhjaGcuZ2V0UHJvamVjdCgpKSk7CisgICAgcC5hZGQobmV3IElubGluZUh5cGVybGluayhjaGcuZ2V0UHJvamVjdCgpLmdldCgpLAorICAgICAgICBQYWdlTGlua3MudG9Qcm9qZWN0KGNoZy5nZXRQcm9qZWN0KCkpKSk7CisgICAgdGFibGUuc2V0V2lkZ2V0KFJfUFJPSkVDVCwgMSwgcCk7CisKICAgICB0YWJsZS5zZXRXaWRnZXQoUl9CUkFOQ0gsIDEsIG5ldyBCcmFuY2hMaW5rKGRzdC5nZXRTaG9ydE5hbWUoKSwgY2hnCiAgICAgICAgIC5nZXRQcm9qZWN0KCksIGNoZy5nZXRTdGF0dXMoKSwgZHN0LmdldCgpLCBudWxsKSk7Ci0gICAgdGFibGUuc2V0V2lkZ2V0KFJfVE9QSUMsIDEsIG5ldyBCcmFuY2hMaW5rKGNoZy5nZXRUb3BpYygpLAotICAgICAgICBjaGcuZ2V0UHJvamVjdCgpLCBjaGcuZ2V0U3RhdHVzKCksIGRzdC5nZXQoKSwgY2hnLmdldFRvcGljKCkpKTsKKyAgICB0YWJsZS5zZXRXaWRnZXQoUl9UT1BJQywgMSwgdG9waWMoY2hnKSk7CiAgICAgdGFibGUuc2V0VGV4dChSX1VQTE9BREVELCAxLCBtZWRpdW1Gb3JtYXQoY2hnLmdldENyZWF0ZWRPbigpKSk7CiAgICAgdGFibGUuc2V0VGV4dChSX1VQREFURUQsIDEsIG1lZGl1bUZvcm1hdChjaGcuZ2V0TGFzdFVwZGF0ZWRPbigpKSk7CiAgICAgdGFibGUuc2V0VGV4dChSX1NUQVRVUywgMSwgVXRpbC50b0xvbmdTdHJpbmcoY2hnLmdldFN0YXR1cygpKSk7CisgICAgU3RyaW5nIHN1Ym1pdFR5cGU7CisgICAgaWYgKHN1Ym1pdFR5cGVSZWNvcmQuc3RhdHVzID09IFN1Ym1pdFR5cGVSZWNvcmQuU3RhdHVzLk9LKSB7CisgICAgICBzdWJtaXRUeXBlID0gY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFkbWluLlV0aWwKKyAgICAgICAgICAgICAgLnRvTG9uZ1N0cmluZyhzdWJtaXRUeXBlUmVjb3JkLnR5cGUpOworICAgIH0gZWxzZSB7CisgICAgICBzdWJtaXRUeXBlID0gc3VibWl0VHlwZVJlY29yZC5zdGF0dXMubmFtZSgpOworICAgIH0KKyAgICB0YWJsZS5zZXRUZXh0KFJfU1VCTUlUX1RZUEUsIDEsIHN1Ym1pdFR5cGUpOwogICAgIGZpbmFsIENoYW5nZS5TdGF0dXMgc3RhdHVzID0gY2hnLmdldFN0YXR1cygpOwogICAgIGlmIChHZXJyaXQuZ2V0Q29uZmlnKCkudGVzdENoYW5nZU1lcmdlKCkpIHsKICAgICAgIGlmIChzdGF0dXMuZXF1YWxzKENoYW5nZS5TdGF0dXMuTkVXKSB8fCBzdGF0dXMuZXF1YWxzKENoYW5nZS5TdGF0dXMuRFJBRlQpKSB7CkBAIC0xMDcsOCArMTM5LDkyIEBACiAKICAgICBpZiAoc3RhdHVzLmlzQ2xvc2VkKCkpIHsKICAgICAgIHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKS5hZGRTdHlsZU5hbWUoUl9TVEFUVVMsIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY2xvc2Vkc3RhdGUoKSk7CisgICAgICB0YWJsZS5nZXRSb3dGb3JtYXR0ZXIoKS5zZXRWaXNpYmxlKFJfU1VCTUlUX1RZUEUsIGZhbHNlKTsKICAgICB9IGVsc2UgewogICAgICAgdGFibGUuZ2V0Q2VsbEZvcm1hdHRlcigpLnJlbW92ZVN0eWxlTmFtZShSX1NUQVRVUywgMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jbG9zZWRzdGF0ZSgpKTsKKyAgICAgIHRhYmxlLmdldFJvd0Zvcm1hdHRlcigpLnNldFZpc2libGUoUl9TVUJNSVRfVFlQRSwgdHJ1ZSk7CisgICAgfQorICB9CisKKyAgcHVibGljIFdpZGdldCB0b3BpYyhmaW5hbCBDaGFuZ2UgY2hnKSB7CisgICAgZmluYWwgQnJhbmNoLk5hbWVLZXkgZHN0ID0gY2hnLmdldERlc3QoKTsKKworICAgIEZsb3dQYW5lbCBmcCA9IG5ldyBGbG93UGFuZWwoKTsKKyAgICBmcC5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jaGFuZ2VJbmZvVG9waWNQYW5lbCgpKTsKKyAgICBmcC5hZGQobmV3IEJyYW5jaExpbmsoY2hnLmdldFRvcGljKCksIGNoZy5nZXRQcm9qZWN0KCksIGNoZy5nZXRTdGF0dXMoKSwKKyAgICAgICAgICAgZHN0LmdldCgpLCBjaGcuZ2V0VG9waWMoKSkpOworCisgICAgQ2hhbmdlRGV0YWlsQ2FjaGUgZGV0YWlsQ2FjaGUgPSBDaGFuZ2VDYWNoZS5nZXQoY2hnLmdldElkKCkpLmdldENoYW5nZURldGFpbENhY2hlKCk7CisgICAgQ2hhbmdlRGV0YWlsIGNoYW5nZURldGFpbCA9IGRldGFpbENhY2hlLmdldCgpOworCisgICAgaWYgKGNoYW5nZURldGFpbC5jYW5FZGl0VG9waWNOYW1lKCkpIHsKKyAgICAgIGZpbmFsIEltYWdlIGVkaXQgPSBuZXcgSW1hZ2UoR2Vycml0LlJFU09VUkNFUy5lZGl0KCkpOworICAgICAgZWRpdC5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5rKCkpOworICAgICAgZWRpdC5zZXRUaXRsZShVdGlsLkMuY2hhbmdlSW5mb0Jsb2NrVG9waWNBbHRlclRvcGljVG9vbFRpcCgpKTsKKyAgICAgIGVkaXQuYWRkQ2xpY2tIYW5kbGVyKG5ldyAgQ2xpY2tIYW5kbGVyKCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIHZvaWQgb25DbGljayhmaW5hbCBDbGlja0V2ZW50IGV2ZW50KSB7CisgICAgICAgICAgbmV3IEFsdGVyVG9waWNEaWFsb2coY2hnKS5jZW50ZXIoKTsKKyAgICAgICAgfQorICAgICAgfSk7CisgICAgICBmcC5hZGQoZWRpdCk7CisgICAgfQorCisgICAgcmV0dXJuIGZwOworICB9CisKKyAgcHJpdmF0ZSBjbGFzcyBBbHRlclRvcGljRGlhbG9nIGV4dGVuZHMgQ29tbWVudGVkQWN0aW9uRGlhbG9nPENoYW5nZURldGFpbD4KKyAgICAgIGltcGxlbWVudHMgS2V5UHJlc3NIYW5kbGVyIHsKKyAgICBUZXh0Qm94IG5ld1RvcGljOworICAgIENoYW5nZSBjaGFuZ2U7CisKKyAgICBBbHRlclRvcGljRGlhbG9nKENoYW5nZSBjaGcpIHsKKyAgICAgIHN1cGVyKFV0aWwuQy5hbHRlclRvcGljVGl0bGUoKSwgVXRpbC5DLmhlYWRpbmdBbHRlclRvcGljTWVzc2FnZSgpLAorICAgICAgICAgIG5ldyBDaGFuZ2VEZXRhaWxDYWNoZS5JZ25vcmVFcnJvckNhbGxiYWNrKCkpOworICAgICAgY2hhbmdlID0gY2hnOworCisgICAgICBuZXdUb3BpYyA9IG5ldyBUZXh0Qm94KCk7CisgICAgICBuZXdUb3BpYy5hZGRLZXlQcmVzc0hhbmRsZXIodGhpcyk7CisgICAgICBzZXRGb2N1c09uKG5ld1RvcGljKTsKKyAgICAgIHBhbmVsLmluc2VydChuZXdUb3BpYywgMCk7CisgICAgICBwYW5lbC5pbnNlcnQobmV3IElubGluZUxhYmVsKFV0aWwuQy5hbHRlclRvcGljTGFiZWwoKSksIDApOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHByb3RlY3RlZCB2b2lkIG9uTG9hZCgpIHsKKyAgICAgIHN1cGVyLm9uTG9hZCgpOworICAgICAgbmV3VG9waWMuc2V0VGV4dChjaGFuZ2UuZ2V0VG9waWMoKSk7CisgICAgfQorCisgICAgcHJpdmF0ZSB2b2lkIGRvVG9waWNFZGl0KCkgeworICAgICAgU3RyaW5nIHRvcGljID0gbmV3VG9waWMuZ2V0VGV4dCgpOworICAgICAgQ2hhbmdlQXBpLnRvcGljKGNoYW5nZS5nZXRJZCgpLmdldCgpLCB0b3BpYywgZ2V0TWVzc2FnZVRleHQoKSwKKyAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPFN0cmluZz4oKSB7CisgICAgICAgIEBPdmVycmlkZQorICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoU3RyaW5nIHJlc3VsdCkgeworICAgICAgICAgIHNlbnQgPSB0cnVlOworICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KFBhZ2VMaW5rcy50b0NoYW5nZShjaGFuZ2UuZ2V0SWQoKSkpOworICAgICAgICAgIGhpZGUoKTsKKyAgICAgICAgfQorCisgICAgICAgIEBPdmVycmlkZQorICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoZmluYWwgVGhyb3dhYmxlIGNhdWdodCkgeworICAgICAgICAgIGVuYWJsZUJ1dHRvbnModHJ1ZSk7CisgICAgICAgICAgc3VwZXIub25GYWlsdXJlKGNhdWdodCk7CisgICAgICAgIH19KTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgdm9pZCBvblNlbmQoKSB7CisgICAgICBkb1RvcGljRWRpdCgpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIG9uS2V5UHJlc3MoS2V5UHJlc3NFdmVudCBldmVudCkgeworICAgICAgaWYgKGV2ZW50LmdldFNvdXJjZSgpID09IG5ld1RvcGljCisgICAgICAgICAgJiYgZXZlbnQuZ2V0TmF0aXZlRXZlbnQoKS5nZXRLZXlDb2RlKCkgPT0gS2V5Q29kZXMuS0VZX0VOVEVSKSB7CisgICAgICAgIGRvVG9waWNFZGl0KCk7CisgICAgICB9CiAgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VMaXN0LmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VMaXN0LmphdmEKaW5kZXggNTYwZTZiMy4uN2M0MWVhMSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlTGlzdC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZUxpc3QuamF2YQpAQCAtMTQsMjggKzE0LDI4IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXM7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLk5hdGl2ZUxpc3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5jaGFuZ2VzLkxpc3RDaGFuZ2VzT3B0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5Kc0FycmF5OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5LZXlVdGlsOwogCiBpbXBvcnQgamF2YS51dGlsLkVudW1TZXQ7CiAKIC8qKiBMaXN0IG9mIGNoYW5nZXMgYXZhaWxhYmxlIGZyb20ge0Bjb2RlIC9jaGFuZ2VzL30uICovCi1wdWJsaWMgY2xhc3MgQ2hhbmdlTGlzdCBleHRlbmRzIE5hdGl2ZUxpc3Q8Q2hhbmdlSW5mbz4geworcHVibGljIGNsYXNzIENoYW5nZUxpc3QgZXh0ZW5kcyBKc0FycmF5PENoYW5nZUluZm8+IHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFVSSSA9ICIvY2hhbmdlcy8iOwogCiAgIC8qKiBSdW4gMiBvciBtb3JlIHF1ZXJpZXMgaW4gYSBzaW5nbGUgcmVtb3RlIGludm9jYXRpb24uICovCiAgIHB1YmxpYyBzdGF0aWMgdm9pZCBxdWVyeSgKLSAgICAgIEFzeW5jQ2FsbGJhY2s8TmF0aXZlTGlzdDxDaGFuZ2VMaXN0Pj4gY2FsbGJhY2ssIFN0cmluZy4uLiBxdWVyaWVzKSB7CisgICAgICBBc3luY0NhbGxiYWNrPEpzQXJyYXk8Q2hhbmdlTGlzdD4+IGNhbGxiYWNrLCBTdHJpbmcuLi4gcXVlcmllcykgewogICAgIGFzc2VydCBxdWVyaWVzLmxlbmd0aCA+PSAyOyAvLyBBdCBsZWFzdCAyIGlzIHJlcXVpcmVkIGZvciBjb3JyZWN0IHJlc3VsdC4KICAgICBSZXN0QXBpIGNhbGwgPSBuZXcgUmVzdEFwaShVUkkpOwogICAgIGZvciAoU3RyaW5nIHEgOiBxdWVyaWVzKSB7CiAgICAgICBjYWxsLmFkZFBhcmFtZXRlclJhdygicSIsIEtleVV0aWwuZW5jb2RlKHEpKTsKICAgICB9CiAgICAgYWRkT3B0aW9ucyhjYWxsLCBMaXN0Q2hhbmdlc09wdGlvbi5MQUJFTFMpOwotICAgIGNhbGwuc2VuZChjYWxsYmFjayk7CisgICAgY2FsbC5nZXQoY2FsbGJhY2spOwogICB9CiAKICAgcHVibGljIHN0YXRpYyB2b2lkIHByZXYoU3RyaW5nIHF1ZXJ5LApAQCAtNDksNyArNDksNyBAQAogICAgIGlmICghUGFnZWRTaW5nbGVMaXN0U2NyZWVuLk1JTl9TT1JUS0VZLmVxdWFscyhzb3J0a2V5KSkgewogICAgICAgY2FsbC5hZGRQYXJhbWV0ZXIoIlAiLCBzb3J0a2V5KTsKICAgICB9Ci0gICAgY2FsbC5zZW5kKGNhbGxiYWNrKTsKKyAgICBjYWxsLmdldChjYWxsYmFjayk7CiAgIH0KIAogICBwdWJsaWMgc3RhdGljIHZvaWQgbmV4dChTdHJpbmcgcXVlcnksCkBAIC02Myw3ICs2Myw3IEBACiAgICAgaWYgKCFQYWdlZFNpbmdsZUxpc3RTY3JlZW4uTUFYX1NPUlRLRVkuZXF1YWxzKHNvcnRrZXkpKSB7CiAgICAgICBjYWxsLmFkZFBhcmFtZXRlcigiTiIsIHNvcnRrZXkpOwogICAgIH0KLSAgICBjYWxsLnNlbmQoY2FsbGJhY2spOworICAgIGNhbGwuZ2V0KGNhbGxiYWNrKTsKICAgfQogCiAgIHByaXZhdGUgc3RhdGljIHZvaWQgYWRkT3B0aW9ucygKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZU1lc3NhZ2VzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VNZXNzYWdlcy5qYXZhCmluZGV4IDRiZDA4MjguLmJhNDY3MDIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZU1lc3NhZ2VzLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlTWVzc2FnZXMuamF2YQpAQCAtNTYsNiArNTYsNCBAQAogICBTdHJpbmcgZ3JvdXBJc05vdEFsbG93ZWQoU3RyaW5nIGdyb3VwKTsKICAgU3RyaW5nIGdyb3VwSGFzVG9vTWFueU1lbWJlcnMoU3RyaW5nIGdyb3VwKTsKICAgU3RyaW5nIGdyb3VwTWFueU1lbWJlcnNDb25maXJtYXRpb24oU3RyaW5nIGdyb3VwLCBpbnQgbWVtYmVyQ291bnQpOwotCi0gIFN0cmluZyBhbm9ueW1vdXNEb3dubG9hZChTdHJpbmcgcHJvdG9jb2wpOwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlTWVzc2FnZXMucHJvcGVydGllcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZU1lc3NhZ2VzLnByb3BlcnRpZXMKaW5kZXggMjQ0OTYxMy4uZmZhNzQ5ZCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlTWVzc2FnZXMucHJvcGVydGllcworKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VNZXNzYWdlcy5wcm9wZXJ0aWVzCkBAIC0xLDMgKzEsNSBAQAorIyBDaGFuZ2VzIHRvIHRoaXMgZmlsZSBzaG91bGQgYWxzbyBiZSBtYWRlIGluCisjIGdlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvQ2hhbmdlTWVzc2FnZXMucHJvcGVydGllcwogYWNjb3VudERhc2hib2FyZFRpdGxlID0gQ29kZSBSZXZpZXcgRGFzaGJvYXJkIGZvciB7MH0KIGNoYW5nZXNPcGVuSW5Qcm9qZWN0ID0gT3BlbiBDaGFuZ2VzIEluIHswfQogY2hhbmdlc01lcmdlZEluUHJvamVjdCA9IE1lcmdlZCBDaGFuZ2VzIEluIHswfQpAQCAtMzcsNSArMzksMyBAQAogZ3JvdXBJc05vdEFsbG93ZWQgPSAgVGhlIGdyb3VwIHswfSBjYW5ub3QgYmUgYWRkZWQgYXMgcmV2aWV3ZXIuCiBncm91cEhhc1Rvb01hbnlNZW1iZXJzID0gVGhlIGdyb3VwIHswfSBoYXMgdG9vIG1hbnkgbWVtYmVycyB0byBhZGQgdGhlbSBhbGwgYXMgcmV2aWV3ZXJzLgogZ3JvdXBNYW55TWVtYmVyc0NvbmZpcm1hdGlvbiA9IFRoZSBncm91cCB7MH0gaGFzIHsxfSBtZW1iZXJzLiBEbyB5b3Ugd2FudCB0byBhZGQgdGhlbSBhbGwgYXMgcmV2aWV3ZXJzPwotCi1hbm9ueW1vdXNEb3dubG9hZCA9IEFub255bW91cyB7MH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZVNjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlU2NyZWVuLmphdmEKaW5kZXggNGRkNmIwMy4uYmVlOGFjNCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlU2NyZWVuLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlU2NyZWVuLmphdmEKQEAgLTE1LDI5ICsxNSwzMyBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlczsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5EaXNwYXRjaGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5Gb3JtYXRVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQ29tbWVudFBhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5Db21wbGV4RGlzY2xvc3VyZVBhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5FeHBhbmRBbGxDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5MaW5rTWVudUJhcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuTmVlZHNTaWduSW5LZXlDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TY3JlZW47Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm9DYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VEZXRhaWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlSW5mbzsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2UuU3RhdHVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2VNZXNzYWdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNoYW5nZUV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2hhbmdlSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmxvZ2ljYWwuc2hhcmVkLlZhbHVlQ2hhbmdlRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQubG9naWNhbC5zaGFyZWQuVmFsdWVDaGFuZ2VIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LnNoYXJlZC5IYW5kbGVyUmVnaXN0cmF0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmkxOG4uY2xpZW50LkxvY2FsZUluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQnV0dG9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkRpc2Nsb3N1cmVQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuR3JpZDsKQEAgLTU5LDYgKzYzLDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2UuSWQgY2hhbmdlSWQ7CiAgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXQuSWQgb3BlblBhdGNoU2V0SWQ7CiAgIHByaXZhdGUgQ2hhbmdlRGV0YWlsQ2FjaGUgZGV0YWlsQ2FjaGU7CisgIHByaXZhdGUgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXMuQ2hhbmdlSW5mbyBjaGFuZ2VJbmZvOwogCiAgIHByaXZhdGUgQ2hhbmdlRGVzY3JpcHRpb25CbG9jayBkZXNjcmlwdGlvbkJsb2NrOwogICBwcml2YXRlIEFwcHJvdmFsVGFibGUgYXBwcm92YWxzOwpAQCAtOTUsMTQgKzEwMCw2IEBACiAgIHB1YmxpYyBDaGFuZ2VTY3JlZW4oZmluYWwgQ2hhbmdlLklkIHRvU2hvdykgewogICAgIGNoYW5nZUlkID0gdG9TaG93OwogICAgIG9wZW5QYXRjaFNldElkID0gbnVsbDsKLQotICAgIC8vIElmIHdlIGhhdmUgYW55IGRpZmYgc3RvcmVkLCBtYWtlIHN1cmUgdGhleSBhcmUgYXBwbGljYWJsZSB0byB0aGUKLSAgICAvLyBjdXJyZW50IGNoYW5nZSwgZGlzY2FyZCB0aGVtIG90aGVyd2lzZS4KLSAgICAvLwotICAgIGlmIChjdXJyZW50Q2hhbmdlSWQgIT0gbnVsbCAmJiAhY3VycmVudENoYW5nZUlkLmVxdWFscyh0b1Nob3cpKSB7Ci0gICAgICBkaWZmQmFzZUlkID0gbnVsbDsKLSAgICB9Ci0gICAgY3VycmVudENoYW5nZUlkID0gdG9TaG93OwogICB9CiAKICAgcHVibGljIENoYW5nZVNjcmVlbihmaW5hbCBQYXRjaFNldC5JZCB0b1Nob3cpIHsKQEAgLTIyOCw3ICsyMjUsNyBAQAogCiAgICAgcGF0Y2hlc0dyaWQgPSBuZXcgR3JpZCgxLCAyKTsKICAgICBwYXRjaGVzR3JpZC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5zZWxlY3RQYXRjaFNldE9sZFZlcnNpb24oKSk7Ci0gICAgcGF0Y2hlc0dyaWQuc2V0VGV4dCgwLCAwLCBVdGlsLkMub2xkVmVyc2lvbkhpc3RvcnkoKSk7CisgICAgcGF0Y2hlc0dyaWQuc2V0VGV4dCgwLCAwLCBVdGlsLkMucmVmZXJlbmNlVmVyc2lvbigpKTsKICAgICBwYXRjaGVzR3JpZC5zZXRXaWRnZXQoMCwgMSwgcGF0Y2hlc0xpc3QpOwogICAgIGFkZChwYXRjaGVzR3JpZCk7CiAKQEAgLTI2MCwxNCArMjU3LDI2IEBACiAgIH0KIAogICBAT3ZlcnJpZGUKLSAgcHVibGljIHZvaWQgb25WYWx1ZUNoYW5nZShWYWx1ZUNoYW5nZUV2ZW50PENoYW5nZURldGFpbD4gZXZlbnQpIHsKKyAgcHVibGljIHZvaWQgb25WYWx1ZUNoYW5nZShmaW5hbCBWYWx1ZUNoYW5nZUV2ZW50PENoYW5nZURldGFpbD4gZXZlbnQpIHsKICAgICBpZiAoaXNBdHRhY2hlZCgpKSB7Ci0gICAgICBkaXNwbGF5KGV2ZW50LmdldFZhbHVlKCkpOworICAgICAgLy8gVW50aWwgdGhpcyBzY3JlZW4gaXMgZnVsbHkgbWlncmF0ZWQgdG8gdGhlIG5ldyBBUEksIHRoaXMgY2FsbCBtdXN0IGJlCisgICAgICAvLyBzZXF1ZW50aWFsLCBiZWNhdXNlIHdlIGNhbid0IHN0YXJ0IGFuIGFzeW5jIGdldCBhdCB0aGUgc291cmNlIG9mIGV2ZXJ5CisgICAgICAvLyBjYWxsIHRoYXQgbWlnaHQgdHJpZ2dlciBhIHZhbHVlIGNoYW5nZS4KKyAgICAgIENoYW5nZUFwaS5kZXRhaWwoZXZlbnQuZ2V0VmFsdWUoKS5nZXRDaGFuZ2UoKS5nZXRJZCgpLmdldCgpLAorICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlcy5DaGFuZ2VJbmZvPigpIHsKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKAorICAgICAgICAgICAgICAgIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLkNoYW5nZUluZm8gcmVzdWx0KSB7CisgICAgICAgICAgICAgIGNoYW5nZUluZm8gPSByZXN1bHQ7CisgICAgICAgICAgICAgIGRpc3BsYXkoZXZlbnQuZ2V0VmFsdWUoKSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSk7CiAgICAgfQogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGRpc3BsYXkoZmluYWwgQ2hhbmdlRGV0YWlsIGRldGFpbCkgewogICAgIGRpc3BsYXlUaXRsZShkZXRhaWwuZ2V0Q2hhbmdlKCkuZ2V0S2V5KCksIGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdWJqZWN0KCkpOworICAgIGRpc2NhcmREaWZmQmFzZUlmTm90QXBwbGljYWJsZShkZXRhaWwuZ2V0Q2hhbmdlKCkuZ2V0SWQoKSk7CiAKICAgICBpZiAoU3RhdHVzLk1FUkdFRCA9PSBkZXRhaWwuZ2V0Q2hhbmdlKCkuZ2V0U3RhdHVzKCkpIHsKICAgICAgIGluY2x1ZGVkSW5QYW5lbC5zZXRWaXNpYmxlKHRydWUpOwpAQCAtMjc3LDE2ICsyODYsMTcgQEAKICAgICB9CiAKICAgICBkZXBlbmRlbmNpZXMuc2V0QWNjb3VudEluZm9DYWNoZShkZXRhaWwuZ2V0QWNjb3VudHMoKSk7Ci0gICAgYXBwcm92YWxzLnNldEFjY291bnRJbmZvQ2FjaGUoZGV0YWlsLmdldEFjY291bnRzKCkpOwogCiAgICAgZGVzY3JpcHRpb25CbG9jay5kaXNwbGF5KGRldGFpbC5nZXRDaGFuZ2UoKSwKICAgICAgICAgZGV0YWlsLmlzU3RhcnJlZCgpLAorICAgICAgICBkZXRhaWwuY2FuRWRpdENvbW1pdE1lc3NhZ2UoKSwKICAgICAgICAgZGV0YWlsLmdldEN1cnJlbnRQYXRjaFNldERldGFpbCgpLmdldEluZm8oKSwKLSAgICAgICAgZGV0YWlsLmdldEFjY291bnRzKCkpOworICAgICAgICBkZXRhaWwuZ2V0QWNjb3VudHMoKSwgZGV0YWlsLmdldFN1Ym1pdFR5cGVSZWNvcmQoKSk7CiAgICAgZGVwZW5kc09uLmRpc3BsYXkoZGV0YWlsLmdldERlcGVuZHNPbigpKTsKICAgICBuZWVkZWRCeS5kaXNwbGF5KGRldGFpbC5nZXROZWVkZWRCeSgpKTsKLSAgICBhcHByb3ZhbHMuZGlzcGxheShkZXRhaWwpOworICAgIGFwcHJvdmFscy5kaXNwbGF5KGNoYW5nZUluZm8pOwogCisgICAgcGF0Y2hlc0xpc3QuY2xlYXIoKTsKICAgICBpZiAoZGV0YWlsLmdldEN1cnJlbnRQYXRjaFNldERldGFpbCgpLmdldEluZm8oKS5nZXRQYXJlbnRzKCkuc2l6ZSgpID4gMSkgewogICAgICAgcGF0Y2hlc0xpc3QuYWRkSXRlbShVdGlsLkMuYXV0b01lcmdlKCkpOwogICAgIH0gZWxzZSB7CkBAIC0zMTMsOCArMzIzLDkgQEAKICAgICBib29sZWFuIGRlcHNPcGVuID0gZmFsc2U7CiAgICAgaW50IG91dGRhdGVkID0gMDsKICAgICBpZiAoIWRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdGF0dXMoKS5pc0Nsb3NlZCgpKSB7Ci0gICAgICBpZiAoZGV0YWlsLmdldERlcGVuZHNPbigpICE9IG51bGwpIHsKLSAgICAgICAgZm9yIChmaW5hbCBDaGFuZ2VJbmZvIGNpIDogZGV0YWlsLmdldERlcGVuZHNPbigpKSB7CisgICAgICBmaW5hbCBMaXN0PENoYW5nZUluZm8+IGRlcGVuZHNPbiA9IGRldGFpbC5nZXREZXBlbmRzT24oKTsKKyAgICAgIGlmIChkZXBlbmRzT24gIT0gbnVsbCkgeworICAgICAgICBmb3IgKGZpbmFsIENoYW5nZUluZm8gY2kgOiBkZXBlbmRzT24pIHsKICAgICAgICAgICBpZiAoIWNpLmlzTGF0ZXN0KCkpIHsKICAgICAgICAgICAgIGRlcHNPcGVuID0gdHJ1ZTsKICAgICAgICAgICAgIG91dGRhdGVkKys7CkBAIC0zMjQsOCArMzM1LDkgQEAKICAgICAgICAgfQogICAgICAgfQogICAgIH0KLSAgICBpZiAoZGV0YWlsLmdldE5lZWRlZEJ5KCkgIT0gbnVsbCkgewotICAgICAgZm9yIChmaW5hbCBDaGFuZ2VJbmZvIGNpIDogZGV0YWlsLmdldE5lZWRlZEJ5KCkpIHsKKyAgICBmaW5hbCBMaXN0PENoYW5nZUluZm8+IG5lZWRlZEJ5ID0gZGV0YWlsLmdldE5lZWRlZEJ5KCk7CisgICAgaWYgKG5lZWRlZEJ5ICE9IG51bGwpIHsKKyAgICAgIGZvciAoZmluYWwgQ2hhbmdlSW5mbyBjaSA6IG5lZWRlZEJ5KSB7CiAgICAgICAgIGlmICgoY2kuZ2V0U3RhdHVzKCkgPT0gQ2hhbmdlLlN0YXR1cy5ORVcpIHx8CiAgICAgICAgICAgICAoY2kuZ2V0U3RhdHVzKCkgPT0gQ2hhbmdlLlN0YXR1cy5TVUJNSVRURUQpIHx8CiAgICAgICAgICAgICAoY2kuZ2V0U3RhdHVzKCkgPT0gQ2hhbmdlLlN0YXR1cy5EUkFGVCkpIHsKQEAgLTM0OCw2ICszNjAsMTMgQEAKICAgICBwYXRjaFNldHNCbG9jay5zZXRSZWdpc3RlcktleXModHJ1ZSk7CiAgIH0KIAorICBwcml2YXRlIHN0YXRpYyB2b2lkIGRpc2NhcmREaWZmQmFzZUlmTm90QXBwbGljYWJsZShmaW5hbCBDaGFuZ2UuSWQgdG9TaG93KSB7CisgICAgaWYgKGN1cnJlbnRDaGFuZ2VJZCAhPSBudWxsICYmICFjdXJyZW50Q2hhbmdlSWQuZXF1YWxzKHRvU2hvdykpIHsKKyAgICAgIGRpZmZCYXNlSWQgPSBudWxsOworICAgIH0KKyAgICBjdXJyZW50Q2hhbmdlSWQgPSB0b1Nob3c7CisgIH0KKwogICBwcml2YXRlIHZvaWQgYWRkQ29tbWVudHMoZmluYWwgQ2hhbmdlRGV0YWlsIGRldGFpbCkgewogICAgIGNvbW1lbnRzLmNsZWFyKCk7CiAKQEAgLTM2OSwxMyArMzg4LDExIEBACiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtc2dMaXN0LnNpemUoKTsgaSsrKSB7CiAgICAgICBmaW5hbCBDaGFuZ2VNZXNzYWdlIG1zZyA9IG1zZ0xpc3QuZ2V0KGkpOwogCi0gICAgICBmaW5hbCBBY2NvdW50SW5mbyBhdXRob3I7CisgICAgICBBY2NvdW50SW5mbyBhdXRob3I7CiAgICAgICBpZiAobXNnLmdldEF1dGhvcigpICE9IG51bGwpIHsKLSAgICAgICAgYXV0aG9yID0gYWNjdHMuZ2V0KG1zZy5nZXRBdXRob3IoKSk7CisgICAgICAgIGF1dGhvciA9IEZvcm1hdFV0aWwuYXNJbmZvKGFjY3RzLmdldChtc2cuZ2V0QXV0aG9yKCkpKTsKICAgICAgIH0gZWxzZSB7Ci0gICAgICAgIGZpbmFsIEFjY291bnQgZ2Vycml0ID0gbmV3IEFjY291bnQobnVsbCk7Ci0gICAgICAgIGdlcnJpdC5zZXRGdWxsTmFtZShVdGlsLkMubWVzc2FnZU5vQXV0aG9yKCkpOwotICAgICAgICBhdXRob3IgPSBuZXcgQWNjb3VudEluZm8oZ2Vycml0KTsKKyAgICAgICAgYXV0aG9yID0gQWNjb3VudEluZm8uY3JlYXRlKDAsIFV0aWwuQy5tZXNzYWdlTm9BdXRob3IoKSwgbnVsbCk7CiAgICAgICB9CiAKICAgICAgIGJvb2xlYW4gaXNSZWNlbnQ7CkBAIC0zOTcsNiArNDE0LDE1IEBACiAgICAgICBjb21tZW50cy5hZGQoY3ApOwogICAgIH0KIAorICAgIGZpbmFsIEJ1dHRvbiBiID0gbmV3IEJ1dHRvbihVdGlsLkMuY2hhbmdlU2NyZWVuQWRkQ29tbWVudCgpKTsKKyAgICBiLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIHZvaWQgb25DbGljayhmaW5hbCBDbGlja0V2ZW50IGV2ZW50KSB7CisgICAgICAgICAgICBQYXRjaFNldC5JZCBjdXJyZW50UGF0Y2hTZXRJZCA9IHBhdGNoU2V0c0Jsb2NrLmdldEN1cnJlbnRQYXRjaFNldCgpLmdldElkKCk7CisgICAgICAgICAgICBHZXJyaXQuZGlzcGxheShEaXNwYXRjaGVyLnRvUHVibGlzaChjdXJyZW50UGF0Y2hTZXRJZCkpOworICAgICAgICB9CisgICAgfSk7CisgICAgY29tbWVudHMuYWRkKGIpOwogICAgIGNvbW1lbnRzLnNldFZpc2libGUobXNnTGlzdC5zaXplKCkgPiAwKTsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlVGFibGUuamF2YQppbmRleCBlZjRlZjUyLi45N2E1YTA5IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZVRhYmxlLmphdmEKQEAgLTE2LDEwICsxNiw3IEBACiAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkZvcm1hdFV0aWwuc2hvcnRGb3JtYXQ7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuRm9ybWF0VXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wYXRjaGVzLlBhdGNoVXRpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5BY2NvdW50TGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQnJhbmNoTGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQ2hhbmdlTGluazsKQEAgLTI3LDcwICsyNCwzNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5OZWVkc1NpZ25JbktleUNvbW1hbmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlByb2plY3RMaW5rOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm9DYWNoZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFN1bW1hcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxTdW1tYXJ5U2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5kb20uY2xpZW50LkVsZW1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5Q29kZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0V2ZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LkRPTTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbGV4VGFibGUuRmxleENlbGxGb3JtYXR0ZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxvd1BhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkhUTUxUYWJsZS5DZWxsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkhUTUxUYWJsZS5DZWxsRm9ybWF0dGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkltYWdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLklubGluZUxhYmVsOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlVJT2JqZWN0OwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIHB1YmxpYyBjbGFzcyBDaGFuZ2VUYWJsZSBleHRlbmRzIE5hdmlnYXRpb25UYWJsZTxDaGFuZ2VJbmZvPiB7CiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX1NUQVIgPSAxOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19JRCA9IDI7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX1NVQkpFQ1QgPSAzOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19PV05FUiA9IDQ7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX1BST0pFQ1QgPSA1OwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19CUkFOQ0ggPSA2OwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19MQVNUX1VQREFURSA9IDc7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBCQVNFX0NPTFVNTlMgPSA4OworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19TVUJKRUNUID0gMjsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENfT1dORVIgPSAzOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19QUk9KRUNUID0gNDsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENfQlJBTkNIID0gNTsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENfTEFTVF9VUERBVEUgPSA2OworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ09MVU1OUyA9IDc7CiAKICAgcHJpdmF0ZSBmaW5hbCBMaXN0PFNlY3Rpb24+IHNlY3Rpb25zOwogICBwcml2YXRlIEFjY291bnRJbmZvQ2FjaGUgYWNjb3VudENhY2hlID0gQWNjb3VudEluZm9DYWNoZS5lbXB0eSgpOwotICBwcml2YXRlIGZpbmFsIExpc3Q8QXBwcm92YWxUeXBlPiBhcHByb3ZhbFR5cGVzOwotICBwcml2YXRlIGZpbmFsIGludCBjb2x1bW5zOwogCiAgIHB1YmxpYyBDaGFuZ2VUYWJsZSgpIHsKLSAgICB0aGlzKGZhbHNlKTsKLSAgfQotCi0gIHB1YmxpYyBDaGFuZ2VUYWJsZShib29sZWFuIHNob3dBcHByb3ZhbHMpIHsKLSAgICBhcHByb3ZhbFR5cGVzID0gR2Vycml0LmdldENvbmZpZygpLmdldEFwcHJvdmFsVHlwZXMoKS5nZXRBcHByb3ZhbFR5cGVzKCk7Ci0gICAgaWYgKHNob3dBcHByb3ZhbHMpIHsKLSAgICAgIGNvbHVtbnMgPSBCQVNFX0NPTFVNTlMgKyBhcHByb3ZhbFR5cGVzLnNpemUoKTsKLSAgICB9IGVsc2UgewotICAgICAgY29sdW1ucyA9IEJBU0VfQ09MVU1OUzsKLSAgICB9Ci0KLSAgICBrZXlzTmF2aWdhdGlvbi5hZGQobmV3IFByZXZLZXlDb21tYW5kKDAsICdrJywgVXRpbC5DLmNoYW5nZVRhYmxlUHJldigpKSk7Ci0gICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBOZXh0S2V5Q29tbWFuZCgwLCAnaicsIFV0aWwuQy5jaGFuZ2VUYWJsZU5leHQoKSkpOwotICAgIGtleXNOYXZpZ2F0aW9uLmFkZChuZXcgT3BlbktleUNvbW1hbmQoMCwgJ28nLCBVdGlsLkMuY2hhbmdlVGFibGVPcGVuKCkpKTsKLSAgICBrZXlzTmF2aWdhdGlvbi5hZGQobmV3IE9wZW5LZXlDb21tYW5kKDAsIEtleUNvZGVzLktFWV9FTlRFUiwgVXRpbC5DCi0gICAgICAgIC5jaGFuZ2VUYWJsZU9wZW4oKSkpOworICAgIHN1cGVyKFV0aWwuQy5jaGFuZ2VJdGVtSGVscCgpKTsKIAogICAgIGlmIChHZXJyaXQuaXNTaWduZWRJbigpKSB7CiAgICAgICBrZXlzQWN0aW9uLmFkZChuZXcgU3RhcktleUNvbW1hbmQoMCwgJ3MnLCBVdGlsLkMuY2hhbmdlVGFibGVTdGFyKCkpKTsKQEAgLTk4LDI5ICs2MSwxNSBAQAogCiAgICAgc2VjdGlvbnMgPSBuZXcgQXJyYXlMaXN0PFNlY3Rpb24+KCk7CiAgICAgdGFibGUuc2V0VGV4dCgwLCBDX1NUQVIsICIiKTsKLSAgICB0YWJsZS5zZXRUZXh0KDAsIENfSUQsIFV0aWwuQy5jaGFuZ2VUYWJsZUNvbHVtbklEKCkpOwogICAgIHRhYmxlLnNldFRleHQoMCwgQ19TVUJKRUNULCBVdGlsLkMuY2hhbmdlVGFibGVDb2x1bW5TdWJqZWN0KCkpOwogICAgIHRhYmxlLnNldFRleHQoMCwgQ19PV05FUiwgVXRpbC5DLmNoYW5nZVRhYmxlQ29sdW1uT3duZXIoKSk7CiAgICAgdGFibGUuc2V0VGV4dCgwLCBDX1BST0pFQ1QsIFV0aWwuQy5jaGFuZ2VUYWJsZUNvbHVtblByb2plY3QoKSk7CiAgICAgdGFibGUuc2V0VGV4dCgwLCBDX0JSQU5DSCwgVXRpbC5DLmNoYW5nZVRhYmxlQ29sdW1uQnJhbmNoKCkpOwogICAgIHRhYmxlLnNldFRleHQoMCwgQ19MQVNUX1VQREFURSwgVXRpbC5DLmNoYW5nZVRhYmxlQ29sdW1uTGFzdFVwZGF0ZSgpKTsKLSAgICBmb3IgKGludCBpID0gQkFTRV9DT0xVTU5TOyBpIDwgY29sdW1uczsgaSsrKSB7Ci0gICAgICBmaW5hbCBBcHByb3ZhbFR5cGUgdHlwZSA9IGFwcHJvdmFsVHlwZXMuZ2V0KGkgLSBCQVNFX0NPTFVNTlMpOwotICAgICAgZmluYWwgQXBwcm92YWxDYXRlZ29yeSBjYXQgPSB0eXBlLmdldENhdGVnb3J5KCk7Ci0gICAgICBTdHJpbmcgdGV4dCA9IGNhdC5nZXRBYmJyZXZpYXRlZE5hbWUoKTsKLSAgICAgIGlmICh0ZXh0ID09IG51bGwpIHsKLSAgICAgICAgdGV4dCA9IGNhdC5nZXROYW1lKCk7Ci0gICAgICB9Ci0gICAgICB0YWJsZS5zZXRUZXh0KDAsIGksIHRleHQpOwotICAgICAgaWYgKHRleHQgIT0gbnVsbCkgewotICAgICAgICB0YWJsZS5nZXRDZWxsRm9ybWF0dGVyKCkuZ2V0RWxlbWVudCgwLCBpKS5zZXRUaXRsZShjYXQuZ2V0TmFtZSgpKTsKLSAgICAgIH0KLSAgICB9CiAKICAgICBmaW5hbCBGbGV4Q2VsbEZvcm1hdHRlciBmbXQgPSB0YWJsZS5nZXRGbGV4Q2VsbEZvcm1hdHRlcigpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUoMCwgQ19TVEFSLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmljb25IZWFkZXIoKSk7Ci0gICAgZm10LmFkZFN0eWxlTmFtZSgwLCBDX0lELCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNJRCgpKTsKLSAgICBmb3IgKGludCBpID0gQ19JRDsgaSA8IGNvbHVtbnM7IGkrKykgeworICAgIGZvciAoaW50IGkgPSBDX1NVQkpFQ1Q7IGkgPCBDT0xVTU5TOyBpKyspIHsKICAgICAgIGZtdC5hZGRTdHlsZU5hbWUoMCwgaSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhSGVhZGVyKCkpOwogICAgIH0KIApAQCAtMTY0LDcgKzExMyw3IEBACiAgICAgaW5zZXJ0Um93KHJvdyk7CiAgICAgdGFibGUuc2V0VGV4dChyb3csIDAsIFV0aWwuQy5jaGFuZ2VUYWJsZU5vbmUoKSk7CiAgICAgZmluYWwgRmxleENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0RmxleENlbGxGb3JtYXR0ZXIoKTsKLSAgICBmbXQuc2V0Q29sU3Bhbihyb3csIDAsIGNvbHVtbnMpOworICAgIGZtdC5zZXRDb2xTcGFuKHJvdywgMCwgQ09MVU1OUyk7CiAgICAgZm10LnNldFN0eWxlTmFtZShyb3csIDAsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZW1wdHlTZWN0aW9uKCkpOwogICB9CiAKQEAgLTE3OCwxNyArMTI3LDEyIEBACiAgICAgc3VwZXIuYXBwbHlEYXRhUm93U3R5bGUocm93KTsKICAgICBmaW5hbCBDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKTsKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQ19TVEFSLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmljb25DZWxsKCkpOwotICAgIGZvciAoaW50IGkgPSBDX0lEOyBpIDwgY29sdW1uczsgaSsrKSB7CisgICAgZm9yIChpbnQgaSA9IENfU1VCSkVDVDsgaSA8IENPTFVNTlM7IGkrKykgewogICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIGksIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CiAgICAgfQotICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX0lELCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNJRCgpKTsKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQ19TVUJKRUNULCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNTVUJKRUNUKCkpOwotICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX1BST0pFQ1QsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY1BST0pFQ1QoKSk7Ci0gICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfQlJBTkNILCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNQUk9KRUNUKCkpOworICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX09XTkVSLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNPV05FUigpKTsKICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQ19MQVNUX1VQREFURSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jTGFzdFVwZGF0ZSgpKTsKLSAgICBmb3IgKGludCBpID0gQkFTRV9DT0xVTU5TOyBpIDwgY29sdW1uczsgaSsrKSB7Ci0gICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgaSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jQVBQUk9WQUwoKSk7Ci0gICAgfQogICB9CiAKICAgcHJpdmF0ZSB2b2lkIHBvcHVsYXRlQ2hhbmdlUm93KGZpbmFsIGludCByb3csIGZpbmFsIENoYW5nZUluZm8gYywKQEAgLTE5NiwxMiArMTQwLDEwIEBACiAgICAgQ2hhbmdlQ2FjaGUgY2FjaGUgPSBDaGFuZ2VDYWNoZS5nZXQoYy5nZXRJZCgpKTsKICAgICBjYWNoZS5nZXRDaGFuZ2VJbmZvQ2FjaGUoKS5zZXQoYyk7CiAKLSAgICBmaW5hbCBTdHJpbmcgaWRzdHIgPSBjLmdldEtleSgpLmFiYnJldmlhdGUoKTsKICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBDX0FSUk9XLCBudWxsKTsKICAgICBpZiAoR2Vycml0LmlzU2lnbmVkSW4oKSkgewogICAgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgQ19TVEFSLCBTdGFycmVkQ2hhbmdlcy5jcmVhdGVJY29uKGMuZ2V0SWQoKSwgYy5pc1N0YXJyZWQoKSkpOwogICAgIH0KLSAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBDX0lELCBuZXcgVGFibGVDaGFuZ2VMaW5rKGlkc3RyLCBjKSk7CiAKICAgICBTdHJpbmcgcyA9IFV0aWwuY3JvcFN1YmplY3QoYy5nZXRTdWJqZWN0KCkpOwogICAgIGlmIChjLmdldFN0YXR1cygpICE9IG51bGwgJiYgYy5nZXRTdGF0dXMoKSAhPSBDaGFuZ2UuU3RhdHVzLk5FVykgewpAQCAtMjUxLDcgKzE5Myw3IEBACiAgICAgICBzLnRpdGxlUm93ID0gdGFibGUuZ2V0Um93Q291bnQoKTsKICAgICAgIHRhYmxlLnNldFRleHQocy50aXRsZVJvdywgMCwgcy50aXRsZVRleHQpOwogICAgICAgZmluYWwgRmxleENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0RmxleENlbGxGb3JtYXR0ZXIoKTsKLSAgICAgIGZtdC5zZXRDb2xTcGFuKHMudGl0bGVSb3csIDAsIGNvbHVtbnMpOworICAgICAgZm10LnNldENvbFNwYW4ocy50aXRsZVJvdywgMCwgQ09MVU1OUyk7CiAgICAgICBmbXQuYWRkU3R5bGVOYW1lKHMudGl0bGVSb3csIDAsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuc2VjdGlvbkhlYWRlcigpKTsKICAgICB9IGVsc2UgewogICAgICAgcy50aXRsZVJvdyA9IC0xOwpAQCAtMjkyLDExMCArMjM0LDYgQEAKICAgICB0YWJsZS5yZW1vdmVSb3cocm93KTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBkaXNwbGF5QXBwcm92YWxzKGZpbmFsIGludCByb3csIGZpbmFsIEFwcHJvdmFsU3VtbWFyeSBzdW1tYXJ5LAotICAgICAgZmluYWwgQWNjb3VudEluZm9DYWNoZSBhaWMsIGZpbmFsIGJvb2xlYW4gaGlnaGxpZ2h0VW5yZXZpZXdlZCkgewotICAgIGZpbmFsIENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0Q2VsbEZvcm1hdHRlcigpOwotICAgIGZpbmFsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBQYXRjaFNldEFwcHJvdmFsPiBhcHByb3ZhbHMgPQotICAgICAgICBzdW1tYXJ5LmdldEFwcHJvdmFsTWFwKCk7Ci0gICAgaW50IGNvbCA9IEJBU0VfQ09MVU1OUzsKLSAgICBib29sZWFuIGhhdmVSZXZpZXcgPSBmYWxzZTsKLQotICAgIGJvb2xlYW4gc2hvd1VzZXJuYW1lSW5SZXZpZXdDYXRlZ29yeSA9IGZhbHNlOwotCi0gICAgaWYgKEdlcnJpdC5pc1NpZ25lZEluKCkpIHsKLSAgICAgIEFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMgcHJlZnMgPSBHZXJyaXQuZ2V0VXNlckFjY291bnQoKS5nZXRHZW5lcmFsUHJlZmVyZW5jZXMoKTsKLQotICAgICAgaWYgKHByZWZzLmlzU2hvd1VzZXJuYW1lSW5SZXZpZXdDYXRlZ29yeSgpKSB7Ci0gICAgICAgIHNob3dVc2VybmFtZUluUmV2aWV3Q2F0ZWdvcnkgPSB0cnVlOwotICAgICAgfQotICAgIH0KLQotICAgIGZvciAoZmluYWwgQXBwcm92YWxUeXBlIHR5cGUgOiBhcHByb3ZhbFR5cGVzKSB7Ci0gICAgICBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGNhID0gYXBwcm92YWxzLmdldCh0eXBlLmdldENhdGVnb3J5KCkuZ2V0SWQoKSk7Ci0KLSAgICAgIGZtdC5yZW1vdmVTdHlsZU5hbWUocm93LCBjb2wsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubmVnc2NvcmUoKSk7Ci0gICAgICBmbXQucmVtb3ZlU3R5bGVOYW1lKHJvdywgY29sLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnBvc3Njb3JlKCkpOwotICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIGNvbCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5zaW5nbGVMaW5lKCkpOwotCi0gICAgICBpZiAoY2EgPT0gbnVsbCB8fCBjYS5nZXRWYWx1ZSgpID09IDApIHsKLSAgICAgICAgdGFibGUuY2xlYXJDZWxsKHJvdywgY29sKTsKLQotICAgICAgfSBlbHNlIHsKLSAgICAgICAgaGF2ZVJldmlldyA9IHRydWU7Ci0KLSAgICAgICAgZmluYWwgQXBwcm92YWxDYXRlZ29yeVZhbHVlIGFjdiA9IHR5cGUuZ2V0VmFsdWUoY2EpOwotICAgICAgICBmaW5hbCBBY2NvdW50SW5mbyBhaSA9IGFpYy5nZXQoY2EuZ2V0QWNjb3VudElkKCkpOwotCi0gICAgICAgIGlmICh0eXBlLmlzTWF4TmVnYXRpdmUoY2EpKSB7Ci0KLSAgICAgICAgICBpZiAoc2hvd1VzZXJuYW1lSW5SZXZpZXdDYXRlZ29yeSkgewotICAgICAgICAgICAgRmxvd1BhbmVsIGZwID0gbmV3IEZsb3dQYW5lbCgpOwotICAgICAgICAgICAgZnAuYWRkKG5ldyBJbWFnZShHZXJyaXQuUkVTT1VSQ0VTLnJlZE5vdCgpKSk7Ci0gICAgICAgICAgICBmcC5hZGQobmV3IElubGluZUxhYmVsKEZvcm1hdFV0aWwubmFtZShhaSkpKTsKLSAgICAgICAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIGNvbCwgZnApOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBjb2wsIG5ldyBJbWFnZShHZXJyaXQuUkVTT1VSQ0VTLnJlZE5vdCgpKSk7Ci0gICAgICAgICAgfQotCi0gICAgICAgIH0gZWxzZSBpZiAodHlwZS5pc01heFBvc2l0aXZlKGNhKSkgewotCi0gICAgICAgICAgaWYgKHNob3dVc2VybmFtZUluUmV2aWV3Q2F0ZWdvcnkpIHsKLSAgICAgICAgICAgIEZsb3dQYW5lbCBmcCA9IG5ldyBGbG93UGFuZWwoKTsKLSAgICAgICAgICAgIGZwLmFkZChuZXcgSW1hZ2UoR2Vycml0LlJFU09VUkNFUy5ncmVlbkNoZWNrKCkpKTsKLSAgICAgICAgICAgIGZwLmFkZChuZXcgSW5saW5lTGFiZWwoRm9ybWF0VXRpbC5uYW1lKGFpKSkpOwotICAgICAgICAgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgY29sLCBmcCk7Ci0gICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIGNvbCwgbmV3IEltYWdlKEdlcnJpdC5SRVNPVVJDRVMuZ3JlZW5DaGVjaygpKSk7Ci0gICAgICAgICAgfQotCi0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgU3RyaW5nIHZzdHIgPSBTdHJpbmcudmFsdWVPZihjYS5nZXRWYWx1ZSgpKTsKLQotICAgICAgICAgIGlmIChzaG93VXNlcm5hbWVJblJldmlld0NhdGVnb3J5KSB7Ci0gICAgICAgICAgICB2c3RyID0gdnN0ciArICIgIiArIEZvcm1hdFV0aWwubmFtZShhaSk7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgaWYgKGNhLmdldFZhbHVlKCkgPiAwKSB7Ci0gICAgICAgICAgICB2c3RyID0gIisiICsgdnN0cjsKLSAgICAgICAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBjb2wsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucG9zc2NvcmUoKSk7Ci0gICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBjb2wsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubmVnc2NvcmUoKSk7Ci0gICAgICAgICAgfQotICAgICAgICAgIHRhYmxlLnNldFRleHQocm93LCBjb2wsIHZzdHIpOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8gU29tZSB3ZWIgYnJvd3NlcnMgaWdub3JlIHRoZSBlbWJlZGRlZCBuZXdsaW5lOyBzb21lIGxpa2UgaXQ7Ci0gICAgICAgIC8vIHNvIHdlIGluY2x1ZGUgYSBzcGFjZSBiZWZvcmUgdGhlIG5ld2xpbmUgdG8gYWNjb21tb2RhdGUgYm90aC4KLSAgICAgICAgLy8KLSAgICAgICAgZm10LmdldEVsZW1lbnQocm93LCBjb2wpLnNldFRpdGxlKAotICAgICAgICAgICAgYWN2LmdldE5hbWUoKSArICIgXG5ieSAiICsgRm9ybWF0VXRpbC5uYW1lRW1haWwoYWkpKTsKLSAgICAgIH0KLQotICAgICAgY29sKys7Ci0gICAgfQotCi0gICAgZmluYWwgRWxlbWVudCB0ciA9IERPTS5nZXRQYXJlbnQoZm10LmdldEVsZW1lbnQocm93LCAwKSk7Ci0gICAgVUlPYmplY3Quc2V0U3R5bGVOYW1lKHRyLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLm5lZWRzUmV2aWV3KCksICFoYXZlUmV2aWV3Ci0gICAgICAgICYmIGhpZ2hsaWdodFVucmV2aWV3ZWQpOwotICB9Ci0KLSAgR2Vycml0Q2FsbGJhY2s8QXBwcm92YWxTdW1tYXJ5U2V0PiBhcHByb3ZhbEZvcm1hdHRlcihmaW5hbCBpbnQgZGF0YUJlZ2luLAotICAgICAgZmluYWwgaW50IHJvd3MsIGZpbmFsIGJvb2xlYW4gaGlnaGxpZ2h0VW5yZXZpZXdlZCkgewotICAgIHJldHVybiBuZXcgR2Vycml0Q2FsbGJhY2s8QXBwcm92YWxTdW1tYXJ5U2V0PigpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIEFwcHJvdmFsU3VtbWFyeVNldCBhcykgewotICAgICAgICBNYXA8Q2hhbmdlLklkLCBBcHByb3ZhbFN1bW1hcnk+IGlkcyA9IGFzLmdldFN1bW1hcnlNYXAoKTsKLSAgICAgICAgQWNjb3VudEluZm9DYWNoZSBhaWMgPSBhcy5nZXRBY2NvdW50SW5mb0NhY2hlKCk7Ci0gICAgICAgIGZvciAoaW50IHJvdyA9IGRhdGFCZWdpbjsgcm93IDwgZGF0YUJlZ2luICsgcm93czsgcm93KyspIHsKLSAgICAgICAgICBmaW5hbCBDaGFuZ2VJbmZvIGMgPSBnZXRSb3dJdGVtKHJvdyk7Ci0gICAgICAgICAgaWYgKGlkcy5jb250YWluc0tleShjLmdldElkKCkpKSB7Ci0gICAgICAgICAgICBkaXNwbGF5QXBwcm92YWxzKHJvdywgaWRzLmdldChjLmdldElkKCkpLCBhaWMsIGhpZ2hsaWdodFVucmV2aWV3ZWQpOwotICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgfQotICAgIH07Ci0gIH0KLQogICBwdWJsaWMgY2xhc3MgU3RhcktleUNvbW1hbmQgZXh0ZW5kcyBOZWVkc1NpZ25JbktleUNvbW1hbmQgewogICAgIHB1YmxpYyBTdGFyS2V5Q29tbWFuZChpbnQgbWFzaywgY2hhciBrZXksIFN0cmluZyBoZWxwKSB7CiAgICAgICBzdXBlcihtYXNrLCBrZXksIGhlbHApOwpAQCAtNDE5LDE1ICsyNTcsMTAgQEAKICAgICB9CiAgIH0KIAotICBwdWJsaWMgZW51bSBBcHByb3ZhbFZpZXdUeXBlIHsKLSAgICBOT05FLCBVU0VSLCBTVFJPTkdFU1QKLSAgfQotCiAgIHB1YmxpYyBzdGF0aWMgY2xhc3MgU2VjdGlvbiB7CiAgICAgU3RyaW5nIHRpdGxlVGV4dDsKIAogICAgIENoYW5nZVRhYmxlIHBhcmVudDsKLSAgICBmaW5hbCBBcHByb3ZhbFZpZXdUeXBlIHZpZXdUeXBlOwogICAgIGZpbmFsIEFjY291bnQuSWQgb3duZXJJZDsKICAgICBpbnQgdGl0bGVSb3cgPSAtMTsKICAgICBpbnQgZGF0YUJlZ2luOwpAQCAtNDM2LDE3ICsyNjksMTUgQEAKICAgICBwcml2YXRlIENoYW5nZVJvd0Zvcm1hdHRlciBjaGFuZ2VSb3dGb3JtYXR0ZXI7CiAKICAgICBwdWJsaWMgU2VjdGlvbigpIHsKLSAgICAgIHRoaXMobnVsbCwgQXBwcm92YWxWaWV3VHlwZS5OT05FLCBudWxsKTsKKyAgICAgIHRoaXMobnVsbCwgbnVsbCk7CiAgICAgfQogCiAgICAgcHVibGljIFNlY3Rpb24oZmluYWwgU3RyaW5nIHRpdGxlVGV4dCkgewotICAgICAgdGhpcyh0aXRsZVRleHQsIEFwcHJvdmFsVmlld1R5cGUuTk9ORSwgbnVsbCk7CisgICAgICB0aGlzKHRpdGxlVGV4dCwgbnVsbCk7CiAgICAgfQogCi0gICAgcHVibGljIFNlY3Rpb24oZmluYWwgU3RyaW5nIHRpdGxlVGV4dCwgZmluYWwgQXBwcm92YWxWaWV3VHlwZSB2aWV3LAotICAgICAgICBmaW5hbCBBY2NvdW50LklkIG93bmVyKSB7CisgICAgcHVibGljIFNlY3Rpb24oZmluYWwgU3RyaW5nIHRpdGxlVGV4dCwgZmluYWwgQWNjb3VudC5JZCBvd25lcikgewogICAgICAgc2V0VGl0bGVUZXh0KHRpdGxlVGV4dCk7Ci0gICAgICB2aWV3VHlwZSA9IHZpZXc7CiAgICAgICBvd25lcklkID0gb3duZXI7CiAgICAgfQogCkBAIC00OTMsMTkgKzMyNCw2IEBACiAgICAgICAgICAgcGFyZW50LnBvcHVsYXRlQ2hhbmdlUm93KGRhdGFCZWdpbiArIGksIGMsIGNoYW5nZVJvd0Zvcm1hdHRlcik7CiAgICAgICAgICAgY2lkcy5hZGQoYy5nZXRJZCgpKTsKICAgICAgICAgfQotCi0gICAgICAgIHN3aXRjaCAodmlld1R5cGUpIHsKLSAgICAgICAgICBjYXNlIE5PTkU6Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgICBjYXNlIFVTRVI6Ci0gICAgICAgICAgICBQYXRjaFV0aWwuREVUQUlMX1NWQy51c2VyQXBwcm92YWxzKGNpZHMsIG93bmVySWQsIHBhcmVudAotICAgICAgICAgICAgICAgIC5hcHByb3ZhbEZvcm1hdHRlcihkYXRhQmVnaW4sIHJvd3MsIHRydWUpKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgIGNhc2UgU1RST05HRVNUOgotICAgICAgICAgICAgUGF0Y2hVdGlsLkRFVEFJTF9TVkMuc3Ryb25nZXN0QXBwcm92YWxzKGNpZHMsIHBhcmVudAotICAgICAgICAgICAgICAgIC5hcHByb3ZhbEZvcm1hdHRlcihkYXRhQmVnaW4sIHJvd3MsIGZhbHNlKSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQogICAgICAgfQogICAgIH0KICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ2hhbmdlVGFibGUyLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZTIuamF2YQppbmRleCAyMGRkODBmLi4wM2NjMTFkIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZTIuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DaGFuZ2VUYWJsZTIuamF2YQpAQCAtMTgsOSArMTgsOSBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlcy5DaGFuZ2VJbmZvLkxhYmVsSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQWNjb3VudExpbms7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkJyYW5jaExpbms7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkNoYW5nZUxpbms7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLklubGluZUh5cGVybGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuTmF2aWdhdGlvblRhYmxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5OZWVkc1NpZ25JbktleUNvbW1hbmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlByb2plY3RMaW5rOwpAQCAtMjksNyArMjksNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmRvbS5jbGllbnQuRWxlbWVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlDb2RlczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRE9NOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsZXhUYWJsZS5GbGV4Q2VsbEZvcm1hdHRlcjsKQEAgLTM5LDYgKzM4LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5JbWFnZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5JbmxpbmVMYWJlbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5VSU9iamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKQEAgLTQ2LDM1ICs0NiwyOCBAQAogCiBwdWJsaWMgY2xhc3MgQ2hhbmdlVGFibGUyIGV4dGVuZHMgTmF2aWdhdGlvblRhYmxlPENoYW5nZUluZm8+IHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENfU1RBUiA9IDE7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX0lEID0gMjsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENfU1VCSkVDVCA9IDM7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX09XTkVSID0gNDsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENfUFJPSkVDVCA9IDU7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX0JSQU5DSCA9IDY7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX0xBU1RfVVBEQVRFID0gNzsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IEJBU0VfQ09MVU1OUyA9IDg7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX1NVQkpFQ1QgPSAyOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19PV05FUiA9IDM7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBDX1BST0pFQ1QgPSA0OworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19CUkFOQ0ggPSA1OworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgQ19MQVNUX1VQREFURSA9IDY7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBCQVNFX0NPTFVNTlMgPSA3OwogCiAgIHByaXZhdGUgZmluYWwgTGlzdDxTZWN0aW9uPiBzZWN0aW9uczsKICAgcHJpdmF0ZSBpbnQgY29sdW1uczsKICAgcHJpdmF0ZSBMaXN0PFN0cmluZz4gbGFiZWxOYW1lczsKIAogICBwdWJsaWMgQ2hhbmdlVGFibGUyKCkgeworICAgIHN1cGVyKFV0aWwuQy5jaGFuZ2VJdGVtSGVscCgpKTsKICAgICBjb2x1bW5zID0gQkFTRV9DT0xVTU5TOwogICAgIGxhYmVsTmFtZXMgPSBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKIAotICAgIGtleXNOYXZpZ2F0aW9uLmFkZChuZXcgUHJldktleUNvbW1hbmQoMCwgJ2snLCBVdGlsLkMuY2hhbmdlVGFibGVQcmV2KCkpKTsKLSAgICBrZXlzTmF2aWdhdGlvbi5hZGQobmV3IE5leHRLZXlDb21tYW5kKDAsICdqJywgVXRpbC5DLmNoYW5nZVRhYmxlTmV4dCgpKSk7Ci0gICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBPcGVuS2V5Q29tbWFuZCgwLCAnbycsIFV0aWwuQy5jaGFuZ2VUYWJsZU9wZW4oKSkpOwotICAgIGtleXNOYXZpZ2F0aW9uLmFkZCgKLSAgICAgICAgbmV3IE9wZW5LZXlDb21tYW5kKDAsIEtleUNvZGVzLktFWV9FTlRFUiwgVXRpbC5DLmNoYW5nZVRhYmxlT3BlbigpKSk7Ci0KICAgICBpZiAoR2Vycml0LmlzU2lnbmVkSW4oKSkgewogICAgICAga2V5c0FjdGlvbi5hZGQobmV3IFN0YXJLZXlDb21tYW5kKDAsICdzJywgVXRpbC5DLmNoYW5nZVRhYmxlU3RhcigpKSk7CiAgICAgfQogCiAgICAgc2VjdGlvbnMgPSBuZXcgQXJyYXlMaXN0PFNlY3Rpb24+KCk7CiAgICAgdGFibGUuc2V0VGV4dCgwLCBDX1NUQVIsICIiKTsKLSAgICB0YWJsZS5zZXRUZXh0KDAsIENfSUQsIFV0aWwuQy5jaGFuZ2VUYWJsZUNvbHVtbklEKCkpOwogICAgIHRhYmxlLnNldFRleHQoMCwgQ19TVUJKRUNULCBVdGlsLkMuY2hhbmdlVGFibGVDb2x1bW5TdWJqZWN0KCkpOwogICAgIHRhYmxlLnNldFRleHQoMCwgQ19PV05FUiwgVXRpbC5DLmNoYW5nZVRhYmxlQ29sdW1uT3duZXIoKSk7CiAgICAgdGFibGUuc2V0VGV4dCgwLCBDX1BST0pFQ1QsIFV0aWwuQy5jaGFuZ2VUYWJsZUNvbHVtblByb2plY3QoKSk7CkBAIC04Myw4ICs3Niw3IEBACiAKICAgICBmaW5hbCBGbGV4Q2VsbEZvcm1hdHRlciBmbXQgPSB0YWJsZS5nZXRGbGV4Q2VsbEZvcm1hdHRlcigpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUoMCwgQ19TVEFSLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmljb25IZWFkZXIoKSk7Ci0gICAgZm10LmFkZFN0eWxlTmFtZSgwLCBDX0lELCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNJRCgpKTsKLSAgICBmb3IgKGludCBpID0gQ19JRDsgaSA8IGNvbHVtbnM7IGkrKykgeworICAgIGZvciAoaW50IGkgPSBDX1NVQkpFQ1Q7IGkgPCBjb2x1bW5zOyBpKyspIHsKICAgICAgIGZtdC5hZGRTdHlsZU5hbWUoMCwgaSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhSGVhZGVyKCkpOwogICAgIH0KIApAQCAtMTM2LDEzICsxMjgsMTEgQEAKICAgICBzdXBlci5hcHBseURhdGFSb3dTdHlsZShyb3cpOwogICAgIGZpbmFsIENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0Q2VsbEZvcm1hdHRlcigpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX1NUQVIsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuaWNvbkNlbGwoKSk7Ci0gICAgZm9yIChpbnQgaSA9IENfSUQ7IGkgPCBjb2x1bW5zOyBpKyspIHsKKyAgICBmb3IgKGludCBpID0gQ19TVUJKRUNUOyBpIDwgY29sdW1uczsgaSsrKSB7CiAgICAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgaSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kYXRhQ2VsbCgpKTsKICAgICB9Ci0gICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfSUQsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY0lEKCkpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX1NVQkpFQ1QsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY1NVQkpFQ1QoKSk7Ci0gICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfUFJPSkVDVCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jUFJPSkVDVCgpKTsKLSAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQ19CUkFOQ0gsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY1BST0pFQ1QoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfT1dORVIsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY09XTkVSKCkpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX0xBU1RfVVBEQVRFLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNMYXN0VXBkYXRlKCkpOwogICAgIGZvciAoaW50IGkgPSBCQVNFX0NPTFVNTlM7IGkgPCBjb2x1bW5zOyBpKyspIHsKICAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBpLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNBUFBST1ZBTCgpKTsKQEAgLTE1Miw3ICsxNDIsNyBAQAogICBwdWJsaWMgdm9pZCB1cGRhdGVDb2x1bW5zRm9yTGFiZWxzKENoYW5nZUxpc3QuLi4gbGlzdHMpIHsKICAgICBsYWJlbE5hbWVzID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7CiAgICAgZm9yIChDaGFuZ2VMaXN0IGxpc3QgOiBsaXN0cykgewotICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsaXN0LnNpemUoKTsgaSsrKSB7CisgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGxpc3QubGVuZ3RoKCk7IGkrKykgewogICAgICAgICBmb3IgKFN0cmluZyBuYW1lIDogbGlzdC5nZXQoaSkubGFiZWxzKCkpIHsKICAgICAgICAgICBpZiAoIWxhYmVsTmFtZXMuY29udGFpbnMobmFtZSkpIHsKICAgICAgICAgICAgIGxhYmVsTmFtZXMuYWRkKG5hbWUpOwpAQCAtMTk4LDcgKzE4OCw2IEBACiAgICAgICAgICAgYy5sZWdhY3lfaWQoKSwKICAgICAgICAgICBjLnN0YXJyZWQoKSkpOwogICAgIH0KLSAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBDX0lELCBuZXcgVGFibGVDaGFuZ2VMaW5rKGMuaWRfYWJicmV2aWF0ZWQoKSwgYykpOwogCiAgICAgU3RyaW5nIHN1YmplY3QgPSBVdGlsLmNyb3BTdWJqZWN0KGMuc3ViamVjdCgpKTsKICAgICBDaGFuZ2UuU3RhdHVzIHN0YXR1cyA9IGMuc3RhdHVzKCk7CkBAIC0yMDcsMTQgKzE5NiwxMiBAQAogICAgIH0KICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBDX1NVQkpFQ1QsIG5ldyBUYWJsZUNoYW5nZUxpbmsoc3ViamVjdCwgYykpOwogCi0gICAgU3RyaW5nIG93bmVyID0gIiI7Ci0gICAgaWYgKGMub3duZXIoKSAhPSBudWxsICYmIGMub3duZXIoKS5uYW1lKCkgIT0gbnVsbCkgewotICAgICAgb3duZXIgPSBjLm93bmVyKCkubmFtZSgpOworICAgIGlmIChjLm93bmVyKCkgIT0gbnVsbCkgeworICAgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgQ19PV05FUiwgbmV3IEFjY291bnRMaW5rKGMub3duZXIoKSwgc3RhdHVzKSk7CisgICAgfSBlbHNlIHsKKyAgICAgIHRhYmxlLnNldFRleHQocm93LCBDX09XTkVSLCAiIik7CiAgICAgfQogCi0gICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgQ19PV05FUiwgbmV3IElubGluZUh5cGVybGluayhvd25lciwKLSAgICAgICAgUGFnZUxpbmtzLnRvQWNjb3VudFF1ZXJ5KG93bmVyLCBjLnN0YXR1cygpKSkpOwotCiAgICAgdGFibGUuc2V0V2lkZ2V0KAogICAgICAgICByb3csIENfUFJPSkVDVCwgbmV3IFByb2plY3RMaW5rKGMucHJvamVjdF9uYW1lX2tleSgpLCBjLnN0YXR1cygpKSk7CiAgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgQ19CUkFOQ0gsIG5ldyBCcmFuY2hMaW5rKGMucHJvamVjdF9uYW1lX2tleSgpLCBjCkBAIC0yOTksOSArMjg2LDkgQEAKICAgcHVibGljIHZvaWQgYWRkU2VjdGlvbihmaW5hbCBTZWN0aW9uIHMpIHsKICAgICBhc3NlcnQgcy5wYXJlbnQgPT0gbnVsbDsKIAotICAgIGlmIChzLnRpdGxlVGV4dCAhPSBudWxsKSB7Ci0gICAgICBzLnRpdGxlUm93ID0gdGFibGUuZ2V0Um93Q291bnQoKTsKLSAgICAgIHRhYmxlLnNldFRleHQocy50aXRsZVJvdywgMCwgcy50aXRsZVRleHQpOworICAgIHMucGFyZW50ID0gdGhpczsKKyAgICBzLnRpdGxlUm93ID0gdGFibGUuZ2V0Um93Q291bnQoKTsKKyAgICBpZiAocy5kaXNwbGF5VGl0bGUoKSkgewogICAgICAgZmluYWwgRmxleENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0RmxleENlbGxGb3JtYXR0ZXIoKTsKICAgICAgIGZtdC5zZXRDb2xTcGFuKHMudGl0bGVSb3csIDAsIGNvbHVtbnMpOwogICAgICAgZm10LmFkZFN0eWxlTmFtZShzLnRpdGxlUm93LCAwLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnNlY3Rpb25IZWFkZXIoKSk7CkBAIC0zMDksNyArMjk2LDYgQEAKICAgICAgIHMudGl0bGVSb3cgPSAtMTsKICAgICB9CiAKLSAgICBzLnBhcmVudCA9IHRoaXM7CiAgICAgcy5kYXRhQmVnaW4gPSB0YWJsZS5nZXRSb3dDb3VudCgpOwogICAgIGluc2VydE5vbmVSb3cocy5kYXRhQmVnaW4pOwogICAgIHNlY3Rpb25zLmFkZChzKTsKQEAgLTM2OSw2ICszNTUsNyBAQAogICBwdWJsaWMgc3RhdGljIGNsYXNzIFNlY3Rpb24gewogICAgIENoYW5nZVRhYmxlMiBwYXJlbnQ7CiAgICAgU3RyaW5nIHRpdGxlVGV4dDsKKyAgICBXaWRnZXQgdGl0bGVXaWRnZXQ7CiAgICAgaW50IHRpdGxlUm93ID0gLTE7CiAgICAgaW50IGRhdGFCZWdpbjsKICAgICBpbnQgcm93czsKQEAgLTM4MCwxMyArMzY3LDMzIEBACiAKICAgICBwdWJsaWMgdm9pZCBzZXRUaXRsZVRleHQoZmluYWwgU3RyaW5nIHRleHQpIHsKICAgICAgIHRpdGxlVGV4dCA9IHRleHQ7CisgICAgICB0aXRsZVdpZGdldCA9IG51bGw7CiAgICAgICBpZiAodGl0bGVSb3cgPj0gMCkgewogICAgICAgICBwYXJlbnQudGFibGUuc2V0VGV4dCh0aXRsZVJvdywgMCwgdGl0bGVUZXh0KTsKICAgICAgIH0KICAgICB9CiAKKyAgICBwdWJsaWMgdm9pZCBzZXRUaXRsZVdpZGdldChmaW5hbCBXaWRnZXQgdGl0bGUpIHsKKyAgICAgIHRpdGxlV2lkZ2V0ID0gdGl0bGU7CisgICAgICB0aXRsZVRleHQgPSBudWxsOworICAgICAgaWYgKHRpdGxlUm93ID49IDApIHsKKyAgICAgICAgcGFyZW50LnRhYmxlLnNldFdpZGdldCh0aXRsZVJvdywgMCwgdGl0bGUpOworICAgICAgfQorICAgIH0KKworICAgIHB1YmxpYyBib29sZWFuIGRpc3BsYXlUaXRsZSgpIHsKKyAgICAgIGlmICh0aXRsZVRleHQgIT0gbnVsbCkgeworICAgICAgICBzZXRUaXRsZVRleHQodGl0bGVUZXh0KTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICB9IGVsc2UgaWYodGl0bGVXaWRnZXQgIT0gbnVsbCkgeworICAgICAgICBzZXRUaXRsZVdpZGdldCh0aXRsZVdpZGdldCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgICAgfQorICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAgIHB1YmxpYyB2b2lkIGRpc3BsYXkoQ2hhbmdlTGlzdCBjaGFuZ2VMaXN0KSB7Ci0gICAgICBmaW5hbCBpbnQgc3ogPSBjaGFuZ2VMaXN0ICE9IG51bGwgPyBjaGFuZ2VMaXN0LnNpemUoKSA6IDA7CisgICAgICBmaW5hbCBpbnQgc3ogPSBjaGFuZ2VMaXN0ICE9IG51bGwgPyBjaGFuZ2VMaXN0Lmxlbmd0aCgpIDogMDsKICAgICAgIGZpbmFsIGJvb2xlYW4gaGFkRGF0YSA9IHJvd3MgPiAwOwogCiAgICAgICBpZiAoaGFkRGF0YSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvQ29tbWl0TWVzc2FnZUJsb2NrLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Db21taXRNZXNzYWdlQmxvY2suamF2YQppbmRleCBlZmYzY2Q1Li5lYTE4NGRmIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Db21taXRNZXNzYWdlQmxvY2suamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Db21taXRNZXNzYWdlQmxvY2suamF2YQpAQCAtMTQsMjQgKzE0LDMzIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXM7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuRXJyb3JEaWFsb2c7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQ2hhbmdlTGluazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQ29tbWVudExpbmtQcm9jZXNzb3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkNvbW1lbnRlZEFjdGlvbkRpYWxvZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuVGV4dEJveENoYW5nZUxpc3RlbmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlRGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQ29tcG9zaXRlOwotCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5kb20uY2xpZW50LlByZUVsZW1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZG9tLmNsaWVudC5TdHlsZS5EaXNwbGF5OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51aWJpbmRlci5jbGllbnQuVWlCaW5kZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudWliaW5kZXIuY2xpZW50LlVpRmllbGQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQ29tcG9zaXRlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5IVE1MUGFuZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW1hZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuU2ltcGxlUGFuZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5jbGlwcHkuY2xpZW50LkNvcHlhYmxlTGFiZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5nbG9iYWxrZXkuY2xpZW50LktleUNvbW1hbmRTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuU2FmZUh0bWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuU2FmZUh0bWxCdWlsZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKIAogcHVibGljIGNsYXNzIENvbW1pdE1lc3NhZ2VCbG9jayBleHRlbmRzIENvbXBvc2l0ZSB7CiAgIGludGVyZmFjZSBCaW5kZXIgZXh0ZW5kcyBVaUJpbmRlcjxIVE1MUGFuZWwsIENvbW1pdE1lc3NhZ2VCbG9jaz4gewpAQCAtNjAsMTMgKzY5LDQ0IEBACiAgIH0KIAogICBwdWJsaWMgdm9pZCBkaXNwbGF5KGZpbmFsIFN0cmluZyBjb21taXRNZXNzYWdlKSB7Ci0gICAgZGlzcGxheShudWxsLCBudWxsLCBjb21taXRNZXNzYWdlKTsKKyAgICBkaXNwbGF5KG51bGwsIG51bGwsIGZhbHNlLCBjb21taXRNZXNzYWdlKTsKICAgfQogCi0gIHB1YmxpYyB2b2lkIGRpc3BsYXkoQ2hhbmdlLklkIGNoYW5nZUlkLCBCb29sZWFuIHN0YXJyZWQsIFN0cmluZyBjb21taXRNZXNzYWdlKSB7Ci0gICAgc3RhclBhbmVsLmNsZWFyKCk7CisgIHByaXZhdGUgYWJzdHJhY3QgY2xhc3MgQ29tbWl0TWVzc2FnZUVkaXREaWFsb2cgZXh0ZW5kcyBDb21tZW50ZWRBY3Rpb25EaWFsb2c8Q2hhbmdlRGV0YWlsPiB7CisgICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgb3JpZ2luYWxNZXNzYWdlOworICAgIHB1YmxpYyBDb21taXRNZXNzYWdlRWRpdERpYWxvZyhmaW5hbCBTdHJpbmcgdGl0bGUsIGZpbmFsIFN0cmluZyBoZWFkaW5nLAorICAgICAgICBmaW5hbCBTdHJpbmcgY29tbWl0TWVzc2FnZSwgQXN5bmNDYWxsYmFjazxDaGFuZ2VEZXRhaWw+IGNhbGxiYWNrKSB7CisgICAgICBzdXBlcih0aXRsZSwgaGVhZGluZywgY2FsbGJhY2spOworICAgICAgb3JpZ2luYWxNZXNzYWdlID0gY29tbWl0TWVzc2FnZS50cmltKCk7CisgICAgICBtZXNzYWdlLnNldENoYXJhY3RlcldpZHRoKDcyKTsKKyAgICAgIG1lc3NhZ2Uuc2V0VmlzaWJsZUxpbmVzKDIwKTsKKyAgICAgIG1lc3NhZ2Uuc2V0VGV4dChvcmlnaW5hbE1lc3NhZ2UpOworICAgICAgbWVzc2FnZS5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jaGFuZ2VTY3JlZW5EZXNjcmlwdGlvbigpKTsKKyAgICAgIHNlbmRCdXR0b24uc2V0RW5hYmxlZChmYWxzZSk7CiAKLSAgICBpZiAoY2hhbmdlSWQgIT0gbnVsbCAmJiBzdGFycmVkICE9IG51bGwgJiYgR2Vycml0LmlzU2lnbmVkSW4oKSkgeworICAgICAgbmV3IFRleHRCb3hDaGFuZ2VMaXN0ZW5lcihtZXNzYWdlKSB7CisgICAgICAgIHB1YmxpYyB2b2lkIG9uVGV4dENoYW5nZWQoU3RyaW5nIG5ld1RleHQpIHsKKyAgICAgICAgICAvLyBUcmltIHRoZSBuZXcgdGV4dCBzbyB3ZSBkb24ndCBjb25zaWRlciB0cmFpbGluZworICAgICAgICAgIC8vIG5ld2xpbmVzIGFzIGNoYW5nZXMKKyAgICAgICAgICBzZW5kQnV0dG9uLnNldEVuYWJsZWQoIW5ld1RleHQudHJpbSgpLmVxdWFscyhvcmlnaW5hbE1lc3NhZ2UpKTsKKyAgICAgICAgfQorICAgICAgfTsKKyAgICB9CisKKyAgICBwdWJsaWMgU3RyaW5nIGdldE1lc3NhZ2VUZXh0KCkgeworICAgICAgLy8gQXMgd2UgcmVseSBvbiBjb21taXQgbWVzc2FnZSBsaW5lcyBlbmRpbmcgaW4gTEYsIHdlIGNvbnZlcnQgQ1JMRiB0bworICAgICAgLy8gTEYuIEFkZGl0aW9uYWxseSwgdGhlIGNvbW1pdCBtZXNzYWdlIHNob3VsZCBiZSB0cmltbWVkIHRvIHJlbW92ZSBhbnkKKyAgICAgIC8vIGV4Y2VzcyBuZXdsaW5lcyBhdCB0aGUgZW5kLCBidXQgd2UgbmVlZCB0byBtYWtlIHN1cmUgaXQgc3RpbGwgaGFzIGF0CisgICAgICAvLyBsZWFzdCBvbmUgdHJhaWxpbmcgbmV3bGluZS4KKyAgICAgIHJldHVybiBtZXNzYWdlLmdldFRleHQoKS5yZXBsYWNlQWxsKCJcclxuIiwgIlxuIikudHJpbSgpICsgJ1xuJzsKKyAgICB9CisgIH0KKworICBwdWJsaWMgdm9pZCBkaXNwbGF5KGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsCisgICAgICBCb29sZWFuIHN0YXJyZWQsIEJvb2xlYW4gY2FuRWRpdENvbW1pdE1lc3NhZ2UsIGZpbmFsIFN0cmluZyBjb21taXRNZXNzYWdlKSB7CisgICAgc3RhclBhbmVsLmNsZWFyKCk7CisgICAgaWYgKHBhdGNoU2V0SWQgIT0gbnVsbCAmJiBzdGFycmVkICE9IG51bGwgJiYgR2Vycml0LmlzU2lnbmVkSW4oKSkgeworICAgICAgQ2hhbmdlLklkIGNoYW5nZUlkID0gcGF0Y2hTZXRJZC5nZXRQYXJlbnRLZXkoKTsKICAgICAgIFN0YXJyZWRDaGFuZ2VzLkljb24gc3RhciA9IFN0YXJyZWRDaGFuZ2VzLmNyZWF0ZUljb24oY2hhbmdlSWQsIHN0YXJyZWQpOwogICAgICAgc3Rhci5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jaGFuZ2VTY3JlZW5TdGFySWNvbigpKTsKICAgICAgIHN0YXJQYW5lbC5hZGQoc3Rhcik7CkBAIC03Nyw5ICsxMTcsNDYgQEAKICAgICB9CiAKICAgICBwZXJtYWxpbmtQYW5lbC5jbGVhcigpOwotICAgIGlmIChjaGFuZ2VJZCAhPSBudWxsKSB7CisgICAgaWYgKHBhdGNoU2V0SWQgIT0gbnVsbCkgeworICAgICAgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkID0gcGF0Y2hTZXRJZC5nZXRQYXJlbnRLZXkoKTsKICAgICAgIHBlcm1hbGlua1BhbmVsLmFkZChuZXcgQ2hhbmdlTGluayhVdGlsLkMuY2hhbmdlUGVybWFsaW5rKCksIGNoYW5nZUlkKSk7Ci0gICAgICBwZXJtYWxpbmtQYW5lbC5hZGQobmV3IENvcHlhYmxlTGFiZWwoQ2hhbmdlTGluay5wZXJtYWxpbmsoY2hhbmdlSWQpLCBmYWxzZSkpOworICAgICAgcGVybWFsaW5rUGFuZWwuYWRkKG5ldyBDb3B5YWJsZUxhYmVsKENoYW5nZUxpbmsucGVybWFsaW5rKGNoYW5nZUlkKSwKKyAgICAgICAgICBmYWxzZSkpOworICAgICAgaWYgKGNhbkVkaXRDb21taXRNZXNzYWdlKSB7CisgICAgICAgIGZpbmFsIEltYWdlIGVkaXQgPSBuZXcgSW1hZ2UoR2Vycml0LlJFU09VUkNFUy5lZGl0KCkpOworICAgICAgICBlZGl0LnNldFRpdGxlKFV0aWwuQy5lZGl0Q29tbWl0TWVzc2FnZVRvb2xUaXAoKSk7CisgICAgICAgIGVkaXQuYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubGluaygpKTsKKyAgICAgICAgZWRpdC5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKGZpbmFsIENsaWNrRXZlbnQgZXZlbnQpIHsKKyAgICAgICAgICAgIG5ldyBDb21taXRNZXNzYWdlRWRpdERpYWxvZyhVdGlsLkMudGl0bGVFZGl0Q29tbWl0TWVzc2FnZSgpLAorICAgICAgICAgICAgICAgIFV0aWwuQy5oZWFkaW5nRWRpdENvbW1pdE1lc3NhZ2UoKSwKKyAgICAgICAgICAgICAgICBjb21taXRNZXNzYWdlLAorICAgICAgICAgICAgICAgIG5ldyBDaGFuZ2VEZXRhaWxDYWNoZS5JZ25vcmVFcnJvckNhbGxiYWNrKCkge30pIHsKKworICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TZW5kKCkgeworICAgICAgICAgICAgICAgIFV0aWwuTUFOQUdFX1NWQy5jcmVhdGVOZXdQYXRjaFNldChwYXRjaFNldElkLCBnZXRNZXNzYWdlVGV4dCgpLAorICAgICAgICAgICAgICAgICAgICBuZXcgQXN5bmNDYWxsYmFjazxDaGFuZ2VEZXRhaWw+KCkgeworICAgICAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKENoYW5nZURldGFpbCByZXN1bHQpIHsKKyAgICAgICAgICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheShQYWdlTGlua3MudG9DaGFuZ2UoY2hhbmdlSWQpKTsKKyAgICAgICAgICAgICAgICAgICAgICBoaWRlKCk7CisgICAgICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICAgICAgICAgICAgICAgICAgICBlbmFibGVCdXR0b25zKHRydWUpOworICAgICAgICAgICAgICAgICAgICAgIG5ldyBFcnJvckRpYWxvZyhjYXVnaHQuZ2V0TWVzc2FnZSgpKS5jZW50ZXIoKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9LmNlbnRlcigpOworICAgICAgICAgIH0KKyAgICAgICAgfSk7CisKKyAgICAgICAgcGVybWFsaW5rUGFuZWwuYWRkKGVkaXQpOworICAgICAgfQogICAgIH0KIAogICAgIFN0cmluZ1tdIHNwbGl0Q29tbWl0TWVzc2FnZSA9IGNvbW1pdE1lc3NhZ2Uuc3BsaXQoIlxuIiwgMik7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9DdXN0b21EYXNoYm9hcmRTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0N1c3RvbURhc2hib2FyZFNjcmVlbi5qYXZhCmluZGV4IGM5ZjFkYzYuLjg0MGViYWEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0N1c3RvbURhc2hib2FyZFNjcmVlbi5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0N1c3RvbURhc2hib2FyZFNjcmVlbi5qYXZhCkBAIC0xNCw5NyArMTQsNDMgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlczsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVMaXN0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuU2NyZWVuTG9hZENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TY3JlZW47Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuaHR0cC5jbGllbnQuVVJMOwotCi1pbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogcHVibGljIGNsYXNzIEN1c3RvbURhc2hib2FyZFNjcmVlbiBleHRlbmRzIFNjcmVlbiBpbXBsZW1lbnRzIENoYW5nZUxpc3RTY3JlZW4gewotICBwcml2YXRlIFN0cmluZyB0aXRsZTsKLSAgcHJpdmF0ZSBMaXN0PFN0cmluZz4gdGl0bGVzOwotICBwcml2YXRlIExpc3Q8U3RyaW5nPiBxdWVyaWVzOwotICBwcml2YXRlIENoYW5nZVRhYmxlMiB0YWJsZTsKLSAgcHJpdmF0ZSBMaXN0PENoYW5nZVRhYmxlMi5TZWN0aW9uPiBzZWN0aW9uczsKKyAgcHJpdmF0ZSBEYXNoYm9hcmRUYWJsZSB0YWJsZTsKKyAgcHJpdmF0ZSBTdHJpbmcgcGFyYW1zOwogCiAgIHB1YmxpYyBDdXN0b21EYXNoYm9hcmRTY3JlZW4oU3RyaW5nIHBhcmFtcykgewotICAgIHRpdGxlcyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOwotICAgIHF1ZXJpZXMgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKLSAgICBmb3IgKFN0cmluZyBrdlBhaXIgOiBwYXJhbXMuc3BsaXQoIlssOyZdIikpIHsKLSAgICAgIFN0cmluZ1tdIGt2ID0ga3ZQYWlyLnNwbGl0KCI9IiwgMik7Ci0gICAgICBpZiAoa3YubGVuZ3RoICE9IDIgfHwga3ZbMF0uaXNFbXB0eSgpKSB7Ci0gICAgICAgIGNvbnRpbnVlOwotICAgICAgfQotCi0gICAgICBpZiAoInRpdGxlIi5lcXVhbHMoa3ZbMF0pKSB7Ci0gICAgICAgIHRpdGxlID0gVVJMLmRlY29kZVF1ZXJ5U3RyaW5nKGt2WzFdKTsKLSAgICAgIH0gZWxzZSB7Ci0gICAgICAgIHRpdGxlcy5hZGQoVVJMLmRlY29kZVF1ZXJ5U3RyaW5nKGt2WzBdKSk7Ci0gICAgICAgIHF1ZXJpZXMuYWRkKFVSTC5kZWNvZGVRdWVyeVN0cmluZyhrdlsxXSkpOwotICAgICAgfQotICAgIH0KKyAgICB0aGlzLnBhcmFtcyA9IHBhcmFtczsKICAgfQogCiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBvbkluaXRVSSgpIHsKKyAgICB0YWJsZSA9IG5ldyBEYXNoYm9hcmRUYWJsZShwYXJhbXMpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgb25Mb2FkKCkgeworICAgICAgICBzdXBlci5vbkxvYWQoKTsKKyAgICAgIH0KKworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBmaW5pc2hEaXNwbGF5KCkgeworICAgICAgICBzdXBlci5maW5pc2hEaXNwbGF5KCk7CisgICAgICAgIGRpc3BsYXkoKTsKKyAgICAgIH0KKyAgICB9OworCiAgICAgc3VwZXIub25Jbml0VUkoKTsKIAorICAgIFN0cmluZyB0aXRsZSA9IHRhYmxlLmdldFRpdGxlKCk7CiAgICAgaWYgKHRpdGxlICE9IG51bGwpIHsKICAgICAgIHNldFdpbmRvd1RpdGxlKHRpdGxlKTsKICAgICAgIHNldFBhZ2VUaXRsZSh0aXRsZSk7CiAgICAgfQogCi0gICAgdGFibGUgPSBuZXcgQ2hhbmdlVGFibGUyKCk7Ci0gICAgdGFibGUuYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuYWNjb3VudERhc2hib2FyZCgpKTsKLQotICAgIHNlY3Rpb25zID0gbmV3IEFycmF5TGlzdDxDaGFuZ2VUYWJsZTIuU2VjdGlvbj4oKTsKLSAgICBmb3IgKFN0cmluZyB0aXRsZSA6IHRpdGxlcykgewotICAgICAgQ2hhbmdlVGFibGUyLlNlY3Rpb24gcyA9IG5ldyBDaGFuZ2VUYWJsZTIuU2VjdGlvbigpOwotICAgICAgcy5zZXRUaXRsZVRleHQodGl0bGUpOwotICAgICAgdGFibGUuYWRkU2VjdGlvbihzKTsKLSAgICAgIHNlY3Rpb25zLmFkZChzKTsKLSAgICB9CiAgICAgYWRkKHRhYmxlKTsKICAgfQogCiAgIEBPdmVycmlkZQotICBwcm90ZWN0ZWQgdm9pZCBvbkxvYWQoKSB7Ci0gICAgc3VwZXIub25Mb2FkKCk7Ci0KLSAgICBpZiAocXVlcmllcy5pc0VtcHR5KCkpIHsKLSAgICAgIGRpc3BsYXkoKTsKLSAgICB9IGVsc2UgaWYgKHF1ZXJpZXMuc2l6ZSgpID09IDEpIHsKLSAgICAgIENoYW5nZUxpc3QubmV4dChxdWVyaWVzLmdldCgwKSwKLSAgICAgICAgICAwLCBQYWdlZFNpbmdsZUxpc3RTY3JlZW4uTUFYX1NPUlRLRVksCi0gICAgICAgICAgbmV3IFNjcmVlbkxvYWRDYWxsYmFjazxDaGFuZ2VMaXN0Pih0aGlzKSB7Ci0gICAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICAgIHByb3RlY3RlZCB2b2lkIHByZURpc3BsYXkoQ2hhbmdlTGlzdCByZXN1bHQpIHsKLSAgICAgICAgICAgICAgdGFibGUudXBkYXRlQ29sdW1uc0ZvckxhYmVscyhyZXN1bHQpOwotICAgICAgICAgICAgICBzZWN0aW9ucy5nZXQoMCkuZGlzcGxheShyZXN1bHQpOwotICAgICAgICAgICAgICB0YWJsZS5maW5pc2hEaXNwbGF5KCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0pOwotICAgIH0gZWxzZSB7Ci0gICAgICBDaGFuZ2VMaXN0LnF1ZXJ5KAotICAgICAgICAgIG5ldyBTY3JlZW5Mb2FkQ2FsbGJhY2s8TmF0aXZlTGlzdDxDaGFuZ2VMaXN0Pj4odGhpcykgewotICAgICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgICBwcm90ZWN0ZWQgdm9pZCBwcmVEaXNwbGF5KE5hdGl2ZUxpc3Q8Q2hhbmdlTGlzdD4gcmVzdWx0KSB7Ci0gICAgICAgICAgICAgIHRhYmxlLnVwZGF0ZUNvbHVtbnNGb3JMYWJlbHMoCi0gICAgICAgICAgICAgICAgICByZXN1bHQuYXNMaXN0KCkudG9BcnJheShuZXcgQ2hhbmdlTGlzdFtyZXN1bHQuc2l6ZSgpXSkpOwotICAgICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IHJlc3VsdC5zaXplKCk7IGkrKykgewotICAgICAgICAgICAgICAgIHNlY3Rpb25zLmdldChpKS5kaXNwbGF5KHJlc3VsdC5nZXQoaSkpOwotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIHRhYmxlLmZpbmlzaERpc3BsYXkoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9LAotICAgICAgICAgIHF1ZXJpZXMudG9BcnJheShuZXcgU3RyaW5nW3F1ZXJpZXMuc2l6ZSgpXSkpOwotICAgIH0KLSAgfQotCi0gIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCByZWdpc3RlcktleXMoKSB7CiAgICAgc3VwZXIucmVnaXN0ZXJLZXlzKCk7CiAgICAgdGFibGUuc2V0UmVnaXN0ZXJLZXlzKHRydWUpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvRGFzaGJvYXJkVGFibGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0Rhc2hib2FyZFRhYmxlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2IzODdhYgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0Rhc2hib2FyZFRhYmxlLmphdmEKQEAgLTAsMCArMSwxMDkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLk5hdGl2ZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLklubGluZUh5cGVybGluazsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkpzQXJyYXk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuaHR0cC5jbGllbnQuVVJMOworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdEl0ZXJhdG9yOworCitwdWJsaWMgY2xhc3MgRGFzaGJvYXJkVGFibGUgZXh0ZW5kcyBDaGFuZ2VUYWJsZTIgeworICBwcml2YXRlIExpc3Q8U2VjdGlvbj4gc2VjdGlvbnM7CisgIHByaXZhdGUgU3RyaW5nIHRpdGxlOworICBwcml2YXRlIExpc3Q8U3RyaW5nPiB0aXRsZXM7CisgIHByaXZhdGUgTGlzdDxTdHJpbmc+IHF1ZXJpZXM7CisKKyAgcHVibGljIERhc2hib2FyZFRhYmxlKFN0cmluZyBwYXJhbXMpIHsKKyAgICB0aXRsZXMgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKKyAgICBxdWVyaWVzID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KCk7CisgICAgU3RyaW5nIGZvcmVhY2ggPSBudWxsOworICAgIGZvciAoU3RyaW5nIGt2UGFpciA6IHBhcmFtcy5zcGxpdCgiWyw7Jl0iKSkgeworICAgICAgU3RyaW5nW10ga3YgPSBrdlBhaXIuc3BsaXQoIj0iLCAyKTsKKyAgICAgIGlmIChrdi5sZW5ndGggIT0gMiB8fCBrdlswXS5pc0VtcHR5KCkpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisKKyAgICAgIGlmICgidGl0bGUiLmVxdWFscyhrdlswXSkpIHsKKyAgICAgICAgdGl0bGUgPSBVUkwuZGVjb2RlUXVlcnlTdHJpbmcoa3ZbMV0pOworICAgICAgfSBlbHNlIGlmICgiZm9yZWFjaCIuZXF1YWxzKGt2WzBdKSkgeworICAgICAgICBmb3JlYWNoID0gVVJMLmRlY29kZVF1ZXJ5U3RyaW5nKGt2WzFdKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHRpdGxlcy5hZGQoVVJMLmRlY29kZVF1ZXJ5U3RyaW5nKGt2WzBdKSk7CisgICAgICAgIHF1ZXJpZXMuYWRkKFVSTC5kZWNvZGVRdWVyeVN0cmluZyhrdlsxXSkpOworICAgICAgfQorICAgIH0KKworICAgIGlmIChmb3JlYWNoICE9IG51bGwpIHsKKyAgICAgIExpc3RJdGVyYXRvcjxTdHJpbmc+IGl0ID0gcXVlcmllcy5saXN0SXRlcmF0b3IoKTsKKyAgICAgIHdoaWxlIChpdC5oYXNOZXh0KCkpIHsKKyAgICAgICAgaXQuc2V0KGl0Lm5leHQoKSArICIgIiArIGZvcmVhY2gpOworICAgICAgfQorICAgIH0KKworICAgIGFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmFjY291bnREYXNoYm9hcmQoKSk7CisKKyAgICBzZWN0aW9ucyA9IG5ldyBBcnJheUxpc3Q8Q2hhbmdlVGFibGUyLlNlY3Rpb24+KCk7CisgICAgaW50IGkgPSAwOworICAgIGZvciAoU3RyaW5nIHRpdGxlIDogdGl0bGVzKSB7CisgICAgICBTZWN0aW9uIHMgPSBuZXcgU2VjdGlvbigpOworICAgICAgcy5zZXRUaXRsZVdpZGdldChuZXcgSW5saW5lSHlwZXJsaW5rKHRpdGxlLCBQYWdlTGlua3MudG9DaGFuZ2VRdWVyeShxdWVyaWVzLmdldChpKyspKSkpOworICAgICAgYWRkU2VjdGlvbihzKTsKKyAgICAgIHNlY3Rpb25zLmFkZChzKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgU3RyaW5nIGdldFRpdGxlKCkgeworICAgIHJldHVybiB0aXRsZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBvbkxvYWQoKSB7CisgICAgc3VwZXIub25Mb2FkKCk7CisKKyAgICBpZiAocXVlcmllcy5zaXplKCkgPT0gMSkgeworICAgICAgQ2hhbmdlTGlzdC5uZXh0KHF1ZXJpZXMuZ2V0KDApLAorICAgICAgICAgIDAsIFBhZ2VkU2luZ2xlTGlzdFNjcmVlbi5NQVhfU09SVEtFWSwKKyAgICAgICAgICBuZXcgR2Vycml0Q2FsbGJhY2s8Q2hhbmdlTGlzdD4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhDaGFuZ2VMaXN0IHJlc3VsdCkgeworICAgICAgICAgICAgICB1cGRhdGVDb2x1bW5zRm9yTGFiZWxzKHJlc3VsdCk7CisgICAgICAgICAgICAgIHNlY3Rpb25zLmdldCgwKS5kaXNwbGF5KHJlc3VsdCk7CisgICAgICAgICAgICAgIGZpbmlzaERpc3BsYXkoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSk7CisgICAgfSBlbHNlIGlmICghIHF1ZXJpZXMuaXNFbXB0eSgpKSB7CisgICAgICBDaGFuZ2VMaXN0LnF1ZXJ5KAorICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxKc0FycmF5PENoYW5nZUxpc3Q+PigpIHsKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKEpzQXJyYXk8Q2hhbmdlTGlzdD4gcmVzdWx0KSB7CisgICAgICAgICAgICAgIExpc3Q8Q2hhbmdlTGlzdD4gY2xzID0gTmF0aXZlcy5hc0xpc3QocmVzdWx0KTsKKyAgICAgICAgICAgICAgdXBkYXRlQ29sdW1uc0ZvckxhYmVscyhjbHMudG9BcnJheShuZXcgQ2hhbmdlTGlzdFtjbHMuc2l6ZSgpXSkpOworICAgICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGNscy5zaXplKCk7IGkrKykgeworICAgICAgICAgICAgICAgIHNlY3Rpb25zLmdldChpKS5kaXNwbGF5KGNscy5nZXQoaSkpOworICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIGZpbmlzaERpc3BsYXkoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9LAorICAgICAgICAgIHF1ZXJpZXMudG9BcnJheShuZXcgU3RyaW5nW3F1ZXJpZXMuc2l6ZSgpXSkpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvRG93bmxvYWRDb21tYW5kTGluay5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvRG93bmxvYWRDb21tYW5kTGluay5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBjMDk1ZDRkLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0Rvd25sb2FkQ29tbWFuZExpbmsuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDgxICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlczsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BY2Nlc3NpYmlsaXR5OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwotCi1hYnN0cmFjdCBjbGFzcyBEb3dubG9hZENvbW1hbmRMaW5rIGV4dGVuZHMgQW5jaG9yIGltcGxlbWVudHMgQ2xpY2tIYW5kbGVyIHsKLSAgZmluYWwgQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlcy5Eb3dubG9hZENvbW1hbmQgY21kVHlwZTsKLQotICBEb3dubG9hZENvbW1hbmRMaW5rKEFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRDb21tYW5kIGNtZFR5cGUsCi0gICAgICBTdHJpbmcgdGV4dCkgewotICAgIHN1cGVyKHRleHQpOwotICAgIHRoaXMuY21kVHlwZSA9IGNtZFR5cGU7Ci0gICAgc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZG93bmxvYWRMaW5rKCkpOwotICAgIEFjY2Vzc2liaWxpdHkuc2V0Um9sZShnZXRFbGVtZW50KCksIEFjY2Vzc2liaWxpdHkuUk9MRV9UQUIpOwotICAgIGFkZENsaWNrSGFuZGxlcih0aGlzKTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKLSAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwotICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwotCi0gICAgc2VsZWN0KCk7Ci0KLSAgICBpZiAoR2Vycml0LmlzU2lnbmVkSW4oKSkgewotICAgICAgLy8gSWYgdGhlIHVzZXIgaXMgc2lnbmVkLWluLCByZW1lbWJlciB0aGlzIGNob2ljZSBmb3IgZnV0dXJlIHBhbmVscy4KLSAgICAgIC8vCi0gICAgICBBY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzIHByZWYgPQotICAgICAgICAgIEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldEdlbmVyYWxQcmVmZXJlbmNlcygpOwotICAgICAgcHJlZi5zZXREb3dubG9hZENvbW1hbmQoY21kVHlwZSk7Ci0gICAgICBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWNjb3VudC5VdGlsLkFDQ09VTlRfU1ZDLmNoYW5nZVByZWZlcmVuY2VzKHByZWYsCi0gICAgICAgICAgbmV3IEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4oKSB7Ci0gICAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgY2F1Z2h0KSB7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKFZvaWRSZXN1bHQgcmVzdWx0KSB7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgfSk7Ci0gICAgfQotICB9Ci0KLSAgcHVibGljIEFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRDb21tYW5kIGdldENtZFR5cGUoKSB7Ci0gICAgcmV0dXJuIGNtZFR5cGU7Ci0gIH0KLQotICB2b2lkIHNlbGVjdCgpIHsKLSAgICBEb3dubG9hZENvbW1hbmRQYW5lbCBwYXJlbnQgPSAoRG93bmxvYWRDb21tYW5kUGFuZWwpIGdldFBhcmVudCgpOwotICAgIGZvciAoV2lkZ2V0IHcgOiBwYXJlbnQpIHsKLSAgICAgIGlmICh3ICE9IHRoaXMgJiYgdyBpbnN0YW5jZW9mIERvd25sb2FkQ29tbWFuZExpbmspIHsKLSAgICAgICAgdy5yZW1vdmVTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtfQWN0aXZlKCkpOwotICAgICAgfQotICAgIH0KLSAgICBwYXJlbnQuc2V0Q3VycmVudENvbW1hbmQodGhpcyk7Ci0gICAgYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZG93bmxvYWRMaW5rX0FjdGl2ZSgpKTsKLSAgfQotCi0gIGFic3RyYWN0IHZvaWQgc2V0Q3VycmVudFVybChEb3dubG9hZFVybExpbmsgbGluayk7Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Eb3dubG9hZENvbW1hbmRQYW5lbC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvRG93bmxvYWRDb21tYW5kUGFuZWwuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMTUxNmRhMS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Eb3dubG9hZENvbW1hbmRQYW5lbC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNzggKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlcy5Eb3dubG9hZENvbW1hbmQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQWNjZXNzaWJpbGl0eTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuV2lkZ2V0OwotCi1jbGFzcyBEb3dubG9hZENvbW1hbmRQYW5lbCBleHRlbmRzIEZsb3dQYW5lbCB7Ci0gIHByaXZhdGUgRG93bmxvYWRDb21tYW5kTGluayBjdXJyZW50Q29tbWFuZDsKLSAgcHJpdmF0ZSBEb3dubG9hZFVybExpbmsgY3VycmVudFVybDsKLQotICBEb3dubG9hZENvbW1hbmRQYW5lbCgpIHsKLSAgICBzZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtMaXN0KCkpOwotICAgIEFjY2Vzc2liaWxpdHkuc2V0Um9sZShnZXRFbGVtZW50KCksIEFjY2Vzc2liaWxpdHkuUk9MRV9UQUJMSVNUKTsKLSAgfQotCi0gIGJvb2xlYW4gaXNFbXB0eSgpIHsKLSAgICByZXR1cm4gZ2V0V2lkZ2V0Q291bnQoKSA9PSAwOwotICB9Ci0KLSAgdm9pZCBzZWxlY3QoQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlcy5Eb3dubG9hZENvbW1hbmQgY21kVHlwZSkgewotICAgIERvd25sb2FkQ29tbWFuZExpbmsgZmlyc3QgPSBudWxsOwotCi0gICAgZm9yIChXaWRnZXQgdyA6IHRoaXMpIHsKLSAgICAgIGlmICh3IGluc3RhbmNlb2YgRG93bmxvYWRDb21tYW5kTGluaykgewotICAgICAgICBmaW5hbCBEb3dubG9hZENvbW1hbmRMaW5rIGQgPSAoRG93bmxvYWRDb21tYW5kTGluaykgdzsKLSAgICAgICAgaWYgKGZpcnN0ID09IG51bGwpIHsKLSAgICAgICAgICBmaXJzdCA9IGQ7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGQuY21kVHlwZSA9PSBjbWRUeXBlKSB7Ci0gICAgICAgICAgZC5zZWxlY3QoKTsKLSAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9Ci0KLSAgICAvLyBJZiBub25lIG1hdGNoZWQgdGhlIHJlcXVlc3RlZCB0eXBlLCBzZWxlY3QgdGhlIGZpcnN0IGluIHRoZQotICAgIC8vIGdyb3VwIGFzIHRoYXQgd2lsbCBhdCBsZWFzdCBnaXZlIHVzIGFuIGluaXRpYWwgYmFzZWxpbmUuCi0gICAgaWYgKGZpcnN0ICE9IG51bGwpIHsKLSAgICAgIGZpcnN0LnNlbGVjdCgpOwotICAgIH0KLSAgfQotCi0gIHZvaWQgc2V0Q3VycmVudFVybChEb3dubG9hZFVybExpbmsgbGluaykgewotICAgIGN1cnJlbnRVcmwgPSBsaW5rOwotICAgIHVwZGF0ZSgpOwotICB9Ci0KLSAgdm9pZCBzZXRDdXJyZW50Q29tbWFuZChEb3dubG9hZENvbW1hbmRMaW5rIGNtZCkgewotICAgIGN1cnJlbnRDb21tYW5kID0gY21kOwotICAgIHVwZGF0ZSgpOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHVwZGF0ZSgpIHsKLSAgICBpZiAoY3VycmVudENvbW1hbmQgIT0gbnVsbCAmJiBjdXJyZW50VXJsICE9IG51bGwpIHsKLSAgICAgIGN1cnJlbnRDb21tYW5kLnNldEN1cnJlbnRVcmwoY3VycmVudFVybCk7Ci0gICAgfSBlbHNlIGlmIChjdXJyZW50Q29tbWFuZCAhPSBudWxsICYmCi0gICAgICAgIGN1cnJlbnRDb21tYW5kLmdldENtZFR5cGUoKS5lcXVhbHMoRG93bmxvYWRDb21tYW5kLlJFUE9fRE9XTkxPQUQpKSB7Ci0gICAgICBjdXJyZW50Q29tbWFuZC5zZXRDdXJyZW50VXJsKG51bGwpOwotICAgIH0KLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvRG93bmxvYWRVcmxMaW5rLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Eb3dubG9hZFVybExpbmsuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMmFmYWZhYS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Eb3dubG9hZFVybExpbmsuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDc3ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlczsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BY2Nlc3NpYmlsaXR5OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwotCi1jbGFzcyBEb3dubG9hZFVybExpbmsgZXh0ZW5kcyBBbmNob3IgaW1wbGVtZW50cyBDbGlja0hhbmRsZXIgewotICBmaW5hbCBBY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzLkRvd25sb2FkU2NoZW1lIHVybFR5cGU7Ci0gIGZpbmFsIFN0cmluZyB1cmxEYXRhOwotCi0gIERvd25sb2FkVXJsTGluayhBY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzLkRvd25sb2FkU2NoZW1lIHVybFR5cGUsIFN0cmluZyB0ZXh0LAotICAgICAgU3RyaW5nIHVybERhdGEpIHsKLSAgICBzdXBlcih0ZXh0KTsKLSAgICB0aGlzLnVybFR5cGUgPSB1cmxUeXBlOwotICAgIHRoaXMudXJsRGF0YSA9IHVybERhdGE7Ci0gICAgc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZG93bmxvYWRMaW5rKCkpOwotICAgIEFjY2Vzc2liaWxpdHkuc2V0Um9sZShnZXRFbGVtZW50KCksIEFjY2Vzc2liaWxpdHkuUk9MRV9UQUIpOwotICAgIGFkZENsaWNrSGFuZGxlcih0aGlzKTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKLSAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwotICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwotCi0gICAgc2VsZWN0KCk7Ci0KLSAgICBpZiAoR2Vycml0LmlzU2lnbmVkSW4oKSkgewotICAgICAgLy8gSWYgdGhlIHVzZXIgaXMgc2lnbmVkLWluLCByZW1lbWJlciB0aGlzIGNob2ljZSBmb3IgZnV0dXJlIHBhbmVscy4KLSAgICAgIC8vCi0gICAgICBBY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzIHByZWYgPQotICAgICAgICAgIEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldEdlbmVyYWxQcmVmZXJlbmNlcygpOwotICAgICAgcHJlZi5zZXREb3dubG9hZFVybCh1cmxUeXBlKTsKLSAgICAgIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hY2NvdW50LlV0aWwuQUNDT1VOVF9TVkMuY2hhbmdlUHJlZmVyZW5jZXMocHJlZiwKLSAgICAgICAgICBuZXcgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PigpIHsKLSAgICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoVm9pZFJlc3VsdCByZXN1bHQpIHsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9KTsKLSAgICB9Ci0gIH0KLQotICB2b2lkIHNlbGVjdCgpIHsKLSAgICBEb3dubG9hZFVybFBhbmVsIHBhcmVudCA9IChEb3dubG9hZFVybFBhbmVsKSBnZXRQYXJlbnQoKTsKLSAgICBmb3IgKFdpZGdldCB3IDogcGFyZW50KSB7Ci0gICAgICBpZiAodyAhPSB0aGlzICYmIHcgaW5zdGFuY2VvZiBEb3dubG9hZFVybExpbmspIHsKLSAgICAgICAgdy5yZW1vdmVTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtfQWN0aXZlKCkpOwotICAgICAgfQotICAgIH0KLSAgICBwYXJlbnQuc2V0Q3VycmVudFVybCh0aGlzKTsKLSAgICBhZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtfQWN0aXZlKCkpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Eb3dubG9hZFVybFBhbmVsLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Eb3dubG9hZFVybFBhbmVsLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGIzYzllYmMuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvRG93bmxvYWRVcmxQYW5lbC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNjIgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BY2Nlc3NpYmlsaXR5OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7Ci0KLWNsYXNzIERvd25sb2FkVXJsUGFuZWwgZXh0ZW5kcyBGbG93UGFuZWwgewotICBwcml2YXRlIGZpbmFsIERvd25sb2FkQ29tbWFuZFBhbmVsIGNvbW1hbmRQYW5lbDsKLQotICBEb3dubG9hZFVybFBhbmVsKGZpbmFsIERvd25sb2FkQ29tbWFuZFBhbmVsIGNvbW1hbmRQYW5lbCkgewotICAgIHRoaXMuY29tbWFuZFBhbmVsID0gY29tbWFuZFBhbmVsOwotICAgIHNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRvd25sb2FkTGlua0xpc3QoKSk7Ci0gICAgQWNjZXNzaWJpbGl0eS5zZXRSb2xlKGdldEVsZW1lbnQoKSwgQWNjZXNzaWJpbGl0eS5ST0xFX1RBQkxJU1QpOwotICB9Ci0KLSAgYm9vbGVhbiBpc0VtcHR5KCkgewotICAgIHJldHVybiBnZXRXaWRnZXRDb3VudCgpID09IDA7Ci0gIH0KLQotICB2b2lkIHNlbGVjdChBY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzLkRvd25sb2FkU2NoZW1lIHVybFR5cGUpIHsKLSAgICBEb3dubG9hZFVybExpbmsgZmlyc3QgPSBudWxsOwotCi0gICAgZm9yIChXaWRnZXQgdyA6IHRoaXMpIHsKLSAgICAgIGlmICh3IGluc3RhbmNlb2YgRG93bmxvYWRVcmxMaW5rKSB7Ci0gICAgICAgIGZpbmFsIERvd25sb2FkVXJsTGluayBkID0gKERvd25sb2FkVXJsTGluaykgdzsKLSAgICAgICAgaWYgKGZpcnN0ID09IG51bGwpIHsKLSAgICAgICAgICBmaXJzdCA9IGQ7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGQudXJsVHlwZSA9PSB1cmxUeXBlKSB7Ci0gICAgICAgICAgZC5zZWxlY3QoKTsKLSAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9Ci0KLSAgICAvLyBJZiBub25lIG1hdGNoZWQgdGhlIHJlcXVlc3RlZCB0eXBlLCBzZWxlY3QgdGhlIGZpcnN0IGluIHRoZQotICAgIC8vIGdyb3VwIGFzIHRoYXQgd2lsbCBhdCBsZWFzdCBnaXZlIHVzIGFuIGluaXRpYWwgYmFzZWxpbmUuCi0gICAgaWYgKGZpcnN0ICE9IG51bGwpIHsKLSAgICAgIGZpcnN0LnNlbGVjdCgpOwotICAgIH0KLSAgfQotCi0gIHZvaWQgc2V0Q3VycmVudFVybChEb3dubG9hZFVybExpbmsgbGluaykgewotICAgIGNvbW1hbmRQYW5lbC5zZXRDdXJyZW50VXJsKGxpbmspOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9QYWdlZFNpbmdsZUxpc3RTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1BhZ2VkU2luZ2xlTGlzdFNjcmVlbi5qYXZhCmluZGV4IDIzY2UxNzguLmMyMWM2OGQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1BhZ2VkU2luZ2xlTGlzdFNjcmVlbi5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1BhZ2VkU2luZ2xlTGlzdFNjcmVlbi5qYXZhCkBAIC0yMSw3ICsyMSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50Lkhpc3Rvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkhvcml6b250YWxQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuS2V5Q29tbWFuZDsKIApAQCAtMTE2LDkgKzExNiw5IEBACiAKICAgcHJvdGVjdGVkIHZvaWQgZGlzcGxheShmaW5hbCBDaGFuZ2VMaXN0IHJlc3VsdCkgewogICAgIGNoYW5nZXMgPSByZXN1bHQ7Ci0gICAgaWYgKCFjaGFuZ2VzLmlzRW1wdHkoKSkgeworICAgIGlmIChjaGFuZ2VzLmxlbmd0aCgpICE9IDApIHsKICAgICAgIGZpbmFsIENoYW5nZUluZm8gZiA9IGNoYW5nZXMuZ2V0KDApOwotICAgICAgZmluYWwgQ2hhbmdlSW5mbyBsID0gY2hhbmdlcy5nZXQoY2hhbmdlcy5zaXplKCkgLSAxKTsKKyAgICAgIGZpbmFsIENoYW5nZUluZm8gbCA9IGNoYW5nZXMuZ2V0KGNoYW5nZXMubGVuZ3RoKCkgLSAxKTsKIAogICAgICAgcHJldi5zZXRUYXJnZXRIaXN0b3J5VG9rZW4oYW5jaG9yUHJlZml4ICsgIixwLCIgKyBmLl9zb3J0a2V5KCkpOwogICAgICAgbmV4dC5zZXRUYXJnZXRIaXN0b3J5VG9rZW4oYW5jaG9yUHJlZml4ICsgIixuLCIgKyBsLl9zb3J0a2V5KCkpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUGF0Y2hTZXRDb21wbGV4RGlzY2xvc3VyZVBhbmVsLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9QYXRjaFNldENvbXBsZXhEaXNjbG9zdXJlUGFuZWwuamF2YQppbmRleCA3ZTMxNGNjLi43NmY3N2EyIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9QYXRjaFNldENvbXBsZXhEaXNjbG9zdXJlUGFuZWwuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9QYXRjaFNldENvbXBsZXhEaXNjbG9zdXJlUGFuZWwuamF2YQpAQCAtMTgsMzMgKzE4LDI3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkZvcm1hdFV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2l0d2ViTGluazsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZG93bmxvYWQuRG93bmxvYWRQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucGF0Y2hlcy5QYXRjaFV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQWNjb3VudExpbms7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkNvbW1lbnRlZEFjdGlvbkRpYWxvZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQ29tcGxleERpc2Nsb3N1cmVQYW5lbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSW5saW5lSHlwZXJsaW5rOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5MaXN0ZW5hYmxlQWNjb3VudERpZmZQcmVmZXJlbmNlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlRGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2V0RGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50RGlmZlByZWZlcmVuY2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkF1dGhUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRJbmZvOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Vc2VySWRlbnRpdHk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzLkRvd25sb2FkU2NoZW1lOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Vc2VySWRlbnRpdHk7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmxvZ2ljYWwuc2hhcmVkLk9wZW5FdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5sb2dpY2FsLnNoYXJlZC5PcGVuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5XaW5kb3c7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQW5jaG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkJ1dHRvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5EaXNjbG9zdXJlUGFuZWw7CkBAIC01NCw3ICs0OCw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSFRNTFRhYmxlLkNlbGxGb3JtYXR0ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW5saW5lTGFiZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuUGFuZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5jbGlwcHkuY2xpZW50LkNvcHlhYmxlTGFiZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwogCiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CkBAIC0xODMsNyArMTc2LDYgQEAKICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgIH0KLSAgICAgIHBvcHVsYXRlRGlmZkFsbEFjdGlvbnMoZGV0YWlsKTsKICAgICAgIGJvZHkuYWRkKGFjdGlvbnNQYW5lbCk7CiAgICAgfQogICB9CkBAIC0yMDIsMjEyICsxOTQsNTAgQEAKICAgICB9CiAgIH0KIAotICBwcml2YXRlIHZvaWQgZGlzcGxheURvd25sb2FkKCkgewotICAgIGZpbmFsIFByb2plY3QuTmFtZUtleSBwcm9qZWN0S2V5ID0gY2hhbmdlRGV0YWlsLmdldENoYW5nZSgpLmdldFByb2plY3QoKTsKLSAgICBmaW5hbCBTdHJpbmcgcHJvamVjdE5hbWUgPSBwcm9qZWN0S2V5LmdldCgpOwotICAgIGZpbmFsIENvcHlhYmxlTGFiZWwgY29weUxhYmVsID0gbmV3IENvcHlhYmxlTGFiZWwoIiIpOwotICAgIGZpbmFsIERvd25sb2FkQ29tbWFuZFBhbmVsIGNvbW1hbmRzID0gbmV3IERvd25sb2FkQ29tbWFuZFBhbmVsKCk7Ci0gICAgZmluYWwgRG93bmxvYWRVcmxQYW5lbCB1cmxzID0gbmV3IERvd25sb2FkVXJsUGFuZWwoY29tbWFuZHMpOwotICAgIGZpbmFsIFNldDxEb3dubG9hZFNjaGVtZT4gYWxsb3dlZFNjaGVtZXMgPSBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0RG93bmxvYWRTY2hlbWVzKCk7Ci0gICAgZmluYWwgU2V0PERvd25sb2FkQ29tbWFuZD4gYWxsb3dlZENvbW1hbmRzID0gR2Vycml0LmdldENvbmZpZygpLmdldERvd25sb2FkQ29tbWFuZHMoKTsKLQotICAgIGNvcHlMYWJlbC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtDb3B5TGFiZWwoKSk7Ci0KLSAgICBpZiAoY2hhbmdlRGV0YWlsLmlzQWxsb3dzQW5vbnltb3VzKCkKLSAgICAgICAgJiYgR2Vycml0LmdldENvbmZpZygpLmdldEdpdERhZW1vblVybCgpICE9IG51bGwKLSAgICAgICAgJiYgKGFsbG93ZWRTY2hlbWVzLmNvbnRhaW5zKERvd25sb2FkU2NoZW1lLkFOT05fR0lUKSB8fAotICAgICAgICAgICAgYWxsb3dlZFNjaGVtZXMuY29udGFpbnMoRG93bmxvYWRTY2hlbWUuREVGQVVMVF9ET1dOTE9BRFMpKSkgewotICAgICAgU3RyaW5nQnVpbGRlciByID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgIHIuYXBwZW5kKEdlcnJpdC5nZXRDb25maWcoKS5nZXRHaXREYWVtb25VcmwoKSk7Ci0gICAgICByLmFwcGVuZChwcm9qZWN0TmFtZSk7Ci0gICAgICByLmFwcGVuZCgiICIpOwotICAgICAgci5hcHBlbmQocGF0Y2hTZXQuZ2V0UmVmTmFtZSgpKTsKLSAgICAgIHVybHMuYWRkKG5ldyBEb3dubG9hZFVybExpbmsoRG93bmxvYWRTY2hlbWUuQU5PTl9HSVQsIFV0aWwuTQotICAgICAgICAgIC5hbm9ueW1vdXNEb3dubG9hZCgiR2l0IiksIHIudG9TdHJpbmcoKSkpOworICBwdWJsaWMgY2xhc3MgQ2hhbmdlRG93bmxvYWRQYW5lbCBleHRlbmRzIERvd25sb2FkUGFuZWwgeworICAgIHB1YmxpYyBDaGFuZ2VEb3dubG9hZFBhbmVsKFN0cmluZyBwcm9qZWN0LCBTdHJpbmcgcmVmLCBib29sZWFuIGFsbG93QW5vbnltb3VzKSB7CisgICAgICBzdXBlcihwcm9qZWN0LCByZWYsIGFsbG93QW5vbnltb3VzKTsKICAgICB9CiAKLSAgICBTdHJpbmcgaG9zdFBhZ2VVcmwgPSBHV1QuZ2V0SG9zdFBhZ2VCYXNlVVJMKCk7Ci0gICAgaWYgKCFob3N0UGFnZVVybC5lbmRzV2l0aCgiLyIpKSB7Ci0gICAgICBob3N0UGFnZVVybCArPSAiLyI7Ci0gICAgfQotCi0gICAgaWYgKGNoYW5nZURldGFpbC5pc0FsbG93c0Fub255bW91cygpCi0gICAgICAgICYmIChhbGxvd2VkU2NoZW1lcy5jb250YWlucyhEb3dubG9hZFNjaGVtZS5BTk9OX0hUVFApIHx8Ci0gICAgICAgICAgICBhbGxvd2VkU2NoZW1lcy5jb250YWlucyhEb3dubG9hZFNjaGVtZS5ERUZBVUxUX0RPV05MT0FEUykpKSB7Ci0gICAgICBTdHJpbmdCdWlsZGVyIHIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgICAgaWYgKEdlcnJpdC5nZXRDb25maWcoKS5nZXRHaXRIdHRwVXJsKCkgIT0gbnVsbCkgewotICAgICAgICByLmFwcGVuZChHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0R2l0SHR0cFVybCgpKTsKLSAgICAgIH0gZWxzZSB7Ci0gICAgICAgIHIuYXBwZW5kKGhvc3RQYWdlVXJsKTsKLSAgICAgIH0KLSAgICAgIHIuYXBwZW5kKHByb2plY3ROYW1lKTsKLSAgICAgIHIuYXBwZW5kKCIgIik7Ci0gICAgICByLmFwcGVuZChwYXRjaFNldC5nZXRSZWZOYW1lKCkpOwotICAgICAgdXJscy5hZGQobmV3IERvd25sb2FkVXJsTGluayhEb3dubG9hZFNjaGVtZS5BTk9OX0hUVFAsIFV0aWwuTQotICAgICAgICAgIC5hbm9ueW1vdXNEb3dubG9hZCgiSFRUUCIpLCByLnRvU3RyaW5nKCkpKTsKLSAgICB9Ci0KLSAgICBpZiAoR2Vycml0LmdldENvbmZpZygpLmdldFNzaGRBZGRyZXNzKCkgIT0gbnVsbAotICAgICAgICAmJiBoYXNVc2VyTmFtZSgpCi0gICAgICAgICYmIChhbGxvd2VkU2NoZW1lcy5jb250YWlucyhEb3dubG9hZFNjaGVtZS5TU0gpIHx8Ci0gICAgICAgICAgICBhbGxvd2VkU2NoZW1lcy5jb250YWlucyhEb3dubG9hZFNjaGVtZS5ERUZBVUxUX0RPV05MT0FEUykpKSB7Ci0gICAgICBTdHJpbmcgc3NoQWRkciA9IEdlcnJpdC5nZXRDb25maWcoKS5nZXRTc2hkQWRkcmVzcygpOwotICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciByID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgIHIuYXBwZW5kKCJzc2g6Ly8iKTsKLSAgICAgIHIuYXBwZW5kKEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldFVzZXJOYW1lKCkpOwotICAgICAgci5hcHBlbmQoIkAiKTsKLSAgICAgIGlmIChzc2hBZGRyLnN0YXJ0c1dpdGgoIio6IikgfHwgIiIuZXF1YWxzKHNzaEFkZHIpKSB7Ci0gICAgICAgIHIuYXBwZW5kKFdpbmRvdy5Mb2NhdGlvbi5nZXRIb3N0TmFtZSgpKTsKLSAgICAgIH0KLSAgICAgIGlmIChzc2hBZGRyLnN0YXJ0c1dpdGgoIioiKSkgewotICAgICAgICBzc2hBZGRyID0gc3NoQWRkci5zdWJzdHJpbmcoMSk7Ci0gICAgICB9Ci0gICAgICByLmFwcGVuZChzc2hBZGRyKTsKLSAgICAgIHIuYXBwZW5kKCIvIik7Ci0gICAgICByLmFwcGVuZChwcm9qZWN0TmFtZSk7Ci0gICAgICByLmFwcGVuZCgiICIpOwotICAgICAgci5hcHBlbmQocGF0Y2hTZXQuZ2V0UmVmTmFtZSgpKTsKLSAgICAgIHVybHMuYWRkKG5ldyBEb3dubG9hZFVybExpbmsoRG93bmxvYWRTY2hlbWUuU1NILCAiU1NIIiwgci50b1N0cmluZygpKSk7Ci0gICAgfQotCi0gICAgaWYgKChoYXNVc2VyTmFtZSgpIHx8IHNpdGVSZWxpZXNPbkh0dHAoKSkKLSAgICAgICAgJiYgKGFsbG93ZWRTY2hlbWVzLmNvbnRhaW5zKERvd25sb2FkU2NoZW1lLkhUVFApCi0gICAgICAgICAgICB8fCBhbGxvd2VkU2NoZW1lcy5jb250YWlucyhEb3dubG9hZFNjaGVtZS5ERUZBVUxUX0RPV05MT0FEUykpKSB7Ci0gICAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIHIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgICAgaWYgKEdlcnJpdC5nZXRDb25maWcoKS5nZXRHaXRIdHRwVXJsKCkgIT0gbnVsbAotICAgICAgICAgICYmIChjaGFuZ2VEZXRhaWwuaXNBbGxvd3NBbm9ueW1vdXMoKSB8fCBzaXRlUmVsaWVzT25IdHRwKCkpKSB7Ci0gICAgICAgIHIuYXBwZW5kKEdlcnJpdC5nZXRDb25maWcoKS5nZXRHaXRIdHRwVXJsKCkpOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgU3RyaW5nIGJhc2UgPSBob3N0UGFnZVVybDsKLSAgICAgICAgaW50IHAgPSBiYXNlLmluZGV4T2YoIjovLyIpOwotICAgICAgICBpbnQgcyA9IGJhc2UuaW5kZXhPZignLycsIHAgKyAzKTsKLSAgICAgICAgaWYgKHMgPCAwKSB7Ci0gICAgICAgICAgcyA9IGJhc2UubGVuZ3RoKCk7Ci0gICAgICAgIH0KLSAgICAgICAgU3RyaW5nIGhvc3QgPSBiYXNlLnN1YnN0cmluZyhwICsgMywgcyk7Ci0gICAgICAgIGlmIChob3N0LmNvbnRhaW5zKCJAIikpIHsKLSAgICAgICAgICBob3N0ID0gaG9zdC5zdWJzdHJpbmcoaG9zdC5pbmRleE9mKCdAJykgKyAxKTsKLSAgICAgICAgfQotCi0gICAgICAgIHIuYXBwZW5kKGJhc2Uuc3Vic3RyaW5nKDAsIHAgKyAzKSk7Ci0gICAgICAgIHIuYXBwZW5kKEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldFVzZXJOYW1lKCkpOwotICAgICAgICByLmFwcGVuZCgnQCcpOwotICAgICAgICByLmFwcGVuZChob3N0KTsKLSAgICAgICAgci5hcHBlbmQoYmFzZS5zdWJzdHJpbmcocykpOwotICAgICAgfQotICAgICAgci5hcHBlbmQocHJvamVjdE5hbWUpOwotICAgICAgci5hcHBlbmQoIiAiKTsKLSAgICAgIHIuYXBwZW5kKHBhdGNoU2V0LmdldFJlZk5hbWUoKSk7Ci0gICAgICB1cmxzLmFkZChuZXcgRG93bmxvYWRVcmxMaW5rKERvd25sb2FkU2NoZW1lLkhUVFAsICJIVFRQIiwgci50b1N0cmluZygpKSk7Ci0gICAgfQotCi0gICAgaWYgKGFsbG93ZWRTY2hlbWVzLmNvbnRhaW5zKERvd25sb2FkU2NoZW1lLlJFUE9fRE9XTkxPQUQpKSB7CisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIHZvaWQgcG9wdWxhdGVEb3dubG9hZENvbW1hbmRMaW5rcygpIHsKICAgICAgIC8vIFRoaXMgc2l0ZSBwcmVmZXJzIHVzYWdlIG9mIHRoZSAncmVwbycgdG9vbCwgc28gc3VnZ2VzdAogICAgICAgLy8gdGhhdCBmb3IgZWFzeSBmZXRjaC4KICAgICAgIC8vCi0gICAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIHIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgICAgci5hcHBlbmQoInJlcG8gZG93bmxvYWQgIik7Ci0gICAgICByLmFwcGVuZChwcm9qZWN0TmFtZSk7Ci0gICAgICByLmFwcGVuZCgiICIpOwotICAgICAgci5hcHBlbmQoY2hhbmdlRGV0YWlsLmdldENoYW5nZSgpLmdldENoYW5nZUlkKCkpOwotICAgICAgci5hcHBlbmQoIi8iKTsKLSAgICAgIHIuYXBwZW5kKHBhdGNoU2V0LmdldFBhdGNoU2V0SWQoKSk7Ci0gICAgICBmaW5hbCBTdHJpbmcgY21kID0gci50b1N0cmluZygpOwotICAgICAgY29tbWFuZHMuYWRkKG5ldyBEb3dubG9hZENvbW1hbmRMaW5rKERvd25sb2FkQ29tbWFuZC5SRVBPX0RPV05MT0FELAotICAgICAgICAgICJyZXBvIGRvd25sb2FkIikgewotICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgdm9pZCBzZXRDdXJyZW50VXJsKERvd25sb2FkVXJsTGluayBsaW5rKSB7Ci0gICAgICAgICAgdXJscy5zZXRWaXNpYmxlKGZhbHNlKTsKLSAgICAgICAgICBjb3B5TGFiZWwuc2V0VGV4dChjbWQpOworICAgICAgaWYgKGFsbG93ZWRTY2hlbWVzLmNvbnRhaW5zKERvd25sb2FkU2NoZW1lLlJFUE9fRE9XTkxPQUQpKSB7CisgICAgICAgIGNvbW1hbmRzLmFkZChjbWRMaW5rZmFjdG9yeS5uZXcgUmVwb0NvbW1hbmRMaW5rKHByb2plY3ROYW1lLAorICAgICAgICAgICAgY2hhbmdlRGV0YWlsLmdldENoYW5nZSgpLmdldENoYW5nZUlkKCkgKyAiLyIKKyAgICAgICAgICAgICsgcGF0Y2hTZXQuZ2V0UGF0Y2hTZXRJZCgpKSk7CisgICAgICB9CisKKyAgICAgIGlmICghdXJscy5pc0VtcHR5KCkpIHsKKyAgICAgICAgaWYgKGFsbG93ZWRDb21tYW5kcy5jb250YWlucyhEb3dubG9hZENvbW1hbmQuQ0hFQ0tPVVQpCisgICAgICAgICAgICB8fCBhbGxvd2VkQ29tbWFuZHMuY29udGFpbnMoRG93bmxvYWRDb21tYW5kLkRFRkFVTFRfRE9XTkxPQURTKSkgeworICAgICAgICAgIGNvbW1hbmRzLmFkZChjbWRMaW5rZmFjdG9yeS5uZXcgQ2hlY2tvdXRDb21tYW5kTGluaygpKTsKICAgICAgICAgfQotICAgICAgfSk7Ci0gICAgfQotCi0gICAgaWYgKCF1cmxzLmlzRW1wdHkoKSkgewotICAgICAgaWYgKGFsbG93ZWRDb21tYW5kcy5jb250YWlucyhEb3dubG9hZENvbW1hbmQuQ0hFQ0tPVVQpCi0gICAgICAgICAgfHwgYWxsb3dlZENvbW1hbmRzLmNvbnRhaW5zKERvd25sb2FkQ29tbWFuZC5ERUZBVUxUX0RPV05MT0FEUykpIHsKLSAgICAgICAgY29tbWFuZHMuYWRkKG5ldyBEb3dubG9hZENvbW1hbmRMaW5rKERvd25sb2FkQ29tbWFuZC5DSEVDS09VVCwKLSAgICAgICAgICAgICJjaGVja291dCIpIHsKLSAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICB2b2lkIHNldEN1cnJlbnRVcmwoRG93bmxvYWRVcmxMaW5rIGxpbmspIHsKLSAgICAgICAgICAgIHVybHMuc2V0VmlzaWJsZSh0cnVlKTsKLSAgICAgICAgICAgIGNvcHlMYWJlbC5zZXRUZXh0KCJnaXQgZmV0Y2ggIiArIGxpbmsudXJsRGF0YQotICAgICAgICAgICAgICAgICsgIiAmJiBnaXQgY2hlY2tvdXQgRkVUQ0hfSEVBRCIpOwotICAgICAgICAgIH0KLSAgICAgICAgfSk7Ci0gICAgICB9Ci0gICAgICBpZiAoYWxsb3dlZENvbW1hbmRzLmNvbnRhaW5zKERvd25sb2FkQ29tbWFuZC5QVUxMKQotICAgICAgICAgIHx8IGFsbG93ZWRDb21tYW5kcy5jb250YWlucyhEb3dubG9hZENvbW1hbmQuREVGQVVMVF9ET1dOTE9BRFMpKSB7Ci0gICAgICAgIGNvbW1hbmRzLmFkZChuZXcgRG93bmxvYWRDb21tYW5kTGluayhEb3dubG9hZENvbW1hbmQuUFVMTCwgInB1bGwiKSB7Ci0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgdm9pZCBzZXRDdXJyZW50VXJsKERvd25sb2FkVXJsTGluayBsaW5rKSB7Ci0gICAgICAgICAgICB1cmxzLnNldFZpc2libGUodHJ1ZSk7Ci0gICAgICAgICAgICBjb3B5TGFiZWwuc2V0VGV4dCgiZ2l0IHB1bGwgIiArIGxpbmsudXJsRGF0YSk7Ci0gICAgICAgICAgfQotICAgICAgICB9KTsKLSAgICAgIH0KLSAgICAgIGlmIChhbGxvd2VkQ29tbWFuZHMuY29udGFpbnMoRG93bmxvYWRDb21tYW5kLkNIRVJSWV9QSUNLKQotICAgICAgICAgIHx8IGFsbG93ZWRDb21tYW5kcy5jb250YWlucyhEb3dubG9hZENvbW1hbmQuREVGQVVMVF9ET1dOTE9BRFMpKSB7Ci0gICAgICAgIGNvbW1hbmRzLmFkZChuZXcgRG93bmxvYWRDb21tYW5kTGluayhEb3dubG9hZENvbW1hbmQuQ0hFUlJZX1BJQ0ssCi0gICAgICAgICAgICAiY2hlcnJ5LXBpY2siKSB7Ci0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgdm9pZCBzZXRDdXJyZW50VXJsKERvd25sb2FkVXJsTGluayBsaW5rKSB7Ci0gICAgICAgICAgICB1cmxzLnNldFZpc2libGUodHJ1ZSk7Ci0gICAgICAgICAgICBjb3B5TGFiZWwuc2V0VGV4dCgiZ2l0IGZldGNoICIgKyBsaW5rLnVybERhdGEKLSAgICAgICAgICAgICAgICArICIgJiYgZ2l0IGNoZXJyeS1waWNrIEZFVENIX0hFQUQiKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0pOwotICAgICAgfQotICAgICAgaWYgKGFsbG93ZWRDb21tYW5kcy5jb250YWlucyhEb3dubG9hZENvbW1hbmQuRk9STUFUX1BBVENIKQotICAgICAgICAgIHx8IGFsbG93ZWRDb21tYW5kcy5jb250YWlucyhEb3dubG9hZENvbW1hbmQuREVGQVVMVF9ET1dOTE9BRFMpKSB7Ci0gICAgICAgIGNvbW1hbmRzLmFkZChuZXcgRG93bmxvYWRDb21tYW5kTGluayhEb3dubG9hZENvbW1hbmQuRk9STUFUX1BBVENILAotICAgICAgICAgICAgInBhdGNoIikgewotICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgIHZvaWQgc2V0Q3VycmVudFVybChEb3dubG9hZFVybExpbmsgbGluaykgewotICAgICAgICAgICAgdXJscy5zZXRWaXNpYmxlKHRydWUpOwotICAgICAgICAgICAgY29weUxhYmVsLnNldFRleHQoImdpdCBmZXRjaCAiICsgbGluay51cmxEYXRhCi0gICAgICAgICAgICAgICAgKyAiICYmIGdpdCBmb3JtYXQtcGF0Y2ggLTEgLS1zdGRvdXQgRkVUQ0hfSEVBRCIpOwotICAgICAgICAgIH0KLSAgICAgICAgfSk7CisgICAgICAgIGlmIChhbGxvd2VkQ29tbWFuZHMuY29udGFpbnMoRG93bmxvYWRDb21tYW5kLlBVTEwpCisgICAgICAgICAgICB8fCBhbGxvd2VkQ29tbWFuZHMuY29udGFpbnMoRG93bmxvYWRDb21tYW5kLkRFRkFVTFRfRE9XTkxPQURTKSkgeworICAgICAgICAgIGNvbW1hbmRzLmFkZChjbWRMaW5rZmFjdG9yeS5uZXcgUHVsbENvbW1hbmRMaW5rKCkpOworICAgICAgICB9CisgICAgICAgIGlmIChhbGxvd2VkQ29tbWFuZHMuY29udGFpbnMoRG93bmxvYWRDb21tYW5kLkNIRVJSWV9QSUNLKQorICAgICAgICAgICAgfHwgYWxsb3dlZENvbW1hbmRzLmNvbnRhaW5zKERvd25sb2FkQ29tbWFuZC5ERUZBVUxUX0RPV05MT0FEUykpIHsKKyAgICAgICAgICBjb21tYW5kcy5hZGQoY21kTGlua2ZhY3RvcnkubmV3IENoZXJyeVBpY2tDb21tYW5kTGluaygpKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoYWxsb3dlZENvbW1hbmRzLmNvbnRhaW5zKERvd25sb2FkQ29tbWFuZC5GT1JNQVRfUEFUQ0gpCisgICAgICAgICAgICB8fCBhbGxvd2VkQ29tbWFuZHMuY29udGFpbnMoRG93bmxvYWRDb21tYW5kLkRFRkFVTFRfRE9XTkxPQURTKSkgeworICAgICAgICAgIGNvbW1hbmRzLmFkZChjbWRMaW5rZmFjdG9yeS5uZXcgRm9ybWF0UGF0Y2hDb21tYW5kTGluaygpKTsKKyAgICAgICAgfQogICAgICAgfQogICAgIH0KLQotICAgIGZpbmFsIEZsb3dQYW5lbCBmcCA9IG5ldyBGbG93UGFuZWwoKTsKLSAgICBpZiAoIWNvbW1hbmRzLmlzRW1wdHkoKSkgewotICAgICAgZmluYWwgQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlcyBwcmVmOwotICAgICAgaWYgKEdlcnJpdC5pc1NpZ25lZEluKCkpIHsKLSAgICAgICAgcHJlZiA9IEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldEdlbmVyYWxQcmVmZXJlbmNlcygpOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgcHJlZiA9IG5ldyBBY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzKCk7Ci0gICAgICAgIHByZWYucmVzZXRUb0RlZmF1bHRzKCk7Ci0gICAgICB9Ci0gICAgICBjb21tYW5kcy5zZWxlY3QocHJlZi5nZXREb3dubG9hZENvbW1hbmQoKSk7Ci0gICAgICB1cmxzLnNlbGVjdChwcmVmLmdldERvd25sb2FkVXJsKCkpOwotCi0gICAgICBGbG93UGFuZWwgcCA9IG5ldyBGbG93UGFuZWwoKTsKLSAgICAgIHAuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZG93bmxvYWRMaW5rSGVhZGVyKCkpOwotICAgICAgcC5hZGQoY29tbWFuZHMpOwotICAgICAgZmluYWwgSW5saW5lTGFiZWwgZ2x1ZSA9IG5ldyBJbmxpbmVMYWJlbCgpOwotICAgICAgZ2x1ZS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtIZWFkZXJHYXAoKSk7Ci0gICAgICBwLmFkZChnbHVlKTsKLSAgICAgIHAuYWRkKHVybHMpOwotCi0gICAgICBmcC5hZGQocCk7Ci0gICAgICBmcC5hZGQoY29weUxhYmVsKTsKLSAgICB9Ci0gICAgaW5mb1RhYmxlLnNldFdpZGdldChSX0RPV05MT0FELCAxLCBmcCk7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBib29sZWFuIHNpdGVSZWxpZXNPbkh0dHAoKSB7Ci0gICAgcmV0dXJuIEdlcnJpdC5nZXRDb25maWcoKS5nZXRHaXRIdHRwVXJsKCkgIT0gbnVsbAotICAgICAgICAmJiBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0QXV0aFR5cGUoKSA9PSBBdXRoVHlwZS5DVVNUT01fRVhURU5TSU9OCi0gICAgICAgICYmICFHZXJyaXQuZ2V0Q29uZmlnKCkuc2l0ZUhhc1VzZXJuYW1lcygpOwotICB9CisgIHByaXZhdGUgdm9pZCBkaXNwbGF5RG93bmxvYWQoKSB7CisgICAgQ2hhbmdlRG93bmxvYWRQYW5lbCBkcCA9IG5ldyBDaGFuZ2VEb3dubG9hZFBhbmVsKAorICAgICAgY2hhbmdlRGV0YWlsLmdldENoYW5nZSgpLmdldFByb2plY3QoKS5nZXQoKSwKKyAgICAgIHBhdGNoU2V0LmdldFJlZk5hbWUoKSwKKyAgICAgIGNoYW5nZURldGFpbC5pc0FsbG93c0Fub255bW91cygpKTsKIAotICBwcml2YXRlIHN0YXRpYyBib29sZWFuIGhhc1VzZXJOYW1lKCkgewotICAgIHJldHVybiBHZXJyaXQuaXNTaWduZWRJbigpCi0gICAgICAgICYmIEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldFVzZXJOYW1lKCkgIT0gbnVsbAotICAgICAgICAmJiBHZXJyaXQuZ2V0VXNlckFjY291bnQoKS5nZXRVc2VyTmFtZSgpLmxlbmd0aCgpID4gMDsKKyAgICBpbmZvVGFibGUuc2V0V2lkZ2V0KFJfRE9XTkxPQUQsIDEsIGRwKTsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBkaXNwbGF5VXNlcklkZW50aXR5KGZpbmFsIGludCByb3csIGZpbmFsIFVzZXJJZGVudGl0eSB3aG8pIHsKQEAgLTQyMCw4ICsyNTAsNyBAQAogICAgIGZwLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnBhdGNoU2V0VXNlcklkZW50aXR5KCkpOwogICAgIGlmICh3aG8uZ2V0TmFtZSgpICE9IG51bGwpIHsKICAgICAgIGlmICh3aG8uZ2V0QWNjb3VudCgpICE9IG51bGwpIHsKLSAgICAgICAgZnAuYWRkKG5ldyBJbmxpbmVIeXBlcmxpbmsod2hvLmdldE5hbWUoKSwKLSAgICAgICAgICAgIFBhZ2VMaW5rcy50b0FjY291bnRRdWVyeSh3aG8uZ2V0TmFtZSgpKSkpOworICAgICAgICBmcC5hZGQobmV3IEFjY291bnRMaW5rKHdobykpOwogICAgICAgfSBlbHNlIHsKICAgICAgICAgZmluYWwgSW5saW5lTGFiZWwgbGJsID0gbmV3IElubGluZUxhYmVsKHdoby5nZXROYW1lKCkpOwogICAgICAgICBsYmwuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuYWNjb3VudE5hbWUoKSk7CkBAIC00NzUsMTEgKzMwNCwyOSBAQAogICAgICAgICBAT3ZlcnJpZGUKICAgICAgICAgcHVibGljIHZvaWQgb25DbGljayhmaW5hbCBDbGlja0V2ZW50IGV2ZW50KSB7CiAgICAgICAgICAgYi5zZXRFbmFibGVkKGZhbHNlKTsKLSAgICAgICAgICBVdGlsLk1BTkFHRV9TVkMuc3VibWl0KHBhdGNoU2V0LmdldElkKCksCi0gICAgICAgICAgICAgIG5ldyBDaGFuZ2VEZXRhaWxDYWNoZS5HZXJyaXRXaWRnZXRDYWxsYmFjayhiKSB7Ci0gICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKENoYW5nZURldGFpbCByZXN1bHQpIHsKLSAgICAgICAgICAgICAgICAgIG9uU3VibWl0UmVzdWx0KHJlc3VsdCk7Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgIENoYW5nZUFwaS5zdWJtaXQoCisgICAgICAgICAgICAgIHBhdGNoU2V0LmdldElkKCkuZ2V0UGFyZW50S2V5KCkuZ2V0KCksCisgICAgICAgICAgICAgIHBhdGNoU2V0LmdldFJldmlzaW9uKCkuZ2V0KCksCisgICAgICAgICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxTdWJtaXRJbmZvPigpIHsKKyAgICAgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhTdWJtaXRJbmZvIHJlc3VsdCkgeworICAgICAgICAgICAgICAgICAgICByZWRpc3BsYXkoKTsKKyAgICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBlcnIpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKFN1Ym1pdEZhaWx1cmVEaWFsb2cuaXNDb25mbGljdChlcnIpKSB7CisgICAgICAgICAgICAgICAgICAgICAgbmV3IFN1Ym1pdEZhaWx1cmVEaWFsb2coZXJyLmdldE1lc3NhZ2UoKSkuY2VudGVyKCk7CisgICAgICAgICAgICAgICAgICAgICAgcmVkaXNwbGF5KCk7CisgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgICAgYi5zZXRFbmFibGVkKHRydWUpOworICAgICAgICAgICAgICAgICAgICAgIHN1cGVyLm9uRmFpbHVyZShlcnIpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICAgIHByaXZhdGUgdm9pZCByZWRpc3BsYXkoKSB7CisgICAgICAgICAgICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KAorICAgICAgICAgICAgICAgICAgICAgICAgUGFnZUxpbmtzLnRvQ2hhbmdlKHBhdGNoU2V0LmdldElkKCkuZ2V0UGFyZW50S2V5KCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgbmV3IENoYW5nZVNjcmVlbihwYXRjaFNldC5nZXRJZCgpLmdldFBhcmVudEtleSgpKSk7CisgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAgICAgICB9KTsKQEAgLTUwNCw4ICszNTEsMjIgQEAKIAogICAgICAgICAgICAgQE92ZXJyaWRlCiAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblNlbmQoKSB7Ci0gICAgICAgICAgICAgIFV0aWwuTUFOQUdFX1NWQy5yZXZlcnRDaGFuZ2UocGF0Y2hTZXQuZ2V0SWQoKSwgZ2V0TWVzc2FnZVRleHQoKSwKLSAgICAgICAgICAgICAgICAgY3JlYXRlQ2FsbGJhY2soKSk7CisgICAgICAgICAgICAgIENoYW5nZUFwaS5yZXZlcnQoY2hhbmdlRGV0YWlsLmdldENoYW5nZSgpLmdldENoYW5nZUlkKCksCisgICAgICAgICAgICAgICAgICBnZXRNZXNzYWdlVGV4dCgpLCBuZXcgR2Vycml0Q2FsbGJhY2s8Q2hhbmdlSW5mbz4oKSB7CisgICAgICAgICAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoQ2hhbmdlSW5mbyByZXN1bHQpIHsKKyAgICAgICAgICAgICAgICAgICAgICBzZW50ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheShQYWdlTGlua3MudG9DaGFuZ2UobmV3IENoYW5nZS5JZChyZXN1bHQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgLl9udW1iZXIoKSkpKTsKKyAgICAgICAgICAgICAgICAgICAgICBoaWRlKCk7CisgICAgICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICAgICAgICAgICAgICAgICAgICBlbmFibGVCdXR0b25zKHRydWUpOworICAgICAgICAgICAgICAgICAgICAgIHN1cGVyLm9uRmFpbHVyZShjYXVnaHQpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICB9LmNlbnRlcigpOwogICAgICAgICB9CkBAIC01MjcsOCArMzg4LDI1IEBACiAKICAgICAgICAgICAgIEBPdmVycmlkZQogICAgICAgICAgICAgcHVibGljIHZvaWQgb25TZW5kKCkgewotICAgICAgICAgICAgICBVdGlsLk1BTkFHRV9TVkMuYWJhbmRvbkNoYW5nZShwYXRjaFNldC5nZXRJZCgpLCBnZXRNZXNzYWdlVGV4dCgpLAotICAgICAgICAgICAgICAgICAgY3JlYXRlQ2FsbGJhY2soKSk7CisgICAgICAgICAgICAgIC8vIFRPRE86IG9uY2UgdGhlIG90aGVyIHVzZXJzIG9mIEFjdGlvbkRpYWxvZyBoYXZlIGNvbnZlcnRlZCB0bworICAgICAgICAgICAgICAvLyBSRVNUIEFQSXMsIHdlIGNhbiB1c2UgY3JlYXRlQ2FsbGJhY2soKSByYXRoZXIgdGhhbiBwcm92aWRpbmcKKyAgICAgICAgICAgICAgLy8gdGhlbSBkaXJlY3RseS4KKyAgICAgICAgICAgICAgQ2hhbmdlQXBpLmFiYW5kb24oY2hhbmdlRGV0YWlsLmdldENoYW5nZSgpLmdldENoYW5nZUlkKCksCisgICAgICAgICAgICAgICAgICBnZXRNZXNzYWdlVGV4dCgpLCBuZXcgR2Vycml0Q2FsbGJhY2s8Q2hhbmdlSW5mbz4oKSB7CisgICAgICAgICAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoQ2hhbmdlSW5mbyByZXN1bHQpIHsKKyAgICAgICAgICAgICAgICAgICAgICBzZW50ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgICBHZXJyaXQuZGlzcGxheShQYWdlTGlua3MudG9DaGFuZ2UobmV3IENoYW5nZS5JZChyZXN1bHQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgLl9udW1iZXIoKSkpKTsKKyAgICAgICAgICAgICAgICAgICAgICBoaWRlKCk7CisgICAgICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICAgICAgICAgICAgICAgICAgICBlbmFibGVCdXR0b25zKHRydWUpOworICAgICAgICAgICAgICAgICAgICAgIHN1cGVyLm9uRmFpbHVyZShjYXVnaHQpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICB9LmNlbnRlcigpOwogICAgICAgICB9CkBAIC01NzQsOCArNDUyLDIyIEBACiAKICAgICAgICAgICAgIEBPdmVycmlkZQogICAgICAgICAgICAgcHVibGljIHZvaWQgb25TZW5kKCkgewotICAgICAgICAgICAgICBVdGlsLk1BTkFHRV9TVkMucmVzdG9yZUNoYW5nZShwYXRjaFNldC5nZXRJZCgpLCBnZXRNZXNzYWdlVGV4dCgpLAotICAgICAgICAgICAgICAgICAgY3JlYXRlQ2FsbGJhY2soKSk7CisgICAgICAgICAgICAgIENoYW5nZUFwaS5yZXN0b3JlKGNoYW5nZURldGFpbC5nZXRDaGFuZ2UoKS5nZXRDaGFuZ2VJZCgpLAorICAgICAgICAgICAgICAgICAgZ2V0TWVzc2FnZVRleHQoKSwgbmV3IEdlcnJpdENhbGxiYWNrPENoYW5nZUluZm8+KCkgeworICAgICAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKENoYW5nZUluZm8gcmVzdWx0KSB7CisgICAgICAgICAgICAgICAgICAgICAgc2VudCA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgICAgR2Vycml0LmRpc3BsYXkoUGFnZUxpbmtzLnRvQ2hhbmdlKG5ldyBDaGFuZ2UuSWQocmVzdWx0CisgICAgICAgICAgICAgICAgICAgICAgICAgIC5fbnVtYmVyKCkpKSk7CisgICAgICAgICAgICAgICAgICAgICAgaGlkZSgpOworICAgICAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgY2F1Z2h0KSB7CisgICAgICAgICAgICAgICAgICAgICAgZW5hYmxlQnV0dG9ucyh0cnVlKTsKKyAgICAgICAgICAgICAgICAgICAgICBzdXBlci5vbkZhaWx1cmUoY2F1Z2h0KTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgfS5jZW50ZXIoKTsKICAgICAgICAgfQpAQCAtNTk3LDM1ICs0ODksNiBAQAogICAgIH0KICAgfQogCi0gIHByaXZhdGUgdm9pZCBwb3B1bGF0ZURpZmZBbGxBY3Rpb25zKGZpbmFsIFBhdGNoU2V0RGV0YWlsIGRldGFpbCkgewotICAgIGZpbmFsIEJ1dHRvbiBkaWZmQWxsU2lkZUJ5U2lkZSA9IG5ldyBCdXR0b24oVXRpbC5DLmJ1dHRvbkRpZmZBbGxTaWRlQnlTaWRlKCkpOwotICAgIGRpZmZBbGxTaWRlQnlTaWRlLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKLSAgICAgICAgZm9yIChQYXRjaCBwIDogZGV0YWlsLmdldFBhdGNoZXMoKSkgewotICAgICAgICAgIG9wZW5XaW5kb3coRGlzcGF0Y2hlci50b1BhdGNoU2lkZUJ5U2lkZShkaWZmQmFzZUlkLCBwLmdldEtleSgpKSk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9KTsKLSAgICBhY3Rpb25zUGFuZWwuYWRkKGRpZmZBbGxTaWRlQnlTaWRlKTsKLQotICAgIGZpbmFsIEJ1dHRvbiBkaWZmQWxsVW5pZmllZCA9IG5ldyBCdXR0b24oVXRpbC5DLmJ1dHRvbkRpZmZBbGxVbmlmaWVkKCkpOwotICAgIGRpZmZBbGxVbmlmaWVkLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKLSAgICAgICAgZm9yIChQYXRjaCBwIDogZGV0YWlsLmdldFBhdGNoZXMoKSkgewotICAgICAgICAgIG9wZW5XaW5kb3coRGlzcGF0Y2hlci50b1BhdGNoVW5pZmllZChkaWZmQmFzZUlkLCBwLmdldEtleSgpKSk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9KTsKLSAgICBhY3Rpb25zUGFuZWwuYWRkKGRpZmZBbGxVbmlmaWVkKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBvcGVuV2luZG93KFN0cmluZyB0b2tlbikgewotICAgIFN0cmluZyB1cmwgPSBXaW5kb3cuTG9jYXRpb24uZ2V0UGF0aCgpICsgIiMiICsgdG9rZW47Ci0gICAgV2luZG93Lm9wZW4odXJsLCAiX2JsYW5rIiwgbnVsbCk7Ci0gIH0KLQogICBwcml2YXRlIHZvaWQgcG9wdWxhdGVSZXZpZXdBY3Rpb24oKSB7CiAgICAgZmluYWwgQnV0dG9uIGIgPSBuZXcgQnV0dG9uKFV0aWwuQy5idXR0b25SZXZpZXcoKSk7CiAgICAgYi5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKQEAgLTczOSwyOCArNjAyLDYgQEAKICAgICAgICAgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5oZWFkZXIoKSk7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgb25TdWJtaXRSZXN1bHQoZmluYWwgQ2hhbmdlRGV0YWlsIHJlc3VsdCkgewotICAgIGlmIChyZXN1bHQuZ2V0Q2hhbmdlKCkuZ2V0U3RhdHVzKCkgPT0gQ2hhbmdlLlN0YXR1cy5ORVcpIHsKLSAgICAgIC8vIFRoZSBzdWJtaXQgZmFpbGVkLiBUcnkgdG8gbG9jYXRlIHRoZSBtZXNzYWdlIGFuZCBkaXNwbGF5Ci0gICAgICAvLyBpdCB0byB0aGUgdXNlciwgaXQgc2hvdWxkIGJlIHRoZSBsYXN0IG9uZSBjcmVhdGVkIGJ5IEdlcnJpdC4KLSAgICAgIC8vCi0gICAgICBDaGFuZ2VNZXNzYWdlIG1zZyA9IG51bGw7Ci0gICAgICBpZiAocmVzdWx0LmdldE1lc3NhZ2VzKCkgIT0gbnVsbCAmJiByZXN1bHQuZ2V0TWVzc2FnZXMoKS5zaXplKCkgPiAwKSB7Ci0gICAgICAgIGZvciAoaW50IGkgPSByZXN1bHQuZ2V0TWVzc2FnZXMoKS5zaXplKCkgLSAxOyBpID49IDA7IGktLSkgewotICAgICAgICAgIGlmIChyZXN1bHQuZ2V0TWVzc2FnZXMoKS5nZXQoaSkuZ2V0QXV0aG9yKCkgPT0gbnVsbCkgewotICAgICAgICAgICAgbXNnID0gcmVzdWx0LmdldE1lc3NhZ2VzKCkuZ2V0KGkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICB9Ci0KLSAgICAgIGlmIChtc2cgIT0gbnVsbCkgewotICAgICAgICBuZXcgU3VibWl0RmFpbHVyZURpYWxvZyhyZXN1bHQsIG1zZykuY2VudGVyKCk7Ci0gICAgICB9Ci0gICAgfQotICAgIGRldGFpbENhY2hlLnNldChyZXN1bHQpOwotICB9Ci0KICAgcHVibGljIFBhdGNoU2V0IGdldFBhdGNoU2V0KCkgewogICAgIHJldHVybiBwYXRjaFNldDsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUGF0Y2hTZXRzQmxvY2suamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1BhdGNoU2V0c0Jsb2NrLmphdmEKaW5kZXggYjllZDRlNy4uNWE2ZTQyNyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUGF0Y2hTZXRzQmxvY2suamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9QYXRjaFNldHNCbG9jay5qYXZhCkBAIC0xNzYsNiArMTc2LDcgQEAKICAgICAgICAgUGF0Y2hTZXRDb21wbGV4RGlzY2xvc3VyZVBhbmVsIHBhdGNoU2V0UGFuZWwgPQogICAgICAgICAgICAgcGF0Y2hTZXRQYW5lbHMuZ2V0KHBhdGNoU2V0SWQpOwogICAgICAgICBwYXRjaFNldFBhbmVsLnNldEFjdGl2ZSh0cnVlKTsKKyAgICAgICAgcGF0Y2hTZXRQYW5lbC5zZXRPcGVuKHRydWUpOwogICAgICAgICBhY3RpdmVQYXRjaFNldElkID0gcGF0Y2hTZXRJZDsKICAgICAgIH0KICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUGF0Y2hUYWJsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUGF0Y2hUYWJsZS5qYXZhCmluZGV4IGI4YWNkNTYuLmQwMGVmODkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1BhdGNoVGFibGUuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9QYXRjaFRhYmxlLmphdmEKQEAgLTE0LDYgKzE0LDcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlczsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5EaXNwYXRjaGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBhdGNoZXMuUGF0Y2hTY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLklubGluZUh5cGVybGluazsKQEAgLTIyLDExICsyMywxMCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5QYXRjaExpbms7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGF0Y2hTZXREZXRhaWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2guQ2hhbmdlVHlwZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2guS2V5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaC5QYXRjaFR5cGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuR1dUOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5TY2hlZHVsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuU2NoZWR1bGVyLlJlcGVhdGluZ0NvbW1hbmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwpAQCAtMzQsNiArMzQsOCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5Q29kZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LkNvbW1hbmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuV2luZG93OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Db21wb3NpdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxvd1BhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkhUTUxUYWJsZS5DZWxsOwpAQCAtNDQsNyArNDYsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkucHJvZ3Jlc3MuY2xpZW50LlByb2dyZXNzQmFyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2FmZWh0bWwuY2xpZW50LlNhZmVIdG1sOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2FmZWh0bWwuY2xpZW50LlNhZmVIdG1sQnVpbGRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuS2V5VXRpbDsKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CkBAIC0yNDMsOCArMjQ0LDcgQEAKIAogICAgIEtleSB0aGlzS2V5ID0gcGF0Y2guZ2V0S2V5KCk7CiAgICAgUGF0Y2hMaW5rIGxpbms7Ci0gICAgaWYgKHBhdGNoVHlwZSA9PSBQYXRjaFNjcmVlbi5UeXBlLlNJREVfQllfU0lERQotICAgICAgICAmJiBwYXRjaC5nZXRQYXRjaFR5cGUoKSA9PSBQYXRjaC5QYXRjaFR5cGUuVU5JRklFRCkgeworICAgIGlmIChwYXRjaFR5cGUgPT0gUGF0Y2hTY3JlZW4uVHlwZS5TSURFX0JZX1NJREUpIHsKICAgICAgIGxpbmsgPSBuZXcgUGF0Y2hMaW5rLlNpZGVCeVNpZGUoIiIsIGJhc2UsIHRoaXNLZXksIGluZGV4LCBkZXRhaWwsIHRoaXMpOwogICAgIH0gZWxzZSB7CiAgICAgICBsaW5rID0gbmV3IFBhdGNoTGluay5VbmlmaWVkKCIiLCBiYXNlLCB0aGlzS2V5LCBpbmRleCwgZGV0YWlsLCB0aGlzKTsKQEAgLTI5MywxMCArMjkzLDYgQEAKICAgICByZXR1cm4gbGlzdGVuYWJsZVByZWZzOwogICB9CiAKLSAgcHVibGljIHZvaWQgc2V0UHJlZmVyZW5jZXMoTGlzdGVuYWJsZUFjY291bnREaWZmUHJlZmVyZW5jZSBwcmVmcykgewotICAgIGxpc3RlbmFibGVQcmVmcyA9IHByZWZzOwotICB9Ci0KICAgcHJpdmF0ZSBjbGFzcyBNeVRhYmxlIGV4dGVuZHMgTmF2aWdhdGlvblRhYmxlPFBhdGNoPiB7CiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENfUEFUSCA9IDI7CiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IENfRFJBRlQgPSAzOwpAQCAtMzk0LDEzICszOTAsOSBAQAogICAgICAgc2V0Um93SXRlbShyb3csIHBhdGNoKTsKIAogICAgICAgV2lkZ2V0IG5hbWVDb2w7Ci0gICAgICBpZiAocGF0Y2guZ2V0UGF0Y2hUeXBlKCkgPT0gUGF0Y2guUGF0Y2hUeXBlLlVOSUZJRUQpIHsKLSAgICAgICAgbmFtZUNvbCA9IG5ldyBQYXRjaExpbmsuU2lkZUJ5U2lkZShnZXREaXNwbGF5RmlsZU5hbWUocGF0Y2gpLCBiYXNlLAotICAgICAgICAgICAgcGF0Y2guZ2V0S2V5KCksIHJvdyAtIDEsIGRldGFpbCwgUGF0Y2hUYWJsZS50aGlzKTsKLSAgICAgIH0gZWxzZSB7Ci0gICAgICAgIG5hbWVDb2wgPSBuZXcgUGF0Y2hMaW5rLlVuaWZpZWQoZ2V0RGlzcGxheUZpbGVOYW1lKHBhdGNoKSwgYmFzZSwKLSAgICAgICAgICAgIHBhdGNoLmdldEtleSgpLCByb3cgLSAxLCBkZXRhaWwsIFBhdGNoVGFibGUudGhpcyk7Ci0gICAgICB9CisgICAgICBuYW1lQ29sID0gbmV3IFBhdGNoTGluay5TaWRlQnlTaWRlKGdldERpc3BsYXlGaWxlTmFtZShwYXRjaCksIGJhc2UsCisgICAgICAgICAgcGF0Y2guZ2V0S2V5KCksIHJvdyAtIDEsIGRldGFpbCwgUGF0Y2hUYWJsZS50aGlzKTsKKwogICAgICAgaWYgKHBhdGNoLmdldFNvdXJjZUZpbGVOYW1lKCkgIT0gbnVsbCkgewogICAgICAgICBmaW5hbCBTdHJpbmcgdGV4dDsKICAgICAgICAgaWYgKHBhdGNoLmdldENoYW5nZVR5cGUoKSA9PSBQYXRjaC5DaGFuZ2VUeXBlLlJFTkFNRUQpIHsKQEAgLTQyMCwxOCArNDEyLDQzIEBACiAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBDX1BBVEgsIG5hbWVDb2wpOwogCiAgICAgICBpbnQgQ19VTklGSUVEID0gQ19TSURFQllTSURFICsgMTsKLSAgICAgIGlmIChwYXRjaC5nZXRQYXRjaFR5cGUoKSA9PSBQYXRjaC5QYXRjaFR5cGUuVU5JRklFRCkgewotICAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBDX1NJREVCWVNJREUsIG5ldyBQYXRjaExpbmsuU2lkZUJ5U2lkZSgKLSAgICAgICAgICAgIFV0aWwuQy5wYXRjaFRhYmxlRGlmZlNpZGVCeVNpZGUoKSwgYmFzZSwgcGF0Y2guZ2V0S2V5KCksIHJvdyAtIDEsCi0gICAgICAgICAgICBkZXRhaWwsIFBhdGNoVGFibGUudGhpcykpOwotICAgICAgfSBlbHNlIGlmIChwYXRjaC5nZXRQYXRjaFR5cGUoKSA9PSBQYXRjaC5QYXRjaFR5cGUuQklOQVJZKSB7Ci0gICAgICAgIENfVU5JRklFRCA9IENfU0lERUJZU0lERSArIDI7Ci0gICAgICB9CisgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBDX1NJREVCWVNJREUsIG5ldyBQYXRjaExpbmsuU2lkZUJ5U2lkZSgKKyAgICAgICAgICBVdGlsLkMucGF0Y2hUYWJsZURpZmZTaWRlQnlTaWRlKCksIGJhc2UsIHBhdGNoLmdldEtleSgpLCByb3cgLSAxLAorICAgICAgICAgIGRldGFpbCwgUGF0Y2hUYWJsZS50aGlzKSk7CiAgICAgICB0YWJsZS5zZXRXaWRnZXQocm93LCBDX1VOSUZJRUQsIG5ldyBQYXRjaExpbmsuVW5pZmllZCgKICAgICAgICAgICBVdGlsLkMucGF0Y2hUYWJsZURpZmZVbmlmaWVkKCksIGJhc2UsIHBhdGNoLmdldEtleSgpLCByb3cgLSAxLAogICAgICAgICAgIGRldGFpbCwgUGF0Y2hUYWJsZS50aGlzKSk7CiAgICAgfQogCisgICAgdm9pZCBpbml0aWFsaXplTGFzdFJvdyhpbnQgcm93KSB7CisgICAgICBBbmNob3Igc2lkZUJ5U2lkZSA9IG5ldyBBbmNob3IoVXRpbC5DLmRpZmZBbGxTaWRlQnlTaWRlKCkpOworICAgICAgc2lkZUJ5U2lkZS5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHB1YmxpYyB2b2lkIG9uQ2xpY2soQ2xpY2tFdmVudCBldmVudCkgeworICAgICAgICAgIGZvciAoUGF0Y2ggcCA6IGRldGFpbC5nZXRQYXRjaGVzKCkpIHsKKyAgICAgICAgICAgIG9wZW5XaW5kb3coRGlzcGF0Y2hlci50b1BhdGNoU2lkZUJ5U2lkZShiYXNlLCBwLmdldEtleSgpKSk7CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICB9KTsKKyAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIENfU0lERUJZU0lERSAtIDIsIHNpZGVCeVNpZGUpOworCisgICAgICBpbnQgQ19VTklGSUVEID0gQ19TSURFQllTSURFIC0gMiArIDE7CisgICAgICBBbmNob3IgdW5pZmllZCA9IG5ldyBBbmNob3IoVXRpbC5DLmRpZmZBbGxVbmlmaWVkKCkpOworICAgICAgdW5pZmllZC5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKKyAgICAgICAgcHVibGljIHZvaWQgb25DbGljayhDbGlja0V2ZW50IGV2ZW50KSB7CisgICAgICAgICAgZm9yIChQYXRjaCBwIDogZGV0YWlsLmdldFBhdGNoZXMoKSkgeworICAgICAgICAgICAgb3BlbldpbmRvdyhEaXNwYXRjaGVyLnRvUGF0Y2hVbmlmaWVkKGJhc2UsIHAuZ2V0S2V5KCkpKTsKKyAgICAgICAgICB9CisgICAgICAgIH07CisgICAgICB9KTsKKyAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIENfVU5JRklFRCwgdW5pZmllZCk7CisgICAgfQorCisgICAgcHJpdmF0ZSB2b2lkIG9wZW5XaW5kb3coU3RyaW5nIHRva2VuKSB7CisgICAgICBTdHJpbmcgdXJsID0gV2luZG93LkxvY2F0aW9uLmdldFBhdGgoKSArICIjIiArIHRva2VuOworICAgICAgV2luZG93Lm9wZW4odXJsLCAiX2JsYW5rIiwgbnVsbCk7CisgICAgfQorCiAgICAgdm9pZCBhcHBlbmRIZWFkZXIoZmluYWwgU2FmZUh0bWxCdWlsZGVyIG0pIHsKICAgICAgIG0ub3BlblRyKCk7CiAKQEAgLTUzMCw0OSArNTQ3LDkgQEAKICAgICAgIGFwcGVuZFNpemUobSwgcCk7CiAgICAgICBtLmNsb3NlVGQoKTsKIAotICAgICAgc3dpdGNoIChwLmdldFBhdGNoVHlwZSgpKSB7Ci0gICAgICAgIGNhc2UgVU5JRklFRDoKLSAgICAgICAgICBvcGVubGluayhtLCAyKTsKLSAgICAgICAgICBtLmNsb3NlVGQoKTsKLSAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIEJJTkFSWTogewotICAgICAgICAgIFN0cmluZyBiYXNlID0gR1dULmdldEhvc3RQYWdlQmFzZVVSTCgpOwotICAgICAgICAgIGJhc2UgKz0gImNhdC8iICsgS2V5VXRpbC5lbmNvZGUocC5nZXRLZXkoKS50b1N0cmluZygpKTsKLSAgICAgICAgICBzd2l0Y2ggKHAuZ2V0Q2hhbmdlVHlwZSgpKSB7Ci0gICAgICAgICAgICBjYXNlIERFTEVURUQ6Ci0gICAgICAgICAgICBjYXNlIE1PRElGSUVEOgotICAgICAgICAgICAgICBvcGVubGluayhtLCAxKTsKLSAgICAgICAgICAgICAgbS5vcGVuQW5jaG9yKCk7Ci0gICAgICAgICAgICAgIG0uc2V0QXR0cmlidXRlKCJocmVmIiwgYmFzZSArICJeMSIpOwotICAgICAgICAgICAgICBtLmFwcGVuZChVdGlsLkMucGF0Y2hUYWJsZURvd25sb2FkUHJlSW1hZ2UoKSk7Ci0gICAgICAgICAgICAgIGNsb3NlbGluayhtKTsKLSAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICBlbXB0eWNlbGwobSwgMSk7Ci0gICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgIH0KLSAgICAgICAgICBzd2l0Y2ggKHAuZ2V0Q2hhbmdlVHlwZSgpKSB7Ci0gICAgICAgICAgICBjYXNlIE1PRElGSUVEOgotICAgICAgICAgICAgY2FzZSBBRERFRDoKLSAgICAgICAgICAgICAgb3BlbmxpbmsobSwgMSk7Ci0gICAgICAgICAgICAgIG0ub3BlbkFuY2hvcigpOwotICAgICAgICAgICAgICBtLnNldEF0dHJpYnV0ZSgiaHJlZiIsIGJhc2UgKyAiXjAiKTsKLSAgICAgICAgICAgICAgbS5hcHBlbmQoVXRpbC5DLnBhdGNoVGFibGVEb3dubG9hZFBvc3RJbWFnZSgpKTsKLSAgICAgICAgICAgICAgY2xvc2VsaW5rKG0pOwotICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgIGVtcHR5Y2VsbChtLCAxKTsKLSAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgfQotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0KLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICBlbXB0eWNlbGwobSwgMik7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KKyAgICAgIC8vIERpZmYKKyAgICAgIG9wZW5saW5rKG0sIDIpOworICAgICAgbS5jbG9zZVRkKCk7CiAgICAgICBvcGVubGluayhtLCAxKTsKICAgICAgIG0uY2xvc2VUZCgpOwogCkBAIC01OTEsNyArNTY4LDcgQEAKICAgICAgIG0uY2xvc2VUcigpOwogICAgIH0KIAotICAgIHZvaWQgYXBwZW5kVG90YWxzKGZpbmFsIFNhZmVIdG1sQnVpbGRlciBtLCBpbnQgaW5zLCBpbnQgZGVscywKKyAgICB2b2lkIGFwcGVuZExhc3RSb3coZmluYWwgU2FmZUh0bWxCdWlsZGVyIG0sIGludCBpbnMsIGludCBkZWxzLAogICAgICAgICBmaW5hbCBib29sZWFuIGlzUmV2ZXJzZURpZmYpIHsKICAgICAgIG0ub3BlblRyKCk7CiAKQEAgLTYxNyw2ICs1OTQsMTIgQEAKICAgICAgIG0uYXBwZW5kKFV0aWwuTS5wYXRjaFRhYmxlU2l6ZV9Nb2RpZnkoaW5zLCBkZWxzKSk7CiAgICAgICBtLmNsb3NlVGQoKTsKIAorICAgICAgb3BlbmxpbmsobSwgMik7CisgICAgICBtLmNsb3NlVGQoKTsKKworICAgICAgb3BlbmxpbmsobSwgMSk7CisgICAgICBtLmNsb3NlVGQoKTsKKwogICAgICAgbS5jbG9zZVRyKCk7CiAgICAgfQogCkBAIC02NDksMTQgKzYzMiwxOSBAQAogICAgICAgICAgIGNhc2UgQURERUQ6CiAgICAgICAgICAgICBtLmFwcGVuZChVdGlsLk0ucGF0Y2hUYWJsZVNpemVfTGluZXMoaW5zKSk7CiAgICAgICAgICAgICBicmVhazsKKwogICAgICAgICAgIGNhc2UgREVMRVRFRDoKICAgICAgICAgICAgIG0ubmJzcCgpOwogICAgICAgICAgICAgYnJlYWs7CisKICAgICAgICAgICBjYXNlIE1PRElGSUVEOgogICAgICAgICAgIGNhc2UgQ09QSUVEOgogICAgICAgICAgIGNhc2UgUkVOQU1FRDoKICAgICAgICAgICAgIG0uYXBwZW5kKFV0aWwuTS5wYXRjaFRhYmxlU2l6ZV9Nb2RpZnkoaW5zLCBkZWxzKSk7CiAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgIGNhc2UgUkVXUklURToKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICB9IGVsc2UgewogICAgICAgICBtLm5ic3AoKTsKQEAgLTY3MCwyMCArNjU4LDYgQEAKICAgICAgIG0uc2V0QXR0cmlidXRlKCJjb2xzcGFuIiwgY29sc3Bhbik7CiAgICAgfQogCi0gICAgcHJpdmF0ZSB2b2lkIGNsb3NlbGluayhmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSkgewotICAgICAgbS5jbG9zZUFuY2hvcigpOwotICAgICAgbS5jbG9zZVRkKCk7Ci0gICAgfQotCi0gICAgcHJpdmF0ZSB2b2lkIGVtcHR5Y2VsbChmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSwgZmluYWwgaW50IGNvbHNwYW4pIHsKLSAgICAgIG0ub3BlblRkKCk7Ci0gICAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRhdGFDZWxsKCkpOwotICAgICAgbS5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmTGlua0NlbGwoKSk7Ci0gICAgICBtLnNldEF0dHJpYnV0ZSgiY29sc3BhbiIsIGNvbHNwYW4pOwotICAgICAgbS5uYnNwKCk7Ci0gICAgICBtLmNsb3NlVGQoKTsKLSAgICB9Ci0KICAgICBAT3ZlcnJpZGUKICAgICBwcm90ZWN0ZWQgT2JqZWN0IGdldFJvd0l0ZW1LZXkoZmluYWwgUGF0Y2ggaXRlbSkgewogICAgICAgcmV0dXJuIGl0ZW0uZ2V0S2V5KCk7CkBAIC03ODcsOCArNzYxLDkgQEAKICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgfQotICAgICAgICAgIHRhYmxlLmFwcGVuZFRvdGFscyhuYywgaW5zZXJ0aW9ucywgZGVsZXRpb25zLCBpc1JldmVyc2VEaWZmKTsKKyAgICAgICAgICB0YWJsZS5hcHBlbmRMYXN0Um93KG5jLCBpbnNlcnRpb25zLCBkZWxldGlvbnMsIGlzUmV2ZXJzZURpZmYpOwogICAgICAgICAgIHRhYmxlLnJlc2V0SHRtbChuYyk7CisgICAgICAgICAgdGFibGUuaW5pdGlhbGl6ZUxhc3RSb3cocm93ICsgMSk7CiAgICAgICAgICAgbmMgPSBudWxsOwogICAgICAgICAgIHN0YWdlID0gMTsKICAgICAgICAgICByb3cgPSAwOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUHJvamVjdERhc2hib2FyZFNjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUHJvamVjdERhc2hib2FyZFNjcmVlbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg5OWU4NmIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9Qcm9qZWN0RGFzaGJvYXJkU2NyZWVuLmphdmEKQEAgLTAsMCArMSw2NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWRtaW4uUHJvamVjdFNjcmVlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSW5saW5lSHlwZXJsaW5rOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxvd1BhbmVsOworCitwdWJsaWMgY2xhc3MgUHJvamVjdERhc2hib2FyZFNjcmVlbiBleHRlbmRzIFByb2plY3RTY3JlZW4gaW1wbGVtZW50cyBDaGFuZ2VMaXN0U2NyZWVuIHsKKyAgcHJpdmF0ZSBEYXNoYm9hcmRUYWJsZSB0YWJsZTsKKyAgcHJpdmF0ZSBTdHJpbmcgcGFyYW1zOworCisgIHB1YmxpYyBQcm9qZWN0RGFzaGJvYXJkU2NyZWVuKGZpbmFsIFByb2plY3QuTmFtZUtleSB0b1Nob3csIFN0cmluZyBwYXJhbXMpIHsKKyAgICBzdXBlcih0b1Nob3cpOworICAgIHRoaXMucGFyYW1zID0gcGFyYW1zOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIG9uSW5pdFVJKCkgeworICAgIHRhYmxlID0gbmV3IERhc2hib2FyZFRhYmxlKHBhcmFtcykgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwcm90ZWN0ZWQgdm9pZCBvbkxvYWQoKSB7CisgICAgICAgIHN1cGVyLm9uTG9hZCgpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIGZpbmlzaERpc3BsYXkoKSB7CisgICAgICAgIHN1cGVyLmZpbmlzaERpc3BsYXkoKTsKKyAgICAgICAgZGlzcGxheSgpOworICAgICAgfQorICAgIH07CisKKyAgICBzdXBlci5vbkluaXRVSSgpOworCisgICAgU3RyaW5nIHRpdGxlID0gdGFibGUuZ2V0VGl0bGUoKTsKKyAgICBpZiAodGl0bGUgIT0gbnVsbCkgeworICAgICAgRmxvd1BhbmVsIGZwID0gbmV3IEZsb3dQYW5lbCgpOworICAgICAgZnAuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuc2NyZWVuSGVhZGVyKCkpOworICAgICAgZnAuYWRkKG5ldyBJbmxpbmVIeXBlcmxpbmsodGl0bGUsIFBhZ2VMaW5rcy50b0N1c3RvbURhc2hib2FyZChwYXJhbXMpKSk7CisgICAgICBhZGQoZnApOworICAgIH0KKworICAgIGFkZCh0YWJsZSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgcmVnaXN0ZXJLZXlzKCkgeworICAgIHN1cGVyLnJlZ2lzdGVyS2V5cygpOworICAgIHRhYmxlLnNldFJlZ2lzdGVyS2V5cyh0cnVlKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUHVibGlzaENvbW1lbnRTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1B1Ymxpc2hDb21tZW50U2NyZWVuLmphdmEKaW5kZXggNDcwNWFhZC4uOTc5NDllMyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUHVibGlzaENvbW1lbnRTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9QdWJsaXNoQ29tbWVudFNjcmVlbi5qYXZhCkBAIC0xNSwyOSArMTUsMzEgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLkNoYW5nZUluZm8uQXBwcm92YWxJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLkNoYW5nZUluZm8uTGFiZWxJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wYXRjaGVzLkFic3RyYWN0UGF0Y2hDb250ZW50VGFibGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBhdGNoZXMuQ29tbWVudEVkaXRvckNvbnRhaW5lcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucGF0Y2hlcy5Db21tZW50RWRpdG9yUGFuZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBhdGNoZXMuUGF0Y2hVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuQ2FsbGJhY2tHcm91cDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuTmF0aXZlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLlJlc3RBcGk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5TY3JlZW5Mb2FkQ2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkFjY291bnRTY3JlZW47CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkNvbW1lbnRMaW5rUHJvY2Vzc29yOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5QYXRjaExpbms7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlNtYWxsSGVhZGluZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNoYW5nZURldGFpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QYXRjaFNldFB1Ymxpc2hEZXRhaWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvblJhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkphdmFTY3JpcHRPYmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSnNBcnJheVN0cmluZzsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQucnBjLkFzeW5jQ2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQnV0dG9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Gb3JtUGFuZWw7CkBAIC00NywxMyArNDksMTQgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5WZXJ0aWNhbFBhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLldpZGdldDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuTnBUZXh0QXJlYTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbEJ1aWxkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7Ci1pbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIApAQCAtNjIsNiArNjUsNyBAQAogICBwcml2YXRlIHN0YXRpYyBTYXZlZFN0YXRlIGxhc3RTdGF0ZTsKIAogICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7CisgIHByaXZhdGUgU3RyaW5nIHJldmlzaW9uOwogICBwcml2YXRlIENvbGxlY3Rpb248VmFsdWVSYWRpb0J1dHRvbj4gYXBwcm92YWxCdXR0b25zOwogICBwcml2YXRlIENoYW5nZURlc2NyaXB0aW9uQmxvY2sgZGVzY0Jsb2NrOwogICBwcml2YXRlIEFwcHJvdmFsVGFibGUgYXBwcm92YWxzOwpAQCAtNzMsNiArNzcsNyBAQAogICBwcml2YXRlIEJ1dHRvbiBjYW5jZWw7CiAgIHByaXZhdGUgYm9vbGVhbiBzYXZlU3RhdGVPblVubG9hZCA9IHRydWU7CiAgIHByaXZhdGUgTGlzdDxDb21tZW50RWRpdG9yUGFuZWw+IGNvbW1lbnRFZGl0b3JzOworICBwcml2YXRlIENoYW5nZUluZm8gY2hhbmdlOwogCiAgIHB1YmxpYyBQdWJsaXNoQ29tbWVudFNjcmVlbihmaW5hbCBQYXRjaFNldC5JZCBwc2kpIHsKICAgICBwYXRjaFNldElkID0gcHNpOwpAQCAtMTQxLDcgKzE0NiwyMiBAQAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgb25Mb2FkKCkgewogICAgIHN1cGVyLm9uTG9hZCgpOwotICAgIFV0aWwuREVUQUlMX1NWQy5wYXRjaFNldFB1Ymxpc2hEZXRhaWwocGF0Y2hTZXRJZCwKKworICAgIENhbGxiYWNrR3JvdXAgY2JzID0gbmV3IENhbGxiYWNrR3JvdXAoKTsKKyAgICBDaGFuZ2VBcGkucmV2aXNpb24ocGF0Y2hTZXRJZCkudmlldygicmV2aWV3IikuZ2V0KGNicy5hZGQoCisgICAgICAgIG5ldyBBc3luY0NhbGxiYWNrPENoYW5nZUluZm8+KCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhDaGFuZ2VJbmZvIHJlc3VsdCkgeworICAgICAgICAgICAgcmVzdWx0LmluaXQoKTsKKyAgICAgICAgICAgIGNoYW5nZSA9IHJlc3VsdDsKKyAgICAgICAgICB9CisKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoVGhyb3dhYmxlIGNhdWdodCkgeworICAgICAgICAgICAgLy8gSGFuZGxlZCBieSBTY3JlZW5Mb2FkQ2FsbGJhY2sub25GYWlsdXJlKCkuCisgICAgICAgICAgfQorICAgICAgICB9KSk7CisgICAgVXRpbC5ERVRBSUxfU1ZDLnBhdGNoU2V0UHVibGlzaERldGFpbChwYXRjaFNldElkLCBjYnMuYWRkR3d0anNvbnJwYygKICAgICAgICAgbmV3IFNjcmVlbkxvYWRDYWxsYmFjazxQYXRjaFNldFB1Ymxpc2hEZXRhaWw+KHRoaXMpIHsKICAgICAgICAgICBAT3ZlcnJpZGUKICAgICAgICAgICBwcm90ZWN0ZWQgdm9pZCBwcmVEaXNwbGF5KGZpbmFsIFBhdGNoU2V0UHVibGlzaERldGFpbCByZXN1bHQpIHsKQEAgLTE1Myw3ICsxNzMsNyBAQAogICAgICAgICAgIHByb3RlY3RlZCB2b2lkIHBvc3REaXNwbGF5KCkgewogICAgICAgICAgICAgbWVzc2FnZS5zZXRGb2N1cyh0cnVlKTsKICAgICAgICAgICB9Ci0gICAgICAgIH0pOworICAgICAgICB9KSk7CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTIyMiw0NyArMjQyLDUzIEBACiAgICAgbXdyYXAuYWRkKG1lc3NhZ2UpOwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIGluaXRBcHByb3ZhbHMoZmluYWwgUGF0Y2hTZXRQdWJsaXNoRGV0YWlsIHIsIGZpbmFsIFBhbmVsIGJvZHkpIHsKLSAgICBBcHByb3ZhbFR5cGVzIHR5cGVzID0gR2Vycml0LmdldENvbmZpZygpLmdldEFwcHJvdmFsVHlwZXMoKTsKLSAgICBmb3IgKFBlcm1pc3Npb25SYW5nZSByYW5nZSA6IHIuZ2V0TGFiZWxzKCkpIHsKLSAgICAgIEFwcHJvdmFsVHlwZSB0eXBlID0gdHlwZXMuYnlMYWJlbChyYW5nZS5nZXRMYWJlbCgpKTsKLSAgICAgIGlmICh0eXBlICE9IG51bGwpIHsKLSAgICAgICAgLy8gTGVnYWN5IHR5cGUsIHVzZSByYWRpbyBidXR0b25zLgotICAgICAgICBpbml0QXBwcm92YWxUeXBlKHIsIGJvZHksIHR5cGUsIHJhbmdlKTsKLSAgICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIFRPRE8gTmV3ZXIgc3R5bGUgbGFiZWwuCi0gICAgICB9CisgIHByaXZhdGUgdm9pZCBpbml0QXBwcm92YWxzKFBhbmVsIGJvZHkpIHsKKyAgICBmb3IgKFN0cmluZyBsYWJlbE5hbWUgOiBjaGFuZ2UubGFiZWxzKCkpIHsKKyAgICAgIGluaXRMYWJlbChsYWJlbE5hbWUsIGJvZHkpOwogICAgIH0KICAgfQogCi0gIHByaXZhdGUgdm9pZCBpbml0QXBwcm92YWxUeXBlKGZpbmFsIFBhdGNoU2V0UHVibGlzaERldGFpbCByLAotICAgICAgZmluYWwgUGFuZWwgYm9keSwgZmluYWwgQXBwcm92YWxUeXBlIGN0LCBmaW5hbCBQZXJtaXNzaW9uUmFuZ2UgcmFuZ2UpIHsKLSAgICBib2R5LmFkZChuZXcgU21hbGxIZWFkaW5nKGN0LmdldENhdGVnb3J5KCkuZ2V0TmFtZSgpICsgIjoiKSk7CisgIHByaXZhdGUgdm9pZCBpbml0TGFiZWwoU3RyaW5nIGxhYmVsTmFtZSwgUGFuZWwgYm9keSkgeworICAgIGlmICghY2hhbmdlLmhhc19wZXJtaXR0ZWRfbGFiZWxzKCkpIHsKKyAgICAgIHJldHVybjsKKyAgICB9CisgICAgSnNBcnJheVN0cmluZyBuYXRpdmVWYWx1ZXMgPSBjaGFuZ2UucGVybWl0dGVkX3ZhbHVlcyhsYWJlbE5hbWUpOworICAgIGlmIChuYXRpdmVWYWx1ZXMgPT0gbnVsbCB8fCBuYXRpdmVWYWx1ZXMubGVuZ3RoKCkgPT0gMCkgeworICAgICAgcmV0dXJuOworICAgIH0KKyAgICBMaXN0PFN0cmluZz4gdmFsdWVzID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KG5hdGl2ZVZhbHVlcy5sZW5ndGgoKSk7CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBuYXRpdmVWYWx1ZXMubGVuZ3RoKCk7IGkrKykgeworICAgICAgdmFsdWVzLmFkZChuYXRpdmVWYWx1ZXMuZ2V0KGkpKTsKKyAgICB9CisgICAgQ29sbGVjdGlvbnMucmV2ZXJzZSh2YWx1ZXMpOworICAgIExhYmVsSW5mbyBsYWJlbCA9IGNoYW5nZS5sYWJlbChsYWJlbE5hbWUpOwogCi0gICAgZmluYWwgVmVydGljYWxQYW5lbCB2cCA9IG5ldyBWZXJ0aWNhbFBhbmVsKCk7Ci0gICAgdnAuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuYXBwcm92YWxDYXRlZ29yeUxpc3QoKSk7Ci0gICAgZmluYWwgTGlzdDxBcHByb3ZhbENhdGVnb3J5VmFsdWU+IGxzdCA9Ci0gICAgICAgIG5ldyBBcnJheUxpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPihjdC5nZXRWYWx1ZXMoKSk7Ci0gICAgQ29sbGVjdGlvbnMucmV2ZXJzZShsc3QpOwotICAgIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgY2F0SWQgPSBjdC5nZXRDYXRlZ29yeSgpLmdldElkKCk7Ci0gICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBwcmlvciA9IHIuZ2V0Q2hhbmdlQXBwcm92YWwoY2F0SWQpOworICAgIGJvZHkuYWRkKG5ldyBTbWFsbEhlYWRpbmcobGFiZWwubmFtZSgpICsgIjoiKSk7CiAKLSAgICBmb3IgKGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSBidXR0b25WYWx1ZSA6IGxzdCkgewotICAgICAgaWYgKCFyYW5nZS5jb250YWlucyhidXR0b25WYWx1ZS5nZXRWYWx1ZSgpKSkgewotICAgICAgICBjb250aW51ZTsKKyAgICBWZXJ0aWNhbFBhbmVsIHZwID0gbmV3IFZlcnRpY2FsUGFuZWwoKTsKKyAgICB2cC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5sYWJlbExpc3QoKSk7CisKKyAgICBTaG9ydCBwcmlvciA9IG51bGw7CisgICAgaWYgKGxhYmVsLmFsbCgpICE9IG51bGwpIHsKKyAgICAgIGZvciAoQXBwcm92YWxJbmZvIGFwcCA6IE5hdGl2ZXMuYXNMaXN0KGxhYmVsLmFsbCgpKSkgeworICAgICAgICBpZiAoYXBwLl9hY2NvdW50X2lkKCkgPT0gR2Vycml0LmdldFVzZXJBY2NvdW50KCkuZ2V0SWQoKS5nZXQoKSkgeworICAgICAgICAgIHByaW9yID0gYXBwLnZhbHVlKCk7CisgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICAgIH0KKyAgICB9CiAKLSAgICAgIGZpbmFsIFZhbHVlUmFkaW9CdXR0b24gYiA9Ci0gICAgICAgICAgbmV3IFZhbHVlUmFkaW9CdXR0b24oYnV0dG9uVmFsdWUsIGN0LmdldENhdGVnb3J5KCkuZ2V0TmFtZSgpKTsKLSAgICAgIGIuc2V0VGV4dChidXR0b25WYWx1ZS5mb3JtYXQoKSk7CisgICAgZm9yIChTdHJpbmcgdmFsdWUgOiB2YWx1ZXMpIHsKKyAgICAgIFZhbHVlUmFkaW9CdXR0b24gYiA9IG5ldyBWYWx1ZVJhZGlvQnV0dG9uKGxhYmVsLCB2YWx1ZSk7CisgICAgICBTYWZlSHRtbCBidWYgPSBuZXcgU2FmZUh0bWxCdWlsZGVyKCkuYXBwZW5kKGIuZm9ybWF0KCkpOworICAgICAgYnVmID0gQ29tbWVudExpbmtQcm9jZXNzb3IuYXBwbHkoYnVmKTsKKyAgICAgIFNhZmVIdG1sLnNldChiLCBidWYpOwogCiAgICAgICBpZiAobGFzdFN0YXRlICE9IG51bGwgJiYgcGF0Y2hTZXRJZC5lcXVhbHMobGFzdFN0YXRlLnBhdGNoU2V0SWQpCi0gICAgICAgICAgJiYgbGFzdFN0YXRlLmFwcHJvdmFscy5jb250YWluc0tleShidXR0b25WYWx1ZS5nZXRDYXRlZ29yeUlkKCkpKSB7Ci0gICAgICAgIGIuc2V0VmFsdWUobGFzdFN0YXRlLmFwcHJvdmFscy5nZXQoYnV0dG9uVmFsdWUuZ2V0Q2F0ZWdvcnlJZCgpKS5lcXVhbHMoCi0gICAgICAgICAgICBidXR0b25WYWx1ZSkpOworICAgICAgICAgICYmIGxhc3RTdGF0ZS5hcHByb3ZhbHMuY29udGFpbnNLZXkobGFiZWwubmFtZSgpKSkgeworICAgICAgICBiLnNldFZhbHVlKGxhc3RTdGF0ZS5hcHByb3ZhbHMuZ2V0KGxhYmVsLm5hbWUoKSkgPT0gdmFsdWUpOwogICAgICAgfSBlbHNlIHsKLSAgICAgICAgYi5zZXRWYWx1ZShwcmlvciAhPSBudWxsID8gYnV0dG9uVmFsdWUuZ2V0VmFsdWUoKSA9PSBwcmlvci5nZXRWYWx1ZSgpCi0gICAgICAgICAgICA6IGJ1dHRvblZhbHVlLmdldFZhbHVlKCkgPT0gMCk7CisgICAgICAgIGIuc2V0VmFsdWUoYi5wYXJzZVZhbHVlKCkgPT0gKHByaW9yICE9IG51bGwgPyBwcmlvciA6IDApKTsKICAgICAgIH0KIAogICAgICAgYXBwcm92YWxCdXR0b25zLmFkZChiKTsKQEAgLTI3NCwxMyArMzAwLDEyIEBACiAgIHByaXZhdGUgdm9pZCBkaXNwbGF5KGZpbmFsIFBhdGNoU2V0UHVibGlzaERldGFpbCByKSB7CiAgICAgc2V0UGFnZVRpdGxlKFV0aWwuTS5wdWJsaXNoQ29tbWVudHMoci5nZXRDaGFuZ2UoKS5nZXRLZXkoKS5hYmJyZXZpYXRlKCksCiAgICAgICAgIHBhdGNoU2V0SWQuZ2V0KCkpKTsKLSAgICBkZXNjQmxvY2suZGlzcGxheShyLmdldENoYW5nZSgpLCBudWxsLCByLmdldFBhdGNoU2V0SW5mbygpLCByLmdldEFjY291bnRzKCkpOworICAgIGRlc2NCbG9jay5kaXNwbGF5KHIuZ2V0Q2hhbmdlKCksIG51bGwsIGZhbHNlLCByLmdldFBhdGNoU2V0SW5mbygpLCByLmdldEFjY291bnRzKCksCisgICAgICAgIHIuZ2V0U3VibWl0VHlwZVJlY29yZCgpKTsKIAogICAgIGlmIChyLmdldENoYW5nZSgpLmdldFN0YXR1cygpLmlzT3BlbigpKSB7Ci0gICAgICBpbml0QXBwcm92YWxzKHIsIGFwcHJvdmFsUGFuZWwpOwotCi0gICAgICBhcHByb3ZhbHMuc2V0QWNjb3VudEluZm9DYWNoZShyLmdldEFjY291bnRzKCkpOwotICAgICAgYXBwcm92YWxzLmRpc3BsYXkocik7CisgICAgICBpbml0QXBwcm92YWxzKGFwcHJvdmFsUGFuZWwpOworICAgICAgYXBwcm92YWxzLmRpc3BsYXkoY2hhbmdlKTsKICAgICB9IGVsc2UgewogICAgICAgYXBwcm92YWxzLnNldFZpc2libGUoZmFsc2UpOwogICAgIH0KQEAgLTI5MSw2ICszMTYsNyBAQAogCiAgICAgZHJhZnRzUGFuZWwuY2xlYXIoKTsKICAgICBjb21tZW50RWRpdG9ycyA9IG5ldyBBcnJheUxpc3Q8Q29tbWVudEVkaXRvclBhbmVsPigpOworICAgIHJldmlzaW9uID0gci5nZXRQYXRjaFNldEluZm8oKS5nZXRSZXZJZCgpOwogCiAgICAgaWYgKCFyLmdldERyYWZ0cygpLmlzRW1wdHkoKSkgewogICAgICAgZHJhZnRzUGFuZWwuYWRkKG5ldyBTbWFsbEhlYWRpbmcoVXRpbC5DLmhlYWRpbmdQYXRjaENvbW1lbnRzKCkpKTsKQEAgLTMxMiw3ICszMzgsMTEgQEAKICAgICAgICAgfQogCiAgICAgICAgIGZpbmFsIENvbW1lbnRFZGl0b3JQYW5lbCBlZGl0b3IgPSBuZXcgQ29tbWVudEVkaXRvclBhbmVsKGMpOwotICAgICAgICBlZGl0b3Iuc2V0QXV0aG9yTmFtZVRleHQoVXRpbC5NLmxpbmVIZWFkZXIoYy5nZXRMaW5lKCkpKTsKKyAgICAgICAgaWYgKGMuZ2V0TGluZSgpID09IEFic3RyYWN0UGF0Y2hDb250ZW50VGFibGUuUl9IRUFEKSB7CisgICAgICAgICAgZWRpdG9yLnNldEF1dGhvck5hbWVUZXh0KFV0aWwuQy5maWxlQ29tbWVudEhlYWRlcigpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBlZGl0b3Iuc2V0QXV0aG9yTmFtZVRleHQoVXRpbC5NLmxpbmVIZWFkZXIoYy5nZXRMaW5lKCkpKTsKKyAgICAgICAgfQogICAgICAgICBlZGl0b3Iuc2V0T3Blbih0cnVlKTsKICAgICAgICAgY29tbWVudEVkaXRvcnMuYWRkKGVkaXRvcik7CiAgICAgICAgIHBhbmVsLmFkZChlZGl0b3IpOwpAQCAtMzQ3LDIwICszNzcsMjMgQEAKICAgfQogCiAgIHByaXZhdGUgdm9pZCBvblNlbmQyKGZpbmFsIGJvb2xlYW4gc3VibWl0KSB7Ci0gICAgZmluYWwgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZD4gdmFsdWVzID0KLSAgICAgICAgbmV3IEhhc2hNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgQXBwcm92YWxDYXRlZ29yeVZhbHVlLklkPigpOworICAgIFJldmlld0lucHV0IGRhdGEgPSBSZXZpZXdJbnB1dC5jcmVhdGUoKTsKKyAgICBkYXRhLm1lc3NhZ2UoQ2hhbmdlQXBpLmVtcHR5VG9OdWxsKG1lc3NhZ2UuZ2V0VGV4dCgpLnRyaW0oKSkpOworICAgIGRhdGEuaW5pdCgpOwogICAgIGZvciAoZmluYWwgVmFsdWVSYWRpb0J1dHRvbiBiIDogYXBwcm92YWxCdXR0b25zKSB7CiAgICAgICBpZiAoYi5nZXRWYWx1ZSgpKSB7Ci0gICAgICAgIHZhbHVlcy5wdXQoYi52YWx1ZS5nZXRDYXRlZ29yeUlkKCksIGIudmFsdWUuZ2V0SWQoKSk7CisgICAgICAgIGRhdGEubGFiZWwoYi5sYWJlbC5uYW1lKCksIGIucGFyc2VWYWx1ZSgpKTsKICAgICAgIH0KICAgICB9CiAKICAgICBlbmFibGVGb3JtKGZhbHNlKTsKLSAgICBQYXRjaFV0aWwuREVUQUlMX1NWQy5wdWJsaXNoQ29tbWVudHMocGF0Y2hTZXRJZCwgbWVzc2FnZS5nZXRUZXh0KCkudHJpbSgpLAotICAgICAgICBuZXcgSGFzaFNldDxBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQ+KHZhbHVlcy52YWx1ZXMoKSksCi0gICAgICAgIG5ldyBHZXJyaXRDYWxsYmFjazxWb2lkUmVzdWx0PigpIHsKLSAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoZmluYWwgVm9pZFJlc3VsdCByZXN1bHQpIHsKLSAgICAgICAgICAgIGlmKHN1Ym1pdCkgeworICAgIG5ldyBSZXN0QXBpKCIvY2hhbmdlcy8iKQorICAgICAgLmlkKFN0cmluZy52YWx1ZU9mKHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCkuZ2V0KCkpKQorICAgICAgLnZpZXcoInJldmlzaW9ucyIpLmlkKHJldmlzaW9uKS52aWV3KCJyZXZpZXciKQorICAgICAgLnBvc3QoZGF0YSwgbmV3IEdlcnJpdENhbGxiYWNrPFJldmlld0lucHV0PigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoUmV2aWV3SW5wdXQgcmVzdWx0KSB7CisgICAgICAgICAgICBpZiAoc3VibWl0KSB7CiAgICAgICAgICAgICAgIHN1Ym1pdCgpOwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgc2F2ZVN0YXRlT25VbmxvYWQgPSBmYWxzZTsKQEAgLTM3NiwxOCArNDA5LDM5IEBACiAgICAgICAgIH0pOwogICB9CiAKKyAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgUmV2aWV3SW5wdXQgZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKKyAgICBzdGF0aWMgUmV2aWV3SW5wdXQgY3JlYXRlKCkgeworICAgICAgcmV0dXJuIChSZXZpZXdJbnB1dCkgY3JlYXRlT2JqZWN0KCk7CisgICAgfQorCisgICAgZmluYWwgbmF0aXZlIHZvaWQgbWVzc2FnZShTdHJpbmcgbSkgLyoteyBpZihtKXRoaXMubWVzc2FnZT1tOyB9LSovOworICAgIGZpbmFsIG5hdGl2ZSB2b2lkIGxhYmVsKFN0cmluZyBuLCBzaG9ydCB2KSAvKi17IHRoaXMubGFiZWxzW25dPXY7IH0tKi87CisgICAgZmluYWwgbmF0aXZlIHZvaWQgaW5pdCgpIC8qLXsKKyAgICAgIHRoaXMubGFiZWxzID0ge307CisgICAgICB0aGlzLnN0cmljdF9sYWJlbHMgPSB0cnVlOworICAgICAgdGhpcy5kcmFmdHMgPSAnUFVCTElTSCc7CisgICAgfS0qLzsKKworICAgIHByb3RlY3RlZCBSZXZpZXdJbnB1dCgpIHsKKyAgICB9CisgIH0KKwogICBwcml2YXRlIHZvaWQgc3VibWl0KCkgewotICAgIFV0aWwuTUFOQUdFX1NWQy5zdWJtaXQocGF0Y2hTZXRJZCwKLSAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPENoYW5nZURldGFpbD4oKSB7Ci0gICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKENoYW5nZURldGFpbCByZXN1bHQpIHsKKyAgICBDaGFuZ2VBcGkuc3VibWl0KHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCkuZ2V0KCksIHJldmlzaW9uLAorICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPFN1Ym1pdEluZm8+KCkgeworICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhTdWJtaXRJbmZvIHJlc3VsdCkgewogICAgICAgICAgICAgc2F2ZVN0YXRlT25VbmxvYWQgPSBmYWxzZTsKICAgICAgICAgICAgIGdvQ2hhbmdlKCk7CiAgICAgICAgICAgfQogCiAgICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoVGhyb3dhYmxlIGVycikgeworICAgICAgICAgICAgaWYgKFN1Ym1pdEZhaWx1cmVEaWFsb2cuaXNDb25mbGljdChlcnIpKSB7CisgICAgICAgICAgICAgIG5ldyBTdWJtaXRGYWlsdXJlRGlhbG9nKGVyci5nZXRNZXNzYWdlKCkpLmNlbnRlcigpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgc3VwZXIub25GYWlsdXJlKGVycik7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBnb0NoYW5nZSgpOwotICAgICAgICAgICAgc3VwZXIub25GYWlsdXJlKGNhdWdodCk7CiAgICAgICAgICAgfQogICAgICAgICB9KTsKICAgfQpAQCAtMzk4LDI2ICs0NTIsNDEgQEAKICAgfQogCiAgIHByaXZhdGUgc3RhdGljIGNsYXNzIFZhbHVlUmFkaW9CdXR0b24gZXh0ZW5kcyBSYWRpb0J1dHRvbiB7Ci0gICAgZmluYWwgQXBwcm92YWxDYXRlZ29yeVZhbHVlIHZhbHVlOworICAgIGZpbmFsIExhYmVsSW5mbyBsYWJlbDsKKyAgICBmaW5hbCBTdHJpbmcgdmFsdWU7CiAKLSAgICBWYWx1ZVJhZGlvQnV0dG9uKGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSB2LCBmaW5hbCBTdHJpbmcgbGFiZWwpIHsKLSAgICAgIHN1cGVyKGxhYmVsKTsKLSAgICAgIHZhbHVlID0gdjsKKyAgICBWYWx1ZVJhZGlvQnV0dG9uKExhYmVsSW5mbyBsYWJlbCwgU3RyaW5nIHZhbHVlKSB7CisgICAgICBzdXBlcihsYWJlbC5uYW1lKCkpOworICAgICAgdGhpcy5sYWJlbCA9IGxhYmVsOworICAgICAgdGhpcy52YWx1ZSA9IHZhbHVlOworICAgIH0KKworICAgIFN0cmluZyBmb3JtYXQoKSB7CisgICAgICByZXR1cm4gbmV3IFN0cmluZ0J1aWxkZXIoKS5hcHBlbmQodmFsdWUpLmFwcGVuZCgnICcpCisgICAgICAgICAgLmFwcGVuZChsYWJlbC52YWx1ZV90ZXh0KHZhbHVlKSkudG9TdHJpbmcoKTsKKyAgICB9CisKKyAgICBzaG9ydCBwYXJzZVZhbHVlKCkgeworICAgICAgU3RyaW5nIHZhbHVlID0gdGhpcy52YWx1ZTsKKyAgICAgIGlmICh2YWx1ZS5zdGFydHNXaXRoKCIgIikgfHwgdmFsdWUuc3RhcnRzV2l0aCgiKyIpKSB7CisgICAgICAgIHZhbHVlID0gdmFsdWUuc3Vic3RyaW5nKDEpOworICAgICAgfQorICAgICAgcmV0dXJuIFNob3J0LnBhcnNlU2hvcnQodmFsdWUpOwogICAgIH0KICAgfQogCiAgIHByaXZhdGUgc3RhdGljIGNsYXNzIFNhdmVkU3RhdGUgewogICAgIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7CiAgICAgZmluYWwgU3RyaW5nIG1lc3NhZ2U7Ci0gICAgZmluYWwgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZT4gYXBwcm92YWxzOworICAgIGZpbmFsIE1hcDxTdHJpbmcsIFN0cmluZz4gYXBwcm92YWxzOwogCiAgICAgU2F2ZWRTdGF0ZShmaW5hbCBQdWJsaXNoQ29tbWVudFNjcmVlbiBwKSB7CiAgICAgICBwYXRjaFNldElkID0gcC5wYXRjaFNldElkOwogICAgICAgbWVzc2FnZSA9IHAubWVzc2FnZS5nZXRUZXh0KCk7Ci0gICAgICBhcHByb3ZhbHMgPSBuZXcgSGFzaE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBBcHByb3ZhbENhdGVnb3J5VmFsdWU+KCk7CisgICAgICBhcHByb3ZhbHMgPSBuZXcgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oKTsKICAgICAgIGZvciAoZmluYWwgVmFsdWVSYWRpb0J1dHRvbiBiIDogcC5hcHByb3ZhbEJ1dHRvbnMpIHsKICAgICAgICAgaWYgKGIuZ2V0VmFsdWUoKSkgewotICAgICAgICAgIGFwcHJvdmFscy5wdXQoYi52YWx1ZS5nZXRDYXRlZ29yeUlkKCksIGIudmFsdWUpOworICAgICAgICAgIGFwcHJvdmFscy5wdXQoYi5sYWJlbC5uYW1lKCksIGIudmFsdWUpOwogICAgICAgICB9CiAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUXVlcnlTY3JlZW4uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1F1ZXJ5U2NyZWVuLmphdmEKaW5kZXggYjk0ZmNhZS4uMDFlMjk0ZiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvUXVlcnlTY3JlZW4uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9RdWVyeVNjcmVlbi5qYXZhCkBAIC0xOSw3ICsxOSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5SZXZJZDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkFzeW5jQ2FsbGJhY2s7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQucnBjLkFzeW5jQ2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LktleVV0aWw7CiAKIHB1YmxpYyBjbGFzcyBRdWVyeVNjcmVlbiBleHRlbmRzIFBhZ2VkU2luZ2xlTGlzdFNjcmVlbiBpbXBsZW1lbnRzCkBAIC01MiwxMiArNTIsMTEgQEAKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIGZpbmFsIHZvaWQgb25TdWNjZXNzKENoYW5nZUxpc3QgcmVzdWx0KSB7CiAgICAgICAgIGlmIChpc0F0dGFjaGVkKCkpIHsKLSAgICAgICAgICBpZiAocmVzdWx0LnNpemUoKSA9PSAxICYmIGlzU2luZ2xlUXVlcnkocXVlcnkpKSB7CisgICAgICAgICAgaWYgKHJlc3VsdC5sZW5ndGgoKSA9PSAxICYmIGlzU2luZ2xlUXVlcnkocXVlcnkpKSB7CiAgICAgICAgICAgICBDaGFuZ2VJbmZvIGMgPSByZXN1bHQuZ2V0KDApOwogICAgICAgICAgICAgQ2hhbmdlLklkIGlkID0gYy5sZWdhY3lfaWQoKTsKICAgICAgICAgICAgIEdlcnJpdC5kaXNwbGF5KFBhZ2VMaW5rcy50b0NoYW5nZShpZCksIG5ldyBDaGFuZ2VTY3JlZW4oaWQpKTsKICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgR2Vycml0LnNldFF1ZXJ5U3RyaW5nKHF1ZXJ5KTsKICAgICAgICAgICAgIGRpc3BsYXkocmVzdWx0KTsKICAgICAgICAgICAgIFF1ZXJ5U2NyZWVuLnRoaXMuZGlzcGxheSgpOwogICAgICAgICAgIH0KQEAgLTY3LDYgKzY2LDEyIEBACiAgIH0KIAogICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgb25TaG93VmlldygpIHsKKyAgICBzdXBlci5vblNob3dWaWV3KCk7CisgICAgR2Vycml0LnNldFF1ZXJ5U3RyaW5nKHF1ZXJ5KTsKKyAgfQorCisgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBsb2FkUHJldigpIHsKICAgICBDaGFuZ2VMaXN0LnByZXYocXVlcnksIHBhZ2VTaXplLCBwb3MsIGxvYWRDYWxsYmFjaygpKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvU3RhcnJlZENoYW5nZXMuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1N0YXJyZWRDaGFuZ2VzLmphdmEKaW5kZXggOGI1YWExYy4uN2QyMDg0YSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvU3RhcnJlZENoYW5nZXMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9TdGFycmVkQ2hhbmdlcy5qYXZhCkBAIC0yMSw4ICsyMSw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5UHJlc3NFdmVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5zaGFyZWQuRXZlbnRCdXM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuc2hhcmVkLlNpbXBsZUV2ZW50QnVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnJlc291cmNlcy5jbGllbnQuSW1hZ2VSZXNvdXJjZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5JbWFnZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuS2V5Q29tbWFuZDsKQEAgLTMyLDcgKzMwLDYgQEAKIAogLyoqIFN1cHBvcnRzIHRoZSBzdGFyIGljb24gZGlzcGxheWVkIG9uIGNoYW5nZXMgYW5kIHRyYWNraW5nIHRoZSBzdGF0dXMuICovCiBwdWJsaWMgY2xhc3MgU3RhcnJlZENoYW5nZXMgewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBFdmVudEJ1cyBldmVudEJ1cyA9IG5ldyBTaW1wbGVFdmVudEJ1cygpOwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBFdmVudC5UeXBlPENoYW5nZVN0YXJIYW5kbGVyPiBUWVBFID0KICAgICAgIG5ldyBFdmVudC5UeXBlPENoYW5nZVN0YXJIYW5kbGVyPigpOwogCkBAIC04Nyw3ICs4NCw3IEBACiAgIHB1YmxpYyBzdGF0aWMgSGFuZGxlclJlZ2lzdHJhdGlvbiBhZGRIYW5kbGVyKAogICAgICAgQ2hhbmdlLklkIHNvdXJjZSwKICAgICAgIENoYW5nZVN0YXJIYW5kbGVyIGhhbmRsZXIpIHsKLSAgICByZXR1cm4gZXZlbnRCdXMuYWRkSGFuZGxlclRvU291cmNlKFRZUEUsIHNvdXJjZSwgaGFuZGxlcik7CisgICAgcmV0dXJuIEdlcnJpdC5FVkVOVF9CVVMuYWRkSGFuZGxlclRvU291cmNlKFRZUEUsIHNvdXJjZSwgaGFuZGxlcik7CiAgIH0KIAogICAvKioKQEAgLTk1LDcgKzkyLDcgQEAKICAgICogbm90IFJQQyB0byB0aGUgc2VydmVyIGFuZCBkb2VzIG5vdCBhbHRlciB0aGUgc3RhcnJlZCBzdGF0dXMgb2YgYSBjaGFuZ2UuCiAgICAqLwogICBwdWJsaWMgc3RhdGljIHZvaWQgZmlyZUNoYW5nZVN0YXJFdmVudChDaGFuZ2UuSWQgaWQsIGJvb2xlYW4gc3RhcnJlZCkgewotICAgIGV2ZW50QnVzLmZpcmVFdmVudEZyb21Tb3VyY2UoCisgICAgR2Vycml0LkVWRU5UX0JVUy5maXJlRXZlbnRGcm9tU291cmNlKAogICAgICAgICBuZXcgQ2hhbmdlU3RhckV2ZW50KGlkLCBzdGFycmVkKSwKICAgICAgICAgaWQpOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9TdWJtaXRGYWlsdXJlRGlhbG9nLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9TdWJtaXRGYWlsdXJlRGlhbG9nLmphdmEKaW5kZXggYmVkZmI3NC4uNzBiZjRiNiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvU3VibWl0RmFpbHVyZURpYWxvZy5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL1N1Ym1pdEZhaWx1cmVEaWFsb2cuamF2YQpAQCAtMTUsMTMgKzE1LDE3IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkVycm9yRGlhbG9nOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNoYW5nZURldGFpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbEJ1aWxkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNsaWVudC5SZW1vdGVKc29uRXhjZXB0aW9uOwogCiBjbGFzcyBTdWJtaXRGYWlsdXJlRGlhbG9nIGV4dGVuZHMgRXJyb3JEaWFsb2cgewotICBTdWJtaXRGYWlsdXJlRGlhbG9nKGZpbmFsIENoYW5nZURldGFpbCByZXN1bHQsIGZpbmFsIENoYW5nZU1lc3NhZ2UgbXNnKSB7Ci0gICAgc3VwZXIobmV3IFNhZmVIdG1sQnVpbGRlcigpLmFwcGVuZChtc2cuZ2V0TWVzc2FnZSgpLnRyaW0oKSkud2lraWZ5KCkpOworICBzdGF0aWMgYm9vbGVhbiBpc0NvbmZsaWN0KFRocm93YWJsZSBlcnIpIHsKKyAgICByZXR1cm4gZXJyIGluc3RhbmNlb2YgUmVtb3RlSnNvbkV4Y2VwdGlvbgorICAgICAgICAmJiA0MDkgPT0gKChSZW1vdGVKc29uRXhjZXB0aW9uKSBlcnIpLmdldENvZGUoKTsKKyAgfQorCisgIFN1Ym1pdEZhaWx1cmVEaWFsb2coU3RyaW5nIG1zZykgeworICAgIHN1cGVyKG5ldyBTYWZlSHRtbEJ1aWxkZXIoKS5hcHBlbmQobXNnLnRyaW0oKSkud2lraWZ5KCkpOwogICAgIHNldFRleHQoVXRpbC5DLnN1Ym1pdEZhaWxlZCgpKTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvU3VibWl0SW5mby5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2NoYW5nZXMvU3VibWl0SW5mby5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE5MjA2YjcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvY2hhbmdlcy9TdWJtaXRJbmZvLmphdmEKQEAgLTAsMCArMSwyOSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5KYXZhU2NyaXB0T2JqZWN0OworCitjbGFzcyBTdWJtaXRJbmZvIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdCB7CisgIGZpbmFsIENoYW5nZS5TdGF0dXMgc3RhdHVzKCkgeworICAgIHJldHVybiBDaGFuZ2UuU3RhdHVzLnZhbHVlT2Yoc3RhdHVzUmF3KCkpOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBuYXRpdmUgU3RyaW5nIHN0YXR1c1JhdygpIC8qLXsgcmV0dXJuIHRoaXMuc3RhdHVzOyB9LSovOworCisgIHByb3RlY3RlZCBTdWJtaXRJbmZvKCkgeworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZGFzaGJvYXJkcy9EYXNoYm9hcmRDb25zdGFudHMuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kYXNoYm9hcmRzL0Rhc2hib2FyZENvbnN0YW50cy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIwMmYwNDc0Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rhc2hib2FyZHMvRGFzaGJvYXJkQ29uc3RhbnRzLmphdmEKQEAgLTAsMCArMSwyNiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kYXNoYm9hcmRzOworCitpbXBvcnQgY29tLmdvb2dsZS5nd3QuaTE4bi5jbGllbnQuQ29uc3RhbnRzOworCitwdWJsaWMgaW50ZXJmYWNlIERhc2hib2FyZENvbnN0YW50cyBleHRlbmRzIENvbnN0YW50cyB7CisgIFN0cmluZyBkYXNoYm9hcmROYW1lKCk7CisgIFN0cmluZyBkYXNoYm9hcmRUaXRsZSgpOworICBTdHJpbmcgZGFzaGJvYXJkRGVzY3JpcHRpb24oKTsKKyAgU3RyaW5nIGRhc2hib2FyZEluaGVyaXRlZCgpOworICBTdHJpbmcgZGFzaGJvYXJkSXRlbSgpOworICBTdHJpbmcgZGFzaGJvYXJkRGVmYXVsdFRvb2xUaXAoKTsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kYXNoYm9hcmRzL0Rhc2hib2FyZENvbnN0YW50cy5wcm9wZXJ0aWVzIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rhc2hib2FyZHMvRGFzaGJvYXJkQ29uc3RhbnRzLnByb3BlcnRpZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWM0ZGU3YwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kYXNoYm9hcmRzL0Rhc2hib2FyZENvbnN0YW50cy5wcm9wZXJ0aWVzCkBAIC0wLDAgKzEsNiBAQAorZGFzaGJvYXJkTmFtZSA9IERhc2hib2FyZCBOYW1lCitkYXNoYm9hcmRUaXRsZSA9IERhc2hib2FyZCBUaXRsZQorZGFzaGJvYXJkRGVzY3JpcHRpb24gPSBEYXNoYm9hcmQgRGVzY3JpcHRpb24KK2Rhc2hib2FyZEluaGVyaXRlZCA9IEluaGVyaXRlZCBGcm9tCitkYXNoYm9hcmRJdGVtID0gZGFzaGJvYXJkCitkYXNoYm9hcmREZWZhdWx0VG9vbFRpcCA9IFByb2plY3QgRGVmYXVsdCBEYXNoYm9hcmQKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZGFzaGJvYXJkcy9EYXNoYm9hcmRJbmZvLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZGFzaGJvYXJkcy9EYXNoYm9hcmRJbmZvLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDRkNzRhYgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kYXNoYm9hcmRzL0Rhc2hib2FyZEluZm8uamF2YQpAQCAtMCwwICsxLDMzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmRhc2hib2FyZHM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5KYXZhU2NyaXB0T2JqZWN0OworCitwdWJsaWMgY2xhc3MgRGFzaGJvYXJkSW5mbyBleHRlbmRzIEphdmFTY3JpcHRPYmplY3QgeworICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyBpZCgpIC8qLXsgcmV0dXJuIHRoaXMuaWQ7IH0tKi87CisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIHRpdGxlKCkgLyoteyByZXR1cm4gdGhpcy50aXRsZTsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBTdHJpbmcgcHJvamVjdCgpIC8qLXsgcmV0dXJuIHRoaXMucHJvamVjdDsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBTdHJpbmcgZGVmaW5pbmdQcm9qZWN0KCkgLyoteyByZXR1cm4gdGhpcy5kZWZpbmluZ19wcm9qZWN0OyB9LSovOworICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyByZWYoKSAvKi17IHJldHVybiB0aGlzLnJlZjsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBTdHJpbmcgcGF0aCgpIC8qLXsgcmV0dXJuIHRoaXMucGF0aDsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBTdHJpbmcgZGVzY3JpcHRpb24oKSAvKi17IHJldHVybiB0aGlzLmRlc2NyaXB0aW9uOyB9LSovOworICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyBmb3JlYWNoKCkgLyoteyByZXR1cm4gdGhpcy5mb3JlYWNoOyB9LSovOworICBwdWJsaWMgZmluYWwgbmF0aXZlIFN0cmluZyB1cmwoKSAvKi17IHJldHVybiB0aGlzLnVybDsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBib29sZWFuIGlzRGVmYXVsdCgpIC8qLXsgcmV0dXJuIHRoaXNbJ2RlZmF1bHQnXSA/IHRydWUgOiBmYWxzZTsgfS0qLzsKKworICBwcm90ZWN0ZWQgRGFzaGJvYXJkSW5mbygpIHsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rhc2hib2FyZHMvRGFzaGJvYXJkTGlzdC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rhc2hib2FyZHMvRGFzaGJvYXJkTGlzdC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjExOTBmOWMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZGFzaGJvYXJkcy9EYXNoYm9hcmRMaXN0LmphdmEKQEAgLTAsMCArMSw1NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kYXNoYm9hcmRzOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkpzQXJyYXk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuaHR0cC5jbGllbnQuVVJMOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOworCisvKiogUHJvamVjdCBkYXNoYm9hcmRzIGZyb20ge0Bjb2RlIC9wcm9qZWN0cy88bmFtZT4vZGFzaGJvYXJkcy99LiAqLworcHVibGljIGNsYXNzIERhc2hib2FyZExpc3QgZXh0ZW5kcyBKc0FycmF5PERhc2hib2FyZEluZm8+IHsKKyAgcHVibGljIHN0YXRpYyB2b2lkIGFsbChQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwKKyAgICAgIEFzeW5jQ2FsbGJhY2s8SnNBcnJheTxEYXNoYm9hcmRMaXN0Pj4gY2FsbGJhY2spIHsKKyAgICBiYXNlKHByb2plY3QpLmFkZFBhcmFtZXRlclRydWUoImluaGVyaXRlZCIpLmdldChjYWxsYmFjayk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIHZvaWQgZ2V0RGVmYXVsdChQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwKKyAgICAgIEFzeW5jQ2FsbGJhY2s8RGFzaGJvYXJkSW5mbz4gY2FsbGJhY2spIHsKKyAgICBiYXNlKHByb2plY3QpLnZpZXcoImRlZmF1bHQiKS5hZGRQYXJhbWV0ZXJUcnVlKCJpbmhlcml0ZWQiKS5nZXQoY2FsbGJhY2spOworICB9CisKKyAgcHVibGljIHN0YXRpYyB2b2lkIGdldChQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgU3RyaW5nIGlkLAorICAgICAgQXN5bmNDYWxsYmFjazxEYXNoYm9hcmRJbmZvPiBjYWxsYmFjaykgeworICAgIGJhc2UocHJvamVjdCkuaWRSYXcoZW5jb2RlRGFzaGJvYXJkSWQoaWQpKS5nZXQoY2FsbGJhY2spOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgUmVzdEFwaSBiYXNlKFByb2plY3QuTmFtZUtleSBwcm9qZWN0KSB7CisgICAgcmV0dXJuIG5ldyBSZXN0QXBpKCIvcHJvamVjdHMvIikuaWQocHJvamVjdC5nZXQoKSkudmlldygiZGFzaGJvYXJkcyIpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGVuY29kZURhc2hib2FyZElkKFN0cmluZyBpZCkgeworICAgIGludCBjID0gaWQuaW5kZXhPZignOicpOworICAgIGlmICgwIDw9IGMpIHsKKyAgICAgIFN0cmluZyByZWYgPSBVUkwuZW5jb2RlUXVlcnlTdHJpbmcoaWQuc3Vic3RyaW5nKDAsIGMpKTsKKyAgICAgIFN0cmluZyBwYXRoID0gVVJMLmVuY29kZVF1ZXJ5U3RyaW5nKGlkLnN1YnN0cmluZyhjICsgMSkpOworICAgICAgcmV0dXJuIHJlZiArICc6JyArIHBhdGg7CisgICAgfQorICAgIHJldHVybiBVUkwuZW5jb2RlUXVlcnlTdHJpbmcoaWQpOworICB9CisKKyAgcHJvdGVjdGVkIERhc2hib2FyZExpc3QoKSB7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kYXNoYm9hcmRzL0Rhc2hib2FyZHNUYWJsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rhc2hib2FyZHMvRGFzaGJvYXJkc1RhYmxlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDA3MjFiNwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kYXNoYm9hcmRzL0Rhc2hib2FyZHNUYWJsZS5qYXZhCkBAIC0wLDAgKzEsMTUyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmRhc2hib2FyZHM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuTmF0aXZlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuTmF2aWdhdGlvblRhYmxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSnNBcnJheTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5IaXN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbGV4VGFibGUuRmxleENlbGxGb3JtYXR0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW1hZ2U7CisKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitwdWJsaWMgY2xhc3MgRGFzaGJvYXJkc1RhYmxlIGV4dGVuZHMgTmF2aWdhdGlvblRhYmxlPERhc2hib2FyZEluZm8+IHsKKyAgUHJvamVjdC5OYW1lS2V5IHByb2plY3Q7CisKKyAgcHVibGljIERhc2hib2FyZHNUYWJsZShmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCkgeworICAgIHN1cGVyKFV0aWwuQy5kYXNoYm9hcmRJdGVtKCkpOworICAgIHRoaXMucHJvamVjdCA9IHByb2plY3Q7CisgICAgaW5pdENvbHVtbkhlYWRlcnMoKTsKKyAgfQorCisgIHByb3RlY3RlZCB2b2lkIGluaXRDb2x1bW5IZWFkZXJzKCkgeworICAgIGZpbmFsIEZsZXhDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCk7CisgICAgZm10LnNldENvbFNwYW4oMCwgMCwgMik7CisgICAgZm10LmFkZFN0eWxlTmFtZSgwLCAxLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRhdGFIZWFkZXIoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZSgwLCAyLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRhdGFIZWFkZXIoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZSgwLCAzLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRhdGFIZWFkZXIoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZSgwLCA0LCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRhdGFIZWFkZXIoKSk7CisKKyAgICB0YWJsZS5zZXRUZXh0KDAsIDEsIFV0aWwuQy5kYXNoYm9hcmROYW1lKCkpOworICAgIHRhYmxlLnNldFRleHQoMCwgMiwgVXRpbC5DLmRhc2hib2FyZFRpdGxlKCkpOworICAgIHRhYmxlLnNldFRleHQoMCwgMywgVXRpbC5DLmRhc2hib2FyZERlc2NyaXB0aW9uKCkpOworICAgIHRhYmxlLnNldFRleHQoMCwgNCwgVXRpbC5DLmRhc2hib2FyZEluaGVyaXRlZCgpKTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIGRpc3BsYXkoRGFzaGJvYXJkTGlzdCBkYXNoZXMpIHsKKyAgICBkaXNwbGF5KE5hdGl2ZXMuYXNMaXN0KGRhc2hlcykpOworICB9CisKKyAgcHVibGljIHZvaWQgZGlzcGxheShKc0FycmF5PERhc2hib2FyZExpc3Q+IGluKSB7CisgICAgTWFwPFN0cmluZywgRGFzaGJvYXJkSW5mbz4gbWFwID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBEYXNoYm9hcmRJbmZvPigpOworICAgIGZvciAoRGFzaGJvYXJkTGlzdCBsaXN0IDogTmF0aXZlcy5hc0xpc3QoaW4pKSB7CisgICAgICBmb3IgKERhc2hib2FyZEluZm8gZCA6IE5hdGl2ZXMuYXNMaXN0KGxpc3QpKSB7CisgICAgICAgIGlmICghbWFwLmNvbnRhaW5zS2V5KGQuaWQoKSkpIHsKKyAgICAgICAgICBtYXAucHV0KGQuaWQoKSwgZCk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgZGlzcGxheShuZXcgQXJyYXlMaXN0PERhc2hib2FyZEluZm8+KG1hcC52YWx1ZXMoKSkpOworICB9CisKKyAgcHVibGljIHZvaWQgZGlzcGxheShMaXN0PERhc2hib2FyZEluZm8+IGxpc3QpIHsKKyAgICB3aGlsZSAoMSA8IHRhYmxlLmdldFJvd0NvdW50KCkpIHsKKyAgICAgIHRhYmxlLnJlbW92ZVJvdyh0YWJsZS5nZXRSb3dDb3VudCgpIC0gMSk7CisgICAgfQorCisgICAgQ29sbGVjdGlvbnMuc29ydChsaXN0LCBuZXcgQ29tcGFyYXRvcjxEYXNoYm9hcmRJbmZvPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIGludCBjb21wYXJlKERhc2hib2FyZEluZm8gYSwgRGFzaGJvYXJkSW5mbyBiKSB7CisgICAgICAgIHJldHVybiBhLmlkKCkuY29tcGFyZVRvKGIuaWQoKSk7CisgICAgICB9CisgICAgfSk7CisKKyAgICBTdHJpbmcgcmVmID0gbnVsbDsKKyAgICBmb3IoRGFzaGJvYXJkSW5mbyBkIDogbGlzdCkgeworICAgICAgaWYgKCFkLnJlZigpLmVxdWFscyhyZWYpKSB7CisgICAgICAgIHJlZiA9IGQucmVmKCk7CisgICAgICAgIGluc2VydFRpdGxlUm93KHRhYmxlLmdldFJvd0NvdW50KCksIHJlZik7CisgICAgICB9CisgICAgICBpbnNlcnQodGFibGUuZ2V0Um93Q291bnQoKSwgZCk7CisgICAgfQorCisgICAgZmluaXNoRGlzcGxheSgpOworICB9CisKKyAgcHJvdGVjdGVkIHZvaWQgaW5zZXJ0VGl0bGVSb3coZmluYWwgaW50IHJvdywgU3RyaW5nIHNlY3Rpb24pIHsKKyAgICB0YWJsZS5pbnNlcnRSb3cocm93KTsKKworICAgIHRhYmxlLnNldFRleHQocm93LCAwLCBzZWN0aW9uKTsKKworICAgIGZpbmFsIEZsZXhDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCk7CisgICAgZm10LnNldENvbFNwYW4ocm93LCAwLCA2KTsKKyAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgMCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5zZWN0aW9uSGVhZGVyKCkpOworICB9CisKKyAgcHJvdGVjdGVkIHZvaWQgaW5zZXJ0KGZpbmFsIGludCByb3csIGZpbmFsIERhc2hib2FyZEluZm8gaykgeworICAgIHRhYmxlLmluc2VydFJvdyhyb3cpOworCisgICAgYXBwbHlEYXRhUm93U3R5bGUocm93KTsKKworICAgIGZpbmFsIEZsZXhDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDIsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDMsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDQsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDUsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CisKKyAgICBwb3B1bGF0ZShyb3csIGspOworICB9CisKKyAgcHJvdGVjdGVkIHZvaWQgcG9wdWxhdGUoZmluYWwgaW50IHJvdywgZmluYWwgRGFzaGJvYXJkSW5mbyBrKSB7CisgICAgaWYgKGsuaXNEZWZhdWx0KCkpIHsKKyAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIDEsIG5ldyBJbWFnZShHZXJyaXQuUkVTT1VSQ0VTLmdyZWVuQ2hlY2soKSkpOworICAgICAgZmluYWwgRmxleENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0RmxleENlbGxGb3JtYXR0ZXIoKTsKKyAgICAgIGZtdC5nZXRFbGVtZW50KHJvdywgMSkuc2V0VGl0bGUoVXRpbC5DLmRhc2hib2FyZERlZmF1bHRUb29sVGlwKCkpOworICAgIH0KKyAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAyLCBuZXcgQW5jaG9yKGsucGF0aCgpLCAiIyIKKyAgICAgICAgICAgICsgUGFnZUxpbmtzLnRvUHJvamVjdERhc2hib2FyZChuZXcgUHJvamVjdC5OYW1lS2V5KGsucHJvamVjdCgpKSwgay5pZCgpKSkpOworICAgIHRhYmxlLnNldFRleHQocm93LCAzLCBrLnRpdGxlKCkgIT0gbnVsbCA/IGsudGl0bGUoKSA6IGsucGF0aCgpKTsKKyAgICB0YWJsZS5zZXRUZXh0KHJvdywgNCwgay5kZXNjcmlwdGlvbigpKTsKKyAgICBpZiAoay5kZWZpbmluZ1Byb2plY3QoKSAhPSBudWxsICYmICFrLmRlZmluaW5nUHJvamVjdCgpLmVxdWFscyhrLnByb2plY3QoKSkpIHsKKyAgICAgIHRhYmxlLnNldFdpZGdldChyb3csIDUsIG5ldyBBbmNob3Ioay5kZWZpbmluZ1Byb2plY3QoKSwgIiMiCisgICAgICAgICAgKyBQYWdlTGlua3MudG9Qcm9qZWN0RGFzaGJvYXJkcyhuZXcgUHJvamVjdC5OYW1lS2V5KGsuZGVmaW5pbmdQcm9qZWN0KCkpKSkpOworICAgIH0KKyAgICBzZXRSb3dJdGVtKHJvdywgayk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIE9iamVjdCBnZXRSb3dJdGVtS2V5KGZpbmFsIERhc2hib2FyZEluZm8gaXRlbSkgeworICAgIHJldHVybiBpdGVtLmlkKCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgb25PcGVuUm93KGZpbmFsIGludCByb3cpIHsKKyAgICBpZiAocm93ID4gMCkgeworICAgICAgbW92ZVBvaW50ZXJUbyhyb3cpOworICAgIH0KKyAgICBIaXN0b3J5Lm5ld0l0ZW0oZ2V0Um93SXRlbShyb3cpLnVybCgpKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rhc2hib2FyZHMvVXRpbC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rhc2hib2FyZHMvVXRpbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIxNWJmNzMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZGFzaGJvYXJkcy9VdGlsLmphdmEKQEAgLTAsMCArMSwyMSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kYXNoYm9hcmRzOworCitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuR1dUOworCitwdWJsaWMgY2xhc3MgVXRpbCB7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgRGFzaGJvYXJkQ29uc3RhbnRzIEMgPSBHV1QuY3JlYXRlKERhc2hib2FyZENvbnN0YW50cy5jbGFzcyk7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRDb21tYW5kTGluay5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rvd25sb2FkL0Rvd25sb2FkQ29tbWFuZExpbmsuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNWM2OGRiCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rvd25sb2FkL0Rvd25sb2FkQ29tbWFuZExpbmsuamF2YQpAQCAtMCwwICsxLDE3NyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kb3dubG9hZDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmFyaWEuY2xpZW50LlJvbGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5BbmNob3I7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuV2lkZ2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuY2xpcHB5LmNsaWVudC5Db3B5YWJsZUxhYmVsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLlZvaWRSZXN1bHQ7CisKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBEb3dubG9hZENvbW1hbmRMaW5rIGV4dGVuZHMgQW5jaG9yIGltcGxlbWVudHMgQ2xpY2tIYW5kbGVyIHsKKyAgcHVibGljIHN0YXRpYyBjbGFzcyBDb3B5YWJsZUNvbW1hbmRMaW5rRmFjdG9yeSB7CisgICAgcHJvdGVjdGVkIENvcHlhYmxlTGFiZWwgY29weUxhYmVsID0gbnVsbDsKKyAgICBwcm90ZWN0ZWQgV2lkZ2V0IHdpZGdldDsKKworICAgIHB1YmxpYyBjbGFzcyBDaGVja291dENvbW1hbmRMaW5rIGV4dGVuZHMgRG93bmxvYWRDb21tYW5kTGluayB7CisgICAgICBwdWJsaWMgQ2hlY2tvdXRDb21tYW5kTGluayAoKSB7CisgICAgICAgIHN1cGVyKERvd25sb2FkQ29tbWFuZC5DSEVDS09VVCwgImNoZWNrb3V0Iik7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgc2V0Q3VycmVudFVybChEb3dubG9hZFVybExpbmsgbGluaykgeworICAgICAgICB3aWRnZXQuc2V0VmlzaWJsZSh0cnVlKTsKKyAgICAgICAgY29weUxhYmVsLnNldFRleHQoImdpdCBmZXRjaCAiICsgbGluay5nZXRVcmxEYXRhKCkKKyAgICAgICAgICAgICsgIiAmJiBnaXQgY2hlY2tvdXQgRkVUQ0hfSEVBRCIpOworICAgICAgfQorICAgIH0KKworICAgIHB1YmxpYyBjbGFzcyBQdWxsQ29tbWFuZExpbmsgZXh0ZW5kcyBEb3dubG9hZENvbW1hbmRMaW5rIHsKKyAgICAgIHB1YmxpYyBQdWxsQ29tbWFuZExpbmsoKSB7CisgICAgICAgIHN1cGVyKERvd25sb2FkQ29tbWFuZC5QVUxMLCAicHVsbCIpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCB2b2lkIHNldEN1cnJlbnRVcmwoRG93bmxvYWRVcmxMaW5rIGxpbmspIHsKKyAgICAgICAgd2lkZ2V0LnNldFZpc2libGUodHJ1ZSk7CisgICAgICAgIGNvcHlMYWJlbC5zZXRUZXh0KCJnaXQgcHVsbCAiICsgbGluay5nZXRVcmxEYXRhKCkpOworICAgICAgfQorICAgIH0KKworICAgIHB1YmxpYyBjbGFzcyBDaGVycnlQaWNrQ29tbWFuZExpbmsgZXh0ZW5kcyBEb3dubG9hZENvbW1hbmRMaW5rIHsKKyAgICAgIHB1YmxpYyBDaGVycnlQaWNrQ29tbWFuZExpbmsoKSB7CisgICAgICAgIHN1cGVyKERvd25sb2FkQ29tbWFuZC5DSEVSUllfUElDSywgImNoZXJyeS1waWNrIik7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgc2V0Q3VycmVudFVybChEb3dubG9hZFVybExpbmsgbGluaykgeworICAgICAgICB3aWRnZXQuc2V0VmlzaWJsZSh0cnVlKTsKKyAgICAgICAgY29weUxhYmVsLnNldFRleHQoImdpdCBmZXRjaCAiICsgbGluay5nZXRVcmxEYXRhKCkKKyAgICAgICAgICAgICsgIiAmJiBnaXQgY2hlcnJ5LXBpY2sgRkVUQ0hfSEVBRCIpOworICAgICAgfQorICAgIH0KKworICAgIHB1YmxpYyBjbGFzcyBGb3JtYXRQYXRjaENvbW1hbmRMaW5rIGV4dGVuZHMgRG93bmxvYWRDb21tYW5kTGluayB7CisgICAgICBwdWJsaWMgRm9ybWF0UGF0Y2hDb21tYW5kTGluaygpIHsKKyAgICAgICAgc3VwZXIoRG93bmxvYWRDb21tYW5kLkZPUk1BVF9QQVRDSCwgInBhdGNoIik7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgc2V0Q3VycmVudFVybChEb3dubG9hZFVybExpbmsgbGluaykgeworICAgICAgICB3aWRnZXQuc2V0VmlzaWJsZSh0cnVlKTsKKyAgICAgICAgY29weUxhYmVsLnNldFRleHQoImdpdCBmZXRjaCAiICsgbGluay5nZXRVcmxEYXRhKCkKKyAgICAgICAgICAgICsgIiAmJiBnaXQgZm9ybWF0LXBhdGNoIC0xIC0tc3Rkb3V0IEZFVENIX0hFQUQiKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBwdWJsaWMgY2xhc3MgUmVwb0NvbW1hbmRMaW5rIGV4dGVuZHMgRG93bmxvYWRDb21tYW5kTGluayB7CisgICAgICBTdHJpbmcgcHJvamVjdE5hbWU7CisgICAgICBTdHJpbmcgcmVmOworICAgICAgcHVibGljIFJlcG9Db21tYW5kTGluayhTdHJpbmcgcHJvamVjdCwgU3RyaW5nIHJlZikgeworICAgICAgICBzdXBlcihEb3dubG9hZENvbW1hbmQuUkVQT19ET1dOTE9BRCwgImNoZWNrb3V0Iik7CisgICAgICAgIHRoaXMucHJvamVjdE5hbWUgPSBwcm9qZWN0OworICAgICAgICB0aGlzLnJlZiA9IHJlZjsKKyAgICAgIH0KKworICAgICAgQE92ZXJyaWRlCisgICAgICBwcm90ZWN0ZWQgdm9pZCBzZXRDdXJyZW50VXJsKERvd25sb2FkVXJsTGluayBsaW5rKSB7CisgICAgICAgIHdpZGdldC5zZXRWaXNpYmxlKGZhbHNlKTsKKyAgICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciByID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKKyAgICAgICAgci5hcHBlbmQoInJlcG8gZG93bmxvYWQgIik7CisgICAgICAgIHIuYXBwZW5kKHByb2plY3ROYW1lKTsKKyAgICAgICAgci5hcHBlbmQoIiAiKTsKKyAgICAgICAgci5hcHBlbmQocmVmKTsKKyAgICAgICAgY29weUxhYmVsLnNldFRleHQoci50b1N0cmluZygpKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBwdWJsaWMgY2xhc3MgQ2xvbmVDb21tYW5kTGluayBleHRlbmRzIERvd25sb2FkQ29tbWFuZExpbmsgeworICAgICAgcHVibGljIENsb25lQ29tbWFuZExpbmsoKSB7CisgICAgICAgIHN1cGVyKERvd25sb2FkQ29tbWFuZC5DSEVDS09VVCwgImNsb25lIik7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgc2V0Q3VycmVudFVybChEb3dubG9hZFVybExpbmsgbGluaykgeworICAgICAgICB3aWRnZXQuc2V0VmlzaWJsZSh0cnVlKTsKKyAgICAgICAgY29weUxhYmVsLnNldFRleHQoImdpdCBjbG9uZSAiICsgbGluay5nZXRVcmxEYXRhKCkpOworICAgICAgfQorICAgIH0KKworICAgIHB1YmxpYyBDb3B5YWJsZUNvbW1hbmRMaW5rRmFjdG9yeShDb3B5YWJsZUxhYmVsIGxhYmVsLCBXaWRnZXQgd2lkZ2V0KSB7CisgICAgICBjb3B5TGFiZWwgPSBsYWJlbDsKKyAgICAgIHRoaXMud2lkZ2V0ID0gd2lkZ2V0OworICAgIH0KKyAgfQorCisgIGZpbmFsIERvd25sb2FkQ29tbWFuZCBjbWRUeXBlOworCisgIHB1YmxpYyBEb3dubG9hZENvbW1hbmRMaW5rKERvd25sb2FkQ29tbWFuZCBjbWRUeXBlLAorICAgICAgU3RyaW5nIHRleHQpIHsKKyAgICBzdXBlcih0ZXh0KTsKKyAgICB0aGlzLmNtZFR5cGUgPSBjbWRUeXBlOworICAgIHNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRvd25sb2FkTGluaygpKTsKKyAgICBSb2xlcy5nZXRUYWJSb2xlKCkuc2V0KGdldEVsZW1lbnQoKSk7CisgICAgYWRkQ2xpY2tIYW5kbGVyKHRoaXMpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIG9uQ2xpY2soQ2xpY2tFdmVudCBldmVudCkgeworICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CisKKyAgICBzZWxlY3QoKTsKKworICAgIGlmIChHZXJyaXQuaXNTaWduZWRJbigpKSB7CisgICAgICAvLyBJZiB0aGUgdXNlciBpcyBzaWduZWQtaW4sIHJlbWVtYmVyIHRoaXMgY2hvaWNlIGZvciBmdXR1cmUgcGFuZWxzLgorICAgICAgLy8KKyAgICAgIEFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMgcHJlZiA9CisgICAgICAgICAgR2Vycml0LmdldFVzZXJBY2NvdW50KCkuZ2V0R2VuZXJhbFByZWZlcmVuY2VzKCk7CisgICAgICBwcmVmLnNldERvd25sb2FkQ29tbWFuZChjbWRUeXBlKTsKKyAgICAgIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hY2NvdW50LlV0aWwuQUNDT1VOVF9TVkMuY2hhbmdlUHJlZmVyZW5jZXMocHJlZiwKKyAgICAgICAgICBuZXcgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PigpIHsKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoVm9pZFJlc3VsdCByZXN1bHQpIHsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgRG93bmxvYWRDb21tYW5kIGdldENtZFR5cGUoKSB7CisgICAgcmV0dXJuIGNtZFR5cGU7CisgIH0KKworICB2b2lkIHNlbGVjdCgpIHsKKyAgICBEb3dubG9hZENvbW1hbmRQYW5lbCBwYXJlbnQgPSAoRG93bmxvYWRDb21tYW5kUGFuZWwpIGdldFBhcmVudCgpOworICAgIGZvciAoV2lkZ2V0IHcgOiBwYXJlbnQpIHsKKyAgICAgIGlmICh3ICE9IHRoaXMgJiYgdyBpbnN0YW5jZW9mIERvd25sb2FkQ29tbWFuZExpbmspIHsKKyAgICAgICAgdy5yZW1vdmVTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtfQWN0aXZlKCkpOworICAgICAgfQorICAgIH0KKyAgICBwYXJlbnQuc2V0Q3VycmVudENvbW1hbmQodGhpcyk7CisgICAgYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZG93bmxvYWRMaW5rX0FjdGl2ZSgpKTsKKyAgfQorCisgIHByb3RlY3RlZCBhYnN0cmFjdCB2b2lkIHNldEN1cnJlbnRVcmwoRG93bmxvYWRVcmxMaW5rIGxpbmspOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rvd25sb2FkL0Rvd25sb2FkQ29tbWFuZFBhbmVsLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRDb21tYW5kUGFuZWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kMTdkNmMyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rvd25sb2FkL0Rvd25sb2FkQ29tbWFuZFBhbmVsLmphdmEKQEAgLTAsMCArMSw3OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kb3dubG9hZDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmFyaWEuY2xpZW50LlJvbGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CisKK3B1YmxpYyBjbGFzcyBEb3dubG9hZENvbW1hbmRQYW5lbCBleHRlbmRzIEZsb3dQYW5lbCB7CisgIHByaXZhdGUgRG93bmxvYWRDb21tYW5kTGluayBjdXJyZW50Q29tbWFuZDsKKyAgcHJpdmF0ZSBEb3dubG9hZFVybExpbmsgY3VycmVudFVybDsKKworICBwdWJsaWMgRG93bmxvYWRDb21tYW5kUGFuZWwoKSB7CisgICAgc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZG93bmxvYWRMaW5rTGlzdCgpKTsKKyAgICBSb2xlcy5nZXRUYWJsaXN0Um9sZSgpLnNldChnZXRFbGVtZW50KCkpOworICB9CisKKyAgcHVibGljIGJvb2xlYW4gaXNFbXB0eSgpIHsKKyAgICByZXR1cm4gZ2V0V2lkZ2V0Q291bnQoKSA9PSAwOworICB9CisKKyAgcHVibGljIHZvaWQgc2VsZWN0KEFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRDb21tYW5kIGNtZFR5cGUpIHsKKyAgICBEb3dubG9hZENvbW1hbmRMaW5rIGZpcnN0ID0gbnVsbDsKKworICAgIGZvciAoV2lkZ2V0IHcgOiB0aGlzKSB7CisgICAgICBpZiAodyBpbnN0YW5jZW9mIERvd25sb2FkQ29tbWFuZExpbmspIHsKKyAgICAgICAgZmluYWwgRG93bmxvYWRDb21tYW5kTGluayBkID0gKERvd25sb2FkQ29tbWFuZExpbmspIHc7CisgICAgICAgIGlmIChmaXJzdCA9PSBudWxsKSB7CisgICAgICAgICAgZmlyc3QgPSBkOworICAgICAgICB9CisgICAgICAgIGlmIChkLmNtZFR5cGUgPT0gY21kVHlwZSkgeworICAgICAgICAgIGQuc2VsZWN0KCk7CisgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICB9CisgICAgfQorCisgICAgLy8gSWYgbm9uZSBtYXRjaGVkIHRoZSByZXF1ZXN0ZWQgdHlwZSwgc2VsZWN0IHRoZSBmaXJzdCBpbiB0aGUKKyAgICAvLyBncm91cCBhcyB0aGF0IHdpbGwgYXQgbGVhc3QgZ2l2ZSB1cyBhbiBpbml0aWFsIGJhc2VsaW5lLgorICAgIGlmIChmaXJzdCAhPSBudWxsKSB7CisgICAgICBmaXJzdC5zZWxlY3QoKTsKKyAgICB9CisgIH0KKworICB2b2lkIHNldEN1cnJlbnRVcmwoRG93bmxvYWRVcmxMaW5rIGxpbmspIHsKKyAgICBjdXJyZW50VXJsID0gbGluazsKKyAgICB1cGRhdGUoKTsKKyAgfQorCisgIHZvaWQgc2V0Q3VycmVudENvbW1hbmQoRG93bmxvYWRDb21tYW5kTGluayBjbWQpIHsKKyAgICBjdXJyZW50Q29tbWFuZCA9IGNtZDsKKyAgICB1cGRhdGUoKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCB1cGRhdGUoKSB7CisgICAgaWYgKGN1cnJlbnRDb21tYW5kICE9IG51bGwgJiYgY3VycmVudFVybCAhPSBudWxsKSB7CisgICAgICBjdXJyZW50Q29tbWFuZC5zZXRDdXJyZW50VXJsKGN1cnJlbnRVcmwpOworICAgIH0gZWxzZSBpZiAoY3VycmVudENvbW1hbmQgIT0gbnVsbCAmJgorICAgICAgICBjdXJyZW50Q29tbWFuZC5nZXRDbWRUeXBlKCkuZXF1YWxzKERvd25sb2FkQ29tbWFuZC5SRVBPX0RPV05MT0FEKSkgeworICAgICAgY3VycmVudENvbW1hbmQuc2V0Q3VycmVudFVybChudWxsKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kb3dubG9hZC9Eb3dubG9hZE1lc3NhZ2VzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRNZXNzYWdlcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmEwMzEzYWQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRNZXNzYWdlcy5qYXZhCkBAIC0wLDAgKzEsMjEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAwOCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZG93bmxvYWQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5pMThuLmNsaWVudC5NZXNzYWdlczsKKworcHVibGljIGludGVyZmFjZSBEb3dubG9hZE1lc3NhZ2VzIGV4dGVuZHMgTWVzc2FnZXMgeworICBTdHJpbmcgYW5vbnltb3VzRG93bmxvYWQoU3RyaW5nIHByb3RvY29sKTsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kb3dubG9hZC9Eb3dubG9hZE1lc3NhZ2VzLnByb3BlcnRpZXMgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRNZXNzYWdlcy5wcm9wZXJ0aWVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNlMzRkYTIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRNZXNzYWdlcy5wcm9wZXJ0aWVzCkBAIC0wLDAgKzEgQEAKK2Fub255bW91c0Rvd25sb2FkID0gQW5vbnltb3VzIHswfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rvd25sb2FkL0Rvd25sb2FkUGFuZWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kb3dubG9hZC9Eb3dubG9hZFBhbmVsLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzUwZGJlZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kb3dubG9hZC9Eb3dubG9hZFBhbmVsLmphdmEKQEAgLTAsMCArMSw3OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDA4IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kb3dubG9hZDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzLkRvd25sb2FkU2NoZW1lOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5JbmxpbmVMYWJlbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmNsaXBweS5jbGllbnQuQ29weWFibGVMYWJlbDsKKworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBEb3dubG9hZFBhbmVsIGV4dGVuZHMgRmxvd1BhbmVsIHsKKyAgcHJvdGVjdGVkIFN0cmluZyBwcm9qZWN0TmFtZTsKKworICBwcm90ZWN0ZWQgU2V0PERvd25sb2FkU2NoZW1lPiBhbGxvd2VkU2NoZW1lcyA9CisgICAgICBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0RG93bmxvYWRTY2hlbWVzKCk7CisgIHByb3RlY3RlZCBTZXQ8RG93bmxvYWRDb21tYW5kPiBhbGxvd2VkQ29tbWFuZHMgPQorICAgICAgR2Vycml0LmdldENvbmZpZygpLmdldERvd25sb2FkQ29tbWFuZHMoKTsKKyAgcHJvdGVjdGVkIERvd25sb2FkQ29tbWFuZExpbmsuQ29weWFibGVDb21tYW5kTGlua0ZhY3RvcnkgY21kTGlua2ZhY3Rvcnk7CisKKyAgcHJvdGVjdGVkIERvd25sb2FkQ29tbWFuZFBhbmVsIGNvbW1hbmRzID0gbmV3IERvd25sb2FkQ29tbWFuZFBhbmVsKCk7CisgIHByb3RlY3RlZCBEb3dubG9hZFVybFBhbmVsIHVybHMgPSBuZXcgRG93bmxvYWRVcmxQYW5lbChjb21tYW5kcyk7CisgIHByb3RlY3RlZCBDb3B5YWJsZUxhYmVsIGNvcHlMYWJlbCA9IG5ldyBDb3B5YWJsZUxhYmVsKCIiKTsKKworICBwdWJsaWMgRG93bmxvYWRQYW5lbChTdHJpbmcgcHJvamVjdCwgU3RyaW5nIHJlZiwgYm9vbGVhbiBhbGxvd0Fub255bW91cykgeworICAgIHRoaXMucHJvamVjdE5hbWUgPSBwcm9qZWN0OworCisgICAgY29weUxhYmVsLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRvd25sb2FkTGlua0NvcHlMYWJlbCgpKTsKKyAgICB1cmxzLmFkZChEb3dubG9hZFVybExpbmsuY3JlYXRlRG93bmxvYWRVcmxMaW5rcyhwcm9qZWN0LCByZWYsIGFsbG93QW5vbnltb3VzKSk7CisgICAgY21kTGlua2ZhY3RvcnkgPSBuZXcgRG93bmxvYWRDb21tYW5kTGluay5Db3B5YWJsZUNvbW1hbmRMaW5rRmFjdG9yeSgKKyAgICAgICAgY29weUxhYmVsLCB1cmxzKTsKKworICAgIHBvcHVsYXRlRG93bmxvYWRDb21tYW5kTGlua3MoKTsKKyAgICBzZXR1cFdpZGdldHMoKTsKKyAgfQorCisgIHByb3RlY3RlZCB2b2lkIHNldHVwV2lkZ2V0cygpIHsKKyAgICBpZiAoIWNvbW1hbmRzLmlzRW1wdHkoKSkgeworICAgICAgZmluYWwgQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlcyBwcmVmOworICAgICAgaWYgKEdlcnJpdC5pc1NpZ25lZEluKCkpIHsKKyAgICAgICAgcHJlZiA9IEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldEdlbmVyYWxQcmVmZXJlbmNlcygpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgcHJlZiA9IG5ldyBBY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzKCk7CisgICAgICAgIHByZWYucmVzZXRUb0RlZmF1bHRzKCk7CisgICAgICB9CisgICAgICBjb21tYW5kcy5zZWxlY3QocHJlZi5nZXREb3dubG9hZENvbW1hbmQoKSk7CisgICAgICB1cmxzLnNlbGVjdChwcmVmLmdldERvd25sb2FkVXJsKCkpOworCisgICAgICBGbG93UGFuZWwgcCA9IG5ldyBGbG93UGFuZWwoKTsKKyAgICAgIHAuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZG93bmxvYWRMaW5rSGVhZGVyKCkpOworICAgICAgcC5hZGQoY29tbWFuZHMpOworICAgICAgZmluYWwgSW5saW5lTGFiZWwgZ2x1ZSA9IG5ldyBJbmxpbmVMYWJlbCgpOworICAgICAgZ2x1ZS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtIZWFkZXJHYXAoKSk7CisgICAgICBwLmFkZChnbHVlKTsKKyAgICAgIHAuYWRkKHVybHMpOworCisgICAgICBhZGQocCk7CisgICAgICBhZGQoY29weUxhYmVsKTsKKyAgICB9CisgIH0KKworICBwcm90ZWN0ZWQgYWJzdHJhY3Qgdm9pZCBwb3B1bGF0ZURvd25sb2FkQ29tbWFuZExpbmtzKCk7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRVcmxMaW5rLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRVcmxMaW5rLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGJjODk3ZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kb3dubG9hZC9Eb3dubG9hZFVybExpbmsuamF2YQpAQCAtMCwwICsxLDI2NCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kb3dubG9hZDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMuRG93bmxvYWRTY2hlbWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkF1dGhUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmFyaWEuY2xpZW50LlJvbGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuV2luZG93OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uVm9pZFJlc3VsdDsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworcHVibGljIGNsYXNzIERvd25sb2FkVXJsTGluayBleHRlbmRzIEFuY2hvciBpbXBsZW1lbnRzIENsaWNrSGFuZGxlciB7CisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgRG93bmxvYWRSZWZVcmxMaW5rIGV4dGVuZHMgRG93bmxvYWRVcmxMaW5rIHsKKyAgICBwcm90ZWN0ZWQgU3RyaW5nIHByb2plY3ROYW1lOworICAgIHByb3RlY3RlZCBTdHJpbmcgcmVmOworCisgICAgcHJvdGVjdGVkIERvd25sb2FkUmVmVXJsTGluayhEb3dubG9hZFNjaGVtZSB1cmxUeXBlLAorICAgICAgICBTdHJpbmcgdGV4dCwgU3RyaW5nIHByb2plY3QsIFN0cmluZyByZWYpIHsKKyAgICAgIHN1cGVyKHVybFR5cGUsIHRleHQpOworICAgICAgdGhpcy5wcm9qZWN0TmFtZSA9IHByb2plY3Q7CisgICAgICB0aGlzLnJlZiA9IHJlZjsKKyAgICB9CisKKyAgICBwcm90ZWN0ZWQgdm9pZCBhcHBlbmRSZWYoU3RyaW5nQnVpbGRlciByKSB7CisgICAgICBpZiAocmVmICE9IG51bGwpIHsKKyAgICAgICAgci5hcHBlbmQoIiAiKTsKKyAgICAgICAgci5hcHBlbmQocmVmKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIEFub25HaXRMaW5rIGV4dGVuZHMgRG93bmxvYWRSZWZVcmxMaW5rIHsKKyAgICBwdWJsaWMgQW5vbkdpdExpbmsoU3RyaW5nIHByb2plY3QsIFN0cmluZyByZWYpIHsKKyAgICAgIHN1cGVyKERvd25sb2FkU2NoZW1lLkFOT05fR0lULCBVdGlsLk0uYW5vbnltb3VzRG93bmxvYWQoIkdpdCIpLCBwcm9qZWN0LCByZWYpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBTdHJpbmcgZ2V0VXJsRGF0YSgpIHsKKyAgICAgIFN0cmluZ0J1aWxkZXIgciA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgICByLmFwcGVuZChHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0R2l0RGFlbW9uVXJsKCkpOworICAgICAgci5hcHBlbmQocHJvamVjdE5hbWUpOworICAgICAgYXBwZW5kUmVmKHIpOworICAgICAgcmV0dXJuIHIudG9TdHJpbmcoKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIEFub25IdHRwTGluayBleHRlbmRzIERvd25sb2FkUmVmVXJsTGluayB7CisgICAgcHVibGljIEFub25IdHRwTGluayhTdHJpbmcgcHJvamVjdCwgU3RyaW5nIHJlZikgeworICAgICAgc3VwZXIoRG93bmxvYWRTY2hlbWUuQU5PTl9IVFRQLCBVdGlsLk0uYW5vbnltb3VzRG93bmxvYWQoIkhUVFAiKSwgcHJvamVjdCwgcmVmKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU3RyaW5nIGdldFVybERhdGEoKSB7CisgICAgICBTdHJpbmdCdWlsZGVyIHIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgaWYgKEdlcnJpdC5nZXRDb25maWcoKS5nZXRHaXRIdHRwVXJsKCkgIT0gbnVsbCkgeworICAgICAgICByLmFwcGVuZChHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0R2l0SHR0cFVybCgpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHIuYXBwZW5kKGhvc3RQYWdlVXJsKTsKKyAgICAgIH0KKyAgICAgIHIuYXBwZW5kKHByb2plY3ROYW1lKTsKKyAgICAgIGFwcGVuZFJlZihyKTsKKyAgICAgIHJldHVybiByLnRvU3RyaW5nKCk7CisgICAgfQorICB9CisKKyAgcHVibGljIHN0YXRpYyBjbGFzcyBTc2hMaW5rIGV4dGVuZHMgRG93bmxvYWRSZWZVcmxMaW5rIHsKKyAgICBwdWJsaWMgU3NoTGluayhTdHJpbmcgcHJvamVjdCwgU3RyaW5nIHJlZikgeworICAgICAgc3VwZXIoRG93bmxvYWRTY2hlbWUuU1NILCAiU1NIIiwgcHJvamVjdCwgcmVmKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU3RyaW5nIGdldFVybERhdGEoKSB7CisgICAgICBTdHJpbmcgc3NoQWRkciA9IEdlcnJpdC5nZXRDb25maWcoKS5nZXRTc2hkQWRkcmVzcygpOworICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciByID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKKyAgICAgIHIuYXBwZW5kKCJzc2g6Ly8iKTsKKyAgICAgIHIuYXBwZW5kKEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldFVzZXJOYW1lKCkpOworICAgICAgci5hcHBlbmQoIkAiKTsKKyAgICAgIGlmIChzc2hBZGRyLnN0YXJ0c1dpdGgoIio6IikgfHwgIiIuZXF1YWxzKHNzaEFkZHIpKSB7CisgICAgICAgIHIuYXBwZW5kKFdpbmRvdy5Mb2NhdGlvbi5nZXRIb3N0TmFtZSgpKTsKKyAgICAgIH0KKyAgICAgIGlmIChzc2hBZGRyLnN0YXJ0c1dpdGgoIioiKSkgeworICAgICAgICBzc2hBZGRyID0gc3NoQWRkci5zdWJzdHJpbmcoMSk7CisgICAgICB9CisgICAgICByLmFwcGVuZChzc2hBZGRyKTsKKyAgICAgIHIuYXBwZW5kKCIvIik7CisgICAgICByLmFwcGVuZChwcm9qZWN0TmFtZSk7CisgICAgICBhcHBlbmRSZWYocik7CisgICAgICByZXR1cm4gci50b1N0cmluZygpOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgSHR0cExpbmsgZXh0ZW5kcyBEb3dubG9hZFJlZlVybExpbmsgeworICAgIHByb3RlY3RlZCBib29sZWFuIGFub255bW91czsKKworICAgIHB1YmxpYyBIdHRwTGluayhTdHJpbmcgcHJvamVjdCwgU3RyaW5nIHJlZiwgYm9vbGVhbiBhbm9ueW1vdXMpIHsKKyAgICAgIHN1cGVyKERvd25sb2FkU2NoZW1lLkhUVFAsICJIVFRQIiwgcHJvamVjdCwgcmVmKTsKKyAgICAgIHRoaXMuYW5vbnltb3VzID0gYW5vbnltb3VzOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBTdHJpbmcgZ2V0VXJsRGF0YSgpIHsKKyAgICAgIGZpbmFsIFN0cmluZ0J1aWxkZXIgciA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgICBpZiAoR2Vycml0LmdldENvbmZpZygpLmdldEdpdEh0dHBVcmwoKSAhPSBudWxsCisgICAgICAgICAgJiYgKGFub255bW91cyB8fCBzaXRlUmVsaWVzT25IdHRwKCkpKSB7CisgICAgICAgIHIuYXBwZW5kKEdlcnJpdC5nZXRDb25maWcoKS5nZXRHaXRIdHRwVXJsKCkpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgU3RyaW5nIGJhc2UgPSBob3N0UGFnZVVybDsKKyAgICAgICAgaW50IHAgPSBiYXNlLmluZGV4T2YoIjovLyIpOworICAgICAgICBpbnQgcyA9IGJhc2UuaW5kZXhPZignLycsIHAgKyAzKTsKKyAgICAgICAgaWYgKHMgPCAwKSB7CisgICAgICAgICAgcyA9IGJhc2UubGVuZ3RoKCk7CisgICAgICAgIH0KKyAgICAgICAgU3RyaW5nIGhvc3QgPSBiYXNlLnN1YnN0cmluZyhwICsgMywgcyk7CisgICAgICAgIGlmIChob3N0LmNvbnRhaW5zKCJAIikpIHsKKyAgICAgICAgICBob3N0ID0gaG9zdC5zdWJzdHJpbmcoaG9zdC5pbmRleE9mKCdAJykgKyAxKTsKKyAgICAgICAgfQorCisgICAgICAgIHIuYXBwZW5kKGJhc2Uuc3Vic3RyaW5nKDAsIHAgKyAzKSk7CisgICAgICAgIHIuYXBwZW5kKEdlcnJpdC5nZXRVc2VyQWNjb3VudCgpLmdldFVzZXJOYW1lKCkpOworICAgICAgICByLmFwcGVuZCgnQCcpOworICAgICAgICByLmFwcGVuZChob3N0KTsKKyAgICAgICAgci5hcHBlbmQoYmFzZS5zdWJzdHJpbmcocykpOworICAgICAgfQorICAgICAgci5hcHBlbmQocHJvamVjdE5hbWUpOworICAgICAgYXBwZW5kUmVmKHIpOworICAgICAgcmV0dXJuIHIudG9TdHJpbmcoKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgc3RhdGljIGJvb2xlYW4gc2l0ZVJlbGllc09uSHR0cCgpIHsKKyAgICByZXR1cm4gR2Vycml0LmdldENvbmZpZygpLmdldEdpdEh0dHBVcmwoKSAhPSBudWxsCisgICAgICAgICYmIEdlcnJpdC5nZXRDb25maWcoKS5nZXRBdXRoVHlwZSgpID09IEF1dGhUeXBlLkNVU1RPTV9FWFRFTlNJT04KKyAgICAgICAgJiYgIUdlcnJpdC5nZXRDb25maWcoKS5zaXRlSGFzVXNlcm5hbWVzKCk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIExpc3Q8RG93bmxvYWRVcmxMaW5rPiBjcmVhdGVEb3dubG9hZFVybExpbmtzKFN0cmluZyBwcm9qZWN0LAorICAgICAgU3RyaW5nIHJlZiwgYm9vbGVhbiBhbGxvd0Fub255bW91cykgeworICAgIExpc3Q8RG93bmxvYWRVcmxMaW5rPiB1cmxzID0gbmV3IEFycmF5TGlzdDxEb3dubG9hZFVybExpbms+KCk7CisgICAgU2V0PERvd25sb2FkU2NoZW1lPiBhbGxvd2VkU2NoZW1lcyA9IEdlcnJpdC5nZXRDb25maWcoKS5nZXREb3dubG9hZFNjaGVtZXMoKTsKKworICAgIGlmIChhbGxvd0Fub255bW91cworICAgICAgICAmJiBHZXJyaXQuZ2V0Q29uZmlnKCkuZ2V0R2l0RGFlbW9uVXJsKCkgIT0gbnVsbAorICAgICAgICAmJiAoYWxsb3dlZFNjaGVtZXMuY29udGFpbnMoRG93bmxvYWRTY2hlbWUuQU5PTl9HSVQpIHx8CisgICAgICAgICAgICBhbGxvd2VkU2NoZW1lcy5jb250YWlucyhEb3dubG9hZFNjaGVtZS5ERUZBVUxUX0RPV05MT0FEUykpKSB7CisgICAgICB1cmxzLmFkZChuZXcgRG93bmxvYWRVcmxMaW5rLkFub25HaXRMaW5rKHByb2plY3QsIHJlZikpOworICAgIH0KKworICAgIGlmIChhbGxvd0Fub255bW91cworICAgICAgICAmJiAoYWxsb3dlZFNjaGVtZXMuY29udGFpbnMoRG93bmxvYWRTY2hlbWUuQU5PTl9IVFRQKSB8fAorICAgICAgICAgICAgYWxsb3dlZFNjaGVtZXMuY29udGFpbnMoRG93bmxvYWRTY2hlbWUuREVGQVVMVF9ET1dOTE9BRFMpKSkgeworICAgICAgdXJscy5hZGQobmV3IERvd25sb2FkVXJsTGluay5Bbm9uSHR0cExpbmsocHJvamVjdCwgcmVmKSk7CisgICAgfQorCisgICAgaWYgKEdlcnJpdC5nZXRDb25maWcoKS5nZXRTc2hkQWRkcmVzcygpICE9IG51bGwKKyAgICAgICAgJiYgaGFzVXNlck5hbWUoKQorICAgICAgICAmJiAoYWxsb3dlZFNjaGVtZXMuY29udGFpbnMoRG93bmxvYWRTY2hlbWUuU1NIKSB8fAorICAgICAgICAgICAgYWxsb3dlZFNjaGVtZXMuY29udGFpbnMoRG93bmxvYWRTY2hlbWUuREVGQVVMVF9ET1dOTE9BRFMpKSkgeworICAgICAgdXJscy5hZGQobmV3IERvd25sb2FkVXJsTGluay5Tc2hMaW5rKHByb2plY3QsIHJlZikpOworICAgIH0KKworICAgIGlmICgoaGFzVXNlck5hbWUoKSB8fCBzaXRlUmVsaWVzT25IdHRwKCkpCisgICAgICAgICYmIChhbGxvd2VkU2NoZW1lcy5jb250YWlucyhEb3dubG9hZFNjaGVtZS5IVFRQKQorICAgICAgICAgICAgfHwgYWxsb3dlZFNjaGVtZXMuY29udGFpbnMoRG93bmxvYWRTY2hlbWUuREVGQVVMVF9ET1dOTE9BRFMpKSkgeworICAgICAgdXJscy5hZGQobmV3IERvd25sb2FkVXJsTGluay5IdHRwTGluayhwcm9qZWN0LCByZWYsIGFsbG93QW5vbnltb3VzKSk7CisgICAgfQorICAgIHJldHVybiB1cmxzOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBoYXNVc2VyTmFtZSgpIHsKKyAgICByZXR1cm4gR2Vycml0LmlzU2lnbmVkSW4oKQorICAgICAgICAmJiBHZXJyaXQuZ2V0VXNlckFjY291bnQoKS5nZXRVc2VyTmFtZSgpICE9IG51bGwKKyAgICAgICAgJiYgR2Vycml0LmdldFVzZXJBY2NvdW50KCkuZ2V0VXNlck5hbWUoKS5sZW5ndGgoKSA+IDA7CisgIH0KKworICBwcm90ZWN0ZWQgRG93bmxvYWRTY2hlbWUgdXJsVHlwZTsKKyAgcHJvdGVjdGVkIFN0cmluZyB1cmxEYXRhOworICBwcm90ZWN0ZWQgU3RyaW5nIGhvc3RQYWdlVXJsID0gR1dULmdldEhvc3RQYWdlQmFzZVVSTCgpOworCisgIHB1YmxpYyBEb3dubG9hZFVybExpbmsoRG93bmxvYWRTY2hlbWUgdXJsVHlwZSwgU3RyaW5nIHRleHQsIFN0cmluZyB1cmxEYXRhKSB7CisgICAgdGhpcyh0ZXh0KTsKKyAgICB0aGlzLnVybFR5cGUgPSB1cmxUeXBlOworICAgIHRoaXMudXJsRGF0YSA9IHVybERhdGE7CisgIH0KKworICBwdWJsaWMgRG93bmxvYWRVcmxMaW5rKERvd25sb2FkU2NoZW1lIHVybFR5cGUsIFN0cmluZyB0ZXh0KSB7CisgICAgdGhpcyh0ZXh0KTsKKyAgICB0aGlzLnVybFR5cGUgPSB1cmxUeXBlOworICB9CisKKyAgcHVibGljIERvd25sb2FkVXJsTGluayhTdHJpbmcgdGV4dCkgeworICAgIHN1cGVyKHRleHQpOworICAgIHNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRvd25sb2FkTGluaygpKTsKKyAgICBSb2xlcy5nZXRUYWJSb2xlKCkuc2V0KGdldEVsZW1lbnQoKSk7CisgICAgYWRkQ2xpY2tIYW5kbGVyKHRoaXMpOworCisgICAgaWYgKCFob3N0UGFnZVVybC5lbmRzV2l0aCgiLyIpKSB7CisgICAgICBob3N0UGFnZVVybCArPSAiLyI7CisgICAgfQorICB9CisKKyAgcHVibGljIFN0cmluZyBnZXRVcmxEYXRhKCkgeworICAgIHJldHVybiB1cmxEYXRhOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIG9uQ2xpY2soQ2xpY2tFdmVudCBldmVudCkgeworICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CisKKyAgICBzZWxlY3QoKTsKKworICAgIGlmIChHZXJyaXQuaXNTaWduZWRJbigpKSB7CisgICAgICAvLyBJZiB0aGUgdXNlciBpcyBzaWduZWQtaW4sIHJlbWVtYmVyIHRoaXMgY2hvaWNlIGZvciBmdXR1cmUgcGFuZWxzLgorICAgICAgLy8KKyAgICAgIEFjY291bnRHZW5lcmFsUHJlZmVyZW5jZXMgcHJlZiA9CisgICAgICAgICAgR2Vycml0LmdldFVzZXJBY2NvdW50KCkuZ2V0R2VuZXJhbFByZWZlcmVuY2VzKCk7CisgICAgICBwcmVmLnNldERvd25sb2FkVXJsKHVybFR5cGUpOworICAgICAgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFjY291bnQuVXRpbC5BQ0NPVU5UX1NWQy5jaGFuZ2VQcmVmZXJlbmNlcyhwcmVmLAorICAgICAgICAgIG5ldyBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+KCkgeworICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoVGhyb3dhYmxlIGNhdWdodCkgeworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhWb2lkUmVzdWx0IHJlc3VsdCkgeworICAgICAgICAgICAgfQorICAgICAgICAgIH0pOworICAgIH0KKyAgfQorCisgIHZvaWQgc2VsZWN0KCkgeworICAgIERvd25sb2FkVXJsUGFuZWwgcGFyZW50ID0gKERvd25sb2FkVXJsUGFuZWwpIGdldFBhcmVudCgpOworICAgIGZvciAoV2lkZ2V0IHcgOiBwYXJlbnQpIHsKKyAgICAgIGlmICh3ICE9IHRoaXMgJiYgdyBpbnN0YW5jZW9mIERvd25sb2FkVXJsTGluaykgeworICAgICAgICB3LnJlbW92ZVN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRvd25sb2FkTGlua19BY3RpdmUoKSk7CisgICAgICB9CisgICAgfQorICAgIHBhcmVudC5zZXRDdXJyZW50VXJsKHRoaXMpOworICAgIGFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRvd25sb2FkTGlua19BY3RpdmUoKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kb3dubG9hZC9Eb3dubG9hZFVybFBhbmVsLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRVcmxQYW5lbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjhkMDc0OTgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZG93bmxvYWQvRG93bmxvYWRVcmxQYW5lbC5qYXZhCkBAIC0wLDAgKzEsNzAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZG93bmxvYWQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R2VuZXJhbFByZWZlcmVuY2VzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmFyaWEuY2xpZW50LlJvbGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKKworcHVibGljIGNsYXNzIERvd25sb2FkVXJsUGFuZWwgZXh0ZW5kcyBGbG93UGFuZWwgeworICBwcml2YXRlIGZpbmFsIERvd25sb2FkQ29tbWFuZFBhbmVsIGNvbW1hbmRQYW5lbDsKKworICBwdWJsaWMgRG93bmxvYWRVcmxQYW5lbChmaW5hbCBEb3dubG9hZENvbW1hbmRQYW5lbCBjb21tYW5kUGFuZWwpIHsKKyAgICB0aGlzLmNvbW1hbmRQYW5lbCA9IGNvbW1hbmRQYW5lbDsKKyAgICBzZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kb3dubG9hZExpbmtMaXN0KCkpOworICAgIFJvbGVzLmdldFRhYmxpc3RSb2xlKCkuc2V0KGdldEVsZW1lbnQoKSk7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBpc0VtcHR5KCkgeworICAgIHJldHVybiBnZXRXaWRnZXRDb3VudCgpID09IDA7CisgIH0KKworICBwdWJsaWMgdm9pZCBzZWxlY3QoQWNjb3VudEdlbmVyYWxQcmVmZXJlbmNlcy5Eb3dubG9hZFNjaGVtZSB1cmxUeXBlKSB7CisgICAgRG93bmxvYWRVcmxMaW5rIGZpcnN0ID0gbnVsbDsKKworICAgIGZvciAoV2lkZ2V0IHcgOiB0aGlzKSB7CisgICAgICBpZiAodyBpbnN0YW5jZW9mIERvd25sb2FkVXJsTGluaykgeworICAgICAgICBmaW5hbCBEb3dubG9hZFVybExpbmsgZCA9IChEb3dubG9hZFVybExpbmspIHc7CisgICAgICAgIGlmIChmaXJzdCA9PSBudWxsKSB7CisgICAgICAgICAgZmlyc3QgPSBkOworICAgICAgICB9CisgICAgICAgIGlmIChkLnVybFR5cGUgPT0gdXJsVHlwZSkgeworICAgICAgICAgIGQuc2VsZWN0KCk7CisgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICB9CisgICAgfQorCisgICAgLy8gSWYgbm9uZSBtYXRjaGVkIHRoZSByZXF1ZXN0ZWQgdHlwZSwgc2VsZWN0IHRoZSBmaXJzdCBpbiB0aGUKKyAgICAvLyBncm91cCBhcyB0aGF0IHdpbGwgYXQgbGVhc3QgZ2l2ZSB1cyBhbiBpbml0aWFsIGJhc2VsaW5lLgorICAgIGlmIChmaXJzdCAhPSBudWxsKSB7CisgICAgICBmaXJzdC5zZWxlY3QoKTsKKyAgICB9CisgIH0KKworICB2b2lkIHNldEN1cnJlbnRVcmwoRG93bmxvYWRVcmxMaW5rIGxpbmspIHsKKyAgICBjb21tYW5kUGFuZWwuc2V0Q3VycmVudFVybChsaW5rKTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIGFkZChDb2xsZWN0aW9uPERvd25sb2FkVXJsTGluaz4gbGlua3MpIHsKKyAgICBmb3IgKFdpZGdldCBsaW5rOiBsaW5rcykgeworICAgICAgYWRkKGxpbmspOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2Rvd25sb2FkL1V0aWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kb3dubG9hZC9VdGlsLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTEwMzYxYgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9kb3dubG9hZC9VdGlsLmphdmEKQEAgLTAsMCArMSwyMSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDA4IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5kb3dubG9hZDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKKworcHVibGljIGNsYXNzIFV0aWwgeworICBwdWJsaWMgc3RhdGljIGZpbmFsIERvd25sb2FkTWVzc2FnZXMgTSA9IEdXVC5jcmVhdGUoRG93bmxvYWRNZXNzYWdlcy5jbGFzcyk7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZWRpdFRleHQucG5nIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2VkaXRUZXh0LnBuZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xODhlMWMxCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2VkaXRUZXh0LnBuZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ2Vycml0LmNzcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nZXJyaXQuY3NzCmluZGV4IDc1MTJkOGMuLjk0MjU0NDMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nZXJyaXQuY3NzCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nZXJyaXQuY3NzCkBAIC0xMywzMSArMTMsMTUgQEAKICAqIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgogICovCiAKLUBleHRlcm5hbCAuZ3d0LUJ1dHRvbjsKLUBleHRlcm5hbCAuZ3d0LVRhYkJhcjsKLUBleHRlcm5hbCAuZ3d0LVRhYkJhckZpcnN0OwotQGV4dGVybmFsIC5nd3QtVGFiQmFySXRlbTsKLUBleHRlcm5hbCAuZ3d0LVRhYkJhckl0ZW0tc2VsZWN0ZWQ7Ci1AZXh0ZXJuYWwgLmd3dC1UYWJCYXJSZXN0OwotQGV4dGVybmFsIC5nd3QtVGFiUGFuZWxCb3R0b207Ci1AZXh0ZXJuYWwgLmd3dC1UZXh0Qm94OwotQGV4dGVybmFsIC5nd3QtSHlwZXJsaW5rOwotQGV4dGVybmFsIC5nd3QtQ2hlY2tCb3g7Ci1AZXh0ZXJuYWwgLmd3dC1EaXNjbG9zdXJlUGFuZWwsIC5oZWFkZXIsIC5jb250ZW50OwotQGV4dGVybmFsIC5nd3QtSW5saW5lTGFiZWw7Ci1AZXh0ZXJuYWwgLmd3dC1JbmxpbmVIeXBlcmxpbms7Ci1AZXh0ZXJuYWwgLmd3dC1SYWRpb0J1dHRvbjsKLQotQGV4dGVybmFsIC5zZWFyY2hQYW5lbDsKLUBleHRlcm5hbCAuc21hbGxIZWFkaW5nOwotQGV4dGVybmFsIC53ZGk7Ci1AZXh0ZXJuYWwgLndkZDsKLUBleHRlcm5hbCAud2RjOworLyoqCisgKiBNYWtlIGV2ZXJ5IHNpbmdsZSBjbGFzcyBleHRlcm5hbCBzbyB1c2VycyBjYW4gcmVseSBvbiB0aGVpciBuYW1lcworICovCitAZXh0ZXJuYWwgLio7CiAKIEBkZWYgYmxhY2sgIzAwMDAwMDsKIEBkZWYgd2hpdGUgI2ZmZmZmZjsKIEBkZWYgbm9ybS1mb250ICBBcmlhbCBVbmljb2RlIE1TLCBBcmlhbCwgc2Fucy1zZXJpZjsKLUBkZWYgbW9uby1mb250ICdMdWNpZGEgQ29uc29sZScsICdMdWNpZGEgU2FucyBUeXBld3JpdGVyJywgTW9uYWNvLCBtb25vc3BhY2U7CitAZGVmIG1vbm8tZm9udCAgbW9ub3NwYWNlOwogCiBAZXZhbCBiYWNrZ3JvdW5kQ29sb3IgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdC5nZXRUaGVtZSgpLmJhY2tncm91bmRDb2xvcjsKIEBldmFsIHRvcE1lbnVDb2xvciBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0LmdldFRoZW1lKCkudG9wTWVudUNvbG9yOwpAQCAtNTIsMjggKzM2LDMyIEBACiAgIGd3dC1pbWFnZTogImdyZWVuQ2hlY2siOwogfQogCisvKiogT3ZlcnJpZGUgdmFyaW91cyBHV1QgZGVmYXVsdHMgKi8KIC5nZXJyaXRUb3BNZW51IHsKICAgZm9udC1zaXplOiA5cHQ7CiAgIHBhZGRpbmctdG9wOiA1cHg7CiAgIHBhZGRpbmctbGVmdDogNXB4OwogICBwYWRkaW5nLXJpZ2h0OiA1cHg7Ci0gIGJhY2tncm91bmQ6IHRvcE1lbnVDb2xvcjsKLX0KLS5nZXJyaXRUb3BNZW51IC5nd3QtVGFiQmFyIC5nd3QtVGFiQmFySXRlbSwKLS5nZXJyaXRUb3BNZW51IC5nd3QtVGFiQmFyIC5nd3QtVGFiQmFyUmVzdCwKLS5nZXJyaXRUb3BNZW51IC5nd3QtVGFiQmFyIC5nd3QtVGFiUGFuZWxCb3R0b20gewotICBiYWNrZ3JvdW5kOiB0b3BNZW51Q29sb3I7Ci19Ci0uZ2Vycml0VG9wTWVudSAuZ3d0LVRhYkJhciAuZ3d0LVRhYkJhckl0ZW0tc2VsZWN0ZWQgewotICBiYWNrZ3JvdW5kOiBzZWxlY3Rpb25Db2xvcjsKKyAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7CiB9CiAKIC5nZXJyaXRCb2R5IHsKLSAgZm9udC1zaXplOiAxMXB0OworICBmb250LXNpemU6IHNtYWxsOwogICBwYWRkaW5nLWxlZnQ6IDVweDsKICAgcGFkZGluZy1yaWdodDogNXB4OwogfQogCithLAorYTp2aXNpdGVkIHsKKyAgY29sb3I6ICMwNjU0YWM7CisgIHRleHQtZGVjb3JhdGlvbjogbm9uZTsKK30KKworYTpob3ZlciB7CisgIGNvbG9yOiAjMDY1NGFjOworICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKK30KKwogLnZlcnNpb24sCiAua2V5aGVscCB7CiAgIGNvbG9yOiAjYTBhZGNjOwpAQCAtMTE4LDYgKzEwNiw5IEBACiAgIHBhZGRpbmc6IDAuMmVtIDAuMmVtIDAuMmVtIDAuNWVtOwogfQogCisubGluayB7CisgIGN1cnNvcjogcG9pbnRlcjsKK30KIAogLyoqIE1lbnVTY3JlZW4gKiovCiAubWVudVNjcmVlbk1lbnVCYXIgewpAQCAtMTQxLDYgKzEzMiw5IEBACiAgIGJhY2tncm91bmQ6IHNlbGVjdGlvbkNvbG9yOwogfQogCisubWVudUl0ZW0uYWN0aXZlUm93IHsKKyAgYmFja2dyb3VuZDogc2VsZWN0aW9uQ29sb3I7Cit9CiAKIC8qKiBDb21tZW50UGFuZWwgKiovCiAuY29tbWVudFBhbmVsQm9yZGVyIHsKQEAgLTIzNSw2ICsyMjksNyBAQAogICBmb250LXNpemU6IDlwdDsKICAgZGlzcGxheTogaW5saW5lOwogICB3aGl0ZS1zcGFjZTogbm93cmFwOworICBwYWRkaW5nLWxlZnQ6IDZweDsKIH0KIC5tZW51SXRlbSB7CiAgIHBhZGRpbmctbGVmdDogNXB4OwpAQCAtMjUzLDMzICsyNDgsNDYgQEAKIC50b3BtZW51VERnbHVlIHsKICAgd2lkdGg6IDEwMCU7CiB9CisKIC50b3BtZW51TWVudUxlZnQgewogICB3aWR0aDogMzAwcHg7Ci0gIGJvcmRlci1sZWZ0OiAxcHggc29saWQgdG9wTWVudUNvbG9yOwotICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCB0b3BNZW51Q29sb3I7Ci0gIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCB0b3BNZW51Q29sb3I7CisgIGZvbnQtc2l6ZTogOXB0OworICBwYWRkaW5nLXRvcDogNXB4OworICBwYWRkaW5nLWxlZnQ6IDVweDsKKyAgcGFkZGluZy1yaWdodDogNXB4OworICBiYWNrZ3JvdW5kOiBub25lOworICBwb3NpdGlvbjogcmVsYXRpdmU7CisgIHRvcDogMDsKK30KKy50b3BtZW51TWVudUxlZnQgdGJvZHkgdHIgdGQgdGFibGUgeworICBib3JkZXI6IDA7Cit9CisudG9wbWVudU1lbnVMZWZ0IHRib2R5IHRyIHRkIHRhYmxlLmd3dC1UYWJCYXIgeworICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI0RERDsKK30KKy50b3BtZW51TWVudUxlZnQgLmd3dC1UZXh0Qm94IHsKKyAgd2lkdGg6IDI1MHB4OworfQorLnRvcG1lbnVNZW51TGVmdCAuZ3d0LUJ1dHRvbiB7CisgIHBhZGRpbmc6IDNweCA2cHg7CiB9CiAudG9wbWVudU1lbnVMZWZ0IC5nd3QtVGFiQmFyRmlyc3QgewogICBkaXNwbGF5OiBub25lOwogfQogLnRvcG1lbnVNZW51TGVmdCAuZ3d0LVRhYkJhckl0ZW0gewogICBtYXJnaW46IDBweDsKLSAgYmFja2dyb3VuZDogdG9wTWVudUNvbG9yOworICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsKICAgcGFkZGluZy10b3A6IDBweDsKICAgcGFkZGluZy1ib3R0b206IDFweDsKICAgcGFkZGluZy1sZWZ0OiAxZW07CiAgIHBhZGRpbmctcmlnaHQ6IDFlbTsKLSAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgYmxhY2s7Ci19Ci0udG9wbWVudU1lbnVMZWZ0IC5nd3QtVGFiQmFySXRlbS1zZWxlY3RlZCB7Ci0gIGJhY2tncm91bmQ6IHNlbGVjdGlvbkNvbG9yOwogfQogLnRvcG1lbnVNZW51TGVmdCAuZ3d0LVRhYkJhclJlc3QgewotICBiYWNrZ3JvdW5kOiB0b3BNZW51Q29sb3I7CisgIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50OwogICBwYWRkaW5nLXRvcDogMHB4OwogfQogLnRvcG1lbnVNZW51TGVmdCAuZ3d0LVRhYlBhbmVsQm90dG9tIHsKLSAgYmFja2dyb3VuZDogdG9wTWVudUNvbG9yOworICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsKICAgYm9yZGVyLXRvcDogbm9uZTsKICAgYm9yZGVyLWxlZnQ6IG5vbmU7CiAgIGJvcmRlci1yaWdodDogbm9uZTsKQEAgLTI5NywyMSArMzA1LDM3IEBACiAgIHRleHQtYWxpZ246IHJpZ2h0OwogfQogLm1lbnVCYXJVc2VyTmFtZSB7Ci0gIGZvbnQtd2VpZ2h0OiBib2xkOwogICBwYWRkaW5nLWxlZnQ6IDVweDsKICAgcGFkZGluZy1yaWdodDogNXB4OwogICB3aGl0ZS1zcGFjZTogbm93cmFwOwogfQorLm1lbnVCYXJVc2VyTmFtZUF2YXRhciB7CisgIHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7Cit9CisubWVudUJhclVzZXJOYW1lRm9jdXNQYW5lbCB7CisgIGRpc3BsYXk6IGlubGluZTsKK30KKy5tZW51QmFyVXNlck5hbWVQYW5lbCB7CisgIGRpc3BsYXk6IGlubGluZTsKKyAgY3Vyc29yOiBwb2ludGVyOworICBmb250LXdlaWdodDogYm9sZDsKK30KKy51c2VySW5mb1BvcHVwIHsKKyAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7CisgIGJhY2tncm91bmQ6IHdoaXRlOworICBib3gtc2hhZG93OiAzcHggM3B4IDVweCAjODg4OworfQogLnNlYXJjaFBhbmVsIHsKICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKKyAgZGlzcGxheTogaW5saW5lOwogfQogLnNlYXJjaFBhbmVsIC5nd3QtVGV4dEJveCB7Ci0gIGZvbnQtc2l6ZTogN3B0OworICBmb250LXNpemU6IDlwdDsKIH0KIC5zZWFyY2hQYW5lbCAuZ3d0LUJ1dHRvbiB7Ci0gIGZvbnQtc2l6ZTogN3B0OworICBmb250LXNpemU6IDlwdDsKICAgbWFyZ2luLWxlZnQ6IDJweDsKLSAgcGFkZGluZzogMXB4OworICBwYWRkaW5nOiAzcHggNnB4OwogfQogCiAvKiogUlBDIFN0YXR1cyAqKi8KQEAgLTMyMyw2ICszNDcsNyBAQAogfQogCiAucnBjU3RhdHVzIHsKKyAgcG9zaXRpb246IGZpeGVkOwogICBwYWRkaW5nLXRvcDogNHB4OwogICBwYWRkaW5nLWJvdHRvbTogNHB4OwogICBwYWRkaW5nLWxlZnQ6IDEwcHg7CkBAIC00ODksNiArNTE0LDEyIEBACiAgIHBhZGRpbmctcmlnaHQ6IDVweDsKICAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgdHJpbUNvbG9yOwogICBib3JkZXItYm90dG9tOiAxcHggc29saWQgdHJpbUNvbG9yOworICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOworICBoZWlnaHQ6IDIwcHg7Cit9CisKKy5jaGFuZ2VUYWJsZSBhLmd3dC1JbmxpbmVIeXBlcmxpbmsgeworICBjb2xvcjogIzIyMiAhaW1wb3J0YW50OwogfQogCiAuYWNjb3VudERhc2hib2FyZC5jaGFuZ2VUYWJsZSB0ciB7CkBAIC01MTAsMjAgKzU0MSwxMyBAQAogICBiYWNrZ3JvdW5kOiBzZWxlY3Rpb25Db2xvciAhaW1wb3J0YW50OwogfQogCi0uY2hhbmdlVGFibGUgLmNJRCB7Ci0gIHdpZHRoOiAzLjVlbTsKLX0KLS5jaGFuZ2VUYWJsZSAuZGF0YUNlbGwuY0lEIHsKLSAgZm9udC1mYW1pbHk6IG1vbm8tZm9udDsKLX0KLQogLmNoYW5nZVRhYmxlIC5jU1VCSkVDVCBkaXYgewogICB0ZXh0LW92ZXJmbG93OiBlbGxpcHNpczsKICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKIH0KIAotLmNoYW5nZVRhYmxlIC5jUFJPSkVDVCB7CisuY2hhbmdlVGFibGUgLmNPV05FUiB7CiAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CiB9CiAKQEAgLTYwMSw2ICs2MjUsMTEgQEAKICAgbWFyZ2luLXJpZ2h0OiAxZW07CiB9CiAKKy5yZXZpZXdlZFBhbmVsQm90dG9tIHsKKyAgZmxvYXQ6IHJpZ2h0OworICBmb250LXNpemU6IHNtYWxsOworfQorCiAKIC8qKiBQYXRjaENvbnRlbnRUYWJsZSAqKi8KIC5wYXRjaENvbnRlbnRUYWJsZSB7CkBAIC02MjYsNiArNjU1LDExIEBACiAucGF0Y2hDb250ZW50VGFibGUgLmRpZmZUZXh0IHsKICAgd2hpdGUtc3BhY2U6IHByZTsKICAgcGFkZGluZy1sZWZ0OiAwLjJlbTsKKyAgYm9yZGVyLWxlZnQ6IHRoaW4gc29saWQgI2IwYmRjYzsKK30KKworLnBhdGNoQ29udGVudFRhYmxlIC5kaWZmVGV4dEZvckJpbmFyeUluU2lkZUJ5U2lkZSB7Cisgd2lkdGg6IDUwJTsKIH0KIAogLnBhdGNoQ29udGVudFRhYmxlIC5kaWZmVGV4dEZpbGVIZWFkZXIgewpAQCAtNjU1LDEzICs2ODksMTggQEAKIC5wYXRjaENvbnRlbnRUYWJsZSB0ci5jb21tZW50SG9sZGVyIC5pY29uQ2VsbCB7CiAgIGJhY2tncm91bmQ6IHdoaXRlOwogfQorLnBhdGNoQ29udGVudFRhYmxlIHRyLmNvbW1lbnRIb2xkZXIgLmljb25DZWxsT2ZGaWxlQ29tbWVudFJvdyB7CisgIGJhY2tncm91bmQ6IHRyaW1Db2xvcjsKK30KIC5wYXRjaENvbnRlbnRUYWJsZSB0ZC5jb21tZW50SG9sZGVyIHsKICAgcGFkZGluZy1sZWZ0OiAwOwogICBwYWRkaW5nLXJpZ2h0OiAwOwogICBib3JkZXItdG9wOiAxcHggc29saWQgYmxhY2s7Ci0gIGJvcmRlci1sZWZ0OiAxcHggc29saWQgYmxhY2s7CiAgIGJvcmRlci1yaWdodDogMXB4IHNvbGlkIGJsYWNrOwogfQorLnBhdGNoQ29udGVudFRhYmxlIHRkLmNvbW1lbnRIb2xkZXJMZWZ0bW9zdCB7CisgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgYmxhY2s7Cit9CiAucGF0Y2hDb250ZW50VGFibGUgdGQuY29tbWVudEhvbGRlci5jb21tZW50UGFuZWxMYXN0IHsKICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIGJsYWNrOwogfQpAQCAtNjg0LDggKzcyMyw4IEBACiAubGluZU51bWJlciB7CiAgIHBhZGRpbmctbGVmdDogMC4yZW07CiAgIHdoaXRlLXNwYWNlOiBwcmU7Ci0gIHdpZHRoOiAzLjVlbTsKLSAgdGV4dC1hbGlnbjogcmlnaHQ7CisgIHdpZHRoOiAxLjVlbTsKKyAgdGV4dC1hbGlnbjogY2VudGVyOwogICBwYWRkaW5nLXJpZ2h0OiAwLjJlbTsKICAgYmFja2dyb3VuZDogd2hpdGU7CiAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCB3aGl0ZTsKQEAgLTY5Myw2ICs3MzIsOSBAQAogLmxpbmVOdW1iZXIucmlnaHRtb3N0IHsKICAgYm9yZGVyLWxlZnQ6IHRoaW4gc29saWQgI2IwYmRjYzsKIH0KKy5saW5lTnVtYmVyLnJpZ2h0Qm9yZGVyIHsKKyAgYm9yZGVyLXJpZ2h0OiB0aGluIHNvbGlkICNiMGJkY2M7Cit9CiAubGluZU51bWJlciBhIHsKICAgY29sb3I6ICM4ODg7CiAgIHRleHQtZGVjb3JhdGlvbjogbm9uZTsKQEAgLTcwMyw2ICs3NDUsOSBAQAogICBmb250LXdlaWdodDogYm9sZDsKICAgdGV4dC1hbGlnbjogY2VudGVyOwogfQorLnBhdGNoQ29udGVudFRhYmxlIHRkLmZpbGVDb2x1bW5IZWFkZXIudW5pZmllZFRhYmxlSGVhZGVyIHsKKyAgdGV4dC1hbGlnbjogbGVmdDsKK30KIC5saW5lTnVtYmVyLmZpbGVDb2x1bW5IZWFkZXIgewogICBib3JkZXItYm90dG9tOiAxcHggc29saWQgdHJpbUNvbG9yOwogfQpAQCAtNzcwLDYgKzgxNSwxMSBAQAogICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsKIH0KIAorLnBhdGNoQ29udGVudFRhYmxlIHRkLmNlbGxzTmV4dFRvRmlsZUNvbW1lbnQgeworICBiYWNrZ3JvdW5kOiB0cmltQ29sb3I7CisgIGJvcmRlci10b3A6IHRyaW1Db2xvcjsKKyAgYm9yZGVyLWJvdHRvbTogdHJpbUNvbG9yOworfQogLnBhdGNoQ29udGVudFRhYmxlIC5hY3RpdmVSb3cgLmljb25DZWxsLAogLnBhdGNoQ29udGVudFRhYmxlIC5hY3RpdmVSb3cgLmxpbmVOdW1iZXIgewogICBiYWNrZ3JvdW5kOiBzZWxlY3Rpb25Db2xvcjsKQEAgLTc3OCwxMyArODI4LDIyIEBACiAucGF0Y2hDb250ZW50VGFibGUgLmFjdGl2ZVJvdyAubGluZU51bWJlciwKIC5wYXRjaENvbnRlbnRUYWJsZSAuYWN0aXZlUm93IC5maWxlTGluZSwKIC5wYXRjaENvbnRlbnRUYWJsZSAuYWN0aXZlUm93IC5kaWZmVGV4dCwKKy5wYXRjaENvbnRlbnRUYWJsZSAuYWN0aXZlUm93IHRkLmNvbW1lbnRIb2xkZXIsCiAucGF0Y2hDb250ZW50VGFibGUgLmFjdGl2ZVJvdyAud2RjLAogLnBhdGNoQ29udGVudFRhYmxlIC5hY3RpdmVSb3cgLndkZCwKIC5wYXRjaENvbnRlbnRUYWJsZSAuYWN0aXZlUm93IC53ZGksCisucGF0Y2hDb250ZW50VGFibGUgLmFjdGl2ZVJvdyAuaWNvbkNlbGxPZkZpbGVDb21tZW50Um93LAogLnBhdGNoQ29udGVudFRhYmxlIC5hY3RpdmVSb3cgdGQuY29tbWVudEhvbGRlci5jb21tZW50UGFuZWxMYXN0ICB7CiAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCBibHVlOwogfQogCisucGF0Y2hDb250ZW50VGFibGUgLmZpbGVDb21tZW50Qm9yZGVyIC5pY29uQ2VsbE9mRmlsZUNvbW1lbnRSb3csCisucGF0Y2hDb250ZW50VGFibGUgLmZpbGVDb21tZW50Qm9yZGVyIC5saW5lTnVtYmVyLAorLnBhdGNoQ29udGVudFRhYmxlIC5maWxlQ29tbWVudEJvcmRlciAuZGlmZlRleHQgeworICBoZWlnaHQ6IDIwcHg7CisgIGJhY2tncm91bmQ6IHRyaW1Db2xvcjsKKyAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHRyaW1Db2xvcjsKK30KIAogLyoqIENoYW5nZSAqKi8KIC5jaGFuZ2VTY3JlZW5TdGFySWNvbiB7CkBAIC04MjEsMTAgKzg4MCwxMSBAQAogICBtYXJnaW4tbGVmdDogMTBweDsKIH0KIAotLmNoYW5nZVNjcmVlbkRlc2NyaXB0aW9uIHsKKy5jaGFuZ2VTY3JlZW5EZXNjcmlwdGlvbiwKKy5jaGFuZ2VTY3JlZW5EZXNjcmlwdGlvbiB0ZXh0YXJlYSB7CiAgIHdoaXRlLXNwYWNlOiBwcmU7CiAgIGZvbnQtZmFtaWx5OiBtb25vLWZvbnQ7Ci0gIGZvbnQtc2l6ZTogOHB0OworICBmb250LXNpemU6IDlwdDsKIH0KIC5jaGFuZ2VTY3JlZW5EZXNjcmlwdGlvbiBwIHsKICAgbWFyZ2luLXRvcDogMHB4OwpAQCAtODYxLDYgKzkyMSwxNCBAQAogICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCB0cmltQ29sb3I7CiB9CiAKKy5zaWRlQnlTaWRlVGFibGVCaW5hcnlIZWFkZXIgeworICBib3JkZXItcmlnaHQ6IHRoaW4gc29saWQgI2IwYmRjYzsKKyAgYm9yZGVyLWxlZnQ6ICB0aGluIHNvbGlkICNiMGJkY2M7CisgIHdpZHRoOiAxMDAlOworICBjb2xvcjogZ3JleTsKKyAgZm9udC13ZWlnaHQ6IGJvbGQ7Cit9CisKIC5pbmZvVGFibGUgdGQuYXBwcm92YWxyb2xlIHsKICAgd2lkdGg6IDVlbTsKICAgYm9yZGVyLWxlZnQ6IG5vbmU7CkBAIC04NzEsNiArOTM5LDkgQEAKIC5pbmZvVGFibGUgdGQuYXBwcm92YWxzY29yZSB7CiAgIHRleHQtYWxpZ246IGNlbnRlcjsKIH0KKy5pbmZvVGFibGUgdGQubm90Vm90YWJsZSB7CisgIGJhY2tncm91bmQ6ICNGNUY1RjU7Cit9CiAuaW5mb1RhYmxlIHRkLm5lZ3Njb3JlIHsKICAgY29sb3I6IHJlZDsKIH0KQEAgLTg4OCw2ICs5NTksMTQgQEAKICAgbWFyZ2luLXJpZ2h0OiAxNXB4OwogfQogCisuY2hhbmdlSW5mb1RvcGljUGFuZWwgaW1nIHsKKyAgZmxvYXQ6IHJpZ2h0OworfQorCisuY2hhbmdlSW5mb1RvcGljUGFuZWwgYSB7CisgIGZsb2F0OiBsZWZ0OworfQorCiAuaW5mb0Jsb2NrIHsKICAgYm9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsKICAgYm9yZGVyLXNwYWNpbmc6IDA7CkBAIC05MDEsNiArOTgwLDExIEBACiAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CiB9CiAKKy5pbmZvQmxvY2sgdGQgdGQgeworICBwYWRkaW5nLWxlZnQ6IDBweDsKKyAgYm9yZGVyLXJpZ2h0OiAwcHg7Cit9CisKIC5pbmZvQmxvY2sgdGQudG9wbW9zdCB7CiAgIGJvcmRlci10b3A6IDFweCBzb2xpZCB0cmltQ29sb3I7CiB9CkBAIC0xMDQ0LDYgKzExMjgsMTMgQEAKICAgcGFkZGluZy1sZWZ0OiAwcHg7CiB9CiAKKy8qKiBVbmlmaWVkU2NyZWVuICoqLworLnVuaWZpZWRUYWJsZSB7CisgIHdpZHRoOiAxMDAlOworICBib3JkZXI6IDFweCBzb2xpZCAjQjBCRENDOworICBkaXNwbGF5OiB0YWJsZTsKK30KKwogLyoqIFNpZGVCeVNpZGVTY3JlZW4gKiovCiAuc2lkZUJ5U2lkZVNjcmVlblNpZGVCeVNpZGVUYWJsZSB7CiAgIHdpZHRoOiAxMDAlOwpAQCAtMTA2OCw2ICsxMTU5LDggQEAKICAgbWFyZ2luLWxlZnQ6IDFlbTsKICAgbWFyZ2luLXJpZ2h0OiA1ZW07CiAgIGZvbnQtd2VpZ2h0OiBib2xkOworICBmb250LXNpemU6IG1lZGl1bTsKKyAgZm9udC1mYW1pbHk6IEFyaWFsIFVuaWNvZGU7CiB9CiAKIC8qKiBQYXRjaCBIaXN0b3J5IFRhYmxlICoqLwpAQCAtMTE0MywxMiArMTIzNiwyNyBAQAogICBjb2xvcjogZ3JleTsKIH0KIAorLmFkZEJyYW5jaCB7CisgIG1hcmdpbi10b3A6IDEwcHg7CisgIGJhY2tncm91bmQtY29sb3I6IHRyaW1Db2xvcjsKKyAgcGFkZGluZzogNXB4IDVweCA1cHggNXB4OworfQorCiAuYWRkU3NoS2V5UGFuZWwgewogICBtYXJnaW4tdG9wOiAxMHB4OwogICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmltQ29sb3I7CiAgIHBhZGRpbmc6IDVweCA1cHggNXB4IDVweDsKIH0KIAorLmFkZFNzaEtleVBhbmVsIG9sIHsKKyAgbWFyZ2luLXRvcDogMHB4OworICBtYXJnaW4tYm90dG9tOiA1cHg7Cit9CisKKy5hZGRTc2hLZXlQYW5lbCB0ZCB7CisgIHdpZHRoOiAxMDAlOworfQorCiAuY3JlYXRlR3JvdXBMaW5rIHsKICAgbWFyZ2luLWJvdHRvbTogMTBweDsKIH0KQEAgLTEyMzgsMTAgKzEzNDYsMTAgQEAKICAgd2lkdGg6IDQ1ZW07CiB9CiAKLS5wcm9qZWN0QWRtaW5BcHByb3ZhbENhdGVnb3J5UmFuZ2VMaW5lIHsKKy5wcm9qZWN0QWRtaW5MYWJlbFJhbmdlTGluZSB7CiAgIHdoaXRlLXNwYWNlOiBub3dyYXA7CiB9Ci0ucHJvamVjdEFkbWluQXBwcm92YWxDYXRlZ29yeVZhbHVlIHsKKy5wcm9qZWN0QWRtaW5MYWJlbFZhbHVlIHsKICAgZm9udC1mYW1pbHk6IG1vbm8tZm9udDsKICAgZm9udC1zaXplOiBzbWFsbDsKIH0KQEAgLTEyNTMsNyArMTM2MSw3IEBACiAgIGZvbnQtd2VpZ2h0OiBib2xkOwogICB3aGl0ZS1zcGFjZTogbm93cmFwOwogfQotLnB1Ymxpc2hDb21tZW50c1NjcmVlbiAuYXBwcm92YWxDYXRlZ29yeUxpc3QgeworLnB1Ymxpc2hDb21tZW50c1NjcmVlbiAubGFiZWxMaXN0IHsKICAgbWFyZ2luLWJvdHRvbTogMTBweDsKICAgbWFyZ2luLWxlZnQ6IDEwcHg7CiAgIGJhY2tncm91bmQ6IHRyaW1Db2xvcjsKQEAgLTEyNjksNyArMTM3Nyw3IEBACiAucHVibGlzaENvbW1lbnRzU2NyZWVuIC5jb3Zlck1lc3NhZ2UgdGV4dGFyZWEgewogICBmb250LXNpemU6IHNtYWxsOwogfQotLnB1Ymxpc2hDb21tZW50c1NjcmVlbiAuYXBwcm92YWxDYXRlZ29yeUxpc3QgLmd3dC1SYWRpb0J1dHRvbiB7CisucHVibGlzaENvbW1lbnRzU2NyZWVuIC5sYWJlbExpc3QgLmd3dC1SYWRpb0J1dHRvbiB7CiAgIGZvbnQtc2l6ZTogc21hbGxlcjsKIH0KIC5wdWJsaXNoQ29tbWVudHNTY3JlZW4gLnBhdGNoQ29tbWVudHMgewpAQCAtMTM1Nyw5ICsxNDY1LDYgQEAKIC5ncm91cE93bmVyVGV4dEJveCB7CiAgIG1hcmdpbi1ib3R0b206IDJweDsKIH0KLS5ncm91cFR5cGVQYW5lbCB7Ci0gIG1hcmdpbi1ib3R0b206IDNweDsKLX0KIC5ncm91cFR5cGVTZWxlY3RMaXN0Qm94IHsKICAgbWFyZ2luLWJvdHRvbTogMnB4OwogfQpAQCAtMTM5NywzICsxNTAyLDE0IEBACiAvKiogUGx1Z2luTGlzdFNjcmVlbiAqKi8KIC5wbHVnaW5zVGFibGUgewogfQorCisvKiogUHJvamVjdExpc3RTY3JlZW4gKiovCisucHJvamVjdEZpbHRlclBhbmVsIHsKKyAgbWFyZ2luLWJvdHRvbTogMTBweDsKK30KKy5wcm9qZWN0RmlsdGVyUGFuZWwgaW5wdXQgeworICB3aWR0aDogMjAwcHg7Cit9CisucHJvamVjdEZpbHRlckxhYmVsIHsKKyAgbWFyZ2luLXJpZ2h0OiA1cHg7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ3JvdXBzL0dyb3VwQXBpLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ3JvdXBzL0dyb3VwQXBpLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGIxNzhmMgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ncm91cHMvR3JvdXBBcGkuamF2YQpAQCAtMCwwICsxLDI2MyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ncm91cHM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuVm9pZFJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWNjb3VudC5BY2NvdW50SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLk5hdGl2ZVN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLk5hdGl2ZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSmF2YVNjcmlwdE9iamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5Kc0FycmF5OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOworCitpbXBvcnQgamF2YS51dGlsLlNldDsKKworLyoqCisgKiBBIGNvbGxlY3Rpb24gb2Ygc3RhdGljIG1ldGhvZHMgd2hpY2ggd29yayBvbiB0aGUgR2Vycml0IFJFU1QgQVBJIGZvciBzcGVjaWZpYworICogZ3JvdXBzLgorICovCitwdWJsaWMgY2xhc3MgR3JvdXBBcGkgeworICAvKiogQ3JlYXRlIGEgbmV3IGdyb3VwICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCBjcmVhdGVHcm91cChTdHJpbmcgZ3JvdXBOYW1lLCBBc3luY0NhbGxiYWNrPEdyb3VwSW5mbz4gY2IpIHsKKyAgICBKYXZhU2NyaXB0T2JqZWN0IGluID0gSmF2YVNjcmlwdE9iamVjdC5jcmVhdGVPYmplY3QoKTsKKyAgICBuZXcgUmVzdEFwaSgiL2dyb3Vwcy8iKS5pZChncm91cE5hbWUpLmlmTm9uZU1hdGNoKCkucHV0KGluLCBjYik7CisgIH0KKworICBwdWJsaWMgc3RhdGljIHZvaWQgZ2V0R3JvdXBEZXRhaWwoU3RyaW5nIGdyb3VwLCBBc3luY0NhbGxiYWNrPEdyb3VwSW5mbz4gY2IpIHsKKyAgICBncm91cChncm91cCkudmlldygiZGV0YWlsIikuZ2V0KGNiKTsKKyAgfQorCisgIC8qKiBHZXQgdGhlIG5hbWUgb2YgYSBncm91cCAqLworICBwdWJsaWMgc3RhdGljIHZvaWQgZ2V0R3JvdXBOYW1lKEFjY291bnRHcm91cC5VVUlEIGdyb3VwLAorICAgICAgQXN5bmNDYWxsYmFjazxOYXRpdmVTdHJpbmc+IGNiKSB7CisgICAgZ3JvdXAoZ3JvdXApLnZpZXcoIm5hbWUiKS5nZXQoY2IpOworICB9CisKKyAgLyoqIENoZWNrIGlmIHRoZSBjdXJyZW50IHVzZXIgaXMgb3duZXIgb2YgYSBncm91cCAqLworICBwdWJsaWMgc3RhdGljIHZvaWQgaXNHcm91cE93bmVyKFN0cmluZyBncm91cE5hbWUsIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Qm9vbGVhbj4gY2IpIHsKKyAgICBHcm91cE1hcC5teU93bmVkKGdyb3VwTmFtZSwgbmV3IEFzeW5jQ2FsbGJhY2s8R3JvdXBNYXA+KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoR3JvdXBNYXAgcmVzdWx0KSB7CisgICAgICAgIGNiLm9uU3VjY2VzcyghcmVzdWx0LmlzRW1wdHkoKSk7CisgICAgICB9CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgY2F1Z2h0KSB7CisgICAgICAgIGNiLm9uRmFpbHVyZShjYXVnaHQpOworICAgICAgfQorICAgIH0pOworICB9CisKKyAgLyoqIFJlbmFtZSBhIGdyb3VwICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCByZW5hbWVHcm91cChBY2NvdW50R3JvdXAuVVVJRCBncm91cCwKKyAgICAgIFN0cmluZyBuZXdOYW1lLCBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNiKSB7CisgICAgR3JvdXBJbnB1dCBpbiA9IEdyb3VwSW5wdXQuY3JlYXRlKCk7CisgICAgaW4ubmFtZShuZXdOYW1lKTsKKyAgICBncm91cChncm91cCkudmlldygibmFtZSIpLnB1dChpbiwgY2IpOworICB9CisKKyAgLyoqIFNldCBkZXNjcmlwdGlvbiBmb3IgYSBncm91cCAqLworICBwdWJsaWMgc3RhdGljIHZvaWQgc2V0R3JvdXBEZXNjcmlwdGlvbihBY2NvdW50R3JvdXAuVVVJRCBncm91cCwKKyAgICAgIFN0cmluZyBkZXNjcmlwdGlvbiwgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PiBjYikgeworICAgIFJlc3RBcGkgY2FsbCA9IGdyb3VwKGdyb3VwKS52aWV3KCJkZXNjcmlwdGlvbiIpOworICAgIGlmIChkZXNjcmlwdGlvbiAhPSBudWxsICYmICFkZXNjcmlwdGlvbi5pc0VtcHR5KCkpIHsKKyAgICAgIEdyb3VwSW5wdXQgaW4gPSBHcm91cElucHV0LmNyZWF0ZSgpOworICAgICAgaW4uZGVzY3JpcHRpb24oZGVzY3JpcHRpb24pOworICAgICAgY2FsbC5wdXQoaW4sIGNiKTsKKyAgICB9IGVsc2UgeworICAgICAgY2FsbC5kZWxldGUoY2IpOworICAgIH0KKyAgfQorCisgIC8qKiBTZXQgb3duZXIgZm9yIGEgZ3JvdXAgKi8KKyAgcHVibGljIHN0YXRpYyB2b2lkIHNldEdyb3VwT3duZXIoQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXAsCisgICAgICBTdHJpbmcgb3duZXIsIEFzeW5jQ2FsbGJhY2s8R3JvdXBJbmZvPiBjYikgeworICAgIEdyb3VwSW5wdXQgaW4gPSBHcm91cElucHV0LmNyZWF0ZSgpOworICAgIGluLm93bmVyKG93bmVyKTsKKyAgICBncm91cChncm91cCkudmlldygib3duZXIiKS5wdXQoaW4sIGNiKTsKKyAgfQorCisgIC8qKiBTZXQgdGhlIG9wdGlvbnMgZm9yIGEgZ3JvdXAgKi8KKyAgcHVibGljIHN0YXRpYyB2b2lkIHNldEdyb3VwT3B0aW9ucyhBY2NvdW50R3JvdXAuVVVJRCBncm91cCwKKyAgICAgIGJvb2xlYW4gaXNWaXNpYmxlVG9BbGwsIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gY2IpIHsKKyAgICBHcm91cE9wdGlvbnNJbnB1dCBpbiA9IEdyb3VwT3B0aW9uc0lucHV0LmNyZWF0ZSgpOworICAgIGluLnZpc2libGVUb0FsbChpc1Zpc2libGVUb0FsbCk7CisgICAgZ3JvdXAoZ3JvdXApLnZpZXcoIm9wdGlvbnMiKS5wdXQoaW4sIGNiKTsKKyAgfQorCisgIC8qKiBBZGQgbWVtYmVyIHRvIGEgZ3JvdXAuICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCBhZGRNZW1iZXIoQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXAsIFN0cmluZyBtZW1iZXIsCisgICAgICBBc3luY0NhbGxiYWNrPEFjY291bnRJbmZvPiBjYikgeworICAgIG1lbWJlcnMoZ3JvdXApLmlkKG1lbWJlcikucHV0KGNiKTsKKyAgfQorCisgIC8qKiBBZGQgbWVtYmVycyB0byBhIGdyb3VwLiAqLworICBwdWJsaWMgc3RhdGljIHZvaWQgYWRkTWVtYmVycyhBY2NvdW50R3JvdXAuVVVJRCBncm91cCwKKyAgICAgIFNldDxTdHJpbmc+IG1lbWJlcnMsCisgICAgICBmaW5hbCBBc3luY0NhbGxiYWNrPEpzQXJyYXk8QWNjb3VudEluZm8+PiBjYikgeworICAgIGlmIChtZW1iZXJzLnNpemUoKSA9PSAxKSB7CisgICAgICBhZGRNZW1iZXIoZ3JvdXAsCisgICAgICAgICAgbWVtYmVycy5pdGVyYXRvcigpLm5leHQoKSwKKyAgICAgICAgICBuZXcgQXN5bmNDYWxsYmFjazxBY2NvdW50SW5mbz4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhBY2NvdW50SW5mbyByZXN1bHQpIHsKKyAgICAgICAgICAgICAgY2Iub25TdWNjZXNzKE5hdGl2ZXMuYXJyYXlPZihyZXN1bHQpKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICBwdWJsaWMgdm9pZCBvbkZhaWx1cmUoVGhyb3dhYmxlIGNhdWdodCkgeworICAgICAgICAgICAgICBjYi5vbkZhaWx1cmUoY2F1Z2h0KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKKyAgICB9IGVsc2UgeworICAgICAgTWVtYmVySW5wdXQgaW5wdXQgPSBNZW1iZXJJbnB1dC5jcmVhdGUoKTsKKyAgICAgIGZvciAoU3RyaW5nIG1lbWJlciA6IG1lbWJlcnMpIHsKKyAgICAgICAgaW5wdXQuYWRkX21lbWJlcihtZW1iZXIpOworICAgICAgfQorICAgICAgbWVtYmVycyhncm91cCkucG9zdChpbnB1dCwgY2IpOworICAgIH0KKyAgfQorCisgIC8qKiBSZW1vdmUgbWVtYmVycyBmcm9tIGEgZ3JvdXAuICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCByZW1vdmVNZW1iZXJzKEFjY291bnRHcm91cC5VVUlEIGdyb3VwLAorICAgICAgU2V0PEludGVnZXI+IGlkcywgZmluYWwgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PiBjYikgeworICAgIGlmIChpZHMuc2l6ZSgpID09IDEpIHsKKyAgICAgIG1lbWJlcnMoZ3JvdXApLmlkKGlkcy5pdGVyYXRvcigpLm5leHQoKS50b1N0cmluZygpKS5kZWxldGUoY2IpOworICAgIH0gZWxzZSB7CisgICAgICBNZW1iZXJJbnB1dCBpbiA9IE1lbWJlcklucHV0LmNyZWF0ZSgpOworICAgICAgZm9yIChJbnRlZ2VyIGlkIDogaWRzKSB7CisgICAgICAgIGluLmFkZF9tZW1iZXIoaWQudG9TdHJpbmcoKSk7CisgICAgICB9CisgICAgICBncm91cChncm91cCkudmlldygibWVtYmVycy5kZWxldGUiKS5wb3N0KGluLCBjYik7CisgICAgfQorICB9CisKKyAgLyoqIEluY2x1ZGUgYSBncm91cCBpbnRvIGEgZ3JvdXAuICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCBhZGRJbmNsdWRlZEdyb3VwKEFjY291bnRHcm91cC5VVUlEIGdyb3VwLCBTdHJpbmcgaW5jbHVkZSwKKyAgICAgIEFzeW5jQ2FsbGJhY2s8R3JvdXBJbmZvPiBjYikgeworICAgIGdyb3Vwcyhncm91cCkuaWQoaW5jbHVkZSkucHV0KGNiKTsKKyAgfQorCisgIC8qKiBJbmNsdWRlIGdyb3VwcyBpbnRvIGEgZ3JvdXAuICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCBhZGRJbmNsdWRlZEdyb3VwcyhBY2NvdW50R3JvdXAuVVVJRCBncm91cCwKKyAgICAgIFNldDxTdHJpbmc+IGluY2x1ZGVkR3JvdXBzLAorICAgICAgZmluYWwgQXN5bmNDYWxsYmFjazxKc0FycmF5PEdyb3VwSW5mbz4+IGNiKSB7CisgICAgaWYgKGluY2x1ZGVkR3JvdXBzLnNpemUoKSA9PSAxKSB7CisgICAgICBhZGRJbmNsdWRlZEdyb3VwKGdyb3VwLAorICAgICAgICAgIGluY2x1ZGVkR3JvdXBzLml0ZXJhdG9yKCkubmV4dCgpLAorICAgICAgICAgIG5ldyBBc3luY0NhbGxiYWNrPEdyb3VwSW5mbz4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhHcm91cEluZm8gcmVzdWx0KSB7CisgICAgICAgICAgICAgIGNiLm9uU3VjY2VzcyhOYXRpdmVzLmFycmF5T2YocmVzdWx0KSk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICAgICAgICAgICAgY2Iub25GYWlsdXJlKGNhdWdodCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSk7CisgICAgfSBlbHNlIHsKKyAgICAgIEluY2x1ZGVkR3JvdXBJbnB1dCBpbnB1dCA9IEluY2x1ZGVkR3JvdXBJbnB1dC5jcmVhdGUoKTsKKyAgICAgIGZvciAoU3RyaW5nIGluY2x1ZGVkR3JvdXAgOiBpbmNsdWRlZEdyb3VwcykgeworICAgICAgICBpbnB1dC5hZGRfZ3JvdXAoaW5jbHVkZWRHcm91cCk7CisgICAgICB9CisgICAgICBncm91cHMoZ3JvdXApLnBvc3QoaW5wdXQsIGNiKTsKKyAgICB9CisgIH0KKworICAvKiogUmVtb3ZlIGluY2x1ZGVkIGdyb3VwcyBmcm9tIGEgZ3JvdXAuICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCByZW1vdmVJbmNsdWRlZEdyb3VwcyhBY2NvdW50R3JvdXAuVVVJRCBncm91cCwKKyAgICAgIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gaWRzLCBmaW5hbCBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNiKSB7CisgICAgaWYgKGlkcy5zaXplKCkgPT0gMSkgeworICAgICAgQWNjb3VudEdyb3VwLlVVSUQgZyA9IGlkcy5pdGVyYXRvcigpLm5leHQoKTsKKyAgICAgIGdyb3Vwcyhncm91cCkuaWQoZy5nZXQoKSkuZGVsZXRlKGNiKTsKKyAgICB9IGVsc2UgeworICAgICAgSW5jbHVkZWRHcm91cElucHV0IGluID0gSW5jbHVkZWRHcm91cElucHV0LmNyZWF0ZSgpOworICAgICAgZm9yIChBY2NvdW50R3JvdXAuVVVJRCBnIDogaWRzKSB7CisgICAgICAgIGluLmFkZF9ncm91cChnLmdldCgpKTsKKyAgICAgIH0KKyAgICAgIGdyb3VwKGdyb3VwKS52aWV3KCJncm91cHMuZGVsZXRlIikucG9zdChpbiwgY2IpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFJlc3RBcGkgbWVtYmVycyhBY2NvdW50R3JvdXAuVVVJRCBncm91cCkgeworICAgIHJldHVybiBncm91cChncm91cCkudmlldygibWVtYmVycyIpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgUmVzdEFwaSBncm91cHMoQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXApIHsKKyAgICByZXR1cm4gZ3JvdXAoZ3JvdXApLnZpZXcoImdyb3VwcyIpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgUmVzdEFwaSBncm91cChBY2NvdW50R3JvdXAuVVVJRCBncm91cCkgeworICAgIHJldHVybiBncm91cChncm91cC5nZXQoKSk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBSZXN0QXBpIGdyb3VwKFN0cmluZyBncm91cCkgeworICAgIHJldHVybiBuZXcgUmVzdEFwaSgiL2dyb3Vwcy8iKS5pZChncm91cCk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBHcm91cElucHV0IGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdCB7CisgICAgZmluYWwgbmF0aXZlIHZvaWQgZGVzY3JpcHRpb24oU3RyaW5nIGQpIC8qLXsgaWYoZCl0aGlzLmRlc2NyaXB0aW9uPWQ7IH0tKi87CisgICAgZmluYWwgbmF0aXZlIHZvaWQgbmFtZShTdHJpbmcgbikgLyoteyBpZihuKXRoaXMubmFtZT1uOyB9LSovOworICAgIGZpbmFsIG5hdGl2ZSB2b2lkIG93bmVyKFN0cmluZyBvKSAvKi17IGlmKG8pdGhpcy5vd25lcj1vOyB9LSovOworCisgICAgc3RhdGljIEdyb3VwSW5wdXQgY3JlYXRlKCkgeworICAgICAgcmV0dXJuIChHcm91cElucHV0KSBjcmVhdGVPYmplY3QoKTsKKyAgICB9CisKKyAgICBwcm90ZWN0ZWQgR3JvdXBJbnB1dCgpIHsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBHcm91cE9wdGlvbnNJbnB1dCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3QgeworICAgIGZpbmFsIG5hdGl2ZSB2b2lkIHZpc2libGVUb0FsbChib29sZWFuIHYpIC8qLXsgaWYodil0aGlzLnZpc2libGVfdG9fYWxsPXY7IH0tKi87CisKKyAgICBzdGF0aWMgR3JvdXBPcHRpb25zSW5wdXQgY3JlYXRlKCkgeworICAgICAgcmV0dXJuIChHcm91cE9wdGlvbnNJbnB1dCkgY3JlYXRlT2JqZWN0KCk7CisgICAgfQorCisgICAgcHJvdGVjdGVkIEdyb3VwT3B0aW9uc0lucHV0KCkgeworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGNsYXNzIE1lbWJlcklucHV0IGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdCB7CisgICAgZmluYWwgbmF0aXZlIHZvaWQgaW5pdCgpIC8qLXsgdGhpcy5tZW1iZXJzID0gW107IH0tKi87CisgICAgZmluYWwgbmF0aXZlIHZvaWQgYWRkX21lbWJlcihTdHJpbmcgbikgLyoteyB0aGlzLm1lbWJlcnMucHVzaChuKTsgfS0qLzsKKworICAgIHN0YXRpYyBNZW1iZXJJbnB1dCBjcmVhdGUoKSB7CisgICAgICBNZW1iZXJJbnB1dCBtID0gKE1lbWJlcklucHV0KSBjcmVhdGVPYmplY3QoKTsKKyAgICAgIG0uaW5pdCgpOworICAgICAgcmV0dXJuIG07CisgICAgfQorCisgICAgcHJvdGVjdGVkIE1lbWJlcklucHV0KCkgeworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGNsYXNzIEluY2x1ZGVkR3JvdXBJbnB1dCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3QgeworICAgIGZpbmFsIG5hdGl2ZSB2b2lkIGluaXQoKSAvKi17IHRoaXMuZ3JvdXBzID0gW107IH0tKi87CisgICAgZmluYWwgbmF0aXZlIHZvaWQgYWRkX2dyb3VwKFN0cmluZyBuKSAvKi17IHRoaXMuZ3JvdXBzLnB1c2gobik7IH0tKi87CisKKyAgICBzdGF0aWMgSW5jbHVkZWRHcm91cElucHV0IGNyZWF0ZSgpIHsKKyAgICAgIEluY2x1ZGVkR3JvdXBJbnB1dCBnID0gKEluY2x1ZGVkR3JvdXBJbnB1dCkgY3JlYXRlT2JqZWN0KCk7CisgICAgICBnLmluaXQoKTsKKyAgICAgIHJldHVybiBnOworICAgIH0KKworICAgIHByb3RlY3RlZCBJbmNsdWRlZEdyb3VwSW5wdXQoKSB7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ3JvdXBzL0dyb3VwSW5mby5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2dyb3Vwcy9Hcm91cEluZm8uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zYjRhYmU1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2dyb3Vwcy9Hcm91cEluZm8uamF2YQpAQCAtMCwwICsxLDY3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lmdyb3VwczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hY2NvdW50LkFjY291bnRJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSmF2YVNjcmlwdE9iamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5Kc0FycmF5OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0Lmh0dHAuY2xpZW50LlVSTDsKKworcHVibGljIGNsYXNzIEdyb3VwSW5mbyBleHRlbmRzIEphdmFTY3JpcHRPYmplY3QgeworICBwdWJsaWMgZmluYWwgQWNjb3VudEdyb3VwLklkIGdldEdyb3VwSWQoKSB7CisgICAgcmV0dXJuIG5ldyBBY2NvdW50R3JvdXAuSWQoZ3JvdXBfaWQoKSk7CisgIH0KKworICBwdWJsaWMgZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgZ2V0R3JvdXBVVUlEKCkgeworICAgIHJldHVybiBuZXcgQWNjb3VudEdyb3VwLlVVSUQoVVJMLmRlY29kZVBhdGhTZWdtZW50KGlkKCkpKTsKKyAgfQorCisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIGlkKCkgLyoteyByZXR1cm4gdGhpcy5pZDsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBTdHJpbmcgbmFtZSgpIC8qLXsgcmV0dXJuIHRoaXMubmFtZTsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBHcm91cE9wdGlvbnNJbmZvIG9wdGlvbnMoKSAvKi17IHJldHVybiB0aGlzLm9wdGlvbnM7IH0tKi87CisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIGRlc2NyaXB0aW9uKCkgLyoteyByZXR1cm4gdGhpcy5kZXNjcmlwdGlvbjsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBTdHJpbmcgdXJsKCkgLyoteyByZXR1cm4gdGhpcy51cmw7IH0tKi87CisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgU3RyaW5nIG93bmVyKCkgLyoteyByZXR1cm4gdGhpcy5vd25lcjsgfS0qLzsKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSB2b2lkIG93bmVyKFN0cmluZyBvKSAvKi17IGlmKG8pdGhpcy5vd25lcj1vOyB9LSovOworICBwdWJsaWMgZmluYWwgbmF0aXZlIEpzQXJyYXk8QWNjb3VudEluZm8+IG1lbWJlcnMoKSAvKi17IHJldHVybiB0aGlzLm1lbWJlcnM7IH0tKi87CisgIHB1YmxpYyBmaW5hbCBuYXRpdmUgSnNBcnJheTxHcm91cEluZm8+IGluY2x1ZGVzKCkgLyoteyByZXR1cm4gdGhpcy5pbmNsdWRlczsgfS0qLzsKKworICBwcml2YXRlIGZpbmFsIG5hdGl2ZSBpbnQgZ3JvdXBfaWQoKSAvKi17IHJldHVybiB0aGlzLmdyb3VwX2lkOyB9LSovOworICBwcml2YXRlIGZpbmFsIG5hdGl2ZSBTdHJpbmcgb3duZXJfaWQoKSAvKi17IHJldHVybiB0aGlzLm93bmVyX2lkOyB9LSovOworICBwcml2YXRlIGZpbmFsIG5hdGl2ZSB2b2lkIG93bmVyX2lkKFN0cmluZyBvKSAvKi17IGlmKG8pdGhpcy5vd25lcl9pZD1vOyB9LSovOworCisgIHB1YmxpYyBmaW5hbCBBY2NvdW50R3JvdXAuVVVJRCBnZXRPd25lclVVSUQoKSB7CisgICAgU3RyaW5nIG93bmVyID0gb3duZXJfaWQoKTsKKyAgICBpZiAob3duZXIgIT0gbnVsbCkgeworICAgICAgICByZXR1cm4gbmV3IEFjY291bnRHcm91cC5VVUlEKFVSTC5kZWNvZGVQYXRoU2VnbWVudChvd25lcikpOworICAgIH0KKyAgICByZXR1cm4gbnVsbDsKKyAgfQorCisgIHB1YmxpYyBmaW5hbCB2b2lkIHNldE93bmVyVVVJRChBY2NvdW50R3JvdXAuVVVJRCB1dWlkKSB7CisgICAgb3duZXJfaWQoVVJMLmVuY29kZVBhdGhTZWdtZW50KHV1aWQuZ2V0KCkpKTsKKyAgfQorCisgIHByb3RlY3RlZCBHcm91cEluZm8oKSB7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIEdyb3VwT3B0aW9uc0luZm8gZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKKyAgICBwdWJsaWMgZmluYWwgbmF0aXZlIGJvb2xlYW4gaXNWaXNpYmxlVG9BbGwoKSAvKi17IHJldHVybiB0aGlzWyd2aXNpYmxlX3RvX2FsbCddID8gdHJ1ZSA6IGZhbHNlOyB9LSovOworCisgICAgcHJvdGVjdGVkIEdyb3VwT3B0aW9uc0luZm8oKSB7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ3JvdXBzL0dyb3VwTGlzdC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2dyb3Vwcy9Hcm91cExpc3QuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45NGU1ZTU4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2dyb3Vwcy9Hcm91cExpc3QuamF2YQpAQCAtMCwwICsxLDM1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lmdyb3VwczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuUmVzdEFwaTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkpzQXJyYXk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQucnBjLkFzeW5jQ2FsbGJhY2s7CisKKy8qKiBHcm91cHMgYXZhaWxhYmxlIGZyb20ge0Bjb2RlIC9ncm91cHMvfSBvciB7QGNvZGUgL2FjY291bnRzL3tpZH0vZ3JvdXBzfS4gKi8KK3B1YmxpYyBjbGFzcyBHcm91cExpc3QgZXh0ZW5kcyBKc0FycmF5PEdyb3VwSW5mbz4geworICBwdWJsaWMgc3RhdGljIHZvaWQgbXkoQXN5bmNDYWxsYmFjazxHcm91cExpc3Q+IGNhbGxiYWNrKSB7CisgICAgbmV3IFJlc3RBcGkoIi9hY2NvdW50cy9zZWxmL2dyb3VwcyIpLmdldChjYWxsYmFjayk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIHZvaWQgaW5jbHVkZWQoQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXAsCisgICAgICBBc3luY0NhbGxiYWNrPEdyb3VwTGlzdD4gY2FsbGJhY2spIHsKKyAgICBuZXcgUmVzdEFwaSgiL2dyb3Vwcy8iKS5pZChncm91cC5nZXQoKSkudmlldygiZ3JvdXBzIikuZ2V0KGNhbGxiYWNrKTsKKyAgfQorCisgIHByb3RlY3RlZCBHcm91cExpc3QoKSB7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ncm91cHMvR3JvdXBNYXAuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ncm91cHMvR3JvdXBNYXAuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42YmEwMGFlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L2dyb3Vwcy9Hcm91cE1hcC5qYXZhCkBAIC0wLDAgKzEsNTQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuZ3JvdXBzOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5OYXRpdmVNYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOworCisvKiogR3JvdXBzIGF2YWlsYWJsZSBmcm9tIHtAY29kZSAvZ3JvdXBzL30uICovCitwdWJsaWMgY2xhc3MgR3JvdXBNYXAgZXh0ZW5kcyBOYXRpdmVNYXA8R3JvdXBJbmZvPiB7CisgIHB1YmxpYyBzdGF0aWMgdm9pZCBhbGwoQXN5bmNDYWxsYmFjazxHcm91cE1hcD4gY2FsbGJhY2spIHsKKyAgICBncm91cHMoKS5nZXQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNhbGxiYWNrKSk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIHZvaWQgbWF0Y2goU3RyaW5nIG1hdGNoLCBBc3luY0NhbGxiYWNrPEdyb3VwTWFwPiBjYikgeworICAgIGlmIChtYXRjaCA9PSBudWxsIHx8ICIiLmVxdWFscyhtYXRjaCkpIHsKKyAgICAgIGFsbChjYik7CisgICAgfSBlbHNlIHsKKyAgICAgIGdyb3VwcygpLmFkZFBhcmFtZXRlcigibSIsIG1hdGNoKS5nZXQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNiKSk7CisgICAgfQorICB9CisKKyAgcHVibGljIHN0YXRpYyB2b2lkIG15T3duZWQoQXN5bmNDYWxsYmFjazxHcm91cE1hcD4gY2IpIHsKKyAgICBteU93bmVkR3JvdXBzKCkuZ2V0KE5hdGl2ZU1hcC5jb3B5S2V5c0ludG9DaGlsZHJlbihjYikpOworICB9CisKKyAgcHVibGljIHN0YXRpYyB2b2lkIG15T3duZWQoU3RyaW5nIGdyb3VwTmFtZSwgQXN5bmNDYWxsYmFjazxHcm91cE1hcD4gY2IpIHsKKyAgICBteU93bmVkR3JvdXBzKCkuYWRkUGFyYW1ldGVyKCJxIiwgZ3JvdXBOYW1lKS5nZXQoCisgICAgICAgIE5hdGl2ZU1hcC5jb3B5S2V5c0ludG9DaGlsZHJlbihjYikpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgUmVzdEFwaSBteU93bmVkR3JvdXBzKCkgeworICAgIHJldHVybiBncm91cHMoKS5hZGRQYXJhbWV0ZXJUcnVlKCJvd25lZCIpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgUmVzdEFwaSBncm91cHMoKSB7CisgICAgcmV0dXJuIG5ldyBSZXN0QXBpKCIvZ3JvdXBzLyIpOworICB9CisKKyAgcHJvdGVjdGVkIEdyb3VwTWFwKCkgeworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ3JvdXBzL01lbWJlckxpc3QuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ncm91cHMvTWVtYmVyTGlzdC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQ3ODhhMWQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ3JvdXBzL01lbWJlckxpc3QuamF2YQpAQCAtMCwwICsxLDMxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50Lmdyb3VwczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hY2NvdW50LkFjY291bnRJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuUmVzdEFwaTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkpzQXJyYXk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQucnBjLkFzeW5jQ2FsbGJhY2s7CisKK3B1YmxpYyBjbGFzcyBNZW1iZXJMaXN0IGV4dGVuZHMgSnNBcnJheTxBY2NvdW50SW5mbz4geworICBwdWJsaWMgc3RhdGljIHZvaWQgYWxsKEFjY291bnRHcm91cC5VVUlEIGdyb3VwLAorICAgICAgQXN5bmNDYWxsYmFjazxNZW1iZXJMaXN0PiBjYWxsYmFjaykgeworICAgIG5ldyBSZXN0QXBpKCIvZ3JvdXBzLyIpLmlkKGdyb3VwLmdldCgpKS52aWV3KCJtZW1iZXJzIikuZ2V0KGNhbGxiYWNrKTsKKyAgfQorCisgIHByb3RlY3RlZCBNZW1iZXJMaXN0KCkgeworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvZ3d0X292ZXJyaWRlLmNzcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nd3Rfb3ZlcnJpZGUuY3NzCmluZGV4IGVkMGIzMmMuLmY5YThjYzAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nd3Rfb3ZlcnJpZGUuY3NzCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9nd3Rfb3ZlcnJpZGUuY3NzCkBAIC00Miw2ICs0MiwxMiBAQAogICB3aGl0ZS1zcGFjZTogbm93cmFwOwogfQogCisuZ3d0LVRhYkJhciAuZ3d0LVRhYkJhckl0ZW0sCisuZ3d0LVRhYkJhciAuZ3d0LVRhYkJhclJlc3QsCisuZ3d0LVRhYlBhbmVsQm90dG9tIHsKKyAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7Cit9CisKIC5nd3QtVGFiQmFyIHsKICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIGJsYWNrOwogfQpAQCAtNDksMTYgKzU1LDIwIEBACiAgIGRpc3BsYXk6IG5vbmU7CiB9CiAuZ3d0LVRhYkJhciAuZ3d0LVRhYkJhckl0ZW0gewotICBtYXJnaW46IDBweDsKKyAgY29sb3I6ICMzNTM1MzU7CisgIG1hcmdpbjogMDsKICAgYmFja2dyb3VuZDogdHJpbUNvbG9yOwogICBwYWRkaW5nLXRvcDogMC41ZW07CiAgIHBhZGRpbmctYm90dG9tOiAxcHg7CiAgIHBhZGRpbmctbGVmdDogMWVtOwogICBwYWRkaW5nLXJpZ2h0OiAxZW07Ci0gIGJvcmRlci1yaWdodDogMXB4IHNvbGlkIGJsYWNrOworICBib3JkZXItYm90dG9tOiAzcHggc29saWQgdHJhbnNwYXJlbnQ7CisgIGJvcmRlci1yaWdodDogMDsKIH0KIC5nd3QtVGFiQmFyIC5nd3QtVGFiQmFySXRlbS1zZWxlY3RlZCB7CisgIGNvbG9yOiAjOTkwMDAwOwogICBiYWNrZ3JvdW5kOiBzZWxlY3Rpb25Db2xvcjsKKyAgYm9yZGVyLWJvdHRvbS1jb2xvcjogIzk5MDAwMDsKIH0KIC5nd3QtVGFiQmFyIC5nd3QtVGFiQmFyUmVzdCB7CiAgIGJhY2tncm91bmQ6IHRyaW1Db2xvcjsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL0Fic3RyYWN0UGF0Y2hDb250ZW50VGFibGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL0Fic3RyYWN0UGF0Y2hDb250ZW50VGFibGUuamF2YQppbmRleCAyNGEyYWU1Li44ZGUzMjUxIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9BYnN0cmFjdFBhdGNoQ29udGVudFRhYmxlLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvQWJzdHJhY3RQYXRjaENvbnRlbnRUYWJsZS5qYXZhCkBAIC0xLDQgKzEsNCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA4IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vQ29weXJpZ2h0IChDKSAyMDA4IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKIC8vCiAvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKIC8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KQEAgLTE1LDE3ICsxNSwxOSBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucGF0Y2hlczsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5EaXNwYXRjaGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5Gb3JtYXRVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFjY291bnQuQWNjb3VudEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXMuUGF0Y2hUYWJsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlcy5VdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLkNvbW1lbnRQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuTmF2aWdhdGlvblRhYmxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5OZWVkc1NpZ25JbktleUNvbW1hbmQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm9DYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Db21tZW50RGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2NyaXB0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2V0RGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnByZXR0aWZ5LmNsaWVudC5DbGllbnRTaWRlRm9ybWF0dGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnByZXR0aWZ5LmNvbW1vbi5QcmV0dHlGb3JtYXR0ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucHJldHRpZnkuY29tbW9uLlNwYXJzZUZpbGVDb250ZW50OwpAQCAtMzgsNiArNDAsOCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQmx1ckhhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuRG91YmxlQ2xpY2tFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkRvdWJsZUNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkZvY3VzRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5Gb2N1c0hhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlDb2RlczsKQEAgLTQ1LDMzICs0OSw0NCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LnNoYXJlZC5IYW5kbGVyUmVnaXN0cmF0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LkRPTTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5FbGVtZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LkV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50Lkhpc3Rvcnk7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQnV0dG9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZvY3VzYWJsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5IVE1MVGFibGUuQ2VsbEZvcm1hdHRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5JbWFnZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5VSU9iamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5nbG9iYWxrZXkuY2xpZW50Lkdsb2JhbEtleTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuS2V5Q29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuS2V5Q29tbWFuZFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbEJ1aWxkZXI7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmRpZmYuRWRpdDsKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdFBhdGNoQ29udGVudFRhYmxlIGV4dGVuZHMgTmF2aWdhdGlvblRhYmxlPE9iamVjdD4KICAgICBpbXBsZW1lbnRzIENvbW1lbnRFZGl0b3JDb250YWluZXIsIEZvY3VzSGFuZGxlciwgQmx1ckhhbmRsZXIgeworICBwdWJsaWMgc3RhdGljIGZpbmFsIGludCBSX0hFQUQgPSAwOworICBzdGF0aWMgZmluYWwgc2hvcnQgRklMRV9TSURFX0EgPSAoc2hvcnQpIDA7CisgIHN0YXRpYyBmaW5hbCBzaG9ydCBGSUxFX1NJREVfQiA9IChzaG9ydCkgMTsKICAgcHJvdGVjdGVkIFBhdGNoVGFibGUgZmlsZUxpc3Q7CiAgIHByb3RlY3RlZCBBY2NvdW50SW5mb0NhY2hlIGFjY291bnRDYWNoZSA9IEFjY291bnRJbmZvQ2FjaGUuZW1wdHkoKTsKICAgcHJvdGVjdGVkIFBhdGNoLktleSBwYXRjaEtleTsKICAgcHJvdGVjdGVkIFBhdGNoU2V0LklkIGlkU2lkZUE7CiAgIHByb3RlY3RlZCBQYXRjaFNldC5JZCBpZFNpZGVCOwogICBwcm90ZWN0ZWQgYm9vbGVhbiBvbmx5T25lSHVuazsKKyAgcHJvdGVjdGVkIFBhdGNoU2V0U2VsZWN0Qm94IGhlYWRlclNpZGVBOworICBwcm90ZWN0ZWQgUGF0Y2hTZXRTZWxlY3RCb3ggaGVhZGVyU2lkZUI7CisgIHByb3RlY3RlZCBJbWFnZSBpY29uQTsKKyAgcHJvdGVjdGVkIEltYWdlIGljb25COwogCiAgIHByaXZhdGUgZmluYWwgS2V5Q29tbWFuZFNldCBrZXlzQ29tbWVudDsKICAgcHJpdmF0ZSBIYW5kbGVyUmVnaXN0cmF0aW9uIHJlZ0NvbW1lbnQ7CiAgIHByaXZhdGUgZmluYWwgS2V5Q29tbWFuZFNldCBrZXlzT3BlbkJ5RW50ZXI7CiAgIHByaXZhdGUgSGFuZGxlclJlZ2lzdHJhdGlvbiByZWdPcGVuQnlFbnRlcjsKKyAgYm9vbGVhbiBpc0Rpc3BsYXlCaW5hcnk7CiAKICAgcHJvdGVjdGVkIEFic3RyYWN0UGF0Y2hDb250ZW50VGFibGUoKSB7CiAgICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBQcmV2S2V5Q29tbWFuZCgwLCAnaycsIFBhdGNoVXRpbC5DLmxpbmVQcmV2KCkpKTsKQEAgLTEwNSw2ICsxMjAsNTcgQEAKICAgICB0YWJsZS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5wYXRjaENvbnRlbnRUYWJsZSgpKTsKICAgfQogCisgIGFic3RyYWN0IHZvaWQgY3JlYXRlRmlsZUNvbW1lbnRFZGl0b3JPblNpZGVBKCk7CisKKyAgYWJzdHJhY3Qgdm9pZCBjcmVhdGVGaWxlQ29tbWVudEVkaXRvck9uU2lkZUIoKTsKKworICBhYnN0cmFjdCBQYXRjaFNjcmVlbi5UeXBlIGdldFBhdGNoU2NyZWVuVHlwZSgpOworCisgIHByb3RlY3RlZCB2b2lkIGluaXRIZWFkZXJzKFBhdGNoU2NyaXB0IHNjcmlwdCwgUGF0Y2hTZXREZXRhaWwgZGV0YWlsKSB7CisgICAgUGF0Y2hTY3JlZW4uVHlwZSB0eXBlID0gZ2V0UGF0Y2hTY3JlZW5UeXBlKCk7CisgICAgaGVhZGVyU2lkZUEgPSBuZXcgUGF0Y2hTZXRTZWxlY3RCb3goUGF0Y2hTZXRTZWxlY3RCb3guU2lkZS5BLCB0eXBlKTsKKyAgICBoZWFkZXJTaWRlQS5kaXNwbGF5KGRldGFpbCwgc2NyaXB0LCBwYXRjaEtleSwgaWRTaWRlQSwgaWRTaWRlQik7CisgICAgaGVhZGVyU2lkZUEuYWRkRG91YmxlQ2xpY2tIYW5kbGVyKG5ldyBEb3VibGVDbGlja0hhbmRsZXIoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uRG91YmxlQ2xpY2soRG91YmxlQ2xpY2tFdmVudCBldmVudCkgeworICAgICAgICBpZiAoaGVhZGVyU2lkZUEuaXNGaWxlT3JDb21taXRNZXNzYWdlKCkpIHsKKyAgICAgICAgICBjcmVhdGVGaWxlQ29tbWVudEVkaXRvck9uU2lkZUEoKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0pOworICAgIGhlYWRlclNpZGVCID0gbmV3IFBhdGNoU2V0U2VsZWN0Qm94KFBhdGNoU2V0U2VsZWN0Qm94LlNpZGUuQiwgdHlwZSk7CisgICAgaGVhZGVyU2lkZUIuZGlzcGxheShkZXRhaWwsIHNjcmlwdCwgcGF0Y2hLZXksIGlkU2lkZUEsIGlkU2lkZUIpOworICAgIGhlYWRlclNpZGVCLmFkZERvdWJsZUNsaWNrSGFuZGxlcihuZXcgRG91YmxlQ2xpY2tIYW5kbGVyKCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvbkRvdWJsZUNsaWNrKERvdWJsZUNsaWNrRXZlbnQgZXZlbnQpIHsKKyAgICAgICAgaWYgKGhlYWRlclNpZGVCLmlzRmlsZU9yQ29tbWl0TWVzc2FnZSgpKSB7CisgICAgICAgICAgY3JlYXRlRmlsZUNvbW1lbnRFZGl0b3JPblNpZGVCKCk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9KTsKKworICAgIC8vIFByZXBhcmUgaWNvbnMuCisgICAgaWNvbkEgPSBuZXcgSW1hZ2UoR2Vycml0LlJFU09VUkNFUy5hZGRGaWxlQ29tbWVudCgpKTsKKyAgICBpY29uQS5zZXRUaXRsZShQYXRjaFV0aWwuQy5hZGRGaWxlQ29tbWVudFRvb2xUaXAoKSk7CisgICAgaWNvbkEuYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubGluaygpKTsKKyAgICBpY29uQS5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgb25DbGljayhDbGlja0V2ZW50IGV2ZW50KSB7CisgICAgICAgIGNyZWF0ZUZpbGVDb21tZW50RWRpdG9yT25TaWRlQSgpOworICAgICAgfQorICAgIH0pOworICAgIGljb25CID0gbmV3IEltYWdlKEdlcnJpdC5SRVNPVVJDRVMuYWRkRmlsZUNvbW1lbnQoKSk7CisgICAgaWNvbkIuc2V0VGl0bGUoUGF0Y2hVdGlsLkMuYWRkRmlsZUNvbW1lbnRUb29sVGlwKCkpOworICAgIGljb25CLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmxpbmsoKSk7CisgICAgaWNvbkIuYWRkQ2xpY2tIYW5kbGVyKG5ldyBDbGlja0hhbmRsZXIoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uQ2xpY2soQ2xpY2tFdmVudCBldmVudCkgeworICAgICAgICBjcmVhdGVGaWxlQ29tbWVudEVkaXRvck9uU2lkZUIoKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgfQorCisgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBub3RpZnlEcmFmdERlbHRhKGZpbmFsIGludCBkZWx0YSkgewogICAgIGlmIChmaWxlTGlzdCAhPSBudWxsKSB7CiAgICAgICBmaWxlTGlzdC5ub3RpZnlEcmFmdERlbHRhKHBhdGNoS2V5LCBkZWx0YSk7CkBAIC0xMzcsOCArMjAzLDggQEAKICAgICAgICAgICAgIHAgPSBwLmdldFBhcmVudCgpOwogICAgICAgICAgIH0KIAotICAgICAgICAgIGlmIChHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNvbW1lbnRIb2xkZXIoKS5lcXVhbHMoCi0gICAgICAgICAgICAgIHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKS5nZXRTdHlsZU5hbWUocm93IC0gMSwgY2VsbCkpKSB7CisgICAgICAgICAgaWYgKHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKS5nZXRTdHlsZU5hbWUocm93IC0gMSwgY2VsbCkKKyAgICAgICAgICAgICAgLmNvbnRhaW5zKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY29tbWVudEhvbGRlcigpKSkgewogICAgICAgICAgICAgdGFibGUuZ2V0Q2VsbEZvcm1hdHRlcigpLmFkZFN0eWxlTmFtZShyb3cgLSAxLCBjZWxsLAogICAgICAgICAgICAgICAgIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY29tbWVudFBhbmVsTGFzdCgpKTsKICAgICAgICAgICB9CkBAIC0xNjcsMTIgKzIzMyw0NyBAQAogICB9CiAKICAgcHVibGljIHZvaWQgZGlzcGxheShmaW5hbCBQYXRjaC5LZXkgaywgZmluYWwgUGF0Y2hTZXQuSWQgYSwKLSAgICAgIGZpbmFsIFBhdGNoU2V0LklkIGIsIGZpbmFsIFBhdGNoU2NyaXB0IHMpIHsKKyAgICAgIGZpbmFsIFBhdGNoU2V0LklkIGIsIGZpbmFsIFBhdGNoU2NyaXB0IHMsIGZpbmFsIFBhdGNoU2V0RGV0YWlsIGQpIHsKICAgICBwYXRjaEtleSA9IGs7CiAgICAgaWRTaWRlQSA9IGE7CiAgICAgaWRTaWRlQiA9IGI7CiAKLSAgICByZW5kZXIocyk7CisgICAgcmVuZGVyKHMsIGQpOworICB9CisKKyAgcHJvdGVjdGVkIGJvb2xlYW4gaGFzRGlmZmVyZW5jZXMoUGF0Y2hTY3JpcHQgc2NyaXB0KSB7CisgICAgcmV0dXJuIGhhc0VkaXRzKHNjcmlwdCkgfHwgaGFzTWV0YShzY3JpcHQpOworICB9CisKKyAgcHVibGljIGJvb2xlYW4gaXNQdXJlTWV0YUNoYW5nZShQYXRjaFNjcmlwdCBzY3JpcHQpIHsKKyAgICByZXR1cm4gIWhhc0VkaXRzKHNjcmlwdCkgJiYgaGFzTWV0YShzY3JpcHQpOworICB9CisKKyAgLy8gVHJ1ZSBpZiB0aGVyZSBhcmUgZGlmZmVyZW5jZXMgYmV0d2VlbiB0aGUgdHdvIHBhdGNoIHNldHMKKyAgcHJpdmF0ZSBib29sZWFuIGhhc0VkaXRzKFBhdGNoU2NyaXB0IHNjcmlwdCkgeworICAgIGZvciAoRWRpdCBlIDogc2NyaXB0LmdldEVkaXRzKCkpIHsKKyAgICAgIGlmIChlLmdldFR5cGUoKSAhPSBFZGl0LlR5cGUuRU1QVFkpIHsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKKyAgfQorCisgIC8vIFRydWUgaWYgdGhpcyBjaGFuZ2UgaXMgYSBtb2RlIGNoYW5nZSBvciBhIHB1cmUgcmVuYW1lL2NvcHkKKyAgcHJpdmF0ZSBib29sZWFuIGhhc01ldGEoUGF0Y2hTY3JpcHQgc2NyaXB0KSB7CisgICAgcmV0dXJuICFzY3JpcHQuZ2V0UGF0Y2hIZWFkZXIoKS5pc0VtcHR5KCk7CisgIH0KKworICBwcm90ZWN0ZWQgdm9pZCBhcHBlbmROb0RpZmZlcmVuY2VzKFNhZmVIdG1sQnVpbGRlciBtKSB7CisgICAgbS5vcGVuVHIoKTsKKyAgICBtLm9wZW5UZCgpOworICAgIG0uc2V0QXR0cmlidXRlKCJjb2xzcGFuIiwgNSk7CisgICAgbS5vcGVuRGl2KCk7CisgICAgbS5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5wYXRjaE5vRGlmZmVyZW5jZSgpKTsKKyAgICBtLmFwcGVuZChQYXRjaFV0aWwuQy5ub0RpZmZlcmVuY2UoKSk7CisgICAgbS5jbG9zZURpdigpOworICAgIG0uY2xvc2VUZCgpOworICAgIG0uY2xvc2VUcigpOwogICB9CiAKICAgcHJvdGVjdGVkIFNwYXJzZUh0bWxGaWxlIGdldFNwYXJzZUh0bWxGaWxlQShQYXRjaFNjcmlwdCBzKSB7CkBAIC0xOTEsMzIgKzI5MiwyNyBAQAogICBwcm90ZWN0ZWQgU3BhcnNlSHRtbEZpbGUgZ2V0U3BhcnNlSHRtbEZpbGVCKFBhdGNoU2NyaXB0IHMpIHsKICAgICBBY2NvdW50RGlmZlByZWZlcmVuY2UgZHAgPSBuZXcgQWNjb3VudERpZmZQcmVmZXJlbmNlKHMuZ2V0RGlmZlByZWZzKCkpOwogCisgICAgU3BhcnNlRmlsZUNvbnRlbnQgYiA9IHMuZ2V0QigpOwogICAgIFByZXR0eUZvcm1hdHRlciBmID0gQ2xpZW50U2lkZUZvcm1hdHRlci5GQUNUT1JZLmdldCgpOwogICAgIGYuc2V0RGlmZlByZWZzKGRwKTsKLSAgICBmLnNldEZpbGVOYW1lKHMuZ2V0QigpLmdldFBhdGgoKSk7CisgICAgZi5zZXRGaWxlTmFtZShiLmdldFBhdGgoKSk7CiAgICAgZi5zZXRFZGl0RmlsdGVyKFByZXR0eUZvcm1hdHRlci5CKTsKICAgICBmLnNldEVkaXRMaXN0KHMuZ2V0RWRpdHMoKSk7CiAKLSAgICBpZiAoZHAuaXNTeW50YXhIaWdobGlnaHRpbmcoKSAmJiBzLmdldEEoKS5pc1dob2xlRmlsZSgpICYmICFzLmdldEIoKS5pc1dob2xlRmlsZSgpKSB7Ci0gICAgICBmLmZvcm1hdChzLmdldEIoKS5hcHBseShzLmdldEEoKSwgcy5nZXRFZGl0cygpKSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgIGYuZm9ybWF0KHMuZ2V0QigpKTsKKyAgICBpZiAocy5nZXRBKCkuaXNXaG9sZUZpbGUoKSAmJiAhYi5pc1dob2xlRmlsZSgpKSB7CisgICAgICBiID0gYi5hcHBseShzLmdldEEoKSwgcy5nZXRFZGl0cygpKTsKICAgICB9CisgICAgZi5mb3JtYXQoYik7CiAgICAgcmV0dXJuIGY7CiAgIH0KIAotICBwcm90ZWN0ZWQgYWJzdHJhY3Qgdm9pZCByZW5kZXIoUGF0Y2hTY3JpcHQgc2NyaXB0KTsKKyAgcHJvdGVjdGVkIGFic3RyYWN0IHZvaWQgcmVuZGVyKFBhdGNoU2NyaXB0IHNjcmlwdCwgZmluYWwgUGF0Y2hTZXREZXRhaWwgZGV0YWlsKTsKIAogICBwcm90ZWN0ZWQgYWJzdHJhY3Qgdm9pZCBvbkluc2VydENvbW1lbnQoUGF0Y2hMaW5lIHBsKTsKIAogICBwdWJsaWMgYWJzdHJhY3Qgdm9pZCBkaXNwbGF5KENvbW1lbnREZXRhaWwgY29tbWVudHMsIGJvb2xlYW4gZXhwYW5kQ29tbWVudHMpOwogCiAgIEBPdmVycmlkZQotICBwcm90ZWN0ZWQgTXlGbGV4VGFibGUgY3JlYXRlRmxleFRhYmxlKCkgewotICAgIHJldHVybiBuZXcgRG91YmxlQ2xpY2tGbGV4VGFibGUoKTsKLSAgfQotCi0gIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgT2JqZWN0IGdldFJvd0l0ZW1LZXkoZmluYWwgT2JqZWN0IGl0ZW0pIHsKICAgICByZXR1cm4gbnVsbDsKICAgfQpAQCAtMjQwLDYgKzMzNiw4IEBACiAgICAgICAgIGNhc2UgSU5TRVJUOgogICAgICAgICBjYXNlIFJFUExBQ0U6CiAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGNhc2UgQ09OVEVYVDoKKyAgICAgICAgICBicmVhazsKICAgICAgIH0KICAgICB9IGVsc2UgaWYgKG8gaW5zdGFuY2VvZiBDb21tZW50TGlzdCkgewogICAgICAgcmV0dXJuIHRydWU7CkBAIC0zNjUsMTIgKzQ2Myw2IEBACiAgICAgcmV0dXJuIGdldFJvd0l0ZW0ocm93KSBpbnN0YW5jZW9mIENvbW1lbnRMaXN0OwogICB9CiAKLSAgLyoqIEludm9rZWQgd2hlbiB0aGUgdXNlciBkb3VibGUgY2xpY2tzIG9uIGEgdGFibGUgY2VsbC4gKi8KLSAgcHJvdGVjdGVkIGFic3RyYWN0IHZvaWQgb25DZWxsRG91YmxlQ2xpY2soaW50IHJvdywgaW50IGNvbHVtbik7Ci0KLSAgLyoqIEludm9rZWQgd2hlbiB0aGUgdXNlciBjbGlja3Mgb24gYSB0YWJsZSBjZWxsLiAqLwotICBwcm90ZWN0ZWQgYWJzdHJhY3Qgdm9pZCBvbkNlbGxTaW5nbGVDbGljayhpbnQgcm93LCBpbnQgY29sdW1uKTsKLQogICAvKioKICAgICogSW52b2tlcyBjcmVhdGVDb21tZW50RWRpdG9yKCkgd2l0aCBhbiBlbXB0eSBzdHJpbmcgYXMgdmFsdWUgZm9yIHRoZSBjb21tZW50CiAgICAqIHBhcmVudCBVVUlELiBUaGlzIG1ldGhvZCBpcyBpbnZva2VkIGJ5IGNhbGxlcnMgdGhhdCB3YW50IHRvIGNyZWF0ZSBhbgpAQCAtMzc5LDcgKzQ3MSw3IEBACiAgIHByb3RlY3RlZCB2b2lkIGNyZWF0ZUNvbW1lbnRFZGl0b3IoZmluYWwgaW50IHN1Z2dlc3RSb3csIGZpbmFsIGludCBjb2x1bW4sCiAgICAgICBmaW5hbCBpbnQgbGluZSwgZmluYWwgc2hvcnQgZmlsZSkgewogICAgIGlmIChHZXJyaXQuaXNTaWduZWRJbigpKSB7Ci0gICAgICBpZiAoMSA8PSBsaW5lKSB7CisgICAgICBpZiAoUl9IRUFEIDw9IGxpbmUpIHsKICAgICAgICAgZmluYWwgUGF0Y2guS2V5IHBhcmVudEtleTsKICAgICAgICAgZmluYWwgc2hvcnQgc2lkZTsKICAgICAgICAgc3dpdGNoIChmaWxlKSB7CkBAIC00MDYsMTUgKzQ5OCwyMSBAQAogICAgICAgICBuZXdDb21tZW50LnNldFNpZGUoc2lkZSk7CiAgICAgICAgIG5ld0NvbW1lbnQuc2V0TWVzc2FnZSgiIik7CiAKLSAgICAgICAgY3JlYXRlQ29tbWVudEVkaXRvcihzdWdnZXN0Um93LCBjb2x1bW4sIG5ld0NvbW1lbnQpLnNldEZvY3VzKHRydWUpOworICAgICAgICBmaW5kT3JDcmVhdGVDb21tZW50RWRpdG9yKHN1Z2dlc3RSb3csIGNvbHVtbiwgbmV3Q29tbWVudCwgdHJ1ZSkKKyAgICAgICAgICAgIC5zZXRGb2N1cyh0cnVlKTsKICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgR2Vycml0LmRvU2lnbkluKEhpc3RvcnkuZ2V0VG9rZW4oKSk7CiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSBDb21tZW50RWRpdG9yUGFuZWwgY3JlYXRlQ29tbWVudEVkaXRvcihmaW5hbCBpbnQgc3VnZ2VzdFJvdywKLSAgICAgIGZpbmFsIGludCBjb2x1bW4sIGZpbmFsIFBhdGNoTGluZUNvbW1lbnQgbmV3Q29tbWVudCkgeworICBwcm90ZWN0ZWQgdm9pZCB1cGRhdGVDdXJzb3IoZmluYWwgUGF0Y2hMaW5lQ29tbWVudCBuZXdDb21tZW50KSB7CisgIH0KKworICBhYnN0cmFjdCB2b2lkIGluc2VydEZpbGVDb21tZW50Um93KGZpbmFsIGludCByb3cpOworCisgIHByaXZhdGUgQ29tbWVudEVkaXRvclBhbmVsIGZpbmRPckNyZWF0ZUNvbW1lbnRFZGl0b3IoZmluYWwgaW50IHN1Z2dlc3RSb3csCisgICAgICBmaW5hbCBpbnQgY29sdW1uLCBmaW5hbCBQYXRjaExpbmVDb21tZW50IG5ld0NvbW1lbnQsIGZpbmFsIGJvb2xlYW4gY3JlYXRlKSB7CiAgICAgaW50IHJvdyA9IHN1Z2dlc3RSb3c7CiAgICAgaW50IHNwYW5zW10gPSBuZXcgaW50W2NvbHVtbiArIDFdOwogICAgIEZJTkRfUk9XOiB3aGlsZSAocm93IDwgdGFibGUuZ2V0Um93Q291bnQoKSkgewpAQCAtNDI3LDcgKzUyNSw5IEBACiAgICAgICAgIHNwYW5zW2NvbF0gPSB0YWJsZS5nZXRGbGV4Q2VsbEZvcm1hdHRlcigpLmdldFJvd1NwYW4ocm93LCBjZWxsKTsKICAgICAgICAgaWYgKGNvbCA9PSBjb2x1bW4pIHsKICAgICAgICAgICBmaW5hbCBXaWRnZXQgdyA9IHRhYmxlLmdldFdpZGdldChyb3csIGNlbGwpOwotICAgICAgICAgIGlmICh3IGluc3RhbmNlb2YgQ29tbWVudEVkaXRvclBhbmVsKSB7CisgICAgICAgICAgaWYgKHcgaW5zdGFuY2VvZiBDb21tZW50RWRpdG9yUGFuZWwKKyAgICAgICAgICAgICAgJiYgKChDb21tZW50RWRpdG9yUGFuZWwpIHcpLmdldENvbW1lbnQoKS5nZXRLZXkoKS5nZXRQYXJlbnRLZXkoKQorICAgICAgICAgICAgICAgICAgLmVxdWFscyhuZXdDb21tZW50LmdldEtleSgpLmdldFBhcmVudEtleSgpKSkgewogICAgICAgICAgICAgLy8gRG9uJ3QgaW5zZXJ0IHR3byBlZGl0b3JzIG9uIHRoZSBzYW1lIHBvc2l0aW9uLCBpdCBkb2Vzbid0IG1ha2UKICAgICAgICAgICAgIC8vIGFueSBzZW5zZSB0byB0aGUgdXNlci4KICAgICAgICAgICAgIC8vCkBAIC00NDEsNiArNTQxLDcgQEAKICAgICAgICAgICAgICAgYnJlYWsgRklORF9ST1c7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByb3crKzsKKyAgICAgICAgICAgIGNlbGwtLTsKICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgYnJlYWsgRklORF9ST1c7CiAgICAgICAgICAgfQpAQCAtNDQ4LDcgKzU0OSw3IEBACiAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKG5ld0NvbW1lbnQgPT0gbnVsbCkgeworICAgIGlmIChuZXdDb21tZW50ID09IG51bGwgfHwgIWNyZWF0ZSkgewogICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQogCkBAIC00NjksNyArNTcwLDExIEBACiAgICAgICB9CiAgICAgfQogICAgIGlmIChuZWVkSW5zZXJ0IHx8ICFpc0NvbW1lbnRSb3cpIHsKLSAgICAgIGluc2VydFJvdyhyb3cpOworICAgICAgaWYgKG5ld0NvbW1lbnQuZ2V0TGluZSgpID09IFJfSEVBRCkgeworICAgICAgICBpbnNlcnRGaWxlQ29tbWVudFJvdyhyb3cpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgaW5zZXJ0Um93KHJvdyk7CisgICAgICB9CiAgICAgICBzdHlsZUNvbW1lbnRSb3cocm93KTsKICAgICB9CiAgICAgdGFibGUuc2V0V2lkZ2V0KHJvdywgY29sdW1uLCBlZCk7CkBAIC01MDcsNiArNjEyLDcgQEAKICAgICAgIH0KICAgICB9CiAKKyAgICB1cGRhdGVDdXJzb3IobmV3Q29tbWVudCk7CiAgICAgcmV0dXJuIGVkOwogICB9CiAKQEAgLTU0MywyNCArNjQ5LDQwIEBACiAgICAgICB9CiAgICAgfQogICAgIGlmIChyZW1vdmVSb3cpIHsKLSAgICAgIGZvciAoaW50IHIgPSByb3cgLSAxOyAwIDw9IHI7IHItLSkgewotICAgICAgICBib29sZWFuIGRhdGEgPSBmYWxzZTsKLSAgICAgICAgZm9yIChpbnQgYyA9IDA7IGMgPCB0YWJsZS5nZXRDZWxsQ291bnQocik7IGMrKykgewotICAgICAgICAgIGRhdGEgfD0gdGFibGUuZ2V0V2lkZ2V0KHIsIGMpICE9IG51bGw7Ci0gICAgICAgICAgZmluYWwgaW50IHMgPSB0YWJsZS5nZXRGbGV4Q2VsbEZvcm1hdHRlcigpLmdldFJvd1NwYW4ociwgYykgLSAxOwotICAgICAgICAgIGlmIChyICsgcyA9PSByb3cpIHsKLSAgICAgICAgICAgIHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCkuc2V0Um93U3BhbihyLCBjLCBzKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCFkYXRhKSB7Ci0gICAgICAgICAgYnJlYWs7CisgICAgICBkZXN0cm95Q29tbWVudFJvdyhyb3cpOworICAgIH0gZWxzZSB7CisgICAgICBkZXN0cm95Q29tbWVudChyb3csIGNvbCwgc3Bhbik7CisgICAgfQorICB9CisKKyAgcHJvdGVjdGVkIHZvaWQgZGVzdHJveUNvbW1lbnRSb3coaW50IHJvdykgeworICAgIGZvciAoaW50IHIgPSByb3cgLSAxOyAwIDw9IHI7IHItLSkgeworICAgICAgYm9vbGVhbiBkYXRhID0gZmFsc2U7CisgICAgICBmb3IgKGludCBjID0gMDsgYyA8IHRhYmxlLmdldENlbGxDb3VudChyKTsgYysrKSB7CisgICAgICAgIGRhdGEgfD0gdGFibGUuZ2V0V2lkZ2V0KHIsIGMpICE9IG51bGw7CisgICAgICAgIGZpbmFsIGludCBzID0gdGFibGUuZ2V0RmxleENlbGxGb3JtYXR0ZXIoKS5nZXRSb3dTcGFuKHIsIGMpIC0gMTsKKyAgICAgICAgaWYgKHIgKyBzID09IHJvdykgeworICAgICAgICAgIHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCkuc2V0Um93U3BhbihyLCBjLCBzKTsKICAgICAgICAgfQogICAgICAgfQotICAgICAgdGFibGUucmVtb3ZlUm93KHJvdyk7Ci0gICAgfSBlbHNlIGlmIChzcGFuICE9IDEpIHsKKyAgICAgIGlmICghZGF0YSkgeworICAgICAgICBicmVhazsKKyAgICAgIH0KKyAgICB9CisgICAgdGFibGUucmVtb3ZlUm93KHJvdyk7CisgIH0KKworICBwcml2YXRlIHZvaWQgZGVzdHJveUNvbW1lbnQoaW50IHJvdywgaW50IGNvbCwgaW50IHNwYW4pIHsKKyAgICB0YWJsZS5nZXRGbGV4Q2VsbEZvcm1hdHRlcigpLnNldFN0eWxlTmFtZSgvLworICAgICAgICByb3csIGNvbCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dCgpKTsKKworICAgIGlmIChzcGFuICE9IDEpIHsKICAgICAgIHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCkuc2V0Um93U3Bhbihyb3csIGNvbCwgMSk7CiAgICAgICBmb3IgKGludCByID0gcm93ICsgMTsgciA8IHJvdyArIHNwYW47IHIrKykgewotICAgICAgICB0YWJsZS5pbnNlcnRDZWxsKHIsIGNvbCArIDEpOworICAgICAgICB0YWJsZS5pbnNlcnRDZWxsKHIsIGNvbCk7CisKKyAgICAgICAgdGFibGUuZ2V0RmxleENlbGxGb3JtYXR0ZXIoKS5zZXRTdHlsZU5hbWUoLy8KKyAgICAgICAgICAgIHIsIGNvbCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dCgpKTsKICAgICAgIH0KICAgICB9CiAgIH0KQEAgLTU3NSw3ICs2OTcsNyBAQAogICAgICAgc3R5bGVMYXN0Q29tbWVudENlbGwocm93LCBjb2wpOwogCiAgICAgfSBlbHNlIHsKLSAgICAgIGZpbmFsIEFjY291bnRJbmZvIGF1dGhvciA9IGFjY291bnRDYWNoZS5nZXQobGluZS5nZXRBdXRob3IoKSk7CisgICAgICBmaW5hbCBBY2NvdW50SW5mbyBhdXRob3IgPSBGb3JtYXRVdGlsLmFzSW5mbyhhY2NvdW50Q2FjaGUuZ2V0KGxpbmUuZ2V0QXV0aG9yKCkpKTsKICAgICAgIGZpbmFsIFB1Ymxpc2hlZENvbW1lbnRQYW5lbCBwYW5lbCA9CiAgICAgICAgICAgbmV3IFB1Ymxpc2hlZENvbW1lbnRQYW5lbChhdXRob3IsIGxpbmUpOwogICAgICAgcGFuZWwuc2V0T3BlbihleHBhbmRDb21tZW50KTsKQEAgLTYzMiw2ICs3NTQsOSBAQAogICAgICAgICBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNvbW1lbnRQYW5lbExhc3QoKSk7CiAgICAgZm10LnNldFN0eWxlTmFtZShyb3csIGNvbCwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jb21tZW50SG9sZGVyKCkpOwogICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBjb2wsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY29tbWVudFBhbmVsTGFzdCgpKTsKKyAgICBpZiAoIWZtdC5nZXRTdHlsZU5hbWUocm93LCBjb2wgLSAxKS5jb250YWlucyhHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNvbW1lbnRIb2xkZXIoKSkpIHsKKyAgICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBjb2wsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY29tbWVudEhvbGRlckxlZnRtb3N0KCkpOworICAgIH0KICAgfQogCiAgIHByb3RlY3RlZCBzdGF0aWMgY2xhc3MgQ29tbWVudExpc3QgewpAQCAtNjQwLDQyICs3NjUsNiBAQAogICAgICAgICBuZXcgQXJyYXlMaXN0PFB1Ymxpc2hlZENvbW1lbnRQYW5lbD4oKTsKICAgfQogCi0gIHByb3RlY3RlZCBjbGFzcyBEb3VibGVDbGlja0ZsZXhUYWJsZSBleHRlbmRzIE15RmxleFRhYmxlIHsKLSAgICBwdWJsaWMgRG91YmxlQ2xpY2tGbGV4VGFibGUoKSB7Ci0gICAgICBzaW5rRXZlbnRzKEV2ZW50Lk9OREJMQ0xJQ0sgfCBFdmVudC5PTkNMSUNLKTsKLSAgICB9Ci0KLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgdm9pZCBvbkJyb3dzZXJFdmVudChmaW5hbCBFdmVudCBldmVudCkgewotICAgICAgc3dpdGNoIChET00uZXZlbnRHZXRUeXBlKGV2ZW50KSkgewotICAgICAgICBjYXNlIEV2ZW50Lk9OQ0xJQ0s6IHsKLSAgICAgICAgICAvLyBGaW5kIG91dCB3aGljaCBjZWxsIHdhcyBhY3R1YWxseSBjbGlja2VkLgotICAgICAgICAgIGZpbmFsIEVsZW1lbnQgdGQgPSBnZXRFdmVudFRhcmdldENlbGwoZXZlbnQpOwotICAgICAgICAgIGlmICh0ZCA9PSBudWxsKSB7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgICB9Ci0gICAgICAgICAgZmluYWwgaW50IHJvdyA9IHJvd09mKHRkKTsKLSAgICAgICAgICBpZiAoZ2V0Um93SXRlbShyb3cpICE9IG51bGwpIHsKLSAgICAgICAgICAgIG1vdmVQb2ludGVyVG8ocm93KTsKLSAgICAgICAgICAgIG9uQ2VsbFNpbmdsZUNsaWNrKHJvd09mKHRkKSwgY29sdW1uT2YodGQpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICB9Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgY2FzZSBFdmVudC5PTkRCTENMSUNLOiB7Ci0gICAgICAgICAgLy8gRmluZCBvdXQgd2hpY2ggY2VsbCB3YXMgYWN0dWFsbHkgY2xpY2tlZC4KLSAgICAgICAgICBFbGVtZW50IHRkID0gZ2V0RXZlbnRUYXJnZXRDZWxsKGV2ZW50KTsKLSAgICAgICAgICBpZiAodGQgPT0gbnVsbCkgewotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgIH0KLSAgICAgICAgICBvbkNlbGxEb3VibGVDbGljayhyb3dPZih0ZCksIGNvbHVtbk9mKHRkKSk7Ci0gICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgICBzdXBlci5vbkJyb3dzZXJFdmVudChldmVudCk7Ci0gICAgfQotICB9Ci0KICAgcHVibGljIHN0YXRpYyBjbGFzcyBOb09wS2V5Q29tbWFuZCBleHRlbmRzIE5lZWRzU2lnbkluS2V5Q29tbWFuZCB7CiAgICAgcHVibGljIE5vT3BLZXlDb21tYW5kKGludCBtYXNrLCBpbnQga2V5LCBTdHJpbmcgaGVscCkgewogICAgICAgc3VwZXIobWFzaywga2V5LCBoZWxwKTsKQEAgLTgwNCwyMiArODkzLDIyIEBACiAgICAgcHJpdmF0ZSB2b2lkIGNyZWF0ZVJlcGx5RWRpdG9yKCkgewogICAgICAgZmluYWwgUGF0Y2hMaW5lQ29tbWVudCBuZXdDb21tZW50ID0gbmV3Q29tbWVudCgpOwogICAgICAgbmV3Q29tbWVudC5zZXRNZXNzYWdlKCIiKTsKLSAgICAgIGNyZWF0ZUVkaXRvcihuZXdDb21tZW50KS5zZXRGb2N1cyh0cnVlKTsKKyAgICAgIGZpbmRPckNyZWF0ZUVkaXRvcihuZXdDb21tZW50LCB0cnVlKS5zZXRGb2N1cyh0cnVlKTsKICAgICB9CiAKICAgICBwcml2YXRlIHZvaWQgY2FubmVkUmVwbHkoU3RyaW5nIG1lc3NhZ2UpIHsKLSAgICAgIENvbW1lbnRFZGl0b3JQYW5lbCBwID0gY3JlYXRlRWRpdG9yKG51bGwpOworICAgICAgZmluYWwgUGF0Y2hMaW5lQ29tbWVudCBuZXdDb21tZW50ID0gbmV3Q29tbWVudCgpOworICAgICAgbmV3Q29tbWVudC5zZXRNZXNzYWdlKG1lc3NhZ2UpOworICAgICAgQ29tbWVudEVkaXRvclBhbmVsIHAgPSBmaW5kT3JDcmVhdGVFZGl0b3IobmV3Q29tbWVudCwgZmFsc2UpOwogICAgICAgaWYgKHAgPT0gbnVsbCkgewotICAgICAgICBmaW5hbCBQYXRjaExpbmVDb21tZW50IG5ld0NvbW1lbnQgPSBuZXdDb21tZW50KCk7Ci0gICAgICAgIG5ld0NvbW1lbnQuc2V0TWVzc2FnZShtZXNzYWdlKTsKLQogICAgICAgICBlbmFibGVCdXR0b25zKGZhbHNlKTsKICAgICAgICAgUGF0Y2hVdGlsLkRFVEFJTF9TVkMuc2F2ZURyYWZ0KG5ld0NvbW1lbnQsCiAgICAgICAgICAgICBuZXcgR2Vycml0Q2FsbGJhY2s8UGF0Y2hMaW5lQ29tbWVudD4oKSB7CisgICAgICAgICAgICAgIEBPdmVycmlkZQogICAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoZmluYWwgUGF0Y2hMaW5lQ29tbWVudCByZXN1bHQpIHsKICAgICAgICAgICAgICAgICBlbmFibGVCdXR0b25zKHRydWUpOwogICAgICAgICAgICAgICAgIG5vdGlmeURyYWZ0RGVsdGEoMSk7Ci0gICAgICAgICAgICAgICAgY3JlYXRlRWRpdG9yKHJlc3VsdCkuc2V0T3BlbihmYWxzZSk7CisgICAgICAgICAgICAgICAgZmluZE9yQ3JlYXRlRWRpdG9yKHJlc3VsdCwgdHJ1ZSkuc2V0T3BlbihmYWxzZSk7CiAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICBAT3ZlcnJpZGUKQEAgLTgzNiwxMCArOTI1LDExIEBACiAgICAgICB9CiAgICAgfQogCi0gICAgcHJpdmF0ZSBDb21tZW50RWRpdG9yUGFuZWwgY3JlYXRlRWRpdG9yKGZpbmFsIFBhdGNoTGluZUNvbW1lbnQgbmV3Q29tbWVudCkgeworICAgIHByaXZhdGUgQ29tbWVudEVkaXRvclBhbmVsIGZpbmRPckNyZWF0ZUVkaXRvcigKKyAgICAgICAgUGF0Y2hMaW5lQ29tbWVudCBuZXdDb21tZW50LCBib29sZWFuIGNyZWF0ZSkgewogICAgICAgaW50IHJvdyA9IHJvd09mKGdldEVsZW1lbnQoKSk7CiAgICAgICBpbnQgY29sdW1uID0gY29sdW1uT2YoZ2V0RWxlbWVudCgpKTsKLSAgICAgIHJldHVybiBjcmVhdGVDb21tZW50RWRpdG9yKHJvdyArIDEsIGNvbHVtbiwgbmV3Q29tbWVudCk7CisgICAgICByZXR1cm4gZmluZE9yQ3JlYXRlQ29tbWVudEVkaXRvcihyb3cgKyAxLCBjb2x1bW4sIG5ld0NvbW1lbnQsIGNyZWF0ZSk7CiAgICAgfQogCiAgICAgcHJpdmF0ZSBQYXRjaExpbmVDb21tZW50IG5ld0NvbW1lbnQoKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9Db21tZW50RWRpdG9yUGFuZWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL0NvbW1lbnRFZGl0b3JQYW5lbC5qYXZhCmluZGV4IGIwZDgyNWIuLmI2MDlmMTUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL0NvbW1lbnRFZGl0b3JQYW5lbC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL0NvbW1lbnRFZGl0b3JQYW5lbC5qYXZhCkBAIC0xOTgsNiArMTk4LDEwIEBACiAgICAgcmV0dXJuIGNvbW1lbnQuZ2V0S2V5KCkuZ2V0KCkgPT0gbnVsbDsKICAgfQogCisgIHB1YmxpYyBQYXRjaExpbmVDb21tZW50IGdldENvbW1lbnQoKSB7CisgICAgcmV0dXJuIGNvbW1lbnQ7CisgIH0KKwogICBAT3ZlcnJpZGUKICAgcHVibGljIHZvaWQgb25Eb3VibGVDbGljayhmaW5hbCBEb3VibGVDbGlja0V2ZW50IGV2ZW50KSB7CiAgICAgZWRpdCgpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hDb25zdGFudHMuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoQ29uc3RhbnRzLmphdmEKaW5kZXggNDgwMWU2NS4uOGM5YzU2YiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hDb25zdGFudHMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaENvbnN0YW50cy5qYXZhCkBAIC0zNiw2ICszNiw3IEBACiAgIFN0cmluZyBwYXRjaEhpc3RvcnlUaXRsZSgpOwogICBTdHJpbmcgZGlzYWJsZWRPbkxhcmdlRmlsZXMoKTsKICAgU3RyaW5nIGludHJhbGluZUZhaWx1cmUoKTsKKyAgU3RyaW5nIGludHJhbGluZVRpbWVvdXQoKTsKICAgU3RyaW5nIGlsbGVnYWxOdW1iZXJPZkNvbHVtbnMoKTsKIAogICBTdHJpbmcgdXBUb0NoYW5nZSgpOwpAQCAtNjcsNiArNjgsOCBAQAogICBTdHJpbmcgcmV2aWV3ZWRBbmQoKTsKICAgU3RyaW5nIG5leHQoKTsKICAgU3RyaW5nIGRvd25sb2FkKCk7CisgIFN0cmluZyBhZGRGaWxlQ29tbWVudFRvb2xUaXAoKTsKKyAgU3RyaW5nIGFkZEZpbGVDb21tZW50QnlEb3VibGVDbGljaygpOwogCiAgIFN0cmluZyBidXR0b25SZXBseURvbmUoKTsKICAgU3RyaW5nIGNhbm5lZFJlcGx5RG9uZSgpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hDb25zdGFudHMucHJvcGVydGllcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoQ29uc3RhbnRzLnByb3BlcnRpZXMKaW5kZXggMTE4MjNhYy4uNWFjZGI1ZiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hDb25zdGFudHMucHJvcGVydGllcworKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaENvbnN0YW50cy5wcm9wZXJ0aWVzCkBAIC0xOCw2ICsxOCw3IEBACiBwYXRjaFNldCA9IFBhdGNoIFNldAogZGlzYWJsZWRPbkxhcmdlRmlsZXMgPSBEaXNhYmxlZCBvbiB2ZXJ5IGxhcmdlIHNvdXJjZSBmaWxlcy4KIGludHJhbGluZUZhaWx1cmUgPSBJbnRyYWxpbmUgZGlmZmVyZW5jZSBub3QgYXZhaWxhYmxlIGR1ZSB0byBzZXJ2ZXIgZXJyb3IuCitpbnRyYWxpbmVUaW1lb3V0ID0gSW50cmFsaW5lIGRpZmZlcmVuY2Ugbm90IGF2YWlsYWJsZSBkdWUgdG8gdGltZW91dC4KIGlsbGVnYWxOdW1iZXJPZkNvbHVtbnMgPSBUaGUgbnVtYmVyIG9mIGNvbHVtbnMgY2Fubm90IGJlIHplcm8gb3IgbmVnYXRpdmUKIAogdXBUb0NoYW5nZSA9IFVwIHRvIGNoYW5nZQpAQCAtNDksNiArNTAsOCBAQAogcmV2aWV3ZWRBbmQgPSBSZXZpZXdlZCAmCiBuZXh0ID0gbmV4dAogZG93bmxvYWQgPSBEb3dubG9hZAorYWRkRmlsZUNvbW1lbnRUb29sVGlwID0gQ2xpY2sgdG8gYWRkIGZpbGUgY29tbWVudAorYWRkRmlsZUNvbW1lbnRCeURvdWJsZUNsaWNrID0gRG91YmxlIGNsaWNrIHRvIGFkZCBmaWxlIGNvbW1lbnQKIAogZmlsZVR5cGVTeW1saW5rID0gVHlwZTogU3ltYm9saWMgTGluawogZmlsZVR5cGVHaXRsaW5rID0gVHlwZTogR2l0IENvbW1pdCBpbiBTdWJwcm9qZWN0CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaFNjcmVlbi5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hTY3JlZW4uamF2YQppbmRleCA0Zjg3MzFjLi42NzZjZWE2IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaFNjcmVlbi5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoU2NyZWVuLmphdmEKQEAgLTIwLDEyICsyMCw5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LlJwY1N0YXR1czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlcy5Db21taXRNZXNzYWdlQmxvY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXMuUGF0Y2hUYWJsZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlcy5QYXRjaFRhYmxlLlBhdGNoVmFsaWRhdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLlV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5HZXJyaXRDYWxsYmFjazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLlNjcmVlbkxvYWRDYWxsYmFjazsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQ2hhbmdlTGluazsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSW5saW5lSHlwZXJsaW5rOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5MaXN0ZW5hYmxlQWNjb3VudERpZmZQcmVmZXJlbmNlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aS5TY3JlZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGF0Y2hTY3JpcHQ7CkBAIC0zNywyMyArMzQsMTQgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuU2NoZWR1bGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LlNjaGVkdWxlci5TY2hlZHVsZWRDb21tYW5kOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQubG9naWNhbC5zaGFyZWQuVmFsdWVDaGFuZ2VFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5sb2dpY2FsLnNoYXJlZC5WYWx1ZUNoYW5nZUhhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuc2hhcmVkLkhhbmRsZXJSZWdpc3RyYXRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5DaGVja0JveDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuTGFiZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5nbG9iYWxrZXkuY2xpZW50Lkdsb2JhbEtleTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuS2V5Q29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuS2V5Q29tbWFuZFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbEJ1aWxkZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwogCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUGF0Y2hTY3JlZW4gZXh0ZW5kcyBTY3JlZW4gaW1wbGVtZW50cwogICAgIENvbW1lbnRFZGl0b3JDb250YWluZXIgewpAQCAtMTEwLDE0ICs5OCwxMCBAQAogICBwcm90ZWN0ZWQgUGF0Y2hTY3JpcHRTZXR0aW5nc1BhbmVsIHNldHRpbmdzUGFuZWw7CiAgIHByb3RlY3RlZCBUb3BWaWV3IHRvcFZpZXc7CiAKLSAgcHJpdmF0ZSBDaGVja0JveCByZXZpZXdlZENoZWNrQm94OwotICBwcml2YXRlIEZsb3dQYW5lbCByZXZpZXdlZFBhbmVsOwotICBwcml2YXRlIElubGluZUh5cGVybGluayByZXZpZXdlZExpbms7CisgIHByaXZhdGUgUmV2aWV3ZWRQYW5lbHMgcmV2aWV3ZWRQYW5lbHM7CiAgIHByaXZhdGUgSGlzdG9yeVRhYmxlIGhpc3RvcnlUYWJsZTsKICAgcHJpdmF0ZSBGbG93UGFuZWwgdG9wUGFuZWw7CiAgIHByaXZhdGUgRmxvd1BhbmVsIGNvbnRlbnRQYW5lbDsKLSAgcHJpdmF0ZSBQYXRjaFRhYmxlSGVhZGVyIGhlYWRlcjsKLSAgcHJpdmF0ZSBMYWJlbCBub0RpZmZlcmVuY2U7CiAgIHByaXZhdGUgQWJzdHJhY3RQYXRjaENvbnRlbnRUYWJsZSBjb250ZW50VGFibGU7CiAgIHByaXZhdGUgQ29tbWl0TWVzc2FnZUJsb2NrIGNvbW1pdE1lc3NhZ2VCbG9jazsKICAgcHJpdmF0ZSBOYXZMaW5rcyB0b3BOYXY7CkBAIC0xMjksNiArMTEzLDcgQEAKICAgLyoqIFRoZSBpbmRleCBvZiB0aGUgZmlsZSB3ZSBhcmUgY3VycmVudGx5IGxvb2tpbmcgYXQgYW1vbmcgdGhlIGZpbGVMaXN0ICovCiAgIHByaXZhdGUgaW50IHBhdGNoSW5kZXg7CiAgIHByaXZhdGUgTGlzdGVuYWJsZUFjY291bnREaWZmUHJlZmVyZW5jZSBwcmVmczsKKyAgcHJpdmF0ZSBIYW5kbGVyUmVnaXN0cmF0aW9uIHByZWZzSGFuZGxlcjsKIAogICAvKiogS2V5cyB0aGF0IGNhdXNlIGFuIGFjdGlvbiBvbiB0aGlzIHNjcmVlbiAqLwogICBwcml2YXRlIEtleUNvbW1hbmRTZXQga2V5c05hdmlnYXRpb247CkBAIC0xMzYsNiArMTIxLDcgQEAKICAgcHJpdmF0ZSBIYW5kbGVyUmVnaXN0cmF0aW9uIHJlZ05hdmlnYXRpb247CiAgIHByaXZhdGUgSGFuZGxlclJlZ2lzdHJhdGlvbiByZWdBY3Rpb247CiAgIHByaXZhdGUgYm9vbGVhbiBpbnRyYWxpbmVGYWlsdXJlOworICBwcml2YXRlIGJvb2xlYW4gaW50cmFsaW5lVGltZW91dDsKIAogICAvKioKICAgICogSG93IHRoaXMgcGF0Y2ggc2hvdWxkIGJlIGRpc3BsYXllZCBpbiB0aGUgcGF0Y2ggc2NyZWVuLgpAQCAtMTU2LDc2ICsxNDIsMTYgQEAKICAgICBpZFNpZGVCID0gaWQuZ2V0UGFyZW50S2V5KCk7CiAgICAgdGhpcy5wYXRjaEluZGV4ID0gcGF0Y2hJbmRleDsKIAotICAgIHByZWZzID0gZmlsZUxpc3QgIT0gbnVsbCA/IGZpbGVMaXN0LmdldFByZWZlcmVuY2VzKCkgOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ldyBMaXN0ZW5hYmxlQWNjb3VudERpZmZQcmVmZXJlbmNlKCk7CisgICAgcHJlZnMgPSBmaWxlTGlzdCAhPSBudWxsCisgICAgICAgID8gZmlsZUxpc3QuZ2V0UHJlZmVyZW5jZXMoKQorICAgICAgICA6IG5ldyBMaXN0ZW5hYmxlQWNjb3VudERpZmZQcmVmZXJlbmNlKCk7CiAgICAgaWYgKEdlcnJpdC5pc1NpZ25lZEluKCkpIHsKICAgICAgIHByZWZzLnJlc2V0KCk7CiAgICAgfQotICAgIHByZWZzLmFkZFZhbHVlQ2hhbmdlSGFuZGxlcigKLSAgICAgICAgbmV3IFZhbHVlQ2hhbmdlSGFuZGxlcjxBY2NvdW50RGlmZlByZWZlcmVuY2U+KCkgewotICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgIHB1YmxpYyB2b2lkIG9uVmFsdWVDaGFuZ2UoVmFsdWVDaGFuZ2VFdmVudDxBY2NvdW50RGlmZlByZWZlcmVuY2U+IGV2ZW50KSB7Ci0gICAgICAgICAgICB1cGRhdGUoZXZlbnQuZ2V0VmFsdWUoKSk7Ci0gICAgICAgICAgfQotICAgICAgICB9KTsKLQotICAgIHJldmlld2VkUGFuZWwgPSBuZXcgRmxvd1BhbmVsKCk7CisgICAgcmV2aWV3ZWRQYW5lbHMgPSBuZXcgUmV2aWV3ZWRQYW5lbHMoKTsKICAgICBzZXR0aW5nc1BhbmVsID0gbmV3IFBhdGNoU2NyaXB0U2V0dGluZ3NQYW5lbChwcmVmcyk7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgcG9wdWxhdGVSZXZpZXdlZFBhbmVsKCl7Ci0gICAgcmV2aWV3ZWRQYW5lbC5jbGVhcigpOwotCi0gICAgcmV2aWV3ZWRDaGVja0JveCA9IG5ldyBDaGVja0JveChQYXRjaFV0aWwuQy5yZXZpZXdlZEFuZCgpICsgIiAiKTsKLSAgICByZXZpZXdlZENoZWNrQm94LmFkZFZhbHVlQ2hhbmdlSGFuZGxlcihuZXcgVmFsdWVDaGFuZ2VIYW5kbGVyPEJvb2xlYW4+KCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBvblZhbHVlQ2hhbmdlKFZhbHVlQ2hhbmdlRXZlbnQ8Qm9vbGVhbj4gZXZlbnQpIHsKLSAgICAgICAgc2V0UmV2aWV3ZWRCeUN1cnJlbnRVc2VyKGV2ZW50LmdldFZhbHVlKCkpOwotICAgICAgfQotICAgIH0pOwotCi0gICAgcmV2aWV3ZWRQYW5lbC5hZGQocmV2aWV3ZWRDaGVja0JveCk7Ci0gICAgcmV2aWV3ZWRQYW5lbC5hZGQoZ2V0UmV2aWV3ZWRBbmNob3IoKSk7Ci0gIH0KLQotICBwcml2YXRlIEFuY2hvciBnZXRSZXZpZXdlZEFuY2hvcigpIHsKLSAgICBTYWZlSHRtbEJ1aWxkZXIgdGV4dCA9IG5ldyBTYWZlSHRtbEJ1aWxkZXIoKTsKLSAgICB0ZXh0LmFwcGVuZChQYXRjaFV0aWwuQy5uZXh0KCkpOwotICAgIHRleHQuYXBwZW5kKFNhZmVIdG1sLmFzaXMoVXRpbC5DLm5leHRQYXRjaExpbmtJY29uKCkpKTsKLQotICAgIEFuY2hvciByZXZpZXdlZEFuY2hvciA9IG5ldyBBbmNob3IoIiIpOwotICAgIFNhZmVIdG1sLnNldChyZXZpZXdlZEFuY2hvciwgdGV4dCk7Ci0KLSAgICBmaW5hbCBQYXRjaFZhbGlkYXRvciB1bnJldmlld2VkVmFsaWRhdG9yID0gbmV3IFBhdGNoVmFsaWRhdG9yKCkgewotICAgICAgcHVibGljIGJvb2xlYW4gaXNWYWxpZChQYXRjaCBwYXRjaCkgewotICAgICAgICByZXR1cm4gIXBhdGNoLmlzUmV2aWV3ZWRCeUN1cnJlbnRVc2VyKCk7Ci0gICAgICB9Ci0gICAgfTsKLQotICAgIGludCBuZXh0VW5yZXZpZXdlZFBhdGNoSW5kZXggPQotICAgICAgICBmaWxlTGlzdC5nZXROZXh0UGF0Y2gocGF0Y2hJbmRleCwgdHJ1ZSwgdW5yZXZpZXdlZFZhbGlkYXRvciwKLSAgICAgICAgICAgIGZpbGVMaXN0LlBSRUZFUkVOQ0VfVkFMSURBVE9SKTsKLQotICAgIGlmIChuZXh0VW5yZXZpZXdlZFBhdGNoSW5kZXggPiAtMSkgewotICAgICAgLy8gQ3JlYXRlIGludmlzaWJsZSBwYXRjaCBsaW5rIHRvIGNoYW5nZSBwYWdlCi0gICAgICByZXZpZXdlZExpbmsgPQotICAgICAgICAgIGZpbGVMaXN0LmNyZWF0ZUxpbmsobmV4dFVucmV2aWV3ZWRQYXRjaEluZGV4LCBnZXRQYXRjaFNjcmVlblR5cGUoKSwKLSAgICAgICAgICAgICAgbnVsbCwgbnVsbCk7Ci0gICAgICByZXZpZXdlZExpbmsuc2V0VGV4dCgiIik7Ci0gICAgfSBlbHNlIHsKLSAgICAgIHJldmlld2VkTGluayA9IG5ldyBDaGFuZ2VMaW5rKCIiLCBwYXRjaEtleS5nZXRQYXJlbnRLZXkoKSk7Ci0gICAgfQotICAgIHJldmlld2VkQW5jaG9yLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKLSAgICAgICAgc2V0UmV2aWV3ZWRCeUN1cnJlbnRVc2VyKHRydWUpOwotICAgICAgICByZXZpZXdlZExpbmsuZ28oKTsKLSAgICAgIH0KLSAgICB9KTsKLQotICAgIHJldHVybiByZXZpZXdlZEFuY2hvcjsKLSAgfQotCiAgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBub3RpZnlEcmFmdERlbHRhKGludCBkZWx0YSkgewogICAgIGxhc3RTY3JpcHQgPSBudWxsOwpAQCAtMjM4LDEwICsxNjQsMTAgQEAKIAogICBwcml2YXRlIHZvaWQgdXBkYXRlKEFjY291bnREaWZmUHJlZmVyZW5jZSBkcCkgewogICAgIC8vIERpZCB0aGUgdXNlciBqdXN0IHR1cm4gb24gYXV0by1yZXZpZXc/Ci0gICAgaWYgKCFyZXZpZXdlZENoZWNrQm94LmdldFZhbHVlKCkgJiYgcHJlZnMuZ2V0T2xkKCkuaXNNYW51YWxSZXZpZXcoKQorICAgIGlmICghcmV2aWV3ZWRQYW5lbHMuZ2V0VmFsdWUoKSAmJiBwcmVmcy5nZXRPbGQoKS5pc01hbnVhbFJldmlldygpCiAgICAgICAgICYmICFkcC5pc01hbnVhbFJldmlldygpKSB7Ci0gICAgICByZXZpZXdlZENoZWNrQm94LnNldFZhbHVlKHRydWUpOwotICAgICAgc2V0UmV2aWV3ZWRCeUN1cnJlbnRVc2VyKHRydWUpOworICAgICAgcmV2aWV3ZWRQYW5lbHMuc2V0VmFsdWUodHJ1ZSk7CisgICAgICByZXZpZXdlZFBhbmVscy5zZXRSZXZpZXdlZEJ5Q3VycmVudFVzZXIodHJ1ZSk7CiAgICAgfQogCiAgICAgaWYgKGxhc3RTY3JpcHQgIT0gbnVsbCAmJiBjYW5SZXVzZShkcCwgbGFzdFNjcmlwdCkpIHsKQEAgLTI5NCw3ICsyMjAsNyBAQAogICAgIHN1cGVyLm9uSW5pdFVJKCk7CiAKICAgICBpZiAoR2Vycml0LmlzU2lnbmVkSW4oKSkgewotICAgICAgc2V0VGl0bGVGYXJFYXN0KHJldmlld2VkUGFuZWwpOworICAgICAgc2V0VGl0bGVGYXJFYXN0KHJldmlld2VkUGFuZWxzLnRvcCk7CiAgICAgfQogCiAgICAga2V5c05hdmlnYXRpb24gPSBuZXcgS2V5Q29tbWFuZFNldChHZXJyaXQuQy5zZWN0aW9uTmF2aWdhdGlvbigpKTsKQEAgLTMxNiwxMiArMjQyLDYgQEAKICAgICB0b3BQYW5lbCA9IG5ldyBGbG93UGFuZWwoKTsKICAgICBhZGQodG9wUGFuZWwpOwogCi0gICAgaGVhZGVyID0gbmV3IFBhdGNoVGFibGVIZWFkZXIoZ2V0UGF0Y2hTY3JlZW5UeXBlKCkpOwotCi0gICAgbm9EaWZmZXJlbmNlID0gbmV3IExhYmVsKFBhdGNoVXRpbC5DLm5vRGlmZmVyZW5jZSgpKTsKLSAgICBub0RpZmZlcmVuY2Uuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucGF0Y2hOb0RpZmZlcmVuY2UoKSk7Ci0gICAgbm9EaWZmZXJlbmNlLnNldFZpc2libGUoZmFsc2UpOwotCiAgICAgY29udGVudFRhYmxlID0gY3JlYXRlQ29udGVudFRhYmxlKCk7CiAgICAgY29udGVudFRhYmxlLmZpbGVMaXN0ID0gZmlsZUxpc3Q7CiAKQEAgLTMzMCwxMyArMjUwLDE5IEBACiAKICAgICBhZGQodG9wTmF2KTsKICAgICBjb250ZW50UGFuZWwgPSBuZXcgRmxvd1BhbmVsKCk7Ci0gICAgY29udGVudFBhbmVsLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpCi0gICAgICAgIC5zaWRlQnlTaWRlU2NyZWVuU2lkZUJ5U2lkZVRhYmxlKCkpOwotICAgIGNvbnRlbnRQYW5lbC5hZGQoaGVhZGVyKTsKLSAgICBjb250ZW50UGFuZWwuYWRkKG5vRGlmZmVyZW5jZSk7CisgICAgaWYgKGdldFBhdGNoU2NyZWVuVHlwZSgpID09IFBhdGNoU2NyZWVuLlR5cGUuU0lERV9CWV9TSURFKSB7CisgICAgICBjb250ZW50UGFuZWwuc2V0U3R5bGVOYW1lKC8vCisgICAgICAgICAgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5zaWRlQnlTaWRlU2NyZWVuU2lkZUJ5U2lkZVRhYmxlKCkpOworICAgIH0gZWxzZSB7CisgICAgICBjb250ZW50UGFuZWwuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkudW5pZmllZFRhYmxlKCkpOworICAgIH0KKwogICAgIGNvbnRlbnRQYW5lbC5hZGQoY29udGVudFRhYmxlKTsKICAgICBhZGQoY29udGVudFBhbmVsKTsKICAgICBhZGQoYm90dG9tTmF2KTsKKyAgICBpZiAoR2Vycml0LmlzU2lnbmVkSW4oKSkgeworICAgICAgYWRkKHJldmlld2VkUGFuZWxzLmJvdHRvbSk7CisgICAgfQogCiAgICAgaWYgKGZpbGVMaXN0ICE9IG51bGwpIHsKICAgICAgIHRvcE5hdi5kaXNwbGF5KHBhdGNoSW5kZXgsIGdldFBhdGNoU2NyZWVuVHlwZSgpLCBmaWxlTGlzdCk7CkBAIC0zNDQsMjUgKzI3MCw2IEBACiAgICAgfQogICB9CiAKLSAgdm9pZCBzZXRSZXZpZXdlZEJ5Q3VycmVudFVzZXIoYm9vbGVhbiByZXZpZXdlZCkgewotICAgIGlmIChmaWxlTGlzdCAhPSBudWxsKSB7Ci0gICAgICBmaWxlTGlzdC51cGRhdGVSZXZpZXdlZFN0YXR1cyhwYXRjaEtleSwgcmV2aWV3ZWQpOwotICAgIH0KLQotICAgIFBhdGNoVXRpbC5ERVRBSUxfU1ZDLnNldFJldmlld2VkQnlDdXJyZW50VXNlcihwYXRjaEtleSwgcmV2aWV3ZWQsCi0gICAgICAgIG5ldyBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+KCkgewotICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgYXJnMCkgewotICAgICAgICAgICAgLy8gbm9wCi0gICAgICAgICAgfQotCi0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKFZvaWRSZXN1bHQgcmVzdWx0KSB7Ci0gICAgICAgICAgICAvLyBub3AKLSAgICAgICAgICB9Ci0gICAgICAgIH0pOwotICB9Ci0KICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIG9uTG9hZCgpIHsKICAgICBzdXBlci5vbkxvYWQoKTsKQEAgLTM4OCw2ICsyOTUsMTAgQEAKIAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgb25VbmxvYWQoKSB7CisgICAgaWYgKHByZWZzSGFuZGxlciAhPSBudWxsKSB7CisgICAgICBwcmVmc0hhbmRsZXIucmVtb3ZlSGFuZGxlcigpOworICAgICAgcHJlZnNIYW5kbGVyID0gbnVsbDsKKyAgICB9CiAgICAgaWYgKHJlZ05hdmlnYXRpb24gIT0gbnVsbCkgewogICAgICAgcmVnTmF2aWdhdGlvbi5yZW1vdmVIYW5kbGVyKCk7CiAgICAgICByZWdOYXZpZ2F0aW9uID0gbnVsbDsKQEAgLTQ0OSw3ICszNjAsNyBAQAogICAgIGZpbmFsIGludCBycGNzZXEgPSArK3JwY1NlcXVlbmNlOwogICAgIGxhc3RTY3JpcHQgPSBudWxsOwogICAgIHNldHRpbmdzUGFuZWwuc2V0RW5hYmxlZChmYWxzZSk7Ci0gICAgcG9wdWxhdGVSZXZpZXdlZFBhbmVsKCk7CisgICAgcmV2aWV3ZWRQYW5lbHMucG9wdWxhdGUocGF0Y2hLZXksIGZpbGVMaXN0LCBwYXRjaEluZGV4LCBnZXRQYXRjaFNjcmVlblR5cGUoKSk7CiAgICAgaWYgKGlzRmlyc3QgJiYgZmlsZUxpc3QgIT0gbnVsbCkgewogICAgICAgZmlsZUxpc3QubW92ZVBvaW50ZXJUbyhwYXRjaEtleSk7CiAgICAgfQpAQCAtNTAwLDE4ICs0MTEsMjIgQEAKIAogICAgIGhpc3RvcnlUYWJsZS5kaXNwbGF5KHNjcmlwdC5nZXRIaXN0b3J5KCkpOwogCi0gICAgLy8gVHJ1ZSBpZiB0aGVyZSBhcmUgZGlmZmVyZW5jZXMgYmV0d2VlbiB0aGUgdHdvIHBhdGNoIHNldHMKLSAgICBib29sZWFuIGhhc0VkaXRzID0gIXNjcmlwdC5nZXRFZGl0cygpLmlzRW1wdHkoKTsKLSAgICAvLyBUcnVlIGlmIHRoaXMgY2hhbmdlIGlzIGEgbW9kZSBjaGFuZ2Ugb3IgYSBwdXJlIHJlbmFtZS9jb3B5Ci0gICAgYm9vbGVhbiBoYXNNZXRhID0gIXNjcmlwdC5nZXRQYXRjaEhlYWRlcigpLmlzRW1wdHkoKTsKKyAgICBmb3IgKFBhdGNoIHAgOiBwYXRjaFNldERldGFpbC5nZXRQYXRjaGVzKCkpIHsKKyAgICAgIGlmIChwLmdldEtleSgpLmVxdWFscyhwYXRjaEtleSkpIHsKKyAgICAgICAgaWYgKHAuZ2V0UGF0Y2hUeXBlKCkuZXF1YWxzKFBhdGNoLlBhdGNoVHlwZS5CSU5BUlkpKSB7CisgICAgICAgICAgY29udGVudFRhYmxlLmlzRGlzcGxheUJpbmFyeSA9IHRydWU7CisgICAgICAgIH0KKyAgICAgICAgYnJlYWs7CisgICAgICB9CisgICAgfQogCi0gICAgYm9vbGVhbiBoYXNEaWZmZXJlbmNlcyA9IGhhc0VkaXRzIHx8IGhhc01ldGE7Ci0gICAgYm9vbGVhbiBwdXJlTWV0YUNoYW5nZSA9ICFoYXNFZGl0cyAmJiBoYXNNZXRhOwotCi0gICAgaWYgKGNvbnRlbnRUYWJsZSBpbnN0YW5jZW9mIFNpZGVCeVNpZGVUYWJsZSAmJiBwdXJlTWV0YUNoYW5nZSkgeworICAgIGlmIChjb250ZW50VGFibGUgaW5zdGFuY2VvZiBTaWRlQnlTaWRlVGFibGUKKyAgICAgICAgJiYgY29udGVudFRhYmxlLmlzUHVyZU1ldGFDaGFuZ2Uoc2NyaXB0KQorICAgICAgICAmJiAhY29udGVudFRhYmxlLmlzRGlzcGxheUJpbmFyeSkgewogICAgICAgLy8gVXNlciBhc2tlZCBmb3IgU2lkZUJ5U2lkZSAob3IgYSBsaW5rIGd1ZXNzZWQsIHdyb25nKSBhbmQgd2UgY2FuJ3QKLSAgICAgIC8vIHNob3cgYSBiaW5hcnkgb3IgcHVyZS1yZW5hbWUgY2hhbmdlIHRoZXJlIGFjY3VyYXRlbHkuIFN3aXRjaCB0bwotICAgICAgLy8gdGhlIHVuaWZpZWQgdmlldyBpbnN0ZWFkLgorICAgICAgLy8gc2hvdyBhIHB1cmUtcmVuYW1lIGNoYW5nZSB0aGVyZSBhY2N1cmF0ZWx5LiBTd2l0Y2ggdG8KKyAgICAgIC8vIHRoZSB1bmlmaWVkIHZpZXcgaW5zdGVhZC4gVXNlciBjYW4gc2V0IGZpbGUgY29tbWVudHMgb24gYmluYXJ5IGZpbGUKKyAgICAgIC8vIGluIFNpZGVCeVNpZGUgdmlldy4KICAgICAgIC8vCiAgICAgICBjb250ZW50VGFibGUucmVtb3ZlRnJvbVBhcmVudCgpOwogICAgICAgY29udGVudFRhYmxlID0gbmV3IFVuaWZpZWREaWZmVGFibGUoKTsKQEAgLTUyMCwxNCArNDM1LDExIEBACiAgICAgICBzZXRUb2tlbihEaXNwYXRjaGVyLnRvUGF0Y2hVbmlmaWVkKGlkU2lkZUEsIHBhdGNoS2V5KSk7CiAgICAgfQogCi0gICAgaGVhZGVyLmRpc3BsYXkocGF0Y2hTZXREZXRhaWwsIHNjcmlwdCwgcGF0Y2hLZXksIGlkU2lkZUEsIGlkU2lkZUIpOworICAgIGNvbnRlbnRUYWJsZS5kaXNwbGF5KHBhdGNoS2V5LCBpZFNpZGVBLCBpZFNpZGVCLCBzY3JpcHQsIHBhdGNoU2V0RGV0YWlsKTsKKyAgICBjb250ZW50VGFibGUuZGlzcGxheShzY3JpcHQuZ2V0Q29tbWVudERldGFpbCgpLCBzY3JpcHQuaXNFeHBhbmRBbGxDb21tZW50cygpKTsKKyAgICBjb250ZW50VGFibGUuZmluaXNoRGlzcGxheSgpOworICAgIGNvbnRlbnRUYWJsZS5zZXRSZWdpc3RlcktleXMoaXNDdXJyZW50VmlldygpKTsKIAotICAgIGlmIChoYXNEaWZmZXJlbmNlcykgewotICAgICAgY29udGVudFRhYmxlLmRpc3BsYXkocGF0Y2hLZXksIGlkU2lkZUEsIGlkU2lkZUIsIHNjcmlwdCk7Ci0gICAgICBjb250ZW50VGFibGUuZGlzcGxheShzY3JpcHQuZ2V0Q29tbWVudERldGFpbCgpLCBzY3JpcHQuaXNFeHBhbmRBbGxDb21tZW50cygpKTsKLSAgICAgIGNvbnRlbnRUYWJsZS5maW5pc2hEaXNwbGF5KCk7Ci0gICAgfQotICAgIHNob3dQYXRjaChoYXNEaWZmZXJlbmNlcyk7CiAgICAgc2V0dGluZ3NQYW5lbC5zZXRFbmFibGVTbWFsbEZpbGVGZWF0dXJlcyghc2NyaXB0LmlzSHVnZUZpbGUoKSk7CiAgICAgc2V0dGluZ3NQYW5lbC5zZXRFbmFibGVJbnRyYWxpbmVEaWZmZXJlbmNlKHNjcmlwdC5oYXNJbnRyYWxpbmVEaWZmZXJlbmNlKCkpOwogICAgIHNldHRpbmdzUGFuZWwuc2V0RW5hYmxlZCh0cnVlKTsKQEAgLTU0Miw3ICs0NTQsNyBAQAogICAgICAgYm9vbGVhbiBpc1Jldmlld2VkID0gZmFsc2U7CiAgICAgICBpZiAoaXNGaXJzdCAmJiAhcHJlZnMuZ2V0KCkuaXNNYW51YWxSZXZpZXcoKSkgewogICAgICAgICBpc1Jldmlld2VkID0gdHJ1ZTsKLSAgICAgICAgc2V0UmV2aWV3ZWRCeUN1cnJlbnRVc2VyKGlzUmV2aWV3ZWQpOworICAgICAgICByZXZpZXdlZFBhbmVscy5zZXRSZXZpZXdlZEJ5Q3VycmVudFVzZXIoaXNSZXZpZXdlZCk7CiAgICAgICB9IGVsc2UgewogICAgICAgICBmb3IgKFBhdGNoIHAgOiBwYXRjaFNldERldGFpbC5nZXRQYXRjaGVzKCkpIHsKICAgICAgICAgICBpZiAocC5nZXRLZXkoKS5lcXVhbHMocGF0Y2hLZXkpKSB7CkBAIC01NTEsMzAgKzQ2MywzNyBAQAogICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgfQotICAgICAgcmV2aWV3ZWRDaGVja0JveC5zZXRWYWx1ZShpc1Jldmlld2VkKTsKKyAgICAgIHJldmlld2VkUGFuZWxzLnNldFZhbHVlKGlzUmV2aWV3ZWQpOwogICAgIH0KIAogICAgIGludHJhbGluZUZhaWx1cmUgPSBpc0ZpcnN0ICYmIHNjcmlwdC5oYXNJbnRyYWxpbmVGYWlsdXJlKCk7CisgICAgaW50cmFsaW5lVGltZW91dCA9IGlzRmlyc3QgJiYgc2NyaXB0Lmhhc0ludHJhbGluZVRpbWVvdXQoKTsKICAgfQogCiAgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBvblNob3dWaWV3KCkgewogICAgIHN1cGVyLm9uU2hvd1ZpZXcoKTsKKyAgICBpZiAocHJlZnNIYW5kbGVyID09IG51bGwpIHsKKyAgICAgIHByZWZzSGFuZGxlciA9IHByZWZzLmFkZFZhbHVlQ2hhbmdlSGFuZGxlcigKKyAgICAgICAgICBuZXcgVmFsdWVDaGFuZ2VIYW5kbGVyPEFjY291bnREaWZmUHJlZmVyZW5jZT4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uVmFsdWVDaGFuZ2UoVmFsdWVDaGFuZ2VFdmVudDxBY2NvdW50RGlmZlByZWZlcmVuY2U+IGV2ZW50KSB7CisgICAgICAgICAgICAgIHVwZGF0ZShldmVudC5nZXRWYWx1ZSgpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKKyAgICB9CiAgICAgaWYgKGludHJhbGluZUZhaWx1cmUpIHsKICAgICAgIGludHJhbGluZUZhaWx1cmUgPSBmYWxzZTsKICAgICAgIG5ldyBFcnJvckRpYWxvZyhQYXRjaFV0aWwuQy5pbnRyYWxpbmVGYWlsdXJlKCkpLnNob3coKTsKKyAgICB9IGVsc2UgaWYgKGludHJhbGluZVRpbWVvdXQpIHsKKyAgICAgIGludHJhbGluZVRpbWVvdXQgPSBmYWxzZTsKKyAgICAgIG5ldyBFcnJvckRpYWxvZyhQYXRjaFV0aWwuQy5pbnRyYWxpbmVUaW1lb3V0KCkpLnNob3coKTsKICAgICB9CiAgICAgaWYgKHRvcFZpZXcgIT0gbnVsbCAmJiBwcmVmcy5nZXQoKS5pc1JldGFpbkhlYWRlcigpKSB7CiAgICAgICBzZXRUb3BWaWV3KHRvcFZpZXcpOwogICAgIH0KICAgfQogCi0gIHByaXZhdGUgdm9pZCBzaG93UGF0Y2goZmluYWwgYm9vbGVhbiBzaG93UGF0Y2gpIHsKLSAgICBub0RpZmZlcmVuY2Uuc2V0VmlzaWJsZSghc2hvd1BhdGNoKTsKLSAgICBjb250ZW50VGFibGUuc2V0VmlzaWJsZShzaG93UGF0Y2gpOwotICAgIGNvbnRlbnRUYWJsZS5zZXRSZWdpc3RlcktleXMoaXNDdXJyZW50VmlldygpICYmIHNob3dQYXRjaCk7Ci0gIH0KLQogICBwdWJsaWMgdm9pZCBzZXRUb3BWaWV3KFRvcFZpZXcgdHYpIHsKICAgICB0b3BWaWV3ID0gdHY7CiAgICAgdG9wUGFuZWwuY2xlYXIoKTsKQEAgLTU4Nyw2ICs1MDYsOCBAQAogICAgICAgICBicmVhazsKICAgICAgIGNhc2UgRklMRVM6ICAgICAgIHRvcFBhbmVsLmFkZChmaWxlTGlzdCk7CiAgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBNQUlOOgorICAgICAgICBicmVhazsKICAgICB9CiAgIH0KIApAQCAtNjIxLDkgKzU0Miw5IEBACiAKICAgICBAT3ZlcnJpZGUKICAgICBwdWJsaWMgdm9pZCBvbktleVByZXNzKGZpbmFsIEtleVByZXNzRXZlbnQgZXZlbnQpIHsKLSAgICAgIGZpbmFsIGJvb2xlYW4gaXNSZXZpZXdlZCA9ICFyZXZpZXdlZENoZWNrQm94LmdldFZhbHVlKCk7Ci0gICAgICByZXZpZXdlZENoZWNrQm94LnNldFZhbHVlKGlzUmV2aWV3ZWQpOwotICAgICAgc2V0UmV2aWV3ZWRCeUN1cnJlbnRVc2VyKGlzUmV2aWV3ZWQpOworICAgICAgZmluYWwgYm9vbGVhbiBpc1Jldmlld2VkID0gIXJldmlld2VkUGFuZWxzLmdldFZhbHVlKCk7CisgICAgICByZXZpZXdlZFBhbmVscy5zZXRWYWx1ZShpc1Jldmlld2VkKTsKKyAgICAgIHJldmlld2VkUGFuZWxzLnNldFJldmlld2VkQnlDdXJyZW50VXNlcihpc1Jldmlld2VkKTsKICAgICB9CiAgIH0KIApAQCAtNjM0LDEwICs1NTUsNyBAQAogCiAgICAgQE92ZXJyaWRlCiAgICAgcHVibGljIHZvaWQgb25LZXlQcmVzcyhmaW5hbCBLZXlQcmVzc0V2ZW50IGV2ZW50KSB7Ci0gICAgICBpZiAocmV2aWV3ZWRMaW5rICE9IG51bGwpIHsKLSAgICAgICAgc2V0UmV2aWV3ZWRCeUN1cnJlbnRVc2VyKHRydWUpOwotICAgICAgICByZXZpZXdlZExpbmsuZ28oKTsKLSAgICAgIH0KKyAgICAgIHJldmlld2VkUGFuZWxzLmdvKCk7CiAgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaFNjcmlwdFNldHRpbmdzUGFuZWwuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoU2NyaXB0U2V0dGluZ3NQYW5lbC5qYXZhCmluZGV4IGE2ODkyNTkuLjhlNzZlNDcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoU2NyaXB0U2V0dGluZ3NQYW5lbC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoU2NyaXB0U2V0dGluZ3NQYW5lbC5qYXZhCkBAIC0yNywxMCArMjcsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5Q29kZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5UHJlc3NIYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmxvZ2ljYWwuc2hhcmVkLkhhc1ZhbHVlQ2hhbmdlSGFuZGxlcnM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQubG9naWNhbC5zaGFyZWQuVmFsdWVDaGFuZ2VFdmVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5sb2dpY2FsLnNoYXJlZC5WYWx1ZUNoYW5nZUhhbmRsZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuc2hhcmVkLkhhbmRsZXJSZWdpc3RyYXRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudWliaW5kZXIuY2xpZW50LlVpQmluZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVpYmluZGVyLmNsaWVudC5VaUZpZWxkOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVpYmluZGVyLmNsaWVudC5VaUhhbmRsZXI7CkBAIC00MywxNCArMzksMTMgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwogCi1wdWJsaWMgY2xhc3MgUGF0Y2hTY3JpcHRTZXR0aW5nc1BhbmVsIGV4dGVuZHMgQ29tcG9zaXRlIGltcGxlbWVudHMKLSAgICBIYXNWYWx1ZUNoYW5nZUhhbmRsZXJzPEFjY291bnREaWZmUHJlZmVyZW5jZT4geworcHVibGljIGNsYXNzIFBhdGNoU2NyaXB0U2V0dGluZ3NQYW5lbCBleHRlbmRzIENvbXBvc2l0ZSB7CiAgIHByaXZhdGUgc3RhdGljIE15VWlCaW5kZXIgdWlCaW5kZXIgPSBHV1QuY3JlYXRlKE15VWlCaW5kZXIuY2xhc3MpOwogCiAgIGludGVyZmFjZSBNeVVpQmluZGVyIGV4dGVuZHMgVWlCaW5kZXI8V2lkZ2V0LCBQYXRjaFNjcmlwdFNldHRpbmdzUGFuZWw+IHsKICAgfQogCi0gIHByaXZhdGUgTGlzdGVuYWJsZUFjY291bnREaWZmUHJlZmVyZW5jZSBsaXN0ZW5hYmxlUHJlZnM7CisgIHByaXZhdGUgZmluYWwgTGlzdGVuYWJsZUFjY291bnREaWZmUHJlZmVyZW5jZSBsaXN0ZW5hYmxlUHJlZnM7CiAgIHByaXZhdGUgYm9vbGVhbiBlbmFibGVJbnRyYWxpbmVEaWZmZXJlbmNlID0gdHJ1ZTsKICAgcHJpdmF0ZSBib29sZWFuIGVuYWJsZVNtYWxsRmlsZUZlYXR1cmVzID0gdHJ1ZTsKIApAQCAtMTM5LDEyICsxMzQsNiBAQAogICAgIGRpc3BsYXkoKTsKICAgfQogCi0gIEBPdmVycmlkZQotICBwdWJsaWMgSGFuZGxlclJlZ2lzdHJhdGlvbiBhZGRWYWx1ZUNoYW5nZUhhbmRsZXIoCi0gICAgICBWYWx1ZUNoYW5nZUhhbmRsZXI8QWNjb3VudERpZmZQcmVmZXJlbmNlPiBoYW5kbGVyKSB7Ci0gICAgcmV0dXJuIHN1cGVyLmFkZEhhbmRsZXIoaGFuZGxlciwgVmFsdWVDaGFuZ2VFdmVudC5nZXRUeXBlKCkpOwotICB9Ci0KICAgcHVibGljIHZvaWQgc2V0RW5hYmxlZChmaW5hbCBib29sZWFuIG9uKSB7CiAgICAgaWYgKG9uKSB7CiAgICAgICBzZXRFbmFibGVkQ291bnRlcisrOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hTZXRTZWxlY3RCb3guamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoU2V0U2VsZWN0Qm94LmphdmEKaW5kZXggYWZhZjdmZC4uZGYxMmI3MCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hTZXRTZWxlY3RCb3guamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaFNldFNlbGVjdEJveC5qYXZhCkBAIC0yMSwxOCArMjEsMjAgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5kb20uY2xpZW50LkRpdkVsZW1lbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZG9tLmNsaWVudC5TdHlsZS5EaXNwbGF5OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkRvdWJsZUNsaWNrRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5Eb3VibGVDbGlja0hhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QucmVzb3VyY2VzLmNsaWVudC5Dc3NSZXNvdXJjZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51aWJpbmRlci5jbGllbnQuVWlCaW5kZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudWliaW5kZXIuY2xpZW50LlVpRmllbGQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRE9NOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LkV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Db21wb3NpdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSFRNTFBhbmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkltYWdlOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkxhYmVsOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5LZXlVdGlsOwogCiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CkBAIC00OSw3ICs1MSw5IEBACiAKICAgICBTdHJpbmcgaGlkZGVuKCk7CiAKLSAgICBTdHJpbmcgZG93bmxvYWRMaW5rKCk7CisgICAgU3RyaW5nIHNpZGVNYXJrZXIoKTsKKworICAgIFN0cmluZyBwYXRjaFNldExhYmVsKCk7CiAgIH0KIAogICBwdWJsaWMgZW51bSBTaWRlIHsKQEAgLTY0LDYgKzY4LDcgQEAKICAgU2lkZSBzaWRlOwogICBQYXRjaFNjcmVlbi5UeXBlIHNjcmVlblR5cGU7CiAgIE1hcDxJbnRlZ2VyLCBBbmNob3I+IGxpbmtzOworICBwcml2YXRlIExhYmVsIHBhdGNoU2V0OwogCiAgIEBVaUZpZWxkCiAgIEhUTUxQYW5lbCBsaW5rUGFuZWw7CkBAIC03MSw5ICs3Niw2IEBACiAgIEBVaUZpZWxkCiAgIEJveFN0eWxlIHN0eWxlOwogCi0gIEBVaUZpZWxkCi0gIERpdkVsZW1lbnQgc2lkZU1hcmtlcjsKLQogICBwdWJsaWMgUGF0Y2hTZXRTZWxlY3RCb3goU2lkZSBzaWRlLCBmaW5hbCBQYXRjaFNjcmVlbi5UeXBlIHR5cGUpIHsKICAgICB0aGlzLnNpZGUgPSBzaWRlOwogICAgIHRoaXMuc2NyZWVuVHlwZSA9IHR5cGU7CkBAIC04MSw4ICs4Myw4IEBACiAgICAgaW5pdFdpZGdldCh1aUJpbmRlci5jcmVhdGVBbmRCaW5kVWkodGhpcykpOwogICB9CiAKLSAgcHVibGljIHZvaWQgZGlzcGxheShmaW5hbCBQYXRjaFNldERldGFpbCBkZXRhaWwsIGZpbmFsIFBhdGNoU2NyaXB0IHNjcmlwdCwgUGF0Y2guS2V5IGtleSwKLSAgICAgIFBhdGNoU2V0LklkIGlkU2lkZUEsIFBhdGNoU2V0LklkIGlkU2lkZUIpIHsKKyAgcHVibGljIHZvaWQgZGlzcGxheShmaW5hbCBQYXRjaFNldERldGFpbCBkZXRhaWwsIGZpbmFsIFBhdGNoU2NyaXB0IHNjcmlwdCwKKyAgICAgIFBhdGNoLktleSBrZXksIFBhdGNoU2V0LklkIGlkU2lkZUEsIFBhdGNoU2V0LklkIGlkU2lkZUIpIHsKICAgICB0aGlzLnNjcmlwdCA9IHNjcmlwdDsKICAgICB0aGlzLnBhdGNoS2V5ID0ga2V5OwogICAgIHRoaXMuaWRTaWRlQSA9IGlkU2lkZUE7CkBAIC05MiwxMCArOTQsMTggQEAKIAogICAgIGxpbmtQYW5lbC5jbGVhcigpOwogCisgICAgaWYgKGlzRmlsZU9yQ29tbWl0TWVzc2FnZSgpKSB7CisgICAgICBsaW5rUGFuZWwuc2V0VGl0bGUoUGF0Y2hVdGlsLkMuYWRkRmlsZUNvbW1lbnRCeURvdWJsZUNsaWNrKCkpOworICAgIH0KKworICAgIHBhdGNoU2V0ID0gbmV3IExhYmVsKFBhdGNoVXRpbC5DLnBhdGNoU2V0KCkpOworICAgIHBhdGNoU2V0LmFkZFN0eWxlTmFtZShzdHlsZS5wYXRjaFNldExhYmVsKCkpOworICAgIGxpbmtQYW5lbC5hZGQocGF0Y2hTZXQpOworCiAgICAgaWYgKHNjcmVlblR5cGUgPT0gUGF0Y2hTY3JlZW4uVHlwZS5VTklGSUVEKSB7Ci0gICAgICBzaWRlTWFya2VyLnNldElubmVyVGV4dCgoc2lkZSA9PSBTaWRlLkEpID8gIigtKSIgOiAiKCspIik7Ci0gICAgfSBlbHNlIHsKLSAgICAgIHNpZGVNYXJrZXIuZ2V0U3R5bGUoKS5zZXREaXNwbGF5KERpc3BsYXkuTk9ORSk7CisgICAgICBMYWJlbCBzaWRlTWFya2VyID0gbmV3IExhYmVsKChzaWRlID09IFNpZGUuQSkgPyAiKC0pIiA6ICIoKykiKTsKKyAgICAgIHNpZGVNYXJrZXIuYWRkU3R5bGVOYW1lKHN0eWxlLnNpZGVNYXJrZXIoKSk7CisgICAgICBsaW5rUGFuZWwuYWRkKHNpZGVNYXJrZXIpOwogICAgIH0KIAogICAgIEFuY2hvciBiYXNlTGluayA9IG51bGw7CkBAIC0xMzMsNiArMTQzLDEyIEBACiAgICAgfQogICB9CiAKKyAgcHVibGljIHZvaWQgYWRkRG91YmxlQ2xpY2tIYW5kbGVyKERvdWJsZUNsaWNrSGFuZGxlciBoYW5kbGVyKSB7CisgICAgbGlua1BhbmVsLnNpbmtFdmVudHMoRXZlbnQuT05EQkxDTElDSyk7CisgICAgbGlua1BhbmVsLmFkZEhhbmRsZXIoaGFuZGxlciwgRG91YmxlQ2xpY2tFdmVudC5nZXRUeXBlKCkpOworICAgIHBhdGNoU2V0LmFkZERvdWJsZUNsaWNrSGFuZGxlcihoYW5kbGVyKTsKKyAgfQorCiAgIHByaXZhdGUgQW5jaG9yIGNyZWF0ZUxpbmsoU3RyaW5nIGxhYmVsLCBmaW5hbCBQYXRjaFNldC5JZCBpZCkgewogICAgIGZpbmFsIEFuY2hvciBhbmNob3IgPSBuZXcgQW5jaG9yKGxhYmVsKTsKICAgICBhbmNob3IuYWRkQ2xpY2tIYW5kbGVyKG5ldyBDbGlja0hhbmRsZXIoKSB7CkBAIC0xNjEsMTggKzE3NywyMyBAQAogICAgIHJldHVybiBhbmNob3I7CiAgIH0KIAorICBwdWJsaWMgYm9vbGVhbiBpc0ZpbGVPckNvbW1pdE1lc3NhZ2UoKSB7CisgICAgcmV0dXJuICEoKHNpZGUgPT0gU2lkZS5BICYmIDAgPj0gc2NyaXB0LmdldEEoKS5zaXplKCkpIHx8IC8vCisgICAgKHNpZGUgPT0gU2lkZS5CICYmIDAgPj0gc2NyaXB0LmdldEIoKS5zaXplKCkpKTsKKyAgfQorCiAgIHByaXZhdGUgQW5jaG9yIGNyZWF0ZURvd25sb2FkTGluaygpIHsKICAgICBib29sZWFuIGlzQ29tbWl0TWVzc2FnZSA9IFBhdGNoLkNPTU1JVF9NU0cuZXF1YWxzKHNjcmlwdC5nZXROZXdOYW1lKCkpOwotCi0gICAgaWYgKGlzQ29tbWl0TWVzc2FnZSB8fCAoc2lkZSA9PSBTaWRlLkEgJiYgMCA+PSBzY3JpcHQuZ2V0QSgpLnNpemUoKSkKLSAgICAgICAgfHwgKHNpZGUgPT0gU2lkZS5CICYmIDAgPj0gc2NyaXB0LmdldEIoKS5zaXplKCkpKSB7CisgICAgaWYgKGlzQ29tbWl0TWVzc2FnZSB8fCAvLworICAgICAgICAoc2lkZSA9PSBTaWRlLkEgJiYgMCA+PSBzY3JpcHQuZ2V0QSgpLnNpemUoKSkgfHwgLy8KKyAgICAgICAgKHNpZGUgPT0gU2lkZS5CICYmIDAgPj0gc2NyaXB0LmdldEIoKS5zaXplKCkpKSB7CiAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CiAKLSAgICBQYXRjaC5LZXkga2V5ID0KLSAgICAgICAgKGlkU2lkZUEgPT0gbnVsbCkgPyBwYXRjaEtleSA6IChuZXcgUGF0Y2guS2V5KGlkU2lkZUEsIHBhdGNoS2V5LmdldCgpKSk7CisgICAgUGF0Y2guS2V5IGtleSA9IChpZEFjdGl2ZSA9PSBudWxsKSA/IC8vCisgICAgICAgIHBhdGNoS2V5IDogKG5ldyBQYXRjaC5LZXkoaWRBY3RpdmUsIHBhdGNoS2V5LmdldCgpKSk7CiAKLSAgICBTdHJpbmcgc2lkZVVSTCA9IChzaWRlID09IFNpZGUuQSkgPyAiMSIgOiAiMCI7CisgICAgU3RyaW5nIHNpZGVVUkwgPSAoaWRBY3RpdmUgPT0gbnVsbCkgPyAiMSIgOiAiMCI7CiAgICAgZmluYWwgU3RyaW5nIGJhc2UgPSBHV1QuZ2V0SG9zdFBhZ2VCYXNlVVJMKCkgKyAiY2F0LyI7CiAKICAgICBJbWFnZSBpbWFnZSA9IG5ldyBJbWFnZShHZXJyaXQuUkVTT1VSQ0VTLmRvd25sb2FkSWNvbigpKTsKQEAgLTE4MCw3ICsyMDEsNiBAQAogICAgIGZpbmFsIEFuY2hvciBhbmNob3IgPSBuZXcgQW5jaG9yKCk7CiAgICAgYW5jaG9yLnNldEhyZWYoYmFzZSArIEtleVV0aWwuZW5jb2RlKGtleS50b1N0cmluZygpKSArICJeIiArIHNpZGVVUkwpOwogICAgIGFuY2hvci5zZXRUaXRsZShQYXRjaFV0aWwuQy5kb3dubG9hZCgpKTsKLSAgICBhbmNob3Iuc2V0U3R5bGVOYW1lKHN0eWxlLmRvd25sb2FkTGluaygpKTsKICAgICBET00uaW5zZXJ0QmVmb3JlKGFuY2hvci5nZXRFbGVtZW50KCksIGltYWdlLmdldEVsZW1lbnQoKSwKICAgICAgICAgRE9NLmdldEZpcnN0Q2hpbGQoYW5jaG9yLmdldEVsZW1lbnQoKSkpOwogCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaFNldFNlbGVjdEJveC51aS54bWwgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaFNldFNlbGVjdEJveC51aS54bWwKaW5kZXggMmZkMTgzYy4uMzM4ZTk1MCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hTZXRTZWxlY3RCb3gudWkueG1sCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoU2V0U2VsZWN0Qm94LnVpLnhtbApAQCAtMTcsNjAgKzE3LDM3IEBACiAKIDx1aTpVaUJpbmRlciB4bWxuczp1aT0ndXJuOnVpOmNvbS5nb29nbGUuZ3d0LnVpYmluZGVyJwogICAgIHhtbG5zOmc9J3VybjppbXBvcnQ6Y29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWknPgotCi0KICAgPHVpOndpdGggZmllbGQ9J3JlcycgdHlwZT0nY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdFJlc291cmNlcycvPgotICA8dWk6d2l0aCBmaWVsZD0nY29ucycgdHlwZT0nY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBhdGNoZXMuUGF0Y2hDb25zdGFudHMnLz4KICAgPHVpOnN0eWxlIHR5cGU9J2NvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wYXRjaGVzLlBhdGNoU2V0U2VsZWN0Qm94LkJveFN0eWxlJz4KICAgICBAZXZhbCBzZWxlY3Rpb25Db2xvciBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0LmdldFRoZW1lKCkuc2VsZWN0aW9uQ29sb3I7Ci0gICAgQGV2YWwgdHJpbUNvbG9yIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQuZ2V0VGhlbWUoKS50cmltQ29sb3I7CiAgICAgQGV2YWwgYmFja2dyb3VuZENvbG9yIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQuZ2V0VGhlbWUoKS5iYWNrZ3JvdW5kQ29sb3I7CiAKLSAgICAud3JhcHBlciB7Ci0gICAgICB3aWR0aDogMTAwJTsKLSAgICAgIHRleHQtYWxpZ246IGNlbnRlcjsKLSAgICAgIGZvbnQtc2l6ZTogMDsgLyogaW5saW5lLWJsb2NrIHNwYWNpbmcgZml4ICovCi0gICAgfQotCiAgICAgLmxpbmtQYW5lbCB7Ci0gICAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgICAgICBmb250LXNpemU6IDEycHg7CisgICAgICB3aGl0ZS1zcGFjZTogbm9ybWFsOwogICAgIH0KIAogICAgIC5saW5rUGFuZWwgPiBkaXYgeworICAgICAgcGFkZGluZy1sZWZ0OiAzcHg7CisgICAgICBwYWRkaW5nLXJpZ2h0OiAzcHg7CisgICAgICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOwogICAgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwotICAgICAgZmxvYXQ6IGxlZnQ7Ci0gICAgfQotCi0gICAgLmxpbmtQYW5lbCB7Ci0gICAgICBvdmVyZmxvdzogaGlkZGVuOyAvKiBkaXYgY2xlYXIgZml4ICovCi0gICAgICBmb250LXNpemU6IDEycHg7Ci0gICAgfQotCi0gICAgLmxpbmtQYW5lbCA+IGEgewotICAgICAgcGFkZGluZzogM3B4OwotICAgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwotICAgICAgdGV4dC1kZWNvcmF0aW9uOiBub25lOwotICAgICAgZmxvYXQ6IGxlZnQ7CiAgICAgfQogCiAgICAgLnBhdGNoU2V0TGFiZWwgewogICAgICAgZm9udC13ZWlnaHQ6IGJvbGQ7Ci0gICAgICBmbG9hdDogbGVmdDsKLSAgICAgIHBhZGRpbmc6IDNweDsKICAgICB9CiAKICAgICAuc2lkZU1hcmtlciB7Ci0gICAgICBwYWRkaW5nOiAzcHg7CisgICAgICBmb250LWZhbWlseTogbW9ub3NwYWNlOwogICAgIH0KIAotICAgIC5kb3dubG9hZExpbmsgewotICAgICAgZmxvYXQ6IGxlZnQ7Ci0gICAgICBwYWRkaW5nOiAxcHggIWltcG9ydGFudDsKLSAgICAgIG1hcmdpbi1sZWZ0OiAzcHg7Ci0gICAgfQotCi0gICAgLmRvd25sb2FkTGluayA+IGEgewotICAgICAgdGV4dC1zaXplOiAwOworICAgIC5saW5rUGFuZWwgPiBhIHsKKyAgICAgIHBhZGRpbmctbGVmdDogM3B4OworICAgICAgcGFkZGluZy1yaWdodDogM3B4OworICAgICAgdGV4dC1kZWNvcmF0aW9uOiBub25lOworICAgICAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKKyAgICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKICAgICB9CiAKICAgICAuc2VsZWN0ZWQgewpAQCAtNzgsMjEgKzU1LDEzIEBACiAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBzZWxlY3Rpb25Db2xvcjsKICAgICB9CiAKLSAgICAuc2lkZU1hcmtlciB7Ci0gICAgICBmb250LWZhbWlseTogbW9ub3NwYWNlOwotICAgICAgZmxvYXQ6IGxlZnQ7Ci0gICAgfQotCiAgICAgLmhpZGRlbiB7CiAgICAgICB2aXNpYmlsaXR5OiBoaWRkZW47CiAgICAgfQogICA8L3VpOnN0eWxlPgogCi0gIDxnOkhUTUxQYW5lbCBzdHlsZU5hbWU9J3dyYXBwZXInPgotICAgIDxnOkhUTUxQYW5lbCBzdHlsZU5hbWU9J3tzdHlsZS5saW5rUGFuZWx9JyB1aTpmaWVsZD0nbGlua1BhbmVsJz4KLSAgICAgIDxkaXYgY2xhc3M9J3tzdHlsZS5wYXRjaFNldExhYmVsfSc+PHVpOnRleHQgZnJvbT0ie2NvbnMucGF0Y2hTZXR9IiAvPjwvZGl2PgotICAgICAgPGRpdiBjbGFzcz0ne3N0eWxlLnNpZGVNYXJrZXJ9JyB1aTpmaWVsZD0nc2lkZU1hcmtlcic+PC9kaXY+Ci0gICAgPC9nOkhUTUxQYW5lbD4KKyAgPGc6SFRNTFBhbmVsPgorICAgIDxnOkhUTUxQYW5lbCBzdHlsZU5hbWU9J3tzdHlsZS5saW5rUGFuZWx9JyB1aTpmaWVsZD0nbGlua1BhbmVsJy8+CiAgIDwvZzpIVE1MUGFuZWw+CiA8L3VpOlVpQmluZGVyPgogCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaFRhYmxlSGVhZGVyLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9QYXRjaFRhYmxlSGVhZGVyLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDNkZDg5MDguLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hUYWJsZUhlYWRlci5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNzEgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wYXRjaGVzOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGF0Y2hTY3JpcHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGF0Y2hTZXREZXRhaWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudWliaW5kZXIuY2xpZW50LlVpQmluZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVpYmluZGVyLmNsaWVudC5VaUZpZWxkOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVpYmluZGVyLmNsaWVudC5VaVRlbXBsYXRlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkNvbXBvc2l0ZTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5IVE1MUGFuZWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuU2ltcGxlUGFuZWw7Ci0KLXB1YmxpYyBjbGFzcyBQYXRjaFRhYmxlSGVhZGVyIGV4dGVuZHMgQ29tcG9zaXRlIHsKLQotICBAVWlUZW1wbGF0ZSgiUGF0Y2hUYWJsZUhlYWRlclNpZGVCeVNpZGUudWkueG1sIikKLSAgaW50ZXJmYWNlIFNpZGVCeVNpZGVCaW5kZXIgZXh0ZW5kcyBVaUJpbmRlcjxIVE1MUGFuZWwsIFBhdGNoVGFibGVIZWFkZXI+IHsKLSAgfQotCi0gIEBVaVRlbXBsYXRlKCJQYXRjaFRhYmxlSGVhZGVyVW5pZmllZC51aS54bWwiKQotICBpbnRlcmZhY2UgVW5pZmllZEJpbmRlciBleHRlbmRzIFVpQmluZGVyPEhUTUxQYW5lbCwgUGF0Y2hUYWJsZUhlYWRlcj4gewotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgU2lkZUJ5U2lkZUJpbmRlciB1aUJpbmRlclMgPSBHV1QuY3JlYXRlKFNpZGVCeVNpZGVCaW5kZXIuY2xhc3MpOwotICBwcml2YXRlIHN0YXRpYyBVbmlmaWVkQmluZGVyIHVpQmluZGVyVSA9IEdXVC5jcmVhdGUoVW5pZmllZEJpbmRlci5jbGFzcyk7Ci0KLSAgQFVpRmllbGQKLSAgU2ltcGxlUGFuZWwgc2lkZUFQYW5lbDsKLQotICBAVWlGaWVsZAotICBTaW1wbGVQYW5lbCBzaWRlQlBhbmVsOwotCi0gIFBhdGNoU2V0U2VsZWN0Qm94IGxpc3RBOwotICBQYXRjaFNldFNlbGVjdEJveCBsaXN0QjsKLQotICBwdWJsaWMgUGF0Y2hUYWJsZUhlYWRlcihQYXRjaFNjcmVlbi5UeXBlIHR5cGUpIHsKLSAgICBsaXN0QSA9IG5ldyBQYXRjaFNldFNlbGVjdEJveChQYXRjaFNldFNlbGVjdEJveC5TaWRlLkEsIHR5cGUpOwotICAgIGxpc3RCID0gbmV3IFBhdGNoU2V0U2VsZWN0Qm94KFBhdGNoU2V0U2VsZWN0Qm94LlNpZGUuQiwgdHlwZSk7Ci0KLSAgICBpZiAodHlwZSA9PSBQYXRjaFNjcmVlbi5UeXBlLlNJREVfQllfU0lERSkgewotICAgICAgaW5pdFdpZGdldCh1aUJpbmRlclMuY3JlYXRlQW5kQmluZFVpKHRoaXMpKTsKLSAgICB9IGVsc2UgewotICAgICAgaW5pdFdpZGdldCh1aUJpbmRlclUuY3JlYXRlQW5kQmluZFVpKHRoaXMpKTsKLSAgICB9Ci0KLSAgICBzaWRlQVBhbmVsLmFkZChsaXN0QSk7Ci0gICAgc2lkZUJQYW5lbC5hZGQobGlzdEIpOwotICB9Ci0KLQotICBwdWJsaWMgdm9pZCBkaXNwbGF5KGZpbmFsIFBhdGNoU2V0RGV0YWlsIGRldGFpbCwgUGF0Y2hTY3JpcHQgc2NyaXB0LCBmaW5hbCBQYXRjaC5LZXkgcGF0Y2hLZXksCi0gICAgICBmaW5hbCBQYXRjaFNldC5JZCBpZFNpZGVBLCBmaW5hbCBQYXRjaFNldC5JZCBpZFNpZGVCKSB7Ci0gICAgbGlzdEEuZGlzcGxheShkZXRhaWwsIHNjcmlwdCwgcGF0Y2hLZXksIGlkU2lkZUEsIGlkU2lkZUIpOwotICAgIGxpc3RCLmRpc3BsYXkoZGV0YWlsLCBzY3JpcHQsIHBhdGNoS2V5LCBpZFNpZGVBLCBpZFNpZGVCKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hUYWJsZUhlYWRlclNpZGVCeVNpZGUudWkueG1sIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hUYWJsZUhlYWRlclNpZGVCeVNpZGUudWkueG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBkNmZkNzE3Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoVGFibGVIZWFkZXJTaWRlQnlTaWRlLnVpLnhtbAorKysgL2Rldi9udWxsCkBAIC0xLDY1ICswLDAgQEAKLTw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Ci08IS0tCi1Db3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotCi1MaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLXlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLVlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotCi1odHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLQotVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLVdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0tLT4KLQotPHVpOlVpQmluZGVyIHhtbG5zOnVpPSd1cm46dWk6Y29tLmdvb2dsZS5nd3QudWliaW5kZXInCi0gICAgeG1sbnM6Zz0ndXJuOmltcG9ydDpjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aSc+Ci0KLQotICA8dWk6c3R5bGU+Ci0gICAgQGV2YWwgdHJpbUNvbG9yIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQuZ2V0VGhlbWUoKS50cmltQ29sb3I7Ci0KLSAgICAud3JhcHBlciB7Ci0gICAgICB3aWR0aDogMTAwJTsKLSAgICAgIGJhY2tncm91bmQtY29sb3I6IHRyaW1Db2xvcjsKLSAgICAgIG92ZXJmbG93OiBoaWRkZW47Ci0gICAgICBmb250LXNpemU6IDA7IC8qIGlubGluZS1ibG9jayBzcGFjaW5nIGZpeCAqLwotICAgIH0KLQotICAgIC53cmFwcGVyIC5ib3ggewotICAgICAgd2lkdGg6IDEwMCU7Ci0gICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7Ci0gICAgfQotCi0gICAgLmxlZnRXcmFwcGVyIHsKLSAgICAgIHdpZHRoOiA1MCU7Ci0gICAgICBmbG9hdDogbGVmdDsKLSAgICB9Ci0KLSAgICAucmlnaHRXcmFwcGVyIHsKLSAgICAgIHdpZHRoOiA1MCU7Ci0gICAgICBvdmVyZmxvdzogaGlkZGVuOwotICAgIH0KLQotICAgIC5sZWZ0Qm94IHsKLSAgICAgIGZsb2F0OmxlZnQ7Ci0gICAgfQotCi0gICAgLnJpZ2h0Qm94IHsKLSAgICAgIGZsb2F0OiByaWdodDsKLSAgICB9Ci0gIDwvdWk6c3R5bGU+Ci0KLSAgPGc6SFRNTFBhbmVsIHN0eWxlTmFtZT0ie3N0eWxlLndyYXBwZXJ9Ij4KLSAgICA8ZGl2IGNsYXNzPSd7c3R5bGUubGVmdFdyYXBwZXJ9Jz4KLSAgICAgIDxnOlNpbXBsZVBhbmVsIGFkZFN0eWxlTmFtZXM9J3tzdHlsZS5ib3h9IHtzdHlsZS5sZWZ0Qm94fScgdWk6ZmllbGQ9J3NpZGVBUGFuZWwnLz4KLSAgICA8L2Rpdj4KLSAgICA8ZGl2IGNsYXNzPSd7c3R5bGUucmlnaHRXcmFwcGVyfSc+Ci0gICAgICA8ZzpTaW1wbGVQYW5lbCBhZGRTdHlsZU5hbWVzPSd7c3R5bGUuYm94fSB7c3R5bGUucmlnaHRCb3h9JyB1aTpmaWVsZD0nc2lkZUJQYW5lbCcvPgotICAgIDwvZGl2PgotICA8L2c6SFRNTFBhbmVsPgotPC91aTpVaUJpbmRlcj4KLQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hUYWJsZUhlYWRlclVuaWZpZWQudWkueG1sIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvUGF0Y2hUYWJsZUhlYWRlclVuaWZpZWQudWkueG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAyNGFjZmEzLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1BhdGNoVGFibGVIZWFkZXJVbmlmaWVkLnVpLnhtbAorKysgL2Rldi9udWxsCkBAIC0xLDQyICswLDAgQEAKLTw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Ci08IS0tCi1Db3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotCi1MaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLXlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLVlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotCi1odHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLQotVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLVdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0tLT4KLQotPHVpOlVpQmluZGVyIHhtbG5zOnVpPSd1cm46dWk6Y29tLmdvb2dsZS5nd3QudWliaW5kZXInCi0gICAgeG1sbnM6Zz0ndXJuOmltcG9ydDpjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aSc+Ci0KLSAgPHVpOnN0eWxlPgotICAgIEBldmFsIHRyaW1Db2xvciBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0LmdldFRoZW1lKCkudHJpbUNvbG9yOwotCi0gICAgLndyYXBwZXIgewotICAgICAgd2lkdGg6IDEwMCU7Ci0gICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmltQ29sb3I7Ci0gICAgICBmb250LXNpemU6IDA7IC8qIGlubGluZS1ibG9jayBzcGFjaW5nIGZpeCAqLwotICAgIH0KLQotICAgIC53cmFwcGVyIC5ib3ggewotICAgICAgd2lkdGg6IDEwMCU7Ci0gICAgICB0ZXh0LWFsaWduOiBsZWZ0OwotICAgICAgbWFyZ2luLWxlZnQ6IDNweDsKLSAgICB9Ci0gIDwvdWk6c3R5bGU+Ci0KLSAgPGc6SFRNTFBhbmVsIHN0eWxlTmFtZT0ie3N0eWxlLndyYXBwZXJ9Ij4KLSAgICA8ZzpTaW1wbGVQYW5lbCBhZGRTdHlsZU5hbWVzPSd7c3R5bGUuYm94fScgdWk6ZmllbGQ9J3NpZGVBUGFuZWwnLz4KLSAgICA8ZzpTaW1wbGVQYW5lbCBhZGRTdHlsZU5hbWVzPSd7c3R5bGUuYm94fScgdWk6ZmllbGQ9J3NpZGVCUGFuZWwnLz4KLSAgPC9nOkhUTUxQYW5lbD4KLTwvdWk6VWlCaW5kZXI+Ci0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1Jldmlld2VkUGFuZWxzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9SZXZpZXdlZFBhbmVscy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY4ZGY0NWQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9SZXZpZXdlZFBhbmVscy5qYXZhCkBAIC0wLDAgKzEsMTc4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnBhdGNoZXM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5Wb2lkUmVzdWx0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5jaGFuZ2VzLlBhdGNoVGFibGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmNoYW5nZXMuUGF0Y2hUYWJsZS5QYXRjaFZhbGlkYXRvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuY2hhbmdlcy5VdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuUmVzdEFwaTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuQ2hhbmdlTGluazsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWkuSW5saW5lSHlwZXJsaW5rOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmxvZ2ljYWwuc2hhcmVkLlZhbHVlQ2hhbmdlRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQubG9naWNhbC5zaGFyZWQuVmFsdWVDaGFuZ2VIYW5kbGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5DaGVja0JveDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuU2FmZUh0bWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuU2FmZUh0bWxCdWlsZGVyOworCitwdWJsaWMgY2xhc3MgUmV2aWV3ZWRQYW5lbHMgeworCisgIHB1YmxpYyBmaW5hbCBGbG93UGFuZWwgdG9wOworICBwdWJsaWMgZmluYWwgRmxvd1BhbmVsIGJvdHRvbTsKKworICBwcml2YXRlIFBhdGNoLktleSBwYXRjaEtleTsKKyAgcHJpdmF0ZSBQYXRjaFRhYmxlIGZpbGVMaXN0OworICBwcml2YXRlIElubGluZUh5cGVybGluayByZXZpZXdlZExpbms7CisgIHByaXZhdGUgQ2hlY2tCb3ggY2hlY2tCb3hUb3A7CisgIHByaXZhdGUgQ2hlY2tCb3ggY2hlY2tCb3hCb3R0b207CisKKyAgcHVibGljIFJldmlld2VkUGFuZWxzKCkgeworICAgIHRoaXMudG9wID0gbmV3IEZsb3dQYW5lbCgpOworICAgIHRoaXMuYm90dG9tID0gbmV3IEZsb3dQYW5lbCgpOworICAgIHRoaXMuYm90dG9tLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnJldmlld2VkUGFuZWxCb3R0b20oKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCBwb3B1bGF0ZShQYXRjaC5LZXkgcGssIFBhdGNoVGFibGUgcHQsIGludCBwYXRjaEluZGV4LAorICAgICAgUGF0Y2hTY3JlZW4uVHlwZSBwYXRjaFNjcmVlblR5cGUpIHsKKyAgICBwYXRjaEtleSA9IHBrOworICAgIGZpbGVMaXN0ID0gcHQ7CisgICAgcmV2aWV3ZWRMaW5rID0gY3JlYXRlUmV2aWV3ZWRMaW5rKHBhdGNoSW5kZXgsIHBhdGNoU2NyZWVuVHlwZSk7CisKKyAgICB0b3AuY2xlYXIoKTsKKyAgICBjaGVja0JveFRvcCA9IGNyZWF0ZVJldmlld2VkQ2hlY2tib3goKTsKKyAgICB0b3AuYWRkKGNoZWNrQm94VG9wKTsKKyAgICB0b3AuYWRkKGNyZWF0ZVJldmlld2VkQW5jaG9yKCkpOworCisgICAgYm90dG9tLmNsZWFyKCk7CisgICAgY2hlY2tCb3hCb3R0b20gPSBjcmVhdGVSZXZpZXdlZENoZWNrYm94KCk7CisgICAgYm90dG9tLmFkZChjaGVja0JveEJvdHRvbSk7CisgICAgYm90dG9tLmFkZChjcmVhdGVSZXZpZXdlZEFuY2hvcigpKTsKKyAgfQorCisgIHByaXZhdGUgQ2hlY2tCb3ggY3JlYXRlUmV2aWV3ZWRDaGVja2JveCgpIHsKKyAgICBmaW5hbCBDaGVja0JveCBjaGVja0JveCA9IG5ldyBDaGVja0JveChQYXRjaFV0aWwuQy5yZXZpZXdlZEFuZCgpICsgIiAiKTsKKyAgICBjaGVja0JveC5hZGRWYWx1ZUNoYW5nZUhhbmRsZXIobmV3IFZhbHVlQ2hhbmdlSGFuZGxlcjxCb29sZWFuPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgb25WYWx1ZUNoYW5nZShWYWx1ZUNoYW5nZUV2ZW50PEJvb2xlYW4+IGV2ZW50KSB7CisgICAgICAgIGZpbmFsIGJvb2xlYW4gdmFsdWUgPSBldmVudC5nZXRWYWx1ZSgpOworICAgICAgICBzZXRSZXZpZXdlZEJ5Q3VycmVudFVzZXIodmFsdWUpOworICAgICAgICBpZiAoY2hlY2tCb3hUb3AuZ2V0VmFsdWUoKSAhPSB2YWx1ZSkgeworICAgICAgICAgIGNoZWNrQm94VG9wLnNldFZhbHVlKHZhbHVlKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoY2hlY2tCb3hCb3R0b20uZ2V0VmFsdWUoKSAhPSB2YWx1ZSkgeworICAgICAgICAgIGNoZWNrQm94Qm90dG9tLnNldFZhbHVlKHZhbHVlKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0pOworICAgIHJldHVybiBjaGVja0JveDsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGdldFZhbHVlKCkgeworICAgIHJldHVybiBjaGVja0JveFRvcC5nZXRWYWx1ZSgpOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0VmFsdWUoZmluYWwgYm9vbGVhbiB2YWx1ZSkgeworICAgIGNoZWNrQm94VG9wLnNldFZhbHVlKHZhbHVlKTsKKyAgICBjaGVja0JveEJvdHRvbS5zZXRWYWx1ZSh2YWx1ZSk7CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRSZXZpZXdlZEJ5Q3VycmVudFVzZXIoYm9vbGVhbiByZXZpZXdlZCkgeworICAgIGlmIChmaWxlTGlzdCAhPSBudWxsKSB7CisgICAgICBmaWxlTGlzdC51cGRhdGVSZXZpZXdlZFN0YXR1cyhwYXRjaEtleSwgcmV2aWV3ZWQpOworICAgIH0KKworICAgIFBhdGNoU2V0LklkIHBzID0gcGF0Y2hLZXkuZ2V0UGFyZW50S2V5KCk7CisgICAgUmVzdEFwaSBhcGkgPSBuZXcgUmVzdEFwaSgiL2NoYW5nZXMvIikuaWQocHMuZ2V0UGFyZW50S2V5KCkuZ2V0KCkpCisgICAgICAgIC52aWV3KCJyZXZpc2lvbnMiKS5pZChwcy5nZXQoKSkKKyAgICAgICAgLnZpZXcoImZpbGVzIikuaWQocGF0Y2hLZXkuZ2V0RmlsZU5hbWUoKSkKKyAgICAgICAgLnZpZXcoInJldmlld2VkIik7CisKKyAgICBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNiID0gbmV3IEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgYXJnMCkgeworICAgICAgICAvLyBub3AKKyAgICAgIH0KKworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoVm9pZFJlc3VsdCByZXN1bHQpIHsKKyAgICAgICAgLy8gbm9wCisgICAgICB9CisgICAgfTsKKyAgICBpZiAocmV2aWV3ZWQpIHsKKyAgICAgIGFwaS5wdXQoY2IpOworICAgIH0gZWxzZSB7CisgICAgICBhcGkuZGVsZXRlKGNiKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgdm9pZCBnbygpIHsKKyAgICBpZiAocmV2aWV3ZWRMaW5rICE9IG51bGwpIHsKKyAgICAgIHNldFJldmlld2VkQnlDdXJyZW50VXNlcih0cnVlKTsKKyAgICAgIHJldmlld2VkTGluay5nbygpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgSW5saW5lSHlwZXJsaW5rIGNyZWF0ZVJldmlld2VkTGluayhmaW5hbCBpbnQgcGF0Y2hJbmRleCwKKyAgICAgIGZpbmFsIFBhdGNoU2NyZWVuLlR5cGUgcGF0Y2hTY3JlZW5UeXBlKSB7CisgICAgZmluYWwgUGF0Y2hWYWxpZGF0b3IgdW5yZXZpZXdlZFZhbGlkYXRvciA9IG5ldyBQYXRjaFZhbGlkYXRvcigpIHsKKyAgICAgIHB1YmxpYyBib29sZWFuIGlzVmFsaWQoUGF0Y2ggcGF0Y2gpIHsKKyAgICAgICAgcmV0dXJuICFwYXRjaC5pc1Jldmlld2VkQnlDdXJyZW50VXNlcigpOworICAgICAgfQorICAgIH07CisKKyAgICBJbmxpbmVIeXBlcmxpbmsgcmV2aWV3ZWRMaW5rID0gbmV3IENoYW5nZUxpbmsoIiIsIHBhdGNoS2V5LmdldFBhcmVudEtleSgpKTsKKyAgICBpZiAoZmlsZUxpc3QgIT0gbnVsbCkgeworICAgICAgaW50IG5leHRVbnJldmlld2VkUGF0Y2hJbmRleCA9CisgICAgICAgICAgZmlsZUxpc3QuZ2V0TmV4dFBhdGNoKHBhdGNoSW5kZXgsIHRydWUsIHVucmV2aWV3ZWRWYWxpZGF0b3IsCisgICAgICAgICAgICAgIGZpbGVMaXN0LlBSRUZFUkVOQ0VfVkFMSURBVE9SKTsKKworICAgICAgaWYgKG5leHRVbnJldmlld2VkUGF0Y2hJbmRleCA+IC0xKSB7CisgICAgICAgIC8vIENyZWF0ZSBpbnZpc2libGUgcGF0Y2ggbGluayB0byBjaGFuZ2UgcGFnZQorICAgICAgICByZXZpZXdlZExpbmsgPQorICAgICAgICAgICAgZmlsZUxpc3QuY3JlYXRlTGluayhuZXh0VW5yZXZpZXdlZFBhdGNoSW5kZXgsIHBhdGNoU2NyZWVuVHlwZSwKKyAgICAgICAgICAgICAgICBudWxsLCBudWxsKTsKKyAgICAgICAgcmV2aWV3ZWRMaW5rLnNldFRleHQoIiIpOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gcmV2aWV3ZWRMaW5rOworICB9CisKKyAgcHJpdmF0ZSBBbmNob3IgY3JlYXRlUmV2aWV3ZWRBbmNob3IoKSB7CisgICAgU2FmZUh0bWxCdWlsZGVyIHRleHQgPSBuZXcgU2FmZUh0bWxCdWlsZGVyKCk7CisgICAgdGV4dC5hcHBlbmQoUGF0Y2hVdGlsLkMubmV4dCgpKTsKKyAgICB0ZXh0LmFwcGVuZChTYWZlSHRtbC5hc2lzKFV0aWwuQy5uZXh0UGF0Y2hMaW5rSWNvbigpKSk7CisKKyAgICBBbmNob3IgcmV2aWV3ZWRBbmNob3IgPSBuZXcgQW5jaG9yKCIiKTsKKyAgICBTYWZlSHRtbC5zZXQocmV2aWV3ZWRBbmNob3IsIHRleHQpOworCisgICAgcmV2aWV3ZWRBbmNob3IuYWRkQ2xpY2tIYW5kbGVyKG5ldyBDbGlja0hhbmRsZXIoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uQ2xpY2soQ2xpY2tFdmVudCBldmVudCkgeworICAgICAgICBzZXRSZXZpZXdlZEJ5Q3VycmVudFVzZXIodHJ1ZSk7CisgICAgICAgIHJldmlld2VkTGluay5nbygpOworICAgICAgfQorICAgIH0pOworCisgICAgcmV0dXJuIHJldmlld2VkQW5jaG9yOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9TaWRlQnlTaWRlVGFibGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1NpZGVCeVNpZGVUYWJsZS5qYXZhCmluZGV4IGVjNjNhODMuLjE1YWI5NTEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1NpZGVCeVNpZGVUYWJsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1NpZGVCeVNpZGVUYWJsZS5qYXZhCkBAIC0yMywyMyArMjMsMjYgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Db21tZW50RGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2NyaXB0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2NyaXB0LkZpbGVNb2RlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2V0RGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnByZXR0aWZ5LmNvbW1vbi5FZGl0TGlzdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wcmV0dGlmeS5jb21tb24uU3BhcnNlSHRtbEZpbGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0V2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tIYW5kbGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LkRPTTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5FbGVtZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFuY2hvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSFRNTFRhYmxlLkNlbGxGb3JtYXR0ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSGFzVmVydGljYWxBbGlnbm1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW5saW5lTGFiZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVUlPYmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuU2FmZUh0bWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuU2FmZUh0bWxCdWlsZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZGlmZi5FZGl0OwogCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuSXRlcmF0b3I7Ci1pbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIHB1YmxpYyBjbGFzcyBTaWRlQnlTaWRlVGFibGUgZXh0ZW5kcyBBYnN0cmFjdFBhdGNoQ29udGVudFRhYmxlIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IEEgPSAyOwpAQCAtNDgsMTAgKzUxLDIxIEBACiAKICAgcHJpdmF0ZSBTcGFyc2VIdG1sRmlsZSBhOwogICBwcml2YXRlIFNwYXJzZUh0bWxGaWxlIGI7CisgIHByb3RlY3RlZCBib29sZWFuIGlzRmlsZUNvbW1lbnRCb3JkZXJSb3dFeGlzdDsKKworICBwcm90ZWN0ZWQgdm9pZCBjcmVhdGVGaWxlQ29tbWVudEVkaXRvck9uU2lkZUEoKSB7CisgICAgY3JlYXRlQ29tbWVudEVkaXRvcihSX0hFQUQgKyAxLCBBLCBSX0hFQUQsIEZJTEVfU0lERV9BKTsKKyAgICByZXR1cm47CisgIH0KKworICBwcm90ZWN0ZWQgdm9pZCBjcmVhdGVGaWxlQ29tbWVudEVkaXRvck9uU2lkZUIoKSB7CisgICAgY3JlYXRlQ29tbWVudEVkaXRvcihSX0hFQUQgKyAxLCBCLCBSX0hFQUQsIEZJTEVfU0lERV9CKTsKKyAgICByZXR1cm47CisgIH0KIAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgb25DZWxsRG91YmxlQ2xpY2soZmluYWwgaW50IHJvdywgaW50IGNvbHVtbikgewotICAgIGlmIChjb2x1bW4gPiAwICYmIGdldFJvd0l0ZW0ocm93KSBpbnN0YW5jZW9mIFBhdGNoTGluZSkgeworICAgIGlmIChjb2x1bW4gPiBDX0FSUk9XICYmIGdldFJvd0l0ZW0ocm93KSBpbnN0YW5jZW9mIFBhdGNoTGluZSkgewogICAgICAgZmluYWwgUGF0Y2hMaW5lIGxpbmUgPSAoUGF0Y2hMaW5lKSBnZXRSb3dJdGVtKHJvdyk7CiAgICAgICBpZiAoY29sdW1uID09IDEgfHwgY29sdW1uID09IEEpIHsKICAgICAgICAgY3JlYXRlQ29tbWVudEVkaXRvcihyb3cgKyAxLCBBLCBsaW5lLmdldExpbmVBKCksIChzaG9ydCkgMCk7CkBAIC02Myw2ICs3Nyw3IEBACiAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIG9uQ2VsbFNpbmdsZUNsaWNrKGludCByb3csIGludCBjb2x1bW4pIHsKKyAgICBzdXBlci5vbkNlbGxTaW5nbGVDbGljayhyb3csIGNvbHVtbik7CiAgICAgaWYgKGNvbHVtbiA9PSAxIHx8IGNvbHVtbiA9PSA0KSB7CiAgICAgICBvbkNlbGxEb3VibGVDbGljayhyb3csIGNvbHVtbik7CiAgICAgfQpAQCAtNzUsMTA2ICs5MCwxMzggQEAKICAgfQogCiAgIEBPdmVycmlkZQotICBwcm90ZWN0ZWQgdm9pZCByZW5kZXIoZmluYWwgUGF0Y2hTY3JpcHQgc2NyaXB0KSB7Ci0gICAgYSA9IGdldFNwYXJzZUh0bWxGaWxlQShzY3JpcHQpOwotICAgIGIgPSBnZXRTcGFyc2VIdG1sRmlsZUIoc2NyaXB0KTsKKyAgcHJvdGVjdGVkIHZvaWQgcmVuZGVyKGZpbmFsIFBhdGNoU2NyaXB0IHNjcmlwdCwgZmluYWwgUGF0Y2hTZXREZXRhaWwgZGV0YWlsKSB7CiAgICAgZmluYWwgQXJyYXlMaXN0PE9iamVjdD4gbGluZXMgPSBuZXcgQXJyYXlMaXN0PE9iamVjdD4oKTsKICAgICBmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbmMgPSBuZXcgU2FmZUh0bWxCdWlsZGVyKCk7Ci0gICAgZmluYWwgYm9vbGVhbiBpbnRyYWxpbmUgPQotICAgICAgICBzY3JpcHQuZ2V0RGlmZlByZWZzKCkuaXNJbnRyYWxpbmVEaWZmZXJlbmNlKCkKLSAgICAgICAgICAgICYmIHNjcmlwdC5oYXNJbnRyYWxpbmVEaWZmZXJlbmNlKCk7Ci0KLSAgICBpZiAoc2NyaXB0LmdldEZpbGVNb2RlQSgpICE9IEZpbGVNb2RlLkZJTEUKLSAgICAgICAgfHwgc2NyaXB0LmdldEZpbGVNb2RlQigpICE9IEZpbGVNb2RlLkZJTEUpIHsKLSAgICAgIG9wZW5MaW5lKG5jKTsKLSAgICAgIGFwcGVuZE1vZGVMaW5lKG5jLCBzY3JpcHQuZ2V0RmlsZU1vZGVBKCkpOwotICAgICAgYXBwZW5kTW9kZUxpbmUobmMsIHNjcmlwdC5nZXRGaWxlTW9kZUIoKSk7Ci0gICAgICBjbG9zZUxpbmUobmMpOwotICAgICAgbGluZXMuYWRkKG51bGwpOwotICAgIH0KLQotICAgIGludCBsYXN0QSA9IDA7Ci0gICAgaW50IGxhc3RCID0gMDsKLSAgICBmaW5hbCBib29sZWFuIGlnbm9yZVdTID0gc2NyaXB0LmlzSWdub3JlV2hpdGVzcGFjZSgpOwotICAgIGZvciAoZmluYWwgRWRpdExpc3QuSHVuayBodW5rIDogc2NyaXB0LmdldEh1bmtzKCkpIHsKLSAgICAgIGlmICghaHVuay5pc1N0YXJ0T2ZGaWxlKCkpIHsKLSAgICAgICAgYXBwZW5kU2tpcExpbmUobmMsIGh1bmsuZ2V0Q3VyQigpIC0gbGFzdEIpOwotICAgICAgICBsaW5lcy5hZGQobmV3IFNraXBwZWRMaW5lKGxhc3RBLCBsYXN0QiwgaHVuay5nZXRDdXJCKCkgLSBsYXN0QikpOworICAgIGFsbG9jYXRlVGFibGVIZWFkZXIoc2NyaXB0LCBuYyk7CisgICAgbGluZXMuYWRkKG51bGwpOworICAgIGlmICghaXNEaXNwbGF5QmluYXJ5KSB7CisgICAgICBpZiAoc2NyaXB0LmdldEZpbGVNb2RlQSgpICE9IEZpbGVNb2RlLkZJTEUKKyAgICAgICAgICB8fCBzY3JpcHQuZ2V0RmlsZU1vZGVCKCkgIT0gRmlsZU1vZGUuRklMRSkgeworICAgICAgICBvcGVuTGluZShuYyk7CisgICAgICAgIGFwcGVuZE1vZGVMaW5lKG5jLCBzY3JpcHQuZ2V0RmlsZU1vZGVBKCkpOworICAgICAgICBhcHBlbmRNb2RlTGluZShuYywgc2NyaXB0LmdldEZpbGVNb2RlQigpKTsKKyAgICAgICAgY2xvc2VMaW5lKG5jKTsKKyAgICAgICAgbGluZXMuYWRkKG51bGwpOwogICAgICAgfQogCi0gICAgICB3aGlsZSAoaHVuay5uZXh0KCkpIHsKLSAgICAgICAgaWYgKGh1bmsuaXNDb250ZXh0TGluZSgpKSB7Ci0gICAgICAgICAgb3BlbkxpbmUobmMpOwotICAgICAgICAgIGZpbmFsIFNhZmVIdG1sIGN0eCA9IGEuZ2V0U2FmZUh0bWxMaW5lKGh1bmsuZ2V0Q3VyQSgpKTsKLSAgICAgICAgICBhcHBlbmRMaW5lTnVtYmVyKG5jLCBodW5rLmdldEN1ckEoKSwgZmFsc2UpOwotICAgICAgICAgIGFwcGVuZExpbmVUZXh0KG5jLCBDT05URVhULCBjdHgsIGZhbHNlLCBmYWxzZSk7Ci0gICAgICAgICAgaWYgKGlnbm9yZVdTICYmIGIuY29udGFpbnMoaHVuay5nZXRDdXJCKCkpKSB7Ci0gICAgICAgICAgICBhcHBlbmRMaW5lVGV4dChuYywgQ09OVEVYVCwgYiwgaHVuay5nZXRDdXJCKCksIGZhbHNlKTsKLSAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYXBwZW5kTGluZVRleHQobmMsIENPTlRFWFQsIGN0eCwgZmFsc2UsIGZhbHNlKTsKLSAgICAgICAgICB9Ci0gICAgICAgICAgYXBwZW5kTGluZU51bWJlcihuYywgaHVuay5nZXRDdXJCKCksIHRydWUpOwotICAgICAgICAgIGNsb3NlTGluZShuYyk7Ci0gICAgICAgICAgaHVuay5pbmNCb3RoKCk7Ci0gICAgICAgICAgbGluZXMuYWRkKG5ldyBQYXRjaExpbmUoQ09OVEVYVCwgaHVuay5nZXRDdXJBKCksIGh1bmsuZ2V0Q3VyQigpKSk7Ci0KLSAgICAgICAgfSBlbHNlIGlmIChodW5rLmlzTW9kaWZpZWRMaW5lKCkpIHsKLSAgICAgICAgICBmaW5hbCBib29sZWFuIGRlbCA9IGh1bmsuaXNEZWxldGVkQSgpOwotICAgICAgICAgIGZpbmFsIGJvb2xlYW4gaW5zID0gaHVuay5pc0luc2VydGVkQigpOwotICAgICAgICAgIGZpbmFsIGJvb2xlYW4gZnVsbCA9Ci0gICAgICAgICAgICAgIGludHJhbGluZSAmJiBodW5rLmdldEN1ckVkaXQoKS5nZXRUeXBlKCkgIT0gRWRpdC5UeXBlLlJFUExBQ0U7Ci0gICAgICAgICAgb3BlbkxpbmUobmMpOwotCi0gICAgICAgICAgaWYgKGRlbCkgewotICAgICAgICAgICAgYXBwZW5kTGluZU51bWJlcihuYywgaHVuay5nZXRDdXJBKCksIGZhbHNlKTsKLSAgICAgICAgICAgIGFwcGVuZExpbmVUZXh0KG5jLCBERUxFVEUsIGEsIGh1bmsuZ2V0Q3VyQSgpLCBmdWxsKTsKLSAgICAgICAgICAgIGh1bmsuaW5jQSgpOwotICAgICAgICAgIH0gZWxzZSBpZiAoaHVuay5nZXRDdXJFZGl0KCkuZ2V0VHlwZSgpID09IEVkaXQuVHlwZS5SRVBMQUNFKSB7Ci0gICAgICAgICAgICBhcHBlbmRMaW5lTnVtYmVyKG5jLCBmYWxzZSk7Ci0gICAgICAgICAgICBhcHBlbmRMaW5lTm9uZShuYywgREVMRVRFKTsKLSAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYXBwZW5kTGluZU51bWJlcihuYywgZmFsc2UpOwotICAgICAgICAgICAgYXBwZW5kTGluZU5vbmUobmMsIENPTlRFWFQpOworICAgICAgaWYgKGhhc0RpZmZlcmVuY2VzKHNjcmlwdCkpIHsKKyAgICAgICAgaW50IGxhc3RBID0gMDsKKyAgICAgICAgaW50IGxhc3RCID0gMDsKKyAgICAgICAgZmluYWwgYm9vbGVhbiBpZ25vcmVXUyA9IHNjcmlwdC5pc0lnbm9yZVdoaXRlc3BhY2UoKTsKKyAgICAgICAgYSA9IGdldFNwYXJzZUh0bWxGaWxlQShzY3JpcHQpOworICAgICAgICBiID0gZ2V0U3BhcnNlSHRtbEZpbGVCKHNjcmlwdCk7CisgICAgICAgIGZpbmFsIGJvb2xlYW4gaW50cmFsaW5lID0KKyAgICAgICAgICAgIHNjcmlwdC5nZXREaWZmUHJlZnMoKS5pc0ludHJhbGluZURpZmZlcmVuY2UoKQorICAgICAgICAgICAgICAgICYmIHNjcmlwdC5oYXNJbnRyYWxpbmVEaWZmZXJlbmNlKCk7CisgICAgICAgIGZvciAoZmluYWwgRWRpdExpc3QuSHVuayBodW5rIDogc2NyaXB0LmdldEh1bmtzKCkpIHsKKyAgICAgICAgICBpZiAoIWh1bmsuaXNTdGFydE9mRmlsZSgpKSB7CisgICAgICAgICAgICBhcHBlbmRTa2lwTGluZShuYywgaHVuay5nZXRDdXJCKCkgLSBsYXN0Qik7CisgICAgICAgICAgICBsaW5lcy5hZGQobmV3IFNraXBwZWRMaW5lKGxhc3RBLCBsYXN0QiwgaHVuay5nZXRDdXJCKCkgLSBsYXN0QikpOwogICAgICAgICAgIH0KIAotICAgICAgICAgIGlmIChpbnMpIHsKLSAgICAgICAgICAgIGFwcGVuZExpbmVUZXh0KG5jLCBJTlNFUlQsIGIsIGh1bmsuZ2V0Q3VyQigpLCBmdWxsKTsKLSAgICAgICAgICAgIGFwcGVuZExpbmVOdW1iZXIobmMsIGh1bmsuZ2V0Q3VyQigpLCB0cnVlKTsKLSAgICAgICAgICAgIGh1bmsuaW5jQigpOwotICAgICAgICAgIH0gZWxzZSBpZiAoaHVuay5nZXRDdXJFZGl0KCkuZ2V0VHlwZSgpID09IEVkaXQuVHlwZS5SRVBMQUNFKSB7Ci0gICAgICAgICAgICBhcHBlbmRMaW5lTm9uZShuYywgSU5TRVJUKTsKLSAgICAgICAgICAgIGFwcGVuZExpbmVOdW1iZXIobmMsIHRydWUpOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBhcHBlbmRMaW5lTm9uZShuYywgQ09OVEVYVCk7Ci0gICAgICAgICAgICBhcHBlbmRMaW5lTnVtYmVyKG5jLCB0cnVlKTsKKyAgICAgICAgICB3aGlsZSAoaHVuay5uZXh0KCkpIHsKKyAgICAgICAgICAgIGlmIChodW5rLmlzQ29udGV4dExpbmUoKSkgeworICAgICAgICAgICAgICBvcGVuTGluZShuYyk7CisgICAgICAgICAgICAgIGZpbmFsIFNhZmVIdG1sIGN0eCA9IGEuZ2V0U2FmZUh0bWxMaW5lKGh1bmsuZ2V0Q3VyQSgpKTsKKyAgICAgICAgICAgICAgYXBwZW5kTGluZU51bWJlcihuYywgaHVuay5nZXRDdXJBKCksIGZhbHNlKTsKKyAgICAgICAgICAgICAgYXBwZW5kTGluZVRleHQobmMsIENPTlRFWFQsIGN0eCwgZmFsc2UsIGZhbHNlKTsKKyAgICAgICAgICAgICAgaWYgKGlnbm9yZVdTICYmIGIuY29udGFpbnMoaHVuay5nZXRDdXJCKCkpKSB7CisgICAgICAgICAgICAgICAgYXBwZW5kTGluZVRleHQobmMsIENPTlRFWFQsIGIsIGh1bmsuZ2V0Q3VyQigpLCBmYWxzZSk7CisgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgYXBwZW5kTGluZVRleHQobmMsIENPTlRFWFQsIGN0eCwgZmFsc2UsIGZhbHNlKTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICBhcHBlbmRMaW5lTnVtYmVyKG5jLCBodW5rLmdldEN1ckIoKSwgdHJ1ZSk7CisgICAgICAgICAgICAgIGNsb3NlTGluZShuYyk7CisgICAgICAgICAgICAgIGh1bmsuaW5jQm90aCgpOworICAgICAgICAgICAgICBsaW5lcy5hZGQobmV3IFBhdGNoTGluZShDT05URVhULCBodW5rLmdldEN1ckEoKSwgaHVuay5nZXRDdXJCKCkpKTsKKworICAgICAgICAgICAgfSBlbHNlIGlmIChodW5rLmlzTW9kaWZpZWRMaW5lKCkpIHsKKyAgICAgICAgICAgICAgZmluYWwgYm9vbGVhbiBkZWwgPSBodW5rLmlzRGVsZXRlZEEoKTsKKyAgICAgICAgICAgICAgZmluYWwgYm9vbGVhbiBpbnMgPSBodW5rLmlzSW5zZXJ0ZWRCKCk7CisgICAgICAgICAgICAgIGZpbmFsIGJvb2xlYW4gZnVsbCA9CisgICAgICAgICAgICAgICAgICBpbnRyYWxpbmUgJiYgaHVuay5nZXRDdXJFZGl0KCkuZ2V0VHlwZSgpICE9IEVkaXQuVHlwZS5SRVBMQUNFOworICAgICAgICAgICAgICBvcGVuTGluZShuYyk7CisKKyAgICAgICAgICAgICAgaWYgKGRlbCkgeworICAgICAgICAgICAgICAgIGFwcGVuZExpbmVOdW1iZXIobmMsIGh1bmsuZ2V0Q3VyQSgpLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgYXBwZW5kTGluZVRleHQobmMsIERFTEVURSwgYSwgaHVuay5nZXRDdXJBKCksIGZ1bGwpOworICAgICAgICAgICAgICAgIGh1bmsuaW5jQSgpOworICAgICAgICAgICAgICB9IGVsc2UgaWYgKGh1bmsuZ2V0Q3VyRWRpdCgpLmdldFR5cGUoKSA9PSBFZGl0LlR5cGUuUkVQTEFDRSkgeworICAgICAgICAgICAgICAgIGFwcGVuZExpbmVOdW1iZXIobmMsIGZhbHNlKTsKKyAgICAgICAgICAgICAgICBhcHBlbmRMaW5lTm9uZShuYywgREVMRVRFKTsKKyAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBhcHBlbmRMaW5lTnVtYmVyKG5jLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgYXBwZW5kTGluZU5vbmUobmMsIENPTlRFWFQpOworICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgaWYgKGlucykgeworICAgICAgICAgICAgICAgIGFwcGVuZExpbmVUZXh0KG5jLCBJTlNFUlQsIGIsIGh1bmsuZ2V0Q3VyQigpLCBmdWxsKTsKKyAgICAgICAgICAgICAgICBhcHBlbmRMaW5lTnVtYmVyKG5jLCBodW5rLmdldEN1ckIoKSwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgaHVuay5pbmNCKCk7CisgICAgICAgICAgICAgIH0gZWxzZSBpZiAoaHVuay5nZXRDdXJFZGl0KCkuZ2V0VHlwZSgpID09IEVkaXQuVHlwZS5SRVBMQUNFKSB7CisgICAgICAgICAgICAgICAgYXBwZW5kTGluZU5vbmUobmMsIElOU0VSVCk7CisgICAgICAgICAgICAgICAgYXBwZW5kTGluZU51bWJlcihuYywgdHJ1ZSk7CisgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgYXBwZW5kTGluZU5vbmUobmMsIENPTlRFWFQpOworICAgICAgICAgICAgICAgIGFwcGVuZExpbmVOdW1iZXIobmMsIHRydWUpOworICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgY2xvc2VMaW5lKG5jKTsKKworICAgICAgICAgICAgICBpZiAoZGVsICYmIGlucykgeworICAgICAgICAgICAgICAgIGxpbmVzLmFkZChuZXcgUGF0Y2hMaW5lKFJFUExBQ0UsIGh1bmsuZ2V0Q3VyQSgpLCBodW5rLmdldEN1ckIoKSkpOworICAgICAgICAgICAgICB9IGVsc2UgaWYgKGRlbCkgeworICAgICAgICAgICAgICAgIGxpbmVzLmFkZChuZXcgUGF0Y2hMaW5lKERFTEVURSwgaHVuay5nZXRDdXJBKCksIC0xKSk7CisgICAgICAgICAgICAgIH0gZWxzZSBpZiAoaW5zKSB7CisgICAgICAgICAgICAgICAgbGluZXMuYWRkKG5ldyBQYXRjaExpbmUoSU5TRVJULCAtMSwgaHVuay5nZXRDdXJCKCkpKTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQogICAgICAgICAgIH0KLQotICAgICAgICAgIGNsb3NlTGluZShuYyk7Ci0KLSAgICAgICAgICBpZiAoZGVsICYmIGlucykgewotICAgICAgICAgICAgbGluZXMuYWRkKG5ldyBQYXRjaExpbmUoUkVQTEFDRSwgaHVuay5nZXRDdXJBKCksIGh1bmsuZ2V0Q3VyQigpKSk7Ci0gICAgICAgICAgfSBlbHNlIGlmIChkZWwpIHsKLSAgICAgICAgICAgIGxpbmVzLmFkZChuZXcgUGF0Y2hMaW5lKERFTEVURSwgaHVuay5nZXRDdXJBKCksIDApKTsKLSAgICAgICAgICB9IGVsc2UgaWYgKGlucykgewotICAgICAgICAgICAgbGluZXMuYWRkKG5ldyBQYXRjaExpbmUoSU5TRVJULCAwLCBodW5rLmdldEN1ckIoKSkpOworICAgICAgICAgIGxhc3RBID0gaHVuay5nZXRDdXJBKCk7CisgICAgICAgICAgbGFzdEIgPSBodW5rLmdldEN1ckIoKTsKKyAgICAgICAgfQorICAgICAgICBpZiAobGFzdEIgIT0gYi5zaXplKCkpIHsKKyAgICAgICAgICBhcHBlbmRTa2lwTGluZShuYywgYi5zaXplKCkgLSBsYXN0Qik7CisgICAgICAgICAgbGluZXMuYWRkKG5ldyBTa2lwcGVkTGluZShsYXN0QSwgbGFzdEIsIGIuc2l6ZSgpIC0gbGFzdEIpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH1lbHNleworICAgICAgLy8gRGlzcGxheSB0aGUgcGF0Y2ggaGVhZGVyIGZvciBiaW5hcnkKKyAgICAgIGZvciAoZmluYWwgU3RyaW5nIGxpbmUgOiBzY3JpcHQuZ2V0UGF0Y2hIZWFkZXIoKSkgeworICAgICAgICBhcHBlbmRGaWxlSGVhZGVyKG5jLCBsaW5lKTsKKyAgICAgIH0KKyAgICB9CisgICAgaWYgKCFoYXNEaWZmZXJlbmNlcyhzY3JpcHQpKSB7CisgICAgICBhcHBlbmROb0RpZmZlcmVuY2VzKG5jKTsKKyAgICB9CisgICAgcmVzZXRIdG1sKG5jKTsKKyAgICBwb3B1bGF0ZVRhYmxlSGVhZGVyKHNjcmlwdCwgZGV0YWlsKTsKKyAgICBpZiAoaGFzRGlmZmVyZW5jZXMoc2NyaXB0KSkgeworICAgICAgaW5pdFNjcmlwdChzY3JpcHQpOworICAgICAgaWYgKCFpc0Rpc3BsYXlCaW5hcnkpIHsKKyAgICAgICAgZm9yIChpbnQgcm93ID0gMDsgcm93IDwgbGluZXMuc2l6ZSgpOyByb3crKykgeworICAgICAgICAgIHNldFJvd0l0ZW0ocm93LCBsaW5lcy5nZXQocm93KSk7CisgICAgICAgICAgaWYgKGxpbmVzLmdldChyb3cpIGluc3RhbmNlb2YgU2tpcHBlZExpbmUpIHsKKyAgICAgICAgICAgIGNyZWF0ZVNraXBMaW5lKHJvdywgKFNraXBwZWRMaW5lKSBsaW5lcy5nZXQocm93KSk7CiAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICB9Ci0gICAgICBsYXN0QSA9IGh1bmsuZ2V0Q3VyQSgpOwotICAgICAgbGFzdEIgPSBodW5rLmdldEN1ckIoKTsKICAgICB9Ci0gICAgaWYgKGxhc3RCICE9IGIuc2l6ZSgpKSB7Ci0gICAgICBhcHBlbmRTa2lwTGluZShuYywgYi5zaXplKCkgLSBsYXN0Qik7Ci0gICAgICBsaW5lcy5hZGQobmV3IFNraXBwZWRMaW5lKGxhc3RBLCBsYXN0QiwgYi5zaXplKCkgLSBsYXN0QikpOwotICAgIH0KLSAgICByZXNldEh0bWwobmMpOwotICAgIGluaXRTY3JpcHQoc2NyaXB0KTsKKyAgfQogCi0gICAgZm9yIChpbnQgcm93ID0gMDsgcm93IDwgbGluZXMuc2l6ZSgpOyByb3crKykgewotICAgICAgc2V0Um93SXRlbShyb3csIGxpbmVzLmdldChyb3cpKTsKLSAgICAgIGlmIChsaW5lcy5nZXQocm93KSBpbnN0YW5jZW9mIFNraXBwZWRMaW5lKSB7Ci0gICAgICAgIGNyZWF0ZVNraXBMaW5lKHJvdywgKFNraXBwZWRMaW5lKSBsaW5lcy5nZXQocm93KSk7Ci0gICAgICB9CisgIHByaXZhdGUgdm9pZCBwb3B1bGF0ZVRhYmxlSGVhZGVyKGZpbmFsIFBhdGNoU2NyaXB0IHNjcmlwdCwKKyAgICAgIGZpbmFsIFBhdGNoU2V0RGV0YWlsIGRldGFpbCkgeworICAgIGluaXRIZWFkZXJzKHNjcmlwdCwgZGV0YWlsKTsKKyAgICB0YWJsZS5zZXRXaWRnZXQoUl9IRUFELCBBLCBoZWFkZXJTaWRlQSk7CisgICAgdGFibGUuc2V0V2lkZ2V0KFJfSEVBRCwgQiwgaGVhZGVyU2lkZUIpOworCisgICAgLy8gUG9wdWxhdGUgaWNvbnMgdG8gbGluZU51bWJlciBjb2x1bW4gaGVhZGVyLgorICAgIGlmIChoZWFkZXJTaWRlQS5pc0ZpbGVPckNvbW1pdE1lc3NhZ2UoKSkgeworICAgICAgdGFibGUuc2V0V2lkZ2V0KFJfSEVBRCwgQSAtIDEsIGljb25BKTsKKyAgICB9CisgICAgaWYgKGhlYWRlclNpZGVCLmlzRmlsZU9yQ29tbWl0TWVzc2FnZSgpKSB7CisgICAgICB0YWJsZS5zZXRXaWRnZXQoUl9IRUFELCBCICsgMSwgaWNvbkIpOwogICAgIH0KICAgfQogCkBAIC0yMDIsNiArMjQ5LDExIEBACiAgIH0KIAogICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIFBhdGNoU2NyZWVuLlR5cGUgZ2V0UGF0Y2hTY3JlZW5UeXBlKCkgeworICAgIHJldHVybiBQYXRjaFNjcmVlbi5UeXBlLlNJREVfQllfU0lERTsKKyAgfQorCisgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBkaXNwbGF5KGZpbmFsIENvbW1lbnREZXRhaWwgY2QsIGJvb2xlYW4gZXhwYW5kQ29tbWVudHMpIHsKICAgICBpZiAoY2QuaXNFbXB0eSgpKSB7CiAgICAgICByZXR1cm47CkBAIC0yMDksNTEgKzI2MSwxNjMgQEAKICAgICBzZXRBY2NvdW50SW5mb0NhY2hlKGNkLmdldEFjY291bnRzKCkpOwogCiAgICAgZm9yIChpbnQgcm93ID0gMDsgcm93IDwgdGFibGUuZ2V0Um93Q291bnQoKTspIHsKLSAgICAgIGlmIChnZXRSb3dJdGVtKHJvdykgaW5zdGFuY2VvZiBQYXRjaExpbmUpIHsKKyAgICAgIGZpbmFsIEl0ZXJhdG9yPFBhdGNoTGluZUNvbW1lbnQ+IGFpOworICAgICAgZmluYWwgSXRlcmF0b3I8UGF0Y2hMaW5lQ29tbWVudD4gYmk7CisKKyAgICAgIGlmIChyb3cgPT0gUl9IRUFEKSB7CisgICAgICAgIGFpID0gY2QuZ2V0Rm9yQShSX0hFQUQpLml0ZXJhdG9yKCk7CisgICAgICAgIGJpID0gY2QuZ2V0Rm9yQihSX0hFQUQpLml0ZXJhdG9yKCk7CisgICAgICB9IGVsc2UgaWYgKGdldFJvd0l0ZW0ocm93KSBpbnN0YW5jZW9mIFBhdGNoTGluZSkgewogICAgICAgICBmaW5hbCBQYXRjaExpbmUgcExpbmUgPSAoUGF0Y2hMaW5lKSBnZXRSb3dJdGVtKHJvdyk7Ci0gICAgICAgIGZpbmFsIExpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gZm9yYSA9IGNkLmdldEZvckEocExpbmUuZ2V0TGluZUEoKSk7Ci0gICAgICAgIGZpbmFsIExpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gZm9yYiA9IGNkLmdldEZvckIocExpbmUuZ2V0TGluZUIoKSk7Ci0gICAgICAgIHJvdysrOwotCi0gICAgICAgIGZpbmFsIEl0ZXJhdG9yPFBhdGNoTGluZUNvbW1lbnQ+IGFpID0gZm9yYS5pdGVyYXRvcigpOwotICAgICAgICBmaW5hbCBJdGVyYXRvcjxQYXRjaExpbmVDb21tZW50PiBiaSA9IGZvcmIuaXRlcmF0b3IoKTsKLSAgICAgICAgd2hpbGUgKGFpLmhhc05leHQoKSAmJiBiaS5oYXNOZXh0KCkpIHsKLSAgICAgICAgICBmaW5hbCBQYXRjaExpbmVDb21tZW50IGFjID0gYWkubmV4dCgpOwotICAgICAgICAgIGZpbmFsIFBhdGNoTGluZUNvbW1lbnQgYmMgPSBiaS5uZXh0KCk7Ci0gICAgICAgICAgaW5zZXJ0Um93KHJvdyk7Ci0gICAgICAgICAgYmluZENvbW1lbnQocm93LCBBLCBhYywgIWFpLmhhc05leHQoKSwgZXhwYW5kQ29tbWVudHMpOwotICAgICAgICAgIGJpbmRDb21tZW50KHJvdywgQiwgYmMsICFiaS5oYXNOZXh0KCksIGV4cGFuZENvbW1lbnRzKTsKLSAgICAgICAgICByb3crKzsKLSAgICAgICAgfQotCi0gICAgICAgIHJvdyA9IGZpbmlzaChhaSwgcm93LCBBLCBleHBhbmRDb21tZW50cyk7Ci0gICAgICAgIHJvdyA9IGZpbmlzaChiaSwgcm93LCBCLCBleHBhbmRDb21tZW50cyk7CisgICAgICAgIGFpID0gY2QuZ2V0Rm9yQShwTGluZS5nZXRMaW5lQSgpKS5pdGVyYXRvcigpOworICAgICAgICBiaSA9IGNkLmdldEZvckIocExpbmUuZ2V0TGluZUIoKSkuaXRlcmF0b3IoKTsKICAgICAgIH0gZWxzZSB7CiAgICAgICAgIHJvdysrOworICAgICAgICBjb250aW51ZTsKICAgICAgIH0KKworICAgICAgcm93Kys7CisgICAgICB3aGlsZSAoYWkuaGFzTmV4dCgpICYmIGJpLmhhc05leHQoKSkgeworICAgICAgICBmaW5hbCBQYXRjaExpbmVDb21tZW50IGFjID0gYWkubmV4dCgpOworICAgICAgICBmaW5hbCBQYXRjaExpbmVDb21tZW50IGJjID0gYmkubmV4dCgpOworICAgICAgICBpZiAoYWMuZ2V0TGluZSgpID09IFJfSEVBRCkgeworICAgICAgICAgIGluc2VydEZpbGVDb21tZW50Um93KHJvdyk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgaW5zZXJ0Um93KHJvdyk7CisgICAgICAgIH0KKyAgICAgICAgYmluZENvbW1lbnQocm93LCBBLCBhYywgIWFpLmhhc05leHQoKSwgZXhwYW5kQ29tbWVudHMpOworICAgICAgICBiaW5kQ29tbWVudChyb3csIEIsIGJjLCAhYmkuaGFzTmV4dCgpLCBleHBhbmRDb21tZW50cyk7CisgICAgICAgIHJvdysrOworICAgICAgfQorCisgICAgICByb3cgPSBmaW5pc2goYWksIHJvdywgQSwgZXhwYW5kQ29tbWVudHMpOworICAgICAgcm93ID0gZmluaXNoKGJpLCByb3csIEIsIGV4cGFuZENvbW1lbnRzKTsKICAgICB9CiAgIH0KIAorICBwcml2YXRlIHZvaWQgZGVmYXVsdFN0eWxlKGZpbmFsIGludCByb3csIGZpbmFsIENlbGxGb3JtYXR0ZXIgZm10KSB7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIEEgLSAxLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmxpbmVOdW1iZXIoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIEEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGlmZlRleHQoKSk7CisgICAgaWYgKGlzRGlzcGxheUJpbmFyeSkgeworICAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIEEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGlmZlRleHRGb3JCaW5hcnlJblNpZGVCeVNpZGUoKSk7CisgICAgfQorICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBCLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRpZmZUZXh0KCkpOworICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBCICsgMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOworICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBCICsgMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5yaWdodG1vc3QoKSk7CisgIH0KKwogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgaW5zZXJ0Um93KGZpbmFsIGludCByb3cpIHsKICAgICBzdXBlci5pbnNlcnRSb3cocm93KTsKICAgICBmaW5hbCBDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKTsKLSAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQSAtIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubGluZU51bWJlcigpKTsKLSAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dCgpKTsKLSAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQiwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dCgpKTsKLSAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQiArIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubGluZU51bWJlcigpKTsKKyAgICBkZWZhdWx0U3R5bGUocm93LCBmbXQpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGluc2VydEZpbGVDb21tZW50Um93KGZpbmFsIGludCByb3cpIHsKKyAgICB0YWJsZS5pbnNlcnRSb3cocm93KTsKKyAgICBmaW5hbCBDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKTsKKyAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgQ19BUlJPVywgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5pY29uQ2VsbE9mRmlsZUNvbW1lbnRSb3coKSk7CisgICAgZGVmYXVsdFN0eWxlKHJvdywgZm10KTsKKworICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX0FSUk9XLCAvLworICAgICAgICBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNlbGxzTmV4dFRvRmlsZUNvbW1lbnQoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIEEgLSAxLCAvLworICAgICAgICBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNlbGxzTmV4dFRvRmlsZUNvbW1lbnQoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIEIgKyAxLCAvLworICAgICAgICBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNlbGxzTmV4dFRvRmlsZUNvbW1lbnQoKSk7CisgICAgY3JlYXRlRmlsZUNvbW1lbnRCb3JkZXJSb3cocm93KTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBjcmVhdGVGaWxlQ29tbWVudEJvcmRlclJvdyhmaW5hbCBpbnQgcm93KSB7CisgICAgaWYgKHJvdyA9PSAxICYmICFpc0ZpbGVDb21tZW50Qm9yZGVyUm93RXhpc3QpIHsKKyAgICAgIGlzRmlsZUNvbW1lbnRCb3JkZXJSb3dFeGlzdCA9IHRydWU7CisgICAgICB0YWJsZS5pbnNlcnRSb3coUl9IRUFEICsgMik7CisKKyAgICAgIGZpbmFsIENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0Q2VsbEZvcm1hdHRlcigpOworCisgICAgICBmbXQuYWRkU3R5bGVOYW1lKFJfSEVBRCArIDIsIENfQVJST1csIC8vCisgICAgICAgICAgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5pY29uQ2VsbE9mRmlsZUNvbW1lbnRSb3coKSk7CisgICAgICBkZWZhdWx0U3R5bGUoUl9IRUFEICsgMiwgZm10KTsKKworICAgICAgZmluYWwgRWxlbWVudCBpY29uQ2VsbCA9IGZtdC5nZXRFbGVtZW50KFJfSEVBRCArIDIsIENfQVJST1cpOworICAgICAgVUlPYmplY3Quc2V0U3R5bGVOYW1lKERPTS5nZXRQYXJlbnQoaWNvbkNlbGwpLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpCisgICAgICAgICAgLmZpbGVDb21tZW50Qm9yZGVyKCksIHRydWUpOworICAgIH0KICAgfQogCiAgIHByaXZhdGUgaW50IGZpbmlzaChmaW5hbCBJdGVyYXRvcjxQYXRjaExpbmVDb21tZW50PiBpLCBpbnQgcm93LCBmaW5hbCBpbnQgY29sLCBib29sZWFuIGV4cGFuZENvbW1lbnQpIHsKICAgICB3aGlsZSAoaS5oYXNOZXh0KCkpIHsKICAgICAgIGZpbmFsIFBhdGNoTGluZUNvbW1lbnQgYyA9IGkubmV4dCgpOwotICAgICAgaW5zZXJ0Um93KHJvdyk7CisgICAgICBpZiAoYy5nZXRMaW5lKCkgPT0gUl9IRUFEKSB7CisgICAgICAgIGluc2VydEZpbGVDb21tZW50Um93KHJvdyk7CisgICAgICB9IGVsc2UgeworICAgICAgICBpbnNlcnRSb3cocm93KTsKKyAgICAgIH0KICAgICAgIGJpbmRDb21tZW50KHJvdywgY29sLCBjLCAhaS5oYXNOZXh0KCksIGV4cGFuZENvbW1lbnQpOwogICAgICAgcm93Kys7CiAgICAgfQogICAgIHJldHVybiByb3c7CiAgIH0KIAorICBwcml2YXRlIHZvaWQgYWxsb2NhdGVUYWJsZUhlYWRlcihQYXRjaFNjcmlwdCBzY3JpcHQsIGZpbmFsIFNhZmVIdG1sQnVpbGRlciBtKSB7CisgICAgbS5vcGVuVHIoKTsKKworICAgIG0ub3BlblRkKCk7CisgICAgbS5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5pY29uQ2VsbCgpKTsKKyAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmZpbGVDb2x1bW5IZWFkZXIoKSk7CisgICAgbS5jbG9zZVRkKCk7CisKKyAgICBtLm9wZW5UZCgpOworICAgIG0uc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubGluZU51bWJlcigpKTsKKyAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmZpbGVDb2x1bW5IZWFkZXIoKSk7CisgICAgbS5uYnNwKCk7CisgICAgbS5jbG9zZVRkKCk7CisKKyAgICBtLm9wZW5UZCgpOworICAgIG0uc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZmlsZUNvbHVtbkhlYWRlcigpKTsKKyAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmZpbGVMaW5lKCkpOworICAgIG0uY2xvc2VUZCgpOworCisgICAgbS5vcGVuVGQoKTsKKyAgICBtLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmZpbGVDb2x1bW5IZWFkZXIoKSk7CisgICAgbS5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5maWxlTGluZSgpKTsKKyAgICBtLmNsb3NlVGQoKTsKKworICAgIG0ub3BlblRkKCk7CisgICAgbS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOworICAgIG0uYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZmlsZUNvbHVtbkhlYWRlcigpKTsKKyAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnJpZ2h0bW9zdCgpKTsKKyAgICBtLmNsb3NlVGQoKTsKKworICAgIG0uY2xvc2VUcigpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFwcGVuZEZpbGVIZWFkZXIoZmluYWwgU2FmZUh0bWxCdWlsZGVyIG0sIGZpbmFsIFN0cmluZyBsaW5lKSB7CisgICAgbS5vcGVuVHIoKTsKKworICAgIG0ub3BlblRkKCk7CisgICAgbS5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5pY29uQ2VsbCgpKTsKKyAgICBtLmNsb3NlVGQoKTsKKworICAgIG0ub3BlblRkKCk7CisgICAgbS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOworICAgIG0ubmJzcCgpOworICAgIG0uY2xvc2VUZCgpOworCisgICAgbS5vcGVuVGQoKTsKKyAgICBtLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnNpZGVCeVNpZGVUYWJsZUJpbmFyeUhlYWRlcigpKTsKKyAgICBtLnNldEF0dHJpYnV0ZSgiY29sc3BhbiIsIDIpOworICAgIG0uYXBwZW5kKGxpbmUpOworICAgIG0uY2xvc2VUZCgpOworCisgICAgbS5vcGVuVGQoKTsKKyAgICBtLm5ic3AoKTsKKyAgICBtLmNsb3NlVGQoKTsKKworICAgIG0uY2xvc2VUcigpOworICB9CisKICAgcHJpdmF0ZSB2b2lkIGFwcGVuZFNraXBMaW5lKGZpbmFsIFNhZmVIdG1sQnVpbGRlciBtLCBmaW5hbCBpbnQgc2tpcENudCkgewogICAgIG0ub3BlblRyKCk7CiAKQEAgLTMxMCw5ICs0NzQsNyBAQAogCiAgICAgQ2VsbEZvcm1hdHRlciBmbXQgPSB0YWJsZS5nZXRDZWxsRm9ybWF0dGVyKCk7CiAgICAgZm9yIChpbnQgaSA9IDAgKyBvZmZzZXQ7IGkgPCBsb29wVG8gKyBvZmZzZXQ7IGkrKykgewotICAgICAgLy8gVGhlIG92ZXJyaWRkZW4gdmVyc2lvbiBvZiBpbnNlcnRSb3cgYWRkcyBzb21lIGNzcyBjbGFzc2VzIHdlIGRvbid0Ci0gICAgICAvLyB3YW50LgotICAgICAgc3VwZXIuaW5zZXJ0Um93KHJvdyArIGkpOworICAgICAgaW5zZXJ0Um93KHJvdyArIGkpOwogICAgICAgdGFibGUuZ2V0Um93Rm9ybWF0dGVyKCkuc2V0VmVydGljYWxBbGlnbihyb3cgKyBpLAogICAgICAgICAgIEhhc1ZlcnRpY2FsQWxpZ25tZW50LkFMSUdOX1RPUCk7CiAgICAgICBpbnQgbGluZUEgPSBsaW5lLmdldFN0YXJ0QSgpICsgaTsKQEAgLTQzOCw2ICs2MDAsOCBAQAogICAgICAgICAgIG0uYWRkU3R5bGVOYW1lKCJ3ZGkiKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKKyAgICAgIGNhc2UgUkVQTEFDRToKKyAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIG0uYXBwZW5kKGxpbmVIdG1sKTsKICAgICBtLmNsb3NlVGQoKTsKQEAgLTQ2Myw0ICs2MjcsMTMgQEAKICAgcHJpdmF0ZSB2b2lkIGNsb3NlTGluZShmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSkgewogICAgIG0uY2xvc2VUcigpOwogICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGRlc3Ryb3lDb21tZW50Um93KGZpbmFsIGludCByb3cpIHsKKyAgICBzdXBlci5kZXN0cm95Q29tbWVudFJvdyhyb3cpOworICAgIGlmIChyb3cgPT0gUl9IRUFEICsgMSkgeworICAgICAgdGFibGUucmVtb3ZlUm93KHJvdyk7CisgICAgICBpc0ZpbGVDb21tZW50Qm9yZGVyUm93RXhpc3QgPSBmYWxzZTsKKyAgICB9CisgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1VuaWZpZWREaWZmVGFibGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wYXRjaGVzL1VuaWZpZWREaWZmVGFibGUuamF2YQppbmRleCBmMGY2MTllLi44MmRmNTRhIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGF0Y2hlcy9VbmlmaWVkRGlmZlRhYmxlLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3BhdGNoZXMvVW5pZmllZERpZmZUYWJsZS5qYXZhCkBAIC0yMiwxMiArMjIsMTcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Db21tZW50RGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2NyaXB0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2NyaXB0LkRpc3BsYXlNZXRob2Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGF0Y2hTZXREZXRhaWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucHJldHRpZnkuY29tbW9uLkVkaXRMaXN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnByZXR0aWZ5LmNvbW1vbi5FZGl0TGlzdC5IdW5rOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnByZXR0aWZ5LmNvbW1vbi5TcGFyc2VIdG1sRmlsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ET007CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRWxlbWVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5VSU9iamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5IVE1MVGFibGUuQ2VsbEZvcm1hdHRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbEJ1aWxkZXI7CkBAIC00OCw5ICs1MywxNCBAQAogICAgICAgICB9CiAgICAgICB9OwogCisgIHByb3RlY3RlZCBib29sZWFuIGlzRmlsZUNvbW1lbnRCb3JkZXJSb3dFeGlzdDsKKyAgLy8gQ3Vyc29ycy4KKyAgcHJvdGVjdGVkIGludCByb3dPZlRhYmxlSGVhZGVyQjsKKyAgcHJvdGVjdGVkIGludCBib3JkZXJSb3dPZkZpbGVDb21tZW50OworCiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBvbkNlbGxEb3VibGVDbGljayhmaW5hbCBpbnQgcm93LCBmaW5hbCBpbnQgY29sdW1uKSB7Ci0gICAgaWYgKGdldFJvd0l0ZW0ocm93KSBpbnN0YW5jZW9mIFBhdGNoTGluZSkgeworICAgIGlmIChjb2x1bW4gPiBDX0FSUk9XICYmIGdldFJvd0l0ZW0ocm93KSBpbnN0YW5jZW9mIFBhdGNoTGluZSkgewogICAgICAgZmluYWwgUGF0Y2hMaW5lIHBsID0gKFBhdGNoTGluZSkgZ2V0Um93SXRlbShyb3cpOwogICAgICAgc3dpdGNoIChwbC5nZXRUeXBlKCkpIHsKICAgICAgICAgY2FzZSBERUxFVEU6CkBAIC02MCwxMiArNzAsNDIgQEAKICAgICAgICAgY2FzZSBJTlNFUlQ6CiAgICAgICAgICAgY3JlYXRlQ29tbWVudEVkaXRvcihyb3cgKyAxLCBQQywgcGwuZ2V0TGluZUIoKSwgKHNob3J0KSAxKTsKICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBSRVBMQUNFOgorICAgICAgICAgIGJyZWFrOworICAgICAgfQorICAgIH0KKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCB1cGRhdGVDdXJzb3IoZmluYWwgUGF0Y2hMaW5lQ29tbWVudCBuZXdDb21tZW50KSB7CisgICAgaWYgKG5ld0NvbW1lbnQuZ2V0TGluZSgpID09IFJfSEVBRCkgeworICAgICAgZmluYWwgUGF0Y2hTZXQuSWQgcHNJZCA9CisgICAgICAgICAgbmV3Q29tbWVudC5nZXRLZXkoKS5nZXRQYXJlbnRLZXkoKS5nZXRQYXJlbnRLZXkoKTsKKyAgICAgIHN3aXRjaCAobmV3Q29tbWVudC5nZXRTaWRlKCkpIHsKKyAgICAgICAgY2FzZSBGSUxFX1NJREVfQToKKyAgICAgICAgICBpZiAoaWRTaWRlQSA9PSBudWxsICYmIGlkU2lkZUIuZXF1YWxzKHBzSWQpKSB7CisgICAgICAgICAgICByb3dPZlRhYmxlSGVhZGVyQisrOworICAgICAgICAgICAgYm9yZGVyUm93T2ZGaWxlQ29tbWVudCsrOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgIH0KKyAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGSUxFX1NJREVfQjoKKyAgICAgICAgICBpZiAoaWRTaWRlQSAhPSBudWxsICYmIGlkU2lkZUEuZXF1YWxzKHBzSWQpKSB7CisgICAgICAgICAgICByb3dPZlRhYmxlSGVhZGVyQisrOworICAgICAgICAgICAgYm9yZGVyUm93T2ZGaWxlQ29tbWVudCsrOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgIH0KKyAgICAgICAgICBpZiAoaWRTaWRlQi5lcXVhbHMocHNJZCkpIHsKKyAgICAgICAgICAgIGJvcmRlclJvd09mRmlsZUNvbW1lbnQrKzsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICB9CiAgICAgICB9CiAgICAgfQogICB9CiAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIG9uQ2VsbFNpbmdsZUNsaWNrKGludCByb3csIGludCBjb2x1bW4pIHsKKyAgICBzdXBlci5vbkNlbGxTaW5nbGVDbGljayhyb3csIGNvbHVtbik7CiAgICAgaWYgKGNvbHVtbiA9PSAxIHx8IGNvbHVtbiA9PSAyKSB7CiAgICAgICBpZiAoISIiLmVxdWFscyh0YWJsZS5nZXRUZXh0KHJvdywgY29sdW1uKSkpIHsKICAgICAgICAgb25DZWxsRG91YmxlQ2xpY2socm93LCBjb2x1bW4pOwpAQCAtNzQsNiArMTE0LDQzIEBACiAgIH0KIAogICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgZGVzdHJveUNvbW1lbnRSb3coZmluYWwgaW50IHJvdykgeworICAgIHN1cGVyLmRlc3Ryb3lDb21tZW50Um93KHJvdyk7CisgICAgaWYgKHRoaXMucm93T2ZUYWJsZUhlYWRlckIgKyAxID09IHJvdyAmJiByb3cgKyAxID09IGJvcmRlclJvd09mRmlsZUNvbW1lbnQpIHsKKyAgICAgIHRhYmxlLnJlbW92ZVJvdyhyb3cpOworICAgICAgaXNGaWxlQ29tbWVudEJvcmRlclJvd0V4aXN0ID0gZmFsc2U7CisgICAgfQorICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIHJlbW92ZShDb21tZW50RWRpdG9yUGFuZWwgcGFuZWwpIHsKKyAgICBzdXBlci5yZW1vdmUocGFuZWwpOworICAgIGlmIChwYW5lbC5nZXRDb21tZW50KCkuZ2V0TGluZSgpID09IEFic3RyYWN0UGF0Y2hDb250ZW50VGFibGUuUl9IRUFEKSB7CisgICAgICBmaW5hbCBQYXRjaFNldC5JZCBwc0lkID0KKyAgICAgICAgICBwYW5lbC5nZXRDb21tZW50KCkuZ2V0S2V5KCkuZ2V0UGFyZW50S2V5KCkuZ2V0UGFyZW50S2V5KCk7CisgICAgICBzd2l0Y2ggKHBhbmVsLmdldENvbW1lbnQoKS5nZXRTaWRlKCkpIHsKKyAgICAgICAgY2FzZSBGSUxFX1NJREVfQToKKyAgICAgICAgICBpZiAoaWRTaWRlQSA9PSBudWxsICYmIGlkU2lkZUIuZXF1YWxzKHBzSWQpKSB7CisgICAgICAgICAgICByb3dPZlRhYmxlSGVhZGVyQi0tOworICAgICAgICAgICAgYm9yZGVyUm93T2ZGaWxlQ29tbWVudC0tOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgIH0KKyAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGSUxFX1NJREVfQjoKKyAgICAgICAgICBpZiAoaWRTaWRlQSAhPSBudWxsICYmIGlkU2lkZUEuZXF1YWxzKHBzSWQpKSB7CisgICAgICAgICAgICByb3dPZlRhYmxlSGVhZGVyQi0tOworICAgICAgICAgICAgYm9yZGVyUm93T2ZGaWxlQ29tbWVudC0tOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgIH0KKyAgICAgICAgICBpZiAoaWRTaWRlQi5lcXVhbHMocHNJZCkpIHsKKyAgICAgICAgICAgIGJvcmRlclJvd09mRmlsZUNvbW1lbnQtLTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICB9CisgICAgICB9CisgICAgfQorICB9CisKKyAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIG9uSW5zZXJ0Q29tbWVudChmaW5hbCBQYXRjaExpbmUgcGwpIHsKICAgICBmaW5hbCBpbnQgcm93ID0gZ2V0Q3VycmVudFJvdygpOwogICAgIHN3aXRjaCAocGwuZ2V0VHlwZSgpKSB7CkBAIC04NCw2ICsxNjEsOCBAQAogICAgICAgY2FzZSBJTlNFUlQ6CiAgICAgICAgIGNyZWF0ZUNvbW1lbnRFZGl0b3Iocm93ICsgMSwgUEMsIHBsLmdldExpbmVCKCksIChzaG9ydCkgMSk7CiAgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBSRVBMQUNFOgorICAgICAgICBicmVhazsKICAgICB9CiAgIH0KIApAQCAtOTMsMTIzICsxNzIsMTc4IEBACiAgICAgbmMuY2xvc2VFbGVtZW50KCJpbWciKTsKICAgfQogCisgIHByb3RlY3RlZCB2b2lkIGNyZWF0ZUZpbGVDb21tZW50RWRpdG9yT25TaWRlQSgpIHsKKyAgICBjcmVhdGVDb21tZW50RWRpdG9yKFJfSEVBRCArIDEsIFBDLCBSX0hFQUQsIEZJTEVfU0lERV9BKTsKKyAgICByZXR1cm47CisgIH0KKworICBwcm90ZWN0ZWQgdm9pZCBjcmVhdGVGaWxlQ29tbWVudEVkaXRvck9uU2lkZUIoKSB7CisgICAgY3JlYXRlQ29tbWVudEVkaXRvcihyb3dPZlRhYmxlSGVhZGVyQiArIDEsIFBDLCBSX0hFQUQsIEZJTEVfU0lERV9CKTsKKyAgICBjcmVhdGVGaWxlQ29tbWVudEJvcmRlclJvdygpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHBvcHVsYXRlVGFibGVIZWFkZXIoZmluYWwgUGF0Y2hTY3JpcHQgc2NyaXB0LAorICAgICAgZmluYWwgUGF0Y2hTZXREZXRhaWwgZGV0YWlsKSB7CisgICAgaW5pdEhlYWRlcnMoc2NyaXB0LCBkZXRhaWwpOworICAgIHRhYmxlLnNldFdpZGdldChSX0hFQUQsIFBDLCBoZWFkZXJTaWRlQSk7CisgICAgdGFibGUuc2V0V2lkZ2V0KHJvd09mVGFibGVIZWFkZXJCLCBQQywgaGVhZGVyU2lkZUIpOworICAgIHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCkuYWRkU3R5bGVOYW1lKFJfSEVBRCwgUEMsCisgICAgICAgIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkudW5pZmllZFRhYmxlSGVhZGVyKCkpOworICAgIHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCkuYWRkU3R5bGVOYW1lKHJvd09mVGFibGVIZWFkZXJCLCBQQywKKyAgICAgICAgR2Vycml0LlJFU09VUkNFUy5jc3MoKS51bmlmaWVkVGFibGVIZWFkZXIoKSk7CisKKyAgICAvLyBBZGQgaWNvbnMgdG8gbGluZU51bWJlciBjb2x1bW4gaGVhZGVyCisgICAgaWYgKGhlYWRlclNpZGVBLmlzRmlsZU9yQ29tbWl0TWVzc2FnZSgpKSB7CisgICAgICB0YWJsZS5zZXRXaWRnZXQoUl9IRUFELCAxLCBpY29uQSk7CisgICAgfQorICAgIGlmIChoZWFkZXJTaWRlQi5pc0ZpbGVPckNvbW1pdE1lc3NhZ2UoKSkgeworICAgICAgdGFibGUuc2V0V2lkZ2V0KHJvd09mVGFibGVIZWFkZXJCLCAyLCBpY29uQik7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFsbG9jYXRlVGFibGVIZWFkZXIoU2FmZUh0bWxCdWlsZGVyIG5jKSB7CisgICAgcm93T2ZUYWJsZUhlYWRlckIgPSAxOworICAgIGJvcmRlclJvd09mRmlsZUNvbW1lbnQgPSAyOworICAgIGZvciAoaW50IGkgPSBSX0hFQUQ7IGkgPCBib3JkZXJSb3dPZkZpbGVDb21tZW50OyBpKyspIHsKKyAgICAgIG9wZW5UYWJsZUhlYWRlckxpbmUobmMpOworICAgICAgcGFkTGluZU51bWJlck9uVGFibGVIZWFkZXJGb3JTaWRlQShuYyk7CisgICAgICBwYWRMaW5lTnVtYmVyT25UYWJsZUhlYWRlckZvclNpZGVCKG5jKTsKKyAgICAgIG5jLm9wZW5UZCgpOworICAgICAgbmMuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZmlsZUxpbmUoKSk7CisgICAgICBuYy5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5maWxlQ29sdW1uSGVhZGVyKCkpOworICAgICAgbmMuY2xvc2VUZCgpOworICAgICAgY2xvc2VMaW5lKG5jKTsKKyAgICB9CisgIH0KKwogICBAT3ZlcnJpZGUKLSAgcHJvdGVjdGVkIHZvaWQgcmVuZGVyKGZpbmFsIFBhdGNoU2NyaXB0IHNjcmlwdCkgewotICAgIGZpbmFsIFNwYXJzZUh0bWxGaWxlIGEgPSBnZXRTcGFyc2VIdG1sRmlsZUEoc2NyaXB0KTsKLSAgICBmaW5hbCBTcGFyc2VIdG1sRmlsZSBiID0gZ2V0U3BhcnNlSHRtbEZpbGVCKHNjcmlwdCk7CisgIHByb3RlY3RlZCB2b2lkIHJlbmRlcihmaW5hbCBQYXRjaFNjcmlwdCBzY3JpcHQsIGZpbmFsIFBhdGNoU2V0RGV0YWlsIGRldGFpbCkgewogICAgIGZpbmFsIFNhZmVIdG1sQnVpbGRlciBuYyA9IG5ldyBTYWZlSHRtbEJ1aWxkZXIoKTsKKyAgICBhbGxvY2F0ZVRhYmxlSGVhZGVyKG5jKTsKIAogICAgIC8vIERpc3BsYXkgdGhlIHBhdGNoIGhlYWRlcgogICAgIGZvciAoZmluYWwgU3RyaW5nIGxpbmUgOiBzY3JpcHQuZ2V0UGF0Y2hIZWFkZXIoKSkgewogICAgICAgYXBwZW5kRmlsZUhlYWRlcihuYywgbGluZSk7CiAgICAgfQotCi0gICAgaWYgKHNjcmlwdC5nZXREaXNwbGF5TWV0aG9kQSgpID09IERpc3BsYXlNZXRob2QuSU1HCi0gICAgICAgIHx8IHNjcmlwdC5nZXREaXNwbGF5TWV0aG9kQigpID09IERpc3BsYXlNZXRob2QuSU1HKSB7Ci0gICAgICBmaW5hbCBTdHJpbmcgcmF3QmFzZSA9IEdXVC5nZXRIb3N0UGFnZUJhc2VVUkwoKSArICJjYXQvIjsKLQotICAgICAgbmMub3BlblRyKCk7Ci0gICAgICBuYy5zZXRBdHRyaWJ1dGUoInZhbGlnbiIsICJjZW50ZXIiKTsKLSAgICAgIG5jLnNldEF0dHJpYnV0ZSgiYWxpZ24iLCAiY2VudGVyIik7Ci0KLSAgICAgIG5jLm9wZW5UZCgpOwotICAgICAgbmMubmJzcCgpOwotICAgICAgbmMuY2xvc2VUZCgpOwotCi0gICAgICBuYy5vcGVuVGQoKTsKLSAgICAgIG5jLm5ic3AoKTsKLSAgICAgIG5jLmNsb3NlVGQoKTsKLQotICAgICAgbmMub3BlblRkKCk7Ci0gICAgICBuYy5uYnNwKCk7Ci0gICAgICBuYy5jbG9zZVRkKCk7Ci0KLSAgICAgIG5jLm9wZW5UZCgpOwotICAgICAgaWYgKHNjcmlwdC5nZXREaXNwbGF5TWV0aG9kQSgpID09IERpc3BsYXlNZXRob2QuSU1HKSB7Ci0gICAgICAgIGlmIChpZFNpZGVBID09IG51bGwpIHsKLSAgICAgICAgICBhcHBlbmRJbWdUYWcobmMsIHJhd0Jhc2UgKyBLZXlVdGlsLmVuY29kZShwYXRjaEtleS50b1N0cmluZygpKSArICJeMSIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgIFBhdGNoLktleSBrID0gbmV3IFBhdGNoLktleShpZFNpZGVBLCBwYXRjaEtleS5nZXQoKSk7Ci0gICAgICAgICAgYXBwZW5kSW1nVGFnKG5jLCByYXdCYXNlICsgS2V5VXRpbC5lbmNvZGUoay50b1N0cmluZygpKSArICJeMCIpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgICBpZiAoc2NyaXB0LmdldERpc3BsYXlNZXRob2RCKCkgPT0gRGlzcGxheU1ldGhvZC5JTUcpIHsKLSAgICAgICAgYXBwZW5kSW1nVGFnKG5jLCByYXdCYXNlICsgS2V5VXRpbC5lbmNvZGUocGF0Y2hLZXkudG9TdHJpbmcoKSkgKyAiXjAiKTsKLSAgICAgIH0KLSAgICAgIG5jLmNsb3NlVGQoKTsKLQotICAgICAgbmMuY2xvc2VUcigpOwotICAgIH0KLQotICAgIGZpbmFsIGJvb2xlYW4gc3ludGF4SGlnaGxpZ2h0aW5nID0KLSAgICAgICAgc2NyaXB0LmdldERpZmZQcmVmcygpLmlzU3ludGF4SGlnaGxpZ2h0aW5nKCk7CiAgICAgZmluYWwgQXJyYXlMaXN0PFBhdGNoTGluZT4gbGluZXMgPSBuZXcgQXJyYXlMaXN0PFBhdGNoTGluZT4oKTsKLSAgICBmb3IgKGZpbmFsIEVkaXRMaXN0Lkh1bmsgaHVuayA6IHNjcmlwdC5nZXRIdW5rcygpKSB7Ci0gICAgICBhcHBlbmRIdW5rSGVhZGVyKG5jLCBodW5rKTsKLSAgICAgIHdoaWxlIChodW5rLm5leHQoKSkgewotICAgICAgICBpZiAoaHVuay5pc0NvbnRleHRMaW5lKCkpIHsKLSAgICAgICAgICBvcGVuTGluZShuYyk7Ci0gICAgICAgICAgYXBwZW5kTGluZU51bWJlcihuYywgaHVuay5nZXRDdXJBKCkpOwotICAgICAgICAgIGFwcGVuZExpbmVOdW1iZXIobmMsIGh1bmsuZ2V0Q3VyQigpKTsKLSAgICAgICAgICBhcHBlbmRMaW5lVGV4dChuYywgZmFsc2UsIENPTlRFWFQsIGEsIGh1bmsuZ2V0Q3VyQSgpKTsKLSAgICAgICAgICBjbG9zZUxpbmUobmMpOwotICAgICAgICAgIGh1bmsuaW5jQm90aCgpOwotICAgICAgICAgIGxpbmVzLmFkZChuZXcgUGF0Y2hMaW5lKENPTlRFWFQsIGh1bmsuZ2V0Q3VyQSgpLCBodW5rLmdldEN1ckIoKSkpOworICAgIGlmICghaXNEaXNwbGF5QmluYXJ5KSB7CisgICAgICBmaW5hbCBTcGFyc2VIdG1sRmlsZSBhID0gZ2V0U3BhcnNlSHRtbEZpbGVBKHNjcmlwdCk7CisgICAgICBmaW5hbCBTcGFyc2VIdG1sRmlsZSBiID0gZ2V0U3BhcnNlSHRtbEZpbGVCKHNjcmlwdCk7CisgICAgICBpZiAoc2NyaXB0LmdldERpc3BsYXlNZXRob2RBKCkgPT0gRGlzcGxheU1ldGhvZC5JTUcKKyAgICAgICAgICB8fCBzY3JpcHQuZ2V0RGlzcGxheU1ldGhvZEIoKSA9PSBEaXNwbGF5TWV0aG9kLklNRykgeworICAgICAgICBmaW5hbCBTdHJpbmcgcmF3QmFzZSA9IEdXVC5nZXRIb3N0UGFnZUJhc2VVUkwoKSArICJjYXQvIjsKIAotICAgICAgICB9IGVsc2UgaWYgKGh1bmsuaXNEZWxldGVkQSgpKSB7Ci0gICAgICAgICAgb3BlbkxpbmUobmMpOwotICAgICAgICAgIGFwcGVuZExpbmVOdW1iZXIobmMsIGh1bmsuZ2V0Q3VyQSgpKTsKLSAgICAgICAgICBwYWRMaW5lTnVtYmVyKG5jKTsKLSAgICAgICAgICBhcHBlbmRMaW5lVGV4dChuYywgc3ludGF4SGlnaGxpZ2h0aW5nLCBERUxFVEUsIGEsIGh1bmsuZ2V0Q3VyQSgpKTsKLSAgICAgICAgICBjbG9zZUxpbmUobmMpOwotICAgICAgICAgIGh1bmsuaW5jQSgpOwotICAgICAgICAgIGxpbmVzLmFkZChuZXcgUGF0Y2hMaW5lKERFTEVURSwgaHVuay5nZXRDdXJBKCksIDApKTsKLSAgICAgICAgICBpZiAoYS5zaXplKCkgPT0gaHVuay5nZXRDdXJBKCkKLSAgICAgICAgICAgICAgJiYgc2NyaXB0LmdldEEoKS5pc01pc3NpbmdOZXdsaW5lQXRFbmQoKSkgewotICAgICAgICAgICAgYXBwZW5kTm9MRihuYyk7CisgICAgICAgIG5jLm9wZW5UcigpOworICAgICAgICBuYy5zZXRBdHRyaWJ1dGUoInZhbGlnbiIsICJjZW50ZXIiKTsKKyAgICAgICAgbmMuc2V0QXR0cmlidXRlKCJhbGlnbiIsICJjZW50ZXIiKTsKKworICAgICAgICBuYy5vcGVuVGQoKTsKKyAgICAgICAgbmMubmJzcCgpOworICAgICAgICBuYy5jbG9zZVRkKCk7CisKKyAgICAgICAgbmMub3BlblRkKCk7CisgICAgICAgIG5jLm5ic3AoKTsKKyAgICAgICAgbmMuY2xvc2VUZCgpOworCisgICAgICAgIG5jLm9wZW5UZCgpOworICAgICAgICBuYy5uYnNwKCk7CisgICAgICAgIG5jLmNsb3NlVGQoKTsKKworICAgICAgICBuYy5vcGVuVGQoKTsKKyAgICAgICAgaWYgKHNjcmlwdC5nZXREaXNwbGF5TWV0aG9kQSgpID09IERpc3BsYXlNZXRob2QuSU1HKSB7CisgICAgICAgICAgaWYgKGlkU2lkZUEgPT0gbnVsbCkgeworICAgICAgICAgICAgYXBwZW5kSW1nVGFnKG5jLCByYXdCYXNlICsgS2V5VXRpbC5lbmNvZGUocGF0Y2hLZXkudG9TdHJpbmcoKSkgKyAiXjEiKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgUGF0Y2guS2V5IGsgPSBuZXcgUGF0Y2guS2V5KGlkU2lkZUEsIHBhdGNoS2V5LmdldCgpKTsKKyAgICAgICAgICAgIGFwcGVuZEltZ1RhZyhuYywgcmF3QmFzZSArIEtleVV0aWwuZW5jb2RlKGsudG9TdHJpbmcoKSkgKyAiXjAiKTsKICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgaWYgKHNjcmlwdC5nZXREaXNwbGF5TWV0aG9kQigpID09IERpc3BsYXlNZXRob2QuSU1HKSB7CisgICAgICAgICAgYXBwZW5kSW1nVGFnKG5jLCByYXdCYXNlICsgS2V5VXRpbC5lbmNvZGUocGF0Y2hLZXkudG9TdHJpbmcoKSkgKyAiXjAiKTsKKyAgICAgICAgfQorICAgICAgICBuYy5jbG9zZVRkKCk7CiAKLSAgICAgICAgfSBlbHNlIGlmIChodW5rLmlzSW5zZXJ0ZWRCKCkpIHsKLSAgICAgICAgICBvcGVuTGluZShuYyk7Ci0gICAgICAgICAgcGFkTGluZU51bWJlcihuYyk7Ci0gICAgICAgICAgYXBwZW5kTGluZU51bWJlcihuYywgaHVuay5nZXRDdXJCKCkpOwotICAgICAgICAgIGFwcGVuZExpbmVUZXh0KG5jLCBzeW50YXhIaWdobGlnaHRpbmcsIElOU0VSVCwgYiwgaHVuay5nZXRDdXJCKCkpOwotICAgICAgICAgIGNsb3NlTGluZShuYyk7Ci0gICAgICAgICAgaHVuay5pbmNCKCk7Ci0gICAgICAgICAgbGluZXMuYWRkKG5ldyBQYXRjaExpbmUoSU5TRVJULCAwLCBodW5rLmdldEN1ckIoKSkpOwotICAgICAgICAgIGlmIChiLnNpemUoKSA9PSBodW5rLmdldEN1ckIoKQotICAgICAgICAgICAgICAmJiBzY3JpcHQuZ2V0QigpLmlzTWlzc2luZ05ld2xpbmVBdEVuZCgpKSB7Ci0gICAgICAgICAgICBhcHBlbmROb0xGKG5jKTsKKyAgICAgICAgbmMuY2xvc2VUcigpOworICAgICAgfQorCisgICAgICBpZiAoaGFzRGlmZmVyZW5jZXMoc2NyaXB0KSkgeworICAgICAgICBmaW5hbCBib29sZWFuIHN5bnRheEhpZ2hsaWdodGluZyA9CisgICAgICAgICAgICBzY3JpcHQuZ2V0RGlmZlByZWZzKCkuaXNTeW50YXhIaWdobGlnaHRpbmcoKTsKKyAgICAgICAgZm9yIChmaW5hbCBFZGl0TGlzdC5IdW5rIGh1bmsgOiBzY3JpcHQuZ2V0SHVua3MoKSkgeworICAgICAgICAgIGFwcGVuZEh1bmtIZWFkZXIobmMsIGh1bmspOworICAgICAgICAgIHdoaWxlIChodW5rLm5leHQoKSkgeworICAgICAgICAgICAgaWYgKGh1bmsuaXNDb250ZXh0TGluZSgpKSB7CisgICAgICAgICAgICAgIG9wZW5MaW5lKG5jKTsKKyAgICAgICAgICAgICAgYXBwZW5kTGluZU51bWJlckZvclNpZGVBKG5jLCBodW5rLmdldEN1ckEoKSk7CisgICAgICAgICAgICAgIGFwcGVuZExpbmVOdW1iZXJGb3JTaWRlQihuYywgaHVuay5nZXRDdXJCKCkpOworICAgICAgICAgICAgICBhcHBlbmRMaW5lVGV4dChuYywgZmFsc2UsIENPTlRFWFQsIGEsIGh1bmsuZ2V0Q3VyQSgpKTsKKyAgICAgICAgICAgICAgY2xvc2VMaW5lKG5jKTsKKyAgICAgICAgICAgICAgaHVuay5pbmNCb3RoKCk7CisgICAgICAgICAgICAgIGxpbmVzLmFkZChuZXcgUGF0Y2hMaW5lKENPTlRFWFQsIGh1bmsuZ2V0Q3VyQSgpLCBodW5rLmdldEN1ckIoKSkpOworCisgICAgICAgICAgICB9IGVsc2UgaWYgKGh1bmsuaXNEZWxldGVkQSgpKSB7CisgICAgICAgICAgICAgIG9wZW5MaW5lKG5jKTsKKyAgICAgICAgICAgICAgYXBwZW5kTGluZU51bWJlckZvclNpZGVBKG5jLCBodW5rLmdldEN1ckEoKSk7CisgICAgICAgICAgICAgIHBhZExpbmVOdW1iZXJGb3JTaWRlQihuYyk7CisgICAgICAgICAgICAgIGFwcGVuZExpbmVUZXh0KG5jLCBzeW50YXhIaWdobGlnaHRpbmcsIERFTEVURSwgYSwgaHVuay5nZXRDdXJBKCkpOworICAgICAgICAgICAgICBjbG9zZUxpbmUobmMpOworICAgICAgICAgICAgICBodW5rLmluY0EoKTsKKyAgICAgICAgICAgICAgbGluZXMuYWRkKG5ldyBQYXRjaExpbmUoREVMRVRFLCBodW5rLmdldEN1ckEoKSwgLTEpKTsKKyAgICAgICAgICAgICAgaWYgKGEuc2l6ZSgpID09IGh1bmsuZ2V0Q3VyQSgpCisgICAgICAgICAgICAgICAgICAmJiBzY3JpcHQuZ2V0QSgpLmlzTWlzc2luZ05ld2xpbmVBdEVuZCgpKSB7CisgICAgICAgICAgICAgICAgYXBwZW5kTm9MRihuYyk7CisgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgfSBlbHNlIGlmIChodW5rLmlzSW5zZXJ0ZWRCKCkpIHsKKyAgICAgICAgICAgICAgb3BlbkxpbmUobmMpOworICAgICAgICAgICAgICBwYWRMaW5lTnVtYmVyRm9yU2lkZUEobmMpOworICAgICAgICAgICAgICBhcHBlbmRMaW5lTnVtYmVyRm9yU2lkZUIobmMsIGh1bmsuZ2V0Q3VyQigpKTsKKyAgICAgICAgICAgICAgYXBwZW5kTGluZVRleHQobmMsIHN5bnRheEhpZ2hsaWdodGluZywgSU5TRVJULCBiLCBodW5rLmdldEN1ckIoKSk7CisgICAgICAgICAgICAgIGNsb3NlTGluZShuYyk7CisgICAgICAgICAgICAgIGh1bmsuaW5jQigpOworICAgICAgICAgICAgICBsaW5lcy5hZGQobmV3IFBhdGNoTGluZShJTlNFUlQsIC0xLCBodW5rLmdldEN1ckIoKSkpOworICAgICAgICAgICAgICBpZiAoYi5zaXplKCkgPT0gaHVuay5nZXRDdXJCKCkKKyAgICAgICAgICAgICAgICAgICYmIHNjcmlwdC5nZXRCKCkuaXNNaXNzaW5nTmV3bGluZUF0RW5kKCkpIHsKKyAgICAgICAgICAgICAgICBhcHBlbmROb0xGKG5jKTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQogICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgfQogICAgIH0KKyAgICBpZiAoIWhhc0RpZmZlcmVuY2VzKHNjcmlwdCkpIHsKKyAgICAgIGFwcGVuZE5vRGlmZmVyZW5jZXMobmMpOworICAgIH0KICAgICByZXNldEh0bWwobmMpOwotICAgIGluaXRTY3JpcHQoc2NyaXB0KTsKLQotICAgIGludCByb3cgPSBzY3JpcHQuZ2V0UGF0Y2hIZWFkZXIoKS5zaXplKCk7Ci0gICAgZmluYWwgQ2VsbEZvcm1hdHRlciBmbXQgPSB0YWJsZS5nZXRDZWxsRm9ybWF0dGVyKCk7Ci0gICAgZmluYWwgSXRlcmF0b3I8UGF0Y2hMaW5lPiBpTGluZSA9IGxpbmVzLml0ZXJhdG9yKCk7Ci0gICAgd2hpbGUgKGlMaW5lLmhhc05leHQoKSkgewotICAgICAgZmluYWwgUGF0Y2hMaW5lIGwgPSBpTGluZS5uZXh0KCk7Ci0gICAgICBmaW5hbCBTdHJpbmcgbjsKLSAgICAgIHN3aXRjaCAobC5nZXRUeXBlKCkpIHsKLSAgICAgICAgY2FzZSBDT05URVhUOgotICAgICAgICAgIG4gPSBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRpZmZUZXh0Q09OVEVYVCgpOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIERFTEVURToKLSAgICAgICAgICBuID0gR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dERFTEVURSgpOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIElOU0VSVDoKLSAgICAgICAgICBuID0gR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dElOU0VSVCgpOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgIGNvbnRpbnVlOworICAgIHBvcHVsYXRlVGFibGVIZWFkZXIoc2NyaXB0LCBkZXRhaWwpOworICAgIGlmIChoYXNEaWZmZXJlbmNlcyhzY3JpcHQpKSB7CisgICAgICBpbml0U2NyaXB0KHNjcmlwdCk7CisgICAgICBpZiAoIWlzRGlzcGxheUJpbmFyeSkgeworICAgICAgICBpbnQgcm93ID0gc2NyaXB0LmdldFBhdGNoSGVhZGVyKCkuc2l6ZSgpOworICAgICAgICBmaW5hbCBDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKTsKKyAgICAgICAgZmluYWwgSXRlcmF0b3I8UGF0Y2hMaW5lPiBpTGluZSA9IGxpbmVzLml0ZXJhdG9yKCk7CisgICAgICAgIHdoaWxlIChpTGluZS5oYXNOZXh0KCkpIHsKKyAgICAgICAgICBmaW5hbCBQYXRjaExpbmUgbCA9IGlMaW5lLm5leHQoKTsKKyAgICAgICAgICBmaW5hbCBTdHJpbmcgbjsKKyAgICAgICAgICBzd2l0Y2ggKGwuZ2V0VHlwZSgpKSB7CisgICAgICAgICAgICBjYXNlIENPTlRFWFQ6CisgICAgICAgICAgICAgIG4gPSBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRpZmZUZXh0Q09OVEVYVCgpOworICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgREVMRVRFOgorICAgICAgICAgICAgICBuID0gR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dERFTEVURSgpOworICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgSU5TRVJUOgorICAgICAgICAgICAgICBuID0gR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dElOU0VSVCgpOworICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgIH0KKyAgICAgICAgICB3aGlsZSAoIWZtdC5nZXRTdHlsZU5hbWUocm93LCBQQykuY29udGFpbnMobikpIHsKKyAgICAgICAgICAgIHJvdysrOworICAgICAgICAgIH0KKyAgICAgICAgICBzZXRSb3dJdGVtKHJvdysrLCBsKTsKKyAgICAgICAgfQogICAgICAgfQotICAgICAgd2hpbGUgKCFmbXQuZ2V0U3R5bGVOYW1lKHJvdywgUEMpLmNvbnRhaW5zKG4pKSB7Ci0gICAgICAgIHJvdysrOwotICAgICAgfQotICAgICAgc2V0Um93SXRlbShyb3crKywgbCk7CiAgICAgfQogICB9CiAKQEAgLTIyMiwxMCArMzU2LDI4IEBACiAKICAgICBmaW5hbCBBcnJheUxpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gYWxsID0gbmV3IEFycmF5TGlzdDxQYXRjaExpbmVDb21tZW50PigpOwogICAgIGZvciAoaW50IHJvdyA9IDA7IHJvdyA8IHRhYmxlLmdldFJvd0NvdW50KCk7KSB7Ci0gICAgICBpZiAoZ2V0Um93SXRlbShyb3cpIGluc3RhbmNlb2YgUGF0Y2hMaW5lKSB7CisgICAgICBmaW5hbCBMaXN0PFBhdGNoTGluZUNvbW1lbnQ+IGZvcmE7CisgICAgICBmaW5hbCBMaXN0PFBhdGNoTGluZUNvbW1lbnQ+IGZvcmI7CisgICAgICBpZiAocm93ID09IFJfSEVBRCkgeworICAgICAgICBmb3JhID0gY2QuZ2V0Rm9yQShSX0hFQUQpOworICAgICAgICBmb3JiID0gY2QuZ2V0Rm9yQihSX0hFQUQpOworICAgICAgICByb3crKzsKKworICAgICAgICBpZiAoIWZvcmEuaXNFbXB0eSgpKSB7CisgICAgICAgICAgcm93ID0gaW5zZXJ0KGZvcmEsIHJvdywgZXhwYW5kQ29tbWVudHMpOworICAgICAgICB9CisgICAgICAgIHJvd09mVGFibGVIZWFkZXJCID0gcm93OworICAgICAgICBib3JkZXJSb3dPZkZpbGVDb21tZW50ID0gcm93ICsgMTsKKyAgICAgICAgaWYgKCFmb3JiLmlzRW1wdHkoKSkgeworICAgICAgICAgIHJvdysrOy8vIFNraXAgdGhlIEhlYWRlciBvZiBzaWRlQi4KKyAgICAgICAgICByb3cgPSBpbnNlcnQoZm9yYiwgcm93LCBleHBhbmRDb21tZW50cyk7CisgICAgICAgICAgYm9yZGVyUm93T2ZGaWxlQ29tbWVudCA9IHJvdzsKKyAgICAgICAgICBjcmVhdGVGaWxlQ29tbWVudEJvcmRlclJvdygpOworICAgICAgICB9CisgICAgICB9IGVsc2UgaWYgKGdldFJvd0l0ZW0ocm93KSBpbnN0YW5jZW9mIFBhdGNoTGluZSkgewogICAgICAgICBmaW5hbCBQYXRjaExpbmUgcExpbmUgPSAoUGF0Y2hMaW5lKSBnZXRSb3dJdGVtKHJvdyk7Ci0gICAgICAgIGZpbmFsIExpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gZm9yYSA9IGNkLmdldEZvckEocExpbmUuZ2V0TGluZUEoKSk7Ci0gICAgICAgIGZpbmFsIExpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gZm9yYiA9IGNkLmdldEZvckIocExpbmUuZ2V0TGluZUIoKSk7CisgICAgICAgIGZvcmEgPSBjZC5nZXRGb3JBKHBMaW5lLmdldExpbmVBKCkpOworICAgICAgICBmb3JiID0gY2QuZ2V0Rm9yQihwTGluZS5nZXRMaW5lQigpKTsKICAgICAgICAgcm93Kys7CiAKICAgICAgICAgaWYgKCFmb3JhLmlzRW1wdHkoKSAmJiAhZm9yYi5pc0VtcHR5KCkpIHsKQEAgLTI0MywzNiArMzk1LDg0IEBACiAgICAgICAgIH0KICAgICAgIH0gZWxzZSB7CiAgICAgICAgIHJvdysrOworICAgICAgICBjb250aW51ZTsKICAgICAgIH0KICAgICB9CiAgIH0KIAorICBwcml2YXRlIHZvaWQgZGVmYXVsdFN0eWxlKGZpbmFsIGludCByb3csIGZpbmFsIENlbGxGb3JtYXR0ZXIgZm10KSB7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIFBDIC0gMiwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOworICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBQQyAtIDIsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucmlnaHRCb3JkZXIoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIFBDIC0gMSwgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOworICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBQQywgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dCgpKTsKKyAgfQogCiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBpbnNlcnRSb3coZmluYWwgaW50IHJvdykgewogICAgIHN1cGVyLmluc2VydFJvdyhyb3cpOwogICAgIGZpbmFsIENlbGxGb3JtYXR0ZXIgZm10ID0gdGFibGUuZ2V0Q2VsbEZvcm1hdHRlcigpOwotICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBQQyAtIDIsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubGluZU51bWJlcigpKTsKLSAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgUEMgLSAxLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmxpbmVOdW1iZXIoKSk7Ci0gICAgZm10LmFkZFN0eWxlTmFtZShyb3csIFBDLCBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRpZmZUZXh0KCkpOworICAgIGRlZmF1bHRTdHlsZShyb3csIGZtdCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIFBhdGNoU2NyZWVuLlR5cGUgZ2V0UGF0Y2hTY3JlZW5UeXBlKCkgeworICAgIHJldHVybiBQYXRjaFNjcmVlbi5UeXBlLlVOSUZJRUQ7CiAgIH0KIAogICBwcml2YXRlIGludCBpbnNlcnQoZmluYWwgTGlzdDxQYXRjaExpbmVDb21tZW50PiBpbiwgaW50IHJvdywgYm9vbGVhbiBleHBhbmRDb21tZW50KSB7CiAgICAgZm9yIChJdGVyYXRvcjxQYXRjaExpbmVDb21tZW50PiBjaSA9IGluLml0ZXJhdG9yKCk7IGNpLmhhc05leHQoKTspIHsKICAgICAgIGZpbmFsIFBhdGNoTGluZUNvbW1lbnQgYyA9IGNpLm5leHQoKTsKLSAgICAgIGluc2VydFJvdyhyb3cpOworICAgICAgaWYgKGMuZ2V0TGluZSgpID09IFJfSEVBRCkgeworICAgICAgICBpbnNlcnRGaWxlQ29tbWVudFJvdyhyb3cpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgaW5zZXJ0Um93KHJvdyk7CisgICAgICB9CiAgICAgICBiaW5kQ29tbWVudChyb3csIFBDLCBjLCAhY2kuaGFzTmV4dCgpLCBleHBhbmRDb21tZW50KTsKICAgICAgIHJvdysrOwogICAgIH0KICAgICByZXR1cm4gcm93OwogICB9CiAKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGluc2VydEZpbGVDb21tZW50Um93KGZpbmFsIGludCByb3cpIHsKKyAgICB0YWJsZS5pbnNlcnRSb3cocm93KTsKKyAgICBmaW5hbCBDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldENlbGxGb3JtYXR0ZXIoKTsKKworICAgIGZtdC5hZGRTdHlsZU5hbWUocm93LCBDX0FSUk9XLCAvLworICAgICAgICBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmljb25DZWxsT2ZGaWxlQ29tbWVudFJvdygpKTsKKyAgICBkZWZhdWx0U3R5bGUocm93LCBmbXQpOworCisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIENfQVJST1csIC8vCisgICAgICAgIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY2VsbHNOZXh0VG9GaWxlQ29tbWVudCgpKTsKKyAgICBmbXQuYWRkU3R5bGVOYW1lKHJvdywgUEMgLSAyLCAvLworICAgICAgICBHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmNlbGxzTmV4dFRvRmlsZUNvbW1lbnQoKSk7CisgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIFBDIC0gMSwgLy8KKyAgICAgICAgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5jZWxsc05leHRUb0ZpbGVDb21tZW50KCkpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGNyZWF0ZUZpbGVDb21tZW50Qm9yZGVyUm93KCkgeworICAgIGlmICghaXNGaWxlQ29tbWVudEJvcmRlclJvd0V4aXN0KSB7CisgICAgICBpc0ZpbGVDb21tZW50Qm9yZGVyUm93RXhpc3QgPSB0cnVlOworICAgICAgdGFibGUuaW5zZXJ0Um93KGJvcmRlclJvd09mRmlsZUNvbW1lbnQpOworICAgICAgZmluYWwgQ2VsbEZvcm1hdHRlciBmbXQgPSB0YWJsZS5nZXRDZWxsRm9ybWF0dGVyKCk7CisgICAgICBmbXQuYWRkU3R5bGVOYW1lKGJvcmRlclJvd09mRmlsZUNvbW1lbnQsIENfQVJST1csIC8vCisgICAgICAgICAgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5pY29uQ2VsbE9mRmlsZUNvbW1lbnRSb3coKSk7CisgICAgICBkZWZhdWx0U3R5bGUoYm9yZGVyUm93T2ZGaWxlQ29tbWVudCwgZm10KTsKKworICAgICAgZmluYWwgRWxlbWVudCBpY29uQ2VsbCA9CisgICAgICAgICAgZm10LmdldEVsZW1lbnQoYm9yZGVyUm93T2ZGaWxlQ29tbWVudCwgQ19BUlJPVyk7CisgICAgICBVSU9iamVjdC5zZXRTdHlsZU5hbWUoRE9NLmdldFBhcmVudChpY29uQ2VsbCksIC8vCisgICAgICAgICAgR2Vycml0LlJFU09VUkNFUy5jc3MoKS5maWxlQ29tbWVudEJvcmRlcigpLCB0cnVlKTsKKyAgICB9CisgIH0KKwogICBwcml2YXRlIHZvaWQgYXBwZW5kRmlsZUhlYWRlcihmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSwgZmluYWwgU3RyaW5nIGxpbmUpIHsKICAgICBvcGVuTGluZShtKTsKLSAgICBwYWRMaW5lTnVtYmVyKG0pOwotICAgIHBhZExpbmVOdW1iZXIobSk7CisgICAgcGFkTGluZU51bWJlckZvclNpZGVBKG0pOworICAgIHBhZExpbmVOdW1iZXJGb3JTaWRlQihtKTsKIAogICAgIG0ub3BlblRkKCk7CisgICAgbS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5maWxlTGluZSgpKTsKICAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRpZmZUZXh0KCkpOwogICAgIG0uYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGlmZlRleHRGaWxlSGVhZGVyKCkpOwogICAgIG0uYXBwZW5kKGxpbmUpOwpAQCAtMjgyLDEwICs0ODIsMTEgQEAKIAogICBwcml2YXRlIHZvaWQgYXBwZW5kSHVua0hlYWRlcihmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSwgZmluYWwgSHVuayBodW5rKSB7CiAgICAgb3BlbkxpbmUobSk7Ci0gICAgcGFkTGluZU51bWJlcihtKTsKLSAgICBwYWRMaW5lTnVtYmVyKG0pOworICAgIHBhZExpbmVOdW1iZXJGb3JTaWRlQShtKTsKKyAgICBwYWRMaW5lTnVtYmVyRm9yU2lkZUIobSk7CiAKICAgICBtLm9wZW5UZCgpOworICAgIG0uc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZmlsZUxpbmUoKSk7CiAgICAgbS5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5kaWZmVGV4dCgpKTsKICAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRpZmZUZXh0SHVua0hlYWRlcigpKTsKICAgICBtLmFwcGVuZCgiQEAgLSIpOwpAQCAtMzIzLDYgKzUyNCw3IEBACiAgICAgICBmaW5hbCBTcGFyc2VIdG1sRmlsZSBzcmMsIGZpbmFsIGludCBpKSB7CiAgICAgZmluYWwgU2FmZUh0bWwgdGV4dCA9IHNyYy5nZXRTYWZlSHRtbExpbmUoaSk7CiAgICAgbS5vcGVuVGQoKTsKKyAgICBtLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmZpbGVMaW5lKCkpOwogICAgIG0uYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGlmZlRleHQoKSk7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAgICAgICBjYXNlIENPTlRFWFQ6CkBAIC0zNDYsMTQgKzU0OCwxNiBAQAogICAgICAgICBtLmFwcGVuZCgiKyIpOwogICAgICAgICBtLmFwcGVuZCh0ZXh0KTsKICAgICAgICAgYnJlYWs7CisgICAgICBjYXNlIFJFUExBQ0U6CisgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBtLmNsb3NlVGQoKTsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBhcHBlbmROb0xGKGZpbmFsIFNhZmVIdG1sQnVpbGRlciBtKSB7CiAgICAgb3BlbkxpbmUobSk7Ci0gICAgcGFkTGluZU51bWJlcihtKTsKLSAgICBwYWRMaW5lTnVtYmVyKG0pOworICAgIHBhZExpbmVOdW1iZXJGb3JTaWRlQShtKTsKKyAgICBwYWRMaW5lTnVtYmVyRm9yU2lkZUIobSk7CiAgICAgbS5vcGVuVGQoKTsKICAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmRpZmZUZXh0KCkpOwogICAgIG0uYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGlmZlRleHROb0xGKCkpOwpAQCAtMzcwLDIwICs1NzQsNTggQEAKICAgICBtLmNsb3NlVGQoKTsKICAgfQogCisgIHByaXZhdGUgdm9pZCBvcGVuVGFibGVIZWFkZXJMaW5lKGZpbmFsIFNhZmVIdG1sQnVpbGRlciBtKSB7CisgICAgbS5vcGVuVHIoKTsKKyAgICBtLm9wZW5UZCgpOworICAgIG0uc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuaWNvbkNlbGwoKSk7CisgICAgbS5hZGRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5maWxlQ29sdW1uSGVhZGVyKCkpOworICAgIG0uY2xvc2VUZCgpOworICB9CisKICAgcHJpdmF0ZSB2b2lkIGNsb3NlTGluZShmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSkgewogICAgIG0uY2xvc2VUcigpOwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIHBhZExpbmVOdW1iZXIoZmluYWwgU2FmZUh0bWxCdWlsZGVyIG0pIHsKKyAgcHJpdmF0ZSB2b2lkIHBhZExpbmVOdW1iZXJGb3JTaWRlQihmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSkgewogICAgIG0ub3BlblRkKCk7CiAgICAgbS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOwogICAgIG0uY2xvc2VUZCgpOwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIGFwcGVuZExpbmVOdW1iZXIoZmluYWwgU2FmZUh0bWxCdWlsZGVyIG0sIGZpbmFsIGludCBpZHgpIHsKKyAgcHJpdmF0ZSB2b2lkIHBhZExpbmVOdW1iZXJGb3JTaWRlQShmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSkgeworICAgIG0ub3BlblRkKCk7CisgICAgbS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOworICAgIG0uYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucmlnaHRCb3JkZXIoKSk7CisgICAgbS5jbG9zZVRkKCk7CisgIH0KKworICBwcml2YXRlIHZvaWQgYXBwZW5kTGluZU51bWJlckZvclNpZGVCKGZpbmFsIFNhZmVIdG1sQnVpbGRlciBtLCBmaW5hbCBpbnQgaWR4KSB7CiAgICAgbS5vcGVuVGQoKTsKICAgICBtLnNldFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmxpbmVOdW1iZXIoKSk7CiAgICAgbS5hcHBlbmQoU2FmZUh0bWwuYXNpcygiPGEgaHJlZj1cImphdmFzY3JpcHQ6dm9pZCgwKVwiPiIrIChpZHggKyAxKSArICI8L2E+IikpOwogICAgIG0uY2xvc2VUZCgpOwogICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFwcGVuZExpbmVOdW1iZXJGb3JTaWRlQShmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSwgZmluYWwgaW50IGlkeCkgeworICAgIG0ub3BlblRkKCk7CisgICAgbS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOworICAgIG0uYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucmlnaHRCb3JkZXIoKSk7CisgICAgbS5hcHBlbmQoU2FmZUh0bWwuYXNpcygiPGEgaHJlZj1cImphdmFzY3JpcHQ6dm9pZCgwKVwiPiIrIChpZHggKyAxKSArICI8L2E+IikpOworICAgIG0uY2xvc2VUZCgpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHBhZExpbmVOdW1iZXJPblRhYmxlSGVhZGVyRm9yU2lkZUIoZmluYWwgU2FmZUh0bWxCdWlsZGVyIG0pIHsKKyAgICBtLm9wZW5UZCgpOworICAgIG0uc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkubGluZU51bWJlcigpKTsKKyAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLmZpbGVDb2x1bW5IZWFkZXIoKSk7CisgICAgbS5jbG9zZVRkKCk7CisgIH0KKworICBwcml2YXRlIHZvaWQgcGFkTGluZU51bWJlck9uVGFibGVIZWFkZXJGb3JTaWRlQShmaW5hbCBTYWZlSHRtbEJ1aWxkZXIgbSkgeworICAgIG0ub3BlblRkKCk7CisgICAgbS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5lTnVtYmVyKCkpOworICAgIG0uYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZmlsZUNvbHVtbkhlYWRlcigpKTsKKyAgICBtLmFkZFN0eWxlTmFtZShHZXJyaXQuUkVTT1VSQ0VTLmNzcygpLnJpZ2h0Qm9yZGVyKCkpOworICAgIG0uY2xvc2VUZCgpOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcGx1Z2lucy9QbHVnaW5NYXAuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wbHVnaW5zL1BsdWdpbk1hcC5qYXZhCmluZGV4IDZlY2EyMDYuLmU0YzUxNTkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wbHVnaW5zL1BsdWdpbk1hcC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wbHVnaW5zL1BsdWdpbk1hcC5qYXZhCkBAIC0xNiwxMyArMTYsMTQgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuTmF0aXZlTWFwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuUmVzdEFwaTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkFzeW5jQ2FsbGJhY2s7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQucnBjLkFzeW5jQ2FsbGJhY2s7CiAKIC8qKiBQbHVnaW5zIGF2YWlsYWJsZSBmcm9tIHtAY29kZSAvcGx1Z2lucy99LiAqLwogcHVibGljIGNsYXNzIFBsdWdpbk1hcCBleHRlbmRzIE5hdGl2ZU1hcDxQbHVnaW5JbmZvPiB7CiAgIHB1YmxpYyBzdGF0aWMgdm9pZCBhbGwoQXN5bmNDYWxsYmFjazxQbHVnaW5NYXA+IGNhbGxiYWNrKSB7Ci0gICAgbmV3IFJlc3RBcGkoIi9wbHVnaW5zLyIpLmFkZFBhcmFtZXRlclRydWUoImFsbCIpCi0gICAgICAgIC5zZW5kKE5hdGl2ZU1hcC5jb3B5S2V5c0ludG9DaGlsZHJlbihjYWxsYmFjaykpOworICAgIG5ldyBSZXN0QXBpKCIvcGx1Z2lucy8iKQorICAgICAgLmFkZFBhcmFtZXRlclRydWUoImFsbCIpCisgICAgICAuZ2V0KE5hdGl2ZU1hcC5jb3B5S2V5c0ludG9DaGlsZHJlbihjYWxsYmFjaykpOwogICB9CiAKICAgcHJvdGVjdGVkIFBsdWdpbk1hcCgpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wcm9qZWN0cy9Qcm9qZWN0QXBpLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcHJvamVjdHMvUHJvamVjdEFwaS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE2Njc2ZGMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcHJvamVjdHMvUHJvamVjdEFwaS5qYXZhCkBAIC0wLDAgKzEsNTEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnByb2plY3RzOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LlZvaWRSZXN1bHQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYy5SZXN0QXBpOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkphdmFTY3JpcHRPYmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQucnBjLkFzeW5jQ2FsbGJhY2s7CisKK3B1YmxpYyBjbGFzcyBQcm9qZWN0QXBpIHsKKyAgLyoqIENyZWF0ZSBhIG5ldyBwcm9qZWN0ICovCisgIHB1YmxpYyBzdGF0aWMgdm9pZCBjcmVhdGVQcm9qZWN0KFN0cmluZyBwcm9qZWN0TmFtZSwgU3RyaW5nIHBhcmVudCwKKyAgICAgIEJvb2xlYW4gY3JlYXRlRW1wdHlDY29tbWl0LCBCb29sZWFuIHBlcm1pc3Npb25zT25seSwKKyAgICAgIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gYXN5bmNDYWxsYmFjaykgeworICAgIFByb2plY3RJbnB1dCBpbnB1dCA9IFByb2plY3RJbnB1dC5jcmVhdGUoKTsKKyAgICBpbnB1dC5zZXROYW1lKHByb2plY3ROYW1lKTsKKyAgICBpbnB1dC5zZXRQYXJlbnQocGFyZW50KTsKKyAgICBpbnB1dC5zZXRQZXJtaXNzaW9uc09ubHkocGVybWlzc2lvbnNPbmx5KTsKKyAgICBpbnB1dC5zZXRDcmVhdGVFbXB0eUNvbW1pdChjcmVhdGVFbXB0eUNjb21taXQpOworICAgIG5ldyBSZXN0QXBpKCIvcHJvamVjdHMvIikuaWQocHJvamVjdE5hbWUpLmlmTm9uZU1hdGNoKCkKKyAgICAgICAgLnB1dChpbnB1dCwgYXN5bmNDYWxsYmFjayk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBQcm9qZWN0SW5wdXQgZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKKyAgICBzdGF0aWMgUHJvamVjdElucHV0IGNyZWF0ZSgpIHsKKyAgICAgIHJldHVybiAoUHJvamVjdElucHV0KSBjcmVhdGVPYmplY3QoKTsKKyAgICB9CisKKyAgICBwcm90ZWN0ZWQgUHJvamVjdElucHV0KCkgeworICAgIH0KKworICAgIGZpbmFsIG5hdGl2ZSB2b2lkIHNldE5hbWUoU3RyaW5nIG4pIC8qLXsgaWYobil0aGlzLm5hbWU9bjsgfS0qLzsKKworICAgIGZpbmFsIG5hdGl2ZSB2b2lkIHNldFBhcmVudChTdHJpbmcgcCkgLyoteyBpZihwKXRoaXMucGFyZW50PXA7IH0tKi87CisKKyAgICBmaW5hbCBuYXRpdmUgdm9pZCBzZXRQZXJtaXNzaW9uc09ubHkoYm9vbGVhbiBwbykgLyoteyBpZihwbyl0aGlzLnBlcm1pc3Npb25zX29ubHk9cG87IH0tKi87CisKKyAgICBmaW5hbCBuYXRpdmUgdm9pZCBzZXRDcmVhdGVFbXB0eUNvbW1pdChib29sZWFuIGNjKSAvKi17IGlmKGNjKXRoaXMuY3JlYXRlX2VtcHR5X2NvbW1pdD1jYzsgfS0qLzsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3Byb2plY3RzL1Byb2plY3RNYXAuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9wcm9qZWN0cy9Qcm9qZWN0TWFwLmphdmEKaW5kZXggNDA4OTE5ZS4uYmJlYWJkMyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3Byb2plY3RzL1Byb2plY3RNYXAuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcHJvamVjdHMvUHJvamVjdE1hcC5qYXZhCkBAIC0xNiw4ICsxNiw3IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLk5hdGl2ZU1hcDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLlJlc3RBcGk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0Lmh0dHAuY2xpZW50LlVSTDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ycGMuQXN5bmNDYWxsYmFjazsKIAogLyoqIFByb2plY3RzIGF2YWlsYWJsZSBmcm9tIHtAY29kZSAvcHJvamVjdHMvfS4gKi8KIHB1YmxpYyBjbGFzcyBQcm9qZWN0TWFwIGV4dGVuZHMgTmF0aXZlTWFwPFByb2plY3RJbmZvPiB7CkBAIC0yNiw3ICsyNSw3IEBACiAgICAgICAgIC5hZGRQYXJhbWV0ZXJSYXcoInR5cGUiLCAiQUxMIikKICAgICAgICAgLmFkZFBhcmFtZXRlclRydWUoImFsbCIpCiAgICAgICAgIC5hZGRQYXJhbWV0ZXJUcnVlKCJkIikgLy8gZGVzY3JpcHRpb24KLSAgICAgICAgLnNlbmQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNhbGxiYWNrKSk7CisgICAgICAgIC5nZXQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNhbGxiYWNrKSk7CiAgIH0KIAogICBwdWJsaWMgc3RhdGljIHZvaWQgcGVybWlzc2lvbnMoQXN5bmNDYWxsYmFjazxQcm9qZWN0TWFwPiBjYWxsYmFjaykgewpAQCAtMzQsNyArMzMsNyBAQAogICAgICAgICAuYWRkUGFyYW1ldGVyUmF3KCJ0eXBlIiwgIlBFUk1JU1NJT05TIikKICAgICAgICAgLmFkZFBhcmFtZXRlclRydWUoImFsbCIpCiAgICAgICAgIC5hZGRQYXJhbWV0ZXJUcnVlKCJkIikgLy8gZGVzY3JpcHRpb24KLSAgICAgICAgLnNlbmQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNhbGxiYWNrKSk7CisgICAgICAgIC5nZXQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNhbGxiYWNrKSk7CiAgIH0KIAogICBwdWJsaWMgc3RhdGljIHZvaWQgcGFyZW50Q2FuZGlkYXRlcyhBc3luY0NhbGxiYWNrPFByb2plY3RNYXA+IGNhbGxiYWNrKSB7CkBAIC00MiwxNSArNDEsMjggQEAKICAgICAgICAgLmFkZFBhcmFtZXRlclJhdygidHlwZSIsICJQQVJFTlRfQ0FORElEQVRFUyIpCiAgICAgICAgIC5hZGRQYXJhbWV0ZXJUcnVlKCJhbGwiKQogICAgICAgICAuYWRkUGFyYW1ldGVyVHJ1ZSgiZCIpIC8vIGRlc2NyaXB0aW9uCi0gICAgICAgIC5zZW5kKE5hdGl2ZU1hcC5jb3B5S2V5c0ludG9DaGlsZHJlbihjYWxsYmFjaykpOworICAgICAgICAuZ2V0KE5hdGl2ZU1hcC5jb3B5S2V5c0ludG9DaGlsZHJlbihjYWxsYmFjaykpOwogICB9CiAKICAgcHVibGljIHN0YXRpYyB2b2lkIHN1Z2dlc3QoU3RyaW5nIHByZWZpeCwgaW50IGxpbWl0LCBBc3luY0NhbGxiYWNrPFByb2plY3RNYXA+IGNiKSB7Ci0gICAgbmV3IFJlc3RBcGkoIi9wcm9qZWN0cy8iICsgVVJMLmVuY29kZShwcmVmaXgpLnJlcGxhY2VBbGwoIls/XSIsICIlM0YiKSkKLSAgICAgICAgLmFkZFBhcmFtZXRlclJhdygidHlwZSIsICJBTEwiKQorICAgIG5ldyBSZXN0QXBpKCIvcHJvamVjdHMvIikKKyAgICAgICAgLmFkZFBhcmFtZXRlcigicCIsIHByZWZpeCkKICAgICAgICAgLmFkZFBhcmFtZXRlcigibiIsIGxpbWl0KQorICAgICAgICAuYWRkUGFyYW1ldGVyUmF3KCJ0eXBlIiwgIkFMTCIpCiAgICAgICAgIC5hZGRQYXJhbWV0ZXJUcnVlKCJkIikgLy8gZGVzY3JpcHRpb24KLSAgICAgICAgLnNlbmQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNiKSk7CisgICAgICAgIC5nZXQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNiKSk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIHZvaWQgbWF0Y2goU3RyaW5nIG1hdGNoLCBBc3luY0NhbGxiYWNrPFByb2plY3RNYXA+IGNiKSB7CisgICAgaWYgKG1hdGNoID09IG51bGwgfHwgIiIuZXF1YWxzKG1hdGNoKSkgeworICAgICAgYWxsKGNiKTsKKyAgICB9IGVsc2UgeworICAgICAgbmV3IFJlc3RBcGkoIi9wcm9qZWN0cy8iKQorICAgICAgICAgIC5hZGRQYXJhbWV0ZXIoIm0iLCBtYXRjaCkKKyAgICAgICAgICAuYWRkUGFyYW1ldGVyUmF3KCJ0eXBlIiwgIkFMTCIpCisgICAgICAgICAgLmFkZFBhcmFtZXRlclRydWUoImQiKSAvLyBkZXNjcmlwdGlvbgorICAgICAgICAgIC5nZXQoTmF0aXZlTWFwLmNvcHlLZXlzSW50b0NoaWxkcmVuKGNiKSk7CisgICAgfQogICB9CiAKICAgcHJvdGVjdGVkIFByb2plY3RNYXAoKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcXVlcnlJY29uLnBuZyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9xdWVyeUljb24ucG5nCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjVhYWNlNTEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcXVlcnlJY29uLnBuZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL0NhbGxiYWNrR3JvdXAuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvQ2FsbGJhY2tHcm91cC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBiMWY5MDUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL0NhbGxiYWNrR3JvdXAuamF2YQpAQCAtMCwwICsxLDEyMSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ycGMuQXN5bmNDYWxsYmFjazsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKKworLyoqCisgKiBDbGFzcyBmb3IgZ3JvdXBpbmcgdG9nZXRoZXIgY2FsbGJhY2tzIGFuZCBjYWxsaW5nIHRoZW0gaW4gb3JkZXIuCisgKiA8cD4KKyAqIENhbGxiYWNrcyBhcmUgYWRkZWQgdG8gdGhlIGdyb3VwIHdpdGgge0BsaW5rICNhZGQoQXN5bmNDYWxsYmFjayl9LCB3aGljaAorICogcmV0dXJucyBhIHdyYXBwZWQgY2FsbGJhY2sgc3VpdGFibGUgZm9yIHBhc3NpbmcgdG8gYW4gYXN5bmNocm9ub3VzIFJQQyBjYWxsLgorICogVGhlIGVuY2xvc2luZyBncm91cCBidWZmZXJzIHJldHVybmVkIHJlc3VsdHMgYW5kIGVuc3VyZXMgdGhhdAorICoge0Bjb2RlIG9uU3VjY2Vzc30gaXMgY2FsbGVkIGV4YWN0bHkgb25jZSBmb3IgZWFjaCBjYWxsYmFjayBpbiB0aGUgZ3JvdXAsIGluCisgKiB0aGUgc2FtZSBvcmRlciB0aGF0IGNhbGxiYWNrcyB3ZXJlIGFkZGVkLiBUaGlzIGFsbG93cyBjYWxsZXJzIHRvLCBmb3IKKyAqIGV4YW1wbGUsIHVzZSBhIHtAbGluayBTY3JlZW5Mb2FkQ2FsbGJhY2t9IGFzIHRoZSBsYXN0IGNhbGxiYWNrIGluIHRoZSBsaXN0CisgKiBhbmQgb25seSBkaXNwbGF5IHRoZSBzY3JlZW4gb25jZSBhbGwgY2FsbGJhY2tzIGhhdmUgc3VjY2VlZGVkLgorICogPHA+CisgKiBJbiB0aGUgZXZlbnQgb2YgYSBmYWlsdXJlLCB0aGUgPGVtPmZpcnN0PC9lbT4gY2F1Z2h0IGV4Y2VwdGlvbiBpcyBzZW50IHRvCisgKiA8ZW0+YWxsPC9lbT4gY2FsbGJhY2tzJyB7QGNvZGUgb25GYWlsdXJlfSBtZXRob2RzLCBpbiBvcmRlcjsgc3Vic2VxdWVudAorICogc3VjY2Vzc2VzIG9yIGZhaWx1cmVzIGFyZSBhbGwgaWdub3JlZC4gTm90ZSB0aGF0IHRoaXMgbWVhbnMKKyAqIHtAY29kZSBvbkZhaWx1cmV9IG1heSBiZSBjYWxsZWQgd2l0aCBhbiBleGNlcHRpb24gdW5yZWxhdGVkIHRvIHRoZSBjYWxsYmFjaworICogcHJvY2Vzc2luZyBpdC4KKyAqLworcHVibGljIGNsYXNzIENhbGxiYWNrR3JvdXAgeworICBwcml2YXRlIGZpbmFsIExpc3Q8T2JqZWN0PiBjYWxsYmFja3M7CisgIHByaXZhdGUgZmluYWwgTWFwPE9iamVjdCwgT2JqZWN0PiByZXN1bHRzOworICBwcml2YXRlIGJvb2xlYW4gZmFpbGVkOworCisgIHB1YmxpYyBDYWxsYmFja0dyb3VwKCkgeworICAgIGNhbGxiYWNrcyA9IG5ldyBBcnJheUxpc3Q8T2JqZWN0PigpOworICAgIHJlc3VsdHMgPSBuZXcgSGFzaE1hcDxPYmplY3QsIE9iamVjdD4oKTsKKyAgfQorCisgIHB1YmxpYyA8VD4gQXN5bmNDYWxsYmFjazxUPiBhZGQoZmluYWwgQXN5bmNDYWxsYmFjazxUPiBjYikgeworICAgIGNhbGxiYWNrcy5hZGQoY2IpOworICAgIHJldHVybiBuZXcgQXN5bmNDYWxsYmFjazxUPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKFQgcmVzdWx0KSB7CisgICAgICAgIHJlc3VsdHMucHV0KGNiLCByZXN1bHQpOworICAgICAgICBDYWxsYmFja0dyb3VwLnRoaXMub25TdWNjZXNzKCk7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICAgICAgQ2FsbGJhY2tHcm91cC50aGlzLm9uRmFpbHVyZShjYXVnaHQpOworICAgICAgfQorICAgIH07CisgIH0KKworICBwdWJsaWMgPFQ+IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazxUPiBhZGRHd3Rqc29ucnBjKAorICAgICAgZmluYWwgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrPFQ+IGNiKSB7CisgICAgY2FsbGJhY2tzLmFkZChjYik7CisgICAgcmV0dXJuIG5ldyBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkFzeW5jQ2FsbGJhY2s8VD4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uU3VjY2VzcyhUIHJlc3VsdCkgeworICAgICAgICByZXN1bHRzLnB1dChjYiwgcmVzdWx0KTsKKyAgICAgICAgQ2FsbGJhY2tHcm91cC50aGlzLm9uU3VjY2VzcygpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgY2F1Z2h0KSB7CisgICAgICAgIENhbGxiYWNrR3JvdXAudGhpcy5vbkZhaWx1cmUoY2F1Z2h0KTsKKyAgICAgIH0KKyAgICB9OworICB9CisKKyAgcHJpdmF0ZSB2b2lkIG9uU3VjY2VzcygpIHsKKyAgICBpZiAocmVzdWx0cy5zaXplKCkgPCBjYWxsYmFja3Muc2l6ZSgpKSB7CisgICAgICByZXR1cm47CisgICAgfQorICAgIGZvciAoT2JqZWN0IG8gOiBjYWxsYmFja3MpIHsKKyAgICAgIE9iamVjdCByZXN1bHQgPSByZXN1bHRzLmdldChvKTsKKyAgICAgIGlmIChvIGluc3RhbmNlb2YgQXN5bmNDYWxsYmFjaykgeworICAgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgICAgQXN5bmNDYWxsYmFjazxPYmplY3Q+IGNiID0gKEFzeW5jQ2FsbGJhY2s8T2JqZWN0PikgbzsKKyAgICAgICAgY2Iub25TdWNjZXNzKHJlc3VsdCk7CisgICAgICB9IGVsc2UgeworICAgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgICAgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrPE9iamVjdD4gY2IgPQorICAgICAgICAgICAgKGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazxPYmplY3Q+KSBvOworICAgICAgICBjYi5vblN1Y2Nlc3MocmVzdWx0KTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgb25GYWlsdXJlKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICBpZiAoZmFpbGVkKSB7CisgICAgICByZXR1cm47CisgICAgfQorICAgIGZhaWxlZCA9IHRydWU7CisgICAgZm9yIChPYmplY3QgbyA6IGNhbGxiYWNrcykgeworICAgICAgaWYgKG8gaW5zdGFuY2VvZiBBc3luY0NhbGxiYWNrKSB7CisgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICAgICAgICBBc3luY0NhbGxiYWNrPE9iamVjdD4gY2IgPSAoQXN5bmNDYWxsYmFjazxPYmplY3Q+KSBvOworICAgICAgICBjYi5vbkZhaWx1cmUoY2F1Z2h0KTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICAgICAgICBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkFzeW5jQ2FsbGJhY2s8T2JqZWN0PiBjYiA9CisgICAgICAgICAgICAoY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrPE9iamVjdD4pIG87CisgICAgICAgIGNiLm9uRmFpbHVyZShjYXVnaHQpOworICAgICAgfQorICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9HZXJyaXRDYWxsYmFjay5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9HZXJyaXRDYWxsYmFjay5qYXZhCmluZGV4IGRjZTViYjYuLjA2ZDFmMGIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvR2Vycml0Q2FsbGJhY2suamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL0dlcnJpdENhbGxiYWNrLmphdmEKQEAgLTI0LDE0ICsyNCwxNSBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob3RTaWduZWRJbkV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5JbnZvY2F0aW9uRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jbGllbnQuUmVtb3RlSnNvbkV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY2xpZW50LlNlcnZlclVuYXZhaWxhYmxlRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uSnNvbkNvbnN0YW50czsKIAogLyoqIEFic3RyYWN0IGNhbGxiYWNrIGhhbmRsaW5nIGdlbmVyaWMgZXJyb3IgY29uZGl0aW9ucyBhdXRvbWF0aWNhbGx5ICovCi1wdWJsaWMgYWJzdHJhY3QgY2xhc3MgR2Vycml0Q2FsbGJhY2s8VD4gaW1wbGVtZW50cyBBc3luY0NhbGxiYWNrPFQ+IHsKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBHZXJyaXRDYWxsYmFjazxUPiBpbXBsZW1lbnRzCisgICAgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrPFQ+LAorICAgIGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrPFQ+IHsKICAgcHVibGljIHZvaWQgb25GYWlsdXJlKGZpbmFsIFRocm93YWJsZSBjYXVnaHQpIHsKICAgICBpZiAoaXNOb3RTaWduZWRJbihjYXVnaHQpIHx8IGlzSW52YWxpZFhTUkYoY2F1Z2h0KSkgewogICAgICAgbmV3IE5vdFNpZ25lZEluRGlhbG9nKCkuY2VudGVyKCk7CkBAIC01Myw3ICs1NCw5IEBACiAgICAgICBkLmNlbnRlcigpOwogCiAgICAgfSBlbHNlIGlmIChpc05hbWVBbHJlYWR5VXNlZChjYXVnaHQpKSB7Ci0gICAgICBuZXcgRXJyb3JEaWFsb2coR2Vycml0LkMubmFtZUFscmVhZHlVc2VkQm9keSgpKS5jZW50ZXIoKTsKKyAgICAgIGZpbmFsIFN0cmluZyBtc2cgPSBjYXVnaHQuZ2V0TWVzc2FnZSgpOworICAgICAgZmluYWwgU3RyaW5nIGFscmVhZHlVc2VkTmFtZSA9IG1zZy5zdWJzdHJpbmcoTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uLk1FU1NBR0UubGVuZ3RoKCkpOworICAgICAgbmV3IEVycm9yRGlhbG9nKEdlcnJpdC5NLm5hbWVBbHJlYWR5VXNlZEJvZHkoYWxyZWFkeVVzZWROYW1lKSkuY2VudGVyKCk7CiAKICAgICB9IGVsc2UgaWYgKGlzTm9TdWNoR3JvdXAoY2F1Z2h0KSkgewogICAgICAgZmluYWwgU3RyaW5nIG1zZyA9IGNhdWdodC5nZXRNZXNzYWdlKCk7CkBAIC03NiwxNCArNzksMTYgQEAKICAgICAgICAgJiYgY2F1Z2h0LmdldE1lc3NhZ2UoKS5lcXVhbHMoSnNvbkNvbnN0YW50cy5FUlJPUl9JTlZBTElEX1hTUkYpOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc05vdFNpZ25lZEluKGZpbmFsIFRocm93YWJsZSBjYXVnaHQpIHsKLSAgICByZXR1cm4gY2F1Z2h0IGluc3RhbmNlb2YgUmVtb3RlSnNvbkV4Y2VwdGlvbgotICAgICAgICAmJiBjYXVnaHQuZ2V0TWVzc2FnZSgpLmVxdWFscyhOb3RTaWduZWRJbkV4Y2VwdGlvbi5NRVNTQUdFKTsKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc05vdFNpZ25lZEluKFRocm93YWJsZSBjYXVnaHQpIHsKKyAgICByZXR1cm4gUmVzdEFwaS5pc05vdFNpZ25lZEluKGNhdWdodCkKKyAgICAgICAgfHwgKGNhdWdodCBpbnN0YW5jZW9mIFJlbW90ZUpzb25FeGNlcHRpb24KKyAgICAgICAgICAgJiYgY2F1Z2h0LmdldE1lc3NhZ2UoKS5lcXVhbHMoTm90U2lnbmVkSW5FeGNlcHRpb24uTUVTU0FHRSkpOwogICB9CiAKLSAgcHJvdGVjdGVkIHN0YXRpYyBib29sZWFuIGlzTm9TdWNoRW50aXR5KGZpbmFsIFRocm93YWJsZSBjYXVnaHQpIHsKLSAgICByZXR1cm4gY2F1Z2h0IGluc3RhbmNlb2YgUmVtb3RlSnNvbkV4Y2VwdGlvbgotICAgICAgICAmJiBjYXVnaHQuZ2V0TWVzc2FnZSgpLmVxdWFscyhOb1N1Y2hFbnRpdHlFeGNlcHRpb24uTUVTU0FHRSk7CisgIHByb3RlY3RlZCBzdGF0aWMgYm9vbGVhbiBpc05vU3VjaEVudGl0eShUaHJvd2FibGUgY2F1Z2h0KSB7CisgICAgcmV0dXJuIFJlc3RBcGkuaXNOb3RGb3VuZChjYXVnaHQpCisgICAgICAgIHx8IChjYXVnaHQgaW5zdGFuY2VvZiBSZW1vdGVKc29uRXhjZXB0aW9uCisgICAgICAgICAgICAmJiBjYXVnaHQuZ2V0TWVzc2FnZSgpLmVxdWFscyhOb1N1Y2hFbnRpdHlFeGNlcHRpb24uTUVTU0FHRSkpOwogICB9CiAKICAgcHJvdGVjdGVkIHN0YXRpYyBib29sZWFuIGlzSW5hY3RpdmVBY2NvdW50KGZpbmFsIFRocm93YWJsZSBjYXVnaHQpIHsKQEAgLTk4LDcgKzEwMyw3IEBACiAKICAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc05hbWVBbHJlYWR5VXNlZChmaW5hbCBUaHJvd2FibGUgY2F1Z2h0KSB7CiAgICAgcmV0dXJuIGNhdWdodCBpbnN0YW5jZW9mIFJlbW90ZUpzb25FeGNlcHRpb24KLSAgICAgICAgJiYgY2F1Z2h0LmdldE1lc3NhZ2UoKS5lcXVhbHMoTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uLk1FU1NBR0UpOworICAgICAgICAmJiBjYXVnaHQuZ2V0TWVzc2FnZSgpLnN0YXJ0c1dpdGgoTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uLk1FU1NBR0UpOwogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc05vU3VjaEdyb3VwKGZpbmFsIFRocm93YWJsZSBjYXVnaHQpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvTmF0aXZlTGlzdC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9OYXRpdmVMaXN0LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGU4MjBmZTAuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9OYXRpdmVMaXN0LmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw1NSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYzsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkphdmFTY3JpcHRPYmplY3Q7Ci0KLWltcG9ydCBqYXZhLnV0aWwuQWJzdHJhY3RMaXN0OwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotCi0vKiogQSByZWFkLW9ubHkgbGlzdCBvZiBuYXRpdmUgSmF2YVNjcmlwdCBvYmplY3RzIHN0b3JlZCBpbiBhIEpTT04gYXJyYXkuICovCi1wdWJsaWMgY2xhc3MgTmF0aXZlTGlzdDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKLSAgcHJvdGVjdGVkIE5hdGl2ZUxpc3QoKSB7Ci0gIH0KLQotICBwdWJsaWMgZmluYWwgTGlzdDxUPiBhc0xpc3QoKSB7Ci0gICAgcmV0dXJuIG5ldyBBYnN0cmFjdExpc3Q8VD4oKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyBUIHNldChpbnQgaW5kZXgsIFQgZWxlbWVudCkgewotICAgICAgICBUIG9sZCA9IE5hdGl2ZUxpc3QudGhpcy5nZXQoaW5kZXgpOwotICAgICAgICBOYXRpdmVMaXN0LnRoaXMuc2V0MChpbmRleCwgZWxlbWVudCk7Ci0gICAgICAgIHJldHVybiBvbGQ7Ci0gICAgICB9Ci0KLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIFQgZ2V0KGludCBpbmRleCkgewotICAgICAgICByZXR1cm4gTmF0aXZlTGlzdC50aGlzLmdldChpbmRleCk7Ci0gICAgICB9Ci0KLSAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIGludCBzaXplKCkgewotICAgICAgICByZXR1cm4gTmF0aXZlTGlzdC50aGlzLnNpemUoKTsKLSAgICAgIH0KLSAgICB9OwotICB9Ci0KLSAgcHVibGljIGZpbmFsIGJvb2xlYW4gaXNFbXB0eSgpIHsKLSAgICByZXR1cm4gc2l6ZSgpID09IDA7Ci0gIH0KLQotICBwdWJsaWMgZmluYWwgbmF0aXZlIGludCBzaXplKCkgLyoteyByZXR1cm4gdGhpcy5sZW5ndGg7IH0tKi87Ci0gIHB1YmxpYyBmaW5hbCBuYXRpdmUgVCBnZXQoaW50IGkpIC8qLXsgcmV0dXJuIHRoaXNbaV07IH0tKi87Ci0gIHByaXZhdGUgZmluYWwgbmF0aXZlIHZvaWQgc2V0MChpbnQgaSwgVCB2KSAvKi17IHRoaXNbaV0gPSB2OyB9LSovOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9OYXRpdmVNYXAuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvTmF0aXZlTWFwLmphdmEKaW5kZXggY2RlOTA0MS4uZDU2ZWVhZiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9OYXRpdmVNYXAuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL05hdGl2ZU1hcC5qYXZhCkBAIC0xNSw3ICsxNSw4IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5KYXZhU2NyaXB0T2JqZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5Kc0FycmF5OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOwogCiBpbXBvcnQgamF2YS51dGlsLlNldDsKIApAQCAtNTMsNyArNTQsNyBAQAogICAgIHJldHVybiBOYXRpdmVzLmtleXModGhpcyk7CiAgIH0KIAotICBwdWJsaWMgZmluYWwgbmF0aXZlIE5hdGl2ZUxpc3Q8VD4gdmFsdWVzKCkKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBKc0FycmF5PFQ+IHZhbHVlcygpCiAgIC8qLXsKICAgICB2YXIgcyA9IHRoaXM7CiAgICAgdmFyIHYgPSBbXTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvTmF0aXZlU3RyaW5nLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL05hdGl2ZVN0cmluZy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU3M2M1ZTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL05hdGl2ZVN0cmluZy5qYXZhCkBAIC0wLDAgKzEsNDggQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjOworCitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSmF2YVNjcmlwdE9iamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ycGMuQXN5bmNDYWxsYmFjazsKKworLyoqIFdyYXBzIGEgU3RyaW5nIHRoYXQgd2FzIHJldHVybmVkIGZyb20gYSBKU09OIEFQSS4gKi8KK3B1YmxpYyBmaW5hbCBjbGFzcyBOYXRpdmVTdHJpbmcgZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0IHsKKyAgc3RhdGljIE5hdGl2ZVN0cmluZyB3cmFwKFN0cmluZyB2YWx1ZSkgeworICAgIE5hdGl2ZVN0cmluZyBucyA9IChOYXRpdmVTdHJpbmcpIGNyZWF0ZU9iamVjdCgpOworICAgIG5zLnNldCh2YWx1ZSk7CisgICAgcmV0dXJuIG5zOworICB9CisKKyAgcHVibGljIGZpbmFsIG5hdGl2ZSBTdHJpbmcgYXNTdHJpbmcoKSAvKi17IHJldHVybiB0aGlzLnM7IH0tKi87CisgIHByaXZhdGUgZmluYWwgbmF0aXZlIHZvaWQgc2V0KFN0cmluZyB2KSAvKi17IHRoaXMucyA9IHY7IH0tKi87CisKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBBc3luY0NhbGxiYWNrPE5hdGl2ZVN0cmluZz4KKyAgdW53cmFwKGZpbmFsIEFzeW5jQ2FsbGJhY2s8U3RyaW5nPiBjYikgeworICAgIHJldHVybiBuZXcgQXN5bmNDYWxsYmFjazxOYXRpdmVTdHJpbmc+KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoTmF0aXZlU3RyaW5nIHJlc3VsdCkgeworICAgICAgICBjYi5vblN1Y2Nlc3MocmVzdWx0ICE9IG51bGwgPyByZXN1bHQuYXNTdHJpbmcoKSA6IG51bGwpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShUaHJvd2FibGUgY2F1Z2h0KSB7CisgICAgICAgIGNiLm9uRmFpbHVyZShjYXVnaHQpOworICAgICAgfQorICAgIH07CisgIH0KKworICBwcm90ZWN0ZWQgTmF0aXZlU3RyaW5nKCkgeworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL05hdGl2ZXMuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvTmF0aXZlcy5qYXZhCmluZGV4IGE2YzYwOWMuLjQxZjBmMjMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvTmF0aXZlcy5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvTmF0aXZlcy5qYXZhCkBAIC0xNSw5ICsxNSwxMiBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSmF2YVNjcmlwdE9iamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5Kc0FycmF5OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0Lmpzb24uY2xpZW50LkpTT05PYmplY3Q7CiAKK2ltcG9ydCBqYXZhLnV0aWwuQWJzdHJhY3RMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiBwdWJsaWMgY2xhc3MgTmF0aXZlcyB7CkBAIC0zMiwxNiArMzUsNTEgQEAKICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlTZXQoKTsKICAgfQogCi0gIHB1YmxpYyBzdGF0aWMgPFQgZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0PiBUIHBhcnNlSlNPTihTdHJpbmcganNvbikgewotICAgIGlmIChwYXJzZXIgPT0gbnVsbCkgewotICAgICAgcGFyc2VyID0gYmVzdEpzb25QYXJzZXIoKTsKKyAgcHVibGljIHN0YXRpYyA8VCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3Q+IExpc3Q8VD4gYXNMaXN0KAorICAgICAgZmluYWwgSnNBcnJheTxUPiBhcnIpIHsKKyAgICBpZiAoYXJyID09IG51bGwpIHsKKyAgICAgIHJldHVybiBudWxsOwogICAgIH0KLSAgICAvLyBqYXZhYyBnZW5lcmljcyBidWcKLSAgICByZXR1cm4gTmF0aXZlcy48VD5wYXJzZTAocGFyc2VyLCBqc29uKTsKKyAgICByZXR1cm4gbmV3IEFic3RyYWN0TGlzdDxUPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIFQgc2V0KGludCBpbmRleCwgVCBlbGVtZW50KSB7CisgICAgICAgIFQgb2xkID0gYXJyLmdldChpbmRleCk7CisgICAgICAgIGFyci5zZXQoaW5kZXgsIGVsZW1lbnQpOworICAgICAgICByZXR1cm4gb2xkOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBUIGdldChpbnQgaW5kZXgpIHsKKyAgICAgICAgcmV0dXJuIGFyci5nZXQoaW5kZXgpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBpbnQgc2l6ZSgpIHsKKyAgICAgICAgcmV0dXJuIGFyci5sZW5ndGgoKTsKKyAgICAgIH0KKyAgICB9OworICB9CisKKyAgcHVibGljIHN0YXRpYyA8VCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3Q+IEpzQXJyYXk8VD4gYXJyYXlPZihUIGVsZW1lbnQpIHsKKyAgICBKc0FycmF5PFQ+IGFyciA9IEphdmFTY3JpcHRPYmplY3QuY3JlYXRlQXJyYXkoKS5jYXN0KCk7CisgICAgYXJyLnB1c2goZWxlbWVudCk7CisgICAgcmV0dXJuIGFycjsKKyAgfQorCisgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICBwdWJsaWMgc3RhdGljIDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gVCBwYXJzZUpTT04oU3RyaW5nIGpzb24pIHsKKyAgICBpZiAoanNvbi5zdGFydHNXaXRoKCJcIiIpKSB7CisgICAgICByZXR1cm4gKFQpIE5hdGl2ZVN0cmluZy53cmFwKHBhcnNlU3RyaW5nKHBhcnNlciwganNvbikpOworICAgIH0KKyAgICByZXR1cm4gTmF0aXZlcy48VD4gcGFyc2VPYmplY3QocGFyc2VyLCBqc29uKTsgLy8gamF2YWMgZ2VuZXJpY3MgYnVnCiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBuYXRpdmUgPFQgZXh0ZW5kcyBKYXZhU2NyaXB0T2JqZWN0PgotICBUIHBhcnNlMChKYXZhU2NyaXB0T2JqZWN0IHAsIFN0cmluZyBzKQorICBUIHBhcnNlT2JqZWN0KEphdmFTY3JpcHRPYmplY3QgcCwgU3RyaW5nIHMpCisgIC8qLXsgcmV0dXJuIHAocyk7IH0tKi87CisKKyAgcHJpdmF0ZSBzdGF0aWMgbmF0aXZlCisgIFN0cmluZyBwYXJzZVN0cmluZyhKYXZhU2NyaXB0T2JqZWN0IHAsIFN0cmluZyBzKQogICAvKi17IHJldHVybiBwKHMpOyB9LSovOwogCiAgIHByaXZhdGUgc3RhdGljIEphdmFTY3JpcHRPYmplY3QgcGFyc2VyOwpAQCAtNTIsNiArOTAsMTAgQEAKICAgICByZXR1cm4gZnVuY3Rpb24ocykgeyByZXR1cm4gZXZhbCgnKCcgKyBzICsgJyknKTsgfTsKICAgfS0qLzsKIAorICBzdGF0aWMgeworICAgIHBhcnNlciA9IGJlc3RKc29uUGFyc2VyKCk7CisgIH0KKwogICBwcml2YXRlIE5hdGl2ZXMoKSB7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvUmVzdEFwaS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9SZXN0QXBpLmphdmEKaW5kZXggNjUwY2FjZC4uNGVlNjNjNiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9SZXN0QXBpLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9SZXN0QXBpLmphdmEKQEAgLTE0LDIzICsxNCwzOCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGM7CiAKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nd3QuaHR0cC5jbGllbnQuUmVxdWVzdEJ1aWxkZXIuREVMRVRFOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmd3dC5odHRwLmNsaWVudC5SZXF1ZXN0QnVpbGRlci5HRVQ7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ3d0Lmh0dHAuY2xpZW50LlJlcXVlc3RCdWlsZGVyLlBPU1Q7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ3d0Lmh0dHAuY2xpZW50LlJlcXVlc3RCdWlsZGVyLlBVVDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LlJwY1N0YXR1czsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuSmF2YVNjcmlwdE9iamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5odHRwLmNsaWVudC5SZXF1ZXN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0Lmh0dHAuY2xpZW50LlJlcXVlc3RCdWlsZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0Lmh0dHAuY2xpZW50LlJlcXVlc3RCdWlsZGVyLk1ldGhvZDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5odHRwLmNsaWVudC5SZXF1ZXN0Q2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuaHR0cC5jbGllbnQuUmVxdWVzdEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5odHRwLmNsaWVudC5SZXNwb25zZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5odHRwLmNsaWVudC5VUkw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuanNvbi5jbGllbnQuSlNPTkV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5qc29uLmNsaWVudC5KU09OT2JqZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0Lmpzb24uY2xpZW50LkpTT05QYXJzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuanNvbi5jbGllbnQuSlNPTlZhbHVlOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5Bc3luY0NhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnJwYy5TdGF0dXNDb2RlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jbGllbnQuUmVtb3RlSnNvbkV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY2xpZW50LlNlcnZlclVuYXZhaWxhYmxlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkpzb25Db25zdGFudHM7CiAKIC8qKiBNYWtlcyBhIFJFU1QgQVBJIGNhbGwgdG8gdGhlIHNlcnZlci4gKi8KIHB1YmxpYyBjbGFzcyBSZXN0QXBpIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFNDX1VOQVZBSUxBQkxFID0gMjsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFNDX0JBRF9UUkFOU1BPUlQgPSAzOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgU0NfQkFEX1JFU1BPTlNFID0gNDsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEpTT05fVFlQRSA9ICJhcHBsaWNhdGlvbi9qc29uIjsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEpTT05fVVRGOCA9IEpTT05fVFlQRSArICI7IGNoYXJzZXQ9dXRmLTgiOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEVYVF9UWVBFID0gInRleHQvcGxhaW4iOworCiAgIC8qKgogICAgKiBFeHBlY3RlZCBKU09OIGNvbnRlbnQgYm9keSBwcmVmaXggdGhhdCBwcmV2ZW50cyBYU1NJLgogICAgKiA8cD4KQEAgLTQyLDc1ICs1NywxMzEgQEAKICAgICovCiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBKU09OX01BR0lDID0gIildfSdcbiI7CiAKLSAgcHJpdmF0ZSBjbGFzcyBNeVJlcXVlc3RDYWxsYmFjazxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gaW1wbGVtZW50cwotICAgICAgUmVxdWVzdENhbGxiYWNrIHsKLSAgICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gd2FzR2V0OworICAvKiogVHJ1ZSBpZiBlcnIgaXMgYSBTdGF0dXNDb2RlRXhjZXB0aW9uIHJlcG9ydGluZyBOb3QgRm91bmQuICovCisgIHB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc05vdEZvdW5kKFRocm93YWJsZSBlcnIpIHsKKyAgICByZXR1cm4gaXNTdGF0dXMoZXJyLCBSZXNwb25zZS5TQ19OT1RfRk9VTkQpOworICB9CisKKyAgLyoqIFRydWUgaWYgZXJyIGlzIGRlc2NyaWJpbmcgYSB1c2VyIHRoYXQgaXMgY3VycmVudGx5IGFub255bW91cy4gKi8KKyAgcHVibGljIHN0YXRpYyBib29sZWFuIGlzTm90U2lnbmVkSW4oVGhyb3dhYmxlIGVycikgeworICAgIGlmIChlcnIgaW5zdGFuY2VvZiBTdGF0dXNDb2RlRXhjZXB0aW9uKSB7CisgICAgICBTdGF0dXNDb2RlRXhjZXB0aW9uIHNjZSA9IChTdGF0dXNDb2RlRXhjZXB0aW9uKSBlcnI7CisgICAgICBpZiAoc2NlLmdldFN0YXR1c0NvZGUoKSA9PSBSZXNwb25zZS5TQ19VTkFVVEhPUklaRUQpIHsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICB9CisgICAgICByZXR1cm4gc2NlLmdldFN0YXR1c0NvZGUoKSA9PSBSZXNwb25zZS5TQ19GT1JCSURERU4KKyAgICAgICAgICAmJiAoc2NlLmdldEVuY29kZWRSZXNwb25zZSgpLmVxdWFscygiQXV0aGVudGljYXRpb24gcmVxdWlyZWQiKQorICAgICAgICAgICAgICB8fCBzY2UuZ2V0RW5jb2RlZFJlc3BvbnNlKCkuc3RhcnRzV2l0aCgiTXVzdCBiZSBzaWduZWQtaW4iKSk7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKKyAgfQorCisgIC8qKiBUcnVlIGlmIGVyciBpcyBhIFN0YXR1c0NvZGVFeGNlcHRpb24gd2l0aCBhIHNwZWNpZmljIEhUVFAgY29kZS4gKi8KKyAgcHVibGljIHN0YXRpYyBib29sZWFuIGlzU3RhdHVzKFRocm93YWJsZSBlcnIsIGludCBzdGF0dXMpIHsKKyAgICByZXR1cm4gZXJyIGluc3RhbmNlb2YgU3RhdHVzQ29kZUV4Y2VwdGlvbgorICAgICAgICAmJiAoKFN0YXR1c0NvZGVFeGNlcHRpb24pIGVycikuZ2V0U3RhdHVzQ29kZSgpID09IHN0YXR1czsKKyAgfQorCisgIC8qKiBJcyB0aGUgR2Vycml0IENvZGUgUmV2aWV3IHNlcnZlciBsaWtlbHkgdG8gcmV0dXJuIHRoaXMgc3RhdHVzPyAqLworICBwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNFeHBlY3RlZChpbnQgc3RhdHVzQ29kZSkgeworICAgIHN3aXRjaCAoc3RhdHVzQ29kZSkgeworICAgICAgY2FzZSBTQ19VTkFWQUlMQUJMRToKKyAgICAgIGNhc2UgNDAwOiAvLyBCYWQgUmVxdWVzdAorICAgICAgY2FzZSA0MDE6IC8vIFVuYXV0aG9yaXplZAorICAgICAgY2FzZSA0MDM6IC8vIEZvcmJpZGRlbgorICAgICAgY2FzZSA0MDQ6IC8vIE5vdCBGb3VuZAorICAgICAgY2FzZSA0MDU6IC8vIE1ldGhvZCBOb3QgQWxsb3dlZAorICAgICAgY2FzZSA0MDk6IC8vIENvbmZsaWN0CisgICAgICBjYXNlIDQxMjogLy8gUHJlY29uZGl0aW9uIEZhaWxlZAorICAgICAgY2FzZSA0Mjk6IC8vIFRvbyBNYW55IFJlcXVlc3RzIChSRkMgNjU4NSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgIGRlZmF1bHQ6CisgICAgICAgIC8vIEFzc3VtZSBhbnkgb3RoZXIgY29kZSBpcyBub3QgZXhwZWN0ZWQuIFRoZXNlIG1heSBiZQorICAgICAgICAvLyBsb2NhbCBwcm94eSBzZXJ2ZXIgZXJyb3JzIG91dHNpZGUgb2Ygb3VyIGNvbnRyb2wuCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBIdHRwQ2FsbGJhY2s8VCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3Q+CisgICAgICBpbXBsZW1lbnRzIFJlcXVlc3RDYWxsYmFjayB7CiAgICAgcHJpdmF0ZSBmaW5hbCBBc3luY0NhbGxiYWNrPFQ+IGNiOwogCi0gICAgcHVibGljIE15UmVxdWVzdENhbGxiYWNrKGJvb2xlYW4gd2FzR2V0LCBBc3luY0NhbGxiYWNrPFQ+IGNiKSB7Ci0gICAgICB0aGlzLndhc0dldCA9IHdhc0dldDsKKyAgICBIdHRwQ2FsbGJhY2soQXN5bmNDYWxsYmFjazxUPiBjYikgewogICAgICAgdGhpcy5jYiA9IGNiOwogICAgIH0KIAogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIG9uUmVzcG9uc2VSZWNlaXZlZChSZXF1ZXN0IHJlcSwgUmVzcG9uc2UgcmVzKSB7CiAgICAgICBpbnQgc3RhdHVzID0gcmVzLmdldFN0YXR1c0NvZGUoKTsKLSAgICAgIGlmIChzdGF0dXMgIT0gMjAwKSB7CisgICAgICBpZiAoc3RhdHVzID09IFJlc3BvbnNlLlNDX05PX0NPTlRFTlQpIHsKKyAgICAgICAgY2Iub25TdWNjZXNzKG51bGwpOwogICAgICAgICBScGNTdGF0dXMuSU5TVEFOQ0Uub25ScGNDb21wbGV0ZSgpOwotICAgICAgICBpZiAoKDQwMCA8PSBzdGF0dXMgJiYgc3RhdHVzIDwgNjAwKSAmJiBpc1RleHRCb2R5KHJlcykpIHsKLSAgICAgICAgICBjYi5vbkZhaWx1cmUobmV3IFJlbW90ZUpzb25FeGNlcHRpb24ocmVzLmdldFRleHQoKSwgc3RhdHVzLCBudWxsKSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgY2Iub25GYWlsdXJlKG5ldyBTdGF0dXNDb2RlRXhjZXB0aW9uKHN0YXR1cywgcmVzLmdldFN0YXR1c1RleHQoKSkpOworCisgICAgICB9IGVsc2UgaWYgKDIwMCA8PSBzdGF0dXMgJiYgc3RhdHVzIDwgMzAwKSB7CisgICAgICAgIGlmICghaXNKc29uQm9keShyZXMpKSB7CisgICAgICAgICAgUnBjU3RhdHVzLklOU1RBTkNFLm9uUnBjQ29tcGxldGUoKTsKKyAgICAgICAgICBjYi5vbkZhaWx1cmUobmV3IFN0YXR1c0NvZGVFeGNlcHRpb24oU0NfQkFEX1JFU1BPTlNFLCAiRXhwZWN0ZWQgIgorICAgICAgICAgICAgICArIEpTT05fVFlQRSArICI7IHJlY2VpdmVkIENvbnRlbnQtVHlwZTogIgorICAgICAgICAgICAgICArIHJlcy5nZXRIZWFkZXIoIkNvbnRlbnQtVHlwZSIpKSk7CisgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybjsKLSAgICAgIH0KIAotICAgICAgaWYgKCFpc0pzb25Cb2R5KHJlcykpIHsKKyAgICAgICAgVCBkYXRhOworICAgICAgICB0cnkgeworICAgICAgICAgIC8vIGphdmFjIGdlbmVyaWNzIGJ1ZworICAgICAgICAgIGRhdGEgPSBSZXN0QXBpLjxUPmNhc3QocGFyc2VKc29uKHJlcykpOworICAgICAgICB9IGNhdGNoIChKU09ORXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICBScGNTdGF0dXMuSU5TVEFOQ0Uub25ScGNDb21wbGV0ZSgpOworICAgICAgICAgIGNiLm9uRmFpbHVyZShuZXcgU3RhdHVzQ29kZUV4Y2VwdGlvbihTQ19CQURfUkVTUE9OU0UsCisgICAgICAgICAgICAgICJJbnZhbGlkIEpTT046ICIgKyBlLmdldE1lc3NhZ2UoKSkpOworICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGNiLm9uU3VjY2VzcyhkYXRhKTsKICAgICAgICAgUnBjU3RhdHVzLklOU1RBTkNFLm9uUnBjQ29tcGxldGUoKTsKLSAgICAgICAgY2Iub25GYWlsdXJlKG5ldyBSZW1vdGVKc29uRXhjZXB0aW9uKCJJbnZhbGlkIEpTT04iKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICAgIH0KIAotICAgICAgU3RyaW5nIGpzb24gPSByZXMuZ2V0VGV4dCgpOwotICAgICAgaWYgKCFqc29uLnN0YXJ0c1dpdGgoSlNPTl9NQUdJQykpIHsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIFN0cmluZyBtc2c7CisgICAgICAgIGlmIChpc1RleHRCb2R5KHJlcykpIHsKKyAgICAgICAgICBtc2cgPSByZXMuZ2V0VGV4dCgpLnRyaW0oKTsKKyAgICAgICAgfSBlbHNlIGlmIChpc0pzb25Cb2R5KHJlcykpIHsKKyAgICAgICAgICBKU09OVmFsdWUgdjsKKyAgICAgICAgICB0cnkgeworICAgICAgICAgICAgdiA9IHBhcnNlSnNvbihyZXMpOworICAgICAgICAgIH0gY2F0Y2ggKEpTT05FeGNlcHRpb24gZSkgeworICAgICAgICAgICAgdiA9IG51bGw7CisgICAgICAgICAgfQorICAgICAgICAgIGlmICh2ICE9IG51bGwgJiYgdi5pc1N0cmluZygpICE9IG51bGwpIHsKKyAgICAgICAgICAgIG1zZyA9IHYuaXNTdHJpbmcoKS5zdHJpbmdWYWx1ZSgpOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBtc2cgPSB0cmltSnNvbk1hZ2ljKHJlcy5nZXRUZXh0KCkpLnRyaW0oKTsKKyAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgbXNnID0gcmVzLmdldFN0YXR1c1RleHQoKTsKKyAgICAgICAgfQorCiAgICAgICAgIFJwY1N0YXR1cy5JTlNUQU5DRS5vblJwY0NvbXBsZXRlKCk7Ci0gICAgICAgIGNiLm9uRmFpbHVyZShuZXcgUmVtb3RlSnNvbkV4Y2VwdGlvbigiSW52YWxpZCBKU09OIikpOwotICAgICAgICByZXR1cm47CisgICAgICAgIGNiLm9uRmFpbHVyZShuZXcgU3RhdHVzQ29kZUV4Y2VwdGlvbihzdGF0dXMsIG1zZykpOwogICAgICAgfQotICAgICAganNvbiA9IGpzb24uc3Vic3RyaW5nKEpTT05fTUFHSUMubGVuZ3RoKCkpOwotCi0gICAgICBpZiAod2FzR2V0ICYmIGpzb24uc3RhcnRzV2l0aCgie1wiX2F1dGhrZXlcIjoiKSkgewotICAgICAgICBSZXN0QXBpLnRoaXMucmVzZW5kUG9zdChjYiwganNvbik7Ci0gICAgICAgIHJldHVybjsKLSAgICAgIH0KLQotICAgICAgVCBkYXRhOwotICAgICAgdHJ5IHsKLSAgICAgICAgLy8gamF2YWMgZ2VuZXJpY3MgYnVnCi0gICAgICAgIGRhdGEgPSBOYXRpdmVzLjxUPiBwYXJzZUpTT04oanNvbik7Ci0gICAgICB9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgUnBjU3RhdHVzLklOU1RBTkNFLm9uUnBjQ29tcGxldGUoKTsKLSAgICAgICAgY2Iub25GYWlsdXJlKG5ldyBSZW1vdGVKc29uRXhjZXB0aW9uKCJJbnZhbGlkIEpTT04iKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICAgIH0KLQotICAgICAgY2Iub25TdWNjZXNzKGRhdGEpOwotICAgICAgUnBjU3RhdHVzLklOU1RBTkNFLm9uUnBjQ29tcGxldGUoKTsKICAgICB9CiAKICAgICBAT3ZlcnJpZGUKICAgICBwdWJsaWMgdm9pZCBvbkVycm9yKFJlcXVlc3QgcmVxLCBUaHJvd2FibGUgZXJyKSB7CiAgICAgICBScGNTdGF0dXMuSU5TVEFOQ0Uub25ScGNDb21wbGV0ZSgpOwogICAgICAgaWYgKGVyci5nZXRNZXNzYWdlKCkuY29udGFpbnMoIlhtbEh0dHBSZXF1ZXN0LnN0YXR1cyIpKSB7Ci0gICAgICAgIGNiLm9uRmFpbHVyZShuZXcgU2VydmVyVW5hdmFpbGFibGVFeGNlcHRpb24oKSk7CisgICAgICAgIGNiLm9uRmFpbHVyZShuZXcgU3RhdHVzQ29kZUV4Y2VwdGlvbigKKyAgICAgICAgICAgIFNDX1VOQVZBSUxBQkxFLAorICAgICAgICAgICAgUnBjQ29uc3RhbnRzLkMuZXJyb3JTZXJ2ZXJVbmF2YWlsYWJsZSgpKSk7CiAgICAgICB9IGVsc2UgewotICAgICAgICBjYi5vbkZhaWx1cmUoZXJyKTsKKyAgICAgICAgY2Iub25GYWlsdXJlKG5ldyBTdGF0dXNDb2RlRXhjZXB0aW9uKFNDX0JBRF9UUkFOU1BPUlQsIGVyci5nZXRNZXNzYWdlKCkpKTsKICAgICAgIH0KICAgICB9CiAgIH0KIAogICBwcml2YXRlIFN0cmluZ0J1aWxkZXIgdXJsOwogICBwcml2YXRlIGJvb2xlYW4gaGFzUXVlcnlQYXJhbXM7CisgIHByaXZhdGUgU3RyaW5nIGlmTm9uZU1hdGNoOwogCiAgIC8qKgogICAgKiBJbml0aWFsaXplIGEgbmV3IEFQSSBjYWxsLgpAQCAtMTMxLDEwICsyMDIsNDAgQEAKICAgICB1cmwuYXBwZW5kKG5hbWUpOwogICB9CiAKKyAgcHVibGljIFJlc3RBcGkgdmlldyhTdHJpbmcgbmFtZSkgeworICAgIHJldHVybiBpZFJhdyhuYW1lKTsKKyAgfQorCisgIHB1YmxpYyBSZXN0QXBpIGlkKFN0cmluZyBpZCkgeworICAgIHJldHVybiBpZFJhdyhVUkwuZW5jb2RlUXVlcnlTdHJpbmcoaWQpKTsKKyAgfQorCisgIHB1YmxpYyBSZXN0QXBpIGlkKGludCBpZCkgeworICAgIHJldHVybiBpZFJhdyhJbnRlZ2VyLnRvU3RyaW5nKGlkKSk7CisgIH0KKworICBwdWJsaWMgUmVzdEFwaSBpZFJhdyhTdHJpbmcgbmFtZSkgeworICAgIGlmIChoYXNRdWVyeVBhcmFtcykgeworICAgICAgdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbigpOworICAgIH0KKyAgICBpZiAodXJsLmNoYXJBdCh1cmwubGVuZ3RoKCkgLSAxKSAhPSAnLycpIHsKKyAgICAgIHVybC5hcHBlbmQoJy8nKTsKKyAgICB9CisgICAgdXJsLmFwcGVuZChuYW1lKTsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCiAgIHB1YmxpYyBSZXN0QXBpIGFkZFBhcmFtZXRlcihTdHJpbmcgbmFtZSwgU3RyaW5nIHZhbHVlKSB7CiAgICAgcmV0dXJuIGFkZFBhcmFtZXRlclJhdyhuYW1lLCBVUkwuZW5jb2RlUXVlcnlTdHJpbmcodmFsdWUpKTsKICAgfQogCisgIHB1YmxpYyBSZXN0QXBpIGFkZFBhcmFtZXRlcihTdHJpbmcgbmFtZSwgU3RyaW5nLi4uIHZhbHVlKSB7CisgICAgZm9yIChTdHJpbmcgdmFsIDogdmFsdWUpIHsKKyAgICAgIGFkZFBhcmFtZXRlcihuYW1lLCB2YWwpOworICAgIH0KKyAgICByZXR1cm4gdGhpczsKKyAgfQorCiAgIHB1YmxpYyBSZXN0QXBpIGFkZFBhcmFtZXRlclRydWUoU3RyaW5nIG5hbWUpIHsKICAgICByZXR1cm4gYWRkUGFyYW1ldGVyUmF3KG5hbWUsIG51bGwpOwogICB9CkBAIC0xNjUsNDAgKzI2Niw4NyBAQAogICAgIHJldHVybiB0aGlzOwogICB9CiAKLSAgcHVibGljIDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gdm9pZCBzZW5kKGZpbmFsIEFzeW5jQ2FsbGJhY2s8VD4gY2IpIHsKLSAgICBSZXF1ZXN0QnVpbGRlciByZXEgPSBuZXcgUmVxdWVzdEJ1aWxkZXIoUmVxdWVzdEJ1aWxkZXIuR0VULCB1cmwudG9TdHJpbmcoKSk7Ci0gICAgcmVxLnNldEhlYWRlcigiQWNjZXB0IiwgSnNvbkNvbnN0YW50cy5KU09OX1RZUEUpOwotICAgIHJlcS5zZXRDYWxsYmFjayhuZXcgTXlSZXF1ZXN0Q2FsbGJhY2s8VD4odHJ1ZSwgY2IpKTsKKyAgcHVibGljIFJlc3RBcGkgaWZOb25lTWF0Y2goKSB7CisgICAgcmV0dXJuIGlmTm9uZU1hdGNoKCIqIik7CisgIH0KKworICBwdWJsaWMgUmVzdEFwaSBpZk5vbmVNYXRjaChTdHJpbmcgZXRhZykgeworICAgIGlmTm9uZU1hdGNoID0gZXRhZzsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgdXJsKCkgeworICAgIHJldHVybiB1cmwudG9TdHJpbmcoKTsKKyAgfQorCisgIHB1YmxpYyA8VCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3Q+IHZvaWQgZ2V0KEFzeW5jQ2FsbGJhY2s8VD4gY2IpIHsKKyAgICBzZW5kKEdFVCwgY2IpOworICB9CisKKyAgcHVibGljIDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gdm9pZCBkZWxldGUoQXN5bmNDYWxsYmFjazxUPiBjYikgeworICAgIHNlbmQoREVMRVRFLCBjYik7CisgIH0KKworICBwcml2YXRlIDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gdm9pZCBzZW5kKAorICAgICAgTWV0aG9kIG1ldGhvZCwgQXN5bmNDYWxsYmFjazxUPiBjYikgeworICAgIEh0dHBDYWxsYmFjazxUPiBodHRwQ2FsbGJhY2sgPSBuZXcgSHR0cENhbGxiYWNrPFQ+KGNiKTsKICAgICB0cnkgewogICAgICAgUnBjU3RhdHVzLklOU1RBTkNFLm9uUnBjU3RhcnQoKTsKLSAgICAgIHJlcS5zZW5kKCk7CisgICAgICByZXF1ZXN0KG1ldGhvZCkuc2VuZFJlcXVlc3QobnVsbCwgaHR0cENhbGxiYWNrKTsKICAgICB9IGNhdGNoIChSZXF1ZXN0RXhjZXB0aW9uIGUpIHsKLSAgICAgIFJwY1N0YXR1cy5JTlNUQU5DRS5vblJwY0NvbXBsZXRlKCk7Ci0gICAgICBjYi5vbkZhaWx1cmUoZSk7CisgICAgICBodHRwQ2FsbGJhY2sub25FcnJvcihudWxsLCBlKTsKICAgICB9CiAgIH0KIAotICBwcml2YXRlIDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gdm9pZCByZXNlbmRQb3N0KAotICAgICAgZmluYWwgQXN5bmNDYWxsYmFjazxUPiBjYiwgU3RyaW5nIHRva2VuKSB7Ci0gICAgUmVxdWVzdEJ1aWxkZXIgcmVxID0gbmV3IFJlcXVlc3RCdWlsZGVyKFJlcXVlc3RCdWlsZGVyLlBPU1QsIHVybC50b1N0cmluZygpKTsKLSAgICByZXEuc2V0SGVhZGVyKCJBY2NlcHQiLCBKc29uQ29uc3RhbnRzLkpTT05fVFlQRSk7Ci0gICAgcmVxLnNldEhlYWRlcigiQ29udGVudC1UeXBlIiwgSnNvbkNvbnN0YW50cy5KU09OX1RZUEUpOwotICAgIHJlcS5zZXRSZXF1ZXN0RGF0YSh0b2tlbik7Ci0gICAgcmVxLnNldENhbGxiYWNrKG5ldyBNeVJlcXVlc3RDYWxsYmFjazxUPihmYWxzZSwgY2IpKTsKKyAgcHVibGljIDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gdm9pZCBwb3N0KAorICAgICAgSmF2YVNjcmlwdE9iamVjdCBjb250ZW50LAorICAgICAgQXN5bmNDYWxsYmFjazxUPiBjYikgeworICAgIHNlbmRKU09OKFBPU1QsIGNvbnRlbnQsIGNiKTsKKyAgfQorCisgIHB1YmxpYyA8VCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3Q+IHZvaWQgcHV0KEFzeW5jQ2FsbGJhY2s8VD4gY2IpIHsKKyAgICBzZW5kKFBVVCwgY2IpOworICB9CisKKyAgcHVibGljIDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gdm9pZCBwdXQoCisgICAgICBKYXZhU2NyaXB0T2JqZWN0IGNvbnRlbnQsCisgICAgICBBc3luY0NhbGxiYWNrPFQ+IGNiKSB7CisgICAgc2VuZEpTT04oUFVULCBjb250ZW50LCBjYik7CisgIH0KKworICBwcml2YXRlIDxUIGV4dGVuZHMgSmF2YVNjcmlwdE9iamVjdD4gdm9pZCBzZW5kSlNPTigKKyAgICAgIE1ldGhvZCBtZXRob2QsIEphdmFTY3JpcHRPYmplY3QgY29udGVudCwKKyAgICAgIEFzeW5jQ2FsbGJhY2s8VD4gY2IpIHsKKyAgICBIdHRwQ2FsbGJhY2s8VD4gaHR0cENhbGxiYWNrID0gbmV3IEh0dHBDYWxsYmFjazxUPihjYik7CiAgICAgdHJ5IHsKLSAgICAgIHJlcS5zZW5kKCk7CisgICAgICBScGNTdGF0dXMuSU5TVEFOQ0Uub25ScGNTdGFydCgpOworICAgICAgU3RyaW5nIGJvZHkgPSBuZXcgSlNPTk9iamVjdChjb250ZW50KS50b1N0cmluZygpOworICAgICAgUmVxdWVzdEJ1aWxkZXIgcmVxID0gcmVxdWVzdChtZXRob2QpOworICAgICAgcmVxLnNldEhlYWRlcigiQ29udGVudC1UeXBlIiwgSlNPTl9VVEY4KTsKKyAgICAgIHJlcS5zZW5kUmVxdWVzdChib2R5LCBodHRwQ2FsbGJhY2spOwogICAgIH0gY2F0Y2ggKFJlcXVlc3RFeGNlcHRpb24gZSkgewotICAgICAgUnBjU3RhdHVzLklOU1RBTkNFLm9uUnBjQ29tcGxldGUoKTsKLSAgICAgIGNiLm9uRmFpbHVyZShlKTsKKyAgICAgIGh0dHBDYWxsYmFjay5vbkVycm9yKG51bGwsIGUpOwogICAgIH0KICAgfQogCisgIHByaXZhdGUgUmVxdWVzdEJ1aWxkZXIgcmVxdWVzdChNZXRob2QgbWV0aG9kKSB7CisgICAgUmVxdWVzdEJ1aWxkZXIgcmVxID0gbmV3IFJlcXVlc3RCdWlsZGVyKG1ldGhvZCwgdXJsKCkpOworICAgIGlmIChpZk5vbmVNYXRjaCAhPSBudWxsKSB7CisgICAgICByZXEuc2V0SGVhZGVyKCJJZi1Ob25lLU1hdGNoIiwgaWZOb25lTWF0Y2gpOworICAgIH0KKyAgICByZXEuc2V0SGVhZGVyKCJBY2NlcHQiLCBKU09OX1RZUEUpOworICAgIGlmIChHZXJyaXQuZ2V0WEdlcnJpdEF1dGgoKSAhPSBudWxsKSB7CisgICAgICByZXEuc2V0SGVhZGVyKCJYLUdlcnJpdC1BdXRoIiwgR2Vycml0LmdldFhHZXJyaXRBdXRoKCkpOworICAgIH0KKyAgICByZXR1cm4gcmVxOworICB9CisKICAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc0pzb25Cb2R5KFJlc3BvbnNlIHJlcykgewotICAgIHJldHVybiBpc0NvbnRlbnRUeXBlKHJlcywgSnNvbkNvbnN0YW50cy5KU09OX1RZUEUpOworICAgIHJldHVybiBpc0NvbnRlbnRUeXBlKHJlcywgSlNPTl9UWVBFKTsKICAgfQogCiAgIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gaXNUZXh0Qm9keShSZXNwb25zZSByZXMpIHsKLSAgICByZXR1cm4gaXNDb250ZW50VHlwZShyZXMsICJ0ZXh0L3BsYWluIik7CisgICAgcmV0dXJuIGlzQ29udGVudFR5cGUocmVzLCBURVhUX1RZUEUpOwogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc0NvbnRlbnRUeXBlKFJlc3BvbnNlIHJlcywgU3RyaW5nIHdhbnQpIHsKQEAgLTIxMiw0ICszNjAsMzUgQEAKICAgICB9CiAgICAgcmV0dXJuIHdhbnQuZXF1YWxzKHR5cGUpOwogICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgSlNPTlZhbHVlIHBhcnNlSnNvbihSZXNwb25zZSByZXMpCisgICAgICB0aHJvd3MgSlNPTkV4Y2VwdGlvbiB7CisgICAgU3RyaW5nIGpzb24gPSB0cmltSnNvbk1hZ2ljKHJlcy5nZXRUZXh0KCkpOworICAgIGlmIChqc29uLmlzRW1wdHkoKSkgeworICAgICAgdGhyb3cgbmV3IEpTT05FeGNlcHRpb24oInJlc3BvbnNlIHdhcyBlbXB0eSIpOworICAgIH0KKyAgICByZXR1cm4gSlNPTlBhcnNlci5wYXJzZVN0cmljdChqc29uKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyB0cmltSnNvbk1hZ2ljKFN0cmluZyBqc29uKSB7CisgICAgaWYgKGpzb24uc3RhcnRzV2l0aChKU09OX01BR0lDKSkgeworICAgICAganNvbiA9IGpzb24uc3Vic3RyaW5nKEpTT05fTUFHSUMubGVuZ3RoKCkpOworICAgIH0KKyAgICByZXR1cm4ganNvbjsKKyAgfQorCisgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICBwcml2YXRlIHN0YXRpYyA8VCBleHRlbmRzIEphdmFTY3JpcHRPYmplY3Q+IFQgY2FzdChKU09OVmFsdWUgdmFsKSB7CisgICAgaWYgKHZhbC5pc09iamVjdCgpICE9IG51bGwpIHsKKyAgICAgIHJldHVybiAoVCkgdmFsLmlzT2JqZWN0KCkuZ2V0SmF2YVNjcmlwdE9iamVjdCgpOworICAgIH0gZWxzZSBpZiAodmFsLmlzQXJyYXkoKSAhPSBudWxsKSB7CisgICAgICByZXR1cm4gKFQpIHZhbC5pc0FycmF5KCkuZ2V0SmF2YVNjcmlwdE9iamVjdCgpOworICAgIH0gZWxzZSBpZiAodmFsLmlzU3RyaW5nKCkgIT0gbnVsbCkgeworICAgICAgcmV0dXJuIChUKSBOYXRpdmVTdHJpbmcud3JhcCh2YWwuaXNTdHJpbmcoKS5zdHJpbmdWYWx1ZSgpKTsKKyAgICB9IGVsc2UgaWYgKHZhbC5pc051bGwoKSAhPSBudWxsKSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9IGVsc2UgeworICAgICAgdGhyb3cgbmV3IEpTT05FeGNlcHRpb24oInVuc3VwcG9ydGVkIEpTT04gdHlwZSIpOworICAgIH0KKyAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9TY3JlZW5Mb2FkQ2FsbGJhY2suamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvU2NyZWVuTG9hZENhbGxiYWNrLmphdmEKaW5kZXggZWIxMzgzNC4uYjhiOTIwOSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9TY3JlZW5Mb2FkQ2FsbGJhY2suamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL1NjcmVlbkxvYWRDYWxsYmFjay5qYXZhCkBAIC0xNiw2ICsxNiw3IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5Ob3RGb3VuZFNjcmVlbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuTm90U2lnbmVkSW5EaWFsb2c7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpLlNjcmVlbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEVudGl0eUV4Y2VwdGlvbjsKIApAQCAtNDMsNyArNDQsMTEgQEAKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyB2b2lkIG9uRmFpbHVyZShmaW5hbCBUaHJvd2FibGUgY2F1Z2h0KSB7CiAgICAgaWYgKGlzTm9TdWNoRW50aXR5KGNhdWdodCkpIHsKLSAgICAgIEdlcnJpdC5kaXNwbGF5KHNjcmVlbi5nZXRUb2tlbigpLCBuZXcgTm90Rm91bmRTY3JlZW4oKSk7CisgICAgICBpZiAoR2Vycml0LmlzU2lnbmVkSW4oKSkgeworICAgICAgICBHZXJyaXQuZGlzcGxheShzY3JlZW4uZ2V0VG9rZW4oKSwgbmV3IE5vdEZvdW5kU2NyZWVuKCkpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgbmV3IE5vdFNpZ25lZEluRGlhbG9nKCkuY2VudGVyKCk7CisgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgIHN1cGVyLm9uRmFpbHVyZShjYXVnaHQpOwogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvVHJhbnNmb3JtQ2FsbGJhY2suamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9ycGMvVHJhbnNmb3JtQ2FsbGJhY2suamF2YQppbmRleCAyY2QyMmNiLi45M2M4NmEyIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvcnBjL1RyYW5zZm9ybUNhbGxiYWNrLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3JwYy9UcmFuc2Zvcm1DYWxsYmFjay5qYXZhCkBAIC0xNCw3ICsxNCw3IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnJwYzsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ycGMuQXN5bmNDYWxsYmFjazsKIAogLyoqIFRyYW5zZm9ybXMgYSB2YWx1ZSBhbmQgcGFzc2VzIGl0IG9uIHRvIGFub3RoZXIgY2FsbGJhY2suICovCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgVHJhbnNmb3JtQ2FsbGJhY2s8SSwgTz4gaW1wbGVtZW50cyBBc3luY0NhbGxiYWNrPEk+ewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0FjY291bnRHcm91cFN1Z2dlc3RPcmFjbGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50R3JvdXBTdWdnZXN0T3JhY2xlLmphdmEKaW5kZXggNWRhMDBjZC4uMjc4ZTE1OSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0FjY291bnRHcm91cFN1Z2dlc3RPcmFjbGUuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQWNjb3VudEdyb3VwU3VnZ2VzdE9yYWNsZS5qYXZhCkBAIC0yMCw3ICsyMCw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5TdWdnZXN0T3JhY2xlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2FmZWh0bWwuY2xpZW50LkhpZ2hsaWdodFN1Z2dlc3RPcmFjbGU7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwpAQCAtMjgsMTQgKzI3LDE0IEBACiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIAogLyoqIFN1Z2dlc3Rpb24gT3JhY2xlIGZvciBBY2NvdW50R3JvdXAgZW50aXRpZXMuICovCi1wdWJsaWMgY2xhc3MgQWNjb3VudEdyb3VwU3VnZ2VzdE9yYWNsZSBleHRlbmRzIEhpZ2hsaWdodFN1Z2dlc3RPcmFjbGUgeworcHVibGljIGNsYXNzIEFjY291bnRHcm91cFN1Z2dlc3RPcmFjbGUgZXh0ZW5kcyBTdWdnZXN0QWZ0ZXJUeXBpbmdOQ2hhcnNPcmFjbGUgewogICBwcml2YXRlIE1hcDxTdHJpbmcsIEFjY291bnRHcm91cC5VVUlEPiBwcmlvclJlc3VsdHMgPQogICAgICAgbmV3IEhhc2hNYXA8U3RyaW5nLCBBY2NvdW50R3JvdXAuVVVJRD4oKTsKIAogICBwcml2YXRlIFByb2plY3QuTmFtZUtleSBwcm9qZWN0TmFtZTsKIAogICBAT3ZlcnJpZGUKLSAgcHVibGljIHZvaWQgb25SZXF1ZXN0U3VnZ2VzdGlvbnMoZmluYWwgUmVxdWVzdCByZXEsIGZpbmFsIENhbGxiYWNrIGNhbGxiYWNrKSB7CisgIHB1YmxpYyB2b2lkIF9vblJlcXVlc3RTdWdnZXN0aW9ucyhmaW5hbCBSZXF1ZXN0IHJlcSwgZmluYWwgQ2FsbGJhY2sgY2FsbGJhY2spIHsKICAgICBScGNTdGF0dXMuaGlkZShuZXcgUnVubmFibGUoKSB7CiAgICAgICBwdWJsaWMgdm9pZCBydW4oKSB7CiAgICAgICAgIFN1Z2dlc3RVdGlsLlNWQy5zdWdnZXN0QWNjb3VudEdyb3VwRm9yUHJvamVjdCgKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50TGluay5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0FjY291bnRMaW5rLmphdmEKaW5kZXggNzkwMTAyYy4uZmQ1Mjc3NyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0FjY291bnRMaW5rLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0FjY291bnRMaW5rLmphdmEKQEAgLTE2LDMyICsxNiw1MSBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkZvcm1hdFV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWNjb3VudC5BY2NvdW50SW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY291bnRJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY291bnRJbmZvQ2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuVXNlcklkZW50aXR5OwogCiAvKiogTGluayB0byBhbnkgdXNlcidzIGFjY291bnQgZGFzaGJvYXJkLiAqLwogcHVibGljIGNsYXNzIEFjY291bnRMaW5rIGV4dGVuZHMgSW5saW5lSHlwZXJsaW5rIHsKICAgLyoqIENyZWF0ZSBhIGxpbmsgYWZ0ZXIgbG9jYXRpbmcgYWNjb3VudCBkZXRhaWxzIGZyb20gYW4gYWN0aXZlIGNhY2hlLiAqLwotICBwdWJsaWMgc3RhdGljIEFjY291bnRMaW5rIGxpbmsoZmluYWwgQWNjb3VudEluZm9DYWNoZSBjYWNoZSwKLSAgICAgIGZpbmFsIEFjY291bnQuSWQgaWQpIHsKLSAgICBmaW5hbCBBY2NvdW50SW5mbyBhaSA9IGNhY2hlLmdldChpZCk7CisgIHB1YmxpYyBzdGF0aWMgQWNjb3VudExpbmsgbGluayhBY2NvdW50SW5mb0NhY2hlIGNhY2hlLCBBY2NvdW50LklkIGlkKSB7CisgICAgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudEluZm8gYWkgPSBjYWNoZS5nZXQoaWQpOwogICAgIHJldHVybiBhaSAhPSBudWxsID8gbmV3IEFjY291bnRMaW5rKGFpKSA6IG51bGw7CiAgIH0KIAotICBwdWJsaWMgQWNjb3VudExpbmsoZmluYWwgQWNjb3VudEluZm8gYWkpIHsKLSAgICBzdXBlcihGb3JtYXRVdGlsLm5hbWUoYWkpLCBQYWdlTGlua3MudG9BY2NvdW50UXVlcnkob3duZXIoYWkpKSk7Ci0gICAgc2V0VGl0bGUoRm9ybWF0VXRpbC5uYW1lRW1haWwoYWkpKTsKKyAgcHVibGljIEFjY291bnRMaW5rKGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY291bnRJbmZvIGFpKSB7CisgICAgdGhpcyhGb3JtYXRVdGlsLmFzSW5mbyhhaSkpOworICB9CisKKyAgcHVibGljIEFjY291bnRMaW5rKFVzZXJJZGVudGl0eSBpZGVudCkgeworICAgIHRoaXMoQWNjb3VudEluZm8uY3JlYXRlKAorICAgICAgICBpZGVudC5nZXRBY2NvdW50KCkuZ2V0KCksCisgICAgICAgIGlkZW50LmdldE5hbWUoKSwKKyAgICAgICAgaWRlbnQuZ2V0RW1haWwoKSkpOworICB9CisKKyAgcHVibGljIEFjY291bnRMaW5rKEFjY291bnRJbmZvIGluZm8pIHsKKyAgICB0aGlzKGluZm8sIENoYW5nZS5TdGF0dXMuTkVXKTsKKyAgfQorCisgIHB1YmxpYyBBY2NvdW50TGluayhBY2NvdW50SW5mbyBpbmZvLCBDaGFuZ2UuU3RhdHVzIHN0YXR1cykgeworICAgIHN1cGVyKEZvcm1hdFV0aWwubmFtZShpbmZvKSwgUGFnZUxpbmtzLnRvQWNjb3VudFF1ZXJ5KG93bmVyKGluZm8pLCBzdGF0dXMpKTsKKyAgICBzZXRUaXRsZShGb3JtYXRVdGlsLm5hbWVFbWFpbChpbmZvKSk7CiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgb3duZXIoQWNjb3VudEluZm8gYWkpIHsKLSAgICBpZiAoYWkuZ2V0UHJlZmVycmVkRW1haWwoKSAhPSBudWxsKSB7Ci0gICAgICByZXR1cm4gYWkuZ2V0UHJlZmVycmVkRW1haWwoKTsKLSAgICB9IGVsc2UgaWYgKGFpLmdldEZ1bGxOYW1lKCkgIT0gbnVsbCkgewotICAgICAgcmV0dXJuIGFpLmdldEZ1bGxOYW1lKCk7CisgICAgaWYgKGFpLmVtYWlsKCkgIT0gbnVsbCkgeworICAgICAgcmV0dXJuIGFpLmVtYWlsKCk7CisgICAgfSBlbHNlIGlmIChhaS5uYW1lKCkgIT0gbnVsbCkgeworICAgICAgcmV0dXJuIGFpLm5hbWUoKTsKKyAgICB9IGVsc2UgaWYgKGFpLl9hY2NvdW50X2lkKCkgIT0gMCkgeworICAgICAgcmV0dXJuICIiICsgYWkuX2FjY291bnRfaWQoKTsKKyAgICB9IGVsc2UgeworICAgICAgcmV0dXJuICIiOwogICAgIH0KLSAgICByZXR1cm4gIiIgKyBhaS5nZXRJZCgpLmdldCgpOwogICB9CiAKICAgQE92ZXJyaWRlCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQWNjb3VudFN1Z2dlc3RPcmFjbGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50U3VnZ2VzdE9yYWNsZS5qYXZhCmluZGV4IGJjZjY0MzguLjBiZjBlYTkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50U3VnZ2VzdE9yYWNsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BY2NvdW50U3VnZ2VzdE9yYWNsZS5qYXZhCkBAIC0xOSwxNSArMTksMTQgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY291bnRJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlN1Z2dlc3RPcmFjbGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZTsKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIC8qKiBTdWdnZXN0aW9uIE9yYWNsZSBmb3IgQWNjb3VudCBlbnRpdGllcy4gKi8KLXB1YmxpYyBjbGFzcyBBY2NvdW50U3VnZ2VzdE9yYWNsZSBleHRlbmRzIEhpZ2hsaWdodFN1Z2dlc3RPcmFjbGUgeworcHVibGljIGNsYXNzIEFjY291bnRTdWdnZXN0T3JhY2xlIGV4dGVuZHMgU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlIHsKICAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIG9uUmVxdWVzdFN1Z2dlc3Rpb25zKGZpbmFsIFJlcXVlc3QgcmVxLCBmaW5hbCBDYWxsYmFjayBjYWxsYmFjaykgeworICBwdWJsaWMgdm9pZCBfb25SZXF1ZXN0U3VnZ2VzdGlvbnMoZmluYWwgUmVxdWVzdCByZXEsIGZpbmFsIENhbGxiYWNrIGNhbGxiYWNrKSB7CiAgICAgUnBjU3RhdHVzLmhpZGUobmV3IFJ1bm5hYmxlKCkgewogICAgICAgcHVibGljIHZvaWQgcnVuKCkgewogICAgICAgICBTdWdnZXN0VXRpbC5TVkMuc3VnZ2VzdEFjY291bnQocmVxLmdldFF1ZXJ5KCksIEJvb2xlYW4uVFJVRSwKQEAgLTU0LDExICs1MywxMSBAQAogICAgIH0KIAogICAgIHB1YmxpYyBTdHJpbmcgZ2V0RGlzcGxheVN0cmluZygpIHsKLSAgICAgIHJldHVybiBGb3JtYXRVdGlsLm5hbWVFbWFpbChpbmZvKTsKKyAgICAgIHJldHVybiBGb3JtYXRVdGlsLm5hbWVFbWFpbChGb3JtYXRVdGlsLmFzSW5mbyhpbmZvKSk7CiAgICAgfQogCiAgICAgcHVibGljIFN0cmluZyBnZXRSZXBsYWNlbWVudFN0cmluZygpIHsKLSAgICAgIHJldHVybiBGb3JtYXRVdGlsLm5hbWVFbWFpbChpbmZvKTsKKyAgICAgIHJldHVybiBGb3JtYXRVdGlsLm5hbWVFbWFpbChGb3JtYXRVdGlsLmFzSW5mbyhpbmZvKSk7CiAgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQWRkTWVtYmVyQm94LmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQWRkTWVtYmVyQm94LmphdmEKaW5kZXggNzJhMDExZi4uZDRhYWE0YyAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0FkZE1lbWJlckJveC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9BZGRNZW1iZXJCb3guamF2YQpAQCAtNzIsNiArNzIsNyBAQAogICAgIG5hbWVUeHQuYWRkU2VsZWN0aW9uSGFuZGxlcihuZXcgU2VsZWN0aW9uSGFuZGxlcjxTdWdnZXN0aW9uPigpIHsKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIHZvaWQgb25TZWxlY3Rpb24oU2VsZWN0aW9uRXZlbnQ8U3VnZ2VzdGlvbj4gZXZlbnQpIHsKKyAgICAgICAgbmFtZVR4dEJveC5zZXRGb2N1cyh0cnVlKTsKICAgICAgICAgaWYgKHN1Ym1pdE9uU2VsZWN0aW9uKSB7CiAgICAgICAgICAgc3VibWl0T25TZWxlY3Rpb24gPSBmYWxzZTsKICAgICAgICAgICBkb0FkZCgpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0NvbW1hbmRNZW51SXRlbS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0NvbW1hbmRNZW51SXRlbS5qYXZhCmluZGV4IGZkYjVjNTYuLjcyYmYwNmMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Db21tYW5kTWVudUl0ZW0uamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQ29tbWFuZE1lbnVJdGVtLmphdmEKQEAgLTE1LDEwICsxNSwxMCBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWk7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuR2Vycml0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmFyaWEuY2xpZW50LlJvbGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5Db21tYW5kOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFjY2Vzc2liaWxpdHk7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQW5jaG9yOwogCiBwdWJsaWMgY2xhc3MgQ29tbWFuZE1lbnVJdGVtIGV4dGVuZHMgQW5jaG9yIGltcGxlbWVudHMgQ2xpY2tIYW5kbGVyIHsKQEAgLTI3LDcgKzI3LDcgQEAKICAgcHVibGljIENvbW1hbmRNZW51SXRlbShmaW5hbCBTdHJpbmcgdGV4dCwgZmluYWwgQ29tbWFuZCBjbWQpIHsKICAgICBzdXBlcih0ZXh0KTsKICAgICBzZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5tZW51SXRlbSgpKTsKLSAgICBBY2Nlc3NpYmlsaXR5LnNldFJvbGUoZ2V0RWxlbWVudCgpLCBBY2Nlc3NpYmlsaXR5LlJPTEVfTUVOVUlURU0pOworICAgIFJvbGVzLmdldE1lbnVpdGVtUm9sZSgpLnNldChnZXRFbGVtZW50KCkpOwogICAgIGFkZENsaWNrSGFuZGxlcih0aGlzKTsKICAgICBjb21tYW5kID0gY21kOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQ29tbWVudFBhbmVsLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQ29tbWVudFBhbmVsLmphdmEKaW5kZXggZGRkMmIyNy4uOGY4YzdlYSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0NvbW1lbnRQYW5lbC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Db21tZW50UGFuZWwuamF2YQpAQCAtMTYsNyArMTYsNyBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkZvcm1hdFV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BY2NvdW50SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuYWNjb3VudC5BY2NvdW50SW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkJsdXJFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkJsdXJIYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Db21tZW50ZWRBY3Rpb25EaWFsb2cuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Db21tZW50ZWRBY3Rpb25EaWFsb2cuamF2YQppbmRleCAyNmI2MWY1Li4yNjM3MDNlIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvQ29tbWVudGVkQWN0aW9uRGlhbG9nLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0NvbW1lbnRlZEFjdGlvbkRpYWxvZy5qYXZhCkBAIC0yNSw2ICsyNSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkJ1dHRvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5GbG93UGFuZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRm9jdXNXaWRnZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuUG9wdXBQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuR2xvYmFsS2V5OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuZ2xvYmFsa2V5LmNsaWVudC5OcFRleHRBcmVhOwpAQCAtMzgsNiArMzksNyBAQAogICBwcm90ZWN0ZWQgZmluYWwgQnV0dG9uIGNhbmNlbEJ1dHRvbjsKICAgcHJvdGVjdGVkIGZpbmFsIEZsb3dQYW5lbCBidXR0b25QYW5lbDsKICAgcHJvdGVjdGVkIEFzeW5jQ2FsbGJhY2s8VD4gY2FsbGJhY2s7CisgIHByb3RlY3RlZCBGb2N1c1dpZGdldCBmb2N1c09uOwogCiAgIHByb3RlY3RlZCBib29sZWFuIHNlbnQgPSBmYWxzZTsKIApAQCAtNDUsNyArNDcsNiBAQAogICAgICAgQXN5bmNDYWxsYmFjazxUPiBjYWxsYmFjaykgewogICAgIHN1cGVyKC8qIGF1dG8gaGlkZSAqL2ZhbHNlLCAvKiBtb2RhbCAqL3RydWUpOwogICAgIHRoaXMuY2FsbGJhY2sgPSBjYWxsYmFjazsKLQogICAgIHNldEdsYXNzRW5hYmxlZCh0cnVlKTsKICAgICBzZXRUZXh0KHRpdGxlKTsKIApAQCAtNTUsNyArNTYsNyBAQAogICAgIG1lc3NhZ2Uuc2V0Q2hhcmFjdGVyV2lkdGgoNjApOwogICAgIG1lc3NhZ2Uuc2V0VmlzaWJsZUxpbmVzKDEwKTsKICAgICBET00uc2V0RWxlbWVudFByb3BlcnR5Qm9vbGVhbihtZXNzYWdlLmdldEVsZW1lbnQoKSwgInNwZWxsY2hlY2siLCB0cnVlKTsKLQorICAgIHNldEZvY3VzT24obWVzc2FnZSk7CiAgICAgc2VuZEJ1dHRvbiA9IG5ldyBCdXR0b24oVXRpbC5DLmNvbW1lbnRlZEFjdGlvbkJ1dHRvblNlbmQoKSk7CiAgICAgc2VuZEJ1dHRvbi5hZGRDbGlja0hhbmRsZXIobmV3IENsaWNrSGFuZGxlcigpIHsKICAgICAgIEBPdmVycmlkZQpAQCAtOTEsNiArOTIsMTAgQEAKICAgICBhZGRDbG9zZUhhbmRsZXIodGhpcyk7CiAgIH0KIAorICBwdWJsaWMgdm9pZCBzZXRGb2N1c09uKEZvY3VzV2lkZ2V0IGZvY3VzV2lkZ2V0KSB7CisgICAgZm9jdXNPbiA9IGZvY3VzV2lkZ2V0OworICB9CisKICAgcHVibGljIHZvaWQgZW5hYmxlQnV0dG9ucyhib29sZWFuIGVuYWJsZSkgewogICAgIHNlbmRCdXR0b24uc2V0RW5hYmxlZChlbmFibGUpOwogICAgIGNhbmNlbEJ1dHRvbi5zZXRFbmFibGVkKGVuYWJsZSk7CkBAIC0xMDAsNyArMTA1LDkgQEAKICAgcHVibGljIHZvaWQgY2VudGVyKCkgewogICAgIHN1cGVyLmNlbnRlcigpOwogICAgIEdsb2JhbEtleS5kaWFsb2codGhpcyk7Ci0gICAgbWVzc2FnZS5zZXRGb2N1cyh0cnVlKTsKKyAgICBpZiAoZm9jdXNPbiAhPSBudWxsKSB7CisgICAgICBmb2N1c09uLnNldEZvY3VzKHRydWUpOworICAgIH0KICAgfQogCiAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0ZpbHRlcmVkVXNlckludGVyZmFjZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0ZpbHRlcmVkVXNlckludGVyZmFjZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjAyMjQ0ZDAKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvRmlsdGVyZWRVc2VySW50ZXJmYWNlLmphdmEKQEAgLTAsMCArMSwyNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aTsKKworcHVibGljIGludGVyZmFjZSBGaWx0ZXJlZFVzZXJJbnRlcmZhY2UgeworICAvKioKKyAgICogUmV0dXJuIHRoZSB2YWx1ZSBieSB3aGljaCB0aGUgdXNlciBpbnRlcmZhY2UgaXMgY3VycmVudGx5IGZpbHRlcmVkLgorICAgKgorICAgKiBAcmV0dXJuIHZhbHVlIGJ5IHdoaWNoIHRoZSB1c2VyIGludGVyZmFjZSBpcyBjdXJyZW50bHkgZmlsdGVyZWQsCisgICAqICAgICAgICAgPGNvZGU+bnVsbDwvY29kZT4gb3IgZW1wdHkgU3RyaW5nIGlmIGN1cnJlbnRseSBubyBmaWx0ZXIgaXMgYXBwbGllZAorICAgKi8KKyAgcHVibGljIFN0cmluZyBnZXRDdXJyZW50RmlsdGVyKCk7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvSGlnaGxpZ2h0aW5nSW5saW5lSHlwZXJsaW5rLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvSGlnaGxpZ2h0aW5nSW5saW5lSHlwZXJsaW5rLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDA4MjVhMwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9IaWdobGlnaHRpbmdJbmxpbmVIeXBlcmxpbmsuamF2YQpAQCAtMCwwICsxLDM4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpOworCisKK3B1YmxpYyBjbGFzcyBIaWdobGlnaHRpbmdJbmxpbmVIeXBlcmxpbmsgZXh0ZW5kcyBJbmxpbmVIeXBlcmxpbmsgeworCisgIHByaXZhdGUgU3RyaW5nIHRvSGlnaGxpZ2h0OworCisgIHB1YmxpYyBIaWdobGlnaHRpbmdJbmxpbmVIeXBlcmxpbmsoZmluYWwgU3RyaW5nIHRleHQsIGZpbmFsIFN0cmluZyB0b2tlbiwKKyAgICAgIGZpbmFsIFN0cmluZyB0b0hpZ2hsaWdodCkgeworICAgIHN1cGVyKHRleHQsIHRva2VuKTsKKyAgICB0aGlzLnRvSGlnaGxpZ2h0ID0gdG9IaWdobGlnaHQ7CisgICAgaGlnaGxpZ2h0KHRleHQsIHRvSGlnaGxpZ2h0KTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBzZXRUZXh0KFN0cmluZyB0ZXh0KSB7CisgICAgc3VwZXIuc2V0VGV4dCh0ZXh0KTsKKyAgICBoaWdobGlnaHQodGV4dCwgdG9IaWdobGlnaHQpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGhpZ2hsaWdodChmaW5hbCBTdHJpbmcgdGV4dCwgZmluYWwgU3RyaW5nIHRvSGlnaGxpZ2h0KSB7CisgICAgc2V0SFRNTChVdGlsLmhpZ2hsaWdodCh0ZXh0LCB0b0hpZ2hsaWdodCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvSGlnaGxpZ2h0aW5nUHJvamVjdHNUYWJsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0hpZ2hsaWdodGluZ1Byb2plY3RzVGFibGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mYzYwMzYwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0hpZ2hsaWdodGluZ1Byb2plY3RzVGFibGUuamF2YQpAQCAtMCwwICsxLDM3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnByb2plY3RzLlByb2plY3RJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wcm9qZWN0cy5Qcm9qZWN0TWFwOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLklubGluZUhUTUw7CisKK3B1YmxpYyBjbGFzcyBIaWdobGlnaHRpbmdQcm9qZWN0c1RhYmxlIGV4dGVuZHMgUHJvamVjdHNUYWJsZSB7CisgIHByaXZhdGUgU3RyaW5nIHRvSGlnaGxpZ2h0OworCisgIHB1YmxpYyB2b2lkIGRpc3BsYXkoZmluYWwgUHJvamVjdE1hcCBwcm9qZWN0cywgZmluYWwgU3RyaW5nIHRvSGlnaGxpZ2h0KSB7CisgICAgdGhpcy50b0hpZ2hsaWdodCA9IHRvSGlnaGxpZ2h0OworICAgIHN1cGVyLmRpc3BsYXkocHJvamVjdHMpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIHBvcHVsYXRlKGZpbmFsIGludCByb3csIGZpbmFsIFByb2plY3RJbmZvIGspIHsKKyAgICB0YWJsZS5zZXRXaWRnZXQocm93LCAxLAorICAgICAgICBuZXcgSW5saW5lSFRNTChVdGlsLmhpZ2hsaWdodChrLm5hbWUoKSwgdG9IaWdobGlnaHQpKSk7CisgICAgdGFibGUuc2V0VGV4dChyb3csIDIsIGsuZGVzY3JpcHRpb24oKSk7CisKKyAgICBzZXRSb3dJdGVtKHJvdywgayk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9JZ25vcmVPdXRkYXRlZEZpbHRlclJlc3VsdHNDYWxsYmFja1dyYXBwZXIuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9JZ25vcmVPdXRkYXRlZEZpbHRlclJlc3VsdHNDYWxsYmFja1dyYXBwZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jOWNhZGNjCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0lnbm9yZU91dGRhdGVkRmlsdGVyUmVzdWx0c0NhbGxiYWNrV3JhcHBlci5qYXZhCkBAIC0wLDAgKzEsNTAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWk7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOworCisvKioKKyAqIEdlcnJpdENhbGxiYWNrIHRvIGJlIHVzZWQgb24gdXNlciBpbnRlcmZhY2VzIHRoYXQgYWxsb3cgZmlsdGVyaW5nIHRvIGhhbmRsZQorICogUlBDJ3MgdGhhdCByZXF1ZXN0IGZpbHRlcmluZy4gVGhlIHVzZXIgbWF5IGNoYW5nZSB0aGUgZmlsdGVyIHF1aWNrbHkgc28gdGhhdAorICogYSByZXNwb25zZSBtYXkgYmUgb3V0ZGF0ZWQgd2hlbiB0aGUgY2xpZW50IHJlY2VpdmVzIGl0LiBJbiB0aGlzIGNhc2UgdGhlCisgKiByZXNwb25zZSBtdXN0IGJlIGlnbm9yZWQgYmVjYXVzZSB0aGUgcmVzcG9uc2VzIHRvIFJDUCdzIG1heSBjb21lIG91dC1vZi1vcmRlcgorICogYW5kIGFuIG91dGRhdGVkIHJlc3BvbnNlIHdvdWxkIG92ZXJ3cml0ZSB0aGUgY29ycmVjdCByZXN1bHQgd2hpY2ggd2FzCisgKiByZWNlaXZlZCBiZWZvcmUuCisgKi8KK3B1YmxpYyBjbGFzcyBJZ25vcmVPdXRkYXRlZEZpbHRlclJlc3VsdHNDYWxsYmFja1dyYXBwZXI8VD4gZXh0ZW5kcyBHZXJyaXRDYWxsYmFjazxUPiB7CisgIHByaXZhdGUgZmluYWwgRmlsdGVyZWRVc2VySW50ZXJmYWNlIGZpbHRlcmVkVUk7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIG15RmlsdGVyOworICBwcml2YXRlIGZpbmFsIEdlcnJpdENhbGxiYWNrPFQ+IGNiOworCisgIHB1YmxpYyBJZ25vcmVPdXRkYXRlZEZpbHRlclJlc3VsdHNDYWxsYmFja1dyYXBwZXIoCisgICAgICBmaW5hbCBGaWx0ZXJlZFVzZXJJbnRlcmZhY2UgZmlsdGVyZWRVSSwgZmluYWwgR2Vycml0Q2FsbGJhY2s8VD4gY2IpIHsKKyAgICB0aGlzLmZpbHRlcmVkVUkgPSBmaWx0ZXJlZFVJOworICAgIHRoaXMubXlGaWx0ZXIgPSBmaWx0ZXJlZFVJLmdldEN1cnJlbnRGaWx0ZXIoKTsKKyAgICB0aGlzLmNiID0gY2I7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIFQgcmVzdWx0KSB7CisgICAgaWYgKChteUZpbHRlciA9PSBudWxsICYmIGZpbHRlcmVkVUkuZ2V0Q3VycmVudEZpbHRlcigpID09IG51bGwpCisgICAgICAgIHx8IChteUZpbHRlciAhPSBudWxsICYmIG15RmlsdGVyLmVxdWFscyhmaWx0ZXJlZFVJLmdldEN1cnJlbnRGaWx0ZXIoKSkpKSB7CisgICAgICBjYi5vblN1Y2Nlc3MocmVzdWx0KTsKKyAgICB9CisgICAgLy8gRWxzZSBpZ25vcmUgdGhlIHJlc3VsdCwgdGhlIHVzZXIgaGFzIGFscmVhZHkgY2hhbmdlZCB0aGUgZmlsdGVyCisgICAgLy8gYW5kIHRoZSByZXN1bHQgaXMgbm90IHJlbGV2YW50IGFueW1vcmUuIElmIG11bHRpcGxlIFJQQydzIGFyZQorICAgIC8vIGZpcmVkIHRoZSByZXN1bHRzIG1heSBjb21lIGJhY2sgb3V0LW9mLW9yZGVyIGFuZCBhIG5vbi1yZWxldmFudAorICAgIC8vIHJlc3VsdCBjb3VsZCBvdmVyd3JpdGUgdGhlIGNvcnJlY3QgcmVzdWx0IGlmIG5vdCBpZ25vcmVkLgorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvTGlua01lbnVCYXIuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9MaW5rTWVudUJhci5qYXZhCmluZGV4IDAzNTMyODEuLmZlN2ZmZTkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9MaW5rTWVudUJhci5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9MaW5rTWVudUJhci5qYXZhCkBAIC0xNSwyMCArMTUsMjEgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5hcmlhLmNsaWVudC5Sb2xlczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5Db21tYW5kOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkFjY2Vzc2liaWxpdHk7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQ29tcG9zaXRlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5XaWRnZXQ7CiAKLXB1YmxpYyBjbGFzcyBMaW5rTWVudUJhciBleHRlbmRzIENvbXBvc2l0ZSB7CitwdWJsaWMgY2xhc3MgTGlua01lbnVCYXIgZXh0ZW5kcyBDb21wb3NpdGUgaW1wbGVtZW50cyBTY3JlZW5Mb2FkSGFuZGxlciB7CiAgIHByaXZhdGUgZmluYWwgRmxvd1BhbmVsIGJvZHk7CiAKICAgcHVibGljIExpbmtNZW51QmFyKCkgewogICAgIGJvZHkgPSBuZXcgRmxvd1BhbmVsKCk7CiAgICAgaW5pdFdpZGdldChib2R5KTsKICAgICBzZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5saW5rTWVudUJhcigpKTsKLSAgICBBY2Nlc3NpYmlsaXR5LnNldFJvbGUoZ2V0RWxlbWVudCgpLCBBY2Nlc3NpYmlsaXR5LlJPTEVfTUVOVUJBUik7CisgICAgUm9sZXMuZ2V0TWVudWJhclJvbGUoKS5zZXQoZ2V0RWxlbWVudCgpKTsKKyAgICBHZXJyaXQuRVZFTlRfQlVTLmFkZEhhbmRsZXIoU2NyZWVuTG9hZEV2ZW50LlRZUEUsIHRoaXMpOwogICB9CiAKICAgcHVibGljIHZvaWQgYWRkSXRlbShmaW5hbCBTdHJpbmcgdGV4dCwgZmluYWwgQ29tbWFuZCBpbXApIHsKQEAgLTY2LDQgKzY3LDcgQEAKICAgICB9CiAgICAgYm9keS5hZGQoaSk7CiAgIH0KKworICBwdWJsaWMgdm9pZCBvblNjcmVlbkxvYWQoU2NyZWVuTG9hZEV2ZW50IGV2ZW50KSB7CisgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9MaW5rTWVudUl0ZW0uamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9MaW5rTWVudUl0ZW0uamF2YQppbmRleCBmMDc2YTJjLi4yMDU2OWMzIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvTGlua01lbnVJdGVtLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0xpbmtNZW51SXRlbS5qYXZhCkBAIC0xNSwxNCArMTUsMTUgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5hcmlhLmNsaWVudC5Sb2xlczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5kb20uY2xpZW50LkFuY2hvckVsZW1lbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQWNjZXNzaWJpbGl0eTsKIAotcHVibGljIGNsYXNzIExpbmtNZW51SXRlbSBleHRlbmRzIElubGluZUh5cGVybGluayB7CitwdWJsaWMgY2xhc3MgTGlua01lbnVJdGVtIGV4dGVuZHMgSW5saW5lSHlwZXJsaW5rIGltcGxlbWVudHMgU2NyZWVuTG9hZEhhbmRsZXIgewogICBwdWJsaWMgTGlua01lbnVJdGVtKGZpbmFsIFN0cmluZyB0ZXh0LCBmaW5hbCBTdHJpbmcgdGFyZ2V0SGlzdG9yeVRva2VuKSB7CiAgICAgc3VwZXIodGV4dCwgdGFyZ2V0SGlzdG9yeVRva2VuKTsKICAgICBzZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5tZW51SXRlbSgpKTsKLSAgICBBY2Nlc3NpYmlsaXR5LnNldFJvbGUoZ2V0RWxlbWVudCgpLCBBY2Nlc3NpYmlsaXR5LlJPTEVfTUVOVUlURU0pOworICAgIFJvbGVzLmdldE1lbnVpdGVtUm9sZSgpLnNldChnZXRFbGVtZW50KCkpOworICAgIEdlcnJpdC5FVkVOVF9CVVMuYWRkSGFuZGxlcihTY3JlZW5Mb2FkRXZlbnQuVFlQRSwgdGhpcyk7CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTMwLDQgKzMxLDEyIEBACiAgICAgc3VwZXIuZ28oKTsKICAgICBBbmNob3JFbGVtZW50LmFzKGdldEVsZW1lbnQoKSkuYmx1cigpOwogICB9CisKKyAgcHVibGljIHZvaWQgb25TY3JlZW5Mb2FkKFNjcmVlbkxvYWRFdmVudCBldmVudCkgeworICAgIGlmIChldmVudC5nZXRTY3JlZW4oKS5nZXRUb2tlbigpLmVxdWFscyhnZXRUYXJnZXRIaXN0b3J5VG9rZW4oKSkpeworICAgICAgYWRkU3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuYWN0aXZlUm93KCkpOworICAgIH0gZWxzZSB7CisgICAgICByZW1vdmVTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5hY3RpdmVSb3coKSk7CisgICAgfQorICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvTGlzdGVuYWJsZU9sZFZhbHVlLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvTGlzdGVuYWJsZU9sZFZhbHVlLmphdmEKaW5kZXggNWMzZTEyNy4uNDdiY2EyYiAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL0xpc3RlbmFibGVPbGRWYWx1ZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9MaXN0ZW5hYmxlT2xkVmFsdWUuamF2YQpAQCAtMjMsOCArMjMsMTEgQEAKICAgfQogCiAgIHB1YmxpYyB2b2lkIHNldChmaW5hbCBUIHZhbHVlKSB7Ci0gICAgb2xkVmFsdWUgPSBnZXQoKTsKLSAgICBzdXBlci5zZXQodmFsdWUpOwotICAgIG9sZFZhbHVlID0gbnVsbDsgLy8gYWxsb3cgaXQgdG8gYmUgZ2NlZCBiZWZvcmUgdGhlIG5leHQgZXZlbnQKKyAgICB0cnkgeworICAgICAgb2xkVmFsdWUgPSBnZXQoKTsKKyAgICAgIHN1cGVyLnNldCh2YWx1ZSk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIG9sZFZhbHVlID0gbnVsbDsgLy8gYWxsb3cgaXQgdG8gYmUgZ2NlZCBiZWZvcmUgdGhlIG5leHQgZXZlbnQKKyAgICB9CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9OYXZpZ2F0aW9uVGFibGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9OYXZpZ2F0aW9uVGFibGUuamF2YQppbmRleCA4ZDc0YmMzLi42M2MyNjM2IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvTmF2aWdhdGlvblRhYmxlLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL05hdmlnYXRpb25UYWJsZS5qYXZhCkBAIC0xNiwxMCArMTYsMTIgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QuZG9tLmNsaWVudC5Eb2N1bWVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleUNvZGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5UHJlc3NFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5zaGFyZWQuSGFuZGxlclJlZ2lzdHJhdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ET007CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRWxlbWVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5FdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5IVE1MVGFibGUuQ2VsbEZvcm1hdHRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5JbWFnZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5TY3JvbGxQYW5lbDsKQEAgLTM0LDYgKzM2LDQxIEBACiBpbXBvcnQgamF2YS51dGlsLk1hcC5FbnRyeTsKIAogcHVibGljIGFic3RyYWN0IGNsYXNzIE5hdmlnYXRpb25UYWJsZTxSb3dJdGVtPiBleHRlbmRzIEZhbmN5RmxleFRhYmxlPFJvd0l0ZW0+IHsKKyAgcHJvdGVjdGVkIGNsYXNzIE15RmxleFRhYmxlIGV4dGVuZHMgRmFuY3lGbGV4VGFibGUuTXlGbGV4VGFibGUgeworICAgIHB1YmxpYyBNeUZsZXhUYWJsZSgpIHsKKyAgICAgIHNpbmtFdmVudHMoRXZlbnQuT05EQkxDTElDSyB8IEV2ZW50Lk9OQ0xJQ0spOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIG9uQnJvd3NlckV2ZW50KGZpbmFsIEV2ZW50IGV2ZW50KSB7CisgICAgICBzd2l0Y2ggKERPTS5ldmVudEdldFR5cGUoZXZlbnQpKSB7CisgICAgICAgIGNhc2UgRXZlbnQuT05DTElDSzogeworICAgICAgICAgIC8vIEZpbmQgb3V0IHdoaWNoIGNlbGwgd2FzIGFjdHVhbGx5IGNsaWNrZWQuCisgICAgICAgICAgZmluYWwgRWxlbWVudCB0ZCA9IGdldEV2ZW50VGFyZ2V0Q2VsbChldmVudCk7CisgICAgICAgICAgaWYgKHRkID09IG51bGwpIHsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgIH0KKyAgICAgICAgICBmaW5hbCBpbnQgcm93ID0gcm93T2YodGQpOworICAgICAgICAgIGlmIChnZXRSb3dJdGVtKHJvdykgIT0gbnVsbCkgeworICAgICAgICAgICAgb25DZWxsU2luZ2xlQ2xpY2socm93T2YodGQpLCBjb2x1bW5PZih0ZCkpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgIH0KKyAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBjYXNlIEV2ZW50Lk9OREJMQ0xJQ0s6IHsKKyAgICAgICAgICAvLyBGaW5kIG91dCB3aGljaCBjZWxsIHdhcyBhY3R1YWxseSBjbGlja2VkLgorICAgICAgICAgIEVsZW1lbnQgdGQgPSBnZXRFdmVudFRhcmdldENlbGwoZXZlbnQpOworICAgICAgICAgIGlmICh0ZCA9PSBudWxsKSB7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgfQorICAgICAgICAgIG9uQ2VsbERvdWJsZUNsaWNrKHJvd09mKHRkKSwgY29sdW1uT2YodGQpKTsKKyAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIHN1cGVyLm9uQnJvd3NlckV2ZW50KGV2ZW50KTsKKyAgICB9CisgIH0KKwogICBAU3VwcHJlc3NXYXJuaW5ncygic2VyaWFsIikKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTGlua2VkSGFzaE1hcDxTdHJpbmcsIE9iamVjdD4gc2F2ZWRQb3NpdGlvbnMgPQogICAgICAgbmV3IExpbmtlZEhhc2hNYXA8U3RyaW5nLCBPYmplY3Q+KDEwLCAwLjc1ZiwgdHJ1ZSkgewpAQCAtNTQsNiArOTEsMTUgQEAKICAgcHJpdmF0ZSBib29sZWFuIGNvbXB1dGVkU2Nyb2xsVHlwZTsKICAgcHJpdmF0ZSBTY3JvbGxQYW5lbCBwYXJlbnRTY3JvbGxQYW5lbDsKIAorICBwcm90ZWN0ZWQgTmF2aWdhdGlvblRhYmxlKFN0cmluZyBpdGVtSGVscE5hbWUpIHsKKyAgICB0aGlzKCk7CisgICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBQcmV2S2V5Q29tbWFuZCgwLCAnaycsIFV0aWwuTS5oZWxwTGlzdFByZXYoaXRlbUhlbHBOYW1lKSkpOworICAgIGtleXNOYXZpZ2F0aW9uLmFkZChuZXcgTmV4dEtleUNvbW1hbmQoMCwgJ2onLCBVdGlsLk0uaGVscExpc3ROZXh0KGl0ZW1IZWxwTmFtZSkpKTsKKyAgICBrZXlzTmF2aWdhdGlvbi5hZGQobmV3IE9wZW5LZXlDb21tYW5kKDAsICdvJywgVXRpbC5NLmhlbHBMaXN0T3BlbihpdGVtSGVscE5hbWUpKSk7CisgICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBPcGVuS2V5Q29tbWFuZCgwLCBLZXlDb2Rlcy5LRVlfRU5URVIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFV0aWwuTS5oZWxwTGlzdE9wZW4oaXRlbUhlbHBOYW1lKSkpOworICB9CisKICAgcHJvdGVjdGVkIE5hdmlnYXRpb25UYWJsZSgpIHsKICAgICBwb2ludGVyID0gbmV3IEltYWdlKEdlcnJpdC5SRVNPVVJDRVMuYXJyb3dSaWdodCgpKTsKICAgICBrZXlzTmF2aWdhdGlvbiA9IG5ldyBLZXlDb21tYW5kU2V0KEdlcnJpdC5DLnNlY3Rpb25OYXZpZ2F0aW9uKCkpOwpAQCAtOTEsNiArMTM3LDE2IEBACiAgICAgfQogICB9CiAKKyAgLyoqIEludm9rZWQgd2hlbiB0aGUgdXNlciBkb3VibGUgY2xpY2tzIG9uIGEgdGFibGUgY2VsbC4gKi8KKyAgcHJvdGVjdGVkIHZvaWQgb25DZWxsRG91YmxlQ2xpY2soaW50IHJvdywgaW50IGNvbHVtbikgeworICAgIG9uT3BlblJvdyhyb3cpOworICB9CisKKyAgLyoqIEludm9rZWQgd2hlbiB0aGUgdXNlciBjbGlja3Mgb24gYSB0YWJsZSBjZWxsLiAqLworICBwcm90ZWN0ZWQgdm9pZCBvbkNlbGxTaW5nbGVDbGljayhpbnQgcm93LCBpbnQgY29sdW1uKSB7CisgICAgbW92ZVBvaW50ZXJUbyhyb3cpOworICB9CisKICAgcHJvdGVjdGVkIGludCBnZXRDdXJyZW50Um93KCkgewogICAgIHJldHVybiBjdXJyZW50Um93OwogICB9CkBAIC0yNTksNiArMzE1LDExIEBACiAgICAgc3VwZXIub25VbmxvYWQoKTsKICAgfQogCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgTXlGbGV4VGFibGUgY3JlYXRlRmxleFRhYmxlKCkgeworICAgIHJldHVybiBuZXcgTXlGbGV4VGFibGUoKTsKKyAgfQorCiAgIHB1YmxpYyBjbGFzcyBQcmV2S2V5Q29tbWFuZCBleHRlbmRzIEtleUNvbW1hbmQgewogICAgIHB1YmxpYyBQcmV2S2V5Q29tbWFuZChpbnQgbWFzaywgY2hhciBrZXksIFN0cmluZyBoZWxwKSB7CiAgICAgICBzdXBlcihtYXNrLCBrZXksIGhlbHApOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL09uRWRpdEVuYWJsZXIuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9PbkVkaXRFbmFibGVyLmphdmEKaW5kZXggYjU3NGRiMS4uYTdkNDlhNCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL09uRWRpdEVuYWJsZXIuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvT25FZGl0RW5hYmxlci5qYXZhCkBAIC0zMyw2ICszMyw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRm9jdXNXaWRnZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuTGlzdEJveDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5UZXh0Qm94QmFzZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5WYWx1ZUJveEJhc2U7CiAKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwpAQCAtMTM5LDYgKzE0MCwxNyBAQAogICAgIGlmICh3aWRnZXQuaXNFbmFibGVkKCkgfHwKICAgICAgICAgISAoZS5nZXRTb3VyY2UoKSBpbnN0YW5jZW9mIEZvY3VzV2lkZ2V0KSB8fAogICAgICAgICAhICgoRm9jdXNXaWRnZXQpIGUuZ2V0U291cmNlKCkpLmlzRW5hYmxlZCgpICkgeworICAgICAgaWYgKGUuZ2V0U291cmNlKCkgaW5zdGFuY2VvZiBWYWx1ZUJveEJhc2UpIHsKKyAgICAgICAgZmluYWwgVGV4dEJveEJhc2UgYm94ID0gKChUZXh0Qm94QmFzZSkgZS5nZXRTb3VyY2UoKSk7CisgICAgICAgIFNjaGVkdWxlci5nZXQoKS5zY2hlZHVsZURlZmVycmVkKG5ldyBTY2hlZHVsZWRDb21tYW5kKCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyB2b2lkIGV4ZWN1dGUoKSB7CisgICAgICAgICAgICBpZiAoYm94LmdldFZhbHVlKCkudHJpbSgpLmxlbmd0aCgpID09IDApIHsKKyAgICAgICAgICAgICAgd2lkZ2V0LnNldEVuYWJsZWQoZmFsc2UpOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAgICAgICAgfSk7CisgICAgICB9CiAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdExpc3RQb3B1cC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Byb2plY3RMaXN0UG9wdXAuamF2YQppbmRleCAyMTdjYTVhLi5jYWM3NjY3IDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdExpc3RQb3B1cC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Qcm9qZWN0TGlzdFBvcHVwLmphdmEKQEAgLTE0LDM2ICsxNCw0NiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aTsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFjY291bnQuVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucHJvamVjdHMuUHJvamVjdE1hcDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLkdlcnJpdENhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuQ2xpY2tFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleUNvZGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LmRvbS5jbGllbnQuS2V5VXBFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVVwSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5XaW5kb3c7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQnV0dG9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkZsb3dQYW5lbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Ib3Jpem9udGFsUGFuZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuTGFiZWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuUG9wdXBQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5TY3JvbGxQYW5lbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmdsb2JhbGtleS5jbGllbnQuR2xvYmFsS2V5OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuZ2xvYmFsa2V5LmNsaWVudC5IaWRlUG9wdXBQYW5lbENvbW1hbmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5nbG9iYWxrZXkuY2xpZW50Lk5wVGV4dEJveDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnVzZXIuY2xpZW50LlBsdWdpblNhZmVEaWFsb2dCb3g7CiAKIC8qKiBJdCBjcmVhdGVzIGEgcG9wdXAgY29udGFpbmluZyBhbGwgdGhlIHByb2plY3RzLiAqLwotcHVibGljIGNsYXNzIFByb2plY3RMaXN0UG9wdXAgewotICBwcml2YXRlIFByb2plY3RzVGFibGUgcHJvamVjdHNUYWI7CitwdWJsaWMgY2xhc3MgUHJvamVjdExpc3RQb3B1cCBpbXBsZW1lbnRzIEZpbHRlcmVkVXNlckludGVyZmFjZSB7CisgIHByaXZhdGUgSGlnaGxpZ2h0aW5nUHJvamVjdHNUYWJsZSBwcm9qZWN0c1RhYjsKICAgcHJpdmF0ZSBQbHVnaW5TYWZlRGlhbG9nQm94IHBvcHVwOworICBwcml2YXRlIE5wVGV4dEJveCBmaWx0ZXJUeHQ7CisgIHByaXZhdGUgSG9yaXpvbnRhbFBhbmVsIGZpbHRlclBhbmVsOworICBwcml2YXRlIFN0cmluZyBzdWJuYW1lOwogICBwcml2YXRlIEJ1dHRvbiBjbG9zZTsKICAgcHJpdmF0ZSBTY3JvbGxQYW5lbCBzcDsKICAgcHJpdmF0ZSBQb3B1cFBhbmVsLlBvc2l0aW9uQ2FsbGJhY2sgcG9wdXBQb3NpdGlvbjsKICAgcHJpdmF0ZSBpbnQgcHJlZmVycmVkVG9wOwogICBwcml2YXRlIGludCBwcmVmZXJyZWRMZWZ0OwotICBwcml2YXRlIGJvb2xlYW4gcG9waW5nVXA7CisgIHByaXZhdGUgYm9vbGVhbiBwb3BwaW5nVXA7CiAgIHByaXZhdGUgYm9vbGVhbiBmaXJzdFBvcHVwTG9hZCA9IHRydWU7CiAKICAgcHVibGljIHZvaWQgaW5pdFBvcHVwKGZpbmFsIFN0cmluZyBwb3B1cFRleHQsIGZpbmFsIFN0cmluZyBjdXJyZW50UGFnZUxpbmspIHsKICAgICBjcmVhdGVXaWRnZXRzKHBvcHVwVGV4dCwgY3VycmVudFBhZ2VMaW5rKTsKICAgICBmaW5hbCBGbG93UGFuZWwgcGZwID0gbmV3IEZsb3dQYW5lbCgpOworICAgIHBmcC5hZGQoZmlsdGVyUGFuZWwpOwogICAgIHNwID0gbmV3IFNjcm9sbFBhbmVsKHByb2plY3RzVGFiKTsKICAgICBzcC5zZXRTaXplKCIxMDAlIiwgIjEwMCUiKTsKICAgICBwZnAuYWRkKHNwKTsKQEAgLTg0LDEzICs5NCwzMCBAQAogICBwcm90ZWN0ZWQgdm9pZCBvcGVuUm93KFN0cmluZyBwcm9qZWN0TmFtZSkgewogICB9CiAKLSAgcHVibGljIGJvb2xlYW4gaXNQb3BpbmdVcCgpIHsKLSAgICByZXR1cm4gcG9waW5nVXA7CisgIHB1YmxpYyBib29sZWFuIGlzUG9wcGluZ1VwKCkgeworICAgIHJldHVybiBwb3BwaW5nVXA7CiAgIH0KIAogICBwcml2YXRlIHZvaWQgY3JlYXRlV2lkZ2V0cyhmaW5hbCBTdHJpbmcgcG9wdXBUZXh0LAogICAgICAgZmluYWwgU3RyaW5nIGN1cnJlbnRQYWdlTGluaykgewotICAgIHByb2plY3RzVGFiID0gbmV3IFByb2plY3RzVGFibGUoKSB7CisgICAgZmlsdGVyUGFuZWwgPSBuZXcgSG9yaXpvbnRhbFBhbmVsKCk7CisgICAgZmlsdGVyUGFuZWwuc2V0U3R5bGVOYW1lKEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkucHJvamVjdEZpbHRlclBhbmVsKCkpOworICAgIGZpbmFsIExhYmVsIGZpbHRlckxhYmVsID0KKyAgICAgICAgbmV3IExhYmVsKGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5hZG1pbi5VdGlsLkMucHJvamVjdEZpbHRlcigpKTsKKyAgICBmaWx0ZXJMYWJlbC5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5wcm9qZWN0RmlsdGVyTGFiZWwoKSk7CisgICAgZmlsdGVyUGFuZWwuYWRkKGZpbHRlckxhYmVsKTsKKyAgICBmaWx0ZXJUeHQgPSBuZXcgTnBUZXh0Qm94KCk7CisgICAgZmlsdGVyVHh0LnNldFZhbHVlKHN1Ym5hbWUpOworICAgIGZpbHRlclR4dC5hZGRLZXlVcEhhbmRsZXIobmV3IEtleVVwSGFuZGxlcigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgb25LZXlVcChLZXlVcEV2ZW50IGV2ZW50KSB7CisgICAgICAgIHN1Ym5hbWUgPSBmaWx0ZXJUeHQuZ2V0VmFsdWUoKTsKKyAgICAgICAgcG9wdWxhdGVQcm9qZWN0cygpOworICAgICAgfQorICAgIH0pOworICAgIGZpbHRlclBhbmVsLmFkZChmaWx0ZXJUeHQpOworCisgICAgcHJvamVjdHNUYWIgPSBuZXcgSGlnaGxpZ2h0aW5nUHJvamVjdHNUYWJsZSgpIHsKICAgICAgIEBPdmVycmlkZQogICAgICAgcHJvdGVjdGVkIHZvaWQgbW92ZVBvaW50ZXJUbyhmaW5hbCBpbnQgcm93LCBmaW5hbCBib29sZWFuIHNjcm9sbCkgewogICAgICAgICBzdXBlci5tb3ZlUG9pbnRlclRvKHJvdywgc2Nyb2xsKTsKQEAgLTExOSw3ICsxNDYsNyBAQAogICB9CiAKICAgcHVibGljIHZvaWQgZGlzcGxheVBvcHVwKCkgewotICAgIHBvcGluZ1VwID0gdHJ1ZTsKKyAgICBwb3BwaW5nVXAgPSB0cnVlOwogICAgIGlmIChmaXJzdFBvcHVwTG9hZCkgeyAvLyBGb3Igc2l6aW5nL3Bvc2l0aW9uaW5nLCBkZWxheSBkaXNwbGF5IHVudGlsIGxvYWRlZAogICAgICAgcG9wdWxhdGVQcm9qZWN0cygpOwogICAgIH0gZWxzZSB7CkBAIC0xMzIsNyArMTU5LDggQEAKICAgICAgIH0KICAgICAgIHByb2plY3RzVGFiLnNldFJlZ2lzdGVyS2V5cyh0cnVlKTsKICAgICAgIHByb2plY3RzVGFiLmZpbmlzaERpc3BsYXkoKTsKLSAgICAgIHBvcGluZ1VwID0gZmFsc2U7CisgICAgICBmaWx0ZXJUeHQuc2V0Rm9jdXModHJ1ZSk7CisgICAgICBwb3BwaW5nVXAgPSBmYWxzZTsKICAgICB9CiAgIH0KIApAQCAtMTQ2LDE1ICsxNzQsMjIgQEAKICAgfQogCiAgIHByb3RlY3RlZCB2b2lkIHBvcHVsYXRlUHJvamVjdHMoKSB7Ci0gICAgUHJvamVjdE1hcC5hbGwobmV3IEdlcnJpdENhbGxiYWNrPFByb2plY3RNYXA+KCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBvblN1Y2Nlc3MoZmluYWwgUHJvamVjdE1hcCByZXN1bHQpIHsKLSAgICAgICAgcHJvamVjdHNUYWIuZGlzcGxheShyZXN1bHQpOwotICAgICAgICBpZiAoZmlyc3RQb3B1cExvYWQpIHsgLy8gRGlzcGxheSB3YXMgZGVsYXllZCB1bnRpbCB0YWJsZSB3YXMgbG9hZGVkCi0gICAgICAgICAgZmlyc3RQb3B1cExvYWQgPSBmYWxzZTsKLSAgICAgICAgICBkaXNwbGF5UG9wdXAoKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0pOworICAgIFByb2plY3RNYXAubWF0Y2goc3VibmFtZSwKKyAgICAgICAgbmV3IElnbm9yZU91dGRhdGVkRmlsdGVyUmVzdWx0c0NhbGxiYWNrV3JhcHBlcjxQcm9qZWN0TWFwPih0aGlzLAorICAgICAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPFByb2plY3RNYXA+KCkgeworICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKGZpbmFsIFByb2plY3RNYXAgcmVzdWx0KSB7CisgICAgICAgICAgICAgICAgcHJvamVjdHNUYWIuZGlzcGxheShyZXN1bHQsIHN1Ym5hbWUpOworICAgICAgICAgICAgICAgIGlmIChmaXJzdFBvcHVwTG9hZCkgeyAvLyBEaXNwbGF5IHdhcyBkZWxheWVkIHVudGlsIHRhYmxlIHdhcyBsb2FkZWQKKyAgICAgICAgICAgICAgICAgIGZpcnN0UG9wdXBMb2FkID0gZmFsc2U7CisgICAgICAgICAgICAgICAgICBkaXNwbGF5UG9wdXAoKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGdldEN1cnJlbnRGaWx0ZXIoKSB7CisgICAgcmV0dXJuIHN1Ym5hbWU7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Qcm9qZWN0TmFtZVN1Z2dlc3RPcmFjbGUuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Qcm9qZWN0TmFtZVN1Z2dlc3RPcmFjbGUuamF2YQppbmRleCAyNWVkMjU4Li44MDM2NGNmIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdE5hbWVTdWdnZXN0T3JhY2xlLmphdmEKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Byb2plY3ROYW1lU3VnZ2VzdE9yYWNsZS5qYXZhCkBAIC0xNywxMiArMTcsMTIgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQuUnBjU3RhdHVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5wcm9qZWN0cy5Qcm9qZWN0TWFwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5ycGMuR2Vycml0Q2FsbGJhY2s7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLk5hdGl2ZXM7CiAKIC8qKiBTdWdnZXN0aW9uIE9yYWNsZSBmb3IgUHJvamVjdC5OYW1lS2V5IGVudGl0aWVzLiAqLwotcHVibGljIGNsYXNzIFByb2plY3ROYW1lU3VnZ2VzdE9yYWNsZSBleHRlbmRzIEhpZ2hsaWdodFN1Z2dlc3RPcmFjbGUgeworcHVibGljIGNsYXNzIFByb2plY3ROYW1lU3VnZ2VzdE9yYWNsZSBleHRlbmRzIFN1Z2dlc3RBZnRlclR5cGluZ05DaGFyc09yYWNsZSB7CiAgIEBPdmVycmlkZQotICBwdWJsaWMgdm9pZCBvblJlcXVlc3RTdWdnZXN0aW9ucyhmaW5hbCBSZXF1ZXN0IHJlcSwgZmluYWwgQ2FsbGJhY2sgY2FsbGJhY2spIHsKKyAgcHVibGljIHZvaWQgX29uUmVxdWVzdFN1Z2dlc3Rpb25zKGZpbmFsIFJlcXVlc3QgcmVxLCBmaW5hbCBDYWxsYmFjayBjYWxsYmFjaykgewogICAgIFJwY1N0YXR1cy5oaWRlKG5ldyBSdW5uYWJsZSgpIHsKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIHZvaWQgcnVuKCkgewpAQCAtMzAsNyArMzAsNyBAQAogICAgICAgICAgICAgbmV3IEdlcnJpdENhbGxiYWNrPFByb2plY3RNYXA+KCkgewogICAgICAgICAgICAgICBAT3ZlcnJpZGUKICAgICAgICAgICAgICAgcHVibGljIHZvaWQgb25TdWNjZXNzKFByb2plY3RNYXAgbWFwKSB7Ci0gICAgICAgICAgICAgICAgY2FsbGJhY2sub25TdWdnZXN0aW9uc1JlYWR5KHJlcSwgbmV3IFJlc3BvbnNlKG1hcC52YWx1ZXMoKS5hc0xpc3QoKSkpOworICAgICAgICAgICAgICAgIGNhbGxiYWNrLm9uU3VnZ2VzdGlvbnNSZWFkeShyZXEsIG5ldyBSZXNwb25zZShOYXRpdmVzLmFzTGlzdChtYXAudmFsdWVzKCkpKSk7CiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0pOwogICAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Byb2plY3RTZWFyY2hMaW5rLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdFNlYXJjaExpbmsuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wYWUyOWJmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Byb2plY3RTZWFyY2hMaW5rLmphdmEKQEAgLTAsMCArMSwzMyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5HZXJyaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LmFkbWluLlV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ET007CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuSW1hZ2U7CisKK3B1YmxpYyBjbGFzcyBQcm9qZWN0U2VhcmNoTGluayBleHRlbmRzIElubGluZUh5cGVybGluayB7CisKKyAgcHVibGljIFByb2plY3RTZWFyY2hMaW5rKFByb2plY3QuTmFtZUtleSBwcm9qZWN0TmFtZSkgeworICAgIHN1cGVyKCIgIiwgUGFnZUxpbmtzLnRvUHJvamVjdERhc2hib2FyZChwcm9qZWN0TmFtZSwgImRlZmF1bHQiKSk7CisgICAgc2V0VGl0bGUoVXRpbC5DLnByb2plY3RMaXN0UXVlcnlMaW5rKCkpOworICAgIGZpbmFsIEltYWdlIGltYWdlID0gbmV3IEltYWdlKEdlcnJpdC5SRVNPVVJDRVMucXVlcnlJY29uKCkpOworICAgIERPTS5pbnNlcnRCZWZvcmUoZ2V0RWxlbWVudCgpLCBpbWFnZS5nZXRFbGVtZW50KCksCisgICAgICAgIERPTS5nZXRGaXJzdENoaWxkKGdldEVsZW1lbnQoKSkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdHNUYWJsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Byb2plY3RzVGFibGUuamF2YQppbmRleCAwY2JlMTk0Li5hM2E1MDUyIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUHJvamVjdHNUYWJsZS5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9Qcm9qZWN0c1RhYmxlLmphdmEKQEAgLTE3LDEwICsxNyw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucHJvamVjdHMuUHJvamVjdEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnByb2plY3RzLlByb2plY3RNYXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlDb2RlczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5ET007Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQuRWxlbWVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC5FdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQucnBjLk5hdGl2ZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuRmxleFRhYmxlLkZsZXhDZWxsRm9ybWF0dGVyOwogCiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwpAQCAtMzAsMTEgKzI3LDcgQEAKIHB1YmxpYyBjbGFzcyBQcm9qZWN0c1RhYmxlIGV4dGVuZHMgTmF2aWdhdGlvblRhYmxlPFByb2plY3RJbmZvPiB7CiAKICAgcHVibGljIFByb2plY3RzVGFibGUoKSB7Ci0gICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBQcmV2S2V5Q29tbWFuZCgwLCAnaycsIFV0aWwuQy5wcm9qZWN0TGlzdFByZXYoKSkpOwotICAgIGtleXNOYXZpZ2F0aW9uLmFkZChuZXcgTmV4dEtleUNvbW1hbmQoMCwgJ2onLCBVdGlsLkMucHJvamVjdExpc3ROZXh0KCkpKTsKLSAgICBrZXlzTmF2aWdhdGlvbi5hZGQobmV3IE9wZW5LZXlDb21tYW5kKDAsICdvJywgVXRpbC5DLnByb2plY3RMaXN0T3BlbigpKSk7Ci0gICAga2V5c05hdmlnYXRpb24uYWRkKG5ldyBPcGVuS2V5Q29tbWFuZCgwLCBLZXlDb2Rlcy5LRVlfRU5URVIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFV0aWwuQy5wcm9qZWN0TGlzdE9wZW4oKSkpOworICAgIHN1cGVyKFV0aWwuQy5wcm9qZWN0SXRlbUhlbHAoKSk7CiAgICAgaW5pdENvbHVtbkhlYWRlcnMoKTsKICAgfQogCkBAIC00OCw0MyArNDEsNiBAQAogICB9CiAKICAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCBNeUZsZXhUYWJsZSBjcmVhdGVGbGV4VGFibGUoKSB7Ci0gICAgTXlGbGV4VGFibGUgdGFibGUgPSBuZXcgTXlGbGV4VGFibGUoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIG9uQnJvd3NlckV2ZW50KGZpbmFsIEV2ZW50IGV2ZW50KSB7Ci0gICAgICAgIHN3aXRjaCAoRE9NLmV2ZW50R2V0VHlwZShldmVudCkpIHsKLSAgICAgICAgICBjYXNlIEV2ZW50Lk9OQ0xJQ0s6IHsKLSAgICAgICAgICAgIC8vIEZpbmQgb3V0IHdoaWNoIGNlbGwgd2FzIGFjdHVhbGx5IGNsaWNrZWQuCi0gICAgICAgICAgICBmaW5hbCBFbGVtZW50IHRkID0gZ2V0RXZlbnRUYXJnZXRDZWxsKGV2ZW50KTsKLSAgICAgICAgICAgIGlmICh0ZCA9PSBudWxsKSB7Ci0gICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZmluYWwgaW50IHJvdyA9IHJvd09mKHRkKTsKLSAgICAgICAgICAgIGlmIChnZXRSb3dJdGVtKHJvdykgIT0gbnVsbCkgewotICAgICAgICAgICAgICBQcm9qZWN0c1RhYmxlLnRoaXMubW92ZVBvaW50ZXJUbyhyb3cpOwotICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgICB9Ci0gICAgICAgICAgY2FzZSBFdmVudC5PTkRCTENMSUNLOiB7Ci0gICAgICAgICAgICAvLyBGaW5kIG91dCB3aGljaCBjZWxsIHdhcyBhY3R1YWxseSBjbGlja2VkLgotICAgICAgICAgICAgRWxlbWVudCB0ZCA9IGdldEV2ZW50VGFyZ2V0Q2VsbChldmVudCk7Ci0gICAgICAgICAgICBpZiAodGQgPT0gbnVsbCkgewotICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBvbk9wZW5Sb3cocm93T2YodGQpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgc3VwZXIub25Ccm93c2VyRXZlbnQoZXZlbnQpOwotICAgICAgfQotICAgIH07Ci0KLSAgICB0YWJsZS5zaW5rRXZlbnRzKEV2ZW50Lk9OREJMQ0xJQ0sgfCBFdmVudC5PTkNMSUNLKTsKLSAgICByZXR1cm4gdGFibGU7Ci0gIH0KLQotICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIE9iamVjdCBnZXRSb3dJdGVtS2V5KGZpbmFsIFByb2plY3RJbmZvIGl0ZW0pIHsKICAgICByZXR1cm4gaXRlbS5uYW1lKCk7CiAgIH0KQEAgLTEwMCw3ICs1Niw3IEBACiAgICAgd2hpbGUgKDEgPCB0YWJsZS5nZXRSb3dDb3VudCgpKQogICAgICAgdGFibGUucmVtb3ZlUm93KHRhYmxlLmdldFJvd0NvdW50KCkgLSAxKTsKIAotICAgIExpc3Q8UHJvamVjdEluZm8+IGxpc3QgPSBwcm9qZWN0cy52YWx1ZXMoKS5hc0xpc3QoKTsKKyAgICBMaXN0PFByb2plY3RJbmZvPiBsaXN0ID0gTmF0aXZlcy5hc0xpc3QocHJvamVjdHMudmFsdWVzKCkpOwogICAgIENvbGxlY3Rpb25zLnNvcnQobGlzdCwgbmV3IENvbXBhcmF0b3I8UHJvamVjdEluZm8+KCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgaW50IGNvbXBhcmUoUHJvamVjdEluZm8gYSwgUHJvamVjdEluZm8gYikgewpAQCAtMTIwLDcgKzc2LDYgQEAKIAogICAgIGZpbmFsIEZsZXhDZWxsRm9ybWF0dGVyIGZtdCA9IHRhYmxlLmdldEZsZXhDZWxsRm9ybWF0dGVyKCk7CiAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7Ci0gICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDEsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuY1BST0pFQ1QoKSk7CiAgICAgZm10LmFkZFN0eWxlTmFtZShyb3csIDIsIEdlcnJpdC5SRVNPVVJDRVMuY3NzKCkuZGF0YUNlbGwoKSk7CiAKICAgICBwb3B1bGF0ZShyb3csIGspOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Jldmlld2VyU3VnZ2VzdE9yYWNsZS5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1Jldmlld2VyU3VnZ2VzdE9yYWNsZS5qYXZhCmluZGV4IDc0N2VmNDAuLjNmMWRlMmIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9SZXZpZXdlclN1Z2dlc3RPcmFjbGUuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvUmV2aWV3ZXJTdWdnZXN0T3JhY2xlLmphdmEKQEAgLTIyLDE4ICsyMiwxNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlJldmlld2VySW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLlN1Z2dlc3RPcmFjbGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zYWZlaHRtbC5jbGllbnQuSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZTsKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIC8qKiBTdWdnZXN0aW9uIE9yYWNsZSBmb3IgcmV2aWV3ZXJzLiAqLwotcHVibGljIGNsYXNzIFJldmlld2VyU3VnZ2VzdE9yYWNsZSBleHRlbmRzIEhpZ2hsaWdodFN1Z2dlc3RPcmFjbGUgeworcHVibGljIGNsYXNzIFJldmlld2VyU3VnZ2VzdE9yYWNsZSBleHRlbmRzIFN1Z2dlc3RBZnRlclR5cGluZ05DaGFyc09yYWNsZSB7CiAKICAgcHJpdmF0ZSBDaGFuZ2UuSWQgY2hhbmdlSWQ7CiAKICAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCB2b2lkIG9uUmVxdWVzdFN1Z2dlc3Rpb25zKGZpbmFsIFJlcXVlc3QgcmVxLCBmaW5hbCBDYWxsYmFjayBjYWxsYmFjaykgeworICBwcm90ZWN0ZWQgdm9pZCBfb25SZXF1ZXN0U3VnZ2VzdGlvbnMoZmluYWwgUmVxdWVzdCByZXEsIGZpbmFsIENhbGxiYWNrIGNhbGxiYWNrKSB7CiAgICAgUnBjU3RhdHVzLmhpZGUobmV3IFJ1bm5hYmxlKCkgewogICAgICAgcHVibGljIHZvaWQgcnVuKCkgewogICAgICAgICBTdWdnZXN0VXRpbC5TVkMuc3VnZ2VzdENoYW5nZVJldmlld2VyKGNoYW5nZUlkLCByZXEuZ2V0UXVlcnkoKSwKQEAgLTY2LDcgKzY1LDcgQEAKICAgICBwdWJsaWMgU3RyaW5nIGdldERpc3BsYXlTdHJpbmcoKSB7CiAgICAgICBmaW5hbCBBY2NvdW50SW5mbyBhY2NvdW50SW5mbyA9IHJldmlld2VySW5mby5nZXRBY2NvdW50SW5mbygpOwogICAgICAgaWYgKGFjY291bnRJbmZvICE9IG51bGwpIHsKLSAgICAgICAgcmV0dXJuIEZvcm1hdFV0aWwubmFtZUVtYWlsKGFjY291bnRJbmZvKTsKKyAgICAgICAgcmV0dXJuIEZvcm1hdFV0aWwubmFtZUVtYWlsKEZvcm1hdFV0aWwuYXNJbmZvKGFjY291bnRJbmZvKSk7CiAgICAgICB9CiAgICAgICByZXR1cm4gcmV2aWV3ZXJJbmZvLmdldEdyb3VwKCkuZ2V0TmFtZSgpICsgIiAoIgogICAgICAgICAgICsgVXRpbC5DLnN1Z2dlc3RlZEdyb3VwTGFiZWwoKSArICIpIjsKQEAgLTc1LDcgKzc0LDcgQEAKICAgICBwdWJsaWMgU3RyaW5nIGdldFJlcGxhY2VtZW50U3RyaW5nKCkgewogICAgICAgZmluYWwgQWNjb3VudEluZm8gYWNjb3VudEluZm8gPSByZXZpZXdlckluZm8uZ2V0QWNjb3VudEluZm8oKTsKICAgICAgIGlmIChhY2NvdW50SW5mbyAhPSBudWxsKSB7Ci0gICAgICAgIHJldHVybiBGb3JtYXRVdGlsLm5hbWVFbWFpbChhY2NvdW50SW5mbyk7CisgICAgICAgIHJldHVybiBGb3JtYXRVdGlsLm5hbWVFbWFpbChGb3JtYXRVdGlsLmFzSW5mbyhhY2NvdW50SW5mbykpOwogICAgICAgfQogICAgICAgcmV0dXJuIHJldmlld2VySW5mby5nZXRHcm91cCgpLmdldE5hbWUoKTsKICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvU2NyZWVuLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvU2NyZWVuLmphdmEKaW5kZXggODQ1YTA0Ni4uZTdjMmQ4NCAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1NjcmVlbi5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9TY3JlZW4uamF2YQpAQCAtMzksNiArMzksNyBAQAogICBwcml2YXRlIFN0cmluZyB0b2tlbjsKICAgcHJpdmF0ZSBib29sZWFuIHJlcXVpcmVzU2lnbkluOwogICBwcml2YXRlIFN0cmluZyB3aW5kb3dUaXRsZTsKKyAgcHJpdmF0ZSBXaWRnZXQgdGl0bGVXaWRnZXQ7CiAKICAgcHJvdGVjdGVkIFNjcmVlbigpIHsKICAgICBpbml0V2lkZ2V0KG5ldyBGbG93UGFuZWwoKSk7CkBAIC02NSw4ICs2NiwxMiBAQAogICAgIG1lLmFkZChoZWFkZXIgPSBuZXcgR3JpZCgxLCBDb2xzLnZhbHVlcygpLmxlbmd0aCkpOwogICAgIG1lLmFkZChib2R5ID0gbmV3IEZsb3dQYW5lbCgpKTsKIAorICAgIGhlYWRlclRleHQgPSBuZXcgSW5saW5lTGFiZWwoKTsKKyAgICBpZiAodGl0bGVXaWRnZXQgPT0gbnVsbCkgeworICAgICAgdGl0bGVXaWRnZXQgPSBoZWFkZXJUZXh0OworICAgIH0KICAgICBGbG93UGFuZWwgdGl0bGUgPSBuZXcgRmxvd1BhbmVsKCk7Ci0gICAgdGl0bGUuYWRkKGhlYWRlclRleHQgPSBuZXcgSW5saW5lTGFiZWwoKSk7CisgICAgdGl0bGUuYWRkKHRpdGxlV2lkZ2V0KTsKICAgICB0aXRsZS5zZXRTdHlsZU5hbWUoR2Vycml0LlJFU09VUkNFUy5jc3MoKS5zY3JlZW5IZWFkZXIoKSk7CiAgICAgaGVhZGVyLnNldFdpZGdldCgwLCBDb2xzLlRpdGxlLm9yZGluYWwoKSwgdGl0bGUpOwogCkBAIC05OSw2ICsxMDQsMTAgQEAKICAgICBoZWFkZXIuc2V0VmlzaWJsZSh2YWx1ZSk7CiAgIH0KIAorICBwdWJsaWMgdm9pZCBzZXRUaXRsZShmaW5hbCBXaWRnZXQgdykgeworICAgIHRpdGxlV2lkZ2V0ID0gdzsKKyAgfQorCiAgIHByb3RlY3RlZCB2b2lkIHNldFRpdGxlRWFzdChmaW5hbCBXaWRnZXQgdykgewogICAgIGhlYWRlci5zZXRXaWRnZXQoMCwgQ29scy5FYXN0Lm9yZGluYWwoKSwgdyk7CiAgIH0KQEAgLTE1NSw2ICsxNjQsOCBAQAogICAgICAgR2Vycml0LnNldFdpbmRvd1RpdGxlKHRoaXMsIHdpbmRvd1RpdGxlKTsKICAgICB9CiAgICAgR2Vycml0LnVwZGF0ZU1lbnVzKHRoaXMpOworICAgIEdlcnJpdC5FVkVOVF9CVVMuZmlyZUV2ZW50KG5ldyBTY3JlZW5Mb2FkRXZlbnQodGhpcykpOworICAgIEdlcnJpdC5zZXRRdWVyeVN0cmluZyhudWxsKTsKICAgICByZWdpc3RlcktleXMoKTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1NjcmVlbkxvYWRFdmVudC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1NjcmVlbkxvYWRFdmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU2MmU1M2EKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvU2NyZWVuTG9hZEV2ZW50LmphdmEKQEAgLTAsMCArMSw0MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmV2ZW50LnNoYXJlZC5Hd3RFdmVudDsKKworcHVibGljIGNsYXNzIFNjcmVlbkxvYWRFdmVudCBleHRlbmRzIEd3dEV2ZW50PFNjcmVlbkxvYWRIYW5kbGVyPiB7CisgIHByaXZhdGUgZmluYWwgU2NyZWVuIHNjcmVlbjsKKworICBwdWJsaWMgU2NyZWVuTG9hZEV2ZW50KFNjcmVlbiBzY3JlZW4pIHsKKyAgICBzdXBlcigpOworICAgIHRoaXMuc2NyZWVuID0gc2NyZWVuOworICB9CisKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlPFNjcmVlbkxvYWRIYW5kbGVyPiBUWVBFID0gbmV3IFR5cGU8U2NyZWVuTG9hZEhhbmRsZXI+KCk7CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGRpc3BhdGNoKFNjcmVlbkxvYWRIYW5kbGVyIGhhbmRsZXIpIHsKKyAgICBoYW5kbGVyLm9uU2NyZWVuTG9hZCh0aGlzKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgR3d0RXZlbnQuVHlwZTxTY3JlZW5Mb2FkSGFuZGxlcj4gZ2V0QXNzb2NpYXRlZFR5cGUoKSB7CisgICAgcmV0dXJuIFRZUEU7CisgIH0KKworICBwdWJsaWMgU2NyZWVuIGdldFNjcmVlbigpeworICAgIHJldHVybiBzY3JlZW47CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9TY3JlZW5Mb2FkSGFuZGxlci5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1NjcmVlbkxvYWRIYW5kbGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTkxYmVjZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9TY3JlZW5Mb2FkSGFuZGxlci5qYXZhCkBAIC0wLDAgKzEsMjEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWk7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5zaGFyZWQuRXZlbnRIYW5kbGVyOworCitwdWJsaWMgaW50ZXJmYWNlIFNjcmVlbkxvYWRIYW5kbGVyIGV4dGVuZHMgRXZlbnRIYW5kbGVyIHsKKyAgcHVibGljIHZvaWQgb25TY3JlZW5Mb2FkKFNjcmVlbkxvYWRFdmVudCBldmVudCk7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGY1NGJhNQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9TdWdnZXN0QWZ0ZXJUeXBpbmdOQ2hhcnNPcmFjbGUuamF2YQpAQCAtMCwwICsxLDM2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LnVpOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LkdlcnJpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5IaWdobGlnaHRTdWdnZXN0T3JhY2xlOworCisvKioKKyAqIFN1Z2dlc3Qgb3JhY2xlIHRoYXQgb25seSBwcm92aWRlcyBzdWdnZXN0aW9ucyBpZiB0aGUgdXNlciBoYXMgdHlwZWQgYXQgbGVhc3QKKyAqIGFzIG1hbnkgY2hhcmFjdGVycyBhcyBjb25maWd1cmVkIGJ5ICdzdWdnZXN0LmZyb20nLiBJZiAnc3VnZ2VzdC5mcm9tJyBpcyBzZXQKKyAqIHRvIDAsIHN1Z2dlc3Rpb25zIHdpbGwgYWx3YXlzIGJlIHByb3ZpZGVkLgorICovCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgU3VnZ2VzdEFmdGVyVHlwaW5nTkNoYXJzT3JhY2xlIGV4dGVuZHMgSGlnaGxpZ2h0U3VnZ2VzdE9yYWNsZSB7CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIG9uUmVxdWVzdFN1Z2dlc3Rpb25zKGZpbmFsIFJlcXVlc3QgcmVxdWVzdCwgZmluYWwgQ2FsbGJhY2sgZG9uZSkgeworICAgIGZpbmFsIGludCBzdWdnZXN0RnJvbSA9IEdlcnJpdC5nZXRDb25maWcoKS5nZXRTdWdnZXN0RnJvbSgpOworICAgIGlmIChzdWdnZXN0RnJvbSA9PSAwIHx8IHJlcXVlc3QuZ2V0UXVlcnkoKS5sZW5ndGgoKSA+PSBzdWdnZXN0RnJvbSkgeworICAgICAgX29uUmVxdWVzdFN1Z2dlc3Rpb25zKHJlcXVlc3QsIGRvbmUpOworICAgIH0KKyAgfQorCisgIHByb3RlY3RlZCBhYnN0cmFjdCB2b2lkIF9vblJlcXVlc3RTdWdnZXN0aW9ucyhSZXF1ZXN0IHJlcXVlc3QsIENhbGxiYWNrIGRvbmUpOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1RleHRCb3hDaGFuZ2VMaXN0ZW5lci5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1RleHRCb3hDaGFuZ2VMaXN0ZW5lci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNhOGVhMWQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvVGV4dEJveENoYW5nZUxpc3RlbmVyLmphdmEKQEAgLTAsMCArMSw5NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LlNjaGVkdWxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5TY2hlZHVsZXIuU2NoZWR1bGVkQ29tbWFuZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkZvY3VzRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5Gb2N1c0hhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlEb3duRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlEb3duSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LktleVByZXNzRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5LZXlQcmVzc0hhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5Nb3VzZVVwRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5Nb3VzZVVwSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5zaGFyZWQuR3d0RXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVGV4dEJveEJhc2U7CisKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBUZXh0Qm94Q2hhbmdlTGlzdGVuZXIgaW1wbGVtZW50cyBLZXlQcmVzc0hhbmRsZXIsIEtleURvd25IYW5kbGVyLCBNb3VzZVVwSGFuZGxlciB7CisKKyAgcHJpdmF0ZSBTdHJpbmcgb2xkVGV4dDsKKworICBwdWJsaWMgVGV4dEJveENoYW5nZUxpc3RlbmVyKGZpbmFsIFRleHRCb3hCYXNlIHRiKSB7CisgICAgb2xkVGV4dCA9IHRiLmdldFRleHQoKTsKKworICAgIHRiLmFkZEtleVByZXNzSGFuZGxlcih0aGlzKTsKKworICAgIC8vIElzIHRoZXJlIGFub3RoZXIgd2F5IHRvIGNhcHR1cmUgbWlkZGxlIGJ1dHRvbiBYMTEgcGFzdGVzIGluIGJyb3dzZXJzCisgICAgLy8gd2hpY2ggZG8gbm90IHlldCBzdXBwb3J0IE9OUEFTVEUgZXZlbnRzIChGaXJlZm94KT8KKyAgICB0Yi5hZGRNb3VzZVVwSGFuZGxlcih0aGlzKTsKKworICAgIC8vIFJlc2V0dGluZyB0aGUgIm9yaWdpbmFsIHRleHQiIG9uIGZvY3VzIGVuc3VyZXMgdGhhdCB3ZSBhcmUKKyAgICAvLyB1cCB0byBkYXRlIHdpdGggbm9uLXVzZXIgdXBkYXRlcyBvZiB0aGUgdGV4dCAoY2FsbHMgdG8KKyAgICAvLyBzZXRUZXh0KCkuLi4pIGFuZCBhbHNvIHVwIHRvIGRhdGUgd2l0aCB1c2VyIGNoYW5nZXMgd2hpY2gKKyAgICAvLyBvY2N1cnJlZCBhZnRlciBlbmFibGluZyAid2lkZ2V0Ii4KKyAgICB0Yi5hZGRGb2N1c0hhbmRsZXIobmV3IEZvY3VzSGFuZGxlcigpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHB1YmxpYyB2b2lkIG9uRm9jdXMoRm9jdXNFdmVudCBldmVudCkgeworICAgICAgICAgIG9sZFRleHQgPSB0Yi5nZXRUZXh0KCk7CisgICAgICAgIH0KKyAgICAgIH0pOworCisgICAgLy8gQ1RSTC1WIFBhc3RlcyBpbiBDaHJvbWUgc2VlbSBvbmx5IGRldGVjdGFibGUgdmlhIEJyb3dzZXJFdmVudHMgb3IKKyAgICAvLyBLZXlEb3duRXZlbnRzLCB0aGUgbGF0dGVyIGlzIGJldHRlci4KKyAgICB0Yi5hZGRLZXlEb3duSGFuZGxlcih0aGlzKTsKKyAgfQorCisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIG9uS2V5UHJlc3MoZmluYWwgS2V5UHJlc3NFdmVudCBlKSB7CisgICAgb24oZSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgb25LZXlEb3duKGZpbmFsIEtleURvd25FdmVudCBlKSB7CisgICAgb24oZSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgb25Nb3VzZVVwKGZpbmFsIE1vdXNlVXBFdmVudCBlKSB7CisgICAgb24oZSk7CisgIH0KKworICBwcml2YXRlIHZvaWQgb24oZmluYWwgR3d0RXZlbnQ8Pz4gZSkgeworICAgIGZpbmFsIFRleHRCb3hCYXNlIHRiID0gKFRleHRCb3hCYXNlKSBlLmdldFNvdXJjZSgpOworCisgICAgaWYgKCF0Yi5nZXRUZXh0KCkuZXF1YWxzKG9sZFRleHQpKSB7CisgICAgICBvblRleHRDaGFuZ2VkKHRiLmdldFRleHQoKSk7CisgICAgICBvbGRUZXh0ID0gdGIuZ2V0VGV4dCgpOworICAgIH0gZWxzZSB7CisgICAgICAvLyBUaGUgdGV4dCBhcHBlYXJzIHRvIG5vdCBhbHdheXMgZ2V0IHVwZGF0ZWQgdW50aWwgdGhlIGhhbmRsZXJzIGNvbXBsZXRlLgorICAgICAgU2NoZWR1bGVyLmdldCgpLnNjaGVkdWxlRGVmZXJyZWQobmV3IFNjaGVkdWxlZENvbW1hbmQoKSB7CisgICAgICAgIEBPdmVycmlkZQorICAgICAgICBwdWJsaWMgdm9pZCBleGVjdXRlKCkgeworICAgICAgICAgIGlmICghdGIuZ2V0VGV4dCgpLmVxdWFscyhvbGRUZXh0KSkgeworICAgICAgICAgICAgb25UZXh0Q2hhbmdlZCh0Yi5nZXRUZXh0KCkpOworICAgICAgICAgICAgb2xkVGV4dCA9IHRiLmdldFRleHQoKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0pOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBhYnN0cmFjdCB2b2lkIG9uVGV4dENoYW5nZWQoU3RyaW5nIG5ld1RleHQpOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1VJQ29uc3RhbnRzLmphdmEgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvVUlDb25zdGFudHMuamF2YQppbmRleCBlYmJiMDQ5Li4xOTE5Y2QzIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvVUlDb25zdGFudHMuamF2YQorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvVUlDb25zdGFudHMuamF2YQpAQCAtMjIsNyArMjIsNSBAQAogCiAgIFN0cmluZyBwcm9qZWN0TmFtZSgpOwogICBTdHJpbmcgcHJvamVjdERlc2NyaXB0aW9uKCk7Ci0gIFN0cmluZyBwcm9qZWN0TGlzdE9wZW4oKTsKLSAgU3RyaW5nIHByb2plY3RMaXN0UHJldigpOwotICBTdHJpbmcgcHJvamVjdExpc3ROZXh0KCk7CisgIFN0cmluZyBwcm9qZWN0SXRlbUhlbHAoKTsKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9VSUNvbnN0YW50cy5wcm9wZXJ0aWVzIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1VJQ29uc3RhbnRzLnByb3BlcnRpZXMKaW5kZXggYWEwMGNlZS4uOGE3MjM1NSAxMDA2NDQKLS0tIGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1VJQ29uc3RhbnRzLnByb3BlcnRpZXMKKysrIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1VJQ29uc3RhbnRzLnByb3BlcnRpZXMKQEAgLTMsNiArMyw0IEBACiAKIHByb2plY3ROYW1lID0gUHJvamVjdCBOYW1lCiBwcm9qZWN0RGVzY3JpcHRpb24gPSBQcm9qZWN0IERlc2NyaXB0aW9uCi1wcm9qZWN0TGlzdE9wZW4gPSBTZWxlY3QgcHJvamVjdAotcHJvamVjdExpc3RQcmV2ID0gUHJldmlvdXMgcHJvamVjdAotcHJvamVjdExpc3ROZXh0ID0gTmV4dCBwcm9qZWN0Citwcm9qZWN0SXRlbUhlbHAgPSBwcm9qZWN0ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1VJTWVzc2FnZXMuamF2YSBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9VSU1lc3NhZ2VzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmNiODQ2ZjQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvVUlNZXNzYWdlcy5qYXZhCkBAIC0wLDAgKzEsMjMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jbGllbnQudWk7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5pMThuLmNsaWVudC5NZXNzYWdlczsKKworcHVibGljIGludGVyZmFjZSBVSU1lc3NhZ2VzIGV4dGVuZHMgTWVzc2FnZXMgeworICBTdHJpbmcgaGVscExpc3RPcGVuKFN0cmluZyBpdGVtKTsKKyAgU3RyaW5nIGhlbHBMaXN0UHJldihTdHJpbmcgaXRlbSk7CisgIFN0cmluZyBoZWxwTGlzdE5leHQoU3RyaW5nIGl0ZW0pOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1VJTWVzc2FnZXMucHJvcGVydGllcyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9VSU1lc3NhZ2VzLnByb3BlcnRpZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTQzOTI0NQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9VSU1lc3NhZ2VzLnByb3BlcnRpZXMKQEAgLTAsMCArMSwzIEBACitoZWxwTGlzdE9wZW4gPSBTZWxlY3QgezB9CitoZWxwTGlzdFByZXYgPSBQcmV2aW91cyB7MH0KK2hlbHBMaXN0TmV4dCA9IE5leHQgezB9CmRpZmYgLS1naXQgYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvVXRpbC5qYXZhIGIvZ2Vycml0LWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L3VpL1V0aWwuamF2YQppbmRleCA5OGYxM2VmLi44MDRlZWUxIDEwMDY0NAotLS0gYS9nZXJyaXQtZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jbGllbnQvdWkvVXRpbC5qYXZhCisrKyBiL2dlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC91aS9VdGlsLmphdmEKQEAgLTE1LDcgKzE1LDM1IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC51aTsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuY2xpZW50LkdXVDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNhZmVodG1sLmNsaWVudC5TYWZlSHRtbEJ1aWxkZXI7CiAKIHB1YmxpYyBjbGFzcyBVdGlsIHsKICAgcHVibGljIHN0YXRpYyBmaW5hbCBVSUNvbnN0YW50cyBDID0gR1dULmNyZWF0ZShVSUNvbnN0YW50cy5jbGFzcyk7CisgIHB1YmxpYyBzdGF0aWMgZmluYWwgVUlNZXNzYWdlcyBNID0gR1dULmNyZWF0ZShVSU1lc3NhZ2VzLmNsYXNzKTsKKworICBwdWJsaWMgc3RhdGljIFN0cmluZyBoaWdobGlnaHQoZmluYWwgU3RyaW5nIHRleHQsIGZpbmFsIFN0cmluZyB0b0hpZ2hsaWdodCkgeworICAgIGZpbmFsIFNhZmVIdG1sQnVpbGRlciBiID0gbmV3IFNhZmVIdG1sQnVpbGRlcigpOworICAgIGlmICh0b0hpZ2hsaWdodCA9PSBudWxsIHx8ICIiLmVxdWFscyh0b0hpZ2hsaWdodCkpIHsKKyAgICAgIGIuYXBwZW5kKHRleHQpOworICAgICAgcmV0dXJuIGIudG9TYWZlSHRtbCgpLmFzU3RyaW5nKCk7CisgICAgfQorCisgICAgaW50IHBvcyA9IDA7CisgICAgaW50IGVuZFBvcyA9IDA7CisgICAgd2hpbGUgKChwb3MgPSB0ZXh0LnRvTG93ZXJDYXNlKCkuaW5kZXhPZigKKyAgICAgICAgdG9IaWdobGlnaHQudG9Mb3dlckNhc2UoKSwgcG9zKSkgPiAtMSkgeworICAgICAgaWYgKHBvcyA+IGVuZFBvcykgeworICAgICAgICBiLmFwcGVuZCh0ZXh0LnN1YnN0cmluZyhlbmRQb3MsIHBvcykpOworICAgICAgfQorICAgICAgZW5kUG9zID0gcG9zICsgdG9IaWdobGlnaHQubGVuZ3RoKCk7CisgICAgICBiLm9wZW5FbGVtZW50KCJiIik7CisgICAgICBiLmFwcGVuZCh0ZXh0LnN1YnN0cmluZyhwb3MsIGVuZFBvcykpOworICAgICAgYi5jbG9zZUVsZW1lbnQoImIiKTsKKyAgICAgIHBvcyA9IGVuZFBvczsKKyAgICB9CisgICAgaWYgKGVuZFBvcyA8IHRleHQubGVuZ3RoKCkpIHsKKyAgICAgIGIuYXBwZW5kKHRleHQuc3Vic3RyaW5nKGVuZFBvcykpOworICAgIH0KKyAgICByZXR1cm4gYi50b1NhZmVIdG1sKCkuYXNTdHJpbmcoKTsKKyAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3BvbS54bWwgYi9nZXJyaXQtaHR0cGQvcG9tLnhtbAppbmRleCBjZWFjYjY2Li42NTY0MWFhIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvcG9tLnhtbAorKysgYi9nZXJyaXQtaHR0cGQvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LWh0dHBkPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvQ2FjaGVCYXNlZFdlYlNlc3Npb24uamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0NhY2hlQmFzZWRXZWJTZXNzaW9uLmphdmEKaW5kZXggY2EzZDI4Ny4uOTY3OTJmMCAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvQ2FjaGVCYXNlZFdlYlNlc3Npb24uamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9DYWNoZUJhc2VkV2ViU2Vzc2lvbi5qYXZhCkBAIC0yNSw3ICsyNSw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFub255bW91c1VzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BdXRoTWV0aG9kOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhSZXN1bHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNhY2hlLkNhY2hlTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQXV0aENvbmZpZzsKQEAgLTM2LDYgKzM1LDggQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuaHR0cC5zZXJ2ZXIuR2l0U21hcnRIdHRwVG9vbHM7CiAKK2ltcG9ydCBqYXZhLnV0aWwuRW51bVNldDsKKwogaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5Db29raWU7CiBpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVxdWVzdDsKIGltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZTsKQEAgLTY3LDEyICs2OCwxMiBAQAogICBwcml2YXRlIGZpbmFsIEF1dGhDb25maWcgYXV0aENvbmZpZzsKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxBbm9ueW1vdXNVc2VyPiBhbm9ueW1vdXNQcm92aWRlcjsKICAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5SZXF1ZXN0RmFjdG9yeSBpZGVudGlmaWVkOwotICBwcml2YXRlIEFjY2Vzc1BhdGggYWNjZXNzUGF0aDsKKyAgcHJpdmF0ZSBmaW5hbCBFbnVtU2V0PEFjY2Vzc1BhdGg+IG9rUGF0aHMgPSBFbnVtU2V0Lm9mKEFjY2Vzc1BhdGguVU5LTk9XTik7CiAgIHByaXZhdGUgQ29va2llIG91dENvb2tpZTsKLSAgcHJpdmF0ZSBBdXRoTWV0aG9kIGF1dGhNZXRob2Q7CiAKICAgcHJpdmF0ZSBLZXkga2V5OwogICBwcml2YXRlIFZhbCB2YWw7CisgIHByaXZhdGUgQ3VycmVudFVzZXIgdXNlcjsKIAogICBASW5qZWN0CiAgIENhY2hlQmFzZWRXZWJTZXNzaW9uKGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXF1ZXN0LApAQCAtODcsMzEgKzg4LDIyIEBACiAgICAgdGhpcy5hbm9ueW1vdXNQcm92aWRlciA9IGFub255bW91c1Byb3ZpZGVyOwogICAgIHRoaXMuaWRlbnRpZmllZCA9IGlkZW50aWZpZWQ7CiAKLSAgICBpZiAoR2l0U21hcnRIdHRwVG9vbHMuaXNHaXRDbGllbnQocmVxdWVzdCkpIHsKLSAgICAgIGFjY2Vzc1BhdGggPSBBY2Nlc3NQYXRoLkdJVDsKLSAgICB9IGVsc2UgewotICAgICAgYWNjZXNzUGF0aCA9IEFjY2Vzc1BhdGguV0VCX1VJOwotICAgIH0KKyAgICBpZiAoIUdpdFNtYXJ0SHR0cFRvb2xzLmlzR2l0Q2xpZW50KHJlcXVlc3QpKSB7CisgICAgICBTdHJpbmcgY29va2llID0gcmVhZENvb2tpZSgpOworICAgICAgaWYgKGNvb2tpZSAhPSBudWxsKSB7CisgICAgICAgIGtleSA9IG5ldyBLZXkoY29va2llKTsKKyAgICAgICAgdmFsID0gbWFuYWdlci5nZXQoa2V5KTsKKyAgICAgICAgaWYgKHZhbCAhPSBudWxsICYmIHZhbC5uZWVkc0Nvb2tpZVJlZnJlc2goKSkgeworICAgICAgICAgIC8vIENvb2tpZSBpcyBtb3JlIHRoYW4gaGFsZiBvbGQuIFNlbmQgdGhlIGNvb2tpZSBhZ2FpbiB0byB0aGUKKyAgICAgICAgICAvLyBjbGllbnQgd2l0aCBhbiB1cGRhdGVkIGV4cGlyYXRpb24gZGF0ZS4KKyAgICAgICAgICB2YWwgPSBtYW5hZ2VyLmNyZWF0ZVZhbChrZXksIHZhbCk7CisgICAgICAgIH0KIAotICAgIGZpbmFsIFN0cmluZyBjb29raWUgPSByZWFkQ29va2llKCk7Ci0gICAgaWYgKGNvb2tpZSAhPSBudWxsKSB7Ci0gICAgICBrZXkgPSBuZXcgS2V5KGNvb2tpZSk7Ci0gICAgICB2YWwgPSBtYW5hZ2VyLmdldChrZXkpOwotICAgIH0gZWxzZSB7Ci0gICAgICBrZXkgPSBudWxsOwotICAgICAgdmFsID0gbnVsbDsKLSAgICB9Ci0gICAgYXV0aE1ldGhvZCA9IGlzU2lnbmVkSW4oKSA/IEF1dGhNZXRob2QuQ09PS0lFIDogQXV0aE1ldGhvZC5OT05FOwotCi0gICAgaWYgKGlzU2lnbmVkSW4oKSAmJiB2YWwubmVlZHNDb29raWVSZWZyZXNoKCkpIHsKLSAgICAgIC8vIENvb2tpZSBpcyBtb3JlIHRoYW4gaGFsZiBvbGQuIFNlbmQgdGhlIGNvb2tpZSBhZ2FpbiB0byB0aGUKLSAgICAgIC8vIGNsaWVudCB3aXRoIGFuIHVwZGF0ZWQgZXhwaXJhdGlvbiBkYXRlLiBXZSBkb24ndCBkYXJlIHRvCi0gICAgICAvLyBjaGFuZ2UgdGhlIGtleSB0b2tlbiBoZXJlIGJlY2F1c2UgdGhlcmUgbWF5IGJlIG90aGVyIFJQQ3MKLSAgICAgIC8vIHF1ZXVlZCB1cCBpbiB0aGUgYnJvd3NlciB3aG9zZSB4c3JmS2V5IHdvdWxkIG5vdCBnZXQgdXBkYXRlZAotICAgICAgLy8gd2l0aCB0aGUgbmV3IHRva2VuLCBjYXVzaW5nIHRoZW0gdG8gZmFpbC4KLSAgICAgIC8vCi0gICAgICB2YWwgPSBtYW5hZ2VyLmNyZWF0ZVZhbChrZXksIHZhbCk7Ci0gICAgICBzYXZlQ29va2llKCk7CisgICAgICAgIFN0cmluZyB0b2tlbiA9IHJlcXVlc3QuZ2V0SGVhZGVyKCJYLUdlcnJpdC1BdXRoIik7CisgICAgICAgIGlmICh2YWwgIT0gbnVsbCAmJiB0b2tlbiAhPSBudWxsICYmIHRva2VuLmVxdWFscyh2YWwuZ2V0QXV0aCgpKSkgeworICAgICAgICAgIG9rUGF0aHMuYWRkKEFjY2Vzc1BhdGguUkVTVF9BUEkpOworICAgICAgICB9CisgICAgICB9CiAgICAgfQogICB9CiAKQEAgLTEyOCwzMyArMTIwLDU0IEBACiAgICAgcmV0dXJuIG51bGw7CiAgIH0KIAorICBAT3ZlcnJpZGUKICAgcHVibGljIGJvb2xlYW4gaXNTaWduZWRJbigpIHsKICAgICByZXR1cm4gdmFsICE9IG51bGw7CiAgIH0KIAotICBwdWJsaWMgU3RyaW5nIGdldFRva2VuKCkgewotICAgIHJldHVybiBpc1NpZ25lZEluKCkgPyB2YWwuZ2V0WHNyZlRva2VuKCkgOiBudWxsOworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRYR2Vycml0QXV0aCgpIHsKKyAgICByZXR1cm4gaXNTaWduZWRJbigpID8gdmFsLmdldEF1dGgoKSA6IG51bGw7CiAgIH0KIAotICBwdWJsaWMgYm9vbGVhbiBpc1Rva2VuVmFsaWQoZmluYWwgU3RyaW5nIGlucHV0VG9rZW4pIHsKLSAgICByZXR1cm4gaXNTaWduZWRJbigpIC8vCi0gICAgICAgICYmIHZhbC5nZXRYc3JmVG9rZW4oKSAhPSBudWxsIC8vCi0gICAgICAgICYmIHZhbC5nZXRYc3JmVG9rZW4oKS5lcXVhbHMoaW5wdXRUb2tlbik7CisgIEBPdmVycmlkZQorICBwdWJsaWMgYm9vbGVhbiBpc1ZhbGlkWEdlcnJpdEF1dGgoU3RyaW5nIGtleUluKSB7CisgICAgcmV0dXJuIGtleUluLmVxdWFscyhnZXRYR2Vycml0QXV0aCgpKTsKICAgfQogCisgIEBPdmVycmlkZQorICBwdWJsaWMgYm9vbGVhbiBpc0FjY2Vzc1BhdGhPayhBY2Nlc3NQYXRoIHBhdGgpIHsKKyAgICByZXR1cm4gb2tQYXRocy5jb250YWlucyhwYXRoKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBzZXRBY2Nlc3NQYXRoT2soQWNjZXNzUGF0aCBwYXRoLCBib29sZWFuIG9rKSB7CisgICAgaWYgKG9rKSB7CisgICAgICBva1BhdGhzLmFkZChwYXRoKTsKKyAgICB9IGVsc2UgeworICAgICAgb2tQYXRocy5yZW1vdmUocGF0aCk7CisgICAgfQorICB9CisKKyAgQE92ZXJyaWRlCiAgIHB1YmxpYyBBY2NvdW50RXh0ZXJuYWxJZC5LZXkgZ2V0TGFzdExvZ2luRXh0ZXJuYWxJZCgpIHsKICAgICByZXR1cm4gdmFsICE9IG51bGwgPyB2YWwuZ2V0RXh0ZXJuYWxJZCgpIDogbnVsbDsKICAgfQogCisgIEBPdmVycmlkZQogICBwdWJsaWMgQ3VycmVudFVzZXIgZ2V0Q3VycmVudFVzZXIoKSB7Ci0gICAgaWYgKGlzU2lnbmVkSW4oKSkgewotICAgICAgcmV0dXJuIGlkZW50aWZpZWQuY3JlYXRlKGFjY2Vzc1BhdGgsIHZhbC5nZXRBY2NvdW50SWQoKSk7CisgICAgaWYgKHVzZXIgPT0gbnVsbCkgeworICAgICAgaWYgKGlzU2lnbmVkSW4oKSkgeworICAgICAgICB1c2VyID0gaWRlbnRpZmllZC5jcmVhdGUodmFsLmdldEFjY291bnRJZCgpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHVzZXIgPSBhbm9ueW1vdXNQcm92aWRlci5nZXQoKTsKKyAgICAgIH0KICAgICB9Ci0gICAgcmV0dXJuIGFub255bW91c1Byb3ZpZGVyLmdldCgpOworICAgIHJldHVybiB1c2VyOwogICB9CiAKLSAgcHVibGljIHZvaWQgbG9naW4oZmluYWwgQXV0aFJlc3VsdCByZXMsIGZpbmFsIEF1dGhNZXRob2QgbWV0aCwKLSAgICAgICAgICAgICAgICAgICAgZmluYWwgYm9vbGVhbiByZW1lbWJlck1lKSB7CisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBsb2dpbihmaW5hbCBBdXRoUmVzdWx0IHJlcywgZmluYWwgYm9vbGVhbiByZW1lbWJlck1lKSB7CiAgICAgZmluYWwgQWNjb3VudC5JZCBpZCA9IHJlcy5nZXRBY2NvdW50SWQoKTsKICAgICBmaW5hbCBBY2NvdW50RXh0ZXJuYWxJZC5LZXkgaWRlbnRpdHkgPSByZXMuZ2V0RXh0ZXJuYWxJZCgpOwogCkBAIC0xNjMsMTkgKzE3NiwxOCBAQAogICAgIH0KIAogICAgIGtleSA9IG1hbmFnZXIuY3JlYXRlS2V5KGlkKTsKLSAgICB2YWwgPSBtYW5hZ2VyLmNyZWF0ZVZhbChrZXksIGlkLCByZW1lbWJlck1lLCBpZGVudGl0eSwgbnVsbCk7CisgICAgdmFsID0gbWFuYWdlci5jcmVhdGVWYWwoa2V5LCBpZCwgcmVtZW1iZXJNZSwgaWRlbnRpdHksIG51bGwsIG51bGwpOwogICAgIHNhdmVDb29raWUoKTsKLQotICAgIGF1dGhNZXRob2QgPSBtZXRoOwogICB9CiAKICAgLyoqIFNldCB0aGUgdXNlciBhY2NvdW50IGZvciB0aGlzIGN1cnJlbnQgcmVxdWVzdCBvbmx5LiAqLwotICBwdWJsaWMgdm9pZCBzZXRVc2VyQWNjb3VudElkKEFjY291bnQuSWQgaWQsIEF1dGhNZXRob2QgbWV0aG9kKSB7CisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBzZXRVc2VyQWNjb3VudElkKEFjY291bnQuSWQgaWQpIHsKICAgICBrZXkgPSBuZXcgS2V5KCJpZDoiICsgaWQpOwotICAgIHZhbCA9IG5ldyBWYWwoaWQsIDAsIGZhbHNlLCBudWxsLCAiIiwgMCk7Ci0gICAgYXV0aE1ldGhvZCA9IG1ldGhvZDsKKyAgICB2YWwgPSBuZXcgVmFsKGlkLCAwLCBmYWxzZSwgbnVsbCwgMCwgbnVsbCwgbnVsbCk7CiAgIH0KIAorICBAT3ZlcnJpZGUKICAgcHVibGljIHZvaWQgbG9nb3V0KCkgewogICAgIGlmICh2YWwgIT0gbnVsbCkgewogICAgICAgbWFuYWdlci5kZXN0cm95KGtleSk7CkBAIC0xODUsNiArMTk3LDExIEBACiAgICAgfQogICB9CiAKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0U2Vzc2lvbklkKCkgeworICAgIHJldHVybiB2YWwgIT0gbnVsbCA/IHZhbC5nZXRTZXNzaW9uSWQoKSA6IG51bGw7CisgIH0KKwogICBwcml2YXRlIHZvaWQgc2F2ZUNvb2tpZSgpIHsKICAgICBmaW5hbCBTdHJpbmcgdG9rZW47CiAgICAgZmluYWwgaW50IGFnZVNlY29uZHM7CkBAIC0yMjAsOCArMjM3LDQgQEAKICAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc1NlY3VyZShmaW5hbCBIdHRwU2VydmxldFJlcXVlc3QgcmVxKSB7CiAgICAgcmV0dXJuIHJlcS5pc1NlY3VyZSgpIHx8ICJodHRwcyIuZXF1YWxzKHJlcS5nZXRTY2hlbWUoKSk7CiAgIH0KLQotICBwdWJsaWMgQXV0aE1ldGhvZCBnZXRBdXRoTWV0aG9kKCkgewotICAgIHJldHVybiBhdXRoTWV0aG9kOwotICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9Db250YWluZXJBdXRoRmlsdGVyLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9Db250YWluZXJBdXRoRmlsdGVyLmphdmEKaW5kZXggOWNlMjI5OC4uNDMzYjRmNSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvQ29udGFpbmVyQXV0aEZpbHRlci5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0NvbnRhaW5lckF1dGhGaWx0ZXIuamF2YQpAQCAtMTcsOSArMTcsOSBAQAogaW1wb3J0IHN0YXRpYyBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19GT1JCSURERU47CiBpbXBvcnQgc3RhdGljIGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlc3BvbnNlLlNDX1VOQVVUSE9SSVpFRDsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5BY2Nlc3NQYXRoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50U3RhdGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aE1ldGhvZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CkBAIC0xMDAsOSArMTAwLDEwIEBACiAgICAgICByc3Auc2VuZEVycm9yKFNDX1VOQVVUSE9SSVpFRCk7CiAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIHNlc3Npb24uZ2V0KCkuc2V0VXNlckFjY291bnRJZCgKLSAgICAgICAgd2hvLmdldEFjY291bnQoKS5nZXRJZCgpLAotICAgICAgICBBdXRoTWV0aG9kLlBBU1NXT1JEKTsKKyAgICBXZWJTZXNzaW9uIHdzID0gc2Vzc2lvbi5nZXQoKTsKKyAgICB3cy5zZXRVc2VyQWNjb3VudElkKHdoby5nZXRBY2NvdW50KCkuZ2V0SWQoKSk7CisgICAgd3Muc2V0QWNjZXNzUGF0aE9rKEFjY2Vzc1BhdGguR0lULCB0cnVlKTsKKyAgICB3cy5zZXRBY2Nlc3NQYXRoT2soQWNjZXNzUGF0aC5SRVNUX0FQSSwgdHJ1ZSk7CiAgICAgcmV0dXJuIHRydWU7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0dlcnJpdENvbmZpZ1Byb3ZpZGVyLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9HZXJyaXRDb25maWdQcm92aWRlci5qYXZhCmluZGV4IGMxZjNhZTQuLmFhNTZhZTkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0dlcnJpdENvbmZpZ1Byb3ZpZGVyLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvR2Vycml0Q29uZmlnUHJvdmlkZXIuamF2YQpAQCAtMTQsNyArMTQsNiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkOwogCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HZXJyaXRDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2l0d2ViQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwpAQCAtNTIsNyArNTEsNiBAQAogICBwcml2YXRlIGZpbmFsIEdpdFdlYkNvbmZpZyBnaXRXZWJDb25maWc7CiAgIHByaXZhdGUgZmluYWwgQWxsUHJvamVjdHNOYW1lIHdpbGRQcm9qZWN0OwogICBwcml2YXRlIGZpbmFsIFNzaEluZm8gc3NoSW5mbzsKLSAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXM7CiAKICAgcHJpdmF0ZSBFbWFpbFNlbmRlciBlbWFpbFNlbmRlcjsKICAgcHJpdmF0ZSBmaW5hbCBDb250YWN0U3RvcmUgY29udGFjdFN0b3JlOwpAQCAtNjIsNyArNjAsNyBAQAogICBASW5qZWN0CiAgIEdlcnJpdENvbmZpZ1Byb3ZpZGVyKGZpbmFsIFJlYWxtIHIsIEBHZXJyaXRTZXJ2ZXJDb25maWcgZmluYWwgQ29uZmlnIGdzYywKICAgICAgIGZpbmFsIEF1dGhDb25maWcgYWMsIGZpbmFsIEdpdFdlYkNvbmZpZyBnd2MsIGZpbmFsIEFsbFByb2plY3RzTmFtZSB3cCwKLSAgICAgIGZpbmFsIFNzaEluZm8gc2ksIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXQsIGZpbmFsIENvbnRhY3RTdG9yZSBjcywKKyAgICAgIGZpbmFsIFNzaEluZm8gc2ksIGZpbmFsIENvbnRhY3RTdG9yZSBjcywKICAgICAgIGZpbmFsIFNlcnZsZXRDb250ZXh0IHNjLCBmaW5hbCBEb3dubG9hZENvbmZpZyBkYywKICAgICAgIGZpbmFsIEBBbm9ueW1vdXNDb3dhcmROYW1lIFN0cmluZyBhY24pIHsKICAgICByZWFsbSA9IHI7CkBAIC03Miw3ICs3MCw2IEBACiAgICAgZ2l0V2ViQ29uZmlnID0gZ3djOwogICAgIHNzaEluZm8gPSBzaTsKICAgICB3aWxkUHJvamVjdCA9IHdwOwotICAgIGFwcHJvdmFsVHlwZXMgPSBhdDsKICAgICBjb250YWN0U3RvcmUgPSBjczsKICAgICBzZXJ2bGV0Q29udGV4dCA9IHNjOwogICAgIGFub255bW91c0Nvd2FyZE5hbWUgPSBhY247CkBAIC04NiwyNSArODMsMjcgQEAKICAgcHJpdmF0ZSBHZXJyaXRDb25maWcgY3JlYXRlKCkgdGhyb3dzIE1hbGZvcm1lZFVSTEV4Y2VwdGlvbiB7CiAgICAgZmluYWwgR2Vycml0Q29uZmlnIGNvbmZpZyA9IG5ldyBHZXJyaXRDb25maWcoKTsKICAgICBzd2l0Y2ggKGF1dGhDb25maWcuZ2V0QXV0aFR5cGUoKSkgewotICAgICAgY2FzZSBPUEVOSUQ6Ci0gICAgICAgIGNvbmZpZy5zZXRBbGxvd2VkT3BlbklEcyhhdXRoQ29uZmlnLmdldEFsbG93ZWRPcGVuSURzKCkpOwotICAgICAgICBicmVhazsKLQotICAgICAgY2FzZSBPUEVOSURfU1NPOgotICAgICAgICBjb25maWcuc2V0T3BlbklkU3NvVXJsKGF1dGhDb25maWcuZ2V0T3BlbklkU3NvVXJsKCkpOwotICAgICAgICBicmVhazsKLQogICAgICAgY2FzZSBMREFQOgogICAgICAgY2FzZSBMREFQX0JJTkQ6CiAgICAgICAgIGNvbmZpZy5zZXRSZWdpc3RlclVybChjZmcuZ2V0U3RyaW5nKCJhdXRoIiwgbnVsbCwgInJlZ2lzdGVydXJsIikpOworICAgICAgICBjb25maWcuc2V0UmVnaXN0ZXJUZXh0KGNmZy5nZXRTdHJpbmcoImF1dGgiLCBudWxsLCAicmVnaXN0ZXJ0ZXh0IikpOwogICAgICAgICBjb25maWcuc2V0RWRpdEZ1bGxOYW1lVXJsKGNmZy5nZXRTdHJpbmcoImF1dGgiLCBudWxsLCAiZWRpdEZ1bGxOYW1lVXJsIikpOwogICAgICAgICBicmVhazsKIAogICAgICAgY2FzZSBDVVNUT01fRVhURU5TSU9OOgogICAgICAgICBjb25maWcuc2V0UmVnaXN0ZXJVcmwoY2ZnLmdldFN0cmluZygiYXV0aCIsIG51bGwsICJyZWdpc3RlcnVybCIpKTsKKyAgICAgICAgY29uZmlnLnNldFJlZ2lzdGVyVGV4dChjZmcuZ2V0U3RyaW5nKCJhdXRoIiwgbnVsbCwgInJlZ2lzdGVydGV4dCIpKTsKICAgICAgICAgY29uZmlnLnNldEVkaXRGdWxsTmFtZVVybChjZmcuZ2V0U3RyaW5nKCJhdXRoIiwgbnVsbCwgImVkaXRGdWxsTmFtZVVybCIpKTsKICAgICAgICAgY29uZmlnLnNldEh0dHBQYXNzd29yZFVybChjZmcuZ2V0U3RyaW5nKCJhdXRoIiwgbnVsbCwgImh0dHBQYXNzd29yZFVybCIpKTsKICAgICAgICAgYnJlYWs7CisKKyAgICAgIGNhc2UgQ0xJRU5UX1NTTF9DRVJUX0xEQVA6CisgICAgICBjYXNlIERFVkVMT1BNRU5UX0JFQ09NRV9BTllfQUNDT1VOVDoKKyAgICAgIGNhc2UgSFRUUDoKKyAgICAgIGNhc2UgSFRUUF9MREFQOgorICAgICAgY2FzZSBPUEVOSUQ6CisgICAgICBjYXNlIE9QRU5JRF9TU086CisgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjb25maWcuc2V0VXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzKGNmZy5nZXRCb29sZWFuKCJhdXRoIiwKICAgICAgICAgImNvbnRyaWJ1dG9yYWdyZWVtZW50cyIsIGZhbHNlKSk7CkBAIC0xMTUsMTIgKzExNCwxMiBAQAogICAgIGNvbmZpZy5zZXREb3dubG9hZENvbW1hbmRzKGRvd25sb2FkQ29uZmlnLmdldERvd25sb2FkQ29tbWFuZHMoKSk7CiAgICAgY29uZmlnLnNldEF1dGhUeXBlKGF1dGhDb25maWcuZ2V0QXV0aFR5cGUoKSk7CiAgICAgY29uZmlnLnNldFdpbGRQcm9qZWN0KHdpbGRQcm9qZWN0KTsKLSAgICBjb25maWcuc2V0QXBwcm92YWxUeXBlcyhhcHByb3ZhbFR5cGVzKTsKICAgICBjb25maWcuc2V0RG9jdW1lbnRhdGlvbkF2YWlsYWJsZShzZXJ2bGV0Q29udGV4dAogICAgICAgICAuZ2V0UmVzb3VyY2UoIi9Eb2N1bWVudGF0aW9uL2luZGV4Lmh0bWwiKSAhPSBudWxsKTsKICAgICBjb25maWcuc2V0VGVzdENoYW5nZU1lcmdlKGNmZy5nZXRCb29sZWFuKCJjaGFuZ2VNZXJnZSIsCiAgICAgICAgICJ0ZXN0IiwgZmFsc2UpKTsKICAgICBjb25maWcuc2V0QW5vbnltb3VzQ293YXJkTmFtZShhbm9ueW1vdXNDb3dhcmROYW1lKTsKKyAgICBjb25maWcuc2V0U3VnZ2VzdEZyb20oY2ZnLmdldEludCgic3VnZ2VzdCIsICJmcm9tIiwgMCkpOwogCiAgICAgY29uZmlnLnNldFJlcG9ydEJ1Z1VybChjZmcuZ2V0U3RyaW5nKCJnZXJyaXQiLCBudWxsLCAicmVwb3J0QnVnVXJsIikpOwogICAgIGlmIChjb25maWcuZ2V0UmVwb3J0QnVnVXJsKCkgPT0gbnVsbCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvR2Vycml0VWlPcHRpb25zLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9HZXJyaXRVaU9wdGlvbnMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZDA3MzIwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvR2Vycml0VWlPcHRpb25zLmphdmEKQEAgLTAsMCArMSwyNyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkOworCitwdWJsaWMgY2xhc3MgR2Vycml0VWlPcHRpb25zIHsKKyAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIGhlYWRsZXNzOworCisgIHB1YmxpYyBHZXJyaXRVaU9wdGlvbnMoYm9vbGVhbiBoZWFkbGVzcykgeworICAgIHRoaXMuaGVhZGxlc3MgPSBoZWFkbGVzczsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGVuYWJsZURlZmF1bHRVaSgpIHsKKyAgICByZXR1cm4gIWhlYWRsZXNzOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9HaXRPdmVySHR0cFNlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0dpdE92ZXJIdHRwU2VydmxldC5qYXZhCmluZGV4IDZiZDM1ZGQuLmRhZDliODAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0dpdE92ZXJIdHRwU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0dpdE92ZXJIdHRwU2VydmxldC5qYXZhCkBAIC0xOCwxMCArMTgsMTMgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DYXBhYmxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQWNjZXNzUGF0aDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQW5vbnltb3VzVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jYWNoZS5DYWNoZU1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkFzeW5jUmVjZWl2ZUNvbW1pdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5DaGFuZ2VDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUmVjZWl2ZUNvbW1pdHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5UYWdDYWNoZTsKQEAgLTE1Niw4ICsxNTksMTIgQEAKICAgICAgIH0gY2F0Y2ggKE5vU3VjaFByb2plY3RFeGNlcHRpb24gZXJyKSB7CiAgICAgICAgIHRocm93IG5ldyBSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24ocHJvamVjdE5hbWUpOwogICAgICAgfQorCisgICAgICBDdXJyZW50VXNlciB1c2VyID0gcGMuZ2V0Q3VycmVudFVzZXIoKTsKKyAgICAgIHVzZXIuc2V0QWNjZXNzUGF0aChBY2Nlc3NQYXRoLkdJVCk7CisKICAgICAgIGlmICghcGMuaXNWaXNpYmxlKCkpIHsKLSAgICAgICAgaWYgKHBjLmdldEN1cnJlbnRVc2VyKCkgaW5zdGFuY2VvZiBBbm9ueW1vdXNVc2VyKSB7CisgICAgICAgIGlmICh1c2VyIGluc3RhbmNlb2YgQW5vbnltb3VzVXNlcikgewogICAgICAgICAgIHRocm93IG5ldyBTZXJ2aWNlTm90QXV0aG9yaXplZEV4Y2VwdGlvbigpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgIHRocm93IG5ldyBTZXJ2aWNlTm90RW5hYmxlZEV4Y2VwdGlvbigpOwpAQCAtMTc2LDEyICsxODMsMTAgQEAKIAogICBzdGF0aWMgY2xhc3MgVXBsb2FkRmFjdG9yeSBpbXBsZW1lbnRzIFVwbG9hZFBhY2tGYWN0b3J5PEh0dHBTZXJ2bGV0UmVxdWVzdD4gewogICAgIHByaXZhdGUgZmluYWwgVHJhbnNmZXJDb25maWcgY29uZmlnOwotICAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gc2Vzc2lvbjsKIAogICAgIEBJbmplY3QKLSAgICBVcGxvYWRGYWN0b3J5KFRyYW5zZmVyQ29uZmlnIHRjLCBQcm92aWRlcjxXZWJTZXNzaW9uPiBzZXNzaW9uKSB7CisgICAgVXBsb2FkRmFjdG9yeShUcmFuc2ZlckNvbmZpZyB0YykgewogICAgICAgdGhpcy5jb25maWcgPSB0YzsKLSAgICAgIHRoaXMuc2Vzc2lvbiA9IHNlc3Npb247CiAgICAgfQogCiAgICAgQE92ZXJyaWRlCkBAIC0xOTYsMTEgKzIwMSwxMyBAQAogICBzdGF0aWMgY2xhc3MgVXBsb2FkRmlsdGVyIGltcGxlbWVudHMgRmlsdGVyIHsKICAgICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYjsKICAgICBwcml2YXRlIGZpbmFsIFRhZ0NhY2hlIHRhZ0NhY2hlOworICAgIHByaXZhdGUgZmluYWwgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGU7CiAKICAgICBASW5qZWN0Ci0gICAgVXBsb2FkRmlsdGVyKFByb3ZpZGVyPFJldmlld0RiPiBkYiwgVGFnQ2FjaGUgdGFnQ2FjaGUpIHsKKyAgICBVcGxvYWRGaWx0ZXIoUHJvdmlkZXI8UmV2aWV3RGI+IGRiLCBUYWdDYWNoZSB0YWdDYWNoZSwgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGUpIHsKICAgICAgIHRoaXMuZGIgPSBkYjsKICAgICAgIHRoaXMudGFnQ2FjaGUgPSB0YWdDYWNoZTsKKyAgICAgIHRoaXMuY2hhbmdlQ2FjaGUgPSBjaGFuZ2VDYWNoZTsKICAgICB9CiAKICAgICBAT3ZlcnJpZGUKQEAgLTIxOSw3ICsyMjYsNyBAQAogICAgICAgfQogCiAgICAgICBpZiAoIXBjLmFsbFJlZnNBcmVWaXNpYmxlKCkpIHsKLSAgICAgICAgdXAuc2V0QWR2ZXJ0aXNlUmVmc0hvb2sobmV3IFZpc2libGVSZWZGaWx0ZXIodGFnQ2FjaGUsIHJlcG8sIHBjLCBkYi5nZXQoKSwgdHJ1ZSkpOworICAgICAgICB1cC5zZXRBZHZlcnRpc2VSZWZzSG9vayhuZXcgVmlzaWJsZVJlZkZpbHRlcih0YWdDYWNoZSwgY2hhbmdlQ2FjaGUsIHJlcG8sIHBjLCBkYi5nZXQoKSwgdHJ1ZSkpOwogICAgICAgfQogCiAgICAgICBuZXh0LmRvRmlsdGVyKHJlcXVlc3QsIHJlc3BvbnNlKTsKQEAgLTIzNiwxNCArMjQzLDExIEBACiAKICAgc3RhdGljIGNsYXNzIFJlY2VpdmVGYWN0b3J5IGltcGxlbWVudHMgUmVjZWl2ZVBhY2tGYWN0b3J5PEh0dHBTZXJ2bGV0UmVxdWVzdD4gewogICAgIHByaXZhdGUgZmluYWwgQXN5bmNSZWNlaXZlQ29tbWl0cy5GYWN0b3J5IGZhY3Rvcnk7Ci0gICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxXZWJTZXNzaW9uPiBzZXNzaW9uOwogICAgIHByaXZhdGUgZmluYWwgVHJhbnNmZXJDb25maWcgY29uZmlnOwogCiAgICAgQEluamVjdAotICAgIFJlY2VpdmVGYWN0b3J5KEFzeW5jUmVjZWl2ZUNvbW1pdHMuRmFjdG9yeSBmYWN0b3J5LAotICAgICAgICBQcm92aWRlcjxXZWJTZXNzaW9uPiBzZXNzaW9uLCBUcmFuc2ZlckNvbmZpZyBjb25maWcpIHsKKyAgICBSZWNlaXZlRmFjdG9yeShBc3luY1JlY2VpdmVDb21taXRzLkZhY3RvcnkgZmFjdG9yeSwgVHJhbnNmZXJDb25maWcgY29uZmlnKSB7CiAgICAgICB0aGlzLmZhY3RvcnkgPSBmYWN0b3J5OwotICAgICAgdGhpcy5zZXNzaW9uID0gc2Vzc2lvbjsKICAgICAgIHRoaXMuY29uZmlnID0gY29uZmlnOwogICAgIH0KIApAQCAtMjg1LDYgKzI4OSw3IEBACiAKICAgICAgIFJlY2VpdmVDb21taXRzIHJjID0gKFJlY2VpdmVDb21taXRzKSByZXF1ZXN0LmdldEF0dHJpYnV0ZShBVFRfUkMpOwogICAgICAgUmVjZWl2ZVBhY2sgcnAgPSByYy5nZXRSZWNlaXZlUGFjaygpOworICAgICAgcnAuZ2V0QWR2ZXJ0aXNlUmVmc0hvb2soKS5hZHZlcnRpc2VSZWZzKHJwKTsKICAgICAgIFByb2plY3RDb250cm9sIHBjID0gKFByb2plY3RDb250cm9sKSByZXF1ZXN0LmdldEF0dHJpYnV0ZShBVFRfQ09OVFJPTCk7CiAgICAgICBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUgPSBwYy5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpOwogCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9IdG1sRG9tVXRpbC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvSHRtbERvbVV0aWwuamF2YQppbmRleCAwYTkzZjgwLi5jNDc1NTJkIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9IdG1sRG9tVXRpbC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0h0bWxEb21VdGlsLmphdmEKQEAgLTUzLDcgKzUzLDcgQEAKIAogICAvKiogRE9DVFlQRSBmb3IgYSBzdGFuZGFyZHMgbW9kZSBIVE1MIGRvY3VtZW50LiAqLwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBIVE1MX1NUUklDVCA9Ci0gICAgICAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxLy9FTlwiIFwiaHR0cDovL3d3dy53My5vcmcvVFIvUkVDLWh0bWw0MC9zdHJpY3QuZHRkIjsKKyAgICAgICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOXCIgXCJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9zdHJpY3QuZHRkIjsKIAogICAvKiogQ29udmVydCBhIGRvY3VtZW50IHRvIGEgVVRGLTggYnl0ZSBzZXF1ZW5jZS4gKi8KICAgcHVibGljIHN0YXRpYyBieXRlW10gdG9VVEY4KGZpbmFsIERvY3VtZW50IGhvc3REb2MpIHRocm93cyBJT0V4Y2VwdGlvbiB7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9IdHRwTG9nb3V0U2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvSHR0cExvZ291dFNlcnZsZXQuamF2YQppbmRleCBlOWIzNTAwLi44NzlkZmEzIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9IdHRwTG9nb3V0U2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0h0dHBMb2dvdXRTZXJ2bGV0LmphdmEKQEAgLTc3LDcgKzc3LDcgQEAKICAgcHJvdGVjdGVkIHZvaWQgZG9HZXQoZmluYWwgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwKICAgICAgIGZpbmFsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcnNwKSB0aHJvd3MgSU9FeGNlcHRpb24gewogCi0gICAgZmluYWwgU3RyaW5nIHNpZCA9IHdlYlNlc3Npb24uZ2V0KCkuZ2V0VG9rZW4oKTsKKyAgICBmaW5hbCBTdHJpbmcgc2lkID0gd2ViU2Vzc2lvbi5nZXQoKS5nZXRTZXNzaW9uSWQoKTsKICAgICBmaW5hbCBDdXJyZW50VXNlciBjdXJyZW50VXNlciA9IHdlYlNlc3Npb24uZ2V0KCkuZ2V0Q3VycmVudFVzZXIoKTsKICAgICBmaW5hbCBTdHJpbmcgd2hhdCA9ICJzaWduIG91dCI7CiAgICAgZmluYWwgbG9uZyB3aGVuID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9IdHRwUmVxdWVzdENvbnRleHQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0h0dHBSZXF1ZXN0Q29udGV4dC5qYXZhCmluZGV4IDhlZjgyNmIuLjJkYjM1MzQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0h0dHBSZXF1ZXN0Q29udGV4dC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL0h0dHBSZXF1ZXN0Q29udGV4dC5qYXZhCkBAIC0xNCwyMCArMTQsMzEgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZDsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5SZXF1ZXN0U2NvcGVkUmV2aWV3RGJQcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5SZXF1ZXN0Q29udGV4dDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiAKIGNsYXNzIEh0dHBSZXF1ZXN0Q29udGV4dCBpbXBsZW1lbnRzIFJlcXVlc3RDb250ZXh0IHsKICAgcHJpdmF0ZSBmaW5hbCBXZWJTZXNzaW9uIHNlc3Npb247CisgIHByaXZhdGUgZmluYWwgUmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXIgcHJvdmlkZXI7CiAKICAgQEluamVjdAotICBIdHRwUmVxdWVzdENvbnRleHQoZmluYWwgV2ViU2Vzc2lvbiBzZXNzaW9uKSB7CisgIEh0dHBSZXF1ZXN0Q29udGV4dChXZWJTZXNzaW9uIHNlc3Npb24sCisgICAgICBSZXF1ZXN0U2NvcGVkUmV2aWV3RGJQcm92aWRlciBwcm92aWRlcikgewogICAgIHRoaXMuc2Vzc2lvbiA9IHNlc3Npb247CisgICAgdGhpcy5wcm92aWRlciA9IHByb3ZpZGVyOwogICB9CiAKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyBDdXJyZW50VXNlciBnZXRDdXJyZW50VXNlcigpIHsKICAgICByZXR1cm4gc2Vzc2lvbi5nZXRDdXJyZW50VXNlcigpOwogICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBQcm92aWRlcjxSZXZpZXdEYj4gZ2V0UmV2aWV3RGJQcm92aWRlcigpIHsKKyAgICByZXR1cm4gcHJvdmlkZXI7CisgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1Byb2plY3RCYXNpY0F1dGhGaWx0ZXIuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1Byb2plY3RCYXNpY0F1dGhGaWx0ZXIuamF2YQppbmRleCA1YjM5Y2IyLi4zZDlmNGM4IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9Qcm9qZWN0QmFzaWNBdXRoRmlsdGVyLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvUHJvamVjdEJhc2ljQXV0aEZpbHRlci5qYXZhCkBAIC0xOCwxMSArMTgsMTEgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFjY2Vzc1BhdGg7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudENhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudE1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudFN0YXRlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhNZXRob2Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlcXVlc3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlc3VsdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkF1dGhDb25maWc7CkBAIC0xMDQsMTAgKzEwNCw5IEBACiAgIHByaXZhdGUgYm9vbGVhbiB2ZXJpZnkoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwgUmVzcG9uc2UgcnNwKQogICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICBmaW5hbCBTdHJpbmcgaGRyID0gcmVxLmdldEhlYWRlcihBVVRIT1JJWkFUSU9OKTsKLSAgICBpZiAoaGRyID09IG51bGwpIHsKKyAgICBpZiAoaGRyID09IG51bGwgfHwgIWhkci5zdGFydHNXaXRoKExJVF9CQVNJQykpIHsKICAgICAgIC8vIEFsbG93IGFuIGFub255bW91cyBjb25uZWN0aW9uIHRocm91Z2gsIG9yIGl0IG1pZ2h0IGJlIHVzaW5nIGEKICAgICAgIC8vIHNlc3Npb24gY29va2llIGluc3RlYWQgb2YgYmFzaWMgYXV0aGVudGljYXRpb24uCi0gICAgICAvLwogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCkBAIC0xNDMsOCArMTQyLDEwIEBACiAKICAgICB0cnkgewogICAgICAgQXV0aFJlc3VsdCB3aG9BdXRoUmVzdWx0ID0gYWNjb3VudE1hbmFnZXIuYXV0aGVudGljYXRlKHdob0F1dGgpOwotICAgICAgc2Vzc2lvbi5nZXQoKS5zZXRVc2VyQWNjb3VudElkKHdob0F1dGhSZXN1bHQuZ2V0QWNjb3VudElkKCksCi0gICAgICAgICAgQXV0aE1ldGhvZC5QQVNTV09SRCk7CisgICAgICBXZWJTZXNzaW9uIHdzID0gc2Vzc2lvbi5nZXQoKTsKKyAgICAgIHdzLnNldFVzZXJBY2NvdW50SWQod2hvQXV0aFJlc3VsdC5nZXRBY2NvdW50SWQoKSk7CisgICAgICB3cy5zZXRBY2Nlc3NQYXRoT2soQWNjZXNzUGF0aC5HSVQsIHRydWUpOworICAgICAgd3Muc2V0QWNjZXNzUGF0aE9rKEFjY2Vzc1BhdGguUkVTVF9BUEksIHRydWUpOwogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSBjYXRjaCAoQWNjb3VudEV4Y2VwdGlvbiBlKSB7CiAgICAgICBsb2cud2FybigiQXV0aGVudGljYXRpb24gZmFpbGVkIGZvciAiICsgdXNlcm5hbWUsIGUpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvUHJvamVjdERpZ2VzdEZpbHRlci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvUHJvamVjdERpZ2VzdEZpbHRlci5qYXZhCmluZGV4IDg0YWE1MzIuLmMzODQyNWQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1Byb2plY3REaWdlc3RGaWx0ZXIuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9Qcm9qZWN0RGlnZXN0RmlsdGVyLmphdmEKQEAgLTIwLDkgKzIwLDkgQEAKIGltcG9ydCBzdGF0aWMgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfSU5URVJOQUxfU0VSVkVSX0VSUk9SOwogaW1wb3J0IHN0YXRpYyBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19VTkFVVEhPUklaRUQ7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQWNjZXNzUGF0aDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50Q2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudFN0YXRlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhNZXRob2Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLnNlcnZlci5TaWduZWRUb2tlbjsKQEAgLTExMCwxMCArMTEwLDkgQEAKICAgcHJpdmF0ZSBib29sZWFuIHZlcmlmeShIdHRwU2VydmxldFJlcXVlc3QgcmVxLCBSZXNwb25zZSByc3ApCiAgICAgICB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGZpbmFsIFN0cmluZyBoZHIgPSByZXEuZ2V0SGVhZGVyKEFVVEhPUklaQVRJT04pOwotICAgIGlmIChoZHIgPT0gbnVsbCkgeworICAgIGlmIChoZHIgPT0gbnVsbCB8fCAhaGRyLnN0YXJ0c1dpdGgoIkRpZ2VzdCAiKSkgewogICAgICAgLy8gQWxsb3cgYW4gYW5vbnltb3VzIGNvbm5lY3Rpb24gdGhyb3VnaCwgb3IgaXQgbWlnaHQgYmUgdXNpbmcgYQogICAgICAgLy8gc2Vzc2lvbiBjb29raWUgaW5zdGVhZCBvZiBkaWdlc3QgYXV0aGVudGljYXRpb24uCi0gICAgICAvLwogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCkBAIC0xNjUsOSArMTY0LDEwIEBACiAgICAgaWYgKGV4cGVjdC5lcXVhbHMocmVzcG9uc2UpKSB7CiAgICAgICB0cnkgewogICAgICAgICBpZiAodG9rZW5zLmNoZWNrVG9rZW4obm9uY2UsICIiKSAhPSBudWxsKSB7Ci0gICAgICAgICAgc2Vzc2lvbi5nZXQoKS5zZXRVc2VyQWNjb3VudElkKAotICAgICAgICAgICAgICB3aG8uZ2V0QWNjb3VudCgpLmdldElkKCksCi0gICAgICAgICAgICAgIEF1dGhNZXRob2QuUEFTU1dPUkQpOworICAgICAgICAgIFdlYlNlc3Npb24gd3MgPSBzZXNzaW9uLmdldCgpOworICAgICAgICAgIHdzLnNldFVzZXJBY2NvdW50SWQod2hvLmdldEFjY291bnQoKS5nZXRJZCgpKTsKKyAgICAgICAgICB3cy5zZXRBY2Nlc3NQYXRoT2soQWNjZXNzUGF0aC5HSVQsIHRydWUpOworICAgICAgICAgIHdzLnNldEFjY2Vzc1BhdGhPayhBY2Nlc3NQYXRoLlJFU1RfQVBJLCB0cnVlKTsKICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAgICB9IGVsc2UgewpAQCAtMjMyLDEyICsyMzIsNiBAQAogICB9CiAKICAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBTdHJpbmc+IHBhcnNlQXV0aG9yaXphdGlvbihTdHJpbmcgYXV0aCkgewotICAgIGlmICghYXV0aC5zdGFydHNXaXRoKCJEaWdlc3QgIikpIHsKLSAgICAgIC8vIFdlIG9ubHkgc3VwcG9ydCBEaWdlc3QgYXV0aGVudGljYXRpb24gc2NoZW1lLCBkZW55IHRoZSByZXN0LgotICAgICAgLy8KLSAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eU1hcCgpOwotICAgIH0KLQogICAgIE1hcDxTdHJpbmcsIFN0cmluZz4gcCA9IG5ldyBIYXNoTWFwPFN0cmluZywgU3RyaW5nPigpOwogICAgIGludCBuZXh0ID0gIkRpZ2VzdCAiLmxlbmd0aCgpOwogICAgIHdoaWxlIChuZXh0IDwgYXV0aC5sZW5ndGgoKSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvUmVzdEFwaVNlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1Jlc3RBcGlTZXJ2bGV0LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDk5ZGIyZjAuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvUmVzdEFwaVNlcnZsZXQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDIzMiArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQ7Ci0KLWltcG9ydCBzdGF0aWMgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfRk9SQklEREVOOwotaW1wb3J0IHN0YXRpYyBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19JTlRFUk5BTF9TRVJWRVJfRVJST1I7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLk9iamVjdHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUmVxdWlyZXNDYXBhYmlsaXR5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2FwYWJpbGl0eUNvbnRyb2w7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQudXRpbC5jbGkuQ21kTGluZVBhcnNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkpzb25Db25zdGFudHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLnNlcnZlci5SUENTZXJ2bGV0VXRpbHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwotCi1pbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLkNtZExpbmVFeGNlcHRpb247Ci1pbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKLWltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKLQotaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247Ci1pbXBvcnQgamF2YS5pby5PdXRwdXRTdHJlYW07Ci1pbXBvcnQgamF2YS5pby5TdHJpbmdXcml0ZXI7Ci1pbXBvcnQgamF2YS5pby5VbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uOwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuTWFwOwotaW1wb3J0IGphdmEudXRpbC5TZXQ7Ci0KLWltcG9ydCBqYXZheC5hbm5vdGF0aW9uLk51bGxhYmxlOwotaW1wb3J0IGphdmF4LnNlcnZsZXQuU2VydmxldEV4Y2VwdGlvbjsKLWltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXQ7Ci1pbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVxdWVzdDsKLWltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZTsKLQotcHVibGljIGFic3RyYWN0IGNsYXNzIFJlc3RBcGlTZXJ2bGV0IGV4dGVuZHMgSHR0cFNlcnZsZXQgewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9Ci0gICAgICBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihSZXN0QXBpU2VydmxldC5jbGFzcyk7Ci0KLSAgLyoqIE1JTUUgdHlwZSB1c2VkIGZvciBhIEpTT04gcmVzcG9uc2UgYm9keS4gKi8KLSAgcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBTdHJpbmcgSlNPTl9UWVBFID0gSnNvbkNvbnN0YW50cy5KU09OX1RZUEU7Ci0KLSAgLyoqCi0gICAqIEdhcmJhZ2UgcHJlZml4IGluc2VydGVkIGJlZm9yZSBKU09OIG91dHB1dCB0byBwcmV2ZW50IFhTU0kuCi0gICAqIDxwPgotICAgKiBUaGlzIHByZWZpeCBpcyAiKV19J1xuIiBhbmQgaXMgZGVzaWduZWQgdG8gcHJldmVudCBhIHdlYiBicm93c2VyIGZyb20KLSAgICogZXhlY3V0aW5nIHRoZSByZXNwb25zZSBib2R5IGlmIHRoZSByZXNvdXJjZSBVUkkgd2VyZSB0byBiZSByZWZlcmVuY2VkIHVzaW5nCi0gICAqIGEgJmx0O3NjcmlwdCBzcmM9Ii4uLiZndDsgSFRNTCB0YWcgZnJvbSBhbm90aGVyIHdlYiBzaXRlLiBDbGllbnRzIHVzaW5nIHRoZQotICAgKiBIVFRQIGludGVyZmFjZSB3aWxsIG5lZWQgdG8gYWx3YXlzIHN0cmlwIHRoZSBmaXJzdCBsaW5lIG9mIHJlc3BvbnNlIGRhdGEgdG8KLSAgICogcmVtb3ZlIHRoaXMgbWFnaWMgaGVhZGVyLgotICAgKi8KLSAgcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBieXRlW10gSlNPTl9NQUdJQzsKLQotICBzdGF0aWMgewotICAgIHRyeSB7Ci0gICAgICBKU09OX01BR0lDID0gIildfSdcbiIuZ2V0Qnl0ZXMoIlVURi04Iik7Ci0gICAgfSBjYXRjaCAoVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbigiVVRGLTggbm90IHN1cHBvcnRlZCIsIGUpOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IGN1cnJlbnRVc2VyOwotCi0gIEBJbmplY3QKLSAgcHJvdGVjdGVkIFJlc3RBcGlTZXJ2bGV0KGZpbmFsIFByb3ZpZGVyPEN1cnJlbnRVc2VyPiBjdXJyZW50VXNlcikgewotICAgIHRoaXMuY3VycmVudFVzZXIgPSBjdXJyZW50VXNlcjsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwcm90ZWN0ZWQgdm9pZCBzZXJ2aWNlKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKQotICAgICAgdGhyb3dzIFNlcnZsZXRFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKLSAgICByZXMuc2V0SGVhZGVyKCJFeHBpcmVzIiwgIkZyaSwgMDEgSmFuIDE5ODAgMDA6MDA6MDAgR01UIik7Ci0gICAgcmVzLnNldEhlYWRlcigiUHJhZ21hIiwgIm5vLWNhY2hlIik7Ci0gICAgcmVzLnNldEhlYWRlcigiQ2FjaGUtQ29udHJvbCIsICJuby1jYWNoZSwgbXVzdC1yZXZhbGlkYXRlIik7Ci0gICAgcmVzLnNldEhlYWRlcigiQ29udGVudC1EaXNwb3NpdGlvbiIsICJhdHRhY2htZW50Iik7Ci0KLSAgICB0cnkgewotICAgICAgY2hlY2tSZXF1aXJlc0NhcGFiaWxpdHkoKTsKLSAgICAgIHN1cGVyLnNlcnZpY2UocmVxLCByZXMpOwotICAgIH0gY2F0Y2ggKFJlcXVpcmVDYXBhYmlsaXR5RXhjZXB0aW9uIGVycikgewotICAgICAgc2VuZEVycm9yKHJlcywgU0NfRk9SQklEREVOLCBlcnIuZ2V0TWVzc2FnZSgpKTsKLSAgICB9IGNhdGNoIChFcnJvciBlcnIpIHsKLSAgICAgIGhhbmRsZUV4Y2VwdGlvbihlcnIsIHJlcSwgcmVzKTsKLSAgICB9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIGVycikgewotICAgICAgaGFuZGxlRXhjZXB0aW9uKGVyciwgcmVxLCByZXMpOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgdm9pZCBjaGVja1JlcXVpcmVzQ2FwYWJpbGl0eSgpIHRocm93cyBSZXF1aXJlQ2FwYWJpbGl0eUV4Y2VwdGlvbiB7Ci0gICAgUmVxdWlyZXNDYXBhYmlsaXR5IHJjID0gZ2V0Q2xhc3MoKS5nZXRBbm5vdGF0aW9uKFJlcXVpcmVzQ2FwYWJpbGl0eS5jbGFzcyk7Ci0gICAgaWYgKHJjICE9IG51bGwpIHsKLSAgICAgIEN1cnJlbnRVc2VyIHVzZXIgPSBjdXJyZW50VXNlci5nZXQoKTsKLSAgICAgIENhcGFiaWxpdHlDb250cm9sIGN0bCA9IHVzZXIuZ2V0Q2FwYWJpbGl0aWVzKCk7Ci0gICAgICBpZiAoIWN0bC5jYW5QZXJmb3JtKHJjLnZhbHVlKCkpICYmICFjdGwuY2FuQWRtaW5pc3RyYXRlU2VydmVyKCkpIHsKLSAgICAgICAgU3RyaW5nIG1zZyA9IFN0cmluZy5mb3JtYXQoCi0gICAgICAgICAgImZhdGFsOiAlcyBkb2VzIG5vdCBoYXZlIFwiJXNcIiBjYXBhYmlsaXR5LiIsCi0gICAgICAgICAgT2JqZWN0cy5maXJzdE5vbk51bGwoCi0gICAgICAgICAgICB1c2VyLmdldFVzZXJOYW1lKCksCi0gICAgICAgICAgICB1c2VyIGluc3RhbmNlb2YgSWRlbnRpZmllZFVzZXIKLSAgICAgICAgICAgICAgPyAoKElkZW50aWZpZWRVc2VyKSB1c2VyKS5nZXROYW1lRW1haWwoKQotICAgICAgICAgICAgICA6IHVzZXIudG9TdHJpbmcoKSksCi0gICAgICAgICAgcmMudmFsdWUoKSk7Ci0gICAgICAgIHRocm93IG5ldyBSZXF1aXJlQ2FwYWJpbGl0eUV4Y2VwdGlvbihtc2cpOwotICAgICAgfQotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIHZvaWQgaGFuZGxlRXhjZXB0aW9uKFRocm93YWJsZSBlcnIsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCi0gICAgICBIdHRwU2VydmxldFJlc3BvbnNlIHJlcykgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICBTdHJpbmcgdXJpID0gcmVxLmdldFJlcXVlc3RVUkkoKTsKLSAgICBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShyZXEuZ2V0UXVlcnlTdHJpbmcoKSkpIHsKLSAgICAgIHVyaSArPSAiPyIgKyByZXEuZ2V0UXVlcnlTdHJpbmcoKTsKLSAgICB9Ci0gICAgbG9nLmVycm9yKFN0cmluZy5mb3JtYXQoIkVycm9yIGluICVzICVzIiwgcmVxLmdldE1ldGhvZCgpLCB1cmkpLCBlcnIpOwotCi0gICAgaWYgKCFyZXMuaXNDb21taXR0ZWQoKSkgewotICAgICAgcmVzLnJlc2V0KCk7Ci0gICAgICBzZW5kRXJyb3IocmVzLCBTQ19JTlRFUk5BTF9TRVJWRVJfRVJST1IsICJJbnRlcm5hbCBTZXJ2ZXIgRXJyb3IiKTsKLSAgICB9Ci0gIH0KLQotICBwcm90ZWN0ZWQgc3RhdGljIHZvaWQgc2VuZEVycm9yKEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzLAotICAgICAgaW50IHN0YXR1c0NvZGUsIFN0cmluZyBtc2cpIHRocm93cyBJT0V4Y2VwdGlvbiB7Ci0gICAgcmVzLnNldFN0YXR1cyhzdGF0dXNDb2RlKTsKLSAgICBzZW5kVGV4dChudWxsLCByZXMsIG1zZyk7Ci0gIH0KLQotICBwcm90ZWN0ZWQgc3RhdGljIGJvb2xlYW4gYWNjZXB0c0pzb24oSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgewotICAgIFN0cmluZyBhY2NlcHQgPSByZXEuZ2V0SGVhZGVyKCJBY2NlcHQiKTsKLSAgICBpZiAoYWNjZXB0ID09IG51bGwpIHsKLSAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9IGVsc2UgaWYgKEpTT05fVFlQRS5lcXVhbHMoYWNjZXB0KSkgewotICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfSBlbHNlIGlmIChhY2NlcHQuc3RhcnRzV2l0aChKU09OX1RZUEUgKyAiLCIpKSB7Ci0gICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgZm9yIChTdHJpbmcgcCA6IGFjY2VwdC5zcGxpdCgiWyAsO11bICw7XSoiKSkgewotICAgICAgaWYgKEpTT05fVFlQRS5lcXVhbHMocCkpIHsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLSAgfQotCi0gIHByb3RlY3RlZCBzdGF0aWMgdm9pZCBzZW5kVGV4dChATnVsbGFibGUgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwKLSAgICAgIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzLCBTdHJpbmcgZGF0YSkgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICByZXMuc2V0Q29udGVudFR5cGUoInRleHQvcGxhaW4iKTsKLSAgICByZXMuc2V0Q2hhcmFjdGVyRW5jb2RpbmcoIlVURi04Iik7Ci0gICAgc2VuZChyZXEsIHJlcywgZGF0YS5nZXRCeXRlcygiVVRGLTgiKSk7Ci0gIH0KLQotICBwcm90ZWN0ZWQgc3RhdGljIHZvaWQgc2VuZChATnVsbGFibGUgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwKLSAgICAgIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzLCBieXRlW10gZGF0YSkgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICBpZiAoZGF0YS5sZW5ndGggPiAyNTYgJiYgcmVxICE9IG51bGwKLSAgICAgICAgJiYgUlBDU2VydmxldFV0aWxzLmFjY2VwdHNHemlwRW5jb2RpbmcocmVxKSkgewotICAgICAgcmVzLnNldEhlYWRlcigiQ29udGVudC1FbmNvZGluZyIsICJnemlwIik7Ci0gICAgICBkYXRhID0gSHRtbERvbVV0aWwuY29tcHJlc3MoZGF0YSk7Ci0gICAgfQotICAgIHJlcy5zZXRDb250ZW50TGVuZ3RoKGRhdGEubGVuZ3RoKTsKLSAgICBPdXRwdXRTdHJlYW0gb3V0ID0gcmVzLmdldE91dHB1dFN0cmVhbSgpOwotICAgIHRyeSB7Ci0gICAgICBvdXQud3JpdGUoZGF0YSk7Ci0gICAgfSBmaW5hbGx5IHsKLSAgICAgIG91dC5jbG9zZSgpOwotICAgIH0KLSAgfQotCi0gIHB1YmxpYyBzdGF0aWMgY2xhc3MgUGFyYW1ldGVyUGFyc2VyIHsKLSAgICBwcml2YXRlIGZpbmFsIENtZExpbmVQYXJzZXIuRmFjdG9yeSBwYXJzZXJGYWN0b3J5OwotCi0gICAgQEluamVjdAotICAgIFBhcmFtZXRlclBhcnNlcihDbWRMaW5lUGFyc2VyLkZhY3RvcnkgcGYpIHsKLSAgICAgIHRoaXMucGFyc2VyRmFjdG9yeSA9IHBmOwotICAgIH0KLQotICAgIHB1YmxpYyA8VD4gYm9vbGVhbiBwYXJzZShUIHBhcmFtLCBIdHRwU2VydmxldFJlcXVlc3QgcmVxLAotICAgICAgICBIdHRwU2VydmxldFJlc3BvbnNlIHJlcykgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICAgIHJldHVybiBwYXJzZShwYXJhbSwgcmVxLCByZXMsIENvbGxlY3Rpb25zLjxTdHJpbmc+ZW1wdHlTZXQoKSk7Ci0gICAgfQotCi0gICAgcHVibGljIDxUPiBib29sZWFuIHBhcnNlKFQgcGFyYW0sIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCi0gICAgICAgIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzLCBTZXQ8U3RyaW5nPiBhcmdOYW1lcykgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICAgIENtZExpbmVQYXJzZXIgY2xwID0gcGFyc2VyRmFjdG9yeS5jcmVhdGUocGFyYW0pOwotICAgICAgdHJ5IHsKLSAgICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCi0gICAgICAgIE1hcDxTdHJpbmcsIFN0cmluZ1tdPiBwYXJhbWV0ZXJNYXAgPSByZXEuZ2V0UGFyYW1ldGVyTWFwKCk7Ci0gICAgICAgIGNscC5wYXJzZU9wdGlvbk1hcChwYXJhbWV0ZXJNYXAsIGFyZ05hbWVzKTsKLSAgICAgIH0gY2F0Y2ggKENtZExpbmVFeGNlcHRpb24gZSkgewotICAgICAgICBpZiAoIWNscC53YXNIZWxwUmVxdWVzdGVkQnlPcHRpb24oKSkgewotICAgICAgICAgIHJlcy5zZXRTdGF0dXMoSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19CQURfUkVRVUVTVCk7Ci0gICAgICAgICAgc2VuZFRleHQocmVxLCByZXMsIGUuZ2V0TWVzc2FnZSgpKTsKLSAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAgICAgIH0KLQotICAgICAgaWYgKGNscC53YXNIZWxwUmVxdWVzdGVkQnlPcHRpb24oKSkgewotICAgICAgICBTdHJpbmdXcml0ZXIgbXNnID0gbmV3IFN0cmluZ1dyaXRlcigpOwotICAgICAgICBjbHAucHJpbnRRdWVyeVN0cmluZ1VzYWdlKHJlcS5nZXRSZXF1ZXN0VVJJKCksIG1zZyk7Ci0gICAgICAgIG1zZy53cml0ZSgnXG4nKTsKLSAgICAgICAgbXNnLndyaXRlKCdcbicpOwotICAgICAgICBjbHAucHJpbnRVc2FnZShtc2csIG51bGwpOwotICAgICAgICBtc2cud3JpdGUoJ1xuJyk7Ci0gICAgICAgIHNlbmRUZXh0KHJlcSwgcmVzLCBtc2cudG9TdHJpbmcoKSk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgIH0KLQotICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICB9Ci0KLSAgQFN1cHByZXNzV2FybmluZ3MoInNlcmlhbCIpIC8vIE5ldmVyIHNlcmlhbGl6ZWQgb3IgdGhyb3duIG91dCBvZiB0aGlzIGNsYXNzLgotICBwcml2YXRlIHN0YXRpYyBjbGFzcyBSZXF1aXJlQ2FwYWJpbGl0eUV4Y2VwdGlvbiBleHRlbmRzIEV4Y2VwdGlvbiB7Ci0gICAgcHVibGljIFJlcXVpcmVDYXBhYmlsaXR5RXhjZXB0aW9uKFN0cmluZyBtc2cpIHsKLSAgICAgIHN1cGVyKG1zZyk7Ci0gICAgfQotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9SZXN0VG9rZW5WZXJpZmllci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvUmVzdFRva2VuVmVyaWZpZXIuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNzgzZWJjNy4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9SZXN0VG9rZW5WZXJpZmllci5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNTggKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmVnaXN0ZXJOZXdFbWFpbFNlbmRlcjsKLQotLyoqIFZlcmlmaWVzIHRoZSB0b2tlbiBzZW50IGJ5IHtAbGluayBSZWdpc3Rlck5ld0VtYWlsU2VuZGVyfS4gKi8KLXB1YmxpYyBpbnRlcmZhY2UgUmVzdFRva2VuVmVyaWZpZXIgewotICAvKioKLSAgICogQ29uc3RydWN0IGEgdG9rZW4gdG8gdmVyaWZ5IGEgUkVTVCBQVVQgcmVxdWVzdC4KLSAgICoKLSAgICogQHBhcmFtIHVzZXIgdGhlIGNhbGxlciB0aGF0IHdhbnRzIHRvIG1ha2UgYSBQVVQgcmVxdWVzdAotICAgKiBAcGFyYW0gdXJsIHRoZSBVUkwgYmVpbmcgcmVxdWVzdGVkCi0gICAqIEByZXR1cm4gYW4gdW5mb3JnZWFibGUgc3RyaW5nIHRvIHNlbmQgdG8gdGhlIHVzZXIgYXMgdGhlIGJvZHkgb2YgYSBHRVQKLSAgICogICAgICAgICByZXF1ZXN0LiBQcmVzZW50aW5nIHRoZSBzdHJpbmcgaW4gYSBmb2xsb3ctdXAgUE9TVCByZXF1ZXN0IHByb3ZpZGVzCi0gICAqICAgICAgICAgcHJvb2YgdGhlIHVzZXIgaGFzIHRoZSBhYmlsaXR5IHRvIHJlYWQgbWVzc2FnZXMgc2VudCB0byB0aGllcgotICAgKiAgICAgICAgIGJyb3dzZXIgYW5kIHRoZXkgbGlrZWx5IGFyZW4ndCBtYWtpbmcgdGhlIHJlcXVlc3QgdmlhIFhTUkYuCi0gICAqLwotICBwdWJsaWMgU3RyaW5nIHNpZ24oQWNjb3VudC5JZCB1c2VyLCBTdHJpbmcgdXJsKTsKLQotICAvKioKLSAgICogRGVjb2RlIGEgdG9rZW4gcHJldmlvdXNseSBjcmVhdGVkLgotICAgKgotICAgKiBAcGFyYW0gdXNlciB0aGUgdXNlciBtYWtpbmcgdGhlIHZlcmlmeSByZXF1ZXN0LgotICAgKiBAcGFyYW0gdXJsIHRoZSB1cmwgdXNlciBpcyBhdHRlbXB0aW5nIHRvIGFjY2Vzcy4KLSAgICogQHBhcmFtIHRva2VuIHRoZSBzdHJpbmcgY3JlYXRlZCBieSBzaWduLgotICAgKiBAdGhyb3dzIEludmFsaWRUb2tlbkV4Y2VwdGlvbiB0aGUgdG9rZW4gaXMgaW52YWxpZCwgZXhwaXJlZCwgbWFsZm9ybWVkLAotICAgKiAgICAgICAgIGV0Yy4KLSAgICovCi0gIHB1YmxpYyB2b2lkIHZlcmlmeShBY2NvdW50LklkIHVzZXIsIFN0cmluZyB1cmwsIFN0cmluZyB0b2tlbikKLSAgICAgIHRocm93cyBJbnZhbGlkVG9rZW5FeGNlcHRpb247Ci0KLSAgLyoqIEV4Y2VwdGlvbiB0aHJvd24gd2hlbiBhIHRva2VuIGRvZXMgbm90IHBhcnNlIGNvcnJlY3RseS4gKi8KLSAgcHVibGljIHN0YXRpYyBjbGFzcyBJbnZhbGlkVG9rZW5FeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24gewotICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwotCi0gICAgcHVibGljIEludmFsaWRUb2tlbkV4Y2VwdGlvbigpIHsKLSAgICAgIHN1cGVyKCJJbnZhbGlkIHRva2VuIik7Ci0gICAgfQotCi0gICAgcHVibGljIEludmFsaWRUb2tlbkV4Y2VwdGlvbihUaHJvd2FibGUgY2F1c2UpIHsKLSAgICAgIHN1cGVyKCJJbnZhbGlkIHRva2VuIiwgY2F1c2UpOwotICAgIH0KLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvU2lnbmVkVG9rZW5SZXN0VG9rZW5WZXJpZmllci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvU2lnbmVkVG9rZW5SZXN0VG9rZW5WZXJpZmllci5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA4M2Q2Y2FhLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1NpZ25lZFRva2VuUmVzdFRva2VuVmVyaWZpZXIuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDk3ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQXV0aENvbmZpZzsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuc2VydmVyLlNpZ25lZFRva2VuOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5zZXJ2ZXIuVmFsaWRUb2tlbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuc2VydmVyLlhzcmZFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLkJhc2U2NDsKLQotaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKLQotLyoqIFZlcmlmaWVzIHRoZSB0b2tlbiBzZW50IGJ5IHtAbGluayBSZXN0QXBpU2VydmxldH0uICovCi1wdWJsaWMgY2xhc3MgU2lnbmVkVG9rZW5SZXN0VG9rZW5WZXJpZmllciBpbXBsZW1lbnRzIFJlc3RUb2tlblZlcmlmaWVyIHsKLSAgcHJpdmF0ZSBmaW5hbCBTaWduZWRUb2tlbiByZXN0VG9rZW47Ci0KLSAgcHVibGljIHN0YXRpYyBjbGFzcyBNb2R1bGUgZXh0ZW5kcyBBYnN0cmFjdE1vZHVsZSB7Ci0gICAgQE92ZXJyaWRlCi0gICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgewotICAgICAgYmluZChSZXN0VG9rZW5WZXJpZmllci5jbGFzcykudG8oU2lnbmVkVG9rZW5SZXN0VG9rZW5WZXJpZmllci5jbGFzcyk7Ci0gICAgfQotICB9Ci0KLSAgQEluamVjdAotICBTaWduZWRUb2tlblJlc3RUb2tlblZlcmlmaWVyKEF1dGhDb25maWcgY29uZmlnKSB7Ci0gICAgcmVzdFRva2VuID0gY29uZmlnLmdldFJlc3RUb2tlbigpOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBTdHJpbmcgc2lnbihBY2NvdW50LklkIHVzZXIsIFN0cmluZyB1cmwpIHsKLSAgICB0cnkgewotICAgICAgU3RyaW5nIHBheWxvYWQgPSBTdHJpbmcuZm9ybWF0KCIlczolcyIsIHVzZXIsIHVybCk7Ci0gICAgICBieXRlW10gdXRmOCA9IHBheWxvYWQuZ2V0Qnl0ZXMoIlVURi04Iik7Ci0gICAgICBTdHJpbmcgYmFzZTY0ID0gQmFzZTY0LmVuY29kZUJ5dGVzKHV0ZjgpOwotICAgICAgcmV0dXJuIHJlc3RUb2tlbi5uZXdUb2tlbihiYXNlNjQpOwotICAgIH0gY2F0Y2ggKFhzcmZFeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbihlKTsKLSAgICB9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIGUpIHsKLSAgICAgIHRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oZSk7Ci0gICAgfQotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIHZlcmlmeShBY2NvdW50LklkIHVzZXIsIFN0cmluZyB1cmwsIFN0cmluZyB0b2tlblN0cmluZykKLSAgICAgIHRocm93cyBJbnZhbGlkVG9rZW5FeGNlcHRpb24gewotICAgIFZhbGlkVG9rZW4gdG9rZW47Ci0gICAgdHJ5IHsKLSAgICAgIHRva2VuID0gcmVzdFRva2VuLmNoZWNrVG9rZW4odG9rZW5TdHJpbmcsIG51bGwpOwotICAgIH0gY2F0Y2ggKFhzcmZFeGNlcHRpb24gZXJyKSB7Ci0gICAgICB0aHJvdyBuZXcgSW52YWxpZFRva2VuRXhjZXB0aW9uKGVycik7Ci0gICAgfQotICAgIGlmICh0b2tlbiA9PSBudWxsIHx8IHRva2VuLmdldERhdGEoKSA9PSBudWxsIHx8IHRva2VuLmdldERhdGEoKS5pc0VtcHR5KCkpIHsKLSAgICAgIHRocm93IG5ldyBJbnZhbGlkVG9rZW5FeGNlcHRpb24oKTsKLSAgICB9Ci0KLSAgICBTdHJpbmcgcGF5bG9hZDsKLSAgICB0cnkgewotICAgICAgcGF5bG9hZCA9IG5ldyBTdHJpbmcoQmFzZTY0LmRlY29kZSh0b2tlbi5nZXREYXRhKCkpLCAiVVRGLTgiKTsKLSAgICB9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIGVycikgewotICAgICAgdGhyb3cgbmV3IEludmFsaWRUb2tlbkV4Y2VwdGlvbihlcnIpOwotICAgIH0KLQotICAgIGludCBjb2xvblBvcyA9IHBheWxvYWQuaW5kZXhPZignOicpOwotICAgIGlmIChjb2xvblBvcyA9PSAtMSkgewotICAgICAgdGhyb3cgbmV3IEludmFsaWRUb2tlbkV4Y2VwdGlvbigpOwotICAgIH0KLQotICAgIEFjY291bnQuSWQgdG9rZW5Vc2VyOwotICAgIHRyeSB7Ci0gICAgICB0b2tlblVzZXIgPSBBY2NvdW50LklkLnBhcnNlKHBheWxvYWQuc3Vic3RyaW5nKDAsIGNvbG9uUG9zKSk7Ci0gICAgfSBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIGVycikgewotICAgICAgdGhyb3cgbmV3IEludmFsaWRUb2tlbkV4Y2VwdGlvbihlcnIpOwotICAgIH0KLQotICAgIFN0cmluZyB0b2tlblVybCA9IHBheWxvYWQuc3Vic3RyaW5nKGNvbG9uUG9zKzEpOwotCi0gICAgaWYgKCF0b2tlblVzZXIuZXF1YWxzKHVzZXIpIHx8ICF0b2tlblVybC5lcXVhbHModXJsKSkgewotICAgICAgdGhyb3cgbmV3IEludmFsaWRUb2tlbkV4Y2VwdGlvbigpOwotICAgIH0KLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvVG9rZW5WZXJpZmllZFJlc3RBcGlTZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9Ub2tlblZlcmlmaWVkUmVzdEFwaVNlcnZsZXQuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOThhMWI1Ny4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9Ub2tlblZlcmlmaWVkUmVzdEFwaVNlcnZsZXQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDI2MyArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQ7Ci0KLWltcG9ydCBzdGF0aWMgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfQkFEX1JFUVVFU1Q7Ci1pbXBvcnQgc3RhdGljIGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlc3BvbnNlLlNDX1VOQVVUSE9SSVpFRDsKLQotaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhdG9yczsKLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuUmVzdFRva2VuVmVyaWZpZXIuSW52YWxpZFRva2VuRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLk91dHB1dEZvcm1hdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdzb24uR3NvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdzb24uSnNvbkVsZW1lbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25PYmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25QYXJzZUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdzb24uSnNvblBhcnNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7Ci0KLWltcG9ydCBqYXZhLmlvLkJ5dGVBcnJheU91dHB1dFN0cmVhbTsKLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEubmV0LlVSTERlY29kZXI7Ci1pbXBvcnQgamF2YS5uZXQuVVJMRW5jb2RlcjsKLWltcG9ydCBqYXZhLnV0aWwuRW51bWVyYXRpb247Ci1pbXBvcnQgamF2YS51dGlsLk1hcDsKLQotaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7Ci1pbXBvcnQgamF2YXguc2VydmxldC5TZXJ2bGV0RXhjZXB0aW9uOwotaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlcXVlc3Q7Ci1pbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVxdWVzdFdyYXBwZXI7Ci1pbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2U7Ci0KLXB1YmxpYyBhYnN0cmFjdCBjbGFzcyBUb2tlblZlcmlmaWVkUmVzdEFwaVNlcnZsZXQgZXh0ZW5kcyBSZXN0QXBpU2VydmxldCB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgRk9STV9FTkNPREVEID0gImFwcGxpY2F0aW9uL3gtd3d3LWZvcm0tdXJsZW5jb2RlZCI7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBVVEZfOCA9ICJVVEYtOCI7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBBVVRIS0VZX05BTUUgPSAiX2F1dGhrZXkiOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgQVVUSEtFWV9IRUFERVIgPSAiWC1hdXRoa2V5IjsKLQotICBwcml2YXRlIGZpbmFsIEdzb24gZ3NvbjsKLSAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gdXNlclByb3ZpZGVyOwotICBwcml2YXRlIGZpbmFsIFJlc3RUb2tlblZlcmlmaWVyIHZlcmlmaWVyOwotCi0gIEBJbmplY3QKLSAgcHJvdGVjdGVkIFRva2VuVmVyaWZpZWRSZXN0QXBpU2VydmxldChQcm92aWRlcjxDdXJyZW50VXNlcj4gdXNlclByb3ZpZGVyLAotICAgICAgUmVzdFRva2VuVmVyaWZpZXIgdmVyaWZpZXIpIHsKLSAgICBzdXBlcih1c2VyUHJvdmlkZXIpOwotICAgIHRoaXMuZ3NvbiA9IE91dHB1dEZvcm1hdC5KU09OX0NPTVBBQ1QubmV3R3NvbigpOwotICAgIHRoaXMudXNlclByb3ZpZGVyID0gdXNlclByb3ZpZGVyOwotICAgIHRoaXMudmVyaWZpZXIgPSB2ZXJpZmllcjsKLSAgfQotCi0gIC8qKgotICAgKiBQcm9jZXNzIHRoZSAocG9zc2libHkgc3RhdGUgY2hhbmdpbmcpIHJlcXVlc3QuCi0gICAqCi0gICAqIEBwYXJhbSByZXEgaW5jb21pbmcgSFRUUCByZXF1ZXN0LgotICAgKiBAcGFyYW0gcmVzIG91dGdvaW5nIHJlc3BvbnNlLgotICAgKiBAcGFyYW0gcmVxdWVzdERhdGEgSlNPTiBvYmplY3QgcmVwcmVzZW50aW5nIHRoZSBIVFRQIHJlcXVlc3QgcGFyYW1ldGVycy4KLSAgICogICAgICAgIE51bGwgaWYgdGhlIHJlcXVlc3QgYm9keSB3YXMgbm90IHN1cHBsaWVkIGluIEpTT04gZm9ybWF0LgotICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uCi0gICAqIEB0aHJvd3MgU2VydmxldEV4Y2VwdGlvbgotICAgKi8KLSAgcHJvdGVjdGVkIGFic3RyYWN0IHZvaWQgZG9SZXF1ZXN0KEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCi0gICAgICBIdHRwU2VydmxldFJlc3BvbnNlIHJlcywKLSAgICAgIEBOdWxsYWJsZSBKc29uT2JqZWN0IHJlcXVlc3REYXRhKSB0aHJvd3MgSU9FeGNlcHRpb24sIFNlcnZsZXRFeGNlcHRpb247Ci0KLSAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCBmaW5hbCB2b2lkIGRvR2V0KEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKQotICAgICAgdGhyb3dzIFNlcnZsZXRFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKLSAgICBDdXJyZW50VXNlciB1c2VyID0gdXNlclByb3ZpZGVyLmdldCgpOwotICAgIGlmICghKHVzZXIgaW5zdGFuY2VvZiBJZGVudGlmaWVkVXNlcikpIHsKLSAgICAgIHNlbmRFcnJvcihyZXMsIFNDX1VOQVVUSE9SSVpFRCwgIkFQSSByZXF1aXJlcyBhdXRoZW50aWNhdGlvbiIpOwotICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIFRva2VuSW5mbyBpbmZvID0gbmV3IFRva2VuSW5mbygpOwotICAgIGluZm8uX2F1dGhrZXkgPSB2ZXJpZmllci5zaWduKAotICAgICAgICAoKElkZW50aWZpZWRVc2VyKSB1c2VyKS5nZXRBY2NvdW50SWQoKSwKLSAgICAgICAgY29tcHV0ZVVybChyZXEpKTsKLQotICAgIEJ5dGVBcnJheU91dHB1dFN0cmVhbSBidWYgPSBuZXcgQnl0ZUFycmF5T3V0cHV0U3RyZWFtKCk7Ci0gICAgU3RyaW5nIHR5cGU7Ci0gICAgYnVmLndyaXRlKEpTT05fTUFHSUMpOwotICAgIGlmIChhY2NlcHRzSnNvbihyZXEpKSB7Ci0gICAgICB0eXBlID0gSlNPTl9UWVBFOwotICAgICAgYnVmLndyaXRlKGdzb24udG9Kc29uKGluZm8pLmdldEJ5dGVzKFVURl84KSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgIHR5cGUgPSBGT1JNX0VOQ09ERUQ7Ci0gICAgICBidWYud3JpdGUoU3RyaW5nLmZvcm1hdCgiJXM9JXMiLAotICAgICAgICAgIEFVVEhLRVlfTkFNRSwKLSAgICAgICAgICBVUkxFbmNvZGVyLmVuY29kZShpbmZvLl9hdXRoa2V5LCBVVEZfOCkpLmdldEJ5dGVzKFVURl84KSk7Ci0gICAgfQotCi0gICAgcmVzLnNldENvbnRlbnRUeXBlKHR5cGUpOwotICAgIHJlcy5zZXRDaGFyYWN0ZXJFbmNvZGluZyhVVEZfOCk7Ci0gICAgcmVzLnNldEhlYWRlcigiQ29udGVudC1EaXNwb3NpdGlvbiIsICJhdHRhY2htZW50Iik7Ci0gICAgc2VuZChyZXEsIHJlcywgYnVmLnRvQnl0ZUFycmF5KCkpOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCBmaW5hbCB2b2lkIGRvUG9zdChIdHRwU2VydmxldFJlcXVlc3QgcmVxLCBIdHRwU2VydmxldFJlc3BvbnNlIHJlcykKLSAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiwgU2VydmxldEV4Y2VwdGlvbiB7Ci0gICAgQ3VycmVudFVzZXIgdXNlciA9IHVzZXJQcm92aWRlci5nZXQoKTsKLSAgICBpZiAoISh1c2VyIGluc3RhbmNlb2YgSWRlbnRpZmllZFVzZXIpKSB7Ci0gICAgICBzZW5kRXJyb3IocmVzLCBTQ19VTkFVVEhPUklaRUQsICJBUEkgcmVxdWlyZXMgYXV0aGVudGljYXRpb24iKTsKLSAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBQYXJzZWRCb2R5IGJvZHk7Ci0gICAgaWYgKEpTT05fVFlQRS5lcXVhbHMocmVxLmdldENvbnRlbnRUeXBlKCkpKSB7Ci0gICAgICBib2R5ID0gcGFyc2VKc29uKHJlcSwgcmVzKTsKLSAgICB9IGVsc2UgaWYgKEZPUk1fRU5DT0RFRC5lcXVhbHMocmVxLmdldENvbnRlbnRUeXBlKCkpKSB7Ci0gICAgICBib2R5ID0gcGFyc2VGb3JtKHJlcSwgcmVzKTsKLSAgICB9IGVsc2UgewotICAgICAgc2VuZEVycm9yKHJlcywgU0NfQkFEX1JFUVVFU1QsIFN0cmluZy5mb3JtYXQoCi0gICAgICAgICAgIkV4cGVjdGVkIENvbnRlbnQtVHlwZTogJXMgb3IgJXMiLAotICAgICAgICAgIEpTT05fVFlQRSwgRk9STV9FTkNPREVEKSk7Ci0gICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKGJvZHkgPT0gbnVsbCkgewotICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkoYm9keS5fYXV0aGtleSkpIHsKLSAgICAgIFN0cmluZyBoID0gcmVxLmdldEhlYWRlcihBVVRIS0VZX0hFQURFUik7Ci0gICAgICBpZiAoU3RyaW5ncy5pc051bGxPckVtcHR5KGgpKSB7Ci0gICAgICAgIHNlbmRFcnJvcihyZXMsIFNDX0JBRF9SRVFVRVNULCBTdHJpbmcuZm9ybWF0KAotICAgICAgICAgICAgIkV4cGVjdGVkICVzIGluIHJlcXVlc3QgYm9keSBvciAlcyBpbiBIVFRQIGhlYWRlcnMiLAotICAgICAgICAgICAgQVVUSEtFWV9OQU1FLCBBVVRIS0VZX0hFQURFUikpOwotICAgICAgICByZXR1cm47Ci0gICAgICB9Ci0gICAgICBib2R5Ll9hdXRoa2V5ID0gVVJMRGVjb2Rlci5kZWNvZGUoaCwgVVRGXzgpOwotICAgIH0KLQotICAgIHRyeSB7Ci0gICAgICB2ZXJpZmllci52ZXJpZnkoCi0gICAgICAgICAgKChJZGVudGlmaWVkVXNlcikgdXNlcikuZ2V0QWNjb3VudElkKCksCi0gICAgICAgICAgY29tcHV0ZVVybChyZXEpLAotICAgICAgICAgIGJvZHkuX2F1dGhrZXkpOwotICAgIH0gY2F0Y2ggKEludmFsaWRUb2tlbkV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgIHNlbmRFcnJvcihyZXMsIFNDX0JBRF9SRVFVRVNULAotICAgICAgICAgIFN0cmluZy5mb3JtYXQoIkludmFsaWQgb3IgZXhwaXJlZCAlcyIsIEFVVEhLRVlfTkFNRSkpOwotICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGRvUmVxdWVzdChib2R5LnJlcSwgcmVzLCBib2R5Lmpzb24pOwotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgUGFyc2VkQm9keSBwYXJzZUpzb24oSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwKLSAgICAgIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKSB0aHJvd3MgSU9FeGNlcHRpb24gewotICAgIHRyeSB7Ci0gICAgICBKc29uRWxlbWVudCBlbGVtZW50ID0gbmV3IEpzb25QYXJzZXIoKS5wYXJzZShyZXEuZ2V0UmVhZGVyKCkpOwotICAgICAgaWYgKCFlbGVtZW50LmlzSnNvbk9iamVjdCgpKSB7Ci0gICAgICAgIHNlbmRFcnJvcihyZXMsIFNDX0JBRF9SRVFVRVNULCAiRXhwZWN0ZWQgSlNPTiBvYmplY3QgaW4gcmVxdWVzdCBib2R5Iik7Ci0gICAgICAgIHJldHVybiBudWxsOwotICAgICAgfQotCi0gICAgICBQYXJzZWRCb2R5IGJvZHkgPSBuZXcgUGFyc2VkQm9keSgpOwotICAgICAgYm9keS5yZXEgPSByZXE7Ci0gICAgICBib2R5Lmpzb24gPSAoSnNvbk9iamVjdCkgZWxlbWVudDsKLSAgICAgIEpzb25FbGVtZW50IGF1dGhLZXkgPSBib2R5Lmpzb24ucmVtb3ZlKEFVVEhLRVlfTkFNRSk7Ci0gICAgICBpZiAoYXV0aEtleSAhPSBudWxsCi0gICAgICAgICAgJiYgYXV0aEtleS5pc0pzb25QcmltaXRpdmUoKQotICAgICAgICAgICYmIGF1dGhLZXkuZ2V0QXNKc29uUHJpbWl0aXZlKCkuaXNTdHJpbmcoKSkgewotICAgICAgICBib2R5Ll9hdXRoa2V5ID0gYXV0aEtleS5nZXRBc1N0cmluZygpOwotICAgICAgfQotICAgICAgcmV0dXJuIGJvZHk7Ci0gICAgfSBjYXRjaCAoSnNvblBhcnNlRXhjZXB0aW9uIGUpIHsKLSAgICAgIHNlbmRFcnJvcihyZXMsIFNDX0JBRF9SRVFVRVNULCAiSW52YWxpZCBKU09OIG9iamVjdCBpbiByZXF1ZXN0IGJvZHkiKTsKLSAgICAgIHJldHVybiBudWxsOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIFBhcnNlZEJvZHkgcGFyc2VGb3JtKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCi0gICAgICBIdHRwU2VydmxldFJlc3BvbnNlIHJlcykgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICBQYXJzZWRCb2R5IGJvZHkgPSBuZXcgUGFyc2VkQm9keSgpOwotICAgIGJvZHkucmVxID0gbmV3IFdyYXBwZWRSZXF1ZXN0KHJlcSk7Ci0gICAgYm9keS5fYXV0aGtleSA9IHJlcS5nZXRQYXJhbWV0ZXIoQVVUSEtFWV9OQU1FKTsKLSAgICByZXR1cm4gYm9keTsKLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIFN0cmluZyBjb21wdXRlVXJsKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEpIHsKLSAgICBTdHJpbmdCdWZmZXIgdXJsID0gcmVxLmdldFJlcXVlc3RVUkwoKTsKLSAgICBTdHJpbmcgcXMgPSByZXEuZ2V0UXVlcnlTdHJpbmcoKTsKLSAgICBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShxcykpIHsKLSAgICAgIHVybC5hcHBlbmQoJz8nKS5hcHBlbmQocXMpOwotICAgIH0KLSAgICByZXR1cm4gdXJsLnRvU3RyaW5nKCk7Ci0gIH0KLQotICBwcml2YXRlIHN0YXRpYyBjbGFzcyBUb2tlbkluZm8gewotICAgIFN0cmluZyBfYXV0aGtleTsKLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIGNsYXNzIFBhcnNlZEJvZHkgewotICAgIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXE7Ci0gICAgU3RyaW5nIF9hdXRoa2V5OwotICAgIEpzb25PYmplY3QganNvbjsKLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIGNsYXNzIFdyYXBwZWRSZXF1ZXN0IGV4dGVuZHMgSHR0cFNlcnZsZXRSZXF1ZXN0V3JhcHBlciB7Ci0gICAgQFN1cHByZXNzV2FybmluZ3MoInJhd3R5cGVzIikKLSAgICBwcml2YXRlIE1hcCBwYXJhbWV0ZXJzOwotCi0gICAgV3JhcHBlZFJlcXVlc3QoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgewotICAgICAgc3VwZXIocmVxKTsKLSAgICB9Ci0KLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgU3RyaW5nIGdldFBhcmFtZXRlcihTdHJpbmcgbmFtZSkgewotICAgICAgaWYgKEFVVEhLRVlfTkFNRS5lcXVhbHMobmFtZSkpIHsKLSAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgICB9Ci0gICAgICByZXR1cm4gc3VwZXIuZ2V0UGFyYW1ldGVyKG5hbWUpOwotICAgIH0KLQotICAgIEBPdmVycmlkZQotICAgIHB1YmxpYyBTdHJpbmdbXSBnZXRQYXJhbWV0ZXJWYWx1ZXMoU3RyaW5nIG5hbWUpIHsKLSAgICAgIGlmIChBVVRIS0VZX05BTUUuZXF1YWxzKG5hbWUpKSB7Ci0gICAgICAgIHJldHVybiBudWxsOwotICAgICAgfQotICAgICAgcmV0dXJuIHN1cGVyLmdldFBhcmFtZXRlclZhbHVlcyhuYW1lKTsKLSAgICB9Ci0KLSAgICBAU3VwcHJlc3NXYXJuaW5ncyh7InJhd3R5cGVzIiwgInVuY2hlY2tlZCJ9KQotICAgIEBPdmVycmlkZQotICAgIHB1YmxpYyBNYXAgZ2V0UGFyYW1ldGVyTWFwKCkgewotICAgICAgTWFwIG0gPSBwYXJhbWV0ZXJzOwotICAgICAgaWYgKG0gPT0gbnVsbCkgewotICAgICAgICBtID0gc3VwZXIuZ2V0UGFyYW1ldGVyTWFwKCk7Ci0gICAgICAgIGlmIChtLmNvbnRhaW5zS2V5KEFVVEhLRVlfTkFNRSkpIHsKLSAgICAgICAgICBtID0gTWFwcy5uZXdIYXNoTWFwKG0pOwotICAgICAgICAgIG0ucmVtb3ZlKEFVVEhLRVlfTkFNRSk7Ci0gICAgICAgIH0KLSAgICAgICAgcGFyYW1ldGVycyA9IG07Ci0gICAgICB9Ci0gICAgICByZXR1cm4gbTsKLSAgICB9Ci0KLSAgICBAU3VwcHJlc3NXYXJuaW5ncyh7InJhd3R5cGVzIiwgInVuY2hlY2tlZCJ9KQotICAgIEBPdmVycmlkZQotICAgIHB1YmxpYyBFbnVtZXJhdGlvbiBnZXRQYXJhbWV0ZXJOYW1lcygpIHsKLSAgICAgIHJldHVybiBJdGVyYXRvcnMuYXNFbnVtZXJhdGlvbihnZXRQYXJhbWV0ZXJNYXAoKS5rZXlTZXQoKS5pdGVyYXRvcigpKTsKLSAgICB9Ci0gIH0KLX0KLQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvVXJsTW9kdWxlLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9VcmxNb2R1bGUuamF2YQppbmRleCBhN2ZkZTliLi5iOTNkZjQzIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9VcmxNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9VcmxNb2R1bGUuamF2YQpAQCAtMjQsMTAgKzI0LDExIEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucmF3LlNzaEluZm9TZXJ2bGV0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJhdy5TdGF0aWNTZXJ2bGV0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJhdy5Ub29sU2VydmxldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuYWNjb3VudC5BY2NvdW50Q2FwYWJpbGl0aWVzU2VydmxldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuYWNjb3VudC5BY2NvdW50c1Jlc3RBcGlTZXJ2bGV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5jaGFuZ2UuQ2hhbmdlc1Jlc3RBcGlTZXJ2bGV0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5jaGFuZ2UuRGVwcmVjYXRlZENoYW5nZVF1ZXJ5U2VydmxldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlLkxpc3RDaGFuZ2VzU2VydmxldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucHJvamVjdC5MaXN0UHJvamVjdHNTZXJ2bGV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5ncm91cC5Hcm91cHNSZXN0QXBpU2VydmxldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucHJvamVjdC5Qcm9qZWN0c1Jlc3RBcGlTZXJ2bGV0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CkBAIC0zOSw2ICs0MCw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3Quc2VydmxldC5TZXJ2bGV0TW9kdWxlOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKIAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiAKQEAgLTU3LDkgKzU5LDExIEBACiAgIH0KIAogICBwcml2YXRlIGZpbmFsIFVybENvbmZpZyBjZmc7CisgIHByaXZhdGUgR2Vycml0VWlPcHRpb25zIHVpT3B0aW9uczsKIAotICBVcmxNb2R1bGUoVXJsQ29uZmlnIGNmZykgeworICBVcmxNb2R1bGUoVXJsQ29uZmlnIGNmZywgR2Vycml0VWlPcHRpb25zIHVpT3B0aW9ucykgewogICAgIHRoaXMuY2ZnID0gY2ZnOworICAgIHRoaXMudWlPcHRpb25zID0gdWlPcHRpb25zOwogICB9CiAKICAgQE92ZXJyaWRlCkBAIC02Nyw5ICs3MSwxMSBAQAogICAgIGZpbHRlcigiLyoiKS50aHJvdWdoKEtleS5nZXQoQ2FjaGVDb250cm9sRmlsdGVyLmNsYXNzKSk7CiAgICAgYmluZChLZXkuZ2V0KENhY2hlQ29udHJvbEZpbHRlci5jbGFzcykpLmluKFNJTkdMRVRPTik7CiAKLSAgICBzZXJ2ZSgiLyIpLndpdGgoSG9zdFBhZ2VTZXJ2bGV0LmNsYXNzKTsKLSAgICBzZXJ2ZSgiL0dlcnJpdCIpLndpdGgoTGVnYWN5R2Vycml0U2VydmxldC5jbGFzcyk7Ci0gICAgc2VydmUoIi9HZXJyaXQvKiIpLndpdGgobGVnYWN5R2Vycml0U2NyZWVuKCkpOworICAgIGlmICh1aU9wdGlvbnMuZW5hYmxlRGVmYXVsdFVpKCkpIHsKKyAgICAgIHNlcnZlKCIvIikud2l0aChIb3N0UGFnZVNlcnZsZXQuY2xhc3MpOworICAgICAgc2VydmUoIi9HZXJyaXQiKS53aXRoKExlZ2FjeUdlcnJpdFNlcnZsZXQuY2xhc3MpOworICAgICAgc2VydmUoIi9HZXJyaXQvKiIpLndpdGgobGVnYWN5R2Vycml0U2NyZWVuKCkpOworICAgIH0KICAgICBzZXJ2ZSgiL2NhdC8qIikud2l0aChDYXRTZXJ2bGV0LmNsYXNzKTsKICAgICBzZXJ2ZSgiL2xvZ291dCIpLndpdGgoSHR0cExvZ291dFNlcnZsZXQuY2xhc3MpOwogICAgIHNlcnZlKCIvc2lnbm91dCIpLndpdGgoSHR0cExvZ291dFNlcnZsZXQuY2xhc3MpOwpAQCAtOTQsOSArMTAwLDEwIEBACiAgICAgc2VydmVSZWdleCgiXi9yLyguKykvPyQiKS53aXRoKERpcmVjdENoYW5nZUJ5Q29tbWl0LmNsYXNzKTsKIAogICAgIGZpbHRlcigiL2EvKiIpLnRocm91Z2goUmVxdWlyZUlkZW50aWZpZWRVc2VyRmlsdGVyLmNsYXNzKTsKLSAgICBzZXJ2ZVJlZ2V4KCJeLyg/OmEvKT9hY2NvdW50cy9zZWxmL2NhcGFiaWxpdGllcyQiKS53aXRoKEFjY291bnRDYXBhYmlsaXRpZXNTZXJ2bGV0LmNsYXNzKTsKLSAgICBzZXJ2ZVJlZ2V4KCJeLyg/OmEvKT9jaGFuZ2VzLyQiKS53aXRoKExpc3RDaGFuZ2VzU2VydmxldC5jbGFzcyk7Ci0gICAgc2VydmVSZWdleCgiXi8oPzphLyk/cHJvamVjdHMvKC4qKT8kIikud2l0aChMaXN0UHJvamVjdHNTZXJ2bGV0LmNsYXNzKTsKKyAgICBzZXJ2ZVJlZ2V4KCJeLyg/OmEvKT9hY2NvdW50cy8oLiopJCIpLndpdGgoQWNjb3VudHNSZXN0QXBpU2VydmxldC5jbGFzcyk7CisgICAgc2VydmVSZWdleCgiXi8oPzphLyk/Y2hhbmdlcy8oLiopJCIpLndpdGgoQ2hhbmdlc1Jlc3RBcGlTZXJ2bGV0LmNsYXNzKTsKKyAgICBzZXJ2ZVJlZ2V4KCJeLyg/OmEvKT9ncm91cHMvKC4qKT8kIikud2l0aChHcm91cHNSZXN0QXBpU2VydmxldC5jbGFzcyk7CisgICAgc2VydmVSZWdleCgiXi8oPzphLyk/cHJvamVjdHMvKC4qKT8kIikud2l0aChQcm9qZWN0c1Jlc3RBcGlTZXJ2bGV0LmNsYXNzKTsKIAogICAgIGlmIChjZmcuZGVwcmVjYXRlZFF1ZXJ5KSB7CiAgICAgICBzZXJ2ZSgiL3F1ZXJ5Iikud2l0aChEZXByZWNhdGVkQ2hhbmdlUXVlcnlTZXJ2bGV0LmNsYXNzKTsKQEAgLTE0OCw3ICsxNTUsMTEgQEAKICAgICAgIHByb3RlY3RlZCB2b2lkIGRvR2V0KGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCiAgICAgICAgICAgZmluYWwgSHR0cFNlcnZsZXRSZXNwb25zZSByc3ApIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgQ2hhbmdlLklkIGlkID0gQ2hhbmdlLklkLnBhcnNlKHJlcS5nZXRQYXRoSW5mbygpKTsKKyAgICAgICAgICBTdHJpbmcgaWRTdHJpbmcgPSByZXEuZ2V0UGF0aEluZm8oKTsKKyAgICAgICAgICBpZiAoaWRTdHJpbmcuZW5kc1dpdGgoIi8iKSkgeworICAgICAgICAgICAgaWRTdHJpbmcgPSBpZFN0cmluZy5zdWJzdHJpbmcoMCwgaWRTdHJpbmcubGVuZ3RoKCkgLSAxKTsKKyAgICAgICAgICB9CisgICAgICAgICAgQ2hhbmdlLklkIGlkID0gQ2hhbmdlLklkLnBhcnNlKGlkU3RyaW5nKTsKICAgICAgICAgICB0b0dlcnJpdChQYWdlTGlua3MudG9DaGFuZ2UoaWQpLCByZXEsIHJzcCk7CiAgICAgICAgIH0gY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBlcnIpIHsKICAgICAgICAgICByc3Auc2VuZEVycm9yKEh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfTk9UX0ZPVU5EKTsKQEAgLTE3Myw4ICsxODQsOSBAQAogICAgICAgICB3aGlsZSAobmFtZS5lbmRzV2l0aCgiLyIpKSB7CiAgICAgICAgICAgbmFtZSA9IG5hbWUuc3Vic3RyaW5nKDAsIG5hbWUubGVuZ3RoKCkgLSAxKTsKICAgICAgICAgfQotICAgICAgICBpZiAobmFtZS5lbmRzV2l0aCgiLmdpdCIpKSB7Ci0gICAgICAgICAgbmFtZSA9IG5hbWUuc3Vic3RyaW5nKDAsIG5hbWUubGVuZ3RoKCkgLSA0KTsKKyAgICAgICAgaWYgKG5hbWUuZW5kc1dpdGgoQ29uc3RhbnRzLkRPVF9HSVRfRVhUKSkgeworICAgICAgICAgIG5hbWUgPSBuYW1lLnN1YnN0cmluZygwLCAvLworICAgICAgICAgICAgICBuYW1lLmxlbmd0aCgpIC0gQ29uc3RhbnRzLkRPVF9HSVRfRVhULmxlbmd0aCgpKTsKICAgICAgICAgfQogICAgICAgICB3aGlsZSAobmFtZS5lbmRzV2l0aCgiLyIpKSB7CiAgICAgICAgICAgbmFtZSA9IG5hbWUuc3Vic3RyaW5nKDAsIG5hbWUubGVuZ3RoKCkgLSAxKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYk1vZHVsZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViTW9kdWxlLmphdmEKaW5kZXggMWE0OGJiNS4uZjdiYTZkZiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViTW9kdWxlLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViTW9kdWxlLmphdmEKQEAgLTE0LDExICsxNCwxMyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkOwogCi1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuaW5qZWN0LlNjb3Blcy5TSU5HTEVUT047CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLlByaXZhdGVJbnRlcm5hbHNfRHluYW1pY1R5cGVzLnJlZ2lzdGVySW5QYXJlbnRJbmplY3RvcnM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuaW5qZWN0LlNjb3Blcy5TSU5HTEVUT047CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HZXJyaXRDb25maWc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5iZWNvbWUuQmVjb21lQW55QWNjb3VudExvZ2luU2VydmxldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMud2VidWkuV2ViVWlQbHVnaW47CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5iZWNvbWUuQmVjb21lQW55QWNjb3VudE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5hdXRoLmNvbnRhaW5lci5IdHRwQXV0aE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5hdXRoLmNvbnRhaW5lci5IdHRwc0NsaWVudFNzbENlcnRNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5sZGFwLkxkYXBBdXRoTW9kdWxlOwpAQCAtMjcsOCArMjksNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNtZExpbmVQYXJzZXJNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLlJlbW90ZVBlZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudE1hbmFnZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2hhbmdlVXNlck5hbWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2xlYXJQYXNzd29yZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5HZW5lcmF0ZVBhc3N3b3JkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQXV0aENvbmZpZzsKQEAgLTM3LDYgKzM3LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFJlcXVlc3RNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbnRhY3QuQ29udGFjdFN0b3JlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb250YWN0LkNvbnRhY3RTdG9yZVByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuQXN5bmNSZWNlaXZlQ29tbWl0czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5HdWljZVJlcXVlc3RTY29wZVByb3BhZ2F0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuUmVxdWVzdFNjb3BlUHJvcGFnYXRvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKQEAgLTQ0LDcgKzQ1LDYgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3RvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aXNpb25FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3Quc2VydmxldC5SZXF1ZXN0U2NvcGVkOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LnNlcnZsZXQuU2VydmxldE1vZHVsZTsKIAogaW1wb3J0IGphdmEubmV0LlNvY2tldEFkZHJlc3M7CiAKQEAgLTU1LDE1ICs1NSwxOCBAQAogICBwcml2YXRlIGZpbmFsIFVybE1vZHVsZS5VcmxDb25maWcgdXJsQ29uZmlnOwogICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gd2FudFNTTDsKICAgcHJpdmF0ZSBmaW5hbCBHaXRXZWJDb25maWcgZ2l0V2ViQ29uZmlnOworICBwcml2YXRlIGZpbmFsIEdlcnJpdFVpT3B0aW9ucyB1aU9wdGlvbnM7CiAKICAgQEluamVjdAogICBXZWJNb2R1bGUoZmluYWwgQXV0aENvbmZpZyBhdXRoQ29uZmlnLAogICAgICAgZmluYWwgVXJsTW9kdWxlLlVybENvbmZpZyB1cmxDb25maWcsCiAgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBmaW5hbCBTdHJpbmcgY2Fub25pY2FsVXJsLAorICAgICAgR2Vycml0VWlPcHRpb25zIHVpT3B0aW9ucywKICAgICAgIGZpbmFsIEluamVjdG9yIGNyZWF0aW5nSW5qZWN0b3IpIHsKICAgICB0aGlzLmF1dGhDb25maWcgPSBhdXRoQ29uZmlnOwogICAgIHRoaXMudXJsQ29uZmlnID0gdXJsQ29uZmlnOwogICAgIHRoaXMud2FudFNTTCA9IGNhbm9uaWNhbFVybCAhPSBudWxsICYmIGNhbm9uaWNhbFVybC5zdGFydHNXaXRoKCJodHRwczoiKTsKKyAgICB0aGlzLnVpT3B0aW9ucyA9IHVpT3B0aW9uczsKIAogICAgIHRoaXMuZ2l0V2ViQ29uZmlnID0KICAgICAgICAgY3JlYXRpbmdJbmplY3Rvci5jcmVhdGVDaGlsZEluamVjdG9yKG5ldyBBYnN0cmFjdE1vZHVsZSgpIHsKQEAgLTk5LDEyICsxMDIsNyBAQAogICAgICAgICBicmVhazsKIAogICAgICAgY2FzZSBERVZFTE9QTUVOVF9CRUNPTUVfQU5ZX0FDQ09VTlQ6Ci0gICAgICAgIGluc3RhbGwobmV3IFNlcnZsZXRNb2R1bGUoKSB7Ci0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlU2VydmxldHMoKSB7Ci0gICAgICAgICAgICBzZXJ2ZSgiL2JlY29tZSIpLndpdGgoQmVjb21lQW55QWNjb3VudExvZ2luU2VydmxldC5jbGFzcyk7Ci0gICAgICAgICAgfQotICAgICAgICB9KTsKKyAgICAgICAgaW5zdGFsbChuZXcgQmVjb21lQW55QWNjb3VudE1vZHVsZSgpKTsKICAgICAgICAgYnJlYWs7CiAKICAgICAgIGNhc2UgT1BFTklEOgpAQCAtMTE2LDcgKzExNCw3IEBACiAgICAgICAgIHRocm93IG5ldyBQcm92aXNpb25FeGNlcHRpb24oIlVuc3VwcG9ydGVkIGxvZ2luVHlwZTogIiArIGF1dGhDb25maWcuZ2V0QXV0aFR5cGUoKSk7CiAgICAgfQogCi0gICAgaW5zdGFsbChuZXcgVXJsTW9kdWxlKHVybENvbmZpZykpOworICAgIGluc3RhbGwobmV3IFVybE1vZHVsZSh1cmxDb25maWcsIHVpT3B0aW9ucykpOwogICAgIGluc3RhbGwobmV3IFVpUnBjTW9kdWxlKCkpOwogICAgIGluc3RhbGwobmV3IEdlcnJpdFJlcXVlc3RNb2R1bGUoKSk7CiAgICAgaW5zdGFsbChuZXcgR2l0T3Zlckh0dHBTZXJ2bGV0Lk1vZHVsZSgpKTsKQEAgLTEzMCwxMSArMTI4LDEwIEBACiAgICAgICAgIFNJTkdMRVRPTik7CiAgICAgYmluZChHZXJyaXRDb25maWdQcm92aWRlci5jbGFzcyk7CiAgICAgYmluZChHZXJyaXRDb25maWcuY2xhc3MpLnRvUHJvdmlkZXIoR2Vycml0Q29uZmlnUHJvdmlkZXIuY2xhc3MpOworICAgIER5bmFtaWNTZXQuc2V0T2YoYmluZGVyKCksIFdlYlVpUGx1Z2luLmNsYXNzKTsKIAotICAgIGJpbmQoQWNjb3VudE1hbmFnZXIuY2xhc3MpOwotICAgIGJpbmQoQ2hhbmdlVXNlck5hbWUuQ3VycmVudFVzZXIuY2xhc3MpOwotICAgIGZhY3RvcnkoQ2hhbmdlVXNlck5hbWUuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShDbGVhclBhc3N3b3JkLkZhY3RvcnkuY2xhc3MpOworICAgIGluc3RhbGwobmV3IEFzeW5jUmVjZWl2ZUNvbW1pdHMuTW9kdWxlKCkpOwogICAgIGluc3RhbGwobmV3IENtZExpbmVQYXJzZXJNb2R1bGUoKSk7CiAgICAgZmFjdG9yeShHZW5lcmF0ZVBhc3N3b3JkLkZhY3RvcnkuY2xhc3MpOwogCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJTZXNzaW9uLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJTZXNzaW9uLmphdmEKaW5kZXggNDQ5MjBhNDguLjMzNDljYzEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYlNlc3Npb24uamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJTZXNzaW9uLmphdmEKQEAgLTE2LDI3ICsxNiwyMyBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRFeHRlcm5hbElkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5BY2Nlc3NQYXRoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BdXRoTWV0aG9kOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhSZXN1bHQ7CiAKIHB1YmxpYyBpbnRlcmZhY2UgV2ViU2Vzc2lvbiB7Ci0gIHB1YmxpYyBBdXRoTWV0aG9kIGdldEF1dGhNZXRob2QoKTsKLQogICBwdWJsaWMgYm9vbGVhbiBpc1NpZ25lZEluKCk7Ci0KLSAgcHVibGljIFN0cmluZyBnZXRUb2tlbigpOwotCi0gIHB1YmxpYyBib29sZWFuIGlzVG9rZW5WYWxpZChTdHJpbmcgaW5wdXRUb2tlbik7Ci0KKyAgcHVibGljIFN0cmluZyBnZXRYR2Vycml0QXV0aCgpOworICBwdWJsaWMgYm9vbGVhbiBpc1ZhbGlkWEdlcnJpdEF1dGgoU3RyaW5nIGtleUluKTsKICAgcHVibGljIEFjY291bnRFeHRlcm5hbElkLktleSBnZXRMYXN0TG9naW5FeHRlcm5hbElkKCk7Ci0KICAgcHVibGljIEN1cnJlbnRVc2VyIGdldEN1cnJlbnRVc2VyKCk7Ci0KLSAgcHVibGljIHZvaWQgbG9naW4oQXV0aFJlc3VsdCByZXMsIEF1dGhNZXRob2QgbWV0aCwgYm9vbGVhbiByZW1lbWJlck1lKTsKKyAgcHVibGljIHZvaWQgbG9naW4oQXV0aFJlc3VsdCByZXMsIGJvb2xlYW4gcmVtZW1iZXJNZSk7CiAKICAgLyoqIFNldCB0aGUgdXNlciBhY2NvdW50IGZvciB0aGlzIGN1cnJlbnQgcmVxdWVzdCBvbmx5LiAqLwotICBwdWJsaWMgdm9pZCBzZXRVc2VyQWNjb3VudElkKEFjY291bnQuSWQgaWQsIEF1dGhNZXRob2QgbWV0aG9kKTsKKyAgcHVibGljIHZvaWQgc2V0VXNlckFjY291bnRJZChBY2NvdW50LklkIGlkKTsKKyAgcHVibGljIGJvb2xlYW4gaXNBY2Nlc3NQYXRoT2soQWNjZXNzUGF0aCBwYXRoKTsKKyAgcHVibGljIHZvaWQgc2V0QWNjZXNzUGF0aE9rKEFjY2Vzc1BhdGggcGF0aCwgYm9vbGVhbiBvayk7CiAKICAgcHVibGljIHZvaWQgbG9nb3V0KCk7CisgIHB1YmxpYyBTdHJpbmcgZ2V0U2Vzc2lvbklkKCk7CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJTZXNzaW9uTWFuYWdlci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViU2Vzc2lvbk1hbmFnZXIuamF2YQppbmRleCA0YjRlZGY0Li5hNTMzOGY4IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJTZXNzaW9uTWFuYWdlci5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYlNlc3Npb25NYW5hZ2VyLmphdmEKQEAgLTI1LDYgKzI1LDcgQEAKIGltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuSE9VUlM7CiBpbXBvcnQgc3RhdGljIGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0Lk1JTExJU0VDT05EUzsKIGltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuTUlOVVRFUzsKK2ltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuU0VDT05EUzsKIAogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkNhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwpAQCAtMzYsNiArMzcsOCBAQAogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lm5hbWUuTmFtZWQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKIAogaW1wb3J0IGphdmEuaW8uQnl0ZUFycmF5T3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CkBAIC00Nyw2ICs1MCw3IEBACiAKIEBTaW5nbGV0b24KIGNsYXNzIFdlYlNlc3Npb25NYW5hZ2VyIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKFdlYlNlc3Npb25NYW5hZ2VyLmNsYXNzKTsKICAgc3RhdGljIGZpbmFsIFN0cmluZyBDQUNIRV9OQU1FID0gIndlYl9zZXNzaW9ucyI7CiAKICAgc3RhdGljIGxvbmcgbm93KCkgewpAQCAtNjMsMTIgKzY3LDIyIEBACiAgICAgcHJuZyA9IG5ldyBTZWN1cmVSYW5kb20oKTsKICAgICBzZWxmID0gY2FjaGU7CiAKLSAgICBzZXNzaW9uTWF4QWdlTWlsbGlzID0gTUlOVVRFUy50b01pbGxpcyhDb25maWdVdGlsLmdldFRpbWVVbml0KGNmZywKKyAgICBzZXNzaW9uTWF4QWdlTWlsbGlzID0gU0VDT05EUy50b01pbGxpcyhDb25maWdVdGlsLmdldFRpbWVVbml0KGNmZywKICAgICAgICAgImNhY2hlIiwgQ0FDSEVfTkFNRSwgIm1heEFnZSIsCi0gICAgICAgIE1BWF9BR0VfTUlOVVRFUywgTUlOVVRFUykpOworICAgICAgICBTRUNPTkRTLmNvbnZlcnQoTUFYX0FHRV9NSU5VVEVTLCBNSU5VVEVTKSwgU0VDT05EUykpOworICAgIGlmIChzZXNzaW9uTWF4QWdlTWlsbGlzIDwgTUlOVVRFUy50b01pbGxpcyg1KSkgeworICAgICAgbG9nLndhcm4oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAiY2FjaGUuJXMubWF4QWdlIGlzIHNldCB0byAlZCBtaWxsaXNlY29uZHM7IiArCisgICAgICAgICAgIiBpdCBzaG91bGQgYmUgYXQgbGVhc3QgNSBtaW51dGVzLiIsCisgICAgICAgICAgQ0FDSEVfTkFNRSwgc2Vzc2lvbk1heEFnZU1pbGxpcykpOworICAgIH0KICAgfQogCiAgIEtleSBjcmVhdGVLZXkoZmluYWwgQWNjb3VudC5JZCB3aG8pIHsKKyAgICByZXR1cm4gbmV3IEtleShuZXdVbmlxdWVUb2tlbih3aG8pKTsKKyAgfQorCisgIHByaXZhdGUgU3RyaW5nIG5ld1VuaXF1ZVRva2VuKGZpbmFsIEFjY291bnQuSWQgd2hvKSB7CiAgICAgdHJ5IHsKICAgICAgIGZpbmFsIGludCBub25jZUxlbiA9IDIwOwogICAgICAgZmluYWwgQnl0ZUFycmF5T3V0cHV0U3RyZWFtIGJ1ZjsKQEAgLTgwLDcgKzk0LDcgQEAKICAgICAgIHdyaXRlVmFySW50MzIoYnVmLCB3aG8uZ2V0KCkpOwogICAgICAgd3JpdGVCeXRlcyhidWYsIHJuZCk7CiAKLSAgICAgIHJldHVybiBuZXcgS2V5KENvb2tpZUJhc2U2NC5lbmNvZGUoYnVmLnRvQnl0ZUFycmF5KCkpKTsKKyAgICAgIHJldHVybiBDb29raWVCYXNlNjQuZW5jb2RlKGJ1Zi50b0J5dGVBcnJheSgpKTsKICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CiAgICAgICB0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbigiQ2Fubm90IHByb2R1Y2UgbmV3IGFjY291bnQgY29va2llIiwgZSk7CiAgICAgfQpAQCAtOTAsMTMgKzEwNCwxMSBAQAogICAgIGZpbmFsIEFjY291bnQuSWQgd2hvID0gdmFsLmdldEFjY291bnRJZCgpOwogICAgIGZpbmFsIGJvb2xlYW4gcmVtZW1iZXIgPSB2YWwuaXNQZXJzaXN0ZW50Q29va2llKCk7CiAgICAgZmluYWwgQWNjb3VudEV4dGVybmFsSWQuS2V5IGxhc3RMb2dpbiA9IHZhbC5nZXRFeHRlcm5hbElkKCk7Ci0gICAgZmluYWwgU3RyaW5nIHhzcmZUb2tlbiA9IHZhbC5nZXRYc3JmVG9rZW4oKTsKLQotICAgIHJldHVybiBjcmVhdGVWYWwoa2V5LCB3aG8sIHJlbWVtYmVyLCBsYXN0TG9naW4sIHhzcmZUb2tlbik7CisgICAgcmV0dXJuIGNyZWF0ZVZhbChrZXksIHdobywgcmVtZW1iZXIsIGxhc3RMb2dpbiwgdmFsLnNlc3Npb25JZCwgdmFsLmF1dGgpOwogICB9CiAKICAgVmFsIGNyZWF0ZVZhbChmaW5hbCBLZXkga2V5LCBmaW5hbCBBY2NvdW50LklkIHdobywgZmluYWwgYm9vbGVhbiByZW1lbWJlciwKLSAgICAgIGZpbmFsIEFjY291bnRFeHRlcm5hbElkLktleSBsYXN0TG9naW4sIFN0cmluZyB4c3JmVG9rZW4pIHsKKyAgICAgIGZpbmFsIEFjY291bnRFeHRlcm5hbElkLktleSBsYXN0TG9naW4sIFN0cmluZyBzaWQsIFN0cmluZyBhdXRoKSB7CiAgICAgLy8gUmVmcmVzaCB0aGUgY29va2llIGV2ZXJ5IGhvdXIgb3Igd2hlbiBpdCBpcyBoYWxmLWV4cGlyZWQuCiAgICAgLy8gVGhpcyByZWR1Y2VzIHRoZSBvZGRzIHRoYXQgdGhlIHVzZXIgc2Vzc2lvbiB3aWxsIGJlIGtpY2tlZAogICAgIC8vIGVhcmx5IGJ1dCBhbHNvIGF2b2lkcyB1cyBuZWVkaW5nIHRvIHJlZnJlc2ggdGhlIGNvb2tpZSBvbgpAQCAtMTA4LDE4ICsxMjAsMTQgQEAKICAgICBmaW5hbCBsb25nIG5vdyA9IG5vdygpOwogICAgIGZpbmFsIGxvbmcgcmVmcmVzaENvb2tpZUF0ID0gbm93ICsgcmVmcmVzaDsKICAgICBmaW5hbCBsb25nIGV4cGlyZXNBdCA9IG5vdyArIHNlc3Npb25NYXhBZ2VNaWxsaXM7Ci0KLSAgICBpZiAoeHNyZlRva2VuID09IG51bGwpIHsKLSAgICAgIC8vIElmIHdlIGRvbid0IHlldCBoYXZlIGEgdG9rZW4gZm9yIHRoaXMgc2Vzc2lvbiwgZXN0YWJsaXNoIG9uZS4KLSAgICAgIC8vCi0gICAgICBmaW5hbCBpbnQgbm9uY2VMZW4gPSAyMDsKLSAgICAgIGZpbmFsIGJ5dGVbXSBybmQgPSBuZXcgYnl0ZVtub25jZUxlbl07Ci0gICAgICBwcm5nLm5leHRCeXRlcyhybmQpOwotICAgICAgeHNyZlRva2VuID0gQ29va2llQmFzZTY0LmVuY29kZShybmQpOworICAgIGlmIChzaWQgPT0gbnVsbCkgeworICAgICAgc2lkID0gbmV3VW5pcXVlVG9rZW4od2hvKTsKKyAgICB9CisgICAgaWYgKGF1dGggPT0gbnVsbCkgeworICAgICAgYXV0aCA9IG5ld1VuaXF1ZVRva2VuKHdobyk7CiAgICAgfQogCi0gICAgVmFsIHZhbCA9IG5ldyBWYWwod2hvLCByZWZyZXNoQ29va2llQXQsIHJlbWVtYmVyLAotICAgICAgICBsYXN0TG9naW4sIHhzcmZUb2tlbiwgZXhwaXJlc0F0KTsKKyAgICBWYWwgdmFsID0gbmV3IFZhbCh3aG8sIHJlZnJlc2hDb29raWVBdCwgcmVtZW1iZXIsIGxhc3RMb2dpbiwgZXhwaXJlc0F0LCBzaWQsIGF1dGgpOwogICAgIHNlbGYucHV0KGtleS50b2tlbiwgdmFsKTsKICAgICByZXR1cm4gdmFsOwogICB9CkBAIC0xODIsMTkgKzE5MCwyMCBAQAogICAgIHByaXZhdGUgdHJhbnNpZW50IGxvbmcgcmVmcmVzaENvb2tpZUF0OwogICAgIHByaXZhdGUgdHJhbnNpZW50IGJvb2xlYW4gcGVyc2lzdGVudENvb2tpZTsKICAgICBwcml2YXRlIHRyYW5zaWVudCBBY2NvdW50RXh0ZXJuYWxJZC5LZXkgZXh0ZXJuYWxJZDsKLSAgICBwcml2YXRlIHRyYW5zaWVudCBTdHJpbmcgeHNyZlRva2VuOwogICAgIHByaXZhdGUgdHJhbnNpZW50IGxvbmcgZXhwaXJlc0F0OworICAgIHByaXZhdGUgdHJhbnNpZW50IFN0cmluZyBzZXNzaW9uSWQ7CisgICAgcHJpdmF0ZSB0cmFuc2llbnQgU3RyaW5nIGF1dGg7CiAKICAgICBWYWwoZmluYWwgQWNjb3VudC5JZCBhY2NvdW50SWQsIGZpbmFsIGxvbmcgcmVmcmVzaENvb2tpZUF0LAogICAgICAgICBmaW5hbCBib29sZWFuIHBlcnNpc3RlbnRDb29raWUsIGZpbmFsIEFjY291bnRFeHRlcm5hbElkLktleSBleHRlcm5hbElkLAotICAgICAgICBmaW5hbCBTdHJpbmcgeHNyZlRva2VuLAotICAgICAgICBmaW5hbCBsb25nIGV4cGlyZXNBdCkgeworICAgICAgICBmaW5hbCBsb25nIGV4cGlyZXNBdCwgZmluYWwgU3RyaW5nIHNlc3Npb25JZCwgZmluYWwgU3RyaW5nIGF1dGgpIHsKICAgICAgIHRoaXMuYWNjb3VudElkID0gYWNjb3VudElkOwogICAgICAgdGhpcy5yZWZyZXNoQ29va2llQXQgPSByZWZyZXNoQ29va2llQXQ7CiAgICAgICB0aGlzLnBlcnNpc3RlbnRDb29raWUgPSBwZXJzaXN0ZW50Q29va2llOwogICAgICAgdGhpcy5leHRlcm5hbElkID0gZXh0ZXJuYWxJZDsKLSAgICAgIHRoaXMueHNyZlRva2VuID0geHNyZlRva2VuOwogICAgICAgdGhpcy5leHBpcmVzQXQgPSBleHBpcmVzQXQ7CisgICAgICB0aGlzLnNlc3Npb25JZCA9IHNlc3Npb25JZDsKKyAgICAgIHRoaXMuYXV0aCA9IGF1dGg7CiAgICAgfQogCiAgICAgQWNjb3VudC5JZCBnZXRBY2NvdW50SWQoKSB7CkBAIC0yMDUsNiArMjE0LDE0IEBACiAgICAgICByZXR1cm4gZXh0ZXJuYWxJZDsKICAgICB9CiAKKyAgICBTdHJpbmcgZ2V0U2Vzc2lvbklkKCkgeworICAgICAgcmV0dXJuIHNlc3Npb25JZDsKKyAgICB9CisKKyAgICBTdHJpbmcgZ2V0QXV0aCgpIHsKKyAgICAgIHJldHVybiBhdXRoOworICAgIH0KKwogICAgIGJvb2xlYW4gbmVlZHNDb29raWVSZWZyZXNoKCkgewogICAgICAgcmV0dXJuIHJlZnJlc2hDb29raWVBdCA8PSBub3coKTsKICAgICB9CkBAIC0yMTMsMTAgKzIzMCw2IEBACiAgICAgICByZXR1cm4gcGVyc2lzdGVudENvb2tpZTsKICAgICB9CiAKLSAgICBTdHJpbmcgZ2V0WHNyZlRva2VuKCkgewotICAgICAgcmV0dXJuIHhzcmZUb2tlbjsKLSAgICB9Ci0KICAgICBwcml2YXRlIHZvaWQgd3JpdGVPYmplY3QoZmluYWwgT2JqZWN0T3V0cHV0U3RyZWFtIG91dCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICAgIHdyaXRlVmFySW50MzIob3V0LCAxKTsKICAgICAgIHdyaXRlVmFySW50MzIob3V0LCBhY2NvdW50SWQuZ2V0KCkpOwpAQCAtMjMyLDEyICsyNDUsMTkgQEAKICAgICAgICAgd3JpdGVTdHJpbmcob3V0LCBleHRlcm5hbElkLmdldCgpKTsKICAgICAgIH0KIAotICAgICAgd3JpdGVWYXJJbnQzMihvdXQsIDUpOwotICAgICAgd3JpdGVTdHJpbmcob3V0LCB4c3JmVG9rZW4pOworICAgICAgaWYgKHNlc3Npb25JZCAhPSBudWxsKSB7CisgICAgICAgIHdyaXRlVmFySW50MzIob3V0LCA1KTsKKyAgICAgICAgd3JpdGVTdHJpbmcob3V0LCBzZXNzaW9uSWQpOworICAgICAgfQogCiAgICAgICB3cml0ZVZhckludDMyKG91dCwgNik7CiAgICAgICB3cml0ZUZpeEludDY0KG91dCwgZXhwaXJlc0F0KTsKIAorICAgICAgaWYgKGF1dGggIT0gbnVsbCkgeworICAgICAgICB3cml0ZVZhckludDMyKG91dCwgNyk7CisgICAgICAgIHdyaXRlU3RyaW5nKG91dCwgYXV0aCk7CisgICAgICB9CisKICAgICAgIHdyaXRlVmFySW50MzIob3V0LCAwKTsKICAgICB9CiAKQEAgLTI2MCwxMSArMjgwLDE0IEBACiAgICAgICAgICAgICBleHRlcm5hbElkID0gbmV3IEFjY291bnRFeHRlcm5hbElkLktleShyZWFkU3RyaW5nKGluKSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICBjYXNlIDU6Ci0gICAgICAgICAgICB4c3JmVG9rZW4gPSByZWFkU3RyaW5nKGluKTsKKyAgICAgICAgICAgIHNlc3Npb25JZCA9IHJlYWRTdHJpbmcoaW4pOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgY2FzZSA2OgogICAgICAgICAgICAgZXhwaXJlc0F0ID0gcmVhZEZpeEludDY0KGluKTsKICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgIGNhc2UgNzoKKyAgICAgICAgICAgIGF1dGggPSByZWFkU3RyaW5nKGluKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIlVua25vd24gdGFnIGZvdW5kIGluIG9iamVjdDogIiArIHRhZyk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYlNzaEdsdWVNb2R1bGUuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYlNzaEdsdWVNb2R1bGUuamF2YQppbmRleCA4MmU5ZGE3Li5lYjA2NjE3IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9XZWJTc2hHbHVlTW9kdWxlLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViU3NoR2x1ZU1vZHVsZS5qYXZhCkBAIC0xNSw3ICsxNSw2IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guU3NoS2V5Q2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwpAQCAtMjksMTggKzI4LDE0IEBACiAgKi8KIHB1YmxpYyBjbGFzcyBXZWJTc2hHbHVlTW9kdWxlIGV4dGVuZHMgQWJzdHJhY3RNb2R1bGUgewogICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFNzaEluZm8+IHNzaEluZm9Qcm92aWRlcjsKLSAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTc2hLZXlDYWNoZT4gc3NoS2V5Q2FjaGVQcm92aWRlcjsKIAogICBASW5qZWN0Ci0gIFdlYlNzaEdsdWVNb2R1bGUoUHJvdmlkZXI8U3NoSW5mbz4gc3NoSW5mb1Byb3ZpZGVyLAotICAgICAgUHJvdmlkZXI8U3NoS2V5Q2FjaGU+IHNzaEtleUNhY2hlUHJvdmlkZXIpIHsKKyAgV2ViU3NoR2x1ZU1vZHVsZShQcm92aWRlcjxTc2hJbmZvPiBzc2hJbmZvUHJvdmlkZXIpIHsKICAgICB0aGlzLnNzaEluZm9Qcm92aWRlciA9IHNzaEluZm9Qcm92aWRlcjsKLSAgICB0aGlzLnNzaEtleUNhY2hlUHJvdmlkZXIgPSBzc2hLZXlDYWNoZVByb3ZpZGVyOwogICB9CiAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKICAgICBiaW5kKFNzaEluZm8uY2xhc3MpLnRvUHJvdmlkZXIoc3NoSW5mb1Byb3ZpZGVyKTsKLSAgICBiaW5kKFNzaEtleUNhY2hlLmNsYXNzKS50b1Byb3ZpZGVyKHNzaEtleUNhY2hlUHJvdmlkZXIpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2JlY29tZS9CZWNvbWVBbnlBY2NvdW50TG9naW5TZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2JlY29tZS9CZWNvbWVBbnlBY2NvdW50TG9naW5TZXJ2bGV0LmphdmEKaW5kZXggMDgyMTQ5Ni4uMjhlMzYxYyAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9iZWNvbWUvQmVjb21lQW55QWNjb3VudExvZ2luU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvYmVjb21lL0JlY29tZUFueUFjY291bnRMb2dpblNlcnZsZXQuamF2YQpAQCAtMTYsMTcgKzE2LDIwIEBACiAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRFeHRlcm5hbElkLlNDSEVNRV9VU0VSTkFNRTsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5IdG1sRG9tVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5XZWJTZXNzaW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnRlbXBsYXRlLlNpdGVIZWFkZXJGb290ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRFeHRlcm5hbElkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhNZXRob2Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlcXVlc3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNlcnZlci5DYWNoZUhlYWRlcnM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUmVzdWx0U2V0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwpAQCAtNTIsMjAgKzU1LDI0IEBACiAKIEBTdXBwcmVzc1dhcm5pbmdzKCJzZXJpYWwiKQogQFNpbmdsZXRvbgotcHVibGljIGNsYXNzIEJlY29tZUFueUFjY291bnRMb2dpblNlcnZsZXQgZXh0ZW5kcyBIdHRwU2VydmxldCB7CitjbGFzcyBCZWNvbWVBbnlBY2NvdW50TG9naW5TZXJ2bGV0IGV4dGVuZHMgSHR0cFNlcnZsZXQgewogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBib29sZWFuIElTX0RFViA9IEJvb2xlYW4uZ2V0Qm9vbGVhbigiR2Vycml0Lkd3dERldk1vZGUiKTsKIAogICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYTsKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxXZWJTZXNzaW9uPiB3ZWJTZXNzaW9uOwogICBwcml2YXRlIGZpbmFsIEFjY291bnRNYW5hZ2VyIGFjY291bnRNYW5hZ2VyOworICBwcml2YXRlIGZpbmFsIFNpdGVIZWFkZXJGb290ZXIgaGVhZGVyczsKIAogICBASW5qZWN0CiAgIEJlY29tZUFueUFjY291bnRMb2dpblNlcnZsZXQoZmluYWwgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gd3MsCiAgICAgICBmaW5hbCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzZiwKLSAgICAgIGZpbmFsIEFjY291bnRNYW5hZ2VyIGFtLCBmaW5hbCBTZXJ2bGV0Q29udGV4dCBzZXJ2bGV0Q29udGV4dCkgeworICAgICAgZmluYWwgQWNjb3VudE1hbmFnZXIgYW0sCisgICAgICBmaW5hbCBTZXJ2bGV0Q29udGV4dCBzZXJ2bGV0Q29udGV4dCwKKyAgICAgIFNpdGVIZWFkZXJGb290ZXIgc2hmKSB7CiAgICAgd2ViU2Vzc2lvbiA9IHdzOwogICAgIHNjaGVtYSA9IHNmOwogICAgIGFjY291bnRNYW5hZ2VyID0gYW07CisgICAgaGVhZGVycyA9IHNoZjsKICAgfQogCiAgIEBPdmVycmlkZQpAQCAtNzcsOSArODQsNyBAQAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgZG9Qb3N0KGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCiAgICAgICBmaW5hbCBIdHRwU2VydmxldFJlc3BvbnNlIHJzcCkgdGhyb3dzIElPRXhjZXB0aW9uLCBTZXJ2bGV0RXhjZXB0aW9uIHsKLSAgICByc3Auc2V0SGVhZGVyKCJFeHBpcmVzIiwgIkZyaSwgMDEgSmFuIDE5ODAgMDA6MDA6MDAgR01UIik7Ci0gICAgcnNwLnNldEhlYWRlcigiUHJhZ21hIiwgIm5vLWNhY2hlIik7Ci0gICAgcnNwLnNldEhlYWRlcigiQ2FjaGUtQ29udHJvbCIsICJuby1jYWNoZSwgbXVzdC1yZXZhbGlkYXRlIik7CisgICAgQ2FjaGVIZWFkZXJzLnNldE5vdENhY2hlYWJsZShyc3ApOwogCiAgICAgZmluYWwgQXV0aFJlc3VsdCByZXM7CiAgICAgaWYgKCJjcmVhdGVfYWNjb3VudCIuZXF1YWxzKHJlcS5nZXRQYXJhbWV0ZXIoImFjdGlvbiIpKSkgewpAQCAtMTE0LDkgKzExOSwxMSBAQAogICAgIH0KIAogICAgIGlmIChyZXMgIT0gbnVsbCkgewotICAgICAgd2ViU2Vzc2lvbi5nZXQoKS5sb2dpbihyZXMsIEF1dGhNZXRob2QuQkFDS0RPT1IsIGZhbHNlKTsKKyAgICAgIHdlYlNlc3Npb24uZ2V0KCkubG9naW4ocmVzLCBmYWxzZSk7CiAgICAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIHJkciA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgICByZHIuYXBwZW5kKHJlcS5nZXRDb250ZXh0UGF0aCgpKTsKKyAgICAgIHJkci5hcHBlbmQoT2JqZWN0cy5maXJzdE5vbk51bGwoCisgICAgICAgICAgU3RyaW5ncy5lbXB0eVRvTnVsbChyZXEuZ2V0Q29udGV4dFBhdGgoKSksCisgICAgICAgICAgIi8iKSk7CiAgICAgICBpZiAoSVNfREVWICYmIHJlcS5nZXRQYXJhbWV0ZXIoImd3dC5jb2Rlc3ZyIikgIT0gbnVsbCkgewogICAgICAgICBpZiAocmRyLmluZGV4T2YoIj8iKSA8IDApIHsKICAgICAgICAgICByZHIuYXBwZW5kKCI/Iik7CkBAIC0xNDcsMTIgKzE1NCwxMiBAQAogCiAgIHByaXZhdGUgYnl0ZVtdIHByZXBhcmVIdG1sT3V0cHV0KCkgdGhyb3dzIElPRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24gewogICAgIGZpbmFsIFN0cmluZyBwYWdlTmFtZSA9ICJCZWNvbWVBbnlBY2NvdW50Lmh0bWwiOwotICAgIGZpbmFsIERvY3VtZW50IGRvYyA9IEh0bWxEb21VdGlsLnBhcnNlRmlsZShnZXRDbGFzcygpLCBwYWdlTmFtZSk7CisgICAgRG9jdW1lbnQgZG9jID0gaGVhZGVycy5wYXJzZShnZXRDbGFzcygpLCBwYWdlTmFtZSk7CiAgICAgaWYgKGRvYyA9PSBudWxsKSB7CiAgICAgICB0aHJvdyBuZXcgRmlsZU5vdEZvdW5kRXhjZXB0aW9uKCJObyAiICsgcGFnZU5hbWUgKyAiIGluIHdlYmFwcCIpOwogICAgIH0KICAgICBpZiAoIUlTX0RFVikgewotICAgICAgZmluYWwgRWxlbWVudCBkZXZtb2RlID0gSHRtbERvbVV0aWwuZmluZChkb2MsICJnZXJyaXRfZ3d0ZGV2bW9kZSIpOworICAgICAgZmluYWwgRWxlbWVudCBkZXZtb2RlID0gSHRtbERvbVV0aWwuZmluZChkb2MsICJnd3RkZXZtb2RlIik7CiAgICAgICBpZiAoZGV2bW9kZSAhPSBudWxsKSB7CiAgICAgICAgIGRldm1vZGUuZ2V0UGFyZW50Tm9kZSgpLnJlbW92ZUNoaWxkKGRldm1vZGUpOwogICAgICAgfQpAQCAtMTY2LDcgKzE3Myw3IEBACiAgICAgICAgIFN0cmluZyBkaXNwbGF5TmFtZTsKICAgICAgICAgaWYgKGEuZ2V0VXNlck5hbWUoKSAhPSBudWxsKSB7CiAgICAgICAgICAgZGlzcGxheU5hbWUgPSBhLmdldFVzZXJOYW1lKCk7Ci0gICAgICAgIH0gZWxzZSBpZiAoYS5nZXRGdWxsTmFtZSgpICE9IG51bGwpIHsKKyAgICAgICAgfSBlbHNlIGlmIChhLmdldEZ1bGxOYW1lKCkgIT0gbnVsbCAmJiAhYS5nZXRGdWxsTmFtZSgpLmlzRW1wdHkoKSkgewogICAgICAgICAgIGRpc3BsYXlOYW1lID0gYS5nZXRGdWxsTmFtZSgpOwogICAgICAgICB9IGVsc2UgaWYgKGEuZ2V0UHJlZmVycmVkRW1haWwoKSAhPSBudWxsKSB7CiAgICAgICAgICAgZGlzcGxheU5hbWUgPSBhLmdldFByZWZlcnJlZEVtYWlsKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2JlY29tZS9CZWNvbWVBbnlBY2NvdW50TW9kdWxlLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2JlY29tZS9CZWNvbWVBbnlBY2NvdW50TW9kdWxlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWUyYTQyNQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvYmVjb21lL0JlY29tZUFueUFjY291bnRNb2R1bGUuamF2YQpAQCAtMCwwICsxLDI0IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5iZWNvbWU7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zZXJ2bGV0LlNlcnZsZXRNb2R1bGU7CisKK3B1YmxpYyBjbGFzcyBCZWNvbWVBbnlBY2NvdW50TW9kdWxlIGV4dGVuZHMgU2VydmxldE1vZHVsZSB7CisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmVTZXJ2bGV0cygpIHsKKyAgICBzZXJ2ZSgiL2xvZ2luIiwgIi9sb2dpbi8qIikud2l0aChCZWNvbWVBbnlBY2NvdW50TG9naW5TZXJ2bGV0LmNsYXNzKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cEF1dGhGaWx0ZXIuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0h0dHBBdXRoRmlsdGVyLmphdmEKaW5kZXggZWI4YTc2Yi4uYWRjYTk1ZSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cEF1dGhGaWx0ZXIuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2NvbnRhaW5lci9IdHRwQXV0aEZpbHRlci5qYXZhCkBAIC0xNCwxNCArMTQsMjQgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5hdXRoLmNvbnRhaW5lcjsKIAoraW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLk9iamVjdHMuZmlyc3ROb25OdWxsOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3MuZW1wdHlUb051bGw7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuY29tbW9uLm5ldC5IdHRwSGVhZGVycy5BVVRIT1JJWkFUSU9OOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEV4dGVybmFsSWQuU0NIRU1FX0dFUlJJVDsKKwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLkh0bWxEb21VdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLldlYlNlc3Npb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucmF3Lkhvc3RQYWdlU2VydmxldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEV4dGVybmFsSWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BdXRoQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2VydmVyLkNhY2hlSGVhZGVyczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuc2VydmVyLlJQQ1NlcnZsZXRVdGlsczsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLkJhc2U2NDsKKwogaW1wb3J0IGphdmEuaW8uRmlsZU5vdEZvdW5kRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiBpbXBvcnQgamF2YS5pby5PdXRwdXRTdHJlYW07CkBAIC0yOSw3ICszOSw2IEBACiBpbXBvcnQgamF2YXguc2VydmxldC5GaWx0ZXI7CiBpbXBvcnQgamF2YXguc2VydmxldC5GaWx0ZXJDaGFpbjsKIGltcG9ydCBqYXZheC5zZXJ2bGV0LkZpbHRlckNvbmZpZzsKLWltcG9ydCBqYXZheC5zZXJ2bGV0LlNlcnZsZXRDb250ZXh0OwogaW1wb3J0IGphdmF4LnNlcnZsZXQuU2VydmxldEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZheC5zZXJ2bGV0LlNlcnZsZXRSZXF1ZXN0OwogaW1wb3J0IGphdmF4LnNlcnZsZXQuU2VydmxldFJlc3BvbnNlOwpAQCAtNDgsMTQgKzU3LDE1IEBACiAgKi8KIEBTaW5nbGV0b24KIGNsYXNzIEh0dHBBdXRoRmlsdGVyIGltcGxlbWVudHMgRmlsdGVyIHsKLSAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxXZWJTZXNzaW9uPiB3ZWJTZXNzaW9uOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFdlYlNlc3Npb24+IHNlc3Npb25Qcm92aWRlcjsKICAgcHJpdmF0ZSBmaW5hbCBieXRlW10gc2lnbkluUmF3OwogICBwcml2YXRlIGZpbmFsIGJ5dGVbXSBzaWduSW5HemlwOworICBwcml2YXRlIGZpbmFsIFN0cmluZyBsb2dpbkhlYWRlcjsKIAogICBASW5qZWN0CiAgIEh0dHBBdXRoRmlsdGVyKGZpbmFsIFByb3ZpZGVyPFdlYlNlc3Npb24+IHdlYlNlc3Npb24sCi0gICAgICBmaW5hbCBTZXJ2bGV0Q29udGV4dCBzZXJ2bGV0Q29udGV4dCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICB0aGlzLndlYlNlc3Npb24gPSB3ZWJTZXNzaW9uOworICAgICAgZmluYWwgQXV0aENvbmZpZyBhdXRoQ29uZmlnKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHRoaXMuc2Vzc2lvblByb3ZpZGVyID0gd2ViU2Vzc2lvbjsKIAogICAgIGZpbmFsIFN0cmluZyBwYWdlTmFtZSA9ICJMb2dpblJlZGlyZWN0Lmh0bWwiOwogICAgIGZpbmFsIFN0cmluZyBkb2MgPSBIdG1sRG9tVXRpbC5yZWFkRmlsZShnZXRDbGFzcygpLCBwYWdlTmFtZSk7CkBAIC02NSwxMyArNzUsMTggQEAKIAogICAgIHNpZ25JblJhdyA9IGRvYy5nZXRCeXRlcyhIdG1sRG9tVXRpbC5FTkMpOwogICAgIHNpZ25Jbkd6aXAgPSBIdG1sRG9tVXRpbC5jb21wcmVzcyhzaWduSW5SYXcpOworICAgIGxvZ2luSGVhZGVyID0gZmlyc3ROb25OdWxsKAorICAgICAgICBlbXB0eVRvTnVsbChhdXRoQ29uZmlnLmdldExvZ2luSHR0cEhlYWRlcigpKSwKKyAgICAgICAgQVVUSE9SSVpBVElPTik7CiAgIH0KIAogICBAT3ZlcnJpZGUKICAgcHVibGljIHZvaWQgZG9GaWx0ZXIoZmluYWwgU2VydmxldFJlcXVlc3QgcmVxdWVzdCwKICAgICAgIGZpbmFsIFNlcnZsZXRSZXNwb25zZSByZXNwb25zZSwgZmluYWwgRmlsdGVyQ2hhaW4gY2hhaW4pCiAgICAgICB0aHJvd3MgSU9FeGNlcHRpb24sIFNlcnZsZXRFeGNlcHRpb24gewotICAgIGlmICghd2ViU2Vzc2lvbi5nZXQoKS5pc1NpZ25lZEluKCkpIHsKKyAgICBpZiAoaXNTZXNzaW9uVmFsaWQoKEh0dHBTZXJ2bGV0UmVxdWVzdCkgcmVxdWVzdCkpIHsKKyAgICAgIGNoYWluLmRvRmlsdGVyKHJlcXVlc3QsIHJlc3BvbnNlKTsKKyAgICB9IGVsc2UgewogICAgICAgLy8gTm90IHNpZ25lZCBpbiB5ZXQuIFNpbmNlIHRoZSBicm93c2VyIHN0YXRlIG1pZ2h0IGhhdmUgYW4gYW5jaG9yCiAgICAgICAvLyB0b2tlbiB3aGljaCB3ZSB3YW50IHRvIGNhcHR1cmUgYW5kIGNhcnJ5IHRocm91Z2ggdGhlIGF1dGggcHJvY2VzcwogICAgICAgLy8gd2Ugc2VuZCBiYWNrIEphdmFTY3JpcHQgbm93IHRvIGNhcHR1cmUgdGhhdCwgYW5kIGRvIHRoZSByZWFsIHdvcmsKQEAgLTg3LDkgKzEwMiw3IEBACiAgICAgICAgIHRvc2VuZCA9IHNpZ25JblJhdzsKICAgICAgIH0KIAotICAgICAgcnNwLnNldEhlYWRlcigiRXhwaXJlcyIsICJGcmksIDAxIEphbiAxOTgwIDAwOjAwOjAwIEdNVCIpOwotICAgICAgcnNwLnNldEhlYWRlcigiUHJhZ21hIiwgIm5vLWNhY2hlIik7Ci0gICAgICByc3Auc2V0SGVhZGVyKCJDYWNoZS1Db250cm9sIiwgIm5vLWNhY2hlLCBtdXN0LXJldmFsaWRhdGUiKTsKKyAgICAgIENhY2hlSGVhZGVycy5zZXROb3RDYWNoZWFibGUocnNwKTsKICAgICAgIHJzcC5zZXRDb250ZW50VHlwZSgidGV4dC9odG1sIik7CiAgICAgICByc3Auc2V0Q2hhcmFjdGVyRW5jb2RpbmcoSHRtbERvbVV0aWwuRU5DKTsKICAgICAgIHJzcC5zZXRDb250ZW50TGVuZ3RoKHRvc2VuZC5sZW5ndGgpOwpAQCAtOTksMTMgKzExMiw3MiBAQAogICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgb3V0LmNsb3NlKCk7CiAgICAgICB9Ci0gICAgfSBlbHNlIHsKLSAgICAgIC8vIEFscmVhZHkgc2lnbmVkIGluLCBmb3J3YXJkIHRoZSByZXF1ZXN0LgotICAgICAgLy8KLSAgICAgIGNoYWluLmRvRmlsdGVyKHJlcXVlc3QsIHJlc3BvbnNlKTsKICAgICB9CiAgIH0KIAorICBwcml2YXRlIGJvb2xlYW4gaXNTZXNzaW9uVmFsaWQoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgeworICAgIFdlYlNlc3Npb24gc2Vzc2lvbiA9IHNlc3Npb25Qcm92aWRlci5nZXQoKTsKKyAgICBpZiAoc2Vzc2lvbi5pc1NpZ25lZEluKCkpIHsKKyAgICAgIFN0cmluZyB1c2VyID0gZ2V0UmVtb3RlVXNlcihyZXEpOworICAgICAgcmV0dXJuIHVzZXIgPT0gbnVsbCB8fCBjb3JyZWN0VXNlcih1c2VyLCBzZXNzaW9uKTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBjb3JyZWN0VXNlcihTdHJpbmcgdXNlciwgV2ViU2Vzc2lvbiBzZXNzaW9uKSB7CisgICAgQWNjb3VudEV4dGVybmFsSWQuS2V5IGlkID0gc2Vzc2lvbi5nZXRMYXN0TG9naW5FeHRlcm5hbElkKCk7CisgICAgcmV0dXJuIGlkICE9IG51bGwKKyAgICAgICAgJiYgaWQuZXF1YWxzKG5ldyBBY2NvdW50RXh0ZXJuYWxJZC5LZXkoU0NIRU1FX0dFUlJJVCwgdXNlcikpOworICB9CisKKyAgU3RyaW5nIGdldFJlbW90ZVVzZXIoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgeworICAgIGlmIChBVVRIT1JJWkFUSU9OLmVxdWFscyhsb2dpbkhlYWRlcikpIHsKKyAgICAgIFN0cmluZyB1c2VyID0gZW1wdHlUb051bGwocmVxLmdldFJlbW90ZVVzZXIoKSk7CisgICAgICBpZiAodXNlciAhPSBudWxsKSB7CisgICAgICAgIC8vIFRoZSBjb250YWluZXIgcGVyZm9ybWVkIHRoZSBhdXRoZW50aWNhdGlvbiwgYW5kIGhhcyB0aGUgdXNlcgorICAgICAgICAvLyBpZGVudGl0eSBhbHJlYWR5IGRlY29kZWQgZm9yIHVzLiBIb25vciB0aGF0IGFzIHdlIGhhdmUgYmVlbgorICAgICAgICAvLyBjb25maWd1cmVkIHRvIGhvbm9yIEhUVFAgYXV0aGVudGljYXRpb24uCisgICAgICAgIHJldHVybiB1c2VyOworICAgICAgfQorCisgICAgICAvLyBJZiB0aGUgY29udGFpbmVyIGRpZG4ndCBkbyB0aGUgYXV0aGVudGljYXRpb24gd2UgbWlnaHQKKyAgICAgIC8vIGhhdmUgZG9uZSBpdCBpbiB0aGUgZnJvbnQtZW5kIHdlYiBzZXJ2ZXIuIFRyeSB0byBzcGxpdAorICAgICAgLy8gdGhlIGlkZW50aXR5IG91dCBvZiB0aGUgQXV0aG9yaXphdGlvbiBoZWFkZXIgYW5kIGhvbm9yIGl0LgorICAgICAgLy8KKyAgICAgIFN0cmluZyBhdXRoID0gZW1wdHlUb051bGwocmVxLmdldEhlYWRlcihBVVRIT1JJWkFUSU9OKSk7CisgICAgICBpZiAoYXV0aCA9PSBudWxsKSB7CisgICAgICAgIHJldHVybiBudWxsOworCisgICAgICB9IGVsc2UgaWYgKGF1dGguc3RhcnRzV2l0aCgiQmFzaWMgIikpIHsKKyAgICAgICAgYXV0aCA9IGF1dGguc3Vic3RyaW5nKCJCYXNpYyAiLmxlbmd0aCgpKTsKKyAgICAgICAgYXV0aCA9IG5ldyBTdHJpbmcoQmFzZTY0LmRlY29kZShhdXRoKSk7CisgICAgICAgIGZpbmFsIGludCBjID0gYXV0aC5pbmRleE9mKCc6Jyk7CisgICAgICAgIHJldHVybiBjID4gMCA/IGF1dGguc3Vic3RyaW5nKDAsIGMpIDogbnVsbDsKKworICAgICAgfSBlbHNlIGlmIChhdXRoLnN0YXJ0c1dpdGgoIkRpZ2VzdCAiKSkgeworICAgICAgICBpbnQgdSA9IGF1dGguaW5kZXhPZigidXNlcm5hbWU9XCIiKTsKKyAgICAgICAgaWYgKHUgPD0gMCkgeworICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICB9CisgICAgICAgIGF1dGggPSBhdXRoLnN1YnN0cmluZyh1ICsgMTApOworICAgICAgICBpbnQgZSA9IGF1dGguaW5kZXhPZignIicpOworICAgICAgICByZXR1cm4gZSA+IDAgPyBhdXRoLnN1YnN0cmluZygwLCBhdXRoLmluZGV4T2YoJyInKSkgOiBudWxsOworCisgICAgICB9IGVsc2UgeworICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgIH0KKyAgICB9IGVsc2UgeworICAgICAgLy8gTm9uc3RhbmRhcmQgSFRUUCBoZWFkZXIuIFdlIGhhdmUgYmVlbiB0b2xkIHRvIHRydXN0IHRoaXMKKyAgICAgIC8vIGhlYWRlciBibGluZGx5IGFzLWlzLgorICAgICAgLy8KKyAgICAgIHJldHVybiBlbXB0eVRvTnVsbChyZXEuZ2V0SGVhZGVyKGxvZ2luSGVhZGVyKSk7CisgICAgfQorICB9CisKKyAgU3RyaW5nIGdldExvZ2luSGVhZGVyKCkgeworICAgIHJldHVybiBsb2dpbkhlYWRlcjsKKyAgfQorCiAgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBpbml0KGZpbmFsIEZpbHRlckNvbmZpZyBmaWx0ZXJDb25maWcpIHsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cEF1dGhNb2R1bGUuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0h0dHBBdXRoTW9kdWxlLmphdmEKaW5kZXggNTUzYjFmNC4uZGFhYTdlMiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cEF1dGhNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2NvbnRhaW5lci9IdHRwQXV0aE1vZHVsZS5qYXZhCkBAIC0yMSw2ICsyMSw2IEBACiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmVTZXJ2bGV0cygpIHsKICAgICBmaWx0ZXIoIi8iKS50aHJvdWdoKEh0dHBBdXRoRmlsdGVyLmNsYXNzKTsKLSAgICBzZXJ2ZSgiL2xvZ2luLyoiKS53aXRoKEh0dHBMb2dpblNlcnZsZXQuY2xhc3MpOworICAgIHNlcnZlKCIvbG9naW4iLCAiL2xvZ2luLyoiKS53aXRoKEh0dHBMb2dpblNlcnZsZXQuY2xhc3MpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2NvbnRhaW5lci9IdHRwTG9naW5TZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2NvbnRhaW5lci9IdHRwTG9naW5TZXJ2bGV0LmphdmEKaW5kZXggOWI3ZWFmNS4uNjk2YTU4NSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cExvZ2luU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0h0dHBMb2dpblNlcnZsZXQuamF2YQpAQCAtMTksMTYgKzE5LDE0IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuV2ViU2Vzc2lvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhNZXRob2Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlcXVlc3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlc3VsdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkF1dGhDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zZXJ2ZXIuQ2FjaGVIZWFkZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuQmFzZTY0OwogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CiBpbXBvcnQgb3JnLnczYy5kb20uRG9jdW1lbnQ7CkBAIC01OCwyMyArNTYsMjAgQEAKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9CiAgICAgICBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihIdHRwTG9naW5TZXJ2bGV0LmNsYXNzKTsKIAotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgQVVUSE9SSVpBVElPTiA9ICJBdXRob3JpemF0aW9uIjsKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxXZWJTZXNzaW9uPiB3ZWJTZXNzaW9uOwogICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXI7CiAgIHByaXZhdGUgZmluYWwgQWNjb3VudE1hbmFnZXIgYWNjb3VudE1hbmFnZXI7Ci0gIHByaXZhdGUgZmluYWwgU3RyaW5nIGxvZ2luSGVhZGVyOworICBwcml2YXRlIGZpbmFsIEh0dHBBdXRoRmlsdGVyIGF1dGhGaWx0ZXI7CiAKICAgQEluamVjdAotICBIdHRwTG9naW5TZXJ2bGV0KGZpbmFsIEF1dGhDb25maWcgYXV0aENvbmZpZywKLSAgICAgIGZpbmFsIFByb3ZpZGVyPFdlYlNlc3Npb24+IHdlYlNlc3Npb24sCisgIEh0dHBMb2dpblNlcnZsZXQoZmluYWwgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gd2ViU2Vzc2lvbiwKICAgICAgIEBDYW5vbmljYWxXZWJVcmwgQE51bGxhYmxlIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXIsCi0gICAgICBmaW5hbCBBY2NvdW50TWFuYWdlciBhY2NvdW50TWFuYWdlcikgeworICAgICAgZmluYWwgQWNjb3VudE1hbmFnZXIgYWNjb3VudE1hbmFnZXIsCisgICAgICBmaW5hbCBIdHRwQXV0aEZpbHRlciBhdXRoRmlsdGVyKSB7CiAgICAgdGhpcy53ZWJTZXNzaW9uID0gd2ViU2Vzc2lvbjsKICAgICB0aGlzLnVybFByb3ZpZGVyID0gdXJsUHJvdmlkZXI7CiAgICAgdGhpcy5hY2NvdW50TWFuYWdlciA9IGFjY291bnRNYW5hZ2VyOwotCi0gICAgZmluYWwgU3RyaW5nIGhkciA9IGF1dGhDb25maWcuZ2V0TG9naW5IdHRwSGVhZGVyKCk7Ci0gICAgdGhpcy5sb2dpbkhlYWRlciA9IGhkciAhPSBudWxsICYmICFoZHIuZXF1YWxzKCIiKSA/IGhkciA6IEFVVEhPUklaQVRJT047CisgICAgdGhpcy5hdXRoRmlsdGVyID0gYXV0aEZpbHRlcjsKICAgfQogCiAgIEBPdmVycmlkZQpAQCAtODYsMTkgKzgxLDE2IEBACiAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgcnNwLnNldEhlYWRlcigiRXhwaXJlcyIsICJGcmksIDAxIEphbiAxOTgwIDAwOjAwOjAwIEdNVCIpOwotICAgIHJzcC5zZXRIZWFkZXIoIlByYWdtYSIsICJuby1jYWNoZSIpOwotICAgIHJzcC5zZXRIZWFkZXIoIkNhY2hlLUNvbnRyb2wiLCAibm8tY2FjaGUsIG11c3QtcmV2YWxpZGF0ZSIpOwotCi0gICAgZmluYWwgU3RyaW5nIHVzZXIgPSBnZXRSZW1vdGVVc2VyKHJlcSk7CisgICAgQ2FjaGVIZWFkZXJzLnNldE5vdENhY2hlYWJsZShyc3ApOworICAgIGZpbmFsIFN0cmluZyB1c2VyID0gYXV0aEZpbHRlci5nZXRSZW1vdGVVc2VyKHJlcSk7CiAgICAgaWYgKHVzZXIgPT0gbnVsbCB8fCAiIi5lcXVhbHModXNlcikpIHsKLSAgICAgIGxvZy5lcnJvcigiVW5hYmxlIHRvIGF1dGhlbnRpY2F0ZSB1c2VyIGJ5ICIgKyBsb2dpbkhlYWRlcgorICAgICAgbG9nLmVycm9yKCJVbmFibGUgdG8gYXV0aGVudGljYXRlIHVzZXIgYnkgIiArIGF1dGhGaWx0ZXIuZ2V0TG9naW5IZWFkZXIoKQogICAgICAgICAgICsgIiByZXF1ZXN0IGhlYWRlci4gIENoZWNrIGNvbnRhaW5lciBvciBzZXJ2ZXIgY29uZmlndXJhdGlvbi4iKTsKIAogICAgICAgZmluYWwgRG9jdW1lbnQgZG9jID0gSHRtbERvbVV0aWwucGFyc2VGaWxlKCAvLwogICAgICAgICAgIEh0dHBMb2dpblNlcnZsZXQuY2xhc3MsICJDb25maWd1cmF0aW9uRXJyb3IuaHRtbCIpOwogCi0gICAgICByZXBsYWNlKGRvYywgImxvZ2luSGVhZGVyIiwgbG9naW5IZWFkZXIpOworICAgICAgcmVwbGFjZShkb2MsICJsb2dpbkhlYWRlciIsIGF1dGhGaWx0ZXIuZ2V0TG9naW5IZWFkZXIoKSk7CiAgICAgICByZXBsYWNlKGRvYywgIlNlcnZlck5hbWUiLCByZXEuZ2V0U2VydmVyTmFtZSgpKTsKICAgICAgIHJlcGxhY2UoZG9jLCAiU2VydmVyUG9ydCIsICI6IiArIHJlcS5nZXRTZXJ2ZXJQb3J0KCkpOwogICAgICAgcmVwbGFjZShkb2MsICJDb250ZXh0UGF0aCIsIHJlcS5nZXRDb250ZXh0UGF0aCgpKTsKQEAgLTEzNiw4ICsxMjgsNyBAQAogICAgIH0KICAgICByZHIuYXBwZW5kKHRva2VuKTsKIAotICAgIHdlYlNlc3Npb24uZ2V0KCkubG9naW4oYXJzcCwgQXV0aE1ldGhvZC5DT09LSUUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlIC8qIHBlcnNpc3RlbnQgY29va2llICovKTsKKyAgICB3ZWJTZXNzaW9uLmdldCgpLmxvZ2luKGFyc3AsIHRydWUgLyogcGVyc2lzdGVudCBjb29raWUgKi8pOwogICAgIHJzcC5zZW5kUmVkaXJlY3QocmRyLnRvU3RyaW5nKCkpOwogICB9CiAKQEAgLTE3Myw1MCArMTY0LDQgQEAKICAgICB9CiAgICAgcmV0dXJuIHRva2VuOwogICB9Ci0KLSAgcHJpdmF0ZSBTdHJpbmcgZ2V0UmVtb3RlVXNlcihmaW5hbCBIdHRwU2VydmxldFJlcXVlc3QgcmVxKSB7Ci0gICAgaWYgKEFVVEhPUklaQVRJT04uZXF1YWxzKGxvZ2luSGVhZGVyKSkgewotICAgICAgZmluYWwgU3RyaW5nIHVzZXIgPSByZXEuZ2V0UmVtb3RlVXNlcigpOwotICAgICAgaWYgKHVzZXIgIT0gbnVsbCAmJiAhIiIuZXF1YWxzKHVzZXIpKSB7Ci0gICAgICAgIC8vIFRoZSBjb250YWluZXIgcGVyZm9ybWVkIHRoZSBhdXRoZW50aWNhdGlvbiwgYW5kIGhhcyB0aGUgdXNlcgotICAgICAgICAvLyBpZGVudGl0eSBhbHJlYWR5IGRlY29kZWQgZm9yIHVzLiBIb25vciB0aGF0IGFzIHdlIGhhdmUgYmVlbgotICAgICAgICAvLyBjb25maWd1cmVkIHRvIGhvbm9yIEhUVFAgYXV0aGVudGljYXRpb24uCi0gICAgICAgIC8vCi0gICAgICAgIHJldHVybiB1c2VyOwotICAgICAgfQotCi0gICAgICAvLyBJZiB0aGUgY29udGFpbmVyIGRpZG4ndCBkbyB0aGUgYXV0aGVudGljYXRpb24gd2UgbWlnaHQKLSAgICAgIC8vIGhhdmUgZG9uZSBpdCBpbiB0aGUgZnJvbnQtZW5kIHdlYiBzZXJ2ZXIuIFRyeSB0byBzcGxpdAotICAgICAgLy8gdGhlIGlkZW50aXR5IG91dCBvZiB0aGUgQXV0aG9yaXphdGlvbiBoZWFkZXIgYW5kIGhvbm9yIGl0LgotICAgICAgLy8KLSAgICAgIFN0cmluZyBhdXRoID0gcmVxLmdldEhlYWRlcihBVVRIT1JJWkFUSU9OKTsKLSAgICAgIGlmIChhdXRoID09IG51bGwgfHwgIiIuZXF1YWxzKGF1dGgpKSB7Ci0gICAgICAgIHJldHVybiBudWxsOwotCi0gICAgICB9IGVsc2UgaWYgKGF1dGguc3RhcnRzV2l0aCgiQmFzaWMgIikpIHsKLSAgICAgICAgYXV0aCA9IGF1dGguc3Vic3RyaW5nKCJCYXNpYyAiLmxlbmd0aCgpKTsKLSAgICAgICAgYXV0aCA9IG5ldyBTdHJpbmcoQmFzZTY0LmRlY29kZShhdXRoKSk7Ci0gICAgICAgIGZpbmFsIGludCBjID0gYXV0aC5pbmRleE9mKCc6Jyk7Ci0gICAgICAgIHJldHVybiBjID4gMCA/IGF1dGguc3Vic3RyaW5nKDAsIGMpIDogbnVsbDsKLQotICAgICAgfSBlbHNlIGlmIChhdXRoLnN0YXJ0c1dpdGgoIkRpZ2VzdCAiKSkgewotICAgICAgICBmaW5hbCBpbnQgdSA9IGF1dGguaW5kZXhPZigidXNlcm5hbWU9XCIiKTsKLSAgICAgICAgaWYgKHUgPD0gMCkgewotICAgICAgICAgIHJldHVybiBudWxsOwotICAgICAgICB9Ci0gICAgICAgIGF1dGggPSBhdXRoLnN1YnN0cmluZyh1ICsgMTApOwotICAgICAgICBmaW5hbCBpbnQgZSA9IGF1dGguaW5kZXhPZignIicpOwotICAgICAgICByZXR1cm4gZSA+IDAgPyBhdXRoLnN1YnN0cmluZygwLCBhdXRoLmluZGV4T2YoJyInKSkgOiBudWxsOwotCi0gICAgICB9IGVsc2UgewotICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAgLy8gTm9uc3RhbmRhcmQgSFRUUCBoZWFkZXIuIFdlIGhhdmUgYmVlbiB0b2xkIHRvIHRydXN0IHRoaXMKLSAgICAgIC8vIGhlYWRlciBibGluZGx5IGFzLWlzLgotICAgICAgLy8KLSAgICAgIGZpbmFsIFN0cmluZyB1c2VyID0gcmVxLmdldEhlYWRlcihsb2dpbkhlYWRlcik7Ci0gICAgICByZXR1cm4gdXNlciAhPSBudWxsICYmICEiIi5lcXVhbHModXNlcikgPyB1c2VyIDogbnVsbDsKLSAgICB9Ci0gIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0h0dHBzQ2xpZW50U3NsQ2VydEF1dGhGaWx0ZXIuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0h0dHBzQ2xpZW50U3NsQ2VydEF1dGhGaWx0ZXIuamF2YQppbmRleCBmZjBlYjI5Li5jODkyYzlkIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2NvbnRhaW5lci9IdHRwc0NsaWVudFNzbENlcnRBdXRoRmlsdGVyLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cHNDbGllbnRTc2xDZXJ0QXV0aEZpbHRlci5qYXZhCkBAIC0xNyw3ICsxNyw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuV2ViU2Vzc2lvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhNZXRob2Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlcXVlc3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlc3VsdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CkBAIC00Miw3ICs0MSw3IEBACiBAU2luZ2xldG9uCiBjbGFzcyBIdHRwc0NsaWVudFNzbENlcnRBdXRoRmlsdGVyIGltcGxlbWVudHMgRmlsdGVyIHsKIAotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBQYXR0ZXJuIFJFR0VYX1VTRVJJRCA9IFBhdHRlcm4uY29tcGlsZSgiQ049KFteLF0qKSwuKiIpOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBQYXR0ZXJuIFJFR0VYX1VTRVJJRCA9IFBhdHRlcm4uY29tcGlsZSgiQ049KFteLF0qKSIpOwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0KICAgICBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihIdHRwc0NsaWVudFNzbENlcnRBdXRoRmlsdGVyLmNsYXNzKTsKIApAQCAtNzEsNyArNzAsNyBAQAogICAgIFN0cmluZyBuYW1lID0gY2VydHNbMF0uZ2V0U3ViamVjdEROKCkuZ2V0TmFtZSgpOwogICAgIE1hdGNoZXIgbSA9IFJFR0VYX1VTRVJJRC5tYXRjaGVyKG5hbWUpOwogICAgIFN0cmluZyB1c2VyTmFtZTsKLSAgICBpZiAobS5tYXRjaGVzKCkpIHsKKyAgICBpZiAobS5maW5kKCkpIHsKICAgICAgIHVzZXJOYW1lID0gbS5ncm91cCgxKTsKICAgICB9IGVsc2UgewogICAgICAgdGhyb3cgbmV3IFNlcnZsZXRFeGNlcHRpb24oIkNvdWxkbid0IGV4dHJhY3QgdXNlcm5hbWUgZnJvbSB5b3VyIGNlcnRpZmljYXRlIik7CkBAIC04NSw3ICs4NCw3IEBACiAgICAgICBsb2cuZXJyb3IoZXJyLCBlKTsKICAgICAgIHRocm93IG5ldyBTZXJ2bGV0RXhjZXB0aW9uKGVyciwgZSk7CiAgICAgfQotICAgIHdlYlNlc3Npb24uZ2V0KCkubG9naW4oYXJzcCwgQXV0aE1ldGhvZC5DT09LSUUsIHRydWUpOworICAgIHdlYlNlc3Npb24uZ2V0KCkubG9naW4oYXJzcCwgdHJ1ZSk7CiAgICAgY2hhaW4uZG9GaWx0ZXIocmVxLCByc3ApOwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0h0dHBzQ2xpZW50U3NsQ2VydExvZ2luU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cHNDbGllbnRTc2xDZXJ0TG9naW5TZXJ2bGV0LmphdmEKaW5kZXggYzVmYTFiYS4uZDk1ODViOSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cHNDbGllbnRTc2xDZXJ0TG9naW5TZXJ2bGV0LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cHNDbGllbnRTc2xDZXJ0TG9naW5TZXJ2bGV0LmphdmEKQEAgLTE2LDYgKzE2LDcgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zZXJ2ZXIuQ2FjaGVIZWFkZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CkBAIC01NSw5ICs1Niw3IEBACiAgICAgcmRyLmFwcGVuZCgnIycpOwogICAgIHJkci5hcHBlbmQoZ2V0VG9rZW4ocmVxKSk7CiAKLSAgICByc3Auc2V0SGVhZGVyKCJFeHBpcmVzIiwgIkZyaSwgMDEgSmFuIDE5ODAgMDA6MDA6MDAgR01UIik7Ci0gICAgcnNwLnNldEhlYWRlcigiUHJhZ21hIiwgIm5vLWNhY2hlIik7Ci0gICAgcnNwLnNldEhlYWRlcigiQ2FjaGUtQ29udHJvbCIsICJuby1jYWNoZSwgbXVzdC1yZXZhbGlkYXRlIik7CisgICAgQ2FjaGVIZWFkZXJzLnNldE5vdENhY2hlYWJsZShyc3ApOwogICAgIHJzcC5zZW5kUmVkaXJlY3QocmRyLnRvU3RyaW5nKCkpOwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0h0dHBzQ2xpZW50U3NsQ2VydE1vZHVsZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cHNDbGllbnRTc2xDZXJ0TW9kdWxlLmphdmEKaW5kZXggN2QzMmFjOC4uZWRmNTAxYiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cHNDbGllbnRTc2xDZXJ0TW9kdWxlLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvSHR0cHNDbGllbnRTc2xDZXJ0TW9kdWxlLmphdmEKQEAgLTIxLDYgKzIxLDYgQEAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZVNlcnZsZXRzKCkgewogICAgIGZpbHRlcigiLyIpLnRocm91Z2goSHR0cHNDbGllbnRTc2xDZXJ0QXV0aEZpbHRlci5jbGFzcyk7Ci0gICAgc2VydmUoIi9sb2dpbi8qIikud2l0aChIdHRwc0NsaWVudFNzbENlcnRMb2dpblNlcnZsZXQuY2xhc3MpOworICAgIHNlcnZlKCIvbG9naW4iLCAiL2xvZ2luLyoiKS53aXRoKEh0dHBzQ2xpZW50U3NsQ2VydExvZ2luU2VydmxldC5jbGFzcyk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvbGRhcC9MZGFwQXV0aE1vZHVsZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9sZGFwL0xkYXBBdXRoTW9kdWxlLmphdmEKaW5kZXggYzQ2ZWRjMy4uZTc2NjNiYiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9sZGFwL0xkYXBBdXRoTW9kdWxlLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9sZGFwL0xkYXBBdXRoTW9kdWxlLmphdmEKQEAgLTE0LDIwICsxNCwxMiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLmF1dGgubGRhcDsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5ScGNTZXJ2bGV0TW9kdWxlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5VaVJwY01vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zZXJ2bGV0LlNlcnZsZXRNb2R1bGU7CiAKLS8qKiBSUEMgc3VwcG9ydCByZWxhdGVkIHRvIHVzZXJuYW1lL3Bhc3N3b3JkIExEQVAgYXV0aGVudGljYXRpb24uICovCisvKiogQ29uZmlndXJlIHVzZXJuYW1lL3Bhc3N3b3JkIExEQVAgYXV0aGVudGljYXRpb24uICovCiBwdWJsaWMgY2xhc3MgTGRhcEF1dGhNb2R1bGUgZXh0ZW5kcyBTZXJ2bGV0TW9kdWxlIHsKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZVNlcnZsZXRzKCkgewotICAgIHNlcnZlKCIvbG9naW4vKiIpLndpdGgoTG9naW5SZWRpcmVjdFNlcnZsZXQuY2xhc3MpOwotICAgIGluc3RhbGwobmV3IFJwY1NlcnZsZXRNb2R1bGUoVWlScGNNb2R1bGUuUFJFRklYKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZVNlcnZsZXRzKCkgewotICAgICAgICBycGMoVXNlclBhc3NBdXRoU2VydmljZUltcGwuY2xhc3MpOwotICAgICAgfQotICAgIH0pOworICAgIHNlcnZlKCIvbG9naW4iLCAiL2xvZ2luLyoiKS53aXRoKExkYXBMb2dpblNlcnZsZXQuY2xhc3MpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2xkYXAvTGRhcExvZ2luU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9sZGFwL0xkYXBMb2dpblNlcnZsZXQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZmFlODZjCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9sZGFwL0xkYXBMb2dpblNlcnZsZXQuamF2YQpAQCAtMCwwICsxLDE2OSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLmF1dGgubGRhcDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5IdG1sRG9tVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5XZWJTZXNzaW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnRlbXBsYXRlLlNpdGVIZWFkZXJGb290ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50TWFuYWdlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50VXNlck5hbWVFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlcXVlc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aC5BdXRoZW50aWNhdGlvblVuYXZhaWxhYmxlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ2Fub25pY2FsV2ViVXJsOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2VydmVyLkNhY2hlSGVhZGVyczsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworCitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKK2ltcG9ydCBvcmcudzNjLmRvbS5Eb2N1bWVudDsKK2ltcG9ydCBvcmcudzNjLmRvbS5FbGVtZW50OworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKKworaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CitpbXBvcnQgamF2YXguc2VydmxldC5TZXJ2bGV0RXhjZXB0aW9uOworaW1wb3J0IGphdmF4LnNlcnZsZXQuU2VydmxldE91dHB1dFN0cmVhbTsKK2ltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXQ7CitpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVxdWVzdDsKK2ltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZTsKKworLyoqIEhhbmRsZXMgdXNlcm5hbWUvcGFzc3dvcmQgYmFzZWQgYXV0aGVudGljYXRpb24gYWdhaW5zdCB0aGUgZGlyZWN0b3J5LiAqLworQFN1cHByZXNzV2FybmluZ3MoInNlcmlhbCIpCitAU2luZ2xldG9uCitjbGFzcyBMZGFwTG9naW5TZXJ2bGV0IGV4dGVuZHMgSHR0cFNlcnZsZXQgeworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeQorICAgICAgLmdldExvZ2dlcihMZGFwTG9naW5TZXJ2bGV0LmNsYXNzKTsKKworICBwcml2YXRlIGZpbmFsIEFjY291bnRNYW5hZ2VyIGFjY291bnRNYW5hZ2VyOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFdlYlNlc3Npb24+IHdlYlNlc3Npb247CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8U3RyaW5nPiB1cmxQcm92aWRlcjsKKyAgcHJpdmF0ZSBmaW5hbCBTaXRlSGVhZGVyRm9vdGVyIGhlYWRlcnM7CisKKyAgQEluamVjdAorICBMZGFwTG9naW5TZXJ2bGV0KEFjY291bnRNYW5hZ2VyIGFjY291bnRNYW5hZ2VyLAorICAgICAgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gd2ViU2Vzc2lvbiwKKyAgICAgIEBDYW5vbmljYWxXZWJVcmwgQE51bGxhYmxlIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXIsCisgICAgICBTaXRlSGVhZGVyRm9vdGVyIGhlYWRlcnMpIHsKKyAgICB0aGlzLmFjY291bnRNYW5hZ2VyID0gYWNjb3VudE1hbmFnZXI7CisgICAgdGhpcy53ZWJTZXNzaW9uID0gd2ViU2Vzc2lvbjsKKyAgICB0aGlzLnVybFByb3ZpZGVyID0gdXJsUHJvdmlkZXI7CisgICAgdGhpcy5oZWFkZXJzID0gaGVhZGVyczsKKworICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkodXJsUHJvdmlkZXIuZ2V0KCkpKSB7CisgICAgICBsb2cuZXJyb3IoImdlcnJpdC5jYW5vbmljYWxXZWJVcmwgbXVzdCBiZSBzZXQgaW4gZ2Vycml0LmNvbmZpZyIpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBzZW5kRm9ybShIdHRwU2VydmxldFJlcXVlc3QgcmVxLCBIdHRwU2VydmxldFJlc3BvbnNlIHJlcywKKyAgICAgIEBOdWxsYWJsZSBTdHJpbmcgZXJyb3JNZXNzYWdlKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIFN0cmluZyBzZWxmID0gcmVxLmdldFJlcXVlc3RVUkkoKTsKKyAgICBTdHJpbmcgY2FuY2VsID0gT2JqZWN0cy5maXJzdE5vbk51bGwodXJsUHJvdmlkZXIuZ2V0KCksICIvIik7CisgICAgU3RyaW5nIHRva2VuID0gZ2V0VG9rZW4ocmVxKTsKKyAgICBpZiAoIXRva2VuLmVxdWFscygiLyIpKSB7CisgICAgICBjYW5jZWwgKz0gIiMiICsgdG9rZW47CisgICAgfQorCisgICAgRG9jdW1lbnQgZG9jID0gaGVhZGVycy5wYXJzZShMZGFwTG9naW5TZXJ2bGV0LmNsYXNzLCAiTG9naW5Gb3JtLmh0bWwiKTsKKyAgICBIdG1sRG9tVXRpbC5maW5kKGRvYywgImhvc3ROYW1lIikuc2V0VGV4dENvbnRlbnQocmVxLmdldFNlcnZlck5hbWUoKSk7CisgICAgSHRtbERvbVV0aWwuZmluZChkb2MsICJsb2dpbl9mb3JtIikuc2V0QXR0cmlidXRlKCJhY3Rpb24iLCBzZWxmKTsKKyAgICBIdG1sRG9tVXRpbC5maW5kKGRvYywgImNhbmNlbF9saW5rIikuc2V0QXR0cmlidXRlKCJocmVmIiwgY2FuY2VsKTsKKworICAgIEVsZW1lbnQgZW1zZyA9IEh0bWxEb21VdGlsLmZpbmQoZG9jLCAiZXJyb3JfbWVzc2FnZSIpOworICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkoZXJyb3JNZXNzYWdlKSkgeworICAgICAgZW1zZy5nZXRQYXJlbnROb2RlKCkucmVtb3ZlQ2hpbGQoZW1zZyk7CisgICAgfSBlbHNlIHsKKyAgICAgIGVtc2cuc2V0VGV4dENvbnRlbnQoZXJyb3JNZXNzYWdlKTsKKyAgICB9CisKKyAgICBieXRlW10gYmluID0gSHRtbERvbVV0aWwudG9VVEY4KGRvYyk7CisgICAgcmVzLnNldFN0YXR1cyhIdHRwU2VydmxldFJlc3BvbnNlLlNDX1VOQVVUSE9SSVpFRCk7CisgICAgcmVzLnNldENvbnRlbnRUeXBlKCJ0ZXh0L2h0bWwiKTsKKyAgICByZXMuc2V0Q2hhcmFjdGVyRW5jb2RpbmcoIlVURi04Iik7CisgICAgcmVzLnNldENvbnRlbnRMZW5ndGgoYmluLmxlbmd0aCk7CisgICAgU2VydmxldE91dHB1dFN0cmVhbSBvdXQgPSByZXMuZ2V0T3V0cHV0U3RyZWFtKCk7CisgICAgdHJ5IHsKKyAgICAgIG91dC53cml0ZShiaW4pOworICAgIH0gZmluYWxseSB7CisgICAgICBvdXQuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgZG9HZXQoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMpCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHNlbmRGb3JtKHJlcSwgcmVzLCBudWxsKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBkb1Bvc3QoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMpCisgICAgICB0aHJvd3MgU2VydmxldEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIFN0cmluZyB1c2VybmFtZSA9IFN0cmluZ3MubnVsbFRvRW1wdHkocmVxLmdldFBhcmFtZXRlcigidXNlcm5hbWUiKSkudHJpbSgpOworICAgIFN0cmluZyBwYXNzd29yZCA9IFN0cmluZ3MubnVsbFRvRW1wdHkocmVxLmdldFBhcmFtZXRlcigicGFzc3dvcmQiKSk7CisgICAgU3RyaW5nIHJlbWVtYmVyID0gU3RyaW5ncy5udWxsVG9FbXB0eShyZXEuZ2V0UGFyYW1ldGVyKCJyZW1lbWJlcm1lIikpOworICAgIGlmICh1c2VybmFtZS5pc0VtcHR5KCkgfHwgcGFzc3dvcmQuaXNFbXB0eSgpKSB7CisgICAgICBzZW5kRm9ybShyZXEsIHJlcywgIkludmFsaWQgdXNlcm5hbWUgb3IgcGFzc3dvcmQuIik7CisgICAgICByZXR1cm47CisgICAgfQorCisgICAgQXV0aFJlcXVlc3QgYXJlcSA9IEF1dGhSZXF1ZXN0LmZvclVzZXIodXNlcm5hbWUpOworICAgIGFyZXEuc2V0UGFzc3dvcmQocGFzc3dvcmQpOworCisgICAgQXV0aFJlc3VsdCBhcmVzOworICAgIHRyeSB7CisgICAgICBhcmVzID0gYWNjb3VudE1hbmFnZXIuYXV0aGVudGljYXRlKGFyZXEpOworICAgIH0gY2F0Y2ggKEFjY291bnRVc2VyTmFtZUV4Y2VwdGlvbiBlKSB7CisgICAgICBzZW5kRm9ybShyZXEsIHJlcywgZS5nZXRNZXNzYWdlKCkpOworICAgICAgcmV0dXJuOworICAgIH0gY2F0Y2ggKEF1dGhlbnRpY2F0aW9uVW5hdmFpbGFibGVFeGNlcHRpb24gZSkgeworICAgICAgc2VuZEZvcm0ocmVxLCByZXMsICJBdXRoZW50aWNhdGlvbiB1bmF2YWlsYWJsZSBhdCB0aGlzIHRpbWUuIik7CisgICAgICByZXR1cm47CisgICAgfSBjYXRjaCAoQWNjb3VudEV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuaW5mbyhTdHJpbmcuZm9ybWF0KCInJXMnIGZhaWxlZCB0byBzaWduIGluOiAlcyIsIHVzZXJuYW1lLCBlLmdldE1lc3NhZ2UoKSkpOworICAgICAgc2VuZEZvcm0ocmVxLCByZXMsICJJbnZhbGlkIHVzZXJuYW1lIG9yIHBhc3N3b3JkLiIpOworICAgICAgcmV0dXJuOworICAgIH0gY2F0Y2ggKFJ1bnRpbWVFeGNlcHRpb24gZSkgeworICAgICAgbG9nLmVycm9yKCJMREFQIGF1dGhlbnRpY2F0aW9uIGZhaWxlZCIsIGUpOworICAgICAgc2VuZEZvcm0ocmVxLCByZXMsICJBdXRoZW50aWNhdGlvbiB1bmF2YWlsYWJsZSBhdCB0aGlzIHRpbWUuIik7CisgICAgICByZXR1cm47CisgICAgfQorCisgICAgU3RyaW5nIHRva2VuID0gZ2V0VG9rZW4ocmVxKTsKKyAgICBTdHJpbmdCdWlsZGVyIGRlc3QgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIGRlc3QuYXBwZW5kKHVybFByb3ZpZGVyLmdldCgpKTsKKyAgICBkZXN0LmFwcGVuZCgnIycpOworICAgIGRlc3QuYXBwZW5kKHRva2VuKTsKKworICAgIENhY2hlSGVhZGVycy5zZXROb3RDYWNoZWFibGUocmVzKTsKKyAgICB3ZWJTZXNzaW9uLmdldCgpLmxvZ2luKGFyZXMsICIxIi5lcXVhbHMocmVtZW1iZXIpKTsKKyAgICByZXMuc2VuZFJlZGlyZWN0KGRlc3QudG9TdHJpbmcoKSk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZ2V0VG9rZW4oZmluYWwgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgeworICAgIFN0cmluZyB0b2tlbiA9IHJlcS5nZXRQYXRoSW5mbygpOworICAgIGlmICh0b2tlbiA9PSBudWxsIHx8IHRva2VuLmlzRW1wdHkoKSkgeworICAgICAgdG9rZW4gPSBQYWdlTGlua3MuTUlORTsKKyAgICB9IGVsc2UgaWYgKCF0b2tlbi5zdGFydHNXaXRoKCIvIikpIHsKKyAgICAgIHRva2VuID0gIi8iICsgdG9rZW47CisgICAgfQorICAgIHJldHVybiB0b2tlbjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9sZGFwL0xvZ2luUmVkaXJlY3RTZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2xkYXAvTG9naW5SZWRpcmVjdFNlcnZsZXQuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZGE2ZTIyNy4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2xkYXAvTG9naW5SZWRpcmVjdFNlcnZsZXQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDg1ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5hdXRoLmxkYXA7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUGFnZUxpbmtzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLlNpZ25Jbk1vZGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuV2ViU2Vzc2lvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOwotCi1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLQotaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7Ci1pbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0OwotaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlcXVlc3Q7Ci1pbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2U7Ci0KLS8qKgotICogU2VydmxldCBib3VuZCB0byB7QGNvZGUgL2xvZ2luLyp9IHRvIHJlZGlyZWN0IGFmdGVyIHVzZXIvcGFzcyBzaWduLWluLgotICogPHA+Ci0gKiBUaGlzIHNlcnZsZXQgaXMgcmVxdWlyZWQgYmVjYXVzZSB1c2VyIGF1dGhlbnRpY2F0aW9uIGlzIGRvbmUgb3ZlciBSUEMsIGJ1dCBpZgotICogdGhlIFJQQyBpcyBzdWNjZXNzZnVsIHdlIG5lZWQgdG8gZm9yY2UgdGhlIGhvc3QgcGFnZSB0byBmdWxseSByZWxvYWQgdG8gcGljawotICogdXAgdGhlIGFjY291bnQgaW5mb3JtYXRpb24sIGFzIHdlIGRvbid0IHN1cHBvcnQgdXBkYXRpbmcgdGhlIFVJIG9uIHRoZSBmbHkKLSAqIGFmdGVyIGEgc2lnbi1pbi4KLSAqLwotQFNpbmdsZXRvbgotY2xhc3MgTG9naW5SZWRpcmVjdFNlcnZsZXQgZXh0ZW5kcyBIdHRwU2VydmxldCB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwotCi0gIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gd2ViU2Vzc2lvbjsKLSAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyOwotCi0gIEBJbmplY3QKLSAgTG9naW5SZWRpcmVjdFNlcnZsZXQoZmluYWwgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gd2ViU2Vzc2lvbiwKLSAgICAgIEBDYW5vbmljYWxXZWJVcmwgQE51bGxhYmxlIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXIpIHsKLSAgICB0aGlzLndlYlNlc3Npb24gPSB3ZWJTZXNzaW9uOwotICAgIHRoaXMudXJsUHJvdmlkZXIgPSB1cmxQcm92aWRlcjsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwcm90ZWN0ZWQgdm9pZCBkb0dldChmaW5hbCBIdHRwU2VydmxldFJlcXVlc3QgcmVxLAotICAgICAgZmluYWwgSHR0cFNlcnZsZXRSZXNwb25zZSByc3ApIHRocm93cyBJT0V4Y2VwdGlvbiB7Ci0gICAgZmluYWwgU3RyaW5nIHRva2VuOwotICAgIGlmICh3ZWJTZXNzaW9uLmdldCgpLmlzU2lnbmVkSW4oKSkgewotICAgICAgdG9rZW4gPSBnZXRUb2tlbihyZXEpOwotICAgIH0gZWxzZSB7Ci0gICAgICBmaW5hbCBTdHJpbmcgbXNnID0gIlNlc3Npb24gY29va2llIG5vdCBhdmFpbGFibGUuIjsKLSAgICAgIHRva2VuID0gIi9TaWduSW5GYWlsdXJlLCIgKyBTaWduSW5Nb2RlLlNJR05fSU4gKyAiLCIgKyBtc2c7Ci0gICAgfQotCi0gICAgZmluYWwgU3RyaW5nQnVpbGRlciByZHIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgIHJkci5hcHBlbmQodXJsUHJvdmlkZXIuZ2V0KCkpOwotICAgIHJkci5hcHBlbmQoJyMnKTsKLSAgICByZHIuYXBwZW5kKHRva2VuKTsKLQotICAgIHJzcC5zZXRIZWFkZXIoIkV4cGlyZXMiLCAiRnJpLCAwMSBKYW4gMTk4MCAwMDowMDowMCBHTVQiKTsKLSAgICByc3Auc2V0SGVhZGVyKCJQcmFnbWEiLCAibm8tY2FjaGUiKTsKLSAgICByc3Auc2V0SGVhZGVyKCJDYWNoZS1Db250cm9sIiwgIm5vLWNhY2hlLCBtdXN0LXJldmFsaWRhdGUiKTsKLSAgICByc3Auc2VuZFJlZGlyZWN0KHJkci50b1N0cmluZygpKTsKLSAgfQotCi0gIHByaXZhdGUgU3RyaW5nIGdldFRva2VuKGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEpIHsKLSAgICBTdHJpbmcgdG9rZW4gPSByZXEuZ2V0UGF0aEluZm8oKTsKLSAgICBpZiAodG9rZW4gPT0gbnVsbCB8fCB0b2tlbi5pc0VtcHR5KCkpIHsKLSAgICAgIHRva2VuID0gUGFnZUxpbmtzLk1JTkU7Ci0gICAgfSBlbHNlIGlmICghdG9rZW4uc3RhcnRzV2l0aCgiLyIpKSB7Ci0gICAgICB0b2tlbiA9ICIvIiArIHRva2VuOwotICAgIH0KLSAgICByZXR1cm4gdG9rZW47Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvbGRhcC9Vc2VyUGFzc0F1dGhTZXJ2aWNlSW1wbC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9sZGFwL1VzZXJQYXNzQXV0aFNlcnZpY2VJbXBsLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDM0OGVjYmIuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9sZGFwL1VzZXJQYXNzQXV0aFNlcnZpY2VJbXBsLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw5NCArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5sZGFwOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGgudXNlcnBhc3MuTG9naW5SZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGgudXNlcnBhc3MuVXNlclBhc3NBdXRoU2VydmljZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5XZWJTZXNzaW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BdXRoVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50RXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRVc2VyTmFtZUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BdXRoTWV0aG9kOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhSZXF1ZXN0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGguQXV0aGVudGljYXRpb25VbmF2YWlsYWJsZUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkF1dGhDb25maWc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKLQotaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7Ci1pbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7Ci0KLWNsYXNzIFVzZXJQYXNzQXV0aFNlcnZpY2VJbXBsIGltcGxlbWVudHMgVXNlclBhc3NBdXRoU2VydmljZSB7Ci0gIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gd2ViU2Vzc2lvbjsKLSAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50TWFuYWdlciBhY2NvdW50TWFuYWdlcjsKLSAgcHJpdmF0ZSBmaW5hbCBBdXRoVHlwZSBhdXRoVHlwZTsKLQotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeQotICAgICAgLmdldExvZ2dlcihVc2VyUGFzc0F1dGhTZXJ2aWNlSW1wbC5jbGFzcyk7Ci0KLSAgQEluamVjdAotICBVc2VyUGFzc0F1dGhTZXJ2aWNlSW1wbChmaW5hbCBQcm92aWRlcjxXZWJTZXNzaW9uPiB3ZWJTZXNzaW9uLAotICAgICAgZmluYWwgQWNjb3VudE1hbmFnZXIgYWNjb3VudE1hbmFnZXIsIGZpbmFsIEF1dGhDb25maWcgYXV0aENvbmZpZykgewotICAgIHRoaXMud2ViU2Vzc2lvbiA9IHdlYlNlc3Npb247Ci0gICAgdGhpcy5hY2NvdW50TWFuYWdlciA9IGFjY291bnRNYW5hZ2VyOwotICAgIHRoaXMuYXV0aFR5cGUgPSBhdXRoQ29uZmlnLmdldEF1dGhUeXBlKCk7Ci0gIH0KLQotICBAT3ZlcnJpZGUKLSAgcHVibGljIHZvaWQgYXV0aGVudGljYXRlKFN0cmluZyB1c2VybmFtZSwgZmluYWwgU3RyaW5nIHBhc3N3b3JkLAotICAgICAgZmluYWwgQXN5bmNDYWxsYmFjazxMb2dpblJlc3VsdD4gY2FsbGJhY2spIHsKLSAgICBMb2dpblJlc3VsdCByZXN1bHQgPSBuZXcgTG9naW5SZXN1bHQoYXV0aFR5cGUpOwotICAgIGlmICh1c2VybmFtZSA9PSBudWxsIHx8ICIiLmVxdWFscyh1c2VybmFtZS50cmltKCkpIC8vCi0gICAgICAgIHx8IHBhc3N3b3JkID09IG51bGwgfHwgIiIuZXF1YWxzKHBhc3N3b3JkKSkgewotICAgICAgcmVzdWx0LnNldEVycm9yKExvZ2luUmVzdWx0LkVycm9yLklOVkFMSURfTE9HSU4pOwotICAgICAgY2FsbGJhY2sub25TdWNjZXNzKHJlc3VsdCk7Ci0gICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgdXNlcm5hbWUgPSB1c2VybmFtZS50cmltKCk7Ci0KLSAgICBmaW5hbCBBdXRoUmVxdWVzdCByZXEgPSBBdXRoUmVxdWVzdC5mb3JVc2VyKHVzZXJuYW1lKTsKLSAgICByZXEuc2V0UGFzc3dvcmQocGFzc3dvcmQpOwotCi0gICAgZmluYWwgQXV0aFJlc3VsdCByZXM7Ci0gICAgdHJ5IHsKLSAgICAgIHJlcyA9IGFjY291bnRNYW5hZ2VyLmF1dGhlbnRpY2F0ZShyZXEpOwotICAgIH0gY2F0Y2ggKEFjY291bnRVc2VyTmFtZUV4Y2VwdGlvbiBlKSB7Ci0gICAgICAvLyBlbnRlcmVkIHVzZXIgbmFtZSBhbmQgcGFzc3dvcmQgd2VyZSBjb3JyZWN0LCBidXQgdXNlciBuYW1lIGNvdWxkIG5vdCBiZQotICAgICAgLy8gc2V0IGZvciB0aGUgbmV3bHkgY3JlYXRlZCBhY2NvdW50IGFuZCB0aGlzIGlzIHdoeSB0aGUgbG9naW4gZmFpbHMsCi0gICAgICAvLyBlcnJvciBzY3JlZW4gd2l0aCBlcnJvciBtZXNzYWdlIHNob3VsZCBiZSBzaG93biB0byB0aGUgdXNlcgotICAgICAgY2FsbGJhY2sub25GYWlsdXJlKGUpOwotICAgICAgcmV0dXJuOwotICAgIH0gY2F0Y2ggKEF1dGhlbnRpY2F0aW9uVW5hdmFpbGFibGVFeGNlcHRpb24gZSkgewotICAgICAgcmVzdWx0LnNldEVycm9yKExvZ2luUmVzdWx0LkVycm9yLkFVVEhFTlRJQ0FUSU9OX1VOQVZBSUxBQkxFKTsKLSAgICAgIGNhbGxiYWNrLm9uU3VjY2VzcyhyZXN1bHQpOwotICAgICAgcmV0dXJuOwotICAgIH0gY2F0Y2ggKEFjY291bnRFeGNlcHRpb24gZSkgewotICAgICAgbG9nLmluZm8oU3RyaW5nLmZvcm1hdCgiJyVzJyBmYWlsZWQgdG8gc2lnbiBpbjogJXMiLCB1c2VybmFtZSwgZS5nZXRNZXNzYWdlKCkpKTsKLSAgICAgIHJlc3VsdC5zZXRFcnJvcihMb2dpblJlc3VsdC5FcnJvci5JTlZBTElEX0xPR0lOKTsKLSAgICAgIGNhbGxiYWNrLm9uU3VjY2VzcyhyZXN1bHQpOwotICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIHJlc3VsdC5zdWNjZXNzID0gdHJ1ZTsKLSAgICByZXN1bHQuaXNOZXcgPSByZXMuaXNOZXcoKTsKLSAgICB3ZWJTZXNzaW9uLmdldCgpLmxvZ2luKHJlcywgQXV0aE1ldGhvZC5QQVNTV09SRCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIHRydWUgLyogcGVyc2lzdGVudCBjb29raWUgKi8pOwotICAgIGNhbGxiYWNrLm9uU3VjY2VzcyhyZXN1bHQpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9naXR3ZWIvR2l0TG9nb1NlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2dpdHdlYi9HaXRMb2dvU2VydmxldC5qYXZhCmluZGV4IDViYTFmMDkuLjQxYWE1NTIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2dpdHdlYi9HaXRMb2dvU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2dpdHdlYi9HaXRMb2dvU2VydmxldC5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLmdpdHdlYjsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLkdpdFdlYkNvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNlcnZlci5DYWNoZUhlYWRlcnM7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKIApAQCAtMzMsMTEgKzM0LDYgQEAKIEBTdXBwcmVzc1dhcm5pbmdzKCJzZXJpYWwiKQogQFNpbmdsZXRvbgogY2xhc3MgR2l0TG9nb1NlcnZsZXQgZXh0ZW5kcyBIdHRwU2VydmxldCB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgTUFYX0FHRSA9Ci0gICAgICBUaW1lVW5pdC5NSUxMSVNFQ09ORFMuY29udmVydCg1LCBUaW1lVW5pdC5NSU5VVEVTKTsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIENBQ0hFX0NUUkwgPQotICAgICAgInB1YmxpYywgbWF4LWFnZT0iICsgKE1BWF9BR0UgLyAxMDAwTCk7Ci0KICAgcHJpdmF0ZSBmaW5hbCBsb25nIG1vZGlmaWVkOwogICBwcml2YXRlIGZpbmFsIGJ5dGVbXSByYXc7CiAKQEAgLTYwLDE2ICs1NiwxOCBAQAogICB9CiAKICAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCBsb25nIGdldExhc3RNb2RpZmllZChmaW5hbCBIdHRwU2VydmxldFJlcXVlc3QgcmVxKSB7CisgICAgcmV0dXJuIG1vZGlmaWVkOworICB9CisKKyAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGRvR2V0KGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCiAgICAgICBmaW5hbCBIdHRwU2VydmxldFJlc3BvbnNlIHJzcCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICBpZiAocmF3ICE9IG51bGwpIHsKLSAgICAgIGZpbmFsIGxvbmcgbm93ID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CiAgICAgICByc3Auc2V0Q29udGVudFR5cGUoImltYWdlL3BuZyIpOwogICAgICAgcnNwLnNldENvbnRlbnRMZW5ndGgocmF3Lmxlbmd0aCk7Ci0gICAgICByc3Auc2V0SGVhZGVyKCJDYWNoZS1Db250cm9sIiwgQ0FDSEVfQ1RSTCk7Ci0gICAgICByc3Auc2V0RGF0ZUhlYWRlcigiRGF0ZSIsIG5vdyk7Ci0gICAgICByc3Auc2V0RGF0ZUhlYWRlcigiRXhwaXJlcyIsIG5vdyArIE1BWF9BR0UpOwogICAgICAgcnNwLnNldERhdGVIZWFkZXIoIkxhc3QtTW9kaWZpZWQiLCBtb2RpZmllZCk7CisgICAgICBDYWNoZUhlYWRlcnMuc2V0Q2FjaGVhYmxlKHJlcSwgcnNwLCA1LCBUaW1lVW5pdC5NSU5VVEVTKTsKIAogICAgICAgZmluYWwgU2VydmxldE91dHB1dFN0cmVhbSBvcyA9IHJzcC5nZXRPdXRwdXRTdHJlYW0oKTsKICAgICAgIHRyeSB7CkBAIC03OCw2ICs3Niw3IEBACiAgICAgICAgIG9zLmNsb3NlKCk7CiAgICAgICB9CiAgICAgfSBlbHNlIHsKKyAgICAgIENhY2hlSGVhZGVycy5zZXROb3RDYWNoZWFibGUocnNwKTsKICAgICAgIHJzcC5zZW5kRXJyb3IoSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19OT1RfRk9VTkQpOwogICAgIH0KICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvZ2l0d2ViL0dpdFdlYkNzc1NlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2dpdHdlYi9HaXRXZWJDc3NTZXJ2bGV0LmphdmEKaW5kZXggZTM5Nzk2MS4uZGNjYTEwNiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvZ2l0d2ViL0dpdFdlYkNzc1NlcnZsZXQuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9naXR3ZWIvR2l0V2ViQ3NzU2VydmxldC5qYXZhCkBAIC0xNyw2ICsxNyw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuR2l0V2ViQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLkh0bWxEb21VdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2VydmVyLkNhY2hlSGVhZGVyczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuc2VydmVyLlJQQ1NlcnZsZXRVdGlsczsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOwpAQCAtNDksMTAgKzUwLDYgQEAKICAgfQogCiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBFTkMgPSAiVVRGLTgiOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIE1BWF9BR0UgPQotICAgICAgVGltZVVuaXQuTUlMTElTRUNPTkRTLmNvbnZlcnQoNSwgVGltZVVuaXQuTUlOVVRFUyk7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBDQUNIRV9DVFJMID0KLSAgICAgICJwdWJsaWMsIG1heC1hZ2U9IiArIChNQVhfQUdFIC8gMTAwMEwpOwogCiAgIHByaXZhdGUgZmluYWwgbG9uZyBtb2RpZmllZDsKICAgcHJpdmF0ZSBmaW5hbCBieXRlW10gcmF3X2NzczsKQEAgLTg5LDcgKzg2LDYgQEAKICAgcHJvdGVjdGVkIHZvaWQgZG9HZXQoZmluYWwgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwKICAgICAgIGZpbmFsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcnNwKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGlmIChyYXdfY3NzICE9IG51bGwpIHsKLSAgICAgIGZpbmFsIGxvbmcgbm93ID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CiAgICAgICByc3Auc2V0Q29udGVudFR5cGUoInRleHQvY3NzIik7CiAgICAgICByc3Auc2V0Q2hhcmFjdGVyRW5jb2RpbmcoRU5DKTsKICAgICAgIGZpbmFsIGJ5dGVbXSB0b1NlbmQ7CkBAIC0xMDAsMTAgKzk2LDggQEAKICAgICAgICAgdG9TZW5kID0gcmF3X2NzczsKICAgICAgIH0KICAgICAgIHJzcC5zZXRDb250ZW50TGVuZ3RoKHRvU2VuZC5sZW5ndGgpOwotICAgICAgcnNwLnNldEhlYWRlcigiQ2FjaGUtQ29udHJvbCIsIENBQ0hFX0NUUkwpOwotICAgICAgcnNwLnNldERhdGVIZWFkZXIoIkRhdGUiLCBub3cpOwotICAgICAgcnNwLnNldERhdGVIZWFkZXIoIkV4cGlyZXMiLCBub3cgKyBNQVhfQUdFKTsKICAgICAgIHJzcC5zZXREYXRlSGVhZGVyKCJMYXN0LU1vZGlmaWVkIiwgbW9kaWZpZWQpOworICAgICAgQ2FjaGVIZWFkZXJzLnNldENhY2hlYWJsZShyZXEsIHJzcCwgNSwgVGltZVVuaXQuTUlOVVRFUyk7CiAKICAgICAgIGZpbmFsIFNlcnZsZXRPdXRwdXRTdHJlYW0gb3MgPSByc3AuZ2V0T3V0cHV0U3RyZWFtKCk7CiAgICAgICB0cnkgewpAQCAtMTEyLDYgKzEwNiw3IEBACiAgICAgICAgIG9zLmNsb3NlKCk7CiAgICAgICB9CiAgICAgfSBlbHNlIHsKKyAgICAgIENhY2hlSGVhZGVycy5zZXROb3RDYWNoZWFibGUocnNwKTsKICAgICAgIHJzcC5zZW5kRXJyb3IoSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19OT1RfRk9VTkQpOwogICAgIH0KICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvZ2l0d2ViL0dpdFdlYkphdmFTY3JpcHRTZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9naXR3ZWIvR2l0V2ViSmF2YVNjcmlwdFNlcnZsZXQuamF2YQppbmRleCA2MWYzMmFjLi5kNzE3MzJhIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9naXR3ZWIvR2l0V2ViSmF2YVNjcmlwdFNlcnZsZXQuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9naXR3ZWIvR2l0V2ViSmF2YVNjcmlwdFNlcnZsZXQuamF2YQpAQCAtMTUsNiArMTUsNyBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5naXR3ZWI7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5HaXRXZWJDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zZXJ2ZXIuQ2FjaGVIZWFkZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKQEAgLTMzLDExICszNCw2IEBACiBAU3VwcHJlc3NXYXJuaW5ncygic2VyaWFsIikKIEBTaW5nbGV0b24KIGNsYXNzIEdpdFdlYkphdmFTY3JpcHRTZXJ2bGV0IGV4dGVuZHMgSHR0cFNlcnZsZXQgewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIE1BWF9BR0UgPQotICAgICAgVGltZVVuaXQuTUlMTElTRUNPTkRTLmNvbnZlcnQoNSwgVGltZVVuaXQuTUlOVVRFUyk7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBDQUNIRV9DVFJMID0KLSAgICAgICJwdWJsaWMsIG1heC1hZ2U9IiArIChNQVhfQUdFIC8gMTAwMEwpOwotCiAgIHByaXZhdGUgZmluYWwgbG9uZyBtb2RpZmllZDsKICAgcHJpdmF0ZSBmaW5hbCBieXRlW10gcmF3OwogCkBAIC02OCwxMyArNjQsMTAgQEAKICAgcHJvdGVjdGVkIHZvaWQgZG9HZXQoZmluYWwgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwKICAgICAgIGZpbmFsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcnNwKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGlmIChyYXcgIT0gbnVsbCkgewotICAgICAgZmluYWwgbG9uZyBub3cgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKTsKICAgICAgIHJzcC5zZXRDb250ZW50VHlwZSgidGV4dC9qYXZhc2NyaXB0Iik7CiAgICAgICByc3Auc2V0Q29udGVudExlbmd0aChyYXcubGVuZ3RoKTsKLSAgICAgIHJzcC5zZXRIZWFkZXIoIkNhY2hlLUNvbnRyb2wiLCBDQUNIRV9DVFJMKTsKLSAgICAgIHJzcC5zZXREYXRlSGVhZGVyKCJEYXRlIiwgbm93KTsKLSAgICAgIHJzcC5zZXREYXRlSGVhZGVyKCJFeHBpcmVzIiwgbm93ICsgTUFYX0FHRSk7CiAgICAgICByc3Auc2V0RGF0ZUhlYWRlcigiTGFzdC1Nb2RpZmllZCIsIG1vZGlmaWVkKTsKKyAgICAgIENhY2hlSGVhZGVycy5zZXRDYWNoZWFibGUocmVxLCByc3AsIDUsIFRpbWVVbml0Lk1JTlVURVMpOwogCiAgICAgICBmaW5hbCBTZXJ2bGV0T3V0cHV0U3RyZWFtIG9zID0gcnNwLmdldE91dHB1dFN0cmVhbSgpOwogICAgICAgdHJ5IHsKQEAgLTgzLDYgKzc2LDcgQEAKICAgICAgICAgb3MuY2xvc2UoKTsKICAgICAgIH0KICAgICB9IGVsc2UgeworICAgICAgQ2FjaGVIZWFkZXJzLnNldE5vdENhY2hlYWJsZShyc3ApOwogICAgICAgcnNwLnNlbmRFcnJvcihIdHRwU2VydmxldFJlc3BvbnNlLlNDX05PVF9GT1VORCk7CiAgICAgfQogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9naXR3ZWIvR2l0V2ViU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvZ2l0d2ViL0dpdFdlYlNlcnZsZXQuamF2YQppbmRleCA2YzM3ZTQzLi5iYTdhNWI4IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9naXR3ZWIvR2l0V2ViU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2dpdHdlYi9HaXRXZWJTZXJ2bGV0LmphdmEKQEAgLTMwLDYgKzMwLDcgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuZ2l0d2ViOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2Vycml0Q29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuR2l0V2ViQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxhdW5jaGVyLkdlcnJpdExhdW5jaGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwpAQCAtMzksNiArNDAsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTG9jYWxEaXNrUmVwb3NpdG9yeU1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoUHJvamVjdEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNlcnZlci5DYWNoZUhlYWRlcnM7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKQEAgLTU4LDEwICs2MCw4IEBACiBpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbVJlYWRlcjsKIGltcG9ydCBqYXZhLmlvLk91dHB1dFN0cmVhbTsKIGltcG9ydCBqYXZhLmlvLlByaW50V3JpdGVyOwotaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLm5ldC5VUkk7CiBpbXBvcnQgamF2YS5uZXQuVVJJU3ludGF4RXhjZXB0aW9uOwotaW1wb3J0IGphdmEubmV0LlVSTERlY29kZXI7CiBpbXBvcnQgamF2YS51dGlsLkVudW1lcmF0aW9uOwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwpAQCAtMzg4LDE3ICszODgsMTQgQEAKICAgICAgIHJldHVybjsKICAgICB9CiAgICAgdHJ5IHsKLSAgICAgIHJzcC5zZXRIZWFkZXIoIkV4cGlyZXMiLCAiRnJpLCAwMSBKYW4gMTk4MCAwMDowMDowMCBHTVQiKTsKLSAgICAgIHJzcC5zZXRIZWFkZXIoIlByYWdtYSIsICJuby1jYWNoZSIpOwotICAgICAgcnNwLnNldEhlYWRlcigiQ2FjaGUtQ29udHJvbCIsICJuby1jYWNoZSwgbXVzdC1yZXZhbGlkYXRlIik7CisgICAgICBDYWNoZUhlYWRlcnMuc2V0Tm90Q2FjaGVhYmxlKHJzcCk7CiAgICAgICBleGVjKHJlcSwgcnNwLCBwcm9qZWN0LCByZXBvKTsKICAgICB9IGZpbmFsbHkgewogICAgICAgcmVwby5jbG9zZSgpOwogICAgIH0KICAgfQogCi0gIHByaXZhdGUgc3RhdGljIE1hcDxTdHJpbmcsIFN0cmluZz4gZ2V0UGFyYW1ldGVycyhmaW5hbCBIdHRwU2VydmxldFJlcXVlc3QgcmVxKQotICAgICAgdGhyb3dzIFVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb24geworICBwcml2YXRlIHN0YXRpYyBNYXA8U3RyaW5nLCBTdHJpbmc+IGdldFBhcmFtZXRlcnMoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgewogICAgIGZpbmFsIE1hcDxTdHJpbmcsIFN0cmluZz4gcGFyYW1zID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+KCk7CiAgICAgZm9yIChmaW5hbCBTdHJpbmcgcGFpciA6IHJlcS5nZXRRdWVyeVN0cmluZygpLnNwbGl0KCJbJjtdIikpIHsKICAgICAgIGZpbmFsIGludCBlcSA9IHBhaXIuaW5kZXhPZignPScpOwpAQCAtNDA2LDggKzQwMyw4IEBACiAgICAgICAgIFN0cmluZyBuYW1lID0gcGFpci5zdWJzdHJpbmcoMCwgZXEpOwogICAgICAgICBTdHJpbmcgdmFsdWUgPSBwYWlyLnN1YnN0cmluZyhlcSArIDEpOwogCi0gICAgICAgIG5hbWUgPSBVUkxEZWNvZGVyLmRlY29kZShuYW1lLCAiVVRGLTgiKTsKLSAgICAgICAgdmFsdWUgPSBVUkxEZWNvZGVyLmRlY29kZSh2YWx1ZSwgIlVURi04Iik7CisgICAgICAgIG5hbWUgPSBVcmwuZGVjb2RlKG5hbWUpOworICAgICAgICB2YWx1ZSA9IFVybC5kZWNvZGUodmFsdWUpOwogICAgICAgICBwYXJhbXMucHV0KG5hbWUsIHZhbHVlKTsKICAgICAgIH0KICAgICB9CkBAIC00MTksNyArNDE2LDggQEAKICAgICAgIGZpbmFsIFJlcG9zaXRvcnkgcmVwbykgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICBmaW5hbCBQcm9jZXNzIHByb2MgPQogICAgICAgICBSdW50aW1lLmdldFJ1bnRpbWUoKS5leGVjKG5ldyBTdHJpbmdbXSB7Z2l0d2ViQ2dpLmdldEFic29sdXRlUGF0aCgpfSwKLSAgICAgICAgICAgIG1ha2VFbnYocmVxLCBwcm9qZWN0KSwgcmVwby5nZXREaXJlY3RvcnkoKSk7CisgICAgICAgICAgICBtYWtlRW52KHJlcSwgcHJvamVjdCksCisgICAgICAgICAgICBnaXR3ZWJDZ2kuZ2V0QWJzb2x1dGVGaWxlKCkuZ2V0UGFyZW50RmlsZSgpKTsKIAogICAgIGNvcHlTdGRlcnJUb0xvZyhwcm9jLmdldEVycm9yU3RyZWFtKCkpOwogICAgIGlmICgwIDwgcmVxLmdldENvbnRlbnRMZW5ndGgoKSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcGx1Z2lucy9IdHRwQXV0b1JlZ2lzdGVyTW9kdWxlR2VuZXJhdG9yLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL0h0dHBBdXRvUmVnaXN0ZXJNb2R1bGVHZW5lcmF0b3IuamF2YQppbmRleCAyZDk1N2YyLi5kMWM2MTdmIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL0h0dHBBdXRvUmVnaXN0ZXJNb2R1bGVHZW5lcmF0b3IuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL0h0dHBBdXRvUmVnaXN0ZXJNb2R1bGVHZW5lcmF0b3IuamF2YQpAQCAtMTQsMTQgKzE0LDIwIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucGx1Z2luczsKIAoraW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2lucy5BdXRvUmVnaXN0ZXJVdGlsLmNhbGN1bGF0ZUJpbmRBbm5vdGF0aW9uOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaW5rZWRMaXN0TXVsdGltYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTXVsdGltYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5FeHBvcnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuSW52YWxpZFBsdWdpbkV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2lucy5Nb2R1bGVHZW5lcmF0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNjb3BlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5UeXBlTGl0ZXJhbDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zZXJ2bGV0LlNlcnZsZXRNb2R1bGU7CiAKK2ltcG9ydCBqYXZhLmxhbmcuYW5ub3RhdGlvbi5Bbm5vdGF0aW9uOwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKIGltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXQ7CkBAIC0yOSw2ICszNSw3IEBACiBjbGFzcyBIdHRwQXV0b1JlZ2lzdGVyTW9kdWxlR2VuZXJhdG9yIGV4dGVuZHMgU2VydmxldE1vZHVsZQogICAgIGltcGxlbWVudHMgTW9kdWxlR2VuZXJhdG9yIHsKICAgcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBDbGFzczxIdHRwU2VydmxldD4+IHNlcnZlID0gTWFwcy5uZXdIYXNoTWFwKCk7CisgIHByaXZhdGUgZmluYWwgTXVsdGltYXA8VHlwZUxpdGVyYWw8Pz4sIENsYXNzPD8+PiBsaXN0ZW5lcnMgPSBMaW5rZWRMaXN0TXVsdGltYXAuY3JlYXRlKCk7CiAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZVNlcnZsZXRzKCkgewpAQCAtMzYsNiArNDMsMTYgQEAKICAgICAgIGJpbmQoZS5nZXRWYWx1ZSgpKS5pbihTY29wZXMuU0lOR0xFVE9OKTsKICAgICAgIHNlcnZlKGUuZ2V0S2V5KCkpLndpdGgoZS5nZXRWYWx1ZSgpKTsKICAgICB9CisgICAgZm9yIChNYXAuRW50cnk8VHlwZUxpdGVyYWw8Pz4sIENsYXNzPD8+PiBlIDogbGlzdGVuZXJzLmVudHJpZXMoKSkgeworICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgICAgICBUeXBlTGl0ZXJhbDxPYmplY3Q+IHR5cGUgPSAoVHlwZUxpdGVyYWw8T2JqZWN0PikgZS5nZXRLZXkoKTsKKworICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgICAgICBDbGFzczxPYmplY3Q+IGltcGwgPSAoQ2xhc3M8T2JqZWN0PikgZS5nZXRWYWx1ZSgpOworCisgICAgICBBbm5vdGF0aW9uIG4gPSBjYWxjdWxhdGVCaW5kQW5ub3RhdGlvbihpbXBsKTsKKyAgICAgIGJpbmQodHlwZSkuYW5ub3RhdGVkV2l0aChuKS50byhpbXBsKTsKKyAgICB9CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTYzLDYgKzgwLDExIEBACiAgIH0KIAogICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgbGlzdGVuKFR5cGVMaXRlcmFsPD8+IHRsLCBDbGFzczw/PiBjbGF6eikgeworICAgIGxpc3RlbmVycy5wdXQodGwsIGNsYXp6KTsKKyAgfQorCisgIEBPdmVycmlkZQogICBwdWJsaWMgTW9kdWxlIGNyZWF0ZSgpIHRocm93cyBJbnZhbGlkUGx1Z2luRXhjZXB0aW9uIHsKICAgICByZXR1cm4gdGhpczsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcGx1Z2lucy9IdHRwUGx1Z2luTW9kdWxlLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL0h0dHBQbHVnaW5Nb2R1bGUuamF2YQppbmRleCAyYmNhYTMwLi41ZGM3ZTJlIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL0h0dHBQbHVnaW5Nb2R1bGUuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL0h0dHBQbHVnaW5Nb2R1bGUuamF2YQpAQCAtMjcsNyArMjcsNiBAQAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlU2VydmxldHMoKSB7CiAgICAgYmluZChIdHRwUGx1Z2luU2VydmxldC5jbGFzcyk7Ci0gICAgc2VydmUoIi9wbHVnaW5zLyoiKS53aXRoKEh0dHBQbHVnaW5TZXJ2bGV0LmNsYXNzKTsKICAgICBzZXJ2ZVJlZ2V4KCJeLyg/OmEvKT9wbHVnaW5zLyguKik/JCIpLndpdGgoSHR0cFBsdWdpblNlcnZsZXQuY2xhc3MpOwogCiAgICAgYmluZChTdGFydFBsdWdpbkxpc3RlbmVyLmNsYXNzKQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcGx1Z2lucy9IdHRwUGx1Z2luU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcGx1Z2lucy9IdHRwUGx1Z2luU2VydmxldC5qYXZhCmluZGV4IGU3Mzc3MDAuLjU0OWMyMzkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3BsdWdpbnMvSHR0cFBsdWdpblNlcnZsZXQuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL0h0dHBQbHVnaW5TZXJ2bGV0LmphdmEKQEAgLTE0LDIwICsxNCwyNCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnBsdWdpbnM7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLkNoYXJNYXRjaGVyOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3BsaXR0ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkNhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLlJlZ2lzdHJhdGlvbkhhbmRsZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucGx1Z2luLkxpc3RQbHVnaW5zU2VydmxldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yZXN0YXBpLlJlc3RBcGlTZXJ2bGV0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5NaW1lVXRpbEZpbGVUeXBlUmVnaXN0cnk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmRvY3VtZW50YXRpb24uTWFya2Rvd25Gb3JtYXR0ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuUGx1Z2luOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlBsdWdpbnNDb2xsZWN0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlJlbG9hZFBsdWdpbkxpc3RlbmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlN0YXJ0UGx1Z2luTGlzdGVuZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2VydmVyLkNhY2hlSGVhZGVyczsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOwpAQCAtODAsNyArODQsNyBAQAogICBwcml2YXRlIGZpbmFsIENhY2hlPFJlc291cmNlS2V5LCBSZXNvdXJjZT4gcmVzb3VyY2VDYWNoZTsKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgc3NoSG9zdDsKICAgcHJpdmF0ZSBmaW5hbCBpbnQgc3NoUG9ydDsKLSAgcHJpdmF0ZSBmaW5hbCBMaXN0UGx1Z2luc1NlcnZsZXQgbGlzdFNlcnZsZXQ7CisgIHByaXZhdGUgZmluYWwgUmVzdEFwaVNlcnZsZXQgbWFuYWdlckFwaTsKIAogICBwcml2YXRlIExpc3Q8UGx1Z2luPiBwZW5kaW5nID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CiAgIHByaXZhdGUgU3RyaW5nIGJhc2U7CkBAIC05MiwxMSArOTYsMTMgQEAKICAgICAgIEBDYW5vbmljYWxXZWJVcmwgUHJvdmlkZXI8U3RyaW5nPiB3ZWJVcmwsCiAgICAgICBATmFtZWQoSHR0cFBsdWdpbk1vZHVsZS5QTFVHSU5fUkVTT1VSQ0VTKSBDYWNoZTxSZXNvdXJjZUtleSwgUmVzb3VyY2U+IGNhY2hlLAogICAgICAgQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgY2ZnLAotICAgICAgU3NoSW5mbyBzc2hJbmZvLCBMaXN0UGx1Z2luc1NlcnZsZXQgbGlzdFNlcnZsZXQpIHsKKyAgICAgIFNzaEluZm8gc3NoSW5mbywKKyAgICAgIFJlc3RBcGlTZXJ2bGV0Lkdsb2JhbHMgZ2xvYmFscywKKyAgICAgIFBsdWdpbnNDb2xsZWN0aW9uIHBsdWdpbnMpIHsKICAgICB0aGlzLm1pbWVVdGlsID0gbWltZVV0aWw7CiAgICAgdGhpcy53ZWJVcmwgPSB3ZWJVcmw7CiAgICAgdGhpcy5yZXNvdXJjZUNhY2hlID0gY2FjaGU7Ci0gICAgdGhpcy5saXN0U2VydmxldCA9IGxpc3RTZXJ2bGV0OworICAgIHRoaXMubWFuYWdlckFwaSA9IG5ldyBSZXN0QXBpU2VydmxldChnbG9iYWxzLCBwbHVnaW5zKTsKIAogICAgIFN0cmluZyBzc2hIb3N0ID0gInJldmlldy5leGFtcGxlLmNvbSI7CiAgICAgaW50IHNzaFBvcnQgPSAyOTQxODsKQEAgLTE4NywxNCArMTkzLDE5IEBACiAgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBzZXJ2aWNlKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKQogICAgICAgdGhyb3dzIElPRXhjZXB0aW9uLCBTZXJ2bGV0RXhjZXB0aW9uIHsKLSAgICBTdHJpbmcgbmFtZSA9IGV4dHJhY3ROYW1lKHJlcSk7Ci0gICAgaWYgKG5hbWUuZXF1YWxzKCIiKSkgewotICAgICAgbGlzdFNlcnZsZXQuc2VydmljZShyZXEsIHJlcyk7CisgICAgTGlzdDxTdHJpbmc+IHBhcnRzID0gTGlzdHMubmV3QXJyYXlMaXN0KAorICAgICAgU3BsaXR0ZXIub24oJy8nKS5saW1pdCgzKS5vbWl0RW1wdHlTdHJpbmdzKCkKKyAgICAgICAgLnNwbGl0KFN0cmluZ3MubnVsbFRvRW1wdHkocmVxLmdldFBhdGhJbmZvKCkpKSk7CisKKyAgICBpZiAoaXNBcGlDYWxsKHJlcSwgcGFydHMpKSB7CisgICAgICBtYW5hZ2VyQXBpLnNlcnZpY2UocmVxLCByZXMpOwogICAgICAgcmV0dXJuOwogICAgIH0KKworICAgIFN0cmluZyBuYW1lID0gcGFydHMuZ2V0KDApOwogICAgIGZpbmFsIFBsdWdpbkhvbGRlciBob2xkZXIgPSBwbHVnaW5zLmdldChuYW1lKTsKICAgICBpZiAoaG9sZGVyID09IG51bGwpIHsKLSAgICAgIG5vQ2FjaGUocmVzKTsKKyAgICAgIENhY2hlSGVhZGVycy5zZXROb3RDYWNoZWFibGUocmVzKTsKICAgICAgIHJlcy5zZW5kRXJyb3IoSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19OT1RfRk9VTkQpOwogICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTIxNCwxMSArMjI1LDE5IEBACiAgICAgfQogICB9CiAKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc0FwaUNhbGwoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwgTGlzdDxTdHJpbmc+IHBhcnRzKSB7CisgICAgU3RyaW5nIG1ldGhvZCA9IHJlcS5nZXRNZXRob2QoKTsKKyAgICBpbnQgY250ID0gcGFydHMuc2l6ZSgpOworICAgIHJldHVybiBjbnQgPT0gMAorICAgICAgICB8fCAoY250ID09IDEgJiYgKCJQVVQiLmVxdWFscyhtZXRob2QpIHx8ICJERUxFVEUiLmVxdWFscyhtZXRob2QpKSkKKyAgICAgICAgfHwgKGNudCA9PSAyICYmIHBhcnRzLmdldCgxKS5zdGFydHNXaXRoKCJnZXJyaXR+IikpOworICB9CisKICAgcHJpdmF0ZSB2b2lkIG9uRGVmYXVsdChQbHVnaW5Ib2xkZXIgaG9sZGVyLAogICAgICAgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwKICAgICAgIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGlmICghIkdFVCIuZXF1YWxzKHJlcS5nZXRNZXRob2QoKSkgJiYgISJIRUFEIi5lcXVhbHMocmVxLmdldE1ldGhvZCgpKSkgewotICAgICAgbm9DYWNoZShyZXMpOworICAgICAgQ2FjaGVIZWFkZXJzLnNldE5vdENhY2hlYWJsZShyZXMpOwogICAgICAgcmVzLnNlbmRFcnJvcihIdHRwU2VydmxldFJlc3BvbnNlLlNDX01FVEhPRF9OT1RfQUxMT1dFRCk7CiAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMjM5LDggKzI1OCwxMSBAQAogICAgIH0KIAogICAgIGlmICgiIi5lcXVhbHMoZmlsZSkpIHsKLSAgICAgIHJlcy5zZW5kUmVkaXJlY3QodXJpICsgIkRvY3VtZW50YXRpb24vaW5kZXguaHRtbCIpOwotICAgIH0gZWxzZSBpZiAoZmlsZS5zdGFydHNXaXRoKCJzdGF0aWMvIikpIHsKKyAgICAgIHJlcy5zZW5kUmVkaXJlY3QodXJpICsgaG9sZGVyLmRvY1ByZWZpeCArICJpbmRleC5odG1sIik7CisgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGZpbGUuc3RhcnRzV2l0aChob2xkZXIuc3RhdGljUHJlZml4KSkgewogICAgICAgSmFyRmlsZSBqYXIgPSBob2xkZXIucGx1Z2luLmdldEphckZpbGUoKTsKICAgICAgIEphckVudHJ5IGVudHJ5ID0gamFyLmdldEphckVudHJ5KGZpbGUpOwogICAgICAgaWYgKGV4aXN0cyhlbnRyeSkpIHsKQEAgLTI0OSwxMSArMjcxLDEyIEBACiAgICAgICAgIHJlc291cmNlQ2FjaGUucHV0KGtleSwgUmVzb3VyY2UuTk9UX0ZPVU5EKTsKICAgICAgICAgUmVzb3VyY2UuTk9UX0ZPVU5ELnNlbmQocmVxLCByZXMpOwogICAgICAgfQotICAgIH0gZWxzZSBpZiAoZmlsZS5lcXVhbHMoIkRvY3VtZW50YXRpb24iKSkgeworICAgIH0gZWxzZSBpZiAoZmlsZS5lcXVhbHMoCisgICAgICAgIGhvbGRlci5kb2NQcmVmaXguc3Vic3RyaW5nKDAsIGhvbGRlci5kb2NQcmVmaXgubGVuZ3RoKCkgLSAxKSkpIHsKICAgICAgIHJlcy5zZW5kUmVkaXJlY3QodXJpICsgIi9pbmRleC5odG1sIik7Ci0gICAgfSBlbHNlIGlmIChmaWxlLnN0YXJ0c1dpdGgoIkRvY3VtZW50YXRpb24vIikgJiYgZmlsZS5lbmRzV2l0aCgiLyIpKSB7CisgICAgfSBlbHNlIGlmIChmaWxlLnN0YXJ0c1dpdGgoaG9sZGVyLmRvY1ByZWZpeCkgJiYgZmlsZS5lbmRzV2l0aCgiLyIpKSB7CiAgICAgICByZXMuc2VuZFJlZGlyZWN0KHVyaSArICJpbmRleC5odG1sIik7Ci0gICAgfSBlbHNlIGlmIChmaWxlLnN0YXJ0c1dpdGgoIkRvY3VtZW50YXRpb24vIikpIHsKKyAgICB9IGVsc2UgaWYgKGZpbGUuc3RhcnRzV2l0aChob2xkZXIuZG9jUHJlZml4KSkgewogICAgICAgSmFyRmlsZSBqYXIgPSBob2xkZXIucGx1Z2luLmdldEphckZpbGUoKTsKICAgICAgIEphckVudHJ5IGVudHJ5ID0gamFyLmdldEphckVudHJ5KGZpbGUpOwogICAgICAgaWYgKCFleGlzdHMoZW50cnkpKSB7CkBAIC01MDEsNiArNTI0LDEwIEBACiAgICAgfQogICAgIGlmIChjb250ZW50VHlwZSA9PSBudWxsKSB7CiAgICAgICBjb250ZW50VHlwZSA9IG1pbWVVdGlsLmdldE1pbWVUeXBlKGVudHJ5LmdldE5hbWUoKSwgZGF0YSkudG9TdHJpbmcoKTsKKyAgICAgIGlmICgiYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtIi5lcXVhbHMoY29udGVudFR5cGUpCisgICAgICAgICAgJiYgZW50cnkuZ2V0TmFtZSgpLmVuZHNXaXRoKCIuanMiKSkgeworICAgICAgICBjb250ZW50VHlwZSA9ICJhcHBsaWNhdGlvbi9qYXZhc2NyaXB0IjsKKyAgICAgIH0KICAgICB9CiAKICAgICBsb25nIHRpbWUgPSBlbnRyeS5nZXRUaW1lKCk7CkBAIC01NDksMjkgKzU3NiwzNSBAQAogICAgIHJldHVybiBkYXRhOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGV4dHJhY3ROYW1lKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEpIHsKLSAgICBTdHJpbmcgcGF0aCA9IHJlcS5nZXRQYXRoSW5mbygpOwotICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkocGF0aCkgfHwgIi8iLmVxdWFscyhwYXRoKSkgewotICAgICAgcmV0dXJuICIiOwotICAgIH0KLSAgICBpbnQgcyA9IHBhdGguaW5kZXhPZignLycsIDEpOwotICAgIHJldHVybiAwIDw9IHMgPyBwYXRoLnN1YnN0cmluZygxLCBzKSA6IHBhdGguc3Vic3RyaW5nKDEpOwotICB9Ci0KLSAgc3RhdGljIHZvaWQgbm9DYWNoZShIdHRwU2VydmxldFJlc3BvbnNlIHJlcykgewotICAgIHJlcy5zZXRIZWFkZXIoIkV4cGlyZXMiLCAiRnJpLCAwMSBKYW4gMTk4MCAwMDowMDowMCBHTVQiKTsKLSAgICByZXMuc2V0SGVhZGVyKCJQcmFnbWEiLCAibm8tY2FjaGUiKTsKLSAgICByZXMuc2V0SGVhZGVyKCJDYWNoZS1Db250cm9sIiwgIm5vLWNhY2hlLCBtdXN0LXJldmFsaWRhdGUiKTsKLSAgICByZXMuc2V0SGVhZGVyKCJDb250ZW50LURpc3Bvc2l0aW9uIiwgImF0dGFjaG1lbnQiKTsKLSAgfQotCiAgIHByaXZhdGUgc3RhdGljIGNsYXNzIFBsdWdpbkhvbGRlciB7CiAgICAgZmluYWwgUGx1Z2luIHBsdWdpbjsKICAgICBmaW5hbCBHdWljZUZpbHRlciBmaWx0ZXI7CisgICAgZmluYWwgU3RyaW5nIHN0YXRpY1ByZWZpeDsKKyAgICBmaW5hbCBTdHJpbmcgZG9jUHJlZml4OwogCiAgICAgUGx1Z2luSG9sZGVyKFBsdWdpbiBwbHVnaW4sIEd1aWNlRmlsdGVyIGZpbHRlcikgewogICAgICAgdGhpcy5wbHVnaW4gPSBwbHVnaW47CiAgICAgICB0aGlzLmZpbHRlciA9IGZpbHRlcjsKKyAgICAgIHRoaXMuc3RhdGljUHJlZml4ID0KKyAgICAgICAgZ2V0UHJlZml4KHBsdWdpbiwgIkdlcnJpdC1IdHRwU3RhdGljUHJlZml4IiwgInN0YXRpYy8iKTsKKyAgICAgIHRoaXMuZG9jUHJlZml4ID0KKyAgICAgICAgZ2V0UHJlZml4KHBsdWdpbiwgIkdlcnJpdC1IdHRwRG9jdW1lbnRhdGlvblByZWZpeCIsICJEb2N1bWVudGF0aW9uLyIpOworICAgIH0KKworICAgIHByaXZhdGUgc3RhdGljIFN0cmluZyBnZXRQcmVmaXgoUGx1Z2luIHBsdWdpbiwgU3RyaW5nIGF0dHIsIFN0cmluZyBkZWYpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIFN0cmluZyBwcmVmaXggPSBwbHVnaW4uZ2V0SmFyRmlsZSgpLmdldE1hbmlmZXN0KCkuZ2V0TWFpbkF0dHJpYnV0ZXMoKQorICAgICAgICAgICAgLmdldFZhbHVlKGF0dHIpOworICAgICAgICBpZiAocHJlZml4ICE9IG51bGwpIHsKKyAgICAgICAgICByZXR1cm4gQ2hhck1hdGNoZXIuaXMoJy8nKS50cmltRnJvbShwcmVmaXgpICsgIi8iOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIHJldHVybiBkZWY7CisgICAgICAgIH0KKyAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgbG9nLndhcm4oU3RyaW5nLmZvcm1hdCgiRXJyb3IgZ2V0dGluZyAlcyBmb3IgcGx1Z2luICVzLCB1c2luZyBkZWZhdWx0IiwKKyAgICAgICAgICAgIGF0dHIsIHBsdWdpbi5nZXROYW1lKCkpLCBlKTsKKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICB9CiAgICAgfQogICB9CiAKQEAgLTU5MCw3ICs2MjMsOCBAQAogCiAgICAgQE92ZXJyaWRlCiAgICAgcHVibGljIFN0cmluZyBnZXRTZXJ2bGV0UGF0aCgpIHsKLSAgICAgIHJldHVybiAoKEh0dHBTZXJ2bGV0UmVxdWVzdCkgZ2V0UmVxdWVzdCgpKS5nZXRSZXF1ZXN0VVJJKCk7CisgICAgICByZXR1cm4gKChIdHRwU2VydmxldFJlcXVlc3QpIGdldFJlcXVlc3QoKSkuZ2V0UmVxdWVzdFVSSSgpLnN1YnN0cmluZygKKyAgICAgICAgICBjb250ZXh0UGF0aC5sZW5ndGgoKSk7CiAgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL1Jlc291cmNlLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9wbHVnaW5zL1Jlc291cmNlLmphdmEKaW5kZXggMDU5NzBhZi4uZjM1NGZkNSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcGx1Z2lucy9SZXNvdXJjZS5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3BsdWdpbnMvUmVzb3VyY2UuamF2YQpAQCAtMTQsNiArMTQsOCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnBsdWdpbnM7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNlcnZlci5DYWNoZUhlYWRlcnM7CisKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogCiBpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVxdWVzdDsKQEAgLTI5LDcgKzMxLDcgQEAKICAgICBAT3ZlcnJpZGUKICAgICB2b2lkIHNlbmQoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMpCiAgICAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7Ci0gICAgICBIdHRwUGx1Z2luU2VydmxldC5ub0NhY2hlKHJlcyk7CisgICAgICBDYWNoZUhlYWRlcnMuc2V0Tm90Q2FjaGVhYmxlKHJlcyk7CiAgICAgICByZXMuc2VuZEVycm9yKEh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfTk9UX0ZPVU5EKTsKICAgICB9CiAgIH07CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvQ2F0U2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0NhdFNlcnZsZXQuamF2YQppbmRleCBhZGY0YWQ1Li4xZWNkOTI5IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvQ2F0U2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9DYXRTZXJ2bGV0LmphdmEKQEAgLTE0LDYgKzE0LDcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yYXc7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVXJsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKQEAgLTIzLDYgKzI0LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2VydmVyLkNhY2hlSGVhZGVyczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKQEAgLTQ0LDcgKzQ2LDYgQEAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLm5ldC5VUkxEZWNvZGVyOwogaW1wb3J0IGphdmEuc2VjdXJpdHkuTWVzc2FnZURpZ2VzdDsKIGltcG9ydCBqYXZhLnNlY3VyaXR5LlNlY3VyZVJhbmRvbTsKIGltcG9ydCBqYXZhLnV0aWwuemlwLlppcEVudHJ5OwpAQCAtOTUsNyArOTYsNyBAQAogICAgIC8vIHJhdGhlciB0aGFuIGVzY2FwZWQgYXMgIiUyNTJGIiwgd2hpY2ggbWFrZXMgbWUgZmVlbCByZWFsbHkgcmVhbGx5CiAgICAgLy8gdW5jb21mb3J0YWJsZSB3aXRoIGEgYmxpbmQgZGVjb2RlIHJpZ2h0IGhlcmUuCiAgICAgLy8KLSAgICBrZXlTdHIgPSBVUkxEZWNvZGVyLmRlY29kZShrZXlTdHIsICJVVEYtOCIpOworICAgIGtleVN0ciA9IFVybC5kZWNvZGUoa2V5U3RyKTsKIAogICAgIGlmICgha2V5U3RyLnN0YXJ0c1dpdGgoIi8iKSkgewogICAgICAgcnNwLnNlbmRFcnJvcihIdHRwU2VydmxldFJlc3BvbnNlLlNDX05PVF9GT1VORCk7CkBAIC0yMjYsOSArMjI3LDcgQEAKICAgICBmaW5hbCBsb25nIHdoZW4gPSBmcm9tQ29tbWl0LmdldENvbW1pdFRpbWUoKSAqIDEwMDBMOwogCiAgICAgcnNwLnNldERhdGVIZWFkZXIoIkxhc3QtTW9kaWZpZWQiLCB3aGVuKTsKLSAgICByc3Auc2V0RGF0ZUhlYWRlcigiRXhwaXJlcyIsIDBMKTsKLSAgICByc3Auc2V0SGVhZGVyKCJQcmFnbWEiLCAibm8tY2FjaGUiKTsKLSAgICByc3Auc2V0SGVhZGVyKCJDYWNoZS1Db250cm9sIiwgIm5vLWNhY2hlLCBtdXN0LXJldmFsaWRhdGUiKTsKKyAgICBDYWNoZUhlYWRlcnMuc2V0Tm90Q2FjaGVhYmxlKHJzcCk7CiAKICAgICBPdXRwdXRTdHJlYW0gb3V0OwogICAgIFppcE91dHB1dFN0cmVhbSB6bzsKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9Ib3N0UGFnZVNlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9Ib3N0UGFnZVNlcnZsZXQuamF2YQppbmRleCA2YTQzZDk1Li42Y2RkOWJkIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvSG9zdFBhZ2VTZXJ2bGV0LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0hvc3RQYWdlU2VydmxldC5qYXZhCkBAIC0xNCwyNSArMTQsMzAgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yYXc7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5oYXNoLkhhc2hlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5oYXNoLkhhc2hpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5wcmltaXRpdmVzLkJ5dGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdlcnJpdENvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Ib3N0UGFnZURhdGE7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLndlYnVpLldlYlVpUGx1Z2luOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLkh0bWxEb21VdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLldlYlNlc3Npb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuc2VydmVyLlJQQ1NlcnZsZXRVdGlsczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLmxpbmtlci5zZXJ2ZXIuUGVybXV0YXRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5saW5rZXIuc2VydmVyLlBlcm11dGF0aW9uU2VsZWN0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zZXJ2ZXIuQ2FjaGVIZWFkZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5zZXJ2ZXIuSnNvblNlcnZsZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLnNlcnZlci5SUENTZXJ2bGV0VXRpbHM7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKIGltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKIGltcG9ydCBvcmcudzNjLmRvbS5Eb2N1bWVudDsKQEAgLTQ0LDggKzQ5LDggQEAKIGltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uU3RyaW5nV3JpdGVyOwotaW1wb3J0IGphdmEuc2VjdXJpdHkuTWVzc2FnZURpZ2VzdDsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCiBpbXBvcnQgamF2YXguc2VydmxldC5TZXJ2bGV0Q29udGV4dDsKQEAgLTY2LDYgKzcxLDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gY3VycmVudFVzZXI7CiAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8V2ViU2Vzc2lvbj4gc2Vzc2lvbjsKICAgcHJpdmF0ZSBmaW5hbCBHZXJyaXRDb25maWcgY29uZmlnOworICBwcml2YXRlIGZpbmFsIER5bmFtaWNTZXQ8V2ViVWlQbHVnaW4+IHBsdWdpbnM7CiAgIHByaXZhdGUgZmluYWwgSG9zdFBhZ2VEYXRhLlRoZW1lIHNpZ25lZE91dFRoZW1lOwogICBwcml2YXRlIGZpbmFsIEhvc3RQYWdlRGF0YS5UaGVtZSBzaWduZWRJblRoZW1lOwogICBwcml2YXRlIGZpbmFsIFNpdGVQYXRocyBzaXRlOwpAQCAtNzksMTUgKzg1LDE4IEBACiAgIEhvc3RQYWdlU2VydmxldChmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gY3UsIGZpbmFsIFByb3ZpZGVyPFdlYlNlc3Npb24+IHcsCiAgICAgICBmaW5hbCBTaXRlUGF0aHMgc3AsIGZpbmFsIFRoZW1lRmFjdG9yeSB0aGVtZUZhY3RvcnksCiAgICAgICBmaW5hbCBHZXJyaXRDb25maWcgZ2MsIGZpbmFsIFNlcnZsZXRDb250ZXh0IHNlcnZsZXRDb250ZXh0LAorICAgICAgZmluYWwgRHluYW1pY1NldDxXZWJVaVBsdWdpbj4gd2ViVWlQbHVnaW5zLAogICAgICAgQEdlcnJpdFNlcnZlckNvbmZpZyBmaW5hbCBDb25maWcgY2ZnKQogICAgICAgdGhyb3dzIElPRXhjZXB0aW9uLCBTZXJ2bGV0RXhjZXB0aW9uIHsKICAgICBjdXJyZW50VXNlciA9IGN1OwogICAgIHNlc3Npb24gPSB3OwogICAgIGNvbmZpZyA9IGdjOworICAgIHBsdWdpbnMgPSB3ZWJVaVBsdWdpbnM7CiAgICAgc2lnbmVkT3V0VGhlbWUgPSB0aGVtZUZhY3RvcnkuZ2V0U2lnbmVkT3V0VGhlbWUoKTsKICAgICBzaWduZWRJblRoZW1lID0gdGhlbWVGYWN0b3J5LmdldFNpZ25lZEluVGhlbWUoKTsKICAgICBzaXRlID0gc3A7CiAgICAgcmVmcmVzaEhlYWRlckZvb3RlciA9IGNmZy5nZXRCb29sZWFuKCJzaXRlIiwgInJlZnJlc2hIZWFkZXJGb290ZXIiLCB0cnVlKTsKKyAgICBib29sZWFuIGNoZWNrVXNlckFnZW50ID0gY2ZnLmdldEJvb2xlYW4oInNpdGUiLCAiY2hlY2tVc2VyQWdlbnQiLCB0cnVlKTsKIAogICAgIGZpbmFsIFN0cmluZyBwYWdlTmFtZSA9ICJIb3N0UGFnZS5odG1sIjsKICAgICB0ZW1wbGF0ZSA9IEh0bWxEb21VdGlsLnBhcnNlRmlsZShnZXRDbGFzcygpLCBwYWdlTmFtZSk7CkBAIC0xMDIsNDAgKzExMSw0MCBAQAogICAgICAgdGhyb3cgbmV3IFNlcnZsZXRFeGNlcHRpb24oIk5vICIgKyBIUERfSUQgKyAiIGluICIgKyBwYWdlTmFtZSk7CiAgICAgfQogCi0gICAgZmluYWwgU3RyaW5nIHNyYyA9ICJnZXJyaXQvZ2Vycml0Lm5vY2FjaGUuanMiOwotICAgIHNlbGVjdG9yID0gbmV3IFBlcm11dGF0aW9uU2VsZWN0b3IoImdlcnJpdCIpOwotICAgIGlmIChJU19ERVYgfHwgIWNmZy5nZXRCb29sZWFuKCJzaXRlIiwgImNoZWNrVXNlckFnZW50IiwgdHJ1ZSkpIHsKLSAgICAgIG5vQ2FjaGVOYW1lID0gc3JjOwotICAgIH0gZWxzZSB7Ci0gICAgICBmaW5hbCBFbGVtZW50IGRldm1vZGUgPSBIdG1sRG9tVXRpbC5maW5kKHRlbXBsYXRlLCAiZ2Vycml0X2d3dGRldm1vZGUiKTsKKyAgICBTdHJpbmcgc3JjID0gImdlcnJpdF91aS9nZXJyaXRfdWkubm9jYWNoZS5qcyI7CisgICAgaWYgKCFJU19ERVYpIHsKKyAgICAgIEVsZW1lbnQgZGV2bW9kZSA9IEh0bWxEb21VdGlsLmZpbmQodGVtcGxhdGUsICJnd3RkZXZtb2RlIik7CiAgICAgICBpZiAoZGV2bW9kZSAhPSBudWxsKSB7CiAgICAgICAgIGRldm1vZGUuZ2V0UGFyZW50Tm9kZSgpLnJlbW92ZUNoaWxkKGRldm1vZGUpOwogICAgICAgfQogCiAgICAgICBJbnB1dFN0cmVhbSBpbiA9IHNlcnZsZXRDb250ZXh0LmdldFJlc291cmNlQXNTdHJlYW0oIi8iICsgc3JjKTsKLSAgICAgIGlmIChpbiA9PSBudWxsKSB7Ci0gICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiTm8gIiArIHNyYyArICIgaW4gd2ViYXBwIHJvb3QiKTsKLSAgICAgIH0KLQotICAgICAgZmluYWwgTWVzc2FnZURpZ2VzdCBtZCA9IENvbnN0YW50cy5uZXdNZXNzYWdlRGlnZXN0KCk7Ci0gICAgICB0cnkgeworICAgICAgaWYgKGluICE9IG51bGwpIHsKKyAgICAgICAgSGFzaGVyIG1kID0gSGFzaGluZy5tZDUoKS5uZXdIYXNoZXIoKTsKICAgICAgICAgdHJ5IHsKLSAgICAgICAgICBmaW5hbCBieXRlW10gYnVmID0gbmV3IGJ5dGVbMTAyNF07Ci0gICAgICAgICAgaW50IG47Ci0gICAgICAgICAgd2hpbGUgKChuID0gaW4ucmVhZChidWYpKSA+IDApIHsKLSAgICAgICAgICAgIG1kLnVwZGF0ZShidWYsIDAsIG4pOworICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICBmaW5hbCBieXRlW10gYnVmID0gbmV3IGJ5dGVbMTAyNF07CisgICAgICAgICAgICBpbnQgbjsKKyAgICAgICAgICAgIHdoaWxlICgobiA9IGluLnJlYWQoYnVmKSkgPiAwKSB7CisgICAgICAgICAgICAgIG1kLnB1dEJ5dGVzKGJ1ZiwgMCwgbik7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICAgIGluLmNsb3NlKCk7CiAgICAgICAgICAgfQotICAgICAgICB9IGZpbmFsbHkgewotICAgICAgICAgIGluLmNsb3NlKCk7CisgICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIkZhaWxlZCByZWFkaW5nICIgKyBzcmMsIGUpOwogICAgICAgICB9Ci0gICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiRmFpbGVkIHJlYWRpbmcgIiArIHNyYywgZSk7CisgICAgICAgIHNyYyArPSAiP2NvbnRlbnQ9IiArIG1kLmhhc2goKS50b1N0cmluZygpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgbG9nLmRlYnVnKCJObyAiICsgc3JjICsgIiBpbiB3ZWJhcHAgcm9vdDsga2VlcGluZyBub25jYWNoZS5qcyBVUkwiKTsKICAgICAgIH0KLSAgICAgIGZpbmFsIFN0cmluZyBpZCA9IE9iamVjdElkLmZyb21SYXcobWQuZGlnZXN0KCkpLm5hbWUoKTsKLSAgICAgIG5vQ2FjaGVOYW1lID0gc3JjICsgIj9jb250ZW50PSIgKyBpZDsKLSAgICAgIHNlbGVjdG9yLmluaXQoc2VydmxldENvbnRleHQpOwogICAgIH0KIAorICAgIG5vQ2FjaGVOYW1lID0gc3JjOworICAgIHNlbGVjdG9yID0gbmV3IFBlcm11dGF0aW9uU2VsZWN0b3IoImdlcnJpdF91aSIpOworICAgIGlmIChjaGVja1VzZXJBZ2VudCAmJiAhSVNfREVWKSB7CisgICAgICBzZWxlY3Rvci5pbml0KHNlcnZsZXRDb250ZXh0KTsKKyAgICB9CiAgICAgcGFnZSA9IG5ldyBQYWdlKCk7CiAgIH0KIApAQCAtMTYyLDE4ICsxNzEsMTYgQEAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGRvR2V0KGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCiAgICAgICBmaW5hbCBIdHRwU2VydmxldFJlc3BvbnNlIHJzcCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBQYWdlLkNvbnRlbnQgcGFnZSA9IGdldCgpLmdldChzZWxlY3QocmVxKSk7Ci0gICAgZmluYWwgYnl0ZVtdIHJhdzsKLQorICAgIGZpbmFsIFBhZ2UuQ29udGVudCBwYWdlID0gc2VsZWN0KHJlcSk7CisgICAgZmluYWwgU3RyaW5nV3JpdGVyIHcgPSBuZXcgU3RyaW5nV3JpdGVyKCk7CiAgICAgZmluYWwgQ3VycmVudFVzZXIgdXNlciA9IGN1cnJlbnRVc2VyLmdldCgpOwogICAgIGlmICh1c2VyIGluc3RhbmNlb2YgSWRlbnRpZmllZFVzZXIpIHsKLSAgICAgIGZpbmFsIFN0cmluZ1dyaXRlciB3ID0gbmV3IFN0cmluZ1dyaXRlcigpOwogICAgICAgdy53cml0ZShIUERfSUQgKyAiLmFjY291bnQ9Iik7CiAgICAgICBqc29uKCgoSWRlbnRpZmllZFVzZXIpIHVzZXIpLmdldEFjY291bnQoKSwgdyk7CiAgICAgICB3LndyaXRlKCI7Iik7CiAKLSAgICAgIHcud3JpdGUoSFBEX0lEICsgIi54c3JmVG9rZW49Iik7Ci0gICAgICBqc29uKHNlc3Npb24uZ2V0KCkuZ2V0VG9rZW4oKSwgdyk7CisgICAgICB3LndyaXRlKEhQRF9JRCArICIueEdlcnJpdEF1dGg9Iik7CisgICAgICBqc29uKHNlc3Npb24uZ2V0KCkuZ2V0WEdlcnJpdEF1dGgoKSwgdyk7CiAgICAgICB3LndyaXRlKCI7Iik7CiAKICAgICAgIHcud3JpdGUoSFBEX0lEICsgIi5hY2NvdW50RGlmZlByZWY9Iik7CkBAIC0xODMsMjQgKzE5MCwyNCBAQAogICAgICAgdy53cml0ZShIUERfSUQgKyAiLnRoZW1lPSIpOwogICAgICAganNvbihzaWduZWRJblRoZW1lLCB3KTsKICAgICAgIHcud3JpdGUoIjsiKTsKLQotICAgICAgZmluYWwgYnl0ZVtdIHVzZXJEYXRhID0gdy50b1N0cmluZygpLmdldEJ5dGVzKCJVVEYtOCIpOwotICAgICAgcmF3ID0gY29uY2F0KHBhZ2UucGFydDEsIHVzZXJEYXRhLCBwYWdlLnBhcnQyKTsKICAgICB9IGVsc2UgewotICAgICAgcmF3ID0gcGFnZS5mdWxsOworICAgICAgdy53cml0ZShIUERfSUQgKyAiLnRoZW1lPSIpOworICAgICAganNvbihzaWduZWRPdXRUaGVtZSwgdyk7CisgICAgICB3LndyaXRlKCI7Iik7CiAgICAgfQorICAgIHBsdWdpbnModyk7CiAKKyAgICBmaW5hbCBieXRlW10gaHBkID0gdy50b1N0cmluZygpLmdldEJ5dGVzKCJVVEYtOCIpOworICAgIGZpbmFsIGJ5dGVbXSByYXcgPSBCeXRlcy5jb25jYXQocGFnZS5wYXJ0MSwgaHBkLCBwYWdlLnBhcnQyKTsKICAgICBmaW5hbCBieXRlW10gdG9zZW5kOwogICAgIGlmIChSUENTZXJ2bGV0VXRpbHMuYWNjZXB0c0d6aXBFbmNvZGluZyhyZXEpKSB7CiAgICAgICByc3Auc2V0SGVhZGVyKCJDb250ZW50LUVuY29kaW5nIiwgImd6aXAiKTsKLSAgICAgIHRvc2VuZCA9IHJhdyA9PSBwYWdlLmZ1bGwgPyBwYWdlLmZ1bGxfZ3ogOiBIdG1sRG9tVXRpbC5jb21wcmVzcyhyYXcpOworICAgICAgdG9zZW5kID0gSHRtbERvbVV0aWwuY29tcHJlc3MocmF3KTsKICAgICB9IGVsc2UgewogICAgICAgdG9zZW5kID0gcmF3OwogICAgIH0KIAotICAgIHJzcC5zZXRIZWFkZXIoIkV4cGlyZXMiLCAiRnJpLCAwMSBKYW4gMTk4MCAwMDowMDowMCBHTVQiKTsKLSAgICByc3Auc2V0SGVhZGVyKCJQcmFnbWEiLCAibm8tY2FjaGUiKTsKLSAgICByc3Auc2V0SGVhZGVyKCJDYWNoZS1Db250cm9sIiwgIm5vLWNhY2hlLCBtdXN0LXJldmFsaWRhdGUiKTsKKyAgICBDYWNoZUhlYWRlcnMuc2V0Tm90Q2FjaGVhYmxlKHJzcCk7CiAgICAgcnNwLnNldENvbnRlbnRUeXBlKCJ0ZXh0L2h0bWwiKTsKICAgICByc3Auc2V0Q2hhcmFjdGVyRW5jb2RpbmcoSHRtbERvbVV0aWwuRU5DKTsKICAgICByc3Auc2V0Q29udGVudExlbmd0aCh0b3NlbmQubGVuZ3RoKTsKQEAgLTIxMiwyOSArMjE5LDMxIEBACiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSBQZXJtdXRhdGlvbiBzZWxlY3QoZmluYWwgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgewotICAgIGlmICgiMCIuZXF1YWxzKHJlcS5nZXRQYXJhbWV0ZXIoInMiKSkpIHsKKyAgcHJpdmF0ZSB2b2lkIHBsdWdpbnMoU3RyaW5nV3JpdGVyIHcpIHsKKyAgICBMaXN0PFN0cmluZz4gdXJscyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIGZvciAoV2ViVWlQbHVnaW4gdSA6IHBsdWdpbnMpIHsKKyAgICAgIHVybHMuYWRkKFN0cmluZy5mb3JtYXQoInBsdWdpbnMvJXMvJXMiLAorICAgICAgICAgIHUuZ2V0UGx1Z2luTmFtZSgpLAorICAgICAgICAgIHUuZ2V0SmF2YVNjcmlwdFJlc291cmNlUGF0aCgpKSk7CisgICAgfQorICAgIGlmICghdXJscy5pc0VtcHR5KCkpIHsKKyAgICAgIHcud3JpdGUoSFBEX0lEICsgIi5wbHVnaW5zPSIpOworICAgICAganNvbih1cmxzLCB3KTsKKyAgICAgIHcud3JpdGUoIjsiKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIFBhZ2UuQ29udGVudCBzZWxlY3QoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgeworICAgIFBhZ2UgcGcgPSBnZXQoKTsKKyAgICBpZiAoIjEiLmVxdWFscyhyZXEuZ2V0UGFyYW1ldGVyKCJkYmciKSkpIHsKKyAgICAgIHJldHVybiBwZy5kZWJ1ZzsKKyAgICB9IGVsc2UgaWYgKCIwIi5lcXVhbHMocmVxLmdldFBhcmFtZXRlcigicyIpKSkgewogICAgICAgLy8gSWYgcz0wIGlzIHVzZWQgaW4gdGhlIFVSTCwgdGhlIHVzZXIgaGFzIGV4cGxpY2l0bHkgYXNrZWQgdXMKICAgICAgIC8vIHRvIG5vdCBwZXJmb3JtIHNlbGVjdGlvbiBvbiB0aGUgc2VydmVyIHNpZGUsIHBlcmhhcHMgZHVlIHRvCiAgICAgICAvLyBpdCBpbmNvcnJlY3RseSBndWVzc2luZyB0aGVpciB1c2VyIGFnZW50LgotICAgICAgLy8KLSAgICAgIHJldHVybiBudWxsOworICAgICAgcmV0dXJuIHBnLmdldChudWxsKTsKICAgICB9Ci0gICAgcmV0dXJuIHNlbGVjdG9yLnNlbGVjdChyZXEpOwotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgYnl0ZVtdIGNvbmNhdChieXRlW10gcDEsIGJ5dGVbXSBwMiwgYnl0ZVtdIHAzKSB7Ci0gICAgZmluYWwgYnl0ZVtdIHIgPSBuZXcgYnl0ZVtwMS5sZW5ndGggKyBwMi5sZW5ndGggKyBwMy5sZW5ndGhdOwotICAgIGludCBwID0gMDsKLSAgICBwID0gYXBwZW5kKHAxLCByLCBwKTsKLSAgICBwID0gYXBwZW5kKHAyLCByLCBwKTsKLSAgICBwID0gYXBwZW5kKHAzLCByLCBwKTsKLSAgICByZXR1cm4gcjsKLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIGludCBhcHBlbmQoYnl0ZVtdIHNyYywgZmluYWwgYnl0ZVtdIGRzdCwgaW50IHApIHsKLSAgICBTeXN0ZW0uYXJyYXljb3B5KHNyYywgMCwgZHN0LCBwLCBzcmMubGVuZ3RoKTsKLSAgICByZXR1cm4gcCArIHNyYy5sZW5ndGg7CisgICAgcmV0dXJuIHBnLmdldChzZWxlY3Rvci5zZWxlY3QocmVxKSk7CiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBjbGFzcyBGaWxlSW5mbyB7CkBAIC0yNTYsNiArMjY1LDcgQEAKICAgICBwcml2YXRlIGZpbmFsIEZpbGVJbmZvIGhlYWRlcjsKICAgICBwcml2YXRlIGZpbmFsIEZpbGVJbmZvIGZvb3RlcjsKICAgICBwcml2YXRlIGZpbmFsIE1hcDxQZXJtdXRhdGlvbiwgQ29udGVudD4gcGVybXV0YXRpb25zOworICAgIHByaXZhdGUgZmluYWwgQ29udGVudCBkZWJ1ZzsKIAogICAgIFBhZ2UoKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgICAgRG9jdW1lbnQgaG9zdERvYyA9IEh0bWxEb21VdGlsLmNsb25lKHRlbXBsYXRlKTsKQEAgLTI4OCw4ICsyOTgsMTIgQEAKIAogICAgICAgRWxlbWVudCBub2NhY2hlID0gSHRtbERvbVV0aWwuZmluZChob3N0RG9jLCAiZ2Vycml0X21vZHVsZSIpOwogICAgICAgYXNTY3JpcHQobm9jYWNoZSk7CisgICAgICBub2NhY2hlLnJlbW92ZUF0dHJpYnV0ZSgiaWQiKTsKICAgICAgIG5vY2FjaGUuc2V0QXR0cmlidXRlKCJzcmMiLCBub0NhY2hlTmFtZSk7CiAgICAgICBwZXJtdXRhdGlvbnMucHV0KG51bGwsIG5ldyBDb250ZW50KGhvc3REb2MpKTsKKworICAgICAgbm9jYWNoZS5zZXRBdHRyaWJ1dGUoInNyYyIsICJnZXJyaXRfdWkvZ2Vycml0X2RiZy5ub2NhY2hlLmpzIik7CisgICAgICBkZWJ1ZyA9IG5ldyBDb250ZW50KGhvc3REb2MpOwogICAgIH0KIAogICAgIENvbnRlbnQgZ2V0KFBlcm11dGF0aW9uIHApIHsKQEAgLTMwNSw3ICszMTksNiBAQAogICAgIH0KIAogICAgIHByaXZhdGUgdm9pZCBhc1NjcmlwdChmaW5hbCBFbGVtZW50IHNjcmlwdE5vZGUpIHsKLSAgICAgIHNjcmlwdE5vZGUucmVtb3ZlQXR0cmlidXRlKCJpZCIpOwogICAgICAgc2NyaXB0Tm9kZS5zZXRBdHRyaWJ1dGUoInR5cGUiLCAidGV4dC9qYXZhc2NyaXB0Iik7CiAgICAgICBzY3JpcHROb2RlLnNldEF0dHJpYnV0ZSgibGFuZ3VhZ2UiLCAiamF2YXNjcmlwdCIpOwogICAgIH0KQEAgLTMxMyw4ICszMjYsNiBAQAogICAgIGNsYXNzIENvbnRlbnQgewogICAgICAgZmluYWwgYnl0ZVtdIHBhcnQxOwogICAgICAgZmluYWwgYnl0ZVtdIHBhcnQyOwotICAgICAgZmluYWwgYnl0ZVtdIGZ1bGw7Ci0gICAgICBmaW5hbCBieXRlW10gZnVsbF9nejsKIAogICAgICAgQ29udGVudChEb2N1bWVudCBob3N0RG9jKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgICAgICBmaW5hbCBTdHJpbmcgcmF3ID0gSHRtbERvbVV0aWwudG9TdHJpbmcoaG9zdERvYyk7CkBAIC0zMjQsMTUgKzMzNSw2IEBACiAgICAgICAgIH0KICAgICAgICAgcGFydDEgPSByYXcuc3Vic3RyaW5nKDAsIHApLmdldEJ5dGVzKCJVVEYtOCIpOwogICAgICAgICBwYXJ0MiA9IHJhdy5zdWJzdHJpbmcocmF3LmluZGV4T2YoJz4nLCBwKSArIDEpLmdldEJ5dGVzKCJVVEYtOCIpOwotCi0gICAgICAgIGZpbmFsIFN0cmluZ1dyaXRlciB3ID0gbmV3IFN0cmluZ1dyaXRlcigpOwotICAgICAgICB3LndyaXRlKEhQRF9JRCArICIudGhlbWU9Iik7Ci0gICAgICAgIGpzb24oc2lnbmVkT3V0VGhlbWUsIHcpOwotICAgICAgICB3LndyaXRlKCI7Iik7Ci0KLSAgICAgICAgZmluYWwgYnl0ZVtdIHRoZW1lRGF0YSA9IHcudG9TdHJpbmcoKS5nZXRCeXRlcygiVVRGLTgiKTsKLSAgICAgICAgZnVsbCA9IGNvbmNhdChwYXJ0MSwgdGhlbWVEYXRhLCBwYXJ0Mik7Ci0gICAgICAgIGZ1bGxfZ3ogPSBIdG1sRG9tVXRpbC5jb21wcmVzcyhmdWxsKTsKICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9MZWdhY3lHZXJyaXRTZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvTGVnYWN5R2Vycml0U2VydmxldC5qYXZhCmluZGV4IGQzODdmNmUuLjc5YzJhZWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9MZWdhY3lHZXJyaXRTZXJ2bGV0LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0xlZ2FjeUdlcnJpdFNlcnZsZXQuamF2YQpAQCAtMTUsNiArMTUsNyBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yYXc7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5IdG1sRG9tVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNlcnZlci5DYWNoZUhlYWRlcnM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLnNlcnZlci5SUENTZXJ2bGV0VXRpbHM7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKQEAgLTY2LDkgKzY3LDcgQEAKICAgICAgIHRvc2VuZCA9IHJhdzsKICAgICB9CiAKLSAgICByc3Auc2V0SGVhZGVyKCJFeHBpcmVzIiwgIkZyaSwgMDEgSmFuIDE5ODAgMDA6MDA6MDAgR01UIik7Ci0gICAgcnNwLnNldEhlYWRlcigiUHJhZ21hIiwgIm5vLWNhY2hlIik7Ci0gICAgcnNwLnNldEhlYWRlcigiQ2FjaGUtQ29udHJvbCIsICJuby1jYWNoZSwgbXVzdC1yZXZhbGlkYXRlIik7CisgICAgQ2FjaGVIZWFkZXJzLnNldE5vdENhY2hlYWJsZShyc3ApOwogICAgIHJzcC5zZXRDb250ZW50VHlwZSgidGV4dC9odG1sIik7CiAgICAgcnNwLnNldENoYXJhY3RlckVuY29kaW5nKEh0bWxEb21VdGlsLkVOQyk7CiAgICAgcnNwLnNldENvbnRlbnRMZW5ndGgodG9zZW5kLmxlbmd0aCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvU3NoSW5mb1NlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9Tc2hJbmZvU2VydmxldC5qYXZhCmluZGV4IDYwNzhjNGUuLjU3NTY4ODAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9Tc2hJbmZvU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9Tc2hJbmZvU2VydmxldC5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJhdzsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guU3NoSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dGV4cHVpLnNlcnZlci5DYWNoZUhlYWRlcnM7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKIApAQCAtNjAsMTAgKzYxLDYgQEAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGRvR2V0KGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCiAgICAgICBmaW5hbCBIdHRwU2VydmxldFJlc3BvbnNlIHJzcCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICByc3Auc2V0SGVhZGVyKCJFeHBpcmVzIiwgIkZyaSwgMDEgSmFuIDE5ODAgMDA6MDA6MDAgR01UIik7Ci0gICAgcnNwLnNldEhlYWRlcigiUHJhZ21hIiwgIm5vLWNhY2hlIik7Ci0gICAgcnNwLnNldEhlYWRlcigiQ2FjaGUtQ29udHJvbCIsICJuby1jYWNoZSwgbXVzdC1yZXZhbGlkYXRlIik7Ci0KICAgICBmaW5hbCBMaXN0PEhvc3RLZXk+IGhvc3RLZXlzID0gc3NoZC5nZXRIb3N0S2V5cygpOwogICAgIGZpbmFsIFN0cmluZyBvdXQ7CiAgICAgaWYgKCFob3N0S2V5cy5pc0VtcHR5KCkpIHsKQEAgLTg4LDYgKzg1LDcgQEAKICAgICAgIG91dCA9ICJOT1RfQVZBSUxBQkxFIjsKICAgICB9CiAKKyAgICBDYWNoZUhlYWRlcnMuc2V0Tm90Q2FjaGVhYmxlKHJzcCk7CiAgICAgcnNwLnNldENoYXJhY3RlckVuY29kaW5nKCJVVEYtOCIpOwogICAgIHJzcC5zZXRDb250ZW50VHlwZSgidGV4dC9wbGFpbiIpOwogICAgIGZpbmFsIFByaW50V3JpdGVyIHcgPSByc3AuZ2V0V3JpdGVyKCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvU3RhdGljU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L1N0YXRpY1NlcnZsZXQuamF2YQppbmRleCA5ODhkYWRiLi5iYzBhMTc0IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvU3RhdGljU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9TdGF0aWNTZXJ2bGV0LmphdmEKQEAgLTE0LDcgKzE0LDkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yYXc7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aHM7CitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zZXJ2ZXIuQ2FjaGVIZWFkZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5zZXJ2ZXIuUlBDU2VydmxldFV0aWxzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CkBAIC0yNiw3ICsyOCw4IEBACiBpbXBvcnQgamF2YS5pby5GaWxlSW5wdXRTdHJlYW07CiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLmlvLk91dHB1dFN0cmVhbTsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0OwogaW1wb3J0IGphdmEudXRpbC56aXAuR1pJUE91dHB1dFN0cmVhbTsKIAogaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldDsKQEAgLTM3LDEyICs0MCw3IEBACiBAU3VwcHJlc3NXYXJuaW5ncygic2VyaWFsIikKIEBTaW5nbGV0b24KIHB1YmxpYyBjbGFzcyBTdGF0aWNTZXJ2bGV0IGV4dGVuZHMgSHR0cFNlcnZsZXQgewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIE1BWF9BR0UgPSAxMiAqIDYwICogNjAgKiAxMDAwTC8qIG1pbGxpc2Vjb25kcyAqLzsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIENBQ0hFX0NUUkwgPQotICAgICAgInB1YmxpYywgbWF4LWFnZT0iICsgKE1BWF9BR0UgLyAxMDAwTCk7Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gTUlNRV9UWVBFUyA9Ci0gICAgICBuZXcgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oKTsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTWFwPFN0cmluZywgU3RyaW5nPiBNSU1FX1RZUEVTID0gTWFwcy5uZXdIYXNoTWFwKCk7CiAgIHN0YXRpYyB7CiAgICAgTUlNRV9UWVBFUy5wdXQoImh0bWwiLCAidGV4dC9odG1sIik7CiAgICAgTUlNRV9UWVBFUy5wdXQoImh0bSIsICJ0ZXh0L2h0bWwiKTsKQEAgLTE0Nyw2ICsxNDUsNyBAQAogICAgICAgZmluYWwgSHR0cFNlcnZsZXRSZXNwb25zZSByc3ApIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAgICAgZmluYWwgRmlsZSBwID0gbG9jYWwocmVxKTsKICAgICBpZiAocCA9PSBudWxsKSB7CisgICAgICBDYWNoZUhlYWRlcnMuc2V0Tm90Q2FjaGVhYmxlKHJzcCk7CiAgICAgICByc3Auc2V0U3RhdHVzKEh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfTk9UX0ZPVU5EKTsKICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xNjEsOCArMTYwLDcgQEAKICAgICAgIHRvc2VuZCA9IHJlYWRGaWxlKHApOwogICAgIH0KIAotICAgIHJzcC5zZXRIZWFkZXIoIkNhY2hlLUNvbnRyb2wiLCBDQUNIRV9DVFJMKTsKLSAgICByc3Auc2V0RGF0ZUhlYWRlcigiRXhwaXJlcyIsIFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpICsgTUFYX0FHRSk7CisgICAgQ2FjaGVIZWFkZXJzLnNldENhY2hlYWJsZShyZXEsIHJzcCwgMTIsIFRpbWVVbml0LkhPVVJTKTsKICAgICByc3Auc2V0RGF0ZUhlYWRlcigiTGFzdC1Nb2RpZmllZCIsIHAubGFzdE1vZGlmaWVkKCkpOwogICAgIHJzcC5zZXRDb250ZW50VHlwZSh0eXBlKTsKICAgICByc3Auc2V0Q29udGVudExlbmd0aCh0b3NlbmQubGVuZ3RoKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9UaGVtZUZhY3RvcnkuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9UaGVtZUZhY3RvcnkuamF2YQppbmRleCA5NzIzNjc0Li45ZTg5ZWVlIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvVGhlbWVGYWN0b3J5LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L1RoZW1lRmFjdG9yeS5qYXZhCkBAIC0zOCwxMSArMzgsMTEgQEAKIAogICBwcml2YXRlIEhvc3RQYWdlRGF0YS5UaGVtZSBnZXRUaGVtZShTdHJpbmcgbmFtZSkgewogICAgIEhvc3RQYWdlRGF0YS5UaGVtZSB0aGVtZSA9IG5ldyBIb3N0UGFnZURhdGEuVGhlbWUoKTsKLSAgICB0aGVtZS5iYWNrZ3JvdW5kQ29sb3IgPSBjb2xvcihuYW1lLCAiYmFja2dyb3VuZENvbG9yIiwgIiNGQ0ZFRUYiKTsKLSAgICB0aGVtZS50ZXh0Q29sb3IgPSBjb2xvcihuYW1lLCAidGV4dENvbG9yIiwgIiMwMDAwMDAiKTsKLSAgICB0aGVtZS50cmltQ29sb3IgPSBjb2xvcihuYW1lLCAidHJpbUNvbG9yIiwgIiNENEU5QTkiKTsKLSAgICB0aGVtZS5zZWxlY3Rpb25Db2xvciA9IGNvbG9yKG5hbWUsICJzZWxlY3Rpb25Db2xvciIsICIjRkZGRkNDIik7Ci0gICAgdGhlbWUudG9wTWVudUNvbG9yID0gY29sb3IobmFtZSwgInRvcE1lbnVDb2xvciIsIHRoZW1lLnRyaW1Db2xvcik7CisgICAgdGhlbWUuYmFja2dyb3VuZENvbG9yID0gY29sb3IobmFtZSwgImJhY2tncm91bmRDb2xvciIsICIjRkZGRkZGIik7CisgICAgdGhlbWUudGV4dENvbG9yID0gY29sb3IobmFtZSwgInRleHRDb2xvciIsICIjMzUzNTM1Iik7CisgICAgdGhlbWUudHJpbUNvbG9yID0gY29sb3IobmFtZSwgInRyaW1Db2xvciIsICIjRUVFRUVFIik7CisgICAgdGhlbWUuc2VsZWN0aW9uQ29sb3IgPSBjb2xvcihuYW1lLCAic2VsZWN0aW9uQ29sb3IiLCAiI0Q4RURGOSIpOworICAgIHRoZW1lLnRvcE1lbnVDb2xvciA9IGNvbG9yKG5hbWUsICJ0b3BNZW51Q29sb3IiLCAiI0ZGRkZGRiIpOwogICAgIHRoZW1lLmNoYW5nZVRhYmxlT3V0ZGF0ZWRDb2xvciA9IGNvbG9yKG5hbWUsICJjaGFuZ2VUYWJsZU91dGRhdGVkQ29sb3IiLCAiI0YwODA4MCIpOwogICAgIHRoZW1lLnRhYmxlT2RkUm93Q29sb3IgPSBjb2xvcihuYW1lLCAidGFibGVPZGRSb3dDb2xvciIsICJ0cmFuc3BhcmVudCIpOwogICAgIHRoZW1lLnRhYmxlRXZlblJvd0NvbG9yID0gY29sb3IobmFtZSwgInRhYmxlRXZlblJvd0NvbG9yIiwgInRyYW5zcGFyZW50Iik7CkBAIC01NCwxMSArNTQsNyBAQAogICAgIGlmICh2ID09IG51bGwgfHwgdi5pc0VtcHR5KCkpIHsKICAgICAgIHYgPSBjZmcuZ2V0U3RyaW5nKCJ0aGVtZSIsIG51bGwsIG5hbWUpOwogICAgICAgaWYgKHYgPT0gbnVsbCB8fCB2LmlzRW1wdHkoKSkgewotICAgICAgICBpZiAoInNpZ25lZC1pbiIuZXF1YWxzKHNlY3Rpb24pICYmICJiYWNrZ3JvdW5kQ29sb3IiLmVxdWFscyhuYW1lKSkgewotICAgICAgICAgIHYgPSAiI0ZGRkZGRiI7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgdiA9IGRlZmF1bHRWYWx1ZTsKLSAgICAgICAgfQorICAgICAgICB2ID0gZGVmYXVsdFZhbHVlOwogICAgICAgfQogICAgIH0KICAgICBpZiAoIXYuc3RhcnRzV2l0aCgiIyIpICYmIHYubWF0Y2hlcygiXlswLTlhLWZBLUZdezIsNn0kIikpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jlc3RhcGkvUGFyYW1ldGVyUGFyc2VyLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yZXN0YXBpL1BhcmFtZXRlclBhcnNlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRhYmZmYzAKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yZXN0YXBpL1BhcmFtZXRlclBhcnNlci5qYXZhCkBAIC0wLDAgKzEsMjE2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucmVzdGFwaTsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yZXN0YXBpLlJlc3RBcGlTZXJ2bGV0LnJlcGx5QmluYXJ5UmVzdWx0OworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yZXN0YXBpLlJlc3RBcGlTZXJ2bGV0LnJlcGx5RXJyb3I7CitpbXBvcnQgc3RhdGljIGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlc3BvbnNlLlNDX0JBRF9SRVFVRVNUOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYW5ub3RhdGlvbnMuVmlzaWJsZUZvclRlc3Rpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TcGxpdHRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JdGVyYWJsZXM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJpbmFyeVJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVXJsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnV0aWwuY2xpLkNtZExpbmVQYXJzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25BcnJheTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24uSnNvbkVsZW1lbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25PYmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25QcmltaXRpdmU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLkNtZExpbmVFeGNlcHRpb247CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuaW8uU3RyaW5nV3JpdGVyOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK2ltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXF1ZXN0OworaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlc3BvbnNlOworCitjbGFzcyBQYXJhbWV0ZXJQYXJzZXIgeworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBJbW11dGFibGVTZXQ8U3RyaW5nPiBSRVNFUlZFRF9LRVlTID0gSW1tdXRhYmxlU2V0Lm9mKAorICAgICAgInBwIiwgInByZXR0eVByaW50IiwgInN0cmljdCIsICJjYWxsYmFjayIsICJhbHQiLCAiZmllbGRzIik7CisKKyAgcHJpdmF0ZSBmaW5hbCBDbWRMaW5lUGFyc2VyLkZhY3RvcnkgcGFyc2VyRmFjdG9yeTsKKworICBASW5qZWN0CisgIFBhcmFtZXRlclBhcnNlcihDbWRMaW5lUGFyc2VyLkZhY3RvcnkgcGYpIHsKKyAgICB0aGlzLnBhcnNlckZhY3RvcnkgPSBwZjsKKyAgfQorCisgIDxUPiBib29sZWFuIHBhcnNlKFQgcGFyYW0sCisgICAgICBNdWx0aW1hcDxTdHJpbmcsIFN0cmluZz4gaW4sCisgICAgICBIdHRwU2VydmxldFJlcXVlc3QgcmVxLAorICAgICAgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMpCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIENtZExpbmVQYXJzZXIgY2xwID0gcGFyc2VyRmFjdG9yeS5jcmVhdGUocGFyYW0pOworICAgIHRyeSB7CisgICAgICBjbHAucGFyc2VPcHRpb25NYXAoaW4pOworICAgIH0gY2F0Y2ggKENtZExpbmVFeGNlcHRpb24gZSkgeworICAgICAgaWYgKCFjbHAud2FzSGVscFJlcXVlc3RlZEJ5T3B0aW9uKCkpIHsKKyAgICAgICAgcmVwbHlFcnJvcihyZXMsIFNDX0JBRF9SRVFVRVNULCBlLmdldE1lc3NhZ2UoKSk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoY2xwLndhc0hlbHBSZXF1ZXN0ZWRCeU9wdGlvbigpKSB7CisgICAgICBTdHJpbmdXcml0ZXIgbXNnID0gbmV3IFN0cmluZ1dyaXRlcigpOworICAgICAgY2xwLnByaW50UXVlcnlTdHJpbmdVc2FnZShyZXEuZ2V0UmVxdWVzdFVSSSgpLCBtc2cpOworICAgICAgbXNnLndyaXRlKCdcbicpOworICAgICAgbXNnLndyaXRlKCdcbicpOworICAgICAgY2xwLnByaW50VXNhZ2UobXNnLCBudWxsKTsKKyAgICAgIG1zZy53cml0ZSgnXG4nKTsKKyAgICAgIHJlcGx5QmluYXJ5UmVzdWx0KHJlcSwgcmVzLAorICAgICAgICAgIEJpbmFyeVJlc3VsdC5jcmVhdGUobXNnLnRvU3RyaW5nKCkpLnNldENvbnRlbnRUeXBlKCJ0ZXh0L3BsYWluIikpOworICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIHJldHVybiB0cnVlOworICB9CisKKyAgc3RhdGljIHZvaWQgc3BsaXRRdWVyeVN0cmluZyhTdHJpbmcgcXVlcnlTdHJpbmcsCisgICAgICBNdWx0aW1hcDxTdHJpbmcsIFN0cmluZz4gY29uZmlnLAorICAgICAgTXVsdGltYXA8U3RyaW5nLCBTdHJpbmc+IHBhcmFtcykgeworICAgIGlmICghU3RyaW5ncy5pc051bGxPckVtcHR5KHF1ZXJ5U3RyaW5nKSkgeworICAgICAgZm9yIChTdHJpbmcga3ZQYWlyIDogU3BsaXR0ZXIub24oJyYnKS5zcGxpdChxdWVyeVN0cmluZykpIHsKKyAgICAgICAgSXRlcmF0b3I8U3RyaW5nPiBpID0gU3BsaXR0ZXIub24oJz0nKS5saW1pdCgyKS5zcGxpdChrdlBhaXIpLml0ZXJhdG9yKCk7CisgICAgICAgIFN0cmluZyBrZXkgPSBVcmwuZGVjb2RlKGkubmV4dCgpKTsKKyAgICAgICAgU3RyaW5nIHZhbCA9IGkuaGFzTmV4dCgpID8gVXJsLmRlY29kZShpLm5leHQoKSkgOiAiIjsKKyAgICAgICAgaWYgKFJFU0VSVkVEX0tFWVMuY29udGFpbnMoa2V5KSkgeworICAgICAgICAgIGNvbmZpZy5wdXQoa2V5LCB2YWwpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIHBhcmFtcy5wdXQoa2V5LCB2YWwpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgU2V0PFN0cmluZz4gcXVlcnkoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgeworICAgIFNldDxTdHJpbmc+IHBhcmFtcyA9IFNldHMubmV3SGFzaFNldCgpOworICAgIGlmICghU3RyaW5ncy5pc051bGxPckVtcHR5KHJlcS5nZXRRdWVyeVN0cmluZygpKSkgeworICAgICAgZm9yIChTdHJpbmcga3ZQYWlyIDogU3BsaXR0ZXIub24oJyYnKS5zcGxpdChyZXEuZ2V0UXVlcnlTdHJpbmcoKSkpIHsKKyAgICAgICAgcGFyYW1zLmFkZChJdGVyYWJsZXMuZ2V0Rmlyc3QoCisgICAgICAgICAgICBTcGxpdHRlci5vbignPScpLmxpbWl0KDIpLnNwbGl0KGt2UGFpciksCisgICAgICAgICAgICBudWxsKSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBwYXJhbXM7CisgIH0KKworICAvKioKKyAgICogQ29udmVydCBhIHN0YW5kYXJkIFVSTCBlbmNvZGVkIGZvcm0gaW5wdXQgaW50byBhIHBhcnNlZCBKU09OIHRyZWUuCisgICAqIDxwPgorICAgKiBHaXZlbiBhbiBpbnB1dCBzdWNoIGFzOgorICAgKgorICAgKiA8cHJlPgorICAgKiBtZXNzYWdlPURvZXMrbm90K2NvbXBpbGUuJmxhYmVscy5WZXJpZmllZD0tMQorICAgKiA8L3ByZT4KKyAgICoKKyAgICogd2hpY2ggaXMgZWFzaWx5IGNyZWF0ZWQgdXNpbmcgdGhlIGN1cmwgY29tbWFuZCBsaW5lIHRvb2w6CisgICAqCisgICAqIDxwcmU+CisgICAqIGN1cmwgLS1kYXRhICdtZXNzYWdlPURvZXMgbm90IGNvbXBpbGUuJyAtLWRhdGEgbGFiZWxzLlZlcmlmaWVkPS0xCisgICAqIDwvcHJlPgorICAgKgorICAgKiBjb252ZXJ0cyB0byBhIEpTT04gb2JqZWN0IHN0cnVjdHVyZSB0aGF0IGlzIG5vcm1hbGx5IGV4cGVjdGVkOgorICAgKgorICAgKiA8cHJlPgorICAgKiB7CisgICAqICAgIm1lc3NhZ2UiOiAiRG9lcyBub3QgY29tcGlsZS4iLAorICAgKiAgICJsYWJlbHMiOiB7CisgICAqICAgICAiVmVyaWZpZWQiOiAiLTEiCisgICAqICAgfQorICAgKiB9CisgICAqIDwvcHJlPgorICAgKgorICAgKiBUaGlzIGlucHV0IGNhbiB0aGVuIGJlIGZ1cnRoZXIgcHJvY2Vzc2VkIGludG8gdGhlIEphdmEgaW5wdXQgdHlwZSBleHBlY3RlZAorICAgKiBieSBhIHZpZXcgdXNpbmcgR3Nvbi4gSGVyZSB3ZSByZWx5IG9uIEdzb24gdG8gcGVyZm9ybSBpbXBsaWNpdCBjb252ZXJzaW9uCisgICAqIG9mIGEgc3RyaW5nIHtAY29kZSAiLTEifSB0byBhIG51bWJlciB0eXBlIHdoZW4gdGhlIEphdmEgaW5wdXQgdHlwZSBleHBlY3RzCisgICAqIGEgbnVtYmVyLgorICAgKiA8cD4KKyAgICogQ29udmVyc2lvbiBhc3N1bWVzIGFueSBmaWVsZCBuYW1lIHRoYXQgZG9lcyBub3QgY29udGFpbiB7QGNvZGUgIi4ifSB3aWxsIGJlCisgICAqIGEgcHJvcGVydHkgb2YgdGhlIHRvcCBsZXZlbCBpbnB1dCBvYmplY3QuIEFueSBmaWVsZCB3aXRoIGEgZG90IHdpbGwgdXNlIHRoZQorICAgKiBmaXJzdCBzZWdtZW50IGFzIHRoZSB0b3AgbGV2ZWwgcHJvcGVydHkgbmFtZSBuYW1pbmcgYW4gb2JqZWN0LCBhbmQgdGhlIHJlc3QKKyAgICogb2YgdGhlIGZpZWxkIG5hbWUgYXMgYSBwcm9wZXJ0eSBpbiB0aGUgbmVzdGVkIG9iamVjdC4KKyAgICoKKyAgICogQHBhcmFtIHJlcSByZXF1ZXN0IHRvIHBhcnNlIGZvcm0gaW5wdXQgZnJvbSBhbmQgY3JlYXRlIEpTT04gdHJlZS4KKyAgICogQHJldHVybiB0aGUgY29udmVydGVkIEpTT04gb2JqZWN0IHRyZWUuCisgICAqIEB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiB0aGUgcmVxdWVzdCBjYW5ub3QgYmUgY2FzdCwgYXMgdGhlcmUgYXJlCisgICAqICAgICAgICAgY29uZmxpY3RpbmcgZGVmaW5pdGlvbnMgZm9yIGEgbmVzdGVkIG9iamVjdC4KKyAgICovCisgIHN0YXRpYyBKc29uT2JqZWN0IGZvcm1Ub0pzb24oSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkKKyAgICAgIHRocm93cyBCYWRSZXF1ZXN0RXhjZXB0aW9uIHsKKyAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICBNYXA8U3RyaW5nLCBTdHJpbmdbXT4gbWFwID0gcmVxLmdldFBhcmFtZXRlck1hcCgpOworICAgIHJldHVybiBmb3JtVG9Kc29uKG1hcCwgcXVlcnkocmVxKSk7CisgIH0KKworICBAVmlzaWJsZUZvclRlc3RpbmcKKyAgc3RhdGljIEpzb25PYmplY3QgZm9ybVRvSnNvbihNYXA8U3RyaW5nLCBTdHJpbmdbXT4gbWFwLCBTZXQ8U3RyaW5nPiBxdWVyeSkKKyAgICAgIHRocm93cyBCYWRSZXF1ZXN0RXhjZXB0aW9uIHsKKyAgICBKc29uT2JqZWN0IGlucHV0T2JqZWN0ID0gbmV3IEpzb25PYmplY3QoKTsKKyAgICBmb3IgKE1hcC5FbnRyeTxTdHJpbmcsIFN0cmluZ1tdPiBlbnQgOiBtYXAuZW50cnlTZXQoKSkgeworICAgICAgU3RyaW5nIGtleSA9IGVudC5nZXRLZXkoKTsKKyAgICAgIFN0cmluZ1tdIHZhbHVlcyA9IGVudC5nZXRWYWx1ZSgpOworCisgICAgICBpZiAocXVlcnkuY29udGFpbnMoa2V5KSB8fCB2YWx1ZXMubGVuZ3RoID09IDApIHsKKyAgICAgICAgLy8gRGlzYWxsb3cgcHJvY2Vzc2luZyBxdWVyeSBwYXJhbWV0ZXJzIGFzIGlucHV0IGJvZHkgZmllbGRzLgorICAgICAgICAvLyBJbXBsZW1lbnRhdGlvbnMgb2Ygdmlld3Mgc2hvdWxkIGF2b2lkIGR1cGxpY2F0ZSBuYW1pbmcuCisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBKc29uT2JqZWN0IG9iaiA9IGlucHV0T2JqZWN0OworICAgICAgaW50IGRvdCA9IGtleS5pbmRleE9mKCcuJyk7CisgICAgICBpZiAoMCA8PSBkb3QpIHsKKyAgICAgICAgU3RyaW5nIHByb3BlcnR5ID0ga2V5LnN1YnN0cmluZygwLCBkb3QpOworICAgICAgICBKc29uRWxlbWVudCBlID0gaW5wdXRPYmplY3QuZ2V0KHByb3BlcnR5KTsKKyAgICAgICAgaWYgKGUgPT0gbnVsbCkgeworICAgICAgICAgIG9iaiA9IG5ldyBKc29uT2JqZWN0KCk7CisgICAgICAgICAgaW5wdXRPYmplY3QuYWRkKHByb3BlcnR5LCBvYmopOworICAgICAgICB9IGVsc2UgaWYgKGUuaXNKc29uT2JqZWN0KCkpIHsKKyAgICAgICAgICBvYmogPSBlLmdldEFzSnNvbk9iamVjdCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAgICJrZXkgJXMgY29uZmxpY3RzIHdpdGggJXMiLAorICAgICAgICAgICAgICBrZXksIHByb3BlcnR5KSk7CisgICAgICAgIH0KKyAgICAgICAga2V5ID0ga2V5LnN1YnN0cmluZyhkb3QgKyAxKTsKKyAgICAgIH0KKworICAgICAgaWYgKG9iai5nZXQoa2V5KSAhPSBudWxsKSB7CisgICAgICAgIC8vIFRoaXMgZXJyb3Igc2hvdWxkIG5ldmVyIGhhcHBlbi4gSWYgYWxsIGZvcm0gdmFsdWVzIGFyZSBoYW5kbGVkCisgICAgICAgIC8vIHRvZ2V0aGVyIGluIGEgc2luZ2xlIHBhc3MgcHJvcGVydGllcyBhcmUgc2V0IG9ubHkgb25jZS4gU2V0dGluZworICAgICAgICAvLyBhZ2FpbiBpbmRpY2F0ZXMgc29tZXRoaW5nIGhhcyBnb25lIHZlcnkgd3JvbmcuCisgICAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKCJpbnZhbGlkIGZvcm0gaW5wdXQsIHVzZSBKU09OIGluc3RlYWQiKTsKKyAgICAgIH0gZWxzZSBpZiAodmFsdWVzLmxlbmd0aCA9PSAxKSB7CisgICAgICAgIG9iai5hZGRQcm9wZXJ0eShrZXksIHZhbHVlc1swXSk7CisgICAgICB9IGVsc2UgeworICAgICAgICBKc29uQXJyYXkgbGlzdCA9IG5ldyBKc29uQXJyYXkoKTsKKyAgICAgICAgZm9yIChTdHJpbmcgdiA6IHZhbHVlcykgeworICAgICAgICAgIGxpc3QuYWRkKG5ldyBKc29uUHJpbWl0aXZlKHYpKTsKKyAgICAgICAgfQorICAgICAgICBvYmouYWRkKGtleSwgbGlzdCk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBpbnB1dE9iamVjdDsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmVzdGFwaS9SZXN0QXBpU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmVzdGFwaS9SZXN0QXBpU2VydmxldC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmEyYWExOTEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yZXN0YXBpL1Jlc3RBcGlTZXJ2bGV0LmphdmEKQEAgLTAsMCArMSw4NjYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yZXN0YXBpOworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuY29tbW9uLmJhc2UuQ2hhcnNldHMuVVRGXzg7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuY29tbW9uLmJhc2UuUHJlY29uZGl0aW9ucy5jaGVja05vdE51bGw7CitpbXBvcnQgc3RhdGljIGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlc3BvbnNlLlNDX0JBRF9SRVFVRVNUOworaW1wb3J0IHN0YXRpYyBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19DT05GTElDVDsKK2ltcG9ydCBzdGF0aWMgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfQ1JFQVRFRDsKK2ltcG9ydCBzdGF0aWMgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfRk9SQklEREVOOworaW1wb3J0IHN0YXRpYyBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19JTlRFUk5BTF9TRVJWRVJfRVJST1I7CitpbXBvcnQgc3RhdGljIGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlc3BvbnNlLlNDX01FVEhPRF9OT1RfQUxMT1dFRDsKK2ltcG9ydCBzdGF0aWMgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfTk9UX0ZPVU5EOworaW1wb3J0IHN0YXRpYyBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19PSzsKK2ltcG9ydCBzdGF0aWMgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2UuU0NfUFJFQ09ORElUSU9OX0ZBSUxFRDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuRnVuY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5Kb2luZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3BsaXR0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlTXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JdGVyYWJsZXM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaW5rZWRIYXNoTXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24ubmV0Lkh0dHBIZWFkZXJzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmF1ZGl0LkF1ZGl0U2VydmljZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hdWRpdC5IdHRwQXVkaXRFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlJlcXVpcmVzQ2FwYWJpbGl0eTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljTWFwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BY2NlcHRzQ3JlYXRlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BY2NlcHRzUG9zdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmluYXJ5UmVzdWx0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5EZWZhdWx0SW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLklkU3RyaW5nOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5NZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5QcmVjb25kaXRpb25GYWlsZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlB1dElucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNwb25zZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdENvbGxlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlN0cmVhbWluZ1Jlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Ub3BMZXZlbFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5VbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLldlYlNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFjY2Vzc1BhdGg7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFub255bW91c1VzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5PdXRwdXRGb3JtYXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2FwYWJpbGl0eUNvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkV4Y2x1c2lvblN0cmF0ZWd5OworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5GaWVsZEF0dHJpYnV0ZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkZpZWxkTmFtaW5nUG9saWN5OworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5Hc29uOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5Hc29uQnVpbGRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24uSnNvbkVsZW1lbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25QYXJzZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24uSnNvblByaW1pdGl2ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24uc3RyZWFtLkpzb25SZWFkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLnN0cmVhbS5Kc29uVG9rZW47CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLnN0cmVhbS5NYWxmb3JtZWRKc29uRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0ZXhwdWkuc2VydmVyLkNhY2hlSGVhZGVyczsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QudXRpbC5Qcm92aWRlcnM7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuVGVtcG9yYXJ5QnVmZmVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudXRpbC5UZW1wb3JhcnlCdWZmZXIuSGVhcDsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS5pby5CdWZmZXJlZFJlYWRlcjsKK2ltcG9ydCBqYXZhLmlvLkJ1ZmZlcmVkV3JpdGVyOworaW1wb3J0IGphdmEuaW8uRU9GRXhjZXB0aW9uOworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLmlvLk91dHB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLmlvLk91dHB1dFN0cmVhbVdyaXRlcjsKK2ltcG9ydCBqYXZhLmlvLldyaXRlcjsKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5Db25zdHJ1Y3RvcjsKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5GaWVsZDsKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOworaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0LlBhcmFtZXRlcml6ZWRUeXBlOworaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0LlR5cGU7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwucmVnZXguUGF0dGVybjsKK2ltcG9ydCBqYXZhLnV0aWwuemlwLkdaSVBPdXRwdXRTdHJlYW07CisKK2ltcG9ydCBqYXZheC5hbm5vdGF0aW9uLk51bGxhYmxlOworaW1wb3J0IGphdmF4LnNlcnZsZXQuU2VydmxldEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXQ7CitpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVxdWVzdDsKK2ltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZTsKKworcHVibGljIGNsYXNzIFJlc3RBcGlTZXJ2bGV0IGV4dGVuZHMgSHR0cFNlcnZsZXQgeworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkKKyAgICAgIC5nZXRMb2dnZXIoUmVzdEFwaVNlcnZsZXQuY2xhc3MpOworCisgIC8qKiBNSU1FIHR5cGUgdXNlZCBmb3IgYSBKU09OIHJlc3BvbnNlIGJvZHkuICovCisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBKU09OX1RZUEUgPSAiYXBwbGljYXRpb24vanNvbiI7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBGT1JNX1RZUEUgPSAiYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNvZGVkIjsKKworICAvKioKKyAgICogR2FyYmFnZSBwcmVmaXggaW5zZXJ0ZWQgYmVmb3JlIEpTT04gb3V0cHV0IHRvIHByZXZlbnQgWFNTSS4KKyAgICogPHA+CisgICAqIFRoaXMgcHJlZml4IGlzICIpXX0nXG4iIGFuZCBpcyBkZXNpZ25lZCB0byBwcmV2ZW50IGEgd2ViIGJyb3dzZXIgZnJvbQorICAgKiBleGVjdXRpbmcgdGhlIHJlc3BvbnNlIGJvZHkgaWYgdGhlIHJlc291cmNlIFVSSSB3ZXJlIHRvIGJlIHJlZmVyZW5jZWQgdXNpbmcKKyAgICogYSAmbHQ7c2NyaXB0IHNyYz0iLi4uJmd0OyBIVE1MIHRhZyBmcm9tIGFub3RoZXIgd2ViIHNpdGUuIENsaWVudHMgdXNpbmcgdGhlCisgICAqIEhUVFAgaW50ZXJmYWNlIHdpbGwgbmVlZCB0byBhbHdheXMgc3RyaXAgdGhlIGZpcnN0IGxpbmUgb2YgcmVzcG9uc2UgZGF0YSB0bworICAgKiByZW1vdmUgdGhpcyBtYWdpYyBoZWFkZXIuCisgICAqLworICBwdWJsaWMgc3RhdGljIGZpbmFsIGJ5dGVbXSBKU09OX01BR0lDOworCisgIHN0YXRpYyB7CisgICAgSlNPTl9NQUdJQyA9ICIpXX0nXG4iLmdldEJ5dGVzKFVURl84KTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgR2xvYmFscyB7CisgICAgZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IGN1cnJlbnRVc2VyOworICAgIGZpbmFsIFByb3ZpZGVyPFdlYlNlc3Npb24+IHdlYlNlc3Npb247CisgICAgZmluYWwgUHJvdmlkZXI8UGFyYW1ldGVyUGFyc2VyPiBwYXJhbVBhcnNlcjsKKyAgICBmaW5hbCBBdWRpdFNlcnZpY2UgYXVkaXRTZXJ2aWNlOworCisgICAgQEluamVjdAorICAgIEdsb2JhbHMoUHJvdmlkZXI8Q3VycmVudFVzZXI+IGN1cnJlbnRVc2VyLAorICAgICAgICBQcm92aWRlcjxXZWJTZXNzaW9uPiB3ZWJTZXNzaW9uLAorICAgICAgICBQcm92aWRlcjxQYXJhbWV0ZXJQYXJzZXI+IHBhcmFtUGFyc2VyLAorICAgICAgICBBdWRpdFNlcnZpY2UgYXVkaXRTZXJ2aWNlKSB7CisgICAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7CisgICAgICB0aGlzLndlYlNlc3Npb24gPSB3ZWJTZXNzaW9uOworICAgICAgdGhpcy5wYXJhbVBhcnNlciA9IHBhcmFtUGFyc2VyOworICAgICAgdGhpcy5hdWRpdFNlcnZpY2UgPSBhdWRpdFNlcnZpY2U7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBHbG9iYWxzIGdsb2JhbHM7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmVzdENvbGxlY3Rpb248UmVzdFJlc291cmNlLCBSZXN0UmVzb3VyY2U+PiBtZW1iZXJzOworCisgIHB1YmxpYyBSZXN0QXBpU2VydmxldChHbG9iYWxzIGdsb2JhbHMsCisgICAgICBSZXN0Q29sbGVjdGlvbjw/IGV4dGVuZHMgUmVzdFJlc291cmNlLCA/IGV4dGVuZHMgUmVzdFJlc291cmNlPiBtZW1iZXJzKSB7CisgICAgdGhpcyhnbG9iYWxzLCBQcm92aWRlcnMub2YobWVtYmVycykpOworICB9CisKKyAgcHVibGljIFJlc3RBcGlTZXJ2bGV0KEdsb2JhbHMgZ2xvYmFscywKKyAgICAgIFByb3ZpZGVyPD8gZXh0ZW5kcyBSZXN0Q29sbGVjdGlvbjw/IGV4dGVuZHMgUmVzdFJlc291cmNlLCA/IGV4dGVuZHMgUmVzdFJlc291cmNlPj4gbWVtYmVycykgeworICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICAgIFByb3ZpZGVyPFJlc3RDb2xsZWN0aW9uPFJlc3RSZXNvdXJjZSwgUmVzdFJlc291cmNlPj4gbiA9CisgICAgICAgIChQcm92aWRlcjxSZXN0Q29sbGVjdGlvbjxSZXN0UmVzb3VyY2UsIFJlc3RSZXNvdXJjZT4+KSBjaGVja05vdE51bGwoKE9iamVjdCkgbWVtYmVycyk7CisgICAgdGhpcy5nbG9iYWxzID0gZ2xvYmFsczsKKyAgICB0aGlzLm1lbWJlcnMgPSBuOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCBmaW5hbCB2b2lkIHNlcnZpY2UoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMpCisgICAgICB0aHJvd3MgU2VydmxldEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIGxvbmcgYXVkaXRTdGFydFRzID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CisgICAgQ2FjaGVIZWFkZXJzLnNldE5vdENhY2hlYWJsZShyZXMpOworICAgIHJlcy5zZXRIZWFkZXIoIkNvbnRlbnQtRGlzcG9zaXRpb24iLCAiYXR0YWNobWVudCIpOworICAgIHJlcy5zZXRIZWFkZXIoIlgtQ29udGVudC1UeXBlLU9wdGlvbnMiLCAibm9zbmlmZiIpOworICAgIGludCBzdGF0dXMgPSBTQ19PSzsKKyAgICBPYmplY3QgcmVzdWx0ID0gbnVsbDsKKyAgICBNdWx0aW1hcDxTdHJpbmcsIFN0cmluZz4gcGFyYW1zID0gTGlua2VkSGFzaE11bHRpbWFwLmNyZWF0ZSgpOworICAgIE9iamVjdCBpbnB1dFJlcXVlc3RCb2R5ID0gbnVsbDsKKworICAgIHRyeSB7CisgICAgICBjaGVja1VzZXJTZXNzaW9uKHJlcSk7CisKKyAgICAgIExpc3Q8SWRTdHJpbmc+IHBhdGggPSBzcGxpdFBhdGgocmVxKTsKKyAgICAgIFJlc3RDb2xsZWN0aW9uPFJlc3RSZXNvdXJjZSwgUmVzdFJlc291cmNlPiByYyA9IG1lbWJlcnMuZ2V0KCk7CisgICAgICBjaGVja0FjY2Vzc0Fubm90YXRpb25zKHJjLmdldENsYXNzKCkpOworCisgICAgICBSZXN0UmVzb3VyY2UgcnNyYyA9IFRvcExldmVsUmVzb3VyY2UuSU5TVEFOQ0U7CisgICAgICBSZXN0VmlldzxSZXN0UmVzb3VyY2U+IHZpZXcgPSBudWxsOworICAgICAgaWYgKHBhdGguaXNFbXB0eSgpKSB7CisgICAgICAgIGlmICgiR0VUIi5lcXVhbHMocmVxLmdldE1ldGhvZCgpKSkgeworICAgICAgICAgIHZpZXcgPSByYy5saXN0KCk7CisgICAgICAgIH0gZWxzZSBpZiAocmMgaW5zdGFuY2VvZiBBY2NlcHRzUG9zdCAmJiAiUE9TVCIuZXF1YWxzKHJlcS5nZXRNZXRob2QoKSkpIHsKKyAgICAgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgICAgICBBY2NlcHRzUG9zdDxSZXN0UmVzb3VyY2U+IGFjID0gKEFjY2VwdHNQb3N0PFJlc3RSZXNvdXJjZT4pIHJjOworICAgICAgICAgIHZpZXcgPSBhYy5wb3N0KHJzcmMpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIHRocm93IG5ldyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uKCk7CisgICAgICAgIH0KKyAgICAgIH0gZWxzZSB7CisgICAgICAgIElkU3RyaW5nIGlkID0gcGF0aC5yZW1vdmUoMCk7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgcnNyYyA9IHJjLnBhcnNlKHJzcmMsIGlkKTsKKyAgICAgICAgICBjaGVja1ByZWNvbmRpdGlvbnMocmVxLCByc3JjKTsKKyAgICAgICAgfSBjYXRjaCAoUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgaWYgKHJjIGluc3RhbmNlb2YgQWNjZXB0c0NyZWF0ZQorICAgICAgICAgICAgICAmJiBwYXRoLmlzRW1wdHkoKQorICAgICAgICAgICAgICAmJiAoIlBPU1QiLmVxdWFscyhyZXEuZ2V0TWV0aG9kKCkpCisgICAgICAgICAgICAgICAgICB8fCAiUFVUIi5lcXVhbHMocmVxLmdldE1ldGhvZCgpKSkpIHsKKyAgICAgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICAgICAgICAgICAgQWNjZXB0c0NyZWF0ZTxSZXN0UmVzb3VyY2U+IGFjID0gKEFjY2VwdHNDcmVhdGU8UmVzdFJlc291cmNlPikgcmM7CisgICAgICAgICAgICB2aWV3ID0gYWMuY3JlYXRlKHJzcmMsIGlkKTsKKyAgICAgICAgICAgIHN0YXR1cyA9IFNDX0NSRUFURUQ7CisgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHRocm93IGU7CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGlmICh2aWV3ID09IG51bGwpIHsKKyAgICAgICAgICB2aWV3ID0gdmlldyhyYywgcmVxLmdldE1ldGhvZCgpLCBwYXRoKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgY2hlY2tBY2Nlc3NBbm5vdGF0aW9ucyh2aWV3LmdldENsYXNzKCkpOworCisgICAgICB3aGlsZSAodmlldyBpbnN0YW5jZW9mIFJlc3RDb2xsZWN0aW9uPD8sPz4pIHsKKyAgICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgICAgICAgIFJlc3RDb2xsZWN0aW9uPFJlc3RSZXNvdXJjZSwgUmVzdFJlc291cmNlPiBjID0KKyAgICAgICAgICAgIChSZXN0Q29sbGVjdGlvbjxSZXN0UmVzb3VyY2UsIFJlc3RSZXNvdXJjZT4pIHZpZXc7CisKKyAgICAgICAgaWYgKHBhdGguaXNFbXB0eSgpKSB7CisgICAgICAgICAgaWYgKCJHRVQiLmVxdWFscyhyZXEuZ2V0TWV0aG9kKCkpKSB7CisgICAgICAgICAgICB2aWV3ID0gYy5saXN0KCk7CisgICAgICAgICAgfSBlbHNlIGlmIChjIGluc3RhbmNlb2YgQWNjZXB0c1Bvc3QgJiYgIlBPU1QiLmVxdWFscyhyZXEuZ2V0TWV0aG9kKCkpKSB7CisgICAgICAgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgICAgICAgIEFjY2VwdHNQb3N0PFJlc3RSZXNvdXJjZT4gYWMgPSAoQWNjZXB0c1Bvc3Q8UmVzdFJlc291cmNlPikgYzsKKyAgICAgICAgICAgIHZpZXcgPSBhYy5wb3N0KHJzcmMpOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB0aHJvdyBuZXcgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbigpOworICAgICAgICAgIH0KKyAgICAgICAgICBicmVhazsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBJZFN0cmluZyBpZCA9IHBhdGgucmVtb3ZlKDApOworICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICByc3JjID0gYy5wYXJzZShyc3JjLCBpZCk7CisgICAgICAgICAgICBjaGVja1ByZWNvbmRpdGlvbnMocmVxLCByc3JjKTsKKyAgICAgICAgICAgIHZpZXcgPSBudWxsOworICAgICAgICAgIH0gY2F0Y2ggKFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgICAgICAgaWYgKGMgaW5zdGFuY2VvZiBBY2NlcHRzQ3JlYXRlCisgICAgICAgICAgICAgICAgJiYgcGF0aC5pc0VtcHR5KCkKKyAgICAgICAgICAgICAgICAmJiAoIlBPU1QiLmVxdWFscyhyZXEuZ2V0TWV0aG9kKCkpCisgICAgICAgICAgICAgICAgICAgIHx8ICJQVVQiLmVxdWFscyhyZXEuZ2V0TWV0aG9kKCkpKSkgeworICAgICAgICAgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgICAgICAgICAgQWNjZXB0c0NyZWF0ZTxSZXN0UmVzb3VyY2U+IGFjID0gKEFjY2VwdHNDcmVhdGU8UmVzdFJlc291cmNlPikgYzsKKyAgICAgICAgICAgICAgdmlldyA9IGFjLmNyZWF0ZShyc3JjLCBpZCk7CisgICAgICAgICAgICAgIHN0YXR1cyA9IFNDX0NSRUFURUQ7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICB0aHJvdyBlOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAgICAgICAgICBpZiAodmlldyA9PSBudWxsKSB7CisgICAgICAgICAgICB2aWV3ID0gdmlldyhjLCByZXEuZ2V0TWV0aG9kKCksIHBhdGgpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBjaGVja0FjY2Vzc0Fubm90YXRpb25zKHZpZXcuZ2V0Q2xhc3MoKSk7CisgICAgICB9CisKKyAgICAgIE11bHRpbWFwPFN0cmluZywgU3RyaW5nPiBjb25maWcgPSBMaW5rZWRIYXNoTXVsdGltYXAuY3JlYXRlKCk7CisgICAgICBQYXJhbWV0ZXJQYXJzZXIuc3BsaXRRdWVyeVN0cmluZyhyZXEuZ2V0UXVlcnlTdHJpbmcoKSwgY29uZmlnLCBwYXJhbXMpOworICAgICAgaWYgKCFnbG9iYWxzLnBhcmFtUGFyc2VyLmdldCgpLnBhcnNlKHZpZXcsIHBhcmFtcywgcmVxLCByZXMpKSB7CisgICAgICAgIHJldHVybjsKKyAgICAgIH0KKworICAgICAgaWYgKHZpZXcgaW5zdGFuY2VvZiBSZXN0TW9kaWZ5Vmlldzw/LCA/PikgeworICAgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgICAgUmVzdE1vZGlmeVZpZXc8UmVzdFJlc291cmNlLCBPYmplY3Q+IG0gPQorICAgICAgICAgICAgKFJlc3RNb2RpZnlWaWV3PFJlc3RSZXNvdXJjZSwgT2JqZWN0PikgdmlldzsKKworICAgICAgICBpbnB1dFJlcXVlc3RCb2R5ID0gcGFyc2VSZXF1ZXN0KHJlcSwgaW5wdXRUeXBlKG0pKTsKKyAgICAgICAgcmVzdWx0ID0gbS5hcHBseShyc3JjLCBpbnB1dFJlcXVlc3RCb2R5KTsKKyAgICAgIH0gZWxzZSBpZiAodmlldyBpbnN0YW5jZW9mIFJlc3RSZWFkVmlldzw/PikgeworICAgICAgICByZXN1bHQgPSAoKFJlc3RSZWFkVmlldzxSZXN0UmVzb3VyY2U+KSB2aWV3KS5hcHBseShyc3JjKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKCk7CisgICAgICB9CisKKyAgICAgIGlmIChyZXN1bHQgaW5zdGFuY2VvZiBSZXNwb25zZSkgeworICAgICAgICBAU3VwcHJlc3NXYXJuaW5ncygicmF3dHlwZXMiKQorICAgICAgICBSZXNwb25zZSByID0gKFJlc3BvbnNlKSByZXN1bHQ7CisgICAgICAgIHN0YXR1cyA9IHIuc3RhdHVzQ29kZSgpOworICAgICAgfSBlbHNlIGlmIChyZXN1bHQgaW5zdGFuY2VvZiBSZXNwb25zZS5SZWRpcmVjdCkgeworICAgICAgICByZXMuc2VuZFJlZGlyZWN0KCgoUmVzcG9uc2UuUmVkaXJlY3QpIHJlc3VsdCkubG9jYXRpb24oKSk7CisgICAgICAgIHJldHVybjsKKyAgICAgIH0KKyAgICAgIHJlcy5zZXRTdGF0dXMoc3RhdHVzKTsKKworICAgICAgaWYgKHJlc3VsdCBpbnN0YW5jZW9mIFN0cmVhbWluZ1Jlc3BvbnNlKSB7CisgICAgICAgIFN0cmVhbWluZ1Jlc3BvbnNlIHIgPSAoU3RyZWFtaW5nUmVzcG9uc2UpIHJlc3VsdDsKKyAgICAgICAgcmVzLnNldENvbnRlbnRUeXBlKHIuZ2V0Q29udGVudFR5cGUoKSk7CisgICAgICAgIHIuc3RyZWFtKHJlcy5nZXRPdXRwdXRTdHJlYW0oKSk7CisgICAgICB9IGVsc2UgaWYgKHJlc3VsdCAhPSBSZXNwb25zZS5ub25lKCkpIHsKKyAgICAgICAgcmVzdWx0ID0gUmVzcG9uc2UudW53cmFwKHJlc3VsdCk7CisgICAgICAgIGlmIChyZXN1bHQgaW5zdGFuY2VvZiBCaW5hcnlSZXN1bHQpIHsKKyAgICAgICAgICByZXBseUJpbmFyeVJlc3VsdChyZXEsIHJlcywgKEJpbmFyeVJlc3VsdCkgcmVzdWx0KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICByZXBseUpzb24ocmVxLCByZXMsIGNvbmZpZywgcmVzdWx0KTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0gY2F0Y2ggKEF1dGhFeGNlcHRpb24gZSkgeworICAgICAgcmVwbHlFcnJvcihyZXMsIHN0YXR1cyA9IFNDX0ZPUkJJRERFTiwgZS5nZXRNZXNzYWdlKCkpOworICAgIH0gY2F0Y2ggKEJhZFJlcXVlc3RFeGNlcHRpb24gZSkgeworICAgICAgcmVwbHlFcnJvcihyZXMsIHN0YXR1cyA9IFNDX0JBRF9SRVFVRVNULCBlLmdldE1lc3NhZ2UoKSk7CisgICAgfSBjYXRjaCAoTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbiBlKSB7CisgICAgICByZXBseUVycm9yKHJlcywgc3RhdHVzID0gU0NfTUVUSE9EX05PVF9BTExPV0VELCAiTWV0aG9kIG5vdCBhbGxvd2VkIik7CisgICAgfSBjYXRjaCAoUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiBlKSB7CisgICAgICByZXBseUVycm9yKHJlcywgc3RhdHVzID0gU0NfQ09ORkxJQ1QsIGUuZ2V0TWVzc2FnZSgpKTsKKyAgICB9IGNhdGNoIChQcmVjb25kaXRpb25GYWlsZWRFeGNlcHRpb24gZSkgeworICAgICAgcmVwbHlFcnJvcihyZXMsIHN0YXR1cyA9IFNDX1BSRUNPTkRJVElPTl9GQUlMRUQsCisgICAgICAgICAgT2JqZWN0cy5maXJzdE5vbk51bGwoZS5nZXRNZXNzYWdlKCksICJQcmVjb25kaXRpb24gZmFpbGVkIikpOworICAgIH0gY2F0Y2ggKFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgcmVwbHlFcnJvcihyZXMsIHN0YXR1cyA9IFNDX05PVF9GT1VORCwgIk5vdCBmb3VuZCIpOworICAgIH0gY2F0Y2ggKFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24gZSkgeworICAgICAgcmVwbHlFcnJvcihyZXMsIHN0YXR1cyA9IDQyMiwKKyAgICAgICAgICBPYmplY3RzLmZpcnN0Tm9uTnVsbChlLmdldE1lc3NhZ2UoKSwgIlVucHJvY2Vzc2FibGUgRW50aXR5IikpOworICAgIH0gY2F0Y2ggKEFtYmlndW91c1ZpZXdFeGNlcHRpb24gZSkgeworICAgICAgcmVwbHlFcnJvcihyZXMsIHN0YXR1cyA9IFNDX05PVF9GT1VORCwgZS5nZXRNZXNzYWdlKCkpOworICAgIH0gY2F0Y2ggKE1hbGZvcm1lZEpzb25FeGNlcHRpb24gZSkgeworICAgICAgcmVwbHlFcnJvcihyZXMsIHN0YXR1cyA9IFNDX0JBRF9SRVFVRVNULCAiSW52YWxpZCAiICsgSlNPTl9UWVBFICsgIiBpbiByZXF1ZXN0Iik7CisgICAgfSBjYXRjaCAoSnNvblBhcnNlRXhjZXB0aW9uIGUpIHsKKyAgICAgIHJlcGx5RXJyb3IocmVzLCBzdGF0dXMgPSBTQ19CQURfUkVRVUVTVCwgIkludmFsaWQgIiArIEpTT05fVFlQRSArICIgaW4gcmVxdWVzdCIpOworICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICBzdGF0dXMgPSBTQ19JTlRFUk5BTF9TRVJWRVJfRVJST1I7CisgICAgICBoYW5kbGVFeGNlcHRpb24oZSwgcmVxLCByZXMpOworICAgIH0gZmluYWxseSB7CisgICAgICBnbG9iYWxzLmF1ZGl0U2VydmljZS5kaXNwYXRjaChuZXcgSHR0cEF1ZGl0RXZlbnQoZ2xvYmFscy53ZWJTZXNzaW9uLmdldCgpCisgICAgICAgICAgLmdldFNlc3Npb25JZCgpLCBnbG9iYWxzLmN1cnJlbnRVc2VyLmdldCgpLCByZXEuZ2V0UmVxdWVzdFVSSSgpLAorICAgICAgICAgIGF1ZGl0U3RhcnRUcywgcGFyYW1zLCByZXEuZ2V0TWV0aG9kKCksIGlucHV0UmVxdWVzdEJvZHksIHN0YXR1cywKKyAgICAgICAgICByZXN1bHQpKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgY2hlY2tQcmVjb25kaXRpb25zKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIFJlc3RSZXNvdXJjZSByc3JjKQorICAgICAgdGhyb3dzIFByZWNvbmRpdGlvbkZhaWxlZEV4Y2VwdGlvbiB7CisgICAgaWYgKCIqIi5lcXVhbHMocmVxLmdldEhlYWRlcigiSWYtTm9uZS1NYXRjaCIpKSkgeworICAgICAgdGhyb3cgbmV3IFByZWNvbmRpdGlvbkZhaWxlZEV4Y2VwdGlvbigiUmVzb3VyY2UgYWxyZWFkeSBleGlzdHMiKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBUeXBlIGlucHV0VHlwZShSZXN0TW9kaWZ5VmlldzxSZXN0UmVzb3VyY2UsIE9iamVjdD4gbSkgeworICAgIFR5cGUgaW5wdXRUeXBlID0gZXh0cmFjdElucHV0VHlwZShtLmdldENsYXNzKCkpOworICAgIGlmIChpbnB1dFR5cGUgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICJWaWV3ICVzIGRvZXMgbm90IGNvcnJlY3RseSBpbXBsZW1lbnQgJXMiLAorICAgICAgICAgIG0uZ2V0Q2xhc3MoKSwgUmVzdE1vZGlmeVZpZXcuY2xhc3MuZ2V0U2ltcGxlTmFtZSgpKSk7CisgICAgfQorICAgIHJldHVybiBpbnB1dFR5cGU7CisgIH0KKworICBAU3VwcHJlc3NXYXJuaW5ncygicmF3dHlwZXMiKQorICBwcml2YXRlIHN0YXRpYyBUeXBlIGV4dHJhY3RJbnB1dFR5cGUoQ2xhc3MgY2xhenopIHsKKyAgICBmb3IgKFR5cGUgdCA6IGNsYXp6LmdldEdlbmVyaWNJbnRlcmZhY2VzKCkpIHsKKyAgICAgIGlmICh0IGluc3RhbmNlb2YgUGFyYW1ldGVyaXplZFR5cGUKKyAgICAgICAgICAmJiAoKFBhcmFtZXRlcml6ZWRUeXBlKSB0KS5nZXRSYXdUeXBlKCkgPT0gUmVzdE1vZGlmeVZpZXcuY2xhc3MpIHsKKyAgICAgICAgcmV0dXJuICgoUGFyYW1ldGVyaXplZFR5cGUpIHQpLmdldEFjdHVhbFR5cGVBcmd1bWVudHMoKVsxXTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoY2xhenouZ2V0U3VwZXJjbGFzcygpICE9IG51bGwpIHsKKyAgICAgIFR5cGUgaSA9IGV4dHJhY3RJbnB1dFR5cGUoY2xhenouZ2V0U3VwZXJjbGFzcygpKTsKKyAgICAgIGlmIChpICE9IG51bGwpIHsKKyAgICAgICAgcmV0dXJuIGk7CisgICAgICB9CisgICAgfQorCisgICAgZm9yIChDbGFzcyB0IDogY2xhenouZ2V0SW50ZXJmYWNlcygpKSB7CisgICAgICBUeXBlIGkgPSBleHRyYWN0SW5wdXRUeXBlKHQpOworICAgICAgaWYgKGkgIT0gbnVsbCkgeworICAgICAgICByZXR1cm4gaTsKKyAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gbnVsbDsKKyAgfQorCisgIHByaXZhdGUgT2JqZWN0IHBhcnNlUmVxdWVzdChIdHRwU2VydmxldFJlcXVlc3QgcmVxLCBUeXBlIHR5cGUpCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24sIEJhZFJlcXVlc3RFeGNlcHRpb24sIFNlY3VyaXR5RXhjZXB0aW9uLAorICAgICAgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uLCBOb1N1Y2hNZXRob2RFeGNlcHRpb24sIElsbGVnYWxBY2Nlc3NFeGNlcHRpb24sCisgICAgICBJbnN0YW50aWF0aW9uRXhjZXB0aW9uLCBJbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uLCBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uIHsKKyAgICBpZiAoaXNUeXBlKEpTT05fVFlQRSwgcmVxLmdldENvbnRlbnRUeXBlKCkpKSB7CisgICAgICBCdWZmZXJlZFJlYWRlciBiciA9IHJlcS5nZXRSZWFkZXIoKTsKKyAgICAgIHRyeSB7CisgICAgICAgIEpzb25SZWFkZXIganNvbiA9IG5ldyBKc29uUmVhZGVyKGJyKTsKKyAgICAgICAganNvbi5zZXRMZW5pZW50KHRydWUpOworCisgICAgICAgIEpzb25Ub2tlbiBmaXJzdDsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICBmaXJzdCA9IGpzb24ucGVlaygpOworICAgICAgICB9IGNhdGNoIChFT0ZFeGNlcHRpb24gZSkgeworICAgICAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKCJFeHBlY3RlZCBKU09OIG9iamVjdCIpOworICAgICAgICB9CisgICAgICAgIGlmIChmaXJzdCA9PSBKc29uVG9rZW4uU1RSSU5HKSB7CisgICAgICAgICAgcmV0dXJuIHBhcnNlU3RyaW5nKGpzb24ubmV4dFN0cmluZygpLCB0eXBlKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gT3V0cHV0Rm9ybWF0LkpTT04ubmV3R3NvbigpLmZyb21Kc29uKGpzb24sIHR5cGUpOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgYnIuY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9IGVsc2UgaWYgKCJQVVQiLmVxdWFscyhyZXEuZ2V0TWV0aG9kKCkpICYmIGFjY2VwdHNQdXRJbnB1dCh0eXBlKSkgeworICAgICAgcmV0dXJuIHBhcnNlUHV0SW5wdXQocmVxLCB0eXBlKTsKKyAgICB9IGVsc2UgaWYgKCJERUxFVEUiLmVxdWFscyhyZXEuZ2V0TWV0aG9kKCkpICYmIGhhc05vQm9keShyZXEpKSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9IGVsc2UgaWYgKGhhc05vQm9keShyZXEpKSB7CisgICAgICByZXR1cm4gY3JlYXRlSW5zdGFuY2UodHlwZSk7CisgICAgfSBlbHNlIGlmIChpc1R5cGUoInRleHQvcGxhaW4iLCByZXEuZ2V0Q29udGVudFR5cGUoKSkpIHsKKyAgICAgIEJ1ZmZlcmVkUmVhZGVyIGJyID0gcmVxLmdldFJlYWRlcigpOworICAgICAgdHJ5IHsKKyAgICAgICAgY2hhcltdIHRtcCA9IG5ldyBjaGFyWzI1Nl07CisgICAgICAgIFN0cmluZ0J1aWxkZXIgc2IgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgICBpbnQgbjsKKyAgICAgICAgd2hpbGUgKDAgPCAobiA9IGJyLnJlYWQodG1wKSkpIHsKKyAgICAgICAgICBzYi5hcHBlbmQodG1wLCAwLCBuKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gcGFyc2VTdHJpbmcoc2IudG9TdHJpbmcoKSwgdHlwZSk7CisgICAgICB9IGZpbmFsbHkgeworICAgICAgICBici5jbG9zZSgpOworICAgICAgfQorICAgIH0gZWxzZSBpZiAoIlBPU1QiLmVxdWFscyhyZXEuZ2V0TWV0aG9kKCkpCisgICAgICAgICYmIGlzVHlwZShGT1JNX1RZUEUsIHJlcS5nZXRDb250ZW50VHlwZSgpKSkgeworICAgICAgcmV0dXJuIE91dHB1dEZvcm1hdC5KU09OLm5ld0dzb24oKS5mcm9tSnNvbigKKyAgICAgICAgICBQYXJhbWV0ZXJQYXJzZXIuZm9ybVRvSnNvbihyZXEpLAorICAgICAgICAgIHR5cGUpOworICAgIH0gZWxzZSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbigiRXhwZWN0ZWQgQ29udGVudC1UeXBlOiAiICsgSlNPTl9UWVBFKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBib29sZWFuIGhhc05vQm9keShIdHRwU2VydmxldFJlcXVlc3QgcmVxKSB7CisgICAgaW50IGxlbiA9IHJlcS5nZXRDb250ZW50TGVuZ3RoKCk7CisgICAgU3RyaW5nIHR5cGUgPSByZXEuZ2V0Q29udGVudFR5cGUoKTsKKyAgICByZXR1cm4gKGxlbiA8PSAwICYmIHR5cGUgPT0gbnVsbCkKKyAgICAgICAgfHwgKGxlbiA9PSAwICYmIGlzVHlwZShGT1JNX1RZUEUsIHR5cGUpKTsKKyAgfQorCisgIEBTdXBwcmVzc1dhcm5pbmdzKCJyYXd0eXBlcyIpCisgIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gYWNjZXB0c1B1dElucHV0KFR5cGUgdHlwZSkgeworICAgIGlmICh0eXBlIGluc3RhbmNlb2YgQ2xhc3MpIHsKKyAgICAgIGZvciAoRmllbGQgZiA6ICgoQ2xhc3MpIHR5cGUpLmdldERlY2xhcmVkRmllbGRzKCkpIHsKKyAgICAgICAgaWYgKGYuZ2V0VHlwZSgpID09IFB1dElucHV0LmNsYXNzKSB7CisgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworICB9CisKKyAgcHJpdmF0ZSBPYmplY3QgcGFyc2VQdXRJbnB1dChmaW5hbCBIdHRwU2VydmxldFJlcXVlc3QgcmVxLCBUeXBlIHR5cGUpCisgICAgICB0aHJvd3MgU2VjdXJpdHlFeGNlcHRpb24sIE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiwKKyAgICAgIElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiwgSW5zdGFudGlhdGlvbkV4Y2VwdGlvbiwgSWxsZWdhbEFjY2Vzc0V4Y2VwdGlvbiwKKyAgICAgIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24sIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24geworICAgIE9iamVjdCBvYmogPSBjcmVhdGVJbnN0YW5jZSh0eXBlKTsKKyAgICBmb3IgKEZpZWxkIGYgOiBvYmouZ2V0Q2xhc3MoKS5nZXREZWNsYXJlZEZpZWxkcygpKSB7CisgICAgICBpZiAoZi5nZXRUeXBlKCkgPT0gUHV0SW5wdXQuY2xhc3MpIHsKKyAgICAgICAgZi5zZXRBY2Nlc3NpYmxlKHRydWUpOworICAgICAgICBmLnNldChvYmosIG5ldyBQdXRJbnB1dCgpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgU3RyaW5nIGdldENvbnRlbnRUeXBlKCkgeworICAgICAgICAgICAgcmV0dXJuIHJlcS5nZXRDb250ZW50VHlwZSgpOworICAgICAgICAgIH0KKworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyBsb25nIGdldENvbnRlbnRMZW5ndGgoKSB7CisgICAgICAgICAgICByZXR1cm4gcmVxLmdldENvbnRlbnRMZW5ndGgoKTsKKyAgICAgICAgICB9CisKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgSW5wdXRTdHJlYW0gZ2V0SW5wdXRTdHJlYW0oKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgICAgICAgICAgcmV0dXJuIHJlcS5nZXRJbnB1dFN0cmVhbSgpOworICAgICAgICAgIH0KKyAgICAgICAgfSk7CisgICAgICAgIHJldHVybiBvYmo7CisgICAgICB9CisgICAgfQorICAgIHRocm93IG5ldyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uKCk7CisgIH0KKworICBwcml2YXRlIE9iamVjdCBwYXJzZVN0cmluZyhTdHJpbmcgdmFsdWUsIFR5cGUgdHlwZSkKKyAgICAgIHRocm93cyBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBTZWN1cml0eUV4Y2VwdGlvbiwgTm9TdWNoTWV0aG9kRXhjZXB0aW9uLAorICAgICAgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uLCBJbGxlZ2FsQWNjZXNzRXhjZXB0aW9uLCBJbnN0YW50aWF0aW9uRXhjZXB0aW9uLAorICAgICAgSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiB7CisgICAgaWYgKHR5cGUgPT0gU3RyaW5nLmNsYXNzKSB7CisgICAgICByZXR1cm4gdmFsdWU7CisgICAgfQorCisgICAgT2JqZWN0IG9iaiA9IGNyZWF0ZUluc3RhbmNlKHR5cGUpOworICAgIEZpZWxkW10gZmllbGRzID0gb2JqLmdldENsYXNzKCkuZ2V0RGVjbGFyZWRGaWVsZHMoKTsKKyAgICBpZiAoZmllbGRzLmxlbmd0aCA9PSAwICYmIFN0cmluZ3MuaXNOdWxsT3JFbXB0eSh2YWx1ZSkpIHsKKyAgICAgIHJldHVybiBvYmo7CisgICAgfQorICAgIGZvciAoRmllbGQgZiA6IGZpZWxkcykgeworICAgICAgaWYgKGYuZ2V0QW5ub3RhdGlvbihEZWZhdWx0SW5wdXQuY2xhc3MpICE9IG51bGwKKyAgICAgICAgICAmJiBmLmdldFR5cGUoKSA9PSBTdHJpbmcuY2xhc3MpIHsKKyAgICAgICAgZi5zZXRBY2Nlc3NpYmxlKHRydWUpOworICAgICAgICBmLnNldChvYmosIHZhbHVlKTsKKyAgICAgICAgcmV0dXJuIG9iajsKKyAgICAgIH0KKyAgICB9CisgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oIkV4cGVjdGVkIEpTT04gb2JqZWN0Iik7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBPYmplY3QgY3JlYXRlSW5zdGFuY2UoVHlwZSB0eXBlKQorICAgICAgdGhyb3dzIE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiwgSW5zdGFudGlhdGlvbkV4Y2VwdGlvbiwKKyAgICAgIElsbGVnYWxBY2Nlc3NFeGNlcHRpb24sIEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24geworICAgIGlmICh0eXBlIGluc3RhbmNlb2YgQ2xhc3MpIHsKKyAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICAgICAgQ2xhc3M8T2JqZWN0PiBjbGF6eiA9IChDbGFzczxPYmplY3Q+KSB0eXBlOworICAgICAgQ29uc3RydWN0b3I8T2JqZWN0PiBjID0gY2xhenouZ2V0RGVjbGFyZWRDb25zdHJ1Y3RvcigpOworICAgICAgYy5zZXRBY2Nlc3NpYmxlKHRydWUpOworICAgICAgcmV0dXJuIGMubmV3SW5zdGFuY2UoKTsKKyAgICB9CisgICAgdGhyb3cgbmV3IEluc3RhbnRpYXRpb25FeGNlcHRpb24oIkNhbm5vdCBtYWtlICIgKyB0eXBlKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIHZvaWQgcmVwbHlKc29uKEBOdWxsYWJsZSBIdHRwU2VydmxldFJlcXVlc3QgcmVxLAorICAgICAgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMsCisgICAgICBNdWx0aW1hcDxTdHJpbmcsIFN0cmluZz4gY29uZmlnLAorICAgICAgT2JqZWN0IHJlc3VsdCkKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgZmluYWwgVGVtcG9yYXJ5QnVmZmVyLkhlYXAgYnVmID0gaGVhcChJbnRlZ2VyLk1BWF9WQUxVRSk7CisgICAgYnVmLndyaXRlKEpTT05fTUFHSUMpOworICAgIFdyaXRlciB3ID0gbmV3IEJ1ZmZlcmVkV3JpdGVyKG5ldyBPdXRwdXRTdHJlYW1Xcml0ZXIoYnVmLCBVVEZfOCkpOworICAgIEdzb24gZ3NvbiA9IG5ld0dzb24oY29uZmlnLCByZXEpOworICAgIGlmIChyZXN1bHQgaW5zdGFuY2VvZiBKc29uRWxlbWVudCkgeworICAgICAgZ3Nvbi50b0pzb24oKEpzb25FbGVtZW50KSByZXN1bHQsIHcpOworICAgIH0gZWxzZSB7CisgICAgICBnc29uLnRvSnNvbihyZXN1bHQsIHcpOworICAgIH0KKyAgICB3LndyaXRlKCdcbicpOworICAgIHcuZmx1c2goKTsKKworICAgIHJlcGx5QmluYXJ5UmVzdWx0KHJlcSwgcmVzLCBuZXcgQmluYXJ5UmVzdWx0KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgbG9uZyBnZXRDb250ZW50TGVuZ3RoKCkgeworICAgICAgICByZXR1cm4gYnVmLmxlbmd0aCgpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIHdyaXRlVG8oT3V0cHV0U3RyZWFtIG9zKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgICAgICBidWYud3JpdGVUbyhvcywgbnVsbCk7CisgICAgICB9CisgICAgfS5zZXRDb250ZW50VHlwZShKU09OX1RZUEUpLnNldENoYXJhY3RlckVuY29kaW5nKFVURl84Lm5hbWUoKSkpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgR3NvbiBuZXdHc29uKE11bHRpbWFwPFN0cmluZywgU3RyaW5nPiBjb25maWcsCisgICAgICBATnVsbGFibGUgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgeworICAgIEdzb25CdWlsZGVyIGdiID0gT3V0cHV0Rm9ybWF0LkpTT05fQ09NUEFDVC5uZXdHc29uQnVpbGRlcigpOworCisgICAgZW5hYmxlUHJldHR5UHJpbnQoZ2IsIGNvbmZpZywgcmVxKTsKKyAgICBlbmFibGVQYXJ0aWFsR2V0RmllbGRzKGdiLCBjb25maWcpOworCisgICAgcmV0dXJuIGdiLmNyZWF0ZSgpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBlbmFibGVQcmV0dHlQcmludChHc29uQnVpbGRlciBnYiwKKyAgICAgIE11bHRpbWFwPFN0cmluZywgU3RyaW5nPiBjb25maWcsCisgICAgICBATnVsbGFibGUgSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSkgeworICAgIFN0cmluZyBwcCA9IEl0ZXJhYmxlcy5nZXRGaXJzdChjb25maWcuZ2V0KCJwcCIpLCBudWxsKTsKKyAgICBpZiAocHAgPT0gbnVsbCkgeworICAgICAgcHAgPSBJdGVyYWJsZXMuZ2V0Rmlyc3QoY29uZmlnLmdldCgicHJldHR5UHJpbnQiKSwgbnVsbCk7CisgICAgICBpZiAocHAgPT0gbnVsbCAmJiByZXEgIT0gbnVsbCkgeworICAgICAgICBwcCA9IGFjY2VwdHNKc29uKHJlcSkgPyAiMCIgOiAiMSI7CisgICAgICB9CisgICAgfQorICAgIGlmICgiMSIuZXF1YWxzKHBwKSB8fCAidHJ1ZSIuZXF1YWxzKHBwKSkgeworICAgICAgZ2Iuc2V0UHJldHR5UHJpbnRpbmcoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyB2b2lkIGVuYWJsZVBhcnRpYWxHZXRGaWVsZHMoR3NvbkJ1aWxkZXIgZ2IsCisgICAgICBNdWx0aW1hcDxTdHJpbmcsIFN0cmluZz4gY29uZmlnKSB7CisgICAgZmluYWwgU2V0PFN0cmluZz4gd2FudCA9IFNldHMubmV3SGFzaFNldCgpOworICAgIGZvciAoU3RyaW5nIHAgOiBjb25maWcuZ2V0KCJmaWVsZHMiKSkgeworICAgICAgSXRlcmFibGVzLmFkZEFsbCh3YW50LCBTcGxpdHRlci5vbignLCcpCisgICAgICAgICAgLm9taXRFbXB0eVN0cmluZ3MoKS50cmltUmVzdWx0cygpCisgICAgICAgICAgLnNwbGl0KHApKTsKKyAgICB9CisgICAgaWYgKCF3YW50LmlzRW1wdHkoKSkgeworICAgICAgZ2IuYWRkU2VyaWFsaXphdGlvbkV4Y2x1c2lvblN0cmF0ZWd5KG5ldyBFeGNsdXNpb25TdHJhdGVneSgpIHsKKyAgICAgICAgcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBTdHJpbmc+IG5hbWVzID0gTWFwcy5uZXdIYXNoTWFwKCk7CisKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHB1YmxpYyBib29sZWFuIHNob3VsZFNraXBGaWVsZChGaWVsZEF0dHJpYnV0ZXMgZmllbGQpIHsKKyAgICAgICAgICBTdHJpbmcgbmFtZSA9IG5hbWVzLmdldChmaWVsZC5nZXROYW1lKCkpOworICAgICAgICAgIGlmIChuYW1lID09IG51bGwpIHsKKyAgICAgICAgICAgIC8vIE5hbWVzIGFyZSBzdXBwbGllZCBieSBHc29uIGluIHRlcm1zIG9mIEphdmEgc291cmNlLgorICAgICAgICAgICAgLy8gVHJhbnNsYXRlIGFuZCBjYWNoZSB0aGUgSlNPTiBsb3dlcl9jYXNlX3N0eWxlIHVzZWQuCisgICAgICAgICAgICB0cnkgeworICAgICAgICAgICAgICBuYW1lID0KKyAgICAgICAgICAgICAgICAgIEZpZWxkTmFtaW5nUG9saWN5LkxPV0VSX0NBU0VfV0lUSF9VTkRFUlNDT1JFUy50cmFuc2xhdGVOYW1lKC8vCisgICAgICAgICAgICAgICAgICAgICAgZmllbGQuZ2V0RGVjbGFyaW5nQ2xhc3MoKS5nZXREZWNsYXJlZEZpZWxkKGZpZWxkLmdldE5hbWUoKSkpOworICAgICAgICAgICAgICBuYW1lcy5wdXQoZmllbGQuZ2V0TmFtZSgpLCBuYW1lKTsKKyAgICAgICAgICAgIH0gY2F0Y2ggKFNlY3VyaXR5RXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9IGNhdGNoIChOb1N1Y2hGaWVsZEV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAgICAgICAgICByZXR1cm4gIXdhbnQuY29udGFpbnMobmFtZSk7CisgICAgICAgIH0KKworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIGJvb2xlYW4gc2hvdWxkU2tpcENsYXNzKENsYXNzPD8+IGNsYXp6KSB7CisgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICB9KTsKKyAgICB9CisgIH0KKworICBzdGF0aWMgdm9pZCByZXBseUJpbmFyeVJlc3VsdCgKKyAgICAgIEBOdWxsYWJsZSBIdHRwU2VydmxldFJlcXVlc3QgcmVxLAorICAgICAgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMsCisgICAgICBCaW5hcnlSZXN1bHQgYmluKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHRyeSB7CisgICAgICByZXMuc2V0Q29udGVudFR5cGUoYmluLmdldENvbnRlbnRUeXBlKCkpOworICAgICAgT3V0cHV0U3RyZWFtIGRzdCA9IHJlcy5nZXRPdXRwdXRTdHJlYW0oKTsKKyAgICAgIHRyeSB7CisgICAgICAgIGxvbmcgbGVuID0gYmluLmdldENvbnRlbnRMZW5ndGgoKTsKKyAgICAgICAgYm9vbGVhbiBnemlwID0gYmluLmNhbkd6aXAoKSAmJiBhY2NlcHRzR3ppcChyZXEpOworICAgICAgICBpZiAoZ3ppcCAmJiAyNTYgPD0gbGVuICYmIGxlbiA8PSAoMTAgPDwgMjApKSB7CisgICAgICAgICAgVGVtcG9yYXJ5QnVmZmVyLkhlYXAgYnVmID0gY29tcHJlc3MoYmluKTsKKyAgICAgICAgICBpZiAoYnVmLmxlbmd0aCgpIDwgbGVuKSB7CisgICAgICAgICAgICByZXMuc2V0Q29udGVudExlbmd0aCgoaW50KSBidWYubGVuZ3RoKCkpOworICAgICAgICAgICAgcmVzLnNldEhlYWRlcigiQ29udGVudC1FbmNvZGluZyIsICJnemlwIik7CisgICAgICAgICAgICBidWYud3JpdGVUbyhkc3QsIG51bGwpOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICByZXBseVVuY29tcHJlc3NlZChyZXMsIGRzdCwgYmluLCBsZW4pOworICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChnemlwKSB7CisgICAgICAgICAgcmVzLnNldEhlYWRlcigiQ29udGVudC1FbmNvZGluZyIsICJnemlwIik7CisgICAgICAgICAgZHN0ID0gbmV3IEdaSVBPdXRwdXRTdHJlYW0oZHN0KTsKKyAgICAgICAgICBiaW4ud3JpdGVUbyhkc3QpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIHJlcGx5VW5jb21wcmVzc2VkKHJlcywgZHN0LCBiaW4sIGxlbik7CisgICAgICAgIH0KKyAgICAgIH0gZmluYWxseSB7CisgICAgICAgIGRzdC5jbG9zZSgpOworICAgICAgfQorICAgIH0gZmluYWxseSB7CisgICAgICBiaW4uY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyB2b2lkIHJlcGx5VW5jb21wcmVzc2VkKEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzLAorICAgICAgT3V0cHV0U3RyZWFtIGRzdCwgQmluYXJ5UmVzdWx0IGJpbiwgbG9uZyBsZW4pIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgaWYgKDAgPD0gbGVuICYmIGxlbiA8IEludGVnZXIuTUFYX1ZBTFVFKSB7CisgICAgICByZXMuc2V0Q29udGVudExlbmd0aCgoaW50KSBsZW4pOworICAgIH0gZWxzZSBpZiAoMCA8PSBsZW4pIHsKKyAgICAgIHJlcy5zZXRIZWFkZXIoIkNvbnRlbnQtTGVuZ3RoIiwgTG9uZy50b1N0cmluZyhsZW4pKTsKKyAgICB9CisgICAgYmluLndyaXRlVG8oZHN0KTsKKyAgfQorCisgIHByaXZhdGUgUmVzdFZpZXc8UmVzdFJlc291cmNlPiB2aWV3KAorICAgICAgUmVzdENvbGxlY3Rpb248UmVzdFJlc291cmNlLCBSZXN0UmVzb3VyY2U+IHJjLAorICAgICAgU3RyaW5nIG1ldGhvZCwgTGlzdDxJZFN0cmluZz4gcGF0aCkgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sCisgICAgICBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uLCBBbWJpZ3VvdXNWaWV3RXhjZXB0aW9uIHsKKyAgICBEeW5hbWljTWFwPFJlc3RWaWV3PFJlc3RSZXNvdXJjZT4+IHZpZXdzID0gcmMudmlld3MoKTsKKyAgICBmaW5hbCBJZFN0cmluZyBwcm9qZWN0aW9uID0gcGF0aC5pc0VtcHR5KCkKKyAgICAgICAgPyBJZFN0cmluZy5mcm9tVXJsKCIvIikKKyAgICAgICAgOiBwYXRoLnJlbW92ZSgwKTsKKyAgICBpZiAoIXBhdGguaXNFbXB0eSgpKSB7CisgICAgICAvLyBJZiB0aGVyZSBhcmUgcGF0aCBjb21wb25lbnRzIHN0aWxsIHJlbWFpbmluZyBhZnRlciB0aGlzIHByb2plY3Rpb24KKyAgICAgIC8vIGlzIGNob3NlbiwgbG9vayBmb3IgdGhlIHByb2plY3Rpb24gYmFzZWQgdXBvbiBHRVQgYXMgdGhlIG1ldGhvZCBhcworICAgICAgLy8gdGhlIGNsaWVudCB0aGlua3MgaXQgaXMgYSBuZXN0ZWQgY29sbGVjdGlvbi4KKyAgICAgIG1ldGhvZCA9ICJHRVQiOworICAgIH0KKworICAgIExpc3Q8U3RyaW5nPiBwID0gc3BsaXRQcm9qZWN0aW9uKHByb2plY3Rpb24pOworICAgIGlmIChwLnNpemUoKSA9PSAyKSB7CisgICAgICBSZXN0VmlldzxSZXN0UmVzb3VyY2U+IHZpZXcgPQorICAgICAgICAgIHZpZXdzLmdldChwLmdldCgwKSwgbWV0aG9kICsgIi4iICsgcC5nZXQoMSkpOworICAgICAgaWYgKHZpZXcgIT0gbnVsbCkgeworICAgICAgICByZXR1cm4gdmlldzsKKyAgICAgIH0KKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKHByb2plY3Rpb24pOworICAgIH0KKworICAgIFN0cmluZyBuYW1lID0gbWV0aG9kICsgIi4iICsgcC5nZXQoMCk7CisgICAgUmVzdFZpZXc8UmVzdFJlc291cmNlPiBjb3JlID0gdmlld3MuZ2V0KCJnZXJyaXQiLCBuYW1lKTsKKyAgICBpZiAoY29yZSAhPSBudWxsKSB7CisgICAgICByZXR1cm4gY29yZTsKKyAgICB9CisKKyAgICBNYXA8U3RyaW5nLCBSZXN0VmlldzxSZXN0UmVzb3VyY2U+PiByID0gTWFwcy5uZXdUcmVlTWFwKCk7CisgICAgZm9yIChTdHJpbmcgcGx1Z2luIDogdmlld3MucGx1Z2lucygpKSB7CisgICAgICBSZXN0VmlldzxSZXN0UmVzb3VyY2U+IGFjdGlvbiA9IHZpZXdzLmdldChwbHVnaW4sIG5hbWUpOworICAgICAgaWYgKGFjdGlvbiAhPSBudWxsKSB7CisgICAgICAgIHIucHV0KHBsdWdpbiwgYWN0aW9uKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoci5zaXplKCkgPT0gMSkgeworICAgICAgcmV0dXJuIEl0ZXJhYmxlcy5nZXRGaXJzdChyLnZhbHVlcygpLCBudWxsKTsKKyAgICB9IGVsc2UgaWYgKHIuaXNFbXB0eSgpKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihwcm9qZWN0aW9uKTsKKyAgICB9IGVsc2UgeworICAgICAgdGhyb3cgbmV3IEFtYmlndW91c1ZpZXdFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgIlByb2plY3Rpb24gJXMgaXMgYW1iaWd1b3VzOiAiLAorICAgICAgICBuYW1lLAorICAgICAgICBKb2luZXIub24oIiwgIikuam9pbigKKyAgICAgICAgICBJdGVyYWJsZXMudHJhbnNmb3JtKHIua2V5U2V0KCksIG5ldyBGdW5jdGlvbjxTdHJpbmcsIFN0cmluZz4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyBTdHJpbmcgYXBwbHkoU3RyaW5nIGluKSB7CisgICAgICAgICAgICAgIHJldHVybiBpbiArICJ+IiArIHByb2plY3Rpb247CisgICAgICAgICAgICB9CisgICAgICAgICAgfSkpKSk7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgTGlzdDxJZFN0cmluZz4gc3BsaXRQYXRoKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEpIHsKKyAgICBTdHJpbmcgcGF0aCA9IHJlcS5nZXRQYXRoSW5mbygpOworICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkocGF0aCkpIHsKKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKKyAgICB9CisgICAgTGlzdDxJZFN0cmluZz4gb3V0ID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgZm9yIChTdHJpbmcgcCA6IFNwbGl0dGVyLm9uKCcvJykuc3BsaXQocGF0aCkpIHsKKyAgICAgIG91dC5hZGQoSWRTdHJpbmcuZnJvbVVybChwKSk7CisgICAgfQorICAgIGlmIChvdXQuc2l6ZSgpID4gMCAmJiBvdXQuZ2V0KG91dC5zaXplKCkgLSAxKS5pc0VtcHR5KCkpIHsKKyAgICAgIG91dC5yZW1vdmUob3V0LnNpemUoKSAtIDEpOworICAgIH0KKyAgICByZXR1cm4gb3V0OworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgTGlzdDxTdHJpbmc+IHNwbGl0UHJvamVjdGlvbihJZFN0cmluZyBwcm9qZWN0aW9uKSB7CisgICAgTGlzdDxTdHJpbmc+IHAgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoMik7CisgICAgSXRlcmFibGVzLmFkZEFsbChwLCBTcGxpdHRlci5vbignficpLmxpbWl0KDIpLnNwbGl0KHByb2plY3Rpb24uZ2V0KCkpKTsKKyAgICByZXR1cm4gcDsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBjaGVja1VzZXJTZXNzaW9uKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEpCisgICAgICB0aHJvd3MgQXV0aEV4Y2VwdGlvbiB7CisgICAgQ3VycmVudFVzZXIgdXNlciA9IGdsb2JhbHMuY3VycmVudFVzZXIuZ2V0KCk7CisgICAgaWYgKGlzU3RhdGVDaGFuZ2UocmVxKSkgeworICAgICAgaWYgKHVzZXIgaW5zdGFuY2VvZiBBbm9ueW1vdXNVc2VyKSB7CisgICAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJBdXRoZW50aWNhdGlvbiByZXF1aXJlZCIpOworICAgICAgfSBlbHNlIGlmICghZ2xvYmFscy53ZWJTZXNzaW9uLmdldCgpLmlzQWNjZXNzUGF0aE9rKEFjY2Vzc1BhdGguUkVTVF9BUEkpKSB7CisgICAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJJbnZhbGlkIGF1dGhlbnRpY2F0aW9uIG1ldGhvZC4gSW4gb3JkZXIgdG8gYXV0aGVudGljYXRlLCBwcmVmaXggdGhlIFJFU1QgZW5kcG9pbnQgVVJMIHdpdGggL2EvIChlLmcuIGh0dHA6Ly9leGFtcGxlLmNvbS9hL3Byb2plY3RzLykuIik7CisgICAgICB9CisgICAgfQorICAgIHVzZXIuc2V0QWNjZXNzUGF0aChBY2Nlc3NQYXRoLlJFU1RfQVBJKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gaXNTdGF0ZUNoYW5nZShIdHRwU2VydmxldFJlcXVlc3QgcmVxKSB7CisgICAgU3RyaW5nIG1ldGhvZCA9IHJlcS5nZXRNZXRob2QoKTsKKyAgICByZXR1cm4gISgiR0VUIi5lcXVhbHMobWV0aG9kKSB8fCAiSEVBRCIuZXF1YWxzKG1ldGhvZCkpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGNoZWNrQWNjZXNzQW5ub3RhdGlvbnMoQ2xhc3M8PyBleHRlbmRzIE9iamVjdD4gY2xhenopCisgICAgICB0aHJvd3MgQXV0aEV4Y2VwdGlvbiB7CisgICAgUmVxdWlyZXNDYXBhYmlsaXR5IHJjID0gY2xhenouZ2V0QW5ub3RhdGlvbihSZXF1aXJlc0NhcGFiaWxpdHkuY2xhc3MpOworICAgIGlmIChyYyAhPSBudWxsKSB7CisgICAgICBDdXJyZW50VXNlciB1c2VyID0gZ2xvYmFscy5jdXJyZW50VXNlci5nZXQoKTsKKyAgICAgIENhcGFiaWxpdHlDb250cm9sIGN0bCA9IHVzZXIuZ2V0Q2FwYWJpbGl0aWVzKCk7CisgICAgICBpZiAoIWN0bC5jYW5QZXJmb3JtKHJjLnZhbHVlKCkpICYmICFjdGwuY2FuQWRtaW5pc3RyYXRlU2VydmVyKCkpIHsKKyAgICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAgICJDYXBhYmlsaXR5ICVzIGlzIHJlcXVpcmVkIHRvIGFjY2VzcyB0aGlzIHJlc291cmNlIiwKKyAgICAgICAgICAgIHJjLnZhbHVlKCkpKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyB2b2lkIGhhbmRsZUV4Y2VwdGlvbihUaHJvd2FibGUgZXJyLCBIdHRwU2VydmxldFJlcXVlc3QgcmVxLAorICAgICAgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgU3RyaW5nIHVyaSA9IHJlcS5nZXRSZXF1ZXN0VVJJKCk7CisgICAgaWYgKCFTdHJpbmdzLmlzTnVsbE9yRW1wdHkocmVxLmdldFF1ZXJ5U3RyaW5nKCkpKSB7CisgICAgICB1cmkgKz0gIj8iICsgcmVxLmdldFF1ZXJ5U3RyaW5nKCk7CisgICAgfQorICAgIGxvZy5lcnJvcihTdHJpbmcuZm9ybWF0KCJFcnJvciBpbiAlcyAlcyIsIHJlcS5nZXRNZXRob2QoKSwgdXJpKSwgZXJyKTsKKworICAgIGlmICghcmVzLmlzQ29tbWl0dGVkKCkpIHsKKyAgICAgIHJlcy5yZXNldCgpOworICAgICAgcmVwbHlFcnJvcihyZXMsIFNDX0lOVEVSTkFMX1NFUlZFUl9FUlJPUiwgIkludGVybmFsIHNlcnZlciBlcnJvciIpOworICAgIH0KKyAgfQorCisgIHN0YXRpYyB2b2lkIHJlcGx5RXJyb3IoSHR0cFNlcnZsZXRSZXNwb25zZSByZXMsIGludCBzdGF0dXNDb2RlLCBTdHJpbmcgbXNnKQorICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICByZXMuc2V0U3RhdHVzKHN0YXR1c0NvZGUpOworICAgIHJlcGx5VGV4dChudWxsLCByZXMsIG1zZyk7CisgIH0KKworICBzdGF0aWMgdm9pZCByZXBseVRleHQoQE51bGxhYmxlIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsCisgICAgICBIdHRwU2VydmxldFJlc3BvbnNlIHJlcywgU3RyaW5nIHRleHQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgaWYgKChyZXEgPT0gbnVsbCB8fCAiR0VUIi5lcXVhbHMocmVxLmdldE1ldGhvZCgpKSkgJiYgaXNNYXliZUhUTUwodGV4dCkpIHsKKyAgICAgIHJlcGx5SnNvbihyZXEsIHJlcywgSW1tdXRhYmxlTXVsdGltYXAub2YoInBwIiwgIjAiKSwgbmV3IEpzb25QcmltaXRpdmUodGV4dCkpOworICAgIH0gZWxzZSB7CisgICAgICBpZiAoIXRleHQuZW5kc1dpdGgoIlxuIikpIHsKKyAgICAgICAgdGV4dCArPSAiXG4iOworICAgICAgfQorICAgICAgcmVwbHlCaW5hcnlSZXN1bHQocmVxLCByZXMsCisgICAgICAgICAgQmluYXJ5UmVzdWx0LmNyZWF0ZSh0ZXh0KS5zZXRDb250ZW50VHlwZSgidGV4dC9wbGFpbiIpKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBQYXR0ZXJuIElTX0hUTUwgPSBQYXR0ZXJuLmNvbXBpbGUoIls8Jl0iKTsKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc01heWJlSFRNTChTdHJpbmcgdGV4dCkgeworICAgIHJldHVybiBJU19IVE1MLm1hdGNoZXIodGV4dCkuZmluZCgpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBhY2NlcHRzSnNvbihIdHRwU2VydmxldFJlcXVlc3QgcmVxKSB7CisgICAgcmV0dXJuIHJlcSAhPSBudWxsICYmIGlzVHlwZShKU09OX1RZUEUsIHJlcS5nZXRIZWFkZXIoSHR0cEhlYWRlcnMuQUNDRVBUKSk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBib29sZWFuIGFjY2VwdHNHemlwKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEpIHsKKyAgICBpZiAocmVxICE9IG51bGwpIHsKKyAgICAgIFN0cmluZyBhY2NlcHRzID0gcmVxLmdldEhlYWRlcihIdHRwSGVhZGVycy5BQ0NFUFRfRU5DT0RJTkcpOworICAgICAgcmV0dXJuIGFjY2VwdHMgIT0gbnVsbCAmJiBhY2NlcHRzLmluZGV4T2YoImd6aXAiKSAhPSAtMTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc1R5cGUoU3RyaW5nIGV4cGVjdCwgU3RyaW5nIGdpdmVuKSB7CisgICAgaWYgKGdpdmVuID09IG51bGwpIHsKKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9IGVsc2UgaWYgKGV4cGVjdC5lcXVhbHMoZ2l2ZW4pKSB7CisgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9IGVsc2UgaWYgKGdpdmVuLnN0YXJ0c1dpdGgoZXhwZWN0ICsgIiwiKSkgeworICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIGZvciAoU3RyaW5nIHAgOiBnaXZlbi5zcGxpdCgiWyAsO11bICw7XSoiKSkgeworICAgICAgaWYgKGV4cGVjdC5lcXVhbHMocCkpIHsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFRlbXBvcmFyeUJ1ZmZlci5IZWFwIGNvbXByZXNzKEJpbmFyeVJlc3VsdCBiaW4pCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIFRlbXBvcmFyeUJ1ZmZlci5IZWFwIGJ1ZiA9IGhlYXAoMjAgPDwgMjApOworICAgIEdaSVBPdXRwdXRTdHJlYW0gZ3ogPSBuZXcgR1pJUE91dHB1dFN0cmVhbShidWYpOworICAgIGJpbi53cml0ZVRvKGd6KTsKKyAgICBnei5maW5pc2goKTsKKyAgICBnei5mbHVzaCgpOworICAgIHJldHVybiBidWY7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBIZWFwIGhlYXAoaW50IG1heCkgeworICAgIHJldHVybiBuZXcgVGVtcG9yYXJ5QnVmZmVyLkhlYXAobWF4KTsKKyAgfQorCisgIEBTdXBwcmVzc1dhcm5pbmdzKCJzZXJpYWwiKQorICBwcml2YXRlIHN0YXRpYyBjbGFzcyBBbWJpZ3VvdXNWaWV3RXhjZXB0aW9uIGV4dGVuZHMgRXhjZXB0aW9uIHsKKyAgICBBbWJpZ3VvdXNWaWV3RXhjZXB0aW9uKFN0cmluZyBtZXNzYWdlKSB7CisgICAgICBzdXBlcihtZXNzYWdlKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9BdWRpdGVkSHR0cFNlcnZsZXRSZXNwb25zZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL0F1ZGl0ZWRIdHRwU2VydmxldFJlc3BvbnNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDU5YjU0YwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9BdWRpdGVkSHR0cFNlcnZsZXRSZXNwb25zZS5qYXZhCkBAIC0wLDAgKzEsNjQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGM7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2U7CitpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2VXcmFwcGVyOworCitjbGFzcyBBdWRpdGVkSHR0cFNlcnZsZXRSZXNwb25zZQorICAgIGV4dGVuZHMgSHR0cFNlcnZsZXRSZXNwb25zZVdyYXBwZXIKKyAgICBpbXBsZW1lbnRzIEh0dHBTZXJ2bGV0UmVzcG9uc2UgeworICBwcml2YXRlIGludCBzdGF0dXM7CisKKyAgQXVkaXRlZEh0dHBTZXJ2bGV0UmVzcG9uc2UoSHR0cFNlcnZsZXRSZXNwb25zZSByZXNwb25zZSkgeworICAgIHN1cGVyKHJlc3BvbnNlKTsKKyAgfQorCisgIGludCBnZXRTdGF0dXMoKSB7CisgICAgcmV0dXJuIHN0YXR1czsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBzZXRTdGF0dXMoaW50IHNjKSB7CisgICAgc3VwZXIuc2V0U3RhdHVzKHNjKTsKKyAgICB0aGlzLnN0YXR1cyA9IHNjOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIHNldFN0YXR1cyhpbnQgc2MsIFN0cmluZyBzbSkgeworICAgIHN1cGVyLnNldFN0YXR1cyhzYywgc20pOworICAgIHRoaXMuc3RhdHVzID0gc2M7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgc2VuZEVycm9yKGludCBzYykgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBzdXBlci5zZW5kRXJyb3Ioc2MpOworICAgIHRoaXMuc3RhdHVzID0gc2M7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgc2VuZEVycm9yKGludCBzYywgU3RyaW5nIG1zZykgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBzdXBlci5zZW5kRXJyb3Ioc2MsIG1zZyk7CisgICAgdGhpcy5zdGF0dXMgPSBzYzsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBzZW5kUmVkaXJlY3QoU3RyaW5nIGxvY2F0aW9uKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHN1cGVyLnNlbmRSZWRpcmVjdChsb2NhdGlvbik7CisgICAgdGhpcy5zdGF0dXMgPSBTQ19NT1ZFRF9URU1QT1JBUklMWTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL0Jhc2VTZXJ2aWNlSW1wbGVtZW50YXRpb24uamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9CYXNlU2VydmljZUltcGxlbWVudGF0aW9uLmphdmEKaW5kZXggNjI1MDZmMC4uMzI3Nzk5MiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL0Jhc2VTZXJ2aWNlSW1wbGVtZW50YXRpb24uamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvQmFzZVNlcnZpY2VJbXBsZW1lbnRhdGlvbi5qYXZhCkBAIC00OCw2ICs0OCwxMCBAQAogICAgIHJldHVybiBudWxsOwogICB9CiAKKyAgcHJvdGVjdGVkIEN1cnJlbnRVc2VyIGdldEN1cnJlbnRVc2VyKCkgeworICAgIHJldHVybiBjdXJyZW50VXNlci5nZXQoKTsKKyAgfQorCiAgIC8qKgogICAgKiBFeGVjdXRlcyA8Y29kZT5hY3Rpb24ucnVuPC9jb2RlPiB3aXRoIGFuIGFjdGl2ZSBSZXZpZXdEYiBjb25uZWN0aW9uLgogICAgKiA8cD4KQEAgLTY4LDcgKzcyLDExIEBACiAgICAgfSBjYXRjaCAoSW52YWxpZFF1ZXJ5RXhjZXB0aW9uIGUpIHsKICAgICAgIGNhbGxiYWNrLm9uRmFpbHVyZShlKTsKICAgICB9IGNhdGNoIChOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uIGUpIHsKLSAgICAgIGNhbGxiYWNrLm9uRmFpbHVyZShuZXcgTm9TdWNoRW50aXR5RXhjZXB0aW9uKCkpOworICAgICAgaWYgKGUuZ2V0TWVzc2FnZSgpICE9IG51bGwpIHsKKyAgICAgICAgY2FsbGJhY2sub25GYWlsdXJlKG5ldyBOb1N1Y2hFbnRpdHlFeGNlcHRpb24oZS5nZXRNZXNzYWdlKCkpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGNhbGxiYWNrLm9uRmFpbHVyZShuZXcgTm9TdWNoRW50aXR5RXhjZXB0aW9uKCkpOworICAgICAgfQogICAgIH0gY2F0Y2ggKE5vU3VjaEdyb3VwRXhjZXB0aW9uIGUpIHsKICAgICAgIGNhbGxiYWNrLm9uRmFpbHVyZShuZXcgTm9TdWNoRW50aXR5RXhjZXB0aW9uKCkpOwogICAgIH0gY2F0Y2ggKE9ybVJ1bnRpbWVFeGNlcHRpb24gZSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL0dlcnJpdEpzb25TZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvR2Vycml0SnNvblNlcnZsZXQuamF2YQppbmRleCAxYjI0NzkyLi41NWVjYjAxIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvR2Vycml0SnNvblNlcnZsZXQuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvR2Vycml0SnNvblNlcnZsZXQuamF2YQpAQCAtMTQsMTMgKzE0LDE1IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjOwogCi1pbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hdWRpdC5BdWRpdEV2ZW50OworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuQXJyYXlMaXN0TXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NdWx0aW1hcDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hdWRpdC5BdWRpdFNlcnZpY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYXVkaXQuUnBjQXVkaXRFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXVkaXQuQXVkaXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGguU2lnbkluUmVxdWlyZWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob3RTaWduZWRJbkV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5XZWJTZXNzaW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5BY2Nlc3NQYXRoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdzb24uR3NvbkJ1aWxkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5SZW1vdGVKc29uU2VydmljZTsKQEAgLTM2LDExICszOCwxMSBAQAogCiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5GaWVsZDsKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOwotaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0Lk1ldGhvZDsKIAogaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlcXVlc3Q7CiBpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2U7CisKIC8qKgogICogQmFzZSBKU09OIHNlcnZsZXQgdG8gZW5zdXJlIHRoZSBjdXJyZW50IHVzZXIgaXMgbm90IGZvcmdlZC4KICAqLwpAQCAtNjcsNyArNjksNyBAQAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIEdlcnJpdENhbGwgY3JlYXRlQWN0aXZlQ2FsbChmaW5hbCBIdHRwU2VydmxldFJlcXVlc3QgcmVxLAogICAgICAgZmluYWwgSHR0cFNlcnZsZXRSZXNwb25zZSByc3ApIHsKLSAgICBmaW5hbCBHZXJyaXRDYWxsIGNhbGwgPSBuZXcgR2Vycml0Q2FsbChzZXNzaW9uLmdldCgpLCByZXEsIHJzcCk7CisgICAgZmluYWwgR2Vycml0Q2FsbCBjYWxsID0gbmV3IEdlcnJpdENhbGwoc2Vzc2lvbi5nZXQoKSwgcmVxLCBuZXcgQXVkaXRlZEh0dHBTZXJ2bGV0UmVzcG9uc2UocnNwKSk7CiAgICAgY3VycmVudENhbGwuc2V0KGNhbGwpOwogICAgIHJldHVybiBjYWxsOwogICB9CkBAIC0xMzEsNjQgKzEzMyw4OCBAQAogICAgICAgfQogICAgICAgQXVkaXQgbm90ZSA9IChBdWRpdCkgbWV0aG9kLmdldEFubm90YXRpb24oQXVkaXQuY2xhc3MpOwogICAgICAgaWYgKG5vdGUgIT0gbnVsbCkgewotICAgICAgICBmaW5hbCBTdHJpbmcgc2lkID0gY2FsbC5nZXRXZWJTZXNzaW9uKCkuZ2V0VG9rZW4oKTsKKyAgICAgICAgZmluYWwgU3RyaW5nIHNpZCA9IGNhbGwuZ2V0V2ViU2Vzc2lvbigpLmdldFNlc3Npb25JZCgpOwogICAgICAgICBmaW5hbCBDdXJyZW50VXNlciB1c2VybmFtZSA9IGNhbGwuZ2V0V2ViU2Vzc2lvbigpLmdldEN1cnJlbnRVc2VyKCk7Ci0gICAgICAgIGZpbmFsIExpc3Q8T2JqZWN0PiBhcmdzID0KKyAgICAgICAgZmluYWwgTXVsdGltYXA8U3RyaW5nLCA/PiBhcmdzID0KICAgICAgICAgICAgIGV4dHJhY3RQYXJhbXMobm90ZSwgY2FsbCk7Ci0gICAgICAgIGZpbmFsIFN0cmluZyB3aGF0ID0gZXh0cmFjdFdoYXQobm90ZSwgbWV0aG9kLmdldE5hbWUoKSk7CisgICAgICAgIGZpbmFsIFN0cmluZyB3aGF0ID0gZXh0cmFjdFdoYXQobm90ZSwgY2FsbCk7CiAgICAgICAgIGZpbmFsIE9iamVjdCByZXN1bHQgPSBjYWxsLmdldFJlc3VsdCgpOwogCi0gICAgICAgIGF1ZGl0LmRpc3BhdGNoKG5ldyBBdWRpdEV2ZW50KHNpZCwgdXNlcm5hbWUsIHdoYXQsIGNhbGwuZ2V0V2hlbigpLCBhcmdzLAotICAgICAgICAgICAgcmVzdWx0KSk7CisgICAgICAgIGF1ZGl0LmRpc3BhdGNoKG5ldyBScGNBdWRpdEV2ZW50KHNpZCwgdXNlcm5hbWUsIHdoYXQsIGNhbGwuZ2V0V2hlbigpLAorICAgICAgICAgICAgYXJncywgY2FsbC5nZXRIdHRwU2VydmxldFJlcXVlc3QoKS5nZXRNZXRob2QoKSwgY2FsbC5nZXRIdHRwU2VydmxldFJlcXVlc3QoKS5nZXRNZXRob2QoKSwKKyAgICAgICAgICAgICgoQXVkaXRlZEh0dHBTZXJ2bGV0UmVzcG9uc2UpIChjYWxsLmdldEh0dHBTZXJ2bGV0UmVzcG9uc2UoKSkpCisgICAgICAgICAgICAgICAgLmdldFN0YXR1cygpLCByZXN1bHQpKTsKICAgICAgIH0KICAgICB9IGNhdGNoIChUaHJvd2FibGUgYWxsKSB7CiAgICAgICBsb2cuZXJyb3IoIlVuYWJsZSB0byBsb2cgdGhlIGNhbGwiLCBhbGwpOwogICAgIH0KICAgfQogCi0gIHByaXZhdGUgTGlzdDxPYmplY3Q+IGV4dHJhY3RQYXJhbXMoZmluYWwgQXVkaXQgbm90ZSwgZmluYWwgR2Vycml0Q2FsbCBjYWxsKSB7Ci0gICAgTGlzdDxPYmplY3Q+IGFyZ3MgPSBMaXN0cy5uZXdBcnJheUxpc3QoQXJyYXlzLmFzTGlzdChjYWxsLmdldFBhcmFtcygpKSk7CisgIHByaXZhdGUgTXVsdGltYXA8U3RyaW5nLCA/PiBleHRyYWN0UGFyYW1zKGZpbmFsIEF1ZGl0IG5vdGUsIGZpbmFsIEdlcnJpdENhbGwgY2FsbCkgeworICAgIE11bHRpbWFwPFN0cmluZywgT2JqZWN0PiBhcmdzID0gQXJyYXlMaXN0TXVsdGltYXAuY3JlYXRlKCk7CisKKyAgICBPYmplY3RbXSBwYXJhbXMgPSBjYWxsLmdldFBhcmFtcygpOworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgcGFyYW1zLmxlbmd0aDsgaSsrKSB7CisgICAgICBhcmdzLnB1dCgiJCIgKyBpLCBwYXJhbXNbaV0pOworICAgIH0KKwogICAgIGZvciAoaW50IGlkeCA6IG5vdGUub2JmdXNjYXRlKCkpIHsKLSAgICAgIGFyZ3Muc2V0KGlkeCwgIioqKioqIik7CisgICAgICBhcmdzLnJlbW92ZUFsbCgiJCIgKyBpZHgpOworICAgICAgYXJncy5wdXQoIiQiICsgaWR4LCAiKioqKioiKTsKICAgICB9CiAgICAgcmV0dXJuIGFyZ3M7CiAgIH0KIAotICBwcml2YXRlIFN0cmluZyBleHRyYWN0V2hhdChmaW5hbCBBdWRpdCBub3RlLCBmaW5hbCBTdHJpbmcgbWV0aG9kTmFtZSkgeworICBwcml2YXRlIFN0cmluZyBleHRyYWN0V2hhdChmaW5hbCBBdWRpdCBub3RlLCBmaW5hbCBHZXJyaXRDYWxsIGNhbGwpIHsKKyAgICBTdHJpbmcgbWV0aG9kQ2xhc3MgPSBjYWxsLmdldE1ldGhvZENsYXNzKCkuZ2V0TmFtZSgpOworICAgIG1ldGhvZENsYXNzID0gbWV0aG9kQ2xhc3Muc3Vic3RyaW5nKG1ldGhvZENsYXNzLmxhc3RJbmRleE9mKCIuIikrMSk7CiAgICAgU3RyaW5nIHdoYXQgPSBub3RlLmFjdGlvbigpOwogICAgIGlmICh3aGF0Lmxlbmd0aCgpID09IDApIHsKLSAgICAgIGJvb2xlYW4gY2Nhc2UgPSBDaGFyYWN0ZXIuaXNMb3dlckNhc2UobWV0aG9kTmFtZS5jaGFyQXQoMCkpOwotCi0gICAgICBTdHJpbmdCdWlsZGVyIHNiID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbWV0aG9kTmFtZS5sZW5ndGgoKTsgaSsrKSB7Ci0gICAgICAgIGNoYXIgYyA9IG1ldGhvZE5hbWUuY2hhckF0KGkpOwotICAgICAgICBpZiAoY2Nhc2UgJiYgIUNoYXJhY3Rlci5pc0xvd2VyQ2FzZShjKSkgewotICAgICAgICAgIHNiLmFwcGVuZCgnICcpOwotICAgICAgICB9Ci0gICAgICAgIHNiLmFwcGVuZChDaGFyYWN0ZXIudG9Mb3dlckNhc2UoYykpOwotICAgICAgfQotICAgICAgd2hhdCA9IHNiLnRvU3RyaW5nKCk7CisgICAgICB3aGF0ID0gY2FsbC5nZXRNZXRob2QoKS5nZXROYW1lKCk7CiAgICAgfQogCi0gICAgcmV0dXJuIHdoYXQ7CisgICAgcmV0dXJuIG1ldGhvZENsYXNzICsgIi4iICsgd2hhdDsKICAgfQogCiAgIHN0YXRpYyBjbGFzcyBHZXJyaXRDYWxsIGV4dGVuZHMgQWN0aXZlQ2FsbCB7CiAgICAgcHJpdmF0ZSBmaW5hbCBXZWJTZXNzaW9uIHNlc3Npb247CiAgICAgcHJpdmF0ZSBmaW5hbCBsb25nIHdoZW47CiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgRmllbGQgcmVzdWx0RmllbGQ7CisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgRmllbGQgbWV0aG9kRmllbGQ7CiAKICAgICAvLyBOZWVkZWQgdG8gYWxsb3cgYWNjZXNzIHRvIG5vbi1wdWJsaWMgcmVzdWx0IGZpZWxkIGluIEdXVC9KU09OLVJQQwogICAgIHN0YXRpYyB7CisgICAgICByZXN1bHRGaWVsZCA9IGdldFByaXZhdGVGaWVsZChBY3RpdmVDYWxsLmNsYXNzLCAicmVzdWx0Iik7CisgICAgICBtZXRob2RGaWVsZCA9IGdldFByaXZhdGVGaWVsZChNZXRob2RIYW5kbGUuY2xhc3MsICJtZXRob2QiKTsKKyAgICB9CisKKyAgICBwcml2YXRlIHN0YXRpYyBGaWVsZCBnZXRQcml2YXRlRmllbGQoQ2xhc3M8Pz4gY2xhenosIFN0cmluZyBmaWVsZE5hbWUpIHsKICAgICAgIEZpZWxkIGRlY2xhcmVkRmllbGQgPSBudWxsOwogICAgICAgdHJ5IHsKLSAgICAgICAgZGVjbGFyZWRGaWVsZCA9IEFjdGl2ZUNhbGwuY2xhc3MuZ2V0RGVjbGFyZWRGaWVsZCgicmVzdWx0Iik7CisgICAgICAgIGRlY2xhcmVkRmllbGQgPSBjbGF6ei5nZXREZWNsYXJlZEZpZWxkKGZpZWxkTmFtZSk7CiAgICAgICAgIGRlY2xhcmVkRmllbGQuc2V0QWNjZXNzaWJsZSh0cnVlKTsKICAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CiAgICAgICAgIGxvZy5lcnJvcigiVW5hYmxlIHRvIGV4cG9zZSBSUFMvSlNPTiByZXN1bHQgZmllbGQiKTsKICAgICAgIH0KKyAgICAgIHJldHVybiBkZWNsYXJlZEZpZWxkOworICAgIH0KIAotICAgICAgcmVzdWx0RmllbGQgPSBkZWNsYXJlZEZpZWxkOworICAgIC8vIFN1cnJvZ2F0ZSBvZiB0aGUgbWlzc2luZyBnZXRNZXRob2RDbGFzcygpIGluIEdXVC9KU09OLVJQQworICAgIHB1YmxpYyBDbGFzczw/PiBnZXRNZXRob2RDbGFzcygpIHsKKyAgICAgIGlmIChtZXRob2RGaWVsZCA9PSBudWxsKSB7CisgICAgICAgIHJldHVybiBudWxsOworICAgICAgfQorCisgICAgICB0cnkgeworICAgICAgICBNZXRob2QgbWV0aG9kID0gKE1ldGhvZCkgbWV0aG9kRmllbGQuZ2V0KHRoaXMuZ2V0TWV0aG9kKCkpOworICAgICAgICByZXR1cm4gbWV0aG9kLmdldERlY2xhcmluZ0NsYXNzKCk7CisgICAgICB9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gZSkgeworICAgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBhY2Nlc3MgcmVzdWx0IGZpZWxkIik7CisgICAgICB9IGNhdGNoIChJbGxlZ2FsQWNjZXNzRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgbG9nLmVycm9yKCJObyBwZXJtaXNzaW9ucyB0byBhY2Nlc3MgcmVzdWx0IGZpZWxkIik7CisgICAgICB9CisKKyAgICAgIHJldHVybiBudWxsOwogICAgIH0KIAogICAgIC8vIFN1cnJvZ2F0ZSBvZiB0aGUgbWlzc2luZyBnZXRSZXN1bHQoKSBpbiBHV1QvSlNPTi1SUEMKQEAgLTI0NiwxMSArMjcyLDEzIEBACiAgICAgICAgIC8vCiAgICAgICAgIHJldHVybiAhc2Vzc2lvbi5pc1NpZ25lZEluKCk7CiAKLSAgICAgIH0gZWxzZSB7CisgICAgICB9IGVsc2UgaWYgKHNlc3Npb24uaXNTaWduZWRJbigpICYmIHNlc3Npb24uaXNWYWxpZFhHZXJyaXRBdXRoKGtleUluKSkgewogICAgICAgICAvLyBUaGUgc2Vzc2lvbiBtdXN0IGV4aXN0LCBhbmQgbXVzdCBiZSB1c2luZyB0aGlzIHRva2VuLgogICAgICAgICAvLwotICAgICAgICByZXR1cm4gc2Vzc2lvbi5pc1NpZ25lZEluKCkgJiYgc2Vzc2lvbi5pc1Rva2VuVmFsaWQoa2V5SW4pOworICAgICAgICBzZXNzaW9uLmdldEN1cnJlbnRVc2VyKCkuc2V0QWNjZXNzUGF0aChBY2Nlc3NQYXRoLkpTT05fUlBDKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICB9CisgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgcHVibGljIFdlYlNlc3Npb24gZ2V0V2ViU2Vzc2lvbigpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9ScGNTZXJ2bGV0TW9kdWxlLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvUnBjU2VydmxldE1vZHVsZS5qYXZhCmluZGV4IDg3NmZlZTMuLjk1M2JjNzEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9ScGNTZXJ2bGV0TW9kdWxlLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL1JwY1NlcnZsZXRNb2R1bGUuamF2YQpAQCAtMjIsNyArMjIsNyBAQAogCiAvKiogQmluZHMge0BsaW5rIFJlbW90ZUpzb25TZXJ2aWNlfSBpbXBsZW1lbnRhdGlvbnMgdG8gYSBKU09OIHNlcnZsZXQuICovCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUnBjU2VydmxldE1vZHVsZSBleHRlbmRzIFNlcnZsZXRNb2R1bGUgewotICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBQUkVGSVggPSAiL2dlcnJpdC9ycGMvIjsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUFJFRklYID0gIi9nZXJyaXRfdWkvcnBjLyI7CiAKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcHJlZml4OwogCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvU3VnZ2VzdFNlcnZpY2VJbXBsLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvU3VnZ2VzdFNlcnZpY2VJbXBsLmphdmEKaW5kZXggMWJhYTQ5Yi4uNTU5YzI3MCAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL1N1Z2dlc3RTZXJ2aWNlSW1wbC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9TdWdnZXN0U2VydmljZUltcGwuamF2YQpAQCAtMzMsOCArMzMsOCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRWaXNpYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQmFja2VuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cE1lbWJlcnM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5Qb3N0UmV2aWV3ZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5BZGRSZXZpZXdlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hQcm9qZWN0RXhjZXB0aW9uOwpAQCAtMjI0LDE2ICsyMjQsMjcgQEAKICAgICAgICAgfSBjYXRjaCAoTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIGUpIHsKICAgICAgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CiAgICAgICAgIH0KLSAgICAgICAgVmlzaWJpbGl0eUNvbnRyb2wgdmlzaWJpbGl0eUNvbnRyb2wgPSBuZXcgVmlzaWJpbGl0eUNvbnRyb2woKSB7Ci0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHVibGljIGJvb2xlYW4gaXNWaXNpYmxlKEFjY291bnQgYWNjb3VudCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7Ci0gICAgICAgICAgICBJZGVudGlmaWVkVXNlciB3aG8gPQotICAgICAgICAgICAgICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUocmV2aWV3RGJQcm92aWRlciwgYWNjb3VudC5nZXRJZCgpKTsKLSAgICAgICAgICAgIC8vIHdlIGNhbid0IHVzZSBjaGFuZ2VDb250cm9sIGRpcmVjdGx5IGFzIGl0IHdvbid0IHN1Z2dlc3QgcmV2aWV3ZXJzCi0gICAgICAgICAgICAvLyB0byBkcmFmdHMKLSAgICAgICAgICAgIHJldHVybiBjaGFuZ2VDb250cm9sLmZvclVzZXIod2hvKS5pc1JlZlZpc2libGUoKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH07CisKKyAgICAgICAgVmlzaWJpbGl0eUNvbnRyb2wgdmlzaWJpbGl0eUNvbnRyb2w7CisgICAgICAgIGlmIChjaGFuZ2VDb250cm9sLmdldFJlZkNvbnRyb2woKS5pc1Zpc2libGVCeVJlZ2lzdGVyZWRVc2VycygpKSB7CisgICAgICAgICAgdmlzaWJpbGl0eUNvbnRyb2wgPSBuZXcgVmlzaWJpbGl0eUNvbnRyb2woKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyBib29sZWFuIGlzVmlzaWJsZShBY2NvdW50IGFjY291bnQpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9OworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIHZpc2liaWxpdHlDb250cm9sID0gbmV3IFZpc2liaWxpdHlDb250cm9sKCkgeworICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICBwdWJsaWMgYm9vbGVhbiBpc1Zpc2libGUoQWNjb3VudCBhY2NvdW50KSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAgICAgICAgICAgSWRlbnRpZmllZFVzZXIgd2hvID0KKyAgICAgICAgICAgICAgICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUocmV2aWV3RGJQcm92aWRlciwgYWNjb3VudC5nZXRJZCgpKTsKKyAgICAgICAgICAgICAgLy8gd2UgY2FuJ3QgdXNlIGNoYW5nZUNvbnRyb2wgZGlyZWN0bHkgYXMgaXQgd29uJ3Qgc3VnZ2VzdCByZXZpZXdlcnMKKyAgICAgICAgICAgICAgLy8gdG8gZHJhZnRzCisgICAgICAgICAgICAgIHJldHVybiBjaGFuZ2VDb250cm9sLmZvclVzZXIod2hvKS5pc1JlZlZpc2libGUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9OworICAgICAgICB9CiAKICAgICAgICAgZmluYWwgTGlzdDxBY2NvdW50SW5mbz4gc3VnZ2VzdGVkQWNjb3VudHMgPQogICAgICAgICAgICAgc3VnZ2VzdEFjY291bnQoZGIsIHF1ZXJ5LCBCb29sZWFuLlRSVUUsIGxpbWl0LCB2aXNpYmlsaXR5Q29udHJvbCk7CkBAIC0yNjIsMTMgKzI3MywxMyBAQAogCiAgIHByaXZhdGUgYm9vbGVhbiBzdWdnZXN0R3JvdXBBc1Jldmlld2VyKGZpbmFsIFByb2plY3QuTmFtZUtleSBwcm9qZWN0LAogICAgICAgZmluYWwgR3JvdXBSZWZlcmVuY2UgZ3JvdXApIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIGlmICghQWRkUmV2aWV3ZXIuaXNMZWdhbFJldmlld2VyR3JvdXAoZ3JvdXAuZ2V0VVVJRCgpKSkgeworICAgIGlmICghUG9zdFJldmlld2Vycy5pc0xlZ2FsUmV2aWV3ZXJHcm91cChncm91cC5nZXRVVUlEKCkpKSB7CiAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgdHJ5IHsKLSAgICAgIGZpbmFsIFNldDxBY2NvdW50PiBtZW1iZXJzID0KLSAgICAgICAgICBncm91cE1lbWJlcnNGYWN0b3J5LmNyZWF0ZSgpLmxpc3RBY2NvdW50cyhncm91cC5nZXRVVUlEKCksIHByb2plY3QpOworICAgICAgZmluYWwgU2V0PEFjY291bnQ+IG1lbWJlcnMgPSBncm91cE1lbWJlcnNGYWN0b3J5LmNyZWF0ZShnZXRDdXJyZW50VXNlcigpKQorICAgICAgICAgIC5saXN0QWNjb3VudHMoZ3JvdXAuZ2V0VVVJRCgpLCBwcm9qZWN0KTsKIAogICAgICAgaWYgKG1lbWJlcnMuaXNFbXB0eSgpKSB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTI3Niw3ICsyODcsNyBAQAogCiAgICAgICBmaW5hbCBpbnQgbWF4QWxsb3dlZCA9CiAgICAgICAgICAgY2ZnLmdldEludCgiYWRkcmV2aWV3ZXIiLCAibWF4QWxsb3dlZCIsCi0gICAgICAgICAgICAgIEFkZFJldmlld2VyLkRFRkFVTFRfTUFYX1JFVklFV0VSUyk7CisgICAgICAgICAgICAgIFBvc3RSZXZpZXdlcnMuREVGQVVMVF9NQVhfUkVWSUVXRVJTKTsKICAgICAgIGlmIChtYXhBbGxvd2VkID4gMCAmJiBtZW1iZXJzLnNpemUoKSA+IG1heEFsbG93ZWQpIHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvQWNjb3VudENhcGFiaWxpdGllc1NlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L0FjY291bnRDYXBhYmlsaXRpZXNTZXJ2bGV0LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGEzM2MyMDkuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvQWNjb3VudENhcGFiaWxpdGllc1NlcnZsZXQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDE4OSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLmFjY291bnQ7Ci0KLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5DUkVBVEVfQUNDT1VOVDsKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5DUkVBVEVfR1JPVVA7Ci1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuQ1JFQVRFX1BST0pFQ1Q7Ci1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuRkxVU0hfQ0FDSEVTOwotaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5LktJTExfVEFTSzsKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5QUklPUklUWTsKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5TVEFSVF9SRVBMSUNBVElPTjsKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5WSUVXX0NBQ0hFUzsKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5WSUVXX0NPTk5FQ1RJT05TOwotaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5LlZJRVdfUVVFVUU7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvblJhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLlJlc3RBcGlTZXJ2bGV0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuT3V0cHV0Rm9ybWF0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkNhcGFiaWxpdHlDb250cm9sOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUXVldWVQcm92aWRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdzb24ucmVmbGVjdC5UeXBlVG9rZW47Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKLQotaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5PcHRpb247Ci0KLWltcG9ydCBqYXZhLmlvLkJ5dGVBcnJheU91dHB1dFN0cmVhbTsKLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtV3JpdGVyOwotaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKLWltcG9ydCBqYXZhLnV0aWwuTWFwOwotaW1wb3J0IGphdmEudXRpbC5TZXQ7Ci0KLWltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXF1ZXN0OwotaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlc3BvbnNlOwotCi1AU2luZ2xldG9uCi1wdWJsaWMgY2xhc3MgQWNjb3VudENhcGFiaWxpdGllc1NlcnZsZXQgZXh0ZW5kcyBSZXN0QXBpU2VydmxldCB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwotICBwcml2YXRlIGZpbmFsIFBhcmFtZXRlclBhcnNlciBwYXJhbVBhcnNlcjsKLSAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxJbXBsPiBmYWN0b3J5OwotCi0gIEBJbmplY3QKLSAgQWNjb3VudENhcGFiaWxpdGllc1NlcnZsZXQoZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IGN1cnJlbnRVc2VyLAotICAgICAgUGFyYW1ldGVyUGFyc2VyIHBhcmFtUGFyc2VyLCBQcm92aWRlcjxJbXBsPiBmYWN0b3J5KSB7Ci0gICAgc3VwZXIoY3VycmVudFVzZXIpOwotICAgIHRoaXMucGFyYW1QYXJzZXIgPSBwYXJhbVBhcnNlcjsKLSAgICB0aGlzLmZhY3RvcnkgPSBmYWN0b3J5OwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCB2b2lkIGRvR2V0KEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKQotICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICBJbXBsIGltcGwgPSBmYWN0b3J5LmdldCgpOwotICAgIGlmIChhY2NlcHRzSnNvbihyZXEpKSB7Ci0gICAgICBpbXBsLmZvcm1hdCA9IE91dHB1dEZvcm1hdC5KU09OX0NPTVBBQ1Q7Ci0gICAgfQotICAgIGlmIChwYXJhbVBhcnNlci5wYXJzZShpbXBsLCByZXEsIHJlcykpIHsKLSAgICAgIGltcGwuY29tcHV0ZSgpOwotCi0gICAgICBCeXRlQXJyYXlPdXRwdXRTdHJlYW0gYnVmID0gbmV3IEJ5dGVBcnJheU91dHB1dFN0cmVhbSgpOwotICAgICAgT3V0cHV0U3RyZWFtV3JpdGVyIG91dCA9IG5ldyBPdXRwdXRTdHJlYW1Xcml0ZXIoYnVmLCAiVVRGLTgiKTsKLSAgICAgIGlmIChpbXBsLmZvcm1hdC5pc0pzb24oKSkgewotICAgICAgICByZXMuc2V0Q29udGVudFR5cGUoSlNPTl9UWVBFKTsKLSAgICAgICAgYnVmLndyaXRlKEpTT05fTUFHSUMpOwotICAgICAgICBpbXBsLmZvcm1hdC5uZXdHc29uKCkudG9Kc29uKAotICAgICAgICAgICAgaW1wbC5oYXZlLAotICAgICAgICAgICAgbmV3IFR5cGVUb2tlbjxNYXA8U3RyaW5nLCBPYmplY3Q+PigpIHt9LmdldFR5cGUoKSwKLSAgICAgICAgICAgIG91dCk7Ci0gICAgICAgIG91dC5mbHVzaCgpOwotICAgICAgICBidWYud3JpdGUoJ1xuJyk7Ci0gICAgICB9IGVsc2UgewotICAgICAgICByZXMuc2V0Q29udGVudFR5cGUoInRleHQvcGxhaW4iKTsKLSAgICAgICAgZm9yIChNYXAuRW50cnk8U3RyaW5nLCBPYmplY3Q+IGUgOiBpbXBsLmhhdmUuZW50cnlTZXQoKSkgewotICAgICAgICAgIG91dC53cml0ZShlLmdldEtleSgpKTsKLSAgICAgICAgICBpZiAoIShlLmdldFZhbHVlKCkgaW5zdGFuY2VvZiBCb29sZWFuKSkgewotICAgICAgICAgICAgb3V0LndyaXRlKCI6ICIpOwotICAgICAgICAgICAgb3V0LndyaXRlKGUuZ2V0VmFsdWUoKS50b1N0cmluZygpKTsKLSAgICAgICAgICB9Ci0gICAgICAgICAgb3V0LndyaXRlKCdcbicpOwotICAgICAgICB9Ci0gICAgICAgIG91dC5mbHVzaCgpOwotICAgICAgfQotICAgICAgcmVzLnNldENoYXJhY3RlckVuY29kaW5nKCJVVEYtOCIpOwotICAgICAgc2VuZChyZXEsIHJlcywgYnVmLnRvQnl0ZUFycmF5KCkpOwotICAgIH0KLSAgfQotCi0gIHN0YXRpYyBjbGFzcyBJbXBsIHsKLSAgICBwcml2YXRlIGZpbmFsIENhcGFiaWxpdHlDb250cm9sIGNjOwotICAgIHByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgT2JqZWN0PiBoYXZlOwotCi0gICAgQE9wdGlvbihuYW1lID0gIi0tZm9ybWF0IiwgbWV0YVZhciA9ICJGTVQiLCB1c2FnZSA9ICJPdXRwdXQgZGlzcGxheSBmb3JtYXQiKQotICAgIHByaXZhdGUgT3V0cHV0Rm9ybWF0IGZvcm1hdCA9IE91dHB1dEZvcm1hdC5URVhUOwotCi0gICAgQE9wdGlvbihuYW1lID0gIi1xIiwgbWV0YVZhciA9ICJDQVAiLCBtdWx0aVZhbHVlZCA9IHRydWUsIHVzYWdlID0gIkNhcGFiaWxpdHkgdG8gaW5zcGVjdCIpCi0gICAgdm9pZCBhZGRRdWVyeShTdHJpbmcgbmFtZSkgewotICAgICAgaWYgKHF1ZXJ5ID09IG51bGwpIHsKLSAgICAgICAgcXVlcnkgPSBTZXRzLm5ld0hhc2hTZXQoKTsKLSAgICAgIH0KLSAgICAgIHF1ZXJ5LmFkZChuYW1lLnRvTG93ZXJDYXNlKCkpOwotICAgIH0KLSAgICBwcml2YXRlIFNldDxTdHJpbmc+IHF1ZXJ5OwotCi0gICAgQEluamVjdAotICAgIEltcGwoQ3VycmVudFVzZXIgdXNlcikgewotICAgICAgY2MgPSB1c2VyLmdldENhcGFiaWxpdGllcygpOwotICAgICAgaGF2ZSA9IE1hcHMubmV3TGlua2VkSGFzaE1hcCgpOwotICAgIH0KLQotICAgIHZvaWQgY29tcHV0ZSgpIHsKLSAgICAgIGZvciAoU3RyaW5nIG5hbWUgOiBHbG9iYWxDYXBhYmlsaXR5LmdldEFsbE5hbWVzKCkpIHsKLSAgICAgICAgaWYgKCFuYW1lLmVxdWFscyhQUklPUklUWSkgJiYgd2FudChuYW1lKSAmJiBjYy5jYW5QZXJmb3JtKG5hbWUpKSB7Ci0gICAgICAgICAgaWYgKEdsb2JhbENhcGFiaWxpdHkuaGFzUmFuZ2UobmFtZSkpIHsKLSAgICAgICAgICAgIGhhdmUucHV0KG5hbWUsIG5ldyBSYW5nZShjYy5nZXRSYW5nZShuYW1lKSkpOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBoYXZlLnB1dChuYW1lLCB0cnVlKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0KLQotICAgICAgaGF2ZS5wdXQoQ1JFQVRFX0FDQ09VTlQsIGNjLmNhbkNyZWF0ZUFjY291bnQoKSk7Ci0gICAgICBoYXZlLnB1dChDUkVBVEVfR1JPVVAsIGNjLmNhbkNyZWF0ZUdyb3VwKCkpOwotICAgICAgaGF2ZS5wdXQoQ1JFQVRFX1BST0pFQ1QsIGNjLmNhbkNyZWF0ZVByb2plY3QoKSk7Ci0gICAgICBoYXZlLnB1dChLSUxMX1RBU0ssIGNjLmNhbktpbGxUYXNrKCkpOwotICAgICAgaGF2ZS5wdXQoVklFV19DQUNIRVMsIGNjLmNhblZpZXdDYWNoZXMoKSk7Ci0gICAgICBoYXZlLnB1dChGTFVTSF9DQUNIRVMsIGNjLmNhbkZsdXNoQ2FjaGVzKCkpOwotICAgICAgaGF2ZS5wdXQoVklFV19DT05ORUNUSU9OUywgY2MuY2FuVmlld0Nvbm5lY3Rpb25zKCkpOwotICAgICAgaGF2ZS5wdXQoVklFV19RVUVVRSwgY2MuY2FuVmlld1F1ZXVlKCkpOwotICAgICAgaGF2ZS5wdXQoU1RBUlRfUkVQTElDQVRJT04sIGNjLmNhblN0YXJ0UmVwbGljYXRpb24oKSk7Ci0KLSAgICAgIFF1ZXVlUHJvdmlkZXIuUXVldWVUeXBlIHF1ZXVlID0gY2MuZ2V0UXVldWVUeXBlKCk7Ci0gICAgICBpZiAocXVldWUgIT0gUXVldWVQcm92aWRlci5RdWV1ZVR5cGUuSU5URVJBQ1RJVkUKLSAgICAgICAgICB8fCAocXVlcnkgIT0gbnVsbCAmJiBxdWVyeS5jb250YWlucyhQUklPUklUWSkpKSB7Ci0gICAgICAgIGhhdmUucHV0KFBSSU9SSVRZLCBxdWV1ZSk7Ci0gICAgICB9Ci0KLSAgICAgIEl0ZXJhdG9yPE1hcC5FbnRyeTxTdHJpbmcsIE9iamVjdD4+IGl0ciA9IGhhdmUuZW50cnlTZXQoKS5pdGVyYXRvcigpOwotICAgICAgd2hpbGUgKGl0ci5oYXNOZXh0KCkpIHsKLSAgICAgICAgTWFwLkVudHJ5PFN0cmluZywgT2JqZWN0PiBlID0gaXRyLm5leHQoKTsKLSAgICAgICAgaWYgKCF3YW50KGUuZ2V0S2V5KCkpKSB7Ci0gICAgICAgICAgaXRyLnJlbW92ZSgpOwotICAgICAgICB9IGVsc2UgaWYgKGUuZ2V0VmFsdWUoKSBpbnN0YW5jZW9mIEJvb2xlYW4gJiYgISgoQm9vbGVhbikgZS5nZXRWYWx1ZSgpKSkgewotICAgICAgICAgIGl0ci5yZW1vdmUoKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLQotICAgIHByaXZhdGUgYm9vbGVhbiB3YW50KFN0cmluZyBuYW1lKSB7Ci0gICAgICByZXR1cm4gcXVlcnkgPT0gbnVsbCB8fCBxdWVyeS5jb250YWlucyhuYW1lLnRvTG93ZXJDYXNlKCkpOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIGNsYXNzIFJhbmdlIHsKLSAgICBwcml2YXRlIHRyYW5zaWVudCBQZXJtaXNzaW9uUmFuZ2UgcmFuZ2U7Ci0gICAgQFN1cHByZXNzV2FybmluZ3MoInVudXNlZCIpCi0gICAgcHJpdmF0ZSBpbnQgbWluOwotICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bnVzZWQiKQotICAgIHByaXZhdGUgaW50IG1heDsKLQotICAgIFJhbmdlKFBlcm1pc3Npb25SYW5nZSByKSB7Ci0gICAgICByYW5nZSA9IHI7Ci0gICAgICBtaW4gPSByLmdldE1pbigpOwotICAgICAgbWF4ID0gci5nZXRNYXgoKTsKLSAgICB9Ci0KLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewotICAgICAgcmV0dXJuIHJhbmdlLnRvU3RyaW5nKCk7Ci0gICAgfQotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9BY2NvdW50TW9kdWxlLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9BY2NvdW50TW9kdWxlLmphdmEKaW5kZXggOTU3ZjMzOS4uYmVmNjMxNiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvQWNjb3VudE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L0FjY291bnRNb2R1bGUuamF2YQpAQCAtMzAsMTggKzMwLDEyIEBACiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKICAgICAgICAgZmFjdG9yeShBZ3JlZW1lbnRJbmZvRmFjdG9yeS5GYWN0b3J5LmNsYXNzKTsKLSAgICAgICAgZmFjdG9yeShDcmVhdGVHcm91cC5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShEZWxldGVFeHRlcm5hbElkcy5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShFeHRlcm5hbElkRGV0YWlsRmFjdG9yeS5GYWN0b3J5LmNsYXNzKTsKLSAgICAgICAgZmFjdG9yeShHcm91cERldGFpbEhhbmRsZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgICAgIGZhY3RvcnkoTXlHcm91cHNGYWN0b3J5LkZhY3RvcnkuY2xhc3MpOwogICAgICAgICBmYWN0b3J5KFJlZ2lzdGVyTmV3RW1haWxTZW5kZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgICAgIGZhY3RvcnkoUmVuYW1lR3JvdXAuRmFjdG9yeS5jbGFzcyk7Ci0gICAgICAgIGZhY3RvcnkoVmlzaWJsZUdyb3Vwc0hhbmRsZXIuRmFjdG9yeS5jbGFzcyk7CiAgICAgICB9CiAgICAgfSk7CiAgICAgcnBjKEFjY291bnRTZWN1cml0eUltcGwuY2xhc3MpOwogICAgIHJwYyhBY2NvdW50U2VydmljZUltcGwuY2xhc3MpOwotICAgIHJwYyhHcm91cEFkbWluU2VydmljZUltcGwuY2xhc3MpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9BY2NvdW50U2VjdXJpdHlJbXBsLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9BY2NvdW50U2VjdXJpdHlJbXBsLmphdmEKaW5kZXggYjYyYTEwYi4uMTE4NDZkMyAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvQWNjb3VudFNlY3VyaXR5SW1wbC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L0FjY291bnRTZWN1cml0eUltcGwuamF2YQpAQCAtMTgsMTAgKzE4LDEwIEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjb3VudFNlY3VyaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNvbnRyaWJ1dG9yQWdyZWVtZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuQ29udGFjdEluZm9ybWF0aW9uU3RvcmVFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkludmFsaWRTc2hLZXlFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5OYW1lQWxyZWFkeVVzZWRFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hFbnRpdHlFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLlBlcm1pc3Npb25EZW5pZWRFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLkJhc2VTZXJ2aWNlSW1wbGVtZW50YXRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLkhhbmRsZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CkBAIC00Nyw3ICs0Nyw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuUmVhbG07CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BdXRoQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb250YWN0LkNvbnRhY3RTdG9yZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5FbWFpbEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5FbWFpbFRva2VuVmVyaWZpZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmVnaXN0ZXJOZXdFbWFpbFNlbmRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q2FjaGU7CkBAIC04Niw3ICs4NSw2IEBACiAgIHByaXZhdGUgZmluYWwgQ2hhbmdlVXNlck5hbWUuQ3VycmVudFVzZXIgY2hhbmdlVXNlck5hbWVGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIERlbGV0ZUV4dGVybmFsSWRzLkZhY3RvcnkgZGVsZXRlRXh0ZXJuYWxJZHNGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIEV4dGVybmFsSWREZXRhaWxGYWN0b3J5LkZhY3RvcnkgZXh0ZXJuYWxJZERldGFpbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgTXlHcm91cHNGYWN0b3J5LkZhY3RvcnkgbXlHcm91cHNGYWN0b3J5OwogCiAgIHByaXZhdGUgZmluYWwgQ2hhbmdlSG9va3MgaG9va3M7CiAgIHByaXZhdGUgZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlOwpAQCAtMTA0LDcgKzEwMiw2IEBACiAgICAgICBmaW5hbCBDaGFuZ2VVc2VyTmFtZS5DdXJyZW50VXNlciBjaGFuZ2VVc2VyTmFtZUZhY3RvcnksCiAgICAgICBmaW5hbCBEZWxldGVFeHRlcm5hbElkcy5GYWN0b3J5IGRlbGV0ZUV4dGVybmFsSWRzRmFjdG9yeSwKICAgICAgIGZpbmFsIEV4dGVybmFsSWREZXRhaWxGYWN0b3J5LkZhY3RvcnkgZXh0ZXJuYWxJZERldGFpbEZhY3RvcnksCi0gICAgICBmaW5hbCBNeUdyb3Vwc0ZhY3RvcnkuRmFjdG9yeSBteUdyb3Vwc0ZhY3RvcnksCiAgICAgICBmaW5hbCBDaGFuZ2VIb29rcyBob29rcywgZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlKSB7CiAgICAgc3VwZXIoc2NoZW1hLCBjdXJyZW50VXNlcik7CiAgICAgY29udGFjdFN0b3JlID0gY3M7CkBAIC0xMjYsNyArMTIzLDYgQEAKICAgICB0aGlzLmNoYW5nZVVzZXJOYW1lRmFjdG9yeSA9IGNoYW5nZVVzZXJOYW1lRmFjdG9yeTsKICAgICB0aGlzLmRlbGV0ZUV4dGVybmFsSWRzRmFjdG9yeSA9IGRlbGV0ZUV4dGVybmFsSWRzRmFjdG9yeTsKICAgICB0aGlzLmV4dGVybmFsSWREZXRhaWxGYWN0b3J5ID0gZXh0ZXJuYWxJZERldGFpbEZhY3Rvcnk7Ci0gICAgdGhpcy5teUdyb3Vwc0ZhY3RvcnkgPSBteUdyb3Vwc0ZhY3Rvcnk7CiAgICAgdGhpcy5ob29rcyA9IGhvb2tzOwogICAgIHRoaXMuZ3JvdXBDYWNoZSA9IGdyb3VwQ2FjaGU7CiAgIH0KQEAgLTE5MSw3ICsxODcsOCBAQAogICAgIGlmIChyZWFsbS5hbGxvd3NFZGl0KEFjY291bnQuRmllbGROYW1lLlVTRVJfTkFNRSkpIHsKICAgICAgIEhhbmRsZXIud3JhcChjaGFuZ2VVc2VyTmFtZUZhY3RvcnkuY3JlYXRlKG5ld05hbWUpKS50byhjYWxsYmFjayk7CiAgICAgfSBlbHNlIHsKLSAgICAgIGNhbGxiYWNrLm9uRmFpbHVyZShuZXcgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uKCkpOworICAgICAgY2FsbGJhY2sub25GYWlsdXJlKG5ldyBQZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uKCJOb3QgYWxsb3dlZCB0byBjaGFuZ2UiCisgICAgICAgICAgKyAiIHVzZXJuYW1lIikpOwogICAgIH0KICAgfQogCkBAIC0yMTEsMTYgKzIwOCw2IEBACiAgICAgZXh0ZXJuYWxJZERldGFpbEZhY3RvcnkuY3JlYXRlKCkudG8oY2FsbGJhY2spOwogICB9CiAKLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIG15R3JvdXBzKGZpbmFsIEFzeW5jQ2FsbGJhY2s8TGlzdDxBY2NvdW50R3JvdXA+PiBjYWxsYmFjaykgewotICAgIHJ1bihjYWxsYmFjaywgbmV3IEFjdGlvbjxMaXN0PEFjY291bnRHcm91cD4+KCkgewotICAgICAgcHVibGljIExpc3Q8QWNjb3VudEdyb3VwPiBydW4oZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24sCi0gICAgICAgICAgTm9TdWNoR3JvdXBFeGNlcHRpb24sIEZhaWx1cmUgewotICAgICAgICByZXR1cm4gbXlHcm91cHNGYWN0b3J5LmNyZWF0ZSgpLmNhbGwoKTsKLSAgICAgIH0KLSAgICB9KTsKLSAgfQotCiAgIHB1YmxpYyB2b2lkIGRlbGV0ZUV4dGVybmFsSWRzKGZpbmFsIFNldDxBY2NvdW50RXh0ZXJuYWxJZC5LZXk+IGtleXMsCiAgICAgICBmaW5hbCBBc3luY0NhbGxiYWNrPFNldDxBY2NvdW50RXh0ZXJuYWxJZC5LZXk+PiBjYWxsYmFjaykgewogICAgIGRlbGV0ZUV4dGVybmFsSWRzRmFjdG9yeS5jcmVhdGUoa2V5cykudG8oY2FsbGJhY2spOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvQWNjb3VudHNSZXN0QXBpU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvQWNjb3VudHNSZXN0QXBpU2VydmxldC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjM1MWQ1NjMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9BY2NvdW50c1Jlc3RBcGlTZXJ2bGV0LmphdmEKQEAgLTAsMCArMSwzMiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5hY2NvdW50OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucmVzdGFwaS5SZXN0QXBpU2VydmxldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50c0NvbGxlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKKworQFNpbmdsZXRvbgorcHVibGljIGNsYXNzIEFjY291bnRzUmVzdEFwaVNlcnZsZXQgZXh0ZW5kcyBSZXN0QXBpU2VydmxldCB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgIEBJbmplY3QKKyAgQWNjb3VudHNSZXN0QXBpU2VydmxldChSZXN0QXBpU2VydmxldC5HbG9iYWxzIGdsb2JhbHMsCisgICAgICBQcm92aWRlcjxBY2NvdW50c0NvbGxlY3Rpb24+IGFjY291bnRzKSB7CisgICAgc3VwZXIoZ2xvYmFscywgYWNjb3VudHMpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9DcmVhdGVHcm91cC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvQ3JlYXRlR3JvdXAuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZWJlYmQwNC4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9DcmVhdGVHcm91cC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNTQgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5hY2NvdW50OwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5OYW1lQWxyZWFkeVVzZWRFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5QZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5IYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LlBlcmZvcm1DcmVhdGVHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKLQotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLQotY2xhc3MgQ3JlYXRlR3JvdXAgZXh0ZW5kcyBIYW5kbGVyPEFjY291bnRHcm91cC5JZD4gewotICBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgQ3JlYXRlR3JvdXAgY3JlYXRlKFN0cmluZyBncm91cE5hbWUpOwotICB9Ci0KLSAgcHJpdmF0ZSBmaW5hbCBQZXJmb3JtQ3JlYXRlR3JvdXAuRmFjdG9yeSBwZXJmb3JtQ3JlYXRlR3JvdXBGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyIHVzZXI7Ci0gIHByaXZhdGUgZmluYWwgU3RyaW5nIGdyb3VwTmFtZTsKLQotICBASW5qZWN0Ci0gIENyZWF0ZUdyb3VwKGZpbmFsIFBlcmZvcm1DcmVhdGVHcm91cC5GYWN0b3J5IHBlcmZvcm1DcmVhdGVHcm91cEZhY3RvcnksCi0gICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyLCBAQXNzaXN0ZWQgZmluYWwgU3RyaW5nIGdyb3VwTmFtZSkgewotICAgIHRoaXMucGVyZm9ybUNyZWF0ZUdyb3VwRmFjdG9yeSA9IHBlcmZvcm1DcmVhdGVHcm91cEZhY3Rvcnk7Ci0gICAgdGhpcy51c2VyID0gdXNlcjsKLSAgICB0aGlzLmdyb3VwTmFtZSA9IGdyb3VwTmFtZTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgQWNjb3VudEdyb3VwLklkIGNhbGwoKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBOYW1lQWxyZWFkeVVzZWRFeGNlcHRpb24sCi0gICAgICBQZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBQZXJmb3JtQ3JlYXRlR3JvdXAgcGVyZm9ybUNyZWF0ZUdyb3VwID0gcGVyZm9ybUNyZWF0ZUdyb3VwRmFjdG9yeS5jcmVhdGUoKTsKLSAgICBmaW5hbCBBY2NvdW50LklkIG1lID0gdXNlci5nZXRBY2NvdW50SWQoKTsKLSAgICByZXR1cm4gcGVyZm9ybUNyZWF0ZUdyb3VwLmNyZWF0ZUdyb3VwKGdyb3VwTmFtZSwgbnVsbCwgZmFsc2UsIG51bGwsIENvbGxlY3Rpb25zLnNpbmdsZXRvbihtZSksIG51bGwpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9Hcm91cEFkbWluU2VydmljZUltcGwuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L0dyb3VwQWRtaW5TZXJ2aWNlSW1wbC5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBhY2EyZTA1Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L0dyb3VwQWRtaW5TZXJ2aWNlSW1wbC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNDIxICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuYWNjb3VudDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwQWRtaW5TZXJ2aWNlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGV0YWlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwTGlzdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cE9wdGlvbnM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBSZWZlcmVuY2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5JbmFjdGl2ZUFjY291bnRFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5OYW1lQWxyZWFkeVVzZWRFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hBY2NvdW50RXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoRW50aXR5RXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLkJhc2VTZXJ2aWNlSW1wbGVtZW50YXRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBNZW1iZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cE1lbWJlckF1ZGl0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BdXRoVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50RXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRSZXNvbHZlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BdXRoUmVxdWVzdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cEJhY2tlbmQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBCYWNrZW5kczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cEluY2x1ZGVDYWNoZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkF1dGhDb25maWc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uVm9pZFJlc3VsdDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKLQotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKLWltcG9ydCBqYXZhLnV0aWwuU2V0OwotCi1jbGFzcyBHcm91cEFkbWluU2VydmljZUltcGwgZXh0ZW5kcyBCYXNlU2VydmljZUltcGxlbWVudGF0aW9uIGltcGxlbWVudHMKLSAgICBHcm91cEFkbWluU2VydmljZSB7Ci0gIHByaXZhdGUgZmluYWwgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZTsKLSAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50UmVzb2x2ZXIgYWNjb3VudFJlc29sdmVyOwotICBwcml2YXRlIGZpbmFsIEFjY291bnRNYW5hZ2VyIGFjY291bnRNYW5hZ2VyOwotICBwcml2YXRlIGZpbmFsIEF1dGhUeXBlIGF1dGhUeXBlOwotICBwcml2YXRlIGZpbmFsIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZTsKLSAgcHJpdmF0ZSBmaW5hbCBHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kOwotICBwcml2YXRlIGZpbmFsIEdyb3VwSW5jbHVkZUNhY2hlIGdyb3VwSW5jbHVkZUNhY2hlOwotICBwcml2YXRlIGZpbmFsIEdyb3VwQ29udHJvbC5GYWN0b3J5IGdyb3VwQ29udHJvbEZhY3Rvcnk7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBDcmVhdGVHcm91cC5GYWN0b3J5IGNyZWF0ZUdyb3VwRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBSZW5hbWVHcm91cC5GYWN0b3J5IHJlbmFtZUdyb3VwRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBHcm91cERldGFpbEhhbmRsZXIuRmFjdG9yeSBncm91cERldGFpbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgVmlzaWJsZUdyb3Vwc0hhbmRsZXIuRmFjdG9yeSB2aXNpYmxlR3JvdXBzRmFjdG9yeTsKLQotICBASW5qZWN0Ci0gIEdyb3VwQWRtaW5TZXJ2aWNlSW1wbChmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gc2NoZW1hLAotICAgICAgZmluYWwgUHJvdmlkZXI8SWRlbnRpZmllZFVzZXI+IGN1cnJlbnRVc2VyLAotICAgICAgZmluYWwgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZSwKLSAgICAgIGZpbmFsIEdyb3VwSW5jbHVkZUNhY2hlIGdyb3VwSW5jbHVkZUNhY2hlLAotICAgICAgZmluYWwgQWNjb3VudFJlc29sdmVyIGFjY291bnRSZXNvbHZlciwKLSAgICAgIGZpbmFsIEFjY291bnRNYW5hZ2VyIGFjY291bnRNYW5hZ2VyLAotICAgICAgZmluYWwgQXV0aENvbmZpZyBhdXRoQ29uZmlnLAotICAgICAgZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlLAotICAgICAgZmluYWwgR3JvdXBCYWNrZW5kIGdyb3VwQmFja2VuZCwKLSAgICAgIGZpbmFsIEdyb3VwQ29udHJvbC5GYWN0b3J5IGdyb3VwQ29udHJvbEZhY3RvcnksCi0gICAgICBmaW5hbCBDcmVhdGVHcm91cC5GYWN0b3J5IGNyZWF0ZUdyb3VwRmFjdG9yeSwKLSAgICAgIGZpbmFsIFJlbmFtZUdyb3VwLkZhY3RvcnkgcmVuYW1lR3JvdXBGYWN0b3J5LAotICAgICAgZmluYWwgR3JvdXBEZXRhaWxIYW5kbGVyLkZhY3RvcnkgZ3JvdXBEZXRhaWxGYWN0b3J5LAotICAgICAgZmluYWwgVmlzaWJsZUdyb3Vwc0hhbmRsZXIuRmFjdG9yeSB2aXNpYmxlR3JvdXBzRmFjdG9yeSkgewotICAgIHN1cGVyKHNjaGVtYSwgY3VycmVudFVzZXIpOwotICAgIHRoaXMuYWNjb3VudENhY2hlID0gYWNjb3VudENhY2hlOwotICAgIHRoaXMuZ3JvdXBJbmNsdWRlQ2FjaGUgPSBncm91cEluY2x1ZGVDYWNoZTsKLSAgICB0aGlzLmFjY291bnRSZXNvbHZlciA9IGFjY291bnRSZXNvbHZlcjsKLSAgICB0aGlzLmFjY291bnRNYW5hZ2VyID0gYWNjb3VudE1hbmFnZXI7Ci0gICAgdGhpcy5hdXRoVHlwZSA9IGF1dGhDb25maWcuZ2V0QXV0aFR5cGUoKTsKLSAgICB0aGlzLmdyb3VwQ2FjaGUgPSBncm91cENhY2hlOwotICAgIHRoaXMuZ3JvdXBCYWNrZW5kID0gZ3JvdXBCYWNrZW5kOwotICAgIHRoaXMuZ3JvdXBDb250cm9sRmFjdG9yeSA9IGdyb3VwQ29udHJvbEZhY3Rvcnk7Ci0gICAgdGhpcy5jcmVhdGVHcm91cEZhY3RvcnkgPSBjcmVhdGVHcm91cEZhY3Rvcnk7Ci0gICAgdGhpcy5yZW5hbWVHcm91cEZhY3RvcnkgPSByZW5hbWVHcm91cEZhY3Rvcnk7Ci0gICAgdGhpcy5ncm91cERldGFpbEZhY3RvcnkgPSBncm91cERldGFpbEZhY3Rvcnk7Ci0gICAgdGhpcy52aXNpYmxlR3JvdXBzRmFjdG9yeSA9IHZpc2libGVHcm91cHNGYWN0b3J5OwotICB9Ci0KLSAgcHVibGljIHZvaWQgdmlzaWJsZUdyb3VwcyhmaW5hbCBBc3luY0NhbGxiYWNrPEdyb3VwTGlzdD4gY2FsbGJhY2spIHsKLSAgICB2aXNpYmxlR3JvdXBzRmFjdG9yeS5jcmVhdGUoKS50byhjYWxsYmFjayk7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBjcmVhdGVHcm91cChmaW5hbCBTdHJpbmcgbmV3TmFtZSwKLSAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8QWNjb3VudEdyb3VwLklkPiBjYWxsYmFjaykgewotICAgIGNyZWF0ZUdyb3VwRmFjdG9yeS5jcmVhdGUobmV3TmFtZSkudG8oY2FsbGJhY2spOwotICB9Ci0KLSAgcHVibGljIHZvaWQgZ3JvdXBEZXRhaWwoQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsIEFjY291bnRHcm91cC5VVUlEIGdyb3VwVVVJRCwKLSAgICAgIEFzeW5jQ2FsbGJhY2s8R3JvdXBEZXRhaWw+IGNhbGxiYWNrKSB7Ci0gICAgaWYgKGdyb3VwSWQgPT0gbnVsbCAmJiBncm91cFVVSUQgIT0gbnVsbCkgewotICAgICAgQWNjb3VudEdyb3VwIGcgPSBncm91cENhY2hlLmdldChncm91cFVVSUQpOwotICAgICAgaWYgKGcgIT0gbnVsbCkgewotICAgICAgICBncm91cElkID0gZy5nZXRJZCgpOwotICAgICAgfQotICAgIH0KLSAgICBncm91cERldGFpbEZhY3RvcnkuY3JlYXRlKGdyb3VwSWQpLnRvKGNhbGxiYWNrKTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIGNoYW5nZUdyb3VwRGVzY3JpcHRpb24oZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsCi0gICAgICBmaW5hbCBTdHJpbmcgZGVzY3JpcHRpb24sIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gY2FsbGJhY2spIHsKLSAgICBydW4oY2FsbGJhY2ssIG5ldyBBY3Rpb248Vm9pZFJlc3VsdD4oKSB7Ci0gICAgICBwdWJsaWMgVm9pZFJlc3VsdCBydW4oZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24sIEZhaWx1cmUgewotICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAgZ3JvdXAgPSBkYi5hY2NvdW50R3JvdXBzKCkuZ2V0KGdyb3VwSWQpOwotICAgICAgICBhc3NlcnRBbUdyb3VwT3duZXIoZGIsIGdyb3VwKTsKLSAgICAgICAgZ3JvdXAuc2V0RGVzY3JpcHRpb24oZGVzY3JpcHRpb24pOwotICAgICAgICBkYi5hY2NvdW50R3JvdXBzKCkudXBkYXRlKENvbGxlY3Rpb25zLnNpbmdsZXRvbihncm91cCkpOwotICAgICAgICBncm91cENhY2hlLmV2aWN0KGdyb3VwKTsKLSAgICAgICAgcmV0dXJuIFZvaWRSZXN1bHQuSU5TVEFOQ0U7Ci0gICAgICB9Ci0gICAgfSk7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBjaGFuZ2VHcm91cE9wdGlvbnMoZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsCi0gICAgICBmaW5hbCBHcm91cE9wdGlvbnMgZ3JvdXBPcHRpb25zLCBmaW5hbCBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNhbGxiYWNrKSB7Ci0gICAgcnVuKGNhbGxiYWNrLCBuZXcgQWN0aW9uPFZvaWRSZXN1bHQ+KCkgewotICAgICAgcHVibGljIFZvaWRSZXN1bHQgcnVuKGZpbmFsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBGYWlsdXJlIHsKLSAgICAgICAgZmluYWwgQWNjb3VudEdyb3VwIGdyb3VwID0gZGIuYWNjb3VudEdyb3VwcygpLmdldChncm91cElkKTsKLSAgICAgICAgYXNzZXJ0QW1Hcm91cE93bmVyKGRiLCBncm91cCk7Ci0gICAgICAgIGdyb3VwLnNldFZpc2libGVUb0FsbChncm91cE9wdGlvbnMuaXNWaXNpYmxlVG9BbGwoKSk7Ci0gICAgICAgIGRiLmFjY291bnRHcm91cHMoKS51cGRhdGUoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGdyb3VwKSk7Ci0gICAgICAgIGdyb3VwQ2FjaGUuZXZpY3QoZ3JvdXApOwotICAgICAgICByZXR1cm4gVm9pZFJlc3VsdC5JTlNUQU5DRTsKLSAgICAgIH0KLSAgICB9KTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIGNoYW5nZUdyb3VwT3duZXIoZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsCi0gICAgICBmaW5hbCBTdHJpbmcgbmV3T3duZXJOYW1lLCBmaW5hbCBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNhbGxiYWNrKSB7Ci0gICAgcnVuKGNhbGxiYWNrLCBuZXcgQWN0aW9uPFZvaWRSZXN1bHQ+KCkgewotICAgICAgcHVibGljIFZvaWRSZXN1bHQgcnVuKGZpbmFsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBGYWlsdXJlIHsKLSAgICAgICAgZmluYWwgQWNjb3VudEdyb3VwIGdyb3VwID0gZGIuYWNjb3VudEdyb3VwcygpLmdldChncm91cElkKTsKLSAgICAgICAgYXNzZXJ0QW1Hcm91cE93bmVyKGRiLCBncm91cCk7Ci0KLSAgICAgICAgR3JvdXBSZWZlcmVuY2Ugb3duZXIgPQotICAgICAgICAgICAgR3JvdXBCYWNrZW5kcy5maW5kRXhhY3RTdWdnZXN0aW9uKGdyb3VwQmFja2VuZCwgbmV3T3duZXJOYW1lKTsKLSAgICAgICAgaWYgKG93bmVyID09IG51bGwpIHsKLSAgICAgICAgICB0aHJvdyBuZXcgRmFpbHVyZShuZXcgTm9TdWNoRW50aXR5RXhjZXB0aW9uKCkpOwotICAgICAgICB9Ci0KLSAgICAgICAgZ3JvdXAuc2V0T3duZXJHcm91cFVVSUQob3duZXIuZ2V0VVVJRCgpKTsKLSAgICAgICAgZGIuYWNjb3VudEdyb3VwcygpLnVwZGF0ZShDb2xsZWN0aW9ucy5zaW5nbGV0b24oZ3JvdXApKTsKLSAgICAgICAgZ3JvdXBDYWNoZS5ldmljdChncm91cCk7Ci0gICAgICAgIHJldHVybiBWb2lkUmVzdWx0LklOU1RBTkNFOwotICAgICAgfQotICAgIH0pOwotICB9Ci0KLSAgcHVibGljIHZvaWQgcmVuYW1lR3JvdXAoZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsIGZpbmFsIFN0cmluZyBuZXdOYW1lLAotICAgICAgZmluYWwgQXN5bmNDYWxsYmFjazxHcm91cERldGFpbD4gY2FsbGJhY2spIHsKLSAgICByZW5hbWVHcm91cEZhY3RvcnkuY3JlYXRlKGdyb3VwSWQsIG5ld05hbWUpLnRvKGNhbGxiYWNrKTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIGNoYW5nZUdyb3VwVHlwZShmaW5hbCBBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZCwKLSAgICAgIGZpbmFsIEFjY291bnRHcm91cC5UeXBlIG5ld1R5cGUsIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gY2FsbGJhY2spIHsKLSAgICBydW4oY2FsbGJhY2ssIG5ldyBBY3Rpb248Vm9pZFJlc3VsdD4oKSB7Ci0gICAgICBwdWJsaWMgVm9pZFJlc3VsdCBydW4oZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24sIEZhaWx1cmUgewotICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAgZ3JvdXAgPSBkYi5hY2NvdW50R3JvdXBzKCkuZ2V0KGdyb3VwSWQpOwotICAgICAgICBhc3NlcnRBbUdyb3VwT3duZXIoZGIsIGdyb3VwKTsKLSAgICAgICAgZ3JvdXAuc2V0VHlwZShuZXdUeXBlKTsKLSAgICAgICAgZGIuYWNjb3VudEdyb3VwcygpLnVwZGF0ZShDb2xsZWN0aW9ucy5zaW5nbGV0b24oZ3JvdXApKTsKLSAgICAgICAgZ3JvdXBDYWNoZS5ldmljdChncm91cCk7Ci0gICAgICAgIHJldHVybiBWb2lkUmVzdWx0LklOU1RBTkNFOwotICAgICAgfQotICAgIH0pOwotICB9Ci0KLSAgcHVibGljIHZvaWQgYWRkR3JvdXBNZW1iZXIoZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsCi0gICAgICBmaW5hbCBTdHJpbmcgbmFtZU9yRW1haWwsIGZpbmFsIEFzeW5jQ2FsbGJhY2s8R3JvdXBEZXRhaWw+IGNhbGxiYWNrKSB7Ci0gICAgcnVuKGNhbGxiYWNrLCBuZXcgQWN0aW9uPEdyb3VwRGV0YWlsPigpIHsKLSAgICAgIHB1YmxpYyBHcm91cERldGFpbCBydW4oUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24sIEZhaWx1cmUsCi0gICAgICAgICAgTm9TdWNoR3JvdXBFeGNlcHRpb24gewotICAgICAgICBmaW5hbCBHcm91cENvbnRyb2wgY29udHJvbCA9IGdyb3VwQ29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoZ3JvdXBJZCk7Ci0gICAgICAgIGlmIChncm91cENhY2hlLmdldChncm91cElkKS5nZXRUeXBlKCkgIT0gQWNjb3VudEdyb3VwLlR5cGUuSU5URVJOQUwpIHsKLSAgICAgICAgICB0aHJvdyBuZXcgRmFpbHVyZShuZXcgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uKCkpOwotICAgICAgICB9Ci0KLSAgICAgICAgZmluYWwgQWNjb3VudCBhID0gZmluZEFjY291bnQobmFtZU9yRW1haWwpOwotICAgICAgICBpZiAoIWEuaXNBY3RpdmUoKSkgewotICAgICAgICAgIHRocm93IG5ldyBGYWlsdXJlKG5ldyBJbmFjdGl2ZUFjY291bnRFeGNlcHRpb24oYS5nZXRGdWxsTmFtZSgpKSk7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCFjb250cm9sLmNhbkFkZE1lbWJlcihhLmdldElkKCkpKSB7Ci0gICAgICAgICAgdGhyb3cgbmV3IEZhaWx1cmUobmV3IE5vU3VjaEVudGl0eUV4Y2VwdGlvbigpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIEFjY291bnRHcm91cE1lbWJlci5LZXkga2V5ID0KLSAgICAgICAgICAgIG5ldyBBY2NvdW50R3JvdXBNZW1iZXIuS2V5KGEuZ2V0SWQoKSwgZ3JvdXBJZCk7Ci0gICAgICAgIEFjY291bnRHcm91cE1lbWJlciBtID0gZGIuYWNjb3VudEdyb3VwTWVtYmVycygpLmdldChrZXkpOwotICAgICAgICBpZiAobSA9PSBudWxsKSB7Ci0gICAgICAgICAgbSA9IG5ldyBBY2NvdW50R3JvdXBNZW1iZXIoa2V5KTsKLSAgICAgICAgICBkYi5hY2NvdW50R3JvdXBNZW1iZXJzQXVkaXQoKS5pbnNlcnQoCi0gICAgICAgICAgICAgIENvbGxlY3Rpb25zLnNpbmdsZXRvbihuZXcgQWNjb3VudEdyb3VwTWVtYmVyQXVkaXQobSwKLSAgICAgICAgICAgICAgICAgIGdldEFjY291bnRJZCgpKSkpOwotICAgICAgICAgIGRiLmFjY291bnRHcm91cE1lbWJlcnMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKG0pKTsKLSAgICAgICAgICBhY2NvdW50Q2FjaGUuZXZpY3QobS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgIH0KLQotICAgICAgICByZXR1cm4gZ3JvdXBEZXRhaWxGYWN0b3J5LmNyZWF0ZShncm91cElkKS5jYWxsKCk7Ci0gICAgICB9Ci0gICAgfSk7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBhZGRHcm91cEluY2x1ZGUoZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsCi0gICAgICBmaW5hbCBTdHJpbmcgZ3JvdXBOYW1lLCBmaW5hbCBBc3luY0NhbGxiYWNrPEdyb3VwRGV0YWlsPiBjYWxsYmFjaykgewotICAgIHJ1bihjYWxsYmFjaywgbmV3IEFjdGlvbjxHcm91cERldGFpbD4oKSB7Ci0gICAgICBwdWJsaWMgR3JvdXBEZXRhaWwgcnVuKFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBGYWlsdXJlLAotICAgICAgICAgIE5vU3VjaEdyb3VwRXhjZXB0aW9uIHsKLSAgICAgICAgZmluYWwgR3JvdXBDb250cm9sIGNvbnRyb2wgPSBncm91cENvbnRyb2xGYWN0b3J5LnZhbGlkYXRlRm9yKGdyb3VwSWQpOwotICAgICAgICBpZiAoZ3JvdXBDYWNoZS5nZXQoZ3JvdXBJZCkuZ2V0VHlwZSgpICE9IEFjY291bnRHcm91cC5UeXBlLklOVEVSTkFMKSB7Ci0gICAgICAgICAgdGhyb3cgbmV3IEZhaWx1cmUobmV3IE5hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbigpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIEFjY291bnRHcm91cCBhID0gZmluZEdyb3VwKGdyb3VwTmFtZSk7Ci0gICAgICAgIGlmICghY29udHJvbC5jYW5BZGRHcm91cChhLmdldElkKCkpKSB7Ci0gICAgICAgICAgdGhyb3cgbmV3IEZhaWx1cmUobmV3IE5vU3VjaEVudGl0eUV4Y2VwdGlvbigpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIEFjY291bnRHcm91cEluY2x1ZGUuS2V5IGtleSA9Ci0gICAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZS5LZXkoZ3JvdXBJZCwgYS5nZXRJZCgpKTsKLSAgICAgICAgQWNjb3VudEdyb3VwSW5jbHVkZSBtID0gZGIuYWNjb3VudEdyb3VwSW5jbHVkZXMoKS5nZXQoa2V5KTsKLSAgICAgICAgaWYgKG0gPT0gbnVsbCkgewotICAgICAgICAgIG0gPSBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZShrZXkpOwotICAgICAgICAgIGRiLmFjY291bnRHcm91cEluY2x1ZGVzQXVkaXQoKS5pbnNlcnQoCi0gICAgICAgICAgICAgIENvbGxlY3Rpb25zLnNpbmdsZXRvbihuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0KG0sCi0gICAgICAgICAgICAgICAgICBnZXRBY2NvdW50SWQoKSkpKTsKLSAgICAgICAgICBkYi5hY2NvdW50R3JvdXBJbmNsdWRlcygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24obSkpOwotICAgICAgICAgIGdyb3VwSW5jbHVkZUNhY2hlLmV2aWN0SW5jbHVkZShhLmdldEdyb3VwVVVJRCgpKTsKLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBncm91cERldGFpbEZhY3RvcnkuY3JlYXRlKGdyb3VwSWQpLmNhbGwoKTsKLSAgICAgIH0KLSAgICB9KTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIGRlbGV0ZUdyb3VwTWVtYmVycyhmaW5hbCBBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZCwKLSAgICAgIGZpbmFsIFNldDxBY2NvdW50R3JvdXBNZW1iZXIuS2V5PiBrZXlzLAotICAgICAgZmluYWwgQXN5bmNDYWxsYmFjazxWb2lkUmVzdWx0PiBjYWxsYmFjaykgewotICAgIHJ1bihjYWxsYmFjaywgbmV3IEFjdGlvbjxWb2lkUmVzdWx0PigpIHsKLSAgICAgIHB1YmxpYyBWb2lkUmVzdWx0IHJ1bihmaW5hbCBSZXZpZXdEYiBkYikgdGhyb3dzIE9ybUV4Y2VwdGlvbiwKLSAgICAgICAgICBOb1N1Y2hHcm91cEV4Y2VwdGlvbiwgRmFpbHVyZSB7Ci0gICAgICAgIGZpbmFsIEdyb3VwQ29udHJvbCBjb250cm9sID0gZ3JvdXBDb250cm9sRmFjdG9yeS52YWxpZGF0ZUZvcihncm91cElkKTsKLSAgICAgICAgaWYgKGdyb3VwQ2FjaGUuZ2V0KGdyb3VwSWQpLmdldFR5cGUoKSAhPSBBY2NvdW50R3JvdXAuVHlwZS5JTlRFUk5BTCkgewotICAgICAgICAgIHRocm93IG5ldyBGYWlsdXJlKG5ldyBOYW1lQWxyZWFkeVVzZWRFeGNlcHRpb24oKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBmb3IgKGZpbmFsIEFjY291bnRHcm91cE1lbWJlci5LZXkgayA6IGtleXMpIHsKLSAgICAgICAgICBpZiAoIWdyb3VwSWQuZXF1YWxzKGsuZ2V0QWNjb3VudEdyb3VwSWQoKSkpIHsKLSAgICAgICAgICAgIHRocm93IG5ldyBGYWlsdXJlKG5ldyBOb1N1Y2hFbnRpdHlFeGNlcHRpb24oKSk7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgZmluYWwgQWNjb3VudC5JZCBtZSA9IGdldEFjY291bnRJZCgpOwotICAgICAgICBmb3IgKGZpbmFsIEFjY291bnRHcm91cE1lbWJlci5LZXkgayA6IGtleXMpIHsKLSAgICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXBNZW1iZXIgbSA9IGRiLmFjY291bnRHcm91cE1lbWJlcnMoKS5nZXQoayk7Ci0gICAgICAgICAgaWYgKG0gIT0gbnVsbCkgewotICAgICAgICAgICAgaWYgKCFjb250cm9sLmNhblJlbW92ZU1lbWJlcihtLmdldEFjY291bnRJZCgpKSkgewotICAgICAgICAgICAgICB0aHJvdyBuZXcgRmFpbHVyZShuZXcgTm9TdWNoRW50aXR5RXhjZXB0aW9uKCkpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBBY2NvdW50R3JvdXBNZW1iZXJBdWRpdCBhdWRpdCA9IG51bGw7Ci0gICAgICAgICAgICBmb3IgKEFjY291bnRHcm91cE1lbWJlckF1ZGl0IGEgOiBkYi5hY2NvdW50R3JvdXBNZW1iZXJzQXVkaXQoKQotICAgICAgICAgICAgICAgIC5ieUdyb3VwQWNjb3VudChtLmdldEFjY291bnRHcm91cElkKCksIG0uZ2V0QWNjb3VudElkKCkpKSB7Ci0gICAgICAgICAgICAgIGlmIChhLmlzQWN0aXZlKCkpIHsKLSAgICAgICAgICAgICAgICBhdWRpdCA9IGE7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgaWYgKGF1ZGl0ICE9IG51bGwpIHsKLSAgICAgICAgICAgICAgYXVkaXQucmVtb3ZlZChtZSk7Ci0gICAgICAgICAgICAgIGRiLmFjY291bnRHcm91cE1lbWJlcnNBdWRpdCgpCi0gICAgICAgICAgICAgICAgICAudXBkYXRlKENvbGxlY3Rpb25zLnNpbmdsZXRvbihhdWRpdCkpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgYXVkaXQgPSBuZXcgQWNjb3VudEdyb3VwTWVtYmVyQXVkaXQobSwgbWUpOwotICAgICAgICAgICAgICBhdWRpdC5yZW1vdmVkTGVnYWN5KCk7Ci0gICAgICAgICAgICAgIGRiLmFjY291bnRHcm91cE1lbWJlcnNBdWRpdCgpCi0gICAgICAgICAgICAgICAgICAuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihhdWRpdCkpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBkYi5hY2NvdW50R3JvdXBNZW1iZXJzKCkuZGVsZXRlKENvbGxlY3Rpb25zLnNpbmdsZXRvbihtKSk7Ci0gICAgICAgICAgICBhY2NvdW50Q2FjaGUuZXZpY3QobS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBWb2lkUmVzdWx0LklOU1RBTkNFOwotICAgICAgfQotICAgIH0pOwotICB9Ci0KLSAgcHVibGljIHZvaWQgZGVsZXRlR3JvdXBJbmNsdWRlcyhmaW5hbCBBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZCwKLSAgICAgIGZpbmFsIFNldDxBY2NvdW50R3JvdXBJbmNsdWRlLktleT4ga2V5cywKLSAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gY2FsbGJhY2spIHsKLSAgICBydW4oY2FsbGJhY2ssIG5ldyBBY3Rpb248Vm9pZFJlc3VsdD4oKSB7Ci0gICAgICBwdWJsaWMgVm9pZFJlc3VsdCBydW4oZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24sCi0gICAgICAgICAgTm9TdWNoR3JvdXBFeGNlcHRpb24sIEZhaWx1cmUgewotICAgICAgICBmaW5hbCBHcm91cENvbnRyb2wgY29udHJvbCA9IGdyb3VwQ29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoZ3JvdXBJZCk7Ci0gICAgICAgIGlmIChncm91cENhY2hlLmdldChncm91cElkKS5nZXRUeXBlKCkgIT0gQWNjb3VudEdyb3VwLlR5cGUuSU5URVJOQUwpIHsKLSAgICAgICAgICB0aHJvdyBuZXcgRmFpbHVyZShuZXcgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uKCkpOwotICAgICAgICB9Ci0KLSAgICAgICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlLktleSBrIDoga2V5cykgewotICAgICAgICAgIGlmICghZ3JvdXBJZC5lcXVhbHMoay5nZXRHcm91cElkKCkpKSB7Ci0gICAgICAgICAgICB0aHJvdyBuZXcgRmFpbHVyZShuZXcgTm9TdWNoRW50aXR5RXhjZXB0aW9uKCkpOwotICAgICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIEFjY291bnQuSWQgbWUgPSBnZXRBY2NvdW50SWQoKTsKLSAgICAgICAgZmluYWwgU2V0PEFjY291bnRHcm91cC5JZD4gZ3JvdXBzVG9FdmljdCA9IG5ldyBIYXNoU2V0PEFjY291bnRHcm91cC5JZD4oKTsKLSAgICAgICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlLktleSBrIDoga2V5cykgewotICAgICAgICAgIGZpbmFsIEFjY291bnRHcm91cEluY2x1ZGUgbSA9Ci0gICAgICAgICAgICAgIGRiLmFjY291bnRHcm91cEluY2x1ZGVzKCkuZ2V0KGspOwotICAgICAgICAgIGlmIChtICE9IG51bGwpIHsKLSAgICAgICAgICAgIGlmICghY29udHJvbC5jYW5SZW1vdmVHcm91cChtLmdldEluY2x1ZGVJZCgpKSkgewotICAgICAgICAgICAgICB0aHJvdyBuZXcgRmFpbHVyZShuZXcgTm9TdWNoRW50aXR5RXhjZXB0aW9uKCkpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQgYXVkaXQgPSBudWxsOwotICAgICAgICAgICAgZm9yIChBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQgYSA6IGRiCi0gICAgICAgICAgICAgICAgLmFjY291bnRHcm91cEluY2x1ZGVzQXVkaXQoKS5ieUdyb3VwSW5jbHVkZSgKLSAgICAgICAgICAgICAgICAgICAgbS5nZXRHcm91cElkKCksIG0uZ2V0SW5jbHVkZUlkKCkpKSB7Ci0gICAgICAgICAgICAgIGlmIChhLmlzQWN0aXZlKCkpIHsKLSAgICAgICAgICAgICAgICBhdWRpdCA9IGE7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgaWYgKGF1ZGl0ICE9IG51bGwpIHsKLSAgICAgICAgICAgICAgYXVkaXQucmVtb3ZlZChtZSk7Ci0gICAgICAgICAgICAgIGRiLmFjY291bnRHcm91cEluY2x1ZGVzQXVkaXQoKS51cGRhdGUoCi0gICAgICAgICAgICAgICAgICBDb2xsZWN0aW9ucy5zaW5nbGV0b24oYXVkaXQpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRiLmFjY291bnRHcm91cEluY2x1ZGVzKCkuZGVsZXRlKENvbGxlY3Rpb25zLnNpbmdsZXRvbihtKSk7Ci0gICAgICAgICAgICBncm91cHNUb0V2aWN0LmFkZChrLmdldEluY2x1ZGVJZCgpKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgZm9yIChBY2NvdW50R3JvdXAgZ3JvdXAgOiBkYi5hY2NvdW50R3JvdXBzKCkuZ2V0KGdyb3Vwc1RvRXZpY3QpKSB7Ci0gICAgICAgICAgZ3JvdXBJbmNsdWRlQ2FjaGUuZXZpY3RJbmNsdWRlKGdyb3VwLmdldEdyb3VwVVVJRCgpKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gVm9pZFJlc3VsdC5JTlNUQU5DRTsKLSAgICAgIH0KLSAgICB9KTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBhc3NlcnRBbUdyb3VwT3duZXIoZmluYWwgUmV2aWV3RGIgZGIsIGZpbmFsIEFjY291bnRHcm91cCBncm91cCkKLSAgICAgIHRocm93cyBGYWlsdXJlIHsKLSAgICB0cnkgewotICAgICAgaWYgKCFncm91cENvbnRyb2xGYWN0b3J5LmNvbnRyb2xGb3IoZ3JvdXAuZ2V0SWQoKSkuaXNPd25lcigpKSB7Ci0gICAgICAgIHRocm93IG5ldyBGYWlsdXJlKG5ldyBOb1N1Y2hHcm91cEV4Y2VwdGlvbihncm91cC5nZXRJZCgpKSk7Ci0gICAgICB9Ci0gICAgfSBjYXRjaCAoTm9TdWNoR3JvdXBFeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgbmV3IEZhaWx1cmUobmV3IE5vU3VjaEdyb3VwRXhjZXB0aW9uKGdyb3VwLmdldElkKCkpKTsKLSAgICB9Ci0gIH0KLQotICBwcml2YXRlIEFjY291bnQgZmluZEFjY291bnQoZmluYWwgU3RyaW5nIG5hbWVPckVtYWlsKSB0aHJvd3MgT3JtRXhjZXB0aW9uLAotICAgICAgRmFpbHVyZSB7Ci0gICAgQWNjb3VudCByID0gYWNjb3VudFJlc29sdmVyLmZpbmQobmFtZU9yRW1haWwpOwotICAgIGlmIChyID09IG51bGwpIHsKLSAgICAgIHN3aXRjaCAoYXV0aFR5cGUpIHsKLSAgICAgICAgY2FzZSBIVFRQX0xEQVA6Ci0gICAgICAgIGNhc2UgQ0xJRU5UX1NTTF9DRVJUX0xEQVA6Ci0gICAgICAgIGNhc2UgTERBUDoKLSAgICAgICAgICByID0gY3JlYXRlQWNjb3VudEJ5TGRhcChuYW1lT3JFbWFpbCk7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICB9Ci0gICAgICBpZiAociA9PSBudWxsKSB7Ci0gICAgICAgIHRocm93IG5ldyBGYWlsdXJlKG5ldyBOb1N1Y2hBY2NvdW50RXhjZXB0aW9uKG5hbWVPckVtYWlsKSk7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiByOwotICB9Ci0KLSAgcHJpdmF0ZSBBY2NvdW50IGNyZWF0ZUFjY291bnRCeUxkYXAoU3RyaW5nIHVzZXIpIHsKLSAgICBpZiAoIXVzZXIubWF0Y2hlcyhBY2NvdW50LlVTRVJfTkFNRV9QQVRURVJOKSkgewotICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfQotCi0gICAgdHJ5IHsKLSAgICAgIGZpbmFsIEF1dGhSZXF1ZXN0IHJlcSA9IEF1dGhSZXF1ZXN0LmZvclVzZXIodXNlcik7Ci0gICAgICByZXEuc2V0U2tpcEF1dGhlbnRpY2F0aW9uKHRydWUpOwotICAgICAgcmV0dXJuIGFjY291bnRDYWNoZS5nZXQoYWNjb3VudE1hbmFnZXIuYXV0aGVudGljYXRlKHJlcSkuZ2V0QWNjb3VudElkKCkpCi0gICAgICAgICAgLmdldEFjY291bnQoKTsKLSAgICB9IGNhdGNoIChBY2NvdW50RXhjZXB0aW9uIGUpIHsKLSAgICAgIHJldHVybiBudWxsOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgQWNjb3VudEdyb3VwIGZpbmRHcm91cChmaW5hbCBTdHJpbmcgbmFtZSkgdGhyb3dzIE9ybUV4Y2VwdGlvbiwKLSAgICAgIEZhaWx1cmUgewotICAgIGZpbmFsIEFjY291bnRHcm91cCBnID0gZ3JvdXBDYWNoZS5nZXQobmV3IEFjY291bnRHcm91cC5OYW1lS2V5KG5hbWUpKTsKLSAgICBpZiAoZyA9PSBudWxsKSB7Ci0gICAgICB0aHJvdyBuZXcgRmFpbHVyZShuZXcgTm9TdWNoR3JvdXBFeGNlcHRpb24obmFtZSkpOwotICAgIH0KLSAgICByZXR1cm4gZzsKLSAgfQotCi19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvYWNjb3VudC9Hcm91cERldGFpbEhhbmRsZXIuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L0dyb3VwRGV0YWlsSGFuZGxlci5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBjZTc0MjE4Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L0dyb3VwRGV0YWlsSGFuZGxlci5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNDYgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDExIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5hY2NvdW50OwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXRhaWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwRGV0YWlsRmFjdG9yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKLQotcHVibGljIGNsYXNzIEdyb3VwRGV0YWlsSGFuZGxlciBleHRlbmRzIEhhbmRsZXI8R3JvdXBEZXRhaWw+IHsKLSAgcHVibGljIGludGVyZmFjZSBGYWN0b3J5IHsKLSAgICBHcm91cERldGFpbEhhbmRsZXIgY3JlYXRlKEFjY291bnRHcm91cC5JZCBncm91cElkKTsKLSAgfQotCi0gIHByaXZhdGUgZmluYWwgR3JvdXBEZXRhaWxGYWN0b3J5LkZhY3RvcnkgZ3JvdXBEZXRhaWxGYWN0b3J5OwotCi0gIHByaXZhdGUgZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQ7Ci0KLSAgQEluamVjdAotICBHcm91cERldGFpbEhhbmRsZXIoZmluYWwgR3JvdXBEZXRhaWxGYWN0b3J5LkZhY3RvcnkgZ3JvdXBEZXRhaWxGYWN0b3J5LAotICAgICAgQEFzc2lzdGVkIGZpbmFsIEFjY291bnRHcm91cC5JZCBncm91cElkKSB7Ci0gICAgdGhpcy5ncm91cERldGFpbEZhY3RvcnkgPSBncm91cERldGFpbEZhY3Rvcnk7Ci0gICAgdGhpcy5ncm91cElkID0gZ3JvdXBJZDsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgR3JvdXBEZXRhaWwgY2FsbCgpIHRocm93cyBPcm1FeGNlcHRpb24sIE5vU3VjaEdyb3VwRXhjZXB0aW9uIHsKLSAgICByZXR1cm4gZ3JvdXBEZXRhaWxGYWN0b3J5LmNyZWF0ZShncm91cElkKS5jYWxsKCk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L015R3JvdXBzRmFjdG9yeS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvTXlHcm91cHNGYWN0b3J5LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDMzY2UzNzEuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvTXlHcm91cHNGYWN0b3J5LmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw0NiArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLmFjY291bnQ7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEdyb3VwRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5IYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LlZpc2libGVHcm91cHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci0KLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLQotY2xhc3MgTXlHcm91cHNGYWN0b3J5IGV4dGVuZHMgSGFuZGxlcjxMaXN0PEFjY291bnRHcm91cD4+IHsKLSAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIE15R3JvdXBzRmFjdG9yeSBjcmVhdGUoKTsKLSAgfQotCi0gIHByaXZhdGUgZmluYWwgVmlzaWJsZUdyb3Vwcy5GYWN0b3J5IHZpc2libGVHcm91cHNGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyIHVzZXI7Ci0KLSAgQEluamVjdAotICBNeUdyb3Vwc0ZhY3RvcnkoZmluYWwgVmlzaWJsZUdyb3Vwcy5GYWN0b3J5IHZpc2libGVHcm91cHNGYWN0b3J5LCBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyKSB7Ci0gICAgdGhpcy52aXNpYmxlR3JvdXBzRmFjdG9yeSA9IHZpc2libGVHcm91cHNGYWN0b3J5OwotICAgIHRoaXMudXNlciA9IHVzZXI7Ci0gIH0KLQotICBAT3ZlcnJpZGUKLSAgcHVibGljIExpc3Q8QWNjb3VudEdyb3VwPiBjYWxsKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgTm9TdWNoR3JvdXBFeGNlcHRpb24gewotICAgIGZpbmFsIFZpc2libGVHcm91cHMgdmlzaWJsZUdyb3VwcyA9IHZpc2libGVHcm91cHNGYWN0b3J5LmNyZWF0ZSgpOwotICAgIHJldHVybiB2aXNpYmxlR3JvdXBzLmdldCh1c2VyKS5nZXRHcm91cHMoKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvUmVuYW1lR3JvdXAuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L1JlbmFtZUdyb3VwLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDI0ZmFmOWUuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvUmVuYW1lR3JvdXAuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDUxICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuYWNjb3VudDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGV0YWlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuSW52YWxpZE5hbWVFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5OYW1lQWxyZWFkeVVzZWRFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LlBlcmZvcm1SZW5hbWVHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKLQotY2xhc3MgUmVuYW1lR3JvdXAgZXh0ZW5kcyBIYW5kbGVyPEdyb3VwRGV0YWlsPiB7Ci0gIGludGVyZmFjZSBGYWN0b3J5IHsKLSAgICBSZW5hbWVHcm91cCBjcmVhdGUoQWNjb3VudEdyb3VwLklkIGlkLCBTdHJpbmcgbmV3TmFtZSk7Ci0gIH0KLQotICBwcml2YXRlIGZpbmFsIFBlcmZvcm1SZW5hbWVHcm91cC5GYWN0b3J5IHBlcmZvcm1SZW5hbWVHcm91cEZhY3Rvcnk7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZDsKLSAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbmV3TmFtZTsKLQotICBASW5qZWN0Ci0gIFJlbmFtZUdyb3VwKGZpbmFsIFBlcmZvcm1SZW5hbWVHcm91cC5GYWN0b3J5IHBlcmZvcm1SZW5hbWVHcm91cEZhY3RvcnksCi0gICAgICBAQXNzaXN0ZWQgZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQsIEBBc3Npc3RlZCBmaW5hbCBTdHJpbmcgbmV3TmFtZSkgewotICAgIHRoaXMucGVyZm9ybVJlbmFtZUdyb3VwRmFjdG9yeSA9IHBlcmZvcm1SZW5hbWVHcm91cEZhY3Rvcnk7Ci0gICAgdGhpcy5ncm91cElkID0gZ3JvdXBJZDsKLSAgICB0aGlzLm5ld05hbWUgPSBuZXdOYW1lOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBHcm91cERldGFpbCBjYWxsKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uLAotICAgICAgTm9TdWNoR3JvdXBFeGNlcHRpb24sIEludmFsaWROYW1lRXhjZXB0aW9uIHsKLSAgICByZXR1cm4gcGVyZm9ybVJlbmFtZUdyb3VwRmFjdG9yeS5jcmVhdGUoKS5yZW5hbWVHcm91cChncm91cElkLCBuZXdOYW1lKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvVmlzaWJsZUdyb3Vwc0hhbmRsZXIuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9hY2NvdW50L1Zpc2libGVHcm91cHNIYW5kbGVyLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDU0ZjkxZjcuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2FjY291bnQvVmlzaWJsZUdyb3Vwc0hhbmRsZXIuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDM5ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuYWNjb3VudDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwTGlzdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5WaXNpYmxlR3JvdXBzOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLQotcHVibGljIGNsYXNzIFZpc2libGVHcm91cHNIYW5kbGVyIGV4dGVuZHMgSGFuZGxlcjxHcm91cExpc3Q+IHsKLQotICBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgVmlzaWJsZUdyb3Vwc0hhbmRsZXIgY3JlYXRlKCk7Ci0gIH0KLQotICBwcml2YXRlIGZpbmFsIFZpc2libGVHcm91cHMuRmFjdG9yeSB2aXNpYmxlR3JvdXBzRmFjdG9yeTsKLQotICBASW5qZWN0Ci0gIFZpc2libGVHcm91cHNIYW5kbGVyKGZpbmFsIFZpc2libGVHcm91cHMuRmFjdG9yeSB2aXNpYmxlR3JvdXBzRmFjdG9yeSkgewotICAgIHRoaXMudmlzaWJsZUdyb3Vwc0ZhY3RvcnkgPSB2aXNpYmxlR3JvdXBzRmFjdG9yeTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgR3JvdXBMaXN0IGNhbGwoKSB0aHJvd3MgRXhjZXB0aW9uIHsKLSAgICByZXR1cm4gdmlzaWJsZUdyb3Vwc0ZhY3RvcnkuY3JlYXRlKCkuZ2V0KCk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2UvQ2hhbmdlc1Jlc3RBcGlTZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlL0NoYW5nZXNSZXN0QXBpU2VydmxldC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZlODEwYjkKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlL0NoYW5nZXNSZXN0QXBpU2VydmxldC5qYXZhCkBAIC0wLDAgKzEsMzIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucmVzdGFwaS5SZXN0QXBpU2VydmxldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkNoYW5nZXNDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CisKK0BTaW5nbGV0b24KK3B1YmxpYyBjbGFzcyBDaGFuZ2VzUmVzdEFwaVNlcnZsZXQgZXh0ZW5kcyBSZXN0QXBpU2VydmxldCB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgIEBJbmplY3QKKyAgQ2hhbmdlc1Jlc3RBcGlTZXJ2bGV0KFJlc3RBcGlTZXJ2bGV0Lkdsb2JhbHMgZ2xvYmFscywKKyAgICAgIFByb3ZpZGVyPENoYW5nZXNDb2xsZWN0aW9uPiBjaGFuZ2VzKSB7CisgICAgc3VwZXIoZ2xvYmFscywgY2hhbmdlcyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2UvRGVwcmVjYXRlZENoYW5nZVF1ZXJ5U2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZS9EZXByZWNhdGVkQ2hhbmdlUXVlcnlTZXJ2bGV0LmphdmEKaW5kZXggY2Y0NDNlNy4uZGEyMWM1MSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZS9EZXByZWNhdGVkQ2hhbmdlUXVlcnlTZXJ2bGV0LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZS9EZXByZWNhdGVkQ2hhbmdlUXVlcnlTZXJ2bGV0LmphdmEKQEAgLTczLDYgKzczLDcgQEAKICAgICBwLnNldEluY2x1ZGVDdXJyZW50UGF0Y2hTZXQoZ2V0KHJlcSwgImN1cnJlbnQtcGF0Y2gtc2V0IiwgZmFsc2UpKTsKICAgICBwLnNldEluY2x1ZGVQYXRjaFNldHMoZ2V0KHJlcSwgInBhdGNoLXNldHMiLCBmYWxzZSkpOwogICAgIHAuc2V0SW5jbHVkZUFwcHJvdmFscyhnZXQocmVxLCAiYWxsLWFwcHJvdmFscyIsIGZhbHNlKSk7CisgICAgcC5zZXRJbmNsdWRlRmlsZXMoZ2V0KHJlcSwgImZpbGVzIiwgZmFsc2UpKTsKICAgICBwLnNldE91dHB1dChyc3AuZ2V0T3V0cHV0U3RyZWFtKCksIGZvcm1hdCk7CiAgICAgcC5xdWVyeShnZXQocmVxLCAicSIsICJzdGF0dXM6b3BlbiIpKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZS9MaXN0Q2hhbmdlc1NlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2UvTGlzdENoYW5nZXNTZXJ2bGV0LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGI1MDFkNDMuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZS9MaXN0Q2hhbmdlc1NlcnZsZXQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDg2ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuUmVzdEFwaVNlcnZsZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5PdXRwdXRGb3JtYXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LlF1ZXJ5UGFyc2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LmNoYW5nZS5MaXN0Q2hhbmdlczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247Ci0KLWltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOwotaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwotCi1pbXBvcnQgamF2YS5pby5CdWZmZXJlZFdyaXRlcjsKLWltcG9ydCBqYXZhLmlvLkJ5dGVBcnJheU91dHB1dFN0cmVhbTsKLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtV3JpdGVyOwotaW1wb3J0IGphdmEuaW8uV3JpdGVyOwotCi1pbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVxdWVzdDsKLWltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZTsKLQotQFNpbmdsZXRvbgotcHVibGljIGNsYXNzIExpc3RDaGFuZ2VzU2VydmxldCBleHRlbmRzIFJlc3RBcGlTZXJ2bGV0IHsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihMaXN0Q2hhbmdlc1NlcnZsZXQuY2xhc3MpOwotICBwcml2YXRlIGZpbmFsIFBhcmFtZXRlclBhcnNlciBwYXJhbVBhcnNlcjsKLSAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxMaXN0Q2hhbmdlcz4gZmFjdG9yeTsKLQotICBASW5qZWN0Ci0gIExpc3RDaGFuZ2VzU2VydmxldChmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gY3VycmVudFVzZXIsCi0gICAgICBQYXJhbWV0ZXJQYXJzZXIgcGFyYW1QYXJzZXIsIFByb3ZpZGVyPExpc3RDaGFuZ2VzPiBscykgewotICAgIHN1cGVyKGN1cnJlbnRVc2VyKTsKLSAgICB0aGlzLnBhcmFtUGFyc2VyID0gcGFyYW1QYXJzZXI7Ci0gICAgdGhpcy5mYWN0b3J5ID0gbHM7Ci0gIH0KLQotICBAT3ZlcnJpZGUKLSAgcHJvdGVjdGVkIHZvaWQgZG9HZXQoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMpCi0gICAgICB0aHJvd3MgSU9FeGNlcHRpb24gewotICAgIExpc3RDaGFuZ2VzIGltcGwgPSBmYWN0b3J5LmdldCgpOwotICAgIGlmIChhY2NlcHRzSnNvbihyZXEpKSB7Ci0gICAgICBpbXBsLnNldEZvcm1hdChPdXRwdXRGb3JtYXQuSlNPTl9DT01QQUNUKTsKLSAgICB9Ci0gICAgaWYgKHBhcmFtUGFyc2VyLnBhcnNlKGltcGwsIHJlcSwgcmVzKSkgewotICAgICAgQnl0ZUFycmF5T3V0cHV0U3RyZWFtIGJ1ZiA9IG5ldyBCeXRlQXJyYXlPdXRwdXRTdHJlYW0oKTsKLSAgICAgIGlmIChpbXBsLmdldEZvcm1hdCgpLmlzSnNvbigpKSB7Ci0gICAgICAgIGJ1Zi53cml0ZShKU09OX01BR0lDKTsKLSAgICAgIH0KLQotICAgICAgV3JpdGVyIG91dCA9IG5ldyBCdWZmZXJlZFdyaXRlcihuZXcgT3V0cHV0U3RyZWFtV3JpdGVyKGJ1ZiwgIlVURi04IikpOwotICAgICAgdHJ5IHsKLSAgICAgICAgaW1wbC5xdWVyeShvdXQpOwotICAgICAgfSBjYXRjaCAoUXVlcnlQYXJzZUV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIHJlcy5zZXRTdGF0dXMoSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19CQURfUkVRVUVTVCk7Ci0gICAgICAgIHNlbmRUZXh0KHJlcSwgcmVzLCBlLmdldE1lc3NhZ2UoKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIGxvZy5lcnJvcigiRXJyb3IgcXVlcnlpbmcgL2NoYW5nZXMvIiwgZSk7Ci0gICAgICAgIHJlcy5zZW5kRXJyb3IoSHR0cFNlcnZsZXRSZXNwb25zZS5TQ19JTlRFUk5BTF9TRVJWRVJfRVJST1IpOwotICAgICAgICByZXR1cm47Ci0gICAgICB9Ci0gICAgICBvdXQuZmx1c2goKTsKLQotICAgICAgcmVzLnNldENvbnRlbnRUeXBlKGltcGwuZ2V0Rm9ybWF0KCkuaXNKc29uKCkgPyBKU09OX1RZUEUgOiAidGV4dC9wbGFpbiIpOwotICAgICAgcmVzLnNldENoYXJhY3RlckVuY29kaW5nKCJVVEYtOCIpOwotICAgICAgc2VuZChyZXEsIHJlcywgYnVmLnRvQnl0ZUFycmF5KCkpOwotICAgIH0KLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9BYmFuZG9uQ2hhbmdlSGFuZGxlci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9BYmFuZG9uQ2hhbmdlSGFuZGxlci5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAyMTEwODg1Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvQWJhbmRvbkNoYW5nZUhhbmRsZXIuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDc3ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlZGV0YWlsOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlRGV0YWlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlJldmlld1Jlc3VsdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEVudGl0eUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZWRldGFpbC5BYmFuZG9uQ2hhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkVtYWlsRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5SZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb247Ci0KLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotCi1pbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKLQotY2xhc3MgQWJhbmRvbkNoYW5nZUhhbmRsZXIgZXh0ZW5kcyBIYW5kbGVyPENoYW5nZURldGFpbD4gewotCi0gIGludGVyZmFjZSBGYWN0b3J5IHsKLSAgICBBYmFuZG9uQ2hhbmdlSGFuZGxlciBjcmVhdGUoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwgU3RyaW5nIG1lc3NhZ2UpOwotICB9Ci0KLSAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxBYmFuZG9uQ2hhbmdlPiBhYmFuZG9uQ2hhbmdlUHJvdmlkZXI7Ci0gIHByaXZhdGUgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3Rvcnk7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkOwotICBATnVsbGFibGUKLSAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbWVzc2FnZTsKLQotICBASW5qZWN0Ci0gIEFiYW5kb25DaGFuZ2VIYW5kbGVyKGZpbmFsIFByb3ZpZGVyPEFiYW5kb25DaGFuZ2U+IGFiYW5kb25DaGFuZ2VQcm92aWRlciwKLSAgICAgIGZpbmFsIENoYW5nZURldGFpbEZhY3RvcnkuRmFjdG9yeSBjaGFuZ2VEZXRhaWxGYWN0b3J5LAotICAgICAgQEFzc2lzdGVkIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsCi0gICAgICBAQXNzaXN0ZWQgQE51bGxhYmxlIGZpbmFsIFN0cmluZyBtZXNzYWdlKSB7Ci0gICAgdGhpcy5hYmFuZG9uQ2hhbmdlUHJvdmlkZXIgPSBhYmFuZG9uQ2hhbmdlUHJvdmlkZXI7Ci0gICAgdGhpcy5jaGFuZ2VEZXRhaWxGYWN0b3J5ID0gY2hhbmdlRGV0YWlsRmFjdG9yeTsKLQotICAgIHRoaXMucGF0Y2hTZXRJZCA9IHBhdGNoU2V0SWQ7Ci0gICAgdGhpcy5tZXNzYWdlID0gbWVzc2FnZTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgQ2hhbmdlRGV0YWlsIGNhbGwoKSB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sCi0gICAgICBFbWFpbEV4Y2VwdGlvbiwgTm9TdWNoRW50aXR5RXhjZXB0aW9uLCBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uLAotICAgICAgUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uLCBSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24sCi0gICAgICBJT0V4Y2VwdGlvbiB7Ci0gICAgZmluYWwgQWJhbmRvbkNoYW5nZSBhYmFuZG9uQ2hhbmdlID0gYWJhbmRvbkNoYW5nZVByb3ZpZGVyLmdldCgpOwotICAgIGFiYW5kb25DaGFuZ2Uuc2V0Q2hhbmdlSWQocGF0Y2hTZXRJZC5nZXRQYXJlbnRLZXkoKSk7Ci0gICAgYWJhbmRvbkNoYW5nZS5zZXRNZXNzYWdlKG1lc3NhZ2UpOwotICAgIGZpbmFsIFJldmlld1Jlc3VsdCByZXN1bHQgPSBhYmFuZG9uQ2hhbmdlLmNhbGwoKTsKLSAgICBpZiAocmVzdWx0LmdldEVycm9ycygpLnNpemUoKSA+IDApIHsKLSAgICAgIHRocm93IG5ldyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24ocmVzdWx0LmdldENoYW5nZUlkKCkpOwotICAgIH0KLSAgICByZXR1cm4gY2hhbmdlRGV0YWlsRmFjdG9yeS5jcmVhdGUocmVzdWx0LmdldENoYW5nZUlkKCkpLmNhbGwoKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9DaGFuZ2VEZXRhaWxGYWN0b3J5LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZURldGFpbEZhY3RvcnkuamF2YQppbmRleCA2NjYwYTNkLi4xMjBiOWFmIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZURldGFpbEZhY3RvcnkuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZURldGFpbEZhY3RvcnkuamF2YQpAQCAtMTQsOSArMTQsNiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5jaGFuZ2VkZXRhaWw7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbERldGFpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VEZXRhaWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlSW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5TdWJtaXRSZWNvcmQ7CkBAIC0yNyw3ICsyNCw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFuY2VzdG9yOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5SZXZJZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFub255bW91c1VzZXI7CkBAIC0zNiwxNSArMzIsMTUgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLlByb2plY3RVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRJbmZvQ2FjaGVGYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuUmViYXNlQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZU9wOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoUHJvamVjdEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZURhdGE7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLndvcmtmbG93LkNhdGVnb3J5RnVuY3Rpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLndvcmtmbG93LkZ1bmN0aW9uU3RhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUmVzdWx0U2V0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTY5LDkgKzY1LDcgQEAKICAgICBDaGFuZ2VEZXRhaWxGYWN0b3J5IGNyZWF0ZShDaGFuZ2UuSWQgaWQpOwogICB9CiAKLSAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXM7CiAgIHByaXZhdGUgZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIEZ1bmN0aW9uU3RhdGUuRmFjdG9yeSBmdW5jdGlvblN0YXRlOwogICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0RGV0YWlsRmFjdG9yeS5GYWN0b3J5IHBhdGNoU2V0RGV0YWlsOwogICBwcml2YXRlIGZpbmFsIEFjY291bnRJbmZvQ2FjaGVGYWN0b3J5IGFpYzsKICAgcHJpdmF0ZSBmaW5hbCBBbm9ueW1vdXNVc2VyIGFub255bW91c1VzZXI7CkBAIC04Nyw5ICs4MSwxMiBAQAogICBwcml2YXRlIGZpbmFsIE1lcmdlT3AuRmFjdG9yeSBvcEZhY3Rvcnk7CiAgIHByaXZhdGUgYm9vbGVhbiB0ZXN0TWVyZ2U7CiAKKyAgcHJpdmF0ZSBMaXN0PFBhdGNoU2V0QW5jZXN0b3I+IGN1cnJlbnRQYXRjaFNldEFuY2VzdG9yczsKKyAgcHJpdmF0ZSBMaXN0PFBhdGNoU2V0PiBjdXJyZW50RGVwUGF0Y2hTZXRzOworICBwcml2YXRlIExpc3Q8Q2hhbmdlPiBjdXJyZW50RGVwQ2hhbmdlczsKKwogICBASW5qZWN0Ci0gIENoYW5nZURldGFpbEZhY3RvcnkoZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzLAotICAgICAgZmluYWwgRnVuY3Rpb25TdGF0ZS5GYWN0b3J5IGZ1bmN0aW9uU3RhdGUsCisgIENoYW5nZURldGFpbEZhY3RvcnkoCiAgICAgICBmaW5hbCBQYXRjaFNldERldGFpbEZhY3RvcnkuRmFjdG9yeSBwYXRjaFNldERldGFpbCwgZmluYWwgUmV2aWV3RGIgZGIsCiAgICAgICBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlciwKICAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwKQEAgLTk4LDggKzk1LDYgQEAKICAgICAgIGZpbmFsIE1lcmdlT3AuRmFjdG9yeSBvcEZhY3RvcnksCiAgICAgICBAR2Vycml0U2VydmVyQ29uZmlnIGZpbmFsIENvbmZpZyBjZmcsCiAgICAgICBAQXNzaXN0ZWQgZmluYWwgQ2hhbmdlLklkIGlkKSB7Ci0gICAgdGhpcy5hcHByb3ZhbFR5cGVzID0gYXBwcm92YWxUeXBlczsKLSAgICB0aGlzLmZ1bmN0aW9uU3RhdGUgPSBmdW5jdGlvblN0YXRlOwogICAgIHRoaXMucGF0Y2hTZXREZXRhaWwgPSBwYXRjaFNldERldGFpbDsKICAgICB0aGlzLmRiID0gZGI7CiAgICAgdGhpcy5yZXBvTWFuYWdlciA9IHJlcG9NYW5hZ2VyOwpAQCAtMTE2LDcgKzExMSw3IEBACiAgIEBPdmVycmlkZQogICBwdWJsaWMgQ2hhbmdlRGV0YWlsIGNhbGwoKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBOb1N1Y2hFbnRpdHlFeGNlcHRpb24sCiAgICAgICBQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24sIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiwKLSAgICAgIFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgICAgUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwgTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiB7CiAgICAgY29udHJvbCA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5LnZhbGlkYXRlRm9yKGNoYW5nZUlkKTsKICAgICBmaW5hbCBDaGFuZ2UgY2hhbmdlID0gY29udHJvbC5nZXRDaGFuZ2UoKTsKICAgICBmaW5hbCBQYXRjaFNldCBwYXRjaCA9IGRiLnBhdGNoU2V0cygpLmdldChjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSk7CkBAIC0xNDEsOSArMTM2LDkgQEAKIAogICAgIGRldGFpbC5zZXRDYW5SZXZlcnQoY2hhbmdlLmdldFN0YXR1cygpID09IENoYW5nZS5TdGF0dXMuTUVSR0VEICYmIGNvbnRyb2wuY2FuQWRkUGF0Y2hTZXQoKSk7CiAKLSAgICBkZXRhaWwuc2V0Q2FuUmViYXNlKGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdGF0dXMoKS5pc09wZW4oKSAmJiBjb250cm9sLmNhblJlYmFzZSgpKTsKLQogICAgIGRldGFpbC5zZXRDYW5FZGl0KGNvbnRyb2wuZ2V0UmVmQ29udHJvbCgpLmNhbldyaXRlKCkpOworICAgIGRldGFpbC5zZXRDYW5FZGl0Q29tbWl0TWVzc2FnZShjaGFuZ2UuZ2V0U3RhdHVzKCkuaXNPcGVuKCkgJiYgY29udHJvbC5jYW5BZGRQYXRjaFNldCgpKTsKKyAgICBkZXRhaWwuc2V0Q2FuRWRpdFRvcGljTmFtZShjb250cm9sLmNhbkVkaXRUb3BpY05hbWUoKSk7CiAKICAgICBMaXN0PFN1Ym1pdFJlY29yZD4gc3VibWl0UmVjb3JkcyA9IGNvbnRyb2wuZ2V0U3VibWl0UmVjb3JkcyhkYiwgcGF0Y2gpOwogICAgIGZvciAoU3VibWl0UmVjb3JkIHJlYyA6IHN1Ym1pdFJlY29yZHMpIHsKQEAgLTE2MSw2ICsxNTYsOCBAQAogICAgIH0KICAgICBkZXRhaWwuc2V0U3VibWl0UmVjb3JkcyhzdWJtaXRSZWNvcmRzKTsKIAorICAgIGRldGFpbC5zZXRTdWJtaXRUeXBlUmVjb3JkKGNvbnRyb2wuZ2V0U3VibWl0VHlwZVJlY29yZChkYiwgcGF0Y2gpKTsKKwogICAgIHBhdGNoc2V0c0J5SWQgPSBuZXcgSGFzaE1hcDxQYXRjaFNldC5JZCwgUGF0Y2hTZXQ+KCk7CiAgICAgbG9hZFBhdGNoU2V0cygpOwogICAgIGxvYWRNZXNzYWdlcygpOwpAQCAtMTY4LDYgKzE2NSwxMSBAQAogICAgICAgbG9hZEN1cnJlbnRQYXRjaFNldCgpOwogICAgIH0KICAgICBsb2FkKCk7CisKKyAgICBkZXRhaWwuc2V0Q2FuUmViYXNlKGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdGF0dXMoKS5pc09wZW4oKSAmJgorICAgICAgICBjb250cm9sLmNhblJlYmFzZSgpICYmCisgICAgICAgIFJlYmFzZUNoYW5nZS5jYW5Eb1JlYmFzZShkYiwgY2hhbmdlLCByZXBvTWFuYWdlciwKKyAgICAgICAgICAgIGN1cnJlbnRQYXRjaFNldEFuY2VzdG9ycywgY3VycmVudERlcFBhdGNoU2V0cywgY3VycmVudERlcENoYW5nZXMpKTsKICAgICBkZXRhaWwuc2V0QWNjb3VudHMoYWljLmNyZWF0ZSgpKTsKICAgICByZXR1cm4gZGV0YWlsOwogICB9CkBAIC0yMDUsNTMgKzIwNywxMyBAQAogICAgIH0KICAgfQogCi0gIHByaXZhdGUgdm9pZCBsb2FkKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIHsKKyAgcHJpdmF0ZSB2b2lkIGxvYWQoKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sCisgICAgICBOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uIHsKICAgICBmaW5hbCBDaGFuZ2UuU3RhdHVzIHN0YXR1cyA9IGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdGF0dXMoKTsKICAgICBpZiAoKHN0YXR1cy5lcXVhbHMoQ2hhbmdlLlN0YXR1cy5ORVcpIHx8IHN0YXR1cy5lcXVhbHMoQ2hhbmdlLlN0YXR1cy5EUkFGVCkpICYmCiAgICAgICAgIHRlc3RNZXJnZSkgewogICAgICAgQ2hhbmdlVXRpbC50ZXN0TWVyZ2Uob3BGYWN0b3J5LCBkZXRhaWwuZ2V0Q2hhbmdlKCkpOwogICAgIH0KLQotICAgIGZpbmFsIFBhdGNoU2V0LklkIHBzSWQgPSBkZXRhaWwuZ2V0Q2hhbmdlKCkuY3VycmVudFBhdGNoU2V0SWQoKTsKLSAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGFsbEFwcHJvdmFscyA9Ci0gICAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlDaGFuZ2UoY2hhbmdlSWQpLnRvTGlzdCgpOwotCi0gICAgaWYgKGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdGF0dXMoKS5pc09wZW4oKSkgewotICAgICAgZmluYWwgRnVuY3Rpb25TdGF0ZSBmcyA9IGZ1bmN0aW9uU3RhdGUuY3JlYXRlKGNvbnRyb2wsIHBzSWQsIGFsbEFwcHJvdmFscyk7Ci0KLSAgICAgIGZvciAoZmluYWwgQXBwcm92YWxUeXBlIGF0IDogYXBwcm92YWxUeXBlcy5nZXRBcHByb3ZhbFR5cGVzKCkpIHsKLSAgICAgICAgQ2F0ZWdvcnlGdW5jdGlvbi5mb3JDYXRlZ29yeShhdC5nZXRDYXRlZ29yeSgpKS5ydW4oYXQsIGZzKTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBmaW5hbCBib29sZWFuIGNhblJlbW92ZVJldmlld2VycyA9IGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdGF0dXMoKS5pc09wZW4oKSAvLwotICAgICAgICAmJiBjb250cm9sLmdldEN1cnJlbnRVc2VyKCkgaW5zdGFuY2VvZiBJZGVudGlmaWVkVXNlcjsKLSAgICBmaW5hbCBIYXNoTWFwPEFjY291bnQuSWQsIEFwcHJvdmFsRGV0YWlsPiBhZCA9Ci0gICAgICAgIG5ldyBIYXNoTWFwPEFjY291bnQuSWQsIEFwcHJvdmFsRGV0YWlsPigpOwotICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBjYSA6IGFsbEFwcHJvdmFscykgewotICAgICAgQXBwcm92YWxEZXRhaWwgZCA9IGFkLmdldChjYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICBpZiAoZCA9PSBudWxsKSB7Ci0gICAgICAgIGQgPSBuZXcgQXBwcm92YWxEZXRhaWwoY2EuZ2V0QWNjb3VudElkKCkpOwotICAgICAgICBkLnNldENhblJlbW92ZShjYW5SZW1vdmVSZXZpZXdlcnMpOwotICAgICAgICBhZC5wdXQoZC5nZXRBY2NvdW50KCksIGQpOwotICAgICAgfQotICAgICAgaWYgKGQuY2FuUmVtb3ZlKCkpIHsKLSAgICAgICAgZC5zZXRDYW5SZW1vdmUoY29udHJvbC5jYW5SZW1vdmVSZXZpZXdlcihjYSkpOwotICAgICAgfQotICAgICAgaWYgKGNhLmdldFBhdGNoU2V0SWQoKS5lcXVhbHMocHNJZCkpIHsKLSAgICAgICAgZC5hZGQoY2EpOwotICAgICAgfQotICAgIH0KLQotICAgIGZpbmFsIEFjY291bnQuSWQgb3duZXIgPSBkZXRhaWwuZ2V0Q2hhbmdlKCkuZ2V0T3duZXIoKTsKLSAgICBpZiAoYWQuY29udGFpbnNLZXkob3duZXIpKSB7Ci0gICAgICAvLyBFbnN1cmUgdGhlIG93bmVyIGFsd2F5cyBzb3J0cyB0byB0aGUgdG9wIG9mIHRoZSB0YWJsZQotICAgICAgLy8KLSAgICAgIGFkLmdldChvd25lcikuc29ydEZpcnN0KCk7Ci0gICAgfQotCi0gICAgYWljLndhbnQoYWQua2V5U2V0KCkpOwotICAgIGRldGFpbC5zZXRBcHByb3ZhbHMoYWQudmFsdWVzKCkpOwogICB9CiAKICAgcHJpdmF0ZSBib29sZWFuIGlzUmV2aWV3ZXIoQ2hhbmdlIGNoYW5nZSkgewpAQCAtMjY2LDYgKzIyOCw4IEBACiAgIHByaXZhdGUgdm9pZCBsb2FkQ3VycmVudFBhdGNoU2V0KCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiwKICAgICAgIE5vU3VjaEVudGl0eUV4Y2VwdGlvbiwgUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uLAogICAgICAgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIHsKKyAgICBjdXJyZW50RGVwUGF0Y2hTZXRzID0gbmV3IEFycmF5TGlzdDxQYXRjaFNldD4oKTsKKyAgICBjdXJyZW50RGVwQ2hhbmdlcyA9IG5ldyBBcnJheUxpc3Q8Q2hhbmdlPigpOwogICAgIGZpbmFsIFBhdGNoU2V0IGN1cnJlbnRQYXRjaCA9IGZpbmRDdXJyZW50T3JMYXRlc3RQYXRjaFNldCgpOwogICAgIGZpbmFsIFBhdGNoU2V0LklkIHBzSWQgPSBjdXJyZW50UGF0Y2guZ2V0SWQoKTsKICAgICBmaW5hbCBQYXRjaFNldERldGFpbEZhY3RvcnkgbG9hZGVyID0gcGF0Y2hTZXREZXRhaWwuY3JlYXRlKG51bGwsIHBzSWQsIG51bGwpOwpAQCAtMjc4LDggKzI0MiwxMCBAQAogICAgIGZpbmFsIEhhc2hNYXA8Q2hhbmdlLklkLFBhdGNoU2V0LklkPiBhbmNlc3RvclBhdGNoSWRzID0KICAgICAgICAgbmV3IEhhc2hNYXA8Q2hhbmdlLklkLFBhdGNoU2V0LklkPigpOwogICAgIGZpbmFsIExpc3Q8Q2hhbmdlLklkPiBhbmNlc3Rvck9yZGVyID0gbmV3IEFycmF5TGlzdDxDaGFuZ2UuSWQ+KCk7Ci0gICAgZm9yIChQYXRjaFNldEFuY2VzdG9yIGEgOiBkYi5wYXRjaFNldEFuY2VzdG9ycygpLmFuY2VzdG9yc09mKHBzSWQpKSB7CisgICAgY3VycmVudFBhdGNoU2V0QW5jZXN0b3JzID0gZGIucGF0Y2hTZXRBbmNlc3RvcnMoKS5hbmNlc3RvcnNPZihwc0lkKS50b0xpc3QoKTsKKyAgICBmb3IgKFBhdGNoU2V0QW5jZXN0b3IgYSA6IGN1cnJlbnRQYXRjaFNldEFuY2VzdG9ycykgewogICAgICAgZm9yIChQYXRjaFNldCBwIDogZGIucGF0Y2hTZXRzKCkuYnlSZXZpc2lvbihhLmdldEFuY2VzdG9yUmV2aXNpb24oKSkpIHsKKyAgICAgICAgY3VycmVudERlcFBhdGNoU2V0cy5hZGQocCk7CiAgICAgICAgIGZpbmFsIENoYW5nZS5JZCBjayA9IHAuZ2V0SWQoKS5nZXRQYXJlbnRLZXkoKTsKICAgICAgICAgaWYgKGNoYW5nZXNUb0dldC5hZGQoY2spKSB7CiAgICAgICAgICAgYW5jZXN0b3JQYXRjaElkcy5wdXQoY2ssIHAuZ2V0SWQoKSk7CkBAIC0zMTMsNiArMjc5LDcgQEAKICAgICBmb3IgKGZpbmFsIENoYW5nZS5JZCBhIDogYW5jZXN0b3JPcmRlcikgewogICAgICAgZmluYWwgQ2hhbmdlIGFjID0gbS5nZXQoYSk7CiAgICAgICBpZiAoYWMgIT0gbnVsbCAmJiBhYy5nZXRQcm9qZWN0KCkuZXF1YWxzKGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRQcm9qZWN0KCkpKSB7CisgICAgICAgIGN1cnJlbnREZXBDaGFuZ2VzLmFkZChhYyk7CiAgICAgICAgIGlmIChhYy5nZXRTdGF0dXMoKS5nZXRDb2RlKCkgIT0gQ2hhbmdlLlNUQVRVU19EUkFGVAogICAgICAgICAgICAgfHwgYWMuZ2V0T3duZXIoKS5lcXVhbHMoY3VycmVudFVzZXJJZCkKICAgICAgICAgICAgIHx8IGlzUmV2aWV3ZXIoYWMpKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZU1hbmFnZVNlcnZpY2VJbXBsLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZU1hbmFnZVNlcnZpY2VJbXBsLmphdmEKaW5kZXggZjk5OTIxYi4uNTNlMGQ5ZCAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9DaGFuZ2VNYW5hZ2VTZXJ2aWNlSW1wbC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvQ2hhbmdlTWFuYWdlU2VydmljZUltcGwuamF2YQpAQCAtMTcsNDQgKzE3LDI3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlRGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNoYW5nZU1hbmFnZVNlcnZpY2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldC5JZDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkFzeW5jQ2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Wb2lkUmVzdWx0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIAogY2xhc3MgQ2hhbmdlTWFuYWdlU2VydmljZUltcGwgaW1wbGVtZW50cyBDaGFuZ2VNYW5hZ2VTZXJ2aWNlIHsKLSAgcHJpdmF0ZSBmaW5hbCBTdWJtaXRBY3Rpb24uRmFjdG9yeSBzdWJtaXRBY3Rpb247Ci0gIHByaXZhdGUgZmluYWwgQWJhbmRvbkNoYW5nZUhhbmRsZXIuRmFjdG9yeSBhYmFuZG9uQ2hhbmdlSGFuZGxlckZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgUmViYXNlQ2hhbmdlLkZhY3RvcnkgcmViYXNlQ2hhbmdlRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBSZXN0b3JlQ2hhbmdlSGFuZGxlci5GYWN0b3J5IHJlc3RvcmVDaGFuZ2VIYW5kbGVyRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBSZXZlcnRDaGFuZ2UuRmFjdG9yeSByZXZlcnRDaGFuZ2VGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFJlYmFzZUNoYW5nZUhhbmRsZXIuRmFjdG9yeSByZWJhc2VDaGFuZ2VGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIFB1Ymxpc2hBY3Rpb24uRmFjdG9yeSBwdWJsaXNoQWN0aW9uOwogICBwcml2YXRlIGZpbmFsIERlbGV0ZURyYWZ0Q2hhbmdlLkZhY3RvcnkgZGVsZXRlRHJhZnRDaGFuZ2VGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIEVkaXRDb21taXRNZXNzYWdlSGFuZGxlci5GYWN0b3J5IGVkaXRDb21taXRNZXNzYWdlSGFuZGxlckZhY3Rvcnk7CiAKICAgQEluamVjdAotICBDaGFuZ2VNYW5hZ2VTZXJ2aWNlSW1wbChmaW5hbCBTdWJtaXRBY3Rpb24uRmFjdG9yeSBwYXRjaFNldEFjdGlvbiwKLSAgICAgIGZpbmFsIEFiYW5kb25DaGFuZ2VIYW5kbGVyLkZhY3RvcnkgYWJhbmRvbkNoYW5nZUhhbmRsZXJGYWN0b3J5LAotICAgICAgZmluYWwgUmViYXNlQ2hhbmdlLkZhY3RvcnkgcmViYXNlQ2hhbmdlRmFjdG9yeSwKLSAgICAgIGZpbmFsIFJlc3RvcmVDaGFuZ2VIYW5kbGVyLkZhY3RvcnkgcmVzdG9yZUNoYW5nZUhhbmRsZXJGYWN0b3J5LAotICAgICAgZmluYWwgUmV2ZXJ0Q2hhbmdlLkZhY3RvcnkgcmV2ZXJ0Q2hhbmdlRmFjdG9yeSwKKyAgQ2hhbmdlTWFuYWdlU2VydmljZUltcGwoCisgICAgICBmaW5hbCBSZWJhc2VDaGFuZ2VIYW5kbGVyLkZhY3RvcnkgcmViYXNlQ2hhbmdlRmFjdG9yeSwKICAgICAgIGZpbmFsIFB1Ymxpc2hBY3Rpb24uRmFjdG9yeSBwdWJsaXNoQWN0aW9uLAotICAgICAgZmluYWwgRGVsZXRlRHJhZnRDaGFuZ2UuRmFjdG9yeSBkZWxldGVEcmFmdENoYW5nZUZhY3RvcnkpIHsKLSAgICB0aGlzLnN1Ym1pdEFjdGlvbiA9IHBhdGNoU2V0QWN0aW9uOwotICAgIHRoaXMuYWJhbmRvbkNoYW5nZUhhbmRsZXJGYWN0b3J5ID0gYWJhbmRvbkNoYW5nZUhhbmRsZXJGYWN0b3J5OworICAgICAgZmluYWwgRGVsZXRlRHJhZnRDaGFuZ2UuRmFjdG9yeSBkZWxldGVEcmFmdENoYW5nZUZhY3RvcnksCisgICAgICBmaW5hbCBFZGl0Q29tbWl0TWVzc2FnZUhhbmRsZXIuRmFjdG9yeSBlZGl0Q29tbWl0TWVzc2FnZUhhbmRsZXIpIHsKICAgICB0aGlzLnJlYmFzZUNoYW5nZUZhY3RvcnkgPSByZWJhc2VDaGFuZ2VGYWN0b3J5OwotICAgIHRoaXMucmVzdG9yZUNoYW5nZUhhbmRsZXJGYWN0b3J5ID0gcmVzdG9yZUNoYW5nZUhhbmRsZXJGYWN0b3J5OwotICAgIHRoaXMucmV2ZXJ0Q2hhbmdlRmFjdG9yeSA9IHJldmVydENoYW5nZUZhY3Rvcnk7CiAgICAgdGhpcy5wdWJsaXNoQWN0aW9uID0gcHVibGlzaEFjdGlvbjsKICAgICB0aGlzLmRlbGV0ZURyYWZ0Q2hhbmdlRmFjdG9yeSA9IGRlbGV0ZURyYWZ0Q2hhbmdlRmFjdG9yeTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHN1Ym1pdChmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAotICAgICAgZmluYWwgQXN5bmNDYWxsYmFjazxDaGFuZ2VEZXRhaWw+IGNiKSB7Ci0gICAgc3VibWl0QWN0aW9uLmNyZWF0ZShwYXRjaFNldElkKS50byhjYik7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBhYmFuZG9uQ2hhbmdlKGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsIGZpbmFsIFN0cmluZyBtZXNzYWdlLAotICAgICAgZmluYWwgQXN5bmNDYWxsYmFjazxDaGFuZ2VEZXRhaWw+IGNhbGxiYWNrKSB7Ci0gICAgYWJhbmRvbkNoYW5nZUhhbmRsZXJGYWN0b3J5LmNyZWF0ZShwYXRjaFNldElkLCBtZXNzYWdlKS50byhjYWxsYmFjayk7CisgICAgdGhpcy5lZGl0Q29tbWl0TWVzc2FnZUhhbmRsZXJGYWN0b3J5ID0gZWRpdENvbW1pdE1lc3NhZ2VIYW5kbGVyOwogICB9CiAKICAgcHVibGljIHZvaWQgcmViYXNlQ2hhbmdlKGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsCkBAIC02MiwxNiArNDUsNiBAQAogICAgIHJlYmFzZUNoYW5nZUZhY3RvcnkuY3JlYXRlKHBhdGNoU2V0SWQpLnRvKGNhbGxiYWNrKTsKICAgfQogCi0gIHB1YmxpYyB2b2lkIHJldmVydENoYW5nZShmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLCBmaW5hbCBTdHJpbmcgbWVzc2FnZSwKLSAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Q2hhbmdlRGV0YWlsPiBjYWxsYmFjaykgewotICAgIHJldmVydENoYW5nZUZhY3RvcnkuY3JlYXRlKHBhdGNoU2V0SWQsIG1lc3NhZ2UpLnRvKGNhbGxiYWNrKTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHJlc3RvcmVDaGFuZ2UoZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwgZmluYWwgU3RyaW5nIG1lc3NhZ2UsCi0gICAgICBmaW5hbCBBc3luY0NhbGxiYWNrPENoYW5nZURldGFpbD4gY2FsbGJhY2spIHsKLSAgICByZXN0b3JlQ2hhbmdlSGFuZGxlckZhY3RvcnkuY3JlYXRlKHBhdGNoU2V0SWQsIG1lc3NhZ2UpLnRvKGNhbGxiYWNrKTsKLSAgfQotCiAgIHB1YmxpYyB2b2lkIHB1Ymxpc2goZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwKICAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Q2hhbmdlRGV0YWlsPiBjYWxsYmFjaykgewogICAgIHB1Ymxpc2hBY3Rpb24uY3JlYXRlKHBhdGNoU2V0SWQpLnRvKGNhbGxiYWNrKTsKQEAgLTgxLDQgKzU0LDkgQEAKICAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gY2FsbGJhY2spIHsKICAgICBkZWxldGVEcmFmdENoYW5nZUZhY3RvcnkuY3JlYXRlKHBhdGNoU2V0SWQpLnRvKGNhbGxiYWNrKTsKICAgfQorCisgIHB1YmxpYyB2b2lkIGNyZWF0ZU5ld1BhdGNoU2V0KElkIHBhdGNoU2V0SWQsIFN0cmluZyBtZXNzYWdlLAorICAgICAgQXN5bmNDYWxsYmFjazxDaGFuZ2VEZXRhaWw+IGNhbGxiYWNrKSB7CisgICAgZWRpdENvbW1pdE1lc3NhZ2VIYW5kbGVyRmFjdG9yeS5jcmVhdGUocGF0Y2hTZXRJZCwgbWVzc2FnZSkudG8oY2FsbGJhY2spOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZU1vZHVsZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9DaGFuZ2VNb2R1bGUuamF2YQppbmRleCBiNjcyYTQzOS4uNDhjMTNjMiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9DaGFuZ2VNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0NoYW5nZU1vZHVsZS5qYXZhCkBAIC0yOCwxNSArMjgsMTIgQEAKICAgICBpbnN0YWxsKG5ldyBGYWN0b3J5TW9kdWxlKCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7Ci0gICAgICAgIGZhY3RvcnkoQWJhbmRvbkNoYW5nZUhhbmRsZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgICAgIGZhY3RvcnkoUmVzdG9yZUNoYW5nZUhhbmRsZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgICAgIGZhY3RvcnkoUmV2ZXJ0Q2hhbmdlLkZhY3RvcnkuY2xhc3MpOwotICAgICAgICBmYWN0b3J5KFJlYmFzZUNoYW5nZS5GYWN0b3J5LmNsYXNzKTsKKyAgICAgICAgZmFjdG9yeShFZGl0Q29tbWl0TWVzc2FnZUhhbmRsZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgICAgIGZhY3RvcnkoUmViYXNlQ2hhbmdlSGFuZGxlci5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShDaGFuZ2VEZXRhaWxGYWN0b3J5LkZhY3RvcnkuY2xhc3MpOwogICAgICAgICBmYWN0b3J5KEluY2x1ZGVkSW5EZXRhaWxGYWN0b3J5LkZhY3RvcnkuY2xhc3MpOwogICAgICAgICBmYWN0b3J5KFBhdGNoU2V0RGV0YWlsRmFjdG9yeS5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShQYXRjaFNldFB1Ymxpc2hEZXRhaWxGYWN0b3J5LkZhY3RvcnkuY2xhc3MpOwotICAgICAgICBmYWN0b3J5KFN1Ym1pdEFjdGlvbi5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShQdWJsaXNoQWN0aW9uLkZhY3RvcnkuY2xhc3MpOwogICAgICAgICBmYWN0b3J5KERlbGV0ZURyYWZ0Q2hhbmdlLkZhY3RvcnkuY2xhc3MpOwogICAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9EZWxldGVEcmFmdENoYW5nZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9EZWxldGVEcmFmdENoYW5nZS5qYXZhCmluZGV4IGVjZDhiNTQuLjYzYzIyY2UgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvRGVsZXRlRHJhZnRDaGFuZ2UuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0RlbGV0ZURyYWZ0Q2hhbmdlLmphdmEKQEAgLTM4LDcgKzM4LDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CiAgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlcjsKLSAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uOworICBwcml2YXRlIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZ2l0UmVmVXBkYXRlZDsKIAogICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7CiAKQEAgLTQ2LDEyICs0NiwxMiBAQAogICBEZWxldGVEcmFmdENoYW5nZShmaW5hbCBSZXZpZXdEYiBkYiwKICAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwKICAgICAgIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIGdpdE1hbmFnZXIsCi0gICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uLAorICAgICAgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkLAogICAgICAgQEFzc2lzdGVkIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQpIHsKICAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgICAgdGhpcy5kYiA9IGRiOwogICAgIHRoaXMuZ2l0TWFuYWdlciA9IGdpdE1hbmFnZXI7Ci0gICAgdGhpcy5yZXBsaWNhdGlvbiA9IHJlcGxpY2F0aW9uOworICAgIHRoaXMuZ2l0UmVmVXBkYXRlZCA9IGdpdFJlZlVwZGF0ZWQ7CiAKICAgICB0aGlzLnBhdGNoU2V0SWQgPSBwYXRjaFNldElkOwogICB9CkBAIC02NSw3ICs2NSw3IEBACiAgICAgICB0aHJvdyBuZXcgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uKGNoYW5nZUlkKTsKICAgICB9CiAKLSAgICBDaGFuZ2VVdGlsLmRlbGV0ZURyYWZ0Q2hhbmdlKHBhdGNoU2V0SWQsIGdpdE1hbmFnZXIsIHJlcGxpY2F0aW9uLCBkYik7CisgICAgQ2hhbmdlVXRpbC5kZWxldGVEcmFmdENoYW5nZShwYXRjaFNldElkLCBnaXRNYW5hZ2VyLCBnaXRSZWZVcGRhdGVkLCBkYik7CiAgICAgcmV0dXJuIFZvaWRSZXN1bHQuSU5TVEFOQ0U7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvRWRpdENvbW1pdE1lc3NhZ2VIYW5kbGVyLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0VkaXRDb21taXRNZXNzYWdlSGFuZGxlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjViMDY0YzgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL0VkaXRDb21taXRNZXNzYWdlSGFuZGxlci5qYXZhCkBAIC0wLDAgKzEsMTQ2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLmNoYW5nZWRldGFpbDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5DaGFuZ2VIb29rczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VEZXRhaWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEVudGl0eUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFwcHJvdmFsc1V0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlRyYWNraW5nRm9vdGVyczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkNvbW1pdE1lc3NhZ2VFZGl0ZWRTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC52YWxpZGF0b3JzLkNvbW1pdFZhbGlkYXRvcnM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaFByb2plY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Ob1NzaEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5JbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLk1pc3NpbmdPYmplY3RFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlBlcnNvbklkZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKKworY2xhc3MgRWRpdENvbW1pdE1lc3NhZ2VIYW5kbGVyIGV4dGVuZHMgSGFuZGxlcjxDaGFuZ2VEZXRhaWw+IHsKKyAgaW50ZXJmYWNlIEZhY3RvcnkgeworICAgIEVkaXRDb21taXRNZXNzYWdlSGFuZGxlciBjcmVhdGUoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwgU3RyaW5nIG1lc3NhZ2UpOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CisgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXI7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgQ29tbWl0TWVzc2FnZUVkaXRlZFNlbmRlci5GYWN0b3J5IGNvbW1pdE1lc3NhZ2VFZGl0ZWRTZW5kZXJGYWN0b3J5OworCisgIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkOworCisgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZDsKKyAgQE51bGxhYmxlCisgIHByaXZhdGUgZmluYWwgU3RyaW5nIG1lc3NhZ2U7CisKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VIb29rcyBob29rczsKKyAgcHJpdmF0ZSBmaW5hbCBDb21taXRWYWxpZGF0b3JzLkZhY3RvcnkgY29tbWl0VmFsaWRhdG9yc0ZhY3Rvcnk7CisKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyOworICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKworICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQ7CisgIHByaXZhdGUgZmluYWwgQXBwcm92YWxzVXRpbCBhcHByb3ZhbHNVdGlsOworICBwcml2YXRlIGZpbmFsIFRyYWNraW5nRm9vdGVycyB0cmFja2luZ0Zvb3RlcnM7CisKKyAgQEluamVjdAorICBFZGl0Q29tbWl0TWVzc2FnZUhhbmRsZXIoZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5LAorICAgICAgZmluYWwgUmV2aWV3RGIgZGIsIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLAorICAgICAgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3RvcnksCisgICAgICBmaW5hbCBDb21taXRNZXNzYWdlRWRpdGVkU2VuZGVyLkZhY3RvcnkgY29tbWl0TWVzc2FnZUVkaXRlZFNlbmRlckZhY3RvcnksCisgICAgICBAQXNzaXN0ZWQgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwKKyAgICAgIEBBc3Npc3RlZCBATnVsbGFibGUgZmluYWwgU3RyaW5nIG1lc3NhZ2UsIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzLAorICAgICAgZmluYWwgQ29tbWl0VmFsaWRhdG9ycy5GYWN0b3J5IGNvbW1pdFZhbGlkYXRvcnNGYWN0b3J5LAorICAgICAgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlciwKKyAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKKyAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZ2l0UmVmVXBkYXRlZCwKKyAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50LAorICAgICAgZmluYWwgQXBwcm92YWxzVXRpbCBhcHByb3ZhbHNVdGlsLCBUcmFja2luZ0Zvb3RlcnMgdHJhY2tpbmdGb290ZXJzKSB7CisgICAgdGhpcy5jaGFuZ2VDb250cm9sRmFjdG9yeSA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5OworICAgIHRoaXMuZGIgPSBkYjsKKyAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7CisgICAgdGhpcy5jaGFuZ2VEZXRhaWxGYWN0b3J5ID0gY2hhbmdlRGV0YWlsRmFjdG9yeTsKKyAgICB0aGlzLmNvbW1pdE1lc3NhZ2VFZGl0ZWRTZW5kZXJGYWN0b3J5ID0gY29tbWl0TWVzc2FnZUVkaXRlZFNlbmRlckZhY3Rvcnk7CisKKyAgICB0aGlzLnBhdGNoU2V0SWQgPSBwYXRjaFNldElkOworICAgIHRoaXMubWVzc2FnZSA9IG1lc3NhZ2U7CisgICAgdGhpcy5ob29rcyA9IGhvb2tzOworICAgIHRoaXMuY29tbWl0VmFsaWRhdG9yc0ZhY3RvcnkgPSBjb21taXRWYWxpZGF0b3JzRmFjdG9yeTsKKyAgICB0aGlzLmdpdE1hbmFnZXIgPSBnaXRNYW5hZ2VyOworCisgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgICB0aGlzLmdpdFJlZlVwZGF0ZWQgPSBnaXRSZWZVcGRhdGVkOworICAgIHRoaXMubXlJZGVudCA9IG15SWRlbnQ7CisgICAgdGhpcy5hcHByb3ZhbHNVdGlsID0gYXBwcm92YWxzVXRpbDsKKyAgICB0aGlzLnRyYWNraW5nRm9vdGVycyA9IHRyYWNraW5nRm9vdGVyczsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgQ2hhbmdlRGV0YWlsIGNhbGwoKSB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sCisgICAgICBFbWFpbEV4Y2VwdGlvbiwgTm9TdWNoRW50aXR5RXhjZXB0aW9uLCBQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24sCisgICAgICBNaXNzaW5nT2JqZWN0RXhjZXB0aW9uLCBJbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwKKyAgICAgIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24sIE5vU3VjaFByb2plY3RFeGNlcHRpb24geworCisgICAgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkID0gcGF0Y2hTZXRJZC5nZXRQYXJlbnRLZXkoKTsKKyAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSBjaGFuZ2VDb250cm9sRmFjdG9yeS52YWxpZGF0ZUZvcihjaGFuZ2VJZCk7CisgICAgaWYgKCFjb250cm9sLmNhbkFkZFBhdGNoU2V0KCkpIHsKKyAgICAgIHRocm93IG5ldyBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uKAorICAgICAgICAgICJOb3QgYWxsb3dlZCB0byBhZGQgbmV3IFBhdGNoIFNldHMgdG86ICIgKyBjaGFuZ2VJZC50b1N0cmluZygpKTsKKyAgICB9CisKKyAgICBmaW5hbCBSZXBvc2l0b3J5IGdpdDsKKyAgICB0cnkgeworICAgICAgZ2l0ID0gZ2l0TWFuYWdlci5vcGVuUmVwb3NpdG9yeShkYi5jaGFuZ2VzKCkuZ2V0KGNoYW5nZUlkKS5nZXRQcm9qZWN0KCkpOworICAgIH0gY2F0Y2ggKFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uKGNoYW5nZUlkLCBlKTsKKyAgICB9CisgICAgdHJ5IHsKKyAgICAgIENvbW1pdFZhbGlkYXRvcnMgY29tbWl0VmFsaWRhdG9ycyA9CisgICAgICAgICAgY29tbWl0VmFsaWRhdG9yc0ZhY3RvcnkuY3JlYXRlKGNvbnRyb2wuZ2V0UmVmQ29udHJvbCgpLCBuZXcgTm9Tc2hJbmZvKCksIGdpdCk7CisKKyAgICAgIENoYW5nZVV0aWwuZWRpdENvbW1pdE1lc3NhZ2UocGF0Y2hTZXRJZCwgY29udHJvbC5nZXRSZWZDb250cm9sKCksIGNvbW1pdFZhbGlkYXRvcnMsIGN1cnJlbnRVc2VyLCBtZXNzYWdlLCBkYiwKKyAgICAgICAgICBjb21taXRNZXNzYWdlRWRpdGVkU2VuZGVyRmFjdG9yeSwgaG9va3MsIGdpdCwgcGF0Y2hTZXRJbmZvRmFjdG9yeSwgZ2l0UmVmVXBkYXRlZCwgbXlJZGVudCwKKyAgICAgICAgICBhcHByb3ZhbHNVdGlsLCB0cmFja2luZ0Zvb3RlcnMpOworCisgICAgICByZXR1cm4gY2hhbmdlRGV0YWlsRmFjdG9yeS5jcmVhdGUoY2hhbmdlSWQpLmNhbGwoKTsKKyAgICB9IGZpbmFsbHkgeworICAgICAgZ2l0LmNsb3NlKCk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1BhdGNoU2V0UHVibGlzaERldGFpbEZhY3RvcnkuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUGF0Y2hTZXRQdWJsaXNoRGV0YWlsRmFjdG9yeS5qYXZhCmluZGV4IDUwYmFmOTcuLmQwMTAxYTYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUGF0Y2hTZXRQdWJsaXNoRGV0YWlsRmFjdG9yeS5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUGF0Y2hTZXRQdWJsaXNoRGV0YWlsRmFjdG9yeS5qYXZhCkBAIC0xNCwxOCArMTQsMTQgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlZGV0YWlsOwogCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxEZXRhaWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2V0UHVibGlzaERldGFpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUmFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0UmVjb3JkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5IYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKQEAgLTM0LDE0ICszMCwxMCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLndvcmtmbG93LkNhdGVnb3J5RnVuY3Rpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLndvcmtmbG93LkZ1bmN0aW9uU3RhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CiAKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwpAQCAtNTMsOSArNDUsNyBAQAogCiAgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBpbmZvRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKLSAgcHJpdmF0ZSBmaW5hbCBGdW5jdGlvblN0YXRlLkZhY3RvcnkgZnVuY3Rpb25TdGF0ZTsKICAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzOwogICBwcml2YXRlIGZpbmFsIEFjY291bnRJbmZvQ2FjaGVGYWN0b3J5IGFpYzsKICAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyOwogCkBAIC02OSwxNSArNTksMTEgQEAKICAgUGF0Y2hTZXRQdWJsaXNoRGV0YWlsRmFjdG9yeShmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IGluZm9GYWN0b3J5LAogICAgICAgZmluYWwgUmV2aWV3RGIgZGIsCiAgICAgICBmaW5hbCBBY2NvdW50SW5mb0NhY2hlRmFjdG9yeS5GYWN0b3J5IGFjY291bnRJbmZvQ2FjaGVGYWN0b3J5LAotICAgICAgZmluYWwgRnVuY3Rpb25TdGF0ZS5GYWN0b3J5IGZ1bmN0aW9uU3RhdGUsCiAgICAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCi0gICAgICBmaW5hbCBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXMsCiAgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyLCBAQXNzaXN0ZWQgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCkgewogICAgIHRoaXMuaW5mb0ZhY3RvcnkgPSBpbmZvRmFjdG9yeTsKICAgICB0aGlzLmRiID0gZGI7Ci0gICAgdGhpcy5mdW5jdGlvblN0YXRlID0gZnVuY3Rpb25TdGF0ZTsKICAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7Ci0gICAgdGhpcy5hcHByb3ZhbFR5cGVzID0gYXBwcm92YWxUeXBlczsKICAgICB0aGlzLmFpYyA9IGFjY291bnRJbmZvQ2FjaGVGYWN0b3J5LmNyZWF0ZSgpOwogICAgIHRoaXMudXNlciA9IHVzZXI7CiAKQEAgLTEwMSw5ICs4Nyw2IEBACiAgICAgZGV0YWlsLnNldENoYW5nZShjaGFuZ2UpOwogICAgIGRldGFpbC5zZXREcmFmdHMoZHJhZnRzKTsKIAotICAgIExpc3Q8UGVybWlzc2lvblJhbmdlPiBhbGxvd2VkID0gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7Ci0gICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBnaXZlbiA9IENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwotCiAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKS5pc09wZW4oKQogICAgICAgICAmJiBwYXRjaFNldElkLmVxdWFscyhjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSkpIHsKICAgICAgIC8vIFRPRE8gUHVzaCB0aGlzIHNlbGVjdGlvbiBvZiBsYWJlbHMgZG93biBpbnRvIHRoZSBQcm9sb2cgaW50ZXJwcmV0ZXIuCkBAIC0xMjAsMTEgKzEwMyw2IEBACiAgICAgICAgICAgcmFuZ2VCeU5hbWUucHV0KHIuZ2V0TGFiZWwoKSwgcik7CiAgICAgICAgIH0KICAgICAgIH0KLSAgICAgIGFsbG93ZWQgPSBuZXcgQXJyYXlMaXN0PFBlcm1pc3Npb25SYW5nZT4oKTsKLQotICAgICAgZ2l2ZW4gPSBkYi5wYXRjaFNldEFwcHJvdmFscygpIC8vCi0gICAgICAgICAgLmJ5UGF0Y2hTZXRVc2VyKHBhdGNoU2V0SWQsIHVzZXIuZ2V0QWNjb3VudElkKCkpIC8vCi0gICAgICAgICAgLnRvTGlzdCgpOwogCiAgICAgICBib29sZWFuIGNvdWxkU3VibWl0ID0gZmFsc2U7CiAgICAgICBMaXN0PFN1Ym1pdFJlY29yZD4gc3VibWl0UmVjb3JkcyA9IGNvbnRyb2wuY2FuU3VibWl0KGRiLCBwYXRjaFNldCk7CkBAIC0xNDIsMTIgKzEyMCw4IEBACiAgICAgICAgICAgICBib29sZWFuIGNhbk1ha2VPayA9IGZhbHNlOwogICAgICAgICAgICAgUGVybWlzc2lvblJhbmdlIHJhbmdlID0gcmFuZ2VCeU5hbWUuZ2V0KGxibC5sYWJlbCk7CiAgICAgICAgICAgICBpZiAocmFuZ2UgIT0gbnVsbCkgewotICAgICAgICAgICAgICBpZiAoIWFsbG93ZWQuY29udGFpbnMocmFuZ2UpKSB7Ci0gICAgICAgICAgICAgICAgYWxsb3dlZC5hZGQocmFuZ2UpOwotICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgQXBwcm92YWxUeXBlIGF0ID0gYXBwcm92YWxUeXBlcy5ieUxhYmVsKGxibC5sYWJlbCk7Ci0gICAgICAgICAgICAgIGlmIChhdCA9PSBudWxsIHx8IGF0LmdldE1heCgpLmdldFZhbHVlKCkgPT0gcmFuZ2UuZ2V0TWF4KCkpIHsKKyAgICAgICAgICAgICAgTGFiZWxUeXBlIGx0ID0gY29udHJvbC5nZXRMYWJlbFR5cGVzKCkuYnlMYWJlbChsYmwubGFiZWwpOworICAgICAgICAgICAgICBpZiAobHQgIT0gbnVsbCAmJiBsdC5nZXRNYXgoKS5nZXRWYWx1ZSgpID09IHJhbmdlLmdldE1heCgpKSB7CiAgICAgICAgICAgICAgICAgY2FuTWFrZU9rID0gdHJ1ZTsKICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQpAQCAtMTYzLDYgKzEzNywxMCBAQAogICAgICAgICAgICAgICAgICAgb2srKzsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgY2FzZSBJTVBPU1NJQkxFOgorICAgICAgICAgICAgICBjYXNlIFJFSkVDVDoKKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICB9CiAKQEAgLTE3Niw2MCArMTU0LDExIEBACiAgICAgICBpZiAoY291bGRTdWJtaXQgJiYgY29udHJvbC5nZXRSZWZDb250cm9sKCkuY2FuU3VibWl0KCkpIHsKICAgICAgICAgZGV0YWlsLnNldENhblN1Ym1pdCh0cnVlKTsKICAgICAgIH0KLQotICAgICAgZGV0YWlsLnNldFN1Ym1pdFJlY29yZHMoc3VibWl0UmVjb3Jkcyk7CiAgICAgfQogCi0gICAgZGV0YWlsLnNldExhYmVscyhhbGxvd2VkKTsKLSAgICBkZXRhaWwuc2V0R2l2ZW4oZ2l2ZW4pOwotICAgIGxvYWRBcHByb3ZhbHMoZGV0YWlsLCBjb250cm9sKTsKLQorICAgIGRldGFpbC5zZXRTdWJtaXRUeXBlUmVjb3JkKGNvbnRyb2wuZ2V0U3VibWl0VHlwZVJlY29yZChkYiwgcGF0Y2hTZXQpKTsKICAgICBkZXRhaWwuc2V0QWNjb3VudHMoYWljLmNyZWF0ZSgpKTsKIAogICAgIHJldHVybiBkZXRhaWw7CiAgIH0KLQotICBwcml2YXRlIHZvaWQgbG9hZEFwcHJvdmFscyhmaW5hbCBQYXRjaFNldFB1Ymxpc2hEZXRhaWwgZGV0YWlsLAotICAgICAgZmluYWwgQ2hhbmdlQ29udHJvbCBjb250cm9sKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBQYXRjaFNldC5JZCBwc0lkID0gZGV0YWlsLmdldENoYW5nZSgpLmN1cnJlbnRQYXRjaFNldElkKCk7Ci0gICAgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkID0gcGF0Y2hTZXRJZC5nZXRQYXJlbnRLZXkoKTsKLSAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGFsbEFwcHJvdmFscyA9Ci0gICAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlDaGFuZ2UoY2hhbmdlSWQpLnRvTGlzdCgpOwotCi0gICAgaWYgKGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdGF0dXMoKS5pc09wZW4oKSkgewotICAgICAgZmluYWwgRnVuY3Rpb25TdGF0ZSBmcyA9IGZ1bmN0aW9uU3RhdGUuY3JlYXRlKGNvbnRyb2wsIHBzSWQsIGFsbEFwcHJvdmFscyk7Ci0KLSAgICAgIGZvciAoZmluYWwgQXBwcm92YWxUeXBlIGF0IDogYXBwcm92YWxUeXBlcy5nZXRBcHByb3ZhbFR5cGVzKCkpIHsKLSAgICAgICAgQ2F0ZWdvcnlGdW5jdGlvbi5mb3JDYXRlZ29yeShhdC5nZXRDYXRlZ29yeSgpKS5ydW4oYXQsIGZzKTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBmaW5hbCBib29sZWFuIGNhblJlbW92ZVJldmlld2VycyA9IGRldGFpbC5nZXRDaGFuZ2UoKS5nZXRTdGF0dXMoKS5pc09wZW4oKSAvLwotICAgICAgICAmJiBjb250cm9sLmdldEN1cnJlbnRVc2VyKCkgaW5zdGFuY2VvZiBJZGVudGlmaWVkVXNlcjsKLSAgICBmaW5hbCBIYXNoTWFwPEFjY291bnQuSWQsIEFwcHJvdmFsRGV0YWlsPiBhZCA9Ci0gICAgICAgIG5ldyBIYXNoTWFwPEFjY291bnQuSWQsIEFwcHJvdmFsRGV0YWlsPigpOwotICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBjYSA6IGFsbEFwcHJvdmFscykgewotICAgICAgQXBwcm92YWxEZXRhaWwgZCA9IGFkLmdldChjYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICBpZiAoZCA9PSBudWxsKSB7Ci0gICAgICAgIGQgPSBuZXcgQXBwcm92YWxEZXRhaWwoY2EuZ2V0QWNjb3VudElkKCkpOwotICAgICAgICBkLnNldENhblJlbW92ZShjYW5SZW1vdmVSZXZpZXdlcnMpOwotICAgICAgICBhZC5wdXQoZC5nZXRBY2NvdW50KCksIGQpOwotICAgICAgfQotICAgICAgaWYgKGQuY2FuUmVtb3ZlKCkpIHsKLSAgICAgICAgZC5zZXRDYW5SZW1vdmUoY29udHJvbC5jYW5SZW1vdmVSZXZpZXdlcihjYSkpOwotICAgICAgfQotICAgICAgaWYgKGNhLmdldFBhdGNoU2V0SWQoKS5lcXVhbHMocHNJZCkpIHsKLSAgICAgICAgZC5hZGQoY2EpOwotICAgICAgfQotICAgIH0KLQotICAgIGZpbmFsIEFjY291bnQuSWQgb3duZXIgPSBkZXRhaWwuZ2V0Q2hhbmdlKCkuZ2V0T3duZXIoKTsKLSAgICBpZiAoYWQuY29udGFpbnNLZXkob3duZXIpKSB7Ci0gICAgICAvLyBFbnN1cmUgdGhlIG93bmVyIGFsd2F5cyBzb3J0cyB0byB0aGUgdG9wIG9mIHRoZSB0YWJsZQotICAgICAgYWQuZ2V0KG93bmVyKS5zb3J0Rmlyc3QoKTsKLSAgICB9Ci0KLSAgICBhaWMud2FudChhZC5rZXlTZXQoKSk7Ci0gICAgZGV0YWlsLnNldEFwcHJvdmFscyhhZC52YWx1ZXMoKSk7Ci0gIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUHVibGlzaEFjdGlvbi5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9QdWJsaXNoQWN0aW9uLmphdmEKaW5kZXggZjU3YjI5Yy4uMzhmOGZjNiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9QdWJsaXNoQWN0aW9uLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9QdWJsaXNoQWN0aW9uLmphdmEKQEAgLTIyLDYgKzIyLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLlB1Ymxpc2hEcmFmdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hQcm9qZWN0RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwpAQCAtNTMsNyArNTQsOCBAQAogICBAT3ZlcnJpZGUKICAgcHVibGljIENoYW5nZURldGFpbCBjYWxsKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgTm9TdWNoRW50aXR5RXhjZXB0aW9uLAogICAgICAgSWxsZWdhbFN0YXRlRXhjZXB0aW9uLCBQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24sCi0gICAgICBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sIFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgICAgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24sIElPRXhjZXB0aW9uLAorICAgICAgTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiB7CiAgICAgZmluYWwgUmV2aWV3UmVzdWx0IHJlc3VsdCA9IHB1Ymxpc2hGYWN0b3J5LmNyZWF0ZShwYXRjaFNldElkKS5jYWxsKCk7CiAgICAgaWYgKHJlc3VsdC5nZXRFcnJvcnMoKS5zaXplKCkgPiAwKSB7CiAgICAgICB0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKCJDYW5ub3QgcHVibGlzaCBwYXRjaHNldCIpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2UuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUmViYXNlQ2hhbmdlLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGU3MWUzMDIuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2UuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDExMCArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLmNoYW5nZWRldGFpbDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5DaGFuZ2VIb29rUnVubmVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNoYW5nZURldGFpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEVudGl0eUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5BcHByb3ZhbHNVdGlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DaGFuZ2VVdGlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV4dGVuc2lvbnMuZXZlbnRzLkdpdFJlZmVyZW5jZVVwZGF0ZWQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5FbWFpbEV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5SZWJhc2VkUGF0Y2hTZXRTZW5kZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5NaXNzaW5nT2JqZWN0RXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlBlcnNvbklkZW50OwotCi1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLQotY2xhc3MgUmViYXNlQ2hhbmdlIGV4dGVuZHMgSGFuZGxlcjxDaGFuZ2VEZXRhaWw+IHsKLSAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIFJlYmFzZUNoYW5nZSBjcmVhdGUoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCk7Ci0gIH0KLQotICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKLSAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlcjsKLSAgcHJpdmF0ZSBmaW5hbCBSZWJhc2VkUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeSByZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5OwotCi0gIHByaXZhdGUgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbjsKLQotICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VIb29rUnVubmVyIGhvb2tzOwotCi0gIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlcjsKLSAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50OwotCi0gIHByaXZhdGUgZmluYWwgQXBwcm92YWxzVXRpbCBhcHByb3ZhbHNVdGlsOwotCi0gIEBJbmplY3QKLSAgUmViYXNlQ2hhbmdlKGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwKLSAgICAgIGZpbmFsIFJldmlld0RiIGRiLCBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlciwKLSAgICAgIGZpbmFsIFJlYmFzZWRQYXRjaFNldFNlbmRlci5GYWN0b3J5IHJlYmFzZWRQYXRjaFNldFNlbmRlckZhY3RvcnksCi0gICAgICBmaW5hbCBDaGFuZ2VEZXRhaWxGYWN0b3J5LkZhY3RvcnkgY2hhbmdlRGV0YWlsRmFjdG9yeSwKLSAgICAgIEBBc3Npc3RlZCBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLCBmaW5hbCBDaGFuZ2VIb29rUnVubmVyIGhvb2tzLAotICAgICAgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlciwKLSAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKLSAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb24sCi0gICAgICBAR2Vycml0UGVyc29uSWRlbnQgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudCwKLSAgICAgIGZpbmFsIEFwcHJvdmFsc1V0aWwgYXBwcm92YWxzVXRpbCkgewotICAgIHRoaXMuY2hhbmdlQ29udHJvbEZhY3RvcnkgPSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKLSAgICB0aGlzLmRiID0gZGI7Ci0gICAgdGhpcy5jdXJyZW50VXNlciA9IGN1cnJlbnRVc2VyOwotICAgIHRoaXMucmViYXNlZFBhdGNoU2V0U2VuZGVyRmFjdG9yeSA9IHJlYmFzZWRQYXRjaFNldFNlbmRlckZhY3Rvcnk7Ci0gICAgdGhpcy5jaGFuZ2VEZXRhaWxGYWN0b3J5ID0gY2hhbmdlRGV0YWlsRmFjdG9yeTsKLQotICAgIHRoaXMucGF0Y2hTZXRJZCA9IHBhdGNoU2V0SWQ7Ci0gICAgdGhpcy5ob29rcyA9IGhvb2tzOwotICAgIHRoaXMuZ2l0TWFuYWdlciA9IGdpdE1hbmFnZXI7Ci0KLSAgICB0aGlzLnBhdGNoU2V0SW5mb0ZhY3RvcnkgPSBwYXRjaFNldEluZm9GYWN0b3J5OwotICAgIHRoaXMucmVwbGljYXRpb24gPSByZXBsaWNhdGlvbjsKLSAgICB0aGlzLm15SWRlbnQgPSBteUlkZW50OwotCi0gICAgdGhpcy5hcHByb3ZhbHNVdGlsID0gYXBwcm92YWxzVXRpbDsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgQ2hhbmdlRGV0YWlsIGNhbGwoKSB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sCi0gICAgICBFbWFpbEV4Y2VwdGlvbiwgTm9TdWNoRW50aXR5RXhjZXB0aW9uLCBQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24sCi0gICAgICBNaXNzaW5nT2JqZWN0RXhjZXB0aW9uLCBJbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwKLSAgICAgIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24gewotCi0gICAgQ2hhbmdlVXRpbC5yZWJhc2VDaGFuZ2UocGF0Y2hTZXRJZCwgY3VycmVudFVzZXIsIGRiLAotICAgICAgICByZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5LCBob29rcywgZ2l0TWFuYWdlciwgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKLSAgICAgICAgcmVwbGljYXRpb24sIG15SWRlbnQsIGNoYW5nZUNvbnRyb2xGYWN0b3J5LCBhcHByb3ZhbHNVdGlsKTsKLQotICAgIHJldHVybiBjaGFuZ2VEZXRhaWxGYWN0b3J5LmNyZWF0ZShwYXRjaFNldElkLmdldFBhcmVudEtleSgpKS5jYWxsKCk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUmViYXNlQ2hhbmdlSGFuZGxlci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2VIYW5kbGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjlhY2ZhOQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUmViYXNlQ2hhbmdlSGFuZGxlci5qYXZhCkBAIC0wLDAgKzEsNjggQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlZGV0YWlsOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2hhbmdlRGV0YWlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuRW1haWxFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hFbnRpdHlFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLkhhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLlJlYmFzZUNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaFByb2plY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5JbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLk1pc3NpbmdPYmplY3RFeGNlcHRpb247CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitjbGFzcyBSZWJhc2VDaGFuZ2VIYW5kbGVyIGV4dGVuZHMgSGFuZGxlcjxDaGFuZ2VEZXRhaWw+IHsKKyAgaW50ZXJmYWNlIEZhY3RvcnkgeworICAgIFJlYmFzZUNoYW5nZUhhbmRsZXIgY3JlYXRlKFBhdGNoU2V0LklkIHBhdGNoU2V0SWQpOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBSZWJhc2VDaGFuZ2UgcmViYXNlQ2hhbmdlOworICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyOworICBwcml2YXRlIGZpbmFsIENoYW5nZURldGFpbEZhY3RvcnkuRmFjdG9yeSBjaGFuZ2VEZXRhaWxGYWN0b3J5OworCisgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZDsKKworICBASW5qZWN0CisgIFJlYmFzZUNoYW5nZUhhbmRsZXIoZmluYWwgUmViYXNlQ2hhbmdlIHJlYmFzZUNoYW5nZSwKKyAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLAorICAgICAgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3RvcnksCisgICAgICBAQXNzaXN0ZWQgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCkgeworICAgIHRoaXMucmViYXNlQ2hhbmdlID0gcmViYXNlQ2hhbmdlOworICAgIHRoaXMuY3VycmVudFVzZXIgPSBjdXJyZW50VXNlcjsKKyAgICB0aGlzLmNoYW5nZURldGFpbEZhY3RvcnkgPSBjaGFuZ2VEZXRhaWxGYWN0b3J5OworCisgICAgdGhpcy5wYXRjaFNldElkID0gcGF0Y2hTZXRJZDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgQ2hhbmdlRGV0YWlsIGNhbGwoKSB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sCisgICAgICBFbWFpbEV4Y2VwdGlvbiwgTm9TdWNoRW50aXR5RXhjZXB0aW9uLCBQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24sCisgICAgICBNaXNzaW5nT2JqZWN0RXhjZXB0aW9uLCBJbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwKKyAgICAgIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24sIE5vU3VjaFByb2plY3RFeGNlcHRpb24geworICAgIHJlYmFzZUNoYW5nZS5yZWJhc2UocGF0Y2hTZXRJZCwgY3VycmVudFVzZXIuZ2V0QWNjb3VudElkKCkpOworICAgIHJldHVybiBjaGFuZ2VEZXRhaWxGYWN0b3J5LmNyZWF0ZShwYXRjaFNldElkLmdldFBhcmVudEtleSgpKS5jYWxsKCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUmVzdG9yZUNoYW5nZUhhbmRsZXIuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9jaGFuZ2VkZXRhaWwvUmVzdG9yZUNoYW5nZUhhbmRsZXIuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTQ1NzFmZC4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1Jlc3RvcmVDaGFuZ2VIYW5kbGVyLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw3NiArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLmNoYW5nZWRldGFpbDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNoYW5nZURldGFpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hFbnRpdHlFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLkhhbmRsZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuUmVzdG9yZUNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5FbWFpbEV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOwotCi1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLQotaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7Ci0KLWNsYXNzIFJlc3RvcmVDaGFuZ2VIYW5kbGVyIGV4dGVuZHMgSGFuZGxlcjxDaGFuZ2VEZXRhaWw+IHsKLSAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIFJlc3RvcmVDaGFuZ2VIYW5kbGVyIGNyZWF0ZShQYXRjaFNldC5JZCBwYXRjaFNldElkLCBTdHJpbmcgbWVzc2FnZSk7Ci0gIH0KLQotICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJlc3RvcmVDaGFuZ2U+IHJlc3RvcmVDaGFuZ2VQcm92aWRlcjsKLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VEZXRhaWxGYWN0b3J5LkZhY3RvcnkgY2hhbmdlRGV0YWlsRmFjdG9yeTsKLQotICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7Ci0gIEBOdWxsYWJsZQotICBwcml2YXRlIGZpbmFsIFN0cmluZyBtZXNzYWdlOwotCi0gIEBJbmplY3QKLSAgUmVzdG9yZUNoYW5nZUhhbmRsZXIoZmluYWwgUHJvdmlkZXI8UmVzdG9yZUNoYW5nZT4gcmVzdG9yZUNoYW5nZVByb3ZpZGVyLAotICAgICAgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3RvcnksCi0gICAgICBAQXNzaXN0ZWQgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwKLSAgICAgIEBBc3Npc3RlZCBATnVsbGFibGUgZmluYWwgU3RyaW5nIG1lc3NhZ2UpIHsKLSAgICB0aGlzLnJlc3RvcmVDaGFuZ2VQcm92aWRlciA9IHJlc3RvcmVDaGFuZ2VQcm92aWRlcjsKLSAgICB0aGlzLmNoYW5nZURldGFpbEZhY3RvcnkgPSBjaGFuZ2VEZXRhaWxGYWN0b3J5OwotCi0gICAgdGhpcy5wYXRjaFNldElkID0gcGF0Y2hTZXRJZDsKLSAgICB0aGlzLm1lc3NhZ2UgPSBtZXNzYWdlOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBDaGFuZ2VEZXRhaWwgY2FsbCgpIHRocm93cyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwKLSAgICAgIEVtYWlsRXhjZXB0aW9uLCBOb1N1Y2hFbnRpdHlFeGNlcHRpb24sIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24sCi0gICAgICBQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24sIFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiwKLSAgICAgIElPRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBSZXN0b3JlQ2hhbmdlIHJlc3RvcmVDaGFuZ2UgPSByZXN0b3JlQ2hhbmdlUHJvdmlkZXIuZ2V0KCk7Ci0gICAgcmVzdG9yZUNoYW5nZS5zZXRDaGFuZ2VJZChwYXRjaFNldElkLmdldFBhcmVudEtleSgpKTsKLSAgICByZXN0b3JlQ2hhbmdlLnNldE1lc3NhZ2UobWVzc2FnZSk7Ci0gICAgZmluYWwgUmV2aWV3UmVzdWx0IHJlc3VsdCA9IHJlc3RvcmVDaGFuZ2UuY2FsbCgpOwotICAgIGlmIChyZXN1bHQuZ2V0RXJyb3JzKCkuc2l6ZSgpID4gMCkgewotICAgICAgdGhyb3cgbmV3IE5vU3VjaENoYW5nZUV4Y2VwdGlvbihyZXN1bHQuZ2V0Q2hhbmdlSWQoKSk7Ci0gICAgfQotICAgIHJldHVybiBjaGFuZ2VEZXRhaWxGYWN0b3J5LmNyZWF0ZShyZXN1bHQuZ2V0Q2hhbmdlSWQoKSkuY2FsbCgpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1JldmVydENoYW5nZS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9SZXZlcnRDaGFuZ2UuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNjBhMDNiZC4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1JldmVydENoYW5nZS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMTE0ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlZGV0YWlsOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNoYW5nZURldGFpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEVudGl0eUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkVtYWlsRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJldmVydGVkU2VuZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9GYWN0b3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5JbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLk1pc3NpbmdPYmplY3RFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUGVyc29uSWRlbnQ7Ci0KLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotCi1pbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKLQotY2xhc3MgUmV2ZXJ0Q2hhbmdlIGV4dGVuZHMgSGFuZGxlcjxDaGFuZ2VEZXRhaWw+IHsKLSAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIFJldmVydENoYW5nZSBjcmVhdGUoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwgU3RyaW5nIG1lc3NhZ2UpOwotICB9Ci0KLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7Ci0gIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXI7Ci0gIHByaXZhdGUgZmluYWwgUmV2ZXJ0ZWRTZW5kZXIuRmFjdG9yeSByZXZlcnRlZFNlbmRlckZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbjsKLQotICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7Ci0gIEBOdWxsYWJsZQotICBwcml2YXRlIGZpbmFsIFN0cmluZyBtZXNzYWdlOwotCi0gIHByaXZhdGUgZmluYWwgQ2hhbmdlSG9va3MgaG9va3M7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyOwotICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeTsKLQotICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQ7Ci0KLSAgQEluamVjdAotICBSZXZlcnRDaGFuZ2UoZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5LAotICAgICAgZmluYWwgUmV2aWV3RGIgZGIsIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLAotICAgICAgZmluYWwgUmV2ZXJ0ZWRTZW5kZXIuRmFjdG9yeSByZXZlcnRlZFNlbmRlckZhY3RvcnksCi0gICAgICBmaW5hbCBDaGFuZ2VEZXRhaWxGYWN0b3J5LkZhY3RvcnkgY2hhbmdlRGV0YWlsRmFjdG9yeSwKLSAgICAgIEBBc3Npc3RlZCBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAotICAgICAgQEFzc2lzdGVkIEBOdWxsYWJsZSBmaW5hbCBTdHJpbmcgbWVzc2FnZSwgZmluYWwgQ2hhbmdlSG9va3MgaG9va3MsCi0gICAgICBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyLAotICAgICAgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5LAotICAgICAgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbiwKLSAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50KSB7Ci0gICAgdGhpcy5jaGFuZ2VDb250cm9sRmFjdG9yeSA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5OwotICAgIHRoaXMuZGIgPSBkYjsKLSAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7Ci0gICAgdGhpcy5yZXZlcnRlZFNlbmRlckZhY3RvcnkgPSByZXZlcnRlZFNlbmRlckZhY3Rvcnk7Ci0gICAgdGhpcy5jaGFuZ2VEZXRhaWxGYWN0b3J5ID0gY2hhbmdlRGV0YWlsRmFjdG9yeTsKLQotICAgIHRoaXMucGF0Y2hTZXRJZCA9IHBhdGNoU2V0SWQ7Ci0gICAgdGhpcy5tZXNzYWdlID0gbWVzc2FnZTsKLSAgICB0aGlzLmhvb2tzID0gaG9va3M7Ci0gICAgdGhpcy5naXRNYW5hZ2VyID0gZ2l0TWFuYWdlcjsKLQotICAgIHRoaXMucGF0Y2hTZXRJbmZvRmFjdG9yeSA9IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7Ci0gICAgdGhpcy5yZXBsaWNhdGlvbiA9IHJlcGxpY2F0aW9uOwotICAgIHRoaXMubXlJZGVudCA9IG15SWRlbnQ7Ci0gIH0KLQotICBAT3ZlcnJpZGUKLSAgcHVibGljIENoYW5nZURldGFpbCBjYWxsKCkgdGhyb3dzIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLAotICAgICAgRW1haWxFeGNlcHRpb24sIE5vU3VjaEVudGl0eUV4Y2VwdGlvbiwgUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uLAotICAgICAgTWlzc2luZ09iamVjdEV4Y2VwdGlvbiwgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewotCi0gICAgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkID0gcGF0Y2hTZXRJZC5nZXRQYXJlbnRLZXkoKTsKLSAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSBjaGFuZ2VDb250cm9sRmFjdG9yeS52YWxpZGF0ZUZvcihjaGFuZ2VJZCk7Ci0gICAgaWYgKCFjb250cm9sLmNhbkFkZFBhdGNoU2V0KCkpIHsKLSAgICAgIHRocm93IG5ldyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24oY2hhbmdlSWQpOwotICAgIH0KLQotICAgIENoYW5nZS5JZCByZXZlcnRlZENoYW5nZUlkID0gQ2hhbmdlVXRpbC5yZXZlcnQocGF0Y2hTZXRJZCwgY3VycmVudFVzZXIsIG1lc3NhZ2UsIGRiLAotICAgICAgICByZXZlcnRlZFNlbmRlckZhY3RvcnksIGhvb2tzLCBnaXRNYW5hZ2VyLCBwYXRjaFNldEluZm9GYWN0b3J5LAotICAgICAgICByZXBsaWNhdGlvbiwgbXlJZGVudCk7Ci0KLSAgICByZXR1cm4gY2hhbmdlRGV0YWlsRmFjdG9yeS5jcmVhdGUocmV2ZXJ0ZWRDaGFuZ2VJZCkuY2FsbCgpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1N1Ym1pdEFjdGlvbi5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL2NoYW5nZWRldGFpbC9TdWJtaXRBY3Rpb24uamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMjNiMjFkNS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvY2hhbmdlZGV0YWlsL1N1Ym1pdEFjdGlvbi5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNjcgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5jaGFuZ2VkZXRhaWw7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VEZXRhaWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUmV2aWV3UmVzdWx0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoRW50aXR5RXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5IYW5kbGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLlN1Ym1pdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOwotCi1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLQotY2xhc3MgU3VibWl0QWN0aW9uIGV4dGVuZHMgSGFuZGxlcjxDaGFuZ2VEZXRhaWw+IHsKLSAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIFN1Ym1pdEFjdGlvbiBjcmVhdGUoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCk7Ci0gIH0KLQotICBwcml2YXRlIGZpbmFsIFN1Ym1pdC5GYWN0b3J5IHN1Ym1pdEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3Rvcnk7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkOwotCi0gIEBJbmplY3QKLSAgU3VibWl0QWN0aW9uKGZpbmFsIFN1Ym1pdC5GYWN0b3J5IHN1Ym1pdEZhY3RvcnksCi0gICAgICBmaW5hbCBDaGFuZ2VEZXRhaWxGYWN0b3J5LkZhY3RvcnkgY2hhbmdlRGV0YWlsRmFjdG9yeSwKLSAgICAgIEBBc3Npc3RlZCBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkKSB7Ci0gICAgdGhpcy5zdWJtaXRGYWN0b3J5ID0gc3VibWl0RmFjdG9yeTsKLSAgICB0aGlzLmNoYW5nZURldGFpbEZhY3RvcnkgPSBjaGFuZ2VEZXRhaWxGYWN0b3J5OwotCi0gICAgdGhpcy5wYXRjaFNldElkID0gcGF0Y2hTZXRJZDsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgQ2hhbmdlRGV0YWlsIGNhbGwoKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBOb1N1Y2hFbnRpdHlFeGNlcHRpb24sCi0gICAgICBJbGxlZ2FsU3RhdGVFeGNlcHRpb24sIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24sCi0gICAgICBQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24sIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiwKLSAgICAgIFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewotICAgIGZpbmFsIFJldmlld1Jlc3VsdCByZXN1bHQgPQotICAgICAgICBzdWJtaXRGYWN0b3J5LmNyZWF0ZShwYXRjaFNldElkKS5jYWxsKCk7Ci0gICAgaWYgKHJlc3VsdC5nZXRFcnJvcnMoKS5zaXplKCkgPiAwKSB7Ci0gICAgICB0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKAotICAgICAgICAgICJDYW5ub3Qgc3VibWl0ICIgKyByZXN1bHQuZ2V0RXJyb3JzKCkuZ2V0KDApLmdldE1lc3NhZ2VPclR5cGUoKSk7Ci0gICAgfQotICAgIHJldHVybiBjaGFuZ2VEZXRhaWxGYWN0b3J5LmNyZWF0ZShyZXN1bHQuZ2V0Q2hhbmdlSWQoKSkuY2FsbCgpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvZ3JvdXAvR3JvdXBzUmVzdEFwaVNlcnZsZXQuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9ncm91cC9Hcm91cHNSZXN0QXBpU2VydmxldC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA0ZGM3NDcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvZ3JvdXAvR3JvdXBzUmVzdEFwaVNlcnZsZXQuamF2YQpAQCAtMCwwICsxLDMyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucmVzdGFwaS5SZXN0QXBpU2VydmxldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuR3JvdXBzQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworCitAU2luZ2xldG9uCitwdWJsaWMgY2xhc3MgR3JvdXBzUmVzdEFwaVNlcnZsZXQgZXh0ZW5kcyBSZXN0QXBpU2VydmxldCB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgIEBJbmplY3QKKyAgR3JvdXBzUmVzdEFwaVNlcnZsZXQoUmVzdEFwaVNlcnZsZXQuR2xvYmFscyBnbG9iYWxzLAorICAgICAgUHJvdmlkZXI8R3JvdXBzQ29sbGVjdGlvbj4gZ3JvdXBzKSB7CisgICAgc3VwZXIoZ2xvYmFscywgZ3JvdXBzKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL0FkZFJldmlld2VySGFuZGxlci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL0FkZFJldmlld2VySGFuZGxlci5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA2MGQ2ZTYwLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wYXRjaC9BZGRSZXZpZXdlckhhbmRsZXIuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDYxICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucGF0Y2g7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdlclJlc3VsdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlZGV0YWlsLkNoYW5nZURldGFpbEZhY3Rvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guQWRkUmV2aWV3ZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwotCi1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247Ci0KLWNsYXNzIEFkZFJldmlld2VySGFuZGxlciBleHRlbmRzIEhhbmRsZXI8UmV2aWV3ZXJSZXN1bHQ+IHsKLSAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIEFkZFJldmlld2VySGFuZGxlciBjcmVhdGUoQ2hhbmdlLklkIGNoYW5nZUlkLCBDb2xsZWN0aW9uPFN0cmluZz4gcmV2aWV3ZXJzLAotICAgICAgICBib29sZWFuIGNvbmZpcm1lZCk7Ci0gIH0KLQotICBwcml2YXRlIGZpbmFsIEFkZFJldmlld2VyLkZhY3RvcnkgYWRkUmV2aWV3ZXJGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIENoYW5nZURldGFpbEZhY3RvcnkuRmFjdG9yeSBjaGFuZ2VEZXRhaWxGYWN0b3J5OwotCi0gIHByaXZhdGUgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkOwotICBwcml2YXRlIGZpbmFsIENvbGxlY3Rpb248U3RyaW5nPiByZXZpZXdlcnM7Ci0gIHByaXZhdGUgZmluYWwgYm9vbGVhbiBjb25maXJtZWQ7Ci0KLSAgQEluamVjdAotICBBZGRSZXZpZXdlckhhbmRsZXIoZmluYWwgQWRkUmV2aWV3ZXIuRmFjdG9yeSBhZGRSZXZpZXdlckZhY3RvcnksCi0gICAgICBmaW5hbCBDaGFuZ2VEZXRhaWxGYWN0b3J5LkZhY3RvcnkgY2hhbmdlRGV0YWlsRmFjdG9yeSwKLSAgICAgIEBBc3Npc3RlZCBmaW5hbCBDaGFuZ2UuSWQgY2hhbmdlSWQsCi0gICAgICBAQXNzaXN0ZWQgZmluYWwgQ29sbGVjdGlvbjxTdHJpbmc+IHJldmlld2VycywKLSAgICAgIEBBc3Npc3RlZCBmaW5hbCBib29sZWFuIGNvbmZpcm1lZCkgewotCi0gICAgdGhpcy5hZGRSZXZpZXdlckZhY3RvcnkgPSBhZGRSZXZpZXdlckZhY3Rvcnk7Ci0gICAgdGhpcy5jaGFuZ2VEZXRhaWxGYWN0b3J5ID0gY2hhbmdlRGV0YWlsRmFjdG9yeTsKLQotICAgIHRoaXMuY2hhbmdlSWQgPSBjaGFuZ2VJZDsKLSAgICB0aGlzLnJldmlld2VycyA9IHJldmlld2VyczsKLSAgICB0aGlzLmNvbmZpcm1lZCA9IGNvbmZpcm1lZDsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgUmV2aWV3ZXJSZXN1bHQgY2FsbCgpIHRocm93cyBFeGNlcHRpb24gewotICAgIFJldmlld2VyUmVzdWx0IHJlc3VsdCA9IGFkZFJldmlld2VyRmFjdG9yeS5jcmVhdGUoY2hhbmdlSWQsIHJldmlld2VycywgY29uZmlybWVkKS5jYWxsKCk7Ci0gICAgcmVzdWx0LnNldENoYW5nZShjaGFuZ2VEZXRhaWxGYWN0b3J5LmNyZWF0ZShjaGFuZ2VJZCkuY2FsbCgpKTsKLSAgICByZXR1cm4gcmVzdWx0OwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvUGF0Y2hEZXRhaWxTZXJ2aWNlSW1wbC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1BhdGNoRGV0YWlsU2VydmljZUltcGwuamF2YQppbmRleCA0MGM5Yjg0Li4zMTc0NzU3IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvUGF0Y2hEZXRhaWxTZXJ2aWNlSW1wbC5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wYXRjaC9QYXRjaERldGFpbFNlcnZpY2VJbXBsLmphdmEKQEAgLTE0LDM4ICsxNCwyNCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5wYXRjaDsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsU3VtbWFyeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFN1bW1hcnlTZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5DaGFuZ2VEZXRhaWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGF0Y2hEZXRhaWxTZXJ2aWNlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBhdGNoU2NyaXB0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlJldmlld1Jlc3VsdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdlclJlc3VsdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEVudGl0eUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuQmFzZVNlcnZpY2VJbXBsZW1lbnRhdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlZGV0YWlsLkNoYW5nZURldGFpbEZhY3Rvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnREaWZmUHJlZmVyZW5jZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudFBhdGNoUmV2aWV3OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaC5LZXk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50SW5mb0NhY2hlRmFjdG9yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLkRlbGV0ZURyYWZ0UGF0Y2hTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUHVibGlzaENvbW1lbnRzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci53b3JrZmxvdy5GdW5jdGlvblN0YXRlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaFByb2plY3RFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLmNvbW1vbi5Bc3luY0NhbGxiYWNrOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uVm9pZFJlc3VsdDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwpAQCAtNTYsMjIgKzQyLDEwIEBACiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuTWFwOwotaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIGNsYXNzIFBhdGNoRGV0YWlsU2VydmljZUltcGwgZXh0ZW5kcyBCYXNlU2VydmljZUltcGxlbWVudGF0aW9uIGltcGxlbWVudHMKICAgICBQYXRjaERldGFpbFNlcnZpY2UgewotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKLQotICBwcml2YXRlIGZpbmFsIEFjY291bnRJbmZvQ2FjaGVGYWN0b3J5LkZhY3RvcnkgYWNjb3VudEluZm9DYWNoZUZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgQWRkUmV2aWV3ZXJIYW5kbGVyLkZhY3RvcnkgYWRkUmV2aWV3ZXJIYW5kbGVyRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgRGVsZXRlRHJhZnRQYXRjaFNldC5GYWN0b3J5IGRlbGV0ZURyYWZ0UGF0Y2hTZXRGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIFJlbW92ZVJldmlld2VySGFuZGxlci5GYWN0b3J5IHJlbW92ZVJldmlld2VySGFuZGxlckZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgRnVuY3Rpb25TdGF0ZS5GYWN0b3J5IGZ1bmN0aW9uU3RhdGVGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIFB1Ymxpc2hDb21tZW50cy5GYWN0b3J5IHB1Ymxpc2hDb21tZW50c0ZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUGF0Y2hTY3JpcHRGYWN0b3J5LkZhY3RvcnkgcGF0Y2hTY3JpcHRGYWN0b3J5RmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBTYXZlRHJhZnQuRmFjdG9yeSBzYXZlRHJhZnRGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIENoYW5nZURldGFpbEZhY3RvcnkuRmFjdG9yeSBjaGFuZ2VEZXRhaWxGYWN0b3J5OwpAQCAtNzksMjggKzUzLDE0IEBACiAgIEBJbmplY3QKICAgUGF0Y2hEZXRhaWxTZXJ2aWNlSW1wbChmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gc2NoZW1hLAogICAgICAgZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IGN1cnJlbnRVc2VyLAotICAgICAgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzLAotICAgICAgZmluYWwgQWNjb3VudEluZm9DYWNoZUZhY3RvcnkuRmFjdG9yeSBhY2NvdW50SW5mb0NhY2hlRmFjdG9yeSwKLSAgICAgIGZpbmFsIEFkZFJldmlld2VySGFuZGxlci5GYWN0b3J5IGFkZFJldmlld2VySGFuZGxlckZhY3RvcnksCi0gICAgICBmaW5hbCBSZW1vdmVSZXZpZXdlckhhbmRsZXIuRmFjdG9yeSByZW1vdmVSZXZpZXdlckhhbmRsZXJGYWN0b3J5LAotICAgICAgZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5LAogICAgICAgZmluYWwgRGVsZXRlRHJhZnRQYXRjaFNldC5GYWN0b3J5IGRlbGV0ZURyYWZ0UGF0Y2hTZXRGYWN0b3J5LAotICAgICAgZmluYWwgRnVuY3Rpb25TdGF0ZS5GYWN0b3J5IGZ1bmN0aW9uU3RhdGVGYWN0b3J5LAogICAgICAgZmluYWwgUGF0Y2hTY3JpcHRGYWN0b3J5LkZhY3RvcnkgcGF0Y2hTY3JpcHRGYWN0b3J5RmFjdG9yeSwKLSAgICAgIGZpbmFsIFB1Ymxpc2hDb21tZW50cy5GYWN0b3J5IHB1Ymxpc2hDb21tZW50c0ZhY3RvcnksCiAgICAgICBmaW5hbCBTYXZlRHJhZnQuRmFjdG9yeSBzYXZlRHJhZnRGYWN0b3J5LAogICAgICAgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3RvcnkpIHsKICAgICBzdXBlcihzY2hlbWEsIGN1cnJlbnRVc2VyKTsKLSAgICB0aGlzLmFwcHJvdmFsVHlwZXMgPSBhcHByb3ZhbFR5cGVzOwogCi0gICAgdGhpcy5hY2NvdW50SW5mb0NhY2hlRmFjdG9yeSA9IGFjY291bnRJbmZvQ2FjaGVGYWN0b3J5OwotICAgIHRoaXMuYWRkUmV2aWV3ZXJIYW5kbGVyRmFjdG9yeSA9IGFkZFJldmlld2VySGFuZGxlckZhY3Rvcnk7Ci0gICAgdGhpcy5yZW1vdmVSZXZpZXdlckhhbmRsZXJGYWN0b3J5ID0gcmVtb3ZlUmV2aWV3ZXJIYW5kbGVyRmFjdG9yeTsKLSAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgICAgdGhpcy5kZWxldGVEcmFmdFBhdGNoU2V0RmFjdG9yeSA9IGRlbGV0ZURyYWZ0UGF0Y2hTZXRGYWN0b3J5OwotICAgIHRoaXMuZnVuY3Rpb25TdGF0ZUZhY3RvcnkgPSBmdW5jdGlvblN0YXRlRmFjdG9yeTsKICAgICB0aGlzLnBhdGNoU2NyaXB0RmFjdG9yeUZhY3RvcnkgPSBwYXRjaFNjcmlwdEZhY3RvcnlGYWN0b3J5OwotICAgIHRoaXMucHVibGlzaENvbW1lbnRzRmFjdG9yeSA9IHB1Ymxpc2hDb21tZW50c0ZhY3Rvcnk7CiAgICAgdGhpcy5zYXZlRHJhZnRGYWN0b3J5ID0gc2F2ZURyYWZ0RmFjdG9yeTsKICAgICB0aGlzLmNoYW5nZURldGFpbEZhY3RvcnkgPSBjaGFuZ2VEZXRhaWxGYWN0b3J5OwogICB9CkBAIC0xNjUsNiArMTI1LDggQEAKICAgICAgICAgICByZXR1cm4gY2hhbmdlRGV0YWlsRmFjdG9yeS5jcmVhdGUocmVzdWx0LmdldENoYW5nZUlkKCkpLmNhbGwoKTsKICAgICAgICAgfSBjYXRjaCAoTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIGUpIHsKICAgICAgICAgICB0aHJvdyBuZXcgRmFpbHVyZShuZXcgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uKHJlc3VsdC5nZXRDaGFuZ2VJZCgpKSk7CisgICAgICAgIH0gY2F0Y2ggKE5vU3VjaFByb2plY3RFeGNlcHRpb24gZSkgeworICAgICAgICAgIHRocm93IG5ldyBGYWlsdXJlKGUpOwogICAgICAgICB9IGNhdGNoIChOb1N1Y2hFbnRpdHlFeGNlcHRpb24gZSkgewogICAgICAgICAgIHRocm93IG5ldyBGYWlsdXJlKGUpOwogICAgICAgICB9IGNhdGNoIChQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24gZSkgewpAQCAtMTc3LDE1NCArMTM5LDQgQEAKICAgICAgIH0KICAgICB9KTsKICAgfQotCi0gIHB1YmxpYyB2b2lkIHB1Ymxpc2hDb21tZW50cyhmaW5hbCBQYXRjaFNldC5JZCBwc2lkLCBmaW5hbCBTdHJpbmcgbXNnLAotICAgICAgZmluYWwgU2V0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZD4gdGFncywKLSAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gY2IpIHsKLSAgICBIYW5kbGVyLndyYXAocHVibGlzaENvbW1lbnRzRmFjdG9yeS5jcmVhdGUocHNpZCwgbXNnLCB0YWdzLCBmYWxzZSkpLnRvKGNiKTsKLSAgfQotCi0gIC8qKgotICAgKiBVcGRhdGUgdGhlIHJldmlld2VkIHN0YXR1cyBmb3IgdGhlIGZpbGUgYnkgdXNlciBAY29kZXthY2NvdW50fQotICAgKi8KLSAgcHVibGljIHZvaWQgc2V0UmV2aWV3ZWRCeUN1cnJlbnRVc2VyKGZpbmFsIEtleSBwYXRjaEtleSwKLSAgICAgIGZpbmFsIGJvb2xlYW4gcmV2aWV3ZWQsIEFzeW5jQ2FsbGJhY2s8Vm9pZFJlc3VsdD4gY2FsbGJhY2spIHsKLSAgICBydW4oY2FsbGJhY2ssIG5ldyBBY3Rpb248Vm9pZFJlc3VsdD4oKSB7Ci0gICAgICBwdWJsaWMgVm9pZFJlc3VsdCBydW4oUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgICAgICBBY2NvdW50LklkIGFjY291bnQgPSBnZXRBY2NvdW50SWQoKTsKLSAgICAgICAgQWNjb3VudFBhdGNoUmV2aWV3LktleSBrZXkgPQotICAgICAgICAgICAgbmV3IEFjY291bnRQYXRjaFJldmlldy5LZXkocGF0Y2hLZXksIGFjY291bnQpOwotICAgICAgICBkYi5hY2NvdW50cygpLmJlZ2luVHJhbnNhY3Rpb24oYWNjb3VudCk7Ci0gICAgICAgIHRyeSB7Ci0gICAgICAgICAgQWNjb3VudFBhdGNoUmV2aWV3IGFwciA9IGRiLmFjY291bnRQYXRjaFJldmlld3MoKS5nZXQoa2V5KTsKLSAgICAgICAgICBpZiAoYXByID09IG51bGwgJiYgcmV2aWV3ZWQpIHsKLSAgICAgICAgICAgIGRiLmFjY291bnRQYXRjaFJldmlld3MoKS5pbnNlcnQoCi0gICAgICAgICAgICAgICAgQ29sbGVjdGlvbnMuc2luZ2xldG9uKG5ldyBBY2NvdW50UGF0Y2hSZXZpZXcocGF0Y2hLZXksIGFjY291bnQpKSk7Ci0gICAgICAgICAgfSBlbHNlIGlmIChhcHIgIT0gbnVsbCAmJiAhcmV2aWV3ZWQpIHsKLSAgICAgICAgICAgIGRiLmFjY291bnRQYXRjaFJldmlld3MoKS5kZWxldGUoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGFwcikpOwotICAgICAgICAgIH0KLSAgICAgICAgICBkYi5jb21taXQoKTsKLSAgICAgICAgICByZXR1cm4gVm9pZFJlc3VsdC5JTlNUQU5DRTsKLSAgICAgICAgfSBmaW5hbGx5IHsKLSAgICAgICAgICBkYi5yb2xsYmFjaygpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfSk7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBhZGRSZXZpZXdlcnMoZmluYWwgQ2hhbmdlLklkIGlkLCBmaW5hbCBMaXN0PFN0cmluZz4gcmV2aWV3ZXJzLAotICAgICAgZmluYWwgYm9vbGVhbiBjb25maXJtZWQsIGZpbmFsIEFzeW5jQ2FsbGJhY2s8UmV2aWV3ZXJSZXN1bHQ+IGNhbGxiYWNrKSB7Ci0gICAgYWRkUmV2aWV3ZXJIYW5kbGVyRmFjdG9yeS5jcmVhdGUoaWQsIHJldmlld2VycywgY29uZmlybWVkKS50byhjYWxsYmFjayk7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCByZW1vdmVSZXZpZXdlcihmaW5hbCBDaGFuZ2UuSWQgaWQsIGZpbmFsIEFjY291bnQuSWQgcmV2aWV3ZXJJZCwKLSAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8UmV2aWV3ZXJSZXN1bHQ+IGNhbGxiYWNrKSB7Ci0gICAgcmVtb3ZlUmV2aWV3ZXJIYW5kbGVyRmFjdG9yeS5jcmVhdGUoaWQsIHJldmlld2VySWQpLnRvKGNhbGxiYWNrKTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHVzZXJBcHByb3ZhbHMoZmluYWwgU2V0PENoYW5nZS5JZD4gY2lkcywgZmluYWwgQWNjb3VudC5JZCBhaWQsCi0gICAgICBmaW5hbCBBc3luY0NhbGxiYWNrPEFwcHJvdmFsU3VtbWFyeVNldD4gY2FsbGJhY2spIHsKLSAgICBydW4oY2FsbGJhY2ssIG5ldyBBY3Rpb248QXBwcm92YWxTdW1tYXJ5U2V0PigpIHsKLSAgICAgIHB1YmxpYyBBcHByb3ZhbFN1bW1hcnlTZXQgcnVuKFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICAgICAgZmluYWwgTWFwPENoYW5nZS5JZCwgQXBwcm92YWxTdW1tYXJ5PiBhcHByb3ZhbHMgPQotICAgICAgICAgICAgbmV3IEhhc2hNYXA8Q2hhbmdlLklkLCBBcHByb3ZhbFN1bW1hcnk+KCk7Ci0gICAgICAgIGZpbmFsIEFjY291bnRJbmZvQ2FjaGVGYWN0b3J5IGFpY0ZhY3RvcnkgPQotICAgICAgICAgICAgYWNjb3VudEluZm9DYWNoZUZhY3RvcnkuY3JlYXRlKCk7Ci0KLSAgICAgICAgYWljRmFjdG9yeS53YW50KGFpZCk7Ci0gICAgICAgIGZvciAoZmluYWwgQ2hhbmdlLklkIGlkIDogY2lkcykgewotICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNjID0gY2hhbmdlQ29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoaWQpOwotICAgICAgICAgICAgZmluYWwgQ2hhbmdlIGNoYW5nZSA9IGNjLmdldENoYW5nZSgpOwotICAgICAgICAgICAgZmluYWwgUGF0Y2hTZXQuSWQgcHNfaWQgPSBjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKTsKLSAgICAgICAgICAgIGZpbmFsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBQYXRjaFNldEFwcHJvdmFsPiBwc2FzID0KLSAgICAgICAgICAgICAgICBuZXcgSGFzaE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBQYXRjaFNldEFwcHJvdmFsPigpOwotICAgICAgICAgICAgZmluYWwgRnVuY3Rpb25TdGF0ZSBmcyA9Ci0gICAgICAgICAgICAgICAgZnVuY3Rpb25TdGF0ZUZhY3RvcnkuY3JlYXRlKGNjLCBwc19pZCwgcHNhcy52YWx1ZXMoKSk7Ci0KLSAgICAgICAgICAgIGZvciAoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBjYSA6IGRiLnBhdGNoU2V0QXBwcm92YWxzKCkKLSAgICAgICAgICAgICAgICAuYnlQYXRjaFNldFVzZXIocHNfaWQsIGFpZCkpIHsKLSAgICAgICAgICAgICAgZmluYWwgQXBwcm92YWxDYXRlZ29yeS5JZCBjYXRlZ29yeSA9IGNhLmdldENhdGVnb3J5SWQoKTsKLSAgICAgICAgICAgICAgaWYgKEFwcHJvdmFsQ2F0ZWdvcnkuU1VCTUlULmVxdWFscyhjYXRlZ29yeSkpIHsKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7Ci0gICAgICAgICAgICAgICAgZnMubm9ybWFsaXplKGFwcHJvdmFsVHlwZXMuYnlJZChjYXRlZ29yeSksIGNhKTsKLSAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICBpZiAoY2EuZ2V0VmFsdWUoKSA9PSAwKSB7Ci0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgcHNhcy5wdXQoY2F0ZWdvcnksIGNhKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgYXBwcm92YWxzLnB1dChpZCwgbmV3IEFwcHJvdmFsU3VtbWFyeShwc2FzLnZhbHVlcygpKSk7Ci0gICAgICAgICAgfSBjYXRjaCAoTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIG5zY2UpIHsKLSAgICAgICAgICAgIC8qCi0gICAgICAgICAgICAgKiBUaGUgdXNlciBoYXMgbm8gYWNjZXNzIHRvIHNlZSB0aGlzIGNoYW5nZSwgc28gd2Ugc2ltcGx5IGRvIG5vdAotICAgICAgICAgICAgICogcHJvdmlkZSBhbnkgZGV0YWlscyBhYm91dCBpdC4KLSAgICAgICAgICAgICAqLwotICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgICByZXR1cm4gbmV3IEFwcHJvdmFsU3VtbWFyeVNldChhaWNGYWN0b3J5LmNyZWF0ZSgpLCBhcHByb3ZhbHMpOwotICAgICAgfQotICAgIH0pOwotICB9Ci0KLSAgcHVibGljIHZvaWQgc3Ryb25nZXN0QXBwcm92YWxzKGZpbmFsIFNldDxDaGFuZ2UuSWQ+IGNpZHMsCi0gICAgICBmaW5hbCBBc3luY0NhbGxiYWNrPEFwcHJvdmFsU3VtbWFyeVNldD4gY2FsbGJhY2spIHsKLSAgICBydW4oY2FsbGJhY2ssIG5ldyBBY3Rpb248QXBwcm92YWxTdW1tYXJ5U2V0PigpIHsKLSAgICAgIHB1YmxpYyBBcHByb3ZhbFN1bW1hcnlTZXQgcnVuKFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICAgICAgZmluYWwgTWFwPENoYW5nZS5JZCwgQXBwcm92YWxTdW1tYXJ5PiBhcHByb3ZhbHMgPQotICAgICAgICAgICAgbmV3IEhhc2hNYXA8Q2hhbmdlLklkLCBBcHByb3ZhbFN1bW1hcnk+KCk7Ci0gICAgICAgIGZpbmFsIEFjY291bnRJbmZvQ2FjaGVGYWN0b3J5IGFpY0ZhY3RvcnkgPQotICAgICAgICAgICAgYWNjb3VudEluZm9DYWNoZUZhY3RvcnkuY3JlYXRlKCk7Ci0KLSAgICAgICAgZm9yIChmaW5hbCBDaGFuZ2UuSWQgaWQgOiBjaWRzKSB7Ci0gICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wgY2MgPSBjaGFuZ2VDb250cm9sRmFjdG9yeS52YWxpZGF0ZUZvcihpZCk7Ci0gICAgICAgICAgICBmaW5hbCBDaGFuZ2UgY2hhbmdlID0gY2MuZ2V0Q2hhbmdlKCk7Ci0gICAgICAgICAgICBmaW5hbCBQYXRjaFNldC5JZCBwc19pZCA9IGNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpOwotICAgICAgICAgICAgZmluYWwgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIFBhdGNoU2V0QXBwcm92YWw+IHBzYXMgPQotICAgICAgICAgICAgICAgIG5ldyBIYXNoTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIFBhdGNoU2V0QXBwcm92YWw+KCk7Ci0gICAgICAgICAgICBmaW5hbCBGdW5jdGlvblN0YXRlIGZzID0KLSAgICAgICAgICAgICAgICBmdW5jdGlvblN0YXRlRmFjdG9yeS5jcmVhdGUoY2MsIHBzX2lkLCBwc2FzLnZhbHVlcygpKTsKLQotICAgICAgICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGNhIDogZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieVBhdGNoU2V0KHBzX2lkKSkgewotICAgICAgICAgICAgICBmaW5hbCBBcHByb3ZhbENhdGVnb3J5LklkIGNhdGVnb3J5ID0gY2EuZ2V0Q2F0ZWdvcnlJZCgpOwotICAgICAgICAgICAgICBpZiAoQXBwcm92YWxDYXRlZ29yeS5TVUJNSVQuZXF1YWxzKGNhdGVnb3J5KSkgewotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkuaXNPcGVuKCkpIHsKLSAgICAgICAgICAgICAgICBmcy5ub3JtYWxpemUoYXBwcm92YWxUeXBlcy5ieUlkKGNhdGVnb3J5KSwgY2EpOwotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIGlmIChjYS5nZXRWYWx1ZSgpID09IDApIHsKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICBib29sZWFuIGtlZXAgPSB0cnVlOwotICAgICAgICAgICAgICBpZiAocHNhcy5jb250YWluc0tleShjYXRlZ29yeSkpIHsKLSAgICAgICAgICAgICAgICBmaW5hbCBzaG9ydCBvbGRWYWx1ZSA9IHBzYXMuZ2V0KGNhdGVnb3J5KS5nZXRWYWx1ZSgpOwotICAgICAgICAgICAgICAgIGZpbmFsIHNob3J0IG5ld1ZhbHVlID0gY2EuZ2V0VmFsdWUoKTsKLSAgICAgICAgICAgICAgICBrZWVwID0KLSAgICAgICAgICAgICAgICAgICAgKE1hdGguYWJzKG9sZFZhbHVlKSA8IE1hdGguYWJzKG5ld1ZhbHVlKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHx8ICgoTWF0aC5hYnMob2xkVmFsdWUpID09IE1hdGguYWJzKG5ld1ZhbHVlKSAmJiAobmV3VmFsdWUgPCBvbGRWYWx1ZSkpKTsKLSAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICBpZiAoa2VlcCkgewotICAgICAgICAgICAgICAgIGFpY0ZhY3Rvcnkud2FudChjYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgICAgICAgICAgcHNhcy5wdXQoY2F0ZWdvcnksIGNhKTsKLSAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBhcHByb3ZhbHMucHV0KGlkLCBuZXcgQXBwcm92YWxTdW1tYXJ5KHBzYXMudmFsdWVzKCkpKTsKLSAgICAgICAgICB9IGNhdGNoIChOb1N1Y2hDaGFuZ2VFeGNlcHRpb24gbnNjZSkgewotICAgICAgICAgICAgLyoKLSAgICAgICAgICAgICAqIFRoZSB1c2VyIGhhcyBubyBhY2Nlc3MgdG8gc2VlIHRoaXMgY2hhbmdlLCBzbyB3ZSBzaW1wbHkgZG8gbm90Ci0gICAgICAgICAgICAgKiBwcm92aWRlIGFueSBkZXRhaWxzIGFib3V0IGl0LgotICAgICAgICAgICAgICovCi0gICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgcmV0dXJuIG5ldyBBcHByb3ZhbFN1bW1hcnlTZXQoYWljRmFjdG9yeS5jcmVhdGUoKSwgYXBwcm92YWxzKTsKLSAgICAgIH0KLSAgICB9KTsKLSAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1BhdGNoTW9kdWxlLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvUGF0Y2hNb2R1bGUuamF2YQppbmRleCAzZTk0YjRjLi5kMWY1YjI0IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvUGF0Y2hNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvUGF0Y2hNb2R1bGUuamF2YQpAQCAtMjgsOCArMjgsNiBAQAogICAgIGluc3RhbGwobmV3IEZhY3RvcnlNb2R1bGUoKSB7CiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKLSAgICAgICAgZmFjdG9yeShBZGRSZXZpZXdlckhhbmRsZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgICAgIGZhY3RvcnkoUmVtb3ZlUmV2aWV3ZXJIYW5kbGVyLkZhY3RvcnkuY2xhc3MpOwogICAgICAgICBmYWN0b3J5KFBhdGNoU2NyaXB0RmFjdG9yeS5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShTYXZlRHJhZnQuRmFjdG9yeS5jbGFzcyk7CiAgICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvUGF0Y2hTY3JpcHRCdWlsZGVyLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvUGF0Y2hTY3JpcHRCdWlsZGVyLmphdmEKaW5kZXggODE2YmJlZi4uNTAxOTQwMyAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1BhdGNoU2NyaXB0QnVpbGRlci5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wYXRjaC9QYXRjaFNjcmlwdEJ1aWxkZXIuamF2YQpAQCAtMTMzLDYgKzEzMyw3IEBACiAgICAgICB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGJvb2xlYW4gaW50cmFsaW5lRGlmZmVyZW5jZUlzUG9zc2libGUgPSB0cnVlOwogICAgIGJvb2xlYW4gaW50cmFsaW5lRmFpbHVyZSA9IGZhbHNlOworICAgIGJvb2xlYW4gaW50cmFsaW5lVGltZW91dCA9IGZhbHNlOwogCiAgICAgYS5wYXRoID0gb2xkTmFtZShjb250ZW50KTsKICAgICBiLnBhdGggPSBuZXdOYW1lKGNvbnRlbnQpOwpAQCAtMTYwLDEwICsxNjEsMTQgQEAKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgY2FzZSBFUlJPUjoKLSAgICAgICAgICBjYXNlIFRJTUVPVVQ6CiAgICAgICAgICAgICBpbnRyYWxpbmVEaWZmZXJlbmNlSXNQb3NzaWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgaW50cmFsaW5lRmFpbHVyZSA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgIGNhc2UgVElNRU9VVDoKKyAgICAgICAgICAgIGludHJhbGluZURpZmZlcmVuY2VJc1Bvc3NpYmxlID0gZmFsc2U7CisgICAgICAgICAgICBpbnRyYWxpbmVUaW1lb3V0ID0gdHJ1ZTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICB9IGVsc2UgewogICAgICAgICBpbnRyYWxpbmVEaWZmZXJlbmNlSXNQb3NzaWJsZSA9IGZhbHNlOwpAQCAtMTk4LDEwICsyMDMsMTAgQEAKICAgICAgICAgY29udGV4dCA9IGRpZmZQcmVmcy5nZXRDb250ZXh0KCk7CiAgICAgICAgIGh1Z2VGaWxlID0gdHJ1ZTsKIAotICAgICAgfSBlbHNlIGlmIChkaWZmUHJlZnMuaXNTeW50YXhIaWdobGlnaHRpbmcoKSkgewotICAgICAgICAvLyBJbiBvcmRlciB0byBzeW50YXggaGlnaGxpZ2h0IHRoZSBmaWxlIHByb3Blcmx5IHdlIG5lZWQgdG8KLSAgICAgICAgLy8gZ2l2ZSB0aGUgY2xpZW50IHRoZSBjb21wbGV0ZSBmaWxlIGNvbnRlbnRzLiBTbyBmb3JjZSBvdXIKLSAgICAgICAgLy8gY29udGV4dCB0ZW1wb3JhcmlseSB0byB0aGUgY29tcGxldGUgZmlsZSBzaXplLgorICAgICAgfSBlbHNlIHsKKyAgICAgICAgLy8gSW4gb3JkZXIgdG8gZXhwYW5kIHRoZSBza2lwcGVkIGNvbW1vbiBsaW5lcyBvciBzeW50YXggaGlnaGxpZ2h0IHRoZQorICAgICAgICAvLyBmaWxlIHByb3Blcmx5IHdlIG5lZWQgdG8gZ2l2ZSB0aGUgY2xpZW50IHRoZSBjb21wbGV0ZSBmaWxlIGNvbnRlbnRzLgorICAgICAgICAvLyBTbyBmb3JjZSBvdXIgY29udGV4dCB0ZW1wb3JhcmlseSB0byB0aGUgY29tcGxldGUgZmlsZSBzaXplLgogICAgICAgICAvLwogICAgICAgICBjb250ZXh0ID0gTUFYX0NPTlRFWFQ7CiAgICAgICB9CkBAIC0yMTIsNyArMjE3LDcgQEAKICAgICAgICAgY29udGVudC5nZXRPbGROYW1lKCksIGNvbnRlbnQuZ2V0TmV3TmFtZSgpLCBhLmZpbGVNb2RlLCBiLmZpbGVNb2RlLAogICAgICAgICBjb250ZW50LmdldEhlYWRlckxpbmVzKCksIGRpZmZQcmVmcywgYS5kc3QsIGIuZHN0LCBlZGl0cywKICAgICAgICAgYS5kaXNwbGF5TWV0aG9kLCBiLmRpc3BsYXlNZXRob2QsIGNvbW1lbnRzLCBoaXN0b3J5LCBodWdlRmlsZSwKLSAgICAgICAgaW50cmFsaW5lRGlmZmVyZW5jZUlzUG9zc2libGUsIGludHJhbGluZUZhaWx1cmUpOworICAgICAgICBpbnRyYWxpbmVEaWZmZXJlbmNlSXNQb3NzaWJsZSwgaW50cmFsaW5lRmFpbHVyZSwgaW50cmFsaW5lVGltZW91dCk7CiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBib29sZWFuIGlzTW9kaWZ5KFBhdGNoTGlzdEVudHJ5IGNvbnRlbnQpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wYXRjaC9QYXRjaFNjcmlwdEZhY3RvcnkuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wYXRjaC9QYXRjaFNjcmlwdEZhY3RvcnkuamF2YQppbmRleCA5N2Q4NTBhLi5lMGVjNDY1IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvUGF0Y2hTY3JpcHRGYWN0b3J5LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1BhdGNoU2NyaXB0RmFjdG9yeS5qYXZhCkBAIC0yNDEsNiArMjQxLDEyIEBACiAgICAgICAgICAgICAgIG5hbWUgPSBvbGROYW1lOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICBjYXNlIE1PRElGSUVEOgorICAgICAgICAgIGNhc2UgREVMRVRFRDoKKyAgICAgICAgICBjYXNlIEFEREVEOgorICAgICAgICAgIGNhc2UgUkVXUklURToKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICB9CiAKQEAgLTI2Niw2ICsyNzIsOSBAQAogICAgICAgICB9CiAgICAgICAgIGxvYWRQdWJsaXNoZWQoYnlLZXksIGFpYywgbmV3TmFtZSk7CiAgICAgICAgIGJyZWFrOworCisgICAgICBjYXNlIFJFV1JJVEU6CisgICAgICAgIGJyZWFrOwogICAgIH0KIAogICAgIGZpbmFsIEN1cnJlbnRVc2VyIHVzZXIgPSBjb250cm9sLmdldEN1cnJlbnRVc2VyKCk7CkBAIC0yODgsNiArMjk3LDkgQEAKICAgICAgICAgICB9CiAgICAgICAgICAgbG9hZERyYWZ0cyhieUtleSwgYWljLCBtZSwgbmV3TmFtZSk7CiAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgY2FzZSBSRVdSSVRFOgorICAgICAgICAgIGJyZWFrOwogICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1JlbW92ZVJldmlld2VySGFuZGxlci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1JlbW92ZVJldmlld2VySGFuZGxlci5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAyYjMxYzFjLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wYXRjaC9SZW1vdmVSZXZpZXdlckhhbmRsZXIuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDU5ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucGF0Y2g7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdlclJlc3VsdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuY2hhbmdlZGV0YWlsLkNoYW5nZURldGFpbEZhY3Rvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUmVtb3ZlUmV2aWV3ZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwotCi1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotCi0vKioKLSAqIEltcGxlbWVudCB0aGUgcmVtb3RlIGxvZ2ljIHRoYXQgcmVtb3ZlcyBhIHJldmlld2VyIGZyb20gYSBjaGFuZ2UuCi0gKi8KLWNsYXNzIFJlbW92ZVJldmlld2VySGFuZGxlciBleHRlbmRzIEhhbmRsZXI8UmV2aWV3ZXJSZXN1bHQ+IHsKLSAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIFJlbW92ZVJldmlld2VySGFuZGxlciBjcmVhdGUoQ2hhbmdlLklkIGNoYW5nZUlkLCBBY2NvdW50LklkIHJldmlld2VySWQpOwotICB9Ci0KLSAgcHJpdmF0ZSBmaW5hbCBSZW1vdmVSZXZpZXdlci5GYWN0b3J5IHJlbW92ZVJldmlld2VyRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50LklkIHJldmlld2VySWQ7Ci0gIHByaXZhdGUgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkOwotICBwcml2YXRlIGZpbmFsIENoYW5nZURldGFpbEZhY3RvcnkuRmFjdG9yeSBjaGFuZ2VEZXRhaWxGYWN0b3J5OwotCi0gIEBJbmplY3QKLSAgUmVtb3ZlUmV2aWV3ZXJIYW5kbGVyKGZpbmFsIFJlbW92ZVJldmlld2VyLkZhY3RvcnkgcmVtb3ZlUmV2aWV3ZXJGYWN0b3J5LAotICAgICAgZmluYWwgQ2hhbmdlRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGNoYW5nZURldGFpbEZhY3RvcnksCi0gICAgICBAQXNzaXN0ZWQgQ2hhbmdlLklkIGNoYW5nZUlkLCBAQXNzaXN0ZWQgQWNjb3VudC5JZCByZXZpZXdlcklkKSB7Ci0gICAgdGhpcy5yZW1vdmVSZXZpZXdlckZhY3RvcnkgPSByZW1vdmVSZXZpZXdlckZhY3Rvcnk7Ci0gICAgdGhpcy5jaGFuZ2VJZCA9IGNoYW5nZUlkOwotICAgIHRoaXMucmV2aWV3ZXJJZCA9IHJldmlld2VySWQ7Ci0gICAgdGhpcy5jaGFuZ2VEZXRhaWxGYWN0b3J5ID0gY2hhbmdlRGV0YWlsRmFjdG9yeTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgUmV2aWV3ZXJSZXN1bHQgY2FsbCgpIHRocm93cyBFeGNlcHRpb24gewotICAgIFJldmlld2VyUmVzdWx0IHJlc3VsdCA9IHJlbW92ZVJldmlld2VyRmFjdG9yeS5jcmVhdGUoCi0gICAgICAgIGNoYW5nZUlkLCBDb2xsZWN0aW9ucy5zaW5nbGV0b24ocmV2aWV3ZXJJZCkpLmNhbGwoKTsKLSAgICByZXN1bHQuc2V0Q2hhbmdlKGNoYW5nZURldGFpbEZhY3RvcnkuY3JlYXRlKGNoYW5nZUlkKS5jYWxsKCkpOwotICAgIHJldHVybiByZXN1bHQ7Ci0gIH0KLQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1NhdmVEcmFmdC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1NhdmVEcmFmdC5qYXZhCmluZGV4IDA2YzIxZGYuLjE4YWI1ZmY1IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGF0Y2gvU2F2ZURyYWZ0LmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BhdGNoL1NhdmVEcmFmdC5qYXZhCkBAIC03MSw4ICs3MSw4IEBACiAKICAgICAgIGZpbmFsIEFjY291bnQuSWQgbWUgPSBjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKTsKICAgICAgIGlmIChjb21tZW50LmdldEtleSgpLmdldCgpID09IG51bGwpIHsKLSAgICAgICAgaWYgKGNvbW1lbnQuZ2V0TGluZSgpIDwgMSkgewotICAgICAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oIkNvbW1lbnQgbGluZSBtdXN0IGJlID49IDEsIG5vdCAiCisgICAgICAgIGlmIChjb21tZW50LmdldExpbmUoKSA8IDApIHsKKyAgICAgICAgICB0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKCJDb21tZW50IGxpbmUgbXVzdCBiZSA+PSAwLCBub3QgIgogICAgICAgICAgICAgICArIGNvbW1lbnQuZ2V0TGluZSgpKTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGx1Z2luL0xpc3RQbHVnaW5zU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3BsdWdpbi9MaXN0UGx1Z2luc1NlcnZsZXQuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNWU4MTQ1Yy4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcGx1Z2luL0xpc3RQbHVnaW5zU2VydmxldC5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNjggKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5wbHVnaW47Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUmVxdWlyZXNDYXBhYmlsaXR5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLlJlc3RBcGlTZXJ2bGV0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuT3V0cHV0Rm9ybWF0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLkxpc3RQbHVnaW5zOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247Ci0KLWltcG9ydCBqYXZhLmlvLkJ5dGVBcnJheU91dHB1dFN0cmVhbTsKLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotCi1pbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVxdWVzdDsKLWltcG9ydCBqYXZheC5zZXJ2bGV0Lmh0dHAuSHR0cFNlcnZsZXRSZXNwb25zZTsKLQotQFNpbmdsZXRvbgotQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LkFETUlOSVNUUkFURV9TRVJWRVIpCi1wdWJsaWMgY2xhc3MgTGlzdFBsdWdpbnNTZXJ2bGV0IGV4dGVuZHMgUmVzdEFwaVNlcnZsZXQgewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKLSAgcHJpdmF0ZSBmaW5hbCBQYXJhbWV0ZXJQYXJzZXIgcGFyYW1QYXJzZXI7Ci0gIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8TGlzdFBsdWdpbnM+IGZhY3Rvcnk7Ci0KLSAgQEluamVjdAotICBMaXN0UGx1Z2luc1NlcnZsZXQoZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IGN1cnJlbnRVc2VyLAotICAgICAgUGFyYW1ldGVyUGFyc2VyIHBhcmFtUGFyc2VyLCBQcm92aWRlcjxMaXN0UGx1Z2lucz4gbHMpIHsKLSAgICBzdXBlcihjdXJyZW50VXNlcik7Ci0gICAgdGhpcy5wYXJhbVBhcnNlciA9IHBhcmFtUGFyc2VyOwotICAgIHRoaXMuZmFjdG9yeSA9IGxzOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCB2b2lkIGRvR2V0KEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKQotICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICBMaXN0UGx1Z2lucyBpbXBsID0gZmFjdG9yeS5nZXQoKTsKLSAgICBpZiAoYWNjZXB0c0pzb24ocmVxKSkgewotICAgICAgaW1wbC5zZXRGb3JtYXQoT3V0cHV0Rm9ybWF0LkpTT05fQ09NUEFDVCk7Ci0gICAgfQotICAgIGlmIChwYXJhbVBhcnNlci5wYXJzZShpbXBsLCByZXEsIHJlcykpIHsKLSAgICAgIEJ5dGVBcnJheU91dHB1dFN0cmVhbSBidWYgPSBuZXcgQnl0ZUFycmF5T3V0cHV0U3RyZWFtKCk7Ci0gICAgICBpZiAoaW1wbC5nZXRGb3JtYXQoKS5pc0pzb24oKSkgewotICAgICAgICByZXMuc2V0Q29udGVudFR5cGUoSlNPTl9UWVBFKTsKLSAgICAgICAgYnVmLndyaXRlKEpTT05fTUFHSUMpOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgcmVzLnNldENvbnRlbnRUeXBlKCJ0ZXh0L3BsYWluIik7Ci0gICAgICB9Ci0gICAgICBpbXBsLmRpc3BsYXkoYnVmKTsKLSAgICAgIHJlcy5zZXRDaGFyYWN0ZXJFbmNvZGluZygiVVRGLTgiKTsKLSAgICAgIHNlbmQocmVxLCByZXMsIGJ1Zi50b0J5dGVBcnJheSgpKTsKLSAgICB9Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L0FkZEJyYW5jaC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvQWRkQnJhbmNoLmphdmEKaW5kZXggOTdlOWJiNC4uZDI2NTAxZSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvQWRkQnJhbmNoLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvQWRkQnJhbmNoLmphdmEKQEAgLTE1LDggKzE1LDcgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLnByb2plY3Q7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGlzdEJyYW5jaGVzUmVzdWx0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuSW52YWxpZE5hbWVFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWRkQnJhbmNoUmVzdWx0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuSW52YWxpZFJldmlzaW9uRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5IYW5kbGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CkBAIC00Niw3ICs0NSw3IEBACiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogCi1jbGFzcyBBZGRCcmFuY2ggZXh0ZW5kcyBIYW5kbGVyPExpc3RCcmFuY2hlc1Jlc3VsdD4geworY2xhc3MgQWRkQnJhbmNoIGV4dGVuZHMgSGFuZGxlcjxBZGRCcmFuY2hSZXN1bHQ+IHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKEFkZEJyYW5jaC5jbGFzcyk7CiAKICAgaW50ZXJmYWNlIEZhY3RvcnkgewpAQCAtOTAsOSArODksNyBAQAogICB9CiAKICAgQE92ZXJyaWRlCi0gIHB1YmxpYyBMaXN0QnJhbmNoZXNSZXN1bHQgY2FsbCgpIHRocm93cyBOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uLAotICAgICAgSW52YWxpZE5hbWVFeGNlcHRpb24sIEludmFsaWRSZXZpc2lvbkV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sCi0gICAgICBCcmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRFeGNlcHRpb24geworICBwdWJsaWMgQWRkQnJhbmNoUmVzdWx0IGNhbGwoKSB0aHJvd3MgTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewogICAgIGZpbmFsIFByb2plY3RDb250cm9sIHByb2plY3RDb250cm9sID0KICAgICAgICAgcHJvamVjdENvbnRyb2xGYWN0b3J5LmNvbnRyb2xGb3IocHJvamVjdE5hbWUpOwogCkBAIC0xMDQsMTAgKzEwMSwxNCBAQAogICAgICAgcmVmbmFtZSA9IENvbnN0YW50cy5SX0hFQURTICsgcmVmbmFtZTsKICAgICB9CiAgICAgaWYgKCFSZXBvc2l0b3J5LmlzVmFsaWRSZWZOYW1lKHJlZm5hbWUpKSB7Ci0gICAgICB0aHJvdyBuZXcgSW52YWxpZE5hbWVFeGNlcHRpb24oKTsKKyAgICAgIHJldHVybiBuZXcgQWRkQnJhbmNoUmVzdWx0KG5ldyBBZGRCcmFuY2hSZXN1bHQuRXJyb3IoCisgICAgICAgICAgQWRkQnJhbmNoUmVzdWx0LkVycm9yLlR5cGUuSU5WQUxJRF9OQU1FLCByZWZuYW1lKSk7CiAgICAgfQogICAgIGlmIChNYWdpY0JyYW5jaC5pc01hZ2ljQnJhbmNoKHJlZm5hbWUpKSB7Ci0gICAgICB0aHJvdyBuZXcgQnJhbmNoQ3JlYXRpb25Ob3RBbGxvd2VkRXhjZXB0aW9uKHJlZm5hbWUpOworICAgICAgcmV0dXJuIG5ldyBBZGRCcmFuY2hSZXN1bHQoCisgICAgICAgICAgbmV3IEFkZEJyYW5jaFJlc3VsdC5FcnJvcigKKyAgICAgICAgICAgICAgQWRkQnJhbmNoUmVzdWx0LkVycm9yLlR5cGUuQlJBTkNIX0NSRUFUSU9OX05PVF9BTExPV0VEX1VOREVSX1JFRk5BTUVfUFJFRklYLAorICAgICAgICAgICAgICBNYWdpY0JyYW5jaC5nZXRNYWdpY1JlZk5hbWVQcmVmaXgocmVmbmFtZSkpKTsKICAgICB9CiAKICAgICBmaW5hbCBCcmFuY2guTmFtZUtleSBuYW1lID0gbmV3IEJyYW5jaC5OYW1lS2V5KHByb2plY3ROYW1lLCByZWZuYW1lKTsKQEAgLTE0NCw5ICsxNDUsMjIgQEAKICAgICAgICAgICBjYXNlIEZBU1RfRk9SV0FSRDoKICAgICAgICAgICBjYXNlIE5FVzoKICAgICAgICAgICBjYXNlIE5PX0NIQU5HRToKLSAgICAgICAgICAgIHJlZmVyZW5jZVVwZGF0ZWQuZmlyZShuYW1lLmdldFBhcmVudEtleSgpLCByZWZuYW1lKTsKKyAgICAgICAgICAgIHJlZmVyZW5jZVVwZGF0ZWQuZmlyZShuYW1lLmdldFBhcmVudEtleSgpLCB1KTsKICAgICAgICAgICAgIGhvb2tzLmRvUmVmVXBkYXRlZEhvb2sobmFtZSwgdSwgaWRlbnRpZmllZFVzZXIuZ2V0QWNjb3VudCgpKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgIGNhc2UgTE9DS19GQUlMVVJFOgorICAgICAgICAgICAgaWYgKHJlcG8uZ2V0UmVmKHJlZm5hbWUpICE9IG51bGwpIHsKKyAgICAgICAgICAgICAgcmV0dXJuIG5ldyBBZGRCcmFuY2hSZXN1bHQobmV3IEFkZEJyYW5jaFJlc3VsdC5FcnJvcigKKyAgICAgICAgICAgICAgICAgIEFkZEJyYW5jaFJlc3VsdC5FcnJvci5UeXBlLkJSQU5DSF9BTFJFQURZX0VYSVNUUywgcmVmbmFtZSkpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgU3RyaW5nIHJlZlByZWZpeCA9IGdldFJlZlByZWZpeChyZWZuYW1lKTsKKyAgICAgICAgICAgIHdoaWxlICghQ29uc3RhbnRzLlJfSEVBRFMuZXF1YWxzKHJlZlByZWZpeCkpIHsKKyAgICAgICAgICAgICAgaWYgKHJlcG8uZ2V0UmVmKHJlZlByZWZpeCkgIT0gbnVsbCkgeworICAgICAgICAgICAgICAgIHJldHVybiBuZXcgQWRkQnJhbmNoUmVzdWx0KG5ldyBBZGRCcmFuY2hSZXN1bHQuRXJyb3IoCisgICAgICAgICAgICAgICAgICAgIEFkZEJyYW5jaFJlc3VsdC5FcnJvci5UeXBlLkJSQU5DSF9DUkVBVElPTl9DT05GTElDVCwgcmVmUHJlZml4KSk7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgcmVmUHJlZml4ID0gZ2V0UmVmUHJlZml4KHJlZlByZWZpeCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgZGVmYXVsdDogewogICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKHJlc3VsdC5uYW1lKCkpOwogICAgICAgICAgIH0KQEAgLTE1NSwxMSArMTY5LDIyIEBACiAgICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IGNyZWF0ZSBicmFuY2ggIiArIG5hbWUsIGVycik7CiAgICAgICAgIHRocm93IGVycjsKICAgICAgIH0KKyAgICB9IGNhdGNoIChJbnZhbGlkUmV2aXNpb25FeGNlcHRpb24gZSkgeworICAgICAgcmV0dXJuIG5ldyBBZGRCcmFuY2hSZXN1bHQobmV3IEFkZEJyYW5jaFJlc3VsdC5FcnJvcigKKyAgICAgICAgICBBZGRCcmFuY2hSZXN1bHQuRXJyb3IuVHlwZS5JTlZBTElEX1JFVklTSU9OKSk7CiAgICAgfSBmaW5hbGx5IHsKICAgICAgIHJlcG8uY2xvc2UoKTsKICAgICB9CiAKLSAgICByZXR1cm4gbGlzdEJyYW5jaGVzRmFjdG9yeS5jcmVhdGUocHJvamVjdE5hbWUpLmNhbGwoKTsKKyAgICByZXR1cm4gbmV3IEFkZEJyYW5jaFJlc3VsdChsaXN0QnJhbmNoZXNGYWN0b3J5LmNyZWF0ZShwcm9qZWN0TmFtZSkuY2FsbCgpKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBnZXRSZWZQcmVmaXgoZmluYWwgU3RyaW5nIHJlZk5hbWUpIHsKKyAgICBmaW5hbCBpbnQgaSA9IHJlZk5hbWUubGFzdEluZGV4T2YoJy8nKTsKKyAgICBpZiAoaSA+IENvbnN0YW50cy5SX0hFQURTLmxlbmd0aCgpIC0gMSkgeworICAgICAgcmV0dXJuIHJlZk5hbWUuc3Vic3RyaW5nKDAsIGkpOworICAgIH0KKyAgICByZXR1cm4gQ29uc3RhbnRzLlJfSEVBRFM7CiAgIH0KIAogICBwcml2YXRlIE9iamVjdElkIHBhcnNlU3RhcnRpbmdSZXZpc2lvbihmaW5hbCBSZXBvc2l0b3J5IHJlcG8pCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9CcmFuY2hDcmVhdGlvbk5vdEFsbG93ZWRFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L0JyYW5jaENyZWF0aW9uTm90QWxsb3dlZEV4Y2VwdGlvbi5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5OGNkYzMyLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L0JyYW5jaENyZWF0aW9uTm90QWxsb3dlZEV4Y2VwdGlvbi5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMjYgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5wcm9qZWN0OwotCi1wdWJsaWMgY2xhc3MgQnJhbmNoQ3JlYXRpb25Ob3RBbGxvd2VkRXhjZXB0aW9uIGV4dGVuZHMgRXhjZXB0aW9uIHsKLQotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKLQotICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBNRVNTQUdFID0gIkJyYW5jaCBjcmVhdGlvbiBpcyBub3QgYWxsb3dlZCB1bmRlcjogIjsKLQotICBwdWJsaWMgQnJhbmNoQ3JlYXRpb25Ob3RBbGxvd2VkRXhjZXB0aW9uKGZpbmFsIFN0cmluZyByZWZuYW1lUHJlZml4KSB7Ci0gICAgc3VwZXIoTUVTU0FHRSArIHJlZm5hbWVQcmVmaXgpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9DcmVhdGVQcm9qZWN0SGFuZGxlci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvQ3JlYXRlUHJvamVjdEhhbmRsZXIuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMTQxZjMzMi4uMDAwMDAwMAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9DcmVhdGVQcm9qZWN0SGFuZGxlci5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsODUgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDExIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLnByb2plY3Q7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLlByb2plY3RDcmVhdGlvbkZhaWxlZEV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuSGFuZGxlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNyZWF0ZVByb2plY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ3JlYXRlUHJvamVjdEFyZ3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoUHJvamVjdEV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLlZvaWRSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwotCi1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotCi1wdWJsaWMgY2xhc3MgQ3JlYXRlUHJvamVjdEhhbmRsZXIgZXh0ZW5kcyBIYW5kbGVyPFZvaWRSZXN1bHQ+IHsKLQotICBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgQ3JlYXRlUHJvamVjdEhhbmRsZXIgY3JlYXRlKEBBc3Npc3RlZCgicHJvamVjdE5hbWUiKSBTdHJpbmcgcHJvamVjdE5hbWUsCi0gICAgICAgIEBBc3Npc3RlZCgicGFyZW50TmFtZSIpIFN0cmluZyBwYXJlbnROYW1lLAotICAgICAgICBAQXNzaXN0ZWQoImVtcHR5Q29tbWl0IikgYm9vbGVhbiBlbXB0eUNvbW1pdCwKLSAgICAgICAgQEFzc2lzdGVkKCJwZXJtaXNzaW9uc09ubHkiKSBib29sZWFuIHBlcm1pc3Npb25zT25seSk7Ci0gIH0KLQotICBwcml2YXRlIGZpbmFsIENyZWF0ZVByb2plY3QuRmFjdG9yeSBjcmVhdGVQcm9qZWN0RmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Q29udHJvbC5GYWN0b3J5IHByb2plY3RDb250cm9sRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcHJvamVjdE5hbWU7Ci0gIHByaXZhdGUgZmluYWwgU3RyaW5nIHBhcmVudE5hbWU7Ci0gIHByaXZhdGUgZmluYWwgYm9vbGVhbiBlbXB0eUNvbW1pdDsKLSAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIHBlcm1pc3Npb25zT25seTsKLQotICBASW5qZWN0Ci0gIHB1YmxpYyBDcmVhdGVQcm9qZWN0SGFuZGxlcihmaW5hbCBDcmVhdGVQcm9qZWN0LkZhY3RvcnkgY3JlYXRlUHJvamVjdEZhY3RvcnksCi0gICAgICBmaW5hbCBQcm9qZWN0Q29udHJvbC5GYWN0b3J5IHByb2plY3RDb250cm9sRmFjdG9yeSwKLSAgICAgIEBBc3Npc3RlZCgicHJvamVjdE5hbWUiKSBmaW5hbCBTdHJpbmcgcHJvamVjdE5hbWUsCi0gICAgICBAQXNzaXN0ZWQoInBhcmVudE5hbWUiKSBmaW5hbCBTdHJpbmcgcGFyZW50TmFtZSwKLSAgICAgIEBBc3Npc3RlZCgiZW1wdHlDb21taXQiKSBmaW5hbCBib29sZWFuIGVtcHR5Q29tbWl0LAotICAgICAgQEFzc2lzdGVkKCJwZXJtaXNzaW9uc09ubHkiKSBmaW5hbCBib29sZWFuIHBlcm1pc3Npb25zT25seSkgewotICAgIHRoaXMuY3JlYXRlUHJvamVjdEZhY3RvcnkgPSBjcmVhdGVQcm9qZWN0RmFjdG9yeTsKLSAgICB0aGlzLnByb2plY3RDb250cm9sRmFjdG9yeSA9IHByb2plY3RDb250cm9sRmFjdG9yeTsKLSAgICB0aGlzLnByb2plY3ROYW1lID0gcHJvamVjdE5hbWU7Ci0gICAgdGhpcy5wYXJlbnROYW1lID0gcGFyZW50TmFtZTsKLSAgICB0aGlzLmVtcHR5Q29tbWl0ID0gZW1wdHlDb21taXQ7Ci0gICAgdGhpcy5wZXJtaXNzaW9uc09ubHkgPSBwZXJtaXNzaW9uc09ubHk7Ci0gIH0KLQotICBAT3ZlcnJpZGUKLSAgcHVibGljIFZvaWRSZXN1bHQgY2FsbCgpIHRocm93cyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24gewotICAgIGZpbmFsIENyZWF0ZVByb2plY3RBcmdzIGFyZ3MgPSBuZXcgQ3JlYXRlUHJvamVjdEFyZ3MoKTsKLSAgICBhcmdzLnNldFByb2plY3ROYW1lKHByb2plY3ROYW1lKTsKLSAgICBpZiAoIXBhcmVudE5hbWUuZXF1YWxzKCIiKSkgewotICAgICAgZmluYWwgUHJvamVjdC5OYW1lS2V5IG5hbWVLZXkgPSBuZXcgUHJvamVjdC5OYW1lS2V5KHBhcmVudE5hbWUpOwotICAgICAgdHJ5IHsKLSAgICAgICAgYXJncy5uZXdQYXJlbnQgPSBwcm9qZWN0Q29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IobmFtZUtleSk7Ci0gICAgICB9IGNhdGNoIChOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uIGUpIHsKLSAgICAgICAgdGhyb3cgbmV3IFByb2plY3RDcmVhdGlvbkZhaWxlZEV4Y2VwdGlvbigiUGFyZW50IHByb2plY3QgXCIiCi0gICAgICAgICAgICArIHBhcmVudE5hbWUgKyAiXCIgZG9lcyBub3QgZXhpc3QuIiwgZSk7Ci0gICAgICB9Ci0gICAgfQotICAgIGFyZ3MucHJvamVjdERlc2NyaXB0aW9uID0gIiI7Ci0gICAgYXJncy5zdWJtaXRUeXBlID0gU3VibWl0VHlwZS5NRVJHRV9JRl9ORUNFU1NBUlk7Ci0gICAgYXJncy5icmFuY2ggPSBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKLSAgICBhcmdzLmNyZWF0ZUVtcHR5Q29tbWl0ID0gZW1wdHlDb21taXQ7Ci0gICAgYXJncy5wZXJtaXNzaW9uc09ubHkgPSBwZXJtaXNzaW9uc09ubHk7Ci0KLSAgICBmaW5hbCBDcmVhdGVQcm9qZWN0IGNyZWF0ZVByb2plY3QgPSBjcmVhdGVQcm9qZWN0RmFjdG9yeS5jcmVhdGUoYXJncyk7Ci0gICAgY3JlYXRlUHJvamVjdC5jcmVhdGVQcm9qZWN0KCk7Ci0gICAgcmV0dXJuIFZvaWRSZXN1bHQuSU5TVEFOQ0U7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L0RlbGV0ZUJyYW5jaGVzLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9EZWxldGVCcmFuY2hlcy5qYXZhCmluZGV4IGYyYjNjYTMuLjhmNTQzMGQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L0RlbGV0ZUJyYW5jaGVzLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvRGVsZXRlQnJhbmNoZXMuamF2YQpAQCAtNTAsNyArNTAsNyBAQAogCiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENvbnRyb2wuRmFjdG9yeSBwcm9qZWN0Q29udHJvbEZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXI7Ci0gIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbjsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQ7CiAgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIgaWRlbnRpZmllZFVzZXI7CiAgIHByaXZhdGUgZmluYWwgQ2hhbmdlSG9va3MgaG9va3M7CiAgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CkBAIC02MSw3ICs2MSw3IEBACiAgIEBJbmplY3QKICAgRGVsZXRlQnJhbmNoZXMoZmluYWwgUHJvamVjdENvbnRyb2wuRmFjdG9yeSBwcm9qZWN0Q29udHJvbEZhY3RvcnksCiAgICAgICBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlciwKLSAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb24sCisgICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQsCiAgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciBpZGVudGlmaWVkVXNlciwKICAgICAgIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzLAogICAgICAgZmluYWwgUmV2aWV3RGIgZGIsCkBAIC02OSw3ICs2OSw3IEBACiAgICAgICBAQXNzaXN0ZWQgUHJvamVjdC5OYW1lS2V5IG5hbWUsIEBBc3Npc3RlZCBTZXQ8QnJhbmNoLk5hbWVLZXk+IHRvUmVtb3ZlKSB7CiAgICAgdGhpcy5wcm9qZWN0Q29udHJvbEZhY3RvcnkgPSBwcm9qZWN0Q29udHJvbEZhY3Rvcnk7CiAgICAgdGhpcy5yZXBvTWFuYWdlciA9IHJlcG9NYW5hZ2VyOwotICAgIHRoaXMucmVwbGljYXRpb24gPSByZXBsaWNhdGlvbjsKKyAgICB0aGlzLmdpdFJlZlVwZGF0ZWQgPSBnaXRSZWZVcGRhdGVkOwogICAgIHRoaXMuaWRlbnRpZmllZFVzZXIgPSBpZGVudGlmaWVkVXNlcjsKICAgICB0aGlzLmhvb2tzID0gaG9va3M7CiAgICAgdGhpcy5kYiA9IGRiOwpAQCAtMTIxLDcgKzEyMSw3IEBACiAgICAgICAgICAgY2FzZSBGQVNUX0ZPUldBUkQ6CiAgICAgICAgICAgY2FzZSBGT1JDRUQ6CiAgICAgICAgICAgICBkZWxldGVkLmFkZChicmFuY2hLZXkpOwotICAgICAgICAgICAgcmVwbGljYXRpb24uZmlyZShwcm9qZWN0TmFtZSwgcmVmbmFtZSk7CisgICAgICAgICAgICBnaXRSZWZVcGRhdGVkLmZpcmUocHJvamVjdE5hbWUsIHUpOwogICAgICAgICAgICAgaG9va3MuZG9SZWZVcGRhdGVkSG9vayhicmFuY2hLZXksIHUsIGlkZW50aWZpZWRVc2VyLmdldEFjY291bnQoKSk7CiAgICAgICAgICAgICBicmVhazsKIApkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvTGlzdFByb2plY3RzU2VydmxldC5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvTGlzdFByb2plY3RzU2VydmxldC5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBkMzI3ZDM1Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L0xpc3RQcm9qZWN0c1NlcnZsZXQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDcwICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucHJvamVjdDsKLQotaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5SZXN0QXBpU2VydmxldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLk91dHB1dEZvcm1hdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5MaXN0UHJvamVjdHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKLQotaW1wb3J0IGphdmEuaW8uQnl0ZUFycmF5T3V0cHV0U3RyZWFtOwotaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247Ci1pbXBvcnQgamF2YS5uZXQuVVJMRGVjb2RlcjsKLQotaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlcXVlc3Q7Ci1pbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2U7Ci0KLUBTaW5nbGV0b24KLXB1YmxpYyBjbGFzcyBMaXN0UHJvamVjdHNTZXJ2bGV0IGV4dGVuZHMgUmVzdEFwaVNlcnZsZXQgewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKLSAgcHJpdmF0ZSBmaW5hbCBQYXJhbWV0ZXJQYXJzZXIgcGFyYW1QYXJzZXI7Ci0gIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8TGlzdFByb2plY3RzPiBmYWN0b3J5OwotCi0gIEBJbmplY3QKLSAgTGlzdFByb2plY3RzU2VydmxldChmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gY3VycmVudFVzZXIsCi0gICAgICBQYXJhbWV0ZXJQYXJzZXIgcGFyYW1QYXJzZXIsIFByb3ZpZGVyPExpc3RQcm9qZWN0cz4gbHMpIHsKLSAgICBzdXBlcihjdXJyZW50VXNlcik7Ci0gICAgdGhpcy5wYXJhbVBhcnNlciA9IHBhcmFtUGFyc2VyOwotICAgIHRoaXMuZmFjdG9yeSA9IGxzOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCB2b2lkIGRvR2V0KEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKQotICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKLSAgICBMaXN0UHJvamVjdHMgaW1wbCA9IGZhY3RvcnkuZ2V0KCk7Ci0gICAgaWYgKCFTdHJpbmdzLmlzTnVsbE9yRW1wdHkocmVxLmdldFBhdGhJbmZvKCkpKSB7Ci0gICAgICBpbXBsLnNldE1hdGNoUHJlZml4KFVSTERlY29kZXIuZGVjb2RlKHJlcS5nZXRQYXRoSW5mbygpLCAiVVRGLTgiKSk7Ci0gICAgfQotICAgIGlmIChhY2NlcHRzSnNvbihyZXEpKSB7Ci0gICAgICBpbXBsLnNldEZvcm1hdChPdXRwdXRGb3JtYXQuSlNPTl9DT01QQUNUKTsKLSAgICB9Ci0gICAgaWYgKHBhcmFtUGFyc2VyLnBhcnNlKGltcGwsIHJlcSwgcmVzKSkgewotICAgICAgQnl0ZUFycmF5T3V0cHV0U3RyZWFtIGJ1ZiA9IG5ldyBCeXRlQXJyYXlPdXRwdXRTdHJlYW0oKTsKLSAgICAgIGlmIChpbXBsLmdldEZvcm1hdCgpLmlzSnNvbigpKSB7Ci0gICAgICAgIHJlcy5zZXRDb250ZW50VHlwZShKU09OX1RZUEUpOwotICAgICAgICBidWYud3JpdGUoSlNPTl9NQUdJQyk7Ci0gICAgICB9IGVsc2UgewotICAgICAgICByZXMuc2V0Q29udGVudFR5cGUoInRleHQvcGxhaW4iKTsKLSAgICAgIH0KLSAgICAgIGltcGwuZGlzcGxheShidWYpOwotICAgICAgcmVzLnNldENoYXJhY3RlckVuY29kaW5nKCJVVEYtOCIpOwotICAgICAgc2VuZChyZXEsIHJlcywgYnVmLnRvQnl0ZUFycmF5KCkpOwotICAgIH0KLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvUHJvamVjdEFjY2Vzc0ZhY3RvcnkuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Byb2plY3RBY2Nlc3NGYWN0b3J5LmphdmEKaW5kZXggN2IzYjhlNy4uMmM1NjgxYiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvUHJvamVjdEFjY2Vzc0ZhY3RvcnkuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0QWNjZXNzRmFjdG9yeS5qYXZhCkBAIC0xMjEsNiArMTIxLDkgQEAKICAgICAgICAgaWYgKHBjLmlzT3duZXIoKSkgewogICAgICAgICAgIGxvY2FsLmFkZChzZWN0aW9uKTsKICAgICAgICAgICBvd25lck9mLmFkZChuYW1lKTsKKworICAgICAgICB9IGVsc2UgaWYgKG1ldGFDb25maWdDb250cm9sLmlzVmlzaWJsZSgpKSB7CisgICAgICAgICAgbG9jYWwuYWRkKHNlY3Rpb24pOwogICAgICAgICB9CiAKICAgICAgIH0gZWxzZSBpZiAoUmVmQ29uZmlnU2VjdGlvbi5pc1ZhbGlkKG5hbWUpKSB7CkBAIC0yMDEsNiArMjA0LDcgQEAKICAgICBkZXRhaWwuc2V0Q2FuVXBsb2FkKHBjLmlzT3duZXIoKQogICAgICAgICB8fCAobWV0YUNvbmZpZ0NvbnRyb2wuaXNWaXNpYmxlKCkgJiYgbWV0YUNvbmZpZ0NvbnRyb2wuY2FuVXBsb2FkKCkpKTsKICAgICBkZXRhaWwuc2V0Q29uZmlnVmlzaWJsZShwYy5pc093bmVyKCkgfHwgbWV0YUNvbmZpZ0NvbnRyb2wuaXNWaXNpYmxlKCkpOworICAgIGRldGFpbC5zZXRMYWJlbFR5cGVzKHBjLmdldExhYmVsVHlwZXMoKSk7CiAgICAgcmV0dXJuIGRldGFpbDsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0QWNjZXNzSGFuZGxlci5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvUHJvamVjdEFjY2Vzc0hhbmRsZXIuamF2YQppbmRleCAwMmI4NGIwLi4wYTUwYTM4IDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0QWNjZXNzSGFuZGxlci5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Byb2plY3RBY2Nlc3NIYW5kbGVyLmphdmEKQEAgLTE0LDYgKzE0LDggQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMucHJvamVjdDsKIAoraW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUHJvamVjdEFjY2Vzc1V0aWwubWVyZ2VTZWN0aW9uczsKKwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY2Vzc1NlY3Rpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBSZWZlcmVuY2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKQEAgLTM2LDExICszOCw4IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7Ci1pbXBvcnQgamF2YS51dGlsLkxpbmtlZEhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUHJvamVjdEFjY2Vzc0hhbmRsZXI8VD4gZXh0ZW5kcyBIYW5kbGVyPFQ+IHsKQEAgLTE1MSwyMyArMTUwLDYgQEAKICAgICB0b0RlbGV0ZS5yZW1vdmUoc2VjdGlvbi5nZXROYW1lKCkpOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgTGlzdDxBY2Nlc3NTZWN0aW9uPiBtZXJnZVNlY3Rpb25zKExpc3Q8QWNjZXNzU2VjdGlvbj4gc3JjKSB7Ci0gICAgTWFwPFN0cmluZywgQWNjZXNzU2VjdGlvbj4gbWFwID0gbmV3IExpbmtlZEhhc2hNYXA8U3RyaW5nLCBBY2Nlc3NTZWN0aW9uPigpOwotICAgIGZvciAoQWNjZXNzU2VjdGlvbiBzZWN0aW9uIDogc3JjKSB7Ci0gICAgICBpZiAoc2VjdGlvbi5nZXRQZXJtaXNzaW9ucygpLmlzRW1wdHkoKSkgewotICAgICAgICBjb250aW51ZTsKLSAgICAgIH0KLQotICAgICAgQWNjZXNzU2VjdGlvbiBwcmlvciA9IG1hcC5nZXQoc2VjdGlvbi5nZXROYW1lKCkpOwotICAgICAgaWYgKHByaW9yICE9IG51bGwpIHsKLSAgICAgICAgcHJpb3IubWVyZ2VGcm9tKHNlY3Rpb24pOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgbWFwLnB1dChzZWN0aW9uLmdldE5hbWUoKSwgc2VjdGlvbik7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBuZXcgQXJyYXlMaXN0PEFjY2Vzc1NlY3Rpb24+KG1hcC52YWx1ZXMoKSk7Ci0gIH0KLQogICBwcml2YXRlIHN0YXRpYyBTZXQ8U3RyaW5nPiBzY2FuU2VjdGlvbk5hbWVzKFByb2plY3RDb25maWcgY29uZmlnKSB7CiAgICAgU2V0PFN0cmluZz4gbmFtZXMgPSBuZXcgSGFzaFNldDxTdHJpbmc+KCk7CiAgICAgZm9yIChBY2Nlc3NTZWN0aW9uIHNlY3Rpb24gOiBjb25maWcuZ2V0QWNjZXNzU2VjdGlvbnMoKSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvUHJvamVjdEFkbWluU2VydmljZUltcGwuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Byb2plY3RBZG1pblNlcnZpY2VJbXBsLmphdmEKaW5kZXggOTgzZjFmYy4uMGU0NmJjMyAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvUHJvamVjdEFkbWluU2VydmljZUltcGwuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0QWRtaW5TZXJ2aWNlSW1wbC5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5wcm9qZWN0OwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjZXNzU2VjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BZGRCcmFuY2hSZXN1bHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGlzdEJyYW5jaGVzUmVzdWx0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlByb2plY3RBY2Nlc3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUHJvamVjdEFkbWluU2VydmljZTsKQEAgLTIzLDcgKzI0LDYgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uQXN5bmNDYWxsYmFjazsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLlZvaWRSZXN1bHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CkBAIC00MCw3ICs0MCw2IEBACiAgIHByaXZhdGUgZmluYWwgTGlzdEJyYW5jaGVzLkZhY3RvcnkgbGlzdEJyYW5jaGVzRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBWaXNpYmxlUHJvamVjdERldGFpbHMuRmFjdG9yeSB2aXNpYmxlUHJvamVjdERldGFpbHNGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIFByb2plY3RBY2Nlc3NGYWN0b3J5LkZhY3RvcnkgcHJvamVjdEFjY2Vzc0ZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgQ3JlYXRlUHJvamVjdEhhbmRsZXIuRmFjdG9yeSBjcmVhdGVQcm9qZWN0SGFuZGxlckZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdERldGFpbEZhY3RvcnkuRmFjdG9yeSBwcm9qZWN0RGV0YWlsRmFjdG9yeTsKIAogICBASW5qZWN0CkBAIC01Miw4ICs1MSw3IEBACiAgICAgICBmaW5hbCBMaXN0QnJhbmNoZXMuRmFjdG9yeSBsaXN0QnJhbmNoZXNGYWN0b3J5LAogICAgICAgZmluYWwgVmlzaWJsZVByb2plY3REZXRhaWxzLkZhY3RvcnkgdmlzaWJsZVByb2plY3REZXRhaWxzRmFjdG9yeSwKICAgICAgIGZpbmFsIFByb2plY3RBY2Nlc3NGYWN0b3J5LkZhY3RvcnkgcHJvamVjdEFjY2Vzc0ZhY3RvcnksCi0gICAgICBmaW5hbCBQcm9qZWN0RGV0YWlsRmFjdG9yeS5GYWN0b3J5IHByb2plY3REZXRhaWxGYWN0b3J5LAotICAgICAgZmluYWwgQ3JlYXRlUHJvamVjdEhhbmRsZXIuRmFjdG9yeSBjcmVhdGVOZXdQcm9qZWN0RmFjdG9yeSkgeworICAgICAgZmluYWwgUHJvamVjdERldGFpbEZhY3RvcnkuRmFjdG9yeSBwcm9qZWN0RGV0YWlsRmFjdG9yeSkgewogICAgIHRoaXMuYWRkQnJhbmNoRmFjdG9yeSA9IGFkZEJyYW5jaEZhY3Rvcnk7CiAgICAgdGhpcy5jaGFuZ2VQcm9qZWN0QWNjZXNzRmFjdG9yeSA9IGNoYW5nZVByb2plY3RBY2Nlc3NGYWN0b3J5OwogICAgIHRoaXMucmV2aWV3UHJvamVjdEFjY2Vzc0ZhY3RvcnkgPSByZXZpZXdQcm9qZWN0QWNjZXNzRmFjdG9yeTsKQEAgLTYzLDcgKzYxLDYgQEAKICAgICB0aGlzLnZpc2libGVQcm9qZWN0RGV0YWlsc0ZhY3RvcnkgPSB2aXNpYmxlUHJvamVjdERldGFpbHNGYWN0b3J5OwogICAgIHRoaXMucHJvamVjdEFjY2Vzc0ZhY3RvcnkgPSBwcm9qZWN0QWNjZXNzRmFjdG9yeTsKICAgICB0aGlzLnByb2plY3REZXRhaWxGYWN0b3J5ID0gcHJvamVjdERldGFpbEZhY3Rvcnk7Ci0gICAgdGhpcy5jcmVhdGVQcm9qZWN0SGFuZGxlckZhY3RvcnkgPSBjcmVhdGVOZXdQcm9qZWN0RmFjdG9yeTsKICAgfQogCiAgIEBPdmVycmlkZQpAQCAtMTI2LDE2ICsxMjMsOCBAQAogICBAT3ZlcnJpZGUKICAgcHVibGljIHZvaWQgYWRkQnJhbmNoKGZpbmFsIFByb2plY3QuTmFtZUtleSBwcm9qZWN0TmFtZSwKICAgICAgIGZpbmFsIFN0cmluZyBicmFuY2hOYW1lLCBmaW5hbCBTdHJpbmcgc3RhcnRpbmdSZXZpc2lvbiwKLSAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8TGlzdEJyYW5jaGVzUmVzdWx0PiBjYWxsYmFjaykgeworICAgICAgZmluYWwgQXN5bmNDYWxsYmFjazxBZGRCcmFuY2hSZXN1bHQ+IGNhbGxiYWNrKSB7CiAgICAgYWRkQnJhbmNoRmFjdG9yeS5jcmVhdGUocHJvamVjdE5hbWUsIGJyYW5jaE5hbWUsIHN0YXJ0aW5nUmV2aXNpb24pLnRvKAogICAgICAgICBjYWxsYmFjayk7CiAgIH0KLQotICBAT3ZlcnJpZGUKLSAgcHVibGljIHZvaWQgY3JlYXRlTmV3UHJvamVjdChTdHJpbmcgcHJvamVjdE5hbWUsIFN0cmluZyBwYXJlbnROYW1lLAotICAgICAgYm9vbGVhbiBlbXB0eUNvbW1pdCwgYm9vbGVhbiBwZXJtaXNzaW9uc09ubHksCi0gICAgICBBc3luY0NhbGxiYWNrPFZvaWRSZXN1bHQ+IGNhbGxiYWNrKSB7Ci0gICAgY3JlYXRlUHJvamVjdEhhbmRsZXJGYWN0b3J5LmNyZWF0ZShwcm9qZWN0TmFtZSwgcGFyZW50TmFtZSwgZW1wdHlDb21taXQsCi0gICAgICAgIHBlcm1pc3Npb25zT25seSkudG8oY2FsbGJhY2spOwotICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0RGV0YWlsRmFjdG9yeS5qYXZhIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvUHJvamVjdERldGFpbEZhY3RvcnkuamF2YQppbmRleCAyNzQxNjQwLi4yNTMzZmViIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0RGV0YWlsRmFjdG9yeS5qYXZhCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Byb2plY3REZXRhaWxGYWN0b3J5LmphdmEKQEAgLTE0LDggKzE0LDEwIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLnByb2plY3Q7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Qcm9qZWN0RGV0YWlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnJwYy5IYW5kbGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Jbmhlcml0ZWRCb29sZWFuOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoUHJvamVjdEV4Y2VwdGlvbjsKQEAgLTY4LDYgKzcwLDI4IEBACiAgICAgZGV0YWlsLnNldENhbk1vZGlmeU1lcmdlVHlwZSh1c2VySXNPd25lcik7CiAgICAgZGV0YWlsLnNldENhbk1vZGlmeVN0YXRlKHVzZXJJc093bmVyKTsKIAorICAgIGZpbmFsIEluaGVyaXRlZEJvb2xlYW4gdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzID0gbmV3IEluaGVyaXRlZEJvb2xlYW4oKTsKKyAgICBmaW5hbCBJbmhlcml0ZWRCb29sZWFuIHVzZVNpZ25lZE9mZkJ5ID0gbmV3IEluaGVyaXRlZEJvb2xlYW4oKTsKKyAgICBmaW5hbCBJbmhlcml0ZWRCb29sZWFuIHVzZUNvbnRlbnRNZXJnZSA9IG5ldyBJbmhlcml0ZWRCb29sZWFuKCk7CisgICAgZmluYWwgSW5oZXJpdGVkQm9vbGVhbiByZXF1aXJlQ2hhbmdlSUQgPSBuZXcgSW5oZXJpdGVkQm9vbGVhbigpOworICAgIHVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cy5zZXRWYWx1ZShwcm9qZWN0U3RhdGUuZ2V0UHJvamVjdCgpCisgICAgICAgIC5nZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoKSk7CisgICAgdXNlU2lnbmVkT2ZmQnkuc2V0VmFsdWUocHJvamVjdFN0YXRlLmdldFByb2plY3QoKS5nZXRVc2VTaWduZWRPZmZCeSgpKTsKKyAgICB1c2VDb250ZW50TWVyZ2Uuc2V0VmFsdWUocHJvamVjdFN0YXRlLmdldFByb2plY3QoKS5nZXRVc2VDb250ZW50TWVyZ2UoKSk7CisgICAgcmVxdWlyZUNoYW5nZUlELnNldFZhbHVlKHByb2plY3RTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0UmVxdWlyZUNoYW5nZUlEKCkpOworICAgIFByb2plY3RTdGF0ZSBwYXJlbnRTdGF0ZSA9IEl0ZXJhYmxlcy5nZXRGaXJzdChwcm9qZWN0U3RhdGUucGFyZW50cygpLCBudWxsKTsKKyAgICBpZiAocGFyZW50U3RhdGUgIT0gbnVsbCkgeworICAgICAgdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzLnNldEluaGVyaXRlZFZhbHVlKHBhcmVudFN0YXRlCisgICAgICAgICAgLmlzVXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzKCkpOworICAgICAgdXNlU2lnbmVkT2ZmQnkuc2V0SW5oZXJpdGVkVmFsdWUocGFyZW50U3RhdGUuaXNVc2VTaWduZWRPZmZCeSgpKTsKKyAgICAgIHVzZUNvbnRlbnRNZXJnZS5zZXRJbmhlcml0ZWRWYWx1ZShwYXJlbnRTdGF0ZS5pc1VzZUNvbnRlbnRNZXJnZSgpKTsKKyAgICAgIHJlcXVpcmVDaGFuZ2VJRC5zZXRJbmhlcml0ZWRWYWx1ZShwYXJlbnRTdGF0ZS5pc1JlcXVpcmVDaGFuZ2VJRCgpKTsKKyAgICB9CisgICAgZGV0YWlsLnNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyh1c2VDb250cmlidXRvckFncmVlbWVudHMpOworICAgIGRldGFpbC5zZXRVc2VTaWduZWRPZmZCeSh1c2VTaWduZWRPZmZCeSk7CisgICAgZGV0YWlsLnNldFVzZUNvbnRlbnRNZXJnZSh1c2VDb250ZW50TWVyZ2UpOworICAgIGRldGFpbC5zZXRSZXF1aXJlQ2hhbmdlSUQocmVxdWlyZUNoYW5nZUlEKTsKKwogICAgIGZpbmFsIFByb2plY3QuTmFtZUtleSBwcm9qZWN0TmFtZSA9IHByb2plY3RTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpOwogICAgIFJlcG9zaXRvcnkgZ2l0OwogICAgIHRyeSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0TW9kdWxlLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0TW9kdWxlLmphdmEKaW5kZXggZTk0M2UzZmMuLjJkNGYyMTAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Byb2plY3RNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0TW9kdWxlLmphdmEKQEAgLTMxLDcgKzMxLDYgQEAKICAgICAgICAgZmFjdG9yeShBZGRCcmFuY2guRmFjdG9yeS5jbGFzcyk7CiAgICAgICAgIGZhY3RvcnkoQ2hhbmdlUHJvamVjdEFjY2Vzcy5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShSZXZpZXdQcm9qZWN0QWNjZXNzLkZhY3RvcnkuY2xhc3MpOwotICAgICAgICBmYWN0b3J5KENyZWF0ZVByb2plY3RIYW5kbGVyLkZhY3RvcnkuY2xhc3MpOwogICAgICAgICBmYWN0b3J5KENoYW5nZVByb2plY3RTZXR0aW5ncy5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShEZWxldGVCcmFuY2hlcy5GYWN0b3J5LmNsYXNzKTsKICAgICAgICAgZmFjdG9yeShMaXN0QnJhbmNoZXMuRmFjdG9yeS5jbGFzcyk7CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0c1Jlc3RBcGlTZXJ2bGV0LmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9Qcm9qZWN0c1Jlc3RBcGlTZXJ2bGV0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZWEzYjhiMAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Byb2plY3RzUmVzdEFwaVNlcnZsZXQuamF2YQpAQCAtMCwwICsxLDMyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucnBjLnByb2plY3Q7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5yZXN0YXBpLlJlc3RBcGlTZXJ2bGV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RzQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworCitAU2luZ2xldG9uCitwdWJsaWMgY2xhc3MgUHJvamVjdHNSZXN0QXBpU2VydmxldCBleHRlbmRzIFJlc3RBcGlTZXJ2bGV0IHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisKKyAgQEluamVjdAorICBQcm9qZWN0c1Jlc3RBcGlTZXJ2bGV0KFJlc3RBcGlTZXJ2bGV0Lkdsb2JhbHMgZ2xvYmFscywKKyAgICAgIFByb3ZpZGVyPFByb2plY3RzQ29sbGVjdGlvbj4gcHJvamVjdHMpIHsKKyAgICBzdXBlcihnbG9iYWxzLCBwcm9qZWN0cyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Jldmlld1Byb2plY3RBY2Nlc3MuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3JwYy9wcm9qZWN0L1Jldmlld1Byb2plY3RBY2Nlc3MuamF2YQppbmRleCA2OWEyODNhLi4yNTEyNDlmIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9ycGMvcHJvamVjdC9SZXZpZXdQcm9qZWN0QWNjZXNzLmphdmEKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcnBjL3Byb2plY3QvUmV2aWV3UHJvamVjdEFjY2Vzcy5qYXZhCkBAIC0yNywxNCArMjcsMTcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ2hhbmdlVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBCYWNrZW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuQ2hhbmdlUmVzb3VyY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5Qb3N0UmV2aWV3ZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXRhRGF0YVVwZGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlByb2plY3RDb25maWc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLkFkZFJldmlld2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9GYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKQEAgLTU4LDE0ICs2MSwxNiBAQAogICBwcml2YXRlIGZpbmFsIFJldmlld0RiIGRiOwogICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyIHVzZXI7CiAgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIEFkZFJldmlld2VyLkZhY3RvcnkgYWRkUmV2aWV3ZXJGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFBvc3RSZXZpZXdlcnM+IHJldmlld2Vyc1Byb3ZpZGVyOworICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgY2hhbmdlRmFjdG9yeTsKIAogICBASW5qZWN0CiAgIFJldmlld1Byb2plY3RBY2Nlc3MoZmluYWwgUHJvamVjdENvbnRyb2wuRmFjdG9yeSBwcm9qZWN0Q29udHJvbEZhY3RvcnksCiAgICAgICBmaW5hbCBHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kLAogICAgICAgZmluYWwgTWV0YURhdGFVcGRhdGUuVXNlciBtZXRhRGF0YVVwZGF0ZUZhY3RvcnksIGZpbmFsIFJldmlld0RiIGRiLAogICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIgdXNlciwgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5LAotICAgICAgZmluYWwgQWRkUmV2aWV3ZXIuRmFjdG9yeSBhZGRSZXZpZXdlckZhY3RvcnksCisgICAgICBmaW5hbCBQcm92aWRlcjxQb3N0UmV2aWV3ZXJzPiByZXZpZXdlcnNQcm92aWRlciwKKyAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgY2hhbmdlRmFjdG9yeSwKIAogICAgICAgQEFzc2lzdGVkIGZpbmFsIFByb2plY3QuTmFtZUtleSBwcm9qZWN0TmFtZSwKICAgICAgIEBOdWxsYWJsZSBAQXNzaXN0ZWQgZmluYWwgT2JqZWN0SWQgYmFzZSwKQEAgLTc2LDE0ICs4MSwxNiBAQAogICAgIHRoaXMuZGIgPSBkYjsKICAgICB0aGlzLnVzZXIgPSB1c2VyOwogICAgIHRoaXMucGF0Y2hTZXRJbmZvRmFjdG9yeSA9IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7Ci0gICAgdGhpcy5hZGRSZXZpZXdlckZhY3RvcnkgPSBhZGRSZXZpZXdlckZhY3Rvcnk7CisgICAgdGhpcy5yZXZpZXdlcnNQcm92aWRlciA9IHJldmlld2Vyc1Byb3ZpZGVyOworICAgIHRoaXMuY2hhbmdlRmFjdG9yeSA9IGNoYW5nZUZhY3Rvcnk7CiAgIH0KIAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIENoYW5nZS5JZCB1cGRhdGVQcm9qZWN0Q29uZmlnKFByb2plY3RDb25maWcgY29uZmlnLCBNZXRhRGF0YVVwZGF0ZSBtZCkKICAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKICAgICBDaGFuZ2UuSWQgY2hhbmdlSWQgPSBuZXcgQ2hhbmdlLklkKGRiLm5leHRDaGFuZ2VJZCgpKTsKLSAgICBQYXRjaFNldCBwcyA9IG5ldyBQYXRjaFNldChuZXcgUGF0Y2hTZXQuSWQoY2hhbmdlSWQsIDEpKTsKKyAgICBQYXRjaFNldCBwcyA9CisgICAgICAgIG5ldyBQYXRjaFNldChuZXcgUGF0Y2hTZXQuSWQoY2hhbmdlSWQsIENoYW5nZS5JTklUSUFMX1BBVENIX1NFVF9JRCkpOwogICAgIFJldkNvbW1pdCBjb21taXQgPSBjb25maWcuY29tbWl0VG9OZXdSZWYobWQsIHBzLmdldFJlZk5hbWUoKSk7CiAgICAgaWYgKGNvbW1pdC5nZXRJZCgpLmVxdWFscyhiYXNlKSkgewogICAgICAgcmV0dXJuIG51bGw7CkBAIC05Niw3ICsxMDMsNiBAQAogICAgICAgICBuZXcgQnJhbmNoLk5hbWVLZXkoCiAgICAgICAgICAgICBjb25maWcuZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSwKICAgICAgICAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRl9DT05GSUcpKTsKLSAgICBjaGFuZ2UubmV4dFBhdGNoU2V0SWQoKTsKIAogICAgIHBzLnNldENyZWF0ZWRPbihjaGFuZ2UuZ2V0Q3JlYXRlZE9uKCkpOwogICAgIHBzLnNldFVwbG9hZGVyKGNoYW5nZS5nZXRPd25lcigpKTsKQEAgLTExMSw3ICsxMTcsNyBAQAogICAgICAgaW5zZXJ0QW5jZXN0b3JzKHBzLmdldElkKCksIGNvbW1pdCk7CiAgICAgICBkYi5wYXRjaFNldHMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKHBzKSk7CiAgICAgICBkYi5jaGFuZ2VzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihjaGFuZ2UpKTsKLSAgICAgIGFkZFByb2plY3RPd25lcnNBc1Jldmlld2VycyhjaGFuZ2VJZCk7CisgICAgICBhZGRQcm9qZWN0T3duZXJzQXNSZXZpZXdlcnMoY2hhbmdlKTsKICAgICAgIGRiLmNvbW1pdCgpOwogICAgIH0gZmluYWxseSB7CiAgICAgICBkYi5yb2xsYmFjaygpOwpAQCAtMTMzLDEyICsxMzksMTUgQEAKICAgICBkYi5wYXRjaFNldEFuY2VzdG9ycygpLmluc2VydCh0b0luc2VydCk7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgYWRkUHJvamVjdE93bmVyc0FzUmV2aWV3ZXJzKGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCkgeworICBwcml2YXRlIHZvaWQgYWRkUHJvamVjdE93bmVyc0FzUmV2aWV3ZXJzKGZpbmFsIENoYW5nZSBjaGFuZ2UpIHsKICAgICBmaW5hbCBTdHJpbmcgcHJvamVjdE93bmVycyA9CiAgICAgICAgIGdyb3VwQmFja2VuZC5nZXQoQWNjb3VudEdyb3VwLlBST0pFQ1RfT1dORVJTKS5nZXROYW1lKCk7CiAgICAgdHJ5IHsKLSAgICAgIGFkZFJldmlld2VyRmFjdG9yeS5jcmVhdGUoY2hhbmdlSWQsIENvbGxlY3Rpb25zLnNpbmdsZXRvbihwcm9qZWN0T3duZXJzKSwKLSAgICAgICAgICBmYWxzZSkuY2FsbCgpOworICAgICAgQ2hhbmdlUmVzb3VyY2UgcnNyYyA9CisgICAgICAgICAgbmV3IENoYW5nZVJlc291cmNlKGNoYW5nZUZhY3RvcnkuY29udHJvbEZvcihjaGFuZ2UsIHVzZXIpKTsKKyAgICAgIFBvc3RSZXZpZXdlcnMuSW5wdXQgaW5wdXQgPSBuZXcgUG9zdFJldmlld2Vycy5JbnB1dCgpOworICAgICAgaW5wdXQucmV2aWV3ZXIgPSBwcm9qZWN0T3duZXJzOworICAgICAgcmV2aWV3ZXJzUHJvdmlkZXIuZ2V0KCkuYXBwbHkocnNyYywgaW5wdXQpOwogICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CiAgICAgICAvLyBvbmUgb2YgdGhlIG93bmVyIGdyb3VwcyBpcyBub3QgdmlzaWJsZSB0byB0aGUgdXNlciBhbmQgdGhpcyBpdCB3aHkgaXQKICAgICAgIC8vIGNhbid0IGJlIGFkZGVkIGFzIHJldmlld2VyCmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC90ZW1wbGF0ZS9TaXRlSGVhZGVyRm9vdGVyLmphdmEgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC90ZW1wbGF0ZS9TaXRlSGVhZGVyRm9vdGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzIxZjAzMgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3RlbXBsYXRlL1NpdGVIZWFkZXJGb290ZXIuamF2YQpAQCAtMCwwICsxLDE1MCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLnRlbXBsYXRlOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLkh0bWxEb21VdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKK2ltcG9ydCBvcmcudzNjLmRvbS5Eb2N1bWVudDsKK2ltcG9ydCBvcmcudzNjLmRvbS5FbGVtZW50OworCitpbXBvcnQgamF2YS5pby5GaWxlOworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CisKK0BTaW5nbGV0b24KK3B1YmxpYyBjbGFzcyBTaXRlSGVhZGVyRm9vdGVyIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKFNpdGVIZWFkZXJGb290ZXIuY2xhc3MpOworCisgIHByaXZhdGUgZmluYWwgYm9vbGVhbiByZWZyZXNoSGVhZGVyRm9vdGVyOworICBwcml2YXRlIGZpbmFsIFNpdGVQYXRocyBzaXRlUGF0aHM7CisgIHByaXZhdGUgdm9sYXRpbGUgVGVtcGxhdGUgdGVtcGxhdGU7CisKKyAgQEluamVjdAorICBTaXRlSGVhZGVyRm9vdGVyKEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNmZywgU2l0ZVBhdGhzIHNpdGVQYXRocykgeworICAgIHRoaXMucmVmcmVzaEhlYWRlckZvb3RlciA9IGNmZy5nZXRCb29sZWFuKCJzaXRlIiwgInJlZnJlc2hIZWFkZXJGb290ZXIiLCB0cnVlKTsKKyAgICB0aGlzLnNpdGVQYXRocyA9IHNpdGVQYXRoczsKKworICAgIFRlbXBsYXRlIHQgPSBuZXcgVGVtcGxhdGUoc2l0ZVBhdGhzKTsKKyAgICB0cnkgeworICAgICAgdC5sb2FkKCk7CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgbG9nLndhcm4oIkNhbm5vdCBsb2FkIHNpdGUgaGVhZGVyIG9yIGZvb3RlciIsIGUpOworICAgIH0KKyAgICB0ZW1wbGF0ZSA9IHQ7CisgIH0KKworICBwdWJsaWMgRG9jdW1lbnQgcGFyc2UoQ2xhc3M8Pz4gY2xhenosIFN0cmluZyBuYW1lKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIFRlbXBsYXRlIHQgPSB0ZW1wbGF0ZTsKKyAgICBpZiAocmVmcmVzaEhlYWRlckZvb3RlciAmJiB0LmlzU3RhbGUoKSkgeworICAgICAgdCA9IG5ldyBUZW1wbGF0ZShzaXRlUGF0aHMpOworICAgICAgdHJ5IHsKKyAgICAgICAgdC5sb2FkKCk7CisgICAgICAgIHRlbXBsYXRlID0gdDsKKyAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgbG9nLndhcm4oIkNhbm5vdCByZWZyZXNoIHNpdGUgaGVhZGVyIG9yIGZvb3RlciIsIGUpOworICAgICAgICB0ID0gdGVtcGxhdGU7CisgICAgICB9CisgICAgfQorCisgICAgRG9jdW1lbnQgZG9jID0gSHRtbERvbVV0aWwucGFyc2VGaWxlKGNsYXp6LCBuYW1lKTsKKyAgICBpbmplY3RDc3MoZG9jLCAiZ2Vycml0X3NpdGVjc3MiLCB0LmNzcyk7CisgICAgaW5qZWN0WG1sKGRvYywgImdlcnJpdF9oZWFkZXIiLCB0LmhlYWRlcik7CisgICAgaW5qZWN0WG1sKGRvYywgImdlcnJpdF9mb290ZXIiLCB0LmZvb3Rlcik7CisgICAgcmV0dXJuIGRvYzsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBpbmplY3RDc3MoRG9jdW1lbnQgZG9jLCBTdHJpbmcgaWQsIFN0cmluZyBjb250ZW50KSB7CisgICAgRWxlbWVudCBlID0gSHRtbERvbVV0aWwuZmluZChkb2MsIGlkKTsKKyAgICBpZiAoZSAhPSBudWxsKSB7CisgICAgICBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShjb250ZW50KSkgeworICAgICAgICB3aGlsZSAoZS5nZXRGaXJzdENoaWxkKCkgIT0gbnVsbCkgeworICAgICAgICAgIGUucmVtb3ZlQ2hpbGQoZS5nZXRGaXJzdENoaWxkKCkpOworICAgICAgICB9CisgICAgICAgIGUucmVtb3ZlQXR0cmlidXRlKCJpZCIpOworICAgICAgICBlLmFwcGVuZENoaWxkKGRvYy5jcmVhdGVDREFUQVNlY3Rpb24oIlxuIiArIGNvbnRlbnQgKyAiXG4iKSk7CisgICAgICB9IGVsc2UgeworICAgICAgICBlLmdldFBhcmVudE5vZGUoKS5yZW1vdmVDaGlsZChlKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgaW5qZWN0WG1sKERvY3VtZW50IGRvYywgU3RyaW5nIGlkLCBFbGVtZW50IGQpIHsKKyAgICBFbGVtZW50IGUgPSBIdG1sRG9tVXRpbC5maW5kKGRvYywgaWQpOworICAgIGlmIChlICE9IG51bGwpIHsKKyAgICAgIGlmIChkICE9IG51bGwpIHsKKyAgICAgICAgd2hpbGUgKGUuZ2V0Rmlyc3RDaGlsZCgpICE9IG51bGwpIHsKKyAgICAgICAgICBlLnJlbW92ZUNoaWxkKGUuZ2V0Rmlyc3RDaGlsZCgpKTsKKyAgICAgICAgfQorICAgICAgICBlLmFwcGVuZENoaWxkKGRvYy5pbXBvcnROb2RlKGQsIHRydWUpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGUuZ2V0UGFyZW50Tm9kZSgpLnJlbW92ZUNoaWxkKGUpOworICAgICAgfQorICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGNsYXNzIFRlbXBsYXRlIHsKKyAgICBwcml2YXRlIGZpbmFsIEZpbGVJbmZvIGNzc0ZpbGU7CisgICAgcHJpdmF0ZSBmaW5hbCBGaWxlSW5mbyBoZWFkZXJGaWxlOworICAgIHByaXZhdGUgZmluYWwgRmlsZUluZm8gZm9vdGVyRmlsZTsKKworICAgIFN0cmluZyBjc3M7CisgICAgRWxlbWVudCBoZWFkZXI7CisgICAgRWxlbWVudCBmb290ZXI7CisKKyAgICBUZW1wbGF0ZShTaXRlUGF0aHMgc2l0ZSkgeworICAgICAgY3NzRmlsZSA9IG5ldyBGaWxlSW5mbyhzaXRlLnNpdGVfY3NzKTsKKyAgICAgIGhlYWRlckZpbGUgPSBuZXcgRmlsZUluZm8oc2l0ZS5zaXRlX2hlYWRlcik7CisgICAgICBmb290ZXJGaWxlID0gbmV3IEZpbGVJbmZvKHNpdGUuc2l0ZV9mb290ZXIpOworICAgIH0KKworICAgIHZvaWQgbG9hZCgpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgICBjc3MgPSBIdG1sRG9tVXRpbC5yZWFkRmlsZSgKKyAgICAgICAgICBjc3NGaWxlLnBhdGguZ2V0UGFyZW50RmlsZSgpLAorICAgICAgICAgIGNzc0ZpbGUucGF0aC5nZXROYW1lKCkpOworICAgICAgaGVhZGVyID0gcmVhZFhtbChoZWFkZXJGaWxlKTsKKyAgICAgIGZvb3RlciA9IHJlYWRYbWwoZm9vdGVyRmlsZSk7CisgICAgfQorCisgICAgYm9vbGVhbiBpc1N0YWxlKCkgeworICAgICAgcmV0dXJuIGNzc0ZpbGUuaXNTdGFsZSgpIHx8IGhlYWRlckZpbGUuaXNTdGFsZSgpIHx8IGZvb3RlckZpbGUuaXNTdGFsZSgpOworICAgIH0KKworICAgIHByaXZhdGUgc3RhdGljIEVsZW1lbnQgcmVhZFhtbChGaWxlSW5mbyBzcmMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgICBEb2N1bWVudCBkID0gSHRtbERvbVV0aWwucGFyc2VGaWxlKHNyYy5wYXRoKTsKKyAgICAgIHJldHVybiBkICE9IG51bGwgPyBkLmdldERvY3VtZW50RWxlbWVudCgpIDogbnVsbDsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBGaWxlSW5mbyB7CisgICAgZmluYWwgRmlsZSBwYXRoOworICAgIGZpbmFsIGxvbmcgdGltZTsKKworICAgIEZpbGVJbmZvKEZpbGUgcCkgeworICAgICAgcGF0aCA9IHA7CisgICAgICB0aW1lID0gcGF0aC5sYXN0TW9kaWZpZWQoKTsKKyAgICB9CisKKyAgICBib29sZWFuIGlzU3RhbGUoKSB7CisgICAgICByZXR1cm4gdGltZSAhPSBwYXRoLmxhc3RNb2RpZmllZCgpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2JlY29tZS9CZWNvbWVBbnlBY2NvdW50Lmh0bWwgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvYmVjb21lL0JlY29tZUFueUFjY291bnQuaHRtbAppbmRleCBjM2M3NTAzLi5jNjYwMzExIDEwMDY0NAotLS0gYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvYmVjb21lL0JlY29tZUFueUFjY291bnQuaHRtbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvYmVjb21lL0JlY29tZUFueUFjY291bnQuaHRtbApAQCAtMSwxMCArMSwxMCBAQAogPGh0bWw+CiAgIDxoZWFkPgogICAgIDx0aXRsZT5HZXJyaXQgQ29kZSBSZXZpZXc8L3RpdGxlPgotICAgIDxzY3JpcHQgaWQ9ImdlcnJpdF9nd3RkZXZtb2RlIj4KKyAgICA8c2NyaXB0IGlkPSJnd3RkZXZtb2RlIj4KICAgICAgIChmdW5jdGlvbiAoKSB7CiAgICAgICAgIHZhciBwbiA9ICdnd3QuY29kZXN2cic7Ci0gICAgICAgIHZhciBjbiA9ICdnZXJyaXQuJyArIHBuOworICAgICAgICB2YXIgY24gPSAnZ2Vycml0X3VpLicgKyBwbjsKIAogICAgICAgICB2YXIgcF9zdGFydCA9IHdpbmRvdy5sb2NhdGlvbi5zZWFyY2guaW5kZXhPZihwbiArICc9Jyk7CiAgICAgICAgIGlmIChwX3N0YXJ0ICE9IC0xKSB7CkBAIC0yOSw1MSArMjksNTkgQEAKICAgICAgICAgfQogICAgICAgfSkoKTsKICAgICA8L3NjcmlwdD4KKyAgICA8c3R5bGUgaWQ9ImdlcnJpdF9zaXRlY3NzIiB0eXBlPSJ0ZXh0L2NzcyI+PC9zdHlsZT4KICAgPC9oZWFkPgogICA8Ym9keT4KLSAgICA8aDI+U2lnbiBJbjwvaDI+Ci0gICAgPHRhYmxlIGJvcmRlcj0iMCI+Ci0gICAgICA8dHI+Ci0gICAgICAgIDx0aD5Vc2VybmFtZTo8L3RoPgotICAgICAgICA8dGQ+Ci0gICAgICAgICAgPGZvcm0gbWV0aG9kPSJHRVQiPgotICAgICAgICAgICAgPGlucHV0IHR5cGU9InRleHQiIHNpemU9IjMwIiBuYW1lPSJ1c2VyX25hbWUiIC8+Ci0gICAgICAgICAgICA8aW5wdXQgdHlwZT0ic3VibWl0IiB2YWx1ZT0iQmVjb21lIEFjY291bnQiIC8+Ci0gICAgICAgICAgPC9mb3JtPgotICAgICAgICA8L3RkPgotICAgICAgPC90cj4KKyAgICA8ZGl2IGlkPSJnZXJyaXRfdG9wbWVudSIgc3R5bGU9ImhlaWdodDo0NXB4OyIgY2xhc3M9ImdlcnJpdFRvcE1lbnUiPjwvZGl2PgorICAgIDxkaXYgaWQ9ImdlcnJpdF9oZWFkZXIiPjwvZGl2PgorICAgIDxkaXYgaWQ9ImdlcnJpdF9ib2R5IiBjbGFzcz0iZ2Vycml0Qm9keSI+CisgICAgICA8aDI+U2lnbiBJbjwvaDI+CisgICAgICA8dGFibGUgYm9yZGVyPSIwIj4KKyAgICAgICAgPHRyPgorICAgICAgICAgIDx0aD5Vc2VybmFtZTo8L3RoPgorICAgICAgICAgIDx0ZD4KKyAgICAgICAgICAgIDxmb3JtIG1ldGhvZD0iR0VUIj4KKyAgICAgICAgICAgICAgPGlucHV0IHR5cGU9InRleHQiIHNpemU9IjMwIiBuYW1lPSJ1c2VyX25hbWUiIC8+CisgICAgICAgICAgICAgIDxpbnB1dCB0eXBlPSJzdWJtaXQiIHZhbHVlPSJCZWNvbWUgQWNjb3VudCIgLz4KKyAgICAgICAgICAgIDwvZm9ybT4KKyAgICAgICAgICA8L3RkPgorICAgICAgICA8L3RyPgogCi0gICAgICA8dHI+Ci0gICAgICAgIDx0aD5FbWFpbCBBZGRyZXNzOjwvdGg+Ci0gICAgICAgIDx0ZD4KLSAgICAgICAgICA8Zm9ybSBtZXRob2Q9IkdFVCI+Ci0gICAgICAgICAgICA8aW5wdXQgdHlwZT0idGV4dCIgc2l6ZT0iMzAiIG5hbWU9InByZWZlcnJlZF9lbWFpbCIgLz4KLSAgICAgICAgICAgIDxpbnB1dCB0eXBlPSJzdWJtaXQiIHZhbHVlPSJCZWNvbWUgQWNjb3VudCIgLz4KLSAgICAgICAgICA8L2Zvcm0+Ci0gICAgICAgIDwvdGQ+Ci0gICAgICA8L3RyPgorICAgICAgICA8dHI+CisgICAgICAgICAgPHRoPkVtYWlsIEFkZHJlc3M6PC90aD4KKyAgICAgICAgICA8dGQ+CisgICAgICAgICAgICA8Zm9ybSBtZXRob2Q9IkdFVCI+CisgICAgICAgICAgICAgIDxpbnB1dCB0eXBlPSJ0ZXh0IiBzaXplPSIzMCIgbmFtZT0icHJlZmVycmVkX2VtYWlsIiAvPgorICAgICAgICAgICAgICA8aW5wdXQgdHlwZT0ic3VibWl0IiB2YWx1ZT0iQmVjb21lIEFjY291bnQiIC8+CisgICAgICAgICAgICA8L2Zvcm0+CisgICAgICAgICAgPC90ZD4KKyAgICAgICAgPC90cj4KIAotICAgICAgPHRyPgotICAgICAgICA8dGg+QWNjb3VudCBJRDo8L3RoPgotICAgICAgICA8dGQ+Ci0gICAgICAgICAgPGZvcm0gbWV0aG9kPSJHRVQiPgotICAgICAgICAgICAgPGlucHV0IHR5cGU9InRleHQiIHNpemU9IjEyIiBuYW1lPSJhY2NvdW50X2lkIiAvPgotICAgICAgICAgICAgPGlucHV0IHR5cGU9InN1Ym1pdCIgdmFsdWU9IkJlY29tZSBBY2NvdW50IiAvPgotICAgICAgICAgIDwvZm9ybT4KLSAgICAgICAgPC90ZD4KLSAgICAgIDwvdHI+CisgICAgICAgIDx0cj4KKyAgICAgICAgICA8dGg+QWNjb3VudCBJRDo8L3RoPgorICAgICAgICAgIDx0ZD4KKyAgICAgICAgICAgIDxmb3JtIG1ldGhvZD0iR0VUIj4KKyAgICAgICAgICAgICAgPGlucHV0IHR5cGU9InRleHQiIHNpemU9IjEyIiBuYW1lPSJhY2NvdW50X2lkIiAvPgorICAgICAgICAgICAgICA8aW5wdXQgdHlwZT0ic3VibWl0IiB2YWx1ZT0iQmVjb21lIEFjY291bnQiIC8+CisgICAgICAgICAgICA8L2Zvcm0+CisgICAgICAgICAgPC90ZD4KKyAgICAgICAgPC90cj4KIAotICAgICAgPHRyPgotICAgICAgICA8dGg+Q2hvb3NlOjwvdGg+Ci0gICAgICAgIDx0ZCBpZD0idXNlcmxpc3QiLz4KLSAgICAgIDwvdHI+Ci0gICAgPC90YWJsZT4KKyAgICAgICAgPHRyPgorICAgICAgICAgIDx0aCBzdHlsZT0idmVydGljYWwtYWxpZ246IHRvcDsiPkNob29zZTo8L3RoPgorICAgICAgICAgIDx0ZCBpZD0idXNlcmxpc3QiLz4KKyAgICAgICAgPC90cj4KKyAgICAgIDwvdGFibGU+CiAKLSAgICA8aHIgLz4KLSAgICA8aDI+UmVnaXN0ZXI8L2gyPgotICAgIDxmb3JtIG1ldGhvZD0iUE9TVCI+Ci0gICAgICA8aW5wdXQgdHlwZT0iaGlkZGVuIiBuYW1lPSJhY3Rpb24iIHZhbHVlPSJjcmVhdGVfYWNjb3VudCIgLz4KLSAgICAgIDxpbnB1dCB0eXBlPSJzdWJtaXQiIHZhbHVlPSJOZXcgQWNjb3VudCIgLz4KLSAgICA8L2Zvcm0+CisgICAgICA8aHIgLz4KKyAgICAgIDxoMj5SZWdpc3RlcjwvaDI+CisgICAgICA8Zm9ybSBtZXRob2Q9IlBPU1QiPgorICAgICAgICA8aW5wdXQgdHlwZT0iaGlkZGVuIiBuYW1lPSJhY3Rpb24iIHZhbHVlPSJjcmVhdGVfYWNjb3VudCIgLz4KKyAgICAgICAgPGlucHV0IHR5cGU9InN1Ym1pdCIgdmFsdWU9Ik5ldyBBY2NvdW50IiAvPgorICAgICAgPC9mb3JtPgorICAgIDwvZGl2PgorICAgIDxkaXYgc3R5bGU9ImNsZWFyOiBib3RoOyBtYXJnaW4tdG9wOiAxNXB4OyBwYWRkaW5nLXRvcDogMnB4OyBtYXJnaW4tYm90dG9tOiAxNXB4OyI+CisgICAgICA8ZGl2IGlkPSJnZXJyaXRfZm9vdGVyIj48L2Rpdj4KKyAgICA8L2Rpdj4KICAgPC9ib2R5PgogPC9odG1sPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2NvbnRhaW5lci9Db25maWd1cmF0aW9uRXJyb3IuaHRtbCBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvQ29uZmlndXJhdGlvbkVycm9yLmh0bWwKaW5kZXggNzI5NDAxMi4uMGJjMzM2OSAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2NvbnRhaW5lci9Db25maWd1cmF0aW9uRXJyb3IuaHRtbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0NvbmZpZ3VyYXRpb25FcnJvci5odG1sCkBAIC00OSwyMiArNDksMTYgQEAKICZsdDtWaXJ0dWFsSG9zdCA8c3BhbiBjbGFzcz0nU2VydmVyTmFtZSc+cmV2aWV3LmV4YW1wbGUuY29tPC9zcGFuPjxzcGFuIGNsYXNzPSdTZXJ2ZXJQb3J0Jz46ODA8L3NwYW4+Jmd0OwogICAgIFNlcnZlck5hbWUgPHNwYW4gY2xhc3M9J1NlcnZlck5hbWUnPnJldmlldy5leGFtcGxlLmNvbTwvc3Bhbj4KIAotICAgIFByb3h5UmVxdWVzdHMgT2ZmCi0gICAgUHJveHlWaWEgT2ZmCi0gICAgUHJveHlQcmVzZXJ2ZUhvc3QgT24KLQotICAgICZsdDtQcm94eSAqJmd0OwotICAgICAgICAgIE9yZGVyIGRlbnksYWxsb3cKLSAgICAgICAgICBBbGxvdyBmcm9tIGFsbAotICAgICZsdDsvUHJveHkmZ3Q7Ci0KIDxkaXYgY2xhc3M9J2FwYWNoZV9hdXRoJz4gICAgJmx0O0xvY2F0aW9uIDxzcGFuIGNsYXNzPSdDb250ZXh0UGF0aCc+L3I8L3NwYW4+L2xvZ2luLyZndDsKICAgICAgIEF1dGhUeXBlIEJhc2ljCiAgICAgICBBdXRoTmFtZSAiR2Vycml0IENvZGUgUmV2aWV3IgogICAgICAgUmVxdWlyZSB2YWxpZC11c2VyCiAgICAgICAuLi4KICAgICAmbHQ7L0xvY2F0aW9uJmd0OzwvZGl2PgotICAgIFByb3h5UGFzcyA8c3BhbiBjbGFzcz0nQ29udGV4dFBhdGgnPi9yPC9zcGFuPi8gaHR0cDovLy4uLjxzcGFuIGNsYXNzPSdDb250ZXh0UGF0aCc+L3I8L3NwYW4+LworCisgICAgQWxsb3dFbmNvZGVkU2xhc2hlcyBOb0RlY29kZQorICAgIFJld3JpdGVFbmdpbmUgT24KKyAgICBSZXdyaXRlUnVsZSBePHNwYW4gY2xhc3M9J0NvbnRleHRQYXRoJz4vcjwvc3Bhbj4vKC4qKSBodHRwOi8vLi4uPHNwYW4gY2xhc3M9J0NvbnRleHRQYXRoJz4vcjwvc3Bhbj4vJDEgW05FLFBdCiAmbHQ7L1ZpcnR1YWxIb3N0Jmd0OwogICAgIDwvcHJlPgogICA8L2JvZHk+CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvY29udGFpbmVyL0xvZ2luUmVkaXJlY3QuaHRtbCBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvTG9naW5SZWRpcmVjdC5odG1sCmluZGV4IDcyYjU4OWYuLjQzM2JlMjAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvTG9naW5SZWRpcmVjdC5odG1sCisrKyBiL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9jb250YWluZXIvTG9naW5SZWRpcmVjdC5odG1sCkBAIC0xLDQgKzEsNCBAQAotPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvUkVDLWh0bWw0MC9zdHJpY3QuZHRkIj4KKzwhRE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L3N0cmljdC5kdGQiPgogPGh0bWw+CiAgIDxoZWFkPgogICAgIDx0aXRsZT5HZXJyaXQgQ29kZSBSZXZpZXc8L3RpdGxlPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2xkYXAvTG9naW5Gb3JtLmh0bWwgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvbGRhcC9Mb2dpbkZvcm0uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41N2JjN2Y0Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL2xkYXAvTG9naW5Gb3JtLmh0bWwKQEAgLTAsMCArMSw4MyBAQAorPGh0bWw+CisgIDxoZWFkPgorICAgIDx0aXRsZT5HZXJyaXQgQ29kZSBSZXZpZXcgLSBTaWduIEluPC90aXRsZT4KKyAgICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgorICAgICAgI2Vycm9yX21lc3NhZ2UgeworICAgICAgICBwYWRkaW5nOiA1cHg7CisgICAgICAgIG1hcmdpbjogMmVtOworICAgICAgICB3aWR0aDogMjBlbTsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAxMTYpOworICAgICAgICBmb250LXdlaWdodDogYm9sZDsKKyAgICAgIH0KKyAgICAgICNjYW5jZWxfbGluayB7CisgICAgICAgIG1hcmdpbi1sZWZ0OiA0NXB4OworICAgICAgfQorICAgIDwvc3R5bGU+CisgICAgPHN0eWxlIGlkPSJnZXJyaXRfc2l0ZWNzcyIgdHlwZT0idGV4dC9jc3MiPjwvc3R5bGU+CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPGRpdiBpZD0iZ2Vycml0X3RvcG1lbnUiIHN0eWxlPSJoZWlnaHQ6NDVweDsiIGNsYXNzPSJnZXJyaXRUb3BNZW51Ij48L2Rpdj4KKyAgICA8ZGl2IGlkPSJnZXJyaXRfaGVhZGVyIj48L2Rpdj4KKyAgICA8ZGl2IGlkPSJnZXJyaXRfYm9keSIgY2xhc3M9ImdlcnJpdEJvZHkiPgorICAgICAgPGgxPlNpZ24gSW4gdG8gR2Vycml0IENvZGUgUmV2aWV3IGF0IDxzcGFuIGlkPSJob3N0TmFtZSI+ZXhhbXBsZS5jb208L3NwYW4+PC9oMT4KKyAgICAgIDxkaXYgaWQ9ImVycm9yX21lc3NhZ2UiPkludmFsaWQgdXNlcm5hbWUgb3IgcGFzc3dvcmQuPC9kaXY+CisgICAgICA8Zm9ybSBtZXRob2Q9IlBPU1QiIGFjdGlvbj0iIyIgaWQ9ImxvZ2luX2Zvcm0iPgorICAgICAgICA8dGFibGUgc3R5bGU9ImJvcmRlcjogMDsiPgorICAgICAgICA8dHI+CisgICAgICAgICAgPHRoPlVzZXJuYW1lPC90aD4KKyAgICAgICAgICA8dGQ+PGlucHV0IG5hbWU9InVzZXJuYW1lIiBpZD0iZl91c2VyIgorICAgICAgICAgICAgICAgICAgICAgdHlwZT0idGV4dCIKKyAgICAgICAgICAgICAgICAgICAgIHNpemU9IjI1IgorICAgICAgICAgICAgICAgICAgICAgdGFiaW5kZXg9IjEiIC8+PC90ZD4KKyAgICAgICAgPC90cj4KKyAgICAgICAgPHRyPgorICAgICAgICAgIDx0aD5QYXNzd29yZDwvdGg+CisgICAgICAgICAgPHRkPjxpbnB1dCBuYW1lPSJwYXNzd29yZCIgaWQ9ImZfcGFzcyIKKyAgICAgICAgICAgICAgICAgICAgIHR5cGU9InBhc3N3b3JkIgorICAgICAgICAgICAgICAgICAgICAgc2l6ZT0iMjUiCisgICAgICAgICAgICAgICAgICAgICB0YWJpbmRleD0iMiIgLz48L3RkPgorICAgICAgICA8L3RyPgorICAgICAgICA8dHI+CisgICAgICAgICAgPHRkPjwvdGQ+CisgICAgICAgICAgPHRkPgorICAgICAgICAgICAgPGlucHV0IG5hbWU9InJlbWVtYmVybWUiIGlkPSJmX3JlbWVtYmVyIgorICAgICAgICAgICAgICAgICAgIHR5cGU9ImNoZWNrYm94IgorICAgICAgICAgICAgICAgICAgIHZhbHVlPSIxIgorICAgICAgICAgICAgICAgICAgIHRhYmluZGV4PSIzIiAvPgorICAgICAgICAgICAgPGxhYmVsIGZvcj0iZl9yZW1lbWJlciI+UmVtZW1iZXIgbWU8L2xhYmVsPgorICAgICAgICAgIDwvdGQ+CisgICAgICAgIDwvdHI+CisgICAgICAgIDx0cj4KKyAgICAgICAgICA8dGQ+PC90ZD4KKyAgICAgICAgICA8dGQ+CisgICAgICAgICAgICA8aW5wdXQgdHlwZT0ic3VibWl0IiB2YWx1ZT0iU2lnbiBJbiIgdGFiaW5kZXg9IjQiLz4KKyAgICAgICAgICAgIDxhIGhyZWY9Ii4uLyIgaWQ9ImNhbmNlbF9saW5rIj5DYW5jZWw8L2E+CisgICAgICAgICAgPC90ZD4KKyAgICAgICAgPC90cj4KKyAgICAgICAgPC90YWJsZT4KKyAgICAgIDwvZm9ybT4KKyAgICAgIDxkaXYgc3R5bGU9ImNsZWFyOiBib3RoOyBtYXJnaW4tdG9wOiAxNXB4OyBwYWRkaW5nLXRvcDogMnB4OyBtYXJnaW4tYm90dG9tOiAxNXB4OyI+CisgICAgICAgIDxkaXYgaWQ9ImdlcnJpdF9mb290ZXIiPjwvZGl2PgorICAgICAgPC9kaXY+CisgICAgPC9kaXY+CisKKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisgICAgICB2YXIgbG9naW5fZm9ybSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdsb2dpbl9mb3JtJyk7CisgICAgICB2YXIgZl91c2VyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2ZfdXNlcicpOworICAgICAgdmFyIGZfcGFzcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdmX3Bhc3MnKTsKKyAgICAgIGZfdXNlci5vbmtleWRvd24gPSBmdW5jdGlvbihlKSB7CisgICAgICAgIGlmIChlLmtleUNvZGUgPT0gMTMpIHsKKyAgICAgICAgICBmX3Bhc3MuZm9jdXMoKTsKKyAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIGZfcGFzcy5vbmtleWRvd24gPSBmdW5jdGlvbihlKSB7CisgICAgICAgIGlmIChlLmtleUNvZGUgPT0gMTMpIHsKKyAgICAgICAgICBsb2dpbl9mb3JtLnN1Ym1pdCgpOworICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgZl91c2VyLmZvY3VzKCk7CisgICAgPC9zY3JpcHQ+CisgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0hvc3RQYWdlLmh0bWwgYi9nZXJyaXQtaHR0cGQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jhdy9Ib3N0UGFnZS5odG1sCmluZGV4IGZmMDlmNTAuLjkwNzQxNGYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0hvc3RQYWdlLmh0bWwKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvSG9zdFBhZ2UuaHRtbApAQCAtMiwxMCArMiwxMCBAQAogICA8aGVhZD4KICAgICA8dGl0bGU+R2Vycml0IENvZGUgUmV2aWV3PC90aXRsZT4KICAgICA8bWV0YSBuYW1lPSJnd3Q6cHJvcGVydHkiIGNvbnRlbnQ9ImxvY2FsZT1lbl9VUyIgLz4KLSAgICA8c2NyaXB0IGlkPSJnZXJyaXRfZ3d0ZGV2bW9kZSI+CisgICAgPHNjcmlwdCBpZD0iZ3d0ZGV2bW9kZSI+CiAgICAgICAoZnVuY3Rpb24gKCkgewogICAgICAgICB2YXIgcG4gPSAnZ3d0LmNvZGVzdnInOwotICAgICAgICB2YXIgY24gPSAnZ2Vycml0LicgKyBwbjsKKyAgICAgICAgdmFyIGNuID0gJ2dlcnJpdF91aS4nICsgcG47CiAKICAgICAgICAgdmFyIHBfc3RhcnQgPSB3aW5kb3cubG9jYXRpb24uc2VhcmNoLmluZGV4T2YocG4gKyAnPScpOwogICAgICAgICBpZiAocF9zdGFydCAhPSAtMSkgewpAQCAtMzIsNyArMzIsNyBAQAogICAgIDwvc2NyaXB0PgogICAgIDxzY3JpcHQgaWQ9ImdlcnJpdF9ob3N0cGFnZWRhdGEiPjwvc2NyaXB0PgogICAgIDxzdHlsZSAgaWQ9ImdlcnJpdF9zaXRlY3NzIiB0eXBlPSJ0ZXh0L2NzcyI+PC9zdHlsZT4KLSAgICA8bGluayByZWw9Imljb24iIHR5cGU9ImltYWdlL2dpZiIgaHJlZj0iZmF2aWNvbi5pY28iIC8+CisgICAgPGxpbmsgcmVsPSJzaG9ydGN1dCBpY29uIiB0eXBlPSJpbWFnZS94LWljb24iIGhyZWY9ImZhdmljb24uaWNvIiAvPgogICA8L2hlYWQ+CiAgIDxib2R5PgogICAgIDxkaXYgaWQ9ImdlcnJpdF90b3BtZW51Ij48L2Rpdj4KZGlmZiAtLWdpdCBhL2dlcnJpdC1odHRwZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvcmF3L0xlZ2FjeUdlcnJpdC5odG1sIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvTGVnYWN5R2Vycml0Lmh0bWwKaW5kZXggNTA1MGJmMi4uNjYzOWE1YiAxMDA2NDQKLS0tIGEvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvTGVnYWN5R2Vycml0Lmh0bWwKKysrIGIvZ2Vycml0LWh0dHBkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yYXcvTGVnYWN5R2Vycml0Lmh0bWwKQEAgLTEsNCArMSw0IEBACi08IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgNC4wMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi9SRUMtaHRtbDQwL3N0cmljdC5kdGQiPgorPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQvc3RyaWN0LmR0ZCI+CiA8aHRtbD4KICAgPGhlYWQ+CiAgICAgPHRpdGxlPkdlcnJpdCBDb2RlIFJldmlldzwvdGl0bGU+CmRpZmYgLS1naXQgYS9nZXJyaXQtaHR0cGQvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yZXN0YXBpL1BhcmFtZXRlclBhcnNlclRlc3QuamF2YSBiL2dlcnJpdC1odHRwZC9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL3Jlc3RhcGkvUGFyYW1ldGVyUGFyc2VyVGVzdC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZmYmM3ZjMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtaHR0cGQvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9yZXN0YXBpL1BhcmFtZXRlclBhcnNlclRlc3QuamF2YQpAQCAtMCwwICsxLDQ5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQucmVzdGFwaTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlTWFwOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5CYWRSZXF1ZXN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5Kc29uQXJyYXk7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25PYmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25QcmltaXRpdmU7CisKK2ltcG9ydCBqdW5pdC5mcmFtZXdvcmsuVGVzdENhc2U7CisKK3B1YmxpYyBjbGFzcyBQYXJhbWV0ZXJQYXJzZXJUZXN0IGV4dGVuZHMgVGVzdENhc2UgeworICBwdWJsaWMgdm9pZCB0ZXN0Q29udmVydEZvcm1Ub0pzb24oKSB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiB7CisgICAgSnNvbk9iamVjdCBvYmogPSBQYXJhbWV0ZXJQYXJzZXIuZm9ybVRvSnNvbigKKyAgICAgICAgSW1tdXRhYmxlTWFwLm9mKAorICAgICAgICAgICAgIm1lc3NhZ2UiLCBuZXcgU3RyaW5nW117InRoaXMuaXMudGV4dCJ9LAorICAgICAgICAgICAgImxhYmVscy5WZXJpZmllZCIsIG5ldyBTdHJpbmdbXXsiLTEifSwKKyAgICAgICAgICAgICJsYWJlbHMuQ29kZS1SZXZpZXciLCBuZXcgU3RyaW5nW117IjIifSwKKyAgICAgICAgICAgICJhX2xpc3QiLCBuZXcgU3RyaW5nW117ImEiLCAiYiJ9KSwKKyAgICAgICAgSW1tdXRhYmxlU2V0Lm9mKCJxIikpOworCisgICAgSnNvbk9iamVjdCBsYWJlbHMgPSBuZXcgSnNvbk9iamVjdCgpOworICAgIGxhYmVscy5hZGRQcm9wZXJ0eSgiVmVyaWZpZWQiLCAiLTEiKTsKKyAgICBsYWJlbHMuYWRkUHJvcGVydHkoIkNvZGUtUmV2aWV3IiwgIjIiKTsKKyAgICBKc29uQXJyYXkgbGlzdCA9IG5ldyBKc29uQXJyYXkoKTsKKyAgICBsaXN0LmFkZChuZXcgSnNvblByaW1pdGl2ZSgiYSIpKTsKKyAgICBsaXN0LmFkZChuZXcgSnNvblByaW1pdGl2ZSgiYiIpKTsKKyAgICBKc29uT2JqZWN0IGV4cCA9IG5ldyBKc29uT2JqZWN0KCk7CisgICAgZXhwLmFkZFByb3BlcnR5KCJtZXNzYWdlIiwgInRoaXMuaXMudGV4dCIpOworICAgIGV4cC5hZGQoImxhYmVscyIsIGxhYmVscyk7CisgICAgZXhwLmFkZCgiYV9saXN0IiwgbGlzdCk7CisKKyAgICBhc3NlcnRFcXVhbHMoZXhwLCBvYmopOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtbGF1bmNoZXIvcG9tLnhtbCBiL2dlcnJpdC1sYXVuY2hlci9wb20ueG1sCmluZGV4IGU3MDAzNTEuLjRmMzNjZTggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1sYXVuY2hlci9wb20ueG1sCisrKyBiL2dlcnJpdC1sYXVuY2hlci9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtbGF1bmNoZXI8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtbGF1bmNoZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9sYXVuY2hlci9HZXJyaXRMYXVuY2hlci5qYXZhIGIvZ2Vycml0LWxhdW5jaGVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvbGF1bmNoZXIvR2Vycml0TGF1bmNoZXIuamF2YQppbmRleCA5Y2NhNTU5Li5kNDljNmM3IDEwMDY0NAotLS0gYS9nZXJyaXQtbGF1bmNoZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9sYXVuY2hlci9HZXJyaXRMYXVuY2hlci5qYXZhCisrKyBiL2dlcnJpdC1sYXVuY2hlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2xhdW5jaGVyL0dlcnJpdExhdW5jaGVyLmphdmEKQEAgLTIwNiwyNyArMjA2LDEwIEBACiAgICAgICAgICAgZmluYWwgWmlwRW50cnkgemUgPSBlLm5leHRFbGVtZW50KCk7CiAgICAgICAgICAgaWYgKHplLmlzRGlyZWN0b3J5KCkpIHsKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgIH0KLQotICAgICAgICAgIGlmICh6ZS5nZXROYW1lKCkuc3RhcnRzV2l0aCgiV0VCLUlORi9saWIvIikpIHsKLSAgICAgICAgICAgIFN0cmluZyBuYW1lID0gemUuZ2V0TmFtZSgpLnN1YnN0cmluZygiV0VCLUlORi9saWIvIi5sZW5ndGgoKSk7Ci0gICAgICAgICAgICBmaW5hbCBGaWxlIHRtcCA9IGNyZWF0ZVRlbXBGaWxlKHNhZmVOYW1lKHplKSwgIi5qYXIiKTsKLSAgICAgICAgICAgIGZpbmFsIEZpbGVPdXRwdXRTdHJlYW0gb3V0ID0gbmV3IEZpbGVPdXRwdXRTdHJlYW0odG1wKTsKLSAgICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgIGZpbmFsIElucHV0U3RyZWFtIGluID0gemYuZ2V0SW5wdXRTdHJlYW0oemUpOwotICAgICAgICAgICAgICB0cnkgewotICAgICAgICAgICAgICAgIGZpbmFsIGJ5dGVbXSBidWYgPSBuZXcgYnl0ZVs0MDk2XTsKLSAgICAgICAgICAgICAgICBpbnQgbjsKLSAgICAgICAgICAgICAgICB3aGlsZSAoKG4gPSBpbi5yZWFkKGJ1ZiwgMCwgYnVmLmxlbmd0aCkpID4gMCkgewotICAgICAgICAgICAgICAgICAgb3V0LndyaXRlKGJ1ZiwgMCwgbik7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICB9IGZpbmFsbHkgewotICAgICAgICAgICAgICAgIGluLmNsb3NlKCk7Ci0gICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZmluYWxseSB7Ci0gICAgICAgICAgICAgIG91dC5jbG9zZSgpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgamFycy5wdXQobmFtZSwgdG1wLnRvVVJJKCkudG9VUkwoKSk7CisgICAgICAgICAgfSBlbHNlIGlmICh6ZS5nZXROYW1lKCkuc3RhcnRzV2l0aCgiV0VCLUlORi9saWIvIikpIHsKKyAgICAgICAgICAgIGV4dHJhY3RKYXIoemYsIHplLCBqYXJzKTsKKyAgICAgICAgICB9IGVsc2UgaWYgKHplLmdldE5hbWUoKS5zdGFydHNXaXRoKCJXRUItSU5GL3BnbS1saWIvIikpIHsKKyAgICAgICAgICAgIGV4dHJhY3RKYXIoemYsIHplLCBqYXJzKTsKICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgIH0gZmluYWxseSB7CkBAIC0yNDgsNyArMjMxLDcgQEAKICAgICBtb3ZlKGphcnMsICJqYXZheC5pbmplY3QtMS5qYXIiLCBleHRhcGkpOwogICAgIG1vdmUoamFycywgImFvcGFsbGlhbmNlLTEuMC5qYXIiLCBleHRhcGkpOwogICAgIG1vdmUoamFycywgImd1aWNlLXNlcnZsZXQtIiwgZXh0YXBpKTsKLSAgICBtb3ZlKGphcnMsICJzZXJ2bGV0LWFwaS0iLCBleHRhcGkpOworICAgIG1vdmUoamFycywgInRvbWNhdC1zZXJ2bGV0LWFwaS0iLCBleHRhcGkpOwogCiAgICAgQ2xhc3NMb2FkZXIgcGFyZW50ID0gQ2xhc3NMb2FkZXIuZ2V0U3lzdGVtQ2xhc3NMb2FkZXIoKTsKICAgICBpZiAoIWV4dGFwaS5pc0VtcHR5KCkpIHsKQEAgLTI2MSw2ICsyNDQsMzEgQEAKICAgICAgICAgcGFyZW50KTsKICAgfQogCisgIHByaXZhdGUgc3RhdGljIHZvaWQgZXh0cmFjdEphcihaaXBGaWxlIHpmLCBaaXBFbnRyeSB6ZSwKKyAgICAgIFNvcnRlZE1hcDxTdHJpbmcsIFVSTD4gamFycykgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBGaWxlIHRtcCA9IGNyZWF0ZVRlbXBGaWxlKHNhZmVOYW1lKHplKSwgIi5qYXIiKTsKKyAgICBGaWxlT3V0cHV0U3RyZWFtIG91dCA9IG5ldyBGaWxlT3V0cHV0U3RyZWFtKHRtcCk7CisgICAgdHJ5IHsKKyAgICAgIElucHV0U3RyZWFtIGluID0gemYuZ2V0SW5wdXRTdHJlYW0oemUpOworICAgICAgdHJ5IHsKKyAgICAgICAgYnl0ZVtdIGJ1ZiA9IG5ldyBieXRlWzQwOTZdOworICAgICAgICBpbnQgbjsKKyAgICAgICAgd2hpbGUgKChuID0gaW4ucmVhZChidWYsIDAsIGJ1Zi5sZW5ndGgpKSA+IDApIHsKKyAgICAgICAgICBvdXQud3JpdGUoYnVmLCAwLCBuKTsKKyAgICAgICAgfQorICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgaW4uY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9IGZpbmFsbHkgeworICAgICAgb3V0LmNsb3NlKCk7CisgICAgfQorCisgICAgU3RyaW5nIG5hbWUgPSB6ZS5nZXROYW1lKCk7CisgICAgamFycy5wdXQoCisgICAgICAgIG5hbWUuc3Vic3RyaW5nKG5hbWUubGFzdEluZGV4T2YoJy8nKSwgbmFtZS5sZW5ndGgoKSksCisgICAgICAgIHRtcC50b1VSSSgpLnRvVVJMKCkpOworICB9CisKICAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBtb3ZlKFNvcnRlZE1hcDxTdHJpbmcsIFVSTD4gamFycywKICAgICAgIFN0cmluZyBwcmVmaXgsCiAgICAgICBMaXN0PFVSTD4gZXh0YXBpKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtbWFpbi9wb20ueG1sIGIvZ2Vycml0LW1haW4vcG9tLnhtbAppbmRleCBiYjJkNzYzLi5kMTc0YWYxIDEwMDY0NAotLS0gYS9nZXJyaXQtbWFpbi9wb20ueG1sCisrKyBiL2dlcnJpdC1tYWluL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC1tYWluPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LW9wZW5pZC8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMucHJlZnMgYi9nZXJyaXQtb3BlbmlkLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5wcmVmcwppbmRleCBmOWZlMzQ1Li44MzlkNjQ3IDEwMDY0NAotLS0gYS9nZXJyaXQtb3BlbmlkLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5wcmVmcworKysgYi9nZXJyaXQtb3BlbmlkLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5wcmVmcwpAQCAtMSw0ICsxLDUgQEAKIGVjbGlwc2UucHJlZmVyZW5jZXMudmVyc2lvbj0xCiBlbmNvZGluZy8vc3JjL21haW4vamF2YT1VVEYtOAorZW5jb2RpbmcvL3NyYy9tYWluL3Jlc291cmNlcz1VVEYtOAogZW5jb2RpbmcvL3NyYy90ZXN0L2phdmE9VVRGLTgKIGVuY29kaW5nLzxwcm9qZWN0Pj1VVEYtOApkaWZmIC0tZ2l0IGEvZ2Vycml0LW9wZW5pZC9wb20ueG1sIGIvZ2Vycml0LW9wZW5pZC9wb20ueG1sCmluZGV4IDAxZTJlM2UuLmRiY2Q2YTggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1vcGVuaWQvcG9tLnhtbAorKysgYi9nZXJyaXQtb3BlbmlkL3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC1vcGVuaWQ8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvRGlzY292ZXJ5UmVzdWx0LmphdmEgYi9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvRGlzY292ZXJ5UmVzdWx0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzExZjI5YQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1vcGVuaWQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL29wZW5pZC9EaXNjb3ZlcnlSZXN1bHQuamF2YQpAQCAtMCwwICsxLDQ3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5vcGVuaWQ7CisKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitmaW5hbCBjbGFzcyBEaXNjb3ZlcnlSZXN1bHQgeworICBzdGF0aWMgZW51bSBTdGF0dXMgeworICAgIC8qKiBQcm92aWRlciB3YXMgZGlzY292ZXJlZCBhbmQge0Bjb2RlIHByb3ZpZGVyVXJsfSBpcyB2YWxpZC4gKi8KKyAgICBWQUxJRCwKKworICAgIC8qKiBJZGVudGlmaWVyIGlzbid0IGZvciBhbiBPcGVuSUQgcHJvdmlkZXIuICovCisgICAgTk9fUFJPVklERVIsCisKKyAgICAvKiogVGhlIHByb3ZpZGVyIHdhcyBkaXNjb3ZlcmVkLCBidXQgc29tZXRoaW5nIGVsc2UgZmFpbGVkLiAqLworICAgIEVSUk9SOworICB9CisKKyAgU3RhdHVzIHN0YXR1czsKKyAgU3RyaW5nIHByb3ZpZGVyVXJsOworICBNYXA8U3RyaW5nLCBTdHJpbmc+IHByb3ZpZGVyQXJnczsKKworICBEaXNjb3ZlcnlSZXN1bHQoKSB7CisgIH0KKworICBEaXNjb3ZlcnlSZXN1bHQoU3RyaW5nIHJlZGlyZWN0LCBNYXA8U3RyaW5nLCBTdHJpbmc+IGFyZ3MpIHsKKyAgICBzdGF0dXMgPSBTdGF0dXMuVkFMSUQ7CisgICAgcHJvdmlkZXJVcmwgPSByZWRpcmVjdDsKKyAgICBwcm92aWRlckFyZ3MgPSBhcmdzOworICB9CisKKyAgRGlzY292ZXJ5UmVzdWx0KFN0YXR1cyBzKSB7CisgICAgc3RhdHVzID0gczsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL0xvZ2luRm9ybS5qYXZhIGIvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL0xvZ2luRm9ybS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI4ZDMxZWUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvTG9naW5Gb3JtLmphdmEKQEAgLTAsMCArMSwzMTAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5hdXRoLm9wZW5pZDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVNYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGgub3BlbmlkLk9wZW5JZFVybHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5IdG1sRG9tVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC50ZW1wbGF0ZS5TaXRlSGVhZGVyRm9vdGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BdXRoVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkF1dGhDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworaW1wb3J0IG9yZy53M2MuZG9tLkRvY3VtZW50OworaW1wb3J0IG9yZy53M2MuZG9tLkVsZW1lbnQ7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CitpbXBvcnQgamF2YXguc2VydmxldC5TZXJ2bGV0T3V0cHV0U3RyZWFtOworaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5Db29raWU7CitpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0OworaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlcXVlc3Q7CitpbXBvcnQgamF2YXguc2VydmxldC5odHRwLkh0dHBTZXJ2bGV0UmVzcG9uc2U7CisKKy8qKiBIYW5kbGVzIE9wZW5JRCBiYXNlZCBsb2dpbiBmbG93LiAqLworQFN1cHByZXNzV2FybmluZ3MoInNlcmlhbCIpCitAU2luZ2xldG9uCitjbGFzcyBMb2dpbkZvcm0gZXh0ZW5kcyBIdHRwU2VydmxldCB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihMb2dpbkZvcm0uY2xhc3MpOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBJbW11dGFibGVNYXA8U3RyaW5nLCBTdHJpbmc+IEFMTF9QUk9WSURFUlMgPSBJbW11dGFibGVNYXAub2YoCisgICAgICAiZ29vZ2xlIiwgT3BlbklkVXJscy5VUkxfR09PR0xFLAorICAgICAgInlhaG9vIiwgT3BlbklkVXJscy5VUkxfWUFIT08pOworCisgIHByaXZhdGUgZmluYWwgSW1tdXRhYmxlU2V0PFN0cmluZz4gc3VnZ2VzdFByb3ZpZGVyczsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyOworICBwcml2YXRlIGZpbmFsIE9wZW5JZFNlcnZpY2VJbXBsIGltcGw7CisgIHByaXZhdGUgZmluYWwgaW50IG1heFJlZGlyZWN0VXJsTGVuZ3RoOworICBwcml2YXRlIGZpbmFsIFN0cmluZyBzc29Vcmw7CisgIHByaXZhdGUgZmluYWwgU2l0ZUhlYWRlckZvb3RlciBoZWFkZXI7CisKKyAgQEluamVjdAorICBMb2dpbkZvcm0oCisgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyLAorICAgICAgQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgY29uZmlnLAorICAgICAgQXV0aENvbmZpZyBhdXRoQ29uZmlnLAorICAgICAgT3BlbklkU2VydmljZUltcGwgaW1wbCwKKyAgICAgIFNpdGVIZWFkZXJGb290ZXIgaGVhZGVyKSB7CisgICAgdGhpcy51cmxQcm92aWRlciA9IHVybFByb3ZpZGVyOworICAgIHRoaXMuaW1wbCA9IGltcGw7CisgICAgdGhpcy5oZWFkZXIgPSBoZWFkZXI7CisgICAgdGhpcy5tYXhSZWRpcmVjdFVybExlbmd0aCA9IGNvbmZpZy5nZXRJbnQoCisgICAgICAgICJvcGVuaWQiLCAibWF4UmVkaXJlY3RVcmxMZW5ndGgiLAorICAgICAgICAxMCk7CisKKyAgICBpZiAoU3RyaW5ncy5pc051bGxPckVtcHR5KHVybFByb3ZpZGVyLmdldCgpKSkgeworICAgICAgbG9nLmVycm9yKCJnZXJyaXQuY2Fub25pY2FsV2ViVXJsIG11c3QgYmUgc2V0IGluIGdlcnJpdC5jb25maWciKTsKKyAgICB9CisKKyAgICBpZiAoYXV0aENvbmZpZy5nZXRBdXRoVHlwZSgpID09IEF1dGhUeXBlLk9QRU5JRF9TU08pIHsKKyAgICAgIHN1Z2dlc3RQcm92aWRlcnMgPSBJbW11dGFibGVTZXQub2YoKTsKKyAgICAgIHNzb1VybCA9IGF1dGhDb25maWcuZ2V0T3BlbklkU3NvVXJsKCk7CisgICAgfSBlbHNlIHsKKyAgICAgIFNldDxTdHJpbmc+IHByb3ZpZGVycyA9IFNldHMubmV3SGFzaFNldCgpOworICAgICAgZm9yIChNYXAuRW50cnk8U3RyaW5nLCBTdHJpbmc+IGUgOiBBTExfUFJPVklERVJTLmVudHJ5U2V0KCkpIHsKKyAgICAgICAgaWYgKGltcGwuaXNBbGxvd2VkT3BlbklEKGUuZ2V0VmFsdWUoKSkpIHsKKyAgICAgICAgICBwcm92aWRlcnMuYWRkKGUuZ2V0S2V5KCkpOworICAgICAgICB9CisgICAgICB9CisgICAgICBzdWdnZXN0UHJvdmlkZXJzID0gSW1tdXRhYmxlU2V0LmNvcHlPZihwcm92aWRlcnMpOworICAgICAgc3NvVXJsID0gbnVsbDsKKyAgICB9CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgZG9HZXQoSHR0cFNlcnZsZXRSZXF1ZXN0IHJlcSwgSHR0cFNlcnZsZXRSZXNwb25zZSByZXMpCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGlmIChzc29VcmwgIT0gbnVsbCkgeworICAgICAgU3RyaW5nIHRva2VuID0gZ2V0VG9rZW4ocmVxKTsKKyAgICAgIFNpZ25Jbk1vZGUgbW9kZTsKKyAgICAgIGlmIChQYWdlTGlua3MuUkVHSVNURVIuZXF1YWxzKHRva2VuKSkgeworICAgICAgICBtb2RlID0gU2lnbkluTW9kZS5SRUdJU1RFUjsKKyAgICAgICAgdG9rZW4gPSBQYWdlTGlua3MuTUlORTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIG1vZGUgPSBTaWduSW5Nb2RlLlNJR05fSU47CisgICAgICB9CisgICAgICBkaXNjb3ZlcihyZXEsIHJlcywgZmFsc2UsIHNzb1VybCwgZmFsc2UsIHRva2VuLCBtb2RlKTsKKyAgICB9IGVsc2UgeworICAgICAgU3RyaW5nIGlkID0gU3RyaW5ncy5udWxsVG9FbXB0eShyZXEuZ2V0UGFyYW1ldGVyKCJpZCIpKS50cmltKCk7CisgICAgICBpZiAoIWlkLmlzRW1wdHkoKSkgeworICAgICAgICBkb1Bvc3QocmVxLCByZXMpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgYm9vbGVhbiBsaW5rID0gcmVxLmdldFBhcmFtZXRlcigibGluayIpICE9IG51bGw7CisgICAgICAgIHNlbmRGb3JtKHJlcSwgcmVzLCBsaW5rLCBudWxsKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgZG9Qb3N0KEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKQorICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBib29sZWFuIGxpbmsgPSByZXEuZ2V0UGFyYW1ldGVyKCJsaW5rIikgIT0gbnVsbDsKKyAgICBTdHJpbmcgaWQgPSBTdHJpbmdzLm51bGxUb0VtcHR5KHJlcS5nZXRQYXJhbWV0ZXIoImlkIikpLnRyaW0oKTsKKyAgICBpZiAoaWQuaXNFbXB0eSgpKSB7CisgICAgICBzZW5kRm9ybShyZXEsIHJlcywgbGluaywgbnVsbCk7CisgICAgICByZXR1cm47CisgICAgfQorICAgIGlmICghaWQuc3RhcnRzV2l0aCgiaHR0cDovLyIpICYmICFpZC5zdGFydHNXaXRoKCJodHRwczovLyIpKSB7CisgICAgICBpZCA9ICJodHRwOi8vIiArIGlkOworICAgIH0KKyAgICBpZiAoKHNzb1VybCAhPSBudWxsICYmICFzc29VcmwuZXF1YWxzKGlkKSkgfHwgIWltcGwuaXNBbGxvd2VkT3BlbklEKGlkKSkgeworICAgICAgc2VuZEZvcm0ocmVxLCByZXMsIGxpbmssICJPcGVuSUQgcHJvdmlkZXIgbm90IHBlcm1pdHRlZCBieSBzaXRlIHBvbGljeS4iKTsKKyAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBib29sZWFuIHJlbWVtYmVyID0gIjEiLmVxdWFscyhyZXEuZ2V0UGFyYW1ldGVyKCJyZW1lbWJlcm1lIikpOworICAgIFN0cmluZyB0b2tlbiA9IGdldFRva2VuKHJlcSk7CisgICAgU2lnbkluTW9kZSBtb2RlOworICAgIGlmIChsaW5rKSB7CisgICAgICBtb2RlID0gU2lnbkluTW9kZS5MSU5LX0lERU5USVk7CisgICAgfSBlbHNlIGlmIChQYWdlTGlua3MuUkVHSVNURVIuZXF1YWxzKHRva2VuKSkgeworICAgICAgbW9kZSA9IFNpZ25Jbk1vZGUuUkVHSVNURVI7CisgICAgICB0b2tlbiA9IFBhZ2VMaW5rcy5NSU5FOworICAgIH0gZWxzZSB7CisgICAgICBtb2RlID0gU2lnbkluTW9kZS5TSUdOX0lOOworICAgIH0KKworICAgIGRpc2NvdmVyKHJlcSwgcmVzLCBsaW5rLCBpZCwgcmVtZW1iZXIsIHRva2VuLCBtb2RlKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBkaXNjb3ZlcihIdHRwU2VydmxldFJlcXVlc3QgcmVxLCBIdHRwU2VydmxldFJlc3BvbnNlIHJlcywKKyAgICAgIGJvb2xlYW4gbGluaywgU3RyaW5nIGlkLCBib29sZWFuIHJlbWVtYmVyLCBTdHJpbmcgdG9rZW4sIFNpZ25Jbk1vZGUgbW9kZSkKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgaWYgKHNzb1VybCAhPSBudWxsKSB7CisgICAgICByZW1lbWJlciA9IGZhbHNlOworICAgIH0KKworICAgIERpc2NvdmVyeVJlc3VsdCByID0gaW1wbC5kaXNjb3ZlcihpZCwgbW9kZSwgcmVtZW1iZXIsIHRva2VuKTsKKyAgICBzd2l0Y2ggKHIuc3RhdHVzKSB7CisgICAgICBjYXNlIFZBTElEOgorICAgICAgICByZWRpcmVjdChyLCByZXMpOworICAgICAgICBicmVhazsKKworICAgICAgY2FzZSBOT19QUk9WSURFUjoKKyAgICAgICAgc2VuZEZvcm0ocmVxLCByZXMsIGxpbmssCisgICAgICAgICAgICAiUHJvdmlkZXIgaXMgbm90IHN1cHBvcnRlZCwgb3Igd2FzIGluY29ycmVjdGx5IGVudGVyZWQuIik7CisgICAgICAgIGJyZWFrOworCisgICAgICBjYXNlIEVSUk9SOgorICAgICAgICBzZW5kRm9ybShyZXEsIHJlcywgbGluaywgIlVuYWJsZSB0byBjb25uZWN0IHdpdGggT3BlbklEIHByb3ZpZGVyLiIpOworICAgICAgICBicmVhazsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgcmVkaXJlY3QoRGlzY292ZXJ5UmVzdWx0IHIsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzKQorICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBTdHJpbmdCdWlsZGVyIHVybCA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgdXJsLmFwcGVuZChyLnByb3ZpZGVyVXJsKTsKKyAgICBpZiAoci5wcm92aWRlckFyZ3MgIT0gbnVsbCAmJiAhci5wcm92aWRlckFyZ3MuaXNFbXB0eSgpKSB7CisgICAgICBib29sZWFuIGZpcnN0ID0gdHJ1ZTsKKyAgICAgIGZvcihNYXAuRW50cnk8U3RyaW5nLCBTdHJpbmc+IGFyZyA6IHIucHJvdmlkZXJBcmdzLmVudHJ5U2V0KCkpIHsKKyAgICAgICAgaWYgKGZpcnN0KSB7CisgICAgICAgICAgdXJsLmFwcGVuZCgnPycpOworICAgICAgICAgIGZpcnN0ID0gZmFsc2U7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgdXJsLmFwcGVuZCgnJicpOworICAgICAgICB9CisgICAgICAgIHVybC5hcHBlbmQoVXJsLmVuY29kZShhcmcuZ2V0S2V5KCkpKQorICAgICAgICAgICAuYXBwZW5kKCc9JykKKyAgICAgICAgICAgLmFwcGVuZChVcmwuZW5jb2RlKGFyZy5nZXRWYWx1ZSgpKSk7CisgICAgICB9CisgICAgfQorICAgIGlmICh1cmwubGVuZ3RoKCkgPD0gbWF4UmVkaXJlY3RVcmxMZW5ndGgpIHsKKyAgICAgIHJlcy5zZW5kUmVkaXJlY3QodXJsLnRvU3RyaW5nKCkpOworICAgICAgcmV0dXJuOworICAgIH0KKworICAgIERvY3VtZW50IGRvYyA9IEh0bWxEb21VdGlsLnBhcnNlRmlsZShMb2dpbkZvcm0uY2xhc3MsICJSZWRpcmVjdEZvcm0uaHRtbCIpOworICAgIEVsZW1lbnQgZm9ybSA9IEh0bWxEb21VdGlsLmZpbmQoZG9jLCAicmVkaXJlY3RfZm9ybSIpOworICAgIGZvcm0uc2V0QXR0cmlidXRlKCJhY3Rpb24iLCByLnByb3ZpZGVyVXJsKTsKKyAgICBpZiAoci5wcm92aWRlckFyZ3MgIT0gbnVsbCAmJiAhci5wcm92aWRlckFyZ3MuaXNFbXB0eSgpKSB7CisgICAgICBmb3IgKE1hcC5FbnRyeTxTdHJpbmcsIFN0cmluZz4gYXJnIDogci5wcm92aWRlckFyZ3MuZW50cnlTZXQoKSkgeworICAgICAgICBFbGVtZW50IGluID0gZG9jLmNyZWF0ZUVsZW1lbnQoImlucHV0Iik7CisgICAgICAgIGluLnNldEF0dHJpYnV0ZSgidHlwZSIsICJoaWRkZW4iKTsKKyAgICAgICAgaW4uc2V0QXR0cmlidXRlKCJuYW1lIiwgYXJnLmdldEtleSgpKTsKKyAgICAgICAgaW4uc2V0QXR0cmlidXRlKCJ2YWx1ZSIsIGFyZy5nZXRWYWx1ZSgpKTsKKyAgICAgICAgZm9ybS5hcHBlbmRDaGlsZChpbik7CisgICAgICB9CisgICAgfQorICAgIHNlbmRIdG1sKHJlcywgZG9jKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBnZXRUb2tlbihIdHRwU2VydmxldFJlcXVlc3QgcmVxKSB7CisgICAgU3RyaW5nIHRva2VuID0gcmVxLmdldFBhdGhJbmZvKCk7CisgICAgaWYgKHRva2VuID09IG51bGwgfHwgdG9rZW4uaXNFbXB0eSgpKSB7CisgICAgICB0b2tlbiA9IFBhZ2VMaW5rcy5NSU5FOworICAgIH0gZWxzZSBpZiAoIXRva2VuLnN0YXJ0c1dpdGgoIi8iKSkgeworICAgICAgdG9rZW4gPSAiLyIgKyB0b2tlbjsKKyAgICB9CisgICAgcmV0dXJuIHRva2VuOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHNlbmRGb3JtKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcmVzLAorICAgICAgYm9vbGVhbiBsaW5rLCBATnVsbGFibGUgU3RyaW5nIGVycm9yTWVzc2FnZSkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBTdHJpbmcgc2VsZiA9IHJlcS5nZXRSZXF1ZXN0VVJJKCk7CisgICAgU3RyaW5nIGNhbmNlbCA9IE9iamVjdHMuZmlyc3ROb25OdWxsKHVybFByb3ZpZGVyLmdldCgpLCAiLyIpOworICAgIFN0cmluZyB0b2tlbiA9IGdldFRva2VuKHJlcSk7CisgICAgaWYgKCF0b2tlbi5lcXVhbHMoIi8iKSkgeworICAgICAgY2FuY2VsICs9ICIjIiArIHRva2VuOworICAgIH0KKworICAgIERvY3VtZW50IGRvYyA9IGhlYWRlci5wYXJzZShMb2dpbkZvcm0uY2xhc3MsICJMb2dpbkZvcm0uaHRtbCIpOworICAgIEh0bWxEb21VdGlsLmZpbmQoZG9jLCAiaG9zdE5hbWUiKS5zZXRUZXh0Q29udGVudChyZXEuZ2V0U2VydmVyTmFtZSgpKTsKKyAgICBIdG1sRG9tVXRpbC5maW5kKGRvYywgImxvZ2luX2Zvcm0iKS5zZXRBdHRyaWJ1dGUoImFjdGlvbiIsIHNlbGYpOworICAgIEh0bWxEb21VdGlsLmZpbmQoZG9jLCAiY2FuY2VsX2xpbmsiKS5zZXRBdHRyaWJ1dGUoImhyZWYiLCBjYW5jZWwpOworCisgICAgaWYgKCFsaW5rIHx8IHNzb1VybCAhPSBudWxsKSB7CisgICAgICBFbGVtZW50IGlucHV0ID0gSHRtbERvbVV0aWwuZmluZChkb2MsICJmX2xpbmsiKTsKKyAgICAgIGlucHV0LmdldFBhcmVudE5vZGUoKS5yZW1vdmVDaGlsZChpbnB1dCk7CisgICAgfQorCisgICAgU3RyaW5nIGxhc3QgPSBnZXRMYXN0SWQocmVxKTsKKyAgICBpZiAobGFzdCAhPSBudWxsKSB7CisgICAgICBIdG1sRG9tVXRpbC5maW5kKGRvYywgImZfb3BlbmlkIikuc2V0QXR0cmlidXRlKCJ2YWx1ZSIsIGxhc3QpOworICAgIH0KKworICAgIEVsZW1lbnQgZW1zZyA9IEh0bWxEb21VdGlsLmZpbmQoZG9jLCAiZXJyb3JfbWVzc2FnZSIpOworICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkoZXJyb3JNZXNzYWdlKSkgeworICAgICAgZW1zZy5nZXRQYXJlbnROb2RlKCkucmVtb3ZlQ2hpbGQoZW1zZyk7CisgICAgfSBlbHNlIHsKKyAgICAgIGVtc2cuc2V0VGV4dENvbnRlbnQoZXJyb3JNZXNzYWdlKTsKKyAgICB9CisKKyAgICBmb3IgKFN0cmluZyBuYW1lIDogQUxMX1BST1ZJREVSUy5rZXlTZXQoKSkgeworICAgICAgRWxlbWVudCBkaXYgPSBIdG1sRG9tVXRpbC5maW5kKGRvYywgInByb3ZpZGVyXyIgKyBuYW1lKTsKKyAgICAgIGlmIChkaXYgPT0gbnVsbCkgeworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKyAgICAgIGlmICghc3VnZ2VzdFByb3ZpZGVycy5jb250YWlucyhuYW1lKSkgeworICAgICAgICBkaXYuZ2V0UGFyZW50Tm9kZSgpLnJlbW92ZUNoaWxkKGRpdik7CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorICAgICAgRWxlbWVudCBhID0gSHRtbERvbVV0aWwuZmluZChkaXYsICJpZF8iICsgbmFtZSk7CisgICAgICBpZiAoYSA9PSBudWxsKSB7CisgICAgICAgIGRpdi5nZXRQYXJlbnROb2RlKCkucmVtb3ZlQ2hpbGQoZGl2KTsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgICBTdHJpbmdCdWlsZGVyIHUgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgdS5hcHBlbmQoc2VsZikuYXBwZW5kKGEuZ2V0QXR0cmlidXRlKCJocmVmIikpOworICAgICAgaWYgKGxpbmspIHsKKyAgICAgICAgdS5hcHBlbmQoIiZsaW5rIik7CisgICAgICB9CisgICAgICBhLnNldEF0dHJpYnV0ZSgiaHJlZiIsIHUudG9TdHJpbmcoKSk7CisgICAgfQorICAgIHNlbmRIdG1sKHJlcywgZG9jKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBzZW5kSHRtbChIdHRwU2VydmxldFJlc3BvbnNlIHJlcywgRG9jdW1lbnQgZG9jKQorICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICBieXRlW10gYmluID0gSHRtbERvbVV0aWwudG9VVEY4KGRvYyk7CisgICAgcmVzLnNldFN0YXR1cyhIdHRwU2VydmxldFJlc3BvbnNlLlNDX1VOQVVUSE9SSVpFRCk7CisgICAgcmVzLnNldENvbnRlbnRUeXBlKCJ0ZXh0L2h0bWwiKTsKKyAgICByZXMuc2V0Q2hhcmFjdGVyRW5jb2RpbmcoIlVURi04Iik7CisgICAgcmVzLnNldENvbnRlbnRMZW5ndGgoYmluLmxlbmd0aCk7CisgICAgU2VydmxldE91dHB1dFN0cmVhbSBvdXQgPSByZXMuZ2V0T3V0cHV0U3RyZWFtKCk7CisgICAgdHJ5IHsKKyAgICAgIG91dC53cml0ZShiaW4pOworICAgIH0gZmluYWxseSB7CisgICAgICBvdXQuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZ2V0TGFzdElkKEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEpIHsKKyAgICBDb29raWVbXSBjb29raWVzID0gcmVxLmdldENvb2tpZXMoKTsKKyAgICBpZiAoY29va2llcyAhPSBudWxsKSB7CisgICAgICBmb3IgKENvb2tpZSBjIDogY29va2llcykgeworICAgICAgICBpZiAoT3BlbklkVXJscy5MQVNUSURfQ09PS0lFLmVxdWFscyhjLmdldE5hbWUoKSkpIHsKKyAgICAgICAgICByZXR1cm4gYy5nZXRWYWx1ZSgpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBudWxsOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvT3BlbklkTG9naW5TZXJ2bGV0LmphdmEgYi9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvT3BlbklkTG9naW5TZXJ2bGV0LmphdmEKaW5kZXggY2ZiNzY3ZC4uNGNiYjIyZiAxMDA2NDQKLS0tIGEvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL09wZW5JZExvZ2luU2VydmxldC5qYXZhCisrKyBiL2dlcnJpdC1vcGVuaWQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL29wZW5pZC9PcGVuSWRMb2dpblNlcnZsZXQuamF2YQpAQCAtMTQsNiArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLmF1dGgub3BlbmlkOwogCitpbXBvcnQgY29tLmdvb2dsZS5nd3RleHB1aS5zZXJ2ZXIuQ2FjaGVIZWFkZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKQEAgLTQ0LDkgKzQ1LDcgQEAKICAgcHVibGljIHZvaWQgZG9Qb3N0KGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIGZpbmFsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcnNwKQogICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICB0cnkgewotICAgICAgcnNwLnNldEhlYWRlcigiRXhwaXJlcyIsICJGcmksIDAxIEphbiAxOTgwIDAwOjAwOjAwIEdNVCIpOwotICAgICAgcnNwLnNldEhlYWRlcigiUHJhZ21hIiwgIm5vLWNhY2hlIik7Ci0gICAgICByc3Auc2V0SGVhZGVyKCJDYWNoZS1Db250cm9sIiwgIm5vLWNhY2hlLCBtdXN0LXJldmFsaWRhdGUiKTsKKyAgICAgIENhY2hlSGVhZGVycy5zZXROb3RDYWNoZWFibGUocnNwKTsKICAgICAgIGltcGwuZG9BdXRoKHJlcSwgcnNwKTsKICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgewogICAgICAgZ2V0U2VydmxldENvbnRleHQoKS5sb2coIlVuZXhwZWN0ZWQgZXJyb3IgZHVyaW5nIGF1dGhlbnRpY2F0aW9uIiwgZSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvT3BlbklkTW9kdWxlLmphdmEgYi9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvT3BlbklkTW9kdWxlLmphdmEKaW5kZXggYTkyOGNiOC4uYzg3YTBjZiAxMDA2NDQKLS0tIGEvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL09wZW5JZE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1vcGVuaWQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL29wZW5pZC9PcGVuSWRNb2R1bGUuamF2YQpAQCAtMTQsMjIgKzE0LDE2IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuYXV0aC5vcGVuaWQ7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5ycGMuUnBjU2VydmxldE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zZXJ2bGV0LlNlcnZsZXRNb2R1bGU7CiAKLS8qKiBTZXJ2bGV0cyBhbmQgUlBDIHN1cHBvcnQgcmVsYXRlZCB0byBPcGVuSUQgYXV0aGVudGljYXRpb24uICovCisvKiogU2VydmxldHMgcmVsYXRlZCB0byBPcGVuSUQgYXV0aGVudGljYXRpb24uICovCiBwdWJsaWMgY2xhc3MgT3BlbklkTW9kdWxlIGV4dGVuZHMgU2VydmxldE1vZHVsZSB7CiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmVTZXJ2bGV0cygpIHsKKyAgICBzZXJ2ZSgiL2xvZ2luIiwgIi9sb2dpbi8qIikud2l0aChMb2dpbkZvcm0uY2xhc3MpOwogICAgIHNlcnZlKCIvIiArIE9wZW5JZFNlcnZpY2VJbXBsLlJFVFVSTl9VUkwpLndpdGgoT3BlbklkTG9naW5TZXJ2bGV0LmNsYXNzKTsKICAgICBzZXJ2ZSgiLyIgKyBYcmRzU2VydmxldC5MT0NBVElPTikud2l0aChYcmRzU2VydmxldC5jbGFzcyk7CiAgICAgZmlsdGVyKCIvIikudGhyb3VnaChYcmRzRmlsdGVyLmNsYXNzKTsKLQotICAgIGluc3RhbGwobmV3IFJwY1NlcnZsZXRNb2R1bGUoUnBjU2VydmxldE1vZHVsZS5QUkVGSVgpIHsKLSAgICAgIEBPdmVycmlkZQotICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlU2VydmxldHMoKSB7Ci0gICAgICAgIHJwYyhPcGVuSWRTZXJ2aWNlSW1wbC5jbGFzcyk7Ci0gICAgICB9Ci0gICAgfSk7CisgICAgYmluZChPcGVuSWRTZXJ2aWNlSW1wbC5jbGFzcyk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1vcGVuaWQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL29wZW5pZC9PcGVuSWRTZXJ2aWNlSW1wbC5qYXZhIGIvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL09wZW5JZFNlcnZpY2VJbXBsLmphdmEKaW5kZXggMDlhNWQxMC4uNTJmM2IwMyAxMDA2NDQKLS0tIGEvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL09wZW5JZFNlcnZpY2VJbXBsLmphdmEKKysrIGIvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL09wZW5JZFNlcnZpY2VJbXBsLmphdmEKQEAgLTE1LDEwICsxNSw2IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLmF1dGgub3BlbmlkOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5TaWduSW5Nb2RlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZC5EaXNjb3ZlcnlSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmF1dGgub3BlbmlkLk9wZW5JZFByb3ZpZGVyUGF0dGVybjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5vcGVuaWQuT3BlbklkU2VydmljZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uYXV0aC5vcGVuaWQuT3BlbklkVXJsczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5XZWJTZXNzaW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwpAQCAtMjYsMTIgKzIyLDExIEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLlVybEVuY29kZWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50TWFuYWdlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BdXRoTWV0aG9kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoLm9wZW5pZC5PcGVuSWRQcm92aWRlclBhdHRlcm47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BdXRoQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ2Fub25pY2FsV2ViVXJsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ29uZmlnVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuY29tbW9uLkFzeW5jQ2FsbGJhY2s7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LktleVV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwpAQCAtNzQsNyArNjksNyBAQAogaW1wb3J0IGphdmF4LnNlcnZsZXQuaHR0cC5IdHRwU2VydmxldFJlc3BvbnNlOwogCiBAU2luZ2xldG9uCi1jbGFzcyBPcGVuSWRTZXJ2aWNlSW1wbCBpbXBsZW1lbnRzIE9wZW5JZFNlcnZpY2UgeworY2xhc3MgT3BlbklkU2VydmljZUltcGwgewogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0KICAgICAgIExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKE9wZW5JZFNlcnZpY2VJbXBsLmNsYXNzKTsKIApAQCAtMTAyLDYgKzk3LDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50TWFuYWdlciBhY2NvdW50TWFuYWdlcjsKICAgcHJpdmF0ZSBmaW5hbCBDb25zdW1lck1hbmFnZXIgbWFuYWdlcjsKICAgcHJpdmF0ZSBmaW5hbCBMaXN0PE9wZW5JZFByb3ZpZGVyUGF0dGVybj4gYWxsb3dlZE9wZW5JRHM7CisgIHByaXZhdGUgZmluYWwgTGlzdDxTdHJpbmc+IG9wZW5JZERvbWFpbnM7CiAKICAgLyoqIE1heGltdW0gYWdlLCBpbiBzZWNvbmRzLCBiZWZvcmUgZm9yY2luZyByZS1hdXRoZW50aWNhdGlvbiBvZiBhY2NvdW50LiAqLwogICBwcml2YXRlIGZpbmFsIGludCBwYXBlTWF4QXV0aEFnZTsKQEAgLTE0MywyNCArMTM5LDE4IEBACiAgICAgYWNjb3VudE1hbmFnZXIgPSBhbTsKICAgICBtYW5hZ2VyID0gbmV3IENvbnN1bWVyTWFuYWdlcigpOwogICAgIGFsbG93ZWRPcGVuSURzID0gYWMuZ2V0QWxsb3dlZE9wZW5JRHMoKTsKKyAgICBvcGVuSWREb21haW5zID0gYWMuZ2V0T3BlbklkRG9tYWlucygpOwogICAgIHBhcGVNYXhBdXRoQWdlID0gKGludCkgQ29uZmlnVXRpbC5nZXRUaW1lVW5pdChjb25maWcsIC8vCiAgICAgICAgICJhdXRoIiwgbnVsbCwgIm1heE9wZW5JZFNlc3Npb25BZ2UiLCAtMSwgVGltZVVuaXQuU0VDT05EUyk7CiAgIH0KIAogICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKLSAgcHVibGljIHZvaWQgZGlzY292ZXIoZmluYWwgU3RyaW5nIG9wZW5pZElkZW50aWZpZXIsIGZpbmFsIFNpZ25Jbk1vZGUgbW9kZSwKLSAgICAgIGZpbmFsIGJvb2xlYW4gcmVtZW1iZXIsIGZpbmFsIFN0cmluZyByZXR1cm5Ub2tlbiwKLSAgICAgIGZpbmFsIEFzeW5jQ2FsbGJhY2s8RGlzY292ZXJ5UmVzdWx0PiBjYikgewotICAgIGlmICghaXNBbGxvd2VkT3BlbklEKG9wZW5pZElkZW50aWZpZXIpKSB7Ci0gICAgICBjYi5vblN1Y2Nlc3MobmV3IERpc2NvdmVyeVJlc3VsdChEaXNjb3ZlcnlSZXN1bHQuU3RhdHVzLk5PVF9BTExPV0VEKSk7Ci0gICAgICByZXR1cm47Ci0gICAgfQotCisgIERpc2NvdmVyeVJlc3VsdCBkaXNjb3ZlcihmaW5hbCBTdHJpbmcgb3BlbmlkSWRlbnRpZmllciwgZmluYWwgU2lnbkluTW9kZSBtb2RlLAorICAgICAgZmluYWwgYm9vbGVhbiByZW1lbWJlciwgZmluYWwgU3RyaW5nIHJldHVyblRva2VuKSB7CiAgICAgZmluYWwgU3RhdGUgc3RhdGU7CiAgICAgc3RhdGUgPSBpbml0KG9wZW5pZElkZW50aWZpZXIsIG1vZGUsIHJlbWVtYmVyLCByZXR1cm5Ub2tlbik7CiAgICAgaWYgKHN0YXRlID09IG51bGwpIHsKLSAgICAgIGNiLm9uU3VjY2VzcyhuZXcgRGlzY292ZXJ5UmVzdWx0KERpc2NvdmVyeVJlc3VsdC5TdGF0dXMuTk9fUFJPVklERVIpKTsKLSAgICAgIHJldHVybjsKKyAgICAgIHJldHVybiBuZXcgRGlzY292ZXJ5UmVzdWx0KERpc2NvdmVyeVJlc3VsdC5TdGF0dXMuTk9fUFJPVklERVIpOwogICAgIH0KIAogICAgIGZpbmFsIEF1dGhSZXF1ZXN0IGFSZXE7CkBAIC0xODgsMTYgKzE3OCwxNSBAQAogICAgICAgfQogICAgIH0gY2F0Y2ggKE1lc3NhZ2VFeGNlcHRpb24gZSkgewogICAgICAgbG9nLmVycm9yKCJDYW5ub3QgY3JlYXRlIE9wZW5JRCByZWRpcmVjdCBmb3IgIiArIG9wZW5pZElkZW50aWZpZXIsIGUpOwotICAgICAgY2Iub25TdWNjZXNzKG5ldyBEaXNjb3ZlcnlSZXN1bHQoRGlzY292ZXJ5UmVzdWx0LlN0YXR1cy5FUlJPUikpOwotICAgICAgcmV0dXJuOworICAgICAgcmV0dXJuIG5ldyBEaXNjb3ZlcnlSZXN1bHQoRGlzY292ZXJ5UmVzdWx0LlN0YXR1cy5FUlJPUik7CiAgICAgfSBjYXRjaCAoQ29uc3VtZXJFeGNlcHRpb24gZSkgewogICAgICAgbG9nLmVycm9yKCJDYW5ub3QgY3JlYXRlIE9wZW5JRCByZWRpcmVjdCBmb3IgIiArIG9wZW5pZElkZW50aWZpZXIsIGUpOwotICAgICAgY2Iub25TdWNjZXNzKG5ldyBEaXNjb3ZlcnlSZXN1bHQoRGlzY292ZXJ5UmVzdWx0LlN0YXR1cy5FUlJPUikpOwotICAgICAgcmV0dXJuOworICAgICAgcmV0dXJuIG5ldyBEaXNjb3ZlcnlSZXN1bHQoRGlzY292ZXJ5UmVzdWx0LlN0YXR1cy5FUlJPUik7CiAgICAgfQogCi0gICAgY2Iub25TdWNjZXNzKG5ldyBEaXNjb3ZlcnlSZXN1bHQoYVJlcS5nZXREZXN0aW5hdGlvblVybChmYWxzZSksIC8vCi0gICAgICAgIGFSZXEuZ2V0UGFyYW1ldGVyTWFwKCkpKTsKKyAgICByZXR1cm4gbmV3IERpc2NvdmVyeVJlc3VsdCgKKyAgICAgICAgYVJlcS5nZXREZXN0aW5hdGlvblVybChmYWxzZSksCisgICAgICAgIGFSZXEuZ2V0UGFyYW1ldGVyTWFwKCkpOwogICB9CiAKICAgcHJpdmF0ZSBib29sZWFuIHJlcXVlc3RSZWdpc3RyYXRpb24oZmluYWwgQXV0aFJlcXVlc3QgYVJlcSkgewpAQCAtMjA4LDcgKzE5Nyw2IEBACiAgICAgICAvLyByZWdpc3RyYXRpb24gaW5mb3JtYXRpb24sIGluIGNhc2UgdGhlIGlkZW50aXR5IGlzIG5ldyB0byB1cy4KICAgICAgIC8vCiAgICAgICByZXR1cm4gdHJ1ZTsKLQogICAgIH0KIAogICAgIC8vIFdlIG1pZ2h0IGFscmVhZHkgaGF2ZSB0aGlzIGFjY291bnQgb24gZmlsZS4gTG9vayBmb3IgaXQuCkBAIC0yMjEsNyArMjA5LDcgQEAKICAgICB9CiAgIH0KIAotICAvKiogQ2FsbGVkIGJ5IHtAbGluayBPcGVuSWRMb2dpblNlcnZsZXR9IGRvR2V0LCBkb1Bvc3QgKi8KKyAgLyoqIENhbGxlZCBieSB7QGxpbmsgT3BlbklkTG9naW5Gb3JtfSBkb0dldCwgZG9Qb3N0ICovCiAgIHZvaWQgZG9BdXRoKGZpbmFsIEh0dHBTZXJ2bGV0UmVxdWVzdCByZXEsIGZpbmFsIEh0dHBTZXJ2bGV0UmVzcG9uc2UgcnNwKQogICAgICAgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgaWYgKE9NT0RFX0NBTkNFTC5lcXVhbHMocmVxLmdldFBhcmFtZXRlcihPUEVOSURfTU9ERSkpKSB7CkBAIC0zNTYsNiArMzQ0LDMyIEBACiAgICAgICBhcmVxLnNldEVtYWlsQWRkcmVzcyhmZXRjaFJzcC5nZXRBdHRyaWJ1dGVWYWx1ZSgiRW1haWwiKSk7CiAgICAgfQogCisgICAgaWYgKG9wZW5JZERvbWFpbnMgIT0gbnVsbCAmJiBvcGVuSWREb21haW5zLnNpemUoKSA+IDApIHsKKyAgICAgIC8vIEFkbWluaXN0cmF0b3IgbGltaXRlZCBlbWFpbCBkb21haW5zLCB3aGljaCBjYW4gYmUgdXNlZCBmb3IgT3BlbklELgorICAgICAgLy8gTG9naW4gcHJvY2VzcyB3aWxsIG9ubHkgd29yayBpZiB0aGUgcGFzc2VkIGVtYWlsIG1hdGNoZXMgb25lCisgICAgICAvLyBvZiB0aGVzZSBkb21haW5zLgorICAgICAgLy8KKyAgICAgIGZpbmFsIFN0cmluZyBlbWFpbCA9IGFyZXEuZ2V0RW1haWxBZGRyZXNzKCk7CisgICAgICBpbnQgZW1haWxBdEluZGV4ID0gZW1haWwubGFzdEluZGV4T2YoIkAiKTsKKyAgICAgIGlmIChlbWFpbEF0SW5kZXggPj0gMCAmJiBlbWFpbEF0SW5kZXggPCBlbWFpbC5sZW5ndGgoKSAtIDEpIHsKKyAgICAgICAgZmluYWwgU3RyaW5nIGVtYWlsRG9tYWluID0gZW1haWwuc3Vic3RyaW5nKGVtYWlsQXRJbmRleCk7CisKKyAgICAgICAgYm9vbGVhbiBtYXRjaCA9IGZhbHNlOworICAgICAgICBmb3IgKFN0cmluZyBkb21haW4gOiBvcGVuSWREb21haW5zKSB7CisgICAgICAgICAgaWYgKGVtYWlsRG9tYWluLmVxdWFsc0lnbm9yZUNhc2UoZG9tYWluKSkgeworICAgICAgICAgICAgbWF0Y2ggPSB0cnVlOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgaWYgKCFtYXRjaCkgeworICAgICAgICAgIGxvZy5lcnJvcigiRG9tYWluIGRpc2FsbG93ZWQ6ICIgKyBlbWFpbERvbWFpbik7CisgICAgICAgICAgY2FuY2VsV2l0aEVycm9yKHJlcSwgcnNwLCAiRG9tYWluIGRpc2FsbG93ZWQiKTsKKyAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisKICAgICBpZiAoY2xhaW1lZElkZW50aWZpZXIgIT0gbnVsbCkgewogICAgICAgLy8gVGhlIHVzZXIgdXNlZCBhIGNsYWltZWQgaWRlbnRpdHkgd2hpY2ggaGFzIGRlbGVnYXRlZCB0byB0aGUgdmVyaWZpZWQKICAgICAgIC8vIGlkZW50aXR5IHdlIGhhdmUgaW4gb3VyIEF1dGhSZXF1ZXN0IGFib3ZlLiBXZSBzdGlsbCBzaG91bGQgaGF2ZSBhCkBAIC00MDksNyArNDIzLDcgQEAKICAgICAgICAgICBhcnNwID0gYWNjb3VudE1hbmFnZXIuYXV0aGVudGljYXRlKGFyZXEpOwogCiAgICAgICAgICAgZmluYWwgQ29va2llIGxhc3RJZCA9IG5ldyBDb29raWUoT3BlbklkVXJscy5MQVNUSURfQ09PS0lFLCAiIik7Ci0gICAgICAgICAgbGFzdElkLnNldFBhdGgocmVxLmdldENvbnRleHRQYXRoKCkgKyAiLyIpOworICAgICAgICAgIGxhc3RJZC5zZXRQYXRoKHJlcS5nZXRDb250ZXh0UGF0aCgpICsgIi9sb2dpbi8iKTsKICAgICAgICAgICBpZiAocmVtZW1iZXIpIHsKICAgICAgICAgICAgIGxhc3RJZC5zZXRWYWx1ZShyZWRpc2NvdmVySWRlbnRpZmllcik7CiAgICAgICAgICAgICBsYXN0SWQuc2V0TWF4QWdlKExBU1RJRF9BR0UpOwpAQCAtNDE3LDcgKzQzMSw3IEBACiAgICAgICAgICAgICBsYXN0SWQuc2V0TWF4QWdlKDApOwogICAgICAgICAgIH0KICAgICAgICAgICByc3AuYWRkQ29va2llKGxhc3RJZCk7Ci0gICAgICAgICAgd2ViU2Vzc2lvbi5nZXQoKS5sb2dpbihhcnNwLCBBdXRoTWV0aG9kLkNPT0tJRSwgcmVtZW1iZXIpOworICAgICAgICAgIHdlYlNlc3Npb24uZ2V0KCkubG9naW4oYXJzcCwgcmVtZW1iZXIpOwogICAgICAgICAgIGlmIChhcnNwLmlzTmV3KCkgJiYgY2xhaW1lZElkZW50aWZpZXIgIT0gbnVsbCkgewogICAgICAgICAgICAgZmluYWwgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQXV0aFJlcXVlc3QgbGlua1JlcSA9CiAgICAgICAgICAgICAgICAgbmV3IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhSZXF1ZXN0KApAQCAtNDMxLDcgKzQ0NSw3IEBACiAKICAgICAgICAgY2FzZSBMSU5LX0lERU5USVk6IHsKICAgICAgICAgICBhcnNwID0gYWNjb3VudE1hbmFnZXIubGluayhpZGVudGlmaWVkVXNlci5nZXQoKS5nZXRBY2NvdW50SWQoKSwgYXJlcSk7Ci0gICAgICAgICAgd2ViU2Vzc2lvbi5nZXQoKS5sb2dpbihhcnNwLCBBdXRoTWV0aG9kLkNPT0tJRSwgcmVtZW1iZXIpOworICAgICAgICAgIHdlYlNlc3Npb24uZ2V0KCkubG9naW4oYXJzcCwgcmVtZW1iZXIpOwogICAgICAgICAgIGNhbGxiYWNrKGZhbHNlLCByZXEsIHJzcCk7CiAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KQEAgLTUzMiw3ICs1NDYsNyBAQAogICAgIHJldHVybiBuZXcgU3RhdGUoZGlzY292ZXJlZCwgcmV0VG8sIGNvbnRleHRVcmwpOwogICB9CiAKLSAgcHJpdmF0ZSBib29sZWFuIGlzQWxsb3dlZE9wZW5JRChmaW5hbCBTdHJpbmcgaWQpIHsKKyAgYm9vbGVhbiBpc0FsbG93ZWRPcGVuSUQoZmluYWwgU3RyaW5nIGlkKSB7CiAgICAgZm9yIChmaW5hbCBPcGVuSWRQcm92aWRlclBhdHRlcm4gcGF0dGVybiA6IGFsbG93ZWRPcGVuSURzKSB7CiAgICAgICBpZiAocGF0dGVybi5tYXRjaGVzKGlkKSkgewogICAgICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1vcGVuaWQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL29wZW5pZC9TaWduSW5Nb2RlLmphdmEgYi9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvU2lnbkluTW9kZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI2YTk4NTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvU2lnbkluTW9kZS5qYXZhCkBAIC0wLDAgKzEsMTkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAwOCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5hdXRoLm9wZW5pZDsKKworZW51bSBTaWduSW5Nb2RlIHsKKyAgU0lHTl9JTiwgTElOS19JREVOVElZLCBSRUdJU1RFUjsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1vcGVuaWQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL0xvZ2luRm9ybS5odG1sIGIvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvTG9naW5Gb3JtLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjU3MzRmZmUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtb3BlbmlkL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9odHRwZC9hdXRoL29wZW5pZC9Mb2dpbkZvcm0uaHRtbApAQCAtMCwwICsxLDkwIEBACis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHRpdGxlPkdlcnJpdCBDb2RlIFJldmlldyAtIFNpZ24gSW48L3RpdGxlPgorICAgIDxzdHlsZT4KKyAgICAgICNlcnJvcl9tZXNzYWdlIHsKKyAgICAgICAgcGFkZGluZzogNXB4OworICAgICAgICBtYXJnaW4tbGVmdDogNXB4OworICAgICAgICBtYXJnaW4tYm90dG9tOiA1cHg7CisgICAgICAgIHdpZHRoOiAyMGVtOworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjU1LCAyNTUsIDExNik7CisgICAgICAgIGZvbnQtd2VpZ2h0OiBib2xkOworICAgICAgfQorICAgICAgI2NhbmNlbF9saW5rIHsKKyAgICAgICAgbWFyZ2luLWxlZnQ6IDQ1cHg7CisgICAgICB9CisgICAgICAjbG9nb19ib3ggeworICAgICAgICBwYWRkaW5nLWxlZnQ6IDE2MHB4OworICAgICAgfQorICAgICAgI2xvZ29faW1nIHsKKyAgICAgICAgd2lkdGg6IDIwMHB4OworICAgICAgICBoZWlnaHQ6IDgwcHg7CisgICAgICAgIGJhY2tncm91bmQ6IHVybCgnZGF0YTppbWFnZS9wbmc7YmFzZTY0LGlWQk9SdzBLR2dvQUFBQU5TVWhFVWdBQUFNZ0FBQUJRQ0FZQUFBQmNiVHF3QUFBTmJVbEVRVlI0MnV4ZGVYQlYxUm0vVVJZcHVORFJGanR1WmNhT1pUcGQ3RCtPMDdwaTY1UXFGTVFFRTdLemhGMmtRRVVyMWdVa0lCUWlJS0RVQllSZ1VCQ0NJSEVCQkxLUjVHVWxLd2xaU0FLSnR2VVBaenI4K3I3M3U4MGRmSG52M2l5dmVlRjl2NWx2UXNpNTN6dnYzTzkzei9tV2M2NmhVQ2dVQ29WQ29WQW9GQXFGUXFGUUtCUUtoVUtoVUNnVUNvVkNvVkFvRkFvRlFhQ2xBdGdRRGhTbXcxQW9GQmJ3eFJaZ3pnZ2d3Z0JjU2hDRndnTTBGQUdySGdhaURFcWNXd29QS0VFVUNoeElCbVorSDVna3hCQlJnaWdVQnFvemdlWDNBVThZUUxSYjRrV1VJQXFGZ1QxTGdTbERTSTU0RVNXSVFtSDVHN0VHTUZrSW9RUlJLQzRCNmwzQTFFRkFyQkpFb2VpRUlJWEExTUZLRUlWQ0NhSlFLRUVVQ2lXSVFxRUVVU2lVSUFwRmNPZEJsQ0FLaFM5Y1BPdHlSSkNMV3MyckNBVmN1SEJoYWtOREEycHFhbEJXVllPcUkzdHdjY29nSU00WFFmaXpkdjhtbEZYWGVhNlQ2MFdQb1ZEMGQ1dzdkdzZWbFpVb0xDeEVibTR1Y25KeWtKV1Y1WkhNVXdVb1ByVFRFVUhLZDY5RFpuNVJ4N1haMmRrZWZTNlh5Nk8vcWFsSlp4aEYvMEJqWXlOS1NrbzhCbXdhdEJCRFJQNnZRN0x6QzFIeVNhb2pnbFI4a0lKc0YzV2EwcUZUeUNLZklmOVhWRlNFczJmUGRva3NMUzB0T2U1WlNRbW1DQnphMnRwR256NTltcVRnRTk2TEVKUmVJb2kzZUpHbHJLd001OCtmWDI3NGdjdytKMCtlbEtWYmp3bUN0am9nT3hWSVh3NTh1SlN5OXdYZ3hMdEFRN0VTTUJRaEJpaXpoUmltTFNtOENjSWxWbmNJWWk4ZGZaTCtXVVN4WnJtOHZMeU9HZTdNbVRQb05qRktQd1hXamdlU2hySmsvMDl1ZWNTVXNRYTNEQ2NPQkpiZkQyVHZ1dXlKZ3VOdkE0blhBbk52QU03WEF1VkhnWm5YVW1aY0RTUU44NVlaYmxsNEcvRHliNEIzWmdKWk8vdi9PTWtUMmpSQ1J3YkxKWkhsZ3doQlNnL3Zja1NReWc5ZmN4T2tWRDdMYTRaeVNoVHByeXluU2t0THVlemo5VDBpQ0xiTllRUnVnbG15djJna3NINGk4TzRzWVB0Y1lITVVzUFNYUUx6Wkp0SXRLUk9BOXN0M1NZY3ZOZ0hoQnBCd0JkQmFEYzhESk5xZ0pJUUJpVmQ2UzN3WUVHV08wVGlERDVxRnR3T0hVL3JmT05YVjFkSHduQkhEeTBlUTVVeHpjM09iNlBxMk90ZFJtUGZiM0QzNG43OGd4bHhjWEl4VHAwNlJMTTc3NFVYb25oQUVLeDhDSHZmTUVOd05XYkFQUHR0V25RUmVtMEFqZU13dHo3bEpjNkVXbHlWQmptd1JBK2MyaHRZYW9Pd3ozdC9FQWNDcEQ0REdFcUMrMEpLR1l1Qk1McEMzRnppNENsZzNIcGorUFdDaVFhS3QvZ1B3VGR0b296L2dPMDlmZjlMUlRwWTRzcVRwVWFLdzZPTk9yNWZvbGZUSi9EeW55NjhlRXdTYm5oQnljTlpJZXdhT3IvdjhkU0JoRUcvK1MzZUZEa0ZpREdES1FPQmNPUnpwYUNvRE5rYklBNFhqdk9xaDRCK3IvUHg4SjAvcmpqWlZWVlg0ZjVhYVZGZFhXNThmUUlMZ3k3ZG9BSlBja3JxZzZ6UFAwVGVBNkRBK0hkTVdJNVFJSXZlN2E5dXhud2NpVFpKODhHeHdqbFY3ZS90SXkvRHNvMGpsNWVYb3kxb3NpYVpKWHdKR2tJVS81ZzE3K2U3dU8vWmJKbFBIdEt1QXhsSW9RWHdENjhiSnc0Uk8vb1c2NEJzcmlmYjROemlTUjlxSmo5RFh4WXJpbndTS0lPNlFMVzkrVEZpUDZzT0VGSmcyaENSNTM1cEZSQ2ZLaitEU1pka200UFZJWU1VRFFQS0R3Sm8vQW1sTGdMbzhaMzF1cVFJT3JBQlNKZ0xKRDRnZXJ2UFRWM2ljYUsvMi8ycE5oU3NkS1A3RTZsZHpCYkI3Q2JCNkRIV3NIQTFzam9YMExlQUVxY3VUS0NCSmN2RFY0Q0tJWktyRitPM0lJVWJaMTlXOHNxU3ppVzcxbkNEckh6T2Q3Si9idDdmWFJWL2ttVkVnYVVyNFhaKytBeDFrV2ZnVENSdVRTREVHeHluQ2pQUWtEZ2Eyei9QYkR6RW96QmdPakRmWTd4aUsrM09wZDlZTndPY2JxY01pS1gyckdkZUFVYW1Od0pTaC9Nd29zdytSbnV0cHRJdEhBUlhIRUJpQ0VHNVNNc0sxOXBFZ0lRZ05Ub3pIMXJqRUNlL0xjdmY2K25wUFgwNmNPQ0g5NmJMSWRlSy9PT3J2a3lOb2FEdm05NXdnUjkra0lVMFpBTFJVQXMwVi9LNUw3d1J5MG9DWUsyaW9zaHpMMlFXY0xaQ0lELzhtNURJallsZ3pCcDNxZjMrUmtJbEd2UHhlNE5oV29EWVBrQUxSWS8vZ2JCUnUrbEo3bjRkRmtIUis3cHpyZ2YzTDJHYmV6VXlBVnA0QW1rbzlzd3UyejVGUUxzbjc1STFBMjFrRWhDRDhMdnl1QzI0S0hvTFlQWTNsNzFKajFaZjdRVnBiVzFQRnVDVjBMTE5BTjBUSXdVU2lEWEFtbHdZUlpmUktJc3R0ckVJTzZzdmRMV0ZmaGtMbi93aVlleU9RZEwzZlE3dngyVVlnbGdZcXk1OUwvcGE5RTRnMGpmODkzMlRHanFla0RjbFlrbUhOWEhFRyt4TG5sbVgzQU8zMThKRVVaSnVKZEtJRFJCQXViU09wVXg0bXdaSUU5T3VReTg5UTJqQUYxMzdlNklRcmdab3M5SXJPV2RmUndEOVpJMGJJc1lnMlROS2t3Y0dUbGRjblhRMjBXRkZEOTdLTlQ5eDFZKzExYkhpY3k1Zmw5OURBaXc3Sm1MTVA4MjRFdm1xQWpSUE42MSs1RCtiTTJQc0VjYVZUUi93VlhNNzFOWVFBZGt1cjJ0cmFVQ0lJdzdPODhiMVdXNFVsZDlBLzJQZVNaTmRsTExnc1d2bWdJLzM0cG4ya2U4WWhHVDU2QVNhUmFkd0pneHdaSk9xTGdJU0JRRndZUE1HRDAxOXd6Q2VaT20yQWpCU1NkTUV0L0h4WnZ2VXlRWVFVTW51TEh2bCtScCtCYTNwYjMwT3kyS0cyNVJaSE5zTWlTQkY2UmVlelB6TUo4dktsQk1sWUI4YzYzcDVHaC9uVjM5TkFkODZuUTczNlllYzZYcm1YczRBczJ5VHJIK3Q4cGtUZVh2b3NTY01DUjVESzQreFBURisvQ29ONUJML0xLelBYRVhvRXlVMFRRNkRmVUpmZksvMXhPOEpjdjMrY0xBU2g3ampEWTFSZGNQWkpxZ1UzMDBEWGpDSHA5aXgxcnVPOXVTeXMzRDVQd3N4aWlDd2cvTGY5eGpTcGNrQzB0TDg2VUFTaFh4UnJjSllyKzdSdmJVRWNiMzlMTEpsZHVIOGl4QWhTZVZ6V3dEU0d2TDA5N1E5ekM5TUcwNWhPYkpNa21EakdsSHJITXhRTk5JWUdLcEVrTFAyVkxMSG83QzhaNVpZNy9JdjRLM052WUxRcVpSeFE2TllYUzMwT2pUZmdCSkVxYUV5bURpNXYrN2FreERaNkpkR2pFQ01JRTJpenJ1VjYrNk1YZTA0UTNuUldzdGFlRWllN093VGgranplek1yWDVrcVkyTlRyVU9JTVZ0VEdEZ1kyaGdjblFRNnM0TGpQSGc3eHU0S2RJQXlMaGhSQkNLeTRudzV4OGdNOUo4aGJVNEdKVm14Zjhnc1dRUXE3T1lQVXNWSTRRbkliZndPYXlrU1h2VFFVOGVkWGpUTFcxQmRNQkVrWnozRi84UzRFUS9aY2wxZys0UFlWYUh3SkErMzlFUHZvRXdteU5RRm1aYk1ZRVkwdC82T3UraUJXRkduVjcraTA3MS9XbmY0eFVSZ2RQQVRCVjAzQXJPR2NRZEtlRHY0Y2lQeXRvcUlpTkFraWZzSk1Mck9rNUwyN2VpUjhpZ2lXZlVoWTlaS3hDS2VEM2ZVb0ZxTlcyRGFiVWF5MWo2SkxJZXlVT0hnU2Z5V0hnMm9HY1pPQ1l4VXZVYlhzdnJjRE9mUWdNelBUWDVKUUNoTkRrQ0NFTzJOTUk1NGNCbVR0NlBvTnI4NENwZy9qN0xGK0FyekdJcEwxV2QzT2cyU24wa0NuRHdYTzF6alQ4K2RiZ0RFR055eFZIZzhXZ2pCQm1IZ1Z4MnBqdUhWdGYwZ1VDcEZDanlBRW52ODFiMXJTZFVDKzQ0Z1d5MVdldXBVejBMd1JVazNyVFpBWUp1bWs5c24rNmJxWXVtWjhKNU8rOEZiMmIvTmtleDJTeFk4d2RYemQzTVl0c2dFaVNLUGp1ajJXMGlTWnMvWDhtemhXUWJSejBLN1VoTW5DMENRSUsyOFgzTVluZDhJQUlPMHZRRnM5L04vd0RmSUdYNU5ZdzRIU0RIaU54WlJCTWg0MGlPZ3dTRjJUMzMwWDhRTnBRQ3cyN0lCVTZDTENyTHBOWGVoYlI4RStZT293SmdsM0xRSU4vdU9BRVVRZUVINTExZVFBaDFZREw5N052ajhtNUxpTjVTWEJkZ0tpZ3pKM1Z2S0dIa0dzUE1heTM0cUI4a2JPK3lHd05SRTR2STU3cnd2MlMyYWFoemNzdmwwTWx1MmVIZ1ZVZm9sT3h5SnhnQmdhZllIWjExUDMyckhBeVcxU2hldFZ6Y3RsMmtSMDJyODNZcTA5ODFLNWUvd2RxeUpZaWlQZmpKUEVHOG14OGlIdmF0NmtvVEJzNGQwZVI3Y0NrNWhRSlVFK3RVcjFGNDFrM21YSlR6dEVmcGNTZjh5OFJrTGUvRTdqRFY3ejkwZUI1bklZd1FoeHhCMlV1ek9ySHNLbnU4dkpHMWgwTzU5NFl6MDNsd2J5aEVtSVI4MlM4emsvQUhZdEJ2N0pBeXQ4RUlSeXZwb0hHVHgzcCtpZzBNaW9hNXdZNEJET0RuNGcrUnJ1Qi9HaEl6WU0yQnpOUXhHc0djRXFIYkdGZDNzY0U0S1lNNFoxYUlNSTIwVjFLcnpQMDRhUU5HOU5CMHFZTVE5cUZCUVVPTm93SlpHdlVILzlBZkwzQWJ1ZkFUWkVjTWZkeWdmNTlOOHhuelBDMStkZ014YWQ1a0dRbGNxem9wSkhjemZnK25BSjRUcXVCME5yRlhCb0RmQjZGR2VTWkZQSGgzOEZxak50ZGhSNnc2NDkydXM1ZXhZZDVPL3VjaFVQaVZ4dUtmUWhCZWxBK1RFdVUvc1g2TEE3Y2RvbGZ5TDcxL1g5SURad1JoQTlpYkUvbmNodU91YU9Eb2FURFVoS0VDVklTSktFeXkzN1BkNFM0WkxkZWtvUUpVam9nSlcrUWdCSHg0eWE3U1RyenVMR0hyMWhLbDBKb3VnSHNFNFBFWEZDRkxibHNVRGl6RXVDc2VNRk9QK3B6ZmRQa0Jnekd1UUtBWUxVNVVza2pGS1hyd1RwNzY4N2tITjJ2WTRodFNlTDliNFFWekhLTXQ3M2ZYaDFGQWtpOFh6SjhCcVhPU1NDSXhXK0l1NS9LMEg2UDNnMnJubDJWdGVQL014emRmYjZBNnZVNHRsZkFLNTlhaWlLL2c4NXJWMnk2dlE5ckZtbEt5L1FFZUU1VVZkSlFrMkpvYmc4SWRFcmMwK0oxN3M4ZkJJa3lpVEhLL2ZMb1FGS0RrVW9nQ2VraUdNdXV4U3RkeGFTTkpteXhEcTRBeGVGSExOSEFCbXZLVEVVdWhTVDg3UWs5RnRVVm9IVEdXbTR1Q1ZXanQxVWNpZ1VDb1ZDb1ZBb0ZBcUZRcUZRS0JRS2hVS2hVQ2dVQ3NWLzI0TURFZ0FBQUFCQi8xKzNJMUFCQUdBaWxWWjJJS3Z2ekVNQUFBQUFTVVZPUks1Q1lJST0nKSBuby1yZXBlYXQgMHB4IDBweDsKKyAgICAgIH0KKyAgICAgICNmX29wZW5pZCB7CisgICAgICAgIHBhZGRpbmctbGVmdDogMjVweDsKKyAgICAgICAgYm9yZGVyOiAxcHggc29saWQgIzk5OTsKKyAgICAgICAgYmFja2dyb3VuZDogI2ZmZiB1cmwoJ2RhdGE6aW1hZ2UvZ2lmO2Jhc2U2NCxSMGxHT0RsaEVBQVFBTVFBQU8zdDdlSGg0c3JLeXZ6OC9QNXBEUDlyRU5MUzB2LzI4UC8xN3RYVjFkSEV2UER3OE0zTnpmbjUrZDNkM2Y1akE5N1N5dm52Nk1mTHpjZkh4LzFtQ1B4NEtjL1MxUGYxODlDK3RQK3hndi9rMU4zT3hmSHk5TkxWMS8zOS9mLy8veUg1QkFBQUFBQUFMQUFBQUFBUUFCQUFBQVZxNENlT1pHbWU2S2hsU0RvZXhkTzZIMElVUitvdHdVWVJrTURDVXdJWUpoTEZUeUdaSkFDQXdRY2dFQVE0a1Z1RUUyQUlHQU9QUVFBUXdYQ2ZTOEtRR0F3TWpJWUlVU2kwM0I3aUorQWNubWNsSGc0VEFoMFFEeklwQ3c0V0dCVVplaWtERnprMGxwY2pJUUE3Jykgbm8tcmVwZWF0IHNjcm9sbCA1cHggNTAlCisgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c3R5bGUgaWQ9ImdlcnJpdF9zaXRlY3NzIiB0eXBlPSJ0ZXh0L2NzcyI+PC9zdHlsZT4KKyAgPC9oZWFkPgorICA8Ym9keT4KKyAgICA8ZGl2IGlkPSJnZXJyaXRfdG9wbWVudSIgc3R5bGU9ImhlaWdodDo0NXB4OyIgY2xhc3M9ImdlcnJpdFRvcE1lbnUiPjwvZGl2PgorICAgIDxkaXYgaWQ9ImdlcnJpdF9oZWFkZXIiPjwvZGl2PgorICAgIDxkaXYgaWQ9ImdlcnJpdF9ib2R5IiBjbGFzcz0iZ2Vycml0Qm9keSI+CisgICAgICA8aDE+U2lnbiBJbiB0byBHZXJyaXQgQ29kZSBSZXZpZXcgYXQgPHNwYW4gaWQ9Imhvc3ROYW1lIj5leGFtcGxlLmNvbTwvc3Bhbj48L2gxPgorICAgICAgPGZvcm0gbWV0aG9kPSJQT1NUIiBhY3Rpb249IiMiIGlkPSJsb2dpbl9mb3JtIj4KKyAgICAgICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgbmFtZT0ibGluayIgaWQ9ImZfbGluayIgdmFsdWU9IjEiIC8+CisgICAgICAgIDxkaXYgaWQ9ImxvZ29fYm94Ij48ZGl2IGlkPSJsb2dvX2ltZyI+PC9kaXY+PC9kaXY+CisgICAgICAgIDxkaXYgaWQ9ImVycm9yX21lc3NhZ2UiPkludmFsaWQgT3BlbklEIGlkZW50aWZpZXIuPC9kaXY+CisgICAgICAgIDxkaXY+CisgICAgICAgICAgPGlucHV0IHR5cGU9InRleHQiCisgICAgICAgICAgICAgICAgIG5hbWU9ImlkIgorICAgICAgICAgICAgICAgICBpZD0iZl9vcGVuaWQiCisgICAgICAgICAgICAgICAgIHNpemU9IjYwIgorICAgICAgICAgICAgICAgICB0YWJpbmRleD0iMSIgLz4KKyAgICAgICAgPC9kaXY+CisgICAgICAgIDxkaXY+CisgICAgICAgICAgPGlucHV0IG5hbWU9InJlbWVtYmVybWUiIGlkPSJmX3JlbWVtYmVyIgorICAgICAgICAgICAgICAgICB0eXBlPSJjaGVja2JveCIKKyAgICAgICAgICAgICAgICAgdmFsdWU9IjEiCisgICAgICAgICAgICAgICAgIHRhYmluZGV4PSIyIiAvPgorICAgICAgICAgIDxsYWJlbCBmb3I9ImZfcmVtZW1iZXIiPlJlbWVtYmVyIG1lPC9sYWJlbD4KKyAgICAgICAgPC9kaXY+CisgICAgICAgIDxkaXYgc3R5bGU9Im1hcmdpbi1ib3R0b206IDI1cHg7Ij4KKyAgICAgICAgICA8aW5wdXQgdHlwZT0ic3VibWl0IiB2YWx1ZT0iU2lnbiBJbiIgaWQ9ImZfc3VibWl0IiB0YWJpbmRleD0iMyIgLz4KKyAgICAgICAgICA8YSBocmVmPSIuLi8iIGlkPSJjYW5jZWxfbGluayI+Q2FuY2VsPC9hPgorICAgICAgICA8L2Rpdj4KKworICAgICAgICA8ZGl2IGlkPSJwcm92aWRlcl9nb29nbGUiPgorICAgICAgICAgIDxpbWcgaGVpZ2h0PSIxNiIgd2lkdGg9IjE2IiBzcmM9ImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCxpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFBQkFBQUFBUUNBWUFBQUFmOC85aEFBQUJzVWxFUVZSNDJyV1N5MHNiWVJSSDg4ZlloVzVLUVhUaElrVVFONklTSkZCQlc2RkZCTjJVcWxDNzhMVktGbEhJb3FXR2FrRjhnVVo4Z2FqVnpLU0tacFFtQVd0SzBwQm1oa3htU2dQdWl1YVltUktoU0V3VS9PRHlEWmZ6Tzh5ZE94YkxReDFOQjBINHk4RkJsbU1weTlMeU9hdnJLVW9LQjRJWHZCc0lJb3BSUEo0NDFkWS8yRnI4ZkF0RlN4TzBka1J5NGVBMVBEcCtUa1ZsbUdoTUtTNUlKT0ZwYllnajZmUWFsaFY0VWhWbTBlc3ZMb2pFTGltdjFKaVlPUHdQZmxTMmdNOTNXTm9JWFoxblBDNC9JUkRRellEVHFUQTBQTTJkdHVDWjh2R21WNlN2UDVzckwvZGE1Yys0VG5OTEZsdlRNWW1FVnJwa2F6dU0yeDFuYU9RN0RjMWZxTE9tYWF5WGthU3o0aExIZXdtN2ZZK1oyUjBpUCtKbVlHcHltL3E2RERiNzZ1MEN3UitnOSswRkh6NHUzd0FkTGg5Vk5XdTVVWDRWbHF5c2ZhWFJEb09ETnorYXc3bkRzOVpQcE5QcHdnSlYxV2h2RjZtMS9xYjc5VDZmcHdYbTVrVkdSbmQ1L21JZFFTendIMmlhaHE3LzI3bnhpcTV4THk5ZmJkRFdzVXRQenlhdXNSVkM0Vk1Nem1BTU52OXN5VGRrV1RaTFZWVXltWXg1SjVOSnM1ZEtwVkFVeGF3OFovU003QlYrZno5VWM0eVlSQUFBQUFCSlJVNUVya0pnZ2c9PSIgLz4KKyAgICAgICAgICA8YSBocmVmPSI/aWQ9aHR0cHM6Ly93d3cuZ29vZ2xlLmNvbS9hY2NvdW50cy9vOC9pZCIgaWQ9ImlkX2dvb2dsZSI+U2lnbiBpbiB3aXRoIGEgR29vZ2xlIEFjY291bnQ8L2E+CisgICAgICAgIDwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJwcm92aWRlcl95YWhvbyI+CisgICAgICAgICAgPGltZyBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiIHNyYz0iZGF0YTppbWFnZS9naWY7YmFzZTY0LFIwbEdPRGxoRUFBUUFQRUNBQUFBQVA4QUFQLy8vOHpNekNINUJBRUFBQU1BTEFBQUFBQVFBQkFBQUFJcW5JK3B5MzBCWTNBZ0FqQ2tmSkRqaUlBUWxnVWtOeHFXa3FybTBob25LazdLaFpPencvZitmeWdBQURzPSIgLz4KKyAgICAgICAgICA8YSBocmVmPSI/aWQ9aHR0cHM6Ly9tZS55YWhvby5jb20iIGlkPSJpZF95YWhvbyI+U2lnbiBpbiB3aXRoIGEgWWFob28hIElEPC9hPgorICAgICAgICA8L2Rpdj4KKworICAgICAgICA8ZGl2IHN0eWxlPSJtYXJnaW4tdG9wOiAyNXB4OyI+CisgICAgICAgICAgPGgyPldoYXQgaXMgT3BlbklEPzwvaDI+CisgICAgICAgICAgPHA+T3BlbklEIHByb3ZpZGVzIHNlY3VyZSBzaW5nbGUtc2lnbi1vbiwgd2l0aG91dCByZXZlYWxpbmcgeW91ciBwYXNzd29yZHMgdG8gdGhpcyB3ZWJzaXRlLjwvcD4KKyAgICAgICAgICA8cD5UaGVyZSBhcmUgbWFueSBPcGVuSUQgcHJvdmlkZXJzIGF2YWlsYWJsZS4gIFlvdSBtYXkgYWxyZWFkeSBiZSBtZW1iZXIgb2Ygb25lITwvcD4KKyAgICAgICAgICA8cD48YSBocmVmPSJodHRwOi8vb3BlbmlkLm5ldC9nZXQvIiB0YXJnZXQ9Il9ibGFuayI+R2V0IE9wZW5JRDwvYT48L3A+CisgICAgICAgIDwvZGl2PgorICAgICAgPC9mb3JtPgorICAgIDwvZGl2PgorICAgIDxkaXYgc3R5bGU9ImNsZWFyOiBib3RoOyBtYXJnaW4tdG9wOiAxNXB4OyBwYWRkaW5nLXRvcDogMnB4OyBtYXJnaW4tYm90dG9tOiAxNXB4OyI+CisgICAgICA8ZGl2IGlkPSJnZXJyaXRfZm9vdGVyIj48L2Rpdj4KKyAgICA8L2Rpdj4KKworICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgICAgIHZhciBmX29wZW5pZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdmX29wZW5pZCcpOworICAgICAgdmFyIGZfc3VibWl0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2Zfc3VibWl0Jyk7CisgICAgICBpZiAoZl9vcGVuaWQudmFsdWUgPT0gJycpCisgICAgICAgIGZfb3BlbmlkLmZvY3VzKCk7CisgICAgICBlbHNlCisgICAgICAgIGZfc3VibWl0LmZvY3VzKCk7CisgICAgPC9zY3JpcHQ+CisgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1vcGVuaWQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL1JlZGlyZWN0Rm9ybS5odG1sIGIvZ2Vycml0LW9wZW5pZC9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvYXV0aC9vcGVuaWQvUmVkaXJlY3RGb3JtLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWQzNGVmNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1vcGVuaWQvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL2F1dGgvb3BlbmlkL1JlZGlyZWN0Rm9ybS5odG1sCkBAIC0wLDAgKzEsMTYgQEAKKzxodG1sPgorICA8aGVhZD4KKyAgICA8dGl0bGU+R2Vycml0IENvZGUgUmV2aWV3IC0gUmVkaXJlY3RpbmcgLi4uPC90aXRsZT4KKyAgPC9oZWFkPgorICA8Ym9keT4KKyAgICA8ZGl2PlJlZGlyZWN0aW5nIC4uLjwvZGl2PgorCTxmb3JtIG1ldGhvZD0iUE9TVCIgYWN0aW9uPSIjIiBpZD0icmVkaXJlY3RfZm9ybSI+CisJICA8aW5wdXQgdHlwZT0ic3VibWl0IiB2YWx1ZT0iQ29udGludWUiIC8+CisgICAgPC9mb3JtPgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBsYW5ndWFnZT0iamF2YXNjcmlwdCI+CisgICAgICB2YXIgciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZWRpcmVjdF9mb3JtJyk7CisgICAgICByLnN0eWxlLmRpc3BsYXkgPSAnbm9uZSc7CisgICAgICByLnN1Ym1pdCgpOworICAgIDwvc2NyaXB0PgorICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGFja2FnZS1wbHVnaW5zLy5naXRpZ25vcmUgYi9nZXJyaXQtcGFja2FnZS1wbHVnaW5zLy5naXRpZ25vcmUKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGM5NmIwNWMuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXBhY2thZ2UtcGx1Z2lucy8uZ2l0aWdub3JlCisrKyAvZGV2L251bGwKQEAgLTEsNiArMCwwIEBACi0vdGFyZ2V0Ci0vLmNsYXNzcGF0aAotLy5wcm9qZWN0Ci0vLnNldHRpbmdzL29yZy5tYXZlbi5pZGUuZWNsaXBzZS5wcmVmcwotLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5tMmUuY29yZS5wcmVmcwotL2dlcnJpdC1wYWNrYWdlLXBsdWdpbnMuaW1sCmRpZmYgLS1naXQgYS9nZXJyaXQtcGFja2FnZS1wbHVnaW5zL3BvbS54bWwgYi9nZXJyaXQtcGFja2FnZS1wbHVnaW5zL3BvbS54bWwKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGMwNzI3MTkuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXBhY2thZ2UtcGx1Z2lucy9wb20ueG1sCisrKyAvZGV2L251bGwKQEAgLTEsOTAgKzAsMCBAQAotPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KLTwhLS0KLUNvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0KLUxpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwoteW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0KLWh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotCi1Vbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi1kaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi1TZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi1saW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLS0tPgotPHByb2plY3QgeG1sbnM9Imh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL1BPTS80LjAuMCIKLSAgICAgICAgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIKLSAgICAgICAgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9QT00vNC4wLjAgaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvbWF2ZW4tdjRfMF8wLnhzZCI+Ci0gIDxtb2RlbFZlcnNpb24+NC4wLjA8L21vZGVsVmVyc2lvbj4KLQotICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KLSAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhY2thZ2UtcGx1Z2luczwvYXJ0aWZhY3RJZD4KLSAgPHBhY2thZ2luZz53YXI8L3BhY2thZ2luZz4KLSAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgotCi0gIDxuYW1lPkdlcnJpdCBDb2RlIFJldmlldyAtIFBhY2thZ2UgUGx1Z2luczwvbmFtZT4KLSAgPHVybD5odHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0LzwvdXJsPgotCi0gIDxwcm9wZXJ0aWVzPgotICAgIDxwcm9qZWN0LmJ1aWxkLnNvdXJjZUVuY29kaW5nPgotICAgICAgVVRGLTgKLSAgICA8L3Byb2plY3QuYnVpbGQuc291cmNlRW5jb2Rpbmc+Ci0gIDwvcHJvcGVydGllcz4KLQotICA8ZGVwZW5kZW5jaWVzPgotICAgIDxkZXBlbmRlbmN5PgotICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+Ci0gICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtd2FyPC9hcnRpZmFjdElkPgotICAgICAgPHZlcnNpb24+JHtwcm9qZWN0LnZlcnNpb259PC92ZXJzaW9uPgotICAgICAgPHR5cGU+d2FyPC90eXBlPgotICAgIDwvZGVwZW5kZW5jeT4KLSAgICA8ZGVwZW5kZW5jeT4KLSAgICAgIDxncm91cElkPmNvbS5nb29nbGVzb3VyY2UuZ2Vycml0LnBsdWdpbnMucmVwbGljYXRpb248L2dyb3VwSWQ+Ci0gICAgICA8YXJ0aWZhY3RJZD5yZXBsaWNhdGlvbjwvYXJ0aWZhY3RJZD4KLSAgICAgIDx2ZXJzaW9uPjEuMDwvdmVyc2lvbj4KLSAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+Ci0gICAgPC9kZXBlbmRlbmN5PgotICA8L2RlcGVuZGVuY2llcz4KLQotICA8YnVpbGQ+Ci0gICAgPHBsdWdpbnM+Ci0gICAgICA8cGx1Z2luPgotICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+Ci0gICAgICAgIDxhcnRpZmFjdElkPm1hdmVuLWRlcGVuZGVuY3ktcGx1Z2luPC9hcnRpZmFjdElkPgotICAgICAgICA8dmVyc2lvbj4yLjE8L3ZlcnNpb24+Ci0gICAgICAgIDxleGVjdXRpb25zPgotICAgICAgICAgIDxleGVjdXRpb24+Ci0gICAgICAgICAgICA8cGhhc2U+cHJvY2Vzcy1yZXNvdXJjZXM8L3BoYXNlPgotICAgICAgICAgICAgPGdvYWxzPgotICAgICAgICAgICAgICA8Z29hbD5jb3B5LWRlcGVuZGVuY2llczwvZ29hbD4KLSAgICAgICAgICAgIDwvZ29hbHM+Ci0gICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KLSAgICAgICAgICAgICAgPGluY2x1ZGVUeXBlcz5qYXI8L2luY2x1ZGVUeXBlcz4KLSAgICAgICAgICAgICAgPHN0cmlwVmVyc2lvbj50cnVlPC9zdHJpcFZlcnNpb24+Ci0gICAgICAgICAgICAgIDxvdXRwdXREaXJlY3Rvcnk+JHtwcm9qZWN0LmJ1aWxkLmRpcmVjdG9yeX0vJHtwcm9qZWN0LmJ1aWxkLmZpbmFsTmFtZX0vV0VCLUlORi9wbHVnaW5zPC9vdXRwdXREaXJlY3Rvcnk+Ci0gICAgICAgICAgICA8L2NvbmZpZ3VyYXRpb24+Ci0gICAgICAgICAgPC9leGVjdXRpb24+Ci0gICAgICAgIDwvZXhlY3V0aW9ucz4KLSAgICAgIDwvcGx1Z2luPgotCi0gICAgICA8cGx1Z2luPgotICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+Ci0gICAgICAgIDxhcnRpZmFjdElkPm1hdmVuLXdhci1wbHVnaW48L2FydGlmYWN0SWQ+Ci0gICAgICAgIDx2ZXJzaW9uPjIuMS4xPC92ZXJzaW9uPgotICAgICAgICA8Y29uZmlndXJhdGlvbj4KLSAgICAgICAgICA8d2FyTmFtZT5nZXJyaXQtZnVsbC0ke3Byb2plY3QudmVyc2lvbn08L3dhck5hbWU+Ci0gICAgICAgICAgPGFyY2hpdmU+Ci0gICAgICAgICAgICA8YWRkTWF2ZW5EZXNjcmlwdG9yPmZhbHNlPC9hZGRNYXZlbkRlc2NyaXB0b3I+Ci0gICAgICAgICAgICA8bWFuaWZlc3RFbnRyaWVzPgotICAgICAgICAgICAgICA8TWFpbi1DbGFzcz5NYWluPC9NYWluLUNsYXNzPgotICAgICAgICAgICAgICA8SW1wbGVtZW50YXRpb24tVGl0bGU+R2Vycml0IENvZGUgUmV2aWV3PC9JbXBsZW1lbnRhdGlvbi1UaXRsZT4KLSAgICAgICAgICAgICAgPEltcGxlbWVudGF0aW9uLVZlcnNpb24+JHtwcm9qZWN0LnZlcnNpb259PC9JbXBsZW1lbnRhdGlvbi1WZXJzaW9uPgotICAgICAgICAgICAgPC9tYW5pZmVzdEVudHJpZXM+Ci0gICAgICAgICAgPC9hcmNoaXZlPgotICAgICAgICA8L2NvbmZpZ3VyYXRpb24+Ci0gICAgICA8L3BsdWdpbj4KLSAgICA8L3BsdWdpbnM+Ci0gIDwvYnVpbGQ+Ci08L3Byb2plY3Q+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGF0Y2gtY29tbW9uc25ldC9wb20ueG1sIGIvZ2Vycml0LXBhdGNoLWNvbW1vbnNuZXQvcG9tLnhtbAppbmRleCBmMWE4YjNlLi43OGNhNjFjIDEwMDY0NAotLS0gYS9nZXJyaXQtcGF0Y2gtY29tbW9uc25ldC9wb20ueG1sCisrKyBiL2dlcnJpdC1wYXRjaC1jb21tb25zbmV0L3BvbS54bWwKQEAgLTIyLDcgKzIyLDcgQEAKICAgPHBhcmVudD4KICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgotICAgIDx2ZXJzaW9uPjIuNS1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAgIDwvcGFyZW50PgogCiAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXRjaC1jb21tb25zbmV0PC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBhdGNoLWpnaXQvcG9tLnhtbCBiL2dlcnJpdC1wYXRjaC1qZ2l0L3BvbS54bWwKaW5kZXggNjUyMjNmYi4uN2U1MGFmOCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBhdGNoLWpnaXQvcG9tLnhtbAorKysgYi9nZXJyaXQtcGF0Y2gtamdpdC9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGF0Y2gtamdpdDwvYXJ0aWZhY3RJZD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wYXRjaC1qZ2l0L3NyYy9tYWluL2phdmEvb3JnL2VjbGlwc2UvamdpdC9pbnRlcm5hbC9zdG9yYWdlL2ZpbGUvV2luZG93Q2FjaGVTdGF0QWNjZXNzb3IuamF2YSBiL2dlcnJpdC1wYXRjaC1qZ2l0L3NyYy9tYWluL2phdmEvb3JnL2VjbGlwc2UvamdpdC9pbnRlcm5hbC9zdG9yYWdlL2ZpbGUvV2luZG93Q2FjaGVTdGF0QWNjZXNzb3IuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mMjQxZGFhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBhdGNoLWpnaXQvc3JjL21haW4vamF2YS9vcmcvZWNsaXBzZS9qZ2l0L2ludGVybmFsL3N0b3JhZ2UvZmlsZS9XaW5kb3dDYWNoZVN0YXRBY2Nlc3Nvci5qYXZhCkBAIC0wLDAgKzEsMzMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBvcmcuZWNsaXBzZS5qZ2l0LmludGVybmFsLnN0b3JhZ2UuZmlsZTsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuaW50ZXJuYWwuc3RvcmFnZS5maWxlLldpbmRvd0NhY2hlOworCisvLyBIYWNrIHRvIG9idGFpbiB2aXNpYmlsaXR5IHRvIHBhY2thZ2UgbGV2ZWwgbWV0aG9kcyBvbmx5LgorLy8gVGhlc2UgYXJlbid0IHlldCBwYXJ0IG9mIHRoZSBwdWJsaWMgSkdpdCBBUEkuCisKK3B1YmxpYyBjbGFzcyBXaW5kb3dDYWNoZVN0YXRBY2Nlc3NvciB7CisgIHB1YmxpYyBzdGF0aWMgaW50IGdldE9wZW5GaWxlcygpIHsKKyAgICByZXR1cm4gV2luZG93Q2FjaGUuZ2V0SW5zdGFuY2UoKS5nZXRPcGVuRmlsZXMoKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgbG9uZyBnZXRPcGVuQnl0ZXMoKSB7CisgICAgcmV0dXJuIFdpbmRvd0NhY2hlLmdldEluc3RhbmNlKCkuZ2V0T3BlbkJ5dGVzKCk7CisgIH0KKworICBwcml2YXRlIFdpbmRvd0NhY2hlU3RhdEFjY2Vzc29yKCkgeworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGF0Y2gtamdpdC9zcmMvbWFpbi9qYXZhL29yZy9lY2xpcHNlL2pnaXQvc3RvcmFnZS9maWxlL1dpbmRvd0NhY2hlU3RhdEFjY2Vzc29yLmphdmEgYi9nZXJyaXQtcGF0Y2gtamdpdC9zcmMvbWFpbi9qYXZhL29yZy9lY2xpcHNlL2pnaXQvc3RvcmFnZS9maWxlL1dpbmRvd0NhY2hlU3RhdEFjY2Vzc29yLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDdlMjk1MzYuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXBhdGNoLWpnaXQvc3JjL21haW4vamF2YS9vcmcvZWNsaXBzZS9qZ2l0L3N0b3JhZ2UvZmlsZS9XaW5kb3dDYWNoZVN0YXRBY2Nlc3Nvci5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMzEgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIG9yZy5lY2xpcHNlLmpnaXQuc3RvcmFnZS5maWxlOwotCi0vLyBIYWNrIHRvIG9idGFpbiB2aXNpYmlsaXR5IHRvIHBhY2thZ2UgbGV2ZWwgbWV0aG9kcyBvbmx5LgotLy8gVGhlc2UgYXJlbid0IHlldCBwYXJ0IG9mIHRoZSBwdWJsaWMgSkdpdCBBUEkuCi0KLXB1YmxpYyBjbGFzcyBXaW5kb3dDYWNoZVN0YXRBY2Nlc3NvciB7Ci0gIHB1YmxpYyBzdGF0aWMgaW50IGdldE9wZW5GaWxlcygpIHsKLSAgICByZXR1cm4gV2luZG93Q2FjaGUuZ2V0SW5zdGFuY2UoKS5nZXRPcGVuRmlsZXMoKTsKLSAgfQotCi0gIHB1YmxpYyBzdGF0aWMgbG9uZyBnZXRPcGVuQnl0ZXMoKSB7Ci0gICAgcmV0dXJuIFdpbmRvd0NhY2hlLmdldEluc3RhbmNlKCkuZ2V0T3BlbkJ5dGVzKCk7Ci0gIH0KLQotICBwcml2YXRlIFdpbmRvd0NhY2hlU3RhdEFjY2Vzc29yKCkgewotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3BvbS54bWwgYi9nZXJyaXQtcGdtL3BvbS54bWwKaW5kZXggYTAxNTIxOS4uZjczYTJiMCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9wb20ueG1sCisrKyBiL2dlcnJpdC1wZ20vcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBnbTwvYXJ0aWZhY3RJZD4KQEAgLTY1LDYgKzY1LDEyIEBACiAgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICAgIDxhcnRpZmFjdElkPmdlcnJpdC1zZXJ2ZXI8L2FydGlmYWN0SWQ+CiAgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8ZXhjbHVzaW9ucz4KKyAgICAgICAgPGV4Y2x1c2lvbj4KKyAgICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLnRvbWNhdDwvZ3JvdXBJZD4KKyAgICAgICAgICA8YXJ0aWZhY3RJZD5zZXJ2bGV0LWFwaTwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPC9leGNsdXNpb24+CisgICAgICA8L2V4Y2x1c2lvbnM+CiAgICAgPC9kZXBlbmRlbmN5PgogCiAgICAgPGRlcGVuZGVuY3k+CkBAIC05Miw3ICs5OCw3IEBACiAKICAgICA8ZGVwZW5kZW5jeT4KICAgICAgIDxncm91cElkPm9yZy5hcGFjaGUudG9tY2F0PC9ncm91cElkPgotICAgICAgPGFydGlmYWN0SWQ+c2VydmxldC1hcGk8L2FydGlmYWN0SWQ+CisgICAgICA8YXJ0aWZhY3RJZD50b21jYXQtc2VydmxldC1hcGk8L2FydGlmYWN0SWQ+CiAgICAgPC9kZXBlbmRlbmN5PgogCiAgICAgPGRlcGVuZGVuY3k+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL0RhZW1vbi5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9EYWVtb24uamF2YQppbmRleCBhODI2Yzg4Li5jYTk4YTg0IDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL0RhZW1vbi5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vRGFlbW9uLmphdmEKQEAgLTE5LDEwICsxOSwxMCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5DaGFuZ2VIb29rUnVubmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLkFsbFJlcXVlc3RGaWx0ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuQ2FjaGVCYXNlZFdlYlNlc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuR2Vycml0VWlPcHRpb25zOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLkdpdE92ZXJIdHRwTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLkh0dHBDYW5vbmljYWxXZWJVcmxQcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5SZXF1ZXN0Q29udGV4dEZpbHRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5TaWduZWRUb2tlblJlc3RUb2tlblZlcmlmaWVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLldlYk1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5XZWJTc2hHbHVlTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLmF1dGgub3BlbmlkLk9wZW5JZE1vZHVsZTsKQEAgLTMzLDYgKzMzLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaHR0cC5qZXR0eS5KZXR0eU1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaHR0cC5qZXR0eS5Qcm9qZWN0UW9TRmlsdGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS51dGlsLkVycm9yTG9nRmlsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20udXRpbC5HYXJiYWdlQ29sbGVjdGlvbkxvZ0ZpbGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucGdtLnV0aWwuTG9nRmlsZUNvbXByZXNzb3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucGdtLnV0aWwuUnVudGltZVNodXRkb3duOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS51dGlsLlNpdGVQcm9ncmFtOwpAQCAtNTEsMTIgKzUyLDE1IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Xb3JrUXVldWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuU2lnbmVkVG9rZW5FbWFpbFRva2VuVmVyaWZpZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuU210cEVtYWlsU2VuZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5JbnRyYUxpbmVXb3JrZXJQb29sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlBsdWdpbkd1aWNlRW52aXJvbm1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuUGx1Z2luTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuU2NoZW1hVXBkYXRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLlNjaGVtYVZlcnNpb25DaGVjazsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLlVwZGF0ZVVJOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guTm9Tc2hLZXlDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc3NoLk5vU3NoTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoS2V5Q2FjaGVJbXBsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHMuTWFzdGVyQ29tbWFuZE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLmNvbW1hbmRzLlNsYXZlQ29tbWFuZE1vZHVsZTsKQEAgLTY1LDYgKzY5LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TdGF0ZW1lbnRFeGVjdXRvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuTW9kdWxlOwpAQCAtMTEzLDYgKzExOCw5IEBACiAgIEBPcHRpb24obmFtZSA9ICItLXJ1bi1pZCIsIHVzYWdlID0gIkNvb2tpZSB0byBzdG9yZSBpbiAkc2l0ZV9wYXRoL2xvZ3MvZ2Vycml0LnJ1biIpCiAgIHByaXZhdGUgU3RyaW5nIHJ1bklkOwogCisgIEBPcHRpb24obmFtZSA9ICItLWhlYWRsZXNzIiwgdXNhZ2UgPSAiRG9uJ3Qgc3RhcnQgdGhlIFVJIGZyb250ZW5kIikKKyAgcHJpdmF0ZSBib29sZWFuIGhlYWRsZXNzOworCiAgIHByaXZhdGUgZmluYWwgTGlmZWN5Y2xlTWFuYWdlciBtYW5hZ2VyID0gbmV3IExpZmVjeWNsZU1hbmFnZXIoKTsKICAgcHJpdmF0ZSBJbmplY3RvciBkYkluamVjdG9yOwogICBwcml2YXRlIEluamVjdG9yIGNmZ0luamVjdG9yOwpAQCAtMTIyLDYgKzEzMCwxNSBAQAogICBwcml2YXRlIEluamVjdG9yIGh0dHBkSW5qZWN0b3I7CiAgIHByaXZhdGUgRmlsZSBydW5GaWxlOwogCisgIHByaXZhdGUgUnVubmFibGUgc2VydmVyU3RhcnRlZDsKKworICBwdWJsaWMgRGFlbW9uKCkgeworICB9CisKKyAgcHVibGljIERhZW1vbihSdW5uYWJsZSBzZXJ2ZXJTdGFydGVkKSB7CisgICAgdGhpcy5zZXJ2ZXJTdGFydGVkID0gc2VydmVyU3RhcnRlZDsKKyAgfQorCiAgIEBPdmVycmlkZQogICBwdWJsaWMgaW50IHJ1bigpIHRocm93cyBFeGNlcHRpb24gewogICAgIG11c3RIYXZlVmFsaWRTaXRlKCk7CkBAIC0xNDcsNiArMTY0LDcgQEAKICAgICAgIHRocm93IGRpZSgiQ2Fubm90IGNvbWJpbmUgLS1zbGF2ZSBhbmQgLS1lbmFibGUtaHR0cGQiKTsKICAgICB9CiAKKyAgICBtYW5hZ2VyLmFkZChHYXJiYWdlQ29sbGVjdGlvbkxvZ0ZpbGUuc3RhcnQoZ2V0U2l0ZVBhdGgoKSkpOwogICAgIGlmIChjb25zb2xlTG9nKSB7CiAgICAgfSBlbHNlIHsKICAgICAgIG1hbmFnZXIuYWRkKEVycm9yTG9nRmlsZS5zdGFydChnZXRTaXRlUGF0aCgpKSk7CkBAIC0xOTgsNiArMjE2LDEwIEBACiAgICAgICAgIH0KICAgICAgIH0KIAorICAgICAgaWYgKHNlcnZlclN0YXJ0ZWQgIT0gbnVsbCkgeworICAgICAgICBzZXJ2ZXJTdGFydGVkLnJ1bigpOworICAgICAgfQorCiAgICAgICBSdW50aW1lU2h1dGRvd24ud2FpdEZvcigpOwogICAgICAgcmV0dXJuIDA7CiAgICAgfSBjYXRjaCAoVGhyb3dhYmxlIGVycikgewpAQCAtMjkxLDExICszMTMsMTEgQEAKICAgICBtb2R1bGVzLmFkZChuZXcgV29ya1F1ZXVlLk1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgQ2hhbmdlSG9va1J1bm5lci5Nb2R1bGUoKSk7CiAgICAgbW9kdWxlcy5hZGQobmV3IFJlY2VpdmVDb21taXRzRXhlY3V0b3JNb2R1bGUoKSk7CisgICAgbW9kdWxlcy5hZGQobmV3IEludHJhTGluZVdvcmtlclBvb2wuTW9kdWxlKCkpOwogICAgIG1vZHVsZXMuYWRkKGNmZ0luamVjdG9yLmdldEluc3RhbmNlKEdlcnJpdEdsb2JhbE1vZHVsZS5jbGFzcykpOwogICAgIG1vZHVsZXMuYWRkKG5ldyBEZWZhdWx0Q2FjaGVGYWN0b3J5Lk1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgU210cEVtYWlsU2VuZGVyLk1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgU2lnbmVkVG9rZW5FbWFpbFRva2VuVmVyaWZpZXIuTW9kdWxlKCkpOwotICAgIG1vZHVsZXMuYWRkKG5ldyBTaWduZWRUb2tlblJlc3RUb2tlblZlcmlmaWVyLk1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgUGx1Z2luTW9kdWxlKCkpOwogICAgIGlmIChodHRwZCkgewogICAgICAgbW9kdWxlcy5hZGQobmV3IENhbm9uaWNhbFdlYlVybE1vZHVsZSgpIHsKQEAgLTMxMiw5ICszMzQsMjAgQEAKICAgICAgICAgfQogICAgICAgfSk7CiAgICAgfQorICAgIGlmIChzc2hkKSB7CisgICAgICBtb2R1bGVzLmFkZChTc2hLZXlDYWNoZUltcGwubW9kdWxlKCkpOworICAgIH0gZWxzZSB7CisgICAgICBtb2R1bGVzLmFkZChOb1NzaEtleUNhY2hlLm1vZHVsZSgpKTsKKyAgICB9CiAgICAgaWYgKCFzbGF2ZSkgewogICAgICAgbW9kdWxlcy5hZGQobmV3IE1hc3Rlck5vZGVTdGFydHVwKCkpOwogICAgIH0KKyAgICBtb2R1bGVzLmFkZChuZXcgQWJzdHJhY3RNb2R1bGUoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICAgICAgYmluZChHZXJyaXRVaU9wdGlvbnMuY2xhc3MpLnRvSW5zdGFuY2UobmV3IEdlcnJpdFVpT3B0aW9ucyhoZWFkbGVzcykpOworICAgICAgfQorICAgIH0pOwogICAgIHJldHVybiBjZmdJbmplY3Rvci5jcmVhdGVDaGlsZEluamVjdG9yKG1vZHVsZXMpOwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vRXhwb3J0UmV2aWV3Tm90ZXMuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vRXhwb3J0UmV2aWV3Tm90ZXMuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNTI1MzYwZC4uMDAwMDAwMAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL0V4cG9ydFJldmlld05vdGVzLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwyNDQgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnBnbTsKLQotaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFTb3VyY2VQcm92aWRlci5Db250ZXh0Lk1VTFRJX1VTRVI7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNb2R1bGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucGdtLnV0aWwuU2l0ZVByb2dyYW07Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudENhY2hlSW1wbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlSW1wbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2FjaGUuaDIuRGVmYXVsdENhY2hlRmFjdG9yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFwcHJvdmFsVHlwZXNQcm92aWRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybFByb3ZpZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuRmFjdG9yeU1vZHVsZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkNvZGVSZXZpZXdOb3RlQ3JlYXRpb25FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5DcmVhdGVDb2RlUmV2aWV3Tm90ZXM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkxvY2FsRGlza1JlcG9zaXRvcnlNYW5hZ2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTm90ZXNCcmFuY2hVdGlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuU2NoZW1hVmVyc2lvbkNoZWNrOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlNjaGVtYUZhY3Rvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdG9yOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNjb3BlczsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlRleHRQcm9ncmVzc01vbml0b3I7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuVGhyZWFkU2FmZVByb2dyZXNzTW9uaXRvcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuQmxvY2tMaXN0OwotaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5PcHRpb247Ci0KLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotaW1wb3J0IGphdmEudXRpbC5NYXA7Ci1pbXBvcnQgamF2YS51dGlsLk1hcC5FbnRyeTsKLQotLyoqIEV4cG9ydCByZXZpZXcgbm90ZXMgZm9yIGFsbCBzdWJtaXR0ZWQgY2hhbmdlcyBpbiBhbGwgcHJvamVjdHMuICovCi1wdWJsaWMgY2xhc3MgRXhwb3J0UmV2aWV3Tm90ZXMgZXh0ZW5kcyBTaXRlUHJvZ3JhbSB7Ci0gIEBPcHRpb24obmFtZSA9ICItLXRocmVhZHMiLCB1c2FnZSA9ICJOdW1iZXIgb2YgY29uY3VycmVudCB0aHJlYWRzIHRvIHJ1biIpCi0gIHByaXZhdGUgaW50IHRocmVhZHMgPSAyOwotCi0gIHByaXZhdGUgZmluYWwgTGlmZWN5Y2xlTWFuYWdlciBtYW5hZ2VyID0gbmV3IExpZmVjeWNsZU1hbmFnZXIoKTsKLSAgcHJpdmF0ZSBmaW5hbCBUZXh0UHJvZ3Jlc3NNb25pdG9yIHRleHRNb25pdG9yID0gbmV3IFRleHRQcm9ncmVzc01vbml0b3IoKTsKLSAgcHJpdmF0ZSBmaW5hbCBUaHJlYWRTYWZlUHJvZ3Jlc3NNb25pdG9yIG1vbml0b3IgPQotICAgICAgbmV3IFRocmVhZFNhZmVQcm9ncmVzc01vbml0b3IodGV4dE1vbml0b3IpOwotCi0gIHByaXZhdGUgSW5qZWN0b3IgZGJJbmplY3RvcjsKLSAgcHJpdmF0ZSBJbmplY3RvciBnaXRJbmplY3RvcjsKLQotICBASW5qZWN0Ci0gIHByaXZhdGUgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlcjsKLQotICBASW5qZWN0Ci0gIHByaXZhdGUgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gZGF0YWJhc2U7Ci0KLSAgQEluamVjdAotICBwcml2YXRlIENyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5GYWN0b3J5IGNvZGVSZXZpZXdOb3Rlc0ZhY3Rvcnk7Ci0KLSAgcHJpdmF0ZSBNYXA8UHJvamVjdC5OYW1lS2V5LCBMaXN0PENoYW5nZT4+IGNoYW5nZXM7Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBpbnQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7Ci0gICAgaWYgKHRocmVhZHMgPD0gMCkgewotICAgICAgdGhyZWFkcyA9IDE7Ci0gICAgfQotCi0gICAgZGJJbmplY3RvciA9IGNyZWF0ZURiSW5qZWN0b3IoTVVMVElfVVNFUik7Ci0gICAgZ2l0SW5qZWN0b3IgPSBkYkluamVjdG9yLmNyZWF0ZUNoaWxkSW5qZWN0b3IobmV3IEFic3RyYWN0TW9kdWxlKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7Ci0gICAgICAgIGluc3RhbGwoU2NoZW1hVmVyc2lvbkNoZWNrLm1vZHVsZSgpKTsKLSAgICAgICAgYmluZChBcHByb3ZhbFR5cGVzLmNsYXNzKS50b1Byb3ZpZGVyKEFwcHJvdmFsVHlwZXNQcm92aWRlci5jbGFzcykuaW4oCi0gICAgICAgICAgICBTY29wZXMuU0lOR0xFVE9OKTsKLSAgICAgICAgYmluZChTdHJpbmcuY2xhc3MpLmFubm90YXRlZFdpdGgoQ2Fub25pY2FsV2ViVXJsLmNsYXNzKQotICAgICAgICAgICAgLnRvUHJvdmlkZXIoQ2Fub25pY2FsV2ViVXJsUHJvdmlkZXIuY2xhc3MpLmluKFNjb3Blcy5TSU5HTEVUT04pOwotCi0gICAgICAgIGluc3RhbGwoQWNjb3VudENhY2hlSW1wbC5tb2R1bGUoKSk7Ci0gICAgICAgIGluc3RhbGwoR3JvdXBDYWNoZUltcGwubW9kdWxlKCkpOwotICAgICAgICBpbnN0YWxsKG5ldyBEZWZhdWx0Q2FjaGVGYWN0b3J5Lk1vZHVsZSgpKTsKLSAgICAgICAgaW5zdGFsbChuZXcgRmFjdG9yeU1vZHVsZSgpIHsKLSAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7Ci0gICAgICAgICAgICBmYWN0b3J5KENyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5GYWN0b3J5LmNsYXNzKTsKLSAgICAgICAgICAgIGZhY3RvcnkoTm90ZXNCcmFuY2hVdGlsLkZhY3RvcnkuY2xhc3MpOwotICAgICAgICAgIH0KLSAgICAgICAgfSk7Ci0gICAgICAgIGluc3RhbGwobmV3IExpZmVjeWNsZU1vZHVsZSgpIHsKLSAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7Ci0gICAgICAgICAgICBsaXN0ZW5lcigpLnRvKExvY2FsRGlza1JlcG9zaXRvcnlNYW5hZ2VyLkxpZmVjeWNsZS5jbGFzcyk7Ci0gICAgICAgICAgfQotICAgICAgICB9KTsKLSAgICAgIH0KLSAgICB9KTsKLQotICAgIG1hbmFnZXIuYWRkKGRiSW5qZWN0b3IsIGdpdEluamVjdG9yKTsKLSAgICBtYW5hZ2VyLnN0YXJ0KCk7Ci0gICAgZ2l0SW5qZWN0b3IuaW5qZWN0TWVtYmVycyh0aGlzKTsKLQotICAgIExpc3Q8Q2hhbmdlPiBhbGxDaGFuZ2VMaXN0ID0gYWxsQ2hhbmdlcygpOwotICAgIG1vbml0b3IuYmVnaW5UYXNrKCJTY2FubmluZyBjaGFuZ2VzIiwgYWxsQ2hhbmdlTGlzdC5zaXplKCkpOwotICAgIGNoYW5nZXMgPSBjbHVzdGVyKGFsbENoYW5nZUxpc3QpOwotICAgIGFsbENoYW5nZUxpc3QgPSBudWxsOwotCi0gICAgbW9uaXRvci5zdGFydFdvcmtlcnModGhyZWFkcyk7Ci0gICAgZm9yIChpbnQgdGlkID0gMDsgdGlkIDwgdGhyZWFkczsgdGlkKyspIHsKLSAgICAgIG5ldyBXb3JrZXIoKS5zdGFydCgpOwotICAgIH0KLSAgICBtb25pdG9yLndhaXRGb3JDb21wbGV0aW9uKCk7Ci0gICAgbW9uaXRvci5lbmRUYXNrKCk7Ci0gICAgbWFuYWdlci5zdG9wKCk7Ci0gICAgcmV0dXJuIDA7Ci0gIH0KLQotICBwcml2YXRlIExpc3Q8Q2hhbmdlPiBhbGxDaGFuZ2VzKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7Ci0gICAgZmluYWwgUmV2aWV3RGIgZGIgPSBkYXRhYmFzZS5vcGVuKCk7Ci0gICAgdHJ5IHsKLSAgICAgIHJldHVybiBkYi5jaGFuZ2VzKCkuYWxsKCkudG9MaXN0KCk7Ci0gICAgfSBmaW5hbGx5IHsKLSAgICAgIGRiLmNsb3NlKCk7Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSBNYXA8UHJvamVjdC5OYW1lS2V5LCBMaXN0PENoYW5nZT4+IGNsdXN0ZXIoTGlzdDxDaGFuZ2U+IGNoYW5nZXMpIHsKLSAgICBIYXNoTWFwPFByb2plY3QuTmFtZUtleSwgTGlzdDxDaGFuZ2U+PiBtID0KLSAgICAgICAgbmV3IEhhc2hNYXA8UHJvamVjdC5OYW1lS2V5LCBMaXN0PENoYW5nZT4+KCk7Ci0gICAgZm9yIChDaGFuZ2UgY2hhbmdlIDogY2hhbmdlcykgewotICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKSA9PSBDaGFuZ2UuU3RhdHVzLk1FUkdFRCkgewotICAgICAgICBMaXN0PENoYW5nZT4gbCA9IG0uZ2V0KGNoYW5nZS5nZXRQcm9qZWN0KCkpOwotICAgICAgICBpZiAobCA9PSBudWxsKSB7Ci0gICAgICAgICAgbCA9IG5ldyBCbG9ja0xpc3Q8Q2hhbmdlPigpOwotICAgICAgICAgIG0ucHV0KGNoYW5nZS5nZXRQcm9qZWN0KCksIGwpOwotICAgICAgICB9Ci0gICAgICAgIGwuYWRkKGNoYW5nZSk7Ci0gICAgICB9IGVsc2UgewotICAgICAgICBtb25pdG9yLnVwZGF0ZSgxKTsKLSAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIG07Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgZXhwb3J0KFJldmlld0RiIGRiLCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgTGlzdDxDaGFuZ2U+IGNoYW5nZXMpCi0gICAgICB0aHJvd3MgSU9FeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwgQ29kZVJldmlld05vdGVDcmVhdGlvbkV4Y2VwdGlvbiwKLSAgICAgIEludGVycnVwdGVkRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBSZXBvc2l0b3J5IGdpdDsKLSAgICB0cnkgewotICAgICAgZ2l0ID0gZ2l0TWFuYWdlci5vcGVuUmVwb3NpdG9yeShwcm9qZWN0KTsKLSAgICB9IGNhdGNoIChSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24gZSkgewotICAgICAgcmV0dXJuOwotICAgIH0KLSAgICB0cnkgewotICAgICAgQ3JlYXRlQ29kZVJldmlld05vdGVzIG5vdGVzID0gY29kZVJldmlld05vdGVzRmFjdG9yeS5jcmVhdGUoZGIsIGdpdCk7Ci0gICAgICBub3Rlcy5jcmVhdGUoY2hhbmdlcywgbnVsbCwKLSAgICAgICAgICAiRXhwb3J0ZWQgcHJpb3IgcmV2aWV3cyBmcm9tIEdlcnJpdCBDb2RlIFJldmlld1xuIiwgbW9uaXRvcik7Ci0gICAgfSBmaW5hbGx5IHsKLSAgICAgIGdpdC5jbG9zZSgpOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgTWFwLkVudHJ5PFByb2plY3QuTmFtZUtleSwgTGlzdDxDaGFuZ2U+PiBuZXh0KCkgewotICAgIHN5bmNocm9uaXplZCAoY2hhbmdlcykgewotICAgICAgaWYgKGNoYW5nZXMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIHJldHVybiBudWxsOwotICAgICAgfQotCi0gICAgICBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgbmFtZSA9IGNoYW5nZXMua2V5U2V0KCkuaXRlcmF0b3IoKS5uZXh0KCk7Ci0gICAgICBmaW5hbCBMaXN0PENoYW5nZT4gbGlzdCA9IGNoYW5nZXMucmVtb3ZlKG5hbWUpOwotICAgICAgcmV0dXJuIG5ldyBNYXAuRW50cnk8UHJvamVjdC5OYW1lS2V5LCBMaXN0PENoYW5nZT4+KCkgewotICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgcHVibGljIFByb2plY3QuTmFtZUtleSBnZXRLZXkoKSB7Ci0gICAgICAgICAgcmV0dXJuIG5hbWU7Ci0gICAgICAgIH0KLQotICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgcHVibGljIExpc3Q8Q2hhbmdlPiBnZXRWYWx1ZSgpIHsKLSAgICAgICAgICByZXR1cm4gbGlzdDsKLSAgICAgICAgfQotCi0gICAgICAgIEBPdmVycmlkZQotICAgICAgICBwdWJsaWMgTGlzdDxDaGFuZ2U+IHNldFZhbHVlKExpc3Q8Q2hhbmdlPiB2YWx1ZSkgewotICAgICAgICAgIHRocm93IG5ldyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbigpOwotICAgICAgICB9Ci0gICAgICB9OwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgY2xhc3MgV29ya2VyIGV4dGVuZHMgVGhyZWFkIHsKLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgdm9pZCBydW4oKSB7Ci0gICAgICBSZXZpZXdEYiBkYjsKLSAgICAgIHRyeSB7Ci0gICAgICAgIGRiID0gZGF0YWJhc2Uub3BlbigpOwotICAgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgZS5wcmludFN0YWNrVHJhY2UoKTsKLSAgICAgICAgcmV0dXJuOwotICAgICAgfQotICAgICAgdHJ5IHsKLSAgICAgICAgZm9yICg7OykgewotICAgICAgICAgIEVudHJ5PFByb2plY3QuTmFtZUtleSwgTGlzdDxDaGFuZ2U+PiBuZXh0ID0gbmV4dCgpOwotICAgICAgICAgIGlmIChuZXh0ICE9IG51bGwpIHsKLSAgICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgIGV4cG9ydChkYiwgbmV4dC5nZXRLZXkoKSwgbmV4dC5nZXRWYWx1ZSgpKTsKLSAgICAgICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgICAgICAgZS5wcmludFN0YWNrVHJhY2UoKTsKLSAgICAgICAgICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgICAgIGUucHJpbnRTdGFja1RyYWNlKCk7Ci0gICAgICAgICAgICB9IGNhdGNoIChDb2RlUmV2aWV3Tm90ZUNyZWF0aW9uRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgICAgICAgZS5wcmludFN0YWNrVHJhY2UoKTsKLSAgICAgICAgICAgIH0gY2F0Y2ggKEludGVycnVwdGVkRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgICAgICAgZS5wcmludFN0YWNrVHJhY2UoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICB9IGZpbmFsbHkgewotICAgICAgICBtb25pdG9yLmVuZFdvcmtlcigpOwotICAgICAgICBkYi5jbG9zZSgpOwotICAgICAgfQotICAgIH0KLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9Jbml0LmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL0luaXQuamF2YQppbmRleCA5NWI4NDg3Zi4uM2M3ODIyYyAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9Jbml0LmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9Jbml0LmphdmEKQEAgLTIxLDcgKzIxLDYgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaW5pdC5Ccm93c2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0LkluaXRGbGFnczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaW5pdC5Jbml0TW9kdWxlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0LlJlbG9hZFNpdGVMaWJyYXJ5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0LlNpdGVQYXRoSW5pdGlhbGl6ZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucGdtLnV0aWwuQ29uc29sZVVJOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS51dGlsLkRpZTsKQEAgLTEyMSwxMiArMTIwLDYgQEAKICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKICAgICAgICAgYmluZChDb25zb2xlVUkuY2xhc3MpLnRvSW5zdGFuY2UodWkpOwogICAgICAgICBiaW5kKEZpbGUuY2xhc3MpLmFubm90YXRlZFdpdGgoU2l0ZVBhdGguY2xhc3MpLnRvSW5zdGFuY2Uoc2l0ZVBhdGgpOwotICAgICAgICBiaW5kKFJlbG9hZFNpdGVMaWJyYXJ5LmNsYXNzKS50b0luc3RhbmNlKG5ldyBSZWxvYWRTaXRlTGlicmFyeSgpIHsKLSAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwdWJsaWMgdm9pZCByZWxvYWQoKSB7Ci0gICAgICAgICAgICBJbml0LnN1cGVyLmxvYWRTaXRlTGliKCk7Ci0gICAgICAgICAgfQotICAgICAgICB9KTsKICAgICAgIH0KICAgICB9KTsKIApAQCAtMTQwLDggKzEzMyw5IEBACiAgICAgICAgIHRocm93IChEaWUpIHdoeTsKICAgICAgIH0KIAotICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciBidWYgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciBidWYgPSBuZXcgU3RyaW5nQnVpbGRlcihjZS5nZXRNZXNzYWdlKCkpOwogICAgICAgd2hpbGUgKHdoeSAhPSBudWxsKSB7CisgICAgICAgIGJ1Zi5hcHBlbmQoIlxuIik7CiAgICAgICAgIGJ1Zi5hcHBlbmQod2h5LmdldE1lc3NhZ2UoKSk7CiAgICAgICAgIHdoeSA9IHdoeS5nZXRDYXVzZSgpOwogICAgICAgICBpZiAod2h5ICE9IG51bGwpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vUHJvdG9HZW4uamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vUHJvdG9HZW4uamF2YQppbmRleCAxN2I3MDE3Li40NTEyMDc4IDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL1Byb3RvR2VuLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9Qcm90b0dlbi5qYXZhCkBAIC0xOCw3ICsxOCw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNjaGVtYS5qYXZhLkphdmFTY2hlbWFNb2RlbDsKIAotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuc3RvcmFnZS5maWxlLkxvY2tGaWxlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuaW50ZXJuYWwuc3RvcmFnZS5maWxlLkxvY2tGaWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudXRpbC5GUzsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuSU87CiBpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaHR0cC9qZXR0eS9KZXR0eVNlcnZlci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9odHRwL2pldHR5L0pldHR5U2VydmVyLmphdmEKaW5kZXggNTgyMzk0MC4uM2E3YTg3NCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9odHRwL2pldHR5L0pldHR5U2VydmVyLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9odHRwL2pldHR5L0pldHR5U2VydmVyLmphdmEKQEAgLTQyLDEwICs0MiwxMCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmpldHR5LnNlcnZlci5zc2wuU3NsU2VsZWN0Q2hhbm5lbENvbm5lY3RvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZXR0eS5zZXJ2bGV0LkRlZmF1bHRTZXJ2bGV0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmpldHR5LnNlcnZsZXQuRmlsdGVySG9sZGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpldHR5LnNlcnZsZXQuRmlsdGVyTWFwcGluZzsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZXR0eS5zZXJ2bGV0LlNlcnZsZXRDb250ZXh0SGFuZGxlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZXR0eS5zZXJ2bGV0LlNlcnZsZXRIb2xkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamV0dHkudXRpbC5yZXNvdXJjZS5SZXNvdXJjZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZXR0eS51dGlsLnNzbC5Tc2xDb250ZXh0RmFjdG9yeTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZXR0eS51dGlsLnRocmVhZC5RdWV1ZWRUaHJlYWRQb29sOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpldHR5LnV0aWwudGhyZWFkLlRocmVhZFBvb2w7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOwpAQCAtNjAsNiArNjAsNyBAQAogaW1wb3J0IGphdmEubmV0LlVSSVN5bnRheEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLm5ldC5VUkw7CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuRW51bVNldDsKIGltcG9ydCBqYXZhLnV0aWwuRW51bWVyYXRpb247CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CkBAIC02Nyw2ICs2OCw4IEBACiBpbXBvcnQgamF2YS51dGlsLnppcC5aaXBFbnRyeTsKIGltcG9ydCBqYXZhLnV0aWwuemlwLlppcEZpbGU7CiAKK2ltcG9ydCBqYXZheC5zZXJ2bGV0LkRpc3BhdGNoZXJUeXBlOworCiBAU2luZ2xldG9uCiBwdWJsaWMgY2xhc3MgSmV0dHlTZXJ2ZXIgewogICBzdGF0aWMgY2xhc3MgTGlmZWN5Y2xlIGltcGxlbWVudHMgTGlmZWN5Y2xlTGlzdGVuZXIgewpAQCAtMTYxLDIzICsxNjQsMjMgQEAKICAgICAgICAgZGVmYXVsdFBvcnQgPSA4MDsKICAgICAgICAgYyA9IG5ldyBTZWxlY3RDaGFubmVsQ29ubmVjdG9yKCk7CiAgICAgICB9IGVsc2UgaWYgKCJodHRwcyIuZXF1YWxzKHUuZ2V0U2NoZW1lKCkpKSB7Ci0gICAgICAgIGZpbmFsIFNzbFNlbGVjdENoYW5uZWxDb25uZWN0b3Igc3NsID0gbmV3IFNzbFNlbGVjdENoYW5uZWxDb25uZWN0b3IoKTsKKyAgICAgICAgU3NsQ29udGV4dEZhY3Rvcnkgc3NsID0gbmV3IFNzbENvbnRleHRGYWN0b3J5KCk7CiAgICAgICAgIGZpbmFsIEZpbGUga2V5c3RvcmUgPSBnZXRGaWxlKGNmZywgInNzbGtleXN0b3JlIiwgImV0Yy9rZXlzdG9yZSIpOwogICAgICAgICBTdHJpbmcgcGFzc3dvcmQgPSBjZmcuZ2V0U3RyaW5nKCJodHRwZCIsIG51bGwsICJzc2xrZXlwYXNzd29yZCIpOwogICAgICAgICBpZiAocGFzc3dvcmQgPT0gbnVsbCkgewogICAgICAgICAgIHBhc3N3b3JkID0gImdlcnJpdCI7CiAgICAgICAgIH0KLSAgICAgICAgc3NsLnNldEtleXN0b3JlKGtleXN0b3JlLmdldEFic29sdXRlUGF0aCgpKTsKLSAgICAgICAgc3NsLnNldFRydXN0c3RvcmUoa2V5c3RvcmUuZ2V0QWJzb2x1dGVQYXRoKCkpOwotICAgICAgICBzc2wuc2V0S2V5UGFzc3dvcmQocGFzc3dvcmQpOwotICAgICAgICBzc2wuc2V0VHJ1c3RQYXNzd29yZChwYXNzd29yZCk7CisgICAgICAgIHNzbC5zZXRLZXlTdG9yZVBhdGgoa2V5c3RvcmUuZ2V0QWJzb2x1dGVQYXRoKCkpOworICAgICAgICBzc2wuc2V0VHJ1c3RTdG9yZShrZXlzdG9yZS5nZXRBYnNvbHV0ZVBhdGgoKSk7CisgICAgICAgIHNzbC5zZXRLZXlTdG9yZVBhc3N3b3JkKHBhc3N3b3JkKTsKKyAgICAgICAgc3NsLnNldFRydXN0U3RvcmVQYXNzd29yZChwYXNzd29yZCk7CiAKICAgICAgICAgaWYgKEF1dGhUeXBlLkNMSUVOVF9TU0xfQ0VSVF9MREFQLmVxdWFscyhhdXRoVHlwZSkpIHsKICAgICAgICAgICBzc2wuc2V0TmVlZENsaWVudEF1dGgodHJ1ZSk7CiAgICAgICAgIH0KIAogICAgICAgICBkZWZhdWx0UG9ydCA9IDQ0MzsKLSAgICAgICAgYyA9IHNzbDsKKyAgICAgICAgYyA9IG5ldyBTc2xTZWxlY3RDaGFubmVsQ29ubmVjdG9yKHNzbCk7CiAKICAgICAgIH0gZWxzZSBpZiAoInByb3h5LWh0dHAiLmVxdWFscyh1LmdldFNjaGVtZSgpKSkgewogICAgICAgICBkZWZhdWx0UG9ydCA9IDgwODA7CkBAIC0zMzYsNyArMzM5LDkgQEAKICAgICAvLyBhbHJlYWR5IGhhdmUgYnVpbHQuCiAgICAgLy8KICAgICBHdWljZUZpbHRlciBmaWx0ZXIgPSBlbnYud2ViSW5qZWN0b3IuZ2V0SW5zdGFuY2UoR3VpY2VGaWx0ZXIuY2xhc3MpOwotICAgIGFwcC5hZGRGaWx0ZXIobmV3IEZpbHRlckhvbGRlcihmaWx0ZXIpLCAiLyoiLCBGaWx0ZXJNYXBwaW5nLkRFRkFVTFQpOworICAgIGFwcC5hZGRGaWx0ZXIobmV3IEZpbHRlckhvbGRlcihmaWx0ZXIpLCAiLyoiLCBFbnVtU2V0Lm9mKAorICAgICAgICBEaXNwYXRjaGVyVHlwZS5SRVFVRVNULAorICAgICAgICBEaXNwYXRjaGVyVHlwZS5BU1lOQykpOwogICAgIGFwcC5hZGRFdmVudExpc3RlbmVyKG5ldyBHdWljZVNlcnZsZXRDb250ZXh0TGlzdGVuZXIoKSB7CiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHByb3RlY3RlZCBJbmplY3RvciBnZXRJbmplY3RvcigpIHsKQEAgLTQ5MSw3ICs0OTYsNyBAQAogICAgIGZvciAoRmlsZSBlIDogZW50cmllcykgewogICAgICAgaWYgKGUuaXNEaXJlY3RvcnkoKSAvKiBtdXN0IGJlIGEgZGlyZWN0b3J5ICovCiAgICAgICAgICAgJiYgZS5nZXROYW1lKCkuc3RhcnRzV2l0aCgiZ2Vycml0LWd3dHVpLSIpCi0gICAgICAgICAgJiYgbmV3IEZpbGUoZSwgImdlcnJpdC9nZXJyaXQubm9jYWNoZS5qcyIpLmlzRmlsZSgpKSB7CisgICAgICAgICAgJiYgbmV3IEZpbGUoZSwgImdlcnJpdF91aS9nZXJyaXRfdWkubm9jYWNoZS5qcyIpLmlzRmlsZSgpKSB7CiAgICAgICAgIHJldHVybiBSZXNvdXJjZS5uZXdSZXNvdXJjZShlLnRvVVJJKCkpOwogICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Ccm93c2VyLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvQnJvd3Nlci5qYXZhCmluZGV4IGVhMTMwNDMuLjhlMzk0OGUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Ccm93c2VyLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0Jyb3dzZXIuamF2YQpAQCAtMTQsNiArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0OwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIApAQCAtNDIsNyArNDMsNiBAQAogICAgIGlmICh1cmwgPT0gbnVsbCkgewogICAgICAgcmV0dXJuOwogICAgIH0KLQogICAgIGlmICh1cmwuc3RhcnRzV2l0aCgicHJveHktIikpIHsKICAgICAgIHVybCA9IHVybC5zdWJzdHJpbmcoInByb3h5LSIubGVuZ3RoKCkpOwogICAgIH0KQEAgLTU0LDE1ICs1NCwxOSBAQAogICAgICAgU3lzdGVtLmVyci5wcmludGxuKCJlcnJvcjogaW52YWxpZCBodHRwZC5saXN0ZW5Vcmw6ICIgKyB1cmwpOwogICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBmaW5hbCBTdHJpbmcgaG9zdG5hbWUgPSB1cmkuZ2V0SG9zdCgpOwotICAgIGZpbmFsIGludCBwb3J0ID0gSW5pdFV0aWwucG9ydE9mKHVyaSk7CisgICAgd2FpdEZvclNlcnZlcih1cmkpOworICAgIG9wZW5Ccm93c2VyKHVyaSwgbGluayk7CisgIH0KIAotICAgIFN5c3RlbS5lcnIucHJpbnQoIldhaXRpbmcgZm9yIHNlcnZlciB0byBzdGFydCAuLi4gIik7CisgIHByaXZhdGUgdm9pZCB3YWl0Rm9yU2VydmVyKFVSSSB1cmkpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgU3RyaW5nIGhvc3QgPSB1cmkuZ2V0SG9zdCgpOworICAgIGludCBwb3J0ID0gSW5pdFV0aWwucG9ydE9mKHVyaSk7CisgICAgU3lzdGVtLmVyci5mb3JtYXQoIldhaXRpbmcgZm9yIHNlcnZlciBvbiAlczolZCAuLi4gIiwgaG9zdCwgcG9ydCk7CiAgICAgU3lzdGVtLmVyci5mbHVzaCgpOwogICAgIGZvciAoOzspIHsKLSAgICAgIGZpbmFsIFNvY2tldCBzOworICAgICAgU29ja2V0IHM7CiAgICAgICB0cnkgewotICAgICAgICBzID0gbmV3IFNvY2tldChob3N0bmFtZSwgcG9ydCk7CisgICAgICAgIHMgPSBuZXcgU29ja2V0KGhvc3QsIHBvcnQpOwogICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewogICAgICAgICB0cnkgewogICAgICAgICAgIFRocmVhZC5zbGVlcCgxMDApOwpAQCAtNzQsMTggKzc4LDMzIEBACiAgICAgICBicmVhazsKICAgICB9CiAgICAgU3lzdGVtLmVyci5wcmludGxuKCJPSyIpOworICB9CiAKLSAgICB1cmwgPSBjZmcuZ2V0U3RyaW5nKCJnZXJyaXQiLCBudWxsLCAiY2Fub25pY2FsV2ViVXJsIik7Ci0gICAgaWYgKHVybCA9PSBudWxsIHx8IHVybC5pc0VtcHR5KCkpIHsKKyAgcHJpdmF0ZSBTdHJpbmcgcmVzb2x2ZVVybChVUkkgdXJpLCBTdHJpbmcgbGluaykgeworICAgIFN0cmluZyB1cmwgPSBjZmcuZ2V0U3RyaW5nKCJnZXJyaXQiLCBudWxsLCAiY2Fub25pY2FsV2ViVXJsIik7CisgICAgaWYgKFN0cmluZ3MuaXNOdWxsT3JFbXB0eSh1cmwpKSB7CiAgICAgICB1cmwgPSB1cmkudG9TdHJpbmcoKTsKICAgICB9CiAgICAgaWYgKCF1cmwuZW5kc1dpdGgoIi8iKSkgewogICAgICAgdXJsICs9ICIvIjsKICAgICB9Ci0gICAgaWYgKGxpbmsgIT0gbnVsbCAmJiAhbGluay5pc0VtcHR5KCkpIHsKKyAgICBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShsaW5rKSkgewogICAgICAgdXJsICs9ICIjIiArIGxpbms7CiAgICAgfQotICAgIFN5c3RlbS5lcnIucHJpbnRsbigiT3BlbmluZyBicm93c2VyIC4uLiIpOwotICAgIG9yZy5oMi50b29scy5TZXJ2ZXIub3BlbkJyb3dzZXIodXJsKTsKKyAgICByZXR1cm4gdXJsOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIG9wZW5Ccm93c2VyKFVSSSB1cmksIFN0cmluZyBsaW5rKSB7CisgICAgU3RyaW5nIHVybCA9IHJlc29sdmVVcmwodXJpLCBsaW5rKTsKKyAgICBTeXN0ZW0uZXJyLmZvcm1hdCgiT3BlbmluZyAlcyAuLi4iLCB1cmwpOworICAgIFN5c3RlbS5lcnIuZmx1c2goKTsKKyAgICB0cnkgeworICAgICAgb3JnLmgyLnRvb2xzLlNlcnZlci5vcGVuQnJvd3Nlcih1cmwpOworICAgICAgU3lzdGVtLmVyci5wcmludGxuKCJPSyIpOworICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICBTeXN0ZW0uZXJyLnByaW50bG4oIkZBSUxFRCIpOworICAgICAgU3lzdGVtLmVyci5wcmludGxuKCJPcGVuIEdlcnJpdCB3aXRoIGEgSmF2YVNjcmlwdCBjYXBhYmxlIGJyb3dzZXI6Iik7CisgICAgICBTeXN0ZW0uZXJyLnByaW50bG4oIiAgIiArIHVybCk7CisgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvRGF0YWJhc2VDb25maWdJbml0aWFsaXplci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0RhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43YWMxZWQ2Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0RhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuamF2YQpAQCAtMCwwICsxLDI1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQ7CisKKy8qKiBBYnN0cmFjdGlvbiBvZiBpbml0aWFsaXplciBmb3IgdGhlIGRhdGFiYXNlIHNlY3Rpb24gKi8KK2ludGVyZmFjZSBEYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyIHsKKworICAvKioKKyAgICogUGVyZm9ybXMgZGF0YWJhc2UgcGxhdGZvcm0gc3BlY2lmaWMgY29uZmlndXJhdGlvbiBzdGVwcyBhbmQgd3JpdGVzCisgICAqIGNvbmZpZ3VyYXRpb24gcGFyYW1ldGVycyBpbnRvIHRoZSBnaXZlbiBkYXRhYmFzZSBzZWN0aW9uCisgICAqLworICBwdWJsaWMgdm9pZCBpbml0Q29uZmlnKFNlY3Rpb24gZGF0YWJhc2VTZWN0aW9uKTsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9EYXRhYmFzZUNvbmZpZ01vZHVsZS5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0RhdGFiYXNlQ29uZmlnTW9kdWxlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzJmOGMyZQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9EYXRhYmFzZUNvbmZpZ01vZHVsZS5qYXZhCkBAIC0wLDAgKzEsNDEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaW5pdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkFic3RyYWN0TW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lm5hbWUuTmFtZXM7CisKK3B1YmxpYyBjbGFzcyBEYXRhYmFzZUNvbmZpZ01vZHVsZSBleHRlbmRzIEFic3RyYWN0TW9kdWxlIHsKKworICBwcml2YXRlIGZpbmFsIFNpdGVQYXRocyBzaXRlOworCisgIHB1YmxpYyBEYXRhYmFzZUNvbmZpZ01vZHVsZShmaW5hbCBTaXRlUGF0aHMgc2l0ZSkgeworICAgIHRoaXMuc2l0ZSA9IHNpdGU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgIGJpbmQoU2l0ZVBhdGhzLmNsYXNzKS50b0luc3RhbmNlKHNpdGUpOworICAgIGJpbmQoRGF0YWJhc2VDb25maWdJbml0aWFsaXplci5jbGFzcykuYW5ub3RhdGVkV2l0aCgKKyAgICAgICAgTmFtZXMubmFtZWQoImgyIikpLnRvKEgySW5pdGlhbGl6ZXIuY2xhc3MpOworICAgIGJpbmQoRGF0YWJhc2VDb25maWdJbml0aWFsaXplci5jbGFzcykuYW5ub3RhdGVkV2l0aCgKKyAgICAgICAgTmFtZXMubmFtZWQoImpkYmMiKSkudG8oSkRCQ0luaXRpYWxpemVyLmNsYXNzKTsKKyAgICBiaW5kKERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuY2xhc3MpLmFubm90YXRlZFdpdGgoCisgICAgICAgIE5hbWVzLm5hbWVkKCJteXNxbCIpKS50byhNeVNxbEluaXRpYWxpemVyLmNsYXNzKTsKKyAgICBiaW5kKERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuY2xhc3MpLmFubm90YXRlZFdpdGgoCisgICAgICAgIE5hbWVzLm5hbWVkKCJwb3N0Z3Jlc3FsIikpLnRvKFBvc3RncmVTUUxJbml0aWFsaXplci5jbGFzcyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9IMkluaXRpYWxpemVyLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSDJJbml0aWFsaXplci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBlYTNmZjAKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSDJJbml0aWFsaXplci5qYXZhCkBAIC0wLDAgKzEsNDggQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaW5pdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKKworY2xhc3MgSDJJbml0aWFsaXplciBpbXBsZW1lbnRzIERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIgeworCisgIHByaXZhdGUgZmluYWwgU2l0ZVBhdGhzIHNpdGU7CisKKyAgQEluamVjdAorICBIMkluaXRpYWxpemVyKGZpbmFsIFNpdGVQYXRocyBzaXRlKSB7CisgICAgdGhpcy5zaXRlID0gc2l0ZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBpbml0Q29uZmlnKFNlY3Rpb24gZGF0YWJhc2VTZWN0aW9uKSB7CisgICAgU3RyaW5nIHBhdGggPSBkYXRhYmFzZVNlY3Rpb24uZ2V0KCJkYXRhYmFzZSIpOworICAgIGlmIChwYXRoID09IG51bGwpIHsKKyAgICAgIHBhdGggPSAiZGIvUmV2aWV3REIiOworICAgICAgZGF0YWJhc2VTZWN0aW9uLnNldCgiZGF0YWJhc2UiLCBwYXRoKTsKKyAgICB9CisgICAgRmlsZSBkYiA9IHNpdGUucmVzb2x2ZShwYXRoKTsKKyAgICBpZiAoZGIgPT0gbnVsbCkgeworICAgICAgdGhyb3cgSW5pdFV0aWwuZGllKCJkYXRhYmFzZS5kYXRhYmFzZSBtdXN0IGJlIHN1cHBsaWVkIGZvciBIMiIpOworICAgIH0KKyAgICBkYiA9IGRiLmdldFBhcmVudEZpbGUoKTsKKyAgICBpZiAoIWRiLmV4aXN0cygpICYmICFkYi5ta2RpcnMoKSkgeworICAgICAgdGhyb3cgSW5pdFV0aWwuZGllKCJjYW5ub3QgY3JlYXRlIGRhdGFiYXNlLmRhdGFiYXNlICIKKyAgICAgICAgICArIGRiLmdldEFic29sdXRlUGF0aCgpKTsKKyAgICB9CisgIH0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdEF1dGguamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0QXV0aC5qYXZhCmluZGV4IGZhNGRjMTQuLjE1MjQ3MDcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0QXV0aC5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0QXV0aC5qYXZhCkBAIC0zMiw4ICszMiw4IEBACiAgIEBJbmplY3QKICAgSW5pdEF1dGgoZmluYWwgQ29uc29sZVVJIHVpLCBmaW5hbCBTZWN0aW9uLkZhY3Rvcnkgc2VjdGlvbnMpIHsKICAgICB0aGlzLnVpID0gdWk7Ci0gICAgdGhpcy5hdXRoID0gc2VjdGlvbnMuZ2V0KCJhdXRoIik7Ci0gICAgdGhpcy5sZGFwID0gc2VjdGlvbnMuZ2V0KCJsZGFwIik7CisgICAgdGhpcy5hdXRoID0gc2VjdGlvbnMuZ2V0KCJhdXRoIiwgbnVsbCk7CisgICAgdGhpcy5sZGFwID0gc2VjdGlvbnMuZ2V0KCJsZGFwIiwgbnVsbCk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBydW4oKSB7CkBAIC01NCw2ICs1NCwxNSBAQAogICAgICAgICBhdXRoLnN0cmluZygiU1NPIGxvZ291dCBVUkwiLCAibG9nb3V0VXJsIiwgbnVsbCk7CiAgICAgICAgIGJyZWFrOwogICAgICAgfQorCisgICAgICBjYXNlIENMSUVOVF9TU0xfQ0VSVF9MREFQOgorICAgICAgY2FzZSBDVVNUT01fRVhURU5TSU9OOgorICAgICAgY2FzZSBERVZFTE9QTUVOVF9CRUNPTUVfQU5ZX0FDQ09VTlQ6CisgICAgICBjYXNlIExEQVA6CisgICAgICBjYXNlIExEQVBfQklORDoKKyAgICAgIGNhc2UgT1BFTklEOgorICAgICAgY2FzZSBPUEVOSURfU1NPOgorICAgICAgICBicmVhazsKICAgICB9CiAKICAgICBzd2l0Y2ggKGF1dGhfdHlwZSkgewpAQCAtODAsNiArODksMTQgQEAKICAgICAgICAgbGRhcC5zdHJpbmcoIkdyb3VwIEJhc2VETiIsICJncm91cEJhc2UiLCBhQmFzZSk7CiAgICAgICAgIGJyZWFrOwogICAgICAgfQorCisgICAgICBjYXNlIENMSUVOVF9TU0xfQ0VSVF9MREFQOgorICAgICAgY2FzZSBDVVNUT01fRVhURU5TSU9OOgorICAgICAgY2FzZSBERVZFTE9QTUVOVF9CRUNPTUVfQU5ZX0FDQ09VTlQ6CisgICAgICBjYXNlIEhUVFA6CisgICAgICBjYXNlIE9QRU5JRDoKKyAgICAgIGNhc2UgT1BFTklEX1NTTzoKKyAgICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAgaWYgKGF1dGguZ2V0U2VjdXJlKCJyZWdpc3RlckVtYWlsUHJpdmF0ZUtleSIpID09IG51bGwpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0Q2FjaGUuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0Q2FjaGUuamF2YQppbmRleCBmYjFhOTI0Li4yYjU3MjlmIDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdENhY2hlLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRDYWNoZS5qYXZhCkBAIC0zMSw3ICszMSw3IEBACiAgIEBJbmplY3QKICAgSW5pdENhY2hlKGZpbmFsIFNpdGVQYXRocyBzaXRlLCBmaW5hbCBTZWN0aW9uLkZhY3Rvcnkgc2VjdGlvbnMpIHsKICAgICB0aGlzLnNpdGUgPSBzaXRlOwotICAgIHRoaXMuY2FjaGUgPSBzZWN0aW9ucy5nZXQoImNhY2hlIik7CisgICAgdGhpcy5jYWNoZSA9IHNlY3Rpb25zLmdldCgiY2FjaGUiLCBudWxsKTsKICAgfQogCiAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0Q29udGFpbmVyLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdENvbnRhaW5lci5qYXZhCmluZGV4IDcwNjNmNTQuLmZiZDU0M2QgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0Q29udGFpbmVyLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRDb250YWluZXIuamF2YQpAQCAtMjMsNyArMjMsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnN0b3JhZ2UuZmlsZS5Mb2NrRmlsZTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmludGVybmFsLnN0b3JhZ2UuZmlsZS5Mb2NrRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuRlM7CiAKIGltcG9ydCBqYXZhLmlvLkZpbGU7CkBAIC00NCw3ICs0NCw3IEBACiAgICAgICBmaW5hbCBTZWN0aW9uLkZhY3Rvcnkgc2VjdGlvbnMpIHsKICAgICB0aGlzLnVpID0gdWk7CiAgICAgdGhpcy5zaXRlID0gc2l0ZTsKLSAgICB0aGlzLmNvbnRhaW5lciA9IHNlY3Rpb25zLmdldCgiY29udGFpbmVyIik7CisgICAgdGhpcy5jb250YWluZXIgPSBzZWN0aW9ucy5nZXQoImNvbnRhaW5lciIsIG51bGwpOwogICB9CiAKICAgcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEZpbGVOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXREYXRhYmFzZS5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXREYXRhYmFzZS5qYXZhCmluZGV4IGQ1MDFlYTUuLjAzMzZkZGEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0RGF0YWJhc2UuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdERhdGFiYXNlLmphdmEKQEAgLTE0LDE3ICsxNCwyNiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0OwogCi1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0LkluaXRVdGlsLmRpZTsKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQuSW5pdFV0aWwudXNlcm5hbWU7Ci1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZVByb3ZpZGVyLlR5cGUuSDI7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuaW5qZWN0LlN0YWdlLlBST0RVQ1RJT047CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS51dGlsLkNvbnNvbGVVSTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFTb3VyY2VQcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5CaW5kaW5nOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lkd1aWNlOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3RvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5LZXk7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lm5hbWUuTmFtZWQ7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QubmFtZS5OYW1lczsKIAotaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmxhbmcuYW5ub3RhdGlvbi5Bbm5vdGF0aW9uOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgamF2YS51dGlsLlRyZWVTZXQ7CiAKIC8qKiBJbml0aWFsaXplIHRoZSB7QGNvZGUgZGF0YWJhc2V9IGNvbmZpZ3VyYXRpb24gc2VjdGlvbi4gKi8KIEBTaW5nbGV0b24KQEAgLTQwLDY1ICs0OSwzOSBAQAogICAgIHRoaXMudWkgPSB1aTsKICAgICB0aGlzLnNpdGUgPSBzaXRlOwogICAgIHRoaXMubGlicmFyaWVzID0gbGlicmFyaWVzOwotICAgIHRoaXMuZGF0YWJhc2UgPSBzZWN0aW9ucy5nZXQoImRhdGFiYXNlIik7CisgICAgdGhpcy5kYXRhYmFzZSA9IHNlY3Rpb25zLmdldCgiZGF0YWJhc2UiLCBudWxsKTsKICAgfQogCiAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKICAgICB1aS5oZWFkZXIoIlNRTCBEYXRhYmFzZSIpOwogCi0gICAgZmluYWwgRGF0YVNvdXJjZVByb3ZpZGVyLlR5cGUgZGJfdHlwZSA9Ci0gICAgICAgIGRhdGFiYXNlLnNlbGVjdCgiRGF0YWJhc2Ugc2VydmVyIHR5cGUiLCAidHlwZSIsIEgyKTsKKyAgICBTZXQ8U3RyaW5nPiBhbGxvd2VkVmFsdWVzID0gU2V0cy5uZXdUcmVlU2V0KCk7CisgICAgSW5qZWN0b3IgaSA9IEd1aWNlLmNyZWF0ZUluamVjdG9yKFBST0RVQ1RJT04sIG5ldyBEYXRhYmFzZUNvbmZpZ01vZHVsZShzaXRlKSk7CisgICAgTGlzdDxCaW5kaW5nPERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXI+PiBkYkNvbmZpZ0JpbmRpbmdzID0KKyAgICAgICAgaS5maW5kQmluZGluZ3NCeVR5cGUobmV3IFR5cGVMaXRlcmFsPERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXI+KCkge30pOworICAgIGZvciAoQmluZGluZzxEYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyPiBiaW5kaW5nIDogZGJDb25maWdCaW5kaW5ncykgeworICAgICAgQW5ub3RhdGlvbiBhbm5vdGF0aW9uID0gYmluZGluZy5nZXRLZXkoKS5nZXRBbm5vdGF0aW9uKCk7CisgICAgICBpZiAoYW5ub3RhdGlvbiBpbnN0YW5jZW9mIE5hbWVkKSB7CisgICAgICAgIGFsbG93ZWRWYWx1ZXMuYWRkKCgoTmFtZWQpIGFubm90YXRpb24pLnZhbHVlKCkpOworICAgICAgfQorICAgIH0KIAotICAgIHN3aXRjaCAoZGJfdHlwZSkgewotICAgICAgY2FzZSBNWVNRTDoKKyAgICBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShkYXRhYmFzZS5nZXQoInVybCIpKQorICAgICAgICAmJiBTdHJpbmdzLmlzTnVsbE9yRW1wdHkoZGF0YWJhc2UuZ2V0KCJ0eXBlIikpKSB7CisgICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCAiamRiYyIpOworICAgIH0KKworICAgIFN0cmluZyBkYlR5cGUgPQorICAgICAgICBkYXRhYmFzZS5zZWxlY3QoIkRhdGFiYXNlIHNlcnZlciB0eXBlIiwgInR5cGUiLCAiaDIiLCBhbGxvd2VkVmFsdWVzKTsKKworICAgIERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIgZGNpID0KKyAgICAgICAgaS5nZXRJbnN0YW5jZShLZXkuZ2V0KERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIuY2xhc3MsCisgICAgICAgICAgICBOYW1lcy5uYW1lZChkYlR5cGUudG9Mb3dlckNhc2UoKSkpKTsKKworICAgIGlmIChkY2kgaW5zdGFuY2VvZiBNeVNxbEluaXRpYWxpemVyKSB7CiAgICAgICAgIGxpYnJhcmllcy5teXNxbERyaXZlci5kb3dubG9hZFJlcXVpcmVkKCk7Ci0gICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGZpbmFsIGJvb2xlYW4gdXNlclBhc3NBdXRoOwotICAgIHN3aXRjaCAoZGJfdHlwZSkgewotICAgICAgY2FzZSBIMjogewotICAgICAgICB1c2VyUGFzc0F1dGggPSBmYWxzZTsKLSAgICAgICAgU3RyaW5nIHBhdGggPSBkYXRhYmFzZS5nZXQoImRhdGFiYXNlIik7Ci0gICAgICAgIGlmIChwYXRoID09IG51bGwpIHsKLSAgICAgICAgICBwYXRoID0gImRiL1Jldmlld0RCIjsKLSAgICAgICAgICBkYXRhYmFzZS5zZXQoImRhdGFiYXNlIiwgcGF0aCk7Ci0gICAgICAgIH0KLSAgICAgICAgRmlsZSBkYiA9IHNpdGUucmVzb2x2ZShwYXRoKTsKLSAgICAgICAgaWYgKGRiID09IG51bGwpIHsKLSAgICAgICAgICB0aHJvdyBkaWUoImRhdGFiYXNlLmRhdGFiYXNlIG11c3QgYmUgc3VwcGxpZWQgZm9yIEgyIik7Ci0gICAgICAgIH0KLSAgICAgICAgZGIgPSBkYi5nZXRQYXJlbnRGaWxlKCk7Ci0gICAgICAgIGlmICghZGIuZXhpc3RzKCkgJiYgIWRiLm1rZGlycygpKSB7Ci0gICAgICAgICAgdGhyb3cgZGllKCJjYW5ub3QgY3JlYXRlIGRhdGFiYXNlLmRhdGFiYXNlICIgKyBkYi5nZXRBYnNvbHV0ZVBhdGgoKSk7Ci0gICAgICAgIH0KLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIGNhc2UgSkRCQzogewotICAgICAgICB1c2VyUGFzc0F1dGggPSB0cnVlOwotICAgICAgICBkYXRhYmFzZS5zdHJpbmcoIkRyaXZlciBjbGFzcyBuYW1lIiwgImRyaXZlciIsIG51bGwpOwotICAgICAgICBkYXRhYmFzZS5zdHJpbmcoIlVSTCIsICJ1cmwiLCBudWxsKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIGNhc2UgUE9TVEdSRVNRTDoKLSAgICAgIGNhc2UgTVlTUUw6IHsKLSAgICAgICAgdXNlclBhc3NBdXRoID0gdHJ1ZTsKLSAgICAgICAgZmluYWwgU3RyaW5nIGRlZlBvcnQgPSAiKCIgKyBkYl90eXBlLnRvU3RyaW5nKCkgKyAiIGRlZmF1bHQpIjsKLSAgICAgICAgZGF0YWJhc2Uuc3RyaW5nKCJTZXJ2ZXIgaG9zdG5hbWUiLCAiaG9zdG5hbWUiLCAibG9jYWxob3N0Iik7Ci0gICAgICAgIGRhdGFiYXNlLnN0cmluZygiU2VydmVyIHBvcnQiLCAicG9ydCIsIGRlZlBvcnQsIHRydWUpOwotICAgICAgICBkYXRhYmFzZS5zdHJpbmcoIkRhdGFiYXNlIG5hbWUiLCAiZGF0YWJhc2UiLCAicmV2aWV3ZGIiKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIGRlZmF1bHQ6Ci0gICAgICAgIHRocm93IGRpZSgiaW50ZXJuYWwgYnVnLCBkYXRhYmFzZSAiICsgZGJfdHlwZSArICIgbm90IHN1cHBvcnRlZCIpOwotICAgIH0KLQotICAgIGlmICh1c2VyUGFzc0F1dGgpIHsKLSAgICAgIGRhdGFiYXNlLnN0cmluZygiRGF0YWJhc2UgdXNlcm5hbWUiLCAidXNlcm5hbWUiLCB1c2VybmFtZSgpKTsKLSAgICAgIGRhdGFiYXNlLnBhc3N3b3JkKCJ1c2VybmFtZSIsICJwYXNzd29yZCIpOwotICAgIH0KKyAgICBkY2kuaW5pdENvbmZpZyhkYXRhYmFzZSk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0R2l0TWFuYWdlci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRHaXRNYW5hZ2VyLmphdmEKaW5kZXggZjBjZDMxZi4uYjZmODUxOSAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRHaXRNYW5hZ2VyLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRHaXRNYW5hZ2VyLmphdmEKQEAgLTMxLDcgKzMxLDcgQEAKICAgQEluamVjdAogICBJbml0R2l0TWFuYWdlcihmaW5hbCBDb25zb2xlVUkgdWksIGZpbmFsIFNlY3Rpb24uRmFjdG9yeSBzZWN0aW9ucykgewogICAgIHRoaXMudWkgPSB1aTsKLSAgICB0aGlzLmdlcnJpdCA9IHNlY3Rpb25zLmdldCgiZ2Vycml0Iik7CisgICAgdGhpcy5nZXJyaXQgPSBzZWN0aW9ucy5nZXQoImdlcnJpdCIsIG51bGwpOwogICB9CiAKICAgcHVibGljIHZvaWQgcnVuKCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRIdHRwZC5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRIdHRwZC5qYXZhCmluZGV4IDk4ZDJlNDcuLjNlNzkwMWEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0SHR0cGQuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdEh0dHBkLmphdmEKQEAgLTIxLDggKzIxLDYgQEAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQuSW5pdFV0aWwudG9VUkk7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20udXRpbC5Db25zb2xlVUk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkF1dGhUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ29uZmlnVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dGpzb25ycGMuc2VydmVyLlNpZ25lZFRva2VuOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTQ4LDggKzQ2LDggQEAKICAgICB0aGlzLnVpID0gdWk7CiAgICAgdGhpcy5zaXRlID0gc2l0ZTsKICAgICB0aGlzLmZsYWdzID0gZmxhZ3M7Ci0gICAgdGhpcy5odHRwZCA9IHNlY3Rpb25zLmdldCgiaHR0cGQiKTsKLSAgICB0aGlzLmdlcnJpdCA9IHNlY3Rpb25zLmdldCgiZ2Vycml0Iik7CisgICAgdGhpcy5odHRwZCA9IHNlY3Rpb25zLmdldCgiaHR0cGQiLCBudWxsKTsKKyAgICB0aGlzLmdlcnJpdCA9IHNlY3Rpb25zLmdldCgiZ2Vycml0IiwgbnVsbCk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBydW4oKSB0aHJvd3MgSU9FeGNlcHRpb24sIEludGVycnVwdGVkRXhjZXB0aW9uIHsKQEAgLTEyMSwxMiArMTE5LDcgQEAKICAgICB9IGNhdGNoIChVUklTeW50YXhFeGNlcHRpb24gZSkgewogICAgICAgdGhyb3cgZGllKCJpbnZhbGlkIGh0dHBkLmxpc3RlblVybCIpOwogICAgIH0KLSAgICBpZiAoZ2Vycml0LmdldCgiY2Fub25pY2FsV2ViVXJsIikgIT0gbnVsbCAvLwotICAgICAgICB8fCAoIXByb3h5ICYmIHNzbCkgLy8KLSAgICAgICAgfHwgZ2V0QXV0aFR5cGUoKSA9PSBBdXRoVHlwZS5PUEVOSUQpIHsKLSAgICAgIGdlcnJpdC5zdHJpbmcoIkNhbm9uaWNhbCBVUkwiLCAiY2Fub25pY2FsV2ViVXJsIiwgdXJpLnRvU3RyaW5nKCkpOwotICAgIH0KLQorICAgIGdlcnJpdC5zdHJpbmcoIkNhbm9uaWNhbCBVUkwiLCAiY2Fub25pY2FsV2ViVXJsIiwgdXJpLnRvU3RyaW5nKCkpOwogICAgIGdlbmVyYXRlU3NsQ2VydGlmaWNhdGUoKTsKICAgfQogCkBAIC0xOTYsOCArMTg5LDQgQEAKICAgICAgIHRocm93IGRpZSgiQ2Fubm90IGRlbGV0ZSAiICsgdG1wZGlyKTsKICAgICB9CiAgIH0KLQotICBwcml2YXRlIEF1dGhUeXBlIGdldEF1dGhUeXBlKCkgewotICAgIHJldHVybiBDb25maWdVdGlsLmdldEVudW0oZmxhZ3MuY2ZnLCAiYXV0aCIsIG51bGwsICJ0eXBlIiwgQXV0aFR5cGUuT1BFTklEKTsKLSAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRQbHVnaW5TdGVwc0xvYWRlci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRQbHVnaW5TdGVwc0xvYWRlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc2NTg3MDEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdFBsdWdpblN0ZXBzTG9hZGVyLmphdmEKQEAgLTAsMCArMSwxMjkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaW5pdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUGx1Z2luTmFtZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20udXRpbC5Db25zb2xlVUk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aHM7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdG9yOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLkZpbGVGaWx0ZXI7CitpbXBvcnQgamF2YS5uZXQuVVJMOworaW1wb3J0IGphdmEubmV0LlVSTENsYXNzTG9hZGVyOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLmphci5BdHRyaWJ1dGVzOworaW1wb3J0IGphdmEudXRpbC5qYXIuSmFyRmlsZTsKKworQFNpbmdsZXRvbgorcHVibGljIGNsYXNzIEluaXRQbHVnaW5TdGVwc0xvYWRlciB7CisgIHByaXZhdGUgZmluYWwgRmlsZSBwbHVnaW5zRGlyOworICBwcml2YXRlIGZpbmFsIEluamVjdG9yIGluaXRJbmplY3RvcjsKKyAgZmluYWwgQ29uc29sZVVJIHVpOworCisgIEBJbmplY3QKKyAgcHVibGljIEluaXRQbHVnaW5TdGVwc0xvYWRlcihmaW5hbCBDb25zb2xlVUkgdWksIGZpbmFsIFNpdGVQYXRocyBzaXRlUGF0aHMsCisgICAgICBmaW5hbCBJbmplY3RvciBpbml0SW5qZWN0b3IpIHsKKyAgICB0aGlzLnBsdWdpbnNEaXIgPSBzaXRlUGF0aHMucGx1Z2luc19kaXI7CisgICAgdGhpcy5pbml0SW5qZWN0b3IgPSBpbml0SW5qZWN0b3I7CisgICAgdGhpcy51aSA9IHVpOworICB9CisKKyAgcHVibGljIENvbGxlY3Rpb248SW5pdFN0ZXA+IGdldEluaXRTdGVwcygpIHsKKyAgICBMaXN0PEZpbGU+IGphcnMgPSBzY2FuSmFyc0luUGx1Z2luc0RpcmVjdG9yeSgpOworICAgIEFycmF5TGlzdDxJbml0U3RlcD4gcGx1Z2luc0luaXRTdGVwcyA9IG5ldyBBcnJheUxpc3Q8SW5pdFN0ZXA+KCk7CisKKyAgICBmb3IgKEZpbGUgamFyIDogamFycykgeworICAgICAgSW5pdFN0ZXAgaW5pdCA9IGxvYWRJbml0U3RlcChqYXIpOworICAgICAgaWYgKGluaXQgIT0gbnVsbCkgeworICAgICAgICBwbHVnaW5zSW5pdFN0ZXBzLmFkZChpbml0KTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIHBsdWdpbnNJbml0U3RlcHM7CisgIH0KKworICBwcml2YXRlIEluaXRTdGVwIGxvYWRJbml0U3RlcChGaWxlIGphcikgeworICAgIHRyeSB7CisgICAgICBDbGFzc0xvYWRlciBwbHVnaW5Mb2FkZXIgPQorICAgICAgICAgIG5ldyBVUkxDbGFzc0xvYWRlcihuZXcgVVJMW10ge2phci50b1VSSSgpLnRvVVJMKCl9LAorICAgICAgICAgICAgICBJbml0UGx1Z2luU3RlcHNMb2FkZXIuY2xhc3MuZ2V0Q2xhc3NMb2FkZXIoKSk7CisgICAgICBKYXJGaWxlIGphckZpbGUgPSBuZXcgSmFyRmlsZShqYXIpOworICAgICAgQXR0cmlidXRlcyBqYXJGaWxlQXR0cmlidXRlcyA9IGphckZpbGUuZ2V0TWFuaWZlc3QoKS5nZXRNYWluQXR0cmlidXRlcygpOworICAgICAgU3RyaW5nIGluaXRDbGFzc05hbWUgPSBqYXJGaWxlQXR0cmlidXRlcy5nZXRWYWx1ZSgiR2Vycml0LUluaXRTdGVwIik7CisgICAgICBpZiAoaW5pdENsYXNzTmFtZSA9PSBudWxsKSB7CisgICAgICAgIHJldHVybiBudWxsOworICAgICAgfQorICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgICAgICBDbGFzczw/IGV4dGVuZHMgSW5pdFN0ZXA+IGluaXRTdGVwQ2xhc3MgPQorICAgICAgICAgIChDbGFzczw/IGV4dGVuZHMgSW5pdFN0ZXA+KSBwbHVnaW5Mb2FkZXIubG9hZENsYXNzKGluaXRDbGFzc05hbWUpOworICAgICAgcmV0dXJuIGdldFBsdWdpbkluamVjdG9yKGphcikuZ2V0SW5zdGFuY2UoaW5pdFN0ZXBDbGFzcyk7CisgICAgfSBjYXRjaCAoQ2xhc3NDYXN0RXhjZXB0aW9uIGUpIHsKKyAgICAgIHVpLm1lc3NhZ2UoCisgICAgICAgICAgIldBUk46IEluaXRTdGVwIGZyb20gcGx1Z2luICVzIGRvZXMgbm90IGltcGxlbWVudCAlcyAoRXhjZXB0aW9uOiAlcykiLAorICAgICAgICAgIGphci5nZXROYW1lKCksIEluaXRTdGVwLmNsYXNzLmdldE5hbWUoKSwgZS5nZXRNZXNzYWdlKCkpOworICAgICAgcmV0dXJuIG51bGw7CisgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKyAgICAgIHVpLm1lc3NhZ2UoCisgICAgICAgICAgIldBUk46IENhbm5vdCBsb2FkIGFuZCBnZXQgcGx1Z2luIGluaXQgc3RlcCBmb3IgJXMgKEV4Y2VwdGlvbjogJXMpIiwKKyAgICAgICAgICBqYXIsIGUuZ2V0TWVzc2FnZSgpKTsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgSW5qZWN0b3IgZ2V0UGx1Z2luSW5qZWN0b3IoRmlsZSBqYXJGaWxlKSB7CisgICAgU3RyaW5nIGphckZpbGVOYW1lID0gamFyRmlsZS5nZXROYW1lKCk7CisgICAgZmluYWwgU3RyaW5nIHBsdWdpbk5hbWUgPQorICAgICAgICBqYXJGaWxlTmFtZS5zdWJzdHJpbmcoMCwgamFyRmlsZU5hbWUubGFzdEluZGV4T2YoJy4nKSk7CisgICAgcmV0dXJuIGluaXRJbmplY3Rvci5jcmVhdGVDaGlsZEluamVjdG9yKG5ldyBBYnN0cmFjdE1vZHVsZSgpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgICAgICBiaW5kKFN0cmluZy5jbGFzcykuYW5ub3RhdGVkV2l0aChQbHVnaW5OYW1lLmNsYXNzKS50b0luc3RhbmNlKAorICAgICAgICAgICAgcGx1Z2luTmFtZSk7CisgICAgICB9CisgICAgfSk7CisgIH0KKworICBwcml2YXRlIExpc3Q8RmlsZT4gc2NhbkphcnNJblBsdWdpbnNEaXJlY3RvcnkoKSB7CisgICAgaWYgKHBsdWdpbnNEaXIgPT0gbnVsbCB8fCAhcGx1Z2luc0Rpci5leGlzdHMoKSkgeworICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOworICAgIH0KKyAgICBGaWxlW10gbWF0Y2hlcyA9IHBsdWdpbnNEaXIubGlzdEZpbGVzKG5ldyBGaWxlRmlsdGVyKCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgYm9vbGVhbiBhY2NlcHQoRmlsZSBwYXRobmFtZSkgeworICAgICAgICBTdHJpbmcgbiA9IHBhdGhuYW1lLmdldE5hbWUoKTsKKyAgICAgICAgcmV0dXJuIChuLmVuZHNXaXRoKCIuamFyIikgJiYgcGF0aG5hbWUuaXNGaWxlKCkpOworICAgICAgfQorICAgIH0pOworICAgIGlmIChtYXRjaGVzID09IG51bGwpIHsKKyAgICAgIHVpLm1lc3NhZ2UoIldBUk46IENhbm5vdCBsaXN0ICVzIiwgcGx1Z2luc0Rpci5nZXRBYnNvbHV0ZVBhdGgoKSk7CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CisgICAgfQorICAgIEFycmF5cy5zb3J0KG1hdGNoZXMsIG5ldyBDb21wYXJhdG9yPEZpbGU+KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgaW50IGNvbXBhcmUoRmlsZSBvMSwgRmlsZSBvMikgeworICAgICAgICByZXR1cm4gbzEuZ2V0TmFtZSgpLmNvbXBhcmVUbyhvMi5nZXROYW1lKCkpOworICAgICAgfQorICAgIH0pOworICAgIHJldHVybiBBcnJheXMuYXNMaXN0KG1hdGNoZXMpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdFBsdWdpbnMuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0UGx1Z2lucy5qYXZhCmluZGV4IDE1NWZlNGMuLmI4MmRmNjQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0UGx1Z2lucy5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0UGx1Z2lucy5qYXZhCkBAIC0zOSwxNyArMzksMjQgQEAKIAogICBwcml2YXRlIGZpbmFsIENvbnNvbGVVSSB1aTsKICAgcHJpdmF0ZSBmaW5hbCBTaXRlUGF0aHMgc2l0ZTsKKyAgcHJpdmF0ZSBJbml0UGx1Z2luU3RlcHNMb2FkZXIgcGx1Z2luTG9hZGVyOwogCiAgIEBJbmplY3QKLSAgSW5pdFBsdWdpbnMoZmluYWwgQ29uc29sZVVJIHVpLCBmaW5hbCBTaXRlUGF0aHMgc2l0ZSkgeworICBJbml0UGx1Z2lucyhmaW5hbCBDb25zb2xlVUkgdWksIGZpbmFsIFNpdGVQYXRocyBzaXRlLCBJbml0UGx1Z2luU3RlcHNMb2FkZXIgcGx1Z2luTG9hZGVyKSB7CiAgICAgdGhpcy51aSA9IHVpOwogICAgIHRoaXMuc2l0ZSA9IHNpdGU7CisgICAgdGhpcy5wbHVnaW5Mb2FkZXIgPSBwbHVnaW5Mb2FkZXI7CiAgIH0KIAogICBAT3ZlcnJpZGUKICAgcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgdWkuaGVhZGVyKCJQbHVnaW5zIik7CiAKKyAgICBpbnN0YWxsUGx1Z2lucygpOworICAgIGluaXRQbHVnaW5zKCk7CisgIH0KKworICBwcml2YXRlIHZvaWQgaW5zdGFsbFBsdWdpbnMoKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGZpbmFsIEZpbGUgbXlXYXI7CiAgICAgdHJ5IHsKICAgICAgIG15V2FyID0gR2Vycml0TGF1bmNoZXIuZ2V0RGlzdHJpYnV0aW9uQXJjaGl2ZSgpOwpAQCAtMTI3LDYgKzEzNCwxMiBAQAogICAgIH0KICAgfQogCisgIHByaXZhdGUgdm9pZCBpbml0UGx1Z2lucygpIHRocm93cyBFeGNlcHRpb24geworICAgIGZvciAoSW5pdFN0ZXAgaW5pdFN0ZXAgOiBwbHVnaW5Mb2FkZXIuZ2V0SW5pdFN0ZXBzKCkpIHsKKyAgICAgIGluaXRTdGVwLnJ1bigpOworICAgIH0KKyAgfQorCiAgIHByaXZhdGUgc3RhdGljIFN0cmluZyBnZXRWZXJzaW9uKGZpbmFsIEZpbGUgcGx1Z2luKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGZpbmFsIEphckZpbGUgamFyRmlsZSA9IG5ldyBKYXJGaWxlKHBsdWdpbik7CiAgICAgdHJ5IHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U2VuZEVtYWlsLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdFNlbmRFbWFpbC5qYXZhCmluZGV4IGM1NzMyZTkuLmU0YjgyN2QxIDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdFNlbmRFbWFpbC5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U2VuZEVtYWlsLmphdmEKQEAgLTM0LDcgKzM0LDcgQEAKICAgSW5pdFNlbmRFbWFpbChmaW5hbCBDb25zb2xlVUkgdWksIGZpbmFsIFNpdGVQYXRocyBzaXRlLAogICAgICAgZmluYWwgU2VjdGlvbi5GYWN0b3J5IHNlY3Rpb25zKSB7CiAgICAgdGhpcy51aSA9IHVpOwotICAgIHRoaXMuc2VuZGVtYWlsID0gc2VjdGlvbnMuZ2V0KCJzZW5kZW1haWwiKTsKKyAgICB0aGlzLnNlbmRlbWFpbCA9IHNlY3Rpb25zLmdldCgic2VuZGVtYWlsIiwgbnVsbCk7CiAgICAgdGhpcy5zaXRlID0gc2l0ZTsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSW5pdFNzaGQuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U3NoZC5qYXZhCmluZGV4IGJmYzBlYWYuLjBjMmEzYzYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U3NoZC5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0U3NoZC5qYXZhCkBAIC00NSw3ICs0NSw3IEBACiAgICAgdGhpcy51aSA9IHVpOwogICAgIHRoaXMuc2l0ZSA9IHNpdGU7CiAgICAgdGhpcy5saWJyYXJpZXMgPSBsaWJyYXJpZXM7Ci0gICAgdGhpcy5zc2hkID0gc2VjdGlvbnMuZ2V0KCJzc2hkIik7CisgICAgdGhpcy5zc2hkID0gc2VjdGlvbnMuZ2V0KCJzc2hkIiwgbnVsbCk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBydW4oKSB0aHJvd3MgRXhjZXB0aW9uIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Jbml0VXRpbC5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRVdGlsLmphdmEKaW5kZXggMTM4MmY2NS4uMGFkNzU2MCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRVdGlsLmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0luaXRVdGlsLmphdmEKQEAgLTE2LDkgKzE2LDkgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS51dGlsLkRpZTsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuaW50ZXJuYWwuc3RvcmFnZS5maWxlLkxvY2tGaWxlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnN0b3JhZ2UuZmlsZS5GaWxlQmFzZWRDb25maWc7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5zdG9yYWdlLmZpbGUuTG9ja0ZpbGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLkZTOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudXRpbC5JTzsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuU3lzdGVtUmVhZGVyOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0pEQkNJbml0aWFsaXplci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0pEQkNJbml0aWFsaXplci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjIwMDM0YzEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvSkRCQ0luaXRpYWxpemVyLmphdmEKQEAgLTAsMCArMSw0NCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0OworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0LkluaXRVdGlsLnVzZXJuYW1lOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworCitjbGFzcyBKREJDSW5pdGlhbGl6ZXIgaW1wbGVtZW50cyBEYXRhYmFzZUNvbmZpZ0luaXRpYWxpemVyIHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIGluaXRDb25maWcoU2VjdGlvbiBkYXRhYmFzZSkgeworICAgIGJvb2xlYW4gaGFzVXJsID0gU3RyaW5ncy5lbXB0eVRvTnVsbChkYXRhYmFzZS5nZXQoInVybCIpKSAhPSBudWxsOworICAgIGRhdGFiYXNlLnN0cmluZygiVVJMIiwgInVybCIsIG51bGwpOworICAgIGd1ZXNzRHJpdmVyKGRhdGFiYXNlKTsKKyAgICBkYXRhYmFzZS5zdHJpbmcoIkRyaXZlciBjbGFzcyBuYW1lIiwgImRyaXZlciIsIG51bGwpOworICAgIGRhdGFiYXNlLnN0cmluZygiRGF0YWJhc2UgdXNlcm5hbWUiLCAidXNlcm5hbWUiLCBoYXNVcmwgPyBudWxsIDogdXNlcm5hbWUoKSk7CisgICAgZGF0YWJhc2UucGFzc3dvcmQoInVzZXJuYW1lIiwgInBhc3N3b3JkIik7CisgIH0KKworICBwcml2YXRlIHZvaWQgZ3Vlc3NEcml2ZXIoU2VjdGlvbiBkYXRhYmFzZSkgeworICAgIFN0cmluZyB1cmwgPSBTdHJpbmdzLmVtcHR5VG9OdWxsKGRhdGFiYXNlLmdldCgidXJsIikpOworICAgIGlmICh1cmwgIT0gbnVsbCAmJiBTdHJpbmdzLmlzTnVsbE9yRW1wdHkoZGF0YWJhc2UuZ2V0KCJkcml2ZXIiKSkpIHsKKyAgICAgIGlmICh1cmwuc3RhcnRzV2l0aCgiamRiYzpoMjoiKSkgeworICAgICAgICBkYXRhYmFzZS5zZXQoImRyaXZlciIsICJvcmcuaDIuRHJpdmVyIik7CisgICAgICB9IGVsc2UgaWYgKHVybC5zdGFydHNXaXRoKCJqZGJjOm15c3FsOiIpKSB7CisgICAgICAgIGRhdGFiYXNlLnNldCgiZHJpdmVyIiwgImNvbS5teXNxbC5qZGJjLkRyaXZlciIpOworICAgICAgfSBlbHNlIGlmICh1cmwuc3RhcnRzV2l0aCgiamRiYzpwb3N0Z3Jlc3FsOiIpKSB7CisgICAgICAgIGRhdGFiYXNlLnNldCgiZHJpdmVyIiwgIm9yZy5wb3N0Z3Jlc3FsLkRyaXZlciIpOworICAgICAgfQorICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0xpYnJhcmllcy5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0xpYnJhcmllcy5qYXZhCmluZGV4IGZmMWVkZGYuLmIxZmEwYzMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9MaWJyYXJpZXMuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvTGlicmFyaWVzLmphdmEKQEAgLTc4LDYgKzc4LDcgQEAKICAgICBkbC5zZXROYW1lKGdldChjZmcsIG4sICJuYW1lIikpOwogICAgIGRsLnNldEphclVybChnZXQoY2ZnLCBuLCAidXJsIikpOwogICAgIGRsLnNldFNIQTEoZ2V0KGNmZywgbiwgInNoYTEiKSk7CisgICAgZGwuc2V0UmVtb3ZlKGdldChjZmcsIG4sICJyZW1vdmUiKSk7CiAgICAgZmllbGQuc2V0KHRoaXMsIGRsKTsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvTGlicmFyeURvd25sb2FkZXIuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9MaWJyYXJ5RG93bmxvYWRlci5qYXZhCmluZGV4IGVhMWI1MTUuLmJmMzU4ZjQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9MaWJyYXJ5RG93bmxvYWRlci5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9MaWJyYXJ5RG93bmxvYWRlci5qYXZhCkBAIC0xNCw4ICsxNCwxMCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0OwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnBnbS51dGlsLkNvbnNvbGVVSTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5wZ20udXRpbC5EaWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucGdtLnV0aWwuSW9VdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIApAQCAtMjYsNiArMjgsNyBAQAogaW1wb3J0IGphdmEuaW8uRmlsZUlucHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uRmlsZU5vdEZvdW5kRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuaW8uRmlsZU91dHB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLmlvLkZpbGVuYW1lRmlsdGVyOwogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiBpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKIGltcG9ydCBqYXZhLmlvLk91dHB1dFN0cmVhbTsKQEAgLTQwLDIwICs0MywxOCBAQAogY2xhc3MgTGlicmFyeURvd25sb2FkZXIgewogICBwcml2YXRlIGZpbmFsIENvbnNvbGVVSSB1aTsKICAgcHJpdmF0ZSBmaW5hbCBGaWxlIGxpYl9kaXI7Ci0gIHByaXZhdGUgZmluYWwgUmVsb2FkU2l0ZUxpYnJhcnkgcmVsb2FkOwogCiAgIHByaXZhdGUgYm9vbGVhbiByZXF1aXJlZDsKICAgcHJpdmF0ZSBTdHJpbmcgbmFtZTsKICAgcHJpdmF0ZSBTdHJpbmcgamFyVXJsOwogICBwcml2YXRlIFN0cmluZyBzaGExOworICBwcml2YXRlIFN0cmluZyByZW1vdmU7CiAgIHByaXZhdGUgRmlsZSBkc3Q7CiAKICAgQEluamVjdAotICBMaWJyYXJ5RG93bmxvYWRlcihmaW5hbCBSZWxvYWRTaXRlTGlicmFyeSByZWxvYWQsIGZpbmFsIENvbnNvbGVVSSB1aSwKLSAgICAgIGZpbmFsIFNpdGVQYXRocyBzaXRlKSB7CisgIExpYnJhcnlEb3dubG9hZGVyKENvbnNvbGVVSSB1aSwgU2l0ZVBhdGhzIHNpdGUpIHsKICAgICB0aGlzLnVpID0gdWk7CiAgICAgdGhpcy5saWJfZGlyID0gc2l0ZS5saWJfZGlyOwotICAgIHRoaXMucmVsb2FkID0gcmVsb2FkOwogICB9CiAKICAgdm9pZCBzZXROYW1lKGZpbmFsIFN0cmluZyBuYW1lKSB7CkBAIC02OCw2ICs2OSwxMCBAQAogICAgIHRoaXMuc2hhMSA9IHNoYTE7CiAgIH0KIAorICB2b2lkIHNldFJlbW92ZShTdHJpbmcgcmVtb3ZlKSB7CisgICAgdGhpcy5yZW1vdmUgPSByZW1vdmU7CisgIH0KKwogICB2b2lkIGRvd25sb2FkUmVxdWlyZWQoKSB7CiAgICAgdGhpcy5yZXF1aXJlZCA9IHRydWU7CiAgICAgZG93bmxvYWQoKTsKQEAgLTEyMyw2ICsxMjgsNyBAQAogICAgIH0KIAogICAgIHRyeSB7CisgICAgICByZW1vdmVTdGFsZVZlcnNpb25zKCk7CiAgICAgICBkb0dldEJ5SHR0cCgpOwogICAgICAgdmVyaWZ5RmlsZUNoZWNrc3VtKCk7CiAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZXJyKSB7CkBAIC0xNTUsNyArMTYxLDI5IEBACiAgICAgICB9CiAgICAgfQogCi0gICAgcmVsb2FkLnJlbG9hZCgpOworICAgIGlmIChkc3QuZXhpc3RzKCkpIHsKKyAgICAgIElvVXRpbC5sb2FkSkFScyhkc3QpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCByZW1vdmVTdGFsZVZlcnNpb25zKCkgeworICAgIGlmICghU3RyaW5ncy5pc051bGxPckVtcHR5KHJlbW92ZSkpIHsKKyAgICAgIFN0cmluZ1tdIG5hbWVzID0gbGliX2Rpci5saXN0KG5ldyBGaWxlbmFtZUZpbHRlcigpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHB1YmxpYyBib29sZWFuIGFjY2VwdChGaWxlIGRpciwgU3RyaW5nIG5hbWUpIHsKKyAgICAgICAgICByZXR1cm4gbmFtZS5tYXRjaGVzKCJeIiArIHJlbW92ZSArICIkIik7CisgICAgICAgIH0KKyAgICAgIH0pOworICAgICAgaWYgKG5hbWVzICE9IG51bGwpIHsKKyAgICAgICAgZm9yIChTdHJpbmcgb2xkIDogbmFtZXMpIHsKKyAgICAgICAgICBTdHJpbmcgYmFrID0gIi4iICsgb2xkICsgIi5iYWNrdXAiOworICAgICAgICAgIHVpLm1lc3NhZ2UoIlJlbmFtaW5nICVzIHRvICVzIiwgb2xkLCBiYWspOworICAgICAgICAgIGlmICghbmV3IEZpbGUobGliX2Rpciwgb2xkKS5yZW5hbWVUbyhuZXcgRmlsZShsaWJfZGlyLCBiYWspKSkgeworICAgICAgICAgICAgdGhyb3cgbmV3IERpZSgiY2Fubm90IHJlbmFtZSAiICsgb2xkKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CiAgIH0KIAogICBwcml2YXRlIHZvaWQgZG9HZXRCeUh0dHAoKSB0aHJvd3MgSU9FeGNlcHRpb24gewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L015U3FsSW5pdGlhbGl6ZXIuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9NeVNxbEluaXRpYWxpemVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmU2YTRkOQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9NeVNxbEluaXRpYWxpemVyLmphdmEKQEAgLTAsMCArMSwzMCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0OworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnBnbS5pbml0LkluaXRVdGlsLnVzZXJuYW1lOworCitjbGFzcyBNeVNxbEluaXRpYWxpemVyIGltcGxlbWVudHMgRGF0YWJhc2VDb25maWdJbml0aWFsaXplciB7CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIGluaXRDb25maWcoU2VjdGlvbiBkYXRhYmFzZVNlY3Rpb24pIHsKKyAgICBmaW5hbCBTdHJpbmcgZGVmUG9ydCA9ICIobXlzcWwgZGVmYXVsdCkiOworICAgIGRhdGFiYXNlU2VjdGlvbi5zdHJpbmcoIlNlcnZlciBob3N0bmFtZSIsICJob3N0bmFtZSIsICJsb2NhbGhvc3QiKTsKKyAgICBkYXRhYmFzZVNlY3Rpb24uc3RyaW5nKCJTZXJ2ZXIgcG9ydCIsICJwb3J0IiwgZGVmUG9ydCwgdHJ1ZSk7CisgICAgZGF0YWJhc2VTZWN0aW9uLnN0cmluZygiRGF0YWJhc2UgbmFtZSIsICJkYXRhYmFzZSIsICJyZXZpZXdkYiIpOworICAgIGRhdGFiYXNlU2VjdGlvbi5zdHJpbmcoIkRhdGFiYXNlIHVzZXJuYW1lIiwgInVzZXJuYW1lIiwgdXNlcm5hbWUoKSk7CisgICAgZGF0YWJhc2VTZWN0aW9uLnBhc3N3b3JkKCJ1c2VybmFtZSIsICJwYXNzd29yZCIpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvUG9zdGdyZVNRTEluaXRpYWxpemVyLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvUG9zdGdyZVNRTEluaXRpYWxpemVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTQyNTY2MwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9Qb3N0Z3JlU1FMSW5pdGlhbGl6ZXIuamF2YQpAQCAtMCwwICsxLDMwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQucGdtLmluaXQuSW5pdFV0aWwudXNlcm5hbWU7CisKK2NsYXNzIFBvc3RncmVTUUxJbml0aWFsaXplciBpbXBsZW1lbnRzIERhdGFiYXNlQ29uZmlnSW5pdGlhbGl6ZXIgeworCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBpbml0Q29uZmlnKFNlY3Rpb24gZGF0YWJhc2VTZWN0aW9uKSB7CisgICAgZmluYWwgU3RyaW5nIGRlZlBvcnQgPSAiKHBvc3RncmVzcWwgZGVmYXVsdCkiOworICAgIGRhdGFiYXNlU2VjdGlvbi5zdHJpbmcoIlNlcnZlciBob3N0bmFtZSIsICJob3N0bmFtZSIsICJsb2NhbGhvc3QiKTsKKyAgICBkYXRhYmFzZVNlY3Rpb24uc3RyaW5nKCJTZXJ2ZXIgcG9ydCIsICJwb3J0IiwgZGVmUG9ydCwgdHJ1ZSk7CisgICAgZGF0YWJhc2VTZWN0aW9uLnN0cmluZygiRGF0YWJhc2UgbmFtZSIsICJkYXRhYmFzZSIsICJyZXZpZXdkYiIpOworICAgIGRhdGFiYXNlU2VjdGlvbi5zdHJpbmcoIkRhdGFiYXNlIHVzZXJuYW1lIiwgInVzZXJuYW1lIiwgdXNlcm5hbWUoKSk7CisgICAgZGF0YWJhc2VTZWN0aW9uLnBhc3N3b3JkKCJ1c2VybmFtZSIsICJwYXNzd29yZCIpOworICB9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1JlbG9hZFNpdGVMaWJyYXJ5LmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvUmVsb2FkU2l0ZUxpYnJhcnkuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYjIxZDNjMC4uMDAwMDAwMAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvUmVsb2FkU2l0ZUxpYnJhcnkuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDIwICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5wZ20uaW5pdDsKLQotLyoqIFJlcXVlc3RzIHRoZSBzaXRlJ3Mge0Bjb2RlIGxpYi99IGRpcmVjdG9yeSBiZSBzY2FubmVkIGFnYWluLiAqLwotcHVibGljIGludGVyZmFjZSBSZWxvYWRTaXRlTGlicmFyeSB7Ci0gIHB1YmxpYyB2b2lkIHJlbG9hZCgpOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1NlY3Rpb24uamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9TZWN0aW9uLmphdmEKaW5kZXggMDJlZDk5MS4uMzg3YjkzYSAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1NlY3Rpb24uamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvU2VjdGlvbi5qYXZhCkBAIC0yMyw1MyArMjMsNjAgQEAKIGltcG9ydCBqYXZhLmlvLkZpbGU7CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK2ltcG9ydCBqYXZheC5hbm5vdGF0aW9uLk51bGxhYmxlOwogCiAvKiogSGVscGVyIHRvIGVkaXQgYSBzZWN0aW9uIG9mIHRoZSBjb25maWd1cmF0aW9uIGZpbGVzLiAqLwotY2xhc3MgU2VjdGlvbiB7Ci0gIGludGVyZmFjZSBGYWN0b3J5IHsKLSAgICBTZWN0aW9uIGdldChTdHJpbmcgbmFtZSk7CitwdWJsaWMgY2xhc3MgU2VjdGlvbiB7CisgIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7CisgICAgU2VjdGlvbiBnZXQoQEFzc2lzdGVkKCJzZWN0aW9uIikgU3RyaW5nIHNlY3Rpb24sCisgICAgICAgIEBBc3Npc3RlZCgic3Vic2VjdGlvbiIpIFN0cmluZyBzdWJzZWN0aW9uKTsKICAgfQogCiAgIHByaXZhdGUgZmluYWwgSW5pdEZsYWdzIGZsYWdzOwogICBwcml2YXRlIGZpbmFsIFNpdGVQYXRocyBzaXRlOwogICBwcml2YXRlIGZpbmFsIENvbnNvbGVVSSB1aTsKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgc2VjdGlvbjsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgc3Vic2VjdGlvbjsKIAogICBASW5qZWN0Ci0gIFNlY3Rpb24oZmluYWwgSW5pdEZsYWdzIGZsYWdzLCBmaW5hbCBTaXRlUGF0aHMgc2l0ZSwgZmluYWwgQ29uc29sZVVJIHVpLAotICAgICAgQEFzc2lzdGVkIGZpbmFsIFN0cmluZyBzZWN0aW9uKSB7CisgIHB1YmxpYyBTZWN0aW9uKGZpbmFsIEluaXRGbGFncyBmbGFncywgZmluYWwgU2l0ZVBhdGhzIHNpdGUsCisgICAgICBmaW5hbCBDb25zb2xlVUkgdWksIEBBc3Npc3RlZCgic2VjdGlvbiIpIGZpbmFsIFN0cmluZyBzZWN0aW9uLAorICAgICAgQEFzc2lzdGVkKCJzdWJzZWN0aW9uIikgQE51bGxhYmxlIGZpbmFsIFN0cmluZyBzdWJzZWN0aW9uKSB7CiAgICAgdGhpcy5mbGFncyA9IGZsYWdzOwogICAgIHRoaXMuc2l0ZSA9IHNpdGU7CiAgICAgdGhpcy51aSA9IHVpOwogICAgIHRoaXMuc2VjdGlvbiA9IHNlY3Rpb247CisgICAgdGhpcy5zdWJzZWN0aW9uID0gc3Vic2VjdGlvbjsKICAgfQogCiAgIFN0cmluZyBnZXQoU3RyaW5nIG5hbWUpIHsKICAgICByZXR1cm4gZmxhZ3MuY2ZnLmdldFN0cmluZyhzZWN0aW9uLCBudWxsLCBuYW1lKTsKICAgfQogCi0gIHZvaWQgc2V0KGZpbmFsIFN0cmluZyBuYW1lLCBmaW5hbCBTdHJpbmcgdmFsdWUpIHsKKyAgcHVibGljIHZvaWQgc2V0KGZpbmFsIFN0cmluZyBuYW1lLCBmaW5hbCBTdHJpbmcgdmFsdWUpIHsKICAgICBmaW5hbCBBcnJheUxpc3Q8U3RyaW5nPiBhbGwgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKLSAgICBhbGwuYWRkQWxsKEFycmF5cy5hc0xpc3QoZmxhZ3MuY2ZnLmdldFN0cmluZ0xpc3Qoc2VjdGlvbiwgbnVsbCwgbmFtZSkpKTsKKyAgICBhbGwuYWRkQWxsKEFycmF5cy5hc0xpc3QoZmxhZ3MuY2ZnLmdldFN0cmluZ0xpc3Qoc2VjdGlvbiwgc3Vic2VjdGlvbiwgbmFtZSkpKTsKIAogICAgIGlmICh2YWx1ZSAhPSBudWxsKSB7CiAgICAgICBpZiAoYWxsLnNpemUoKSA9PSAwIHx8IGFsbC5zaXplKCkgPT0gMSkgewotICAgICAgICBmbGFncy5jZmcuc2V0U3RyaW5nKHNlY3Rpb24sIG51bGwsIG5hbWUsIHZhbHVlKTsKKyAgICAgICAgZmxhZ3MuY2ZnLnNldFN0cmluZyhzZWN0aW9uLCBzdWJzZWN0aW9uLCBuYW1lLCB2YWx1ZSk7CiAgICAgICB9IGVsc2UgewogICAgICAgICBhbGwuc2V0KDAsIHZhbHVlKTsKLSAgICAgICAgZmxhZ3MuY2ZnLnNldFN0cmluZ0xpc3Qoc2VjdGlvbiwgbnVsbCwgbmFtZSwgYWxsKTsKKyAgICAgICAgZmxhZ3MuY2ZnLnNldFN0cmluZ0xpc3Qoc2VjdGlvbiwgc3Vic2VjdGlvbiwgbmFtZSwgYWxsKTsKICAgICAgIH0KIAogICAgIH0gZWxzZSBpZiAoYWxsLnNpemUoKSA9PSAwKSB7CiAgICAgfSBlbHNlIGlmIChhbGwuc2l6ZSgpID09IDEpIHsKLSAgICAgIGZsYWdzLmNmZy51bnNldChzZWN0aW9uLCBudWxsLCBuYW1lKTsKKyAgICAgIGZsYWdzLmNmZy51bnNldChzZWN0aW9uLCBzdWJzZWN0aW9uLCBuYW1lKTsKICAgICB9IGVsc2UgewogICAgICAgYWxsLnJlbW92ZSgwKTsKLSAgICAgIGZsYWdzLmNmZy5zZXRTdHJpbmdMaXN0KHNlY3Rpb24sIG51bGwsIG5hbWUsIGFsbCk7CisgICAgICBmbGFncy5jZmcuc2V0U3RyaW5nTGlzdChzZWN0aW9uLCBzdWJzZWN0aW9uLCBuYW1lLCBhbGwpOwogICAgIH0KICAgfQogCi0gIDxUIGV4dGVuZHMgRW51bTw/Pj4gdm9pZCBzZXQoZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFQgdmFsdWUpIHsKKyAgcHVibGljIDxUIGV4dGVuZHMgRW51bTw/Pj4gdm9pZCBzZXQoZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFQgdmFsdWUpIHsKICAgICBpZiAodmFsdWUgIT0gbnVsbCkgewogICAgICAgc2V0KG5hbWUsIHZhbHVlLm5hbWUoKSk7CiAgICAgfSBlbHNlIHsKQEAgLTc3LDE1ICs4NCwxNSBAQAogICAgIH0KICAgfQogCi0gIHZvaWQgdW5zZXQoU3RyaW5nIG5hbWUpIHsKKyAgcHVibGljIHZvaWQgdW5zZXQoU3RyaW5nIG5hbWUpIHsKICAgICBzZXQobmFtZSwgKFN0cmluZykgbnVsbCk7CiAgIH0KIAotICBTdHJpbmcgc3RyaW5nKGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyBkdikgeworICBwdWJsaWMgU3RyaW5nIHN0cmluZyhmaW5hbCBTdHJpbmcgdGl0bGUsIGZpbmFsIFN0cmluZyBuYW1lLCBmaW5hbCBTdHJpbmcgZHYpIHsKICAgICByZXR1cm4gc3RyaW5nKHRpdGxlLCBuYW1lLCBkdiwgZmFsc2UpOwogICB9CiAKLSAgU3RyaW5nIHN0cmluZyhmaW5hbCBTdHJpbmcgdGl0bGUsIGZpbmFsIFN0cmluZyBuYW1lLCBmaW5hbCBTdHJpbmcgZHYsCisgIHB1YmxpYyBTdHJpbmcgc3RyaW5nKGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyBkdiwKICAgICAgIGZpbmFsIGJvb2xlYW4gbnVsbElmRGVmYXVsdCkgewogICAgIGZpbmFsIFN0cmluZyBvdiA9IGdldChuYW1lKTsKICAgICBTdHJpbmcgbnYgPSB1aS5yZWFkU3RyaW5nKG92ICE9IG51bGwgPyBvdiA6IGR2LCAiJXMiLCB0aXRsZSk7CkBAIC05OCwxOSArMTA1LDE5IEBACiAgICAgcmV0dXJuIG52OwogICB9CiAKLSAgRmlsZSBwYXRoKGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyBkZWZWYWx1ZSkgeworICBwdWJsaWMgRmlsZSBwYXRoKGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyBkZWZWYWx1ZSkgewogICAgIHJldHVybiBzaXRlLnJlc29sdmUoc3RyaW5nKHRpdGxlLCBuYW1lLCBkZWZWYWx1ZSkpOwogICB9CiAKLSAgPFQgZXh0ZW5kcyBFbnVtPD8+PiBUIHNlbGVjdChmaW5hbCBTdHJpbmcgdGl0bGUsIGZpbmFsIFN0cmluZyBuYW1lLAorICBwdWJsaWMgPFQgZXh0ZW5kcyBFbnVtPD8+PiBUIHNlbGVjdChmaW5hbCBTdHJpbmcgdGl0bGUsIGZpbmFsIFN0cmluZyBuYW1lLAogICAgICAgZmluYWwgVCBkZWZWYWx1ZSkgewogICAgIHJldHVybiBzZWxlY3QodGl0bGUsIG5hbWUsIGRlZlZhbHVlLCBmYWxzZSk7CiAgIH0KIAotICA8VCBleHRlbmRzIEVudW08Pz4+IFQgc2VsZWN0KGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsCisgIHB1YmxpYyA8VCBleHRlbmRzIEVudW08Pz4+IFQgc2VsZWN0KGZpbmFsIFN0cmluZyB0aXRsZSwgZmluYWwgU3RyaW5nIG5hbWUsCiAgICAgICBmaW5hbCBUIGRlZlZhbHVlLCBmaW5hbCBib29sZWFuIG51bGxJZkRlZmF1bHQpIHsKICAgICBmaW5hbCBib29sZWFuIHNldCA9IGdldChuYW1lKSAhPSBudWxsOwotICAgIFQgb2xkVmFsdWUgPSBDb25maWdVdGlsLmdldEVudW0oZmxhZ3MuY2ZnLCBzZWN0aW9uLCBudWxsLCBuYW1lLCBkZWZWYWx1ZSk7CisgICAgVCBvbGRWYWx1ZSA9IENvbmZpZ1V0aWwuZ2V0RW51bShmbGFncy5jZmcsIHNlY3Rpb24sIHN1YnNlY3Rpb24sIG5hbWUsIGRlZlZhbHVlKTsKICAgICBUIG5ld1ZhbHVlID0gdWkucmVhZEVudW0ob2xkVmFsdWUsICIlcyIsIHRpdGxlKTsKICAgICBpZiAobnVsbElmRGVmYXVsdCAmJiBuZXdWYWx1ZSA9PSBkZWZWYWx1ZSkgewogICAgICAgbmV3VmFsdWUgPSBudWxsOwpAQCAtMTI1LDE2ICsxMzIsMjYgQEAKICAgICByZXR1cm4gbmV3VmFsdWU7CiAgIH0KIAotICBTdHJpbmcgcGFzc3dvcmQoZmluYWwgU3RyaW5nIHVzZXJuYW1lLCBmaW5hbCBTdHJpbmcgcGFzc3dvcmQpIHsKKyAgcHVibGljIFN0cmluZyBzZWxlY3QoZmluYWwgU3RyaW5nIHRpdGxlLCBmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgU3RyaW5nIGR2LAorICAgICAgU2V0PFN0cmluZz4gYWxsb3dlZFZhbHVlcykgeworICAgIGZpbmFsIFN0cmluZyBvdiA9IGdldChuYW1lKTsKKyAgICBTdHJpbmcgbnYgPSB1aS5yZWFkU3RyaW5nKG92ICE9IG51bGwgPyBvdiA6IGR2LCBhbGxvd2VkVmFsdWVzLCAiJXMiLCB0aXRsZSk7CisgICAgaWYgKCFlcShvdiwgbnYpKSB7CisgICAgICBzZXQobmFtZSwgbnYpOworICAgIH0KKyAgICByZXR1cm4gbnY7CisgIH0KKworICBwdWJsaWMgU3RyaW5nIHBhc3N3b3JkKGZpbmFsIFN0cmluZyB1c2VybmFtZSwgZmluYWwgU3RyaW5nIHBhc3N3b3JkKSB7CiAgICAgZmluYWwgU3RyaW5nIG92ID0gZ2V0U2VjdXJlKHBhc3N3b3JkKTsKIAotICAgIFN0cmluZyB1c2VyID0gZmxhZ3Muc2VjLmdldFN0cmluZyhzZWN0aW9uLCBudWxsLCB1c2VybmFtZSk7CisgICAgU3RyaW5nIHVzZXIgPSBmbGFncy5zZWMuZ2V0U3RyaW5nKHNlY3Rpb24sIHN1YnNlY3Rpb24sIHVzZXJuYW1lKTsKICAgICBpZiAodXNlciA9PSBudWxsKSB7CiAgICAgICB1c2VyID0gZ2V0KHVzZXJuYW1lKTsKICAgICB9CiAKICAgICBpZiAodXNlciA9PSBudWxsKSB7Ci0gICAgICBmbGFncy5zZWMudW5zZXQoc2VjdGlvbiwgbnVsbCwgcGFzc3dvcmQpOworICAgICAgZmxhZ3Muc2VjLnVuc2V0KHNlY3Rpb24sIHN1YnNlY3Rpb24sIHBhc3N3b3JkKTsKICAgICAgIHJldHVybiBudWxsOwogICAgIH0KIApAQCAtMTU0LDE4ICsxNzEsMjIgQEAKICAgICByZXR1cm4gbnY7CiAgIH0KIAotICBTdHJpbmcgZ2V0U2VjdXJlKFN0cmluZyBuYW1lKSB7Ci0gICAgcmV0dXJuIGZsYWdzLnNlYy5nZXRTdHJpbmcoc2VjdGlvbiwgbnVsbCwgbmFtZSk7CisgIHB1YmxpYyBTdHJpbmcgZ2V0U2VjdXJlKFN0cmluZyBuYW1lKSB7CisgICAgcmV0dXJuIGZsYWdzLnNlYy5nZXRTdHJpbmcoc2VjdGlvbiwgc3Vic2VjdGlvbiwgbmFtZSk7CiAgIH0KIAotICB2b2lkIHNldFNlY3VyZShTdHJpbmcgbmFtZSwgU3RyaW5nIHZhbHVlKSB7CisgIHB1YmxpYyB2b2lkIHNldFNlY3VyZShTdHJpbmcgbmFtZSwgU3RyaW5nIHZhbHVlKSB7CiAgICAgaWYgKHZhbHVlICE9IG51bGwpIHsKLSAgICAgIGZsYWdzLnNlYy5zZXRTdHJpbmcoc2VjdGlvbiwgbnVsbCwgbmFtZSwgdmFsdWUpOworICAgICAgZmxhZ3Muc2VjLnNldFN0cmluZyhzZWN0aW9uLCBzdWJzZWN0aW9uLCBuYW1lLCB2YWx1ZSk7CiAgICAgfSBlbHNlIHsKLSAgICAgIGZsYWdzLnNlYy51bnNldChzZWN0aW9uLCBudWxsLCBuYW1lKTsKKyAgICAgIGZsYWdzLnNlYy51bnNldChzZWN0aW9uLCBzdWJzZWN0aW9uLCBuYW1lKTsKICAgICB9CiAgIH0KIAorICBTdHJpbmcgZ2V0TmFtZSgpIHsKKyAgICByZXR1cm4gc2VjdGlvbjsKKyAgfQorCiAgIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gZXEoZmluYWwgU3RyaW5nIGEsIGZpbmFsIFN0cmluZyBiKSB7CiAgICAgaWYgKGEgPT0gbnVsbCAmJiBiID09IG51bGwpIHsKICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1NpdGVQYXRoSW5pdGlhbGl6ZXIuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9TaXRlUGF0aEluaXRpYWxpemVyLmphdmEKaW5kZXggZjhlZjYzNy4uYmYwYWY3ZiAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1NpdGVQYXRoSW5pdGlhbGl6ZXIuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvU2l0ZVBhdGhJbml0aWFsaXplci5qYXZhCkBAIC04OSw2ICs4OSw4IEBACiAgICAgZXh0cmFjdE1haWxFeGFtcGxlKCJDaGFuZ2VGb290ZXIudm0iKTsKICAgICBleHRyYWN0TWFpbEV4YW1wbGUoIkNoYW5nZVN1YmplY3Qudm0iKTsKICAgICBleHRyYWN0TWFpbEV4YW1wbGUoIkNvbW1lbnQudm0iKTsKKyAgICBleHRyYWN0TWFpbEV4YW1wbGUoIkNvbW1lbnRGb290ZXIudm0iKTsKKyAgICBleHRyYWN0TWFpbEV4YW1wbGUoIkNvbW1pdE1lc3NhZ2VFZGl0ZWQudm0iKTsKICAgICBleHRyYWN0TWFpbEV4YW1wbGUoIk1lcmdlZC52bSIpOwogICAgIGV4dHJhY3RNYWlsRXhhbXBsZSgiTWVyZ2VGYWlsLnZtIik7CiAgICAgZXh0cmFjdE1haWxFeGFtcGxlKCJOZXdDaGFuZ2Uudm0iKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9VcGdyYWRlRnJvbTJfMF94LmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvVXBncmFkZUZyb20yXzBfeC5qYXZhCmluZGV4IDlmNjJmYzUuLmI5ODJhZTEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9VcGdyYWRlRnJvbTJfMF94LmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1VwZ3JhZGVGcm9tMl8wX3guamF2YQpAQCAtMjAsNyArMjAsNiBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucGdtLnV0aWwuQ29uc29sZVVJOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZVByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLlNvY2tldFV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKQEAgLTExOCwxMSArMTE3LDExIEBACiAKICAgICBmaW5hbCBQcm9wZXJ0aWVzIG9sZHByb3AgPSByZWFkR2Vycml0U2VydmVyUHJvcGVydGllcygpOwogICAgIGlmIChvbGRwcm9wICE9IG51bGwpIHsKLSAgICAgIGZpbmFsIFNlY3Rpb24gZGF0YWJhc2UgPSBzZWN0aW9ucy5nZXQoImRhdGFiYXNlIik7CisgICAgICBmaW5hbCBTZWN0aW9uIGRhdGFiYXNlID0gc2VjdGlvbnMuZ2V0KCJkYXRhYmFzZSIsIG51bGwpOwogCiAgICAgICBTdHJpbmcgdXJsID0gb2xkcHJvcC5nZXRQcm9wZXJ0eSgidXJsIik7CiAgICAgICBpZiAodXJsICE9IG51bGwgJiYgIWNvbnZlcnRVcmwoZGF0YWJhc2UsIHVybCkpIHsKLSAgICAgICAgZGF0YWJhc2Uuc2V0KCJ0eXBlIiwgRGF0YVNvdXJjZVByb3ZpZGVyLlR5cGUuSkRCQyk7CisgICAgICAgIGRhdGFiYXNlLnNldCgidHlwZSIsICJqZGJjIik7CiAgICAgICAgIGRhdGFiYXNlLnNldCgiZHJpdmVyIiwgb2xkcHJvcC5nZXRQcm9wZXJ0eSgiZHJpdmVyIikpOwogICAgICAgICBkYXRhYmFzZS5zZXQoInVybCIsIHVybCk7CiAgICAgICB9CkBAIC0xODksNyArMTg4LDcgQEAKIAogICAgIGlmICh1cmwuc3RhcnRzV2l0aCgiamRiYzpoMjpmaWxlOiIpKSB7CiAgICAgICB1cmwgPSB1cmwuc3Vic3RyaW5nKCJqZGJjOmgyOmZpbGU6Ii5sZW5ndGgoKSk7Ci0gICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCBEYXRhU291cmNlUHJvdmlkZXIuVHlwZS5IMik7CisgICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCAiaDIiKTsKICAgICAgIGRhdGFiYXNlLnNldCgiZGF0YWJhc2UiLCB1cmwpOwogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAtMjAyLDcgKzIwMSw3IEBACiAgICAgICB9CiAKICAgICAgIGZpbmFsIEluZXRTb2NrZXRBZGRyZXNzIGFkZHIgPSBTb2NrZXRVdGlsLnBhcnNlKHVybC5zdWJzdHJpbmcoMCwgc2wpLCAwKTsKLSAgICAgIGRhdGFiYXNlLnNldCgidHlwZSIsIERhdGFTb3VyY2VQcm92aWRlci5UeXBlLlBPU1RHUkVTUUwpOworICAgICAgZGF0YWJhc2Uuc2V0KCJ0eXBlIiwgInBvc3RncmVzcWwiKTsKICAgICAgIHNldGhvc3QoZGF0YWJhc2UsIGFkZHIpOwogICAgICAgZGF0YWJhc2Uuc2V0KCJkYXRhYmFzZSIsIHVybC5zdWJzdHJpbmcoc2wgKyAxKSk7CiAgICAgICBzZXR1c2VyKGRhdGFiYXNlLCB1c2VybmFtZSwgcGFzc3dvcmQpOwpAQCAtMjExLDcgKzIxMCw3IEBACiAKICAgICBpZiAodXJsLnN0YXJ0c1dpdGgoImpkYmM6cG9zdGdyZXNxbDoiKSkgewogICAgICAgdXJsID0gdXJsLnN1YnN0cmluZygiamRiYzpwb3N0Z3Jlc3FsOiIubGVuZ3RoKCkpOwotICAgICAgZGF0YWJhc2Uuc2V0KCJ0eXBlIiwgRGF0YVNvdXJjZVByb3ZpZGVyLlR5cGUuUE9TVEdSRVNRTCk7CisgICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCAicG9zdGdyZXNxbCIpOwogICAgICAgZGF0YWJhc2Uuc2V0KCJob3N0bmFtZSIsICJsb2NhbGhvc3QiKTsKICAgICAgIGRhdGFiYXNlLnNldCgiZGF0YWJhc2UiLCB1cmwpOwogICAgICAgc2V0dXNlcihkYXRhYmFzZSwgdXNlcm5hbWUsIHBhc3N3b3JkKTsKQEAgLTIyNiw3ICsyMjUsNyBAQAogICAgICAgfQogCiAgICAgICBmaW5hbCBJbmV0U29ja2V0QWRkcmVzcyBhZGRyID0gU29ja2V0VXRpbC5wYXJzZSh1cmwuc3Vic3RyaW5nKDAsIHNsKSwgMCk7Ci0gICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCBEYXRhU291cmNlUHJvdmlkZXIuVHlwZS5NWVNRTCk7CisgICAgICBkYXRhYmFzZS5zZXQoInR5cGUiLCAibXlzcWwiKTsKICAgICAgIHNldGhvc3QoZGF0YWJhc2UsIGFkZHIpOwogICAgICAgZGF0YWJhc2Uuc2V0KCJkYXRhYmFzZSIsIHVybC5zdWJzdHJpbmcoc2wgKyAxKSk7CiAgICAgICBzZXR1c2VyKGRhdGFiYXNlLCB1c2VybmFtZSwgcGFzc3dvcmQpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL0NvbnNvbGVVSS5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL0NvbnNvbGVVSS5qYXZhCmluZGV4IGI0ZTBmYWQuLmU4Y2YwYWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9Db25zb2xlVUkuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvQ29uc29sZVVJLmphdmEKQEAgLTE4LDYgKzE4LDcgQEAKIAogaW1wb3J0IGphdmEuaW8uQ29uc29sZTsKIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5JbnZvY2F0aW9uVGFyZ2V0RXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIC8qKiBDb25zb2xlIGJhc2VkIGludGVyYWN0aW9uIHdpdGggdGhlIGludm9raW5nIHVzZXIuICovCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgQ29uc29sZVVJIHsKQEAgLTczLDYgKzc0LDEwIEBACiAgIC8qKiBQcm9tcHQgdGhlIHVzZXIgZm9yIGEgc3RyaW5nLCBzdWdnZXN0aW5nIGEgZGVmYXVsdCwgYW5kIHJldHVybmluZyBjaG9pY2UuICovCiAgIHB1YmxpYyBhYnN0cmFjdCBTdHJpbmcgcmVhZFN0cmluZyhTdHJpbmcgZGVmLCBTdHJpbmcgZm10LCBPYmplY3QuLi4gYXJncyk7CiAKKyAgLyoqIFByb21wdCB0aGUgdXNlciB0byBtYWtlIGEgY2hvaWNlIGZyb20gYW4gYWxsb3dlZCBsaXN0IG9mIHZhbHVlcy4gKi8KKyAgcHVibGljIGFic3RyYWN0IFN0cmluZyByZWFkU3RyaW5nKFN0cmluZyBkZWYsIFNldDxTdHJpbmc+IGFsbG93ZWRWYWx1ZXMsCisgICAgICBTdHJpbmcgZm10LCBPYmplY3QuLi4gYXJncyk7CisKICAgLyoqIFByb21wdCB0aGUgdXNlciBmb3IgYW4gaW50ZWdlciB2YWx1ZSwgc3VnZ2VzdGluZyBhIGRlZmF1bHQuICovCiAgIHB1YmxpYyBpbnQgcmVhZEludChpbnQgZGVmLCBTdHJpbmcgZm10LCBPYmplY3QuLi4gYXJncykgewogICAgIGZvciAoOzspIHsKQEAgLTE2Miw2ICsxNjcsMjQgQEAKICAgICB9CiAKICAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU3RyaW5nIHJlYWRTdHJpbmcoU3RyaW5nIGRlZiwgU2V0PFN0cmluZz4gYWxsb3dlZFZhbHVlcywgU3RyaW5nIGZtdCwKKyAgICAgICAgT2JqZWN0Li4uIGFyZ3MpIHsKKyAgICAgIGZvciAoOzspIHsKKyAgICAgICAgU3RyaW5nIHIgPSByZWFkU3RyaW5nKGRlZiwgZm10LCBhcmdzKTsKKyAgICAgICAgaWYgKGFsbG93ZWRWYWx1ZXMuY29udGFpbnMoci50b0xvd2VyQ2FzZSgpKSkgeworICAgICAgICAgIHJldHVybiByLnRvTG93ZXJDYXNlKCk7CisgICAgICAgIH0KKyAgICAgICAgaWYgKCEiPyIuZXF1YWxzKHIpKSB7CisgICAgICAgICAgY29uc29sZS5wcmludGYoImVycm9yOiAnJXMnIGlzIG5vdCBhIHZhbGlkIGNob2ljZVxuIiwgcik7CisgICAgICAgIH0KKyAgICAgICAgY29uc29sZS5wcmludGYoIiAgICAgICBTdXBwb3J0ZWQgb3B0aW9ucyBhcmU6XG4iKTsKKyAgICAgICAgZm9yIChmaW5hbCBTdHJpbmcgdiA6IGFsbG93ZWRWYWx1ZXMpIHsKKyAgICAgICAgICBjb25zb2xlLnByaW50ZigiICAgICAgICAgJXNcbiIsIHYudG9TdHJpbmcoKS50b0xvd2VyQ2FzZSgpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKworICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyBTdHJpbmcgcGFzc3dvcmQoU3RyaW5nIGZtdCwgT2JqZWN0Li4uIGFyZ3MpIHsKICAgICAgIGZpbmFsIFN0cmluZyBwcm9tcHQgPSBTdHJpbmcuZm9ybWF0KGZtdCwgYXJncyk7CiAgICAgICBmb3IgKDs7KSB7CkBAIC0yNDIsNiArMjY1LDEyIEBACiAgICAgfQogCiAgICAgQE92ZXJyaWRlCisgICAgcHVibGljIFN0cmluZyByZWFkU3RyaW5nKFN0cmluZyBkZWYsIFNldDxTdHJpbmc+IGFsbG93ZWRWYWx1ZXMsIFN0cmluZyBmbXQsCisgICAgICAgIE9iamVjdC4uLiBhcmdzKSB7CisgICAgICByZXR1cm4gZGVmOworICAgIH0KKworICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIHdhaXRGb3JVc2VyKCkgewogICAgIH0KIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL0dhcmJhZ2VDb2xsZWN0aW9uTG9nRmlsZS5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL0dhcmJhZ2VDb2xsZWN0aW9uTG9nRmlsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk1ZTU3NjMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvR2FyYmFnZUNvbGxlY3Rpb25Mb2dGaWxlLmphdmEKQEAgLTAsMCArMSwxMjMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5wZ20udXRpbDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuZXZlbnRzLkxpZmVjeWNsZUxpc3RlbmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2FyYmFnZUNvbGxlY3Rpb247CisKK2ltcG9ydCBvcmcuYXBhY2hlLmxvZzRqLkFwcGVuZGVyOworaW1wb3J0IG9yZy5hcGFjaGUubG9nNGouRGFpbHlSb2xsaW5nRmlsZUFwcGVuZGVyOworaW1wb3J0IG9yZy5hcGFjaGUubG9nNGouTGV2ZWw7CitpbXBvcnQgb3JnLmFwYWNoZS5sb2c0ai5Mb2dNYW5hZ2VyOworaW1wb3J0IG9yZy5hcGFjaGUubG9nNGouTG9nZ2VyOworaW1wb3J0IG9yZy5hcGFjaGUubG9nNGouUGF0dGVybkxheW91dDsKK2ltcG9ydCBvcmcuYXBhY2hlLmxvZzRqLmhlbHBlcnMuT25seU9uY2VFcnJvckhhbmRsZXI7CitpbXBvcnQgb3JnLmFwYWNoZS5sb2c0ai5zcGkuRXJyb3JIYW5kbGVyOworaW1wb3J0IG9yZy5hcGFjaGUubG9nNGouc3BpLkxvZ2dpbmdFdmVudDsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLkZpbGVOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitwdWJsaWMgY2xhc3MgR2FyYmFnZUNvbGxlY3Rpb25Mb2dGaWxlIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgb3JnLnNsZjRqLkxvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihHYXJiYWdlQ29sbGVjdGlvbkxvZ0ZpbGUuY2xhc3MpOworCisgIHB1YmxpYyBzdGF0aWMgTGlmZWN5Y2xlTGlzdGVuZXIgc3RhcnQoRmlsZSBzaXRlUGF0aCkKKyAgICAgIHRocm93cyBGaWxlTm90Rm91bmRFeGNlcHRpb24geworICAgIEZpbGUgbG9nZGlyID0gbmV3IFNpdGVQYXRocyhzaXRlUGF0aCkubG9nc19kaXI7CisgICAgaWYgKCFsb2dkaXIuZXhpc3RzKCkgJiYgIWxvZ2Rpci5ta2RpcnMoKSkgeworICAgICAgdGhyb3cgbmV3IERpZSgiQ2Fubm90IGNyZWF0ZSBsb2cgZGlyZWN0b3J5OiAiICsgbG9nZGlyKTsKKyAgICB9CisKKyAgICBQYXR0ZXJuTGF5b3V0IGxheW91dCA9IG5ldyBQYXR0ZXJuTGF5b3V0KCk7CisgICAgbGF5b3V0LnNldENvbnZlcnNpb25QYXR0ZXJuKCJbJWRdICUtNXAgJXg6ICVtJW4iKTsKKworICAgIERhaWx5Um9sbGluZ0ZpbGVBcHBlbmRlciBkc3QgPSBuZXcgRGFpbHlSb2xsaW5nRmlsZUFwcGVuZGVyKCk7CisgICAgZHN0LnNldE5hbWUoR2FyYmFnZUNvbGxlY3Rpb24uTE9HX05BTUUpOworICAgIGRzdC5zZXRMYXlvdXQobGF5b3V0KTsKKyAgICBkc3Quc2V0RW5jb2RpbmcoIlVURi04Iik7CisgICAgZHN0LnNldEZpbGUobmV3IEZpbGUocmVzb2x2ZShsb2dkaXIpLCBHYXJiYWdlQ29sbGVjdGlvbi5MT0dfTkFNRSkuZ2V0UGF0aCgpKTsKKyAgICBkc3Quc2V0SW1tZWRpYXRlRmx1c2godHJ1ZSk7CisgICAgZHN0LnNldEFwcGVuZCh0cnVlKTsKKyAgICBkc3Quc2V0VGhyZXNob2xkKExldmVsLklORk8pOworICAgIGRzdC5zZXRFcnJvckhhbmRsZXIobmV3IExvZ0Vycm9ySGFuZGxlcigpKTsKKyAgICBkc3QuYWN0aXZhdGVPcHRpb25zKCk7CisgICAgZHN0LnNldEVycm9ySGFuZGxlcihuZXcgT25seU9uY2VFcnJvckhhbmRsZXIoKSk7CisKKyAgICBMb2dnZXIgZ2NMb2dnZXIgPSBMb2dNYW5hZ2VyLmdldExvZ2dlcihHYXJiYWdlQ29sbGVjdGlvbi5MT0dfTkFNRSk7CisgICAgZ2NMb2dnZXIucmVtb3ZlQWxsQXBwZW5kZXJzKCk7CisgICAgZ2NMb2dnZXIuYWRkQXBwZW5kZXIoZHN0KTsKKyAgICBnY0xvZ2dlci5zZXRBZGRpdGl2aXR5KGZhbHNlKTsKKworICAgIHJldHVybiBuZXcgTGlmZWN5Y2xlTGlzdGVuZXIoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIHN0YXJ0KCkgeworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIHN0b3AoKSB7CisgICAgICAgIExvZ01hbmFnZXIuZ2V0TG9nZ2VyKEdhcmJhZ2VDb2xsZWN0aW9uLkxPR19OQU1FKS5yZW1vdmVBbGxBcHBlbmRlcnMoKTsKKyAgICAgIH0KKyAgICB9OworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgRmlsZSByZXNvbHZlKEZpbGUgbG9nc19kaXIpIHsKKyAgICB0cnkgeworICAgICAgcmV0dXJuIGxvZ3NfZGlyLmdldENhbm9uaWNhbEZpbGUoKTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICByZXR1cm4gbG9nc19kaXIuZ2V0QWJzb2x1dGVGaWxlKCk7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBHYXJiYWdlQ29sbGVjdGlvbkxvZ0ZpbGUoKSB7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBjbGFzcyBMb2dFcnJvckhhbmRsZXIgaW1wbGVtZW50cyBFcnJvckhhbmRsZXIgeworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIGVycm9yKFN0cmluZyBtZXNzYWdlLCBFeGNlcHRpb24gZSwgaW50IGVycm9yQ29kZSwKKyAgICAgICAgTG9nZ2luZ0V2ZW50IGV2ZW50KSB7CisgICAgICBlcnJvcihlICE9IG51bGwgPyBlLmdldE1lc3NhZ2UoKSA6IG1lc3NhZ2UpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIGVycm9yKFN0cmluZyBtZXNzYWdlLCBFeGNlcHRpb24gZSwgaW50IGVycm9yQ29kZSkgeworICAgICAgZXJyb3IoZSAhPSBudWxsID8gZS5nZXRNZXNzYWdlKCkgOiBtZXNzYWdlKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgdm9pZCBlcnJvcihTdHJpbmcgbWVzc2FnZSkgeworICAgICAgbG9nLmVycm9yKCJDYW5ub3Qgb3BlbiAnIiArIEdhcmJhZ2VDb2xsZWN0aW9uLkxPR19OQU1FICsgIicgbG9nIGZpbGU6ICIKKyAgICAgICAgICArIG1lc3NhZ2UpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIGFjdGl2YXRlT3B0aW9ucygpIHsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgdm9pZCBzZXRBcHBlbmRlcihBcHBlbmRlciBhcHBlbmRlcikgeworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIHNldEJhY2t1cEFwcGVuZGVyKEFwcGVuZGVyIGFwcGVuZGVyKSB7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIHZvaWQgc2V0TG9nZ2VyKExvZ2dlciBsb2dnZXIpIHsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9Jb1V0aWwuamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9Jb1V0aWwuamF2YQppbmRleCA5Mzk4ODUxLi5mNzUwNzQ4YSAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL0lvVXRpbC5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9Jb1V0aWwuamF2YQpAQCAtMTQsOSArMTQsMTkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5wZ20udXRpbDsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuaW8uSW5wdXRTdHJlYW07CiBpbXBvcnQgamF2YS5pby5PdXRwdXRTdHJlYW07CitpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5NZXRob2Q7CitpbXBvcnQgamF2YS5uZXQuTWFsZm9ybWVkVVJMRXhjZXB0aW9uOworaW1wb3J0IGphdmEubmV0LlVSTDsKK2ltcG9ydCBqYXZhLm5ldC5VUkxDbGFzc0xvYWRlcjsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIHB1YmxpYyBmaW5hbCBjbGFzcyBJb1V0aWwgewogICBwdWJsaWMgc3RhdGljIHZvaWQgY29weVdpdGhUaHJlYWQoZmluYWwgSW5wdXRTdHJlYW0gc3JjLApAQCAtNDIsNiArNTIsNDcgQEAKICAgICB9LnN0YXJ0KCk7CiAgIH0KIAorICBwdWJsaWMgc3RhdGljIHZvaWQgbG9hZEpBUnMoRmlsZS4uLiBqYXJzKSB7CisgICAgQ2xhc3NMb2FkZXIgY2wgPSBJb1V0aWwuY2xhc3MuZ2V0Q2xhc3NMb2FkZXIoKTsKKyAgICBpZiAoIShjbCBpbnN0YW5jZW9mIFVSTENsYXNzTG9hZGVyKSkgeworICAgICAgdGhyb3cgbm9BZGRVUkwoIk5vdCBsb2FkZWQgYnkgVVJMQ2xhc3NMb2FkZXIiLCBudWxsKTsKKyAgICB9CisgICAgQFN1cHByZXNzV2FybmluZ3MoInJlc291cmNlIikKKyAgICBVUkxDbGFzc0xvYWRlciB1cmxDbGFzc0xvYWRlciA9IChVUkxDbGFzc0xvYWRlcikgY2w7CisKKyAgICBNZXRob2QgYWRkVVJMOworICAgIHRyeSB7CisgICAgICBhZGRVUkwgPSBVUkxDbGFzc0xvYWRlci5jbGFzcy5nZXREZWNsYXJlZE1ldGhvZCgiYWRkVVJMIiwgVVJMLmNsYXNzKTsKKyAgICAgIGFkZFVSTC5zZXRBY2Nlc3NpYmxlKHRydWUpOworICAgIH0gY2F0Y2ggKFNlY3VyaXR5RXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5vQWRkVVJMKCJNZXRob2QgYWRkVVJMIG5vdCBhdmFpbGFibGUiLCBlKTsKKyAgICB9IGNhdGNoIChOb1N1Y2hNZXRob2RFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbm9BZGRVUkwoIk1ldGhvZCBhZGRVUkwgbm90IGF2YWlsYWJsZSIsIGUpOworICAgIH0KKworICAgIFNldDxVUkw+IGhhdmUgPSBTZXRzLm5ld0hhc2hTZXQoQXJyYXlzLmFzTGlzdCh1cmxDbGFzc0xvYWRlci5nZXRVUkxzKCkpKTsKKyAgICBmb3IgKEZpbGUgcGF0aCA6IGphcnMpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIFVSTCB1cmwgPSBwYXRoLnRvVVJJKCkudG9VUkwoKTsKKyAgICAgICAgaWYgKGhhdmUuYWRkKHVybCkpIHsKKyAgICAgICAgICBhZGRVUkwuaW52b2tlKGNsLCB1cmwpOworICAgICAgICB9CisgICAgICB9IGNhdGNoIChNYWxmb3JtZWRVUkxFeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBub0FkZFVSTCgiYWRkVVJMICIgKyBwYXRoICsgIiBmYWlsZWQiLCBlKTsKKyAgICAgIH0gY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBlKSB7CisgICAgICAgIHRocm93IG5vQWRkVVJMKCJhZGRVUkwgIiArIHBhdGggKyAiIGZhaWxlZCIsIGUpOworICAgICAgfSBjYXRjaCAoSWxsZWdhbEFjY2Vzc0V4Y2VwdGlvbiBlKSB7CisgICAgICAgIHRocm93IG5vQWRkVVJMKCJhZGRVUkwgIiArIHBhdGggKyAiIGZhaWxlZCIsIGUpOworICAgICAgfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7CisgICAgICAgIHRocm93IG5vQWRkVVJMKCJhZGRVUkwgIiArIHBhdGggKyAiIGZhaWxlZCIsIGUuZ2V0Q2F1c2UoKSk7CisgICAgICB9CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24gbm9BZGRVUkwoU3RyaW5nIG0sIFRocm93YWJsZSB3aHkpIHsKKyAgICBTdHJpbmcgcHJlZml4ID0gIkNhbm5vdCBleHRlbmQgY2xhc3NwYXRoOiAiOworICAgIHJldHVybiBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24ocHJlZml4ICsgbSwgd2h5KTsKKyAgfQogICBwcml2YXRlIElvVXRpbCgpIHsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL0xvZ0ZpbGVDb21wcmVzc29yLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvTG9nRmlsZUNvbXByZXNzb3IuamF2YQppbmRleCA1N2NjN2M0Li5jZGE2NTNlIDEwMDY0NAotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvTG9nRmlsZUNvbXByZXNzb3IuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvTG9nRmlsZUNvbXByZXNzb3IuamF2YQpAQCAtMTksNiArMTksNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuZXZlbnRzLkxpZmVjeWNsZUxpc3RlbmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HYXJiYWdlQ29sbGVjdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LldvcmtRdWV1ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiAKQEAgLTk3LDYgKzk4LDcgQEAKICAgcHJpdmF0ZSBib29sZWFuIGlzTGl2ZShmaW5hbCBGaWxlIGVudHJ5KSB7CiAgICAgZmluYWwgU3RyaW5nIG5hbWUgPSBlbnRyeS5nZXROYW1lKCk7CiAgICAgcmV0dXJuIEVycm9yTG9nRmlsZS5MT0dfTkFNRS5lcXVhbHMobmFtZSkgLy8KKyAgICAgICAgfHwgR2FyYmFnZUNvbGxlY3Rpb24uTE9HX05BTUUuZXF1YWxzKG5hbWUpIC8vCiAgICAgICAgIHx8ICJzc2hkX2xvZyIuZXF1YWxzKG5hbWUpIC8vCiAgICAgICAgIHx8ICJodHRwZF9sb2ciLmVxdWFscyhuYW1lKSAvLwogICAgICAgICB8fCAiZ2Vycml0LnJ1biIuZXF1YWxzKG5hbWUpIC8vCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvUnVudGltZVNodXRkb3duLmphdmEgYi9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvUnVudGltZVNodXRkb3duLmphdmEKaW5kZXggMThiNzA2NC4uYzAwYWQ3ZiAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL1J1bnRpbWVTaHV0ZG93bi5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9SdW50aW1lU2h1dGRvd24uamF2YQpAQCAtMTAzLDkgKzEwMyw3IEBACiAgICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgIHdhaXQoKTsKICAgICAgICAgICB9IGNhdGNoIChJbnRlcnJ1cHRlZEV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgICBsb2cud2FybigiVGhyZWFkICIgKyBUaHJlYWQuY3VycmVudFRocmVhZCgpLmdldE5hbWUoKQotICAgICAgICAgICAgICAgICsgIiBpbnRlcnJ1cHRlZCB3aGlsZSB3YWl0aW5nIGZvciBncmFjZWZ1bCBzaHV0ZG93bjsiCi0gICAgICAgICAgICAgICAgKyAiIGlnbm9yaW5nIGludGVycnVwdCByZXF1ZXN0Iik7CisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvU2l0ZUxpYnJhcnlCYXNlZERhdGFTb3VyY2VQcm92aWRlci5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL1NpdGVMaWJyYXJ5QmFzZWREYXRhU291cmNlUHJvdmlkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42YWI3Mzk1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS91dGlsL1NpdGVMaWJyYXJ5QmFzZWREYXRhU291cmNlUHJvdmlkZXIuamF2YQpAQCAtMCwwICsxLDgxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucGdtLnV0aWw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5wcmltaXRpdmVzLkxvbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZVByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZVR5cGU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLkZpbGVGaWx0ZXI7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKKworaW1wb3J0IGphdmF4LnNxbC5EYXRhU291cmNlOworCisvKiogTG9hZHMgdGhlIHNpdGUgbGlicmFyeSBpZiBub3QgeWV0IGxvYWRlZC4gKi8KK0BTaW5nbGV0b24KK3B1YmxpYyBjbGFzcyBTaXRlTGlicmFyeUJhc2VkRGF0YVNvdXJjZVByb3ZpZGVyIGV4dGVuZHMgRGF0YVNvdXJjZVByb3ZpZGVyIHsKKyAgcHJpdmF0ZSBmaW5hbCBGaWxlIGxpYmRpcjsKKyAgcHJpdmF0ZSBib29sZWFuIGluaXQ7CisKKyAgQEluamVjdAorICBTaXRlTGlicmFyeUJhc2VkRGF0YVNvdXJjZVByb3ZpZGVyKFNpdGVQYXRocyBzaXRlLAorICAgICAgQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgY2ZnLAorICAgICAgRGF0YVNvdXJjZVByb3ZpZGVyLkNvbnRleHQgY3R4LAorICAgICAgRGF0YVNvdXJjZVR5cGUgZHN0KSB7CisgICAgc3VwZXIoc2l0ZSwgY2ZnLCBjdHgsIGRzdCk7CisgICAgbGliZGlyID0gc2l0ZS5saWJfZGlyOworICB9CisKKyAgcHVibGljIHN5bmNocm9uaXplZCBEYXRhU291cmNlIGdldCgpIHsKKyAgICBpZiAoIWluaXQpIHsKKyAgICAgIGxvYWRTaXRlTGliKCk7CisgICAgICBpbml0ID0gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIHN1cGVyLmdldCgpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGxvYWRTaXRlTGliKCkgeworICAgIEZpbGVbXSBqYXJzID0gbGliZGlyLmxpc3RGaWxlcyhuZXcgRmlsZUZpbHRlcigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIGJvb2xlYW4gYWNjZXB0KEZpbGUgcGF0aCkgeworICAgICAgICBTdHJpbmcgbmFtZSA9IHBhdGguZ2V0TmFtZSgpOworICAgICAgICByZXR1cm4gKG5hbWUuZW5kc1dpdGgoIi5qYXIiKSB8fCBuYW1lLmVuZHNXaXRoKCIuemlwIikpCisgICAgICAgICAgICAmJiBwYXRoLmlzRmlsZSgpOworICAgICAgfQorICAgIH0pOworICAgIGlmIChqYXJzICE9IG51bGwgJiYgMCA8IGphcnMubGVuZ3RoKSB7CisgICAgICBBcnJheXMuc29ydChqYXJzLCBuZXcgQ29tcGFyYXRvcjxGaWxlPigpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShGaWxlIGEsIEZpbGUgYikgeworICAgICAgICAgIC8vIFNvcnQgYnkgcmV2ZXJzZSBsYXN0LW1vZGlmaWVkIHRpbWUgc28gbmV3ZXIgSkFScyBhcmUgZmlyc3QuCisgICAgICAgICAgaW50IGNtcCA9IExvbmdzLmNvbXBhcmUoYi5sYXN0TW9kaWZpZWQoKSwgYS5sYXN0TW9kaWZpZWQoKSk7CisgICAgICAgICAgaWYgKGNtcCAhPSAwKSB7CisgICAgICAgICAgICByZXR1cm4gY21wOworICAgICAgICAgIH0KKyAgICAgICAgICByZXR1cm4gYS5nZXROYW1lKCkuY29tcGFyZVRvKGIuZ2V0TmFtZSgpKTsKKyAgICAgICAgfQorICAgICAgfSk7CisgICAgICBJb1V0aWwubG9hZEpBUnMoamFycyk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL3V0aWwvU2l0ZVByb2dyYW0uamF2YSBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9TaXRlUHJvZ3JhbS5qYXZhCmluZGV4IDQ4OTM1NzkuLmFhZTViNDggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9TaXRlUHJvZ3JhbS5qYXZhCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vdXRpbC9TaXRlUHJvZ3JhbS5qYXZhCkBAIC0xOCwxMCArMTgsMTMgQEAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5pbmplY3QuU3RhZ2UuUFJPRFVDVElPTjsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWdNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkxvY2FsRGlza1JlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YVNvdXJjZU1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFTb3VyY2VQcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFTb3VyY2VUeXBlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuRGF0YWJhc2VNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5TY2hlbWFNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKQEAgLTM0LDIyICszNywxMyBAQAogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lm5hbWUuTmFtZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3Quc3BpLk1lc3NhZ2U7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CiBpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKIAogaW1wb3J0IGphdmEuaW8uRmlsZTsKLWltcG9ydCBqYXZhLmlvLkZpbGVGaWx0ZXI7Ci1pbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5NZXRob2Q7Ci1pbXBvcnQgamF2YS5uZXQuTWFsZm9ybWVkVVJMRXhjZXB0aW9uOwotaW1wb3J0IGphdmEubmV0LlVSTDsKLWltcG9ydCBqYXZhLm5ldC5VUkxDbGFzc0xvYWRlcjsKIGltcG9ydCBqYXZhLnNxbC5TUUxFeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOwotaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOwotaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwotaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIGltcG9ydCBqYXZheC5zcWwuRGF0YVNvdXJjZTsKIApAQCAtNzQsOTUgKzY4LDQ0IEBACiAgICAgfQogICB9CiAKLSAgLyoqIExvYWQgZXh0cmEgSkFScyBmcm9tIHtAY29kZSBsaWIvfSBzdWJkaXJlY3Rvcnkgb2Yge0BsaW5rICNnZXRTaXRlUGF0aCgpfSAqLwotICBwcm90ZWN0ZWQgdm9pZCBsb2FkU2l0ZUxpYigpIHsKLSAgICBmaW5hbCBGaWxlIGxpYmRpciA9IG5ldyBGaWxlKGdldFNpdGVQYXRoKCksICJsaWIiKTsKLSAgICBmaW5hbCBGaWxlW10gbGlzdCA9IGxpYmRpci5saXN0RmlsZXMobmV3IEZpbGVGaWx0ZXIoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyBib29sZWFuIGFjY2VwdChGaWxlIHBhdGgpIHsKLSAgICAgICAgaWYgKCFwYXRoLmlzRmlsZSgpKSB7Ci0gICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBwYXRoLmdldE5hbWUoKS5lbmRzV2l0aCgiLmphciIpIC8vCi0gICAgICAgICAgICB8fCBwYXRoLmdldE5hbWUoKS5lbmRzV2l0aCgiLnppcCIpOwotICAgICAgfQotICAgIH0pOwotICAgIGlmIChsaXN0ICE9IG51bGwgJiYgMCA8IGxpc3QubGVuZ3RoKSB7Ci0gICAgICBBcnJheXMuc29ydChsaXN0LCBuZXcgQ29tcGFyYXRvcjxGaWxlPigpIHsKLSAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShGaWxlIGEsIEZpbGUgYikgewotICAgICAgICAgIHJldHVybiBhLmdldE5hbWUoKS5jb21wYXJlVG8oYi5nZXROYW1lKCkpOwotICAgICAgICB9Ci0gICAgICB9KTsKLSAgICAgIGFkZFRvQ2xhc3NMb2FkZXIobGlzdCk7Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIGFkZFRvQ2xhc3NMb2FkZXIoZmluYWwgRmlsZVtdIGFkZGl0aW9uYWxMb2NhdGlvbnMpIHsKLSAgICBmaW5hbCBDbGFzc0xvYWRlciBjbCA9IGdldENsYXNzKCkuZ2V0Q2xhc3NMb2FkZXIoKTsKLSAgICBpZiAoIShjbCBpbnN0YW5jZW9mIFVSTENsYXNzTG9hZGVyKSkgewotICAgICAgdGhyb3cgbm9BZGRVUkwoIk5vdCBsb2FkZWQgYnkgVVJMQ2xhc3NMb2FkZXIiLCBudWxsKTsKLSAgICB9Ci0KLSAgICBmaW5hbCBVUkxDbGFzc0xvYWRlciB1Y2wgPSAoVVJMQ2xhc3NMb2FkZXIpIGNsOwotICAgIGZpbmFsIFNldDxVUkw+IGhhdmUgPSBuZXcgSGFzaFNldDxVUkw+KCk7Ci0gICAgaGF2ZS5hZGRBbGwoQXJyYXlzLmFzTGlzdCh1Y2wuZ2V0VVJMcygpKSk7Ci0KLSAgICBmaW5hbCBNZXRob2QgbTsKLSAgICB0cnkgewotICAgICAgbSA9IFVSTENsYXNzTG9hZGVyLmNsYXNzLmdldERlY2xhcmVkTWV0aG9kKCJhZGRVUkwiLCBVUkwuY2xhc3MpOwotICAgICAgbS5zZXRBY2Nlc3NpYmxlKHRydWUpOwotICAgIH0gY2F0Y2ggKFNlY3VyaXR5RXhjZXB0aW9uIGUpIHsKLSAgICAgIHRocm93IG5vQWRkVVJMKCJNZXRob2QgYWRkVVJMIG5vdCBhdmFpbGFibGUiLCBlKTsKLSAgICB9IGNhdGNoIChOb1N1Y2hNZXRob2RFeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgbm9BZGRVUkwoIk1ldGhvZCBhZGRVUkwgbm90IGF2YWlsYWJsZSIsIGUpOwotICAgIH0KLQotICAgIGZvciAoZmluYWwgRmlsZSBwYXRoIDogYWRkaXRpb25hbExvY2F0aW9ucykgewotICAgICAgdHJ5IHsKLSAgICAgICAgZmluYWwgVVJMIHVybCA9IHBhdGgudG9VUkkoKS50b1VSTCgpOwotICAgICAgICBpZiAoaGF2ZS5hZGQodXJsKSkgewotICAgICAgICAgIG0uaW52b2tlKGNsLCB1cmwpOwotICAgICAgICB9Ci0gICAgICB9IGNhdGNoIChNYWxmb3JtZWRVUkxFeGNlcHRpb24gZSkgewotICAgICAgICB0aHJvdyBub0FkZFVSTCgiYWRkVVJMICIgKyBwYXRoICsgIiBmYWlsZWQiLCBlKTsKLSAgICAgIH0gY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIHRocm93IG5vQWRkVVJMKCJhZGRVUkwgIiArIHBhdGggKyAiIGZhaWxlZCIsIGUpOwotICAgICAgfSBjYXRjaCAoSWxsZWdhbEFjY2Vzc0V4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIHRocm93IG5vQWRkVVJMKCJhZGRVUkwgIiArIHBhdGggKyAiIGZhaWxlZCIsIGUpOwotICAgICAgfSBjYXRjaCAoSW52b2NhdGlvblRhcmdldEV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIHRocm93IG5vQWRkVVJMKCJhZGRVUkwgIiArIHBhdGggKyAiIGZhaWxlZCIsIGUuZ2V0Q2F1c2UoKSk7Ci0gICAgICB9Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24gbm9BZGRVUkwoU3RyaW5nIG0sIFRocm93YWJsZSB3aHkpIHsKLSAgICBmaW5hbCBTdHJpbmcgcHJlZml4ID0gIkNhbm5vdCBleHRlbmQgY2xhc3NwYXRoOiAiOwotICAgIHJldHVybiBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24ocHJlZml4ICsgbSwgd2h5KTsKLSAgfQotCiAgIC8qKiBAcmV0dXJuIHByb3ZpZGVzIGRhdGFiYXNlIGNvbm5lY3Rpdml0eSBhbmQgc2l0ZSBwYXRoLiAqLwogICBwcm90ZWN0ZWQgSW5qZWN0b3IgY3JlYXRlRGJJbmplY3RvcihmaW5hbCBEYXRhU291cmNlUHJvdmlkZXIuQ29udGV4dCBjb250ZXh0KSB7Ci0gICAgbG9hZFNpdGVMaWIoKTsKLQogICAgIGZpbmFsIEZpbGUgc2l0ZVBhdGggPSBnZXRTaXRlUGF0aCgpOwogICAgIGZpbmFsIExpc3Q8TW9kdWxlPiBtb2R1bGVzID0gbmV3IEFycmF5TGlzdDxNb2R1bGU+KCk7Ci0gICAgbW9kdWxlcy5hZGQobmV3IEFic3RyYWN0TW9kdWxlKCkgeworCisgICAgTW9kdWxlIHNpdGVQYXRoTW9kdWxlID0gbmV3IEFic3RyYWN0TW9kdWxlKCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CiAgICAgICAgIGJpbmQoRmlsZS5jbGFzcykuYW5ub3RhdGVkV2l0aChTaXRlUGF0aC5jbGFzcykudG9JbnN0YW5jZShzaXRlUGF0aCk7CiAgICAgICB9Ci0gICAgfSk7CisgICAgfTsKKyAgICBtb2R1bGVzLmFkZChzaXRlUGF0aE1vZHVsZSk7CisKICAgICBtb2R1bGVzLmFkZChuZXcgTGlmZWN5Y2xlTW9kdWxlKCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CiAgICAgICAgIGJpbmQoRGF0YVNvdXJjZVByb3ZpZGVyLkNvbnRleHQuY2xhc3MpLnRvSW5zdGFuY2UoY29udGV4dCk7Ci0gICAgICAgIGJpbmQoS2V5LmdldChEYXRhU291cmNlLmNsYXNzLCBOYW1lcy5uYW1lZCgiUmV2aWV3RGIiKSkpLnRvUHJvdmlkZXIoCi0gICAgICAgICAgICBEYXRhU291cmNlUHJvdmlkZXIuY2xhc3MpLmluKFNJTkdMRVRPTik7Ci0gICAgICAgIGxpc3RlbmVyKCkudG8oRGF0YVNvdXJjZVByb3ZpZGVyLmNsYXNzKTsKKyAgICAgICAgYmluZChLZXkuZ2V0KERhdGFTb3VyY2UuY2xhc3MsIE5hbWVzLm5hbWVkKCJSZXZpZXdEYiIpKSkKKyAgICAgICAgICAudG9Qcm92aWRlcihTaXRlTGlicmFyeUJhc2VkRGF0YVNvdXJjZVByb3ZpZGVyLmNsYXNzKQorICAgICAgICAgIC5pbihTSU5HTEVUT04pOworICAgICAgICBsaXN0ZW5lcigpLnRvKFNpdGVMaWJyYXJ5QmFzZWREYXRhU291cmNlUHJvdmlkZXIuY2xhc3MpOwogICAgICAgfQogICAgIH0pOwotICAgIG1vZHVsZXMuYWRkKG5ldyBHZXJyaXRTZXJ2ZXJDb25maWdNb2R1bGUoKSk7CisgICAgTW9kdWxlIGNvbmZpZ01vZHVsZSA9IG5ldyBHZXJyaXRTZXJ2ZXJDb25maWdNb2R1bGUoKTsKKyAgICBtb2R1bGVzLmFkZChjb25maWdNb2R1bGUpOworICAgIEluamVjdG9yIGNmZ0luamVjdG9yID0gR3VpY2UuY3JlYXRlSW5qZWN0b3Ioc2l0ZVBhdGhNb2R1bGUsIGNvbmZpZ01vZHVsZSk7CisgICAgQ29uZmlnIGNmZyA9IGNmZ0luamVjdG9yLmdldEluc3RhbmNlKEtleS5nZXQoQ29uZmlnLmNsYXNzLCBHZXJyaXRTZXJ2ZXJDb25maWcuY2xhc3MpKTsKKyAgICBTdHJpbmcgZGJUeXBlID0gY2ZnLmdldFN0cmluZygiZGF0YWJhc2UiLCBudWxsLCAidHlwZSIpOworCisgICAgZmluYWwgRGF0YVNvdXJjZVR5cGUgZHN0ID0gR3VpY2UuY3JlYXRlSW5qZWN0b3IobmV3IERhdGFTb3VyY2VNb2R1bGUoKSwgY29uZmlnTW9kdWxlLAorICAgICAgICAgICAgc2l0ZVBhdGhNb2R1bGUpLmdldEluc3RhbmNlKAorICAgICAgICAgICAgS2V5LmdldChEYXRhU291cmNlVHlwZS5jbGFzcywgTmFtZXMubmFtZWQoZGJUeXBlLnRvTG93ZXJDYXNlKCkpKSk7CisKKyAgICBtb2R1bGVzLmFkZChuZXcgQWJzdHJhY3RNb2R1bGUoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICAgICAgYmluZChEYXRhU291cmNlVHlwZS5jbGFzcykudG9JbnN0YW5jZShkc3QpOworICAgICAgfX0pOwogICAgIG1vZHVsZXMuYWRkKG5ldyBEYXRhYmFzZU1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgU2NoZW1hTW9kdWxlKCkpOwogICAgIG1vZHVsZXMuYWRkKG5ldyBMb2NhbERpc2tSZXBvc2l0b3J5TWFuYWdlci5Nb2R1bGUoKSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vZ2Vycml0LnNoIGIvZ2Vycml0LXBnbS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2dlcnJpdC5zaAppbmRleCAzODU3ZWJkLi45YWE0ZWEzIDEwMDc1NQotLS0gYS9nZXJyaXQtcGdtL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vZ2Vycml0LnNoCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9nZXJyaXQuc2gKQEAgLTksNiArOSwxNyBAQAogIyBwcm9jZXNzbmFtZTogZ2Vycml0CiAjID09PT09PT09PT09PT09PT09PT09PT09PQogCisjIyMgQkVHSU4gSU5JVCBJTkZPCisjIFByb3ZpZGVzOiAgICAgICAgICBnZXJyaXQKKyMgUmVxdWlyZWQtU3RhcnQ6ICAgICRuYW1lZCAkcmVtb3RlX2ZzICRzeXNsb2cKKyMgUmVxdWlyZWQtU3RvcDogICAgICRuYW1lZCAkcmVtb3RlX2ZzICRzeXNsb2cKKyMgRGVmYXVsdC1TdGFydDogICAgIDIgMyA0IDUKKyMgRGVmYXVsdC1TdG9wOiAgICAgIDAgMSA2CisjIFNob3J0LURlc2NyaXB0aW9uOiBTdGFydC9zdG9wIEdlcnJpdCBDb2RlIFJldmlldworIyBEZXNjcmlwdGlvbjogICAgICAgR2Vycml0IGlzIGEgd2ViIGJhc2VkIGNvZGUgcmV2aWV3IHN5c3RlbSwgZmFjaWxpdGF0aW5nIG9ubGluZSBjb2RlIHJldmlld3MKKyMgICAgICAgICAgICAgICAgICAgIGZvciBwcm9qZWN0cyB1c2luZyB0aGUgR2l0IHZlcnNpb24gY29udHJvbCBzeXN0ZW0uCisjIyMgRU5EIElOSVQgSU5GTworCiAjIENvbmZpZ3VyYXRpb24gZmlsZXM6CiAjCiAjIC9ldGMvZGVmYXVsdC9nZXJyaXRjb2RlcmV2aWV3CkBAIC0zNiw3ICs0Nyw3IEBACiAKIHVzYWdlKCkgewogICAgIG1lPWBiYXNlbmFtZSAiJDAiYAotICAgIGVjaG8gPiYyICJVc2FnZTogJG1lIHtzdGFydHxzdG9wfHJlc3RhcnR8Y2hlY2t8cnVufHN1cGVydmlzZX0gWy1kIHNpdGVdIgorICAgIGVjaG8gPiYyICJVc2FnZTogJG1lIHtzdGFydHxzdG9wfHJlc3RhcnR8Y2hlY2t8c3RhdHVzfHJ1bnxzdXBlcnZpc2V9IFstZCBzaXRlXSIKICAgICBleGl0IDEKIH0KIApAQCAtMTA4LDcgKzExOSw3IEBACiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogIyBTZWUgaWYgdGhlcmUncyBhIGRlZmF1bHQgY29uZmlndXJhdGlvbiBmaWxlCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotaWYgdGVzdCAtZiAvZXRjL2RlZmF1bHQvZ2Vycml0Y29kZXJldmlldyA7IHRoZW4gCitpZiB0ZXN0IC1mIC9ldGMvZGVmYXVsdC9nZXJyaXRjb2RlcmV2aWV3IDsgdGhlbgogICAuIC9ldGMvZGVmYXVsdC9nZXJyaXRjb2RlcmV2aWV3CiBmaQogCkBAIC0xMjYsNyArMTM3LDcgQEAKIEdFUlJJVF9JTlNUQUxMX1RSQUNFX0ZJTEU9ZXRjL2dlcnJpdC5jb25maWcKIAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSMgTm8gZ2l0IGluIFBBVEg/IE5lZWRlZCBmb3IgZ2Vycml0LmNvbmZnIHBhcnNpbmcKKyMgTm8gZ2l0IGluIFBBVEg/IE5lZWRlZCBmb3IgZ2Vycml0LmNvbmZpZyBwYXJzaW5nCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogaWYgdHlwZSBnaXQgPi9kZXYvbnVsbCAyPiYxIDsgdGhlbgogICA6IE9LCkBAIC0xMzksMTAgKzE1MCw5IEBACiAjIFRyeSB0byBkZXRlcm1pbmUgR0VSUklUX1NJVEUgaWYgbm90IHNldAogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIGlmIHRlc3QgLXogIiRHRVJSSVRfU0lURSIgOyB0aGVuCi0gIEdFUlJJVF9TSVRFXzE9YGRpcm5hbWUgIiQwImAKLSAgR0VSUklUX1NJVEVfMT1gZGlybmFtZSAiJEdFUlJJVF9TSVRFXzEiYAotICBpZiB0ZXN0IC1mICIke0dFUlJJVF9TSVRFXzF9LyR7R0VSUklUX0lOU1RBTExfVFJBQ0VfRklMRX0iIDsgdGhlbiAKLSAgICBHRVJSSVRfU0lURT0ke0dFUlJJVF9TSVRFXzF9IAorICBHRVJSSVRfU0lURV8xPWBkaXJuYW1lICIkMCJgLy4uCisgIGlmIHRlc3QgLWYgIiR7R0VSUklUX1NJVEVfMX0vJHtHRVJSSVRfSU5TVEFMTF9UUkFDRV9GSUxFfSIgOyB0aGVuCisgICAgR0VSUklUX1NJVEU9JHtHRVJSSVRfU0lURV8xfQogICBmaQogZmkKIApAQCAtMTUwLDEwICsxNjAsMTEgQEAKICMgTm8gR0VSUklUX1NJVEUgeWV0PyBXZSdyZSBvdXQgb2YgbHVjayEKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiBpZiB0ZXN0IC16ICIkR0VSUklUX1NJVEUiIDsgdGhlbgotICAgIGVjaG8gPiYyICIqKiBFUlJPUjogR0VSUklUX1NJVEUgbm90IHNldCIgCisgICAgZWNobyA+JjIgIioqIEVSUk9SOiBHRVJSSVRfU0lURSBub3Qgc2V0IgogICAgIGV4aXQgMQogZmkKIAorSU5JVElBTF9ESVI9YHB3ZGAKIGlmIGNkICIkR0VSUklUX1NJVEUiIDsgdGhlbgogICBHRVJSSVRfU0lURT1gcHdkYAogZWxzZQpAQCAtMjA2LDcgKzIxNyw3IEBACiAgICAgIgogICAgIGZvciBOIGluIGphdmEgamRrIGpyZSA7IGRvCiAgICAgICBmb3IgTCBpbiAkSkFWQV9MT0NBVElPTlMgOyBkbwotICAgICAgICB0ZXN0IC1kICIkTCIgfHwgY29udGludWUgCisgICAgICAgIHRlc3QgLWQgIiRMIiB8fCBjb250aW51ZQogICAgICAgICBmaW5kICRMIC1uYW1lICIkTiIgISAtdHlwZSBkIHwgZ3JlcCAtdiB0aHJlYWRzIHwgd2hpbGUgcmVhZCBKIDsgZG8KICAgICAgICAgICB0ZXN0IC14ICIkSiIgfHwgY29udGludWUKICAgICAgICAgICBWRVJTSU9OPWBldmFsICIkSiIgLXZlcnNpb24gMj4mMWAKQEAgLTI0MSw3ICsyNTIsOSBAQAogZmkKIAogaWYgdGVzdCAteiAiJEpBVkEiIDsgdGhlbgotICBlY2hvID4mMiAiQ2Fubm90IGZpbmQgYSBKUkUgb3IgSkRLLiBQbGVhc2Ugc2V0IEpBVkFfSE9NRSB0byBhID49MS42IEpSRSIKKyAgZWNobyA+JjIgIkNhbm5vdCBmaW5kIGEgSlJFIG9yIEpESy4gUGxlYXNlIHNldCBKQVZBX0hPTUUgb3IiCisgIGVjaG8gPiYyICJjb250YWluZXIuamF2YUhvbWUgaW4gJEdFUlJJVF9TSVRFL2V0Yy9nZXJyaXQuY29uZmlnIgorICBlY2hvID4mMiAidG8gYSA+PTEuNiBKUkUiCiAgIGV4aXQgMQogZmkKIApAQCAtMzQwLDcgKzM1Myw3IEBACiAgIHN0YXJ0KQogICAgIHByaW50ZiAnJXMnICJTdGFydGluZyBHZXJyaXQgQ29kZSBSZXZpZXc6ICIKIAotICAgIGlmIHRlc3QgMSA9ICIkTk9fU1RBUlQiIDsgdGhlbiAKKyAgICBpZiB0ZXN0IDEgPSAiJE5PX1NUQVJUIiA7IHRoZW4KICAgICAgIGVjaG8gIk5vdCBzdGFydGluZyBnZXJyaXQgLSBOT19TVEFSVD0xIGluIC9ldGMvZGVmYXVsdC9nZXJyaXRjb2RlcmV2aWV3IgogICAgICAgZXhpdCAwCiAgICAgZmkKQEAgLTM2NSwyMiArMzc4LDIyIEBACiAgICAgICAgICAgZWNobyA+JjIgImZhdGFsOiBzdGFydC1zdG9wLWRhZW1vbiBmYWlsZWQiCiAgICAgICAgICAgcmM9MQogICAgICAgICBmaQotICAgICAgICBleGl0ICRyYyAKKyAgICAgICAgZXhpdCAkcmMKICAgICAgIGZpCiAgICAgZWxzZQogICAgICAgaWYgdGVzdCAtZiAiJEdFUlJJVF9QSUQiIDsgdGhlbgogICAgICAgICBpZiBydW5uaW5nICIkR0VSUklUX1BJRCIgOyB0aGVuCiAgICAgICAgICAgZWNobyAiQWxyZWFkeSBSdW5uaW5nISEiCi0gICAgICAgICAgZXhpdCAxCisgICAgICAgICAgZXhpdCAwCiAgICAgICAgIGVsc2UKICAgICAgICAgICBybSAtZiAiJEdFUlJJVF9QSUQiICIkR0VSUklUX1JVTiIKICAgICAgICAgZmkKICAgICAgIGZpCiAKLSAgICAgIGlmIHRlc3QgJFVJRCA9IDAgLWEgLW4gIiRHRVJSSVRfVVNFUiIgOyB0aGVuIAorICAgICAgaWYgdGVzdCAkVUlEID0gMCAtYSAtbiAiJEdFUlJJVF9VU0VSIiA7IHRoZW4KICAgICAgICAgdG91Y2ggIiRHRVJSSVRfUElEIgogICAgICAgICBjaG93biAkR0VSUklUX1VTRVIgIiRHRVJSSVRfUElEIgotICAgICAgICBzdSAtICRHRVJSSVRfVVNFUiAtYyAiCisgICAgICAgIHN1IC0gJEdFUlJJVF9VU0VSIC1zIC9iaW4vc2ggLWMgIgogICAgICAgICAgIEpBVkE9JyRKQVZBJyA7IGV4cG9ydCBKQVZBIDsKICAgICAgICAgICAkUlVOX0VYRUMgJFJVTl9BcmcxICckUlVOX0FyZzInICRSVU5fQXJnMyAkUlVOX0FSR1MgPC9kZXYvbnVsbCA+L2Rldi9udWxsIDI+JjEgJgogICAgICAgICAgIFBJRD1cJCEgOwpAQCAtNDI2LDcgKzQzOSw3IEBACiAKICAgICBpZiB0ZXN0IDEgPSAiJFNUQVJUX1NUT1BfREFFTU9OIiAmJiB0eXBlIHN0YXJ0LXN0b3AtZGFlbW9uID4vZGV2L251bGwgMj4mMQogICAgIHRoZW4KLSAgICAgIHN0YXJ0LXN0b3AtZGFlbW9uIC1LIC1wICIkR0VSUklUX1BJRCIgLXMgSFVQIAorICAgICAgc3RhcnQtc3RvcC1kYWVtb24gLUsgLXAgIiRHRVJSSVRfUElEIiAtcyBIVVAKICAgICAgIHNsZWVwIDEKICAgICAgIGlmIHJ1bm5pbmcgIiRHRVJSSVRfUElEIiA7IHRoZW4KICAgICAgICAgc2xlZXAgMwpAQCAtNDU4LDggKzQ3MSwxMyBAQAogICAgIGlmIHRlc3QgLWYgIiRHRVJSSVRfU0giIDsgdGhlbgogICAgICAgOiBPSwogICAgIGVsc2UKLSAgICAgIGVjaG8gPiYyICIqKiBFUlJPUjogQ2Fubm90IGxvY2F0ZSBnZXJyaXQuc2giCi0gICAgICBleGl0IDEKKyAgICAgIEdFUlJJVF9TSD0iJElOSVRJQUxfRElSLyRHRVJSSVRfU0giCisgICAgICBpZiB0ZXN0IC1mICIkR0VSUklUX1NIIiA7IHRoZW4KKyAgICAgICAgOiBPSworICAgICAgZWxzZQorICAgICAgICBlY2hvID4mMiAiKiogRVJST1I6IENhbm5vdCBsb2NhdGUgZ2Vycml0LnNoIgorICAgICAgICBleGl0IDEKKyAgICAgIGZpCiAgICAgZmkKICAgICAkR0VSUklUX1NIIHN0b3AgJCoKICAgICBzbGVlcCA1CkBAIC00ODAsNyArNDk4LDcgQEAKICAgICBpZiB0ZXN0IC1mICIkR0VSUklUX1BJRCIgOyB0aGVuCiAgICAgICAgIGlmIHJ1bm5pbmcgIiRHRVJSSVRfUElEIiA7IHRoZW4KICAgICAgICAgICBlY2hvICJBbHJlYWR5IFJ1bm5pbmchISIKLSAgICAgICAgICBleGl0IDEKKyAgICAgICAgICBleGl0IDAKICAgICAgICAgZWxzZQogICAgICAgICAgIHJtIC1mICIkR0VSUklUX1BJRCIKICAgICAgICAgZmkKQEAgLTQ4OSw3ICs1MDcsNyBAQAogICAgIGV4ZWMgIiRSVU5fRVhFQyIgJFJVTl9BcmcxICIkUlVOX0FyZzIiICRSVU5fQXJnMyAkUlVOX0FSR1MgLS1jb25zb2xlLWxvZwogICA7OwogCi0gIGNoZWNrKQorICBjaGVja3xzdGF0dXMpCiAgICAgZWNobyAiQ2hlY2tpbmcgYXJndW1lbnRzIHRvIEdlcnJpdCBDb2RlIFJldmlldzoiCiAgICAgZWNobyAiICBHRVJSSVRfU0lURSAgICAgPSAgJEdFUlJJVF9TSVRFIgogICAgIGVjaG8gIiAgR0VSUklUX0NPTkZJRyAgID0gICRHRVJSSVRfQ09ORklHIgpAQCAtNTEwLDcgKzUyOCw3IEBACiAgICAgICAgICAgICBleGl0IDAKICAgICAgICAgZmkKICAgICBmaQotICAgIGV4aXQgMQorICAgIGV4aXQgMwogICA7OwogCiAgICopCmRpZmYgLS1naXQgYS9nZXJyaXQtcGdtL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vbGlicmFyaWVzLmNvbmZpZyBiL2dlcnJpdC1wZ20vc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9saWJyYXJpZXMuY29uZmlnCmluZGV4IGI5OTI2N2MuLmYxZWNhZGQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wZ20vc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9saWJyYXJpZXMuY29uZmlnCisrKyBiL2dlcnJpdC1wZ20vc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9saWJyYXJpZXMuY29uZmlnCkBAIC0xNyw4ICsxNywxMCBAQAogICBuYW1lID0gQm91bmN5IENhc3RsZSBDcnlwdG8gdjE0NAogICB1cmwgPSBodHRwOi8vd3d3LmJvdW5jeWNhc3RsZS5vcmcvZG93bmxvYWQvYmNwcm92LWpkazE2LTE0NC5qYXIKICAgc2hhMSA9IDYzMjdhNWY3YTNkYzQ1ZTBmZDczNWFkYjVkMDhjNWE3NGMwNWMyMGMKKyAgcmVtb3ZlID0gYmNwcm92LS4qWy5damFyCiAKIFtsaWJyYXJ5ICJteXNxbERyaXZlciJdCi0gIG5hbWUgPSBNeVNRTCBDb25uZWN0b3IvSiA1LjEuMTAKLSAgdXJsID0gaHR0cDovL3JlcG8yLm1hdmVuLm9yZy9tYXZlbjIvbXlzcWwvbXlzcWwtY29ubmVjdG9yLWphdmEvNS4xLjEwL215c3FsLWNvbm5lY3Rvci1qYXZhLTUuMS4xMC5qYXIKLSAgc2hhMSA9IGI4MzU3NDEyNGYxYTAwZDZmNzBkNTZiYTY0YWE1MmI4ZTE1ODhlNmQKKyAgbmFtZSA9IE15U1FMIENvbm5lY3Rvci9KIDUuMS4yMQorICB1cmwgPSBodHRwOi8vcmVwbzIubWF2ZW4ub3JnL21hdmVuMi9teXNxbC9teXNxbC1jb25uZWN0b3ItamF2YS81LjEuMjEvbXlzcWwtY29ubmVjdG9yLWphdmEtNS4xLjIxLmphcgorICBzaGExID0gN2FiYmQxOWZjMmUyZDViOTJjMDg5NWFmODUyMGY3ZmEzMDI2NmJlOQorICByZW1vdmUgPSBteXNxbC1jb25uZWN0b3ItamF2YS0uKlsuXWphcgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBnbS9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0xpYnJhcmllc1Rlc3QuamF2YSBiL2dlcnJpdC1wZ20vc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9MaWJyYXJpZXNUZXN0LmphdmEKaW5kZXggZTcyMzQ2My4uZGYxZjQ0NyAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L0xpYnJhcmllc1Rlc3QuamF2YQorKysgYi9nZXJyaXQtcGdtL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcGdtL2luaXQvTGlicmFyaWVzVGVzdC5qYXZhCkBAIC0zMCwxNiArMzAsMTQgQEAKIHB1YmxpYyBjbGFzcyBMaWJyYXJpZXNUZXN0IGV4dGVuZHMgVGVzdENhc2UgewogICBwdWJsaWMgdm9pZCB0ZXN0Q3JlYXRlKCkgdGhyb3dzIEZpbGVOb3RGb3VuZEV4Y2VwdGlvbiB7CiAgICAgZmluYWwgU2l0ZVBhdGhzIHNpdGUgPSBuZXcgU2l0ZVBhdGhzKG5ldyBGaWxlKCIuIikpOwotICAgIGZpbmFsIFJlbG9hZFNpdGVMaWJyYXJ5IHJlbG9hZCA9IGNyZWF0ZVN0cmljdE1vY2soUmVsb2FkU2l0ZUxpYnJhcnkuY2xhc3MpOwogICAgIGZpbmFsIENvbnNvbGVVSSB1aSA9IGNyZWF0ZVN0cmljdE1vY2soQ29uc29sZVVJLmNsYXNzKTsKIAogICAgIHJlcGxheSh1aSk7Ci0gICAgcmVwbGF5KHJlbG9hZCk7CiAKICAgICBMaWJyYXJpZXMgbGliID0gbmV3IExpYnJhcmllcyhuZXcgUHJvdmlkZXI8TGlicmFyeURvd25sb2FkZXI+KCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgTGlicmFyeURvd25sb2FkZXIgZ2V0KCkgewotICAgICAgICByZXR1cm4gbmV3IExpYnJhcnlEb3dubG9hZGVyKHJlbG9hZCwgdWksIHNpdGUpOworICAgICAgICByZXR1cm4gbmV3IExpYnJhcnlEb3dubG9hZGVyKHVpLCBzaXRlKTsKICAgICAgIH0KICAgICB9KTsKIApAQCAtNDcsNiArNDUsNSBAQAogICAgIGFzc2VydE5vdE51bGwobGliLm15c3FsRHJpdmVyKTsKIAogICAgIHZlcmlmeSh1aSk7Ci0gICAgdmVyaWZ5KHJlbG9hZCk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1wZ20vc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wZ20vaW5pdC9VcGdyYWRlRnJvbTJfMF94VGVzdC5qYXZhIGIvZ2Vycml0LXBnbS9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1VwZ3JhZGVGcm9tMl8wX3hUZXN0LmphdmEKaW5kZXggNDkzYTQ0MC4uODZmMDI2MCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBnbS9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1VwZ3JhZGVGcm9tMl8wX3hUZXN0LmphdmEKKysrIGIvZ2Vycml0LXBnbS9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3BnbS9pbml0L1VwZ3JhZGVGcm9tMl8wX3hUZXN0LmphdmEKQEAgLTcyLDggKzcyLDggQEAKICAgICBmaW5hbCBDb25zb2xlVUkgdWkgPSBjcmVhdGVTdHJpY3RNb2NrKENvbnNvbGVVSS5jbGFzcyk7CiAgICAgU2VjdGlvbi5GYWN0b3J5IHNlY3Rpb25zID0gbmV3IFNlY3Rpb24uRmFjdG9yeSgpIHsKICAgICAgIEBPdmVycmlkZQotICAgICAgcHVibGljIFNlY3Rpb24gZ2V0KFN0cmluZyBuYW1lKSB7Ci0gICAgICAgIHJldHVybiBuZXcgU2VjdGlvbihmbGFncywgc2l0ZSwgdWksIG5hbWUpOworICAgICAgcHVibGljIFNlY3Rpb24gZ2V0KFN0cmluZyBuYW1lLCBTdHJpbmcgc3Vic2VjdGlvbikgeworICAgICAgICByZXR1cm4gbmV3IFNlY3Rpb24oZmxhZ3MsIHNpdGUsIHVpLCBuYW1lLCBzdWJzZWN0aW9uKTsKICAgICAgIH0KICAgICB9OwogCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWFwaS9wb20ueG1sIGIvZ2Vycml0LXBsdWdpbi1hcGkvcG9tLnhtbAppbmRleCA4NGY2ZjdiLi44MWE1MDk4NCAxMDA2NDQKLS0tIGEvZ2Vycml0LXBsdWdpbi1hcGkvcG9tLnhtbAorKysgYi9nZXJyaXQtcGx1Z2luLWFwaS9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGx1Z2luLWFwaTwvYXJ0aWZhY3RJZD4KQEAgLTQ2LDYgKzQ2LDE4IEBACiAgICAgPC9kZXBlbmRlbmN5PgogCiAgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wZ208L2FydGlmYWN0SWQ+CisgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8ZXhjbHVzaW9ucz4KKyAgICAgICAgPGV4Y2x1c2lvbj4KKyAgICAgICAgICA8Z3JvdXBJZD5vcmcuZWNsaXBzZS5qZXR0eTwvZ3JvdXBJZD4KKyAgICAgICAgICA8YXJ0aWZhY3RJZD5qZXR0eS1zZXJ2bGV0PC9hcnRpZmFjdElkPgorICAgICAgICA8L2V4Y2x1c2lvbj4KKyAgICAgIDwvZXhjbHVzaW9ucz4KKyAgICA8L2RlcGVuZGVuY3k+CisKKyAgICA8ZGVwZW5kZW5jeT4KICAgICAgIDxncm91cElkPm9yZy5hcGFjaGUudG9tY2F0PC9ncm91cElkPgogICAgICAgPGFydGlmYWN0SWQ+c2VydmxldC1hcGk8L2FydGlmYWN0SWQ+CiAgICAgPC9kZXBlbmRlbmN5PgpAQCAtNjYsOCArNzgsOCBAQAogICAgICAgICAgICAgICA8ZXhjbHVkZT5jb20uZ29vZ2xlLmdlcnJpdDpnZXJyaXQtcGF0Y2gtY29tbW9uc25ldDwvZXhjbHVkZT4KICAgICAgICAgICAgICAgPGV4Y2x1ZGU+Y29tLmdvb2dsZS5nZXJyaXQ6Z2Vycml0LXBhdGNoLWpnaXQ8L2V4Y2x1ZGU+CiAgICAgICAgICAgICAgIDxleGNsdWRlPmNvbS5nb29nbGUuZ2Vycml0OmdlcnJpdC11dGlsLXNzbDwvZXhjbHVkZT4KLSAgICAgICAgICAgICAgPGV4Y2x1ZGU+Y29tLmdvb2dsZS5nZXJyaXQ6anVuaXZlcnNhbGNoYXJkZXQ8L2V4Y2x1ZGU+CiAKKyAgICAgICAgICAgICAgPGV4Y2x1ZGU+Y29tLmdvb2dsZWNvZGUuanVuaXZlcnNhbGNoYXJkZXQ6anVuaXZlcnNhbGNoYXJkZXQ8L2V4Y2x1ZGU+CiAgICAgICAgICAgICAgIDxleGNsdWRlPmNvbS5nb29nbGVjb2RlLnByb2xvZy1jYWZlOlByb2xvZ0NhZmU8L2V4Y2x1ZGU+CiAgICAgICAgICAgICAgIDxleGNsdWRlPm9yZy5zbGY0ajpzbGY0ai1sb2c0ajEyPC9leGNsdWRlPgogICAgICAgICAgICAgICA8ZXhjbHVkZT5sb2c0ajpsb2c0ajwvZXhjbHVkZT4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tYXJjaGV0eXBlL3BvbS54bWwgYi9nZXJyaXQtcGx1Z2luLWFyY2hldHlwZS9wb20ueG1sCmluZGV4IGRkMTc5NGIuLjcxZmVhYmMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wbHVnaW4tYXJjaGV0eXBlL3BvbS54bWwKKysrIGIvZ2Vycml0LXBsdWdpbi1hcmNoZXR5cGUvcG9tLnhtbApAQCAtMjEsNyArMjEsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBsdWdpbi1hcmNoZXR5cGU8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvLmdpdGlnbm9yZSBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS8uZ2l0aWdub3JlCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjcwNzVhMmYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvLmdpdGlnbm9yZQpAQCAtMCwwICsxLDQgQEAKKy90YXJnZXQKKy8uY2xhc3NwYXRoCisvLnByb2plY3QKKy8uc2V0dGluZ3MKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9wb20ueG1sIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3BvbS54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTFjZDE0MgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9wb20ueG1sCkBAIC0wLDAgKzEsNTMgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8IS0tCitDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorCitMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKK3lvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KK1lvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorCitodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKworVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKK1dJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCistLT4KKzxwcm9qZWN0IHhtbG5zPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9QT00vNC4wLjAiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiCisgIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvUE9NLzQuMC4wIGh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL21hdmVuLXY0XzBfMC54c2QiPgorICA8bW9kZWxWZXJzaW9uPjQuMC4wPC9tb2RlbFZlcnNpb24+CisKKyAgPHBhcmVudD4KKyAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgPC9wYXJlbnQ+CisKKyAgPGFydGlmYWN0SWQ+Z2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlPC9hcnRpZmFjdElkPgorICA8bmFtZT5HZXJyaXQgQ29kZSBSZXZpZXcgLSBXZWIgVWkgR1dUIFBsdWdpbiBBcmNoZXR5cGU8L25hbWU+CisKKyAgPHByb3BlcnRpZXM+CisgICAgPGRlZmF1bHRHZXJyaXRBcGlWZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvZGVmYXVsdEdlcnJpdEFwaVZlcnNpb24+CisgIDwvcHJvcGVydGllcz4KKworICA8YnVpbGQ+CisgICAgPHJlc291cmNlcz4KKyAgICAgIDxyZXNvdXJjZT4KKyAgICAgICAgPGRpcmVjdG9yeT5zcmMvbWFpbi9yZXNvdXJjZXM8L2RpcmVjdG9yeT4KKyAgICAgICAgPGZpbHRlcmluZz50cnVlPC9maWx0ZXJpbmc+CisgICAgICAgIDxpbmNsdWRlcz4KKyAgICAgICAgICA8aW5jbHVkZT5NRVRBLUlORi9tYXZlbi9hcmNoZXR5cGUtbWV0YWRhdGEueG1sPC9pbmNsdWRlPgorICAgICAgICA8L2luY2x1ZGVzPgorICAgICAgPC9yZXNvdXJjZT4KKyAgICAgIDxyZXNvdXJjZT4KKyAgICAgICAgPGRpcmVjdG9yeT5zcmMvbWFpbi9yZXNvdXJjZXM8L2RpcmVjdG9yeT4KKyAgICAgICAgPGZpbHRlcmluZz5mYWxzZTwvZmlsdGVyaW5nPgorICAgICAgICA8ZXhjbHVkZXM+CisgICAgICAgICAgPGV4Y2x1ZGU+TUVUQS1JTkYvbWF2ZW4vYXJjaGV0eXBlLW1ldGFkYXRhLnhtbDwvZXhjbHVkZT4KKyAgICAgICAgPC9leGNsdWRlcz4KKyAgICAgIDwvcmVzb3VyY2U+CisgICAgPC9yZXNvdXJjZXM+CisgIDwvYnVpbGQ+CisKKzwvcHJvamVjdD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvTUVUQS1JTkYvbWF2ZW4vYXJjaGV0eXBlLW1ldGFkYXRhLnhtbCBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvTUVUQS1JTkYvbWF2ZW4vYXJjaGV0eXBlLW1ldGFkYXRhLnhtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43OGYyOTQxCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9NRVRBLUlORi9tYXZlbi9hcmNoZXR5cGUtbWV0YWRhdGEueG1sCkBAIC0wLDAgKzEsNTYgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8IS0tCitDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorCitMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKK3lvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KK1lvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorCitodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKworVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKK1dJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCistLT4KKzxhcmNoZXR5cGUtZGVzY3JpcHRvciBuYW1lPSJHZXJyaXQgUGx1Z2luIj4KKyAgPHJlcXVpcmVkUHJvcGVydGllcz4KKyAgICA8cmVxdWlyZWRQcm9wZXJ0eSBrZXk9InBsdWdpbk5hbWUiLz4KKworICAgIDxyZXF1aXJlZFByb3BlcnR5IGtleT0iSW1wbGVtZW50YXRpb24tVmVuZG9yIi8+CisgICAgPHJlcXVpcmVkUHJvcGVydHkga2V5PSJJbXBsZW1lbnRhdGlvbi1VcmwiLz4KKyAgICA8cmVxdWlyZWRQcm9wZXJ0eSBrZXk9Ikd3dC1WZXJzaW9uIi8+CisKKyAgICA8cmVxdWlyZWRQcm9wZXJ0eSBrZXk9ImdlcnJpdEFwaVZlcnNpb24iPgorICAgICAgPGRlZmF1bHRWYWx1ZT4ke2RlZmF1bHRHZXJyaXRBcGlWZXJzaW9ufTwvZGVmYXVsdFZhbHVlPgorICAgIDwvcmVxdWlyZWRQcm9wZXJ0eT4KKyAgPC9yZXF1aXJlZFByb3BlcnRpZXM+CisKKyAgPGZpbGVTZXRzPgorICAgIDxmaWxlU2V0IGZpbHRlcmVkPSJ0cnVlIiBwYWNrYWdlZD0idHJ1ZSI+CisgICAgICA8ZGlyZWN0b3J5PnNyYy9tYWluL2phdmE8L2RpcmVjdG9yeT4KKyAgICAgIDxpbmNsdWRlcz4KKyAgICAgICAgPGluY2x1ZGU+KiovKi5jc3M8L2luY2x1ZGU+CisgICAgICAgIDxpbmNsdWRlPioqLyoucG5nPC9pbmNsdWRlPgorICAgICAgICA8aW5jbHVkZT4qKi8qLmphdmE8L2luY2x1ZGU+CisgICAgICAgIDxpbmNsdWRlPioqLyouZ3d0LnhtbDwvaW5jbHVkZT4KKyAgICAgIDwvaW5jbHVkZXM+CisgICAgPC9maWxlU2V0PgorCisgICAgPGZpbGVTZXQgZmlsdGVyZWQ9InRydWUiPgorICAgICAgPGRpcmVjdG9yeT5zcmMvbWFpbi9yZXNvdXJjZXMvRG9jdW1lbnRhdGlvbjwvZGlyZWN0b3J5PgorICAgICAgPGluY2x1ZGVzPgorICAgICAgICA8aW5jbHVkZT4qKi8qLm1kPC9pbmNsdWRlPgorICAgICAgPC9pbmNsdWRlcz4KKyAgICA8L2ZpbGVTZXQ+CisKKyAgICA8ZmlsZVNldD4KKyAgICAgIDxkaXJlY3Rvcnk+PC9kaXJlY3Rvcnk+CisgICAgICA8aW5jbHVkZXM+CisgICAgICAgIDxpbmNsdWRlPi5naXRpZ25vcmU8L2luY2x1ZGU+CisgICAgICAgIDxpbmNsdWRlPkxJQ0VOU0U8L2luY2x1ZGU+CisgICAgICA8L2luY2x1ZGVzPgorICAgIDwvZmlsZVNldD4KKyAgPC9maWxlU2V0cz4KKzwvYXJjaGV0eXBlLWRlc2NyaXB0b3I+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvLmdpdGlnbm9yZSBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy8uZ2l0aWdub3JlCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjgwZDYyNTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvLmdpdGlnbm9yZQpAQCAtMCwwICsxLDUgQEAKKy90YXJnZXQKKy8uY2xhc3NwYXRoCisvLnByb2plY3QKKy8uc2V0dGluZ3Mvb3JnLm1hdmVuLmlkZS5lY2xpcHNlLnByZWZzCisvLnNldHRpbmdzL29yZy5lY2xpcHNlLm0yZS5jb3JlLnByZWZzCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvTElDRU5TRSBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9MSUNFTlNFCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjExMDY5ZWQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvTElDRU5TRQpAQCAtMCwwICsxLDIwMSBAQAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQXBhY2hlIExpY2Vuc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIFZlcnNpb24gMi4wLCBKYW51YXJ5IDIwMDQKKyAgICAgICAgICAgICAgICAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy8KKworVEVSTVMgQU5EIENPTkRJVElPTlMgRk9SIFVTRSwgUkVQUk9EVUNUSU9OLCBBTkQgRElTVFJJQlVUSU9OCisKKzEuIERlZmluaXRpb25zLgorCisgICAiTGljZW5zZSIgc2hhbGwgbWVhbiB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgZm9yIHVzZSwgcmVwcm9kdWN0aW9uLAorICAgYW5kIGRpc3RyaWJ1dGlvbiBhcyBkZWZpbmVkIGJ5IFNlY3Rpb25zIDEgdGhyb3VnaCA5IG9mIHRoaXMgZG9jdW1lbnQuCisKKyAgICJMaWNlbnNvciIgc2hhbGwgbWVhbiB0aGUgY29weXJpZ2h0IG93bmVyIG9yIGVudGl0eSBhdXRob3JpemVkIGJ5CisgICB0aGUgY29weXJpZ2h0IG93bmVyIHRoYXQgaXMgZ3JhbnRpbmcgdGhlIExpY2Vuc2UuCisKKyAgICJMZWdhbCBFbnRpdHkiIHNoYWxsIG1lYW4gdGhlIHVuaW9uIG9mIHRoZSBhY3RpbmcgZW50aXR5IGFuZCBhbGwKKyAgIG90aGVyIGVudGl0aWVzIHRoYXQgY29udHJvbCwgYXJlIGNvbnRyb2xsZWQgYnksIG9yIGFyZSB1bmRlciBjb21tb24KKyAgIGNvbnRyb2wgd2l0aCB0aGF0IGVudGl0eS4gRm9yIHRoZSBwdXJwb3NlcyBvZiB0aGlzIGRlZmluaXRpb24sCisgICAiY29udHJvbCIgbWVhbnMgKGkpIHRoZSBwb3dlciwgZGlyZWN0IG9yIGluZGlyZWN0LCB0byBjYXVzZSB0aGUKKyAgIGRpcmVjdGlvbiBvciBtYW5hZ2VtZW50IG9mIHN1Y2ggZW50aXR5LCB3aGV0aGVyIGJ5IGNvbnRyYWN0IG9yCisgICBvdGhlcndpc2UsIG9yIChpaSkgb3duZXJzaGlwIG9mIGZpZnR5IHBlcmNlbnQgKDUwJSkgb3IgbW9yZSBvZiB0aGUKKyAgIG91dHN0YW5kaW5nIHNoYXJlcywgb3IgKGlpaSkgYmVuZWZpY2lhbCBvd25lcnNoaXAgb2Ygc3VjaCBlbnRpdHkuCisKKyAgICJZb3UiIChvciAiWW91ciIpIHNoYWxsIG1lYW4gYW4gaW5kaXZpZHVhbCBvciBMZWdhbCBFbnRpdHkKKyAgIGV4ZXJjaXNpbmcgcGVybWlzc2lvbnMgZ3JhbnRlZCBieSB0aGlzIExpY2Vuc2UuCisKKyAgICJTb3VyY2UiIGZvcm0gc2hhbGwgbWVhbiB0aGUgcHJlZmVycmVkIGZvcm0gZm9yIG1ha2luZyBtb2RpZmljYXRpb25zLAorICAgaW5jbHVkaW5nIGJ1dCBub3QgbGltaXRlZCB0byBzb2Z0d2FyZSBzb3VyY2UgY29kZSwgZG9jdW1lbnRhdGlvbgorICAgc291cmNlLCBhbmQgY29uZmlndXJhdGlvbiBmaWxlcy4KKworICAgIk9iamVjdCIgZm9ybSBzaGFsbCBtZWFuIGFueSBmb3JtIHJlc3VsdGluZyBmcm9tIG1lY2hhbmljYWwKKyAgIHRyYW5zZm9ybWF0aW9uIG9yIHRyYW5zbGF0aW9uIG9mIGEgU291cmNlIGZvcm0sIGluY2x1ZGluZyBidXQKKyAgIG5vdCBsaW1pdGVkIHRvIGNvbXBpbGVkIG9iamVjdCBjb2RlLCBnZW5lcmF0ZWQgZG9jdW1lbnRhdGlvbiwKKyAgIGFuZCBjb252ZXJzaW9ucyB0byBvdGhlciBtZWRpYSB0eXBlcy4KKworICAgIldvcmsiIHNoYWxsIG1lYW4gdGhlIHdvcmsgb2YgYXV0aG9yc2hpcCwgd2hldGhlciBpbiBTb3VyY2Ugb3IKKyAgIE9iamVjdCBmb3JtLCBtYWRlIGF2YWlsYWJsZSB1bmRlciB0aGUgTGljZW5zZSwgYXMgaW5kaWNhdGVkIGJ5IGEKKyAgIGNvcHlyaWdodCBub3RpY2UgdGhhdCBpcyBpbmNsdWRlZCBpbiBvciBhdHRhY2hlZCB0byB0aGUgd29yaworICAgKGFuIGV4YW1wbGUgaXMgcHJvdmlkZWQgaW4gdGhlIEFwcGVuZGl4IGJlbG93KS4KKworICAgIkRlcml2YXRpdmUgV29ya3MiIHNoYWxsIG1lYW4gYW55IHdvcmssIHdoZXRoZXIgaW4gU291cmNlIG9yIE9iamVjdAorICAgZm9ybSwgdGhhdCBpcyBiYXNlZCBvbiAob3IgZGVyaXZlZCBmcm9tKSB0aGUgV29yayBhbmQgZm9yIHdoaWNoIHRoZQorICAgZWRpdG9yaWFsIHJldmlzaW9ucywgYW5ub3RhdGlvbnMsIGVsYWJvcmF0aW9ucywgb3Igb3RoZXIgbW9kaWZpY2F0aW9ucworICAgcmVwcmVzZW50LCBhcyBhIHdob2xlLCBhbiBvcmlnaW5hbCB3b3JrIG9mIGF1dGhvcnNoaXAuIEZvciB0aGUgcHVycG9zZXMKKyAgIG9mIHRoaXMgTGljZW5zZSwgRGVyaXZhdGl2ZSBXb3JrcyBzaGFsbCBub3QgaW5jbHVkZSB3b3JrcyB0aGF0IHJlbWFpbgorICAgc2VwYXJhYmxlIGZyb20sIG9yIG1lcmVseSBsaW5rIChvciBiaW5kIGJ5IG5hbWUpIHRvIHRoZSBpbnRlcmZhY2VzIG9mLAorICAgdGhlIFdvcmsgYW5kIERlcml2YXRpdmUgV29ya3MgdGhlcmVvZi4KKworICAgIkNvbnRyaWJ1dGlvbiIgc2hhbGwgbWVhbiBhbnkgd29yayBvZiBhdXRob3JzaGlwLCBpbmNsdWRpbmcKKyAgIHRoZSBvcmlnaW5hbCB2ZXJzaW9uIG9mIHRoZSBXb3JrIGFuZCBhbnkgbW9kaWZpY2F0aW9ucyBvciBhZGRpdGlvbnMKKyAgIHRvIHRoYXQgV29yayBvciBEZXJpdmF0aXZlIFdvcmtzIHRoZXJlb2YsIHRoYXQgaXMgaW50ZW50aW9uYWxseQorICAgc3VibWl0dGVkIHRvIExpY2Vuc29yIGZvciBpbmNsdXNpb24gaW4gdGhlIFdvcmsgYnkgdGhlIGNvcHlyaWdodCBvd25lcgorICAgb3IgYnkgYW4gaW5kaXZpZHVhbCBvciBMZWdhbCBFbnRpdHkgYXV0aG9yaXplZCB0byBzdWJtaXQgb24gYmVoYWxmIG9mCisgICB0aGUgY29weXJpZ2h0IG93bmVyLiBGb3IgdGhlIHB1cnBvc2VzIG9mIHRoaXMgZGVmaW5pdGlvbiwgInN1Ym1pdHRlZCIKKyAgIG1lYW5zIGFueSBmb3JtIG9mIGVsZWN0cm9uaWMsIHZlcmJhbCwgb3Igd3JpdHRlbiBjb21tdW5pY2F0aW9uIHNlbnQKKyAgIHRvIHRoZSBMaWNlbnNvciBvciBpdHMgcmVwcmVzZW50YXRpdmVzLCBpbmNsdWRpbmcgYnV0IG5vdCBsaW1pdGVkIHRvCisgICBjb21tdW5pY2F0aW9uIG9uIGVsZWN0cm9uaWMgbWFpbGluZyBsaXN0cywgc291cmNlIGNvZGUgY29udHJvbCBzeXN0ZW1zLAorICAgYW5kIGlzc3VlIHRyYWNraW5nIHN5c3RlbXMgdGhhdCBhcmUgbWFuYWdlZCBieSwgb3Igb24gYmVoYWxmIG9mLCB0aGUKKyAgIExpY2Vuc29yIGZvciB0aGUgcHVycG9zZSBvZiBkaXNjdXNzaW5nIGFuZCBpbXByb3ZpbmcgdGhlIFdvcmssIGJ1dAorICAgZXhjbHVkaW5nIGNvbW11bmljYXRpb24gdGhhdCBpcyBjb25zcGljdW91c2x5IG1hcmtlZCBvciBvdGhlcndpc2UKKyAgIGRlc2lnbmF0ZWQgaW4gd3JpdGluZyBieSB0aGUgY29weXJpZ2h0IG93bmVyIGFzICJOb3QgYSBDb250cmlidXRpb24uIgorCisgICAiQ29udHJpYnV0b3IiIHNoYWxsIG1lYW4gTGljZW5zb3IgYW5kIGFueSBpbmRpdmlkdWFsIG9yIExlZ2FsIEVudGl0eQorICAgb24gYmVoYWxmIG9mIHdob20gYSBDb250cmlidXRpb24gaGFzIGJlZW4gcmVjZWl2ZWQgYnkgTGljZW5zb3IgYW5kCisgICBzdWJzZXF1ZW50bHkgaW5jb3Jwb3JhdGVkIHdpdGhpbiB0aGUgV29yay4KKworMi4gR3JhbnQgb2YgQ29weXJpZ2h0IExpY2Vuc2UuIFN1YmplY3QgdG8gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mCisgICB0aGlzIExpY2Vuc2UsIGVhY2ggQ29udHJpYnV0b3IgaGVyZWJ5IGdyYW50cyB0byBZb3UgYSBwZXJwZXR1YWwsCisgICB3b3JsZHdpZGUsIG5vbi1leGNsdXNpdmUsIG5vLWNoYXJnZSwgcm95YWx0eS1mcmVlLCBpcnJldm9jYWJsZQorICAgY29weXJpZ2h0IGxpY2Vuc2UgdG8gcmVwcm9kdWNlLCBwcmVwYXJlIERlcml2YXRpdmUgV29ya3Mgb2YsCisgICBwdWJsaWNseSBkaXNwbGF5LCBwdWJsaWNseSBwZXJmb3JtLCBzdWJsaWNlbnNlLCBhbmQgZGlzdHJpYnV0ZSB0aGUKKyAgIFdvcmsgYW5kIHN1Y2ggRGVyaXZhdGl2ZSBXb3JrcyBpbiBTb3VyY2Ugb3IgT2JqZWN0IGZvcm0uCisKKzMuIEdyYW50IG9mIFBhdGVudCBMaWNlbnNlLiBTdWJqZWN0IHRvIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZgorICAgdGhpcyBMaWNlbnNlLCBlYWNoIENvbnRyaWJ1dG9yIGhlcmVieSBncmFudHMgdG8gWW91IGEgcGVycGV0dWFsLAorICAgd29ybGR3aWRlLCBub24tZXhjbHVzaXZlLCBuby1jaGFyZ2UsIHJveWFsdHktZnJlZSwgaXJyZXZvY2FibGUKKyAgIChleGNlcHQgYXMgc3RhdGVkIGluIHRoaXMgc2VjdGlvbikgcGF0ZW50IGxpY2Vuc2UgdG8gbWFrZSwgaGF2ZSBtYWRlLAorICAgdXNlLCBvZmZlciB0byBzZWxsLCBzZWxsLCBpbXBvcnQsIGFuZCBvdGhlcndpc2UgdHJhbnNmZXIgdGhlIFdvcmssCisgICB3aGVyZSBzdWNoIGxpY2Vuc2UgYXBwbGllcyBvbmx5IHRvIHRob3NlIHBhdGVudCBjbGFpbXMgbGljZW5zYWJsZQorICAgYnkgc3VjaCBDb250cmlidXRvciB0aGF0IGFyZSBuZWNlc3NhcmlseSBpbmZyaW5nZWQgYnkgdGhlaXIKKyAgIENvbnRyaWJ1dGlvbihzKSBhbG9uZSBvciBieSBjb21iaW5hdGlvbiBvZiB0aGVpciBDb250cmlidXRpb24ocykKKyAgIHdpdGggdGhlIFdvcmsgdG8gd2hpY2ggc3VjaCBDb250cmlidXRpb24ocykgd2FzIHN1Ym1pdHRlZC4gSWYgWW91CisgICBpbnN0aXR1dGUgcGF0ZW50IGxpdGlnYXRpb24gYWdhaW5zdCBhbnkgZW50aXR5IChpbmNsdWRpbmcgYQorICAgY3Jvc3MtY2xhaW0gb3IgY291bnRlcmNsYWltIGluIGEgbGF3c3VpdCkgYWxsZWdpbmcgdGhhdCB0aGUgV29yaworICAgb3IgYSBDb250cmlidXRpb24gaW5jb3Jwb3JhdGVkIHdpdGhpbiB0aGUgV29yayBjb25zdGl0dXRlcyBkaXJlY3QKKyAgIG9yIGNvbnRyaWJ1dG9yeSBwYXRlbnQgaW5mcmluZ2VtZW50LCB0aGVuIGFueSBwYXRlbnQgbGljZW5zZXMKKyAgIGdyYW50ZWQgdG8gWW91IHVuZGVyIHRoaXMgTGljZW5zZSBmb3IgdGhhdCBXb3JrIHNoYWxsIHRlcm1pbmF0ZQorICAgYXMgb2YgdGhlIGRhdGUgc3VjaCBsaXRpZ2F0aW9uIGlzIGZpbGVkLgorCis0LiBSZWRpc3RyaWJ1dGlvbi4gWW91IG1heSByZXByb2R1Y2UgYW5kIGRpc3RyaWJ1dGUgY29waWVzIG9mIHRoZQorICAgV29yayBvciBEZXJpdmF0aXZlIFdvcmtzIHRoZXJlb2YgaW4gYW55IG1lZGl1bSwgd2l0aCBvciB3aXRob3V0CisgICBtb2RpZmljYXRpb25zLCBhbmQgaW4gU291cmNlIG9yIE9iamVjdCBmb3JtLCBwcm92aWRlZCB0aGF0IFlvdQorICAgbWVldCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6CisKKyAgIChhKSBZb3UgbXVzdCBnaXZlIGFueSBvdGhlciByZWNpcGllbnRzIG9mIHRoZSBXb3JrIG9yCisgICAgICAgRGVyaXZhdGl2ZSBXb3JrcyBhIGNvcHkgb2YgdGhpcyBMaWNlbnNlOyBhbmQKKworICAgKGIpIFlvdSBtdXN0IGNhdXNlIGFueSBtb2RpZmllZCBmaWxlcyB0byBjYXJyeSBwcm9taW5lbnQgbm90aWNlcworICAgICAgIHN0YXRpbmcgdGhhdCBZb3UgY2hhbmdlZCB0aGUgZmlsZXM7IGFuZAorCisgICAoYykgWW91IG11c3QgcmV0YWluLCBpbiB0aGUgU291cmNlIGZvcm0gb2YgYW55IERlcml2YXRpdmUgV29ya3MKKyAgICAgICB0aGF0IFlvdSBkaXN0cmlidXRlLCBhbGwgY29weXJpZ2h0LCBwYXRlbnQsIHRyYWRlbWFyaywgYW5kCisgICAgICAgYXR0cmlidXRpb24gbm90aWNlcyBmcm9tIHRoZSBTb3VyY2UgZm9ybSBvZiB0aGUgV29yaywKKyAgICAgICBleGNsdWRpbmcgdGhvc2Ugbm90aWNlcyB0aGF0IGRvIG5vdCBwZXJ0YWluIHRvIGFueSBwYXJ0IG9mCisgICAgICAgdGhlIERlcml2YXRpdmUgV29ya3M7IGFuZAorCisgICAoZCkgSWYgdGhlIFdvcmsgaW5jbHVkZXMgYSAiTk9USUNFIiB0ZXh0IGZpbGUgYXMgcGFydCBvZiBpdHMKKyAgICAgICBkaXN0cmlidXRpb24sIHRoZW4gYW55IERlcml2YXRpdmUgV29ya3MgdGhhdCBZb3UgZGlzdHJpYnV0ZSBtdXN0CisgICAgICAgaW5jbHVkZSBhIHJlYWRhYmxlIGNvcHkgb2YgdGhlIGF0dHJpYnV0aW9uIG5vdGljZXMgY29udGFpbmVkCisgICAgICAgd2l0aGluIHN1Y2ggTk9USUNFIGZpbGUsIGV4Y2x1ZGluZyB0aG9zZSBub3RpY2VzIHRoYXQgZG8gbm90CisgICAgICAgcGVydGFpbiB0byBhbnkgcGFydCBvZiB0aGUgRGVyaXZhdGl2ZSBXb3JrcywgaW4gYXQgbGVhc3Qgb25lCisgICAgICAgb2YgdGhlIGZvbGxvd2luZyBwbGFjZXM6IHdpdGhpbiBhIE5PVElDRSB0ZXh0IGZpbGUgZGlzdHJpYnV0ZWQKKyAgICAgICBhcyBwYXJ0IG9mIHRoZSBEZXJpdmF0aXZlIFdvcmtzOyB3aXRoaW4gdGhlIFNvdXJjZSBmb3JtIG9yCisgICAgICAgZG9jdW1lbnRhdGlvbiwgaWYgcHJvdmlkZWQgYWxvbmcgd2l0aCB0aGUgRGVyaXZhdGl2ZSBXb3Jrczsgb3IsCisgICAgICAgd2l0aGluIGEgZGlzcGxheSBnZW5lcmF0ZWQgYnkgdGhlIERlcml2YXRpdmUgV29ya3MsIGlmIGFuZAorICAgICAgIHdoZXJldmVyIHN1Y2ggdGhpcmQtcGFydHkgbm90aWNlcyBub3JtYWxseSBhcHBlYXIuIFRoZSBjb250ZW50cworICAgICAgIG9mIHRoZSBOT1RJQ0UgZmlsZSBhcmUgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgb25seSBhbmQKKyAgICAgICBkbyBub3QgbW9kaWZ5IHRoZSBMaWNlbnNlLiBZb3UgbWF5IGFkZCBZb3VyIG93biBhdHRyaWJ1dGlvbgorICAgICAgIG5vdGljZXMgd2l0aGluIERlcml2YXRpdmUgV29ya3MgdGhhdCBZb3UgZGlzdHJpYnV0ZSwgYWxvbmdzaWRlCisgICAgICAgb3IgYXMgYW4gYWRkZW5kdW0gdG8gdGhlIE5PVElDRSB0ZXh0IGZyb20gdGhlIFdvcmssIHByb3ZpZGVkCisgICAgICAgdGhhdCBzdWNoIGFkZGl0aW9uYWwgYXR0cmlidXRpb24gbm90aWNlcyBjYW5ub3QgYmUgY29uc3RydWVkCisgICAgICAgYXMgbW9kaWZ5aW5nIHRoZSBMaWNlbnNlLgorCisgICBZb3UgbWF5IGFkZCBZb3VyIG93biBjb3B5cmlnaHQgc3RhdGVtZW50IHRvIFlvdXIgbW9kaWZpY2F0aW9ucyBhbmQKKyAgIG1heSBwcm92aWRlIGFkZGl0aW9uYWwgb3IgZGlmZmVyZW50IGxpY2Vuc2UgdGVybXMgYW5kIGNvbmRpdGlvbnMKKyAgIGZvciB1c2UsIHJlcHJvZHVjdGlvbiwgb3IgZGlzdHJpYnV0aW9uIG9mIFlvdXIgbW9kaWZpY2F0aW9ucywgb3IKKyAgIGZvciBhbnkgc3VjaCBEZXJpdmF0aXZlIFdvcmtzIGFzIGEgd2hvbGUsIHByb3ZpZGVkIFlvdXIgdXNlLAorICAgcmVwcm9kdWN0aW9uLCBhbmQgZGlzdHJpYnV0aW9uIG9mIHRoZSBXb3JrIG90aGVyd2lzZSBjb21wbGllcyB3aXRoCisgICB0aGUgY29uZGl0aW9ucyBzdGF0ZWQgaW4gdGhpcyBMaWNlbnNlLgorCis1LiBTdWJtaXNzaW9uIG9mIENvbnRyaWJ1dGlvbnMuIFVubGVzcyBZb3UgZXhwbGljaXRseSBzdGF0ZSBvdGhlcndpc2UsCisgICBhbnkgQ29udHJpYnV0aW9uIGludGVudGlvbmFsbHkgc3VibWl0dGVkIGZvciBpbmNsdXNpb24gaW4gdGhlIFdvcmsKKyAgIGJ5IFlvdSB0byB0aGUgTGljZW5zb3Igc2hhbGwgYmUgdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mCisgICB0aGlzIExpY2Vuc2UsIHdpdGhvdXQgYW55IGFkZGl0aW9uYWwgdGVybXMgb3IgY29uZGl0aW9ucy4KKyAgIE5vdHdpdGhzdGFuZGluZyB0aGUgYWJvdmUsIG5vdGhpbmcgaGVyZWluIHNoYWxsIHN1cGVyc2VkZSBvciBtb2RpZnkKKyAgIHRoZSB0ZXJtcyBvZiBhbnkgc2VwYXJhdGUgbGljZW5zZSBhZ3JlZW1lbnQgeW91IG1heSBoYXZlIGV4ZWN1dGVkCisgICB3aXRoIExpY2Vuc29yIHJlZ2FyZGluZyBzdWNoIENvbnRyaWJ1dGlvbnMuCisKKzYuIFRyYWRlbWFya3MuIFRoaXMgTGljZW5zZSBkb2VzIG5vdCBncmFudCBwZXJtaXNzaW9uIHRvIHVzZSB0aGUgdHJhZGUKKyAgIG5hbWVzLCB0cmFkZW1hcmtzLCBzZXJ2aWNlIG1hcmtzLCBvciBwcm9kdWN0IG5hbWVzIG9mIHRoZSBMaWNlbnNvciwKKyAgIGV4Y2VwdCBhcyByZXF1aXJlZCBmb3IgcmVhc29uYWJsZSBhbmQgY3VzdG9tYXJ5IHVzZSBpbiBkZXNjcmliaW5nIHRoZQorICAgb3JpZ2luIG9mIHRoZSBXb3JrIGFuZCByZXByb2R1Y2luZyB0aGUgY29udGVudCBvZiB0aGUgTk9USUNFIGZpbGUuCisKKzcuIERpc2NsYWltZXIgb2YgV2FycmFudHkuIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvcgorICAgYWdyZWVkIHRvIGluIHdyaXRpbmcsIExpY2Vuc29yIHByb3ZpZGVzIHRoZSBXb3JrIChhbmQgZWFjaAorICAgQ29udHJpYnV0b3IgcHJvdmlkZXMgaXRzIENvbnRyaWJ1dGlvbnMpIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgICBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IKKyAgIGltcGxpZWQsIGluY2x1ZGluZywgd2l0aG91dCBsaW1pdGF0aW9uLCBhbnkgd2FycmFudGllcyBvciBjb25kaXRpb25zCisgICBvZiBUSVRMRSwgTk9OLUlORlJJTkdFTUVOVCwgTUVSQ0hBTlRBQklMSVRZLCBvciBGSVRORVNTIEZPUiBBCisgICBQQVJUSUNVTEFSIFBVUlBPU0UuIFlvdSBhcmUgc29sZWx5IHJlc3BvbnNpYmxlIGZvciBkZXRlcm1pbmluZyB0aGUKKyAgIGFwcHJvcHJpYXRlbmVzcyBvZiB1c2luZyBvciByZWRpc3RyaWJ1dGluZyB0aGUgV29yayBhbmQgYXNzdW1lIGFueQorICAgcmlza3MgYXNzb2NpYXRlZCB3aXRoIFlvdXIgZXhlcmNpc2Ugb2YgcGVybWlzc2lvbnMgdW5kZXIgdGhpcyBMaWNlbnNlLgorCis4LiBMaW1pdGF0aW9uIG9mIExpYWJpbGl0eS4gSW4gbm8gZXZlbnQgYW5kIHVuZGVyIG5vIGxlZ2FsIHRoZW9yeSwKKyAgIHdoZXRoZXIgaW4gdG9ydCAoaW5jbHVkaW5nIG5lZ2xpZ2VuY2UpLCBjb250cmFjdCwgb3Igb3RoZXJ3aXNlLAorICAgdW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IChzdWNoIGFzIGRlbGliZXJhdGUgYW5kIGdyb3NzbHkKKyAgIG5lZ2xpZ2VudCBhY3RzKSBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc2hhbGwgYW55IENvbnRyaWJ1dG9yIGJlCisgICBsaWFibGUgdG8gWW91IGZvciBkYW1hZ2VzLCBpbmNsdWRpbmcgYW55IGRpcmVjdCwgaW5kaXJlY3QsIHNwZWNpYWwsCisgICBpbmNpZGVudGFsLCBvciBjb25zZXF1ZW50aWFsIGRhbWFnZXMgb2YgYW55IGNoYXJhY3RlciBhcmlzaW5nIGFzIGEKKyAgIHJlc3VsdCBvZiB0aGlzIExpY2Vuc2Ugb3Igb3V0IG9mIHRoZSB1c2Ugb3IgaW5hYmlsaXR5IHRvIHVzZSB0aGUKKyAgIFdvcmsgKGluY2x1ZGluZyBidXQgbm90IGxpbWl0ZWQgdG8gZGFtYWdlcyBmb3IgbG9zcyBvZiBnb29kd2lsbCwKKyAgIHdvcmsgc3RvcHBhZ2UsIGNvbXB1dGVyIGZhaWx1cmUgb3IgbWFsZnVuY3Rpb24sIG9yIGFueSBhbmQgYWxsCisgICBvdGhlciBjb21tZXJjaWFsIGRhbWFnZXMgb3IgbG9zc2VzKSwgZXZlbiBpZiBzdWNoIENvbnRyaWJ1dG9yCisgICBoYXMgYmVlbiBhZHZpc2VkIG9mIHRoZSBwb3NzaWJpbGl0eSBvZiBzdWNoIGRhbWFnZXMuCisKKzkuIEFjY2VwdGluZyBXYXJyYW50eSBvciBBZGRpdGlvbmFsIExpYWJpbGl0eS4gV2hpbGUgcmVkaXN0cmlidXRpbmcKKyAgIHRoZSBXb3JrIG9yIERlcml2YXRpdmUgV29ya3MgdGhlcmVvZiwgWW91IG1heSBjaG9vc2UgdG8gb2ZmZXIsCisgICBhbmQgY2hhcmdlIGEgZmVlIGZvciwgYWNjZXB0YW5jZSBvZiBzdXBwb3J0LCB3YXJyYW50eSwgaW5kZW1uaXR5LAorICAgb3Igb3RoZXIgbGlhYmlsaXR5IG9ibGlnYXRpb25zIGFuZC9vciByaWdodHMgY29uc2lzdGVudCB3aXRoIHRoaXMKKyAgIExpY2Vuc2UuIEhvd2V2ZXIsIGluIGFjY2VwdGluZyBzdWNoIG9ibGlnYXRpb25zLCBZb3UgbWF5IGFjdCBvbmx5CisgICBvbiBZb3VyIG93biBiZWhhbGYgYW5kIG9uIFlvdXIgc29sZSByZXNwb25zaWJpbGl0eSwgbm90IG9uIGJlaGFsZgorICAgb2YgYW55IG90aGVyIENvbnRyaWJ1dG9yLCBhbmQgb25seSBpZiBZb3UgYWdyZWUgdG8gaW5kZW1uaWZ5LAorICAgZGVmZW5kLCBhbmQgaG9sZCBlYWNoIENvbnRyaWJ1dG9yIGhhcm1sZXNzIGZvciBhbnkgbGlhYmlsaXR5CisgICBpbmN1cnJlZCBieSwgb3IgY2xhaW1zIGFzc2VydGVkIGFnYWluc3QsIHN1Y2ggQ29udHJpYnV0b3IgYnkgcmVhc29uCisgICBvZiB5b3VyIGFjY2VwdGluZyBhbnkgc3VjaCB3YXJyYW50eSBvciBhZGRpdGlvbmFsIGxpYWJpbGl0eS4KKworRU5EIE9GIFRFUk1TIEFORCBDT05ESVRJT05TCisKK0FQUEVORElYOiBIb3cgdG8gYXBwbHkgdGhlIEFwYWNoZSBMaWNlbnNlIHRvIHlvdXIgd29yay4KKworICAgVG8gYXBwbHkgdGhlIEFwYWNoZSBMaWNlbnNlIHRvIHlvdXIgd29yaywgYXR0YWNoIHRoZSBmb2xsb3dpbmcKKyAgIGJvaWxlcnBsYXRlIG5vdGljZSwgd2l0aCB0aGUgZmllbGRzIGVuY2xvc2VkIGJ5IGJyYWNrZXRzICJbXSIKKyAgIHJlcGxhY2VkIHdpdGggeW91ciBvd24gaWRlbnRpZnlpbmcgaW5mb3JtYXRpb24uIChEb24ndCBpbmNsdWRlCisgICB0aGUgYnJhY2tldHMhKSAgVGhlIHRleHQgc2hvdWxkIGJlIGVuY2xvc2VkIGluIHRoZSBhcHByb3ByaWF0ZQorICAgY29tbWVudCBzeW50YXggZm9yIHRoZSBmaWxlIGZvcm1hdC4gV2UgYWxzbyByZWNvbW1lbmQgdGhhdCBhCisgICBmaWxlIG9yIGNsYXNzIG5hbWUgYW5kIGRlc2NyaXB0aW9uIG9mIHB1cnBvc2UgYmUgaW5jbHVkZWQgb24gdGhlCisgICBzYW1lICJwcmludGVkIHBhZ2UiIGFzIHRoZSBjb3B5cmlnaHQgbm90aWNlIGZvciBlYXNpZXIKKyAgIGlkZW50aWZpY2F0aW9uIHdpdGhpbiB0aGlyZC1wYXJ0eSBhcmNoaXZlcy4KKworQ29weXJpZ2h0IFt5eXl5XSBbbmFtZSBvZiBjb3B5cmlnaHQgb3duZXJdCisKK0xpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisKKyAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKworVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKK1dJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvcG9tLnhtbCBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9wb20ueG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjZlMWJhMjEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvcG9tLnhtbApAQCAtMCwwICsxLDEyOSBAQAorPCEtLQorQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKworTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Cit5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCitZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKworaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisKK1VubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKK2Rpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCitXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KK1NlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKK2xpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorLS0+Cis8cHJvamVjdCB4bWxucz0iaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvUE9NLzQuMC4wIgorICB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIgorICB4c2k6c2NoZW1hTG9jYXRpb249Imh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL1BPTS80LjAuMCBodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9tYXZlbi12NF8wXzAueHNkIj4KKyAgPG1vZGVsVmVyc2lvbj40LjAuMDwvbW9kZWxWZXJzaW9uPgorCisgIDxncm91cElkPiR7Z3JvdXBJZH08L2dyb3VwSWQ+CisgIDxhcnRpZmFjdElkPiR7YXJ0aWZhY3RJZH08L2FydGlmYWN0SWQ+CisgIDxwYWNrYWdpbmc+amFyPC9wYWNrYWdpbmc+CisgIDx2ZXJzaW9uPiR7dmVyc2lvbn08L3ZlcnNpb24+CisgIDxuYW1lPiR7cGx1Z2luTmFtZX08L25hbWU+CisKKyAgPHByb3BlcnRpZXM+CisgICAgPEdlcnJpdC1BcGlUeXBlPmV4dGVuc2lvbjwvR2Vycml0LUFwaVR5cGU+CisgICAgPEdlcnJpdC1BcGlWZXJzaW9uPiR7Z2Vycml0QXBpVmVyc2lvbn08L0dlcnJpdC1BcGlWZXJzaW9uPgorICA8L3Byb3BlcnRpZXM+CisKKyAgPGJ1aWxkPgorICAgIDxwbHVnaW5zPgorICAgICAgPHBsdWdpbj4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS5tYXZlbi5wbHVnaW5zPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi1qYXItcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICA8dmVyc2lvbj4yLjQ8L3ZlcnNpb24+CisgICAgICAgIDxjb25maWd1cmF0aW9uPgorICAgICAgICAgIDxpbmNsdWRlcz4KKyAgICAgICAgICAgIDxpbmNsdWRlPioqLyouKjwvaW5jbHVkZT4KKyAgICAgICAgICA8L2luY2x1ZGVzPgorICAgICAgICAgIDxhcmNoaXZlPgorICAgICAgICAgICAgPG1hbmlmZXN0RW50cmllcz4KKyAgICAgICAgICAgICAgPEltcGxlbWVudGF0aW9uLVZlbmRvcj4ke0ltcGxlbWVudGF0aW9uLVZlbmRvcn08L0ltcGxlbWVudGF0aW9uLVZlbmRvcj4KKyAgICAgICAgICAgICAgPEltcGxlbWVudGF0aW9uLVVSTD4ke0ltcGxlbWVudGF0aW9uLVVybH08L0ltcGxlbWVudGF0aW9uLVVSTD4KKworICAgICAgICAgICAgICA8SW1wbGVtZW50YXRpb24tVGl0bGU+JHtHZXJyaXQtQXBpVHlwZX0gJHtwcm9qZWN0LmFydGlmYWN0SWR9PC9JbXBsZW1lbnRhdGlvbi1UaXRsZT4KKyAgICAgICAgICAgICAgPEltcGxlbWVudGF0aW9uLVZlcnNpb24+JHtwcm9qZWN0LnZlcnNpb259PC9JbXBsZW1lbnRhdGlvbi1WZXJzaW9uPgorCisgICAgICAgICAgICAgIDxHZXJyaXQtQXBpVHlwZT4ke0dlcnJpdC1BcGlUeXBlfTwvR2Vycml0LUFwaVR5cGU+CisgICAgICAgICAgICAgIDxHZXJyaXQtQXBpVmVyc2lvbj4ke0dlcnJpdC1BcGlWZXJzaW9ufTwvR2Vycml0LUFwaVZlcnNpb24+CisgICAgICAgICAgICA8L21hbmlmZXN0RW50cmllcz4KKyAgICAgICAgICA8L2FyY2hpdmU+CisgICAgICAgIDwvY29uZmlndXJhdGlvbj4KKyAgICAgIDwvcGx1Z2luPgorCisgICAgICA8cGx1Z2luPgorICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+CisgICAgICAgIDxhcnRpZmFjdElkPm1hdmVuLWNvbXBpbGVyLXBsdWdpbjwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPHZlcnNpb24+Mi4zLjI8L3ZlcnNpb24+CisgICAgICAgIDxjb25maWd1cmF0aW9uPgorICAgICAgICAgIDxzb3VyY2U+MS42PC9zb3VyY2U+CisgICAgICAgICAgPHRhcmdldD4xLjY8L3RhcmdldD4KKyAgICAgICAgICA8ZW5jb2Rpbmc+VVRGLTg8L2VuY29kaW5nPgorICAgICAgICA8L2NvbmZpZ3VyYXRpb24+CisgICAgICA8L3BsdWdpbj4KKworICAgICAgPHBsdWdpbj4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLmNvZGVoYXVzLm1vam88L2dyb3VwSWQ+CisgICAgICAgIDxhcnRpZmFjdElkPmd3dC1tYXZlbi1wbHVnaW48L2FydGlmYWN0SWQ+CisgICAgICAgIDx2ZXJzaW9uPiR7R3d0LVZlcnNpb259PC92ZXJzaW9uPgorICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICA8bW9kdWxlPiR7cGFja2FnZX0uSGVsbG9QbHVnaW5zPC9tb2R1bGU+CisgICAgICAgICAgPGRpc2FibGVDbGFzc01ldGFkYXRhPnRydWU8L2Rpc2FibGVDbGFzc01ldGFkYXRhPgorICAgICAgICAgIDxkaXNhYmxlQ2FzdENoZWNraW5nPnRydWU8L2Rpc2FibGVDYXN0Q2hlY2tpbmc+CisgICAgICAgICAgPHdlYmFwcERpcmVjdG9yeT4ke3Byb2plY3QuYnVpbGQuZGlyZWN0b3J5fS9jbGFzc2VzL3N0YXRpYzwvd2ViYXBwRGlyZWN0b3J5PgorICAgICAgICA8L2NvbmZpZ3VyYXRpb24+CisgICAgICAgIDxleGVjdXRpb25zPgorICAgICAgICAgIDxleGVjdXRpb24+CisgICAgICAgICAgICA8Z29hbHM+CisgICAgICAgICAgICAgIDxnb2FsPmNvbXBpbGU8L2dvYWw+CisgICAgICAgICAgICA8L2dvYWxzPgorICAgICAgICAgIDwvZXhlY3V0aW9uPgorICAgICAgICA8L2V4ZWN1dGlvbnM+CisgICAgICA8L3BsdWdpbj4KKworICAgIDwvcGx1Z2lucz4KKyAgPC9idWlsZD4KKworICA8ZGVwZW5kZW5jaWVzPgorICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtJHtHZXJyaXQtQXBpVHlwZX0tYXBpPC9hcnRpZmFjdElkPgorICAgICAgPHZlcnNpb24+JHtHZXJyaXQtQXBpVmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGx1Z2luLWd3dHVpPC9hcnRpZmFjdElkPgorICAgICAgPHZlcnNpb24+JHtHZXJyaXQtQXBpVmVyc2lvbn08L3ZlcnNpb24+CisgICAgPC9kZXBlbmRlbmN5PgorCisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmd3dDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmd3dC11c2VyPC9hcnRpZmFjdElkPgorICAgICAgPHZlcnNpb24+JHtHd3QtVmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+anVuaXQ8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5qdW5pdDwvYXJ0aWZhY3RJZD4KKyAgICAgIDx2ZXJzaW9uPjQuOC4xPC92ZXJzaW9uPgorICAgICAgPHNjb3BlPnRlc3Q8L3Njb3BlPgorICAgIDwvZGVwZW5kZW5jeT4KKyAgPC9kZXBlbmRlbmNpZXM+CisKKyAgPHJlcG9zaXRvcmllcz4KKyAgICA8cmVwb3NpdG9yeT4KKyAgICAgIDxpZD5nZXJyaXQtYXBpLXJlcG9zaXRvcnk8L2lkPgorI2lmICgkZ2Vycml0QXBpVmVyc2lvbi5lbmRzV2l0aCgiU05BUFNIT1QiKSkKKyAgICAgIDx1cmw+aHR0cHM6Ly9nZXJyaXQtYXBpLmNvbW1vbmRhdGFzdG9yYWdlLmdvb2dsZWFwaXMuY29tL3NuYXBzaG90LzwvdXJsPgorI2Vsc2UKKyAgICAgIDx1cmw+aHR0cHM6Ly9nZXJyaXQtYXBpLmNvbW1vbmRhdGFzdG9yYWdlLmdvb2dsZWFwaXMuY29tL3JlbGVhc2UvPC91cmw+CisjZW5kCisgICAgPC9yZXBvc2l0b3J5PgorICA8L3JlcG9zaXRvcmllcz4KKzwvcHJvamVjdD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL0hlbGxvUGx1Z2lucy5nd3QueG1sIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvSGVsbG9QbHVnaW5zLmd3dC54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGM3MGZjYwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL0hlbGxvUGx1Z2lucy5nd3QueG1sCkBAIC0wLDAgKzEsMjkgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8IS0tCisgQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKworIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKworIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCisgVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorLS0+Cis8bW9kdWxlIHJlbmFtZS10bz0iaGVsbG9fZ3d0X3BsdWdpbnMiPgorICA8IS0tIEluaGVyaXQgdGhlIGNvcmUgV2ViIFRvb2xraXQgc3R1ZmYuICAgICAgICAgICAgICAgICAgICAgICAgLS0+CisgIDxpbmhlcml0cyBuYW1lPSJjb20uZ29vZ2xlLmd3dC51c2VyLlVzZXIiLz4KKyAgPCEtLSBPdGhlciBtb2R1bGUgaW5oZXJpdHMgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tPgorICA8aW5oZXJpdHMgbmFtZT0iY29tLmdvb2dsZS5nZXJyaXQuUGx1Z2luIi8+CisgIDxpbmhlcml0cyBuYW1lPSJjb20uZ29vZ2xlLmd3dC5odHRwLkhUVFAiLz4KKyAgPCEtLSBVc2luZyBHV1QgYnVpbHQtaW4gdGhlbWVzIGFkZHMgYSBudW1iZXIgb2Ygc3RhdGljICAgICAgICAgIC0tPgorICA8IS0tIHJlc291cmNlcyB0byB0aGUgcGx1Z2luLiBObyB0aGVtZSBpbmhlcml0cyBsaW5lcyB3ZXJlICAgICAgLS0+CisgIDwhLS0gYWRkZWQgaW4gb3JkZXIgdG8gbWFrZSB0aGlzIHBsdWdpbiBhcyBzaW1wbGUgYXMgcG9zc2libGUgICAtLT4KKyAgPCEtLSBTcGVjaWZ5IHRoZSBhcHAgZW50cnkgcG9pbnQgY2xhc3MuICAgICAgICAgICAgICAgICAgICAgICAgIC0tPgorICA8ZW50cnktcG9pbnQgY2xhc3M9IiR7cGFja2FnZX0uY2xpZW50LkhlbGxvUGx1Z2lucyIvPgorICA8c3R5bGVzaGVldCBzcmM9ImhlbGxvLmNzcyIvPgorPC9tb2R1bGU+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9NeUV4dGVuc2lvbi5qYXZhIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvTXlFeHRlbnNpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lYmRiYjI2Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvTXlFeHRlbnNpb24uamF2YQpAQCAtMCwwICsxLDI1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlCisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSAke3BhY2thZ2V9OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy53ZWJ1aS5Hd3RQbHVnaW47CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5MaXN0ZW47CisKK0BMaXN0ZW4KK3B1YmxpYyBjbGFzcyBNeUV4dGVuc2lvbiBleHRlbmRzIEd3dFBsdWdpbiB7CisgIHB1YmxpYyBNeUV4dGVuc2lvbigpIHsKKyAgICBzdXBlcigiaGVsbG9fZ3d0X3BsdWdpbnMiKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvY2xpZW50L0hlbGxvUGx1Z2lucy5qYXZhIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvY2xpZW50L0hlbGxvUGx1Z2lucy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU1ODRkODUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9jbGllbnQvSGVsbG9QbHVnaW5zLmphdmEKQEAgLTAsMCArMSw3MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlICR7cGFja2FnZX0uY2xpZW50OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50LlBsdWdpbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5ldmVudC5kb20uY2xpZW50LkNsaWNrRXZlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuZXZlbnQuZG9tLmNsaWVudC5DbGlja0hhbmRsZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuQnV0dG9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LnVzZXIuY2xpZW50LnVpLkRpYWxvZ0JveDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5JbWFnZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLmNsaWVudC51aS5Sb290UGFuZWw7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5jbGllbnQudWkuVmVydGljYWxQYW5lbDsKKworLyoqCisgKiBIZWxsb1dvcmxkIFBsdWdpbnMuCisgKi8KK3B1YmxpYyBjbGFzcyBIZWxsb1BsdWdpbnMgZXh0ZW5kcyBQbHVnaW4geworCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBvbk1vZHVsZUxvYWQoKSB7CisgICAgSW1hZ2UgaW1nID0gbmV3IEltYWdlKCJodHRwOi8vY29kZS5nb29nbGUuY29tL3dlYnRvb2xraXQvbG9nby0xODV4MTc1LnBuZyIpOworICAgIEJ1dHRvbiBidXR0b24gPSBuZXcgQnV0dG9uKCJDbGljayBtZSIpOworCisgICAgVmVydGljYWxQYW5lbCB2UGFuZWwgPSBuZXcgVmVydGljYWxQYW5lbCgpOworICAgIHZQYW5lbC5zZXRXaWR0aCgiMTAwJSIpOworICAgIHZQYW5lbC5zZXRIb3Jpem9udGFsQWxpZ25tZW50KFZlcnRpY2FsUGFuZWwuQUxJR05fQ0VOVEVSKTsKKyAgICB2UGFuZWwuYWRkKGltZyk7CisgICAgdlBhbmVsLmFkZChidXR0b24pOworCisgICAgUm9vdFBhbmVsLmdldCgpLmFkZCh2UGFuZWwpOworCisgICAgLy8gQ3JlYXRlIHRoZSBkaWFsb2cgYm94CisgICAgZmluYWwgRGlhbG9nQm94IGRpYWxvZ0JveCA9IG5ldyBEaWFsb2dCb3goKTsKKworICAgIC8vIFRoZSBjb250ZW50IG9mIHRoZSBkaWFsb2cgY29tZXMgZnJvbSBhIFVzZXIgc3BlY2lmaWVkIFByZWZlcmVuY2UKKyAgICBkaWFsb2dCb3guc2V0VGV4dCgiSGVsbG8gZnJvbSBHV1QgR2Vycml0IFVJIHBsdWdpbiIpOworICAgIGRpYWxvZ0JveC5zZXRBbmltYXRpb25FbmFibGVkKHRydWUpOworICAgIEJ1dHRvbiBjbG9zZUJ1dHRvbiA9IG5ldyBCdXR0b24oIkNsb3NlIik7CisgICAgVmVydGljYWxQYW5lbCBkaWFsb2dWUGFuZWwgPSBuZXcgVmVydGljYWxQYW5lbCgpOworICAgIGRpYWxvZ1ZQYW5lbC5zZXRXaWR0aCgiMTAwJSIpOworICAgIGRpYWxvZ1ZQYW5lbC5zZXRIb3Jpem9udGFsQWxpZ25tZW50KFZlcnRpY2FsUGFuZWwuQUxJR05fQ0VOVEVSKTsKKyAgICBkaWFsb2dWUGFuZWwuYWRkKGNsb3NlQnV0dG9uKTsKKworICAgIGNsb3NlQnV0dG9uLmFkZENsaWNrSGFuZGxlcihuZXcgQ2xpY2tIYW5kbGVyKCkgeworICAgICAgcHVibGljIHZvaWQgb25DbGljayhDbGlja0V2ZW50IGV2ZW50KSB7CisgICAgICAgIGRpYWxvZ0JveC5oaWRlKCk7CisgICAgICB9CisgICAgfSk7CisKKyAgICAvLyBTZXQgdGhlIGNvbnRlbnRzIG9mIHRoZSBXaWRnZXQKKyAgICBkaWFsb2dCb3guc2V0V2lkZ2V0KGRpYWxvZ1ZQYW5lbCk7CisKKyAgICBidXR0b24uYWRkQ2xpY2tIYW5kbGVyKG5ldyBDbGlja0hhbmRsZXIoKSB7CisgICAgICBwdWJsaWMgdm9pZCBvbkNsaWNrKENsaWNrRXZlbnQgZXZlbnQpIHsKKyAgICAgICAgZGlhbG9nQm94LmNlbnRlcigpOworICAgICAgICBkaWFsb2dCb3guc2hvdygpOworICAgICAgfQorICAgIH0pOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9wdWJsaWMvZ3d0LWhlbGxvLWdhZGdldHMtaWdvb2dsZS10aHVtYi5wbmcgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9wdWJsaWMvZ3d0LWhlbGxvLWdhZGdldHMtaWdvb2dsZS10aHVtYi5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTk3MDc3NAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL3B1YmxpYy9nd3QtaGVsbG8tZ2FkZ2V0cy1pZ29vZ2xlLXRodW1iLnBuZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9wdWJsaWMvZ3d0LWhlbGxvLWdhZGdldHMtaWdvb2dsZS5wbmcgYi9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9wdWJsaWMvZ3d0LWhlbGxvLWdhZGdldHMtaWdvb2dsZS5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzA0MTE0OQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL3B1YmxpYy9nd3QtaGVsbG8tZ2FkZ2V0cy1pZ29vZ2xlLnBuZwpCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dC1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9wdWJsaWMvaGVsbG8uY3NzIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvcHVibGljL2hlbGxvLmNzcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hODgwNTlkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3QtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvcHVibGljL2hlbGxvLmNzcwpAQCAtMCwwICsxLDEwMyBAQAorLyoqCisgKiBUaGUgZmlsZSBjb250YWlucyBzdHlsZXMgZm9yIGEgc2FtcGxlIHBsdWdpbiBkZXJpdmVkIGZyb20gdGhlCisgKiBHV1Qgc3RhbmRhcmQgdGhlbWUuCisgKiBJbWFnZXMgaW4gdGhlIHN0eWxlc2hlZXQgaGF2ZSBiZWVuIHJlbW92ZWQsIGFzIHdlbGwgYXMgc3R5bGVzIGZvciB3aWRnZXRzCisgKiBub3QgY3VycmVudGx5IGluIHVzZS4KKyAqLworCitib2R5LCB0YWJsZSB0ZCwgc2VsZWN0IHsKKyAgZm9udC1mYW1pbHk6IEFyaWFsIFVuaWNvZGUgTVMsIEFyaWFsLCBzYW5zLXNlcmlmOworICBmb250LXNpemU6IHNtYWxsOworfQorcHJlIHsKKyAgZm9udC1mYW1pbHk6ICJjb3VyaWVyIG5ldyIsIGNvdXJpZXI7CisgIGZvbnQtc2l6ZTogc21hbGw7Cit9Citib2R5IHsKKyAgY29sb3I6IGJsYWNrOworICBtYXJnaW46IDBweDsKKyAgYm9yZGVyOiAwcHg7CisgIHBhZGRpbmc6IDBweDsKKyAgYmFja2dyb3VuZDogI2ZmZjsKKyAgZGlyZWN0aW9uOiBsdHI7Cit9CithLCBhOnZpc2l0ZWQsIGE6aG92ZXIgeworICBjb2xvcjogIzAwMDBBQTsKK30KKworLyoqCisgKiBUaGUgcmVmZXJlbmNlIHRoZW1lIGNhbiBiZSB1c2VkIHRvIGRldGVybWluZSB3aGVuIHRoaXMgc3R5bGUgc2hlZXQgaGFzCisgKiBsb2FkZWQuICBDcmVhdGUgYSBoaWRkZW4gZGl2IGVsZW1lbnQgd2l0aCBhYnNvbHV0ZSBwb3NpdGlvbiwgYXNzaWduIHRoZSBzdHlsZQorICogbmFtZSBiZWxvdywgYW5kIGF0dGFjaCBpdCB0byB0aGUgRE9NLiAgVXNlIGEgdGltZXIgdG8gZGV0ZWN0IHdoZW4gdGhlCisgKiBlbGVtZW50J3MgaGVpZ2h0IGFuZCB3aWR0aCBhcmUgc2V0IHRvIDVweC4KKyAqLworLmd3dC1SZWZlcmVuY2Utc3RhbmRhcmQgeworICBoZWlnaHQ6IDVweDsKKyAgd2lkdGg6IDVweDsKKyAgem9vbTogMTsKK30KKworLmd3dC1CdXR0b24geworICBtYXJnaW46IDA7CisgIHBhZGRpbmc6IDNweCA1cHg7CisgIHRleHQtZGVjb3JhdGlvbjogbm9uZTsKKyAgZm9udC1zaXplOiBzbWFsbDsKKyAgY3Vyc29yOiBwb2ludGVyOworICBjdXJzb3I6IGhhbmQ7CisgIGJvcmRlcjogMXB4IG91dHNldCAjY2NjOworfQorLmd3dC1CdXR0b246YWN0aXZlIHsKKyAgYm9yZGVyOiAxcHggaW5zZXQgI2NjYzsKK30KKy5nd3QtQnV0dG9uOmhvdmVyIHsKKyAgYm9yZGVyLWNvbG9yOiAjOWNmICM2OWUgIzY5ZSAjN2FmOworfQorLmd3dC1CdXR0b25bZGlzYWJsZWRdIHsKKyAgY3Vyc29yOiBkZWZhdWx0OworICBjb2xvcjogIzg4ODsKK30KKy5nd3QtQnV0dG9uW2Rpc2FibGVkXTpob3ZlciB7CisgIGJvcmRlcjogMXB4IG91dHNldCAjY2NjOworfQorCisuZ3d0LURpYWxvZ0JveCAuQ2FwdGlvbiB7CisgIGJhY2tncm91bmQ6ICNlM2U4ZjM7CisgIHBhZGRpbmc6IDRweCA0cHggNHB4IDhweDsKKyAgY3Vyc29yOiBkZWZhdWx0OworICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2JiYmJiYjsKKyAgYm9yZGVyLXRvcDogNXB4IHNvbGlkICNkMGU0ZjY7CisgIGJvcmRlci1sZWZ0OiA1cHggc29saWQgI2QwZTRmNjsKKyAgYm9yZGVyLXJpZ2h0OiA1cHggc29saWQgI2QwZTRmNjsKK30KKworLmd3dC1EaWFsb2dCb3ggLmRpYWxvZ0NvbnRlbnQgeworfQorCisuZ3d0LURpYWxvZ0JveCAuZGlhbG9nTWlkZGxlQ2VudGVyIHsKKyAgcGFkZGluZzogM3B4OworICBiYWNrZ3JvdW5kOiB3aGl0ZTsKKyAgYm9yZGVyLWxlZnQ6IDVweCBzb2xpZCAjZDBlNGY2OworICBib3JkZXItcmlnaHQ6IDVweCBzb2xpZCAjZDBlNGY2OworICBib3JkZXItYm90dG9tOiA1cHggc29saWQgI2QwZTRmNjsKK30KKworLmd3dC1EaWFsb2dCb3ggLmRpYWxvZ1RvcExlZnRJbm5lciB7CisgIHdpZHRoOiA1cHg7CisgIHpvb206IDE7Cit9CisuZ3d0LURpYWxvZ0JveCAuZGlhbG9nVG9wUmlnaHRJbm5lciB7CisgIHdpZHRoOiA4cHg7CisgIHpvb206IDE7Cit9CisuZ3d0LURpYWxvZ0JveCAuZGlhbG9nQm90dG9tTGVmdElubmVyIHsKKyAgd2lkdGg6IDVweDsKKyAgaGVpZ2h0OiA4cHg7CisgIHpvb206IDE7Cit9CisKKy5nd3QtRGlhbG9nQm94IC5kaWFsb2dCb3R0b21SaWdodElubmVyIHsKKyAgd2lkdGg6IDVweDsKKyAgaGVpZ2h0OiA4cHg7CisgIHpvb206IDE7Cit9CisKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLmdpdGlnbm9yZSBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLmdpdGlnbm9yZQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yZGNmMWVkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS8uZ2l0aWdub3JlCkBAIC0wLDAgKzEsNiBAQAorL3RhcmdldAorLy5jbGFzc3BhdGgKKy8ucHJvamVjdAorLy5zZXR0aW5ncy9vcmcubWF2ZW4uaWRlLmVjbGlwc2UucHJlZnMKKy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UubTJlLmNvcmUucHJlZnMKKy9nZXJyaXQtZ3d0dWktcGx1Z2luLmltbApkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1nd3R1aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMucHJlZnMgYi9nZXJyaXQtcGx1Z2luLWd3dHVpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5jb3JlLnJlc291cmNlcy5wcmVmcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MzlkNjQ3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuY29yZS5yZXNvdXJjZXMucHJlZnMKQEAgLTAsMCArMSw1IEBACitlY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQorZW5jb2RpbmcvL3NyYy9tYWluL2phdmE9VVRGLTgKK2VuY29kaW5nLy9zcmMvbWFpbi9yZXNvdXJjZXM9VVRGLTgKK2VuY29kaW5nLy9zcmMvdGVzdC9qYXZhPVVURi04CitlbmNvZGluZy88cHJvamVjdD49VVRGLTgKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTU1ZTIwOAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCkBAIC0wLDAgKzEsMjk1IEBACitlY2xpcHNlLnByZWZlcmVuY2VzLnZlcnNpb249MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmFyZ3VtZW50UHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuYXJndW1lbnRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5maWVsZFByZWZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLmZpZWxkU3VmZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUubG9jYWxQcmVmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5sb2NhbFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29kZUNvbXBsZXRlLnN0YXRpY0ZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmllbGRTdWZmaXhlcz0KK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvZGVDb21wbGV0ZS5zdGF0aWNGaW5hbEZpZWxkUHJlZml4ZXM9CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb2RlQ29tcGxldGUuc3RhdGljRmluYWxGaWVsZFN1ZmZpeGVzPQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuY29kZWdlbi50YXJnZXRQbGF0Zm9ybT0xLjYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmNvbXBsaWFuY2U9MS42CitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT13YXJuaW5nCitvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5zb3VyY2U9MS42CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25fdHlwZV9tZW1iZXJzX29uX2NvbHVtbnM9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2FyZ3VtZW50c19pbl9hbGxvY2F0aW9uX2V4cHJlc3Npb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2FyZ3VtZW50c19pbl9hbm5vdGF0aW9uPTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2FyZ3VtZW50c19pbl9lbnVtX2NvbnN0YW50PTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9hcmd1bWVudHNfaW5fZXhwbGljaXRfY29uc3RydWN0b3JfY2FsbD0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfYXJndW1lbnRzX2luX21ldGhvZF9pbnZvY2F0aW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9hcmd1bWVudHNfaW5fcXVhbGlmaWVkX2FsbG9jYXRpb25fZXhwcmVzc2lvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfYXNzaWdubWVudD0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfYmluYXJ5X2V4cHJlc3Npb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2NvbXBhY3RfaWY9MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2NvbmRpdGlvbmFsX2V4cHJlc3Npb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX2VudW1fY29uc3RhbnRzPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9leHByZXNzaW9uc19pbl9hcnJheV9pbml0aWFsaXplcj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfbWV0aG9kX2RlY2xhcmF0aW9uPTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX211bHRpcGxlX2ZpZWxkcz0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfcGFyYW1ldGVyc19pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfcGFyYW1ldGVyc19pbl9tZXRob2RfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3Jlc291cmNlc19pbl90cnk9ODAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3NlbGVjdG9yX2luX21ldGhvZF9pbnZvY2F0aW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9zdXBlcmNsYXNzX2luX3R5cGVfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3N1cGVyaW50ZXJmYWNlc19pbl9lbnVtX2RlY2xhcmF0aW9uPTE2CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYWxpZ25tZW50X2Zvcl9zdXBlcmludGVyZmFjZXNfaW5fdHlwZV9kZWNsYXJhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfdGhyb3dzX2NsYXVzZV9pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmFsaWdubWVudF9mb3JfdGhyb3dzX2NsYXVzZV9pbl9tZXRob2RfZGVjbGFyYXRpb249MTYKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5hbGlnbm1lbnRfZm9yX3VuaW9uX3R5cGVfaW5fbXVsdGljYXRjaD0xNgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2FmdGVyX2ltcG9ydHM9MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2FmdGVyX3BhY2thZ2U9MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2JlZm9yZV9maWVsZD0wCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYmxhbmtfbGluZXNfYmVmb3JlX2ZpcnN0X2NsYXNzX2JvZHlfZGVjbGFyYXRpb249MAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2JlZm9yZV9pbXBvcnRzPTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZWZvcmVfbWVtYmVyX3R5cGU9MAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2JlZm9yZV9tZXRob2Q9MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2JlZm9yZV9uZXdfY2h1bms9MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2JlZm9yZV9wYWNrYWdlPTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5ibGFua19saW5lc19iZXR3ZWVuX2ltcG9ydF9ncm91cHM9MQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJsYW5rX2xpbmVzX2JldHdlZW5fdHlwZV9kZWNsYXJhdGlvbnM9Mgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJyYWNlX3Bvc2l0aW9uX2Zvcl9hbm5vdGF0aW9uX3R5cGVfZGVjbGFyYXRpb249ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfYW5vbnltb3VzX3R5cGVfZGVjbGFyYXRpb249ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfYXJyYXlfaW5pdGlhbGl6ZXI9ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfYmxvY2s9ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfYmxvY2tfaW5fY2FzZT1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJyYWNlX3Bvc2l0aW9uX2Zvcl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJyYWNlX3Bvc2l0aW9uX2Zvcl9lbnVtX2NvbnN0YW50PWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX2VudW1fZGVjbGFyYXRpb249ZW5kX29mX2xpbmUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5icmFjZV9wb3NpdGlvbl9mb3JfbWV0aG9kX2RlY2xhcmF0aW9uPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuYnJhY2VfcG9zaXRpb25fZm9yX3N3aXRjaD1lbmRfb2ZfbGluZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmJyYWNlX3Bvc2l0aW9uX2Zvcl90eXBlX2RlY2xhcmF0aW9uPWVuZF9vZl9saW5lCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5jbGVhcl9ibGFua19saW5lc19pbl9ibG9ja19jb21tZW50PWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5jbGVhcl9ibGFua19saW5lc19pbl9qYXZhZG9jX2NvbW1lbnQ9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50LmZvcm1hdF9ibG9ja19jb21tZW50cz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5mb3JtYXRfaGVhZGVyPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50LmZvcm1hdF9odG1sPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50LmZvcm1hdF9qYXZhZG9jX2NvbW1lbnRzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50LmZvcm1hdF9saW5lX2NvbW1lbnRzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50LmZvcm1hdF9zb3VyY2VfY29kZT10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5pbmRlbnRfcGFyYW1ldGVyX2Rlc2NyaXB0aW9uPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tbWVudC5pbmRlbnRfcm9vdF90YWdzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50Lmluc2VydF9uZXdfbGluZV9iZWZvcmVfcm9vdF90YWdzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQuaW5zZXJ0X25ld19saW5lX2Zvcl9wYXJhbWV0ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQubGluZV9sZW5ndGg9ODAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50Lm5ld19saW5lc19hdF9ibG9ja19ib3VuZGFyaWVzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb21tZW50Lm5ld19saW5lc19hdF9qYXZhZG9jX2JvdW5kYXJpZXM9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbW1lbnQucHJlc2VydmVfd2hpdGVfc3BhY2VfYmV0d2Vlbl9jb2RlX2FuZF9saW5lX2NvbW1lbnRzPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuY29tcGFjdF9lbHNlX2lmPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5jb250aW51YXRpb25faW5kZW50YXRpb249Mgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmNvbnRpbnVhdGlvbl9pbmRlbnRhdGlvbl9mb3JfYXJyYXlfaW5pdGlhbGl6ZXI9Mgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmRpc2FibGluZ190YWc9QGZvcm1hdHRlclw6b2ZmCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuZW5hYmxpbmdfdGFnPUBmb3JtYXR0ZXJcOm9uCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuZm9ybWF0X2d1YXJkaWFuX2NsYXVzZV9vbl9vbmVfbGluZT1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmZvcm1hdF9saW5lX2NvbW1lbnRfc3RhcnRpbmdfb25fZmlyc3RfY29sdW1uPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfYm9keV9kZWNsYXJhdGlvbnNfY29tcGFyZV90b19hbm5vdGF0aW9uX2RlY2xhcmF0aW9uX2hlYWRlcj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X2JvZHlfZGVjbGFyYXRpb25zX2NvbXBhcmVfdG9fZW51bV9jb25zdGFudF9oZWFkZXI9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluZGVudF9ib2R5X2RlY2xhcmF0aW9uc19jb21wYXJlX3RvX2VudW1fZGVjbGFyYXRpb25faGVhZGVyPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfYm9keV9kZWNsYXJhdGlvbnNfY29tcGFyZV90b190eXBlX2hlYWRlcj10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5kZW50X2JyZWFrc19jb21wYXJlX3RvX2Nhc2VzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfZW1wdHlfbGluZXM9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfc3RhdGVtZW50c19jb21wYXJlX3RvX2Jsb2NrPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRfc3RhdGVtZW50c19jb21wYXJlX3RvX2JvZHk9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluZGVudF9zd2l0Y2hzdGF0ZW1lbnRzX2NvbXBhcmVfdG9fY2FzZXM9dHJ1ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluZGVudF9zd2l0Y2hzdGF0ZW1lbnRzX2NvbXBhcmVfdG9fc3dpdGNoPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbmRlbnRhdGlvbi5zaXplPTQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfYW5ub3RhdGlvbl9vbl9maWVsZD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfYW5ub3RhdGlvbl9vbl9sb2NhbF92YXJpYWJsZT1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfYW5ub3RhdGlvbl9vbl9tZXRob2Q9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2FmdGVyX2Fubm90YXRpb25fb25fcGFja2FnZT1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfYW5ub3RhdGlvbl9vbl9wYXJhbWV0ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9hZnRlcl9hbm5vdGF0aW9uX29uX3R5cGU9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2FmdGVyX2xhYmVsPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYWZ0ZXJfb3BlbmluZ19icmFjZV9pbl9hcnJheV9pbml0aWFsaXplcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2F0X2VuZF9vZl9maWxlX2lmX21pc3Npbmc9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2JlZm9yZV9jYXRjaF9pbl90cnlfc3RhdGVtZW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYmVmb3JlX2Nsb3NpbmdfYnJhY2VfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9iZWZvcmVfZWxzZV9pbl9pZl9zdGF0ZW1lbnQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9iZWZvcmVfZmluYWxseV9pbl90cnlfc3RhdGVtZW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfYmVmb3JlX3doaWxlX2luX2RvX3N0YXRlbWVudD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2luX2VtcHR5X2Fubm90YXRpb25fZGVjbGFyYXRpb249aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2luX2VtcHR5X2Fub255bW91c190eXBlX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfaW5fZW1wdHlfYmxvY2s9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X25ld19saW5lX2luX2VtcHR5X2VudW1fY29uc3RhbnQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9pbl9lbXB0eV9lbnVtX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9uZXdfbGluZV9pbl9lbXB0eV9tZXRob2RfYm9keT1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfbmV3X2xpbmVfaW5fZW1wdHlfdHlwZV9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfYW5kX2luX3R5cGVfcGFyYW1ldGVyPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9hc3NpZ25tZW50X29wZXJhdG9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9hdF9pbl9hbm5vdGF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfYXRfaW5fYW5ub3RhdGlvbl90eXBlX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfYmluYXJ5X29wZXJhdG9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jbG9zaW5nX2FuZ2xlX2JyYWNrZXRfaW5fdHlwZV9hcmd1bWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2Nsb3NpbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX3BhcmFtZXRlcnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2Nsb3NpbmdfYnJhY2VfaW5fYmxvY2s9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2Nsb3NpbmdfcGFyZW5faW5fY2FzdD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29sb25faW5fYXNzZXJ0PWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb2xvbl9pbl9jYXNlPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb2xvbl9pbl9jb25kaXRpb25hbD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29sb25faW5fZm9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb2xvbl9pbl9sYWJlbGVkX3N0YXRlbWVudD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fYWxsb2NhdGlvbl9leHByZXNzaW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9hbm5vdGF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9hcnJheV9pbml0aWFsaXplcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb25fcGFyYW1ldGVycz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb25fdGhyb3dzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9lbnVtX2NvbnN0YW50X2FyZ3VtZW50cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fZW51bV9kZWNsYXJhdGlvbnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2V4cGxpY2l0Y29uc3RydWN0b3JjYWxsX2FyZ3VtZW50cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fZm9yX2luY3JlbWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX2Zvcl9pbml0cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fbWV0aG9kX2RlY2xhcmF0aW9uX3BhcmFtZXRlcnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX21ldGhvZF9kZWNsYXJhdGlvbl90aHJvd3M9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX21ldGhvZF9pbnZvY2F0aW9uX2FyZ3VtZW50cz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fbXVsdGlwbGVfZmllbGRfZGVjbGFyYXRpb25zPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9jb21tYV9pbl9tdWx0aXBsZV9sb2NhbF9kZWNsYXJhdGlvbnM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX3BhcmFtZXRlcml6ZWRfdHlwZV9yZWZlcmVuY2U9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX3N1cGVyaW50ZXJmYWNlcz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfY29tbWFfaW5fdHlwZV9hcmd1bWVudHM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX2NvbW1hX2luX3R5cGVfcGFyYW1ldGVycz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfZWxsaXBzaXM9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfYW5nbGVfYnJhY2tldF9pbl9wYXJhbWV0ZXJpemVkX3R5cGVfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19hbmdsZV9icmFja2V0X2luX3R5cGVfYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19hbmdsZV9icmFja2V0X2luX3R5cGVfcGFyYW1ldGVycz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfYnJhY2VfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX2JyYWNrZXRfaW5fYXJyYXlfYWxsb2NhdGlvbl9leHByZXNzaW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19icmFja2V0X2luX2FycmF5X3JlZmVyZW5jZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fYW5ub3RhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fY2FzdD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fY2F0Y2g9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9lbnVtX2NvbnN0YW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9mb3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX2lmPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9tZXRob2RfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX21ldGhvZF9pbnZvY2F0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl9wYXJlbnRoZXNpemVkX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX3N3aXRjaD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX29wZW5pbmdfcGFyZW5faW5fc3luY2hyb25pemVkPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfb3BlbmluZ19wYXJlbl9pbl90cnk9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9vcGVuaW5nX3BhcmVuX2luX3doaWxlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYWZ0ZXJfcG9zdGZpeF9vcGVyYXRvcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX3ByZWZpeF9vcGVyYXRvcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX3F1ZXN0aW9uX2luX2NvbmRpdGlvbmFsPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl9xdWVzdGlvbl9pbl93aWxkY2FyZD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX3NlbWljb2xvbl9pbl9mb3I9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2FmdGVyX3NlbWljb2xvbl9pbl90cnlfcmVzb3VyY2VzPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9hZnRlcl91bmFyeV9vcGVyYXRvcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9hbmRfaW5fdHlwZV9wYXJhbWV0ZXI9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9hc3NpZ25tZW50X29wZXJhdG9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfYXRfaW5fYW5ub3RhdGlvbl90eXBlX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfYmluYXJ5X29wZXJhdG9yPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19hbmdsZV9icmFja2V0X2luX3BhcmFtZXRlcml6ZWRfdHlwZV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19hbmdsZV9icmFja2V0X2luX3R5cGVfYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19icmFjZV9pbl9hcnJheV9pbml0aWFsaXplcj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX2JyYWNrZXRfaW5fYXJyYXlfYWxsb2NhdGlvbl9leHByZXNzaW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfYnJhY2tldF9pbl9hcnJheV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9hbm5vdGF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fY2FzdD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX2NhdGNoPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9lbnVtX2NvbnN0YW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5fZm9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2Nsb3NpbmdfcGFyZW5faW5faWY9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9tZXRob2RfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY2xvc2luZ19wYXJlbl9pbl9tZXRob2RfaW52b2NhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3BhcmVudGhlc2l6ZWRfZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3N3aXRjaD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3N5bmNocm9uaXplZD1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3RyeT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jbG9zaW5nX3BhcmVuX2luX3doaWxlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2Fzc2VydD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2Nhc2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29sb25faW5fY29uZGl0aW9uYWw9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb2xvbl9pbl9kZWZhdWx0PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2Zvcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbG9uX2luX2xhYmVsZWRfc3RhdGVtZW50PWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2FsbG9jYXRpb25fZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9hbm5vdGF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2FycmF5X2luaXRpYWxpemVyPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fY29uc3RydWN0b3JfZGVjbGFyYXRpb25fdGhyb3dzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2VudW1fY29uc3RhbnRfYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2VudW1fZGVjbGFyYXRpb25zPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX2V4cGxpY2l0Y29uc3RydWN0b3JjYWxsX2FyZ3VtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9mb3JfaW5jcmVtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9mb3JfaW5pdHM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fbWV0aG9kX2RlY2xhcmF0aW9uX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fbWV0aG9kX2RlY2xhcmF0aW9uX3Rocm93cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9tZXRob2RfaW52b2NhdGlvbl9hcmd1bWVudHM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfY29tbWFfaW5fbXVsdGlwbGVfZmllbGRfZGVjbGFyYXRpb25zPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX211bHRpcGxlX2xvY2FsX2RlY2xhcmF0aW9ucz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl9wYXJhbWV0ZXJpemVkX3R5cGVfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX2NvbW1hX2luX3N1cGVyaW50ZXJmYWNlcz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl90eXBlX2FyZ3VtZW50cz1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9jb21tYV9pbl90eXBlX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfZWxsaXBzaXM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19hbmdsZV9icmFja2V0X2luX3BhcmFtZXRlcml6ZWRfdHlwZV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19hbmdsZV9icmFja2V0X2luX3R5cGVfYXJndW1lbnRzPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYW5nbGVfYnJhY2tldF9pbl90eXBlX3BhcmFtZXRlcnM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9hbm5vdGF0aW9uX3R5cGVfZGVjbGFyYXRpb249aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNlX2luX2Fub255bW91c190eXBlX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9hcnJheV9pbml0aWFsaXplcj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fYmxvY2s9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNlX2luX2NvbnN0cnVjdG9yX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9lbnVtX2NvbnN0YW50PWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9lbnVtX2RlY2xhcmF0aW9uPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFjZV9pbl9tZXRob2RfZGVjbGFyYXRpb249aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNlX2luX3N3aXRjaD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2VfaW5fdHlwZV9kZWNsYXJhdGlvbj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfYnJhY2tldF9pbl9hcnJheV9hbGxvY2F0aW9uX2V4cHJlc3Npb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19icmFja2V0X2luX2FycmF5X3JlZmVyZW5jZT1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX2JyYWNrZXRfaW5fYXJyYXlfdHlwZV9yZWZlcmVuY2U9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9hbm5vdGF0aW9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fYW5ub3RhdGlvbl90eXBlX21lbWJlcl9kZWNsYXJhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX2NhdGNoPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX2VudW1fY29uc3RhbnQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9mb3I9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX2lmPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9tZXRob2RfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl9tZXRob2RfaW52b2NhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX3BhcmVudGhlc2l6ZWRfZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX3N3aXRjaD1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX29wZW5pbmdfcGFyZW5faW5fc3luY2hyb25pemVkPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfb3BlbmluZ19wYXJlbl9pbl90cnk9aW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JlZm9yZV9vcGVuaW5nX3BhcmVuX2luX3doaWxlPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfcGFyZW50aGVzaXplZF9leHByZXNzaW9uX2luX3JldHVybj1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3BhcmVudGhlc2l6ZWRfZXhwcmVzc2lvbl9pbl90aHJvdz1pbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3Bvc3RmaXhfb3BlcmF0b3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfcHJlZml4X29wZXJhdG9yPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3F1ZXN0aW9uX2luX2NvbmRpdGlvbmFsPWluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfcXVlc3Rpb25faW5fd2lsZGNhcmQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfc2VtaWNvbG9uPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmVmb3JlX3NlbWljb2xvbl9pbl9mb3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfc2VtaWNvbG9uX2luX3RyeV9yZXNvdXJjZXM9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZWZvcmVfdW5hcnlfb3BlcmF0b3I9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2JyYWNrZXRzX2luX2FycmF5X3R5cGVfcmVmZXJlbmNlPWRvIG5vdCBpbnNlcnQKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5pbnNlcnRfc3BhY2VfYmV0d2Vlbl9lbXB0eV9icmFjZXNfaW5fYXJyYXlfaW5pdGlhbGl6ZXI9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2VtcHR5X2JyYWNrZXRzX2luX2FycmF5X2FsbG9jYXRpb25fZXhwcmVzc2lvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JldHdlZW5fZW1wdHlfcGFyZW5zX2luX2Fubm90YXRpb25fdHlwZV9tZW1iZXJfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2VtcHR5X3BhcmVuc19pbl9jb25zdHJ1Y3Rvcl9kZWNsYXJhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuaW5zZXJ0X3NwYWNlX2JldHdlZW5fZW1wdHlfcGFyZW5zX2luX2VudW1fY29uc3RhbnQ9ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2VtcHR5X3BhcmVuc19pbl9tZXRob2RfZGVjbGFyYXRpb249ZG8gbm90IGluc2VydAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmluc2VydF9zcGFjZV9iZXR3ZWVuX2VtcHR5X3BhcmVuc19pbl9tZXRob2RfaW52b2NhdGlvbj1kbyBub3QgaW5zZXJ0CitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuam9pbl9saW5lc19pbl9jb21tZW50cz10cnVlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIuam9pbl93cmFwcGVkX2xpbmVzPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5rZWVwX2Vsc2Vfc3RhdGVtZW50X29uX3NhbWVfbGluZT1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmtlZXBfZW1wdHlfYXJyYXlfaW5pdGlhbGl6ZXJfb25fb25lX2xpbmU9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5rZWVwX2ltcGxlX2lmX29uX29uZV9saW5lPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5rZWVwX3RoZW5fc3RhdGVtZW50X29uX3NhbWVfbGluZT1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLmxpbmVTcGxpdD04MAorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLm5ldmVyX2luZGVudF9ibG9ja19jb21tZW50c19vbl9maXJzdF9jb2x1bW49ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5uZXZlcl9pbmRlbnRfbGluZV9jb21tZW50c19vbl9maXJzdF9jb2x1bW49ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5udW1iZXJfb2ZfYmxhbmtfbGluZXNfYXRfYmVnaW5uaW5nX29mX21ldGhvZF9ib2R5PTAKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci5udW1iZXJfb2ZfZW1wdHlfbGluZXNfdG9fcHJlc2VydmU9Mworb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLnB1dF9lbXB0eV9zdGF0ZW1lbnRfb25fbmV3X2xpbmU9ZmFsc2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci50YWJ1bGF0aW9uLmNoYXI9c3BhY2UKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci50YWJ1bGF0aW9uLnNpemU9Mgorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLnVzZV9vbl9vZmZfdGFncz1mYWxzZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuZm9ybWF0dGVyLnVzZV90YWJzX29ubHlfZm9yX2xlYWRpbmdfaW5kZW50YXRpb25zPWZhbHNlCitvcmcuZWNsaXBzZS5qZHQuY29yZS5mb3JtYXR0ZXIud3JhcF9iZWZvcmVfYmluYXJ5X29wZXJhdG9yPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci53cmFwX2JlZm9yZV9vcl9vcGVyYXRvcl9tdWx0aWNhdGNoPXRydWUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmZvcm1hdHRlci53cmFwX291dGVyX2V4cHJlc3Npb25zX3doZW5fbmVzdGVkPXRydWUKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC51aS5wcmVmcyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC51aS5wcmVmcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMDE4ODIxCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LnVpLnByZWZzCkBAIC0wLDAgKzEsNyBAQAorZWNsaXBzZS5wcmVmZXJlbmNlcy52ZXJzaW9uPTEKK2Zvcm1hdHRlcl9wcm9maWxlPV9Hb29nbGUgRm9ybWF0Citmb3JtYXR0ZXJfc2V0dGluZ3NfdmVyc2lvbj0xMgorb3JnLmVjbGlwc2UuamR0LnVpLmV4Y2VwdGlvbi5uYW1lPWUKK29yZy5lY2xpcHNlLmpkdC51aS5nZXR0ZXJzZXR0ZXIudXNlLmlzPXRydWUKK29yZy5lY2xpcHNlLmpkdC51aS5rZXl3b3JkdGhpcz1mYWxzZQorb3JnLmVjbGlwc2UuamR0LnVpLm92ZXJyaWRlYW5ub3RhdGlvbj10cnVlCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3BvbS54bWwgYi9nZXJyaXQtcGx1Z2luLWd3dHVpL3BvbS54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTQ2MDg3MAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvcG9tLnhtbApAQCAtMCwwICsxLDEyNSBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KKzwhLS0KK0NvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisKK0xpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisKK2h0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCitVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCitkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCitTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCitsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKy0tPgorPHByb2plY3QgeG1sbnM9Imh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL1BPTS80LjAuMCIKKyAgICAgICAgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIKKyAgICAgICAgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9QT00vNC4wLjAgaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvbWF2ZW4tdjRfMF8wLnhzZCI+CisgIDxtb2RlbFZlcnNpb24+NC4wLjA8L21vZGVsVmVyc2lvbj4KKworICA8cGFyZW50PgorICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgorICA8L3BhcmVudD4KKworICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGx1Z2luLWd3dHVpPC9hcnRpZmFjdElkPgorICA8bmFtZT5HZXJyaXQgQ29kZSBSZXZpZXcgLSBQbHVnaW4gR1dUIFVJPC9uYW1lPgorCisgIDxkZXNjcmlwdGlvbj4KKyAgICBBUEkgZm9yIFVJIHBsdWdpbnMgdG8gYnVpbGQgd2l0aCBHV1QgYW5kIGludGVncmF0ZSB3aXRoIEdlcnJpdAorICA8L2Rlc2NyaXB0aW9uPgorCisgIDxkZXBlbmRlbmNpZXM+CisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmd3dDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmd3dC11c2VyPC9hcnRpZmFjdElkPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nd3Q8L2dyb3VwSWQ+CisgICAgICA8YXJ0aWZhY3RJZD5nd3QtZGV2PC9hcnRpZmFjdElkPgorICAgIDwvZGVwZW5kZW5jeT4KKyAgPC9kZXBlbmRlbmNpZXM+CisKKyAgIDxidWlsZD4KKyAgICAgPHBsdWdpbk1hbmFnZW1lbnQ+CisgICAgICAgPHBsdWdpbnM+CisgICAgICAgICA8cGx1Z2luPgorICAgICAgICAgICA8Z3JvdXBJZD5vcmcuZWNsaXBzZS5tMmU8L2dyb3VwSWQ+CisgICAgICAgICAgIDxhcnRpZmFjdElkPmxpZmVjeWNsZS1tYXBwaW5nPC9hcnRpZmFjdElkPgorICAgICAgICAgICA8dmVyc2lvbj4xLjAuMDwvdmVyc2lvbj4KKyAgICAgICAgICAgPGNvbmZpZ3VyYXRpb24+CisgICAgICAgICAgICAgPGxpZmVjeWNsZU1hcHBpbmdNZXRhZGF0YT4KKyAgICAgICAgICAgICAgIDxwbHVnaW5FeGVjdXRpb25zPgorICAgICAgICAgICAgICAgICA8cGx1Z2luRXhlY3V0aW9uPgorICAgICAgICAgICAgICAgICAgIDxwbHVnaW5FeGVjdXRpb25GaWx0ZXI+CisgICAgICAgICAgICAgICAgICAgICA8Z3JvdXBJZD5vcmcuY29kZWhhdXMubW9qbzwvZ3JvdXBJZD4KKyAgICAgICAgICAgICAgICAgICAgIDxhcnRpZmFjdElkPmd3dC1tYXZlbi1wbHVnaW48L2FydGlmYWN0SWQ+CisgICAgICAgICAgICAgICAgICAgICA8dmVyc2lvblJhbmdlPlsyLjUuMCwpPC92ZXJzaW9uUmFuZ2U+CisgICAgICAgICAgICAgICAgICAgICA8Z29hbHM+CisgICAgICAgICAgICAgICAgICAgICAgIDxnb2FsPnJlc291cmNlczwvZ29hbD4KKyAgICAgICAgICAgICAgICAgICAgICAgPGdvYWw+Y29tcGlsZTwvZ29hbD4KKyAgICAgICAgICAgICAgICAgICAgICAgPGdvYWw+aTE4bjwvZ29hbD4KKyAgICAgICAgICAgICAgICAgICAgICAgPGdvYWw+Z2VuZXJhdGVBc3luYzwvZ29hbD4KKyAgICAgICAgICAgICAgICAgICAgIDwvZ29hbHM+CisgICAgICAgICAgICAgICAgICAgPC9wbHVnaW5FeGVjdXRpb25GaWx0ZXI+CisgICAgICAgICAgICAgICAgICAgPGFjdGlvbj4KKyAgICAgICAgICAgICAgICAgICAgIDxleGVjdXRlIC8+CisgICAgICAgICAgICAgICAgICAgPC9hY3Rpb24+CisgICAgICAgICAgICAgICAgIDwvcGx1Z2luRXhlY3V0aW9uPgorICAgICAgICAgICAgICAgICA8cGx1Z2luRXhlY3V0aW9uPgorICAgICAgICAgICAgICAgICAgIDxwbHVnaW5FeGVjdXRpb25GaWx0ZXI+CisgICAgICAgICAgICAgICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+CisgICAgICAgICAgICAgICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi13YXItcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICAgICAgICAgICAgICAgPHZlcnNpb25SYW5nZT5bMi4xLjEsKTwvdmVyc2lvblJhbmdlPgorICAgICAgICAgICAgICAgICAgICAgPGdvYWxzPgorICAgICAgICAgICAgICAgICAgICAgICA8Z29hbD5leHBsb2RlZDwvZ29hbD4KKyAgICAgICAgICAgICAgICAgICAgIDwvZ29hbHM+CisgICAgICAgICAgICAgICAgICAgPC9wbHVnaW5FeGVjdXRpb25GaWx0ZXI+CisgICAgICAgICAgICAgICAgICAgPGFjdGlvbj4KKyAgICAgICAgICAgICAgICAgICAgIDxleGVjdXRlIC8+CisgICAgICAgICAgICAgICAgICAgPC9hY3Rpb24+CisgICAgICAgICAgICAgICAgIDwvcGx1Z2luRXhlY3V0aW9uPgorICAgICAgICAgICAgICAgPC9wbHVnaW5FeGVjdXRpb25zPgorICAgICAgICAgICAgIDwvbGlmZWN5Y2xlTWFwcGluZ01ldGFkYXRhPgorICAgICAgICAgIDwvY29uZmlndXJhdGlvbj4KKyAgICAgICAgPC9wbHVnaW4+CisgICAgICA8L3BsdWdpbnM+CisgICAgPC9wbHVnaW5NYW5hZ2VtZW50PgorICAgIDxwbHVnaW5zPgorICAgICAgPHBsdWdpbj4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS5tYXZlbi5wbHVnaW5zPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi1zb3VyY2UtcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICA8ZXhlY3V0aW9ucz4KKyAgICAgICAgICA8ZXhlY3V0aW9uPgorICAgICAgICAgICAgPGdvYWxzPgorICAgICAgICAgICAgICA8Z29hbD5qYXI8L2dvYWw+CisgICAgICAgICAgICA8L2dvYWxzPgorICAgICAgICAgIDwvZXhlY3V0aW9uPgorICAgICAgICA8L2V4ZWN1dGlvbnM+CisgICAgICA8L3BsdWdpbj4KKworICAgICAgPHBsdWdpbj4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLmNvZGVoYXVzLm1vam88L2dyb3VwSWQ+CisgICAgICAgIDxhcnRpZmFjdElkPmd3dC1tYXZlbi1wbHVnaW48L2FydGlmYWN0SWQ+CisgICAgICAgIDxjb25maWd1cmF0aW9uPgorICAgICAgICAgIDxtb2R1bGU+Y29tLmdvb2dsZS5nZXJyaXQuUGx1Z2luPC9tb2R1bGU+CisgICAgICAgICAgPGRpc2FibGVDbGFzc01ldGFkYXRhPnRydWU8L2Rpc2FibGVDbGFzc01ldGFkYXRhPgorICAgICAgICAgIDxkaXNhYmxlQ2FzdENoZWNraW5nPnRydWU8L2Rpc2FibGVDYXN0Q2hlY2tpbmc+CisgICAgICAgIDwvY29uZmlndXJhdGlvbj4KKyAgICAgICAgPGV4ZWN1dGlvbnM+CisgICAgICAgICAgPGV4ZWN1dGlvbj4KKyAgICAgICAgICAgIDxnb2Fscz4KKyAgICAgICAgICAgICAgPGdvYWw+cmVzb3VyY2VzPC9nb2FsPgorICAgICAgICAgICAgICA8Z29hbD5jb21waWxlPC9nb2FsPgorICAgICAgICAgICAgPC9nb2Fscz4KKyAgICAgICAgICA8L2V4ZWN1dGlvbj4KKyAgICAgICAgPC9leGVjdXRpb25zPgorICAgICAgPC9wbHVnaW4+CisgICAgPC9wbHVnaW5zPgorICA8L2J1aWxkPgorPC9wcm9qZWN0PgorCmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvUGx1Z2luLmd3dC54bWwgYi9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvUGx1Z2luLmd3dC54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDNlZGY2NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tZ3d0dWkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9QbHVnaW4uZ3d0LnhtbApAQCAtMCwwICsxLDIzIEBACis8IS0tCisgQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKworIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKworIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCisgVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorLS0+Cis8bW9kdWxlPgorICA8ZGVmaW5lLWxpbmtlciBuYW1lPSJnZXJyaXRfcGx1Z2luIiBjbGFzcz0iY29tLmdvb2dsZS5nZXJyaXQubGlua2VyLkdlcnJpdFBsdWdpbkxpbmtlciIvPgorICA8YWRkLWxpbmtlciBuYW1lPSJnZXJyaXRfcGx1Z2luIi8+CisgIDxnZW5lcmF0ZS13aXRoIGNsYXNzPSJjb20uZ29vZ2xlLmdlcnJpdC5yZWJpbmQuUGx1Z2luR2VuZXJhdG9yIj4KKyAgICA8d2hlbi10eXBlLWFzc2lnbmFibGUgY2xhc3M9ImNvbS5nb29nbGUuZ2Vycml0LmNsaWVudC5QbHVnaW4iLz4KKyAgPC9nZW5lcmF0ZS13aXRoPgorICA8c291cmNlIHBhdGg9ImNsaWVudCIvPgorPC9tb2R1bGU+CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY2xpZW50L1BsdWdpbi5qYXZhIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9QbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xMjkxYjc5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9QbHVnaW4uamF2YQpAQCAtMCwwICsxLDI5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY2xpZW50OworCitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5jbGllbnQuRW50cnlQb2ludDsKKworLyoqCisgKiBCYXNlIGNsYXNzIGZvciB3cml0aW5nIEdlcnJpdCBXZWIgVUkgcGx1Z2lucworICoKKyAqIFdyaXRpbmcgYSBwbHVnaW46CisgKiA8b2w+CisgKiA8bGk+RGVjbGFyZSBzdWJ0eXBlIG9mIFBsdWdpbjwvbGk+CisgKiA8bGk+QmluZCBXZWJVaVBsdWdpbiB0byBHd3RQbHVnaW4gaW1wbGVtZW50YXRpb24gaW4gR2Vycml0LU1vZHVsZTwvbGk+CisgKiA8L29sPgorICovCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgUGx1Z2luIGltcGxlbWVudHMgRW50cnlQb2ludCB7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvbGlua2VyL0dlcnJpdFBsdWdpbkxpbmtlci5qYXZhIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2xpbmtlci9HZXJyaXRQbHVnaW5MaW5rZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lNTAzMzRlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2xpbmtlci9HZXJyaXRQbHVnaW5MaW5rZXIuamF2YQpAQCAtMCwwICsxLDMxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQubGlua2VyOworCitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5leHQuTGlua2VyQ29udGV4dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmxpbmtlci5Dcm9zc1NpdGVJZnJhbWVMaW5rZXI7CisKKy8qKiBGaW5hbGl6ZXMgdGhlIG1vZHVsZSBtYW5pZmVzdCBmaWxlIHdpdGggdGhlIHNlbGVjdGlvbiBzY3JpcHQuICovCitwdWJsaWMgZmluYWwgY2xhc3MgR2Vycml0UGx1Z2luTGlua2VyIGV4dGVuZHMgQ3Jvc3NTaXRlSWZyYW1lTGlua2VyIHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0RGVzY3JpcHRpb24oKSB7CisgICAgcmV0dXJuICJHZXJyaXQgR1dUIFVJIHBsdWdpbiI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIFN0cmluZyBnZXRKc0NvbXB1dGVVcmxGb3JSZXNvdXJjZShMaW5rZXJDb250ZXh0IGNvbnRleHQpIHsKKyAgICByZXR1cm4gImNvbS9nb29nbGUvZ2Vycml0L2xpbmtlci9jb21wdXRlVXJsRm9yUGx1Z2luUmVzb3VyY2UuanMiOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmViaW5kL1BsdWdpbkdlbmVyYXRvci5qYXZhIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3JlYmluZC9QbHVnaW5HZW5lcmF0b3IuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zN2MzZTk2Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3JlYmluZC9QbHVnaW5HZW5lcmF0b3IuamF2YQpAQCAtMCwwICsxLDg5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8gQ29weXJpZ2h0IDIwMDggR29vZ2xlIEluYy4KKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnJlYmluZDsKKworaW1wb3J0IGphdmEuaW8uUHJpbnRXcml0ZXI7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmNsaWVudC5HV1Q7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5leHQuR2VuZXJhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuZXh0LkdlbmVyYXRvckNvbnRleHQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5leHQuVHJlZUxvZ2dlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC5jb3JlLmV4dC5VbmFibGVUb0NvbXBsZXRlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0LmNvcmUuZXh0LnR5cGVpbmZvLkpDbGFzc1R5cGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QuY29yZS5leHQudHlwZWluZm8uVHlwZU9yYWNsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dC51c2VyLnJlYmluZC5DbGFzc1NvdXJjZUZpbGVDb21wb3NlckZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3QudXNlci5yZWJpbmQuU291cmNlV3JpdGVyOworCisvKioKKyAqIFdyaXRlIHRoZSB0b3AgbGF5ZXIgaW4gdGhlIEdhZGdldCBib290c3RyYXAgc2FuZHdpY2ggYW5kIGdlbmVyYXRlIGEgc3R1YgorICogbWFuaWZlc3QgdGhhdCB3aWxsIGJlIGNvbXBsZXRlZCBieSB0aGUgbGlua2VyLgorICoKKyAqIEJhc2VkIG9uIGd3dC1nYWRnZXRzIEdhZGdldEdlbmVyYXRvciBjbGFzcworICovCitwdWJsaWMgY2xhc3MgUGx1Z2luR2VuZXJhdG9yIGV4dGVuZHMgR2VuZXJhdG9yIHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2VuZXJhdGUoVHJlZUxvZ2dlciBsb2dnZXIsIEdlbmVyYXRvckNvbnRleHQgY29udGV4dCwKKyAgICAgIFN0cmluZyB0eXBlTmFtZSkgdGhyb3dzIFVuYWJsZVRvQ29tcGxldGVFeGNlcHRpb24geworCisgICAgLy8gVGhlIFR5cGVPcmFjbGUga25vd3MgYWJvdXQgYWxsIHR5cGVzIGluIHRoZSB0eXBlIHN5c3RlbQorICAgIFR5cGVPcmFjbGUgdHlwZU9yYWNsZSA9IGNvbnRleHQuZ2V0VHlwZU9yYWNsZSgpOworCisgICAgLy8gR2V0IGEgcmVmZXJlbmNlIHRvIHRoZSB0eXBlIHRoYXQgdGhlIGdlbmVyYXRvciBzaG91bGQgaW1wbGVtZW50CisgICAgSkNsYXNzVHlwZSBzb3VyY2VUeXBlID0gdHlwZU9yYWNsZS5maW5kVHlwZSh0eXBlTmFtZSk7CisKKyAgICAvLyBFbnN1cmUgdGhhdCB0aGUgcmVxdWVzdGVkIHR5cGUgZXhpc3RzCisgICAgaWYgKHNvdXJjZVR5cGUgPT0gbnVsbCkgeworICAgICAgbG9nZ2VyLmxvZyhUcmVlTG9nZ2VyLkVSUk9SLCAiQ291bGQgbm90IGZpbmQgcmVxdWVzdGVkIHR5cGVOYW1lIiwgbnVsbCk7CisgICAgICB0aHJvdyBuZXcgVW5hYmxlVG9Db21wbGV0ZUV4Y2VwdGlvbigpOworICAgIH0KKworICAgIC8vIE1ha2Ugc3VyZSB0aGUgR2FkZ2V0IHR5cGUgaXMgY29ycmVjdGx5IGRlZmluZWQKKyAgICB2YWxpZGF0ZVR5cGUobG9nZ2VyLCBzb3VyY2VUeXBlKTsKKworICAgIC8vIFBpY2sgYSBuYW1lIGZvciB0aGUgZ2VuZXJhdGVkIGNsYXNzIHRvIG5vdCBjb25mbGljdC4KKyAgICBTdHJpbmcgZ2VuZXJhdGVkU2ltcGxlU291cmNlTmFtZSA9IHNvdXJjZVR5cGUuZ2V0U2ltcGxlU291cmNlTmFtZSgpCisgICAgICAgICsgIlBsdWdpbkltcGwiOworCisgICAgLy8gQmVnaW4gd3JpdGluZyB0aGUgZ2VuZXJhdGVkIHNvdXJjZS4KKyAgICBDbGFzc1NvdXJjZUZpbGVDb21wb3NlckZhY3RvcnkgZiA9IG5ldyBDbGFzc1NvdXJjZUZpbGVDb21wb3NlckZhY3RvcnkoCisgICAgICAgIHNvdXJjZVR5cGUuZ2V0UGFja2FnZSgpLmdldE5hbWUoKSwgZ2VuZXJhdGVkU2ltcGxlU291cmNlTmFtZSk7CisgICAgZi5hZGRJbXBvcnQoR1dULmNsYXNzLmdldE5hbWUoKSk7CisgICAgZi5zZXRTdXBlcmNsYXNzKHR5cGVOYW1lKTsKKworICAgIC8vIEFsbCBzb3VyY2UgZ2V0cyB3cml0dGVuIHRocm91Z2ggdGhpcyBXcml0ZXIKKyAgICBQcmludFdyaXRlciBvdXQgPSBjb250ZXh0LnRyeUNyZWF0ZShsb2dnZXIsCisgICAgICAgIHNvdXJjZVR5cGUuZ2V0UGFja2FnZSgpLmdldE5hbWUoKSwgZ2VuZXJhdGVkU2ltcGxlU291cmNlTmFtZSk7CisKKyAgICAvLyBJZiBhbiBpbXBsZW1lbnRhdGlvbiBhbHJlYWR5IGV4aXN0cywgd2UgZG9uJ3QgbmVlZCB0byBkbyBhbnkgd29yaworICAgIGlmIChvdXQgIT0gbnVsbCkgeworCisgICAgICAvLyBXZSByZWFsbHkgdXNlIGEgU291cmNlV3JpdGVyIHNpbmNlIGl0J3MgY29udmVuaWVudAorICAgICAgU291cmNlV3JpdGVyIHN3ID0gZi5jcmVhdGVTb3VyY2VXcml0ZXIoY29udGV4dCwgb3V0KTsKKyAgICAgIHN3LmNvbW1pdChsb2dnZXIpOworICAgIH0KKworICAgIHJldHVybiBmLmdldENyZWF0ZWRDbGFzc05hbWUoKTsKKyAgfQorCisgIHByb3RlY3RlZCB2b2lkIHZhbGlkYXRlVHlwZShUcmVlTG9nZ2VyIGxvZ2dlciwgSkNsYXNzVHlwZSB0eXBlKQorICAgICAgdGhyb3dzIFVuYWJsZVRvQ29tcGxldGVFeGNlcHRpb24geworICAgIGlmICghdHlwZS5pc0RlZmF1bHRJbnN0YW50aWFibGUoKSkgeworICAgICAgbG9nZ2VyLmxvZyhUcmVlTG9nZ2VyLkVSUk9SLCAiUGx1Z2luIHR5cGVzIG11c3QgYmUgZGVmYXVsdCBpbnN0YW50aWFibGUiLAorICAgICAgICAgIG51bGwpOworICAgICAgdGhyb3cgbmV3IFVuYWJsZVRvQ29tcGxldGVFeGNlcHRpb24oKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tZ3d0dWkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L2xpbmtlci9jb21wdXRlVXJsRm9yUGx1Z2luUmVzb3VyY2UuanMgYi9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9saW5rZXIvY29tcHV0ZVVybEZvclBsdWdpblJlc291cmNlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNlMjBlOTQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWd3dHVpL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9saW5rZXIvY29tcHV0ZVVybEZvclBsdWdpblJlc291cmNlLmpzCkBAIC0wLDAgKzEsMyBAQAorZnVuY3Rpb24gY29tcHV0ZVVybEZvclJlc291cmNlKHJlc291cmNlKSB7CisgIHJldHVybiBfX01PRFVMRV9GVU5DX18uX19tb2R1bGVCYXNlICsgcmVzb3VyY2U7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS8uZ2l0aWdub3JlIGIvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvLmdpdGlnbm9yZQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43MDc1YTJmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvLmdpdGlnbm9yZQpAQCAtMCwwICsxLDQgQEAKKy90YXJnZXQKKy8uY2xhc3NwYXRoCisvLnByb2plY3QKKy8uc2V0dGluZ3MKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3BvbS54bWwgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9wb20ueG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjFmMGY1M2EKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9wb20ueG1sCkBAIC0wLDAgKzEsNTMgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8IS0tCitDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorCitMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKK3lvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KK1lvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorCitodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKworVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKK1dJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCistLT4KKzxwcm9qZWN0IHhtbG5zPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9QT00vNC4wLjAiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiCisgIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvUE9NLzQuMC4wIGh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL21hdmVuLXY0XzBfMC54c2QiPgorICA8bW9kZWxWZXJzaW9uPjQuMC4wPC9tb2RlbFZlcnNpb24+CisKKyAgPHBhcmVudD4KKyAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICA8YXJ0aWZhY3RJZD5nZXJyaXQtcGFyZW50PC9hcnRpZmFjdElkPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KKyAgPC9wYXJlbnQ+CisKKyAgPGFydGlmYWN0SWQ+Z2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGU8L2FydGlmYWN0SWQ+CisgIDxuYW1lPkdlcnJpdCBDb2RlIFJldmlldyAtIFdlYiBVSSBKYXZhU2NyaXB0IFBsdWdpbiBBcmNoZXR5cGU8L25hbWU+CisKKyAgPHByb3BlcnRpZXM+CisgICAgPGRlZmF1bHRHZXJyaXRBcGlWZXJzaW9uPiR7cHJvamVjdC52ZXJzaW9ufTwvZGVmYXVsdEdlcnJpdEFwaVZlcnNpb24+CisgIDwvcHJvcGVydGllcz4KKworICA8YnVpbGQ+CisgICAgPHJlc291cmNlcz4KKyAgICAgIDxyZXNvdXJjZT4KKyAgICAgICAgPGRpcmVjdG9yeT5zcmMvbWFpbi9yZXNvdXJjZXM8L2RpcmVjdG9yeT4KKyAgICAgICAgPGZpbHRlcmluZz50cnVlPC9maWx0ZXJpbmc+CisgICAgICAgIDxpbmNsdWRlcz4KKyAgICAgICAgICA8aW5jbHVkZT5NRVRBLUlORi9tYXZlbi9hcmNoZXR5cGUtbWV0YWRhdGEueG1sPC9pbmNsdWRlPgorICAgICAgICA8L2luY2x1ZGVzPgorICAgICAgPC9yZXNvdXJjZT4KKyAgICAgIDxyZXNvdXJjZT4KKyAgICAgICAgPGRpcmVjdG9yeT5zcmMvbWFpbi9yZXNvdXJjZXM8L2RpcmVjdG9yeT4KKyAgICAgICAgPGZpbHRlcmluZz5mYWxzZTwvZmlsdGVyaW5nPgorICAgICAgICA8ZXhjbHVkZXM+CisgICAgICAgICAgPGV4Y2x1ZGU+TUVUQS1JTkYvbWF2ZW4vYXJjaGV0eXBlLW1ldGFkYXRhLnhtbDwvZXhjbHVkZT4KKyAgICAgICAgPC9leGNsdWRlcz4KKyAgICAgIDwvcmVzb3VyY2U+CisgICAgPC9yZXNvdXJjZXM+CisgIDwvYnVpbGQ+CisKKzwvcHJvamVjdD4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9NRVRBLUlORi9tYXZlbi9hcmNoZXR5cGUtbWV0YWRhdGEueG1sIGIvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL01FVEEtSU5GL21hdmVuL2FyY2hldHlwZS1tZXRhZGF0YS54bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDU0Y2FhZQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9NRVRBLUlORi9tYXZlbi9hcmNoZXR5cGUtbWV0YWRhdGEueG1sCkBAIC0wLDAgKzEsNjIgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8IS0tCitDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorCitMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKK3lvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KK1lvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorCitodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKworVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKK1dJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCistLT4KKzxhcmNoZXR5cGUtZGVzY3JpcHRvciBuYW1lPSJHZXJyaXQgUGx1Z2luIj4KKyAgPHJlcXVpcmVkUHJvcGVydGllcz4KKyAgICA8cmVxdWlyZWRQcm9wZXJ0eSBrZXk9InBsdWdpbk5hbWUiLz4KKworICAgIDxyZXF1aXJlZFByb3BlcnR5IGtleT0iSW1wbGVtZW50YXRpb24tVmVuZG9yIi8+CisgICAgPHJlcXVpcmVkUHJvcGVydHkga2V5PSJJbXBsZW1lbnRhdGlvbi1VcmwiLz4KKworICAgIDxyZXF1aXJlZFByb3BlcnR5IGtleT0iZ2Vycml0QXBpVHlwZSI+CisgICAgICA8ZGVmYXVsdFZhbHVlPmpzPC9kZWZhdWx0VmFsdWU+CisgICAgPC9yZXF1aXJlZFByb3BlcnR5PgorICAgIDxyZXF1aXJlZFByb3BlcnR5IGtleT0iZ2Vycml0QXBpVmVyc2lvbiI+CisgICAgICA8ZGVmYXVsdFZhbHVlPiR7ZGVmYXVsdEdlcnJpdEFwaVZlcnNpb259PC9kZWZhdWx0VmFsdWU+CisgICAgPC9yZXF1aXJlZFByb3BlcnR5PgorICA8L3JlcXVpcmVkUHJvcGVydGllcz4KKworICA8ZmlsZVNldHM+CisgICAgPGZpbGVTZXQgZmlsdGVyZWQ9InRydWUiIHBhY2thZ2VkPSJ0cnVlIj4KKyAgICAgIDxkaXJlY3Rvcnk+c3JjL21haW4vamF2YTwvZGlyZWN0b3J5PgorICAgICAgPGluY2x1ZGVzPgorICAgICAgICA8aW5jbHVkZT4qKi8qLmphdmE8L2luY2x1ZGU+CisgICAgICA8L2luY2x1ZGVzPgorICAgIDwvZmlsZVNldD4KKworICAgIDxmaWxlU2V0PgorICAgICAgPGRpcmVjdG9yeT5zcmMvbWFpbi9qczwvZGlyZWN0b3J5PgorICAgICAgPGluY2x1ZGVzPgorICAgICAgICA8aW5jbHVkZT4qKi8qLmpzPC9pbmNsdWRlPgorICAgICAgPC9pbmNsdWRlcz4KKyAgICA8L2ZpbGVTZXQ+CisKKyAgICA8ZmlsZVNldCBmaWx0ZXJlZD0idHJ1ZSI+CisgICAgICA8ZGlyZWN0b3J5PnNyYy9tYWluL3Jlc291cmNlcy9Eb2N1bWVudGF0aW9uPC9kaXJlY3Rvcnk+CisgICAgICA8aW5jbHVkZXM+CisgICAgICAgIDxpbmNsdWRlPioqLyoubWQ8L2luY2x1ZGU+CisgICAgICA8L2luY2x1ZGVzPgorICAgIDwvZmlsZVNldD4KKworICAgIDxmaWxlU2V0PgorICAgICAgPGRpcmVjdG9yeT48L2RpcmVjdG9yeT4KKyAgICAgIDxpbmNsdWRlcz4KKyAgICAgICAgPGluY2x1ZGU+LmdpdGlnbm9yZTwvaW5jbHVkZT4KKyAgICAgICAgPGluY2x1ZGU+TElDRU5TRTwvaW5jbHVkZT4KKyAgICAgIDwvaW5jbHVkZXM+CisgICAgPC9maWxlU2V0PgorICA8L2ZpbGVTZXRzPgorPC9hcmNoZXR5cGUtZGVzY3JpcHRvcj4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzLy5naXRpZ25vcmUgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy8uZ2l0aWdub3JlCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjgwZDYyNTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy8uZ2l0aWdub3JlCkBAIC0wLDAgKzEsNSBAQAorL3RhcmdldAorLy5jbGFzc3BhdGgKKy8ucHJvamVjdAorLy5zZXR0aW5ncy9vcmcubWF2ZW4uaWRlLmVjbGlwc2UucHJlZnMKKy8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UubTJlLmNvcmUucHJlZnMKZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL0xJQ0VOU0UgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9MSUNFTlNFCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjExMDY5ZWQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9MSUNFTlNFCkBAIC0wLDAgKzEsMjAxIEBACisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBBcGFjaGUgTGljZW5zZQorICAgICAgICAgICAgICAgICAgICAgICAgVmVyc2lvbiAyLjAsIEphbnVhcnkgMjAwNAorICAgICAgICAgICAgICAgICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzLworCitURVJNUyBBTkQgQ09ORElUSU9OUyBGT1IgVVNFLCBSRVBST0RVQ1RJT04sIEFORCBESVNUUklCVVRJT04KKworMS4gRGVmaW5pdGlvbnMuCisKKyAgICJMaWNlbnNlIiBzaGFsbCBtZWFuIHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBmb3IgdXNlLCByZXByb2R1Y3Rpb24sCisgICBhbmQgZGlzdHJpYnV0aW9uIGFzIGRlZmluZWQgYnkgU2VjdGlvbnMgMSB0aHJvdWdoIDkgb2YgdGhpcyBkb2N1bWVudC4KKworICAgIkxpY2Vuc29yIiBzaGFsbCBtZWFuIHRoZSBjb3B5cmlnaHQgb3duZXIgb3IgZW50aXR5IGF1dGhvcml6ZWQgYnkKKyAgIHRoZSBjb3B5cmlnaHQgb3duZXIgdGhhdCBpcyBncmFudGluZyB0aGUgTGljZW5zZS4KKworICAgIkxlZ2FsIEVudGl0eSIgc2hhbGwgbWVhbiB0aGUgdW5pb24gb2YgdGhlIGFjdGluZyBlbnRpdHkgYW5kIGFsbAorICAgb3RoZXIgZW50aXRpZXMgdGhhdCBjb250cm9sLCBhcmUgY29udHJvbGxlZCBieSwgb3IgYXJlIHVuZGVyIGNvbW1vbgorICAgY29udHJvbCB3aXRoIHRoYXQgZW50aXR5LiBGb3IgdGhlIHB1cnBvc2VzIG9mIHRoaXMgZGVmaW5pdGlvbiwKKyAgICJjb250cm9sIiBtZWFucyAoaSkgdGhlIHBvd2VyLCBkaXJlY3Qgb3IgaW5kaXJlY3QsIHRvIGNhdXNlIHRoZQorICAgZGlyZWN0aW9uIG9yIG1hbmFnZW1lbnQgb2Ygc3VjaCBlbnRpdHksIHdoZXRoZXIgYnkgY29udHJhY3Qgb3IKKyAgIG90aGVyd2lzZSwgb3IgKGlpKSBvd25lcnNoaXAgb2YgZmlmdHkgcGVyY2VudCAoNTAlKSBvciBtb3JlIG9mIHRoZQorICAgb3V0c3RhbmRpbmcgc2hhcmVzLCBvciAoaWlpKSBiZW5lZmljaWFsIG93bmVyc2hpcCBvZiBzdWNoIGVudGl0eS4KKworICAgIllvdSIgKG9yICJZb3VyIikgc2hhbGwgbWVhbiBhbiBpbmRpdmlkdWFsIG9yIExlZ2FsIEVudGl0eQorICAgZXhlcmNpc2luZyBwZXJtaXNzaW9ucyBncmFudGVkIGJ5IHRoaXMgTGljZW5zZS4KKworICAgIlNvdXJjZSIgZm9ybSBzaGFsbCBtZWFuIHRoZSBwcmVmZXJyZWQgZm9ybSBmb3IgbWFraW5nIG1vZGlmaWNhdGlvbnMsCisgICBpbmNsdWRpbmcgYnV0IG5vdCBsaW1pdGVkIHRvIHNvZnR3YXJlIHNvdXJjZSBjb2RlLCBkb2N1bWVudGF0aW9uCisgICBzb3VyY2UsIGFuZCBjb25maWd1cmF0aW9uIGZpbGVzLgorCisgICAiT2JqZWN0IiBmb3JtIHNoYWxsIG1lYW4gYW55IGZvcm0gcmVzdWx0aW5nIGZyb20gbWVjaGFuaWNhbAorICAgdHJhbnNmb3JtYXRpb24gb3IgdHJhbnNsYXRpb24gb2YgYSBTb3VyY2UgZm9ybSwgaW5jbHVkaW5nIGJ1dAorICAgbm90IGxpbWl0ZWQgdG8gY29tcGlsZWQgb2JqZWN0IGNvZGUsIGdlbmVyYXRlZCBkb2N1bWVudGF0aW9uLAorICAgYW5kIGNvbnZlcnNpb25zIHRvIG90aGVyIG1lZGlhIHR5cGVzLgorCisgICAiV29yayIgc2hhbGwgbWVhbiB0aGUgd29yayBvZiBhdXRob3JzaGlwLCB3aGV0aGVyIGluIFNvdXJjZSBvcgorICAgT2JqZWN0IGZvcm0sIG1hZGUgYXZhaWxhYmxlIHVuZGVyIHRoZSBMaWNlbnNlLCBhcyBpbmRpY2F0ZWQgYnkgYQorICAgY29weXJpZ2h0IG5vdGljZSB0aGF0IGlzIGluY2x1ZGVkIGluIG9yIGF0dGFjaGVkIHRvIHRoZSB3b3JrCisgICAoYW4gZXhhbXBsZSBpcyBwcm92aWRlZCBpbiB0aGUgQXBwZW5kaXggYmVsb3cpLgorCisgICAiRGVyaXZhdGl2ZSBXb3JrcyIgc2hhbGwgbWVhbiBhbnkgd29yaywgd2hldGhlciBpbiBTb3VyY2Ugb3IgT2JqZWN0CisgICBmb3JtLCB0aGF0IGlzIGJhc2VkIG9uIChvciBkZXJpdmVkIGZyb20pIHRoZSBXb3JrIGFuZCBmb3Igd2hpY2ggdGhlCisgICBlZGl0b3JpYWwgcmV2aXNpb25zLCBhbm5vdGF0aW9ucywgZWxhYm9yYXRpb25zLCBvciBvdGhlciBtb2RpZmljYXRpb25zCisgICByZXByZXNlbnQsIGFzIGEgd2hvbGUsIGFuIG9yaWdpbmFsIHdvcmsgb2YgYXV0aG9yc2hpcC4gRm9yIHRoZSBwdXJwb3NlcworICAgb2YgdGhpcyBMaWNlbnNlLCBEZXJpdmF0aXZlIFdvcmtzIHNoYWxsIG5vdCBpbmNsdWRlIHdvcmtzIHRoYXQgcmVtYWluCisgICBzZXBhcmFibGUgZnJvbSwgb3IgbWVyZWx5IGxpbmsgKG9yIGJpbmQgYnkgbmFtZSkgdG8gdGhlIGludGVyZmFjZXMgb2YsCisgICB0aGUgV29yayBhbmQgRGVyaXZhdGl2ZSBXb3JrcyB0aGVyZW9mLgorCisgICAiQ29udHJpYnV0aW9uIiBzaGFsbCBtZWFuIGFueSB3b3JrIG9mIGF1dGhvcnNoaXAsIGluY2x1ZGluZworICAgdGhlIG9yaWdpbmFsIHZlcnNpb24gb2YgdGhlIFdvcmsgYW5kIGFueSBtb2RpZmljYXRpb25zIG9yIGFkZGl0aW9ucworICAgdG8gdGhhdCBXb3JrIG9yIERlcml2YXRpdmUgV29ya3MgdGhlcmVvZiwgdGhhdCBpcyBpbnRlbnRpb25hbGx5CisgICBzdWJtaXR0ZWQgdG8gTGljZW5zb3IgZm9yIGluY2x1c2lvbiBpbiB0aGUgV29yayBieSB0aGUgY29weXJpZ2h0IG93bmVyCisgICBvciBieSBhbiBpbmRpdmlkdWFsIG9yIExlZ2FsIEVudGl0eSBhdXRob3JpemVkIHRvIHN1Ym1pdCBvbiBiZWhhbGYgb2YKKyAgIHRoZSBjb3B5cmlnaHQgb3duZXIuIEZvciB0aGUgcHVycG9zZXMgb2YgdGhpcyBkZWZpbml0aW9uLCAic3VibWl0dGVkIgorICAgbWVhbnMgYW55IGZvcm0gb2YgZWxlY3Ryb25pYywgdmVyYmFsLCBvciB3cml0dGVuIGNvbW11bmljYXRpb24gc2VudAorICAgdG8gdGhlIExpY2Vuc29yIG9yIGl0cyByZXByZXNlbnRhdGl2ZXMsIGluY2x1ZGluZyBidXQgbm90IGxpbWl0ZWQgdG8KKyAgIGNvbW11bmljYXRpb24gb24gZWxlY3Ryb25pYyBtYWlsaW5nIGxpc3RzLCBzb3VyY2UgY29kZSBjb250cm9sIHN5c3RlbXMsCisgICBhbmQgaXNzdWUgdHJhY2tpbmcgc3lzdGVtcyB0aGF0IGFyZSBtYW5hZ2VkIGJ5LCBvciBvbiBiZWhhbGYgb2YsIHRoZQorICAgTGljZW5zb3IgZm9yIHRoZSBwdXJwb3NlIG9mIGRpc2N1c3NpbmcgYW5kIGltcHJvdmluZyB0aGUgV29yaywgYnV0CisgICBleGNsdWRpbmcgY29tbXVuaWNhdGlvbiB0aGF0IGlzIGNvbnNwaWN1b3VzbHkgbWFya2VkIG9yIG90aGVyd2lzZQorICAgZGVzaWduYXRlZCBpbiB3cml0aW5nIGJ5IHRoZSBjb3B5cmlnaHQgb3duZXIgYXMgIk5vdCBhIENvbnRyaWJ1dGlvbi4iCisKKyAgICJDb250cmlidXRvciIgc2hhbGwgbWVhbiBMaWNlbnNvciBhbmQgYW55IGluZGl2aWR1YWwgb3IgTGVnYWwgRW50aXR5CisgICBvbiBiZWhhbGYgb2Ygd2hvbSBhIENvbnRyaWJ1dGlvbiBoYXMgYmVlbiByZWNlaXZlZCBieSBMaWNlbnNvciBhbmQKKyAgIHN1YnNlcXVlbnRseSBpbmNvcnBvcmF0ZWQgd2l0aGluIHRoZSBXb3JrLgorCisyLiBHcmFudCBvZiBDb3B5cmlnaHQgTGljZW5zZS4gU3ViamVjdCB0byB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YKKyAgIHRoaXMgTGljZW5zZSwgZWFjaCBDb250cmlidXRvciBoZXJlYnkgZ3JhbnRzIHRvIFlvdSBhIHBlcnBldHVhbCwKKyAgIHdvcmxkd2lkZSwgbm9uLWV4Y2x1c2l2ZSwgbm8tY2hhcmdlLCByb3lhbHR5LWZyZWUsIGlycmV2b2NhYmxlCisgICBjb3B5cmlnaHQgbGljZW5zZSB0byByZXByb2R1Y2UsIHByZXBhcmUgRGVyaXZhdGl2ZSBXb3JrcyBvZiwKKyAgIHB1YmxpY2x5IGRpc3BsYXksIHB1YmxpY2x5IHBlcmZvcm0sIHN1YmxpY2Vuc2UsIGFuZCBkaXN0cmlidXRlIHRoZQorICAgV29yayBhbmQgc3VjaCBEZXJpdmF0aXZlIFdvcmtzIGluIFNvdXJjZSBvciBPYmplY3QgZm9ybS4KKworMy4gR3JhbnQgb2YgUGF0ZW50IExpY2Vuc2UuIFN1YmplY3QgdG8gdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mCisgICB0aGlzIExpY2Vuc2UsIGVhY2ggQ29udHJpYnV0b3IgaGVyZWJ5IGdyYW50cyB0byBZb3UgYSBwZXJwZXR1YWwsCisgICB3b3JsZHdpZGUsIG5vbi1leGNsdXNpdmUsIG5vLWNoYXJnZSwgcm95YWx0eS1mcmVlLCBpcnJldm9jYWJsZQorICAgKGV4Y2VwdCBhcyBzdGF0ZWQgaW4gdGhpcyBzZWN0aW9uKSBwYXRlbnQgbGljZW5zZSB0byBtYWtlLCBoYXZlIG1hZGUsCisgICB1c2UsIG9mZmVyIHRvIHNlbGwsIHNlbGwsIGltcG9ydCwgYW5kIG90aGVyd2lzZSB0cmFuc2ZlciB0aGUgV29yaywKKyAgIHdoZXJlIHN1Y2ggbGljZW5zZSBhcHBsaWVzIG9ubHkgdG8gdGhvc2UgcGF0ZW50IGNsYWltcyBsaWNlbnNhYmxlCisgICBieSBzdWNoIENvbnRyaWJ1dG9yIHRoYXQgYXJlIG5lY2Vzc2FyaWx5IGluZnJpbmdlZCBieSB0aGVpcgorICAgQ29udHJpYnV0aW9uKHMpIGFsb25lIG9yIGJ5IGNvbWJpbmF0aW9uIG9mIHRoZWlyIENvbnRyaWJ1dGlvbihzKQorICAgd2l0aCB0aGUgV29yayB0byB3aGljaCBzdWNoIENvbnRyaWJ1dGlvbihzKSB3YXMgc3VibWl0dGVkLiBJZiBZb3UKKyAgIGluc3RpdHV0ZSBwYXRlbnQgbGl0aWdhdGlvbiBhZ2FpbnN0IGFueSBlbnRpdHkgKGluY2x1ZGluZyBhCisgICBjcm9zcy1jbGFpbSBvciBjb3VudGVyY2xhaW0gaW4gYSBsYXdzdWl0KSBhbGxlZ2luZyB0aGF0IHRoZSBXb3JrCisgICBvciBhIENvbnRyaWJ1dGlvbiBpbmNvcnBvcmF0ZWQgd2l0aGluIHRoZSBXb3JrIGNvbnN0aXR1dGVzIGRpcmVjdAorICAgb3IgY29udHJpYnV0b3J5IHBhdGVudCBpbmZyaW5nZW1lbnQsIHRoZW4gYW55IHBhdGVudCBsaWNlbnNlcworICAgZ3JhbnRlZCB0byBZb3UgdW5kZXIgdGhpcyBMaWNlbnNlIGZvciB0aGF0IFdvcmsgc2hhbGwgdGVybWluYXRlCisgICBhcyBvZiB0aGUgZGF0ZSBzdWNoIGxpdGlnYXRpb24gaXMgZmlsZWQuCisKKzQuIFJlZGlzdHJpYnV0aW9uLiBZb3UgbWF5IHJlcHJvZHVjZSBhbmQgZGlzdHJpYnV0ZSBjb3BpZXMgb2YgdGhlCisgICBXb3JrIG9yIERlcml2YXRpdmUgV29ya3MgdGhlcmVvZiBpbiBhbnkgbWVkaXVtLCB3aXRoIG9yIHdpdGhvdXQKKyAgIG1vZGlmaWNhdGlvbnMsIGFuZCBpbiBTb3VyY2Ugb3IgT2JqZWN0IGZvcm0sIHByb3ZpZGVkIHRoYXQgWW91CisgICBtZWV0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9uczoKKworICAgKGEpIFlvdSBtdXN0IGdpdmUgYW55IG90aGVyIHJlY2lwaWVudHMgb2YgdGhlIFdvcmsgb3IKKyAgICAgICBEZXJpdmF0aXZlIFdvcmtzIGEgY29weSBvZiB0aGlzIExpY2Vuc2U7IGFuZAorCisgICAoYikgWW91IG11c3QgY2F1c2UgYW55IG1vZGlmaWVkIGZpbGVzIHRvIGNhcnJ5IHByb21pbmVudCBub3RpY2VzCisgICAgICAgc3RhdGluZyB0aGF0IFlvdSBjaGFuZ2VkIHRoZSBmaWxlczsgYW5kCisKKyAgIChjKSBZb3UgbXVzdCByZXRhaW4sIGluIHRoZSBTb3VyY2UgZm9ybSBvZiBhbnkgRGVyaXZhdGl2ZSBXb3JrcworICAgICAgIHRoYXQgWW91IGRpc3RyaWJ1dGUsIGFsbCBjb3B5cmlnaHQsIHBhdGVudCwgdHJhZGVtYXJrLCBhbmQKKyAgICAgICBhdHRyaWJ1dGlvbiBub3RpY2VzIGZyb20gdGhlIFNvdXJjZSBmb3JtIG9mIHRoZSBXb3JrLAorICAgICAgIGV4Y2x1ZGluZyB0aG9zZSBub3RpY2VzIHRoYXQgZG8gbm90IHBlcnRhaW4gdG8gYW55IHBhcnQgb2YKKyAgICAgICB0aGUgRGVyaXZhdGl2ZSBXb3JrczsgYW5kCisKKyAgIChkKSBJZiB0aGUgV29yayBpbmNsdWRlcyBhICJOT1RJQ0UiIHRleHQgZmlsZSBhcyBwYXJ0IG9mIGl0cworICAgICAgIGRpc3RyaWJ1dGlvbiwgdGhlbiBhbnkgRGVyaXZhdGl2ZSBXb3JrcyB0aGF0IFlvdSBkaXN0cmlidXRlIG11c3QKKyAgICAgICBpbmNsdWRlIGEgcmVhZGFibGUgY29weSBvZiB0aGUgYXR0cmlidXRpb24gbm90aWNlcyBjb250YWluZWQKKyAgICAgICB3aXRoaW4gc3VjaCBOT1RJQ0UgZmlsZSwgZXhjbHVkaW5nIHRob3NlIG5vdGljZXMgdGhhdCBkbyBub3QKKyAgICAgICBwZXJ0YWluIHRvIGFueSBwYXJ0IG9mIHRoZSBEZXJpdmF0aXZlIFdvcmtzLCBpbiBhdCBsZWFzdCBvbmUKKyAgICAgICBvZiB0aGUgZm9sbG93aW5nIHBsYWNlczogd2l0aGluIGEgTk9USUNFIHRleHQgZmlsZSBkaXN0cmlidXRlZAorICAgICAgIGFzIHBhcnQgb2YgdGhlIERlcml2YXRpdmUgV29ya3M7IHdpdGhpbiB0aGUgU291cmNlIGZvcm0gb3IKKyAgICAgICBkb2N1bWVudGF0aW9uLCBpZiBwcm92aWRlZCBhbG9uZyB3aXRoIHRoZSBEZXJpdmF0aXZlIFdvcmtzOyBvciwKKyAgICAgICB3aXRoaW4gYSBkaXNwbGF5IGdlbmVyYXRlZCBieSB0aGUgRGVyaXZhdGl2ZSBXb3JrcywgaWYgYW5kCisgICAgICAgd2hlcmV2ZXIgc3VjaCB0aGlyZC1wYXJ0eSBub3RpY2VzIG5vcm1hbGx5IGFwcGVhci4gVGhlIGNvbnRlbnRzCisgICAgICAgb2YgdGhlIE5PVElDRSBmaWxlIGFyZSBmb3IgaW5mb3JtYXRpb25hbCBwdXJwb3NlcyBvbmx5IGFuZAorICAgICAgIGRvIG5vdCBtb2RpZnkgdGhlIExpY2Vuc2UuIFlvdSBtYXkgYWRkIFlvdXIgb3duIGF0dHJpYnV0aW9uCisgICAgICAgbm90aWNlcyB3aXRoaW4gRGVyaXZhdGl2ZSBXb3JrcyB0aGF0IFlvdSBkaXN0cmlidXRlLCBhbG9uZ3NpZGUKKyAgICAgICBvciBhcyBhbiBhZGRlbmR1bSB0byB0aGUgTk9USUNFIHRleHQgZnJvbSB0aGUgV29yaywgcHJvdmlkZWQKKyAgICAgICB0aGF0IHN1Y2ggYWRkaXRpb25hbCBhdHRyaWJ1dGlvbiBub3RpY2VzIGNhbm5vdCBiZSBjb25zdHJ1ZWQKKyAgICAgICBhcyBtb2RpZnlpbmcgdGhlIExpY2Vuc2UuCisKKyAgIFlvdSBtYXkgYWRkIFlvdXIgb3duIGNvcHlyaWdodCBzdGF0ZW1lbnQgdG8gWW91ciBtb2RpZmljYXRpb25zIGFuZAorICAgbWF5IHByb3ZpZGUgYWRkaXRpb25hbCBvciBkaWZmZXJlbnQgbGljZW5zZSB0ZXJtcyBhbmQgY29uZGl0aW9ucworICAgZm9yIHVzZSwgcmVwcm9kdWN0aW9uLCBvciBkaXN0cmlidXRpb24gb2YgWW91ciBtb2RpZmljYXRpb25zLCBvcgorICAgZm9yIGFueSBzdWNoIERlcml2YXRpdmUgV29ya3MgYXMgYSB3aG9sZSwgcHJvdmlkZWQgWW91ciB1c2UsCisgICByZXByb2R1Y3Rpb24sIGFuZCBkaXN0cmlidXRpb24gb2YgdGhlIFdvcmsgb3RoZXJ3aXNlIGNvbXBsaWVzIHdpdGgKKyAgIHRoZSBjb25kaXRpb25zIHN0YXRlZCBpbiB0aGlzIExpY2Vuc2UuCisKKzUuIFN1Ym1pc3Npb24gb2YgQ29udHJpYnV0aW9ucy4gVW5sZXNzIFlvdSBleHBsaWNpdGx5IHN0YXRlIG90aGVyd2lzZSwKKyAgIGFueSBDb250cmlidXRpb24gaW50ZW50aW9uYWxseSBzdWJtaXR0ZWQgZm9yIGluY2x1c2lvbiBpbiB0aGUgV29yaworICAgYnkgWW91IHRvIHRoZSBMaWNlbnNvciBzaGFsbCBiZSB1bmRlciB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YKKyAgIHRoaXMgTGljZW5zZSwgd2l0aG91dCBhbnkgYWRkaXRpb25hbCB0ZXJtcyBvciBjb25kaXRpb25zLgorICAgTm90d2l0aHN0YW5kaW5nIHRoZSBhYm92ZSwgbm90aGluZyBoZXJlaW4gc2hhbGwgc3VwZXJzZWRlIG9yIG1vZGlmeQorICAgdGhlIHRlcm1zIG9mIGFueSBzZXBhcmF0ZSBsaWNlbnNlIGFncmVlbWVudCB5b3UgbWF5IGhhdmUgZXhlY3V0ZWQKKyAgIHdpdGggTGljZW5zb3IgcmVnYXJkaW5nIHN1Y2ggQ29udHJpYnV0aW9ucy4KKworNi4gVHJhZGVtYXJrcy4gVGhpcyBMaWNlbnNlIGRvZXMgbm90IGdyYW50IHBlcm1pc3Npb24gdG8gdXNlIHRoZSB0cmFkZQorICAgbmFtZXMsIHRyYWRlbWFya3MsIHNlcnZpY2UgbWFya3MsIG9yIHByb2R1Y3QgbmFtZXMgb2YgdGhlIExpY2Vuc29yLAorICAgZXhjZXB0IGFzIHJlcXVpcmVkIGZvciByZWFzb25hYmxlIGFuZCBjdXN0b21hcnkgdXNlIGluIGRlc2NyaWJpbmcgdGhlCisgICBvcmlnaW4gb2YgdGhlIFdvcmsgYW5kIHJlcHJvZHVjaW5nIHRoZSBjb250ZW50IG9mIHRoZSBOT1RJQ0UgZmlsZS4KKworNy4gRGlzY2xhaW1lciBvZiBXYXJyYW50eS4gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yCisgICBhZ3JlZWQgdG8gaW4gd3JpdGluZywgTGljZW5zb3IgcHJvdmlkZXMgdGhlIFdvcmsgKGFuZCBlYWNoCisgICBDb250cmlidXRvciBwcm92aWRlcyBpdHMgQ29udHJpYnV0aW9ucykgb24gYW4gIkFTIElTIiBCQVNJUywKKyAgIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvcgorICAgaW1wbGllZCwgaW5jbHVkaW5nLCB3aXRob3V0IGxpbWl0YXRpb24sIGFueSB3YXJyYW50aWVzIG9yIGNvbmRpdGlvbnMKKyAgIG9mIFRJVExFLCBOT04tSU5GUklOR0VNRU5ULCBNRVJDSEFOVEFCSUxJVFksIG9yIEZJVE5FU1MgRk9SIEEKKyAgIFBBUlRJQ1VMQVIgUFVSUE9TRS4gWW91IGFyZSBzb2xlbHkgcmVzcG9uc2libGUgZm9yIGRldGVybWluaW5nIHRoZQorICAgYXBwcm9wcmlhdGVuZXNzIG9mIHVzaW5nIG9yIHJlZGlzdHJpYnV0aW5nIHRoZSBXb3JrIGFuZCBhc3N1bWUgYW55CisgICByaXNrcyBhc3NvY2lhdGVkIHdpdGggWW91ciBleGVyY2lzZSBvZiBwZXJtaXNzaW9ucyB1bmRlciB0aGlzIExpY2Vuc2UuCisKKzguIExpbWl0YXRpb24gb2YgTGlhYmlsaXR5LiBJbiBubyBldmVudCBhbmQgdW5kZXIgbm8gbGVnYWwgdGhlb3J5LAorICAgd2hldGhlciBpbiB0b3J0IChpbmNsdWRpbmcgbmVnbGlnZW5jZSksIGNvbnRyYWN0LCBvciBvdGhlcndpc2UsCisgICB1bmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgKHN1Y2ggYXMgZGVsaWJlcmF0ZSBhbmQgZ3Jvc3NseQorICAgbmVnbGlnZW50IGFjdHMpIG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzaGFsbCBhbnkgQ29udHJpYnV0b3IgYmUKKyAgIGxpYWJsZSB0byBZb3UgZm9yIGRhbWFnZXMsIGluY2x1ZGluZyBhbnkgZGlyZWN0LCBpbmRpcmVjdCwgc3BlY2lhbCwKKyAgIGluY2lkZW50YWwsIG9yIGNvbnNlcXVlbnRpYWwgZGFtYWdlcyBvZiBhbnkgY2hhcmFjdGVyIGFyaXNpbmcgYXMgYQorICAgcmVzdWx0IG9mIHRoaXMgTGljZW5zZSBvciBvdXQgb2YgdGhlIHVzZSBvciBpbmFiaWxpdHkgdG8gdXNlIHRoZQorICAgV29yayAoaW5jbHVkaW5nIGJ1dCBub3QgbGltaXRlZCB0byBkYW1hZ2VzIGZvciBsb3NzIG9mIGdvb2R3aWxsLAorICAgd29yayBzdG9wcGFnZSwgY29tcHV0ZXIgZmFpbHVyZSBvciBtYWxmdW5jdGlvbiwgb3IgYW55IGFuZCBhbGwKKyAgIG90aGVyIGNvbW1lcmNpYWwgZGFtYWdlcyBvciBsb3NzZXMpLCBldmVuIGlmIHN1Y2ggQ29udHJpYnV0b3IKKyAgIGhhcyBiZWVuIGFkdmlzZWQgb2YgdGhlIHBvc3NpYmlsaXR5IG9mIHN1Y2ggZGFtYWdlcy4KKworOS4gQWNjZXB0aW5nIFdhcnJhbnR5IG9yIEFkZGl0aW9uYWwgTGlhYmlsaXR5LiBXaGlsZSByZWRpc3RyaWJ1dGluZworICAgdGhlIFdvcmsgb3IgRGVyaXZhdGl2ZSBXb3JrcyB0aGVyZW9mLCBZb3UgbWF5IGNob29zZSB0byBvZmZlciwKKyAgIGFuZCBjaGFyZ2UgYSBmZWUgZm9yLCBhY2NlcHRhbmNlIG9mIHN1cHBvcnQsIHdhcnJhbnR5LCBpbmRlbW5pdHksCisgICBvciBvdGhlciBsaWFiaWxpdHkgb2JsaWdhdGlvbnMgYW5kL29yIHJpZ2h0cyBjb25zaXN0ZW50IHdpdGggdGhpcworICAgTGljZW5zZS4gSG93ZXZlciwgaW4gYWNjZXB0aW5nIHN1Y2ggb2JsaWdhdGlvbnMsIFlvdSBtYXkgYWN0IG9ubHkKKyAgIG9uIFlvdXIgb3duIGJlaGFsZiBhbmQgb24gWW91ciBzb2xlIHJlc3BvbnNpYmlsaXR5LCBub3Qgb24gYmVoYWxmCisgICBvZiBhbnkgb3RoZXIgQ29udHJpYnV0b3IsIGFuZCBvbmx5IGlmIFlvdSBhZ3JlZSB0byBpbmRlbW5pZnksCisgICBkZWZlbmQsIGFuZCBob2xkIGVhY2ggQ29udHJpYnV0b3IgaGFybWxlc3MgZm9yIGFueSBsaWFiaWxpdHkKKyAgIGluY3VycmVkIGJ5LCBvciBjbGFpbXMgYXNzZXJ0ZWQgYWdhaW5zdCwgc3VjaCBDb250cmlidXRvciBieSByZWFzb24KKyAgIG9mIHlvdXIgYWNjZXB0aW5nIGFueSBzdWNoIHdhcnJhbnR5IG9yIGFkZGl0aW9uYWwgbGlhYmlsaXR5LgorCitFTkQgT0YgVEVSTVMgQU5EIENPTkRJVElPTlMKKworQVBQRU5ESVg6IEhvdyB0byBhcHBseSB0aGUgQXBhY2hlIExpY2Vuc2UgdG8geW91ciB3b3JrLgorCisgICBUbyBhcHBseSB0aGUgQXBhY2hlIExpY2Vuc2UgdG8geW91ciB3b3JrLCBhdHRhY2ggdGhlIGZvbGxvd2luZworICAgYm9pbGVycGxhdGUgbm90aWNlLCB3aXRoIHRoZSBmaWVsZHMgZW5jbG9zZWQgYnkgYnJhY2tldHMgIltdIgorICAgcmVwbGFjZWQgd2l0aCB5b3VyIG93biBpZGVudGlmeWluZyBpbmZvcm1hdGlvbi4gKERvbid0IGluY2x1ZGUKKyAgIHRoZSBicmFja2V0cyEpICBUaGUgdGV4dCBzaG91bGQgYmUgZW5jbG9zZWQgaW4gdGhlIGFwcHJvcHJpYXRlCisgICBjb21tZW50IHN5bnRheCBmb3IgdGhlIGZpbGUgZm9ybWF0LiBXZSBhbHNvIHJlY29tbWVuZCB0aGF0IGEKKyAgIGZpbGUgb3IgY2xhc3MgbmFtZSBhbmQgZGVzY3JpcHRpb24gb2YgcHVycG9zZSBiZSBpbmNsdWRlZCBvbiB0aGUKKyAgIHNhbWUgInByaW50ZWQgcGFnZSIgYXMgdGhlIGNvcHlyaWdodCBub3RpY2UgZm9yIGVhc2llcgorICAgaWRlbnRpZmljYXRpb24gd2l0aGluIHRoaXJkLXBhcnR5IGFyY2hpdmVzLgorCitDb3B5cmlnaHQgW3l5eXldIFtuYW1lIG9mIGNvcHlyaWdodCBvd25lcl0KKworTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Cit5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCitZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKworICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCitVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCitkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCitTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCitsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KZGlmZiAtLWdpdCBhL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3BvbS54bWwgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9wb20ueG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJhOGI0NjkKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9wb20ueG1sCkBAIC0wLDAgKzEsMTIxIEBACis8IS0tCitDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorCitMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKK3lvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KK1lvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorCitodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKworVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKK1dJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCistLT4KKzxwcm9qZWN0IHhtbG5zPSJodHRwOi8vbWF2ZW4uYXBhY2hlLm9yZy9QT00vNC4wLjAiCisgIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiCisgIHhzaTpzY2hlbWFMb2NhdGlvbj0iaHR0cDovL21hdmVuLmFwYWNoZS5vcmcvUE9NLzQuMC4wIGh0dHA6Ly9tYXZlbi5hcGFjaGUub3JnL21hdmVuLXY0XzBfMC54c2QiPgorICA8bW9kZWxWZXJzaW9uPjQuMC4wPC9tb2RlbFZlcnNpb24+CisKKyAgPGdyb3VwSWQ+JHtncm91cElkfTwvZ3JvdXBJZD4KKyAgPGFydGlmYWN0SWQ+JHthcnRpZmFjdElkfTwvYXJ0aWZhY3RJZD4KKyAgPHBhY2thZ2luZz5qYXI8L3BhY2thZ2luZz4KKyAgPHZlcnNpb24+JHt2ZXJzaW9ufTwvdmVyc2lvbj4KKyAgPG5hbWU+JHtwbHVnaW5OYW1lfTwvbmFtZT4KKworICA8cHJvcGVydGllcz4KKyAgICA8R2Vycml0LUFwaVR5cGU+JHtnZXJyaXRBcGlUeXBlfTwvR2Vycml0LUFwaVR5cGU+CisgICAgPEdlcnJpdC1BcGlWZXJzaW9uPiR7Z2Vycml0QXBpVmVyc2lvbn08L0dlcnJpdC1BcGlWZXJzaW9uPgorICA8L3Byb3BlcnRpZXM+CisKKyAgPGJ1aWxkPgorICAgIDxwbHVnaW5zPgorICAgICAgPHBsdWdpbj4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS5tYXZlbi5wbHVnaW5zPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi1qYXItcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICA8dmVyc2lvbj4yLjQ8L3ZlcnNpb24+CisgICAgICAgIDxjb25maWd1cmF0aW9uPgorICAgICAgICAgIDxpbmNsdWRlcz4KKyAgICAgICAgICAgIDxpbmNsdWRlPioqLyouanM8L2luY2x1ZGU+CisgICAgICAgICAgICA8aW5jbHVkZT4qKi8qLmNsYXNzPC9pbmNsdWRlPgorICAgICAgICAgIDwvaW5jbHVkZXM+CisgICAgICAgICAgPGFyY2hpdmU+CisgICAgICAgICAgICA8bWFuaWZlc3RFbnRyaWVzPgorICAgICAgICAgICAgICA8SW1wbGVtZW50YXRpb24tVmVuZG9yPiR7SW1wbGVtZW50YXRpb24tVmVuZG9yfTwvSW1wbGVtZW50YXRpb24tVmVuZG9yPgorICAgICAgICAgICAgICA8SW1wbGVtZW50YXRpb24tVVJMPiR7SW1wbGVtZW50YXRpb24tVXJsfTwvSW1wbGVtZW50YXRpb24tVVJMPgorCisgICAgICAgICAgICAgIDxJbXBsZW1lbnRhdGlvbi1UaXRsZT4ke0dlcnJpdC1BcGlUeXBlfSAke3Byb2plY3QuYXJ0aWZhY3RJZH08L0ltcGxlbWVudGF0aW9uLVRpdGxlPgorICAgICAgICAgICAgICA8SW1wbGVtZW50YXRpb24tVmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L0ltcGxlbWVudGF0aW9uLVZlcnNpb24+CisKKyAgICAgICAgICAgICAgPEdlcnJpdC1BcGlUeXBlPiR7R2Vycml0LUFwaVR5cGV9PC9HZXJyaXQtQXBpVHlwZT4KKyAgICAgICAgICAgICAgPEdlcnJpdC1BcGlWZXJzaW9uPiR7R2Vycml0LUFwaVZlcnNpb259PC9HZXJyaXQtQXBpVmVyc2lvbj4KKyAgICAgICAgICAgIDwvbWFuaWZlc3RFbnRyaWVzPgorICAgICAgICAgIDwvYXJjaGl2ZT4KKyAgICAgICAgPC9jb25maWd1cmF0aW9uPgorICAgICAgPC9wbHVnaW4+CisKKyAgICAgIDxwbHVnaW4+CisgICAgICAgIDxncm91cElkPm9yZy5hcGFjaGUubWF2ZW4ucGx1Z2luczwvZ3JvdXBJZD4KKyAgICAgICAgPGFydGlmYWN0SWQ+bWF2ZW4tY29tcGlsZXItcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICA8dmVyc2lvbj4yLjMuMjwvdmVyc2lvbj4KKyAgICAgICAgPGNvbmZpZ3VyYXRpb24+CisgICAgICAgICAgPHNvdXJjZT4xLjY8L3NvdXJjZT4KKyAgICAgICAgICA8dGFyZ2V0PjEuNjwvdGFyZ2V0PgorICAgICAgICAgIDxlbmNvZGluZz5VVEYtODwvZW5jb2Rpbmc+CisgICAgICAgIDwvY29uZmlndXJhdGlvbj4KKyAgICAgIDwvcGx1Z2luPgorCisgICAgICA8cGx1Z2luPgorICAgICAgICA8YXJ0aWZhY3RJZD5tYXZlbi1yZXNvdXJjZXMtcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICA8dmVyc2lvbj4yLjY8L3ZlcnNpb24+CisgICAgICAgIDxleGVjdXRpb25zPgorICAgICAgICAgIDxleGVjdXRpb24+CisgICAgICAgICAgICA8aWQ+Y29weS1yZXNvdXJjZXM8L2lkPgorICAgICAgICAgICAgPHBoYXNlPnByb2Nlc3MtcmVzb3VyY2VzPC9waGFzZT4KKyAgICAgICAgICAgIDxnb2Fscz4KKyAgICAgICAgICAgICAgPGdvYWw+Y29weS1yZXNvdXJjZXM8L2dvYWw+CisgICAgICAgICAgICA8L2dvYWxzPgorICAgICAgICAgICAgPGNvbmZpZ3VyYXRpb24+CisgICAgICAgICAgICAgIDxvdXRwdXREaXJlY3Rvcnk+JHtiYXNlZGlyfS90YXJnZXQvY2xhc3Nlcy9zdGF0aWM8L291dHB1dERpcmVjdG9yeT4KKyAgICAgICAgICAgICAgPHJlc291cmNlcz4KKyAgICAgICAgICAgICAgICA8cmVzb3VyY2U+CisgICAgICAgICAgICAgICAgICA8ZGlyZWN0b3J5PnNyYy9tYWluL2pzPC9kaXJlY3Rvcnk+CisgICAgICAgICAgICAgICAgICA8ZmlsdGVyaW5nPnRydWU8L2ZpbHRlcmluZz4KKyAgICAgICAgICAgICAgICA8L3Jlc291cmNlPgorICAgICAgICAgICAgICA8L3Jlc291cmNlcz4KKyAgICAgICAgICAgIDwvY29uZmlndXJhdGlvbj4KKyAgICAgICAgICA8L2V4ZWN1dGlvbj4KKyAgICAgICAgPC9leGVjdXRpb25zPgorICAgICAgPC9wbHVnaW4+CisKKyAgICA8L3BsdWdpbnM+CisgIDwvYnVpbGQ+CisKKyAgPGRlcGVuZGVuY2llcz4KKyAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgorICAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LWV4dGVuc2lvbi1hcGk8L2FydGlmYWN0SWQ+CisgICAgICA8dmVyc2lvbj4ke0dlcnJpdC1BcGlWZXJzaW9ufTwvdmVyc2lvbj4KKyAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+CisgICAgPC9kZXBlbmRlbmN5PgorCisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5qdW5pdDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmp1bml0PC9hcnRpZmFjdElkPgorICAgICAgPHZlcnNpb24+NC44LjE8L3ZlcnNpb24+CisgICAgICA8c2NvcGU+dGVzdDwvc2NvcGU+CisgICAgPC9kZXBlbmRlbmN5PgorICA8L2RlcGVuZGVuY2llcz4KKworICA8cmVwb3NpdG9yaWVzPgorICAgIDxyZXBvc2l0b3J5PgorICAgICAgPGlkPmdlcnJpdC1hcGktcmVwb3NpdG9yeTwvaWQ+CisjaWYgKCRnZXJyaXRBcGlWZXJzaW9uLmVuZHNXaXRoKCJTTkFQU0hPVCIpKQorICAgICAgPHVybD5odHRwczovL2dlcnJpdC1hcGkuY29tbW9uZGF0YXN0b3JhZ2UuZ29vZ2xlYXBpcy5jb20vc25hcHNob3QvPC91cmw+CisjZWxzZQorICAgICAgPHVybD5odHRwczovL2dlcnJpdC1hcGkuY29tbW9uZGF0YXN0b3JhZ2UuZ29vZ2xlYXBpcy5jb20vcmVsZWFzZS88L3VybD4KKyNlbmQKKyAgICA8L3JlcG9zaXRvcnk+CisgIDwvcmVwb3NpdG9yaWVzPgorPC9wcm9qZWN0PgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vamF2YS9NeUpzRXh0ZW5zaW9uLmphdmEgYi9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qYXZhL015SnNFeHRlbnNpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iZWM5MTRkZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wbHVnaW4tanMtYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3NyYy9tYWluL2phdmEvTXlKc0V4dGVuc2lvbi5qYXZhCkBAIC0wLDAgKzEsMjUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSAke3BhY2thZ2V9OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5MaXN0ZW47CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy53ZWJ1aS5KYXZhU2NyaXB0UGx1Z2luOworCitATGlzdGVuCitwdWJsaWMgY2xhc3MgTXlKc0V4dGVuc2lvbiBleHRlbmRzIEphdmFTY3JpcHRQbHVnaW4geworICBwdWJsaWMgTXlKc0V4dGVuc2lvbigpIHsKKyAgICBzdXBlcigiaGVsbG8tanMtcGx1Z2lucy5qcyIpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcGx1Z2luLWpzLWFyY2hldHlwZS9zcmMvbWFpbi9yZXNvdXJjZXMvYXJjaGV0eXBlLXJlc291cmNlcy9zcmMvbWFpbi9qcy9oZWxsby1qcy1wbHVnaW5zLmpzIGIvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vanMvaGVsbG8tanMtcGx1Z2lucy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mZDUxYTQyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGUvc3JjL21haW4vcmVzb3VyY2VzL2FyY2hldHlwZS1yZXNvdXJjZXMvc3JjL21haW4vanMvaGVsbG8tanMtcGx1Z2lucy5qcwpAQCAtMCwwICsxIEBACithbGVydCgiR3JlZXRpbmcgZnJvbSBKYXZhU2NyaXB0IEdlcnJpdCBwbHVnaW4hIik7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3BvbS54bWwgYi9nZXJyaXQtcHJldHRpZnkvcG9tLnhtbAppbmRleCA5MzU0Mjc0Li40ZGIxMDU2IDEwMDY0NAotLS0gYS9nZXJyaXQtcHJldHRpZnkvcG9tLnhtbAorKysgYi9nZXJyaXQtcHJldHRpZnkvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXByZXR0aWZ5PC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L0NsaWVudFNpZGVGb3JtYXR0ZXIuamF2YSBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9DbGllbnRTaWRlRm9ybWF0dGVyLmphdmEKaW5kZXggNGJjZTk1NC4uMTQzNmJiYSAxMDA2NDQKLS0tIGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L0NsaWVudFNpZGVGb3JtYXR0ZXIuamF2YQorKysgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvQ2xpZW50U2lkZUZvcm1hdHRlci5qYXZhCkBAIC0zOSwxNSArMzksMjUgQEAKICAgICBSb290UGFuZWwuZ2V0KCkuYWRkKHByZXR0aWZ5KTsKIAogICAgIHByZXR0aWZ5LmNvbXBpbGUoUmVzb3VyY2VzLkkuY29yZSgpKTsKKyAgICBwcmV0dGlmeS5jb21waWxlKFJlc291cmNlcy5JLmxhbmdfYXBvbGxvKCkpOworICAgIHByZXR0aWZ5LmNvbXBpbGUoUmVzb3VyY2VzLkkubGFuZ19jbGooKSk7CiAgICAgcHJldHRpZnkuY29tcGlsZShSZXNvdXJjZXMuSS5sYW5nX2NzcygpKTsKKyAgICBwcmV0dGlmeS5jb21waWxlKFJlc291cmNlcy5JLmxhbmdfZGFydCgpKTsKKyAgICBwcmV0dGlmeS5jb21waWxlKFJlc291cmNlcy5JLmxhbmdfZ28oKSk7CiAgICAgcHJldHRpZnkuY29tcGlsZShSZXNvdXJjZXMuSS5sYW5nX2hzKCkpOwogICAgIHByZXR0aWZ5LmNvbXBpbGUoUmVzb3VyY2VzLkkubGFuZ19saXNwKCkpOwogICAgIHByZXR0aWZ5LmNvbXBpbGUoUmVzb3VyY2VzLkkubGFuZ19sdWEoKSk7CiAgICAgcHJldHRpZnkuY29tcGlsZShSZXNvdXJjZXMuSS5sYW5nX21sKCkpOworICAgIHByZXR0aWZ5LmNvbXBpbGUoUmVzb3VyY2VzLkkubGFuZ19uKCkpOwogICAgIHByZXR0aWZ5LmNvbXBpbGUoUmVzb3VyY2VzLkkubGFuZ19wcm90bygpKTsKKyAgICBwcmV0dGlmeS5jb21waWxlKFJlc291cmNlcy5JLmxhbmdfc2NhbGEoKSk7CiAgICAgcHJldHRpZnkuY29tcGlsZShSZXNvdXJjZXMuSS5sYW5nX3NxbCgpKTsKKyAgICBwcmV0dGlmeS5jb21waWxlKFJlc291cmNlcy5JLmxhbmdfdGV4KCkpOwogICAgIHByZXR0aWZ5LmNvbXBpbGUoUmVzb3VyY2VzLkkubGFuZ192YigpKTsKKyAgICBwcmV0dGlmeS5jb21waWxlKFJlc291cmNlcy5JLmxhbmdfdmhkbCgpKTsKICAgICBwcmV0dGlmeS5jb21waWxlKFJlc291cmNlcy5JLmxhbmdfd2lraSgpKTsKKyAgICBwcmV0dGlmeS5jb21waWxlKFJlc291cmNlcy5JLmxhbmdfeHEoKSk7CisgICAgcHJldHRpZnkuY29tcGlsZShSZXNvdXJjZXMuSS5sYW5nX3lhbWwoKSk7CiAgIH0KIAogICBAT3ZlcnJpZGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9SZXNvdXJjZXMuamF2YSBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9SZXNvdXJjZXMuamF2YQppbmRleCA3NDVjOTIxLi5mNTNjOTFjIDEwMDY0NAotLS0gYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvUmVzb3VyY2VzLmphdmEKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L1Jlc291cmNlcy5qYXZhCkBAIC0zMiwzMyArMzIsMjMgQEAKICAgQFNvdXJjZSgicHJldHRpZnkuanMiKQogICBUZXh0UmVzb3VyY2UgY29yZSgpOwogCi0gIEBTb3VyY2UoImxhbmctYXBvbGxvLmpzIikKLSAgVGV4dFJlc291cmNlIGxhbmdfYXBvbGxvKCk7Ci0KLSAgQFNvdXJjZSgibGFuZy1jc3MuanMiKQotICBUZXh0UmVzb3VyY2UgbGFuZ19jc3MoKTsKLQotICBAU291cmNlKCJsYW5nLWhzLmpzIikKLSAgVGV4dFJlc291cmNlIGxhbmdfaHMoKTsKLQotICBAU291cmNlKCJsYW5nLWxpc3AuanMiKQotICBUZXh0UmVzb3VyY2UgbGFuZ19saXNwKCk7Ci0KLSAgQFNvdXJjZSgibGFuZy1sdWEuanMiKQotICBUZXh0UmVzb3VyY2UgbGFuZ19sdWEoKTsKLQotICBAU291cmNlKCJsYW5nLW1sLmpzIikKLSAgVGV4dFJlc291cmNlIGxhbmdfbWwoKTsKLQotICBAU291cmNlKCJsYW5nLXByb3RvLmpzIikKLSAgVGV4dFJlc291cmNlIGxhbmdfcHJvdG8oKTsKLQotICBAU291cmNlKCJsYW5nLXNxbC5qcyIpCi0gIFRleHRSZXNvdXJjZSBsYW5nX3NxbCgpOwotCi0gIEBTb3VyY2UoImxhbmctdmIuanMiKQotICBUZXh0UmVzb3VyY2UgbGFuZ192YigpOwotCi0gIEBTb3VyY2UoImxhbmctd2lraS5qcyIpCi0gIFRleHRSZXNvdXJjZSBsYW5nX3dpa2koKTsKKyAgQFNvdXJjZSgibGFuZy1hcG9sbG8uanMiKSBUZXh0UmVzb3VyY2UgbGFuZ19hcG9sbG8oKTsKKyAgQFNvdXJjZSgibGFuZy1jbGouanMiKSBUZXh0UmVzb3VyY2UgbGFuZ19jbGooKTsKKyAgQFNvdXJjZSgibGFuZy1jc3MuanMiKSBUZXh0UmVzb3VyY2UgbGFuZ19jc3MoKTsKKyAgQFNvdXJjZSgibGFuZy1kYXJ0LmpzIikgVGV4dFJlc291cmNlIGxhbmdfZGFydCgpOworICBAU291cmNlKCJsYW5nLWdvLmpzIikgVGV4dFJlc291cmNlIGxhbmdfZ28oKTsKKyAgQFNvdXJjZSgibGFuZy1ocy5qcyIpIFRleHRSZXNvdXJjZSBsYW5nX2hzKCk7CisgIEBTb3VyY2UoImxhbmctbGlzcC5qcyIpIFRleHRSZXNvdXJjZSBsYW5nX2xpc3AoKTsKKyAgQFNvdXJjZSgibGFuZy1sdWEuanMiKSBUZXh0UmVzb3VyY2UgbGFuZ19sdWEoKTsKKyAgQFNvdXJjZSgibGFuZy1tbC5qcyIpIFRleHRSZXNvdXJjZSBsYW5nX21sKCk7CisgIEBTb3VyY2UoImxhbmctbi5qcyIpIFRleHRSZXNvdXJjZSBsYW5nX24oKTsKKyAgQFNvdXJjZSgibGFuZy1wcm90by5qcyIpIFRleHRSZXNvdXJjZSBsYW5nX3Byb3RvKCk7CisgIEBTb3VyY2UoImxhbmctc2NhbGEuanMiKSBUZXh0UmVzb3VyY2UgbGFuZ19zY2FsYSgpOworICBAU291cmNlKCJsYW5nLXNxbC5qcyIpIFRleHRSZXNvdXJjZSBsYW5nX3NxbCgpOworICBAU291cmNlKCJsYW5nLXRleC5qcyIpIFRleHRSZXNvdXJjZSBsYW5nX3RleCgpOworICBAU291cmNlKCJsYW5nLXZiLmpzIikgVGV4dFJlc291cmNlIGxhbmdfdmIoKTsKKyAgQFNvdXJjZSgibGFuZy12aGRsLmpzIikgVGV4dFJlc291cmNlIGxhbmdfdmhkbCgpOworICBAU291cmNlKCJsYW5nLXdpa2kuanMiKSBUZXh0UmVzb3VyY2UgbGFuZ193aWtpKCk7CisgIEBTb3VyY2UoImxhbmcteHEuanMiKSBUZXh0UmVzb3VyY2UgbGFuZ194cSgpOworICBAU291cmNlKCJsYW5nLXlhbWwuanMiKSBUZXh0UmVzb3VyY2UgbGFuZ195YW1sKCk7CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jb21tb24vUHJldHR5Rm9ybWF0dGVyLmphdmEgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jb21tb24vUHJldHR5Rm9ybWF0dGVyLmphdmEKaW5kZXggMTUxMTQ5Yi4uNTExYjA1NiAxMDA2NDQKLS0tIGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY29tbW9uL1ByZXR0eUZvcm1hdHRlci5qYXZhCisrKyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NvbW1vbi9QcmV0dHlGb3JtYXR0ZXIuamF2YQpAQCAtMTM1LDExICsxMzUsMjEgQEAKICAgICAgIC8vIGNvbmZ1c2UgdGhlIHBhcnNlci4KICAgICAgIC8vCiAgICAgICBodG1sID0gaHRtbC5yZXBsYWNlQWxsKCImIzM5OyIsICInIik7Ci0gICAgICBodG1sID0gcHJldHRpZnkoaHRtbCwgZ2V0RmlsZVR5cGUoKSk7CiAKKyAgICAgIC8vIElmIGEgbGluZSBpcyBtb2RpZmllZCBhdCBpdHMgZW5kIGFuZCB0aGUgbGluZSBlbmRpbmcgaXMgY2hhbmdlZCBmcm9tCisgICAgICAvLyAnXG4nIHRvICdcclxuJyB0aGVuIHRoZSAnXHInIG9mIHRoZSBuZXcgbGluZSBpcyBwYXJ0IG9mIHRoZSBtb2RpZmllZAorICAgICAgLy8gdGV4dC4gSWYgaW50cmFsaW5lIGRpZmZzIGFyZSBoaWdobGlnaHRlZCB0aGUgbW9kaWZpZWQgdGV4dCBpcworICAgICAgLy8gc3Vycm91bmRlZCBieSBhICdzcGFuJyB0YWcuIEFzIHJlc3VsdCAnXHInIGFuZCAnXG4nIG9mIHRoZSBuZXcgbGluZSBnZXQKKyAgICAgIC8vIHNlcGFyYXRlZCBieSAnPC9zcGFuPicuIEZvciB0aGUgcHJldHRpZnkgcGFyc2VyIHRoaXMgbm93IGxvb2tzIGxpa2UgdHdvCisgICAgICAvLyBzZXBhcmF0ZSBsaW5lIGVuZGluZ3MuIFRoaXMgbWVzc2VzIHVwIHRoZSBsaW5lIGNvdW50aW5nIGJlbG93LgorICAgICAgLy8gRHJvcCBhbnkgJ1xyJyB0byBhdm9pZCB0aGlzIHByb2JsZW0uCisgICAgICBodG1sID0gaHRtbC5yZXBsYWNlKCJccjwvc3Bhbj5cbiIsICI8L3NwYW4+XG4iKTsKKworICAgICAgaHRtbCA9IGh0bWwucmVwbGFjZSgiXG4iLCAiIFxuIik7CisgICAgICBodG1sID0gcHJldHRpZnkoaHRtbCwgZ2V0RmlsZVR5cGUoKSk7CisgICAgICBodG1sID0gaHRtbC5yZXBsYWNlKCIgXG4iLCAiXG4iKTsKICAgICB9IGVsc2UgewogICAgICAgaHRtbCA9IGV4cGFuZFRhYnMoaHRtbCk7Ci0gICAgICBodG1sID0gaHRtbC5yZXBsYWNlQWxsKCJcbiIsICI8YnIgLz4iKTsKICAgICB9CiAKICAgICBpbnQgcG9zID0gMDsKQEAgLTE1Miw4ICsxNjIsOSBAQAogICAgIGJ1ZiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CiAgICAgd2hpbGUgKHBvcyA8PSBodG1sLmxlbmd0aCgpKSB7CiAgICAgICBpbnQgdGFnU3RhcnQgPSBodG1sLmluZGV4T2YoJzwnLCBwb3MpOworICAgICAgaW50IGxmID0gaHRtbC5pbmRleE9mKCdcbicsIHBvcyk7CiAKLSAgICAgIGlmICh0YWdTdGFydCA8IDApIHsKKyAgICAgIGlmICh0YWdTdGFydCA8IDAgJiYgbGYgPCAwKSB7CiAgICAgICAgIC8vIE5vIG1vcmUgdGFncyByZW1haW5pbmcuIFdoYXQncyBsZWZ0IGlzIHBsYWluIHRleHQuCiAgICAgICAgIC8vCiAgICAgICAgIGFzc2VydCBsYXN0VGFnID09IFRhZy5OVUxMOwpAQCAtMTY3LDYgKzE3OCwyMiBAQAogICAgICAgICBicmVhazsKICAgICAgIH0KIAorICAgICAgLy8gTGluZSBlbmQgb2NjdXJzIGJlZm9yZSB0aGUgbmV4dCBIVE1MIHRhZy4gQnJlYWsgdGhlIGxpbmUuCisgICAgICBpZiAoMCA8PSBsZiAmJiAobGYgPCB0YWdTdGFydCB8fCB0YWdTdGFydCA8IDApKSB7CisgICAgICAgIGlmICh0ZXh0Q2h1bmtTdGFydCA8IGxmKSB7CisgICAgICAgICAgbGFzdFRhZy5vcGVuKGJ1ZiwgaHRtbCk7CisgICAgICAgICAgaHRtbFRleHQoaHRtbC5zdWJzdHJpbmcodGV4dENodW5rU3RhcnQsIGxmKSk7CisgICAgICAgIH0KKyAgICAgICAgcG9zID0gbGYgKyAxOworICAgICAgICB0ZXh0Q2h1bmtTdGFydCA9IHBvczsKKworICAgICAgICBsYXN0VGFnLmNsb3NlKGJ1ZiwgaHRtbCk7CisgICAgICAgIGNvbnRlbnQuYWRkTGluZShzcmMubWFwSW5kZXhUb0xpbmUobGluZUlkeCsrKSwgYnVmLnRvU3RyaW5nKCkpOworICAgICAgICBidWYgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgICBjb2wgPSAwOworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKwogICAgICAgLy8gQXNzdW1lIG5vIGF0dHJpYnV0ZSBjb250YWlucyAnPicgYW5kIHRoYXQgYWxsIHRhZ3MKICAgICAgIC8vIHdpdGhpbiB0aGUgSFRNTCB3aWxsIGJlIHdlbGwtZm9ybWVkLgogICAgICAgLy8KQEAgLTE4MywxNCArMjEwLDcgQEAKICAgICAgIH0KICAgICAgIHRleHRDaHVua1N0YXJ0ID0gcG9zOwogCi0gICAgICBpZiAoaXNCUihodG1sLCB0YWdTdGFydCwgdGFnRW5kKSkgewotICAgICAgICBsYXN0VGFnLmNsb3NlKGJ1ZiwgaHRtbCk7Ci0gICAgICAgIGNvbnRlbnQuYWRkTGluZShzcmMubWFwSW5kZXhUb0xpbmUobGluZUlkeCksIGJ1Zi50b1N0cmluZygpKTsKLSAgICAgICAgYnVmID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgICAgY29sID0gMDsKLSAgICAgICAgbGluZUlkeCsrOwotCi0gICAgICB9IGVsc2UgaWYgKGh0bWwuY2hhckF0KHRhZ1N0YXJ0ICsgMSkgPT0gJy8nKSB7CisgICAgICBpZiAoaHRtbC5jaGFyQXQodGFnU3RhcnQgKyAxKSA9PSAnLycpIHsKICAgICAgICAgbGFzdFRhZyA9IGxhc3RUYWcucG9wKGJ1ZiwgaHRtbCk7CiAKICAgICAgIH0gZWxzZSBpZiAoaHRtbC5jaGFyQXQodGFnRW5kIC0gMSkgIT0gJy8nKSB7CkBAIC0yNDUsMTMgKzI2NSw2IEBACiAgIC8qKiBSdW4gdGhlIHByZXR0aWZ5IGVuZ2luZSBvdmVyIHRoZSB0ZXh0IGFuZCByZXR1cm4gdGhlIHJlc3VsdC4gKi8KICAgcHJvdGVjdGVkIGFic3RyYWN0IFN0cmluZyBwcmV0dGlmeShTdHJpbmcgaHRtbCwgU3RyaW5nIHR5cGUpOwogCi0gIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gaXNCUihTdHJpbmcgaHRtbCwgaW50IHRhZ1N0YXJ0LCBpbnQgdGFnRW5kKSB7Ci0gICAgcmV0dXJuIHRhZ0VuZCAtIHRhZ1N0YXJ0ID09IDUgLy8KLSAgICAgICAgJiYgaHRtbC5jaGFyQXQodGFnU3RhcnQgKyAxKSA9PSAnYicgLy8KLSAgICAgICAgJiYgaHRtbC5jaGFyQXQodGFnU3RhcnQgKyAyKSA9PSAncicgLy8KLSAgICAgICAgJiYgaHRtbC5jaGFyQXQodGFnU3RhcnQgKyAzKSA9PSAnICc7Ci0gIH0KLQogICBwcml2YXRlIHN0YXRpYyBjbGFzcyBUYWcgewogICAgIHN0YXRpYyBmaW5hbCBUYWcgTlVMTCA9IG5ldyBUYWcobnVsbCwgMCwgMCkgewogICAgICAgQE92ZXJyaWRlCmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jb21tb24vU3BhcnNlRmlsZUNvbnRlbnQuamF2YSBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NvbW1vbi9TcGFyc2VGaWxlQ29udGVudC5qYXZhCmluZGV4IDFhNTQ2OGMuLjYwOWYwOTEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NvbW1vbi9TcGFyc2VGaWxlQ29udGVudC5qYXZhCisrKyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NvbW1vbi9TcGFyc2VGaWxlQ29udGVudC5qYXZhCkBAIC0yOTYsNiArMjk2LDcgQEAKIAogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CisgICAgICAvLyBVc2FnZSBvZiBbIGFuZCApIGlzIGludGVudGlvbmFsIHRvIGRlbm90ZSBpbmNsdXNpdmUvZXhjbHVzaXZlIHJhbmdlCiAgICAgICByZXR1cm4gIlJhbmdlWyIgKyBiYXNlICsgIiwiICsgZW5kKCkgKyAiKSI7CiAgICAgfQogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLWFwb2xsby5qcyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctYXBvbGxvLmpzCmluZGV4IDQwNDIwMzAuLjk5ZTRhOTcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctYXBvbGxvLmpzCisrKyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctYXBvbGxvLmpzCkBAIC0xICsxLDIgQEAKLVBSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1tQUi5QUl9DT01NRU5ULC9eI1teXHJcbl0qLyxudWxsLCcjJ10sW1BSLlBSX1BMQUlOLC9eW1x0XG5cciBceEEwXSsvLG51bGwsJwlcblxyIFx4YTAnXSxbUFIuUFJfU1RSSU5HLC9eXCIoPzpbXlwiXFxdfFxcW1xzXFNdKSooPzpcInwkKS8sbnVsbCwnXCInXV0sW1tQUi5QUl9LRVlXT1JELC9eKD86QURTfEFEfEFVR3xCWkZ8QlpNRnxDQUV8Q0FGfENBfENDU3xDT018Q1N8REFTfERDQXxEQ09NfERDU3xERE9VQkx8RElNfERPVUJMRXxEVENCfERUQ0Z8RFZ8RFhDSHxFRFJVUFR8RVhURU5EfElOQ1J8SU5ERVh8TkRYfElOSElOVHxMWENIfE1BU0t8TVNLfE1QfE1TVXxOT09QfE9WU0t8UVhDSHxSQU5EfFJFQUR8UkVMSU5UfFJFU1VNRXxSRVRVUk58Uk9SfFJYT1J8U1FVQVJFfFNVfFRDUnxUQ0FBfE9WU0t8VENGfFRDfFRTfFdBTkR8V09SfFdSSVRFfFhDSHxYTFF8WFhBTFF8Wkx8WlF8QUREfEFEWnxTVUJ8U1VafE1QWXxNUFJ8TVBafERWUHxDT018QUJTfENMQXxDTFp8TERRfFNUT3xTVFF8QUxTfExMU3xMUlN8VFJBfFRTUXxUTUl8VE9WfEFYVHxUSVh8RExZfElOUHxPVVQpXHMvLG51bGxdLFtQUi5QUl9UWVBFLC9eKD86LT9HRU5BRFJ8PU1JTlVTfDJCQ0FEUnxWTnxCT0Z8TU18LT8yQ0FEUnwtP1sxLTZdRE5BRFJ8QURSRVN8QkJDT058W1NFXT9CQU5LXD0/fEJMT0NLfEJOS1NVTXxFP0NBRFJ8Q09VTlRcKj98Mj9ERUNcKj98LT9ETkNIQU58LT9ETlBUUnxFUVVBTFN8RVJBU0V8TUVNT1JZfDI/T0NUfFJFTUFEUnxTRVRMT0N8U1VCUk98T1JHfEJTU3xCRVN8U1lOfEVRVXxERUZJTkV8RU5EKVxzLyxudWxsXSxbUFIuUFJfTElURVJBTCwvXlwnKD86LSooPzpcd3xcXFtceDIxLVx4N2VdKSg/Oltcdy1dKnxcXFtceDIxLVx4N2VdKVs9IT9dPyk/L10sW1BSLlBSX1BMQUlOLC9eLSooPzpbIS16X118XFxbXHgyMS1ceDdlXSkoPzpbXHctXSp8XFxbXHgyMS1ceDdlXSlbPSE/XT8vaV0sW1BSLlBSX1BVTkNUVUFUSU9OLC9eW15cd1x0XG5cciBceEEwKClcIlxcXCc7XSsvXV0pLFsnYXBvbGxvJywnYWdjJywnYWVhJ10pClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbWyJjb20iLC9eI1teXG5ccl0qLyxudWxsLCIjIl0sWyJwbG4iLC9eW1x0XG5cciBceGEwXSsvLG51bGwsIlx0XG5cciBcdTAwYTAiXSxbInN0ciIsL14iKD86W14iXFxdfFxcW1xTXHNdKSooPzoifCQpLyxudWxsLCciJ11dLFtbImt3ZCIsL14oPzpBRFN8QUR8QVVHfEJaRnxCWk1GfENBRXxDQUZ8Q0F8Q0NTfENPTXxDU3xEQVN8RENBfERDT018RENTfERET1VCTHxESU18RE9VQkxFfERUQ0J8RFRDRnxEVnxEWENIfEVEUlVQVHxFWFRFTkR8SU5DUnxJTkRFWHxORFh8SU5ISU5UfExYQ0h8TUFTS3xNU0t8TVB8TVNVfE5PT1B8T1ZTS3xRWENIfFJBTkR8UkVBRHxSRUxJTlR8UkVTVU1FfFJFVFVSTnxST1J8UlhPUnxTUVVBUkV8U1V8VENSfFRDQUF8T1ZTS3xUQ0Z8VEN8VFN8V0FORHxXT1J8V1JJVEV8WENIfFhMUXxYWEFMUXxaTHxaUXxBRER8QURafFNVQnxTVVp8TVBZfE1QUnxNUFp8RFZQfENPTXxBQlN8Q0xBfENMWnxMRFF8U1RPfFNUUXxBTFN8TExTfExSU3xUUkF8VFNRfFRNSXxUT1Z8QVhUfFRJWHxETFl8SU5QfE9VVClccy8sCitudWxsXSxbInR5cCIsL14oPzotP0dFTkFEUnw9TUlOVVN8MkJDQURSfFZOfEJPRnxNTXwtPzJDQURSfC0/WzEtNl1ETkFEUnxBRFJFU3xCQkNPTnxbRVNdP0JBTks9P3xCTE9DS3xCTktTVU18RT9DQURSfENPVU5UXCo/fDI/REVDXCo/fC0/RE5DSEFOfC0/RE5QVFJ8RVFVQUxTfEVSQVNFfE1FTU9SWXwyP09DVHxSRU1BRFJ8U0VUTE9DfFNVQlJPfE9SR3xCU1N8QkVTfFNZTnxFUVV8REVGSU5FfEVORClccy8sbnVsbF0sWyJsaXQiLC9eJyg/Oi0qKD86XHd8XFxbIS1+XSkoPzpbXHctXSp8XFxbIS1+XSlbIT0/XT8pPy9dLFsicGxuIiwvXi0qKD86WyEtel18XFxbIS1+XSkoPzpbXHctXSp8XFxbIS1+XSlbIT0/XT8vXSxbInB1biIsL15bXlx3XHRcblxyICInLSk7XFxceGEwXSsvXV0pLFsiYXBvbGxvIiwiYWdjIiwiYWVhIl0pOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1jbGouanMgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLWNsai5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xYmI1MzljCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1jbGouanMKQEAgLTAsMCArMSwxOCBAQAorLyoKKyBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4KKworIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKworIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorCisgVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorKi8KK3ZhciBhPW51bGw7CitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbIm9wbiIsL15bKFt7XSsvLGEsIihbeyJdLFsiY2xvIiwvXlspXF19XSsvLGEsIildfSJdLFsiY29tIiwvXjtbXlxuXHJdKi8sYSwiOyJdLFsicGxuIiwvXltcdFxuXHIgXHhhMF0rLyxhLCJcdFxuXHIgXHUwMGEwIl0sWyJzdHIiLC9eIig/OlteIlxcXXxcXFtcU1xzXSkqKD86InwkKS8sYSwnIiddXSxbWyJrd2QiLC9eKD86ZGVmfGlmfGRvfGxldHxxdW90ZXx2YXJ8Zm58bG9vcHxyZWN1cnx0aHJvd3x0cnl8bW9uaXRvci1lbnRlcnxtb25pdG9yLWV4aXR8ZGVmbWFjcm98ZGVmbnxkZWZuLXxtYWNyb2V4cGFuZHxtYWNyb2V4cGFuZC0xfGZvcnxkb3NlcXxkb3N5bmN8ZG90aW1lc3xhbmR8b3J8d2hlbnxub3R8YXNzZXJ0fGRvdG98cHJveHl8ZGVmc3RydWN0fGZpcnN0fHJlc3R8Y29uc3xkZWZwcm90b2NvbHxkZWZ0eXBlfGRlZnJlY29yZHxyZWlmeXxkZWZtdWx0aXxkZWZtZXRob2R8bWV0YXx3aXRoLW1ldGF8bnN8aW4tbnN8Y3JlYXRlLW5zfGltcG9ydHxpbnRlcm58cmVmZXJ8YWxpYXN8bmFtZXNwYWNlfHJlc29sdmV8cmVmfGRlcmVmfHJlZnNldHxuZXd8c2V0IXxtZW1mbnx0by1hcnJheXxpbnRvLWFycmF5fGFzZXR8Z2VuLWNsYXNzfHJlZHVjZXxtYXB8ZmlsdGVyfGZpbmR8bmlsP3xlbXB0eT98aGFzaC1tYXB8aGFzaC1zZXR8dmVjfHZlY3RvcnxzZXF8ZmxhdHRlbnxyZXZlcnNlfGFzc29jfGRpc3NvY3xsaXN0fGxpc3Q/fGRpc2p8Z2V0fHVuaW9ufGRpZmZlcmVuY2V8aW50ZXJzZWN0aW9ufGV4dGVuZHxleHRlbmQtdHlwZXxleHRlbmQtcHJvdG9jb2x8cHJuKVxiLyxhXSwKK1sidHlwIiwvXjpbXGRBLVphLXotXSsvXV0pLFsiY2xqIl0pOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1jc3MuanMgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLWNzcy5qcwppbmRleCBjNjUwZDhmLi4yMDg2YmQ1IDEwMDY0NAotLS0gYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLWNzcy5qcworKysgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLWNzcy5qcwpAQCAtMSArMSwyIEBACi1QUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbUFIuUFJfUExBSU4sL15bIFx0XHJcblxmXSsvLG51bGwsJyAJXHJcbgwnXV0sW1tQUi5QUl9TVFJJTkcsL15cIig/OlteXG5cclxmXFxcIl18XFwoPzpcclxuP3xcbnxcZil8XFxbXHNcU10pKlwiLyxudWxsXSxbUFIuUFJfU1RSSU5HLC9eXCcoPzpbXlxuXHJcZlxcXCddfFxcKD86XHJcbj98XG58XGYpfFxcW1xzXFNdKSpcJy8sbnVsbF0sWydsYW5nLWNzcy1zdHInLC9edXJsXCgoW15cKVwiXCddKilcKS9pXSxbUFIuUFJfS0VZV09SRCwvXig/OnVybHxyZ2J8XCFpbXBvcnRhbnR8QGltcG9ydHxAcGFnZXxAbWVkaWF8QGNoYXJzZXR8aW5oZXJpdCkoPz1bXlwtXHddfCQpL2ksbnVsbF0sWydsYW5nLWNzcy1rdycsL14oLT8oPzpbX2Etel18KD86XFxbMC05YS1mXSsgPykpKD86W19hLXowLTlcLV18XFwoPzpcXFswLTlhLWZdKyA/KSkqKVxzKjovaV0sW1BSLlBSX0NPTU1FTlQsL15cL1wqW14qXSpcKisoPzpbXlwvKl1bXipdKlwqKykqXC8vXSxbUFIuUFJfQ09NTUVOVCwvXig/OjwhLS18LS0+KS9dLFtQUi5QUl9MSVRFUkFMLC9eKD86XGQrfFxkKlwuXGQrKSg/OiV8W2Etel0rKT8vaV0sW1BSLlBSX0xJVEVSQUwsL14jKD86WzAtOWEtZl17M30pezEsMn0vaV0sW1BSLlBSX1BMQUlOLC9eLT8oPzpbX2Etel18KD86XFxbXGRhLWZdKyA/KSkoPzpbX2EtelxkXC1dfFxcKD86XFxbXGRhLWZdKyA/KSkqL2ldLFtQUi5QUl9QVU5DVFVBVElPTiwvXlteXHNcd1wnXCJdKy9dXSksWydjc3MnXSksUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbXSxbW1BSLlBSX0tFWVdPUkQsL14tPyg/OltfYS16XXwoPzpcXFtcZGEtZl0rID8pKSg/OltfYS16XGRcLV18XFwoPzpcXFtcZGEtZl0rID8pKSovaV1dKSxbJ2Nzcy1rdyddKSxQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtdLFtbUFIuUFJfU1RSSU5HLC9eW15cKVwiXCddKy9dXSksWydjc3Mtc3RyJ10pClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbWyJwbG4iLC9eW1x0XG5cZlxyIF0rLyxudWxsLCIgXHRcclxuXHUwMDBjIl1dLFtbInN0ciIsL14iKD86W15cblxmXHIiXFxdfFxcKD86XHJcbj98XG58XGYpfFxcW1xTXHNdKSoiLyxudWxsXSxbInN0ciIsL14nKD86W15cblxmXHInXFxdfFxcKD86XHJcbj98XG58XGYpfFxcW1xTXHNdKSonLyxudWxsXSxbImxhbmctY3NzLXN0ciIsL151cmxcKChbXiInKV0rKVwpL2ldLFsia3dkIiwvXig/OnVybHxyZ2J8IWltcG9ydGFudHxAaW1wb3J0fEBwYWdlfEBtZWRpYXxAY2hhcnNldHxpbmhlcml0KSg/PVteXHctXXwkKS9pLG51bGxdLFsibGFuZy1jc3Mta3ciLC9eKC0/KD86W19hLXpdfFxcW1xkYS1mXSsgPykoPzpbXHctXXxcXFxcW1xkYS1mXSsgPykqKVxzKjovaV0sWyJjb20iLC9eXC9cKlteKl0qXCorKD86W14qL11bXipdKlwqKykqXC8vXSwKK1siY29tIiwvXig/OjxcIS0tfC0tXD4pL10sWyJsaXQiLC9eKD86XGQrfFxkKlwuXGQrKSg/OiV8W2Etel0rKT8vaV0sWyJsaXQiLC9eI1tcZGEtZl17Myw2fS9pXSxbInBsbiIsL14tPyg/OltfYS16XXxcXFtcZGEtZl0rID8pKD86W1x3LV18XFxcXFtcZGEtZl0rID8pKi9pXSxbInB1biIsL15bXlxzXHciJ10rL11dKSxbImNzcyJdKTtQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtdLFtbImt3ZCIsL14tPyg/OltfYS16XXxcXFtcZGEtZl0rID8pKD86W1x3LV18XFxcXFtcZGEtZl0rID8pKi9pXV0pLFsiY3NzLWt3Il0pO1BSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW10sW1sic3RyIiwvXlteIicpXSsvXV0pLFsiY3NzLXN0ciJdKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctZGFydC5qcyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctZGFydC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lZWZjY2M5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1kYXJ0LmpzCkBAIC0wLDAgKzEsMyBAQAorUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbWyJwbG4iLC9eW1x0XG5cciBceGEwXSsvLG51bGwsIlx0XG5cciBcdTAwYTAiXV0sW1siY29tIiwvXiMhLiovXSxbImt3ZCIsL15cYig/OmltcG9ydHxsaWJyYXJ5fHBhcnQgb2Z8cGFydHxhc3xzaG93fGhpZGUpXGIvaV0sWyJjb20iLC9eXC9cLy4qL10sWyJjb20iLC9eXC9cKlteKl0qXCorKD86W14qL11bXipdKlwqKykqXC8vXSxbImt3ZCIsL15cYig/OmNsYXNzfGludGVyZmFjZSlcYi9pXSxbImt3ZCIsL15cYig/OmFzc2VydHxicmVha3xjYXNlfGNhdGNofGNvbnRpbnVlfGRlZmF1bHR8ZG98ZWxzZXxmaW5hbGx5fGZvcnxpZnxpbnxpc3xuZXd8cmV0dXJufHN1cGVyfHN3aXRjaHx0aGlzfHRocm93fHRyeXx3aGlsZSlcYi9pXSxbImt3ZCIsL15cYig/OmFic3RyYWN0fGNvbnN0fGV4dGVuZHN8ZmFjdG9yeXxmaW5hbHxnZXR8aW1wbGVtZW50c3xuYXRpdmV8b3BlcmF0b3J8c2V0fHN0YXRpY3x0eXBlZGVmfHZhcilcYi9pXSwKK1sidHlwIiwvXlxiKD86Ym9vbHxkb3VibGV8ZHluYW1pY3xpbnR8bnVtfG9iamVjdHxzdHJpbmd8dm9pZClcYi9pXSxbImt3ZCIsL15cYig/OmZhbHNlfG51bGx8dHJ1ZSlcYi9pXSxbInN0ciIsL15yPycnJ1tcU1xzXSo/W15cXF0nJycvXSxbInN0ciIsL15yPyIiIltcU1xzXSo/W15cXF0iIiIvXSxbInN0ciIsL15yPycoJ3xbXlxuXGZccl0qP1teXFxdJykvXSxbInN0ciIsL15yPyIoInxbXlxuXGZccl0qP1teXFxdIikvXSxbInBsbiIsL15bJF9hLXpdXHcqL2ldLFsicHVuIiwvXlshJSYqKy86PC0/Xnx+LV0vXSxbImxpdCIsL15cYjB4W1xkYS1mXSsvaV0sWyJsaXQiLC9eXGJcZCsoPzpcLlxkKik/KD86ZVsrLV0/XGQrKT8vaV0sWyJsaXQiLC9eXGJcLlxkKyg/OmVbKy1dP1xkKyk/L2ldLFsicHVuIiwvXlsoKSwuO1tcXXt9XS9dXSksCitbImRhcnQiXSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLWdvLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1nby5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xY2FjYTIzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1nby5qcwpAQCAtMCwwICsxIEBACitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbInBsbiIsL15bXHRcblxyIFx4YTBdKy8sbnVsbCwiXHRcblxyIFx1MDBhMCJdLFsicGxuIiwvXig/OiIoPzpbXiJcXF18XFxbXFNcc10pKig/OiJ8JCl8Jyg/OlteJ1xcXXxcXFtcU1xzXSkrKD86J3wkKXxgW15gXSooPzpgfCQpKS8sbnVsbCwiXCInIl1dLFtbImNvbSIsL14oPzpcL1wvW15cblxyXSp8XC9cKltcU1xzXSo/XCpcLykvXSxbInBsbiIsL14oPzpbXiInL2BdfFwvKD8hWyovXSkpKy9dXSksWyJnbyJdKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctaHMuanMgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLWhzLmpzCmluZGV4IDI3YjIyMWEuLmZmMzcyOWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctaHMuanMKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1ocy5qcwpAQCAtMSArMSwyIEBACi1QUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbUFIuUFJfUExBSU4sL15bXHRcblx4MEJceDBDXHIgXSsvLG51bGwsJwlcbgsMXHIgJ10sW1BSLlBSX1NUUklORywvXlwiKD86W15cIlxcXG5ceDBDXHJdfFxcW1xzXFNdKSooPzpcInwkKS8sbnVsbCwnXCInXSxbUFIuUFJfU1RSSU5HLC9eXCcoPzpbXlwnXFxcblx4MENccl18XFxbXiZdKVwnPy8sbnVsbCwnXCcnXSxbUFIuUFJfTElURVJBTCwvXig/OjBvWzAtN10rfDB4W1xkYS1mXSt8XGQrKD86XC5cZCspPyg/OmVbK1wtXT9cZCspPykvaSxudWxsLCcwMTIzNDU2Nzg5J11dLFtbUFIuUFJfQ09NTUVOVCwvXig/Oig/Oi0tKyg/OlteXHJcblx4MENdKik/KXwoPzpcey0oPzpbXi1dfC0rW14tXH1dKSotXH0pKS9dLFtQUi5QUl9LRVlXT1JELC9eKD86Y2FzZXxjbGFzc3xkYXRhfGRlZmF1bHR8ZGVyaXZpbmd8ZG98ZWxzZXxpZnxpbXBvcnR8aW58aW5maXh8aW5maXhsfGluZml4cnxpbnN0YW5jZXxsZXR8bW9kdWxlfG5ld3R5cGV8b2Z8dGhlbnx0eXBlfHdoZXJlfF8pKD89W15hLXpBLVowLTlcJ118JCkvLG51bGxdLFtQUi5QUl9QTEFJTiwvXig/OltBLVpdW1x3XCddKlwuKSpbYS16QS1aXVtcd1wnXSovXSxbUFIuUFJfUFVOQ1RVQVRJT04sL15bXlx0XG5ceDBCXHgwQ1xyIGEtekEtWjAtOVwnXCJdKy9dXSksWydocyddKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK1BSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1sicGxuIiwvXltcdC1cciBdKy8sbnVsbCwiXHRcblx1MDAwYlx1MDAwY1xyICJdLFsic3RyIiwvXiIoPzpbXlxuXGZcciJcXF18XFxbXFNcc10pKig/OiJ8JCkvLG51bGwsJyInXSxbInN0ciIsL14nKD86W15cblxmXHInXFxdfFxcW14mXSknPy8sbnVsbCwiJyJdLFsibGl0IiwvXig/OjBvWzAtN10rfDB4W1xkYS1mXSt8XGQrKD86XC5cZCspPyg/OmVbKy1dP1xkKyk/KS9pLG51bGwsIjAxMjM0NTY3ODkiXV0sW1siY29tIiwvXig/Oi0tK1teXG5cZlxyXSp8ey0oPzpbXi1dfC0rW159LV0pKi19KS9dLFsia3dkIiwvXig/OmNhc2V8Y2xhc3N8ZGF0YXxkZWZhdWx0fGRlcml2aW5nfGRvfGVsc2V8aWZ8aW1wb3J0fGlufGluZml4fGluZml4bHxpbmZpeHJ8aW5zdGFuY2V8bGV0fG1vZHVsZXxuZXd0eXBlfG9mfHRoZW58dHlwZXx3aGVyZXxfKSg/PVteXGQnQS1aYS16XXwkKS8sCitudWxsXSxbInBsbiIsL14oPzpbQS1aXVtcdyddKlwuKSpbQS1aYS16XVtcdyddKi9dLFsicHVuIiwvXlteXGRcdC1cciAiJ0EtWmEtel0rL11dKSxbImhzIl0pOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1saXNwLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1saXNwLmpzCmluZGV4IDg1YzZjMjMuLjljOGNmYTUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctbGlzcC5qcworKysgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLWxpc3AuanMKQEAgLTEgKzEsMyBAQAotUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbWydvcG4nLC9eXCgvLG51bGwsJygnXSxbJ2NsbycsL15cKS8sbnVsbCwnKSddLFtQUi5QUl9DT01NRU5ULC9eO1teXHJcbl0qLyxudWxsLCc7J10sW1BSLlBSX1BMQUlOLC9eW1x0XG5cciBceEEwXSsvLG51bGwsJwlcblxyIFx4YTAnXSxbUFIuUFJfU1RSSU5HLC9eXCIoPzpbXlwiXFxdfFxcW1xzXFNdKSooPzpcInwkKS8sbnVsbCwnXCInXV0sW1tQUi5QUl9LRVlXT1JELC9eKD86YmxvY2t8Y1thZF0rcnxjYXRjaHxjb25zfGRlZnVufGRvfGVxfGVxbHxlcXVhbHxlcXVhbHB8ZXZhbC13aGVufGZsZXR8Zm9ybWF0fGdvfGlmfGxhYmVsc3xsYW1iZGF8bGV0fGxvYWQtdGltZS12YWx1ZXxsb2NhbGx5fG1hY3JvbGV0fG11bHRpcGxlLXZhbHVlLWNhbGx8bmlsfHByb2dufHByb2d2fHF1b3RlfHJlcXVpcmV8cmV0dXJuLWZyb218c2V0cXxzeW1ib2wtbWFjcm9sZXR8dHx0YWdib2R5fHRoZXx0aHJvd3x1bndpbmQpXGIvLG51bGxdLFtQUi5QUl9MSVRFUkFMLC9eWytcLV0/KD86MHhbMC05YS1mXSt8XGQrXC9cZCt8KD86XC5cZCt8XGQrKD86XC5cZCopPykoPzpbZWRdWytcLV0/XGQrKT8pL2ldLFtQUi5QUl9MSVRFUkFMLC9eXCcoPzotKig/Olx3fFxcW1x4MjEtXHg3ZV0pKD86W1x3LV0qfFxcW1x4MjEtXHg3ZV0pWz0hP10/KT8vXSxbUFIuUFJfUExBSU4sL14tKig/OlthLXpfXXxcXFtceDIxLVx4N2VdKSg/Oltcdy1dKnxcXFtceDIxLVx4N2VdKVs9IT9dPy9pXSxbUFIuUFJfUFVOQ1RVQVRJT04sL15bXlx3XHRcblxyIFx4QTAoKVwiXFxcJztdKy9dXSksWydjbCcsJ2VsJywnbGlzcCcsJ3NjbSddKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK3ZhciBhPW51bGw7CitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbIm9wbiIsL15cKCsvLGEsIigiXSxbImNsbyIsL15cKSsvLGEsIikiXSxbImNvbSIsL147W15cblxyXSovLGEsIjsiXSxbInBsbiIsL15bXHRcblxyIFx4YTBdKy8sYSwiXHRcblxyIFx1MDBhMCJdLFsic3RyIiwvXiIoPzpbXiJcXF18XFxbXFNcc10pKig/OiJ8JCkvLGEsJyInXV0sW1sia3dkIiwvXig/OmJsb2NrfGNbYWRdK3J8Y2F0Y2h8Y29uW2RzXXxkZWYoPzppbmV8dW4pfGRvfGVxfGVxbHxlcXVhbHxlcXVhbHB8ZXZhbC13aGVufGZsZXR8Zm9ybWF0fGdvfGlmfGxhYmVsc3xsYW1iZGF8bGV0fGxvYWQtdGltZS12YWx1ZXxsb2NhbGx5fG1hY3JvbGV0fG11bHRpcGxlLXZhbHVlLWNhbGx8bmlsfHByb2dufHByb2d2fHF1b3RlfHJlcXVpcmV8cmV0dXJuLWZyb218c2V0cXxzeW1ib2wtbWFjcm9sZXR8dHx0YWdib2R5fHRoZXx0aHJvd3x1bndpbmQpXGIvLGFdLAorWyJsaXQiLC9eWystXT8oPzpbIzBdeFtcZGEtZl0rfFxkK1wvXGQrfCg/OlwuXGQrfFxkKyg/OlwuXGQqKT8pKD86W2RlXVsrLV0/XGQrKT8pL2ldLFsibGl0IiwvXicoPzotKig/Olx3fFxcWyEtfl0pKD86W1x3LV0qfFxcWyEtfl0pWyE9P10/KT8vXSxbInBsbiIsL14tKig/OltfYS16XXxcXFshLX5dKSg/Oltcdy1dKnxcXFshLX5dKVshPT9dPy9pXSxbInB1biIsL15bXlx3XHRcblxyICInLSk7XFxceGEwXSsvXV0pLFsiY2wiLCJlbCIsImxpc3AiLCJsc3AiLCJzY20iLCJzcyIsInJrdCJdKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctbHVhLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1sdWEuanMKaW5kZXggZDEwN2JhYi4uN2U0NGNjYSAxMDA2NDQKLS0tIGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1sdWEuanMKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1sdWEuanMKQEAgLTEgKzEsMiBAQAotUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbW1BSLlBSX1BMQUlOLC9eW1x0XG5cciBceEEwXSsvLG51bGwsJwlcblxyIFx4YTAnXSxbUFIuUFJfU1RSSU5HLC9eKD86XCIoPzpbXlwiXFxdfFxcW1xzXFNdKSooPzpcInwkKXxcJyg/OlteXCdcXF18XFxbXHNcU10pKig/OlwnfCQpKS8sbnVsbCwnXCJcJyddXSxbW1BSLlBSX0NPTU1FTlQsL14tLSg/OlxbKD0qKVxbW1xzXFNdKj8oPzpcXVwxXF18JCl8W15cclxuXSopL10sW1BSLlBSX1NUUklORywvXlxbKD0qKVxbW1xzXFNdKj8oPzpcXVwxXF18JCkvXSxbUFIuUFJfS0VZV09SRCwvXig/OmFuZHxicmVha3xkb3xlbHNlfGVsc2VpZnxlbmR8ZmFsc2V8Zm9yfGZ1bmN0aW9ufGlmfGlufGxvY2FsfG5pbHxub3R8b3J8cmVwZWF0fHJldHVybnx0aGVufHRydWV8dW50aWx8d2hpbGUpXGIvLG51bGxdLFtQUi5QUl9MSVRFUkFMLC9eWystXT8oPzoweFtcZGEtZl0rfCg/Oig/OlwuXGQrfFxkKyg/OlwuXGQqKT8pKD86ZVsrXC1dP1xkKyk/KSkvaV0sW1BSLlBSX1BMQUlOLC9eW2Etel9dXHcqL2ldLFtQUi5QUl9QVU5DVFVBVElPTiwvXlteXHdcdFxuXHIgXHhBMF1bXlx3XHRcblxyIFx4QTBcIlwnXC1cKz1dKi9dXSksWydsdWEnXSkKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbInBsbiIsL15bXHRcblxyIFx4YTBdKy8sbnVsbCwiXHRcblxyIFx1MDBhMCJdLFsic3RyIiwvXig/OiIoPzpbXiJcXF18XFxbXFNcc10pKig/OiJ8JCl8Jyg/OlteJ1xcXXxcXFtcU1xzXSkqKD86J3wkKSkvLG51bGwsIlwiJyJdXSxbWyJjb20iLC9eLS0oPzpcWyg9KilcW1tcU1xzXSo/KD86XVwxXXwkKXxbXlxuXHJdKikvXSxbInN0ciIsL15cWyg9KilcW1tcU1xzXSo/KD86XVwxXXwkKS9dLFsia3dkIiwvXig/OmFuZHxicmVha3xkb3xlbHNlfGVsc2VpZnxlbmR8ZmFsc2V8Zm9yfGZ1bmN0aW9ufGlmfGlufGxvY2FsfG5pbHxub3R8b3J8cmVwZWF0fHJldHVybnx0aGVufHRydWV8dW50aWx8d2hpbGUpXGIvLG51bGxdLFsibGl0IiwvXlsrLV0/KD86MHhbXGRhLWZdK3woPzpcLlxkK3xcZCsoPzpcLlxkKik/KSg/OmVbKy1dP1xkKyk/KS9pXSwKK1sicGxuIiwvXltfYS16XVx3Ki9pXSxbInB1biIsL15bXlx3XHRcblxyIFx4YTBdW15cd1x0XG5cciAiJys9XHhhMC1dKi9dXSksWyJsdWEiXSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLW1sLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1tbC5qcwppbmRleCA2OThkNmRlLi44ZWQyYjBjIDEwMDY0NAotLS0gYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLW1sLmpzCisrKyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctbWwuanMKQEAgLTEgKzEsMiBAQAotUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbW1BSLlBSX1BMQUlOLC9eW1x0XG5cciBceEEwXSsvLG51bGwsJwlcblxyIFx4YTAnXSxbUFIuUFJfQ09NTUVOVCwvXiMoPzppZltcdFxuXHIgXHhBMF0rKD86W2Etel8kXVtcd1wnXSp8YGBbXlxyXG5cdGBdKig/OmBgfCQpKXxlbHNlfGVuZGlmfGxpZ2h0KS9pLG51bGwsJyMnXSxbUFIuUFJfU1RSSU5HLC9eKD86XCIoPzpbXlwiXFxdfFxcW1xzXFNdKSooPzpcInwkKXxcJyg/OlteXCdcXF18XFxbXHNcU10pKig/OlwnfCQpKS8sbnVsbCwnXCJcJyddXSxbW1BSLlBSX0NPTU1FTlQsL14oPzpcL1wvW15cclxuXSp8XChcKltcc1xTXSo/XCpcKSkvXSxbUFIuUFJfS0VZV09SRCwvXig/OmFic3RyYWN0fGFuZHxhc3xhc3NlcnR8YmVnaW58Y2xhc3N8ZGVmYXVsdHxkZWxlZ2F0ZXxkb3xkb25lfGRvd25jYXN0fGRvd250b3xlbGlmfGVsc2V8ZW5kfGV4Y2VwdGlvbnxleHRlcm58ZmFsc2V8ZmluYWxseXxmb3J8ZnVufGZ1bmN0aW9ufGlmfGlufGluaGVyaXR8aW5saW5lfGludGVyZmFjZXxpbnRlcm5hbHxsYXp5fGxldHxtYXRjaHxtZW1iZXJ8bW9kdWxlfG11dGFibGV8bmFtZXNwYWNlfG5ld3xudWxsfG9mfG9wZW58b3J8b3ZlcnJpZGV8cHJpdmF0ZXxwdWJsaWN8cmVjfHJldHVybnxzdGF0aWN8c3RydWN0fHRoZW58dG98dHJ1ZXx0cnl8dHlwZXx1cGNhc3R8dXNlfHZhbHx2b2lkfHdoZW58d2hpbGV8d2l0aHx5aWVsZHxhc3J8bGFuZHxsb3J8bHNsfGxzcnxseG9yfG1vZHxzaWd8YXRvbWljfGJyZWFrfGNoZWNrZWR8Y29tcG9uZW50fGNvbnN0fGNvbnN0cmFpbnR8Y29uc3RydWN0b3J8Y29udGludWV8ZWFnZXJ8ZXZlbnR8ZXh0ZXJuYWx8Zml4ZWR8ZnVuY3RvcnxnbG9iYWx8aW5jbHVkZXxtZXRob2R8bWl4aW58b2JqZWN0fHBhcmFsbGVsfHByb2Nlc3N8cHJvdGVjdGVkfHB1cmV8c2VhbGVkfHRyYWl0fHZpcnR1YWx8dm9sYXRpbGUpXGIvXSxbUFIuUFJfTElURVJBTCwvXlsrXC1dPyg/OjB4W1xkYS1mXSt8KD86KD86XC5cZCt8XGQrKD86XC5cZCopPykoPzplWytcLV0/XGQrKT8pKS9pXSxbUFIuUFJfUExBSU4sL14oPzpbYS16X11cdypbIT8jXT98YGBbXlxyXG5cdGBdKig/OmBgfCQpKS9pXSxbUFIuUFJfUFVOQ1RVQVRJT04sL15bXlx0XG5cciBceEEwXCJcJ1x3XSsvXV0pLFsnZnMnLCdtbCddKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK1BSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1sicGxuIiwvXltcdFxuXHIgXHhhMF0rLyxudWxsLCJcdFxuXHIgXHUwMGEwIl0sWyJjb20iLC9eIyg/OmlmW1x0XG5cciBceGEwXSsoPzpbJF9hLXpdW1x3J10qfGBgW15cdFxuXHJgXSooPzpgYHwkKSl8ZWxzZXxlbmRpZnxsaWdodCkvaSxudWxsLCIjIl0sWyJzdHIiLC9eKD86Iig/OlteIlxcXXxcXFtcU1xzXSkqKD86InwkKXwnKD86W14nXFxdfFxcW1xTXHNdKSg/Oid8JCkpLyxudWxsLCJcIiciXV0sW1siY29tIiwvXig/OlwvXC9bXlxuXHJdKnxcKFwqW1xTXHNdKj9cKlwpKS9dLFsia3dkIiwvXig/OmFic3RyYWN0fGFuZHxhc3xhc3NlcnR8YmVnaW58Y2xhc3N8ZGVmYXVsdHxkZWxlZ2F0ZXxkb3xkb25lfGRvd25jYXN0fGRvd250b3xlbGlmfGVsc2V8ZW5kfGV4Y2VwdGlvbnxleHRlcm58ZmFsc2V8ZmluYWxseXxmb3J8ZnVufGZ1bmN0aW9ufGlmfGlufGluaGVyaXR8aW5saW5lfGludGVyZmFjZXxpbnRlcm5hbHxsYXp5fGxldHxtYXRjaHxtZW1iZXJ8bW9kdWxlfG11dGFibGV8bmFtZXNwYWNlfG5ld3xudWxsfG9mfG9wZW58b3J8b3ZlcnJpZGV8cHJpdmF0ZXxwdWJsaWN8cmVjfHJldHVybnxzdGF0aWN8c3RydWN0fHRoZW58dG98dHJ1ZXx0cnl8dHlwZXx1cGNhc3R8dXNlfHZhbHx2b2lkfHdoZW58d2hpbGV8d2l0aHx5aWVsZHxhc3J8bGFuZHxsb3J8bHNsfGxzcnxseG9yfG1vZHxzaWd8YXRvbWljfGJyZWFrfGNoZWNrZWR8Y29tcG9uZW50fGNvbnN0fGNvbnN0cmFpbnR8Y29uc3RydWN0b3J8Y29udGludWV8ZWFnZXJ8ZXZlbnR8ZXh0ZXJuYWx8Zml4ZWR8ZnVuY3RvcnxnbG9iYWx8aW5jbHVkZXxtZXRob2R8bWl4aW58b2JqZWN0fHBhcmFsbGVsfHByb2Nlc3N8cHJvdGVjdGVkfHB1cmV8c2VhbGVkfHRyYWl0fHZpcnR1YWx8dm9sYXRpbGUpXGIvXSwKK1sibGl0IiwvXlsrLV0/KD86MHhbXGRhLWZdK3woPzpcLlxkK3xcZCsoPzpcLlxkKik/KSg/OmVbKy1dP1xkKyk/KS9pXSxbInBsbiIsL14oPzpbX2Etel1bXHcnXSpbISM/XT98YGBbXlx0XG5ccmBdKig/OmBgfCQpKS9pXSxbInB1biIsL15bXlx3XHRcblxyICInXHhhMF0rL11dKSxbImZzIiwibWwiXSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLW4uanMgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLW4uanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjc4MTJhNQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctbi5qcwpAQCAtMCwwICsxLDQgQEAKK3ZhciBhPW51bGw7CitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbInN0ciIsL14oPzonKD86W15cblxyJ1xcXXxcXC4pKid8Iig/OlteXG5cciJcXF18XFwuKSooPzoifCQpKS8sYSwnIiddLFsiY29tIiwvXiMoPzooPzpkZWZpbmV8ZWxpZnxlbHNlfGVuZGlmfGVycm9yfGlmZGVmfGluY2x1ZGV8aWZuZGVmfGxpbmV8cHJhZ21hfHVuZGVmfHdhcm5pbmcpXGJ8W15cblxyXSopLyxhLCIjIl0sWyJwbG4iLC9eXHMrLyxhLCIgXHJcblx0XHUwMGEwIl1dLFtbInN0ciIsL15AIig/OlteIl18IiIpKig/OiJ8JCkvLGFdLFsic3RyIiwvXjwjW14jPl0qKD86Iz58JCkvLGFdLFsic3RyIiwvXjwoPzooPzooPzpcLlwuXC8pKnxcLz8pKD86W1x3LV0rKD86XC9bXHctXSspKyk/W1x3LV0rXC5ofFthLXpdXHcqKT4vLGFdLFsiY29tIiwvXlwvXC9bXlxuXHJdKi8sYV0sWyJjb20iLC9eXC9cKltcU1xzXSo/KD86XCpcL3wkKS8sCithXSxbImt3ZCIsL14oPzphYnN0cmFjdHxhbmR8YXN8YmFzZXxjYXRjaHxjbGFzc3xkZWZ8ZGVsZWdhdGV8ZW51bXxldmVudHxleHRlcm58ZmFsc2V8ZmluYWxseXxmdW58aW1wbGVtZW50c3xpbnRlcmZhY2V8aW50ZXJuYWx8aXN8bWFjcm98bWF0Y2h8bWF0Y2hlc3xtb2R1bGV8bXV0YWJsZXxuYW1lc3BhY2V8bmV3fG51bGx8b3V0fG92ZXJyaWRlfHBhcmFtc3xwYXJ0aWFsfHByaXZhdGV8cHJvdGVjdGVkfHB1YmxpY3xyZWZ8c2VhbGVkfHN0YXRpY3xzdHJ1Y3R8c3ludGF4fHRoaXN8dGhyb3d8dHJ1ZXx0cnl8dHlwZXx0eXBlb2Z8dXNpbmd8dmFyaWFudHx2aXJ0dWFsfHZvbGF0aWxlfHdoZW58d2hlcmV8d2l0aHxhc3NlcnR8YXNzZXJ0Mnxhc3luY3xicmVha3xjaGVja2VkfGNvbnRpbnVlfGRvfGVsc2V8ZW5zdXJlc3xmb3J8Zm9yZWFjaHxpZnxsYXRlfGxvY2t8bmV3fG5vbGF0ZXxvdGhlcndpc2V8cmVnZXhwfHJlcGVhdHxyZXF1aXJlc3xyZXR1cm58c3Vycm91bmR3aXRofHVuY2hlY2tlZHx1bmxlc3N8dXNpbmd8d2hpbGV8eWllbGQpXGIvLAorYV0sWyJ0eXAiLC9eKD86YXJyYXl8Ym9vbHxieXRlfGNoYXJ8ZGVjaW1hbHxkb3VibGV8ZmxvYXR8aW50fGxpc3R8bG9uZ3xvYmplY3R8c2J5dGV8c2hvcnR8c3RyaW5nfHVsb25nfHVpbnR8dWZsb2F0fHVsb25nfHVzaG9ydHx2b2lkKVxiLyxhXSxbImxpdCIsL15AWyRfYS16XVtcdyRAXSovaSxhXSxbInR5cCIsL15AW0EtWl0rW2Etel1bXHckQF0qLyxhXSxbInBsbiIsL14nP1skX2Etel1bXHckQF0qL2ksYV0sWyJsaXQiLC9eKD86MHhbXGRhLWZdK3woPzpcZCg/Ol9cZCspKlxkKig/OlwuXGQqKT98XC5cZFwrKSg/OmVbKy1dP1xkKyk/KVthLXpdKi9pLGEsIjAxMjM0NTY3ODkiXSxbInB1biIsL14uW15cc1x3Ii0kJy4vQGBdKi8sYV1dKSxbIm4iLCJuZW1lcmxlIl0pOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1wcm90by5qcyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctcHJvdG8uanMKaW5kZXggZTY3OTY3Zi4uZjAwNmFkOCAxMDA2NDQKLS0tIGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1wcm90by5qcworKysgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLXByb3RvLmpzCkBAIC0xICsxIEBACi1QUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLnNvdXJjZURlY29yYXRvcih7a2V5d29yZHM6J2Jvb2wgYnl0ZXMgZGVmYXVsdCBkb3VibGUgZW51bSBleHRlbmQgZXh0ZW5zaW9ucyBmYWxzZSBmaXhlZDMyIGZpeGVkNjQgZmxvYXQgZ3JvdXAgaW1wb3J0IGludDMyIGludDY0IG1heCBtZXNzYWdlIG9wdGlvbiBvcHRpb25hbCBwYWNrYWdlIHJlcGVhdGVkIHJlcXVpcmVkIHJldHVybnMgcnBjIHNlcnZpY2Ugc2ZpeGVkMzIgc2ZpeGVkNjQgc2ludDMyIHNpbnQ2NCBzdHJpbmcgc3ludGF4IHRvIHRydWUgdWludDMyIHVpbnQ2NCcsY1N0eWxlQ29tbWVudHM6dHJ1ZX0pLFsncHJvdG8nXSkKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLnNvdXJjZURlY29yYXRvcih7a2V5d29yZHM6ImJ5dGVzLGRlZmF1bHQsZG91YmxlLGVudW0sZXh0ZW5kLGV4dGVuc2lvbnMsZmFsc2UsZ3JvdXAsaW1wb3J0LG1heCxtZXNzYWdlLG9wdGlvbixvcHRpb25hbCxwYWNrYWdlLHJlcGVhdGVkLHJlcXVpcmVkLHJldHVybnMscnBjLHNlcnZpY2Usc3ludGF4LHRvLHRydWUiLHR5cGVzOi9eKGJvb2x8KGRvdWJsZXxzP2ZpeGVkfFtzdV0/aW50KSgzMnw2NCl8ZmxvYXR8c3RyaW5nKVxiLyxjU3R5bGVDb21tZW50czohMH0pLFsicHJvdG8iXSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLXNjYWxhLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1zY2FsYS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zZjk3ZGJhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1zY2FsYS5qcwpAQCAtMCwwICsxLDIgQEAKK1BSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1sicGxuIiwvXltcdFxuXHIgXHhhMF0rLyxudWxsLCJcdFxuXHIgXHUwMGEwIl0sWyJzdHIiLC9eIig/OiIiKD86IiI/KD8hIil8W14iXFxdfFxcLikqInswLDN9fCg/OlteXG5cciJcXF18XFwuKSoiPykvLG51bGwsJyInXSxbImxpdCIsL15gKD86W15cblxyXFxgXXxcXC4pKmA/LyxudWxsLCJgIl0sWyJwdW4iLC9eWyEjJSYoLS06LUBbLV57LX5dKy8sbnVsbCwiISMlJigpKissLTo7PD0+P0BbXFxdXnt8fX4iXV0sW1sic3RyIiwvXicoPzpbXlxuXHInXFxdfFxcKD86J3xbXlxuXHInXSspKScvXSxbImxpdCIsL14nWyRBLVpfYS16XVtcdyRdKig/IVtcdyQnXSkvXSxbImt3ZCIsL14oPzphYnN0cmFjdHxjYXNlfGNhdGNofGNsYXNzfGRlZnxkb3xlbHNlfGV4dGVuZHN8ZmluYWx8ZmluYWxseXxmb3J8Zm9yU29tZXxpZnxpbXBsaWNpdHxpbXBvcnR8bGF6eXxtYXRjaHxuZXd8b2JqZWN0fG92ZXJyaWRlfHBhY2thZ2V8cHJpdmF0ZXxwcm90ZWN0ZWR8cmVxdWlyZXN8cmV0dXJufHNlYWxlZHxzdXBlcnx0aHJvd3x0cmFpdHx0cnl8dHlwZXx2YWx8dmFyfHdoaWxlfHdpdGh8eWllbGQpXGIvXSwKK1sibGl0IiwvXig/OnRydWV8ZmFsc2V8bnVsbHx0aGlzKVxiL10sWyJsaXQiLC9eKD86MCg/OlswLTddK3x4W1xkYS1mXSspbD98KD86MHxbMS05XVxkKikoPzooPzpcLlxkKyk/KD86ZVsrLV0/XGQrKT9mP3xsPyl8XFwuXGQrKD86ZVsrLV0/XGQrKT9mPykvaV0sWyJ0eXAiLC9eWyRfXSpbQS1aXVtcZCRBLVpfXSpbYS16XVtcdyRdKi9dLFsicGxuIiwvXlskQS1aX2Etel1bXHckXSovXSxbImNvbSIsL15cLyg/OlwvLip8XCooPzpcL3xcKipbXiovXSkqKD86XCorXC8/KT8pL10sWyJwdW4iLC9eKD86XC4rfFwvKS9dXSksWyJzY2FsYSJdKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctc3FsLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy1zcWwuanMKaW5kZXggZmYzODFjZDQuLjJmZGRkM2UgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctc3FsLmpzCisrKyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctc3FsLmpzCkBAIC0xICsxLDIgQEAKLVBSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1tQUi5QUl9QTEFJTiwvXltcdFxuXHIgXHhBMF0rLyxudWxsLCcJXG5cciBceGEwJ10sW1BSLlBSX1NUUklORywvXig/OiIoPzpbXlwiXFxdfFxcLikqInwnKD86W15cJ1xcXXxcXC4pKicpLyxudWxsLCdcIlwnJ11dLFtbUFIuUFJfQ09NTUVOVCwvXig/Oi0tW15cclxuXSp8XC9cKltcc1xTXSo/KD86XCpcL3wkKSkvXSxbUFIuUFJfS0VZV09SRCwvXig/OkFERHxBTEx8QUxURVJ8QU5EfEFOWXxBU3xBU0N8QVVUSE9SSVpBVElPTnxCQUNLVVB8QkVHSU58QkVUV0VFTnxCUkVBS3xCUk9XU0V8QlVMS3xCWXxDQVNDQURFfENBU0V8Q0hFQ0t8Q0hFQ0tQT0lOVHxDTE9TRXxDTFVTVEVSRUR8Q09BTEVTQ0V8Q09MTEFURXxDT0xVTU58Q09NTUlUfENPTVBVVEV8Q09OU1RSQUlOVHxDT05UQUlOU3xDT05UQUlOU1RBQkxFfENPTlRJTlVFfENPTlZFUlR8Q1JFQVRFfENST1NTfENVUlJFTlR8Q1VSUkVOVF9EQVRFfENVUlJFTlRfVElNRXxDVVJSRU5UX1RJTUVTVEFNUHxDVVJSRU5UX1VTRVJ8Q1VSU09SfERBVEFCQVNFfERCQ0N8REVBTExPQ0FURXxERUNMQVJFfERFRkFVTFR8REVMRVRFfERFTll8REVTQ3xESVNLfERJU1RJTkNUfERJU1RSSUJVVEVEfERPVUJMRXxEUk9QfERVTU1ZfERVTVB8RUxTRXxFTkR8RVJSTFZMfEVTQ0FQRXxFWENFUFR8RVhFQ3xFWEVDVVRFfEVYSVNUU3xFWElUfEZFVENIfEZJTEV8RklMTEZBQ1RPUnxGT1J8Rk9SRUlHTnxGUkVFVEVYVHxGUkVFVEVYVFRBQkxFfEZST018RlVMTHxGVU5DVElPTnxHT1RPfEdSQU5UfEdST1VQfEhBVklOR3xIT0xETE9DS3xJREVOVElUWXxJREVOVElUWUNPTHxJREVOVElUWV9JTlNFUlR8SUZ8SU58SU5ERVh8SU5ORVJ8SU5TRVJUfElOVEVSU0VDVHxJTlRPfElTfEpPSU58S0VZfEtJTEx8TEVGVHxMSUtFfExJTkVOT3xMT0FEfE5BVElPTkFMfE5PQ0hFQ0t8Tk9OQ0xVU1RFUkVEfE5PVHxOVUxMfE5VTExJRnxPRnxPRkZ8T0ZGU0VUU3xPTnxPUEVOfE9QRU5EQVRBU09VUkNFfE9QRU5RVUVSWXxPUEVOUk9XU0VUfE9QRU5YTUx8T1BUSU9OfE9SfE9SREVSfE9VVEVSfE9WRVJ8UEVSQ0VOVHxQTEFOfFBSRUNJU0lPTnxQUklNQVJZfFBSSU5UfFBST0N8UFJPQ0VEVVJFfFBVQkxJQ3xSQUlTRVJST1J8UkVBRHxSRUFEVEVYVHxSRUNPTkZJR1VSRXxSRUZFUkVOQ0VTfFJFUExJQ0FUSU9OfFJFU1RPUkV8UkVTVFJJQ1R8UkVUVVJOfFJFVk9LRXxSSUdIVHxST0xMQkFDS3xST1dDT1VOVHxST1dHVUlEQ09MfFJVTEV8U0FWRXxTQ0hFTUF8U0VMRUNUfFNFU1NJT05fVVNFUnxTRVR8U0VUVVNFUnxTSFVURE9XTnxTT01FfFNUQVRJU1RJQ1N8U1lTVEVNX1VTRVJ8VEFCTEV8VEVYVFNJWkV8VEhFTnxUT3xUT1B8VFJBTnxUUkFOU0FDVElPTnxUUklHR0VSfFRSVU5DQVRFfFRTRVFVQUx8VU5JT058VU5JUVVFfFVQREFURXxVUERBVEVURVhUfFVTRXxVU0VSfFZBTFVFU3xWQVJZSU5HfFZJRVd8V0FJVEZPUnxXSEVOfFdIRVJFfFdISUxFfFdJVEh8V1JJVEVURVhUKSg/PVteXHctXXwkKS9pLG51bGxdLFtQUi5QUl9MSVRFUkFMLC9eWystXT8oPzoweFtcZGEtZl0rfCg/Oig/OlwuXGQrfFxkKyg/OlwuXGQqKT8pKD86ZVsrXC1dP1xkKyk/KSkvaV0sW1BSLlBSX1BMQUlOLC9eW2Etel9dW1x3LV0qL2ldLFtQUi5QUl9QVU5DVFVBVElPTiwvXlteXHdcdFxuXHIgXHhBMFwiXCddW15cd1x0XG5cciBceEEwK1wtXCJcJ10qL11dKSxbJ3NxbCddKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK1BSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1sicGxuIiwvXltcdFxuXHIgXHhhMF0rLyxudWxsLCJcdFxuXHIgXHUwMGEwIl0sWyJzdHIiLC9eKD86Iig/OlteIlxcXXxcXC4pKiJ8Jyg/OlteJ1xcXXxcXC4pKicpLyxudWxsLCJcIiciXV0sW1siY29tIiwvXig/Oi0tW15cblxyXSp8XC9cKltcU1xzXSo/KD86XCpcL3wkKSkvXSxbImt3ZCIsL14oPzphZGR8YWxsfGFsdGVyfGFuZHxhbnl8YXBwbHl8YXN8YXNjfGF1dGhvcml6YXRpb258YmFja3VwfGJlZ2lufGJldHdlZW58YnJlYWt8YnJvd3NlfGJ1bGt8Ynl8Y2FzY2FkZXxjYXNlfGNoZWNrfGNoZWNrcG9pbnR8Y2xvc2V8Y2x1c3RlcmVkfGNvYWxlc2NlfGNvbGxhdGV8Y29sdW1ufGNvbW1pdHxjb21wdXRlfGNvbnN0cmFpbnR8Y29udGFpbnN8Y29udGFpbnN0YWJsZXxjb250aW51ZXxjb252ZXJ0fGNyZWF0ZXxjcm9zc3xjdXJyZW50fGN1cnJlbnRfZGF0ZXxjdXJyZW50X3RpbWV8Y3VycmVudF90aW1lc3RhbXB8Y3VycmVudF91c2VyfGN1cnNvcnxkYXRhYmFzZXxkYmNjfGRlYWxsb2NhdGV8ZGVjbGFyZXxkZWZhdWx0fGRlbGV0ZXxkZW55fGRlc2N8ZGlza3xkaXN0aW5jdHxkaXN0cmlidXRlZHxkb3VibGV8ZHJvcHxkdW1teXxkdW1wfGVsc2V8ZW5kfGVycmx2bHxlc2NhcGV8ZXhjZXB0fGV4ZWN8ZXhlY3V0ZXxleGlzdHN8ZXhpdHxmZXRjaHxmaWxlfGZpbGxmYWN0b3J8Zm9sbG93aW5nfGZvcnxmb3JlaWdufGZyZWV0ZXh0fGZyZWV0ZXh0dGFibGV8ZnJvbXxmdWxsfGZ1bmN0aW9ufGdvdG98Z3JhbnR8Z3JvdXB8aGF2aW5nfGhvbGRsb2NrfGlkZW50aXR5fGlkZW50aXR5Y29sfGlkZW50aXR5X2luc2VydHxpZnxpbnxpbmRleHxpbm5lcnxpbnNlcnR8aW50ZXJzZWN0fGludG98aXN8am9pbnxrZXl8a2lsbHxsZWZ0fGxpa2V8bGluZW5vfGxvYWR8bWF0Y2h8bWVyZ2V8bmF0aW9uYWx8bm9jaGVja3xub25jbHVzdGVyZWR8bm90fG51bGx8bnVsbGlmfG9mfG9mZnxvZmZzZXRzfG9ufG9wZW58b3BlbmRhdGFzb3VyY2V8b3BlbnF1ZXJ5fG9wZW5yb3dzZXR8b3BlbnhtbHxvcHRpb258b3J8b3JkZXJ8b3V0ZXJ8b3ZlcnxwZXJjZW50fHBsYW58cHJlY2VkaW5nfHByZWNpc2lvbnxwcmltYXJ5fHByaW50fHByb2N8cHJvY2VkdXJlfHB1YmxpY3xyYWlzZXJyb3J8cmVhZHxyZWFkdGV4dHxyZWNvbmZpZ3VyZXxyZWZlcmVuY2VzfHJlcGxpY2F0aW9ufHJlc3RvcmV8cmVzdHJpY3R8cmV0dXJufHJldm9rZXxyaWdodHxyb2xsYmFja3xyb3djb3VudHxyb3dndWlkY29sfHJvd3M/fHJ1bGV8c2F2ZXxzY2hlbWF8c2VsZWN0fHNlc3Npb25fdXNlcnxzZXR8c2V0dXNlcnxzaHV0ZG93bnxzb21lfHN0YXRpc3RpY3N8c3lzdGVtX3VzZXJ8dGFibGV8dGV4dHNpemV8dGhlbnx0b3x0b3B8dHJhbnx0cmFuc2FjdGlvbnx0cmlnZ2VyfHRydW5jYXRlfHRzZXF1YWx8dW5ib3VuZGVkfHVuaW9ufHVuaXF1ZXx1cGRhdGV8dXBkYXRldGV4dHx1c2V8dXNlcnx1c2luZ3x2YWx1ZXN8dmFyeWluZ3x2aWV3fHdhaXRmb3J8d2hlbnx3aGVyZXx3aGlsZXx3aXRofHdyaXRldGV4dCkoPz1bXlx3LV18JCkvaSwKK251bGxdLFsibGl0IiwvXlsrLV0/KD86MHhbXGRhLWZdK3woPzpcLlxkK3xcZCsoPzpcLlxkKik/KSg/OmVbKy1dP1xkKyk/KS9pXSxbInBsbiIsL15bX2Etel1bXHctXSovaV0sWyJwdW4iLC9eW15cd1x0XG5cciAiJ1x4YTBdW15cd1x0XG5cciAiJytceGEwLV0qL11dKSxbInNxbCJdKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctdGV4LmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy10ZXguanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGNmZGFkZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctdGV4LmpzCkBAIC0wLDAgKzEgQEAKK1BSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1sicGxuIiwvXltcdFxuXHIgXHhhMF0rLyxudWxsLCJcdFxuXHIgXHUwMGEwIl0sWyJjb20iLC9eJVteXG5ccl0qLyxudWxsLCIlIl1dLFtbImt3ZCIsL15cXFtALVphLXpdKy9dLFsia3dkIiwvXlxcLi9dLFsidHlwIiwvXlskJl0vXSxbImxpdCIsL1srLV0/KD86XC5cZCt8XGQrKD86XC5cZCopPykoY218ZW18ZXh8aW58cGN8cHR8YnB8bW0pL2ldLFsicHVuIiwvXlsoKT1bXF17fV0rL11dKSxbImxhdGV4IiwidGV4Il0pOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy12Yi5qcyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctdmIuanMKaW5kZXggY2FiY2U4NS4uYjE1MWI3YyAxMDA2NDQKLS0tIGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy12Yi5qcworKysgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLXZiLmpzCkBAIC0xICsxLDIgQEAKLVBSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1tQUi5QUl9QTEFJTiwvXltcdFxuXHIgXHhBMFx1MjAyOFx1MjAyOV0rLyxudWxsLCcJXG5cciBceGEwXHUyMDI4XHUyMDI5J10sW1BSLlBSX1NUUklORywvXig/OltcIlx1MjAxQ1x1MjAxRF0oPzpbXlwiXHUyMDFDXHUyMDFEXXxbXCJcdTIwMUNcdTIwMURdezJ9KSg/OltcIlx1MjAxQ1x1MjAxRF1jfCQpfFtcIlx1MjAxQ1x1MjAxRF0oPzpbXlwiXHUyMDFDXHUyMDFEXXxbXCJcdTIwMUNcdTIwMURdezJ9KSooPzpbXCJcdTIwMUNcdTIwMURdfCQpKS9pLG51bGwsJ1wiXHUyMDFjXHUyMDFkJ10sW1BSLlBSX0NPTU1FTlQsL15bXCdcdTIwMThcdTIwMTldW15cclxuXHUyMDI4XHUyMDI5XSovLG51bGwsJ1wnXHUyMDE4XHUyMDE5J11dLFtbUFIuUFJfS0VZV09SRCwvXig/OkFkZEhhbmRsZXJ8QWRkcmVzc09mfEFsaWFzfEFuZHxBbmRBbHNvfEFuc2l8QXN8QXNzZW1ibHl8QXV0b3xCb29sZWFufEJ5UmVmfEJ5dGV8QnlWYWx8Q2FsbHxDYXNlfENhdGNofENCb29sfENCeXRlfENDaGFyfENEYXRlfENEYmx8Q0RlY3xDaGFyfENJbnR8Q2xhc3N8Q0xuZ3xDT2JqfENvbnN0fENTaG9ydHxDU25nfENTdHJ8Q1R5cGV8RGF0ZXxEZWNpbWFsfERlY2xhcmV8RGVmYXVsdHxEZWxlZ2F0ZXxEaW18RGlyZWN0Q2FzdHxEb3xEb3VibGV8RWFjaHxFbHNlfEVsc2VJZnxFbmR8RW5kSWZ8RW51bXxFcmFzZXxFcnJvcnxFdmVudHxFeGl0fEZpbmFsbHl8Rm9yfEZyaWVuZHxGdW5jdGlvbnxHZXR8R2V0VHlwZXxHb1N1YnxHb1RvfEhhbmRsZXN8SWZ8SW1wbGVtZW50c3xJbXBvcnRzfElufEluaGVyaXRzfEludGVnZXJ8SW50ZXJmYWNlfElzfExldHxMaWJ8TGlrZXxMb25nfExvb3B8TWV8TW9kfE1vZHVsZXxNdXN0SW5oZXJpdHxNdXN0T3ZlcnJpZGV8TXlCYXNlfE15Q2xhc3N8TmFtZXNwYWNlfE5ld3xOZXh0fE5vdHxOb3RJbmhlcml0YWJsZXxOb3RPdmVycmlkYWJsZXxPYmplY3R8T258T3B0aW9ufE9wdGlvbmFsfE9yfE9yRWxzZXxPdmVybG9hZHN8T3ZlcnJpZGFibGV8T3ZlcnJpZGVzfFBhcmFtQXJyYXl8UHJlc2VydmV8UHJpdmF0ZXxQcm9wZXJ0eXxQcm90ZWN0ZWR8UHVibGljfFJhaXNlRXZlbnR8UmVhZE9ubHl8UmVEaW18UmVtb3ZlSGFuZGxlcnxSZXN1bWV8UmV0dXJufFNlbGVjdHxTZXR8U2hhZG93c3xTaGFyZWR8U2hvcnR8U2luZ2xlfFN0YXRpY3xTdGVwfFN0b3B8U3RyaW5nfFN0cnVjdHVyZXxTdWJ8U3luY0xvY2t8VGhlbnxUaHJvd3xUb3xUcnl8VHlwZU9mfFVuaWNvZGV8VW50aWx8VmFyaWFudHxXZW5kfFdoZW58V2hpbGV8V2l0aHxXaXRoRXZlbnRzfFdyaXRlT25seXxYb3J8RW5kSWZ8R29TdWJ8TGV0fFZhcmlhbnR8V2VuZClcYi9pLG51bGxdLFtQUi5QUl9DT01NRU5ULC9eUkVNW15cclxuXHUyMDI4XHUyMDI5XSovaV0sW1BSLlBSX0xJVEVSQUwsL14oPzpUcnVlXGJ8RmFsc2VcYnxOb3RoaW5nXGJ8XGQrKD86RVsrXC1dP1xkK1tGUkRdP3xbRlJEU0lMXSk/fCg/OiZIWzAtOUEtRl0rfCZPWzAtN10rKVtTSUxdP3xcZCpcLlxkKyg/OkVbK1wtXT9cZCspP1tGUkRdP3wjXHMrKD86XGQrW1wtXC9dXGQrW1wtXC9dXGQrKD86XHMrXGQrOlxkKyg/OjpcZCspPyhccyooPzpBTXxQTSkpPyk/fFxkKzpcZCsoPzo6XGQrKT8oXHMqKD86QU18UE0pKT8pXHMrIykvaV0sW1BSLlBSX1BMQUlOLC9eKD86KD86W2Etel18X1x3KVx3KnxcWyg/OlthLXpdfF9cdylcdypcXSkvaV0sW1BSLlBSX1BVTkNUVUFUSU9OLC9eW15cd1x0XG5cciBcIlwnXFtcXVx4QTBcdTIwMThcdTIwMTlcdTIwMUNcdTIwMURcdTIwMjhcdTIwMjldKy9dLFtQUi5QUl9QVU5DVFVBVElPTiwvXig/OlxbfFxdKS9dXSksWyd2YicsJ3ZicyddKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK1BSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1sicGxuIiwvXltcdFxuXHIgXHhhMFx1MjAyOFx1MjAyOV0rLyxudWxsLCJcdFxuXHIgXHUwMGEwXHUyMDI4XHUyMDI5Il0sWyJzdHIiLC9eKD86WyJcdTIwMWNcdTIwMWRdKD86W14iXHUyMDFjXHUyMDFkXXxbIlx1MjAxY1x1MjAxZF17Mn0pKD86WyJcdTIwMWNcdTIwMWRdY3wkKXxbIlx1MjAxY1x1MjAxZF0oPzpbXiJcdTIwMWNcdTIwMWRdfFsiXHUyMDFjXHUyMDFkXXsyfSkqKD86WyJcdTIwMWNcdTIwMWRdfCQpKS9pLG51bGwsJyJcdTIwMWNcdTIwMWQnXSxbImNvbSIsL15bJ1x1MjAxOFx1MjAxOV0oPzpfKD86XHJcbj98W15ccl0/KXxbXlxuXHJfXHUyMDI4XHUyMDI5XSkqLyxudWxsLCInXHUyMDE4XHUyMDE5Il1dLFtbImt3ZCIsL14oPzphZGRoYW5kbGVyfGFkZHJlc3NvZnxhbGlhc3xhbmR8YW5kYWxzb3xhbnNpfGFzfGFzc2VtYmx5fGF1dG98Ym9vbGVhbnxieXJlZnxieXRlfGJ5dmFsfGNhbGx8Y2FzZXxjYXRjaHxjYm9vbHxjYnl0ZXxjY2hhcnxjZGF0ZXxjZGJsfGNkZWN8Y2hhcnxjaW50fGNsYXNzfGNsbmd8Y29ianxjb25zdHxjc2hvcnR8Y3NuZ3xjc3RyfGN0eXBlfGRhdGV8ZGVjaW1hbHxkZWNsYXJlfGRlZmF1bHR8ZGVsZWdhdGV8ZGltfGRpcmVjdGNhc3R8ZG98ZG91YmxlfGVhY2h8ZWxzZXxlbHNlaWZ8ZW5kfGVuZGlmfGVudW18ZXJhc2V8ZXJyb3J8ZXZlbnR8ZXhpdHxmaW5hbGx5fGZvcnxmcmllbmR8ZnVuY3Rpb258Z2V0fGdldHR5cGV8Z29zdWJ8Z290b3xoYW5kbGVzfGlmfGltcGxlbWVudHN8aW1wb3J0c3xpbnxpbmhlcml0c3xpbnRlZ2VyfGludGVyZmFjZXxpc3xsZXR8bGlifGxpa2V8bG9uZ3xsb29wfG1lfG1vZHxtb2R1bGV8bXVzdGluaGVyaXR8bXVzdG92ZXJyaWRlfG15YmFzZXxteWNsYXNzfG5hbWVzcGFjZXxuZXd8bmV4dHxub3R8bm90aW5oZXJpdGFibGV8bm90b3ZlcnJpZGFibGV8b2JqZWN0fG9ufG9wdGlvbnxvcHRpb25hbHxvcnxvcmVsc2V8b3ZlcmxvYWRzfG92ZXJyaWRhYmxlfG92ZXJyaWRlc3xwYXJhbWFycmF5fHByZXNlcnZlfHByaXZhdGV8cHJvcGVydHl8cHJvdGVjdGVkfHB1YmxpY3xyYWlzZWV2ZW50fHJlYWRvbmx5fHJlZGltfHJlbW92ZWhhbmRsZXJ8cmVzdW1lfHJldHVybnxzZWxlY3R8c2V0fHNoYWRvd3N8c2hhcmVkfHNob3J0fHNpbmdsZXxzdGF0aWN8c3RlcHxzdG9wfHN0cmluZ3xzdHJ1Y3R1cmV8c3VifHN5bmNsb2NrfHRoZW58dGhyb3d8dG98dHJ5fHR5cGVvZnx1bmljb2RlfHVudGlsfHZhcmlhbnR8d2VuZHx3aGVufHdoaWxlfHdpdGh8d2l0aGV2ZW50c3x3cml0ZW9ubHl8eG9yfGVuZGlmfGdvc3VifGxldHx2YXJpYW50fHdlbmQpXGIvaSwKK251bGxdLFsiY29tIiwvXnJlbS4qL2ldLFsibGl0IiwvXig/OnRydWVcYnxmYWxzZVxifG5vdGhpbmdcYnxcZCsoPzplWystXT9cZCtbZGZyXT98W2RmaWxyc10pP3woPzomaFtcZGEtZl0rfCZvWzAtN10rKVtpbHNdP3xcZCpcLlxkKyg/OmVbKy1dP1xkKyk/W2Rmcl0/fCNccysoPzpcZCtbLy1dXGQrWy8tXVxkKyg/OlxzK1xkKzpcZCsoPzo6XGQrKT8oXHMqKD86YW18cG0pKT8pP3xcZCs6XGQrKD86OlxkKyk/KFxzKig/OmFtfHBtKSk/KVxzKyMpL2ldLFsicGxuIiwvXig/Oig/OlthLXpdfF9cdylcdyp8XFsoPzpbYS16XXxfXHcpXHcqXSkvaV0sWyJwdW4iLC9eW15cd1x0XG5cciAiJ1tcXVx4YTBcdTIwMThcdTIwMTlcdTIwMWNcdTIwMWRcdTIwMjhcdTIwMjldKy9dLFsicHVuIiwvXig/OlxbfF0pL11dKSxbInZiIiwidmJzIl0pOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy12aGRsLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy12aGRsLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUxZjMwMTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLXZoZGwuanMKQEAgLTAsMCArMSwzIEBACitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbInBsbiIsL15bXHRcblxyIFx4YTBdKy8sbnVsbCwiXHRcblxyIFx1MDBhMCJdXSxbWyJzdHIiLC9eKD86W2JveF0/Iig/OlteIl18IiIpKiJ8Jy4nKS9pXSxbImNvbSIsL14tLVteXG5ccl0qL10sWyJrd2QiLC9eKD86YWJzfGFjY2Vzc3xhZnRlcnxhbGlhc3xhbGx8YW5kfGFyY2hpdGVjdHVyZXxhcnJheXxhc3NlcnR8YXR0cmlidXRlfGJlZ2lufGJsb2NrfGJvZHl8YnVmZmVyfGJ1c3xjYXNlfGNvbXBvbmVudHxjb25maWd1cmF0aW9ufGNvbnN0YW50fGRpc2Nvbm5lY3R8ZG93bnRvfGVsc2V8ZWxzaWZ8ZW5kfGVudGl0eXxleGl0fGZpbGV8Zm9yfGZ1bmN0aW9ufGdlbmVyYXRlfGdlbmVyaWN8Z3JvdXB8Z3VhcmRlZHxpZnxpbXB1cmV8aW58aW5lcnRpYWx8aW5vdXR8aXN8bGFiZWx8bGlicmFyeXxsaW5rYWdlfGxpdGVyYWx8bG9vcHxtYXB8bW9kfG5hbmR8bmV3fG5leHR8bm9yfG5vdHxudWxsfG9mfG9ufG9wZW58b3J8b3RoZXJzfG91dHxwYWNrYWdlfHBvcnR8cG9zdHBvbmVkfHByb2NlZHVyZXxwcm9jZXNzfHB1cmV8cmFuZ2V8cmVjb3JkfHJlZ2lzdGVyfHJlamVjdHxyZW18cmVwb3J0fHJldHVybnxyb2x8cm9yfHNlbGVjdHxzZXZlcml0eXxzaGFyZWR8c2lnbmFsfHNsYXxzbGx8c3JhfHNybHxzdWJ0eXBlfHRoZW58dG98dHJhbnNwb3J0fHR5cGV8dW5hZmZlY3RlZHx1bml0c3x1bnRpbHx1c2V8dmFyaWFibGV8d2FpdHx3aGVufHdoaWxlfHdpdGh8eG5vcnx4b3IpKD89W15cdy1dfCQpL2ksCitudWxsXSxbInR5cCIsL14oPzpiaXR8Yml0X3ZlY3RvcnxjaGFyYWN0ZXJ8Ym9vbGVhbnxpbnRlZ2VyfHJlYWx8dGltZXxzdHJpbmd8c2V2ZXJpdHlfbGV2ZWx8cG9zaXRpdmV8bmF0dXJhbHxzaWduZWR8dW5zaWduZWR8bGluZXx0ZXh0fHN0ZF91P2xvZ2ljKD86X3ZlY3Rvcik/KSg/PVteXHctXXwkKS9pLG51bGxdLFsidHlwIiwvXicoPzphY3RpdmV8YXNjZW5kaW5nfGJhc2V8ZGVsYXllZHxkcml2aW5nfGRyaXZpbmdfdmFsdWV8ZXZlbnR8aGlnaHxpbWFnZXxpbnN0YW5jZV9uYW1lfGxhc3RfYWN0aXZlfGxhc3RfZXZlbnR8bGFzdF92YWx1ZXxsZWZ0fGxlZnRvZnxsZW5ndGh8bG93fHBhdGhfbmFtZXxwb3N8cHJlZHxxdWlldHxyYW5nZXxyZXZlcnNlX3JhbmdlfHJpZ2h0fHJpZ2h0b2Z8c2ltcGxlX25hbWV8c3RhYmxlfHN1Y2N8dHJhbnNhY3Rpb258dmFsfHZhbHVlKSg/PVteXHctXXwkKS9pLG51bGxdLFsibGl0IiwvXlxkKyg/Ol9cZCspKig/OiNbXHcuXFxdKyMoPzpbKy1dP1xkKyg/Ol9cZCspKik/fCg/OlwuXGQrKD86X1xkKykqKT8oPzplWystXT9cZCsoPzpfXGQrKSopPykvaV0sCitbInBsbiIsL14oPzpbYS16XVx3KnxcXFteXFxdKlxcKS9pXSxbInB1biIsL15bXlx3XHRcblxyICInXHhhMF1bXlx3XHRcblxyICInXHhhMC1dKi9dXSksWyJ2aGRsIiwidmhkIl0pOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy13aWtpLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy13aWtpLmpzCmluZGV4IDAwYTFiNmIuLjk2YzFlMzQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmctd2lraS5qcworKysgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLXdpa2kuanMKQEAgLTEgKzEsMiBAQAotUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbW1BSLlBSX1BMQUlOLC9eW1x0IFx4QTBhLWdpLXowLTldKy8sbnVsbCwnCSBceGEwYWJjZGVmZ2lqa2xtbm9wcXJzdHV2d3h5ejAxMjM0NTY3ODknXSxbUFIuUFJfUFVOQ1RVQVRJT04sL15bPSp+XF5cW1xdXSsvLG51bGwsJz0qfl5bXSddXSxbWydsYW5nLXdpa2kubWV0YScsLyg/Ol5efFxyXG4/fFxuKSgjW2Etel0rKVxiL10sW1BSLlBSX0xJVEVSQUwsL14oPzpbQS1aXVthLXpdW2EtejAtOV0rW0EtWl1bYS16XVthLXpBLVowLTldKylcYi9dLFsnbGFuZy0nLC9eXHtce1x7KFtcc1xTXSs/KVx9XH1cfS9dLFsnbGFuZy0nLC9eYChbXlxyXG5gXSspYC9dLFtQUi5QUl9TVFJJTkcsL15odHRwcz86XC9cL1teXC8/I1xzXSooPzpcL1tePyNcc10qKT8oPzpcP1teI1xzXSopPyg/OiNcUyopPy9pXSxbUFIuUFJfUExBSU4sL14oPzpcclxufFtcc1xTXSlbXiM9Kn5eQS1aaFx7YFxbXHJcbl0qL11dKSxbJ3dpa2knXSksUFIucmVnaXN0ZXJMYW5nSGFuZGxlcihQUi5jcmVhdGVTaW1wbGVMZXhlcihbW1BSLlBSX0tFWVdPUkQsL14jW2Etel0rL2ksbnVsbCwnIyddXSxbXSksWyd3aWtpLm1ldGEnXSkKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbInBsbiIsL15bXGRcdCBhLWdpLXpceGEwXSsvLG51bGwsIlx0IFx1MDBhMGFiY2RlZmdpamtsbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5Il0sWyJwdW4iLC9eWyo9W1xdXn5dKy8sbnVsbCwiPSp+XltdIl1dLFtbImxhbmctd2lraS5tZXRhIiwvKD86Xl58XHJcbj98XG4pKCNbYS16XSspXGIvXSxbImxpdCIsL15bQS1aXVthLXpdW1xkYS16XStbQS1aXVthLXpdW15cV19dK1xiL10sWyJsYW5nLSIsL157e3soW1xTXHNdKz8pfX19L10sWyJsYW5nLSIsL15gKFteXG5ccmBdKylgL10sWyJzdHIiLC9eaHR0cHM/OlwvXC9bXlxzIy8/XSooPzpcL1teXHMjP10qKT8oPzpcP1teXHMjXSopPyg/OiNcUyopPy9pXSxbInBsbiIsL14oPzpcclxufFtcU1xzXSlbXlxuXHIjKj1BLVteYGh7fl0qL11dKSxbIndpa2kiXSk7CitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbImt3ZCIsL14jW2Etel0rL2ksbnVsbCwiIyJdXSxbXSksWyJ3aWtpLm1ldGEiXSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLXhxLmpzIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy14cS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lMzIzYWUzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvbGFuZy14cS5qcwpAQCAtMCwwICsxLDMgQEAKK1BSLnJlZ2lzdGVyTGFuZ0hhbmRsZXIoUFIuY3JlYXRlU2ltcGxlTGV4ZXIoW1sidmFyIHBsbiIsL15cJFtcdy1dKy8sbnVsbCwiJCJdXSxbWyJwbG4iLC9eW1xzPV1bPD5dW1xzPV0vXSxbImxpdCIsL15AW1x3LV0rL10sWyJ0YWciLC9ePFwvP1thLXpdKD86W1x3LS46XSpcdyk/fFwvPz4kL2ldLFsiY29tIiwvXlwoOltcU1xzXSo/OlwpL10sWyJwbG4iLC9eWygpLC87W1xde31dJC9dLFsic3RyIiwvXig/OiIoPzpbXiJcXHtdfFxcW1xTXHNdKSooPzoifCQpfCcoPzpbXidcXHtdfFxcW1xTXHNdKSooPzonfCQpKS8sbnVsbCwiXCInIl0sWyJrd2QiLC9eKD86eHF1ZXJ5fHdoZXJlfHZlcnNpb258dmFyaWFibGV8dW5pb258dHlwZXN3aXRjaHx0cmVhdHx0b3x0aGVufHRleHR8c3RhYmxlfHNvcnRieXxzb21lfHNlbGZ8c2NoZW1hfHNhdGlzZmllc3xyZXR1cm5zfHJldHVybnxyZWZ8cHJvY2Vzc2luZy1pbnN0cnVjdGlvbnxwcmVjZWRpbmctc2libGluZ3xwcmVjZWRpbmd8cHJlY2VkZXN8cGFyZW50fG9ubHl8b2Z8bm9kZXxuYW1lc3BhY2V8bW9kdWxlfGxldHxpdGVtfGludGVyc2VjdHxpbnN0YW5jZXxpbnxpbXBvcnR8aWZ8ZnVuY3Rpb258Zm9yfGZvbGxvd3N8Zm9sbG93aW5nLXNpYmxpbmd8Zm9sbG93aW5nfGV4dGVybmFsfGV4Y2VwdHxldmVyeXxlbHNlfGVsZW1lbnR8ZGVzY2VuZGluZ3xkZXNjZW5kYW50LW9yLXNlbGZ8ZGVzY2VuZGFudHxkZWZpbmV8ZGVmYXVsdHxkZWNsYXJlfGNvbW1lbnR8Y2hpbGR8Y2FzdHxjYXNlfGJlZm9yZXxhdHRyaWJ1dGV8YXNzZXJ0fGFzY2VuZGluZ3xhc3xhbmNlc3Rvci1vci1zZWxmfGFuY2VzdG9yfGFmdGVyfGVxfG9yZGVyfGJ5fG9yfGFuZHxzY2hlbWEtZWxlbWVudHxkb2N1bWVudC1ub2RlfG5vZGV8YXQpXGIvXSwKK1sidHlwIiwvXig/OnhzOnllYXJNb250aER1cmF0aW9ufHhzOnVuc2lnbmVkTG9uZ3x4czp0aW1lfHhzOnN0cmluZ3x4czpzaG9ydHx4czpRTmFtZXx4czpOYW1lfHhzOmxvbmd8eHM6aW50ZWdlcnx4czppbnR8eHM6Z1llYXJNb250aHx4czpnWWVhcnx4czpnTW9udGhEYXl8eHM6Z0RheXx4czpmbG9hdHx4czpkdXJhdGlvbnx4czpkb3VibGV8eHM6ZGVjaW1hbHx4czpkYXlUaW1lRHVyYXRpb258eHM6ZGF0ZVRpbWV8eHM6ZGF0ZXx4czpieXRlfHhzOmJvb2xlYW58eHM6YW55VVJJfHhmOnllYXJNb250aER1cmF0aW9uKVxiLyxudWxsXSxbImZ1biBwbG4iLC9eKD86eHA6ZGVyZWZlcmVuY2V8eGluYzpub2RlLWV4cGFuZHx4aW5jOmxpbmstcmVmZXJlbmNlc3x4aW5jOmxpbmstZXhwYW5kfHhodG1sOnJlc3RydWN0dXJlfHhodG1sOmNsZWFufHhodG1sOmFkZC1saXN0c3x4ZG1wOnppcC1tYW5pZmVzdHx4ZG1wOnppcC1nZXR8eGRtcDp6aXAtY3JlYXRlfHhkbXA6eHF1ZXJ5LXZlcnNpb258eGRtcDp3b3JkLWNvbnZlcnR8eGRtcDp3aXRoLW5hbWVzcGFjZXN8eGRtcDp2ZXJzaW9ufHhkbXA6dmFsdWV8eGRtcDp1c2VyLXJvbGVzfHhkbXA6dXNlci1sYXN0LWxvZ2lufHhkbXA6dXNlcnx4ZG1wOnVybC1lbmNvZGV8eGRtcDp1cmwtZGVjb2RlfHhkbXA6dXJpLWlzLWZpbGV8eGRtcDp1cmktZm9ybWF0fHhkbXA6dXJpLWNvbnRlbnQtdHlwZXx4ZG1wOnVucXVvdGV8eGRtcDp1bnBhdGh8eGRtcDp0cmlnZ2Vycy1kYXRhYmFzZXx4ZG1wOnRyYWNlfHhkbXA6dG8tanNvbnx4ZG1wOnRpZHl8eGRtcDpzdWJiaW5hcnl8eGRtcDpzdHJmdGltZXx4ZG1wOnNwYXduLWlufHhkbXA6c3Bhd258eGRtcDpzbGVlcHx4ZG1wOnNodXRkb3dufHhkbXA6c2V0LXNlc3Npb24tZmllbGR8eGRtcDpzZXQtcmVzcG9uc2UtZW5jb2Rpbmd8eGRtcDpzZXQtcmVzcG9uc2UtY29udGVudC10eXBlfHhkbXA6c2V0LXJlc3BvbnNlLWNvZGV8eGRtcDpzZXQtcmVxdWVzdC10aW1lLWxpbWl0fHhkbXA6c2V0fHhkbXA6c2VydmVyc3x4ZG1wOnNlcnZlci1zdGF0dXN8eGRtcDpzZXJ2ZXItbmFtZXx4ZG1wOnNlcnZlcnx4ZG1wOnNlY3VyaXR5LWRhdGFiYXNlfHhkbXA6c2VjdXJpdHktYXNzZXJ0fHhkbXA6c2NoZW1hLWRhdGFiYXNlfHhkbXA6c2F2ZXx4ZG1wOnJvbGUtcm9sZXN8eGRtcDpyb2xlfHhkbXA6cmV0aHJvd3x4ZG1wOnJlc3RhcnR8eGRtcDpyZXF1ZXN0LXRpbWVzdGFtcHx4ZG1wOnJlcXVlc3Qtc3RhdHVzfHhkbXA6cmVxdWVzdC1jYW5jZWx8eGRtcDpyZXF1ZXN0fHhkbXA6cmVkaXJlY3QtcmVzcG9uc2V8eGRtcDpyYW5kb218eGRtcDpxdW90ZXx4ZG1wOnF1ZXJ5LXRyYWNlfHhkbXA6cXVlcnktbWV0ZXJzfHhkbXA6cHJvZHVjdC1lZGl0aW9ufHhkbXA6cHJpdmlsZWdlLXJvbGVzfHhkbXA6cHJpdmlsZWdlfHhkbXA6cHJldHR5LXByaW50fHhkbXA6cG93ZXJwb2ludC1jb252ZXJ0fHhkbXA6cGxhdGZvcm18eGRtcDpwZXJtaXNzaW9ufHhkbXA6cGRmLWNvbnZlcnR8eGRtcDpwYXRofHhkbXA6b2N0YWwtdG8taW50ZWdlcnx4ZG1wOm5vZGUtdXJpfHhkbXA6bm9kZS1yZXBsYWNlfHhkbXA6bm9kZS1raW5kfHhkbXA6bm9kZS1pbnNlcnQtY2hpbGR8eGRtcDpub2RlLWluc2VydC1iZWZvcmV8eGRtcDpub2RlLWluc2VydC1hZnRlcnx4ZG1wOm5vZGUtZGVsZXRlfHhkbXA6bm9kZS1kYXRhYmFzZXx4ZG1wOm11bDY0fHhkbXA6bW9kdWxlcy1yb290fHhkbXA6bW9kdWxlcy1kYXRhYmFzZXx4ZG1wOm1lcmdpbmd8eGRtcDptZXJnZS1jYW5jZWx8eGRtcDptZXJnZXx4ZG1wOm1kNXx4ZG1wOmxvZ291dHx4ZG1wOmxvZ2lufHhkbXA6bG9nLWxldmVsfHhkbXA6bG9nfHhkbXA6bG9jay1yZWxlYXNlfHhkbXA6bG9jay1hY3F1aXJlfHhkbXA6bG9hZHx4ZG1wOmludm9rZS1pbnx4ZG1wOmludm9rZXx4ZG1wOmludGVnZXItdG8tb2N0YWx8eGRtcDppbnRlZ2VyLXRvLWhleHx4ZG1wOmh0dHAtcHV0fHhkbXA6aHR0cC1wb3N0fHhkbXA6aHR0cC1vcHRpb25zfHhkbXA6aHR0cC1oZWFkfHhkbXA6aHR0cC1nZXR8eGRtcDpodHRwLWRlbGV0ZXx4ZG1wOmhvc3RzfHhkbXA6aG9zdC1zdGF0dXN8eGRtcDpob3N0LW5hbWV8eGRtcDpob3N0fHhkbXA6aGV4LXRvLWludGVnZXJ8eGRtcDpoYXNoNjR8eGRtcDpoYXNoMzJ8eGRtcDpoYXMtcHJpdmlsZWdlfHhkbXA6Z3JvdXBzfHhkbXA6Z3JvdXAtc2VydmVzfHhkbXA6Z3JvdXAtc2VydmVyc3x4ZG1wOmdyb3VwLW5hbWV8eGRtcDpncm91cC1ob3N0c3x4ZG1wOmdyb3VwfHhkbXA6Z2V0LXNlc3Npb24tZmllbGQtbmFtZXN8eGRtcDpnZXQtc2Vzc2lvbi1maWVsZHx4ZG1wOmdldC1yZXNwb25zZS1lbmNvZGluZ3x4ZG1wOmdldC1yZXNwb25zZS1jb2RlfHhkbXA6Z2V0LXJlcXVlc3QtdXNlcm5hbWV8eGRtcDpnZXQtcmVxdWVzdC11c2VyfHhkbXA6Z2V0LXJlcXVlc3QtdXJsfHhkbXA6Z2V0LXJlcXVlc3QtcHJvdG9jb2x8eGRtcDpnZXQtcmVxdWVzdC1wYXRofHhkbXA6Z2V0LXJlcXVlc3QtbWV0aG9kfHhkbXA6Z2V0LXJlcXVlc3QtaGVhZGVyLW5hbWVzfHhkbXA6Z2V0LXJlcXVlc3QtaGVhZGVyfHhkbXA6Z2V0LXJlcXVlc3QtZmllbGQtbmFtZXN8eGRtcDpnZXQtcmVxdWVzdC1maWVsZC1maWxlbmFtZXx4ZG1wOmdldC1yZXF1ZXN0LWZpZWxkLWNvbnRlbnQtdHlwZXx4ZG1wOmdldC1yZXF1ZXN0LWZpZWxkfHhkbXA6Z2V0LXJlcXVlc3QtY2xpZW50LWNlcnRpZmljYXRlfHhkbXA6Z2V0LXJlcXVlc3QtY2xpZW50LWFkZHJlc3N8eGRtcDpnZXQtcmVxdWVzdC1ib2R5fHhkbXA6Z2V0LWN1cnJlbnQtdXNlcnx4ZG1wOmdldC1jdXJyZW50LXJvbGVzfHhkbXA6Z2V0fHhkbXA6ZnVuY3Rpb24tbmFtZXx4ZG1wOmZ1bmN0aW9uLW1vZHVsZXx4ZG1wOmZ1bmN0aW9ufHhkbXA6ZnJvbS1qc29ufHhkbXA6Zm9yZXN0c3x4ZG1wOmZvcmVzdC1zdGF0dXN8eGRtcDpmb3Jlc3QtcmVzdG9yZXx4ZG1wOmZvcmVzdC1yZXN0YXJ0fHhkbXA6Zm9yZXN0LW5hbWV8eGRtcDpmb3Jlc3QtZGVsZXRlfHhkbXA6Zm9yZXN0LWRhdGFiYXNlc3x4ZG1wOmZvcmVzdC1jb3VudHN8eGRtcDpmb3Jlc3QtY2xlYXJ8eGRtcDpmb3Jlc3QtYmFja3VwfHhkbXA6Zm9yZXN0fHhkbXA6ZmlsZXN5c3RlbS1maWxlfHhkbXA6ZmlsZXN5c3RlbS1kaXJlY3Rvcnl8eGRtcDpleGlzdHN8eGRtcDpleGNlbC1jb252ZXJ0fHhkbXA6ZXZhbC1pbnx4ZG1wOmV2YWx8eGRtcDplc3RpbWF0ZXx4ZG1wOmVtYWlsfHhkbXA6ZWxlbWVudC1jb250ZW50LXR5cGV8eGRtcDplbGFwc2VkLXRpbWV8eGRtcDpkb2N1bWVudC1zZXQtcXVhbGl0eXx4ZG1wOmRvY3VtZW50LXNldC1wcm9wZXJ0eXx4ZG1wOmRvY3VtZW50LXNldC1wcm9wZXJ0aWVzfHhkbXA6ZG9jdW1lbnQtc2V0LXBlcm1pc3Npb25zfHhkbXA6ZG9jdW1lbnQtc2V0LWNvbGxlY3Rpb25zfHhkbXA6ZG9jdW1lbnQtcmVtb3ZlLXByb3BlcnRpZXN8eGRtcDpkb2N1bWVudC1yZW1vdmUtcGVybWlzc2lvbnN8eGRtcDpkb2N1bWVudC1yZW1vdmUtY29sbGVjdGlvbnN8eGRtcDpkb2N1bWVudC1wcm9wZXJ0aWVzfHhkbXA6ZG9jdW1lbnQtbG9ja3N8eGRtcDpkb2N1bWVudC1sb2FkfHhkbXA6ZG9jdW1lbnQtaW5zZXJ0fHhkbXA6ZG9jdW1lbnQtZ2V0LXF1YWxpdHl8eGRtcDpkb2N1bWVudC1nZXQtcHJvcGVydGllc3x4ZG1wOmRvY3VtZW50LWdldC1wZXJtaXNzaW9uc3x4ZG1wOmRvY3VtZW50LWdldC1jb2xsZWN0aW9uc3x4ZG1wOmRvY3VtZW50LWdldHx4ZG1wOmRvY3VtZW50LWZvcmVzdHx4ZG1wOmRvY3VtZW50LWRlbGV0ZXx4ZG1wOmRvY3VtZW50LWFkZC1wcm9wZXJ0aWVzfHhkbXA6ZG9jdW1lbnQtYWRkLXBlcm1pc3Npb25zfHhkbXA6ZG9jdW1lbnQtYWRkLWNvbGxlY3Rpb25zfHhkbXA6ZGlyZWN0b3J5LXByb3BlcnRpZXN8eGRtcDpkaXJlY3RvcnktbG9ja3N8eGRtcDpkaXJlY3RvcnktZGVsZXRlfHhkbXA6ZGlyZWN0b3J5LWNyZWF0ZXx4ZG1wOmRpcmVjdG9yeXx4ZG1wOmRpYWNyaXRpYy1sZXNzfHhkbXA6ZGVzY3JpYmV8eGRtcDpkZWZhdWx0LXBlcm1pc3Npb25zfHhkbXA6ZGVmYXVsdC1jb2xsZWN0aW9uc3x4ZG1wOmRhdGFiYXNlc3x4ZG1wOmRhdGFiYXNlLXJlc3RvcmUtdmFsaWRhdGV8eGRtcDpkYXRhYmFzZS1yZXN0b3JlLXN0YXR1c3x4ZG1wOmRhdGFiYXNlLXJlc3RvcmUtY2FuY2VsfHhkbXA6ZGF0YWJhc2UtcmVzdG9yZXx4ZG1wOmRhdGFiYXNlLW5hbWV8eGRtcDpkYXRhYmFzZS1mb3Jlc3RzfHhkbXA6ZGF0YWJhc2UtYmFja3VwLXZhbGlkYXRlfHhkbXA6ZGF0YWJhc2UtYmFja3VwLXN0YXR1c3x4ZG1wOmRhdGFiYXNlLWJhY2t1cC1wdXJnZXx4ZG1wOmRhdGFiYXNlLWJhY2t1cC1jYW5jZWx8eGRtcDpkYXRhYmFzZS1iYWNrdXB8eGRtcDpkYXRhYmFzZXx4ZG1wOmNvbGxlY3Rpb24tcHJvcGVydGllc3x4ZG1wOmNvbGxlY3Rpb24tbG9ja3N8eGRtcDpjb2xsZWN0aW9uLWRlbGV0ZXx4ZG1wOmNvbGxhdGlvbi1jYW5vbmljYWwtdXJpfHhkbXA6Y2FzdGFibGUtYXN8eGRtcDpjYW4tZ3JhbnQtcm9sZXN8eGRtcDpiYXNlNjQtZW5jb2RlfHhkbXA6YmFzZTY0LWRlY29kZXx4ZG1wOmFyY2hpdGVjdHVyZXx4ZG1wOmFwcGx5fHhkbXA6YW1wLXJvbGVzfHhkbXA6YW1wfHhkbXA6YWRkNjR8eGRtcDphZGQtcmVzcG9uc2UtaGVhZGVyfHhkbXA6YWNjZXNzfHRyZ3I6dHJpZ2dlci1zZXQtcmVjdXJzaXZlfHRyZ3I6dHJpZ2dlci1zZXQtcGVybWlzc2lvbnN8dHJncjp0cmlnZ2VyLXNldC1uYW1lfHRyZ3I6dHJpZ2dlci1zZXQtbW9kdWxlfHRyZ3I6dHJpZ2dlci1zZXQtZXZlbnR8dHJncjp0cmlnZ2VyLXNldC1kZXNjcmlwdGlvbnx0cmdyOnRyaWdnZXItcmVtb3ZlLXBlcm1pc3Npb25zfHRyZ3I6dHJpZ2dlci1tb2R1bGV8dHJncjp0cmlnZ2VyLWdldC1wZXJtaXNzaW9uc3x0cmdyOnRyaWdnZXItZW5hYmxlfHRyZ3I6dHJpZ2dlci1kaXNhYmxlfHRyZ3I6dHJpZ2dlci1kYXRhYmFzZS1vbmxpbmUtZXZlbnR8dHJncjp0cmlnZ2VyLWRhdGEtZXZlbnR8dHJncjp0cmlnZ2VyLWFkZC1wZXJtaXNzaW9uc3x0cmdyOnJlbW92ZS10cmlnZ2VyfHRyZ3I6cHJvcGVydHktY29udGVudHx0cmdyOnByZS1jb21taXR8dHJncjpwb3N0LWNvbW1pdHx0cmdyOmdldC10cmlnZ2VyLWJ5LWlkfHRyZ3I6Z2V0LXRyaWdnZXJ8dHJncjpkb2N1bWVudC1zY29wZXx0cmdyOmRvY3VtZW50LWNvbnRlbnR8dHJncjpkaXJlY3Rvcnktc2NvcGV8dHJncjpjcmVhdGUtdHJpZ2dlcnx0cmdyOmNvbGxlY3Rpb24tc2NvcGV8dHJncjphbnktcHJvcGVydHktY29udGVudHx0aHNyOnNldC1lbnRyeXx0aHNyOnJlbW92ZS10ZXJtfHRoc3I6cmVtb3ZlLXN5bm9ueW18dGhzcjpyZW1vdmUtZW50cnl8dGhzcjpxdWVyeS1sb29rdXB8dGhzcjpsb29rdXB8dGhzcjpsb2FkfHRoc3I6aW5zZXJ0fHRoc3I6ZXhwYW5kfHRoc3I6YWRkLXN5bm9ueW18c3BlbGw6c3VnZ2VzdC1kZXRhaWxlZHxzcGVsbDpzdWdnZXN0fHNwZWxsOnJlbW92ZS13b3JkfHNwZWxsOm1ha2UtZGljdGlvbmFyeXxzcGVsbDpsb2FkfHNwZWxsOmxldmVuc2h0ZWluLWRpc3RhbmNlfHNwZWxsOmlzLWNvcnJlY3R8c3BlbGw6aW5zZXJ0fHNwZWxsOmRvdWJsZS1tZXRhcGhvbmV8c3BlbGw6YWRkLXdvcmR8c2VjOnVzZXJzLWNvbGxlY3Rpb258c2VjOnVzZXItc2V0LXJvbGVzfHNlYzp1c2VyLXNldC1wYXNzd29yZHxzZWM6dXNlci1zZXQtbmFtZXxzZWM6dXNlci1zZXQtZGVzY3JpcHRpb258c2VjOnVzZXItc2V0LWRlZmF1bHQtcGVybWlzc2lvbnN8c2VjOnVzZXItc2V0LWRlZmF1bHQtY29sbGVjdGlvbnN8c2VjOnVzZXItcmVtb3ZlLXJvbGVzfHNlYzp1c2VyLXByaXZpbGVnZXN8c2VjOnVzZXItZ2V0LXJvbGVzfHNlYzp1c2VyLWdldC1kZXNjcmlwdGlvbnxzZWM6dXNlci1nZXQtZGVmYXVsdC1wZXJtaXNzaW9uc3xzZWM6dXNlci1nZXQtZGVmYXVsdC1jb2xsZWN0aW9uc3xzZWM6dXNlci1kb2MtcGVybWlzc2lvbnN8c2VjOnVzZXItZG9jLWNvbGxlY3Rpb25zfHNlYzp1c2VyLWFkZC1yb2xlc3xzZWM6dW5wcm90ZWN0LWNvbGxlY3Rpb258c2VjOnVpZC1mb3ItbmFtZXxzZWM6c2V0LXJlYWxtfHNlYzpzZWN1cml0eS12ZXJzaW9ufHNlYzpzZWN1cml0eS1uYW1lc3BhY2V8c2VjOnNlY3VyaXR5LWluc3RhbGxlZHxzZWM6c2VjdXJpdHktY29sbGVjdGlvbnxzZWM6cm9sZXMtY29sbGVjdGlvbnxzZWM6cm9sZS1zZXQtcm9sZXN8c2VjOnJvbGUtc2V0LW5hbWV8c2VjOnJvbGUtc2V0LWRlc2NyaXB0aW9ufHNlYzpyb2xlLXNldC1kZWZhdWx0LXBlcm1pc3Npb25zfHNlYzpyb2xlLXNldC1kZWZhdWx0LWNvbGxlY3Rpb25zfHNlYzpyb2xlLXJlbW92ZS1yb2xlc3xzZWM6cm9sZS1wcml2aWxlZ2VzfHNlYzpyb2xlLWdldC1yb2xlc3xzZWM6cm9sZS1nZXQtZGVzY3JpcHRpb258c2VjOnJvbGUtZ2V0LWRlZmF1bHQtcGVybWlzc2lvbnN8c2VjOnJvbGUtZ2V0LWRlZmF1bHQtY29sbGVjdGlvbnN8c2VjOnJvbGUtZG9jLXBlcm1pc3Npb25zfHNlYzpyb2xlLWRvYy1jb2xsZWN0aW9uc3xzZWM6cm9sZS1hZGQtcm9sZXN8c2VjOnJlbW92ZS11c2VyfHNlYzpyZW1vdmUtcm9sZS1mcm9tLXVzZXJzfHNlYzpyZW1vdmUtcm9sZS1mcm9tLXJvbGV8c2VjOnJlbW92ZS1yb2xlLWZyb20tcHJpdmlsZWdlc3xzZWM6cmVtb3ZlLXJvbGUtZnJvbS1hbXBzfHNlYzpyZW1vdmUtcm9sZXxzZWM6cmVtb3ZlLXByaXZpbGVnZXxzZWM6cmVtb3ZlLWFtcHxzZWM6cHJvdGVjdC1jb2xsZWN0aW9ufHNlYzpwcml2aWxlZ2VzLWNvbGxlY3Rpb258c2VjOnByaXZpbGVnZS1zZXQtcm9sZXN8c2VjOnByaXZpbGVnZS1zZXQtbmFtZXxzZWM6cHJpdmlsZWdlLXJlbW92ZS1yb2xlc3xzZWM6cHJpdmlsZWdlLWdldC1yb2xlc3xzZWM6cHJpdmlsZWdlLWFkZC1yb2xlc3xzZWM6cHJpdi1kb2MtcGVybWlzc2lvbnN8c2VjOnByaXYtZG9jLWNvbGxlY3Rpb25zfHNlYzpnZXQtdXNlci1uYW1lc3xzZWM6Z2V0LXVuaXF1ZS1lbGVtLWlkfHNlYzpnZXQtcm9sZS1uYW1lc3xzZWM6Z2V0LXJvbGUtaWRzfHNlYzpnZXQtcHJpdmlsZWdlfHNlYzpnZXQtZGlzdGluY3QtcGVybWlzc2lvbnN8c2VjOmdldC1jb2xsZWN0aW9ufHNlYzpnZXQtYW1wfHNlYzpjcmVhdGUtdXNlci13aXRoLXJvbGV8c2VjOmNyZWF0ZS11c2VyfHNlYzpjcmVhdGUtcm9sZXxzZWM6Y3JlYXRlLXByaXZpbGVnZXxzZWM6Y3JlYXRlLWFtcHxzZWM6Y29sbGVjdGlvbnMtY29sbGVjdGlvbnxzZWM6Y29sbGVjdGlvbi1zZXQtcGVybWlzc2lvbnN8c2VjOmNvbGxlY3Rpb24tcmVtb3ZlLXBlcm1pc3Npb25zfHNlYzpjb2xsZWN0aW9uLWdldC1wZXJtaXNzaW9uc3xzZWM6Y29sbGVjdGlvbi1hZGQtcGVybWlzc2lvbnN8c2VjOmNoZWNrLWFkbWlufHNlYzphbXBzLWNvbGxlY3Rpb258c2VjOmFtcC1zZXQtcm9sZXN8c2VjOmFtcC1yZW1vdmUtcm9sZXN8c2VjOmFtcC1nZXQtcm9sZXN8c2VjOmFtcC1kb2MtcGVybWlzc2lvbnN8c2VjOmFtcC1kb2MtY29sbGVjdGlvbnN8c2VjOmFtcC1hZGQtcm9sZXN8c2VhcmNoOnVucGFyc2V8c2VhcmNoOnN1Z2dlc3R8c2VhcmNoOnNuaXBwZXR8c2VhcmNoOnNlYXJjaHxzZWFyY2g6cmVzb2x2ZS1ub2Rlc3xzZWFyY2g6cmVzb2x2ZXxzZWFyY2g6cmVtb3ZlLWNvbnN0cmFpbnR8c2VhcmNoOnBhcnNlfHNlYXJjaDpnZXQtZGVmYXVsdC1vcHRpb25zfHNlYXJjaDplc3RpbWF0ZXxzZWFyY2g6Y2hlY2stb3B0aW9uc3xwcm9mOnZhbHVlfHByb2Y6cmVzZXR8cHJvZjpyZXBvcnR8cHJvZjppbnZva2V8cHJvZjpldmFsfHByb2Y6ZW5hYmxlfHByb2Y6ZGlzYWJsZXxwcm9mOmFsbG93ZWR8cHB0OmNsZWFufHBraTp0ZW1wbGF0ZS1zZXQtcmVxdWVzdHxwa2k6dGVtcGxhdGUtc2V0LW5hbWV8cGtpOnRlbXBsYXRlLXNldC1rZXktdHlwZXxwa2k6dGVtcGxhdGUtc2V0LWtleS1vcHRpb25zfHBraTp0ZW1wbGF0ZS1zZXQtZGVzY3JpcHRpb258cGtpOnRlbXBsYXRlLWluLXVzZXxwa2k6dGVtcGxhdGUtZ2V0LXZlcnNpb258cGtpOnRlbXBsYXRlLWdldC1yZXF1ZXN0fHBraTp0ZW1wbGF0ZS1nZXQtbmFtZXxwa2k6dGVtcGxhdGUtZ2V0LWtleS10eXBlfHBraTp0ZW1wbGF0ZS1nZXQta2V5LW9wdGlvbnN8cGtpOnRlbXBsYXRlLWdldC1pZHxwa2k6dGVtcGxhdGUtZ2V0LWRlc2NyaXB0aW9ufHBraTpuZWVkLWNlcnRpZmljYXRlfHBraTppcy10ZW1wb3Jhcnl8cGtpOmluc2VydC10cnVzdGVkLWNlcnRpZmljYXRlc3xwa2k6aW5zZXJ0LXRlbXBsYXRlfHBraTppbnNlcnQtc2lnbmVkLWNlcnRpZmljYXRlc3xwa2k6aW5zZXJ0LWNlcnRpZmljYXRlLXJldm9jYXRpb24tbGlzdHxwa2k6Z2V0LXRydXN0ZWQtY2VydGlmaWNhdGUtaWRzfHBraTpnZXQtdGVtcGxhdGUtaWRzfHBraTpnZXQtdGVtcGxhdGUtY2VydGlmaWNhdGUtYXV0aG9yaXR5fHBraTpnZXQtdGVtcGxhdGUtYnktbmFtZXxwa2k6Z2V0LXRlbXBsYXRlfHBraTpnZXQtcGVuZGluZy1jZXJ0aWZpY2F0ZS1yZXF1ZXN0cy14bWx8cGtpOmdldC1wZW5kaW5nLWNlcnRpZmljYXRlLXJlcXVlc3RzLXBlbXxwa2k6Z2V0LXBlbmRpbmctY2VydGlmaWNhdGUtcmVxdWVzdHxwa2k6Z2V0LWNlcnRpZmljYXRlcy1mb3ItdGVtcGxhdGUteG1sfHBraTpnZXQtY2VydGlmaWNhdGVzLWZvci10ZW1wbGF0ZXxwa2k6Z2V0LWNlcnRpZmljYXRlc3xwa2k6Z2V0LWNlcnRpZmljYXRlLXhtbHxwa2k6Z2V0LWNlcnRpZmljYXRlLXBlbXxwa2k6Z2V0LWNlcnRpZmljYXRlfHBraTpnZW5lcmF0ZS10ZW1wb3JhcnktY2VydGlmaWNhdGUtaWYtbmVjZXNzYXJ5fHBraTpnZW5lcmF0ZS10ZW1wb3JhcnktY2VydGlmaWNhdGV8cGtpOmdlbmVyYXRlLXRlbXBsYXRlLWNlcnRpZmljYXRlLWF1dGhvcml0eXxwa2k6Z2VuZXJhdGUtY2VydGlmaWNhdGUtcmVxdWVzdHxwa2k6ZGVsZXRlLXRlbXBsYXRlfHBraTpkZWxldGUtY2VydGlmaWNhdGV8cGtpOmNyZWF0ZS10ZW1wbGF0ZXxwZGY6bWFrZS10b2N8cGRmOmluc2VydC10b2MtaGVhZGVyc3xwZGY6Z2V0LXRvY3xwZGY6Y2xlYW58cDpzdGF0dXMtdHJhbnNpdGlvbnxwOnN0YXRlLXRyYW5zaXRpb258cDpyZW1vdmV8cDpwaXBlbGluZXN8cDppbnNlcnR8cDpnZXQtYnktaWR8cDpnZXR8cDpleGVjdXRlfHA6Y3JlYXRlfHA6Y29uZGl0aW9ufHA6Y29sbGVjdGlvbnxwOmFjdGlvbnxvb3htbDpydW5zLW1lcmdlfG9veG1sOnBhY2thZ2UtdXJpc3xvb3htbDpwYWNrYWdlLXBhcnRzLWluc2VydHxvb3htbDpwYWNrYWdlLXBhcnRzfG1zd29yZDpjbGVhbnxtY2dtOnBvbHlnb258bWNnbTpwb2ludHxtY2dtOmdlb3NwYXRpYWwtcXVlcnktZnJvbS1lbGVtZW50c3xtY2dtOmdlb3NwYXRpYWwtcXVlcnl8bWNnbTpjaXJjbGV8bWF0aDp0YW5ofG1hdGg6dGFufG1hdGg6c3FydHxtYXRoOnNpbmh8bWF0aDpzaW58bWF0aDpwb3d8bWF0aDptb2RmfG1hdGg6bG9nMTB8bWF0aDpsb2d8bWF0aDpsZGV4cHxtYXRoOmZyZXhwfG1hdGg6Zm1vZHxtYXRoOmZsb29yfG1hdGg6ZmFic3xtYXRoOmV4cHxtYXRoOmNvc2h8bWF0aDpjb3N8bWF0aDpjZWlsfG1hdGg6YXRhbjJ8bWF0aDphdGFufG1hdGg6YXNpbnxtYXRoOmFjb3N8bWFwOnB1dHxtYXA6bWFwfG1hcDprZXlzfG1hcDpnZXR8bWFwOmRlbGV0ZXxtYXA6Y291bnR8bWFwOmNsZWFyfGxuazp0b3xsbms6cmVtb3ZlfGxuazppbnNlcnR8bG5rOmdldHxsbms6ZnJvbXxsbms6Y3JlYXRlfGttbDpwb2x5Z29ufGttbDpwb2ludHxrbWw6aW50ZXJpb3ItcG9seWdvbnxrbWw6Z2Vvc3BhdGlhbC1xdWVyeS1mcm9tLWVsZW1lbnRzfGttbDpnZW9zcGF0aWFsLXF1ZXJ5fGttbDpjaXJjbGV8a21sOmJveHxnbWw6cG9seWdvbnxnbWw6cG9pbnR8Z21sOmludGVyaW9yLXBvbHlnb258Z21sOmdlb3NwYXRpYWwtcXVlcnktZnJvbS1lbGVtZW50c3xnbWw6Z2Vvc3BhdGlhbC1xdWVyeXxnbWw6Y2lyY2xlfGdtbDpib3h8Z2VvcnNzOnBvaW50fGdlb3JzczpnZW9zcGF0aWFsLXF1ZXJ5fGdlb3JzczpjaXJjbGV8Z2VvOnBvbHlnb258Z2VvOnBvaW50fGdlbzppbnRlcmlvci1wb2x5Z29ufGdlbzpnZW9zcGF0aWFsLXF1ZXJ5LWZyb20tZWxlbWVudHN8Z2VvOmdlb3NwYXRpYWwtcXVlcnl8Z2VvOmNpcmNsZXxnZW86Ym94fGZuOnplcm8tb3Itb25lfGZuOnllYXJzLWZyb20tZHVyYXRpb258Zm46eWVhci1mcm9tLWRhdGVUaW1lfGZuOnllYXItZnJvbS1kYXRlfGZuOnVwcGVyLWNhc2V8Zm46dW5vcmRlcmVkfGZuOnRydWV8Zm46dHJhbnNsYXRlfGZuOnRyYWNlfGZuOnRva2VuaXplfGZuOnRpbWV6b25lLWZyb20tdGltZXxmbjp0aW1lem9uZS1mcm9tLWRhdGVUaW1lfGZuOnRpbWV6b25lLWZyb20tZGF0ZXxmbjpzdW18Zm46c3VidHJhY3QtZGF0ZVRpbWVzLXlpZWxkaW5nLXllYXJNb250aER1cmF0aW9ufGZuOnN1YnRyYWN0LWRhdGVUaW1lcy15aWVsZGluZy1kYXlUaW1lRHVyYXRpb258Zm46c3Vic3RyaW5nLWJlZm9yZXxmbjpzdWJzdHJpbmctYWZ0ZXJ8Zm46c3Vic3RyaW5nfGZuOnN1YnNlcXVlbmNlfGZuOnN0cmluZy10by1jb2RlcG9pbnRzfGZuOnN0cmluZy1wYWR8Zm46c3RyaW5nLWxlbmd0aHxmbjpzdHJpbmctam9pbnxmbjpzdHJpbmd8Zm46c3RhdGljLWJhc2UtdXJpfGZuOnN0YXJ0cy13aXRofGZuOnNlY29uZHMtZnJvbS10aW1lfGZuOnNlY29uZHMtZnJvbS1kdXJhdGlvbnxmbjpzZWNvbmRzLWZyb20tZGF0ZVRpbWV8Zm46cm91bmQtaGFsZi10by1ldmVufGZuOnJvdW5kfGZuOnJvb3R8Zm46cmV2ZXJzZXxmbjpyZXNvbHZlLXVyaXxmbjpyZXNvbHZlLVFOYW1lfGZuOnJlcGxhY2V8Zm46cmVtb3ZlfGZuOlFOYW1lfGZuOnByZWZpeC1mcm9tLVFOYW1lfGZuOnBvc2l0aW9ufGZuOm9uZS1vci1tb3JlfGZuOm51bWJlcnxmbjpub3R8Zm46bm9ybWFsaXplLXVuaWNvZGV8Zm46bm9ybWFsaXplLXNwYWNlfGZuOm5vZGUtbmFtZXxmbjpub2RlLWtpbmR8Zm46bmlsbGVkfGZuOm5hbWVzcGFjZS11cmktZnJvbS1RTmFtZXxmbjpuYW1lc3BhY2UtdXJpLWZvci1wcmVmaXh8Zm46bmFtZXNwYWNlLXVyaXxmbjpuYW1lfGZuOm1vbnRocy1mcm9tLWR1cmF0aW9ufGZuOm1vbnRoLWZyb20tZGF0ZVRpbWV8Zm46bW9udGgtZnJvbS1kYXRlfGZuOm1pbnV0ZXMtZnJvbS10aW1lfGZuOm1pbnV0ZXMtZnJvbS1kdXJhdGlvbnxmbjptaW51dGVzLWZyb20tZGF0ZVRpbWV8Zm46bWlufGZuOm1heHxmbjptYXRjaGVzfGZuOmxvd2VyLWNhc2V8Zm46bG9jYWwtbmFtZS1mcm9tLVFOYW1lfGZuOmxvY2FsLW5hbWV8Zm46bGFzdHxmbjpsYW5nfGZuOmlyaS10by11cml8Zm46aW5zZXJ0LWJlZm9yZXxmbjppbmRleC1vZnxmbjppbi1zY29wZS1wcmVmaXhlc3xmbjppbXBsaWNpdC10aW1lem9uZXxmbjppZHJlZnxmbjppZHxmbjpob3Vycy1mcm9tLXRpbWV8Zm46aG91cnMtZnJvbS1kdXJhdGlvbnxmbjpob3Vycy1mcm9tLWRhdGVUaW1lfGZuOmZsb29yfGZuOmZhbHNlfGZuOmV4cGFuZGVkLVFOYW1lfGZuOmV4aXN0c3xmbjpleGFjdGx5LW9uZXxmbjplc2NhcGUtdXJpfGZuOmVzY2FwZS1odG1sLXVyaXxmbjplcnJvcnxmbjplbmRzLXdpdGh8Zm46ZW5jb2RlLWZvci11cml8Zm46ZW1wdHl8Zm46ZG9jdW1lbnQtdXJpfGZuOmRvYy1hdmFpbGFibGV8Zm46ZG9jfGZuOmRpc3RpbmN0LXZhbHVlc3xmbjpkaXN0aW5jdC1ub2Rlc3xmbjpkZWZhdWx0LWNvbGxhdGlvbnxmbjpkZWVwLWVxdWFsfGZuOmRheXMtZnJvbS1kdXJhdGlvbnxmbjpkYXktZnJvbS1kYXRlVGltZXxmbjpkYXktZnJvbS1kYXRlfGZuOmRhdGF8Zm46Y3VycmVudC10aW1lfGZuOmN1cnJlbnQtZGF0ZVRpbWV8Zm46Y3VycmVudC1kYXRlfGZuOmNvdW50fGZuOmNvbnRhaW5zfGZuOmNvbmNhdHxmbjpjb21wYXJlfGZuOmNvbGxlY3Rpb258Zm46Y29kZXBvaW50cy10by1zdHJpbmd8Zm46Y29kZXBvaW50LWVxdWFsfGZuOmNlaWxpbmd8Zm46Ym9vbGVhbnxmbjpiYXNlLXVyaXxmbjphdmd8Zm46YWRqdXN0LXRpbWUtdG8tdGltZXpvbmV8Zm46YWRqdXN0LWRhdGVUaW1lLXRvLXRpbWV6b25lfGZuOmFkanVzdC1kYXRlLXRvLXRpbWV6b25lfGZuOmFic3xmZWVkOnVuc3Vic2NyaWJlfGZlZWQ6c3Vic2NyaXB0aW9ufGZlZWQ6c3Vic2NyaWJlfGZlZWQ6cmVxdWVzdHxmZWVkOml0ZW18ZmVlZDpkZXNjcmlwdGlvbnxleGNlbDpjbGVhbnxlbnRpdHk6ZW5yaWNofGRvbTpzZXQtcGlwZWxpbmVzfGRvbTpzZXQtcGVybWlzc2lvbnN8ZG9tOnNldC1uYW1lfGRvbTpzZXQtZXZhbHVhdGlvbi1jb250ZXh0fGRvbTpzZXQtZG9tYWluLXNjb3BlfGRvbTpzZXQtZGVzY3JpcHRpb258ZG9tOnJlbW92ZS1waXBlbGluZXxkb206cmVtb3ZlLXBlcm1pc3Npb25zfGRvbTpyZW1vdmV8ZG9tOmdldHxkb206ZXZhbHVhdGlvbi1jb250ZXh0fGRvbTpkb21haW5zfGRvbTpkb21haW4tc2NvcGV8ZG9tOmNyZWF0ZXxkb206Y29uZmlndXJhdGlvbi1zZXQtcmVzdGFydC11c2VyfGRvbTpjb25maWd1cmF0aW9uLXNldC1wZXJtaXNzaW9uc3xkb206Y29uZmlndXJhdGlvbi1zZXQtZXZhbHVhdGlvbi1jb250ZXh0fGRvbTpjb25maWd1cmF0aW9uLXNldC1kZWZhdWx0LWRvbWFpbnxkb206Y29uZmlndXJhdGlvbi1nZXR8ZG9tOmNvbmZpZ3VyYXRpb24tY3JlYXRlfGRvbTpjb2xsZWN0aW9ufGRvbTphZGQtcGlwZWxpbmV8ZG9tOmFkZC1wZXJtaXNzaW9uc3xkbHM6cmV0ZW50aW9uLXJ1bGVzfGRsczpyZXRlbnRpb24tcnVsZS1yZW1vdmV8ZGxzOnJldGVudGlvbi1ydWxlLWluc2VydHxkbHM6cmV0ZW50aW9uLXJ1bGV8ZGxzOnB1cmdlfGRsczpub2RlLWV4cGFuZHxkbHM6bGluay1yZWZlcmVuY2VzfGRsczpsaW5rLWV4cGFuZHxkbHM6ZG9jdW1lbnRzLXF1ZXJ5fGRsczpkb2N1bWVudC12ZXJzaW9ucy1xdWVyeXxkbHM6ZG9jdW1lbnQtdmVyc2lvbi11cml8ZGxzOmRvY3VtZW50LXZlcnNpb24tcXVlcnl8ZGxzOmRvY3VtZW50LXZlcnNpb24tZGVsZXRlfGRsczpkb2N1bWVudC12ZXJzaW9uLWFzLW9mfGRsczpkb2N1bWVudC12ZXJzaW9ufGRsczpkb2N1bWVudC11cGRhdGV8ZGxzOmRvY3VtZW50LXVubWFuYWdlfGRsczpkb2N1bWVudC1zZXQtcXVhbGl0eXxkbHM6ZG9jdW1lbnQtc2V0LXByb3BlcnR5fGRsczpkb2N1bWVudC1zZXQtcHJvcGVydGllc3xkbHM6ZG9jdW1lbnQtc2V0LXBlcm1pc3Npb25zfGRsczpkb2N1bWVudC1zZXQtY29sbGVjdGlvbnN8ZGxzOmRvY3VtZW50LXJldGVudGlvbi1ydWxlc3xkbHM6ZG9jdW1lbnQtcmVtb3ZlLXByb3BlcnRpZXN8ZGxzOmRvY3VtZW50LXJlbW92ZS1wZXJtaXNzaW9uc3xkbHM6ZG9jdW1lbnQtcmVtb3ZlLWNvbGxlY3Rpb25zfGRsczpkb2N1bWVudC1wdXJnZXxkbHM6ZG9jdW1lbnQtbWFuYWdlfGRsczpkb2N1bWVudC1pcy1tYW5hZ2VkfGRsczpkb2N1bWVudC1pbnNlcnQtYW5kLW1hbmFnZXxkbHM6ZG9jdW1lbnQtaW5jbHVkZS1xdWVyeXxkbHM6ZG9jdW1lbnQtaGlzdG9yeXxkbHM6ZG9jdW1lbnQtZ2V0LXBlcm1pc3Npb25zfGRsczpkb2N1bWVudC1leHRyYWN0LXBhcnR8ZGxzOmRvY3VtZW50LWRlbGV0ZXxkbHM6ZG9jdW1lbnQtY2hlY2tvdXQtc3RhdHVzfGRsczpkb2N1bWVudC1jaGVja291dHxkbHM6ZG9jdW1lbnQtY2hlY2tpbnxkbHM6ZG9jdW1lbnQtYWRkLXByb3BlcnRpZXN8ZGxzOmRvY3VtZW50LWFkZC1wZXJtaXNzaW9uc3xkbHM6ZG9jdW1lbnQtYWRkLWNvbGxlY3Rpb25zfGRsczpicmVhay1jaGVja291dHxkbHM6YXV0aG9yLXF1ZXJ5fGRsczphcy1vZi1xdWVyeXxkYms6Y29udmVydHxkYmc6d2FpdHxkYmc6dmFsdWV8ZGJnOnN0b3BwZWR8ZGJnOnN0b3B8ZGJnOnN0ZXB8ZGJnOnN0YXR1c3xkYmc6c3RhY2t8ZGJnOm91dHxkYmc6bmV4dHxkYmc6bGluZXxkYmc6aW52b2tlfGRiZzpmdW5jdGlvbnxkYmc6ZmluaXNofGRiZzpleHByfGRiZzpldmFsfGRiZzpkaXNjb25uZWN0fGRiZzpkZXRhY2h8ZGJnOmNvbnRpbnVlfGRiZzpjb25uZWN0fGRiZzpjbGVhcnxkYmc6YnJlYWtwb2ludHN8ZGJnOmJyZWFrfGRiZzphdHRhY2hlZHxkYmc6YXR0YWNofGN2dDpzYXZlLWNvbnZlcnRlZC1kb2N1bWVudHN8Y3Z0OnBhcnQtdXJpfGN2dDpkZXN0aW5hdGlvbi11cml8Y3Z0OmJhc2VwYXRofGN2dDpiYXNlbmFtZXxjdHM6d29yZHN8Y3RzOndvcmQtcXVlcnktd2VpZ2h0fGN0czp3b3JkLXF1ZXJ5LXRleHR8Y3RzOndvcmQtcXVlcnktb3B0aW9uc3xjdHM6d29yZC1xdWVyeXxjdHM6d29yZC1tYXRjaHxjdHM6d2Fsa3xjdHM6dXJpc3xjdHM6dXJpLW1hdGNofGN0czp0cmFpbnxjdHM6dG9rZW5pemV8Y3RzOnRocmVzaG9sZHN8Y3RzOnN0ZW18Y3RzOnNpbWlsYXItcXVlcnktd2VpZ2h0fGN0czpzaW1pbGFyLXF1ZXJ5LW5vZGVzfGN0czpzaW1pbGFyLXF1ZXJ5fGN0czpzaG9ydGVzdC1kaXN0YW5jZXxjdHM6c2VhcmNofGN0czpzY29yZXxjdHM6cmV2ZXJzZS1xdWVyeS13ZWlnaHR8Y3RzOnJldmVyc2UtcXVlcnktbm9kZXN8Y3RzOnJldmVyc2UtcXVlcnl8Y3RzOnJlbWFpbmRlcnxjdHM6cmVnaXN0ZXJlZC1xdWVyeS13ZWlnaHR8Y3RzOnJlZ2lzdGVyZWQtcXVlcnktb3B0aW9uc3xjdHM6cmVnaXN0ZXJlZC1xdWVyeS1pZHN8Y3RzOnJlZ2lzdGVyZWQtcXVlcnl8Y3RzOnJlZ2lzdGVyfGN0czpxdWVyeXxjdHM6cXVhbGl0eXxjdHM6cHJvcGVydGllcy1xdWVyeS1xdWVyeXxjdHM6cHJvcGVydGllcy1xdWVyeXxjdHM6cG9seWdvbi12ZXJ0aWNlc3xjdHM6cG9seWdvbnxjdHM6cG9pbnQtbG9uZ2l0dWRlfGN0czpwb2ludC1sYXRpdHVkZXxjdHM6cG9pbnR8Y3RzOm9yLXF1ZXJ5LXF1ZXJpZXN8Y3RzOm9yLXF1ZXJ5fGN0czpub3QtcXVlcnktd2VpZ2h0fGN0czpub3QtcXVlcnktcXVlcnl8Y3RzOm5vdC1xdWVyeXxjdHM6bmVhci1xdWVyeS13ZWlnaHR8Y3RzOm5lYXItcXVlcnktcXVlcmllc3xjdHM6bmVhci1xdWVyeS1vcHRpb25zfGN0czpuZWFyLXF1ZXJ5LWRpc3RhbmNlfGN0czpuZWFyLXF1ZXJ5fGN0czpoaWdobGlnaHR8Y3RzOmdlb3NwYXRpYWwtY28tb2NjdXJyZW5jZXN8Y3RzOmZyZXF1ZW5jeXxjdHM6Zml0bmVzc3xjdHM6ZmllbGQtd29yZHN8Y3RzOmZpZWxkLXdvcmQtcXVlcnktd2VpZ2h0fGN0czpmaWVsZC13b3JkLXF1ZXJ5LXRleHR8Y3RzOmZpZWxkLXdvcmQtcXVlcnktb3B0aW9uc3xjdHM6ZmllbGQtd29yZC1xdWVyeS1maWVsZC1uYW1lfGN0czpmaWVsZC13b3JkLXF1ZXJ5fGN0czpmaWVsZC13b3JkLW1hdGNofGN0czplbnRpdHktaGlnaGxpZ2h0fGN0czplbGVtZW50LXdvcmRzfGN0czplbGVtZW50LXdvcmQtcXVlcnktd2VpZ2h0fGN0czplbGVtZW50LXdvcmQtcXVlcnktdGV4dHxjdHM6ZWxlbWVudC13b3JkLXF1ZXJ5LW9wdGlvbnN8Y3RzOmVsZW1lbnQtd29yZC1xdWVyeS1lbGVtZW50LW5hbWV8Y3RzOmVsZW1lbnQtd29yZC1xdWVyeXxjdHM6ZWxlbWVudC13b3JkLW1hdGNofGN0czplbGVtZW50LXZhbHVlc3xjdHM6ZWxlbWVudC12YWx1ZS1yYW5nZXN8Y3RzOmVsZW1lbnQtdmFsdWUtcXVlcnktd2VpZ2h0fGN0czplbGVtZW50LXZhbHVlLXF1ZXJ5LXRleHR8Y3RzOmVsZW1lbnQtdmFsdWUtcXVlcnktb3B0aW9uc3xjdHM6ZWxlbWVudC12YWx1ZS1xdWVyeS1lbGVtZW50LW5hbWV8Y3RzOmVsZW1lbnQtdmFsdWUtcXVlcnl8Y3RzOmVsZW1lbnQtdmFsdWUtbWF0Y2h8Y3RzOmVsZW1lbnQtdmFsdWUtZ2Vvc3BhdGlhbC1jby1vY2N1cnJlbmNlc3xjdHM6ZWxlbWVudC12YWx1ZS1jby1vY2N1cnJlbmNlc3xjdHM6ZWxlbWVudC1yYW5nZS1xdWVyeS13ZWlnaHR8Y3RzOmVsZW1lbnQtcmFuZ2UtcXVlcnktdmFsdWV8Y3RzOmVsZW1lbnQtcmFuZ2UtcXVlcnktb3B0aW9uc3xjdHM6ZWxlbWVudC1yYW5nZS1xdWVyeS1vcGVyYXRvcnxjdHM6ZWxlbWVudC1yYW5nZS1xdWVyeS1lbGVtZW50LW5hbWV8Y3RzOmVsZW1lbnQtcmFuZ2UtcXVlcnl8Y3RzOmVsZW1lbnQtcXVlcnktcXVlcnl8Y3RzOmVsZW1lbnQtcXVlcnktZWxlbWVudC1uYW1lfGN0czplbGVtZW50LXF1ZXJ5fGN0czplbGVtZW50LXBhaXItZ2Vvc3BhdGlhbC12YWx1ZXN8Y3RzOmVsZW1lbnQtcGFpci1nZW9zcGF0aWFsLXZhbHVlLW1hdGNofGN0czplbGVtZW50LXBhaXItZ2Vvc3BhdGlhbC1xdWVyeS13ZWlnaHR8Y3RzOmVsZW1lbnQtcGFpci1nZW9zcGF0aWFsLXF1ZXJ5LXJlZ2lvbnxjdHM6ZWxlbWVudC1wYWlyLWdlb3NwYXRpYWwtcXVlcnktb3B0aW9uc3xjdHM6ZWxlbWVudC1wYWlyLWdlb3NwYXRpYWwtcXVlcnktbG9uZ2l0dWRlLW5hbWV8Y3RzOmVsZW1lbnQtcGFpci1nZW9zcGF0aWFsLXF1ZXJ5LWxhdGl0dWRlLW5hbWV8Y3RzOmVsZW1lbnQtcGFpci1nZW9zcGF0aWFsLXF1ZXJ5LWVsZW1lbnQtbmFtZXxjdHM6ZWxlbWVudC1wYWlyLWdlb3NwYXRpYWwtcXVlcnl8Y3RzOmVsZW1lbnQtcGFpci1nZW9zcGF0aWFsLWJveGVzfGN0czplbGVtZW50LWdlb3NwYXRpYWwtdmFsdWVzfGN0czplbGVtZW50LWdlb3NwYXRpYWwtdmFsdWUtbWF0Y2h8Y3RzOmVsZW1lbnQtZ2Vvc3BhdGlhbC1xdWVyeS13ZWlnaHR8Y3RzOmVsZW1lbnQtZ2Vvc3BhdGlhbC1xdWVyeS1yZWdpb258Y3RzOmVsZW1lbnQtZ2Vvc3BhdGlhbC1xdWVyeS1vcHRpb25zfGN0czplbGVtZW50LWdlb3NwYXRpYWwtcXVlcnktZWxlbWVudC1uYW1lfGN0czplbGVtZW50LWdlb3NwYXRpYWwtcXVlcnl8Y3RzOmVsZW1lbnQtZ2Vvc3BhdGlhbC1ib3hlc3xjdHM6ZWxlbWVudC1jaGlsZC1nZW9zcGF0aWFsLXZhbHVlc3xjdHM6ZWxlbWVudC1jaGlsZC1nZW9zcGF0aWFsLXZhbHVlLW1hdGNofGN0czplbGVtZW50LWNoaWxkLWdlb3NwYXRpYWwtcXVlcnktd2VpZ2h0fGN0czplbGVtZW50LWNoaWxkLWdlb3NwYXRpYWwtcXVlcnktcmVnaW9ufGN0czplbGVtZW50LWNoaWxkLWdlb3NwYXRpYWwtcXVlcnktb3B0aW9uc3xjdHM6ZWxlbWVudC1jaGlsZC1nZW9zcGF0aWFsLXF1ZXJ5LWVsZW1lbnQtbmFtZXxjdHM6ZWxlbWVudC1jaGlsZC1nZW9zcGF0aWFsLXF1ZXJ5LWNoaWxkLW5hbWV8Y3RzOmVsZW1lbnQtY2hpbGQtZ2Vvc3BhdGlhbC1xdWVyeXxjdHM6ZWxlbWVudC1jaGlsZC1nZW9zcGF0aWFsLWJveGVzfGN0czplbGVtZW50LWF0dHJpYnV0ZS13b3Jkc3xjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtd29yZC1xdWVyeS13ZWlnaHR8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXdvcmQtcXVlcnktdGV4dHxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtd29yZC1xdWVyeS1vcHRpb25zfGN0czplbGVtZW50LWF0dHJpYnV0ZS13b3JkLXF1ZXJ5LWVsZW1lbnQtbmFtZXxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtd29yZC1xdWVyeS1hdHRyaWJ1dGUtbmFtZXxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtd29yZC1xdWVyeXxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtd29yZC1tYXRjaHxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtdmFsdWVzfGN0czplbGVtZW50LWF0dHJpYnV0ZS12YWx1ZS1yYW5nZXN8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXZhbHVlLXF1ZXJ5LXdlaWdodHxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtdmFsdWUtcXVlcnktdGV4dHxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtdmFsdWUtcXVlcnktb3B0aW9uc3xjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtdmFsdWUtcXVlcnktZWxlbWVudC1uYW1lfGN0czplbGVtZW50LWF0dHJpYnV0ZS12YWx1ZS1xdWVyeS1hdHRyaWJ1dGUtbmFtZXxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtdmFsdWUtcXVlcnl8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXZhbHVlLW1hdGNofGN0czplbGVtZW50LWF0dHJpYnV0ZS12YWx1ZS1nZW9zcGF0aWFsLWNvLW9jY3VycmVuY2VzfGN0czplbGVtZW50LWF0dHJpYnV0ZS12YWx1ZS1jby1vY2N1cnJlbmNlc3xjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtcmFuZ2UtcXVlcnktd2VpZ2h0fGN0czplbGVtZW50LWF0dHJpYnV0ZS1yYW5nZS1xdWVyeS12YWx1ZXxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtcmFuZ2UtcXVlcnktb3B0aW9uc3xjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtcmFuZ2UtcXVlcnktb3BlcmF0b3J8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXJhbmdlLXF1ZXJ5LWVsZW1lbnQtbmFtZXxjdHM6ZWxlbWVudC1hdHRyaWJ1dGUtcmFuZ2UtcXVlcnktYXR0cmlidXRlLW5hbWV8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXJhbmdlLXF1ZXJ5fGN0czplbGVtZW50LWF0dHJpYnV0ZS1wYWlyLWdlb3NwYXRpYWwtdmFsdWVzfGN0czplbGVtZW50LWF0dHJpYnV0ZS1wYWlyLWdlb3NwYXRpYWwtdmFsdWUtbWF0Y2h8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXBhaXItZ2Vvc3BhdGlhbC1xdWVyeS13ZWlnaHR8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXBhaXItZ2Vvc3BhdGlhbC1xdWVyeS1yZWdpb258Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXBhaXItZ2Vvc3BhdGlhbC1xdWVyeS1vcHRpb25zfGN0czplbGVtZW50LWF0dHJpYnV0ZS1wYWlyLWdlb3NwYXRpYWwtcXVlcnktbG9uZ2l0dWRlLW5hbWV8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXBhaXItZ2Vvc3BhdGlhbC1xdWVyeS1sYXRpdHVkZS1uYW1lfGN0czplbGVtZW50LWF0dHJpYnV0ZS1wYWlyLWdlb3NwYXRpYWwtcXVlcnktZWxlbWVudC1uYW1lfGN0czplbGVtZW50LWF0dHJpYnV0ZS1wYWlyLWdlb3NwYXRpYWwtcXVlcnl8Y3RzOmVsZW1lbnQtYXR0cmlidXRlLXBhaXItZ2Vvc3BhdGlhbC1ib3hlc3xjdHM6ZG9jdW1lbnQtcXVlcnktdXJpc3xjdHM6ZG9jdW1lbnQtcXVlcnl8Y3RzOmRpc3RhbmNlfGN0czpkaXJlY3RvcnktcXVlcnktdXJpc3xjdHM6ZGlyZWN0b3J5LXF1ZXJ5LWRlcHRofGN0czpkaXJlY3RvcnktcXVlcnl8Y3RzOmRlc3RpbmF0aW9ufGN0czpkZXJlZ2lzdGVyfGN0czpjb250YWluc3xjdHM6Y29uZmlkZW5jZXxjdHM6Y29sbGVjdGlvbnN8Y3RzOmNvbGxlY3Rpb24tcXVlcnktdXJpc3xjdHM6Y29sbGVjdGlvbi1xdWVyeXxjdHM6Y29sbGVjdGlvbi1tYXRjaHxjdHM6Y2xhc3NpZnl8Y3RzOmNpcmNsZS1yYWRpdXN8Y3RzOmNpcmNsZS1jZW50ZXJ8Y3RzOmNpcmNsZXxjdHM6Ym94LXdlc3R8Y3RzOmJveC1zb3V0aHxjdHM6Ym94LW5vcnRofGN0czpib3gtZWFzdHxjdHM6Ym94fGN0czpiZWFyaW5nfGN0czphcmMtaW50ZXJzZWN0aW9ufGN0czphbmQtcXVlcnktcXVlcmllc3xjdHM6YW5kLXF1ZXJ5LW9wdGlvbnN8Y3RzOmFuZC1xdWVyeXxjdHM6YW5kLW5vdC1xdWVyeS1wb3NpdGl2ZS1xdWVyeXxjdHM6YW5kLW5vdC1xdWVyeS1uZWdhdGl2ZS1xdWVyeXxjdHM6YW5kLW5vdC1xdWVyeXxjc3M6Z2V0fGNzczpjb252ZXJ0fGNwZjpzdWNjZXNzfGNwZjpmYWlsdXJlfGNwZjpkb2N1bWVudC1zZXQtc3RhdGV8Y3BmOmRvY3VtZW50LXNldC1wcm9jZXNzaW5nLXN0YXR1c3xjcGY6ZG9jdW1lbnQtc2V0LWxhc3QtdXBkYXRlZHxjcGY6ZG9jdW1lbnQtc2V0LWVycm9yfGNwZjpkb2N1bWVudC1nZXQtc3RhdGV8Y3BmOmRvY3VtZW50LWdldC1wcm9jZXNzaW5nLXN0YXR1c3xjcGY6ZG9jdW1lbnQtZ2V0LWxhc3QtdXBkYXRlZHxjcGY6ZG9jdW1lbnQtZ2V0LWVycm9yfGNwZjpjaGVjay10cmFuc2l0aW9ufGFsZXJ0OnNwYXduLW1hdGNoaW5nLWFjdGlvbnN8YWxlcnQ6cnVsZS11c2VyLWlkLXF1ZXJ5fGFsZXJ0OnJ1bGUtc2V0LXVzZXItaWR8YWxlcnQ6cnVsZS1zZXQtcXVlcnl8YWxlcnQ6cnVsZS1zZXQtb3B0aW9uc3xhbGVydDpydWxlLXNldC1uYW1lfGFsZXJ0OnJ1bGUtc2V0LWRlc2NyaXB0aW9ufGFsZXJ0OnJ1bGUtc2V0LWFjdGlvbnxhbGVydDpydWxlLXJlbW92ZXxhbGVydDpydWxlLW5hbWUtcXVlcnl8YWxlcnQ6cnVsZS1pbnNlcnR8YWxlcnQ6cnVsZS1pZC1xdWVyeXxhbGVydDpydWxlLWdldC11c2VyLWlkfGFsZXJ0OnJ1bGUtZ2V0LXF1ZXJ5fGFsZXJ0OnJ1bGUtZ2V0LW9wdGlvbnN8YWxlcnQ6cnVsZS1nZXQtbmFtZXxhbGVydDpydWxlLWdldC1pZHxhbGVydDpydWxlLWdldC1kZXNjcmlwdGlvbnxhbGVydDpydWxlLWdldC1hY3Rpb258YWxlcnQ6cnVsZS1hY3Rpb24tcXVlcnl8YWxlcnQ6cmVtb3ZlLXRyaWdnZXJzfGFsZXJ0Om1ha2UtcnVsZXxhbGVydDptYWtlLWxvZy1hY3Rpb258YWxlcnQ6bWFrZS1jb25maWd8YWxlcnQ6bWFrZS1hY3Rpb258YWxlcnQ6aW52b2tlLW1hdGNoaW5nLWFjdGlvbnN8YWxlcnQ6Z2V0LW15LXJ1bGVzfGFsZXJ0OmdldC1hbGwtcnVsZXN8YWxlcnQ6Z2V0LWFjdGlvbnN8YWxlcnQ6ZmluZC1tYXRjaGluZy1ydWxlc3xhbGVydDpjcmVhdGUtdHJpZ2dlcnN8YWxlcnQ6Y29uZmlnLXNldC11cml8YWxlcnQ6Y29uZmlnLXNldC10cmlnZ2VyLWlkc3xhbGVydDpjb25maWctc2V0LW9wdGlvbnN8YWxlcnQ6Y29uZmlnLXNldC1uYW1lfGFsZXJ0OmNvbmZpZy1zZXQtZGVzY3JpcHRpb258YWxlcnQ6Y29uZmlnLXNldC1jcGYtZG9tYWluLW5hbWVzfGFsZXJ0OmNvbmZpZy1zZXQtY3BmLWRvbWFpbi1pZHN8YWxlcnQ6Y29uZmlnLWluc2VydHxhbGVydDpjb25maWctZ2V0LXVyaXxhbGVydDpjb25maWctZ2V0LXRyaWdnZXItaWRzfGFsZXJ0OmNvbmZpZy1nZXQtb3B0aW9uc3xhbGVydDpjb25maWctZ2V0LW5hbWV8YWxlcnQ6Y29uZmlnLWdldC1pZHxhbGVydDpjb25maWctZ2V0LWRlc2NyaXB0aW9ufGFsZXJ0OmNvbmZpZy1nZXQtY3BmLWRvbWFpbi1uYW1lc3xhbGVydDpjb25maWctZ2V0LWNwZi1kb21haW4taWRzfGFsZXJ0OmNvbmZpZy1nZXR8YWxlcnQ6Y29uZmlnLWRlbGV0ZXxhbGVydDphY3Rpb24tc2V0LW9wdGlvbnN8YWxlcnQ6YWN0aW9uLXNldC1uYW1lfGFsZXJ0OmFjdGlvbi1zZXQtbW9kdWxlLXJvb3R8YWxlcnQ6YWN0aW9uLXNldC1tb2R1bGUtZGJ8YWxlcnQ6YWN0aW9uLXNldC1tb2R1bGV8YWxlcnQ6YWN0aW9uLXNldC1kZXNjcmlwdGlvbnxhbGVydDphY3Rpb24tcmVtb3ZlfGFsZXJ0OmFjdGlvbi1pbnNlcnR8YWxlcnQ6YWN0aW9uLWdldC1vcHRpb25zfGFsZXJ0OmFjdGlvbi1nZXQtbmFtZXxhbGVydDphY3Rpb24tZ2V0LW1vZHVsZS1yb290fGFsZXJ0OmFjdGlvbi1nZXQtbW9kdWxlLWRifGFsZXJ0OmFjdGlvbi1nZXQtbW9kdWxlfGFsZXJ0OmFjdGlvbi1nZXQtZGVzY3JpcHRpb258emVyby1vci1vbmV8eWVhcnMtZnJvbS1kdXJhdGlvbnx5ZWFyLWZyb20tZGF0ZVRpbWV8eWVhci1mcm9tLWRhdGV8dXBwZXItY2FzZXx1bm9yZGVyZWR8dHJ1ZXx0cmFuc2xhdGV8dHJhY2V8dG9rZW5pemV8dGltZXpvbmUtZnJvbS10aW1lfHRpbWV6b25lLWZyb20tZGF0ZVRpbWV8dGltZXpvbmUtZnJvbS1kYXRlfHN1bXxzdWJ0cmFjdC1kYXRlVGltZXMteWllbGRpbmcteWVhck1vbnRoRHVyYXRpb258c3VidHJhY3QtZGF0ZVRpbWVzLXlpZWxkaW5nLWRheVRpbWVEdXJhdGlvbnxzdWJzdHJpbmctYmVmb3JlfHN1YnN0cmluZy1hZnRlcnxzdWJzdHJpbmd8c3Vic2VxdWVuY2V8c3RyaW5nLXRvLWNvZGVwb2ludHN8c3RyaW5nLXBhZHxzdHJpbmctbGVuZ3RofHN0cmluZy1qb2lufHN0cmluZ3xzdGF0aWMtYmFzZS11cml8c3RhcnRzLXdpdGh8c2Vjb25kcy1mcm9tLXRpbWV8c2Vjb25kcy1mcm9tLWR1cmF0aW9ufHNlY29uZHMtZnJvbS1kYXRlVGltZXxyb3VuZC1oYWxmLXRvLWV2ZW58cm91bmR8cm9vdHxyZXZlcnNlfHJlc29sdmUtdXJpfHJlc29sdmUtUU5hbWV8cmVwbGFjZXxyZW1vdmV8UU5hbWV8cHJlZml4LWZyb20tUU5hbWV8cG9zaXRpb258b25lLW9yLW1vcmV8bnVtYmVyfG5vdHxub3JtYWxpemUtdW5pY29kZXxub3JtYWxpemUtc3BhY2V8bm9kZS1uYW1lfG5vZGUta2luZHxuaWxsZWR8bmFtZXNwYWNlLXVyaS1mcm9tLVFOYW1lfG5hbWVzcGFjZS11cmktZm9yLXByZWZpeHxuYW1lc3BhY2UtdXJpfG5hbWV8bW9udGhzLWZyb20tZHVyYXRpb258bW9udGgtZnJvbS1kYXRlVGltZXxtb250aC1mcm9tLWRhdGV8bWludXRlcy1mcm9tLXRpbWV8bWludXRlcy1mcm9tLWR1cmF0aW9ufG1pbnV0ZXMtZnJvbS1kYXRlVGltZXxtaW58bWF4fG1hdGNoZXN8bG93ZXItY2FzZXxsb2NhbC1uYW1lLWZyb20tUU5hbWV8bG9jYWwtbmFtZXxsYXN0fGxhbmd8aXJpLXRvLXVyaXxpbnNlcnQtYmVmb3JlfGluZGV4LW9mfGluLXNjb3BlLXByZWZpeGVzfGltcGxpY2l0LXRpbWV6b25lfGlkcmVmfGlkfGhvdXJzLWZyb20tdGltZXxob3Vycy1mcm9tLWR1cmF0aW9ufGhvdXJzLWZyb20tZGF0ZVRpbWV8Zmxvb3J8ZmFsc2V8ZXhwYW5kZWQtUU5hbWV8ZXhpc3RzfGV4YWN0bHktb25lfGVzY2FwZS11cml8ZXNjYXBlLWh0bWwtdXJpfGVycm9yfGVuZHMtd2l0aHxlbmNvZGUtZm9yLXVyaXxlbXB0eXxkb2N1bWVudC11cml8ZG9jLWF2YWlsYWJsZXxkb2N8ZGlzdGluY3QtdmFsdWVzfGRpc3RpbmN0LW5vZGVzfGRlZmF1bHQtY29sbGF0aW9ufGRlZXAtZXF1YWx8ZGF5cy1mcm9tLWR1cmF0aW9ufGRheS1mcm9tLWRhdGVUaW1lfGRheS1mcm9tLWRhdGV8ZGF0YXxjdXJyZW50LXRpbWV8Y3VycmVudC1kYXRlVGltZXxjdXJyZW50LWRhdGV8Y291bnR8Y29udGFpbnN8Y29uY2F0fGNvbXBhcmV8Y29sbGVjdGlvbnxjb2RlcG9pbnRzLXRvLXN0cmluZ3xjb2RlcG9pbnQtZXF1YWx8Y2VpbGluZ3xib29sZWFufGJhc2UtdXJpfGF2Z3xhZGp1c3QtdGltZS10by10aW1lem9uZXxhZGp1c3QtZGF0ZVRpbWUtdG8tdGltZXpvbmV8YWRqdXN0LWRhdGUtdG8tdGltZXpvbmV8YWJzKVxiL10sCitbInBsbiIsL15bXHc6LV0rL10sWyJwbG4iLC9eW1x0XG5cciBceGEwXSsvXV0pLFsieHEiLCJ4cXVlcnkiXSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLXlhbWwuanMgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9sYW5nLXlhbWwuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzM4NzI5YgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L2xhbmcteWFtbC5qcwpAQCAtMCwwICsxLDIgQEAKK3ZhciBhPW51bGw7CitQUi5yZWdpc3RlckxhbmdIYW5kbGVyKFBSLmNyZWF0ZVNpbXBsZUxleGVyKFtbInB1biIsL15bOj4/fF0rLyxhLCI6fD4/Il0sWyJkZWMiLC9eJSg/OllBTUx8VEFHKVteXG5cciNdKy8sYSwiJSJdLFsidHlwIiwvXiZcUysvLGEsIiYiXSxbInR5cCIsL14hXFMqLyxhLCIhIl0sWyJzdHIiLC9eIig/OlteIlxcXXxcXC4pKig/OiJ8JCkvLGEsJyInXSxbInN0ciIsL14nKD86W14nXXwnJykqKD86J3wkKS8sYSwiJyJdLFsiY29tIiwvXiNbXlxuXHJdKi8sYSwiIyJdLFsicGxuIiwvXlxzKy8sYSwiIFx0XHJcbiJdXSxbWyJkZWMiLC9eKD86LS0tfFwuXC5cLikoPzpbXG5ccl18JCkvXSxbInB1biIsL14tL10sWyJrd2QiLC9eXHcrOltcblxyIF0vXSxbInBsbiIsL15cdysvXV0pLFsieWFtbCIsInltbCJdKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L3ByZXR0aWZ5LmNzcyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L3ByZXR0aWZ5LmNzcwppbmRleCAyNmUzZTI2Li40YmZkYThlIDEwMDY0NAotLS0gYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9wcmV0dGlmeS5jc3MKKysrIGIvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvcHJldHRpZnkuY3NzCkBAIC0xLDQwICsxLDUzIEBACiAvKiBQcmV0dHkgcHJpbnRpbmcgc3R5bGVzLiBVc2VkIHdpdGggcHJldHRpZnkuanMuICovCitAZXh0ZXJuYWwgLio7CiAKLUBleHRlcm5hbCAuc3RyOwotQGV4dGVybmFsIC5rd2Q7Ci1AZXh0ZXJuYWwgLmNvbTsKLUBleHRlcm5hbCAudHlwOwotQGV4dGVybmFsIC5saXQ7Ci1AZXh0ZXJuYWwgLnB1bjsKLUBleHRlcm5hbCAucGxuOwotQGV4dGVybmFsIC50YWc7Ci1AZXh0ZXJuYWwgLmF0bjsKLUBleHRlcm5hbCAuYXR2OwotQGV4dGVybmFsIC5kZWM7Ci1AZXh0ZXJuYWwgLnByZXR0eXByaW50OworLyogU1BBTiBlbGVtZW50cyB3aXRoIHRoZSBjbGFzc2VzIGJlbG93IGFyZSBhZGRlZCBieSBwcmV0dHlwcmludC4gKi8KKy5wbG4geyBjb2xvcjogIzAwMCB9ICAvKiBwbGFpbiB0ZXh0ICovCiAKLS5zdHIgeyBjb2xvcjogIzA4MDsgfQotLmt3ZCB7IGNvbG9yOiAjMDA4OyB9Ci0uY29tIHsgY29sb3I6ICM4MDA7IH0KLS50eXAgeyBjb2xvcjogIzYwNjsgfQotLmxpdCB7IGNvbG9yOiAjMDY2OyB9Ci0ucHVuIHsgY29sb3I6ICM2NjA7IH0KLS5wbG4geyBjb2xvcjogIzAwMDsgfQotLnRhZyB7IGNvbG9yOiAjMDA4OyB9Ci0uYXRuIHsgY29sb3I6ICM2MDY7IH0KLS5hdHYgeyBjb2xvcjogIzA4MDsgfQotLmRlYyB7IGNvbG9yOiAjNjA2OyB9Ci1wcmUucHJldHR5cHJpbnQgeyBwYWRkaW5nOiAycHg7IGJvcmRlcjogMXB4IHNvbGlkICM4ODg7IH0KLQotQG1lZGlhIHByaW50IHsKLSAgLnN0ciB7IGNvbG9yOiAjMDYwOyB9Ci0gIC5rd2QgeyBjb2xvcjogIzAwNjsgZm9udC13ZWlnaHQ6IGJvbGQ7IH0KLSAgLmNvbSB7IGNvbG9yOiAjNjAwOyBmb250LXN0eWxlOiBpdGFsaWM7IH0KLSAgLnR5cCB7IGNvbG9yOiAjNDA0OyBmb250LXdlaWdodDogYm9sZDsgfQotICAubGl0IHsgY29sb3I6ICMwNDQ7IH0KLSAgLnB1biB7IGNvbG9yOiAjNDQwOyB9Ci0gIC5wbG4geyBjb2xvcjogIzAwMDsgfQotICAudGFnIHsgY29sb3I6ICMwMDY7IGZvbnQtd2VpZ2h0OiBib2xkOyB9Ci0gIC5hdG4geyBjb2xvcjogIzQwNDsgfQotICAuYXR2IHsgY29sb3I6ICMwNjA7IH0KK0BtZWRpYSBzY3JlZW4geworICAuc3RyIHsgY29sb3I6ICMwODAgfSAgLyogc3RyaW5nIGNvbnRlbnQgKi8KKyAgLmt3ZCB7IGNvbG9yOiAjMDA4IH0gIC8qIGEga2V5d29yZCAqLworICAuY29tIHsgY29sb3I6ICM4MDAgfSAgLyogYSBjb21tZW50ICovCisgIC50eXAgeyBjb2xvcjogIzYwNiB9ICAvKiBhIHR5cGUgbmFtZSAqLworICAubGl0IHsgY29sb3I6ICMwNjYgfSAgLyogYSBsaXRlcmFsIHZhbHVlICovCisgIC8qIHB1bmN0dWF0aW9uLCBsaXNwIG9wZW4gYnJhY2tldCwgbGlzcCBjbG9zZSBicmFja2V0ICovCisgIC5wdW4sIC5vcG4sIC5jbG8geyBjb2xvcjogIzY2MCB9CisgIC50YWcgeyBjb2xvcjogIzAwOCB9ICAvKiBhIG1hcmt1cCB0YWcgbmFtZSAqLworICAuYXRuIHsgY29sb3I6ICM2MDYgfSAgLyogYSBtYXJrdXAgYXR0cmlidXRlIG5hbWUgKi8KKyAgLmF0diB7IGNvbG9yOiAjMDgwIH0gIC8qIGEgbWFya3VwIGF0dHJpYnV0ZSB2YWx1ZSAqLworICAuZGVjLCAudmFyIHsgY29sb3I6ICM2MDYgfSAgLyogYSBkZWNsYXJhdGlvbjsgYSB2YXJpYWJsZSBuYW1lICovCisgIC5mdW4geyBjb2xvcjogcmVkIH0gIC8qIGEgZnVuY3Rpb24gbmFtZSAqLwogfQorCisvKiBVc2UgaGlnaGVyIGNvbnRyYXN0IGFuZCB0ZXh0LXdlaWdodCBmb3IgcHJpbnRhYmxlIGZvcm0uICovCitAbWVkaWEgcHJpbnQsIHByb2plY3Rpb24geworICAuc3RyIHsgY29sb3I6ICMwNjAgfQorICAua3dkIHsgY29sb3I6ICMwMDY7IGZvbnQtd2VpZ2h0OiBib2xkIH0KKyAgLmNvbSB7IGNvbG9yOiAjNjAwOyBmb250LXN0eWxlOiBpdGFsaWMgfQorICAudHlwIHsgY29sb3I6ICM0MDQ7IGZvbnQtd2VpZ2h0OiBib2xkIH0KKyAgLmxpdCB7IGNvbG9yOiAjMDQ0IH0KKyAgLnB1biwgLm9wbiwgLmNsbyB7IGNvbG9yOiAjNDQwIH0KKyAgLnRhZyB7IGNvbG9yOiAjMDA2OyBmb250LXdlaWdodDogYm9sZCB9CisgIC5hdG4geyBjb2xvcjogIzQwNCB9CisgIC5hdHYgeyBjb2xvcjogIzA2MCB9Cit9CisKKy8qIFB1dCBhIGJvcmRlciBhcm91bmQgcHJldHR5cHJpbnRlZCBjb2RlIHNuaXBwZXRzLiAqLworcHJlLnByZXR0eXByaW50IHsgcGFkZGluZzogMnB4OyBib3JkZXI6IDFweCBzb2xpZCAjODg4IH0KKworLyogU3BlY2lmeSBjbGFzcz1saW5lbnVtcyBvbiBhIHByZSB0byBnZXQgbGluZSBudW1iZXJpbmcgKi8KK29sLmxpbmVudW1zIHsgbWFyZ2luLXRvcDogMDsgbWFyZ2luLWJvdHRvbTogMCB9IC8qIElFIGluZGVudHMgdmlhIG1hcmdpbi1sZWZ0ICovCitsaS5MMCwKK2xpLkwxLAorbGkuTDIsCitsaS5MMywKK2xpLkw1LAorbGkuTDYsCitsaS5MNywKK2xpLkw4IHsgbGlzdC1zdHlsZS10eXBlOiBub25lIH0KKy8qIEFsdGVybmF0ZSBzaGFkaW5nIGZvciBsaW5lcyAqLworbGkuTDEsCitsaS5MMywKK2xpLkw1LAorbGkuTDcsCitsaS5MOSB7IGJhY2tncm91bmQ6ICNlZWUgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvcHJldHRpZnkuanMgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9wcmV0dGlmeS5qcwppbmRleCAyOWI1ZTczLi40ODI3YmMzIDEwMDY0NAotLS0gYS9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9wcmV0dGlmeS5qcworKysgYi9nZXJyaXQtcHJldHRpZnkvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3ByZXR0aWZ5L2NsaWVudC9wcmV0dGlmeS5qcwpAQCAtMSw0NiArMSwyOCBAQAotd2luZG93LlBSX1NIT1VMRF9VU0VfQ09OVElOVUFUSU9OPXRydWUsd2luZG93LlBSX1RBQl9XSURUSD04LHdpbmRvdy5QUl9ub3JtYWxpemVkSHRtbD13aW5kb3cuUFI9d2luZG93LnByZXR0eVByaW50T25lPXdpbmRvdy5wcmV0dHlQcmludD12b2lkCi0wLHdpbmRvdy5fcHJfaXNJRTY9ZnVuY3Rpb24oKXt2YXIgYT1uYXZpZ2F0b3ImJm5hdmlnYXRvci51c2VyQWdlbnQmJm5hdmlnYXRvci51c2VyQWdlbnQubWF0Y2goL1xiTVNJRSAoWzY3OF0pXC4vKTtyZXR1cm4gYT1hPythWzFdOmZhbHNlLHdpbmRvdy5fcHJfaXNJRTY9ZnVuY3Rpb24oKXtyZXR1cm4gYX0sYX0sKGZ1bmN0aW9uKCl7dmFyCi1hPXRydWUsYj1udWxsLGM9J2JyZWFrIGNvbnRpbnVlIGRvIGVsc2UgZm9yIGlmIHJldHVybiB3aGlsZSBhdXRvIGNhc2UgY2hhciBjb25zdCBkZWZhdWx0IGRvdWJsZSBlbnVtIGV4dGVybiBmbG9hdCBnb3RvIGludCBsb25nIHJlZ2lzdGVyIHNob3J0IHNpZ25lZCBzaXplb2Ygc3RhdGljIHN0cnVjdCBzd2l0Y2ggdHlwZWRlZiB1bmlvbiB1bnNpZ25lZCB2b2lkIHZvbGF0aWxlIGNhdGNoIGNsYXNzIGRlbGV0ZSBmYWxzZSBpbXBvcnQgbmV3IG9wZXJhdG9yIHByaXZhdGUgcHJvdGVjdGVkIHB1YmxpYyB0aGlzIHRocm93IHRydWUgdHJ5IHR5cGVvZiAnLGQ9YysnYWxpZ25vZiBhbGlnbl91bmlvbiBhc20gYXhpb20gYm9vbCAnKydjb25jZXB0IGNvbmNlcHRfbWFwIGNvbnN0X2Nhc3QgY29uc3RleHByIGRlY2x0eXBlICcrJ2R5bmFtaWNfY2FzdCBleHBsaWNpdCBleHBvcnQgZnJpZW5kIGlubGluZSBsYXRlX2NoZWNrICcrJ211dGFibGUgbmFtZXNwYWNlIG51bGxwdHIgcmVpbnRlcnByZXRfY2FzdCBzdGF0aWNfYXNzZXJ0IHN0YXRpY19jYXN0ICcrJ3RlbXBsYXRlIHR5cGVpZCB0eXBlbmFtZSB1c2luZyB2aXJ0dWFsIHdjaGFyX3Qgd2hlcmUgJyxlPWMrJ2Fic3RyYWN0IGJvb2xlYW4gYnl0ZSBleHRlbmRzIGZpbmFsIGZpbmFsbHkgaW1wbGVtZW50cyBpbXBvcnQgJysnaW5zdGFuY2VvZiBudWxsIG5hdGl2ZSBwYWNrYWdlIHN0cmljdGZwIHN1cGVyIHN5bmNocm9uaXplZCB0aHJvd3MgJysndHJhbnNpZW50ICcsZj1lKydhcyBiYXNlIGJ5IGNoZWNrZWQgZGVjaW1hbCBkZWxlZ2F0ZSBkZXNjZW5kaW5nIGV2ZW50ICcrJ2ZpeGVkIGZvcmVhY2ggZnJvbSBncm91cCBpbXBsaWNpdCBpbiBpbnRlcmZhY2UgaW50ZXJuYWwgaW50byBpcyBsb2NrICcrJ29iamVjdCBvdXQgb3ZlcnJpZGUgb3JkZXJieSBwYXJhbXMgcGFydGlhbCByZWFkb25seSByZWYgc2J5dGUgc2VhbGVkICcrJ3N0YWNrYWxsb2Mgc3RyaW5nIHNlbGVjdCB1aW50IHVsb25nIHVuY2hlY2tlZCB1bnNhZmUgdXNob3J0IHZhciAnLGc9YysnZGVidWdnZXIgZXZhbCBleHBvcnQgZnVuY3Rpb24gZ2V0IG51bGwgc2V0IHVuZGVmaW5lZCB2YXIgd2l0aCAnKydJbmZpbml0eSBOYU4gJyxoPSdjYWxsZXIgZGVsZXRlIGRpZSBkbyBkdW1wIGVsc2lmIGV2YWwgZXhpdCBmb3JlYWNoIGZvciBnb3RvIGlmIGltcG9ydCBsYXN0IGxvY2FsIG15IG5leHQgbm8gb3VyIHByaW50IHBhY2thZ2UgcmVkbyByZXF1aXJlIHN1YiB1bmRlZiB1bmxlc3MgdW50aWwgdXNlIHdhbnRhcnJheSB3aGlsZSBCRUdJTiBFTkQgJyxpPSdicmVhayBjb250aW51ZSBkbyBlbHNlIGZvciBpZiByZXR1cm4gd2hpbGUgYW5kIGFzIGFzc2VydCBjbGFzcyBkZWYgZGVsIGVsaWYgZXhjZXB0IGV4ZWMgZmluYWxseSBmcm9tIGdsb2JhbCBpbXBvcnQgaW4gaXMgbGFtYmRhIG5vbmxvY2FsIG5vdCBvciBwYXNzIHByaW50IHJhaXNlIHRyeSB3aXRoIHlpZWxkIEZhbHNlIFRydWUgTm9uZSAnLGo9J2JyZWFrIGNvbnRpbnVlIGRvIGVsc2UgZm9yIGlmIHJldHVybiB3aGlsZSBhbGlhcyBhbmQgYmVnaW4gY2FzZSBjbGFzcyBkZWYgZGVmaW5lZCBlbHNpZiBlbmQgZW5zdXJlIGZhbHNlIGluIG1vZHVsZSBuZXh0IG5pbCBub3Qgb3IgcmVkbyByZXNjdWUgcmV0cnkgc2VsZiBzdXBlciB0aGVuIHRydWUgdW5kZWYgdW5sZXNzIHVudGlsIHdoZW4geWllbGQgQkVHSU4gRU5EICcsaz0nYnJlYWsgY29udGludWUgZG8gZWxzZSBmb3IgaWYgcmV0dXJuIHdoaWxlIGNhc2UgZG9uZSBlbGlmIGVzYWMgZXZhbCBmaSBmdW5jdGlvbiBpbiBsb2NhbCBzZXQgdGhlbiB1bnRpbCAnLGw9ZCtmK2craCtpK2orayxtPShmdW5jdGlvbigpe3ZhcgotYT1bJyEnLCchPScsJyE9PScsJyMnLCclJywnJT0nLCcmJywnJiYnLCcmJj0nLCcmPScsJygnLCcqJywnKj0nLCcrPScsJywnLCctPScsJy0+JywnLycsJy89JywnOicsJzo6JywnOycsJzwnLCc8PCcsJzw8PScsJzw9JywnPScsJz09JywnPT09JywnPicsJz49JywnPj4nLCc+Pj0nLCc+Pj4nLCc+Pj49JywnPycsJ0AnLCdbJywnXicsJ149JywnXl4nLCdeXj0nLCd7JywnfCcsJ3w9JywnfHwnLCd8fD0nLCd+JywnYnJlYWsnLCdjYXNlJywnY29udGludWUnLCdkZWxldGUnLCdkbycsJ2Vsc2UnLCdmaW5hbGx5JywnaW5zdGFuY2VvZicsJ3JldHVybicsJ3Rocm93JywndHJ5JywndHlwZW9mJ10sYj0nKD86Xl58WystXScsYztmb3IoYz0wO2M8YS5sZW5ndGg7KytjKWIrPSd8JythW2NdLnJlcGxhY2UoLyhbXj08PjomYS16XSkvZywnXFwkMScpO3JldHVybiBiKz0nKVxccyonLGJ9KSgpLG49LyYvZyxvPS88L2cscD0vPi9nLHE9L1wiL2cscixzLHQsdSx2LHcseCx5LHosQSxCLEMsRCxFLEY7ZnVuY3Rpb24KLUcoYSl7cmV0dXJuIGEucmVwbGFjZShuLCcmYW1wOycpLnJlcGxhY2UobywnJmx0OycpLnJlcGxhY2UocCwnJmd0OycpLnJlcGxhY2UocSwnJnF1b3Q7Jyl9ZnVuY3Rpb24KLUgoYSl7cmV0dXJuIGEucmVwbGFjZShuLCcmYW1wOycpLnJlcGxhY2UobywnJmx0OycpLnJlcGxhY2UocCwnJmd0OycpfUM9LyZsdDsvZyxCPS8mZ3Q7L2csdz0vJmFwb3M7L2csRT0vJnF1b3Q7L2csdj0vJmFtcDsvZyxEPS8mbmJzcDsvZztmdW5jdGlvbgotSShhKXt2YXIgYj1hLmluZGV4T2YoJyYnKSxjLGQsZSxmO2lmKGI8MClyZXR1cm4gYTtmb3IoLS1iOyhiPWEuaW5kZXhPZignJiMnLGIrMSkpPj0wOylkPWEuaW5kZXhPZignOycsYiksZD49MCYmKGU9YS5zdWJzdHJpbmcoYiszLGQpLGY9MTAsZSYmZS5jaGFyQXQoMCk9PT0neCcmJihlPWUuc3Vic3RyaW5nKDEpLGY9MTYpLGM9cGFyc2VJbnQoZSxmKSxpc05hTihjKXx8KGE9YS5zdWJzdHJpbmcoMCxiKStTdHJpbmcuZnJvbUNoYXJDb2RlKGMpK2Euc3Vic3RyaW5nKGQrMSkpKTtyZXR1cm4gYS5yZXBsYWNlKEMsJzwnKS5yZXBsYWNlKEIsJz4nKS5yZXBsYWNlKHcsJ1wnJykucmVwbGFjZShFLCdcIicpLnJlcGxhY2UoRCwnICcpLnJlcGxhY2UodiwnJicpfWZ1bmN0aW9uCi1KKGEpe3JldHVybidYTVAnPT09YS50YWdOYW1lfXU9L1tcclxuXS9nO2Z1bmN0aW9uIEsoYyxkKXt2YXIgZTtyZXR1cm4nUFJFJz09PWMudGFnTmFtZT9hOnUudGVzdChkKT8oZT0nJyxjLmN1cnJlbnRTdHlsZT8oZT1jLmN1cnJlbnRTdHlsZS53aGl0ZVNwYWNlKTp3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSYmKGU9d2luZG93LmdldENvbXB1dGVkU3R5bGUoYyxiKS53aGl0ZVNwYWNlKSwhZXx8ZT09PSdwcmUnKTphfWZ1bmN0aW9uCi1MKGEsYil7dmFyIGMsZCxlLGY7c3dpdGNoKGEubm9kZVR5cGUpe2Nhc2UgMTpmPWEudGFnTmFtZS50b0xvd2VyQ2FzZSgpLGIucHVzaCgnPCcsZik7Zm9yKGU9MDtlPGEuYXR0cmlidXRlcy5sZW5ndGg7KytlKXtjPWEuYXR0cmlidXRlc1tlXTtpZighYy5zcGVjaWZpZWQpY29udGludWU7Yi5wdXNoKCcgJyksTChjLGIpfWIucHVzaCgnPicpO2ZvcihkPWEuZmlyc3RDaGlsZDtkO2Q9ZC5uZXh0U2libGluZylMKGQsYik7KGEuZmlyc3RDaGlsZHx8IS9eKD86YnJ8bGlua3xpbWcpJC8udGVzdChmKSkmJmIucHVzaCgnPC8nLGYsJz4nKTticmVhaztjYXNlCi0yOmIucHVzaChhLm5hbWUudG9Mb3dlckNhc2UoKSwnPVwiJyxHKGEudmFsdWUpLCdcIicpO2JyZWFrO2Nhc2UgMzpjYXNlIDQ6Yi5wdXNoKEgoYS5ub2RlVmFsdWUpKX19ZnVuY3Rpb24KLU0oYil7dmFyIGM9MCxkPWZhbHNlLGU9ZmFsc2UsZixnLGgsaTtmb3IoZj0wLGc9Yi5sZW5ndGg7ZjxnOysrZil7aD1iW2ZdO2lmKGguaWdub3JlQ2FzZSllPWE7ZWxzZQotaWYoL1thLXpdL2kudGVzdChoLnNvdXJjZS5yZXBsYWNlKC9cXHVbMC05YS1mXXs0fXxcXHhbMC05YS1mXXsyfXxcXFtedXhdL2dpLCcnKSkpe2Q9YSxlPWZhbHNlO2JyZWFrfX1mdW5jdGlvbgotaihhKXtpZihhLmNoYXJBdCgwKSE9PSdcXCcpcmV0dXJuIGEuY2hhckNvZGVBdCgwKTtzd2l0Y2goYS5jaGFyQXQoMSkpe2Nhc2UnYic6cmV0dXJuIDg7Y2FzZSd0JzpyZXR1cm4gOTtjYXNlJ24nOnJldHVybiAxMDtjYXNlJ3YnOnJldHVybiAxMTtjYXNlJ2YnOnJldHVybiAxMjtjYXNlJ3InOnJldHVybiAxMztjYXNlJ3UnOmNhc2UneCc6cmV0dXJuIHBhcnNlSW50KGEuc3Vic3RyaW5nKDIpLDE2KXx8YS5jaGFyQ29kZUF0KDEpO2Nhc2UnMCc6Y2FzZScxJzpjYXNlJzInOmNhc2UnMyc6Y2FzZSc0JzpjYXNlJzUnOmNhc2UnNic6Y2FzZSc3JzpyZXR1cm4gcGFyc2VJbnQoYS5zdWJzdHJpbmcoMSksOCk7ZGVmYXVsdDpyZXR1cm4gYS5jaGFyQ29kZUF0KDEpfX1mdW5jdGlvbgotayhhKXt2YXIgYjtyZXR1cm4gYTwzMj8oYTwxNj8nXFx4MCc6J1xceCcpK2EudG9TdHJpbmcoMTYpOihiPVN0cmluZy5mcm9tQ2hhckNvZGUoYSksKGI9PT0nXFwnfHxiPT09Jy0nfHxiPT09J1snfHxiPT09J10nKSYmKGI9J1xcJytiKSxiKX1mdW5jdGlvbgotbChhKXt2YXIgYj1hLnN1YnN0cmluZygxLGEubGVuZ3RoLTEpLm1hdGNoKG5ldyBSZWdFeHAoJ1xcXFx1WzAtOUEtRmEtZl17NH18XFxcXHhbMC05QS1GYS1mXXsyfXxcXFxcWzAtM11bMC03XXswLDJ9fFxcXFxbMC03XXsxLDJ9fFxcXFxbXFxzXFxTXXwtfFteLVxcXFxdJywnZycpKSxjPVtdLGQ9W10sZT1iWzBdPT09J14nLGYsZyxoLGksbSxuLG8scCxxO2ZvcihoPWU/MTowLG09Yi5sZW5ndGg7aDxtOysraCl7bz1iW2hdO3N3aXRjaChvKXtjYXNlJ1xcQic6Y2FzZSdcXGInOmNhc2UnXFxEJzpjYXNlJ1xcZCc6Y2FzZSdcXFMnOmNhc2UnXFxzJzpjYXNlJ1xcVyc6Y2FzZSdcXHcnOmMucHVzaChvKTtjb250aW51ZX1xPWoobyksaCsyPG0mJictJz09PWJbaCsxXT8oZz1qKGJbaCsyXSksaCs9Mik6KGc9cSksZC5wdXNoKFtxLGddKSxnPDY1fHxxPjEyMnx8KGc8NjV8fHE+OTB8fGQucHVzaChbTWF0aC5tYXgoNjUscSl8MzIsTWF0aC5taW4oZyw5MCl8MzJdKSxnPDk3fHxxPjEyMnx8ZC5wdXNoKFtNYXRoLm1heCg5NyxxKSYtMzMsTWF0aC5taW4oZywxMjIpJi0zM10pKX1kLnNvcnQoZnVuY3Rpb24oYSxiKXtyZXR1cm4gYVswXS1iWzBdfHxiWzFdLWFbMV19KSxmPVtdLGk9W05hTixOYU5dO2ZvcihoPTA7aDxkLmxlbmd0aDsrK2gpcD1kW2hdLHBbMF08PWlbMV0rMT8oaVsxXT1NYXRoLm1heChpWzFdLHBbMV0pKTpmLnB1c2goaT1wKTtuPVsnWyddLGUmJm4ucHVzaCgnXicpLG4ucHVzaC5hcHBseShuLGMpO2ZvcihoPTA7aDxmLmxlbmd0aDsrK2gpcD1mW2hdLG4ucHVzaChrKHBbMF0pKSxwWzFdCi0+cFswXSYmKHBbMV0rMT5wWzBdJiZuLnB1c2goJy0nKSxuLnB1c2goayhwWzFdKSkpO3JldHVybiBuLnB1c2goJ10nKSxuLmpvaW4oJycpfWZ1bmN0aW9uCi1tKGEpe3ZhciBiPWEuc291cmNlLm1hdGNoKG5ldyBSZWdFeHAoJyg/OlxcWyg/OlteXFx4NUNcXHg1RF18XFxcXFtcXHNcXFNdKSpcXF18XFxcXHVbQS1GYS1mMC05XXs0fXxcXFxceFtBLUZhLWYwLTldezJ9fFxcXFxbMC05XSt8XFxcXFtedXgwLTldfFxcKFxcP1s6IT1dfFtcXChcXClcXF5dfFteXFx4NUJcXHg1Q1xcKFxcKVxcXl0rKScsJ2cnKSksZT1iLmxlbmd0aCxmPVtdLGcsaCxpLGosaztmb3Ioaj0wLGk9MDtqPGU7KytqKWs9YltqXSxrPT09JygnPysraTonXFwnPT09ay5jaGFyQXQoMCkmJihoPStrLnN1YnN0cmluZygxKSxoJiZoPD1pJiYoZltoXT0tMSkpO2ZvcihqPTE7ajxmLmxlbmd0aDsrK2opLTE9PT1mW2pdJiYoZltqXT0rK2MpO2ZvcihqPTAsaT0wO2o8ZTsrK2opaz1iW2pdLGs9PT0nKCc/KCsraSxmW2ldPT09dm9pZAotMCYmKGJbal09Jyg/OicpKTonXFwnPT09ay5jaGFyQXQoMCkmJihoPStrLnN1YnN0cmluZygxKSxoJiZoPD1pJiYoYltqXT0nXFwnK2ZbaV0pKTtmb3Ioaj0wLGk9MDtqPGU7KytqKSdeJz09PWJbal0mJideJyE9PWJbaisxXSYmKGJbal09JycpO2lmKGEuaWdub3JlQ2FzZSYmZClmb3Ioaj0wO2o8ZTsrK2opaz1iW2pdLGc9ay5jaGFyQXQoMCksay5sZW5ndGg+PTImJmc9PT0nWyc/KGJbal09bChrKSk6ZyE9PSdcXCcmJihiW2pdPWsucmVwbGFjZSgvW2EtekEtWl0vZyxmdW5jdGlvbihhKXt2YXIKLWI9YS5jaGFyQ29kZUF0KDApO3JldHVybidbJytTdHJpbmcuZnJvbUNoYXJDb2RlKGImLTMzLGJ8MzIpKyddJ30pKTtyZXR1cm4gYi5qb2luKCcnKX1pPVtdO2ZvcihmPTAsZz1iLmxlbmd0aDtmPGc7KytmKXtoPWJbZl07aWYoaC5nbG9iYWx8fGgubXVsdGlsaW5lKXRocm93IG5ldwotRXJyb3IoJycraCk7aS5wdXNoKCcoPzonK20oaCkrJyknKX1yZXR1cm4gbmV3IFJlZ0V4cChpLmpvaW4oJ3wnKSxlPydnaSc6J2cnKX1yPWI7ZnVuY3Rpb24KLU4oYSl7dmFyIGMsZCxlLGY7Yj09PXImJihmPWRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ1BSRScpLGYuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoJzwhRE9DVFlQRSBmb28gUFVCTElDIFwiZm9vIGJhclwiPlxuPGZvbyAvPicpKSxyPSEvPC8udGVzdChmLmlubmVySFRNTCkpO2lmKHIpcmV0dXJuIGQ9YS5pbm5lckhUTUwsSihhKT8oZD1IKGQpKTpLKGEsZCl8fChkPWQucmVwbGFjZSgvKDxiclxzKlwvPz4pW1xyXG5dKy9nLCckMScpLnJlcGxhY2UoLyg/OltcclxuXStbIFx0XSopKy9nLCcgJykpLGQ7ZT1bXTtmb3IoYz1hLmZpcnN0Q2hpbGQ7YztjPWMubmV4dFNpYmxpbmcpTChjLGUpO3JldHVybiBlLmpvaW4oJycpfWZ1bmN0aW9uCi1PKGEpe3ZhciBjPTA7cmV0dXJuIGZ1bmN0aW9uKGQpe3ZhciBlPWIsZj0wLGcsaCxpLGo7Zm9yKGg9MCxpPWQubGVuZ3RoO2g8aTsrK2gpe2c9ZC5jaGFyQXQoaCk7c3dpdGNoKGcpe2Nhc2UnCSc6ZXx8KGU9W10pLGUucHVzaChkLnN1YnN0cmluZyhmLGgpKSxqPWEtYyVhLGMrPWo7Zm9yKDtqPj0wO2otPScgICAgICAgICAgICAgICAgJy5sZW5ndGgpZS5wdXNoKCcgICAgICAgICAgICAgICAgJy5zdWJzdHJpbmcoMCxqKSk7Zj1oKzE7YnJlYWs7Y2FzZSdcbic6Yz0wO2JyZWFrO2RlZmF1bHQ6KytjfX1yZXR1cm4gZT8oZS5wdXNoKGQuc3Vic3RyaW5nKGYpKSxlLmpvaW4oJycpKTpkfX16PW5ldwotUmVnRXhwKCdbXjxdK3w8IS0tW1xcc1xcU10qPy0tPnw8IVxcW0NEQVRBXFxbW1xcc1xcU10qP1xcXVxcXT58PC8/W2EtekEtWl0oPzpbXj5cIlwnXXxcJ1teXCddKlwnfFwiW15cIl0qXCIpKj58PCcsJ2cnKSxBPS9ePFwhLS0vLHk9L148IVxbQ0RBVEFcWy8seD0vXjxiclxiL2ksRj0vXjwoXC8/KShbYS16QS1aXVthLXpBLVowLTldKikvO2Z1bmN0aW9uCi1QKGEpe3ZhciBiPWEubWF0Y2goeiksYz1bXSxkPTAsZT1bXSxmLGcsaCxpLGosayxsLG07aWYoYilmb3IoZz0wLGs9Yi5sZW5ndGg7ZzxrOysrZyl7aj1iW2ddO2lmKGoubGVuZ3RoPjEmJmouY2hhckF0KDApPT09JzwnKXtpZihBLnRlc3QoaikpY29udGludWU7aWYoeS50ZXN0KGopKWMucHVzaChqLnN1YnN0cmluZyg5LGoubGVuZ3RoLTMpKSxkKz1qLmxlbmd0aC0xMjtlbHNlCi1pZih4LnRlc3QoaikpYy5wdXNoKCdcbicpLCsrZDtlbHNlIGlmKGouaW5kZXhPZignbm9jb2RlJyk+PTAmJlEoaikpe2w9KGoubWF0Y2goRikpWzJdLGY9MTtmb3IoaD1nKzE7aDxrOysraCl7bT1iW2hdLm1hdGNoKEYpO2lmKG0mJm1bMl09PT1sKWlmKG1bMV09PT0nLycpe2lmKC0tZj09PTApYnJlYWt9ZWxzZSsrZn1oPGs/KGUucHVzaChkLGIuc2xpY2UoZyxoKzEpLmpvaW4oJycpKSxnPWgpOmUucHVzaChkLGopfWVsc2UKLWUucHVzaChkLGopfWVsc2UgaT1JKGopLGMucHVzaChpKSxkKz1pLmxlbmd0aH1yZXR1cm57c291cmNlOmMuam9pbignJyksdGFnczplfX1mdW5jdGlvbgotUShhKXtyZXR1cm4hIWEucmVwbGFjZSgvXHMoXHcrKVxzKj1ccyooPzpcIihbXlwiXSopXCJ8JyhbXlwnXSopJ3woXFMrKSkvZywnICQxPVwiJDIkMyQ0XCInKS5tYXRjaCgvW2NDXVtsTF1bYUFdW3NTXVtzU109XCJbXlwiXSpcYm5vY29kZVxiLyl9ZnVuY3Rpb24KLVIoYSxiLGMsZCl7dmFyIGU7aWYoIWIpcmV0dXJuO2U9e3NvdXJjZTpiLGJhc2VQb3M6YX0sYyhlKSxkLnB1c2guYXBwbHkoZCxlLmRlY29yYXRpb25zKX1mdW5jdGlvbgotUyhhLGMpe3ZhciBkPXt9LGUsZixnLGg7cmV0dXJuKGZ1bmN0aW9uKCl7dmFyIGU9YS5jb25jYXQoYyksZj1bXSxnPXt9LGksaixrLGwsbSxuLG87Zm9yKGo9MCxsPWUubGVuZ3RoO2o8bDsrK2ope209ZVtqXSxvPW1bM107aWYobylmb3IoaT1vLmxlbmd0aDstLWk+PTA7KWRbby5jaGFyQXQoaSldPW07bj1tWzFdLGs9JycrbixnLmhhc093blByb3BlcnR5KGspfHwoZi5wdXNoKG4pLGdba109Yil9Zi5wdXNoKC9bXDAtXHVmZmZmXS8pLGg9TShmKX0pKCksZj1jLmxlbmd0aCxnPS9cUy8sZT1mdW5jdGlvbihhKXt2YXIKLWI9YS5zb3VyY2UsZz1hLmJhc2VQb3MsaSxqLGssbCxtLG4sbyxwLHEscixzLHQsdSx2LHcseCx5O2k9W2csJ3BsbiddLHM9MCx5PWIubWF0Y2goaCl8fFtdLHU9e307Zm9yKHY9MCxxPXkubGVuZ3RoO3Y8cTsrK3Ype3c9eVt2XSx0PXVbd10scD12b2lkCi0wO2lmKHR5cGVvZiB0PT09J3N0cmluZycpbj1mYWxzZTtlbHNle3I9ZFt3LmNoYXJBdCgwKV07aWYocilwPXcubWF0Y2goclsxXSksdD1yWzBdO2Vsc2V7Zm9yKG09MDttPGY7KyttKXtyPWNbbV0scD13Lm1hdGNoKHJbMV0pO2lmKHApe3Q9clswXTticmVha319cHx8KHQ9J3BsbicpfW49dC5sZW5ndGg+PTUmJidsYW5nLSc9PT10LnN1YnN0cmluZygwLDUpLG4mJiEocCYmdHlwZW9mCi1wWzFdPT09J3N0cmluZycpJiYobj1mYWxzZSx0PSdzcmMnKSxufHwodVt3XT10KX14PXMscys9dy5sZW5ndGgsbj8oaj1wWzFdLGw9dy5pbmRleE9mKGopLGs9bCtqLmxlbmd0aCxwWzJdJiYoaz13Lmxlbmd0aC1wWzJdLmxlbmd0aCxsPWstai5sZW5ndGgpLG89dC5zdWJzdHJpbmcoNSksUihnK3gsdy5zdWJzdHJpbmcoMCxsKSxlLGkpLFIoZyt4K2wsaixXKG8saiksaSksUihnK3grayx3LnN1YnN0cmluZyhrKSxlLGkpKTppLnB1c2goZyt4LHQpfWEuZGVjb3JhdGlvbnM9aX0sZX1mdW5jdGlvbgotVChhKXt2YXIgYz1bXSxkPVtdLGUsZjtyZXR1cm4gYS50cmlwbGVRdW90ZWRTdHJpbmdzP2MucHVzaChbJ3N0cicsL14oPzpcJ1wnXCcoPzpbXlwnXFxdfFxcW1xzXFNdfFwnezEsMn0oPz1bXlwnXSkpKig/OlwnXCdcJ3wkKXxcIlwiXCIoPzpbXlwiXFxdfFxcW1xzXFNdfFwiezEsMn0oPz1bXlwiXSkpKig/OlwiXCJcInwkKXxcJyg/OlteXFxcJ118XFxbXHNcU10pKig/OlwnfCQpfFwiKD86W15cXFwiXXxcXFtcc1xTXSkqKD86XCJ8JCkpLyxiLCdcJ1wiJ10pOmEubXVsdGlMaW5lU3RyaW5ncz9jLnB1c2goWydzdHInLC9eKD86XCcoPzpbXlxcXCddfFxcW1xzXFNdKSooPzpcJ3wkKXxcIig/OlteXFxcIl18XFxbXHNcU10pKig/OlwifCQpfFxgKD86W15cXFxgXXxcXFtcc1xTXSkqKD86XGB8JCkpLyxiLCdcJ1wiYCddKTpjLnB1c2goWydzdHInLC9eKD86XCcoPzpbXlxcXCdcclxuXXxcXC4pKig/OlwnfCQpfFwiKD86W15cXFwiXHJcbl18XFwuKSooPzpcInwkKSkvLGIsJ1wiXCcnXSksYS52ZXJiYXRpbVN0cmluZ3MmJmQucHVzaChbJ3N0cicsL15AXCIoPzpbXlwiXXxcIlwiKSooPzpcInwkKS8sYl0pLGEuaGFzaENvbW1lbnRzJiYoYS5jU3R5bGVDb21tZW50cz8oYy5wdXNoKFsnY29tJywvXiMoPzooPzpkZWZpbmV8ZWxpZnxlbHNlfGVuZGlmfGVycm9yfGlmZGVmfGluY2x1ZGV8aWZuZGVmfGxpbmV8cHJhZ21hfHVuZGVmfHdhcm5pbmcpXGJ8W15cclxuXSopLyxiLCcjJ10pLGQucHVzaChbJ3N0cicsL148KD86KD86KD86XC5cLlwvKSp8XC8/KSg/Oltcdy1dKyg/OlwvW1x3LV0rKSspP1tcdy1dK1wuaHxbYS16XVx3Kik+LyxiXSkpOmMucHVzaChbJ2NvbScsL14jW15cclxuXSovLGIsJyMnXSkpLGEuY1N0eWxlQ29tbWVudHMmJihkLnB1c2goWydjb20nLC9eXC9cL1teXHJcbl0qLyxiXSksZC5wdXNoKFsnY29tJywvXlwvXCpbXHNcU10qPyg/OlwqXC98JCkvLGJdKSksYS5yZWdleExpdGVyYWxzJiYoZT0nLyg/PVteLypdKSg/OlteL1xceDVCXFx4NUNdfFxceDVDW1xcc1xcU118XFx4NUIoPzpbXlxceDVDXFx4NURdfFxceDVDW1xcc1xcU10pKig/OlxceDVEfCQpKSsvJyxkLnB1c2goWydsYW5nLXJlZ2V4JyxuZXcKLVJlZ0V4cCgnXicrbSsnKCcrZSsnKScpXSkpLGY9YS5rZXl3b3Jkcy5yZXBsYWNlKC9eXHMrfFxzKyQvZywnJyksZi5sZW5ndGgmJmQucHVzaChbJ2t3ZCcsbmV3Ci1SZWdFeHAoJ14oPzonK2YucmVwbGFjZSgvXHMrL2csJ3wnKSsnKVxcYicpLGJdKSxjLnB1c2goWydwbG4nLC9eXHMrLyxiLCcgXHJcbglceGEwJ10pLGQucHVzaChbJ2xpdCcsL15AW2Etel8kXVthLXpfJEAwLTldKi9pLGJdLFsndHlwJywvXkA/W0EtWl0rW2Etel1bQS1aYS16XyRAMC05XSovLGJdLFsncGxuJywvXlthLXpfJF1bYS16XyRAMC05XSovaSxiXSxbJ2xpdCcsbmV3Ci1SZWdFeHAoJ14oPzoweFthLWYwLTldK3woPzpcXGQoPzpfXFxkKykqXFxkKig/OlxcLlxcZCopP3xcXC5cXGRcXCspKD86ZVsrXFwtXT9cXGQrKT8pW2Etel0qJywnaScpLGIsJzAxMjM0NTY3ODknXSxbJ3B1bicsL14uW15cc1x3XC4kQFwnXCJcYFwvXCNdKi8sYl0pLFMoYyxkKX1zPVQoe2tleXdvcmRzOmwsaGFzaENvbW1lbnRzOmEsY1N0eWxlQ29tbWVudHM6YSxtdWx0aUxpbmVTdHJpbmdzOmEscmVnZXhMaXRlcmFsczphfSk7ZnVuY3Rpb24KLVUoYyl7dmFyIGQ9Yy5zb3VyY2UsZT1jLmV4dHJhY3RlZFRhZ3MsZj1jLmRlY29yYXRpb25zLGc9W10saD0wLGk9YixqPWIsaz0wLGw9MCxtPU8od2luZG93LlBSX1RBQl9XSURUSCksbj0vKFtcclxuIF0pIC9nLG89LyhefCApIC9nbSxwPS9cclxuP3xcbi9nLHE9L1sgXHJcbl0kLyxyPWEscztmdW5jdGlvbgotdChhKXt2YXIgYyxlO2E+aCYmKGkmJmkhPT1qJiYoZy5wdXNoKCc8L3NwYW4+JyksaT1iKSwhaSYmaiYmKGk9aixnLnB1c2goJzxzcGFuIGNsYXNzPVwiJyxpLCdcIj4nKSksYz1IKG0oZC5zdWJzdHJpbmcoaCxhKSkpLnJlcGxhY2Uocj9vOm4sJyQxJm5ic3A7Jykscj1xLnRlc3QoYyksZT13aW5kb3cuX3ByX2lzSUU2KCk/JyZuYnNwOzxiciAvPic6JzxiciAvPicsZy5wdXNoKGMucmVwbGFjZShwLGUpKSxoPWEpfXdoaWxlKGEpe2s8ZS5sZW5ndGg/bDxmLmxlbmd0aD8ocz1lW2tdPD1mW2xdKToocz1hKToocz1mYWxzZSk7aWYocyl0KGVba10pLGkmJihnLnB1c2goJzwvc3Bhbj4nKSxpPWIpLGcucHVzaChlW2srMV0pLGsrPTI7ZWxzZQotaWYobDxmLmxlbmd0aCl0KGZbbF0pLGo9ZltsKzFdLGwrPTI7ZWxzZSBicmVha310KGQubGVuZ3RoKSxpJiZnLnB1c2goJzwvc3Bhbj4nKSxjLnByZXR0eVByaW50ZWRIdG1sPWcuam9pbignJyl9dD17fTtmdW5jdGlvbgotVihhLGIpe3ZhciBjLGQ7Zm9yKGQ9Yi5sZW5ndGg7LS1kPj0wOyljPWJbZF0sdC5oYXNPd25Qcm9wZXJ0eShjKT8nY29uc29sZSdpbiB3aW5kb3cmJmNvbnNvbGUud2FybignY2Fubm90IG92ZXJyaWRlIGxhbmd1YWdlIGhhbmRsZXIgJXMnLGMpOih0W2NdPWEpfWZ1bmN0aW9uCi1XKGEsYil7cmV0dXJuIGEmJnQuaGFzT3duUHJvcGVydHkoYSl8fChhPS9eXHMqPC8udGVzdChiKT8nZGVmYXVsdC1tYXJrdXAnOidkZWZhdWx0LWNvZGUnKSx0W2FdfVYocyxbJ2RlZmF1bHQtY29kZSddKSxWKFMoW10sW1sncGxuJywvXltePD9dKy9dLFsnZGVjJywvXjwhXHdbXj5dKig/Oj58JCkvXSxbJ2NvbScsL148XCEtLVtcc1xTXSo/KD86LVwtPnwkKS9dLFsnbGFuZy0nLC9ePFw/KFtcc1xTXSs/KSg/Olw/PnwkKS9dLFsnbGFuZy0nLC9ePCUoW1xzXFNdKz8pKD86JT58JCkvXSxbJ3B1bicsL14oPzo8WyU/XXxbJT9dPikvXSxbJ2xhbmctJywvXjx4bXBcYltePl0qPihbXHNcU10rPyk8XC94bXBcYltePl0qPi9pXSxbJ2xhbmctanMnLC9ePHNjcmlwdFxiW14+XSo+KFtcc1xTXSo/KSg8XC9zY3JpcHRcYltePl0qPikvaV0sWydsYW5nLWNzcycsL148c3R5bGVcYltePl0qPihbXHNcU10qPykoPFwvc3R5bGVcYltePl0qPikvaV0sWydsYW5nLWluLnRhZycsL14oPFwvP1thLXpdW148Pl0qPikvaV1dKSxbJ2RlZmF1bHQtbWFya3VwJywnaHRtJywnaHRtbCcsJ214bWwnLCd4aHRtbCcsJ3htbCcsJ3hzbCddKSxWKFMoW1sncGxuJywvXltcc10rLyxiLCcgCVxyXG4nXSxbJ2F0dicsL14oPzpcIlteXCJdKlwiP3xcJ1teXCddKlwnPykvLGIsJ1wiXCcnXV0sW1sndGFnJywvXl48XC8/W2Etel0oPzpbXHcuOi1dKlx3KT98XC8/PiQvaV0sWydhdG4nLC9eKD8hc3R5bGVbXHM9XXxvbilbYS16XSg/OltcdzotXSpcdyk/L2ldLFsnbGFuZy11cS52YWwnLC9ePVxzKihbXj5cJ1wiXHNdKig/OltePlwnXCJcc1wvXXxcLyg/PVxzKSkpL10sWydwdW4nLC9eWz08PlwvXSsvXSxbJ2xhbmctanMnLC9eb25cdytccyo9XHMqXCIoW15cIl0rKVwiL2ldLFsnbGFuZy1qcycsL15vblx3K1xzKj1ccypcJyhbXlwnXSspXCcvaV0sWydsYW5nLWpzJywvXm9uXHcrXHMqPVxzKihbXlwiXCc+XHNdKykvaV0sWydsYW5nLWNzcycsL15zdHlsZVxzKj1ccypcIihbXlwiXSspXCIvaV0sWydsYW5nLWNzcycsL15zdHlsZVxzKj1ccypcJyhbXlwnXSspXCcvaV0sWydsYW5nLWNzcycsL15zdHlsZVxzKj1ccyooW15cIlwnPlxzXSspL2ldXSksWydpbi50YWcnXSksVihTKFtdLFtbJ2F0dicsL15bXHNcU10rL11dKSxbJ3VxLnZhbCddKSxWKFQoe2tleXdvcmRzOmQsaGFzaENvbW1lbnRzOmEsY1N0eWxlQ29tbWVudHM6YX0pLFsnYycsJ2NjJywnY3BwJywnY3h4JywnY3ljJywnbSddKSxWKFQoe2tleXdvcmRzOidudWxsIHRydWUgZmFsc2UnfSksWydqc29uJ10pLFYoVCh7a2V5d29yZHM6ZixoYXNoQ29tbWVudHM6YSxjU3R5bGVDb21tZW50czphLHZlcmJhdGltU3RyaW5nczphfSksWydjcyddKSxWKFQoe2tleXdvcmRzOmUsY1N0eWxlQ29tbWVudHM6YX0pLFsnamF2YSddKSxWKFQoe2tleXdvcmRzOmssaGFzaENvbW1lbnRzOmEsbXVsdGlMaW5lU3RyaW5nczphfSksWydic2gnLCdjc2gnLCdzaCddKSxWKFQoe2tleXdvcmRzOmksaGFzaENvbW1lbnRzOmEsbXVsdGlMaW5lU3RyaW5nczphLHRyaXBsZVF1b3RlZFN0cmluZ3M6YX0pLFsnY3YnLCdweSddKSxWKFQoe2tleXdvcmRzOmgsaGFzaENvbW1lbnRzOmEsbXVsdGlMaW5lU3RyaW5nczphLHJlZ2V4TGl0ZXJhbHM6YX0pLFsncGVybCcsJ3BsJywncG0nXSksVihUKHtrZXl3b3JkczpqLGhhc2hDb21tZW50czphLG11bHRpTGluZVN0cmluZ3M6YSxyZWdleExpdGVyYWxzOmF9KSxbJ3JiJ10pLFYoVCh7a2V5d29yZHM6ZyxjU3R5bGVDb21tZW50czphLHJlZ2V4TGl0ZXJhbHM6YX0pLFsnanMnXSksVihTKFtdLFtbJ3N0cicsL15bXHNcU10rL11dKSxbJ3JlZ2V4J10pO2Z1bmN0aW9uCi1YKGEpe3ZhciBiPWEuc291cmNlQ29kZUh0bWwsYz1hLmxhbmdFeHRlbnNpb24sZCxlO2EucHJldHR5UHJpbnRlZEh0bWw9Yjt0cnl7ZT1QKGIpLGQ9ZS5zb3VyY2UsYS5zb3VyY2U9ZCxhLmJhc2VQb3M9MCxhLmV4dHJhY3RlZFRhZ3M9ZS50YWdzLFcoYyxkKShhKSxVKGEpfWNhdGNoKGYpeydjb25zb2xlJ2luCi13aW5kb3cmJihjb25zb2xlLmxvZyhmKSxjb25zb2xlLnRyYWNlKCkpfX1mdW5jdGlvbiBZKGEsYil7dmFyIGM9e3NvdXJjZUNvZGVIdG1sOmEsbGFuZ0V4dGVuc2lvbjpifTtyZXR1cm4gWChjKSxjLnByZXR0eVByaW50ZWRIdG1sfWZ1bmN0aW9uCi1aKGMpe3ZhciBkPXdpbmRvdy5fcHJfaXNJRTYoKSxlPWQ9PT02PydcclxuJzonXHInLGY9W2RvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdwcmUnKSxkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnY29kZScpLGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCd4bXAnKV0sZz1bXSxoLGksaixrLGwsbTtmb3IoaT0wO2k8Zi5sZW5ndGg7KytpKWZvcihqPTAsbD1mW2ldLmxlbmd0aDtqPGw7KytqKWcucHVzaChmW2ldW2pdKTtmPWIsaD1EYXRlLGgubm93fHwoaD17bm93OmZ1bmN0aW9uKCl7cmV0dXJuKG5ldwotRGF0ZSkuZ2V0VGltZSgpfX0pLGs9MDtmdW5jdGlvbiBuKCl7dmFyIGI9d2luZG93LlBSX1NIT1VMRF9VU0VfQ09OVElOVUFUSU9OP2gubm93KCkrMjUwOkluZmluaXR5LGQsZSxmLGksajtmb3IoO2s8Zy5sZW5ndGgmJmgubm93KCk8YjsrK2spe2U9Z1trXTtpZihlLmNsYXNzTmFtZSYmZS5jbGFzc05hbWUuaW5kZXhPZigncHJldHR5cHJpbnQnKT49MCl7Zj1lLmNsYXNzTmFtZS5tYXRjaCgvXGJsYW5nLShcdyspXGIvKSxmJiYoZj1mWzFdKSxpPWZhbHNlO2ZvcihqPWUucGFyZW50Tm9kZTtqO2o9ai5wYXJlbnROb2RlKWlmKChqLnRhZ05hbWU9PT0ncHJlJ3x8ai50YWdOYW1lPT09J2NvZGUnfHxqLnRhZ05hbWU9PT0neG1wJykmJmouY2xhc3NOYW1lJiZqLmNsYXNzTmFtZS5pbmRleE9mKCdwcmV0dHlwcmludCcpPj0wKXtpPWE7YnJlYWt9aXx8KGQ9TihlKSxkPWQucmVwbGFjZSgvKD86XHJcbj98XG4pJC8sJycpLG09e3NvdXJjZUNvZGVIdG1sOmQsbGFuZ0V4dGVuc2lvbjpmLHNvdXJjZU5vZGU6ZX0sWChtKSxvKCkpfX1rPGcubGVuZ3RoP3NldFRpbWVvdXQobiwyNTApOmMmJmMoKX1mdW5jdGlvbgotbygpe3ZhciBhPW0ucHJldHR5UHJpbnRlZEh0bWwsYixjLGYsZyxoLGksaixrO2lmKCFhKXJldHVybjtmPW0uc291cmNlTm9kZTtpZighSihmKSlmLmlubmVySFRNTD1hO2Vsc2V7az1kb2N1bWVudC5jcmVhdGVFbGVtZW50KCdQUkUnKTtmb3IoZz0wO2c8Zi5hdHRyaWJ1dGVzLmxlbmd0aDsrK2cpYj1mLmF0dHJpYnV0ZXNbZ10sYi5zcGVjaWZpZWQmJihjPWIubmFtZS50b0xvd2VyQ2FzZSgpLGM9PT0nY2xhc3MnPyhrLmNsYXNzTmFtZT1iLnZhbHVlKTprLnNldEF0dHJpYnV0ZShiLm5hbWUsYi52YWx1ZSkpO2suaW5uZXJIVE1MPWEsZi5wYXJlbnROb2RlLnJlcGxhY2VDaGlsZChrLGYpLGY9a31pZihkJiZmLnRhZ05hbWU9PT0nUFJFJyl7aj1mLmdldEVsZW1lbnRzQnlUYWdOYW1lKCdicicpO2ZvcihoPWoubGVuZ3RoOy0taD49MDspaT1qW2hdLGkucGFyZW50Tm9kZS5yZXBsYWNlQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoZSksaSl9fW4oKX13aW5kb3cuUFJfbm9ybWFsaXplZEh0bWw9TCx3aW5kb3cucHJldHR5UHJpbnRPbmU9WSx3aW5kb3cucHJldHR5UHJpbnQ9Wix3aW5kb3cuUFI9e2NvbWJpbmVQcmVmaXhQYXR0ZXJuczpNLGNyZWF0ZVNpbXBsZUxleGVyOlMscmVnaXN0ZXJMYW5nSGFuZGxlcjpWLHNvdXJjZURlY29yYXRvcjpULFBSX0FUVFJJQl9OQU1FOidhdG4nLFBSX0FUVFJJQl9WQUxVRTonYXR2JyxQUl9DT01NRU5UOidjb20nLFBSX0RFQ0xBUkFUSU9OOidkZWMnLFBSX0tFWVdPUkQ6J2t3ZCcsUFJfTElURVJBTDonbGl0JyxQUl9OT0NPREU6J25vY29kZScsUFJfUExBSU46J3BsbicsUFJfUFVOQ1RVQVRJT046J3B1bicsUFJfU09VUkNFOidzcmMnLFBSX1NUUklORzonc3RyJyxQUl9UQUc6J3RhZycsUFJfVFlQRTondHlwJ319KSgpClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQordmFyIHI9bnVsbDt3aW5kb3cuUFJfU0hPVUxEX1VTRV9DT05USU5VQVRJT049ITA7CisoZnVuY3Rpb24oKXtmdW5jdGlvbiBPKGEpe2Z1bmN0aW9uIGkoZCl7dmFyIGE9ZC5jaGFyQ29kZUF0KDApO2lmKGEhPT05MilyZXR1cm4gYTt2YXIgZj1kLmNoYXJBdCgxKTtyZXR1cm4oYT1zW2ZdKT9hOiIwIjw9ZiYmZjw9IjciP3BhcnNlSW50KGQuc3Vic3RyaW5nKDEpLDgpOmY9PT0idSJ8fGY9PT0ieCI/cGFyc2VJbnQoZC5zdWJzdHJpbmcoMiksMTYpOmQuY2hhckNvZGVBdCgxKX1mdW5jdGlvbiBnKGQpe2lmKGQ8MzIpcmV0dXJuKGQ8MTY/IlxceDAiOiJcXHgiKStkLnRvU3RyaW5nKDE2KTtkPVN0cmluZy5mcm9tQ2hhckNvZGUoZCk7cmV0dXJuIGQ9PT0iXFwifHxkPT09Ii0ifHxkPT09Il0ifHxkPT09Il4iPyJcXCIrZDpkfWZ1bmN0aW9uIGooZCl7dmFyIGE9ZC5zdWJzdHJpbmcoMSxkLmxlbmd0aC0xKS5tYXRjaCgvXFx1W1xkQS1GYS1mXXs0fXxcXHhbXGRBLUZhLWZdezJ9fFxcWzAtM11bMC03XXswLDJ9fFxcWzAtN117MSwyfXxcXFtcU1xzXXxbXlxcXS9nKSxkPVtdLGY9CithWzBdPT09Il4iLGI9WyJbIl07ZiYmYi5wdXNoKCJeIik7Zm9yKHZhciBmPWY/MTowLGM9YS5sZW5ndGg7ZjxjOysrZil7dmFyIGg9YVtmXTtpZigvXFxbYmRzd10vaS50ZXN0KGgpKWIucHVzaChoKTtlbHNle3ZhciBoPWkoaCksZTtmKzI8YyYmIi0iPT09YVtmKzFdPyhlPWkoYVtmKzJdKSxmKz0yKTplPWg7ZC5wdXNoKFtoLGVdKTtlPDY1fHxoPjEyMnx8KGU8NjV8fGg+OTB8fGQucHVzaChbTWF0aC5tYXgoNjUsaCl8MzIsTWF0aC5taW4oZSw5MCl8MzJdKSxlPDk3fHxoPjEyMnx8ZC5wdXNoKFtNYXRoLm1heCg5NyxoKSYtMzMsTWF0aC5taW4oZSwxMjIpJi0zM10pKX19ZC5zb3J0KGZ1bmN0aW9uKGQsYSl7cmV0dXJuIGRbMF0tYVswXXx8YVsxXS1kWzFdfSk7YT1bXTtjPVtdO2ZvcihmPTA7ZjxkLmxlbmd0aDsrK2YpaD1kW2ZdLGhbMF08PWNbMV0rMT9jWzFdPU1hdGgubWF4KGNbMV0saFsxXSk6YS5wdXNoKGM9aCk7Zm9yKGY9MDtmPGEubGVuZ3RoOysrZiloPWFbZl0sYi5wdXNoKGcoaFswXSkpLAoraFsxXT5oWzBdJiYoaFsxXSsxPmhbMF0mJmIucHVzaCgiLSIpLGIucHVzaChnKGhbMV0pKSk7Yi5wdXNoKCJdIik7cmV0dXJuIGIuam9pbigiIil9ZnVuY3Rpb24gdChkKXtmb3IodmFyIGE9ZC5zb3VyY2UubWF0Y2goL1xbKD86W15cXFxdXXxcXFtcU1xzXSkqXXxcXHVbXGRBLUZhLWZdezR9fFxceFtcZEEtRmEtZl17Mn18XFxcZCt8XFxbXlxkdXhdfFwoXD9bITo9XXxbKCleXXxbXigpW1xcXl0rL2cpLGI9YS5sZW5ndGgsaT1bXSxjPTAsaD0wO2M8YjsrK2Mpe3ZhciBlPWFbY107ZT09PSIoIj8rK2g6IlxcIj09PWUuY2hhckF0KDApJiYoZT0rZS5zdWJzdHJpbmcoMSkpJiYoZTw9aD9pW2VdPS0xOmFbY109ZyhlKSl9Zm9yKGM9MTtjPGkubGVuZ3RoOysrYyktMT09PWlbY10mJihpW2NdPSsreik7Zm9yKGg9Yz0wO2M8YjsrK2MpZT1hW2NdLGU9PT0iKCI/KCsraCxpW2hdfHwoYVtjXT0iKD86IikpOiJcXCI9PT1lLmNoYXJBdCgwKSYmKGU9K2Uuc3Vic3RyaW5nKDEpKSYmZTw9aCYmCisoYVtjXT0iXFwiK2lbZV0pO2ZvcihjPTA7YzxiOysrYykiXiI9PT1hW2NdJiYiXiIhPT1hW2MrMV0mJihhW2NdPSIiKTtpZihkLmlnbm9yZUNhc2UmJncpZm9yKGM9MDtjPGI7KytjKWU9YVtjXSxkPWUuY2hhckF0KDApLGUubGVuZ3RoPj0yJiZkPT09IlsiP2FbY109aihlKTpkIT09IlxcIiYmKGFbY109ZS5yZXBsYWNlKC9bQS1aYS16XS9nLGZ1bmN0aW9uKGQpe2Q9ZC5jaGFyQ29kZUF0KDApO3JldHVybiJbIitTdHJpbmcuZnJvbUNoYXJDb2RlKGQmLTMzLGR8MzIpKyJdIn0pKTtyZXR1cm4gYS5qb2luKCIiKX1mb3IodmFyIHo9MCx3PSExLGs9ITEsbT0wLGI9YS5sZW5ndGg7bTxiOysrbSl7dmFyIG89YVttXTtpZihvLmlnbm9yZUNhc2Upaz0hMDtlbHNlIGlmKC9bYS16XS9pLnRlc3Qoby5zb3VyY2UucmVwbGFjZSgvXFx1W1xkYS1mXXs0fXxcXHhbXGRhLWZdezJ9fFxcW15VWHV4XS9naSwiIikpKXt3PSEwO2s9ITE7YnJlYWt9fWZvcih2YXIgcz17Yjo4LHQ6OSxuOjEwLHY6MTEsCitmOjEyLHI6MTN9LHE9W10sbT0wLGI9YS5sZW5ndGg7bTxiOysrbSl7bz1hW21dO2lmKG8uZ2xvYmFsfHxvLm11bHRpbGluZSl0aHJvdyBFcnJvcigiIitvKTtxLnB1c2goIig/OiIrdChvKSsiKSIpfXJldHVybiBSZWdFeHAocS5qb2luKCJ8Iiksaz8iZ2kiOiJnIil9ZnVuY3Rpb24gUChhLGkpe2Z1bmN0aW9uIGcoYSl7c3dpdGNoKGEubm9kZVR5cGUpe2Nhc2UgMTppZihqLnRlc3QoYS5jbGFzc05hbWUpKWJyZWFrO2Zvcih2YXIgYj1hLmZpcnN0Q2hpbGQ7YjtiPWIubmV4dFNpYmxpbmcpZyhiKTtiPWEubm9kZU5hbWUudG9Mb3dlckNhc2UoKTtpZigiYnIiPT09Ynx8ImxpIj09PWIpdFtrXT0iXG4iLHdbazw8MV09eisrLHdbaysrPDwxfDFdPWE7YnJlYWs7Y2FzZSAzOmNhc2UgNDpiPWEubm9kZVZhbHVlLGIubGVuZ3RoJiYoYj1pP2IucmVwbGFjZSgvXHJcbj8vZywiXG4iKTpiLnJlcGxhY2UoL1tcdFxuXHIgXSsvZywiICIpLHRba109Yix3W2s8PDFdPXoseis9Yi5sZW5ndGgsd1trKys8PAorMXwxXT1hKX19dmFyIGo9Lyg/Ol58XHMpbm9jb2RlKD86XHN8JCkvLHQ9W10sej0wLHc9W10saz0wO2coYSk7cmV0dXJue2E6dC5qb2luKCIiKS5yZXBsYWNlKC9cbiQvLCIiKSxkOnd9fWZ1bmN0aW9uIEUoYSxpLGcsail7aSYmKGE9e2E6aSxlOmF9LGcoYSksai5wdXNoLmFwcGx5KGosYS5nKSl9ZnVuY3Rpb24geChhLGkpe2Z1bmN0aW9uIGcoYSl7Zm9yKHZhciBrPWEuZSxtPVtrLCJwbG4iXSxiPTAsbz1hLmEubWF0Y2godCl8fFtdLHM9e30scT0wLGQ9by5sZW5ndGg7cTxkOysrcSl7dmFyIHY9b1txXSxmPXNbdl0sdT12b2lkIDAsYztpZih0eXBlb2YgZj09PSJzdHJpbmciKWM9ITE7ZWxzZXt2YXIgaD1qW3YuY2hhckF0KDApXTtpZihoKXU9di5tYXRjaChoWzFdKSxmPWhbMF07ZWxzZXtmb3IoYz0wO2M8ejsrK2MpaWYoaD1pW2NdLHU9di5tYXRjaChoWzFdKSl7Zj1oWzBdO2JyZWFrfXV8fChmPSJwbG4iKX1pZigoYz1mLmxlbmd0aD49NSYmImxhbmctIj09PWYuc3Vic3RyaW5nKDAsCis1KSkmJiEodSYmdHlwZW9mIHVbMV09PT0ic3RyaW5nIikpYz0hMSxmPSJzcmMiO2N8fChzW3ZdPWYpfWg9YjtiKz12Lmxlbmd0aDtpZihjKXtjPXVbMV07dmFyIGU9di5pbmRleE9mKGMpLHA9ZStjLmxlbmd0aDt1WzJdJiYocD12Lmxlbmd0aC11WzJdLmxlbmd0aCxlPXAtYy5sZW5ndGgpO2Y9Zi5zdWJzdHJpbmcoNSk7RShrK2gsdi5zdWJzdHJpbmcoMCxlKSxnLG0pO0UoaytoK2UsYyxGKGYsYyksbSk7RShrK2grcCx2LnN1YnN0cmluZyhwKSxnLG0pfWVsc2UgbS5wdXNoKGsraCxmKX1hLmc9bX12YXIgaj17fSx0OyhmdW5jdGlvbigpe2Zvcih2YXIgZz1hLmNvbmNhdChpKSxrPVtdLG09e30sYj0wLG89Zy5sZW5ndGg7YjxvOysrYil7dmFyIHM9Z1tiXSxxPXNbM107aWYocSlmb3IodmFyIGQ9cS5sZW5ndGg7LS1kPj0wOylqW3EuY2hhckF0KGQpXT1zO3M9c1sxXTtxPSIiK3M7bS5oYXNPd25Qcm9wZXJ0eShxKXx8KGsucHVzaChzKSxtW3FdPXIpfWsucHVzaCgvW1xTXHNdLyk7dD0KK08oayl9KSgpO3ZhciB6PWkubGVuZ3RoO3JldHVybiBnfWZ1bmN0aW9uIGwoYSl7dmFyIGk9W10sZz1bXTthLnRyaXBsZVF1b3RlZFN0cmluZ3M/aS5wdXNoKFsic3RyIiwvXig/OicnJyg/OlteJ1xcXXxcXFtcU1xzXXwnJz8oPz1bXiddKSkqKD86JycnfCQpfCIiIig/OlteIlxcXXxcXFtcU1xzXXwiIj8oPz1bXiJdKSkqKD86IiIifCQpfCcoPzpbXidcXF18XFxbXFNcc10pKig/Oid8JCl8Iig/OlteIlxcXXxcXFtcU1xzXSkqKD86InwkKSkvLHIsIidcIiJdKTphLm11bHRpTGluZVN0cmluZ3M/aS5wdXNoKFsic3RyIiwvXig/OicoPzpbXidcXF18XFxbXFNcc10pKig/Oid8JCl8Iig/OlteIlxcXXxcXFtcU1xzXSkqKD86InwkKXxgKD86W15cXGBdfFxcW1xTXHNdKSooPzpgfCQpKS8sciwiJ1wiYCJdKTppLnB1c2goWyJzdHIiLC9eKD86Jyg/OlteXG5ccidcXF18XFwuKSooPzonfCQpfCIoPzpbXlxuXHIiXFxdfFxcLikqKD86InwkKSkvLHIsIlwiJyJdKTthLnZlcmJhdGltU3RyaW5ncyYmCitnLnB1c2goWyJzdHIiLC9eQCIoPzpbXiJdfCIiKSooPzoifCQpLyxyXSk7dmFyIGo9YS5oYXNoQ29tbWVudHM7aiYmKGEuY1N0eWxlQ29tbWVudHM/KGo+MT9pLnB1c2goWyJjb20iLC9eIyg/OiMjKD86W14jXXwjKD8hIyMpKSooPzojIyN8JCl8LiopLyxyLCIjIl0pOmkucHVzaChbImNvbSIsL14jKD86KD86ZGVmaW5lfGUoPzpsfG5kKWlmfGVsc2V8ZXJyb3J8aWZuP2RlZnxpbmNsdWRlfGxpbmV8cHJhZ21hfHVuZGVmfHdhcm5pbmcpXGJ8W15cblxyXSopLyxyLCIjIl0pLGcucHVzaChbInN0ciIsL148KD86KD86KD86XC5cLlwvKSp8XC8/KSg/Oltcdy1dKyg/OlwvW1x3LV0rKSspP1tcdy1dK1wuaCg/Omh8cHB8XCtcKyk/fFthLXpdXHcqKT4vLHJdKSk6aS5wdXNoKFsiY29tIiwvXiNbXlxuXHJdKi8sciwiIyJdKSk7YS5jU3R5bGVDb21tZW50cyYmKGcucHVzaChbImNvbSIsL15cL1wvW15cblxyXSovLHJdKSxnLnB1c2goWyJjb20iLC9eXC9cKltcU1xzXSo/KD86XCpcL3wkKS8sCityXSkpO2EucmVnZXhMaXRlcmFscyYmZy5wdXNoKFsibGFuZy1yZWdleCIsL14oPzpeXlwuP3xbKy1dfFshPV09ezAsMn18I3wlPT98JiY/PT98XCh8XCo9P3xbKy1dPXwtPnxcLz0/fDo6P3w8PD89P3w+ezEsM309P3xbLDs/QFt7fl18XF5cXj89P3xcfFx8Pz0/fGJyZWFrfGNhc2V8Y29udGludWV8ZGVsZXRlfGRvfGVsc2V8ZmluYWxseXxpbnN0YW5jZW9mfHJldHVybnx0aHJvd3x0cnl8dHlwZW9mKVxzKihcLyg/PVteKi9dKSg/OlteL1tcXF18XFxbXFNcc118XFsoPzpbXlxcXF1dfFxcW1xTXHNdKSooPzpdfCQpKStcLykvXSk7KGo9YS50eXBlcykmJmcucHVzaChbInR5cCIsal0pO2E9KCIiK2Eua2V5d29yZHMpLnJlcGxhY2UoL14gfCAkL2csIiIpO2EubGVuZ3RoJiZnLnB1c2goWyJrd2QiLFJlZ0V4cCgiXig/OiIrYS5yZXBsYWNlKC9bXHMsXSsvZywifCIpKyIpXFxiIikscl0pO2kucHVzaChbInBsbiIsL15ccysvLHIsIiBcclxuXHRcdTAwYTAiXSk7Zy5wdXNoKFsibGl0IiwKKy9eQFskX2Etel1bXHckQF0qL2kscl0sWyJ0eXAiLC9eKD86W0BfXT9bQS1aXStbYS16XVtcdyRAXSp8XHcrX3RcYikvLHJdLFsicGxuIiwvXlskX2Etel1bXHckQF0qL2kscl0sWyJsaXQiLC9eKD86MHhbXGRhLWZdK3woPzpcZCg/Ol9cZCspKlxkKig/OlwuXGQqKT98XC5cZFwrKSg/OmVbKy1dP1xkKyk/KVthLXpdKi9pLHIsIjAxMjM0NTY3ODkiXSxbInBsbiIsL15cXFtcU1xzXT8vLHJdLFsicHVuIiwvXi5bXlxzXHciJCcuL0BcXGBdKi8scl0pO3JldHVybiB4KGksZyl9ZnVuY3Rpb24gRyhhLGksZyl7ZnVuY3Rpb24gaihhKXtzd2l0Y2goYS5ub2RlVHlwZSl7Y2FzZSAxOmlmKHoudGVzdChhLmNsYXNzTmFtZSkpYnJlYWs7aWYoImJyIj09PWEubm9kZU5hbWUpdChhKSxhLnBhcmVudE5vZGUmJmEucGFyZW50Tm9kZS5yZW1vdmVDaGlsZChhKTtlbHNlIGZvcihhPWEuZmlyc3RDaGlsZDthO2E9YS5uZXh0U2libGluZylqKGEpO2JyZWFrO2Nhc2UgMzpjYXNlIDQ6aWYoZyl7dmFyIGI9CithLm5vZGVWYWx1ZSxmPWIubWF0Y2gobik7aWYoZil7dmFyIGk9Yi5zdWJzdHJpbmcoMCxmLmluZGV4KTthLm5vZGVWYWx1ZT1pOyhiPWIuc3Vic3RyaW5nKGYuaW5kZXgrZlswXS5sZW5ndGgpKSYmYS5wYXJlbnROb2RlLmluc2VydEJlZm9yZShrLmNyZWF0ZVRleHROb2RlKGIpLGEubmV4dFNpYmxpbmcpO3QoYSk7aXx8YS5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKGEpfX19fWZ1bmN0aW9uIHQoYSl7ZnVuY3Rpb24gaShhLGIpe3ZhciBkPWI/YS5jbG9uZU5vZGUoITEpOmEsZT1hLnBhcmVudE5vZGU7aWYoZSl7dmFyIGU9aShlLDEpLGY9YS5uZXh0U2libGluZztlLmFwcGVuZENoaWxkKGQpO2Zvcih2YXIgZz1mO2c7Zz1mKWY9Zy5uZXh0U2libGluZyxlLmFwcGVuZENoaWxkKGcpfXJldHVybiBkfWZvcig7IWEubmV4dFNpYmxpbmc7KWlmKGE9YS5wYXJlbnROb2RlLCFhKXJldHVybjtmb3IodmFyIGE9aShhLm5leHRTaWJsaW5nLDApLGY7KGY9YS5wYXJlbnROb2RlKSYmZi5ub2RlVHlwZT09PQorMTspYT1mO2IucHVzaChhKX1mb3IodmFyIHo9Lyg/Ol58XHMpbm9jb2RlKD86XHN8JCkvLG49L1xyXG4/fFxuLyxrPWEub3duZXJEb2N1bWVudCxtPWsuY3JlYXRlRWxlbWVudCgibGkiKTthLmZpcnN0Q2hpbGQ7KW0uYXBwZW5kQ2hpbGQoYS5maXJzdENoaWxkKTtmb3IodmFyIGI9W21dLG89MDtvPGIubGVuZ3RoOysrbylqKGJbb10pO2k9PT0oaXwwKSYmYlswXS5zZXRBdHRyaWJ1dGUoInZhbHVlIixpKTt2YXIgcz1rLmNyZWF0ZUVsZW1lbnQoIm9sIik7cy5jbGFzc05hbWU9ImxpbmVudW1zIjtmb3IodmFyIGk9TWF0aC5tYXgoMCxpLTF8MCl8fDAsbz0wLHE9Yi5sZW5ndGg7bzxxOysrbyltPWJbb10sbS5jbGFzc05hbWU9IkwiKyhvK2kpJTEwLG0uZmlyc3RDaGlsZHx8bS5hcHBlbmRDaGlsZChrLmNyZWF0ZVRleHROb2RlKCJcdTAwYTAiKSkscy5hcHBlbmRDaGlsZChtKTthLmFwcGVuZENoaWxkKHMpfWZ1bmN0aW9uIG4oYSxpKXtmb3IodmFyIGc9aS5sZW5ndGg7LS1nPj0wOyl7dmFyIGo9CitpW2ddO0EuaGFzT3duUHJvcGVydHkoaik/Qy5jb25zb2xlJiZjb25zb2xlLndhcm4oImNhbm5vdCBvdmVycmlkZSBsYW5ndWFnZSBoYW5kbGVyICVzIixqKTpBW2pdPWF9fWZ1bmN0aW9uIEYoYSxpKXtpZighYXx8IUEuaGFzT3duUHJvcGVydHkoYSkpYT0vXlxzKjwvLnRlc3QoaSk/ImRlZmF1bHQtbWFya3VwIjoiZGVmYXVsdC1jb2RlIjtyZXR1cm4gQVthXX1mdW5jdGlvbiBIKGEpe3ZhciBpPWEuaDt0cnl7dmFyIGc9UChhLmMsYS5pKSxqPWcuYTthLmE9ajthLmQ9Zy5kO2EuZT0wO0YoaSxqKShhKTt2YXIgdD0vXGJNU0lFXHMoXGQrKS8uZXhlYyhuYXZpZ2F0b3IudXNlckFnZW50KSx0PXQmJit0WzFdPD04LGk9L1xuL2csbj1hLmEsdz1uLmxlbmd0aCxnPTAsaz1hLmQsbT1rLmxlbmd0aCxqPTAsYj1hLmcsbz1iLmxlbmd0aCxzPTA7YltvXT13O3ZhciBxLGQ7Zm9yKGQ9cT0wO2Q8bzspYltkXSE9PWJbZCsyXT8oYltxKytdPWJbZCsrXSxiW3ErK109YltkKytdKTpkKz0yO289cTsKK2ZvcihkPXE9MDtkPG87KXtmb3IodmFyIHY9YltkXSxmPWJbZCsxXSx1PWQrMjt1KzI8PW8mJmJbdSsxXT09PWY7KXUrPTI7YltxKytdPXY7YltxKytdPWY7ZD11fWIubGVuZ3RoPXE7dmFyIGM9YS5jLGg7aWYoYyloPWMuc3R5bGUuZGlzcGxheSxjLnN0eWxlLmRpc3BsYXk9Im5vbmUiO3RyeXtmb3IoO2o8bTspe3ZhciBlPWtbaisyXXx8dyxwPWJbcysyXXx8dyx1PU1hdGgubWluKGUscCksbD1rW2orMV0sRDtpZihsLm5vZGVUeXBlIT09MSYmKEQ9bi5zdWJzdHJpbmcoZyx1KSkpe3QmJihEPUQucmVwbGFjZShpLCJcciIpKTtsLm5vZGVWYWx1ZT1EO3ZhciB5PWwub3duZXJEb2N1bWVudCx4PXkuY3JlYXRlRWxlbWVudCgic3BhbiIpO3guY2xhc3NOYW1lPWJbcysxXTt2YXIgQj1sLnBhcmVudE5vZGU7Qi5yZXBsYWNlQ2hpbGQoeCxsKTt4LmFwcGVuZENoaWxkKGwpO2c8ZSYmKGtbaisxXT1sPXkuY3JlYXRlVGV4dE5vZGUobi5zdWJzdHJpbmcodSxlKSksQi5pbnNlcnRCZWZvcmUobCwKK3gubmV4dFNpYmxpbmcpKX1nPXU7Zz49ZSYmKGorPTIpO2c+PXAmJihzKz0yKX19ZmluYWxseXtpZihjKWMuc3R5bGUuZGlzcGxheT1ofX1jYXRjaChBKXtDLmNvbnNvbGUmJmNvbnNvbGUubG9nKEEmJkEuc3RhY2s/QS5zdGFjazpBKX19dmFyIEM9d2luZG93LHk9WyJicmVhayxjb250aW51ZSxkbyxlbHNlLGZvcixpZixyZXR1cm4sd2hpbGUiXSxCPVtbeSwiYXV0byxjYXNlLGNoYXIsY29uc3QsZGVmYXVsdCxkb3VibGUsZW51bSxleHRlcm4sZmxvYXQsZ290byxpbnQsbG9uZyxyZWdpc3RlcixzaG9ydCxzaWduZWQsc2l6ZW9mLHN0YXRpYyxzdHJ1Y3Qsc3dpdGNoLHR5cGVkZWYsdW5pb24sdW5zaWduZWQsdm9pZCx2b2xhdGlsZSJdLCJjYXRjaCxjbGFzcyxkZWxldGUsZmFsc2UsaW1wb3J0LG5ldyxvcGVyYXRvcixwcml2YXRlLHByb3RlY3RlZCxwdWJsaWMsdGhpcyx0aHJvdyx0cnVlLHRyeSx0eXBlb2YiXSxJPVtCLCJhbGlnbm9mLGFsaWduX3VuaW9uLGFzbSxheGlvbSxib29sLGNvbmNlcHQsY29uY2VwdF9tYXAsY29uc3RfY2FzdCxjb25zdGV4cHIsZGVjbHR5cGUsZHluYW1pY19jYXN0LGV4cGxpY2l0LGV4cG9ydCxmcmllbmQsaW5saW5lLGxhdGVfY2hlY2ssbXV0YWJsZSxuYW1lc3BhY2UsbnVsbHB0cixyZWludGVycHJldF9jYXN0LHN0YXRpY19hc3NlcnQsc3RhdGljX2Nhc3QsdGVtcGxhdGUsdHlwZWlkLHR5cGVuYW1lLHVzaW5nLHZpcnR1YWwsd2hlcmUiXSwKK0o9W0IsImFic3RyYWN0LGJvb2xlYW4sYnl0ZSxleHRlbmRzLGZpbmFsLGZpbmFsbHksaW1wbGVtZW50cyxpbXBvcnQsaW5zdGFuY2VvZixudWxsLG5hdGl2ZSxwYWNrYWdlLHN0cmljdGZwLHN1cGVyLHN5bmNocm9uaXplZCx0aHJvd3MsdHJhbnNpZW50Il0sSz1bSiwiYXMsYmFzZSxieSxjaGVja2VkLGRlY2ltYWwsZGVsZWdhdGUsZGVzY2VuZGluZyxkeW5hbWljLGV2ZW50LGZpeGVkLGZvcmVhY2gsZnJvbSxncm91cCxpbXBsaWNpdCxpbixpbnRlcmZhY2UsaW50ZXJuYWwsaW50byxpcyxsZXQsbG9jayxvYmplY3Qsb3V0LG92ZXJyaWRlLG9yZGVyYnkscGFyYW1zLHBhcnRpYWwscmVhZG9ubHkscmVmLHNieXRlLHNlYWxlZCxzdGFja2FsbG9jLHN0cmluZyxzZWxlY3QsdWludCx1bG9uZyx1bmNoZWNrZWQsdW5zYWZlLHVzaG9ydCx2YXIsdmlydHVhbCx3aGVyZSJdLEI9W0IsImRlYnVnZ2VyLGV2YWwsZXhwb3J0LGZ1bmN0aW9uLGdldCxudWxsLHNldCx1bmRlZmluZWQsdmFyLHdpdGgsSW5maW5pdHksTmFOIl0sCitMPVt5LCJhbmQsYXMsYXNzZXJ0LGNsYXNzLGRlZixkZWwsZWxpZixleGNlcHQsZXhlYyxmaW5hbGx5LGZyb20sZ2xvYmFsLGltcG9ydCxpbixpcyxsYW1iZGEsbm9ubG9jYWwsbm90LG9yLHBhc3MscHJpbnQscmFpc2UsdHJ5LHdpdGgseWllbGQsRmFsc2UsVHJ1ZSxOb25lIl0sTT1beSwiYWxpYXMsYW5kLGJlZ2luLGNhc2UsY2xhc3MsZGVmLGRlZmluZWQsZWxzaWYsZW5kLGVuc3VyZSxmYWxzZSxpbixtb2R1bGUsbmV4dCxuaWwsbm90LG9yLHJlZG8scmVzY3VlLHJldHJ5LHNlbGYsc3VwZXIsdGhlbix0cnVlLHVuZGVmLHVubGVzcyx1bnRpbCx3aGVuLHlpZWxkLEJFR0lOLEVORCJdLHk9W3ksImNhc2UsZG9uZSxlbGlmLGVzYWMsZXZhbCxmaSxmdW5jdGlvbixpbixsb2NhbCxzZXQsdGhlbix1bnRpbCJdLE49L14oRElSfEZJTEV8dmVjdG9yfChkZXxwcmlvcml0eV8pP3F1ZXVlfGxpc3R8c3RhY2t8KGNvbnN0Xyk/aXRlcmF0b3J8KG11bHRpKT8oc2V0fG1hcCl8Yml0c2V0fHU/KGludHxmbG9hdClcZCopXGIvLAorUT0vXFMvLFI9bCh7a2V5d29yZHM6W0ksSyxCLCJjYWxsZXIsZGVsZXRlLGRpZSxkbyxkdW1wLGVsc2lmLGV2YWwsZXhpdCxmb3JlYWNoLGZvcixnb3RvLGlmLGltcG9ydCxsYXN0LGxvY2FsLG15LG5leHQsbm8sb3VyLHByaW50LHBhY2thZ2UscmVkbyxyZXF1aXJlLHN1Yix1bmRlZix1bmxlc3MsdW50aWwsdXNlLHdhbnRhcnJheSx3aGlsZSxCRUdJTixFTkQiK0wsTSx5XSxoYXNoQ29tbWVudHM6ITAsY1N0eWxlQ29tbWVudHM6ITAsbXVsdGlMaW5lU3RyaW5nczohMCxyZWdleExpdGVyYWxzOiEwfSksQT17fTtuKFIsWyJkZWZhdWx0LWNvZGUiXSk7bih4KFtdLFtbInBsbiIsL15bXjw/XSsvXSxbImRlYyIsL148IVx3W14+XSooPzo+fCQpL10sWyJjb20iLC9ePFwhLS1bXFNcc10qPyg/Oi0tXD58JCkvXSxbImxhbmctIiwvXjxcPyhbXFNcc10rPykoPzpcPz58JCkvXSxbImxhbmctIiwvXjwlKFtcU1xzXSs/KSg/OiU+fCQpL10sWyJwdW4iLC9eKD86PFslP118WyU/XT4pL10sWyJsYW5nLSIsCisvXjx4bXBcYltePl0qPihbXFNcc10rPyk8XC94bXBcYltePl0qPi9pXSxbImxhbmctanMiLC9ePHNjcmlwdFxiW14+XSo+KFtcU1xzXSo/KSg8XC9zY3JpcHRcYltePl0qPikvaV0sWyJsYW5nLWNzcyIsL148c3R5bGVcYltePl0qPihbXFNcc10qPykoPFwvc3R5bGVcYltePl0qPikvaV0sWyJsYW5nLWluLnRhZyIsL14oPFwvP1thLXpdW148Pl0qPikvaV1dKSxbImRlZmF1bHQtbWFya3VwIiwiaHRtIiwiaHRtbCIsIm14bWwiLCJ4aHRtbCIsInhtbCIsInhzbCJdKTtuKHgoW1sicGxuIiwvXlxzKy8sciwiIFx0XHJcbiJdLFsiYXR2IiwvXig/OiJbXiJdKiI/fCdbXiddKic/KS8sciwiXCInIl1dLFtbInRhZyIsL15ePFwvP1thLXpdKD86W1x3LS46XSpcdyk/fFwvPz4kL2ldLFsiYXRuIiwvXig/IXN0eWxlW1xzPV18b24pW2Etel0oPzpbXHc6LV0qXHcpPy9pXSxbImxhbmctdXEudmFsIiwvXj1ccyooW15ccyInPl0qKD86W15ccyInLz5dfFwvKD89XHMpKSkvXSxbInB1biIsL15bLzwtPl0rL10sCitbImxhbmctanMiLC9eb25cdytccyo9XHMqIihbXiJdKykiL2ldLFsibGFuZy1qcyIsL15vblx3K1xzKj1ccyonKFteJ10rKScvaV0sWyJsYW5nLWpzIiwvXm9uXHcrXHMqPVxzKihbXlxzIic+XSspL2ldLFsibGFuZy1jc3MiLC9ec3R5bGVccyo9XHMqIihbXiJdKykiL2ldLFsibGFuZy1jc3MiLC9ec3R5bGVccyo9XHMqJyhbXiddKyknL2ldLFsibGFuZy1jc3MiLC9ec3R5bGVccyo9XHMqKFteXHMiJz5dKykvaV1dKSxbImluLnRhZyJdKTtuKHgoW10sW1siYXR2IiwvXltcU1xzXSsvXV0pLFsidXEudmFsIl0pO24obCh7a2V5d29yZHM6SSxoYXNoQ29tbWVudHM6ITAsY1N0eWxlQ29tbWVudHM6ITAsdHlwZXM6Tn0pLFsiYyIsImNjIiwiY3BwIiwiY3h4IiwiY3ljIiwibSJdKTtuKGwoe2tleXdvcmRzOiJudWxsLHRydWUsZmFsc2UifSksWyJqc29uIl0pO24obCh7a2V5d29yZHM6SyxoYXNoQ29tbWVudHM6ITAsY1N0eWxlQ29tbWVudHM6ITAsdmVyYmF0aW1TdHJpbmdzOiEwLHR5cGVzOk59KSwKK1siY3MiXSk7bihsKHtrZXl3b3JkczpKLGNTdHlsZUNvbW1lbnRzOiEwfSksWyJqYXZhIl0pO24obCh7a2V5d29yZHM6eSxoYXNoQ29tbWVudHM6ITAsbXVsdGlMaW5lU3RyaW5nczohMH0pLFsiYnNoIiwiY3NoIiwic2giXSk7bihsKHtrZXl3b3JkczpMLGhhc2hDb21tZW50czohMCxtdWx0aUxpbmVTdHJpbmdzOiEwLHRyaXBsZVF1b3RlZFN0cmluZ3M6ITB9KSxbImN2IiwicHkiXSk7bihsKHtrZXl3b3JkczoiY2FsbGVyLGRlbGV0ZSxkaWUsZG8sZHVtcCxlbHNpZixldmFsLGV4aXQsZm9yZWFjaCxmb3IsZ290byxpZixpbXBvcnQsbGFzdCxsb2NhbCxteSxuZXh0LG5vLG91cixwcmludCxwYWNrYWdlLHJlZG8scmVxdWlyZSxzdWIsdW5kZWYsdW5sZXNzLHVudGlsLHVzZSx3YW50YXJyYXksd2hpbGUsQkVHSU4sRU5EIixoYXNoQ29tbWVudHM6ITAsbXVsdGlMaW5lU3RyaW5nczohMCxyZWdleExpdGVyYWxzOiEwfSksWyJwZXJsIiwicGwiLCJwbSJdKTtuKGwoe2tleXdvcmRzOk0saGFzaENvbW1lbnRzOiEwLAorbXVsdGlMaW5lU3RyaW5nczohMCxyZWdleExpdGVyYWxzOiEwfSksWyJyYiJdKTtuKGwoe2tleXdvcmRzOkIsY1N0eWxlQ29tbWVudHM6ITAscmVnZXhMaXRlcmFsczohMH0pLFsianMiXSk7bihsKHtrZXl3b3JkczoiYWxsLGFuZCxieSxjYXRjaCxjbGFzcyxlbHNlLGV4dGVuZHMsZmFsc2UsZmluYWxseSxmb3IsaWYsaW4saXMsaXNudCxsb29wLG5ldyxubyxub3QsbnVsbCxvZixvZmYsb24sb3IscmV0dXJuLHN1cGVyLHRoZW4sdGhyb3csdHJ1ZSx0cnksdW5sZXNzLHVudGlsLHdoZW4sd2hpbGUseWVzIixoYXNoQ29tbWVudHM6MyxjU3R5bGVDb21tZW50czohMCxtdWx0aWxpbmVTdHJpbmdzOiEwLHRyaXBsZVF1b3RlZFN0cmluZ3M6ITAscmVnZXhMaXRlcmFsczohMH0pLFsiY29mZmVlIl0pO24oeChbXSxbWyJzdHIiLC9eW1xTXHNdKy9dXSksWyJyZWdleCJdKTt2YXIgUz1DLlBSPXtjcmVhdGVTaW1wbGVMZXhlcjp4LHJlZ2lzdGVyTGFuZ0hhbmRsZXI6bixzb3VyY2VEZWNvcmF0b3I6bCwKK1BSX0FUVFJJQl9OQU1FOiJhdG4iLFBSX0FUVFJJQl9WQUxVRToiYXR2IixQUl9DT01NRU5UOiJjb20iLFBSX0RFQ0xBUkFUSU9OOiJkZWMiLFBSX0tFWVdPUkQ6Imt3ZCIsUFJfTElURVJBTDoibGl0IixQUl9OT0NPREU6Im5vY29kZSIsUFJfUExBSU46InBsbiIsUFJfUFVOQ1RVQVRJT046InB1biIsUFJfU09VUkNFOiJzcmMiLFBSX1NUUklORzoic3RyIixQUl9UQUc6InRhZyIsUFJfVFlQRToidHlwIixwcmV0dHlQcmludE9uZTpDLnByZXR0eVByaW50T25lPWZ1bmN0aW9uKGEsaSxnKXt2YXIgaj1kb2N1bWVudC5jcmVhdGVFbGVtZW50KCJwcmUiKTtqLmlubmVySFRNTD1hO2cmJkcoaixnLCEwKTtIKHtoOmksajpnLGM6aixpOjF9KTtyZXR1cm4gai5pbm5lckhUTUx9LHByZXR0eVByaW50OkMucHJldHR5UHJpbnQ9ZnVuY3Rpb24oYSl7ZnVuY3Rpb24gaSgpe3ZhciB1O2Zvcih2YXIgZz1DLlBSX1NIT1VMRF9VU0VfQ09OVElOVUFUSU9OP2subm93KCkrMjUwOkluZmluaXR5O208ai5sZW5ndGgmJgoray5ub3coKTxnO20rKyl7dmFyIGM9alttXSxoPWMuY2xhc3NOYW1lO2lmKHMudGVzdChoKSYmIXEudGVzdChoKSl7Zm9yKHZhciBlPSExLHA9Yy5wYXJlbnROb2RlO3A7cD1wLnBhcmVudE5vZGUpaWYoZi50ZXN0KHAudGFnTmFtZSkmJnAuY2xhc3NOYW1lJiZzLnRlc3QocC5jbGFzc05hbWUpKXtlPSEwO2JyZWFrfWlmKCFlKXtjLmNsYXNzTmFtZSs9IiBwcmV0dHlwcmludGVkIjt2YXIgaD1oLm1hdGNoKG8pLG47aWYoZT0haCl7Zm9yKHZhciBlPWMscD12b2lkIDAsbD1lLmZpcnN0Q2hpbGQ7bDtsPWwubmV4dFNpYmxpbmcpdmFyIHQ9bC5ub2RlVHlwZSxwPXQ9PT0xP3A/ZTpsOnQ9PT0zP1EudGVzdChsLm5vZGVWYWx1ZSk/ZTpwOnA7ZT0obj1wPT09ZT92b2lkIDA6cCkmJnYudGVzdChuLnRhZ05hbWUpfWUmJihoPW4uY2xhc3NOYW1lLm1hdGNoKG8pKTtoJiYoaD1oWzFdKTt1PWQudGVzdChjLnRhZ05hbWUpPzE6KGU9KGU9Yy5jdXJyZW50U3R5bGUpP2Uud2hpdGVTcGFjZTpkb2N1bWVudC5kZWZhdWx0VmlldyYmCitkb2N1bWVudC5kZWZhdWx0Vmlldy5nZXRDb21wdXRlZFN0eWxlP2RvY3VtZW50LmRlZmF1bHRWaWV3LmdldENvbXB1dGVkU3R5bGUoYyxyKS5nZXRQcm9wZXJ0eVZhbHVlKCJ3aGl0ZS1zcGFjZSIpOjApJiYicHJlIj09PWUuc3Vic3RyaW5nKDAsMyksZT11OyhwPShwPWMuY2xhc3NOYW1lLm1hdGNoKC9cYmxpbmVudW1zXGIoPzo6KFxkKykpPy8pKT9wWzFdJiZwWzFdLmxlbmd0aD8rcFsxXTohMDohMSkmJkcoYyxwLGUpO2I9e2g6aCxjOmMsajpwLGk6ZX07SChiKX19fW08ai5sZW5ndGg/c2V0VGltZW91dChpLDI1MCk6YSYmYSgpfWZvcih2YXIgZz1bZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoInByZSIpLGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJjb2RlIiksZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoInhtcCIpXSxqPVtdLG49MDtuPGcubGVuZ3RoOysrbilmb3IodmFyIGw9MCx3PWdbbl0ubGVuZ3RoO2w8dzsrK2wpai5wdXNoKGdbbl1bbF0pO3ZhciBnPQorcixrPURhdGU7ay5ub3d8fChrPXtub3c6ZnVuY3Rpb24oKXtyZXR1cm4rbmV3IERhdGV9fSk7dmFyIG09MCxiLG89L1xibGFuZyg/OnVhZ2UpPy0oW1x3Ll0rKSg/IVxTKS8scz0vXGJwcmV0dHlwcmludFxiLyxxPS9cYnByZXR0eXByaW50ZWRcYi8sZD0vcHJlfHhtcC9pLHY9L15jb2RlJC9pLGY9L14oPzpwcmV8Y29kZXx4bXApJC9pO2koKX19O3R5cGVvZiBkZWZpbmU9PT0iZnVuY3Rpb24iJiZkZWZpbmUuYW1kJiZkZWZpbmUoImdvb2dsZS1jb2RlLXByZXR0aWZ5IixbXSxmdW5jdGlvbigpe3JldHVybiBTfSl9KSgpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvc2VydmVyLWVudi5qcyBiL2dlcnJpdC1wcmV0dGlmeS9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcHJldHRpZnkvY2xpZW50L3NlcnZlci1lbnYuanMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDI4ZDQ5YzAuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXByZXR0aWZ5L3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9wcmV0dGlmeS9jbGllbnQvc2VydmVyLWVudi5qcworKysgL2Rldi9udWxsCkBAIC0xLDIyICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotLy8gTW96aWxsYSBSaGlubyBpcyBub3QgSUUgNi4KLS8vCi13aW5kb3cuX3ByX2lzSUU2ID0gZnVuY3Rpb24gKCkgeyByZXR1cm4gZmFsc2U7IH07Ci0KLS8vIEV4cG9zZSB0aGUgZnVuY3Rpb24gYXQgdGhlIHRvcCBsZXZlbCB0byBzaW1wbGlmeSBjYWxscy4KLS8vCi1wcmV0dHlQcmludE9uZSA9IHdpbmRvdy5wcmV0dHlQcmludE9uZTsKLVBSID0gd2luZG93LlBSOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3BvbS54bWwgYi9nZXJyaXQtcmV2aWV3ZGIvcG9tLnhtbAppbmRleCBmOWZiNDllLi45NjU5OWIzIDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvcG9tLnhtbAorKysgYi9nZXJyaXQtcmV2aWV3ZGIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXJldmlld2RiPC9hcnRpZmFjdElkPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnQuamF2YSBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9BY2NvdW50LmphdmEKaW5kZXggYjIzYWE4Ni4uOTRiMzdlMSAxMDA2NDQKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnQuamF2YQorKysgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQWNjb3VudC5qYXZhCkBAIC0xNjksNyArMTY5LDExIEBACiAKICAgLyoqIFNldCB0aGUgZnVsbCBuYW1lIG9mIHRoZSB1c2VyICgiR2l2ZW4tbmFtZSBTdXJuYW1lIiBzdHlsZSkuICovCiAgIHB1YmxpYyB2b2lkIHNldEZ1bGxOYW1lKGZpbmFsIFN0cmluZyBuYW1lKSB7Ci0gICAgZnVsbE5hbWUgPSBuYW1lOworICAgIGlmIChuYW1lICE9IG51bGwgJiYgIW5hbWUudHJpbSgpLmlzRW1wdHkoKSkgeworICAgICAgZnVsbE5hbWUgPSBuYW1lLnRyaW0oKTsKKyAgICB9IGVsc2UgeworICAgICAgZnVsbE5hbWUgPSBudWxsOworICAgIH0KICAgfQogCiAgIC8qKiBFbWFpbCBhZGRyZXNzIHRoZSB1c2VyIHByZWZlcnMgdG8gYmUgY29udGFjdGVkIHRocm91Z2guICovCmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQWNjb3VudEdyb3VwLmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQWNjb3VudEdyb3VwLmphdmEKaW5kZXggMDYxZWYzZS4uZWE5YzUyZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cC5qYXZhCisrKyBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9BY2NvdW50R3JvdXAuamF2YQpAQCAtODUsNiArODUsMTEgQEAKICAgICAgICAgfHwgdXVpZC5nZXQoKS5tYXRjaGVzKCJeWzAtOWEtZl17NDB9JCIpOwogICB9CiAKKyAgLyoqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgVVVJRCBpcyBmb3IgYSBzeXN0ZW0gZ3JvdXAgbWFuYWdlZCB3aXRoaW4gR2Vycml0LiAqLworICBwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNTeXN0ZW1Hcm91cChBY2NvdW50R3JvdXAuVVVJRCB1dWlkKSB7CisgICAgcmV0dXJuIHV1aWQuZ2V0KCkuc3RhcnRzV2l0aCgiZ2xvYmFsOiIpOworICB9CisKICAgLyoqIFN5bnRoZXRpYyBrZXkgdG8gbGluayB0byB3aXRoaW4gdGhlIGRhdGFiYXNlICovCiAgIHB1YmxpYyBzdGF0aWMgY2xhc3MgSWQgZXh0ZW5kcyBJbnRLZXk8Y29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LktleTw/Pj4gewogICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cEluY2x1ZGUuamF2YSBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9BY2NvdW50R3JvdXBJbmNsdWRlLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDRiNTg2ODkuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cEluY2x1ZGUuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDgxICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQ7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuQ29sdW1uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5Db21wb3VuZEtleTsKLQotLyoqIE1lbWJlcnNoaXAgb2YgYW4ge0BsaW5rIEFjY291bnRHcm91cH0gaW4gYW4ge0BsaW5rIEFjY291bnRHcm91cH0uICovCi1wdWJsaWMgZmluYWwgY2xhc3MgQWNjb3VudEdyb3VwSW5jbHVkZSB7Ci0gIHB1YmxpYyBzdGF0aWMgY2xhc3MgS2V5IGV4dGVuZHMgQ29tcG91bmRLZXk8QWNjb3VudEdyb3VwLklkPiB7Ci0gICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7Ci0KLSAgICBAQ29sdW1uKGlkID0gMSkKLSAgICBwcm90ZWN0ZWQgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQ7Ci0KLSAgICBAQ29sdW1uKGlkID0gMikKLSAgICBwcm90ZWN0ZWQgQWNjb3VudEdyb3VwLklkIGluY2x1ZGVJZDsKLQotICAgIHByb3RlY3RlZCBLZXkoKSB7Ci0gICAgICBncm91cElkID0gbmV3IEFjY291bnRHcm91cC5JZCgpOwotICAgICAgaW5jbHVkZUlkID0gbmV3IEFjY291bnRHcm91cC5JZCgpOwotICAgIH0KLQotICAgIHB1YmxpYyBLZXkoZmluYWwgQWNjb3VudEdyb3VwLklkIGcsIGZpbmFsIEFjY291bnRHcm91cC5JZCBpKSB7Ci0gICAgICBncm91cElkID0gZzsKLSAgICAgIGluY2x1ZGVJZCA9IGk7Ci0gICAgfQotCi0gICAgQE92ZXJyaWRlCi0gICAgcHVibGljIEFjY291bnRHcm91cC5JZCBnZXRQYXJlbnRLZXkoKSB7Ci0gICAgICByZXR1cm4gZ3JvdXBJZDsKLSAgICB9Ci0KLSAgICBwdWJsaWMgQWNjb3VudEdyb3VwLklkIGdldEdyb3VwSWQoKSB7Ci0gICAgICByZXR1cm4gZ3JvdXBJZDsKLSAgICB9Ci0KLSAgICBwdWJsaWMgQWNjb3VudEdyb3VwLklkIGdldEluY2x1ZGVJZCgpIHsKLSAgICAgIHJldHVybiBpbmNsdWRlSWQ7Ci0gICAgfQotCi0gICAgQE92ZXJyaWRlCi0gICAgcHVibGljIGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5LZXk8Pz5bXSBtZW1iZXJzKCkgewotICAgICAgcmV0dXJuIG5ldyBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuS2V5PD8+W10ge2luY2x1ZGVJZH07Ci0gICAgfQotICB9Ci0KLSAgQENvbHVtbihpZCA9IDEsIG5hbWUgPSBDb2x1bW4uTk9ORSkKLSAgcHJvdGVjdGVkIEtleSBrZXk7Ci0KLSAgcHJvdGVjdGVkIEFjY291bnRHcm91cEluY2x1ZGUoKSB7Ci0gIH0KLQotICBwdWJsaWMgQWNjb3VudEdyb3VwSW5jbHVkZShmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlLktleSBrKSB7Ci0gICAga2V5ID0gazsKLSAgfQotCi0gIHB1YmxpYyBBY2NvdW50R3JvdXBJbmNsdWRlLktleSBnZXRLZXkoKSB7Ci0gICAgcmV0dXJuIGtleTsKLSAgfQotCi0gIHB1YmxpYyBBY2NvdW50R3JvdXAuSWQgZ2V0R3JvdXBJZCgpIHsKLSAgICByZXR1cm4ga2V5Lmdyb3VwSWQ7Ci0gIH0KLQotICBwdWJsaWMgQWNjb3VudEdyb3VwLklkIGdldEluY2x1ZGVJZCgpIHsKLSAgICByZXR1cm4ga2V5LmluY2x1ZGVJZDsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cEluY2x1ZGVBdWRpdC5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cEluY2x1ZGVBdWRpdC5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAyNzVjM2MzLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9BY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDEwNSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTEgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50OwotCi1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LkNvbHVtbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuQ29tcG91bmRLZXk7Ci0KLWltcG9ydCBqYXZhLnNxbC5UaW1lc3RhbXA7Ci0KLS8qKiBJbmNsdXNpb24gb2YgYW4ge0BsaW5rIEFjY291bnRHcm91cH0gaW4gYW5vdGhlciB7QGxpbmsgQWNjb3VudEdyb3VwfS4gKi8KLXB1YmxpYyBmaW5hbCBjbGFzcyBBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQgewotICBwdWJsaWMgc3RhdGljIGNsYXNzIEtleSBleHRlbmRzIENvbXBvdW5kS2V5PEFjY291bnRHcm91cC5JZD4gewotICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwotCi0gICAgQENvbHVtbihpZCA9IDEpCi0gICAgcHJvdGVjdGVkIEFjY291bnRHcm91cC5JZCBncm91cElkOwotCi0gICAgQENvbHVtbihpZCA9IDIpCi0gICAgcHJvdGVjdGVkIEFjY291bnRHcm91cC5JZCBpbmNsdWRlSWQ7Ci0KLSAgICBAQ29sdW1uKGlkID0gMykKLSAgICBwcm90ZWN0ZWQgVGltZXN0YW1wIGFkZGVkT247Ci0KLSAgICBwcm90ZWN0ZWQgS2V5KCkgewotICAgICAgZ3JvdXBJZCA9IG5ldyBBY2NvdW50R3JvdXAuSWQoKTsKLSAgICAgIGluY2x1ZGVJZCA9IG5ldyBBY2NvdW50R3JvdXAuSWQoKTsKLSAgICB9Ci0KLSAgICBwdWJsaWMgS2V5KGZpbmFsIEFjY291bnRHcm91cC5JZCBnLCBmaW5hbCBBY2NvdW50R3JvdXAuSWQgaSwgZmluYWwgVGltZXN0YW1wIHQpIHsKLSAgICAgIGdyb3VwSWQgPSBnOwotICAgICAgaW5jbHVkZUlkID0gaTsKLSAgICAgIGFkZGVkT24gPSB0OwotICAgIH0KLQotICAgIEBPdmVycmlkZQotICAgIHB1YmxpYyBBY2NvdW50R3JvdXAuSWQgZ2V0UGFyZW50S2V5KCkgewotICAgICAgcmV0dXJuIGdyb3VwSWQ7Ci0gICAgfQotCi0gICAgcHVibGljIEFjY291bnRHcm91cC5JZCBnZXRJbmNsdWRlZElkKCkgewotICAgICAgcmV0dXJuIGluY2x1ZGVJZDsKLSAgICB9Ci0KLSAgICBwdWJsaWMgVGltZXN0YW1wIGdldEFkZGVkT24oKSB7Ci0gICAgICByZXR1cm4gYWRkZWRPbjsKLSAgICB9Ci0KLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LktleTw/PltdIG1lbWJlcnMoKSB7Ci0gICAgICByZXR1cm4gbmV3IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5LZXk8Pz5bXSB7aW5jbHVkZUlkfTsKLSAgICB9Ci0gIH0KLQotICBAQ29sdW1uKGlkID0gMSwgbmFtZSA9IENvbHVtbi5OT05FKQotICBwcm90ZWN0ZWQgS2V5IGtleTsKLQotICBAQ29sdW1uKGlkID0gMikKLSAgcHJvdGVjdGVkIEFjY291bnQuSWQgYWRkZWRCeTsKLQotICBAQ29sdW1uKGlkID0gMywgbm90TnVsbCA9IGZhbHNlKQotICBwcm90ZWN0ZWQgQWNjb3VudC5JZCByZW1vdmVkQnk7Ci0KLSAgQENvbHVtbihpZCA9IDQsIG5vdE51bGwgPSBmYWxzZSkKLSAgcHJvdGVjdGVkIFRpbWVzdGFtcCByZW1vdmVkT247Ci0KLSAgcHJvdGVjdGVkIEFjY291bnRHcm91cEluY2x1ZGVBdWRpdCgpIHsKLSAgfQotCi0gIHB1YmxpYyBBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQoZmluYWwgQWNjb3VudEdyb3VwSW5jbHVkZSBtLAotICAgICAgZmluYWwgQWNjb3VudC5JZCBhZGRlcikgewotICAgIGZpbmFsIEFjY291bnRHcm91cC5JZCBncm91cCA9IG0uZ2V0R3JvdXBJZCgpOwotICAgIGZpbmFsIEFjY291bnRHcm91cC5JZCBpbmNsdWRlID0gbS5nZXRJbmNsdWRlSWQoKTsKLSAgICBrZXkgPSBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0LktleShncm91cCwgaW5jbHVkZSwgbm93KCkpOwotICAgIGFkZGVkQnkgPSBhZGRlcjsKLSAgfQotCi0gIHB1YmxpYyBBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQuS2V5IGdldEtleSgpIHsKLSAgICByZXR1cm4ga2V5OwotICB9Ci0KLSAgcHVibGljIGJvb2xlYW4gaXNBY3RpdmUoKSB7Ci0gICAgcmV0dXJuIHJlbW92ZWRPbiA9PSBudWxsOwotICB9Ci0KLSAgcHVibGljIHZvaWQgcmVtb3ZlZChmaW5hbCBBY2NvdW50LklkIGRlbGV0ZXIpIHsKLSAgICByZW1vdmVkQnkgPSBkZWxldGVyOwotICAgIHJlbW92ZWRPbiA9IG5vdygpOwotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgVGltZXN0YW1wIG5vdygpIHsKLSAgICByZXR1cm4gbmV3IFRpbWVzdGFtcChTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKSk7Ci0gIH0KLX0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZC5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cEluY2x1ZGVCeVV1aWQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hNWIzNWVkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cEluY2x1ZGVCeVV1aWQuamF2YQpAQCAtMCwwICsxLDgxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTEgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50OworCitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LkNvbHVtbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuQ29tcG91bmRLZXk7CisKKy8qKiBNZW1iZXJzaGlwIG9mIGFuIHtAbGluayBBY2NvdW50R3JvdXB9IGluIGFuIHtAbGluayBBY2NvdW50R3JvdXB9LiAqLworcHVibGljIGZpbmFsIGNsYXNzIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQgeworICBwdWJsaWMgc3RhdGljIGNsYXNzIEtleSBleHRlbmRzIENvbXBvdW5kS2V5PEFjY291bnRHcm91cC5JZD4geworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgICAgQENvbHVtbihpZCA9IDEpCisgICAgcHJvdGVjdGVkIEFjY291bnRHcm91cC5JZCBncm91cElkOworCisgICAgQENvbHVtbihpZCA9IDIpCisgICAgcHJvdGVjdGVkIEFjY291bnRHcm91cC5VVUlEIGluY2x1ZGVVVUlEOworCisgICAgcHJvdGVjdGVkIEtleSgpIHsKKyAgICAgIGdyb3VwSWQgPSBuZXcgQWNjb3VudEdyb3VwLklkKCk7CisgICAgICBpbmNsdWRlVVVJRCA9IG5ldyBBY2NvdW50R3JvdXAuVVVJRCgpOworICAgIH0KKworICAgIHB1YmxpYyBLZXkoZmluYWwgQWNjb3VudEdyb3VwLklkIGcsIGZpbmFsIEFjY291bnRHcm91cC5VVUlEIHUpIHsKKyAgICAgIGdyb3VwSWQgPSBnOworICAgICAgaW5jbHVkZVVVSUQgPSB1OworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBBY2NvdW50R3JvdXAuSWQgZ2V0UGFyZW50S2V5KCkgeworICAgICAgcmV0dXJuIGdyb3VwSWQ7CisgICAgfQorCisgICAgcHVibGljIEFjY291bnRHcm91cC5JZCBnZXRHcm91cElkKCkgeworICAgICAgcmV0dXJuIGdyb3VwSWQ7CisgICAgfQorCisgICAgcHVibGljIEFjY291bnRHcm91cC5VVUlEIGdldEluY2x1ZGVVVUlEKCkgeworICAgICAgcmV0dXJuIGluY2x1ZGVVVUlEOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuS2V5PD8+W10gbWVtYmVycygpIHsKKyAgICAgIHJldHVybiBuZXcgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LktleTw/PltdIHtpbmNsdWRlVVVJRH07CisgICAgfQorICB9CisKKyAgQENvbHVtbihpZCA9IDEsIG5hbWUgPSBDb2x1bW4uTk9ORSkKKyAgcHJvdGVjdGVkIEtleSBrZXk7CisKKyAgcHJvdGVjdGVkIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQoKSB7CisgIH0KKworICBwdWJsaWMgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZChmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkLktleSBrKSB7CisgICAga2V5ID0gazsKKyAgfQorCisgIHB1YmxpYyBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkLktleSBnZXRLZXkoKSB7CisgICAgcmV0dXJuIGtleTsKKyAgfQorCisgIHB1YmxpYyBBY2NvdW50R3JvdXAuSWQgZ2V0R3JvdXBJZCgpIHsKKyAgICByZXR1cm4ga2V5Lmdyb3VwSWQ7CisgIH0KKworICBwdWJsaWMgQWNjb3VudEdyb3VwLlVVSUQgZ2V0SW5jbHVkZVVVSUQoKSB7CisgICAgcmV0dXJuIGtleS5pbmNsdWRlVVVJRDsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdC5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY2MjUxOTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0LmphdmEKQEAgLTAsMCArMSwxMTUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuQ29sdW1uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5Db21wb3VuZEtleTsKKworaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKKworLyoqIEluY2x1c2lvbiBvZiBhbiB7QGxpbmsgQWNjb3VudEdyb3VwfSBpbiBhbm90aGVyIHtAbGluayBBY2NvdW50R3JvdXB9LiAqLworcHVibGljIGZpbmFsIGNsYXNzIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdCB7CisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgS2V5IGV4dGVuZHMgQ29tcG91bmRLZXk8QWNjb3VudEdyb3VwLklkPiB7CisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisKKyAgICBAQ29sdW1uKGlkID0gMSkKKyAgICBwcm90ZWN0ZWQgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQ7CisKKyAgICBAQ29sdW1uKGlkID0gMikKKyAgICBwcm90ZWN0ZWQgQWNjb3VudEdyb3VwLlVVSUQgaW5jbHVkZVVVSUQ7CisKKyAgICBAQ29sdW1uKGlkID0gMykKKyAgICBwcm90ZWN0ZWQgVGltZXN0YW1wIGFkZGVkT247CisKKyAgICBwcm90ZWN0ZWQgS2V5KCkgeworICAgICAgZ3JvdXBJZCA9IG5ldyBBY2NvdW50R3JvdXAuSWQoKTsKKyAgICAgIGluY2x1ZGVVVUlEID0gbmV3IEFjY291bnRHcm91cC5VVUlEKCk7CisgICAgfQorCisgICAgcHVibGljIEtleShmaW5hbCBBY2NvdW50R3JvdXAuSWQgZywgZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgdSwgZmluYWwgVGltZXN0YW1wIHQpIHsKKyAgICAgIGdyb3VwSWQgPSBnOworICAgICAgaW5jbHVkZVVVSUQgPSB1OworICAgICAgYWRkZWRPbiA9IHQ7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIEFjY291bnRHcm91cC5JZCBnZXRQYXJlbnRLZXkoKSB7CisgICAgICByZXR1cm4gZ3JvdXBJZDsKKyAgICB9CisKKyAgICBwdWJsaWMgQWNjb3VudEdyb3VwLlVVSUQgZ2V0SW5jbHVkZVVVSUQoKSB7CisgICAgICByZXR1cm4gaW5jbHVkZVVVSUQ7CisgICAgfQorCisgICAgcHVibGljIFRpbWVzdGFtcCBnZXRBZGRlZE9uKCkgeworICAgICAgcmV0dXJuIGFkZGVkT247CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5LZXk8Pz5bXSBtZW1iZXJzKCkgeworICAgICAgcmV0dXJuIG5ldyBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuS2V5PD8+W10ge2luY2x1ZGVVVUlEfTsKKyAgICB9CisgIH0KKworICBAQ29sdW1uKGlkID0gMSwgbmFtZSA9IENvbHVtbi5OT05FKQorICBwcm90ZWN0ZWQgS2V5IGtleTsKKworICBAQ29sdW1uKGlkID0gMikKKyAgcHJvdGVjdGVkIEFjY291bnQuSWQgYWRkZWRCeTsKKworICBAQ29sdW1uKGlkID0gMywgbm90TnVsbCA9IGZhbHNlKQorICBwcm90ZWN0ZWQgQWNjb3VudC5JZCByZW1vdmVkQnk7CisKKyAgQENvbHVtbihpZCA9IDQsIG5vdE51bGwgPSBmYWxzZSkKKyAgcHJvdGVjdGVkIFRpbWVzdGFtcCByZW1vdmVkT247CisKKyAgcHJvdGVjdGVkIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdCgpIHsKKyAgfQorCisgIHB1YmxpYyBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQoZmluYWwgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZCBtLAorICAgICAgZmluYWwgQWNjb3VudC5JZCBhZGRlciwgZmluYWwgVGltZXN0YW1wIHdoZW4pIHsKKyAgICBmaW5hbCBBY2NvdW50R3JvdXAuSWQgZ3JvdXAgPSBtLmdldEdyb3VwSWQoKTsKKyAgICBmaW5hbCBBY2NvdW50R3JvdXAuVVVJRCBpbmNsdWRlID0gbS5nZXRJbmNsdWRlVVVJRCgpOworICAgIGtleSA9IG5ldyBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQuS2V5KGdyb3VwLCBpbmNsdWRlLCB3aGVuKTsKKyAgICBhZGRlZEJ5ID0gYWRkZXI7CisgIH0KKworICBwdWJsaWMgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0KGZpbmFsIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQgbSwKKyAgICAgIGZpbmFsIEFjY291bnQuSWQgYWRkZXIpIHsKKyAgICB0aGlzKG0sIGFkZGVyLCBub3coKSk7CisgIH0KKworICBwdWJsaWMgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0LktleSBnZXRLZXkoKSB7CisgICAgcmV0dXJuIGtleTsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGlzQWN0aXZlKCkgeworICAgIHJldHVybiByZW1vdmVkT24gPT0gbnVsbDsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHJlbW92ZWQoZmluYWwgQWNjb3VudC5JZCBkZWxldGVyKSB7CisgICAgcmVtb3ZlZEJ5ID0gZGVsZXRlcjsKKyAgICByZW1vdmVkT24gPSBub3coKTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHJlbW92ZWQoZmluYWwgQWNjb3VudC5JZCBkZWxldGVyLCBmaW5hbCBUaW1lc3RhbXAgd2hlbikgeworICAgIHJlbW92ZWRCeSA9IGRlbGV0ZXI7CisgICAgcmVtb3ZlZE9uID0gd2hlbjsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFRpbWVzdGFtcCBub3coKSB7CisgICAgcmV0dXJuIG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQWNjb3VudFByb2plY3RXYXRjaC5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FjY291bnRQcm9qZWN0V2F0Y2guamF2YQppbmRleCBlNTkyMTAxLi5jN2Y1MmIwIDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQWNjb3VudFByb2plY3RXYXRjaC5qYXZhCisrKyBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9BY2NvdW50UHJvamVjdFdhdGNoLmphdmEKQEAgLTIyLDcgKzIyLDggQEAKIHB1YmxpYyBmaW5hbCBjbGFzcyBBY2NvdW50UHJvamVjdFdhdGNoIHsKIAogICBwdWJsaWMgZW51bSBOb3RpZnlUeXBlIHsKLSAgICBORVdfQ0hBTkdFUywgQUxMX0NPTU1FTlRTLCBTVUJNSVRURURfQ0hBTkdFUywgQUxMCisgICAgTkVXX0NIQU5HRVMsIE5FV19QQVRDSFNFVFMsIEFMTF9DT01NRU5UUywgU1VCTUlUVEVEX0NIQU5HRVMsCisgICAgQUJBTkRPTkVEX0NIQU5HRVMsIEFMTAogICB9CiAKICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgRklMVEVSX0FMTCA9ICIqIjsKQEAgLTEwOSw2ICsxMTAsMTIgQEAKICAgQENvbHVtbihpZCA9IDQpCiAgIHByb3RlY3RlZCBib29sZWFuIG5vdGlmeVN1Ym1pdHRlZENoYW5nZXM7CiAKKyAgQENvbHVtbihpZCA9IDUpCisgIHByb3RlY3RlZCBib29sZWFuIG5vdGlmeU5ld1BhdGNoU2V0czsKKworICBAQ29sdW1uKGlkID0gNikKKyAgcHJvdGVjdGVkIGJvb2xlYW4gbm90aWZ5QWJhbmRvbmVkQ2hhbmdlczsKKwogICBwcm90ZWN0ZWQgQWNjb3VudFByb2plY3RXYXRjaCgpIHsKICAgfQogCkBAIC0xMzcsMTEgKzE0NCwyMCBAQAogICAgICAgY2FzZSBORVdfQ0hBTkdFUzoKICAgICAgICAgcmV0dXJuIG5vdGlmeU5ld0NoYW5nZXM7CiAKKyAgICAgIGNhc2UgTkVXX1BBVENIU0VUUzoKKyAgICAgICAgcmV0dXJuIG5vdGlmeU5ld1BhdGNoU2V0czsKKwogICAgICAgY2FzZSBBTExfQ09NTUVOVFM6CiAgICAgICAgIHJldHVybiBub3RpZnlBbGxDb21tZW50czsKIAogICAgICAgY2FzZSBTVUJNSVRURURfQ0hBTkdFUzoKICAgICAgICAgcmV0dXJuIG5vdGlmeVN1Ym1pdHRlZENoYW5nZXM7CisKKyAgICAgIGNhc2UgQUJBTkRPTkVEX0NIQU5HRVM6CisgICAgICAgIHJldHVybiBub3RpZnlBYmFuZG9uZWRDaGFuZ2VzOworCisgICAgICBjYXNlIEFMTDoKKyAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKICAgfQpAQCAtMTUyLDYgKzE2OCwxMCBAQAogICAgICAgICBub3RpZnlOZXdDaGFuZ2VzID0gdjsKICAgICAgICAgYnJlYWs7CiAKKyAgICAgIGNhc2UgTkVXX1BBVENIU0VUUzoKKyAgICAgICAgbm90aWZ5TmV3UGF0Y2hTZXRzID0gdjsKKyAgICAgICAgYnJlYWs7CisKICAgICAgIGNhc2UgQUxMX0NPTU1FTlRTOgogICAgICAgICBub3RpZnlBbGxDb21tZW50cyA9IHY7CiAgICAgICAgIGJyZWFrOwpAQCAtMTYwLDEwICsxODAsMTYgQEAKICAgICAgICAgbm90aWZ5U3VibWl0dGVkQ2hhbmdlcyA9IHY7CiAgICAgICAgIGJyZWFrOwogCisgICAgICBjYXNlIEFCQU5ET05FRF9DSEFOR0VTOgorICAgICAgICBub3RpZnlBYmFuZG9uZWRDaGFuZ2VzID0gdjsKKyAgICAgICAgYnJlYWs7CisKICAgICAgIGNhc2UgQUxMOgogICAgICAgICBub3RpZnlOZXdDaGFuZ2VzID0gdjsKKyAgICAgICAgbm90aWZ5TmV3UGF0Y2hTZXRzID0gdjsKICAgICAgICAgbm90aWZ5QWxsQ29tbWVudHMgPSB2OwogICAgICAgICBub3RpZnlTdWJtaXR0ZWRDaGFuZ2VzID0gdjsKKyAgICAgICAgbm90aWZ5QWJhbmRvbmVkQ2hhbmdlcyA9IHY7CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FwcHJvdmFsQ2F0ZWdvcnkuamF2YSBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9BcHByb3ZhbENhdGVnb3J5LmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDdkNjE5NzUuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FwcHJvdmFsQ2F0ZWdvcnkuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDE1MSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDggVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50OwotCi1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LkNvbHVtbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuS2V5OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5TdHJpbmdLZXk7Ci0KLS8qKiBUeXBlcyBvZiBhcHByb3ZhbHMgdGhhdCBjYW4gYmUgYXNzb2NpYXRlZCB3aXRoIGEge0BsaW5rIENoYW5nZX0uICovCi1wdWJsaWMgZmluYWwgY2xhc3MgQXBwcm92YWxDYXRlZ29yeSB7Ci0gIC8qKiBJZCBvZiB0aGUgc3BlY2lhbCAiU3VibWl0IiBhY3Rpb24gKGFuZCBjYXRlZ29yeSkuICovCi0gIHB1YmxpYyBzdGF0aWMgZmluYWwgQXBwcm92YWxDYXRlZ29yeS5JZCBTVUJNSVQgPQotICAgICAgbmV3IEFwcHJvdmFsQ2F0ZWdvcnkuSWQoIlNVQk0iKTsKLQotICBwdWJsaWMgc3RhdGljIGNsYXNzIElkIGV4dGVuZHMgU3RyaW5nS2V5PEtleTw/Pj4gewotICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwotCi0gICAgQENvbHVtbihpZCA9IDEsIGxlbmd0aCA9IDQpCi0gICAgcHJvdGVjdGVkIFN0cmluZyBpZDsKLQotICAgIHByb3RlY3RlZCBJZCgpIHsKLSAgICB9Ci0KLSAgICBwdWJsaWMgSWQoZmluYWwgU3RyaW5nIGEpIHsKLSAgICAgIGlkID0gYTsKLSAgICB9Ci0KLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgU3RyaW5nIGdldCgpIHsKLSAgICAgIHJldHVybiBpZDsKLSAgICB9Ci0KLSAgICBAT3ZlcnJpZGUKLSAgICBwcm90ZWN0ZWQgdm9pZCBzZXQoU3RyaW5nIG5ld1ZhbHVlKSB7Ci0gICAgICBpZCA9IG5ld1ZhbHVlOwotICAgIH0KLSAgfQotCi0gIC8qKiBJbnRlcm5hbCBzaG9ydCB1bmlxdWUgaWRlbnRpZmllciBmb3IgdGhpcyBjYXRlZ29yeS4gKi8KLSAgQENvbHVtbihpZCA9IDEpCi0gIHByb3RlY3RlZCBJZCBjYXRlZ29yeUlkOwotCi0gIC8qKiBVbmlxdWUgbmFtZSBmb3IgdGhpcyBjYXRlZ29yeSwgc2hvd24gaW4gdGhlIHdlYiBpbnRlcmZhY2UgdG8gdXNlcnMuICovCi0gIEBDb2x1bW4oaWQgPSAyLCBsZW5ndGggPSAyMCkKLSAgcHJvdGVjdGVkIFN0cmluZyBuYW1lOwotCi0gIC8qKiBBYmJyZXZpYXRlZCBmb3JtIG9mIHtAbGluayAjbmFtZX0gZm9yIGRpc3BsYXkgaW4gdmVyeSB3aWRlIHRhYmxlcy4gKi8KLSAgQENvbHVtbihpZCA9IDMsIGxlbmd0aCA9IDQsIG5vdE51bGwgPSBmYWxzZSkKLSAgcHJvdGVjdGVkIFN0cmluZyBhYmJyZXZpYXRlZE5hbWU7Ci0KLSAgLyoqIE9yZGVyIG9mIHRoaXMgY2F0ZWdvcnkgd2l0aGluIHRoZSBBcHByb3ZhbHMgdGFibGUgd2hlbiBwcmVzZW50ZWQuICovCi0gIEBDb2x1bW4oaWQgPSA0KQotICBwcm90ZWN0ZWQgc2hvcnQgcG9zaXRpb247Ci0KLSAgLyoqIElkZW50aXR5IG9mIHRoZSBmdW5jdGlvbiB1c2VkIHRvIGFnZ3JlZ2F0ZSB0aGUgY2F0ZWdvcnkncyB2YWx1ZS4gKi8KLSAgQENvbHVtbihpZCA9IDUpCi0gIHByb3RlY3RlZCBTdHJpbmcgZnVuY3Rpb25OYW1lOwotCi0gIC8qKiBJZiBzZXQsIHRoZSBtaW5pbXVtIHNjb3JlIGlzIGNvcGllZCBkdXJpbmcgcGF0Y2ggc2V0IHJlcGxhY2VtZW50LiAqLwotICBAQ29sdW1uKGlkID0gNikKLSAgcHJvdGVjdGVkIGJvb2xlYW4gY29weU1pblNjb3JlOwotCi0gIC8qKiBDb21wdXRlZCBuYW1lIGRlcml2ZWQgZnJvbSB7QGxpbmsgI25hbWV9LiAqLwotICBwcm90ZWN0ZWQgU3RyaW5nIGxhYmVsTmFtZTsKLQotICBwcm90ZWN0ZWQgQXBwcm92YWxDYXRlZ29yeSgpIHsKLSAgfQotCi0gIHB1YmxpYyBBcHByb3ZhbENhdGVnb3J5KGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgaWQsIGZpbmFsIFN0cmluZyBuYW1lKSB7Ci0gICAgdGhpcy5jYXRlZ29yeUlkID0gaWQ7Ci0gICAgdGhpcy5uYW1lID0gbmFtZTsKLSAgICB0aGlzLmZ1bmN0aW9uTmFtZSA9ICJNYXhXaXRoQmxvY2siOwotICB9Ci0KLSAgcHVibGljIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgZ2V0SWQoKSB7Ci0gICAgcmV0dXJuIGNhdGVnb3J5SWQ7Ci0gIH0KLQotICBwdWJsaWMgU3RyaW5nIGdldE5hbWUoKSB7Ci0gICAgcmV0dXJuIG5hbWU7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBzZXROYW1lKGZpbmFsIFN0cmluZyBuKSB7Ci0gICAgbmFtZSA9IG47Ci0gICAgbGFiZWxOYW1lID0gbnVsbDsKLSAgfQotCi0gIC8qKiBDbGVhbiB2ZXJzaW9uIG9mIHtAbGluayAjZ2V0TmFtZSgpfSwgZS5nLiAiQ29kZSBSZXZpZXciIGlzICJDb2RlLVJldmlldyIuICovCi0gIHB1YmxpYyBTdHJpbmcgZ2V0TGFiZWxOYW1lKCkgewotICAgIGlmIChsYWJlbE5hbWUgPT0gbnVsbCkgewotICAgICAgU3RyaW5nQnVpbGRlciByID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbmFtZS5sZW5ndGgoKTsgaSsrKSB7Ci0gICAgICAgIGNoYXIgYyA9IG5hbWUuY2hhckF0KGkpOwotICAgICAgICBpZiAoKCcwJyA8PSBjICYmIGMgPD0gJzknKSAvLwotICAgICAgICAgICAgfHwgKCdhJyA8PSBjICYmIGMgPD0gJ3onKSAvLwotICAgICAgICAgICAgfHwgKCdBJyA8PSBjICYmIGMgPD0gJ1onKSAvLwotICAgICAgICAgICAgfHwgKGMgPT0gJy0nKSkgewotICAgICAgICAgIHIuYXBwZW5kKGMpOwotICAgICAgICB9IGVsc2UgaWYgKGMgPT0gJyAnKSB7Ci0gICAgICAgICAgci5hcHBlbmQoJy0nKTsKLSAgICAgICAgfQotICAgICAgfQotICAgICAgbGFiZWxOYW1lID0gci50b1N0cmluZygpOwotICAgIH0KLSAgICByZXR1cm4gbGFiZWxOYW1lOwotICB9Ci0KLSAgcHVibGljIFN0cmluZyBnZXRBYmJyZXZpYXRlZE5hbWUoKSB7Ci0gICAgcmV0dXJuIGFiYnJldmlhdGVkTmFtZTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldEFiYnJldmlhdGVkTmFtZShmaW5hbCBTdHJpbmcgbikgewotICAgIGFiYnJldmlhdGVkTmFtZSA9IG47Ci0gIH0KLQotICBwdWJsaWMgc2hvcnQgZ2V0UG9zaXRpb24oKSB7Ci0gICAgcmV0dXJuIHBvc2l0aW9uOwotICB9Ci0KLSAgcHVibGljIHZvaWQgc2V0UG9zaXRpb24oZmluYWwgc2hvcnQgcCkgewotICAgIHBvc2l0aW9uID0gcDsKLSAgfQotCi0gIHB1YmxpYyBTdHJpbmcgZ2V0RnVuY3Rpb25OYW1lKCkgewotICAgIHJldHVybiBmdW5jdGlvbk5hbWU7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBzZXRGdW5jdGlvbk5hbWUoZmluYWwgU3RyaW5nIG5hbWUpIHsKLSAgICBmdW5jdGlvbk5hbWUgPSBuYW1lOwotICB9Ci0KLSAgcHVibGljIGJvb2xlYW4gaXNDb3B5TWluU2NvcmUoKSB7Ci0gICAgcmV0dXJuIGNvcHlNaW5TY29yZTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldENvcHlNaW5TY29yZShmaW5hbCBib29sZWFuIGNvcHkpIHsKLSAgICBjb3B5TWluU2NvcmUgPSBjb3B5OwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQXBwcm92YWxDYXRlZ29yeVZhbHVlLmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQXBwcm92YWxDYXRlZ29yeVZhbHVlLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGI3NzYxYzUuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0FwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMTA4ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQ7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuQ29sdW1uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmNsaWVudC5TaG9ydEtleTsKLQotLyoqIFZhbGlkIHZhbHVlIGZvciBhIHtAbGluayBBcHByb3ZhbENhdGVnb3J5fS4gKi8KLXB1YmxpYyBmaW5hbCBjbGFzcyBBcHByb3ZhbENhdGVnb3J5VmFsdWUgewotICBwdWJsaWMgc3RhdGljIGNsYXNzIElkIGV4dGVuZHMgU2hvcnRLZXk8QXBwcm92YWxDYXRlZ29yeS5JZD4gewotICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwotCi0gICAgQENvbHVtbihpZCA9IDEpCi0gICAgcHJvdGVjdGVkIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgY2F0ZWdvcnlJZDsKLQotICAgIEBDb2x1bW4oaWQgPSAyKQotICAgIHByb3RlY3RlZCBzaG9ydCB2YWx1ZTsKLQotICAgIHByb3RlY3RlZCBJZCgpIHsKLSAgICAgIGNhdGVnb3J5SWQgPSBuZXcgQXBwcm92YWxDYXRlZ29yeS5JZCgpOwotICAgIH0KLQotICAgIHB1YmxpYyBJZChmaW5hbCBBcHByb3ZhbENhdGVnb3J5LklkIGNhdCwgZmluYWwgc2hvcnQgdikgewotICAgICAgY2F0ZWdvcnlJZCA9IGNhdDsKLSAgICAgIHZhbHVlID0gdjsKLSAgICB9Ci0KLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgQXBwcm92YWxDYXRlZ29yeS5JZCBnZXRQYXJlbnRLZXkoKSB7Ci0gICAgICByZXR1cm4gY2F0ZWdvcnlJZDsKLSAgICB9Ci0KLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgc2hvcnQgZ2V0KCkgewotICAgICAgcmV0dXJuIHZhbHVlOwotICAgIH0KLQotICAgIEBPdmVycmlkZQotICAgIHByb3RlY3RlZCB2b2lkIHNldChzaG9ydCBuZXdWYWx1ZSkgewotICAgICAgdmFsdWUgPSBuZXdWYWx1ZTsKLSAgICB9Ci0gIH0KLQotICBAQ29sdW1uKGlkID0gMSwgbmFtZSA9IENvbHVtbi5OT05FKQotICBwcm90ZWN0ZWQgSWQga2V5OwotCi0gIEBDb2x1bW4oaWQgPSAyLCBsZW5ndGggPSA1MCkKLSAgcHJvdGVjdGVkIFN0cmluZyBuYW1lOwotCi0gIHByb3RlY3RlZCBBcHByb3ZhbENhdGVnb3J5VmFsdWUoKSB7Ci0gIH0KLQotICBwdWJsaWMgQXBwcm92YWxDYXRlZ29yeVZhbHVlKGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZCBpZCwKLSAgICAgIGZpbmFsIFN0cmluZyBuYW1lKSB7Ci0gICAgdGhpcy5rZXkgPSBpZDsKLSAgICB0aGlzLm5hbWUgPSBuYW1lOwotICB9Ci0KLSAgcHVibGljIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZCBnZXRJZCgpIHsKLSAgICByZXR1cm4ga2V5OwotICB9Ci0KLSAgcHVibGljIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgZ2V0Q2F0ZWdvcnlJZCgpIHsKLSAgICByZXR1cm4ga2V5LmNhdGVnb3J5SWQ7Ci0gIH0KLQotICBwdWJsaWMgc2hvcnQgZ2V0VmFsdWUoKSB7Ci0gICAgcmV0dXJuIGtleS52YWx1ZTsKLSAgfQotCi0gIHB1YmxpYyBTdHJpbmcgZ2V0TmFtZSgpIHsKLSAgICByZXR1cm4gbmFtZTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHNldE5hbWUoZmluYWwgU3RyaW5nIG4pIHsKLSAgICBuYW1lID0gbjsKLSAgfQotCi0gIHB1YmxpYyBTdHJpbmcgZm9ybWF0VmFsdWUoKSB7Ci0gICAgaWYgKGdldFZhbHVlKCkgPCAwKSB7Ci0gICAgICByZXR1cm4gU2hvcnQudG9TdHJpbmcoZ2V0VmFsdWUoKSk7Ci0gICAgfSBlbHNlIGlmIChnZXRWYWx1ZSgpID09IDApIHsKLSAgICAgIHJldHVybiAiIDAiOwotICAgIH0gZWxzZSB7Ci0gICAgICByZXR1cm4gIisiICsgU2hvcnQudG9TdHJpbmcoZ2V0VmFsdWUoKSk7Ci0gICAgfQotICB9Ci0KLSAgcHVibGljIFN0cmluZyBmb3JtYXQoKSB7Ci0gICAgZmluYWwgU3RyaW5nQnVpbGRlciBtID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICBtLmFwcGVuZChmb3JtYXRWYWx1ZSgpKTsKLSAgICBtLmFwcGVuZCgnICcpOwotICAgIG0uYXBwZW5kKGdldE5hbWUoKSk7Ci0gICAgcmV0dXJuIG0udG9TdHJpbmcoKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0NoYW5nZS5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L0NoYW5nZS5qYXZhCmluZGV4IGJmYmFjYzAuLjJhNTE4NzIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9DaGFuZ2UuamF2YQorKysgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvQ2hhbmdlLmphdmEKQEAgLTE5Myw2ICsxOTMsOSBAQAogICAvKiogRGF0YWJhc2UgY29uc3RhbnQgZm9yIHtAbGluayBTdGF0dXMjTUVSR0VEfS4gKi8KICAgcHVibGljIHN0YXRpYyBmaW5hbCBjaGFyIFNUQVRVU19NRVJHRUQgPSAnTSc7CiAKKyAgLyoqIElEIG51bWJlciBvZiB0aGUgZmlyc3QgcGF0Y2ggc2V0IGluIGEgY2hhbmdlLiAqLworICBwdWJsaWMgc3RhdGljIGZpbmFsIGludCBJTklUSUFMX1BBVENIX1NFVF9JRCA9IDE7CisKICAgLyoqCiAgICAqIEN1cnJlbnQgc3RhdGUgd2l0aGluIHRoZSBiYXNpYyB3b3JrZmxvdyBvZiB0aGUgY2hhbmdlLgogICAgKgpAQCAtMzU5LDEwICszNjIsNiBAQAogICBAQ29sdW1uKGlkID0gMTApCiAgIHByb3RlY3RlZCBjaGFyIHN0YXR1czsKIAotICAvKiogVGhlIHRvdGFsIG51bWJlciBvZiB7QGxpbmsgUGF0Y2hTZXR9IGNoaWxkcmVuIGluIHRoaXMgQ2hhbmdlLiAqLwotICBAQ29sdW1uKGlkID0gMTEpCi0gIHByb3RlY3RlZCBpbnQgbmJyUGF0Y2hTZXRzOwotCiAgIC8qKiBUaGUgY3VycmVudCBwYXRjaCBzZXQuICovCiAgIEBDb2x1bW4oaWQgPSAxMikKICAgcHJvdGVjdGVkIGludCBjdXJyZW50UGF0Y2hTZXRJZDsKQEAgLTQyOCwxMiArNDI3LDEyIEBACiAgICAgcmV0dXJuIGxhc3RVcGRhdGVkT247CiAgIH0KIAotICBwdWJsaWMgdm9pZCByZXNldExhc3RVcGRhdGVkT24oKSB7Ci0gICAgbGFzdFVwZGF0ZWRPbiA9IG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpOworICBwdWJsaWMgdm9pZCBzZXRMYXN0VXBkYXRlZE9uKFRpbWVzdGFtcCBub3cpIHsKKyAgICBsYXN0VXBkYXRlZE9uID0gbm93OwogICB9CiAKLSAgcHVibGljIGludCBnZXROdW1iZXJPZlBhdGNoU2V0cygpIHsKLSAgICByZXR1cm4gbmJyUGF0Y2hTZXRzOworICBwdWJsaWMgdm9pZCByZXNldExhc3RVcGRhdGVkT24oKSB7CisgICAgbGFzdFVwZGF0ZWRPbiA9IG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpOwogICB9CiAKICAgcHVibGljIFN0cmluZyBnZXRTb3J0S2V5KCkgewpAQCAtNDczLDMyICs0NzIsNiBAQAogICAgIHN1YmplY3QgPSBwcy5nZXRTdWJqZWN0KCk7CiAgIH0KIAotICAvKioKLSAgICogQWxsb2NhdGUgYSBuZXcgUGF0Y2hTZXQgaWQgd2l0aGluIHRoaXMgY2hhbmdlLgotICAgKiA8cD4KLSAgICogPGI+Tm90ZTogVGhpcyBtYWtlcyB0aGUgY2hhbmdlIGRpcnR5LiBDYWxsIHVwZGF0ZSgpIGFmdGVyLjwvYj4KLSAgICovCi0gIHB1YmxpYyB2b2lkIG5leHRQYXRjaFNldElkKCkgewotICAgICsrbmJyUGF0Y2hTZXRzOwotICB9Ci0KLSAgLyoqCi0gICAqIFJldmVydHMgdG8gYW4gb2xkZXIgUGF0Y2hTZXQgaWQgd2l0aGluIHRoaXMgY2hhbmdlLgotICAgKiA8cD4KLSAgICogPGI+Tm90ZTogVGhpcyBtYWtlcyB0aGUgY2hhbmdlIGRpcnR5LiBDYWxsIHVwZGF0ZSgpIGFmdGVyLjwvYj4KLSAgICovCi0gIHB1YmxpYyB2b2lkIHJlbW92ZUxhc3RQYXRjaFNldElkKCkgewotICAgIC0tbmJyUGF0Y2hTZXRzOwotICB9Ci0KLSAgcHVibGljIHZvaWQgdXBkYXRlTnVtYmVyT2ZQYXRjaFNldHMoaW50IG1heCkgewotICAgIG5iclBhdGNoU2V0cyA9IE1hdGgubWF4KG5iclBhdGNoU2V0cywgbWF4KTsKLSAgfQotCi0gIHB1YmxpYyBQYXRjaFNldC5JZCBjdXJyUGF0Y2hTZXRJZCgpIHsKLSAgICByZXR1cm4gbmV3IFBhdGNoU2V0LklkKGNoYW5nZUlkLCBuYnJQYXRjaFNldHMpOwotICB9Ci0KICAgcHVibGljIFN0YXR1cyBnZXRTdGF0dXMoKSB7CiAgICAgcmV0dXJuIFN0YXR1cy5mb3JDb2RlKHN0YXR1cyk7CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9Jbmhlcml0ZWRCb29sZWFuLmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvSW5oZXJpdGVkQm9vbGVhbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk1NGI0OTQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvSW5oZXJpdGVkQm9vbGVhbi5qYXZhCkBAIC0wLDAgKzEsMzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5Jbmhlcml0YWJsZUJvb2xlYW47CisKK3B1YmxpYyBjbGFzcyBJbmhlcml0ZWRCb29sZWFuIHsKKworICBwdWJsaWMgSW5oZXJpdGFibGVCb29sZWFuIHZhbHVlOworICBwdWJsaWMgYm9vbGVhbiBpbmhlcml0ZWRWYWx1ZTsKKworICBwdWJsaWMgSW5oZXJpdGVkQm9vbGVhbigpIHsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldFZhbHVlKGZpbmFsIEluaGVyaXRhYmxlQm9vbGVhbiB2YWx1ZSkgeworICAgIHRoaXMudmFsdWUgPSB2YWx1ZTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldEluaGVyaXRlZFZhbHVlKGZpbmFsIGJvb2xlYW4gaW5oZXJpdGVkVmFsdWUpIHsKKyAgICB0aGlzLmluaGVyaXRlZFZhbHVlID0gaW5oZXJpdGVkVmFsdWU7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9QYXRjaC5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1BhdGNoLmphdmEKaW5kZXggMDBlMjgyYi4uNmRkZDZkMiAxMDA2NDQKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1BhdGNoLmphdmEKKysrIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1BhdGNoLmphdmEKQEAgLTg0LDcgKzg0LDcgQEAKICAgICAvKiogUGF0aCB3YXMgY29waWVkIGZyb20ge0BsaW5rIFBhdGNoI2dldFNvdXJjZUZpbGVOYW1lKCl9LiAqLwogICAgIENPUElFRCgnQycpLAogCi0gICAgLyoqIFN1ZmZpY2llbnQgYW1vdW50IG9mIGNvbnRlbnQgY2hhbmdlZCB0byBjbGFpbSB0aGUgZmlsZSB3YXMgd3JpdHRlbi4gKi8KKyAgICAvKiogU3VmZmljaWVudCBhbW91bnQgb2YgY29udGVudCBjaGFuZ2VkIHRvIGNsYWltIHRoZSBmaWxlIHdhcyByZXdyaXR0ZW4uICovCiAgICAgUkVXUklURSgnVycpOwogCiAgICAgcHJpdmF0ZSBmaW5hbCBjaGFyIGNvZGU7CmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2hMaW5lQ29tbWVudC5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1BhdGNoTGluZUNvbW1lbnQuamF2YQppbmRleCBjOGE5NzBkLi5hZjM1ZTUyZiAxMDA2NDQKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1BhdGNoTGluZUNvbW1lbnQuamF2YQorKysgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2hMaW5lQ29tbWVudC5qYXZhCkBAIC0xMzgsNiArMTM4LDEwIEBACiAgICAgcmV0dXJuIGxpbmVOYnI7CiAgIH0KIAorICBwdWJsaWMgdm9pZCBzZXRMaW5lKGludCBsaW5lKSB7CisgICAgbGluZU5iciA9IGxpbmU7CisgIH0KKwogICBwdWJsaWMgQWNjb3VudC5JZCBnZXRBdXRob3IoKSB7CiAgICAgcmV0dXJuIGF1dGhvcjsKICAgfQpAQCAtMTc0LDcgKzE3OCwxNSBAQAogICAgIHdyaXR0ZW5PbiA9IG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpOwogICB9CiAKKyAgcHVibGljIHZvaWQgc2V0V3JpdHRlbk9uKFRpbWVzdGFtcCB0cykgeworICAgIHdyaXR0ZW5PbiA9IHRzOworICB9CisKICAgcHVibGljIFN0cmluZyBnZXRQYXJlbnRVdWlkKCkgewogICAgIHJldHVybiBwYXJlbnRVdWlkOwogICB9CisKKyAgcHVibGljIHZvaWQgc2V0UGFyZW50VXVpZChTdHJpbmcgaW5SZXBseVRvKSB7CisgICAgcGFyZW50VXVpZCA9IGluUmVwbHlUbzsKKyAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1BhdGNoU2V0LmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2hTZXQuamF2YQppbmRleCA4M2NlODI4Li41NGM1NTZkIDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2hTZXQuamF2YQorKysgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2hTZXQuamF2YQpAQCAtMjUsNyArMjUsMjcgQEAKIAogICAvKiogSXMgdGhlIHJlZmVyZW5jZSBuYW1lIGEgY2hhbmdlIHJlZmVyZW5jZT8gKi8KICAgcHVibGljIHN0YXRpYyBib29sZWFuIGlzUmVmKGZpbmFsIFN0cmluZyBuYW1lKSB7Ci0gICAgcmV0dXJuIG5hbWUubWF0Y2hlcygiXnJlZnMvY2hhbmdlcy8uKi9bMS05XVswLTldKi9bMS05XVswLTldKiQiKTsKKyAgICBpZiAobmFtZSA9PSBudWxsIHx8ICFuYW1lLnN0YXJ0c1dpdGgoUkVGU19DSEFOR0VTKSkgeworICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBib29sZWFuIGFjY2VwdGVkID0gZmFsc2U7CisgICAgaW50IG51bXNGb3VuZCA9IDA7CisgICAgZm9yIChpbnQgaSA9IG5hbWUubGVuZ3RoKCkgLSAxOyBpID49IFJFRlNfQ0hBTkdFUy5sZW5ndGgoKSAtIDE7IGktLSkgeworICAgICAgY2hhciBjID0gbmFtZS5jaGFyQXQoaSk7CisgICAgICBpZiAoYyA+PSAnMCcgJiYgYyA8PSAnOScpIHsKKyAgICAgICAgYWNjZXB0ZWQgPSAoYyAhPSAnMCcpOworICAgICAgfSBlbHNlIGlmIChjID09ICcvJykgeworICAgICAgICBpZiAoYWNjZXB0ZWQpIHsKKyAgICAgICAgICBpZiAoKytudW1zRm91bmQgPT0gMikgeworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgfQorICAgICAgICAgIGFjY2VwdGVkID0gZmFsc2U7CisgICAgICAgIH0KKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOwogICB9CiAKICAgcHVibGljIHN0YXRpYyBjbGFzcyBJZCBleHRlbmRzIEludEtleTxDaGFuZ2UuSWQ+IHsKQEAgLTYxLDYgKzgxLDIyIEBACiAgICAgICBwYXRjaFNldElkID0gbmV3VmFsdWU7CiAgICAgfQogCisgICAgcHVibGljIFN0cmluZyB0b1JlZk5hbWUoKSB7CisgICAgICBTdHJpbmdCdWlsZGVyIHIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgci5hcHBlbmQoUkVGU19DSEFOR0VTKTsKKyAgICAgIGludCBjaGFuZ2UgPSBjaGFuZ2VJZC5nZXQoKTsKKyAgICAgIGludCBtID0gY2hhbmdlICUgMTAwOworICAgICAgaWYgKG0gPCAxMCkgeworICAgICAgICByLmFwcGVuZCgnMCcpOworICAgICAgfQorICAgICAgci5hcHBlbmQobSk7CisgICAgICByLmFwcGVuZCgnLycpOworICAgICAgci5hcHBlbmQoY2hhbmdlKTsKKyAgICAgIHIuYXBwZW5kKCcvJyk7CisgICAgICByLmFwcGVuZChwYXRjaFNldElkKTsKKyAgICAgIHJldHVybiByLnRvU3RyaW5nKCk7CisgICAgfQorCiAgICAgLyoqIFBhcnNlIGEgUGF0Y2hTZXQuSWQgb3V0IG9mIGEgc3RyaW5nIHJlcHJlc2VudGF0aW9uLiAqLwogICAgIHB1YmxpYyBzdGF0aWMgSWQgcGFyc2UoZmluYWwgU3RyaW5nIHN0cikgewogICAgICAgZmluYWwgSWQgciA9IG5ldyBJZCgpOwpAQCAtMTQ4LDE5ICsxODQsNyBAQAogICB9CiAKICAgcHVibGljIFN0cmluZyBnZXRSZWZOYW1lKCkgewotICAgIGZpbmFsIFN0cmluZ0J1aWxkZXIgciA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgci5hcHBlbmQoUkVGU19DSEFOR0VTKTsKLSAgICBmaW5hbCBpbnQgY2hhbmdlSWQgPSBpZC5nZXRQYXJlbnRLZXkoKS5nZXQoKTsKLSAgICBmaW5hbCBpbnQgbSA9IGNoYW5nZUlkICUgMTAwOwotICAgIGlmIChtIDwgMTApIHsKLSAgICAgIHIuYXBwZW5kKCcwJyk7Ci0gICAgfQotICAgIHIuYXBwZW5kKG0pOwotICAgIHIuYXBwZW5kKCcvJyk7Ci0gICAgci5hcHBlbmQoY2hhbmdlSWQpOwotICAgIHIuYXBwZW5kKCcvJyk7Ci0gICAgci5hcHBlbmQoaWQuZ2V0KCkpOwotICAgIHJldHVybiByLnRvU3RyaW5nKCk7CisgICAgcmV0dXJuIGlkLnRvUmVmTmFtZSgpOwogICB9CiAKICAgQE92ZXJyaWRlCmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2hTZXRBcHByb3ZhbC5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1BhdGNoU2V0QXBwcm92YWwuamF2YQppbmRleCAwNGIyYjZmLi44ZDc5ZDY2IDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUGF0Y2hTZXRBcHByb3ZhbC5qYXZhCisrKyBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9QYXRjaFNldEFwcHJvdmFsLmphdmEKQEAgLTE2LDExICsxNiw1MiBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LkNvbHVtbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5jbGllbnQuQ29tcG91bmRLZXk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LlN0cmluZ0tleTsKIAogaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKIAogLyoqIEFuIGFwcHJvdmFsIChvciBuZWdhdGl2ZSBhcHByb3ZhbCkgb24gYSBwYXRjaCBzZXQuICovCiBwdWJsaWMgZmluYWwgY2xhc3MgUGF0Y2hTZXRBcHByb3ZhbCB7CisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgTGFiZWxJZCBleHRlbmRzCisgICAgICBTdHJpbmdLZXk8Y29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LktleTw/Pj4geworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgICAgcHVibGljIHN0YXRpYyBmaW5hbCBMYWJlbElkIFNVQk1JVCA9IG5ldyBMYWJlbElkKCJTVUJNIik7CisKKyAgICBAQ29sdW1uKGlkID0gMSkKKyAgICBwcm90ZWN0ZWQgU3RyaW5nIGlkOworCisgICAgcHJvdGVjdGVkIExhYmVsSWQoKSB7CisgICAgfQorCisgICAgcHVibGljIExhYmVsSWQoZmluYWwgU3RyaW5nIG4pIHsKKyAgICAgIGlkID0gbjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU3RyaW5nIGdldCgpIHsKKyAgICAgIHJldHVybiBpZDsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwcm90ZWN0ZWQgdm9pZCBzZXQoU3RyaW5nIG5ld1ZhbHVlKSB7CisgICAgICBpZCA9IG5ld1ZhbHVlOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CisgICAgICByZXR1cm4gZ2V0KCkuaGFzaENvZGUoKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgYm9vbGVhbiBlcXVhbHMoT2JqZWN0IGIpIHsKKyAgICAgIGlmIChiIGluc3RhbmNlb2YgTGFiZWxJZCkgeworICAgICAgICByZXR1cm4gZ2V0KCkuZXF1YWxzKCgoTGFiZWxJZCkgYikuZ2V0KCkpOworICAgICAgfQorICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgfQorCiAgIHB1YmxpYyBzdGF0aWMgY2xhc3MgS2V5IGV4dGVuZHMgQ29tcG91bmRLZXk8UGF0Y2hTZXQuSWQ+IHsKICAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKIApAQCAtMzEsMTYgKzcyLDE2IEBACiAgICAgcHJvdGVjdGVkIEFjY291bnQuSWQgYWNjb3VudElkOwogCiAgICAgQENvbHVtbihpZCA9IDMpCi0gICAgcHJvdGVjdGVkIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgY2F0ZWdvcnlJZDsKKyAgICBwcm90ZWN0ZWQgTGFiZWxJZCBjYXRlZ29yeUlkOwogCiAgICAgcHJvdGVjdGVkIEtleSgpIHsKICAgICAgIHBhdGNoU2V0SWQgPSBuZXcgUGF0Y2hTZXQuSWQoKTsKICAgICAgIGFjY291bnRJZCA9IG5ldyBBY2NvdW50LklkKCk7Ci0gICAgICBjYXRlZ29yeUlkID0gbmV3IEFwcHJvdmFsQ2F0ZWdvcnkuSWQoKTsKKyAgICAgIGNhdGVnb3J5SWQgPSBuZXcgTGFiZWxJZCgpOwogICAgIH0KIAogICAgIHB1YmxpYyBLZXkoZmluYWwgUGF0Y2hTZXQuSWQgcHMsIGZpbmFsIEFjY291bnQuSWQgYSwKLSAgICAgICAgZmluYWwgQXBwcm92YWxDYXRlZ29yeS5JZCBjKSB7CisgICAgICAgIGZpbmFsIExhYmVsSWQgYykgewogICAgICAgdGhpcy5wYXRjaFNldElkID0gcHM7CiAgICAgICB0aGlzLmFjY291bnRJZCA9IGE7CiAgICAgICB0aGlzLmNhdGVnb3J5SWQgPSBjOwpAQCAtNTUsNyArOTYsNyBAQAogICAgICAgcmV0dXJuIGFjY291bnRJZDsKICAgICB9CiAKLSAgICBwdWJsaWMgQXBwcm92YWxDYXRlZ29yeS5JZCBnZXRDYXRlZ29yeUlkKCkgeworICAgIHB1YmxpYyBMYWJlbElkIGdldExhYmVsSWQoKSB7CiAgICAgICByZXR1cm4gY2F0ZWdvcnlJZDsKICAgICB9CiAKQEAgLTEwOCw3ICsxNDksNyBAQAogCiAgIHB1YmxpYyBQYXRjaFNldEFwcHJvdmFsKGZpbmFsIFBhdGNoU2V0LklkIHBzSWQsIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgc3JjKSB7CiAgICAga2V5ID0KLSAgICAgICAgbmV3IFBhdGNoU2V0QXBwcm92YWwuS2V5KHBzSWQsIHNyYy5nZXRBY2NvdW50SWQoKSwgc3JjLmdldENhdGVnb3J5SWQoKSk7CisgICAgICAgIG5ldyBQYXRjaFNldEFwcHJvdmFsLktleShwc0lkLCBzcmMuZ2V0QWNjb3VudElkKCksIHNyYy5nZXRMYWJlbElkKCkpOwogICAgIGNoYW5nZU9wZW4gPSB0cnVlOwogICAgIHZhbHVlID0gc3JjLmdldFZhbHVlKCk7CiAgICAgZ3JhbnRlZCA9IHNyYy5ncmFudGVkOwpAQCAtMTI2LDcgKzE2Nyw3IEBACiAgICAgcmV0dXJuIGtleS5hY2NvdW50SWQ7CiAgIH0KIAotICBwdWJsaWMgQXBwcm92YWxDYXRlZ29yeS5JZCBnZXRDYXRlZ29yeUlkKCkgeworICBwdWJsaWMgTGFiZWxJZCBnZXRMYWJlbElkKCkgewogICAgIHJldHVybiBrZXkuY2F0ZWdvcnlJZDsKICAgfQogCkBAIC0xNDYsOCArMTg3LDI2IEBACiAgICAgZ3JhbnRlZCA9IG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpOwogICB9CiAKKyAgcHVibGljIHZvaWQgc2V0R3JhbnRlZChUaW1lc3RhbXAgdHMpIHsKKyAgICBncmFudGVkID0gdHM7CisgIH0KKwogICBwdWJsaWMgdm9pZCBjYWNoZShmaW5hbCBDaGFuZ2UgYykgewogICAgIGNoYW5nZU9wZW4gPSBjLm9wZW47CiAgICAgY2hhbmdlU29ydEtleSA9IGMuc29ydEtleTsKICAgfQorCisgIHB1YmxpYyBTdHJpbmcgZ2V0TGFiZWwoKSB7CisgICAgcmV0dXJuIGdldExhYmVsSWQoKS5nZXQoKTsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGlzU3VibWl0KCkgeworICAgIHJldHVybiBMYWJlbElkLlNVQk1JVC5nZXQoKS5lcXVhbHMoZ2V0TGFiZWwoKSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKyAgICByZXR1cm4gbmV3IFN0cmluZ0J1aWxkZXIoKS5hcHBlbmQoJ1snKS5hcHBlbmQoa2V5KS5hcHBlbmQoIjogIikKKyAgICAgICAgLmFwcGVuZCh2YWx1ZSkuYXBwZW5kKCddJykudG9TdHJpbmcoKTsKKyAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1Byb2plY3QuamF2YSBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL2NsaWVudC9Qcm9qZWN0LmphdmEKaW5kZXggYTJmYzQ2Zi4uYzA3MGUzZSAxMDA2NDQKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvY2xpZW50L1Byb2plY3QuamF2YQorKysgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9jbGllbnQvUHJvamVjdC5qYXZhCkBAIC03MCw2ICs3MCw4IEBACiAKICAgICBNRVJHRV9JRl9ORUNFU1NBUlksCiAKKyAgICBSRUJBU0VfSUZfTkVDRVNTQVJZLAorCiAgICAgTUVSR0VfQUxXQVlTLAogCiAgICAgQ0hFUlJZX1BJQ0s7CkBAIC04MywxMyArODUsMTkgQEAKICAgICBISURERU47CiAgIH0KIAorICBwdWJsaWMgc3RhdGljIGVudW0gSW5oZXJpdGFibGVCb29sZWFuIHsKKyAgICBUUlVFLAorICAgIEZBTFNFLAorICAgIElOSEVSSVQ7CisgIH0KKwogICBwcm90ZWN0ZWQgTmFtZUtleSBuYW1lOwogCiAgIHByb3RlY3RlZCBTdHJpbmcgZGVzY3JpcHRpb247CiAKLSAgcHJvdGVjdGVkIGJvb2xlYW4gdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzOworICBwcm90ZWN0ZWQgSW5oZXJpdGFibGVCb29sZWFuIHVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50czsKIAotICBwcm90ZWN0ZWQgYm9vbGVhbiB1c2VTaWduZWRPZmZCeTsKKyAgcHJvdGVjdGVkIEluaGVyaXRhYmxlQm9vbGVhbiB1c2VTaWduZWRPZmZCeTsKIAogICBwcm90ZWN0ZWQgU3VibWl0VHlwZSBzdWJtaXRUeXBlOwogCkBAIC05Nyw5ICsxMDUsMTMgQEAKIAogICBwcm90ZWN0ZWQgTmFtZUtleSBwYXJlbnQ7CiAKLSAgcHJvdGVjdGVkIGJvb2xlYW4gcmVxdWlyZUNoYW5nZUlEOworICBwcm90ZWN0ZWQgSW5oZXJpdGFibGVCb29sZWFuIHJlcXVpcmVDaGFuZ2VJRDsKIAotICBwcm90ZWN0ZWQgYm9vbGVhbiB1c2VDb250ZW50TWVyZ2U7CisgIHByb3RlY3RlZCBJbmhlcml0YWJsZUJvb2xlYW4gdXNlQ29udGVudE1lcmdlOworCisgIHByb3RlY3RlZCBTdHJpbmcgZGVmYXVsdERhc2hib2FyZElkOworCisgIHByb3RlY3RlZCBTdHJpbmcgbG9jYWxEZWZhdWx0RGFzaGJvYXJkSWQ7CiAKICAgcHJvdGVjdGVkIFByb2plY3QoKSB7CiAgIH0KQEAgLTEwOCw2ICsxMjAsMTAgQEAKICAgICBuYW1lID0gbmFtZUtleTsKICAgICBzdWJtaXRUeXBlID0gU3VibWl0VHlwZS5NRVJHRV9JRl9ORUNFU1NBUlk7CiAgICAgc3RhdGUgPSBTdGF0ZS5BQ1RJVkU7CisgICAgdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzID0gSW5oZXJpdGFibGVCb29sZWFuLklOSEVSSVQ7CisgICAgdXNlU2lnbmVkT2ZmQnkgPSBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKyAgICByZXF1aXJlQ2hhbmdlSUQgPSBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKyAgICB1c2VDb250ZW50TWVyZ2UgPSBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKICAgfQogCiAgIHB1YmxpYyBQcm9qZWN0Lk5hbWVLZXkgZ2V0TmFtZUtleSgpIHsKQEAgLTEyNiwzNSArMTQyLDM1IEBACiAgICAgZGVzY3JpcHRpb24gPSBkOwogICB9CiAKLSAgcHVibGljIGJvb2xlYW4gaXNVc2VDb250cmlidXRvckFncmVlbWVudHMoKSB7CisgIHB1YmxpYyBJbmhlcml0YWJsZUJvb2xlYW4gZ2V0VXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzKCkgewogICAgIHJldHVybiB1c2VDb250cmlidXRvckFncmVlbWVudHM7CiAgIH0KIAotICBwdWJsaWMgdm9pZCBzZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoZmluYWwgYm9vbGVhbiB1KSB7Ci0gICAgdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzID0gdTsKLSAgfQotCi0gIHB1YmxpYyBib29sZWFuIGlzVXNlU2lnbmVkT2ZmQnkoKSB7CisgIHB1YmxpYyBJbmhlcml0YWJsZUJvb2xlYW4gZ2V0VXNlU2lnbmVkT2ZmQnkoKSB7CiAgICAgcmV0dXJuIHVzZVNpZ25lZE9mZkJ5OwogICB9CiAKLSAgcHVibGljIGJvb2xlYW4gaXNVc2VDb250ZW50TWVyZ2UoKSB7CisgIHB1YmxpYyBJbmhlcml0YWJsZUJvb2xlYW4gZ2V0VXNlQ29udGVudE1lcmdlKCkgewogICAgIHJldHVybiB1c2VDb250ZW50TWVyZ2U7CiAgIH0KIAotICBwdWJsaWMgYm9vbGVhbiBpc1JlcXVpcmVDaGFuZ2VJRCgpIHsKKyAgcHVibGljIEluaGVyaXRhYmxlQm9vbGVhbiBnZXRSZXF1aXJlQ2hhbmdlSUQoKSB7CiAgICAgcmV0dXJuIHJlcXVpcmVDaGFuZ2VJRDsKICAgfQogCi0gIHB1YmxpYyB2b2lkIHNldFVzZVNpZ25lZE9mZkJ5KGZpbmFsIGJvb2xlYW4gc2JvKSB7CisgIHB1YmxpYyB2b2lkIHNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyhmaW5hbCBJbmhlcml0YWJsZUJvb2xlYW4gdSkgeworICAgIHVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyA9IHU7CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRVc2VTaWduZWRPZmZCeShmaW5hbCBJbmhlcml0YWJsZUJvb2xlYW4gc2JvKSB7CiAgICAgdXNlU2lnbmVkT2ZmQnkgPSBzYm87CiAgIH0KIAotICBwdWJsaWMgdm9pZCBzZXRVc2VDb250ZW50TWVyZ2UoZmluYWwgYm9vbGVhbiBjbSkgeworICBwdWJsaWMgdm9pZCBzZXRVc2VDb250ZW50TWVyZ2UoZmluYWwgSW5oZXJpdGFibGVCb29sZWFuIGNtKSB7CiAgICAgdXNlQ29udGVudE1lcmdlID0gY207CiAgIH0KIAotICBwdWJsaWMgdm9pZCBzZXRSZXF1aXJlQ2hhbmdlSUQoZmluYWwgYm9vbGVhbiBjaWQpIHsKKyAgcHVibGljIHZvaWQgc2V0UmVxdWlyZUNoYW5nZUlEKGZpbmFsIEluaGVyaXRhYmxlQm9vbGVhbiBjaWQpIHsKICAgICByZXF1aXJlQ2hhbmdlSUQgPSBjaWQ7CiAgIH0KIApAQCAtMTc0LDYgKzE5MCwyMiBAQAogICAgIHN0YXRlID0gbmV3U3RhdGU7CiAgIH0KIAorICBwdWJsaWMgU3RyaW5nIGdldERlZmF1bHREYXNoYm9hcmQoKSB7CisgICAgcmV0dXJuIGRlZmF1bHREYXNoYm9hcmRJZDsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldERlZmF1bHREYXNoYm9hcmQoZmluYWwgU3RyaW5nIGRlZmF1bHREYXNoYm9hcmRJZCkgeworICAgIHRoaXMuZGVmYXVsdERhc2hib2FyZElkID0gZGVmYXVsdERhc2hib2FyZElkOworICB9CisKKyAgcHVibGljIFN0cmluZyBnZXRMb2NhbERlZmF1bHREYXNoYm9hcmQoKSB7CisgICAgcmV0dXJuIGxvY2FsRGVmYXVsdERhc2hib2FyZElkOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0TG9jYWxEZWZhdWx0RGFzaGJvYXJkKGZpbmFsIFN0cmluZyBsb2NhbERlZmF1bHREYXNoYm9hcmRJZCkgeworICAgIHRoaXMubG9jYWxEZWZhdWx0RGFzaGJvYXJkSWQgPSBsb2NhbERlZmF1bHREYXNoYm9hcmRJZDsKKyAgfQorCiAgIHB1YmxpYyB2b2lkIGNvcHlTZXR0aW5nc0Zyb20oZmluYWwgUHJvamVjdCB1cGRhdGUpIHsKICAgICBkZXNjcmlwdGlvbiA9IHVwZGF0ZS5kZXNjcmlwdGlvbjsKICAgICB1c2VDb250cmlidXRvckFncmVlbWVudHMgPSB1cGRhdGUudXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL0FjY291bnRHcm91cEluY2x1ZGVBY2Nlc3MuamF2YSBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9BY2NvdW50R3JvdXBJbmNsdWRlQWNjZXNzLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDNlZTRiYTAuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL0FjY291bnRHcm91cEluY2x1ZGVBY2Nlc3MuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDM1ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXI7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5BY2Nlc3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUHJpbWFyeUtleTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUXVlcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlJlc3VsdFNldDsKLQotcHVibGljIGludGVyZmFjZSBBY2NvdW50R3JvdXBJbmNsdWRlQWNjZXNzIGV4dGVuZHMKLSAgICBBY2Nlc3M8QWNjb3VudEdyb3VwSW5jbHVkZSwgQWNjb3VudEdyb3VwSW5jbHVkZS5LZXk+IHsKLSAgQFByaW1hcnlLZXkoImtleSIpCi0gIEFjY291bnRHcm91cEluY2x1ZGUgZ2V0KEFjY291bnRHcm91cEluY2x1ZGUuS2V5IGtleSkgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKLQotICBAUXVlcnkoIldIRVJFIGtleS5pbmNsdWRlSWQgPSA/IikKLSAgUmVzdWx0U2V0PEFjY291bnRHcm91cEluY2x1ZGU+IGJ5SW5jbHVkZShBY2NvdW50R3JvdXAuSWQgaWQpIHRocm93cyBPcm1FeGNlcHRpb247Ci0KLSAgQFF1ZXJ5KCJXSEVSRSBrZXkuZ3JvdXBJZCA9ID8iKQotICBSZXN1bHRTZXQ8QWNjb3VudEdyb3VwSW5jbHVkZT4gYnlHcm91cChBY2NvdW50R3JvdXAuSWQgaWQpIHRocm93cyBPcm1FeGNlcHRpb247Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvQWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0QWNjZXNzLmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvQWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0QWNjZXNzLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGIzZjRmODguLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL0FjY291bnRHcm91cEluY2x1ZGVBdWRpdEFjY2Vzcy5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMzQgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDExIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlcjsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cEluY2x1ZGVBdWRpdDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuQWNjZXNzOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlByaW1hcnlLZXk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlF1ZXJ5OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5SZXN1bHRTZXQ7Ci0KLXB1YmxpYyBpbnRlcmZhY2UgQWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0QWNjZXNzIGV4dGVuZHMKLSAgICBBY2Nlc3M8QWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0LCBBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQuS2V5PiB7Ci0gIEBQcmltYXJ5S2V5KCJrZXkiKQotICBBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQgZ2V0KEFjY291bnRHcm91cEluY2x1ZGVBdWRpdC5LZXkga2V5KQotICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKLQotICBAUXVlcnkoIldIRVJFIGtleS5ncm91cElkID0gPyBBTkQga2V5LmluY2x1ZGVJZCA9ID8iKQotICBSZXN1bHRTZXQ8QWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0PiBieUdyb3VwSW5jbHVkZShBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZCwKLSAgICAgIEFjY291bnRHcm91cC5JZCBpbmNHcm91cElkKSB0aHJvd3MgT3JtRXhjZXB0aW9uOwotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL0FjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBY2Nlc3MuamF2YSBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQWNjZXNzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTBlMjNlYgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQWNjZXNzLmphdmEKQEAgLTAsMCArMSwzOCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDExIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlcjsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLkFjY2VzczsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5QcmltYXJ5S2V5OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5RdWVyeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUmVzdWx0U2V0OworCitwdWJsaWMgaW50ZXJmYWNlIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBY2Nlc3MgZXh0ZW5kcworICAgIEFjY2VzczxBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkLCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkLktleT4geworICBAUHJpbWFyeUtleSgia2V5IikKKyAgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZCBnZXQoQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZC5LZXkga2V5KSB0aHJvd3MgT3JtRXhjZXB0aW9uOworCisgIEBRdWVyeSgiV0hFUkUga2V5LmluY2x1ZGVVVUlEID0gPyIpCisgIFJlc3VsdFNldDxBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkPiBieUluY2x1ZGVVVUlEKEFjY291bnRHcm91cC5VVUlEIHV1aWQpIHRocm93cyBPcm1FeGNlcHRpb247CisKKyAgQFF1ZXJ5KCJXSEVSRSBrZXkuZ3JvdXBJZCA9ID8iKQorICBSZXN1bHRTZXQ8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZD4gYnlHcm91cChBY2NvdW50R3JvdXAuSWQgaWQpIHRocm93cyBPcm1FeGNlcHRpb247CisKKyAgQFF1ZXJ5KCIiKQorICBSZXN1bHRTZXQ8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZD4gYWxsKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXRBY2Nlc3MuamF2YSBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXRBY2Nlc3MuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xYzk1Zjc1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL0FjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdEFjY2Vzcy5qYXZhCkBAIC0wLDAgKzEsMzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXI7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLkFjY2VzczsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5QcmltYXJ5S2V5OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5RdWVyeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUmVzdWx0U2V0OworCitwdWJsaWMgaW50ZXJmYWNlIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdEFjY2VzcyBleHRlbmRzCisgICAgQWNjZXNzPEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdCwgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0LktleT4geworICBAUHJpbWFyeUtleSgia2V5IikKKyAgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0IGdldChBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQuS2V5IGtleSkKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb247CisKKyAgQFF1ZXJ5KCJXSEVSRSBrZXkuZ3JvdXBJZCA9ID8gQU5EIGtleS5pbmNsdWRlVVVJRCA9ID8iKQorICBSZXN1bHRTZXQ8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0PiBieUdyb3VwSW5jbHVkZShBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZCwKKyAgICAgIEFjY291bnRHcm91cC5VVUlEIGluY0dyb3VwVVVJRCkgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9BcHByb3ZhbENhdGVnb3J5QWNjZXNzLmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvQXBwcm92YWxDYXRlZ29yeUFjY2Vzcy5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBkYjk4ODZlLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9BcHByb3ZhbENhdGVnb3J5QWNjZXNzLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwzMSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDggVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFwcHJvdmFsQ2F0ZWdvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLkFjY2VzczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5QcmltYXJ5S2V5OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5RdWVyeTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUmVzdWx0U2V0OwotCi1wdWJsaWMgaW50ZXJmYWNlIEFwcHJvdmFsQ2F0ZWdvcnlBY2Nlc3MgZXh0ZW5kcwotICAgIEFjY2VzczxBcHByb3ZhbENhdGVnb3J5LCBBcHByb3ZhbENhdGVnb3J5LklkPiB7Ci0gIEBQcmltYXJ5S2V5KCJjYXRlZ29yeUlkIikKLSAgQXBwcm92YWxDYXRlZ29yeSBnZXQoQXBwcm92YWxDYXRlZ29yeS5JZCBpZCkgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKLQotICBAUXVlcnkoIk9SREVSIEJZIHBvc2l0aW9uLCBuYW1lIikKLSAgUmVzdWx0U2V0PEFwcHJvdmFsQ2F0ZWdvcnk+IGFsbCgpIHRocm93cyBPcm1FeGNlcHRpb247Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvQXBwcm92YWxDYXRlZ29yeVZhbHVlQWNjZXNzLmphdmEgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvQXBwcm92YWxDYXRlZ29yeVZhbHVlQWNjZXNzLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDBiYzk5ODEuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL0FwcHJvdmFsQ2F0ZWdvcnlWYWx1ZUFjY2Vzcy5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMzMgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA4IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlcjsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLkFjY2VzczsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5QcmltYXJ5S2V5OwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5RdWVyeTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUmVzdWx0U2V0OwotCi1wdWJsaWMgaW50ZXJmYWNlIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZUFjY2VzcyBleHRlbmRzCi0gICAgQWNjZXNzPEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSwgQXBwcm92YWxDYXRlZ29yeVZhbHVlLklkPiB7Ci0gIEBQcmltYXJ5S2V5KCJrZXkiKQotICBBcHByb3ZhbENhdGVnb3J5VmFsdWUgZ2V0KEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZCBrZXkpIHRocm93cyBPcm1FeGNlcHRpb247Ci0KLSAgQFF1ZXJ5KCJXSEVSRSBrZXkuY2F0ZWdvcnlJZCA9ID8gT1JERVIgQlkga2V5LnZhbHVlIikKLSAgUmVzdWx0U2V0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZT4gYnlDYXRlZ29yeShBcHByb3ZhbENhdGVnb3J5LklkIGlkKQotICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9SZXZpZXdEYi5qYXZhIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL1Jldmlld0RiLmphdmEKaW5kZXggMTQ5NjI2Yi4uZjFhYjc1MiAxMDA2NDQKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL1Jldmlld0RiLmphdmEKKysrIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL1Jldmlld0RiLmphdmEKQEAgLTQzLDExICs0Myw5IEBACiAgIEBSZWxhdGlvbihpZCA9IDIpCiAgIFN5c3RlbUNvbmZpZ0FjY2VzcyBzeXN0ZW1Db25maWcoKTsKIAotICBAUmVsYXRpb24oaWQgPSAzKQotICBBcHByb3ZhbENhdGVnb3J5QWNjZXNzIGFwcHJvdmFsQ2F0ZWdvcmllcygpOworICAvLyBEZWxldGVkIEBSZWxhdGlvbihpZCA9IDMpCiAKLSAgQFJlbGF0aW9uKGlkID0gNCkKLSAgQXBwcm92YWxDYXRlZ29yeVZhbHVlQWNjZXNzIGFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZXMoKTsKKyAgLy8gRGVsZXRlZCBAUmVsYXRpb24oaWQgPSA0KQogCiAgIEBSZWxhdGlvbihpZCA9IDYpCiAgIEFjY291bnRBY2Nlc3MgYWNjb3VudHMoKTsKQEAgLTcwLDEyICs2OCw2IEBACiAgIEBSZWxhdGlvbihpZCA9IDEzKQogICBBY2NvdW50R3JvdXBNZW1iZXJBdWRpdEFjY2VzcyBhY2NvdW50R3JvdXBNZW1iZXJzQXVkaXQoKTsKIAotICBAUmVsYXRpb24oaWQgPSAxNCkKLSAgQWNjb3VudEdyb3VwSW5jbHVkZUFjY2VzcyBhY2NvdW50R3JvdXBJbmNsdWRlcygpOwotCi0gIEBSZWxhdGlvbihpZCA9IDE1KQotICBBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXRBY2Nlc3MgYWNjb3VudEdyb3VwSW5jbHVkZXNBdWRpdCgpOwotCiAgIEBSZWxhdGlvbihpZCA9IDE3KQogICBBY2NvdW50RGlmZlByZWZlcmVuY2VBY2Nlc3MgYWNjb3VudERpZmZQcmVmZXJlbmNlcygpOwogCkBAIC0xMTIsNiArMTA0LDEyIEBACiAgIEBSZWxhdGlvbihpZCA9IDI4KQogICBTdWJtb2R1bGVTdWJzY3JpcHRpb25BY2Nlc3Mgc3VibW9kdWxlU3Vic2NyaXB0aW9ucygpOwogCisgIEBSZWxhdGlvbihpZCA9IDI5KQorICBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQWNjZXNzIGFjY291bnRHcm91cEluY2x1ZGVzQnlVdWlkKCk7CisKKyAgQFJlbGF0aW9uKGlkID0gMzApCisgIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdEFjY2VzcyBhY2NvdW50R3JvdXBJbmNsdWRlc0J5VXVpZEF1ZGl0KCk7CisKICAgLyoqIENyZWF0ZSB0aGUgbmV4dCB1bmlxdWUgaWQgZm9yIGFuIHtAbGluayBBY2NvdW50fS4gKi8KICAgQFNlcXVlbmNlKHN0YXJ0V2l0aCA9IDEwMDAwMDApCiAgIGludCBuZXh0QWNjb3VudElkKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9TdWJtb2R1bGVTdWJzY3JpcHRpb25BY2Nlc3MuamF2YSBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9TdWJtb2R1bGVTdWJzY3JpcHRpb25BY2Nlc3MuamF2YQppbmRleCAwMDkwZGY4Li5jMGUxZWI2IDEwMDY0NAotLS0gYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvU3VibW9kdWxlU3Vic2NyaXB0aW9uQWNjZXNzLmphdmEKKysrIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL1N1Ym1vZHVsZVN1YnNjcmlwdGlvbkFjY2Vzcy5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlcjsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlN1Ym1vZHVsZVN1YnNjcmlwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuQWNjZXNzOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CkBAIC0zMSw3ICszMiwzOSBAQAogICBSZXN1bHRTZXQ8U3VibW9kdWxlU3Vic2NyaXB0aW9uPiBieVN1cGVyUHJvamVjdChCcmFuY2guTmFtZUtleSBzdXBlclByb2plY3QpCiAgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uOwogCisgIC8qKgorICAgKiBGZXRjaGVzIGFsbCA8Y29kZT5TdWJtb2R1bGVTdWJzY3JpcHRpb248L2NvZGU+cyBpbiB3aGljaCBzb21lIGJyYW5jaCBvZgorICAgKiA8Y29kZT5zdXBlclByb2plY3Q8L2NvZGU+IHN1YnNjcmliZXMgYSBicmFuY2guCisgICAqCisgICAqIFVzZSB7QGxpbmsgI2J5U3VwZXJwcm9qZWN0KEJyYW5jaC5OYW1lS2V5KX0gdG8gZmV0Y2ggZm9yIGEgYnJhbmNoIGluc3RlYWQKKyAgICogb2YgYSBwcm9qZWN0LgorICAgKgorICAgKiBAcGFyYW0gc3VwZXJQcm9qZWN0IHRoZSBwcm9qZWN0IHRvIGZldGNoIHN1YnNjcmlwdGlvbnMgZm9yCisgICAqIEByZXR1cm4gPGNvZGU+U3VibW9kdWxlU3Vic2NyaXB0aW9uPC9jb2RlPnMgdGhhdCBhcmUgc3Vic2NyaWJlZCBieSBzb21lCisgICAqIGJyYW5jaCBvZiA8Y29kZT5zdXBlclByb2plY3Q8L2NvZGU+LgorICAgKiBAdGhyb3dzIE9ybUV4Y2VwdGlvbgorICAgKi8KKyAgQFF1ZXJ5KCJXSEVSRSBrZXkuc3VwZXJQcm9qZWN0LnByb2plY3ROYW1lID0gPyIpCisgIFJlc3VsdFNldDxTdWJtb2R1bGVTdWJzY3JpcHRpb24+IGJ5U3VwZXJQcm9qZWN0UHJvamVjdChQcm9qZWN0Lk5hbWVLZXkgc3VwZXJQcm9qZWN0KQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKKwogICBAUXVlcnkoIldIRVJFIHN1Ym1vZHVsZSA9ID8iKQogICBSZXN1bHRTZXQ8U3VibW9kdWxlU3Vic2NyaXB0aW9uPiBieVN1Ym1vZHVsZShCcmFuY2guTmFtZUtleSBzdWJtb2R1bGUpCiAgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uOworCisgIC8qKgorICAgKiBGZXRjaGVzIGFsbCA8Y29kZT5TdWJtb2R1bGVTdWJzY3JpcHRpb248L2NvZGU+cyBpbiB3aGljaCBzb21lIGJyYW5jaCBvZgorICAgKiA8Y29kZT5zdWJtb2R1bGU8L2NvZGU+IGlzIHN1YnNjcmliZWQuCisgICAqCisgICAqIFVzZSB7QGxpbmsgI2J5U3VibW9kdWxlKEJyYW5jaC5OYW1lS2V5KX0gdG8gZmV0Y2ggZm9yIGEgYnJhbmNoIGluc3RlYWQgb2YKKyAgICogYSBwcm9qZWN0LgorICAgKgorICAgKiBAcGFyYW0gc3VibW9kdWxlIHRoZSBwcm9qZWN0IHRvIGZldGNoIHN1YnNjcmlwdGlvbnMgZm9yLgorICAgKiBAcmV0dXJuIDxjb2RlPlN1Ym1vZHVsZVN1YnNjcmlwdGlvbjwvY29kZT5zIHRoYXQgc3Vic2NyaWJlIHNvbWUgYnJhbmNoIG9mCisgICAqIDxjb2RlPnN1Ym1vZHVsZTwvY29kZT4uCisgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uCisgICAqLworICBAUXVlcnkoIldIRVJFIHN1Ym1vZHVsZS5wcm9qZWN0TmFtZSA9ID8iKQorICBSZXN1bHRTZXQ8U3VibW9kdWxlU3Vic2NyaXB0aW9uPiBieVN1Ym1vZHVsZVByb2plY3QoUHJvamVjdC5OYW1lS2V5IHN1Ym1vZHVsZSkKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb247CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9pbmRleF9nZW5lcmljLnNxbCBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL2luZGV4X2dlbmVyaWMuc3FsCmluZGV4IDlkNDUzZmMuLmQ2NjA5ZTcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL2luZGV4X2dlbmVyaWMuc3FsCisrKyBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL2luZGV4X2dlbmVyaWMuc3FsCkBAIC0zNCwxMCArMzQsMTAgQEAKIAogCiAtLSAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKLS0tIEFjY291bnRHcm91cEluY2x1ZGVBY2Nlc3MKKy0tIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBY2Nlc3MKIC0tICAgIEBQcmltYXJ5S2V5IGNvdmVyczogYnlHcm91cAotQ1JFQVRFIElOREVYIGFjY291bnRfZ3JvdXBfaW5jbHVkZXNfYnlJbmNsdWRlCi1PTiBhY2NvdW50X2dyb3VwX2luY2x1ZGVzIChpbmNsdWRlX2lkKTsKK0NSRUFURSBJTkRFWCBhY2NvdW50X2dyb3VwX2luY2x1ZGVzX2J5X3V1aWRfYnlJbmNsdWRlCitPTiBhY2NvdW50X2dyb3VwX2luY2x1ZGVzX2J5X3V1aWQgKGluY2x1ZGVfdXVpZCk7CiAKIAogLS0gKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCmRpZmYgLS1naXQgYS9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9pbmRleF9wb3N0Z3Jlcy5zcWwgYi9nZXJyaXQtcmV2aWV3ZGIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3Jldmlld2RiL3NlcnZlci9pbmRleF9wb3N0Z3Jlcy5zcWwKaW5kZXggMmM5MWRiNC4uM2I2MmU4NCAxMDA2NDQKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvaW5kZXhfcG9zdGdyZXMuc3FsCisrKyBiL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL2luZGV4X3Bvc3RncmVzLnNxbApAQCAtNDcsMzAgKzQ3LDYgQEAKIAogRFJPUCBGVU5DVElPTiBtYWtlX3BscGdzcWwoKTsKIAotLS0gRGVmaW5lIG91ciBzY2hlbWEgdXBncmFkZSBzdXBwb3J0IGZ1bmN0aW9uLgotLS0KLQotZGVsaW1pdGVyIC8vCi0KLUNSRUFURSBPUiBSRVBMQUNFIEZVTkNUSU9OCi1jaGVja19zY2hlbWFfdmVyc2lvbiAoZXhwIElOVCkKLVJFVFVSTlMgVkFSQ0hBUigyNTUpCi1BUyAkJAotREVDTEFSRQotICBsX2FjdCBJTlQ7Ci1CRUdJTgotICBTRUxFQ1QgdmVyc2lvbl9uYnIgSU5UTyBsX2FjdAotICBGUk9NIHNjaGVtYV92ZXJzaW9uOwotCi0gIElGIGxfYWN0IDw+IGV4cAotICBUSEVOCi0gICAgUkFJU0UgRVhDRVBUSU9OICdleHBlY3RlZCBzY2hlbWEgJSwgZm91bmQgJScsIGV4cCwgbF9hY3Q7Ci0gIEVORCBJRjsKLSAgUkVUVVJOICdPSyc7Ci1FTkQ7Ci0kJCBMQU5HVUFHRSBwbHBnc3FsOwotLy8KLQogZGVsaW1pdGVyIDsKIAogLS0gSW5kZXhlcyB0byBzdXBwb3J0IEBRdWVyeQpAQCAtMTA2LDEwICs4MiwxMCBAQAogCiAKIC0tICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotLS0gQWNjb3VudEdyb3VwSW5jbHVkZUFjY2VzcworLS0gQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEFjY2VzcwogLS0gICAgQFByaW1hcnlLZXkgY292ZXJzOiBieUdyb3VwCi1DUkVBVEUgSU5ERVggYWNjb3VudF9ncm91cF9pbmNsdWRlc19ieUluY2x1ZGUKLU9OIGFjY291bnRfZ3JvdXBfaW5jbHVkZXMgKGluY2x1ZGVfaWQpOworQ1JFQVRFIElOREVYIGFjY291bnRfZ3JvdXBfaW5jbHVkZXNfYnlfdXVpZF9ieUluY2x1ZGUKK09OIGFjY291bnRfZ3JvdXBfaW5jbHVkZXNfYnlfdXVpZCAoaW5jbHVkZV91dWlkKTsKIAogCiAtLSAqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKZGlmZiAtLWdpdCBhL2dlcnJpdC1yZXZpZXdkYi9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcmV2aWV3ZGIvc2VydmVyL215c3FsX25leHR2YWwuc3FsIGIvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvbXlzcWxfbmV4dHZhbC5zcWwKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDI0NzkwMTAuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXJldmlld2RiL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9yZXZpZXdkYi9zZXJ2ZXIvbXlzcWxfbmV4dHZhbC5zcWwKKysrIC9kZXYvbnVsbApAQCAtMSwxNCArMCwwIEBACi0tLSBHZXJyaXQgMiA6IE15U1FMCi0tLQotZGVsaW1pdGVyIC8vCi0KLUNSRUFURSBGVU5DVElPTiBuZXh0dmFsX2FjY291bnRfaWQgKCkKLSAgUkVUVVJOUyBCSUdJTlQKLSAgTEFOR1VBR0UgU1FMCi0gIE5PVCBERVRFUk1JTklTVElDCi0gIE1PRElGSUVTIFNRTCBEQVRBCi1CRUdJTgotICBJTlNFUlQgSU5UTyBhY2NvdW50X2lkIChzKSBWQUxVRVMgKE5VTEwpOwotICBSRVRVUk4gTEFTVF9JTlNFUlRfSUQoKTsKLUVORDsKLS8vCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3BvbS54bWwgYi9nZXJyaXQtc2VydmVyL3BvbS54bWwKaW5kZXggYWYxODE3My4uMGIxM2ZiZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9wb20ueG1sCisrKyBiL2dlcnJpdC1zZXJ2ZXIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXNlcnZlcjwvYXJ0aWZhY3RJZD4KQEAgLTgwLDcgKzgwLDYgQEAKICAgICA8ZGVwZW5kZW5jeT4KICAgICAgIDxncm91cElkPmJvdW5jeWNhc3RsZTwvZ3JvdXBJZD4KICAgICAgIDxhcnRpZmFjdElkPmJjcGctamRrMTU8L2FydGlmYWN0SWQ+Ci0gICAgICA8dmVyc2lvbj4xNDA8L3ZlcnNpb24+CiAgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgogICAgIDwvZGVwZW5kZW5jeT4KIApAQCAtMTYyLDcgKzE2MSw3IEBACiAgICAgPC9kZXBlbmRlbmN5PgogCiAgICAgPGRlcGVuZGVuY3k+Ci0gICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICAgIDxncm91cElkPmNvbS5nb29nbGVjb2RlLmp1bml2ZXJzYWxjaGFyZGV0PC9ncm91cElkPgogICAgICAgPGFydGlmYWN0SWQ+anVuaXZlcnNhbGNoYXJkZXQ8L2FydGlmYWN0SWQ+CiAgICAgPC9kZXBlbmRlbmN5PgogCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYXVkaXQvQXVkaXRFdmVudC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2F1ZGl0L0F1ZGl0RXZlbnQuamF2YQppbmRleCAzNjRkZjgwLi4xNzNjZWQ2IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYXVkaXQvQXVkaXRFdmVudC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hdWRpdC9BdWRpdEV2ZW50LmphdmEKQEAgLTE0LDIyICsxNCwyMiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmF1ZGl0OwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuUHJlY29uZGl0aW9uczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkhhc2hNdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk11bHRpbWFwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKIAotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLQogcHVibGljIGNsYXNzIEF1ZGl0RXZlbnQgewogCiAgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIFVOS05PV05fU0VTU0lPTl9JRCA9ICIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBPYmplY3QgVU5LTk9XTl9SRVNVTFQgPSAiTi9BIjsKKyAgcHJvdGVjdGVkIHN0YXRpYyBmaW5hbCBNdWx0aW1hcDxTdHJpbmcsID8+IEVNUFRZX1BBUkFNUyA9IEhhc2hNdWx0aW1hcC5jcmVhdGUoKTsKIAogICBwdWJsaWMgZmluYWwgU3RyaW5nIHNlc3Npb25JZDsKICAgcHVibGljIGZpbmFsIEN1cnJlbnRVc2VyIHdobzsKICAgcHVibGljIGZpbmFsIGxvbmcgd2hlbjsKICAgcHVibGljIGZpbmFsIFN0cmluZyB3aGF0OwotICBwdWJsaWMgZmluYWwgTGlzdDw/PiBwYXJhbXM7CisgIHB1YmxpYyBmaW5hbCBNdWx0aW1hcDxTdHJpbmcsID8+IHBhcmFtczsKICAgcHVibGljIGZpbmFsIE9iamVjdCByZXN1bHQ7CiAgIHB1YmxpYyBmaW5hbCBsb25nIHRpbWVBdFN0YXJ0OwogICBwdWJsaWMgZmluYWwgbG9uZyBlbGFwc2VkOwpAQCAtNzMsMTkgKzczLDYgQEAKICAgfQogCiAgIC8qKgotICAgKiBDcmVhdGVzIGEgbmV3IGF1ZGl0IGV2ZW50LgotICAgKgotICAgKiBAcGFyYW0gc2Vzc2lvbklkIHNlc3Npb24gaWQgdGhlIGV2ZW50IGJlbG9uZ3MgdG8KLSAgICogQHBhcmFtIHdobyBwcmluY2lwYWwgdGhhdCBoYXMgZ2VuZXJhdGVkIHRoZSBldmVudAotICAgKiBAcGFyYW0gd2hhdCBvYmplY3Qgb2YgdGhlIGV2ZW50Ci0gICAqIEBwYXJhbSBwYXJhbXMgcGFyYW1ldGVycyBvZiB0aGUgZXZlbnQKLSAgICovCi0gIHB1YmxpYyBBdWRpdEV2ZW50KFN0cmluZyBzZXNzaW9uSWQsIEN1cnJlbnRVc2VyIHdobywgU3RyaW5nIHdoYXQsIExpc3Q8Pz4gcGFyYW1zKSB7Ci0gICAgdGhpcyhzZXNzaW9uSWQsIHdobywgd2hhdCwgU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCksIHBhcmFtcywKLSAgICAgICAgVU5LTk9XTl9SRVNVTFQpOwotICB9Ci0KLSAgLyoqCiAgICAqIENyZWF0ZXMgYSBuZXcgYXVkaXQgZXZlbnQgd2l0aCByZXN1bHRzCiAgICAqCiAgICAqIEBwYXJhbSBzZXNzaW9uSWQgc2Vzc2lvbiBpZCB0aGUgZXZlbnQgYmVsb25ncyB0bwpAQCAtOTYsMjggKzgzLDIwIEBACiAgICAqIEBwYXJhbSByZXN1bHQgcmVzdWx0IG9mIHRoZSBldmVudAogICAgKi8KICAgcHVibGljIEF1ZGl0RXZlbnQoU3RyaW5nIHNlc3Npb25JZCwgQ3VycmVudFVzZXIgd2hvLCBTdHJpbmcgd2hhdCwgbG9uZyB3aGVuLAotICAgICAgTGlzdDw/PiBwYXJhbXMsIE9iamVjdCByZXN1bHQpIHsKKyAgICAgIE11bHRpbWFwPFN0cmluZywgPz4gcGFyYW1zLCBPYmplY3QgcmVzdWx0KSB7CiAgICAgUHJlY29uZGl0aW9ucy5jaGVja05vdE51bGwod2hhdCwgIndoYXQgaXMgYSBtYW5kYXRvcnkgbm90IG51bGwgcGFyYW0gISIpOwogCi0gICAgdGhpcy5zZXNzaW9uSWQgPSBnZXRWYWx1ZVdpdGhEZWZhdWx0KHNlc3Npb25JZCwgVU5LTk9XTl9TRVNTSU9OX0lEKTsKKyAgICB0aGlzLnNlc3Npb25JZCA9IE9iamVjdHMuZmlyc3ROb25OdWxsKHNlc3Npb25JZCwgVU5LTk9XTl9TRVNTSU9OX0lEKTsKICAgICB0aGlzLndobyA9IHdobzsKICAgICB0aGlzLndoYXQgPSB3aGF0OwogICAgIHRoaXMud2hlbiA9IHdoZW47CiAgICAgdGhpcy50aW1lQXRTdGFydCA9IHRoaXMud2hlbjsKLSAgICB0aGlzLnBhcmFtcyA9IGdldFZhbHVlV2l0aERlZmF1bHQocGFyYW1zLCBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKSk7CisgICAgdGhpcy5wYXJhbXMgPSBPYmplY3RzLmZpcnN0Tm9uTnVsbChwYXJhbXMsIEVNUFRZX1BBUkFNUyk7CiAgICAgdGhpcy51dWlkID0gbmV3IFVVSUQoKTsKICAgICB0aGlzLnJlc3VsdCA9IHJlc3VsdDsKICAgICB0aGlzLmVsYXBzZWQgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKSAtIHRpbWVBdFN0YXJ0OwogICB9CiAKLSAgcHJpdmF0ZSA8VD4gVCBnZXRWYWx1ZVdpdGhEZWZhdWx0KFQgdmFsdWUsIFQgZGVmYXVsdFZhbHVlSWZOdWxsKSB7Ci0gICAgaWYgKHZhbHVlID09IG51bGwpIHsKLSAgICAgIHJldHVybiBkZWZhdWx0VmFsdWVJZk51bGw7Ci0gICAgfSBlbHNlIHsKLSAgICAgIHJldHVybiB2YWx1ZTsKLSAgICB9Ci0gIH0KLQogICBAT3ZlcnJpZGUKICAgcHVibGljIGludCBoYXNoQ29kZSgpIHsKICAgICByZXR1cm4gdXVpZC5oYXNoQ29kZSgpOwpAQCAtMTM1LDM4ICsxMTQsNyBAQAogCiAgIEBPdmVycmlkZQogICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewotICAgIFN0cmluZ0J1aWxkZXIgc2IgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgIHNiLmFwcGVuZCh1dWlkLnRvU3RyaW5nKCkpOwotICAgIHNiLmFwcGVuZCgifCIpOwotICAgIHNiLmFwcGVuZChzZXNzaW9uSWQpOwotICAgIHNiLmFwcGVuZCgnfCcpOwotICAgIHNiLmFwcGVuZCh3aG8pOwotICAgIHNiLmFwcGVuZCgnfCcpOwotICAgIHNiLmFwcGVuZCh3aGVuKTsKLSAgICBzYi5hcHBlbmQoJ3wnKTsKLSAgICBzYi5hcHBlbmQod2hhdCk7Ci0gICAgc2IuYXBwZW5kKCd8Jyk7Ci0gICAgc2IuYXBwZW5kKGVsYXBzZWQpOwotICAgIHNiLmFwcGVuZCgnfCcpOwotICAgIGlmIChwYXJhbXMgIT0gbnVsbCkgewotICAgICAgc2IuYXBwZW5kKCdbJyk7Ci0gICAgICBmb3IgKGludCBpID0gMDsgaSA8IHBhcmFtcy5zaXplKCk7IGkrKykgewotICAgICAgICBpZiAoaSA+IDApIHNiLmFwcGVuZCgnLCcpOwotCi0gICAgICAgIE9iamVjdCBwYXJhbSA9IHBhcmFtcy5nZXQoaSk7Ci0gICAgICAgIGlmIChwYXJhbSA9PSBudWxsKSB7Ci0gICAgICAgICAgc2IuYXBwZW5kKCJudWxsIik7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgc2IuYXBwZW5kKHBhcmFtKTsKLSAgICAgICAgfQotICAgICAgfQotICAgICAgc2IuYXBwZW5kKCddJyk7Ci0gICAgfQotICAgIHNiLmFwcGVuZCgnfCcpOwotICAgIGlmIChyZXN1bHQgIT0gbnVsbCkgewotICAgICAgc2IuYXBwZW5kKHJlc3VsdCk7Ci0gICAgfQotCi0gICAgcmV0dXJuIHNiLnRvU3RyaW5nKCk7CisgICAgcmV0dXJuIFN0cmluZy5mb3JtYXQoIkF1ZGl0RXZlbnQgVVVJRDolcywgU0lEOiVzLCBUUzolZCwgd2hvOiVzLCB3aGF0OiVzIiwKKyAgICAgICAgdXVpZC5nZXQoKSwgc2Vzc2lvbklkLCB3aGVuLCB3aG8sIHdoYXQpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYXVkaXQvSHR0cEF1ZGl0RXZlbnQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hdWRpdC9IdHRwQXVkaXRFdmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRiZjk3MjMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYXVkaXQvSHR0cEF1ZGl0RXZlbnQuamF2YQpAQCAtMCwwICsxLDQxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmF1ZGl0OworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CisKK3B1YmxpYyBjbGFzcyBIdHRwQXVkaXRFdmVudCBleHRlbmRzIEF1ZGl0RXZlbnQgeworICBwdWJsaWMgZmluYWwgU3RyaW5nIGh0dHBNZXRob2Q7CisgIHB1YmxpYyBmaW5hbCBpbnQgaHR0cFN0YXR1czsKKyAgcHVibGljIGZpbmFsIE9iamVjdCBpbnB1dDsKKworICAvKioKKyAgICogQ3JlYXRlcyBhIG5ldyBhdWRpdCBldmVudCB3aXRoIHJlc3VsdHMKKyAgICoKKyAgICogQHBhcmFtIHNlc3Npb25JZCBzZXNzaW9uIGlkIHRoZSBldmVudCBiZWxvbmdzIHRvCisgICAqIEBwYXJhbSB3aG8gcHJpbmNpcGFsIHRoYXQgaGFzIGdlbmVyYXRlZCB0aGUgZXZlbnQKKyAgICogQHBhcmFtIHdoYXQgb2JqZWN0IG9mIHRoZSBldmVudAorICAgKiBAcGFyYW0gd2hlbiB0aW1lLXN0YW1wIG9mIHdoZW4gdGhlIGV2ZW50IHN0YXJ0ZWQKKyAgICogQHBhcmFtIHBhcmFtcyBwYXJhbWV0ZXJzIG9mIHRoZSBldmVudAorICAgKiBAcGFyYW0gcmVzdWx0IHJlc3VsdCBvZiB0aGUgZXZlbnQKKyAgICovCisgIHB1YmxpYyBIdHRwQXVkaXRFdmVudChTdHJpbmcgc2Vzc2lvbklkLCBDdXJyZW50VXNlciB3aG8sIFN0cmluZyB3aGF0LCBsb25nIHdoZW4sCisgICAgICBNdWx0aW1hcDxTdHJpbmcsID8+IHBhcmFtcywgU3RyaW5nIGh0dHBNZXRob2QsIE9iamVjdCBpbnB1dCwgaW50IHN0YXR1cywgT2JqZWN0IHJlc3VsdCkgeworICAgIHN1cGVyKHNlc3Npb25JZCwgd2hvLCB3aGF0LCB3aGVuLCBwYXJhbXMsIHJlc3VsdCk7CisgICAgdGhpcy5odHRwTWV0aG9kID0gaHR0cE1ldGhvZDsKKyAgICB0aGlzLmlucHV0ID0gaW5wdXQ7CisgICAgdGhpcy5odHRwU3RhdHVzID0gc3RhdHVzOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvYXVkaXQvUnBjQXVkaXRFdmVudC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2F1ZGl0L1JwY0F1ZGl0RXZlbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jNDFhYjNhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2F1ZGl0L1JwY0F1ZGl0RXZlbnQuamF2YQpAQCAtMCwwICsxLDM2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LmF1ZGl0OworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CisKK3B1YmxpYyBjbGFzcyBScGNBdWRpdEV2ZW50IGV4dGVuZHMgSHR0cEF1ZGl0RXZlbnQgeworCisgIC8qKgorICAgKiBDcmVhdGVzIGEgbmV3IGF1ZGl0IGV2ZW50IHdpdGggcmVzdWx0cworICAgKgorICAgKiBAcGFyYW0gc2Vzc2lvbklkIHNlc3Npb24gaWQgdGhlIGV2ZW50IGJlbG9uZ3MgdG8KKyAgICogQHBhcmFtIHdobyBwcmluY2lwYWwgdGhhdCBoYXMgZ2VuZXJhdGVkIHRoZSBldmVudAorICAgKiBAcGFyYW0gd2hhdCBvYmplY3Qgb2YgdGhlIGV2ZW50CisgICAqIEBwYXJhbSB3aGVuIHRpbWUtc3RhbXAgb2Ygd2hlbiB0aGUgZXZlbnQgc3RhcnRlZAorICAgKiBAcGFyYW0gcGFyYW1zIHBhcmFtZXRlcnMgb2YgdGhlIGV2ZW50CisgICAqIEBwYXJhbSByZXN1bHQgcmVzdWx0IG9mIHRoZSBldmVudAorICAgKi8KKyAgcHVibGljIFJwY0F1ZGl0RXZlbnQoU3RyaW5nIHNlc3Npb25JZCwgQ3VycmVudFVzZXIgd2hvLCBTdHJpbmcgd2hhdCwKKyAgICAgIGxvbmcgd2hlbiwgTXVsdGltYXA8U3RyaW5nLCA/PiBwYXJhbXMsIFN0cmluZyBodHRwTWV0aG9kLCBPYmplY3QgaW5wdXQsCisgICAgICBpbnQgc3RhdHVzLCBPYmplY3QgcmVzdWx0KSB7CisgICAgc3VwZXIoc2Vzc2lvbklkLCB3aG8sIHdoYXQsIHdoZW4sIHBhcmFtcywgaHR0cE1ldGhvZCwgaW5wdXQsIHN0YXR1cywgcmVzdWx0KTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2F1ZGl0L1NzaEF1ZGl0RXZlbnQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hdWRpdC9Tc2hBdWRpdEV2ZW50LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTg4NjRjOAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9hdWRpdC9Tc2hBdWRpdEV2ZW50LmphdmEKQEAgLTAsMCArMSwyNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5hdWRpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOworCitwdWJsaWMgY2xhc3MgU3NoQXVkaXRFdmVudCBleHRlbmRzIEF1ZGl0RXZlbnQgeworCisgIHB1YmxpYyBTc2hBdWRpdEV2ZW50KFN0cmluZyBzZXNzaW9uSWQsIEN1cnJlbnRVc2VyIHdobywgU3RyaW5nIHdoYXQsCisgICAgICBsb25nIHdoZW4sIE11bHRpbWFwPFN0cmluZywgPz4gcGFyYW1zLCBPYmplY3QgcmVzdWx0KSB7CisgICAgc3VwZXIoc2Vzc2lvbklkLCB3aG8sIHdoYXQsIHdoZW4sIHBhcmFtcywgcmVzdWx0KTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9DaGFuZ2VIb29rUnVubmVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0NoYW5nZUhvb2tSdW5uZXIuamF2YQppbmRleCAzN2JlMjkzLi40MTE2NjMzIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0NoYW5nZUhvb2tSdW5uZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0NoYW5nZUhvb2tSdW5uZXIuamF2YQpAQCAtMTQsMTIgKzE0LDEzIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uOwogCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ29udHJpYnV0b3JBZ3JlZW1lbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5ldmVudHMuTGlmZWN5Y2xlTGlzdGVuZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5saWZlY3ljbGUuTGlmZWN5Y2xlTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKQEAgLTM5LDE1ICs0MCwxNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuQ29tbWVudEFkZGVkRXZlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50cy5EcmFmdFB1Ymxpc2hlZEV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuRXZlbnRGYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuTWVyZ2VGYWlsZWRFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXZlbnRzLlBhdGNoU2V0Q3JlYXRlZEV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuUmVmVXBkYXRlZEV2ZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuUmV2aWV3ZXJBZGRlZEV2ZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Xb3JrUXVldWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RTdGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkFic3RyYWN0TW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKQEAgLTYxLDI0ICs2MywzNCBAQAogaW1wb3J0IGphdmEuaW8uQnVmZmVyZWRSZWFkZXI7CiBpbXBvcnQgamF2YS5pby5GaWxlOwogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKIGltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtUmVhZGVyOworaW1wb3J0IGphdmEuaW8uU3RyaW5nUmVhZGVyOworaW1wb3J0IGphdmEuaW8uU3RyaW5nV3JpdGVyOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwLkVudHJ5OworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNhbGxhYmxlOwogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNvbmN1cnJlbnRIYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkV4ZWN1dG9yU2VydmljZTsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5FeGVjdXRvcnM7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuRnV0dXJlVGFzazsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lb3V0RXhjZXB0aW9uOwogCiAvKiogU3Bhd25zIGxvY2FsIGV4ZWN1dGFibGVzIHdoZW4gYSBob29rIGFjdGlvbiBvY2N1cnMuICovCiBAU2luZ2xldG9uCi1wdWJsaWMgY2xhc3MgQ2hhbmdlSG9va1J1bm5lciBpbXBsZW1lbnRzIENoYW5nZUhvb2tzIHsKK3B1YmxpYyBjbGFzcyBDaGFuZ2VIb29rUnVubmVyIGltcGxlbWVudHMgQ2hhbmdlSG9va3MsIExpZmVjeWNsZUxpc3RlbmVyIHsKICAgICAvKiogQSBsb2dnZXIgZm9yIHRoaXMgY2xhc3MuICovCiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKENoYW5nZUhvb2tSdW5uZXIuY2xhc3MpOwogCi0gICAgcHVibGljIHN0YXRpYyBjbGFzcyBNb2R1bGUgZXh0ZW5kcyBBYnN0cmFjdE1vZHVsZSB7CisgICAgcHVibGljIHN0YXRpYyBjbGFzcyBNb2R1bGUgZXh0ZW5kcyBMaWZlY3ljbGVNb2R1bGUgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CiAgICAgICAgIGJpbmQoQ2hhbmdlSG9va1J1bm5lci5jbGFzcyk7CiAgICAgICAgIGJpbmQoQ2hhbmdlSG9va3MuY2xhc3MpLnRvKENoYW5nZUhvb2tSdW5uZXIuY2xhc3MpOworICAgICAgICBsaXN0ZW5lcigpLnRvKENoYW5nZUhvb2tSdW5uZXIuY2xhc3MpOwogICAgICAgfQogICAgIH0KIApAQCAtOTIsMTAgKzEwNCw2MSBAQAogICAgICAgICB9CiAgICAgfQogCi0gICAgLyoqIExpc3RlbmVycyB0byByZWNlaXZlIGNoYW5nZXMgYXMgdGhleSBoYXBwZW4uICovCisgICAgLyoqIENvbnRhaW5lciBjbGFzcyB1c2VkIHRvIGhvbGQgdGhlIHJldHVybiBjb2RlIGFuZCBvdXRwdXQgb2Ygc2NyaXB0IGhvb2sgZXhlY3V0aW9uICovCisgICAgcHVibGljIHN0YXRpYyBjbGFzcyBIb29rUmVzdWx0IHsKKyAgICAgIHByaXZhdGUgaW50IGV4aXRWYWx1ZSA9IC0xOworICAgICAgcHJpdmF0ZSBTdHJpbmcgb3V0cHV0OworICAgICAgcHJpdmF0ZSBTdHJpbmcgZXhlY3V0aW9uRXJyb3I7CisKKyAgICAgIHByaXZhdGUgSG9va1Jlc3VsdChpbnQgZXhpdFZhbHVlLCBTdHJpbmcgb3V0cHV0KSB7CisgICAgICAgIHRoaXMuZXhpdFZhbHVlID0gZXhpdFZhbHVlOworICAgICAgICB0aGlzLm91dHB1dCA9IG91dHB1dDsKKyAgICAgIH0KKworICAgICAgcHJpdmF0ZSBIb29rUmVzdWx0KFN0cmluZyBvdXRwdXQsIFN0cmluZyBleGVjdXRpb25FcnJvcikgeworICAgICAgICB0aGlzLm91dHB1dCA9IG91dHB1dDsKKyAgICAgICAgdGhpcy5leGVjdXRpb25FcnJvciA9IGV4ZWN1dGlvbkVycm9yOworICAgICAgfQorCisgICAgICBwdWJsaWMgaW50IGdldEV4aXRWYWx1ZSgpIHsKKyAgICAgICAgcmV0dXJuIGV4aXRWYWx1ZTsKKyAgICAgIH0KKworICAgICAgcHVibGljIHZvaWQgc2V0RXhpdFZhbHVlKGludCBleGl0VmFsdWUpIHsKKyAgICAgICAgdGhpcy5leGl0VmFsdWUgPSBleGl0VmFsdWU7CisgICAgICB9CisKKyAgICAgIHB1YmxpYyBTdHJpbmcgZ2V0T3V0cHV0KCkgeworICAgICAgICByZXR1cm4gb3V0cHV0OworICAgICAgfQorCisgICAgICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgICAgICBTdHJpbmdCdWlsZGVyIHNiID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKKworICAgICAgICBpZiAob3V0cHV0ICE9IG51bGwgJiYgb3V0cHV0Lmxlbmd0aCgpICE9IDApIHsKKyAgICAgICAgICBzYi5hcHBlbmQob3V0cHV0KTsKKworICAgICAgICAgIGlmIChleGVjdXRpb25FcnJvciAhPSBudWxsKSB7CisgICAgICAgICAgICBzYi5hcHBlbmQoIiAtICIpOworICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmIChleGVjdXRpb25FcnJvciAhPSBudWxsICkgeworICAgICAgICAgIHNiLmFwcGVuZChleGVjdXRpb25FcnJvcik7CisgICAgICAgIH0KKworICAgICAgICByZXR1cm4gc2IudG9TdHJpbmcoKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICAvKiogTGlzdGVuZXJzIHRvIHJlY2VpdmUgY2hhbmdlcyBhcyB0aGV5IGhhcHBlbiAobGltaXRlZCBieSB2aXNpYmlsaXR5CisgICAgICogIG9mIGhvbGRlcidzIHVzZXIpLiAqLwogICAgIHByaXZhdGUgZmluYWwgTWFwPENoYW5nZUxpc3RlbmVyLCBDaGFuZ2VMaXN0ZW5lckhvbGRlcj4gbGlzdGVuZXJzID0KICAgICAgIG5ldyBDb25jdXJyZW50SGFzaE1hcDxDaGFuZ2VMaXN0ZW5lciwgQ2hhbmdlTGlzdGVuZXJIb2xkZXI+KCk7CiAKKyAgICAvKiogTGlzdGVuZXJzIHRvIHJlY2VpdmUgYWxsIGNoYW5nZXMgYXMgdGhleSBoYXBwZW4uICovCisgICAgcHJpdmF0ZSBmaW5hbCBEeW5hbWljU2V0PENoYW5nZUxpc3RlbmVyPiB1bnJlc3RyaWN0ZWRMaXN0ZW5lcnM7CisKICAgICAvKiogRmlsZW5hbWUgb2YgdGhlIG5ldyBwYXRjaHNldCBob29rLiAqLwogICAgIHByaXZhdGUgZmluYWwgRmlsZSBwYXRjaHNldENyZWF0ZWRIb29rOwogCkBAIC0xMDgsNiArMTcxLDkgQEAKICAgICAvKiogRmlsZW5hbWUgb2YgdGhlIGNoYW5nZSBtZXJnZWQgaG9vay4gKi8KICAgICBwcml2YXRlIGZpbmFsIEZpbGUgY2hhbmdlTWVyZ2VkSG9vazsKIAorICAgIC8qKiBGaWxlbmFtZSBvZiB0aGUgbWVyZ2UgZmFpbGVkIGhvb2suICovCisgICAgcHJpdmF0ZSBmaW5hbCBGaWxlIG1lcmdlRmFpbGVkSG9vazsKKwogICAgIC8qKiBGaWxlbmFtZSBvZiB0aGUgY2hhbmdlIGFiYW5kb25lZCBob29rLiAqLwogICAgIHByaXZhdGUgZmluYWwgRmlsZSBjaGFuZ2VBYmFuZG9uZWRIb29rOwogCkBAIC0xMTcsOSArMTgzLDE1IEBACiAgICAgLyoqIEZpbGVuYW1lIG9mIHRoZSByZWYgdXBkYXRlZCBob29rLiAqLwogICAgIHByaXZhdGUgZmluYWwgRmlsZSByZWZVcGRhdGVkSG9vazsKIAorICAgIC8qKiBGaWxlbmFtZSBvZiB0aGUgcmV2aWV3ZXIgYWRkZWQgaG9vay4gKi8KKyAgICBwcml2YXRlIGZpbmFsIEZpbGUgcmV2aWV3ZXJBZGRlZEhvb2s7CisKICAgICAvKiogRmlsZW5hbWUgb2YgdGhlIGNsYSBzaWduZWQgaG9vay4gKi8KICAgICBwcml2YXRlIGZpbmFsIEZpbGUgY2xhU2lnbmVkSG9vazsKIAorICAgIC8qKiBGaWxlbmFtZSBvZiB0aGUgdXBkYXRlIGhvb2suICovCisgICAgcHJpdmF0ZSBmaW5hbCBGaWxlIHJlZlVwZGF0ZUhvb2s7CisKICAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBhbm9ueW1vdXNDb3dhcmROYW1lOwogCiAgICAgLyoqIFJlcG9zaXRvcnkgTWFuYWdlci4gKi8KQEAgLTEzMiwxMiArMjA0LDE2IEBACiAKICAgICBwcml2YXRlIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGU7CiAKLSAgICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKLQogICAgIHByaXZhdGUgZmluYWwgRXZlbnRGYWN0b3J5IGV2ZW50RmFjdG9yeTsKIAogICAgIHByaXZhdGUgZmluYWwgU2l0ZVBhdGhzIHNpdGVQYXRoczsKIAorICAgIC8qKiBUaHJlYWQgcG9vbCB1c2VkIHRvIG1vbml0b3Igc3luYyBob29rcyAqLworICAgIHByaXZhdGUgZmluYWwgRXhlY3V0b3JTZXJ2aWNlIHN5bmNIb29rVGhyZWFkUG9vbCA9IEV4ZWN1dG9ycy5uZXdDYWNoZWRUaHJlYWRQb29sKCk7CisKKyAgICAvKiogVGltZW91dCB2YWx1ZSBmb3Igc3luY2hyb25vdXMgaG9va3MgKi8KKyAgICBwcml2YXRlIGZpbmFsIGludCBzeW5jSG9va1RpbWVvdXQ7CisKICAgICAvKioKICAgICAgKiBDcmVhdGUgYSBuZXcgQ2hhbmdlSG9va1J1bm5lci4KICAgICAgKgpAQCAtMTUyLDE3ICsyMjgsMjAgQEAKICAgICAgIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLAogICAgICAgZmluYWwgQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgY29uZmlnLAogICAgICAgZmluYWwgQEFub255bW91c0Nvd2FyZE5hbWUgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWUsCi0gICAgICBmaW5hbCBTaXRlUGF0aHMgc2l0ZVBhdGgsIGZpbmFsIFByb2plY3RDYWNoZSBwcm9qZWN0Q2FjaGUsCi0gICAgICBmaW5hbCBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlLCBmaW5hbCBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXMsCi0gICAgICBmaW5hbCBFdmVudEZhY3RvcnkgZXZlbnRGYWN0b3J5LCBmaW5hbCBTaXRlUGF0aHMgc2l0ZVBhdGhzKSB7CisgICAgICBmaW5hbCBTaXRlUGF0aHMgc2l0ZVBhdGgsCisgICAgICBmaW5hbCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlLAorICAgICAgZmluYWwgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZSwKKyAgICAgIGZpbmFsIEV2ZW50RmFjdG9yeSBldmVudEZhY3RvcnksCisgICAgICBmaW5hbCBTaXRlUGF0aHMgc2l0ZVBhdGhzLAorICAgICAgZmluYWwgRHluYW1pY1NldDxDaGFuZ2VMaXN0ZW5lcj4gdW5yZXN0cmljdGVkTGlzdGVuZXJzKSB7CiAgICAgICAgIHRoaXMuYW5vbnltb3VzQ293YXJkTmFtZSA9IGFub255bW91c0Nvd2FyZE5hbWU7CiAgICAgICAgIHRoaXMucmVwb01hbmFnZXIgPSByZXBvTWFuYWdlcjsKICAgICAgICAgdGhpcy5ob29rUXVldWUgPSBxdWV1ZS5jcmVhdGVRdWV1ZSgxLCAiaG9vayIpOwogICAgICAgICB0aGlzLnByb2plY3RDYWNoZSA9IHByb2plY3RDYWNoZTsKICAgICAgICAgdGhpcy5hY2NvdW50Q2FjaGUgPSBhY2NvdW50Q2FjaGU7Ci0gICAgICAgIHRoaXMuYXBwcm92YWxUeXBlcyA9IGFwcHJvdmFsVHlwZXM7CiAgICAgICAgIHRoaXMuZXZlbnRGYWN0b3J5ID0gZXZlbnRGYWN0b3J5OwogICAgICAgICB0aGlzLnNpdGVQYXRocyA9IHNpdGVQYXRoOworICAgICAgICB0aGlzLnVucmVzdHJpY3RlZExpc3RlbmVycyA9IHVucmVzdHJpY3RlZExpc3RlbmVyczsKIAogICAgICAgICBmaW5hbCBGaWxlIGhvb2tzUGF0aCA9IHNpdGVQYXRoLnJlc29sdmUoZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAicGF0aCIsIHNpdGVQYXRoLmhvb2tzX2Rpci5nZXRBYnNvbHV0ZVBhdGgoKSkpOwogCkBAIC0xNzAsMTAgKzI0OSwxNCBAQAogICAgICAgICBkcmFmdFB1Ymxpc2hlZEhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAiZHJhZnRQdWJsaXNoZWRIb29rIiwgImRyYWZ0LXB1Ymxpc2hlZCIpKS5nZXRQYXRoKCkpOwogICAgICAgICBjb21tZW50QWRkZWRIb29rID0gc2l0ZVBhdGgucmVzb2x2ZShuZXcgRmlsZShob29rc1BhdGgsIGdldFZhbHVlKGNvbmZpZywgImhvb2tzIiwgImNvbW1lbnRBZGRlZEhvb2siLCAiY29tbWVudC1hZGRlZCIpKS5nZXRQYXRoKCkpOwogICAgICAgICBjaGFuZ2VNZXJnZWRIb29rID0gc2l0ZVBhdGgucmVzb2x2ZShuZXcgRmlsZShob29rc1BhdGgsIGdldFZhbHVlKGNvbmZpZywgImhvb2tzIiwgImNoYW5nZU1lcmdlZEhvb2siLCAiY2hhbmdlLW1lcmdlZCIpKS5nZXRQYXRoKCkpOworICAgICAgICBtZXJnZUZhaWxlZEhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAibWVyZ2VGYWlsZWQiLCAibWVyZ2UtZmFpbGVkIikpLmdldFBhdGgoKSk7CiAgICAgICAgIGNoYW5nZUFiYW5kb25lZEhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAiY2hhbmdlQWJhbmRvbmVkSG9vayIsICJjaGFuZ2UtYWJhbmRvbmVkIikpLmdldFBhdGgoKSk7CiAgICAgICAgIGNoYW5nZVJlc3RvcmVkSG9vayA9IHNpdGVQYXRoLnJlc29sdmUobmV3IEZpbGUoaG9va3NQYXRoLCBnZXRWYWx1ZShjb25maWcsICJob29rcyIsICJjaGFuZ2VSZXN0b3JlZEhvb2siLCAiY2hhbmdlLXJlc3RvcmVkIikpLmdldFBhdGgoKSk7CiAgICAgICAgIHJlZlVwZGF0ZWRIb29rID0gc2l0ZVBhdGgucmVzb2x2ZShuZXcgRmlsZShob29rc1BhdGgsIGdldFZhbHVlKGNvbmZpZywgImhvb2tzIiwgInJlZlVwZGF0ZWRIb29rIiwgInJlZi11cGRhdGVkIikpLmdldFBhdGgoKSk7CisgICAgICAgIHJldmlld2VyQWRkZWRIb29rID0gc2l0ZVBhdGgucmVzb2x2ZShuZXcgRmlsZShob29rc1BhdGgsIGdldFZhbHVlKGNvbmZpZywgImhvb2tzIiwgInJldmlld2VyQWRkZWRIb29rIiwgInJldmlld2VyLWFkZGVkIikpLmdldFBhdGgoKSk7CiAgICAgICAgIGNsYVNpZ25lZEhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAiY2xhU2lnbmVkSG9vayIsICJjbGEtc2lnbmVkIikpLmdldFBhdGgoKSk7CisgICAgICAgIHJlZlVwZGF0ZUhvb2sgPSBzaXRlUGF0aC5yZXNvbHZlKG5ldyBGaWxlKGhvb2tzUGF0aCwgZ2V0VmFsdWUoY29uZmlnLCAiaG9va3MiLCAicmVmVXBkYXRlSG9vayIsICJyZWYtdXBkYXRlIikpLmdldFBhdGgoKSk7CisgICAgICAgIHN5bmNIb29rVGltZW91dCA9IGNvbmZpZy5nZXRJbnQoImhvb2tzIiwgInN5bmNIb29rVGltZW91dCIsIDMwKTsKICAgICB9CiAKICAgICBwdWJsaWMgdm9pZCBhZGRDaGFuZ2VMaXN0ZW5lcihDaGFuZ2VMaXN0ZW5lciBsaXN0ZW5lciwgSWRlbnRpZmllZFVzZXIgdXNlcikgewpAQCAtMjIwLDYgKzMwMywzOCBAQAogICAgICAgICB9CiAgICAgfQogCisgICAgLyoqCisgICAgICogRmlyZSB0aGUgdXBkYXRlIGhvb2sKKyAgICAgKgorICAgICAqLworICAgIHB1YmxpYyBIb29rUmVzdWx0IGRvUmVmVXBkYXRlSG9vayhmaW5hbCBQcm9qZWN0IHByb2plY3QsIGZpbmFsIFN0cmluZyByZWZuYW1lLAorICAgICAgICBmaW5hbCBBY2NvdW50IHVwbG9hZGVyLCBmaW5hbCBPYmplY3RJZCBvbGRJZCwgZmluYWwgT2JqZWN0SWQgbmV3SWQpIHsKKworICAgICAgZmluYWwgTGlzdDxTdHJpbmc+IGFyZ3MgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKKyAgICAgIGFkZEFyZyhhcmdzLCAiLS1wcm9qZWN0IiwgcHJvamVjdC5nZXROYW1lKCkpOworICAgICAgYWRkQXJnKGFyZ3MsICItLXJlZm5hbWUiLCByZWZuYW1lKTsKKyAgICAgIGFkZEFyZyhhcmdzLCAiLS11cGxvYWRlciIsIGdldERpc3BsYXlOYW1lKHVwbG9hZGVyKSk7CisgICAgICBhZGRBcmcoYXJncywgIi0tb2xkcmV2Iiwgb2xkSWQuZ2V0TmFtZSgpKTsKKyAgICAgIGFkZEFyZyhhcmdzLCAiLS1uZXdyZXYiLCBuZXdJZC5nZXROYW1lKCkpOworCisgICAgICBIb29rUmVzdWx0IGhvb2tSZXN1bHQ7CisKKyAgICAgIHRyeSB7CisgICAgICAgIGhvb2tSZXN1bHQgPSBydW5TeW5jSG9vayhwcm9qZWN0LmdldE5hbWVLZXkoKSwgcmVmVXBkYXRlSG9vaywgYXJncyk7CisgICAgICB9IGNhdGNoIChUaW1lb3V0RXhjZXB0aW9uIGUpIHsKKyAgICAgICAgaG9va1Jlc3VsdCA9IG5ldyBIb29rUmVzdWx0KC0xLCAiU3luY2hyb25vdXMgaG9vayB0aW1lZCBvdXQiKTsKKyAgICAgIH0KKworICAgICAgcmV0dXJuIGhvb2tSZXN1bHQ7CisgICAgfQorCisgICAgLyoqCisgICAgICogRmlyZSB0aGUgUGF0Y2hzZXQgQ3JlYXRlZCBIb29rLgorICAgICAqCisgICAgICogQHBhcmFtIGNoYW5nZSBUaGUgY2hhbmdlIGl0c2VsZi4KKyAgICAgKiBAcGFyYW0gcGF0Y2hTZXQgVGhlIFBhdGNoc2V0IHRoYXQgd2FzIGNyZWF0ZWQuCisgICAgICogQHRocm93cyBPcm1FeGNlcHRpb24KKyAgICAgKi8KICAgICBwdWJsaWMgdm9pZCBkb1BhdGNoc2V0Q3JlYXRlZEhvb2soZmluYWwgQ2hhbmdlIGNoYW5nZSwgZmluYWwgUGF0Y2hTZXQgcGF0Y2hTZXQsCiAgICAgICAgICAgZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgICAgICBmaW5hbCBQYXRjaFNldENyZWF0ZWRFdmVudCBldmVudCA9IG5ldyBQYXRjaFNldENyZWF0ZWRFdmVudCgpOwpAQCAtMjY4LDggKzM4Myw4IEBACiAgICAgfQogCiAgICAgcHVibGljIHZvaWQgZG9Db21tZW50QWRkZWRIb29rKGZpbmFsIENoYW5nZSBjaGFuZ2UsIGZpbmFsIEFjY291bnQgYWNjb3VudCwKLSAgICAgICAgICBmaW5hbCBQYXRjaFNldCBwYXRjaFNldCwgZmluYWwgU3RyaW5nIGNvbW1lbnQsIGZpbmFsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLAotICAgICAgICAgIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZD4gYXBwcm92YWxzLCBmaW5hbCBSZXZpZXdEYiBkYikgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgICAgICAgZmluYWwgUGF0Y2hTZXQgcGF0Y2hTZXQsIGZpbmFsIFN0cmluZyBjb21tZW50LCBmaW5hbCBNYXA8U3RyaW5nLCBTaG9ydD4gYXBwcm92YWxzLAorICAgICAgICAgIGZpbmFsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKICAgICAgICAgZmluYWwgQ29tbWVudEFkZGVkRXZlbnQgZXZlbnQgPSBuZXcgQ29tbWVudEFkZGVkRXZlbnQoKTsKIAogICAgICAgICBldmVudC5jaGFuZ2UgPSBldmVudEZhY3RvcnkuYXNDaGFuZ2VBdHRyaWJ1dGUoY2hhbmdlKTsKQEAgLTI3NywxMSArMzkyLDEyIEBACiAgICAgICAgIGV2ZW50LnBhdGNoU2V0ID0gZXZlbnRGYWN0b3J5LmFzUGF0Y2hTZXRBdHRyaWJ1dGUocGF0Y2hTZXQpOwogICAgICAgICBldmVudC5jb21tZW50ID0gY29tbWVudDsKIAorICAgICAgICBMYWJlbFR5cGVzIGxhYmVsVHlwZXMgPSBwcm9qZWN0Q2FjaGUuZ2V0KGNoYW5nZS5nZXRQcm9qZWN0KCkpLmdldExhYmVsVHlwZXMoKTsKICAgICAgICAgaWYgKGFwcHJvdmFscy5zaXplKCkgPiAwKSB7CiAgICAgICAgICAgICBldmVudC5hcHByb3ZhbHMgPSBuZXcgQXBwcm92YWxBdHRyaWJ1dGVbYXBwcm92YWxzLnNpemUoKV07CiAgICAgICAgICAgICBpbnQgaSA9IDA7Ci0gICAgICAgICAgICBmb3IgKE1hcC5FbnRyeTxBcHByb3ZhbENhdGVnb3J5LklkLCBBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQ+IGFwcHJvdmFsIDogYXBwcm92YWxzLmVudHJ5U2V0KCkpIHsKLSAgICAgICAgICAgICAgICBldmVudC5hcHByb3ZhbHNbaSsrXSA9IGdldEFwcHJvdmFsQXR0cmlidXRlKGFwcHJvdmFsKTsKKyAgICAgICAgICAgIGZvciAoTWFwLkVudHJ5PFN0cmluZywgU2hvcnQ+IGFwcHJvdmFsIDogYXBwcm92YWxzLmVudHJ5U2V0KCkpIHsKKyAgICAgICAgICAgICAgICBldmVudC5hcHByb3ZhbHNbaSsrXSA9IGdldEFwcHJvdmFsQXR0cmlidXRlKGxhYmVsVHlwZXMsIGFwcHJvdmFsKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCkBAIC0yODksNiArNDA1LDcgQEAKIAogICAgICAgICBmaW5hbCBMaXN0PFN0cmluZz4gYXJncyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOwogICAgICAgICBhZGRBcmcoYXJncywgIi0tY2hhbmdlIiwgZXZlbnQuY2hhbmdlLmlkKTsKKyAgICAgICAgYWRkQXJnKGFyZ3MsICItLWlzLWRyYWZ0IiwgcGF0Y2hTZXQuaXNEcmFmdCgpID8gInRydWUiIDogImZhbHNlIik7CiAgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1jaGFuZ2UtdXJsIiwgZXZlbnQuY2hhbmdlLnVybCk7CiAgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1wcm9qZWN0IiwgZXZlbnQuY2hhbmdlLnByb2plY3QpOwogICAgICAgICBhZGRBcmcoYXJncywgIi0tYnJhbmNoIiwgZXZlbnQuY2hhbmdlLmJyYW5jaCk7CkBAIC0yOTYsOCArNDEzLDExIEBACiAgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1hdXRob3IiLCBnZXREaXNwbGF5TmFtZShhY2NvdW50KSk7CiAgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1jb21taXQiLCBldmVudC5wYXRjaFNldC5yZXZpc2lvbik7CiAgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1jb21tZW50IiwgY29tbWVudCA9PSBudWxsID8gIiIgOiBjb21tZW50KTsKLSAgICAgICAgZm9yIChNYXAuRW50cnk8QXBwcm92YWxDYXRlZ29yeS5JZCwgQXBwcm92YWxDYXRlZ29yeVZhbHVlLklkPiBhcHByb3ZhbCA6IGFwcHJvdmFscy5lbnRyeVNldCgpKSB7Ci0gICAgICAgICAgICBhZGRBcmcoYXJncywgIi0tIiArIGFwcHJvdmFsLmdldEtleSgpLmdldCgpLCBTaG9ydC50b1N0cmluZyhhcHByb3ZhbC5nZXRWYWx1ZSgpLmdldCgpKSk7CisgICAgICAgIGZvciAoTWFwLkVudHJ5PFN0cmluZywgU2hvcnQ+IGFwcHJvdmFsIDogYXBwcm92YWxzLmVudHJ5U2V0KCkpIHsKKyAgICAgICAgICBMYWJlbFR5cGUgbHQgPSBsYWJlbFR5cGVzLmJ5TGFiZWwoYXBwcm92YWwuZ2V0S2V5KCkpOworICAgICAgICAgIGlmIChsdCAhPSBudWxsKSB7CisgICAgICAgICAgICBhZGRBcmcoYXJncywgIi0tIiArIGx0LmdldE5hbWUoKSwgU2hvcnQudG9TdHJpbmcoYXBwcm92YWwuZ2V0VmFsdWUoKSkpOworICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIHJ1bkhvb2soY2hhbmdlLmdldFByb2plY3QoKSwgY29tbWVudEFkZGVkSG9vaywgYXJncyk7CkBAIC0zMjQsNiArNDQ0LDMwIEBACiAgICAgICAgIHJ1bkhvb2soY2hhbmdlLmdldFByb2plY3QoKSwgY2hhbmdlTWVyZ2VkSG9vaywgYXJncyk7CiAgICAgfQogCisgICAgcHVibGljIHZvaWQgZG9NZXJnZUZhaWxlZEhvb2soZmluYWwgQ2hhbmdlIGNoYW5nZSwgZmluYWwgQWNjb3VudCBhY2NvdW50LAorICAgICAgICAgIGZpbmFsIFBhdGNoU2V0IHBhdGNoU2V0LCBmaW5hbCBTdHJpbmcgcmVhc29uLAorICAgICAgICAgIGZpbmFsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAgICAgZmluYWwgTWVyZ2VGYWlsZWRFdmVudCBldmVudCA9IG5ldyBNZXJnZUZhaWxlZEV2ZW50KCk7CisKKyAgICAgICAgZXZlbnQuY2hhbmdlID0gZXZlbnRGYWN0b3J5LmFzQ2hhbmdlQXR0cmlidXRlKGNoYW5nZSk7CisgICAgICAgIGV2ZW50LnN1Ym1pdHRlciA9IGV2ZW50RmFjdG9yeS5hc0FjY291bnRBdHRyaWJ1dGUoYWNjb3VudCk7CisgICAgICAgIGV2ZW50LnBhdGNoU2V0ID0gZXZlbnRGYWN0b3J5LmFzUGF0Y2hTZXRBdHRyaWJ1dGUocGF0Y2hTZXQpOworICAgICAgICBldmVudC5yZWFzb24gPSByZWFzb247CisgICAgICAgIGZpcmVFdmVudChjaGFuZ2UsIGV2ZW50LCBkYik7CisKKyAgICAgICAgZmluYWwgTGlzdDxTdHJpbmc+IGFyZ3MgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKKyAgICAgICAgYWRkQXJnKGFyZ3MsICItLWNoYW5nZSIsIGV2ZW50LmNoYW5nZS5pZCk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1jaGFuZ2UtdXJsIiwgZXZlbnQuY2hhbmdlLnVybCk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1wcm9qZWN0IiwgZXZlbnQuY2hhbmdlLnByb2plY3QpOworICAgICAgICBhZGRBcmcoYXJncywgIi0tYnJhbmNoIiwgZXZlbnQuY2hhbmdlLmJyYW5jaCk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS10b3BpYyIsIGV2ZW50LmNoYW5nZS50b3BpYyk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1zdWJtaXR0ZXIiLCBnZXREaXNwbGF5TmFtZShhY2NvdW50KSk7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1jb21taXQiLCBldmVudC5wYXRjaFNldC5yZXZpc2lvbik7CisgICAgICAgIGFkZEFyZyhhcmdzLCAiLS1yZWFzb24iLCAgcmVhc29uID09IG51bGwgPyAiIiA6IHJlYXNvbik7CisKKyAgICAgICAgcnVuSG9vayhjaGFuZ2UuZ2V0UHJvamVjdCgpLCBtZXJnZUZhaWxlZEhvb2ssIGFyZ3MpOworICAgIH0KKwogICAgIHB1YmxpYyB2b2lkIGRvQ2hhbmdlQWJhbmRvbmVkSG9vayhmaW5hbCBDaGFuZ2UgY2hhbmdlLCBmaW5hbCBBY2NvdW50IGFjY291bnQsCiAgICAgICAgICAgZmluYWwgU3RyaW5nIHJlYXNvbiwgZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgICAgICBmaW5hbCBDaGFuZ2VBYmFuZG9uZWRFdmVudCBldmVudCA9IG5ldyBDaGFuZ2VBYmFuZG9uZWRFdmVudCgpOwpAQCAtMzkxLDYgKzUzNSwyNSBAQAogICAgICAgcnVuSG9vayhyZWZOYW1lLmdldFBhcmVudEtleSgpLCByZWZVcGRhdGVkSG9vaywgYXJncyk7CiAgICAgfQogCisgICAgcHVibGljIHZvaWQgZG9SZXZpZXdlckFkZGVkSG9vayhmaW5hbCBDaGFuZ2UgY2hhbmdlLCBmaW5hbCBBY2NvdW50IGFjY291bnQsCisgICAgICAgIGZpbmFsIFBhdGNoU2V0IHBhdGNoU2V0LCBmaW5hbCBSZXZpZXdEYiBkYikgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgICBmaW5hbCBSZXZpZXdlckFkZGVkRXZlbnQgZXZlbnQgPSBuZXcgUmV2aWV3ZXJBZGRlZEV2ZW50KCk7CisKKyAgICAgIGV2ZW50LmNoYW5nZSA9IGV2ZW50RmFjdG9yeS5hc0NoYW5nZUF0dHJpYnV0ZShjaGFuZ2UpOworICAgICAgZXZlbnQucGF0Y2hTZXQgPSBldmVudEZhY3RvcnkuYXNQYXRjaFNldEF0dHJpYnV0ZShwYXRjaFNldCk7CisgICAgICBldmVudC5yZXZpZXdlciA9IGV2ZW50RmFjdG9yeS5hc0FjY291bnRBdHRyaWJ1dGUoYWNjb3VudCk7CisgICAgICBmaXJlRXZlbnQoY2hhbmdlLCBldmVudCwgZGIpOworCisgICAgICBmaW5hbCBMaXN0PFN0cmluZz4gYXJncyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOworICAgICAgYWRkQXJnKGFyZ3MsICItLWNoYW5nZSIsIGV2ZW50LmNoYW5nZS5pZCk7CisgICAgICBhZGRBcmcoYXJncywgIi0tY2hhbmdlLXVybCIsIGV2ZW50LmNoYW5nZS51cmwpOworICAgICAgYWRkQXJnKGFyZ3MsICItLXByb2plY3QiLCBldmVudC5jaGFuZ2UucHJvamVjdCk7CisgICAgICBhZGRBcmcoYXJncywgIi0tYnJhbmNoIiwgZXZlbnQuY2hhbmdlLmJyYW5jaCk7CisgICAgICBhZGRBcmcoYXJncywgIi0tcmV2aWV3ZXIiLCBnZXREaXNwbGF5TmFtZShhY2NvdW50KSk7CisKKyAgICAgIHJ1bkhvb2soY2hhbmdlLmdldFByb2plY3QoKSwgcmV2aWV3ZXJBZGRlZEhvb2ssIGFyZ3MpOworICAgIH0KKwogICAgIHB1YmxpYyB2b2lkIGRvQ2xhU2lnbnVwSG9vayhBY2NvdW50IGFjY291bnQsIENvbnRyaWJ1dG9yQWdyZWVtZW50IGNsYSkgewogICAgICAgaWYgKGFjY291bnQgIT0gbnVsbCkgewogICAgICAgICBmaW5hbCBMaXN0PFN0cmluZz4gYXJncyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOwpAQCAtNDAyLDEyICs1NjUsMjAgQEAKICAgICAgIH0KICAgICB9CiAKKyAgICBwcml2YXRlIHZvaWQgZmlyZUV2ZW50Rm9yVW5yZXN0cmljdGVkTGlzdGVuZXJzKGZpbmFsIENoYW5nZUV2ZW50IGV2ZW50KSB7CisgICAgICBmb3IgKENoYW5nZUxpc3RlbmVyIGxpc3RlbmVyIDogdW5yZXN0cmljdGVkTGlzdGVuZXJzKSB7CisgICAgICAgICAgbGlzdGVuZXIub25DaGFuZ2VFdmVudChldmVudCk7CisgICAgICB9CisgICAgfQorCiAgICAgcHJpdmF0ZSB2b2lkIGZpcmVFdmVudChmaW5hbCBDaGFuZ2UgY2hhbmdlLCBmaW5hbCBDaGFuZ2VFdmVudCBldmVudCwgZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgICAgZm9yIChDaGFuZ2VMaXN0ZW5lckhvbGRlciBob2xkZXIgOiBsaXN0ZW5lcnMudmFsdWVzKCkpIHsKICAgICAgICAgICBpZiAoaXNWaXNpYmxlVG8oY2hhbmdlLCBob2xkZXIudXNlciwgZGIpKSB7CiAgICAgICAgICAgICAgIGhvbGRlci5saXN0ZW5lci5vbkNoYW5nZUV2ZW50KGV2ZW50KTsKICAgICAgICAgICB9CiAgICAgICB9CisKKyAgICAgIGZpcmVFdmVudEZvclVucmVzdHJpY3RlZExpc3RlbmVycyggZXZlbnQgKTsKICAgICB9CiAKICAgICBwcml2YXRlIHZvaWQgZmlyZUV2ZW50KEJyYW5jaC5OYW1lS2V5IGJyYW5jaE5hbWUsIGZpbmFsIENoYW5nZUV2ZW50IGV2ZW50KSB7CkBAIC00MTYsNiArNTg3LDggQEAKICAgICAgICAgICAgICAgaG9sZGVyLmxpc3RlbmVyLm9uQ2hhbmdlRXZlbnQoZXZlbnQpOwogICAgICAgICAgIH0KICAgICAgIH0KKworICAgICAgZmlyZUV2ZW50Rm9yVW5yZXN0cmljdGVkTGlzdGVuZXJzKCBldmVudCApOwogICAgIH0KIAogICAgIHByaXZhdGUgYm9vbGVhbiBpc1Zpc2libGVUbyhDaGFuZ2UgY2hhbmdlLCBJZGVudGlmaWVkVXNlciB1c2VyLCBSZXZpZXdEYiBkYikgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CkBAIC00NDEsMTUgKzYxNCwxNSBAQAogICAgICAqIEBwYXJhbSBhcHByb3ZhbAogICAgICAqIEByZXR1cm4gb2JqZWN0IHN1aXRhYmxlIGZvciBzZXJpYWxpemF0aW9uIHRvIEpTT04KICAgICAgKi8KLSAgICBwcml2YXRlIEFwcHJvdmFsQXR0cmlidXRlIGdldEFwcHJvdmFsQXR0cmlidXRlKAotICAgICAgICAgICAgRW50cnk8QXBwcm92YWxDYXRlZ29yeS5JZCwgQXBwcm92YWxDYXRlZ29yeVZhbHVlLklkPiBhcHByb3ZhbCkgeworICAgIHByaXZhdGUgQXBwcm92YWxBdHRyaWJ1dGUgZ2V0QXBwcm92YWxBdHRyaWJ1dGUoTGFiZWxUeXBlcyBsYWJlbFR5cGVzLAorICAgICAgICAgICAgRW50cnk8U3RyaW5nLCBTaG9ydD4gYXBwcm92YWwpIHsKICAgICAgICAgQXBwcm92YWxBdHRyaWJ1dGUgYSA9IG5ldyBBcHByb3ZhbEF0dHJpYnV0ZSgpOwotICAgICAgICBhLnR5cGUgPSBhcHByb3ZhbC5nZXRLZXkoKS5nZXQoKTsKLSAgICAgICAgQXBwcm92YWxUeXBlIGF0ID0gYXBwcm92YWxUeXBlcy5ieUlkKGFwcHJvdmFsLmdldEtleSgpKTsKLSAgICAgICAgaWYgKGF0ICE9IG51bGwpIHsKLSAgICAgICAgICBhLmRlc2NyaXB0aW9uID0gYXQuZ2V0Q2F0ZWdvcnkoKS5nZXROYW1lKCk7CisgICAgICAgIGEudHlwZSA9IGFwcHJvdmFsLmdldEtleSgpOworICAgICAgICBMYWJlbFR5cGUgbHQgPSBsYWJlbFR5cGVzLmJ5TGFiZWwoYXBwcm92YWwuZ2V0S2V5KCkpOworICAgICAgICBpZiAobHQgIT0gbnVsbCkgeworICAgICAgICAgIGEuZGVzY3JpcHRpb24gPSBsdC5nZXROYW1lKCk7CiAgICAgICAgIH0KLSAgICAgICAgYS52YWx1ZSA9IFNob3J0LnRvU3RyaW5nKGFwcHJvdmFsLmdldFZhbHVlKCkuZ2V0KCkpOworICAgICAgICBhLnZhbHVlID0gU2hvcnQudG9TdHJpbmcoYXBwcm92YWwuZ2V0VmFsdWUoKSk7CiAgICAgICAgIHJldHVybiBhOwogICAgIH0KIApAQCAtNDgxLDMxICs2NTQsODQgQEAKICAgcHJpdmF0ZSBzeW5jaHJvbml6ZWQgdm9pZCBydW5Ib29rKFByb2plY3QuTmFtZUtleSBwcm9qZWN0LCBGaWxlIGhvb2ssCiAgICAgICBMaXN0PFN0cmluZz4gYXJncykgewogICAgIGlmIChwcm9qZWN0ICE9IG51bGwgJiYgaG9vay5leGlzdHMoKSkgewotICAgICAgaG9va1F1ZXVlLmV4ZWN1dGUobmV3IEhvb2tUYXNrKHByb2plY3QsIGhvb2ssIGFyZ3MpKTsKKyAgICAgIGhvb2tRdWV1ZS5leGVjdXRlKG5ldyBBc3luY0hvb2tUYXNrKHByb2plY3QsIGhvb2ssIGFyZ3MpKTsKICAgICB9CiAgIH0KIAogICBwcml2YXRlIHN5bmNocm9uaXplZCB2b2lkIHJ1bkhvb2soRmlsZSBob29rLCBMaXN0PFN0cmluZz4gYXJncykgewogICAgIGlmIChob29rLmV4aXN0cygpKSB7Ci0gICAgICBob29rUXVldWUuZXhlY3V0ZShuZXcgSG9va1Rhc2sobnVsbCwgaG9vaywgYXJncykpOworICAgICAgaG9va1F1ZXVlLmV4ZWN1dGUobmV3IEFzeW5jSG9va1Rhc2sobnVsbCwgaG9vaywgYXJncykpOwogICAgIH0KICAgfQogCi0gIHByaXZhdGUgZmluYWwgY2xhc3MgSG9va1Rhc2sgaW1wbGVtZW50cyBSdW5uYWJsZSB7CisgIHByaXZhdGUgSG9va1Jlc3VsdCBydW5TeW5jSG9vayhQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwKKyAgICAgIEZpbGUgaG9vaywgTGlzdDxTdHJpbmc+IGFyZ3MpIHRocm93cyBUaW1lb3V0RXhjZXB0aW9uIHsKKworICAgIGlmICghaG9vay5leGlzdHMoKSkgeworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorCisgICAgU3luY0hvb2tUYXNrIHN5bmNIb29rID0gbmV3IFN5bmNIb29rVGFzayhwcm9qZWN0LCBob29rLCBhcmdzKTsKKyAgICBGdXR1cmVUYXNrPEhvb2tSZXN1bHQ+IHRhc2sgPSBuZXcgRnV0dXJlVGFzazxIb29rUmVzdWx0PihzeW5jSG9vayk7CisKKyAgICBzeW5jSG9va1RocmVhZFBvb2wuZXhlY3V0ZSh0YXNrKTsKKworICAgIFN0cmluZyBtZXNzYWdlOworCisgICAgdHJ5IHsKKyAgICAgIHJldHVybiB0YXNrLmdldChzeW5jSG9va1RpbWVvdXQsIFRpbWVVbml0LlNFQ09ORFMpOworICAgIH0gY2F0Y2ggKFRpbWVvdXRFeGNlcHRpb24gZSkgeworICAgICAgbWVzc2FnZSA9ICJTeW5jaHJvbm91cyBob29rIHRpbWVkIG91dCAiICArIGhvb2suZ2V0QWJzb2x1dGVQYXRoKCk7CisgICAgICBsb2cuZXJyb3IobWVzc2FnZSk7CisgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKyAgICAgIG1lc3NhZ2UgPSAiRXJyb3IgcnVubmluZyBob29rICIgKyBob29rLmdldEFic29sdXRlUGF0aCgpOworICAgICAgbG9nLmVycm9yKG1lc3NhZ2UsIGUpOworICAgIH0KKworICAgIHRhc2suY2FuY2VsKHRydWUpOworICAgIHN5bmNIb29rLmNhbmNlbCgpOworICAgIHJldHVybiAgbmV3IEhvb2tSZXN1bHQoc3luY0hvb2suZ2V0T3V0cHV0KCksIG1lc3NhZ2UpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIHN0YXJ0KCkgeworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIHN0b3AoKSB7CisgICAgc3luY0hvb2tUaHJlYWRQb29sLnNodXRkb3duKCk7CisgICAgYm9vbGVhbiBpc1Rlcm1pbmF0ZWQ7CisgICAgZG8geworICAgICAgdHJ5IHsKKyAgICAgICAgaXNUZXJtaW5hdGVkID0gc3luY0hvb2tUaHJlYWRQb29sLmF3YWl0VGVybWluYXRpb24oMTAsIFRpbWVVbml0LlNFQ09ORFMpOworICAgICAgfSBjYXRjaCAoSW50ZXJydXB0ZWRFeGNlcHRpb24gaWUpIHsKKyAgICAgICAgaXNUZXJtaW5hdGVkID0gZmFsc2U7CisgICAgICB9CisgICAgfSB3aGlsZSAoIWlzVGVybWluYXRlZCk7CisgIH0KKworICBwcml2YXRlIGNsYXNzIEhvb2tUYXNrIHsKICAgICBwcml2YXRlIGZpbmFsIFByb2plY3QuTmFtZUtleSBwcm9qZWN0OwogICAgIHByaXZhdGUgZmluYWwgRmlsZSBob29rOwogICAgIHByaXZhdGUgZmluYWwgTGlzdDxTdHJpbmc+IGFyZ3M7CisgICAgcHJpdmF0ZSBTdHJpbmdXcml0ZXIgb3V0cHV0OworICAgIHByaXZhdGUgUHJvY2VzcyBwczsKIAotICAgIHByaXZhdGUgSG9va1Rhc2soUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIEZpbGUgaG9vaywgTGlzdDxTdHJpbmc+IGFyZ3MpIHsKKyAgICBwcm90ZWN0ZWQgSG9va1Rhc2soUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIEZpbGUgaG9vaywgTGlzdDxTdHJpbmc+IGFyZ3MpIHsKICAgICAgIHRoaXMucHJvamVjdCA9IHByb2plY3Q7CiAgICAgICB0aGlzLmhvb2sgPSBob29rOwogICAgICAgdGhpcy5hcmdzID0gYXJnczsKICAgICB9CiAKLSAgICBAT3ZlcnJpZGUKLSAgICBwdWJsaWMgdm9pZCBydW4oKSB7CisgICAgcHVibGljIFN0cmluZyBnZXRPdXRwdXQoKSB7CisgICAgICByZXR1cm4gb3V0cHV0ICE9IG51bGwgPyBvdXRwdXQudG9TdHJpbmcoKSA6IG51bGw7CisgICAgfQorCisgICAgcHJvdGVjdGVkIEhvb2tSZXN1bHQgcnVuSG9vaygpIHsKICAgICAgIFJlcG9zaXRvcnkgcmVwbyA9IG51bGw7CisgICAgICBIb29rUmVzdWx0IHJlc3VsdCA9IG51bGw7CiAgICAgICB0cnkgeworCiAgICAgICAgIGZpbmFsIExpc3Q8U3RyaW5nPiBhcmd2ID0gbmV3IEFycmF5TGlzdDxTdHJpbmc+KDEgKyBhcmdzLnNpemUoKSk7CiAgICAgICAgIGFyZ3YuYWRkKGhvb2suZ2V0QWJzb2x1dGVQYXRoKCkpOwogICAgICAgICBhcmd2LmFkZEFsbChhcmdzKTsKQEAgLTUyNiwyMyArNzUyLDIyIEBACiAgICAgICAgICAgZW52LnB1dCgiR0lUX0RJUiIsIHJlcG8uZ2V0RGlyZWN0b3J5KCkuZ2V0QWJzb2x1dGVQYXRoKCkpOwogICAgICAgICB9CiAKLSAgICAgICAgUHJvY2VzcyBwcyA9IHBiLnN0YXJ0KCk7CisgICAgICAgIHBzID0gcGIuc3RhcnQoKTsKICAgICAgICAgcHMuZ2V0T3V0cHV0U3RyZWFtKCkuY2xvc2UoKTsKLQotICAgICAgICBCdWZmZXJlZFJlYWRlciBiciA9Ci0gICAgICAgICAgICBuZXcgQnVmZmVyZWRSZWFkZXIobmV3IElucHV0U3RyZWFtUmVhZGVyKHBzLmdldElucHV0U3RyZWFtKCkpKTsKKyAgICAgICAgSW5wdXRTdHJlYW0gaXMgPSBwcy5nZXRJbnB1dFN0cmVhbSgpOworICAgICAgICBTdHJpbmcgb3V0cHV0ID0gbnVsbDsKICAgICAgICAgdHJ5IHsKLSAgICAgICAgICBTdHJpbmcgbGluZTsKLSAgICAgICAgICB3aGlsZSAoKGxpbmUgPSBici5yZWFkTGluZSgpKSAhPSBudWxsKSB7Ci0gICAgICAgICAgICBsb2cuaW5mbygiaG9va1siICsgaG9vay5nZXROYW1lKCkgKyAiXSBvdXRwdXQ6ICIgKyBsaW5lKTsKLSAgICAgICAgICB9CisgICAgICAgICAgb3V0cHV0ID0gcmVhZE91dHB1dChpcyk7CiAgICAgICAgIH0gZmluYWxseSB7CiAgICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgIGJyLmNsb3NlKCk7CisgICAgICAgICAgICBpcy5jbG9zZSgpOwogICAgICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGNsb3NlRXJyKSB7CiAgICAgICAgICAgfQogICAgICAgICAgIHBzLndhaXRGb3IoKTsKKyAgICAgICAgICByZXN1bHQgPSBuZXcgSG9va1Jlc3VsdChwcy5leGl0VmFsdWUoKSwgb3V0cHV0KTsKICAgICAgICAgfQorICAgICAgfSBjYXRjaCAoSW50ZXJydXB0ZWRFeGNlcHRpb24gaWV4KSB7CisgICAgICAgIC8vIEludGVycnVwdGVkRXhlY2VwdGlvbiAtIHRpbWVvdXQgb3IgY2FuY2VsCiAgICAgICB9IGNhdGNoIChUaHJvd2FibGUgZXJyKSB7CiAgICAgICAgIGxvZy5lcnJvcigiRXJyb3IgcnVubmluZyBob29rICIgKyBob29rLmdldEFic29sdXRlUGF0aCgpLCBlcnIpOwogICAgICAgfSBmaW5hbGx5IHsKQEAgLTU1MCwxMSArNzc1LDc5IEBACiAgICAgICAgICAgcmVwby5jbG9zZSgpOwogICAgICAgICB9CiAgICAgICB9CisKKyAgICAgIGZpbmFsIGludCBleGl0VmFsdWUgPSByZXN1bHQuZ2V0RXhpdFZhbHVlKCk7CisgICAgICBpZiAoZXhpdFZhbHVlID09IDApIHsKKyAgICAgICAgbG9nLmRlYnVnKCJob29rWyIgKyBnZXROYW1lKCkgKyAiXSBleGl0VmFsdWU6IiArIGV4aXRWYWx1ZSk7CisgICAgICB9IGVsc2UgeworICAgICAgICBsb2cuaW5mbygiaG9va1siICsgZ2V0TmFtZSgpICsgIl0gZXhpdFZhbHVlOiIgKyBleGl0VmFsdWUpOworICAgICAgfQorCisgICAgICBCdWZmZXJlZFJlYWRlciBiciA9CisgICAgICAgICAgbmV3IEJ1ZmZlcmVkUmVhZGVyKG5ldyBTdHJpbmdSZWFkZXIocmVzdWx0LmdldE91dHB1dCgpKSk7CisgICAgICB0cnkgeworICAgICAgICBTdHJpbmcgbGluZTsKKyAgICAgICAgd2hpbGUgKChsaW5lID0gYnIucmVhZExpbmUoKSkgIT0gbnVsbCkgeworICAgICAgICAgIGxvZy5pbmZvKCJob29rWyIgKyBnZXROYW1lKCkgKyAiXSBvdXRwdXQ6ICIgKyBsaW5lKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgY2F0Y2goSU9FeGNlcHRpb24gIGlveCkgeworICAgICAgICBsb2cuZXJyb3IoIkVycm9yIHdyaXRpbmcgaG9vayBvdXRwdXQiLCBpb3gpOworICAgICAgfQorCisgICAgICByZXR1cm4gcmVzdWx0OworICAgIH0KKworICAgIHByaXZhdGUgU3RyaW5nIHJlYWRPdXRwdXQoSW5wdXRTdHJlYW0gaXMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgICBvdXRwdXQgPSBuZXcgU3RyaW5nV3JpdGVyKCk7CisgICAgICBJbnB1dFN0cmVhbVJlYWRlciBpbnB1dCA9IG5ldyBJbnB1dFN0cmVhbVJlYWRlcihpcyk7CisgICAgICBjaGFyW10gYnVmZmVyID0gbmV3IGNoYXJbNDA5Nl07CisgICAgICBpbnQgbiA9IDA7CisgICAgICB3aGlsZSAoKG4gPSBpbnB1dC5yZWFkKGJ1ZmZlcikpICE9IC0xKSB7CisgICAgICAgIG91dHB1dC53cml0ZShidWZmZXIsIDAsIG4pOworICAgICAgfQorCisgICAgICByZXR1cm4gb3V0cHV0LnRvU3RyaW5nKCk7CisgICAgfQorCisgICAgcHJvdGVjdGVkIFN0cmluZyBnZXROYW1lKCkgeworICAgICAgcmV0dXJuIGhvb2suZ2V0TmFtZSgpOwogICAgIH0KIAogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyBTdHJpbmcgdG9TdHJpbmcoKSB7CiAgICAgICByZXR1cm4gImhvb2sgIiArIGhvb2suZ2V0TmFtZSgpOwogICAgIH0KKworICAgIHB1YmxpYyB2b2lkIGNhbmNlbCgpIHsKKyAgICAgIHBzLmRlc3Ryb3koKTsKKyAgICB9CisgIH0KKworICAvKiogQ2FsbGFibGUgdHlwZSB1c2VkIHRvIHJ1biBzeW5jaHJvbm91cyBob29rcyAqLworICBwcml2YXRlIGZpbmFsIGNsYXNzIFN5bmNIb29rVGFzayBleHRlbmRzIEhvb2tUYXNrCisgICAgICBpbXBsZW1lbnRzIENhbGxhYmxlPEhvb2tSZXN1bHQ+IHsKKworICAgIHByaXZhdGUgU3luY0hvb2tUYXNrKFByb2plY3QuTmFtZUtleSBwcm9qZWN0LCBGaWxlIGhvb2ssIExpc3Q8U3RyaW5nPiBhcmdzKSB7CisgICAgICBzdXBlcihwcm9qZWN0LCBob29rLCBhcmdzKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgSG9va1Jlc3VsdCBjYWxsKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICByZXR1cm4gc3VwZXIucnVuSG9vaygpOworICAgIH0KKyAgfQorCisgIC8qKiBSdW5hYmxlIHR5cGUgdXNlZCB0byBydW4gYXN5bmMgaG9va3MgKi8KKyAgcHJpdmF0ZSBmaW5hbCBjbGFzcyBBc3luY0hvb2tUYXNrIGV4dGVuZHMgSG9va1Rhc2sgaW1wbGVtZW50cyBSdW5uYWJsZSB7CisKKyAgICBwcml2YXRlIEFzeW5jSG9va1Rhc2soUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIEZpbGUgaG9vaywgTGlzdDxTdHJpbmc+IGFyZ3MpIHsKKyAgICAgIHN1cGVyKHByb2plY3QsIGhvb2ssIGFyZ3MpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKKyAgICAgIHN1cGVyLnJ1bkhvb2soKTsKKyAgICB9CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vQ2hhbmdlSG9va3MuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9jb21tb24vQ2hhbmdlSG9va3MuamF2YQppbmRleCAxMzQwNTdkLi40OGE1MmEwIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0NoYW5nZUhvb2tzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9DaGFuZ2VIb29rcy5qYXZhCkBAIC0xNCwxMyArMTQsMTMgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb247CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va1J1bm5lci5Ib29rUmVzdWx0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNvbnRyaWJ1dG9yQWdyZWVtZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CkBAIC01MCw3ICs1MCw3IEBACiAgICAqIEZpcmUgdGhlIERyYWZ0IFB1Ymxpc2hlZCBIb29rLgogICAgKgogICAgKiBAcGFyYW0gY2hhbmdlIFRoZSBjaGFuZ2UgaXRzZWxmLgotICAgKiBAcGFyYW0gcGF0Y2hTZXQgVGhlIFBhdGNoc2V0IHRoYXQgd2FzIGNyZWF0ZWQuCisgICAqIEBwYXJhbSBwYXRjaFNldCBUaGUgUGF0Y2hzZXQgdGhhdCB3YXMgcHVibGlzaGVkLgogICAgKiBAdGhyb3dzIE9ybUV4Y2VwdGlvbgogICAgKi8KICAgcHVibGljIHZvaWQgZG9EcmFmdFB1Ymxpc2hlZEhvb2soQ2hhbmdlIGNoYW5nZSwgUGF0Y2hTZXQgcGF0Y2hTZXQsCkBAIC02MywxMiArNjMsMTIgQEAKICAgICogQHBhcmFtIHBhdGNoU2V0IFRoZSBwYXRjaHNldCB0aGlzIGNvbW1lbnQgaXMgcmVsYXRlZCB0by4KICAgICogQHBhcmFtIGFjY291bnQgVGhlIGdlcnJpdCB1c2VyIHdobyBhZGRlZCB0aGUgY29tbWVudC4KICAgICogQHBhcmFtIGNvbW1lbnQgVGhlIGNvbW1lbnQgZ2l2ZW4uCi0gICAqIEBwYXJhbSBhcHByb3ZhbHMgTWFwIG9mIEFwcHJvdmFsIENhdGVnb3JpZXMgYW5kIFNjb3JlcworICAgKiBAcGFyYW0gYXBwcm92YWxzIE1hcCBvZiBsYWJlbCBJRHMgdG8gc2NvcmVzCiAgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uCiAgICAqLwogICBwdWJsaWMgdm9pZCBkb0NvbW1lbnRBZGRlZEhvb2soQ2hhbmdlIGNoYW5nZSwgQWNjb3VudCBhY2NvdW50LAogICAgICAgUGF0Y2hTZXQgcGF0Y2hTZXQsIFN0cmluZyBjb21tZW50LAotICAgICAgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZD4gYXBwcm92YWxzLCBSZXZpZXdEYiBkYikKKyAgICAgIE1hcDxTdHJpbmcsIFNob3J0PiBhcHByb3ZhbHMsIFJldmlld0RiIGRiKQogICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbjsKIAogICAvKioKQEAgLTgzLDYgKzgzLDE4IEBACiAgICAgICBQYXRjaFNldCBwYXRjaFNldCwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb247CiAKICAgLyoqCisgICAqIEZpcmUgdGhlIE1lcmdlIEZhaWxlZCBIb29rLgorICAgKgorICAgKiBAcGFyYW0gY2hhbmdlIFRoZSBjaGFuZ2UgaXRzZWxmLgorICAgKiBAcGFyYW0gYWNjb3VudCBUaGUgZ2Vycml0IHVzZXIgd2hvIGF0dGVtcHRlZCB0byBzdWJtaXQgdGhlIGNoYW5nZS4KKyAgICogQHBhcmFtIHBhdGNoU2V0IFRoZSBwYXRjaHNldCB0aGF0IGZhaWxlZCB0byBtZXJnZS4KKyAgICogQHBhcmFtIHJlYXNvbiBUaGUgcmVhc29uIHRoYXQgdGhlIGNoYW5nZSBmYWlsZWQgdG8gbWVyZ2UuCisgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uCisgICAqLworICBwdWJsaWMgdm9pZCBkb01lcmdlRmFpbGVkSG9vayhDaGFuZ2UgY2hhbmdlLCBBY2NvdW50IGFjY291bnQsCisgICAgICBQYXRjaFNldCBwYXRjaFNldCwgU3RyaW5nIHJlYXNvbiwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb247CisKKyAgLyoqCiAgICAqIEZpcmUgdGhlIENoYW5nZSBBYmFuZG9uZWQgSG9vay4KICAgICoKICAgICogQHBhcmFtIGNoYW5nZSBUaGUgY2hhbmdlIGl0c2VsZi4KQEAgLTEyNSw1ICsxMzcsMjggQEAKICAgcHVibGljIHZvaWQgZG9SZWZVcGRhdGVkSG9vayhCcmFuY2guTmFtZUtleSByZWZOYW1lLCBPYmplY3RJZCBvbGRJZCwKICAgICAgIE9iamVjdElkIG5ld0lkLCBBY2NvdW50IGFjY291bnQpOwogCisgIC8qKgorICAgKiBGaXJlIHRoZSBSZXZpZXdlciBBZGRlZCBIb29rCisgICAqCisgICAqIEBwYXJhbSBjaGFuZ2UgVGhlIGNoYW5nZSBpdHNlbGYuCisgICAqIEBwYXJhbSBwYXRjaFNldCBUaGUgcGF0Y2hzZXQgdGhhdCB0aGUgcmV2aWV3ZXIgd2FzIGFkZGVkIG9uLgorICAgKiBAcGFyYW0gYWNjb3VudCBUaGUgZ2Vycml0IHVzZXIgd2hvIHdhcyBhZGRlZCBhcyByZXZpZXdlci4KKyAgICovCisgIHB1YmxpYyB2b2lkIGRvUmV2aWV3ZXJBZGRlZEhvb2soQ2hhbmdlIGNoYW5nZSwgQWNjb3VudCBhY2NvdW50LAorICAgICAgUGF0Y2hTZXQgcGF0Y2hTZXQsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uOworCiAgIHB1YmxpYyB2b2lkIGRvQ2xhU2lnbnVwSG9vayhBY2NvdW50IGFjY291bnQsIENvbnRyaWJ1dG9yQWdyZWVtZW50IGNsYSk7CisKKyAgLyoqCisgICAqIEZpcmUgdGhlIFJlZiB1cGRhdGUgSG9vaworICAgKgorICAgKiBAcGFyYW0gcHJvamVjdCBUaGUgdGFyZ2V0IHByb2plY3QKKyAgICogQHBhcmFtIHJlZk5hbWUgVGhlIEJyYW5jaC5OYW1lS2V5IG9mIHRoZSByZWYgcHJvdmlkZWQgYnkgY2xpZW50CisgICAqIEBwYXJhbSB1cGxvYWRlciBUaGUgZ2Vycml0IHVzZXIgcnVubmluZyB0aGUgY29tbWFuZAorICAgKiBAcGFyYW0gb2xkSWQgVGhlIHJlZidzIG9sZCBpZAorICAgKiBAcGFyYW0gbmV3SWQgVGhlIHJlZidzIG5ldyBpZAorICAgKiBAcGFyYW0gYWNjb3VudCBUaGUgZ2Vycml0IHVzZXIgd2hvIG1vdmVkIHRoZSByZWYKKyAgICovCisgIHB1YmxpYyBIb29rUmVzdWx0IGRvUmVmVXBkYXRlSG9vayhQcm9qZWN0IHByb2plY3QsICBTdHJpbmcgcmVmTmFtZSwKKyAgICAgICBBY2NvdW50IHVwbG9hZGVyLCBPYmplY3RJZCBvbGRJZCwgT2JqZWN0SWQgbmV3SWQpOwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NvbW1vbi9EaXNhYmxlZENoYW5nZUhvb2tzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0Rpc2FibGVkQ2hhbmdlSG9va3MuamF2YQppbmRleCBmMzBmNWVhLi42MDExYWIwIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0Rpc2FibGVkQ2hhbmdlSG9va3MuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvY29tbW9uL0Rpc2FibGVkQ2hhbmdlSG9va3MuamF2YQpAQCAtMTQsMTMgKzE0LDEzIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tSdW5uZXIuSG9va1Jlc3VsdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Db250cmlidXRvckFncmVlbWVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeVZhbHVlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2guTmFtZUtleTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoLk5hbWVLZXk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKIApAQCAtNDYsNiArNDYsMTEgQEAKICAgfQogCiAgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBkb01lcmdlRmFpbGVkSG9vayhDaGFuZ2UgY2hhbmdlLCBBY2NvdW50IGFjY291bnQsCisgICAgICBQYXRjaFNldCBwYXRjaFNldCwgU3RyaW5nIHJlYXNvbiwgUmV2aWV3RGIgZGIpIHsKKyAgfQorCisgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBkb0NoYW5nZVJlc3RvcmVkSG9vayhDaGFuZ2UgY2hhbmdlLCBBY2NvdW50IGFjY291bnQsCiAgICAgICBTdHJpbmcgcmVhc29uLCBSZXZpZXdEYiBkYikgewogICB9CkBAIC01Nyw3ICs2Miw3IEBACiAgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBkb0NvbW1lbnRBZGRlZEhvb2soQ2hhbmdlIGNoYW5nZSwgQWNjb3VudCBhY2NvdW50LAogICAgICAgUGF0Y2hTZXQgcGF0Y2hTZXQsIFN0cmluZyBjb21tZW50LAotICAgICAgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZD4gYXBwcm92YWxzLCBSZXZpZXdEYiBkYikgeworICAgICAgTWFwPFN0cmluZywgU2hvcnQ+IGFwcHJvdmFscywgUmV2aWV3RGIgZGIpIHsKICAgfQogCiAgIEBPdmVycmlkZQpAQCAtODEsNiArODYsMTcgQEAKICAgfQogCiAgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBkb1Jldmlld2VyQWRkZWRIb29rKENoYW5nZSBjaGFuZ2UsIEFjY291bnQgYWNjb3VudCwgUGF0Y2hTZXQgcGF0Y2hTZXQsCisgICAgICBSZXZpZXdEYiBkYikgeworICB9CisKKyAgQE92ZXJyaWRlCiAgIHB1YmxpYyB2b2lkIHJlbW92ZUNoYW5nZUxpc3RlbmVyKENoYW5nZUxpc3RlbmVyIGxpc3RlbmVyKSB7CiAgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIEhvb2tSZXN1bHQgZG9SZWZVcGRhdGVIb29rKFByb2plY3QgcHJvamVjdCwgU3RyaW5nIHJlZk5hbWUsCisgICAgICBBY2NvdW50IHVwbG9hZGVyLCBPYmplY3RJZCBvbGRJZCwgT2JqZWN0SWQgbmV3SWQpIHsKKyAgICByZXR1cm4gbnVsbDsKKyAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1ByZWRpY2F0ZUNsYXNzTG9hZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJlZGljYXRlQ2xhc3NMb2FkZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lYjJkMjY0Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1ByZWRpY2F0ZUNsYXNzTG9hZGVyLmphdmEKQEAgLTAsMCArMSw2NSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5ydWxlczsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlua2VkSGFzaE11bHRpbWFwOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOworCisvKioKKyAqIExvYWRzIHRoZSBjbGFzc2VzIGZvciBQcm9sb2cgcHJlZGljYXRlcy4KKyAqLworcHVibGljIGNsYXNzIFByZWRpY2F0ZUNsYXNzTG9hZGVyIGV4dGVuZHMgQ2xhc3NMb2FkZXIgeworCisgIHByaXZhdGUgZmluYWwgTXVsdGltYXA8U3RyaW5nLCBDbGFzc0xvYWRlcj4gcGFja2FnZUNsYXNzTG9hZGVyTWFwID0KKyAgICAgIExpbmtlZEhhc2hNdWx0aW1hcC5jcmVhdGUoKTsKKworICBwdWJsaWMgUHJlZGljYXRlQ2xhc3NMb2FkZXIoCisgICAgICBmaW5hbCBEeW5hbWljU2V0PFByZWRpY2F0ZVByb3ZpZGVyPiBwcmVkaWNhdGVQcm92aWRlcnMsCisgICAgICBmaW5hbCBDbGFzc0xvYWRlciBwYXJlbnQpIHsKKyAgICBzdXBlcihwYXJlbnQpOworCisgICAgZm9yIChQcmVkaWNhdGVQcm92aWRlciBwcmVkaWNhdGVQcm92aWRlciA6IHByZWRpY2F0ZVByb3ZpZGVycykgeworICAgICAgZm9yIChTdHJpbmcgcGtnIDogcHJlZGljYXRlUHJvdmlkZXIuZ2V0UGFja2FnZXMoKSkgeworICAgICAgICBwYWNrYWdlQ2xhc3NMb2FkZXJNYXAucHV0KHBrZywgcHJlZGljYXRlUHJvdmlkZXIuZ2V0Q2xhc3MoKQorICAgICAgICAgICAgLmdldENsYXNzTG9hZGVyKCkpOworICAgICAgfQorICAgIH0KKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgQ2xhc3M8Pz4gZmluZENsYXNzKGZpbmFsIFN0cmluZyBjbGFzc05hbWUpCisgICAgICB0aHJvd3MgQ2xhc3NOb3RGb3VuZEV4Y2VwdGlvbiB7CisgICAgZmluYWwgQ29sbGVjdGlvbjxDbGFzc0xvYWRlcj4gY2xhc3NMb2FkZXJzID0KKyAgICAgICAgcGFja2FnZUNsYXNzTG9hZGVyTWFwLmdldChnZXRQYWNrYWdlTmFtZShjbGFzc05hbWUpKTsKKyAgICBmb3IgKGZpbmFsIENsYXNzTG9hZGVyIGNsIDogY2xhc3NMb2FkZXJzKSB7CisgICAgICB0cnkgeworICAgICAgICByZXR1cm4gQ2xhc3MuZm9yTmFtZShjbGFzc05hbWUsIHRydWUsIGNsKTsKKyAgICAgIH0gY2F0Y2ggKENsYXNzTm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgICAvLyBpZ25vcmUKKyAgICAgIH0KKyAgICB9CisgICAgdGhyb3cgbmV3IENsYXNzTm90Rm91bmRFeGNlcHRpb24oY2xhc3NOYW1lKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBnZXRQYWNrYWdlTmFtZShTdHJpbmcgY2xhc3NOYW1lKSB7CisgICAgZmluYWwgaW50IHBvcyA9IGNsYXNzTmFtZS5sYXN0SW5kZXhPZignLicpOworICAgIGlmIChwb3MgPCAwKSB7CisgICAgICByZXR1cm4gIiI7CisgICAgfQorICAgIHJldHVybiBjbGFzc05hbWUuc3Vic3RyaW5nKDAsIHBvcyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9QcmVkaWNhdGVQcm92aWRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1ByZWRpY2F0ZVByb3ZpZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGJkOTQyMwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9QcmVkaWNhdGVQcm92aWRlci5qYXZhCkBAIC0wLDAgKzEsMzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucnVsZXM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZVNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLkV4dGVuc2lvblBvaW50OworCitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5QcmVkaWNhdGU7CisKKy8qKgorICogUHJvdmlkZXMgYWRkaXRpb25hbCBwYWNrYWdlcyB0aGF0IGNvbnRhaW4gUHJvbG9nIHByZWRpY2F0ZXMgdGhhdCBzaG91bGQgYmUKKyAqIG1hZGUgYXZhaWxhYmxlIGluIHRoZSBQcm9sb2cgZW52aXJvbm1lbnQuIFRoZSBwcmVkaWNhdGVzIGNhbiBlLmcuIGJlIHVzZWQgaW4KKyAqIHRoZSBwcm9qZWN0IHN1Ym1pdCBydWxlcy4KKyAqCisgKiBFYWNoIEphdmEgY2xhc3MgZGVmaW5pbmcgYSBQcm9sb2cgcHJlZGljYXRlIG11c3QgYmUgaW4gb25lIG9mIHRoZSBwcm92aWRlZAorICogcGFja2FnZXMgYW5kIGl0cyBuYW1lIG11c3QgYXBwbHkgdG8gdGhlICdQUkVEX1tmdW5jdG9yXV9bYXJpdHldJyBmb3JtYXQuIEluCisgKiBhZGRpdGlvbiBpdCBtdXN0IGV4dGVuZCB7QGxpbmsgUHJlZGljYXRlfS4KKyAqLworQEV4dGVuc2lvblBvaW50CitwdWJsaWMgaW50ZXJmYWNlIFByZWRpY2F0ZVByb3ZpZGVyIHsKKyAgLyoqIFJldHVybiBzZXQgb2YgcGFja2FnZXMgdGhhdCBjb250YWluIFByb2xvZyBwcmVkaWNhdGVzICovCisgIHB1YmxpYyBJbW11dGFibGVTZXQ8U3RyaW5nPiBnZXRQYWNrYWdlcygpOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1Byb2xvZ01vZHVsZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1Byb2xvZ01vZHVsZS5qYXZhCmluZGV4IGQzNjE3OTAuLjkyYjhiMWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9Qcm9sb2dNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJvbG9nTW9kdWxlLmphdmEKQEAgLTE0LDExICsxNCwxMyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkZhY3RvcnlNb2R1bGU7CiAKIHB1YmxpYyBjbGFzcyBQcm9sb2dNb2R1bGUgZXh0ZW5kcyBGYWN0b3J5TW9kdWxlIHsKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICBEeW5hbWljU2V0LnNldE9mKGJpbmRlcigpLCBQcmVkaWNhdGVQcm92aWRlci5jbGFzcyk7CiAgICAgZmFjdG9yeShQcm9sb2dFbnZpcm9ubWVudC5GYWN0b3J5LmNsYXNzKTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1J1bGVzQ2FjaGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9SdWxlc0NhY2hlLmphdmEKaW5kZXggZmJlZTE0NS4uZGFkNTNiOSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1J1bGVzQ2FjaGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUnVsZXNDYWNoZS5qYXZhCkBAIC0xNiw2ICsxNiw5IEBACiAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2dNYWNoaW5lQ29weS5zYXZlOwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVMaXN0OworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKQEAgLTQyLDcgKzQ1LDEwIEBACiAKIGltcG9ydCBqYXZhLmlvLkZpbGU7CiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOworaW1wb3J0IGphdmEuaW8uSW5wdXRTdHJlYW1SZWFkZXI7CiBpbXBvcnQgamF2YS5pby5QdXNoYmFja1JlYWRlcjsKK2ltcG9ydCBqYXZhLmlvLlJlYWRlcjsKIGltcG9ydCBqYXZhLmlvLlN0cmluZ1JlYWRlcjsKIGltcG9ydCBqYXZhLmxhbmcucmVmLlJlZmVyZW5jZTsKIGltcG9ydCBqYXZhLmxhbmcucmVmLlJlZmVyZW5jZVF1ZXVlOwpAQCAtNTIsNiArNTgsNyBAQAogaW1wb3J0IGphdmEubmV0LlVSTENsYXNzTG9hZGVyOwogaW1wb3J0IGphdmEudXRpbC5FbnVtU2V0OwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOworaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKIC8qKgpAQCAtNjksMTAgKzc2LDggQEAKICAgLyoqIERlZmF1bHQgc2l6ZSBvZiB0aGUgaW50ZXJuYWwgUHJvbG9nIGRhdGFiYXNlIHdpdGhpbiBlYWNoIGludGVycHJldGVyLiAqLwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgREJfTUFYID0gMjU2OwogCi0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZ1tdIFBBQ0tBR0VfTElTVCA9IHsKLSAgICAgIFByb2xvZy5CVUlMVElOLAotICAgICAgImdlcnJpdCIsCi0gICAgfTsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTGlzdDxTdHJpbmc+IFBBQ0tBR0VfTElTVCA9IEltbXV0YWJsZUxpc3Qub2YoCisgICAgICBQcm9sb2cuQlVJTFRJTiwgImdlcnJpdCIpOwogCiAgIHByaXZhdGUgZmluYWwgTWFwPE9iamVjdElkLCBNYWNoaW5lUmVmPiBtYWNoaW5lQ2FjaGUgPQogICAgICAgbmV3IEhhc2hNYXA8T2JqZWN0SWQsIE1hY2hpbmVSZWY+KCk7CkBAIC05NCwyMSArOTksMjcgQEAKICAgcHJpdmF0ZSBmaW5hbCBGaWxlIGNhY2hlRGlyOwogICBwcml2YXRlIGZpbmFsIEZpbGUgcnVsZXNEaXI7CiAgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWdyOworICBwcml2YXRlIGZpbmFsIER5bmFtaWNTZXQ8UHJlZGljYXRlUHJvdmlkZXI+IHByZWRpY2F0ZVByb3ZpZGVyczsKICAgcHJpdmF0ZSBmaW5hbCBDbGFzc0xvYWRlciBzeXN0ZW1Mb2FkZXI7CiAgIHByaXZhdGUgZmluYWwgUHJvbG9nTWFjaGluZUNvcHkgZGVmYXVsdE1hY2hpbmU7CiAKICAgQEluamVjdAogICBwcm90ZWN0ZWQgUnVsZXNDYWNoZShAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBjb25maWcsIFNpdGVQYXRocyBzaXRlLAotICAgICAgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ20pIHsKKyAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIGdtLCBEeW5hbWljU2V0PFByZWRpY2F0ZVByb3ZpZGVyPiBwcmVkaWNhdGVQcm92aWRlcnMpIHsKICAgICBlbmFibGVQcm9qZWN0UnVsZXMgPSBjb25maWcuZ2V0Qm9vbGVhbigicnVsZXMiLCBudWxsLCAiZW5hYmxlIiwgdHJ1ZSk7CiAgICAgY2FjaGVEaXIgPSBzaXRlLnJlc29sdmUoY29uZmlnLmdldFN0cmluZygiY2FjaGUiLCBudWxsLCAiZGlyZWN0b3J5IikpOwogICAgIHJ1bGVzRGlyID0gY2FjaGVEaXIgIT0gbnVsbCA/IG5ldyBGaWxlKGNhY2hlRGlyLCAicnVsZXMiKSA6IG51bGw7CiAgICAgZ2l0TWdyID0gZ207CisgICAgdGhpcy5wcmVkaWNhdGVQcm92aWRlcnMgPSBwcmVkaWNhdGVQcm92aWRlcnM7CiAKICAgICBzeXN0ZW1Mb2FkZXIgPSBnZXRDbGFzcygpLmdldENsYXNzTG9hZGVyKCk7CiAgICAgZGVmYXVsdE1hY2hpbmUgPSBzYXZlKG5ld0VtcHR5TWFjaGluZShzeXN0ZW1Mb2FkZXIpKTsKICAgfQogCisgIHB1YmxpYyBib29sZWFuIGlzUHJvamVjdFJ1bGVzRW5hYmxlZCgpIHsKKyAgICByZXR1cm4gZW5hYmxlUHJvamVjdFJ1bGVzOworICB9CisKICAgLyoqCiAgICAqIExvY2F0ZSBhIGNhY2hlZCBQcm9sb2cgbWFjaGluZSBzdGF0ZSwgb3IgY3JlYXRlIG9uZSBpZiBub3QgYXZhaWxhYmxlLgogICAgKgpAQCAtMTQyLDYgKzE1MywxNSBAQAogICAgIHJldHVybiBwY207CiAgIH0KIAorICBwdWJsaWMgUHJvbG9nTWFjaGluZUNvcHkgbG9hZE1hY2hpbmUoU3RyaW5nIG5hbWUsIElucHV0U3RyZWFtIGluKQorICAgICAgdGhyb3dzIENvbXBpbGVFeGNlcHRpb24geworICAgIFByb2xvZ01hY2hpbmVDb3B5IHBtYyA9IGNvbnN1bHRSdWxlcyhuYW1lLCBuZXcgSW5wdXRTdHJlYW1SZWFkZXIoaW4pKTsKKyAgICBpZiAocG1jID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBDb21waWxlRXhjZXB0aW9uKCJDYW5ub3QgY29uc3VsdCBydWxlcyBmcm9tIHRoZSBzdHJlYW0gIiArIG5hbWUpOworICAgIH0KKyAgICByZXR1cm4gcG1jOworICB9CisKICAgcHJpdmF0ZSB2b2lkIGdjKCkgewogICAgIFJlZmVyZW5jZTw/PiByZWY7CiAgICAgd2hpbGUgKChyZWYgPSBkZWFkLnBvbGwoKSkgIT0gbnVsbCkgewpAQCAtMTY4LDE2ICsxODgsMjEgQEAKICAgICAvLyBEeW5hbWljYWxseSBjb25zdWx0IHRoZSBydWxlcyBpbnRvIHRoZSBtYWNoaW5lJ3MgaW50ZXJuYWwgZGF0YWJhc2UuCiAgICAgLy8KICAgICBTdHJpbmcgcnVsZXMgPSByZWFkKHByb2plY3QsIHJ1bGVzSWQpOwotICAgIEJ1ZmZlcmluZ1Byb2xvZ0NvbnRyb2wgY3RsID0gbmV3RW1wdHlNYWNoaW5lKHN5c3RlbUxvYWRlcik7Ci0gICAgUHVzaGJhY2tSZWFkZXIgaW4gPSBuZXcgUHVzaGJhY2tSZWFkZXIoCi0gICAgICAgIG5ldyBTdHJpbmdSZWFkZXIocnVsZXMpLAotICAgICAgICBQcm9sb2cuUFVTSEJBQ0tfU0laRSk7CisgICAgUHJvbG9nTWFjaGluZUNvcHkgcG1jID0gY29uc3VsdFJ1bGVzKCJydWxlcy5wbCIsIG5ldyBTdHJpbmdSZWFkZXIocnVsZXMpKTsKKyAgICBpZiAocG1jID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBDb21waWxlRXhjZXB0aW9uKCJDYW5ub3QgY29uc3VsdCBydWxlcyBvZiAiICsgcHJvamVjdCk7CisgICAgfQorICAgIHJldHVybiBwbWM7CisgIH0KIAorICBwcml2YXRlIFByb2xvZ01hY2hpbmVDb3B5IGNvbnN1bHRSdWxlcyhTdHJpbmcgbmFtZSwgUmVhZGVyIHJ1bGVzKSB7CisgICAgQnVmZmVyaW5nUHJvbG9nQ29udHJvbCBjdGwgPSBuZXdFbXB0eU1hY2hpbmUoc3lzdGVtTG9hZGVyKTsKKyAgICBQdXNoYmFja1JlYWRlciBpbiA9IG5ldyBQdXNoYmFja1JlYWRlcihydWxlcywgUHJvbG9nLlBVU0hCQUNLX1NJWkUpOwogICAgIGlmICghY3RsLmV4ZWN1dGUoCiAgICAgICAgIFByb2xvZy5CVUlMVElOLCAiY29uc3VsdF9zdHJlYW0iLAotICAgICAgICBTeW1ib2xUZXJtLmludGVybigicnVsZXMucGwiKSwKKyAgICAgICAgU3ltYm9sVGVybS5pbnRlcm4obmFtZSksCiAgICAgICAgIG5ldyBKYXZhT2JqZWN0VGVybShpbikpKSB7Ci0gICAgICB0aHJvdyBuZXcgQ29tcGlsZUV4Y2VwdGlvbigiQ2Fubm90IGNvbnN1bHQgcnVsZXMgb2YgIiArIHByb2plY3QpOworICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQogICAgIHJldHVybiBzYXZlKGN0bCk7CiAgIH0KQEAgLTIwNywxNSArMjMyLDIyIEBACiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgQnVmZmVyaW5nUHJvbG9nQ29udHJvbCBuZXdFbXB0eU1hY2hpbmUoQ2xhc3NMb2FkZXIgY2wpIHsKKyAgcHJpdmF0ZSBCdWZmZXJpbmdQcm9sb2dDb250cm9sIG5ld0VtcHR5TWFjaGluZShDbGFzc0xvYWRlciBjbCkgewogICAgIEJ1ZmZlcmluZ1Byb2xvZ0NvbnRyb2wgY3RsID0gbmV3IEJ1ZmZlcmluZ1Byb2xvZ0NvbnRyb2woKTsKICAgICBjdGwuc2V0TWF4QXJpdHkoUHJvbG9nRW52aXJvbm1lbnQuTUFYX0FSSVRZKTsKICAgICBjdGwuc2V0TWF4RGF0YWJhc2VTaXplKERCX01BWCk7Ci0gICAgY3RsLnNldFByb2xvZ0NsYXNzTG9hZGVyKG5ldyBQcm9sb2dDbGFzc0xvYWRlcihjbCkpOworICAgIGN0bC5zZXRQcm9sb2dDbGFzc0xvYWRlcihuZXcgUHJvbG9nQ2xhc3NMb2FkZXIobmV3IFByZWRpY2F0ZUNsYXNzTG9hZGVyKAorICAgICAgICBwcmVkaWNhdGVQcm92aWRlcnMsIGNsKSkpOwogICAgIGN0bC5zZXRFbmFibGVkKEVudW1TZXQuYWxsT2YoUHJvbG9nLkZlYXR1cmUuY2xhc3MpLCBmYWxzZSk7CiAKKyAgICBMaXN0PFN0cmluZz4gcGFja2FnZXMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgICBwYWNrYWdlcy5hZGRBbGwoUEFDS0FHRV9MSVNUKTsKKyAgICBmb3IgKFByZWRpY2F0ZVByb3ZpZGVyIHByZWRpY2F0ZVByb3ZpZGVyIDogcHJlZGljYXRlUHJvdmlkZXJzKSB7CisgICAgICBwYWNrYWdlcy5hZGRBbGwocHJlZGljYXRlUHJvdmlkZXIuZ2V0UGFja2FnZXMoKSk7CisgICAgfQorCiAgICAgLy8gQm9vdHN0cmFwIHRoZSBpbnRlcnByZXRlciBhbmQgZW5zdXJlIHRoZXJlIGlzIGNsZWFuIHN0YXRlLgotICAgIGN0bC5pbml0aWFsaXplKFBBQ0tBR0VfTElTVCk7CisgICAgY3RsLmluaXRpYWxpemUocGFja2FnZXMudG9BcnJheShuZXcgU3RyaW5nW3BhY2thZ2VzLnNpemUoKV0pKTsKICAgICByZXR1cm4gY3RsOwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvQWNjZXNzUGF0aC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9BY2Nlc3NQYXRoLmphdmEKaW5kZXggYWU3NmE2ZS4uMzFkZjg3NSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9BY2Nlc3NQYXRoLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9BY2Nlc3NQYXRoLmphdmEKQEAgLTE5LDggKzE5LDE0IEBACiAgIC8qKiBBbiB1bmtub3duIGFjY2VzcyBwYXRoLCBwcm9iYWJseSBzaG91bGQgbm90IGJlIHNwZWNpYWwuICovCiAgIFVOS05PV04sCiAKLSAgLyoqIEFjY2VzcyB0aHJvdWdoIHRoZSB3ZWIgVUkuICovCi0gIFdFQl9VSSwKKyAgLyoqIEFjY2VzcyB0aHJvdWdoIHRoZSBSRVNUIEFQSS4gKi8KKyAgUkVTVF9BUEksCisKKyAgLyoqIEFjY2VzcyB0aHJvdWdoIHRoZSBvbGQgSlNPTi1SUEMgaW50ZXJmYWNlLiAqLworICBKU09OX1JQQywKKworICAvKiogQWNjZXNzIGJ5IGEgd2ViIGNvb2tpZS4gVGhpcyBwYXRoIGlzIG5vdCBwcm90ZWN0ZWQgbGlrZSBSRVNUX0FQSS4gKi8KKyAgV0VCX0JST1dTRVIsCiAKICAgLyoqIEFjY2VzcyB0aHJvdWdoIGFuIFNTSCBjb21tYW5kIHRoYXQgaXMgbm90IGludm9rZWQgYnkgR2l0LiAqLwogICBTU0hfQ09NTUFORCwKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvQW5vbnltb3VzVXNlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9Bbm9ueW1vdXNVc2VyLmphdmEKaW5kZXggNWQzNmIzMy4uZjFmZTcyZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9Bbm9ueW1vdXNVc2VyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9Bbm9ueW1vdXNVc2VyLmphdmEKQEAgLTMwLDcgKzMwLDcgQEAKIHB1YmxpYyBjbGFzcyBBbm9ueW1vdXNVc2VyIGV4dGVuZHMgQ3VycmVudFVzZXIgewogICBASW5qZWN0CiAgIEFub255bW91c1VzZXIoQ2FwYWJpbGl0eUNvbnRyb2wuRmFjdG9yeSBjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnkpIHsKLSAgICBzdXBlcihjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksIEFjY2Vzc1BhdGguVU5LTk9XTik7CisgICAgc3VwZXIoY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5KTsKICAgfQogCiAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9BcHByb3ZhbHNVdGlsLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL0FwcHJvdmFsc1V0aWwuamF2YQppbmRleCBhMjk1YzQ5Li4wY2U2ODkyIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL0FwcHJvdmFsc1V0aWwuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL0FwcHJvdmFsc1V0aWwuamF2YQpAQCAtMTQsMjIgKzE0LDIyIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyOwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JdGVyYWJsZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQuSWQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFwcHJvdmFsQ2F0ZWdvcnk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWwuTGFiZWxJZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIAotaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CkBAIC00NiwyMCArNDYsMTcgQEAKICAqLwogcHVibGljIGNsYXNzIEFwcHJvdmFsc1V0aWwgewogICBwcml2YXRlIGZpbmFsIFJldmlld0RiIGRiOwotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKIAogICBASW5qZWN0Ci0gIEFwcHJvdmFsc1V0aWwoUmV2aWV3RGIgZGIsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlcykgeworICBwdWJsaWMgQXBwcm92YWxzVXRpbChSZXZpZXdEYiBkYikgewogICAgIHRoaXMuZGIgPSBkYjsKLSAgICB0aGlzLmFwcHJvdmFsVHlwZXMgPSBhcHByb3ZhbFR5cGVzOwogICB9CiAKICAgLyoqCiAgICAqIFJlc3luYyB0aGUgY2hhbmdlT3BlbiBzdGF0dXMgd2hpY2ggaXMgY2FjaGVkIGluIHRoZSBhcHByb3ZhbHMgdGFibGUgZm9yCiAgICAqIHBlcmZvcm1hbmNlIHJlYXNvbnMKICAgICovCi0gIHB1YmxpYyB2b2lkIHN5bmNDaGFuZ2VTdGF0dXMoZmluYWwgQ2hhbmdlIGNoYW5nZSkKLSAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICBwdWJsaWMgdm9pZCBzeW5jQ2hhbmdlU3RhdHVzKGZpbmFsIENoYW5nZSBjaGFuZ2UpIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgIGZpbmFsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzID0KICAgICAgICAgZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieUNoYW5nZShjaGFuZ2UuZ2V0SWQoKSkudG9MaXN0KCk7CiAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGEgOiBhcHByb3ZhbHMpIHsKQEAgLTY5LDUzICs2Niw0MSBAQAogICB9CiAKICAgLyoqCi0gICAqIE1vdmVzIHRoZSBQYXRjaFNldEFwcHJvdmFscyB0byB0aGUgbGFzdCBQYXRjaFNldCBvbiB0aGUgY2hhbmdlIHdoaWxlCi0gICAqIGtlZXBpbmcgdGhlIHZldG9zLgorICAgKiBNb3ZlcyB0aGUgUGF0Y2hTZXRBcHByb3ZhbHMgdG8gdGhlIHNwZWNpZmllZCBQYXRjaFNldCBvbiB0aGUgY2hhbmdlIGZyb20KKyAgICogdGhlIHByaW9yIFBhdGNoU2V0LCB3aGlsZSBrZWVwaW5nIHRoZSB2ZXRvcy4KICAgICoKLSAgICogQHBhcmFtIGNoYW5nZSBDaGFuZ2UgdG8gdXBkYXRlCisgICAqIEBwYXJhbSBkYiBkYXRhYmFzZSBjb25uZWN0aW9uIHRvIHVzZSBmb3IgdXBkYXRlcy4KKyAgICogQHBhcmFtIGRlc3QgUGF0Y2hTZXQgdG8gY29weSB0bwogICAgKiBAdGhyb3dzIE9ybUV4Y2VwdGlvbgotICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uCiAgICAqIEByZXR1cm4gTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBUaGUgcHJldmlvdXMgYXBwcm92YWxzCiAgICAqLwotICBwdWJsaWMgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBjb3B5VmV0b3NUb0xhdGVzdFBhdGNoU2V0KENoYW5nZSBjaGFuZ2UpCi0gICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgIHB1YmxpYyBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGNvcHlWZXRvc1RvUGF0Y2hTZXQoUmV2aWV3RGIgZGIsCisgICAgICBMYWJlbFR5cGVzIGxhYmVsVHlwZXMsIFBhdGNoU2V0LklkIGRlc3QpIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgIFBhdGNoU2V0LklkIHNvdXJjZTsKLSAgICBpZiAoY2hhbmdlLmdldE51bWJlck9mUGF0Y2hTZXRzKCkgPiAxKSB7Ci0gICAgICBzb3VyY2UgPSBuZXcgUGF0Y2hTZXQuSWQoY2hhbmdlLmdldElkKCksIGNoYW5nZS5nZXROdW1iZXJPZlBhdGNoU2V0cygpIC0gMSk7CisgICAgaWYgKGRlc3QuZ2V0KCkgPiAxKSB7CisgICAgICBzb3VyY2UgPSBuZXcgUGF0Y2hTZXQuSWQoZGVzdC5nZXRQYXJlbnRLZXkoKSwgZGVzdC5nZXQoKSAtIDEpOwogICAgIH0gZWxzZSB7Ci0gICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIlByZXZpb3VzIHBhdGNoIHNldCBjb3VsZCBub3QgYmUgZm91bmQiKTsKKyAgICAgIHRocm93IG5ldyBPcm1FeGNlcHRpb24oIlByZXZpb3VzIHBhdGNoIHNldCBjb3VsZCBub3QgYmUgZm91bmQiKTsKICAgICB9CiAKLSAgICBQYXRjaFNldC5JZCBkZXN0ID0gY2hhbmdlLmN1cnJQYXRjaFNldElkKCk7Ci0gICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBwYXRjaFNldEFwcHJvdmFscyA9IGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlDaGFuZ2UoY2hhbmdlLmdldElkKCkpLnRvTGlzdCgpOworICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gcGF0Y2hTZXRBcHByb3ZhbHMgPQorICAgICAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmJ5Q2hhbmdlKGRlc3QuZ2V0UGFyZW50S2V5KCkpLnRvTGlzdCgpOwogICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogcGF0Y2hTZXRBcHByb3ZhbHMpIHsKLSAgICAgIC8vIEFwcHJvdmFsQ2F0ZWdvcnkuU1VCTUlUIGlzIHN0aWxsIGluIGRiIGJ1dCBub3QgcmVsZXZhbnQgaW4gZ2l0LXN0b3JlCi0gICAgICBpZiAoIUFwcHJvdmFsQ2F0ZWdvcnkuU1VCTUlULmVxdWFscyhhLmdldENhdGVnb3J5SWQoKSkpIHsKLSAgICAgICAgZmluYWwgQXBwcm92YWxUeXBlIHR5cGUgPSBhcHByb3ZhbFR5cGVzLmJ5SWQoYS5nZXRDYXRlZ29yeUlkKCkpOwotICAgICAgICBpZiAoYS5nZXRQYXRjaFNldElkKCkuZXF1YWxzKHNvdXJjZSkgJiYKLSAgICAgICAgICAgIHR5cGUuZ2V0Q2F0ZWdvcnkoKS5pc0NvcHlNaW5TY29yZSgpICYmCi0gICAgICAgICAgICB0eXBlLmlzTWF4TmVnYXRpdmUoYSkpIHsKLSAgICAgICAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmluc2VydCgKLSAgICAgICAgICAgICAgQ29sbGVjdGlvbnMuc2luZ2xldG9uKG5ldyBQYXRjaFNldEFwcHJvdmFsKGRlc3QsIGEpKSk7Ci0gICAgICAgIH0KKyAgICAgIExhYmVsVHlwZSB0eXBlID0gbGFiZWxUeXBlcy5ieUxhYmVsKGEuZ2V0TGFiZWxJZCgpKTsKKyAgICAgIGlmICh0eXBlICE9IG51bGwgJiYgYS5nZXRQYXRjaFNldElkKCkuZXF1YWxzKHNvdXJjZSkgJiYKKyAgICAgICAgICB0eXBlLmlzQ29weU1pblNjb3JlKCkgJiYKKyAgICAgICAgICB0eXBlLmlzTWF4TmVnYXRpdmUoYSkpIHsKKyAgICAgICAgZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5pbnNlcnQoCisgICAgICAgICAgICBDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3IFBhdGNoU2V0QXBwcm92YWwoZGVzdCwgYSkpKTsKICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIHBhdGNoU2V0QXBwcm92YWxzOwogICB9CiAKLQotICAvKiogQXR0YWNoIHJldmlld2VycyB0byBhIGNoYW5nZS4gKi8KLSAgcHVibGljIHZvaWQgYWRkUmV2aWV3ZXJzKENoYW5nZSBjaGFuZ2UsIFBhdGNoU2V0IHBzLCBQYXRjaFNldEluZm8gaW5mbywKLSAgICAgIFNldDxBY2NvdW50LklkPiB3YW50UmV2aWV3ZXJzKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBTZXQ8SWQ+IGV4aXN0aW5nID0gU2V0cy48QWNjb3VudC5JZD4gbmV3SGFzaFNldCgpOwotICAgIGFkZFJldmlld2VycyhjaGFuZ2UsIHBzLCBpbmZvLCB3YW50UmV2aWV3ZXJzLCBleGlzdGluZyk7Ci0gIH0KLQotICAvKiogQXR0YWNoIHJldmlld2VycyB0byBhIGNoYW5nZS4gKi8KLSAgcHVibGljIHZvaWQgYWRkUmV2aWV3ZXJzKENoYW5nZSBjaGFuZ2UsIFBhdGNoU2V0IHBzLCBQYXRjaFNldEluZm8gaW5mbywKLSAgICAgIFNldDxBY2NvdW50LklkPiB3YW50UmV2aWV3ZXJzLCBTZXQ8QWNjb3VudC5JZD4gZXhpc3RpbmdSZXZpZXdlcnMpCi0gICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBMaXN0PEFwcHJvdmFsVHlwZT4gYWxsVHlwZXMgPSBhcHByb3ZhbFR5cGVzLmdldEFwcHJvdmFsVHlwZXMoKTsKKyAgcHVibGljIHZvaWQgYWRkUmV2aWV3ZXJzKFJldmlld0RiIGRiLCBMYWJlbFR5cGVzIGxhYmVsVHlwZXMsIENoYW5nZSBjaGFuZ2UsCisgICAgICBQYXRjaFNldCBwcywgUGF0Y2hTZXRJbmZvIGluZm8sIFNldDxJZD4gd2FudFJldmlld2VycywKKyAgICAgIFNldDxBY2NvdW50LklkPiBleGlzdGluZ1Jldmlld2VycykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgTGlzdDxMYWJlbFR5cGU+IGFsbFR5cGVzID0gbGFiZWxUeXBlcy5nZXRMYWJlbFR5cGVzKCk7CiAgICAgaWYgKGFsbFR5cGVzLmlzRW1wdHkoKSkgewogICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTEzOCwxMCArMTIzLDEwIEBACiAgICAgbmVlZC5yZW1vdmVBbGwoZXhpc3RpbmdSZXZpZXdlcnMpOwogCiAgICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBjZWxscyA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShuZWVkLnNpemUoKSk7Ci0gICAgQXBwcm92YWxDYXRlZ29yeS5JZCBjYXRJZCA9IGFsbFR5cGVzLmdldChhbGxUeXBlcy5zaXplKCkgLSAxKS5nZXRDYXRlZ29yeSgpLmdldElkKCk7CisgICAgTGFiZWxJZCBsYWJlbElkID0gSXRlcmFibGVzLmdldExhc3QoYWxsVHlwZXMpLmdldExhYmVsSWQoKTsKICAgICBmb3IgKEFjY291bnQuSWQgYWNjb3VudCA6IG5lZWQpIHsKICAgICAgIFBhdGNoU2V0QXBwcm92YWwgcHNhID0gbmV3IFBhdGNoU2V0QXBwcm92YWwoCi0gICAgICAgICAgbmV3IFBhdGNoU2V0QXBwcm92YWwuS2V5KHBzLmdldElkKCksIGFjY291bnQsIGNhdElkKSwKKyAgICAgICAgICBuZXcgUGF0Y2hTZXRBcHByb3ZhbC5LZXkocHMuZ2V0SWQoKSwgYWNjb3VudCwgbGFiZWxJZCksCiAgICAgICAgICAgKHNob3J0KSAwKTsKICAgICAgIHBzYS5jYWNoZShjaGFuZ2UpOwogICAgICAgY2VsbHMuYWRkKHBzYSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL0NoYW5nZVV0aWwuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvQ2hhbmdlVXRpbC5qYXZhCmluZGV4IDUzNWFkOGUuLjQxYTk3ZDIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvQ2hhbmdlVXRpbC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvQ2hhbmdlVXRpbC5qYXZhCkBAIC0xNCw0MSArMTQsNDEgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXI7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tSdW5uZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5DaGFyTWF0Y2hlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2UuU3RhdHVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2VNZXNzYWdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBbmNlc3RvcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5SZXZJZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuVHJhY2tpbmdJZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5DaGFuZ2VNZXNzYWdlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlRyYWNraW5nRm9vdGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuVHJhY2tpbmdGb290ZXJzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuQ29tbWl0UmVjZWl2ZWRFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VPcDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5FbWFpbEV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5SZWJhc2VkUGF0Y2hTZXRTZW5kZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmVwbGFjZVBhdGNoU2V0U2VuZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJlcGx5VG9DaGFuZ2VTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC52YWxpZGF0b3JzLkNvbW1pdFZhbGlkYXRpb25FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC52YWxpZGF0b3JzLkNvbW1pdFZhbGlkYXRvcnM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuQ29tbWl0TWVzc2FnZUVkaXRlZFNlbmRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5SZXZlcnRlZFNlbmRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvRmFjdG9yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoUHJvamVjdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5SZWZDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLklkR2VuZXJhdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5BdG9taWNVcGRhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUNvbmN1cnJlbmN5RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5JbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLk1pc3NpbmdPYmplY3RFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbW1pdEJ1aWxkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SW5zZXJ0ZXI7CkBAIC01NiwzMSArNTYsMjcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWY7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5tZXJnZS5NZXJnZVN0cmF0ZWd5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubWVyZ2UuVGhyZWVXYXlNZXJnZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLkZvb3RlckxpbmU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkNvbW1pdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2V2FsazsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5SZWNlaXZlQ29tbWFuZDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuQmFzZTY0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudXRpbC5DaGFuZ2VJZFV0aWw7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLk5COwotaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7Ci1pbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKK2ltcG9ydCBqYXZhLnRleHQuTWVzc2FnZUZvcm1hdDsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5EYXRlOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIGltcG9ydCBqYXZhLnV0aWwucmVnZXguTWF0Y2hlcjsKIAogcHVibGljIGNsYXNzIENoYW5nZVV0aWwgewotCi0gIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihDaGFuZ2VVdGlsLmNsYXNzKTsKLQogICBwcml2YXRlIHN0YXRpYyBpbnQgdXVpZFByZWZpeDsKICAgcHJpdmF0ZSBzdGF0aWMgaW50IHV1aWRTZXE7CiAKQEAgLTk1LDcgKzkxLDEyIEBACiAgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIG1lc3NhZ2VVVUlEKGZpbmFsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKICAgICBmaW5hbCBieXRlW10gcmF3ID0gbmV3IGJ5dGVbOF07CiAgICAgZmlsbChyYXcsIGRiKTsKLSAgICByZXR1cm4gQmFzZTY0LmVuY29kZUJ5dGVzKHJhdyk7CisKKyAgICAvLyBNYWtlIHRoZSByZXN1bHRpbmcgYmFzZTY0IHN0cmluZyBtb3JlIFVSTCBmcmllbmRseS4KKyAgICByZXR1cm4gQ2hhck1hdGNoZXIuaXMoJ0EnKS50cmltTGVhZGluZ0Zyb20oCisgICAgICAgICAgIENoYXJNYXRjaGVyLmlzKCc9JykudHJpbVRyYWlsaW5nRnJvbShCYXNlNjQuZW5jb2RlQnl0ZXMocmF3KSkpCisgICAgICAgIC5yZXBsYWNlKCcrJywgJy4nKQorICAgICAgICAucmVwbGFjZSgnLycsICctJyk7CiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBzeW5jaHJvbml6ZWQgdm9pZCBmaWxsKGJ5dGVbXSByYXcsIFJldmlld0RiIGRiKQpAQCAtMTA1LDcgKzEwNiw3IEBACiAgICAgICB1dWlkU2VxID0gSW50ZWdlci5NQVhfVkFMVUU7CiAgICAgfQogICAgIE5CLmVuY29kZUludDMyKHJhdywgMCwgdXVpZFByZWZpeCk7Ci0gICAgTkIuZW5jb2RlSW50MzIocmF3LCA0LCB1dWlkU2VxLS0pOworICAgIE5CLmVuY29kZUludDMyKHJhdywgNCwgSWRHZW5lcmF0b3IubWl4KHV1aWRQcmVmaXgsIHV1aWRTZXEtLSkpOwogICB9CiAKICAgcHVibGljIHN0YXRpYyB2b2lkIHRvdWNoKGZpbmFsIENoYW5nZSBjaGFuZ2UsIFJldmlld0RiIGRiKQpAQCAtMTc2LDcgKzE3Nyw4IEBACiAgICAgZGIudHJhY2tpbmdJZHMoKS5kZWxldGUodG9EZWxldGUpOwogICB9CiAKLSAgcHVibGljIHN0YXRpYyB2b2lkIHRlc3RNZXJnZShNZXJnZU9wLkZhY3Rvcnkgb3BGYWN0b3J5LCBDaGFuZ2UgY2hhbmdlKSB7CisgIHB1YmxpYyBzdGF0aWMgdm9pZCB0ZXN0TWVyZ2UoTWVyZ2VPcC5GYWN0b3J5IG9wRmFjdG9yeSwgQ2hhbmdlIGNoYW5nZSkKKyAgICAgIHRocm93cyBOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uIHsKICAgICBvcEZhY3RvcnkuY3JlYXRlKGNoYW5nZS5nZXREZXN0KCkpLnZlcmlmeU1lcmdlYWJpbGl0eShjaGFuZ2UpOwogICB9CiAKQEAgLTE5MywyOTAgKzE5NSwyMSBAQAogICAgIGRiLnBhdGNoU2V0QW5jZXN0b3JzKCkuaW5zZXJ0KHRvSW5zZXJ0KTsKICAgfQogCi0gIC8qKgotICAgKiBSZWJhc2VzIGEgY29tbWl0Ci0gICAqCi0gICAqIEBwYXJhbSBnaXQgUmVwb3NpdG9yeSB0byBmaW5kIGNvbW1pdHMgaW4KLSAgICogQHBhcmFtIGluc2VydGVyIGluc2VydGVyIHRvIGhhbmRsZSBuZXcgdHJlZXMgYW5kIGJsb2JzLgotICAgKiBAcGFyYW0gb3JpZ2luYWwgVGhlIGNvbW1pdCB0byByZWJhc2UKLSAgICogQHBhcmFtIGJhc2UgQmFzZSB0byByZWJhc2UgYWdhaW5zdAotICAgKiBAcmV0dXJuIENvbW1pdEJ1aWxkZXIgdGhlIG5ld2x5IHJlYmFzZWQgY29tbWl0Ci0gICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gTWVyZ2VkIGZhaWxlZAotICAgKi8KLSAgcHVibGljIHN0YXRpYyBDb21taXRCdWlsZGVyIHJlYmFzZUNvbW1pdChSZXBvc2l0b3J5IGdpdCwKLSAgICAgIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyLCBSZXZDb21taXQgb3JpZ2luYWwsIFJldkNvbW1pdCBiYXNlLAotICAgICAgUGVyc29uSWRlbnQgY29tbWl0dGVySWRlbnQpIHRocm93cyBJT0V4Y2VwdGlvbiB7Ci0KLSAgICBpZiAob3JpZ2luYWwuZ2V0UGFyZW50Q291bnQoKSA9PSAwKSB7Ci0gICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oCi0gICAgICAgICAgIkNvbW1pdHMgd2l0aCBubyBwYXJlbnRzIGNhbm5vdCBiZSByZWJhc2VkIChpcyB0aGlzIHRoZSBpbml0aWFsIGNvbW1pdD8pLiIpOwotICAgIH0KLQotICAgIGlmIChvcmlnaW5hbC5nZXRQYXJlbnRDb3VudCgpID4gMSkgewotICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAotICAgICAgICAgICJQYXRjaCBzZXRzIHdpdGggbXVsdGlwbGUgcGFyZW50cyBjYW5ub3QgYmUgcmViYXNlZCAobWVyZ2UgY29tbWl0cykuIgotICAgICAgICAgICAgICArICIgUGFyZW50czogIiArIEFycmF5cy50b1N0cmluZyhvcmlnaW5hbC5nZXRQYXJlbnRzKCkpKTsKLSAgICB9Ci0KLSAgICBmaW5hbCBSZXZDb21taXQgcGFyZW50Q29tbWl0ID0gb3JpZ2luYWwuZ2V0UGFyZW50KDApOwotCi0gICAgaWYgKGJhc2UuZXF1YWxzKHBhcmVudENvbW1pdCkpIHsKLSAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiQ2hhbmdlIGlzIGFscmVhZHkgdXAgdG8gZGF0ZS4iKTsKLSAgICB9Ci0KLSAgICBmaW5hbCBUaHJlZVdheU1lcmdlciBtZXJnZXIgPSBNZXJnZVN0cmF0ZWd5LlJFU09MVkUubmV3TWVyZ2VyKGdpdCwgdHJ1ZSk7Ci0gICAgbWVyZ2VyLnNldE9iamVjdEluc2VydGVyKG5ldyBPYmplY3RJbnNlcnRlci5GaWx0ZXIoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHByb3RlY3RlZCBPYmplY3RJbnNlcnRlciBkZWxlZ2F0ZSgpIHsKLSAgICAgICAgcmV0dXJuIGluc2VydGVyOwotICAgICAgfQotCi0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIGZsdXNoKCkgewotICAgICAgfQotCi0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIHJlbGVhc2UoKSB7Ci0gICAgICB9Ci0gICAgfSk7Ci0gICAgbWVyZ2VyLnNldEJhc2UocGFyZW50Q29tbWl0KTsKLSAgICBtZXJnZXIubWVyZ2Uob3JpZ2luYWwsIGJhc2UpOwotCi0gICAgaWYgKG1lcmdlci5nZXRSZXN1bHRUcmVlSWQoKSA9PSBudWxsKSB7Ci0gICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oCi0gICAgICAgICAgIlRoZSByZWJhc2UgZmFpbGVkIHNpbmNlIGNvbmZsaWN0cyBvY2N1cmVkIGR1cmluZyB0aGUgbWVyZ2UuIik7Ci0gICAgfQotCi0gICAgZmluYWwgQ29tbWl0QnVpbGRlciByZWJhc2VkQ29tbWl0QnVpbGRlciA9IG5ldyBDb21taXRCdWlsZGVyKCk7Ci0KLSAgICByZWJhc2VkQ29tbWl0QnVpbGRlci5zZXRUcmVlSWQobWVyZ2VyLmdldFJlc3VsdFRyZWVJZCgpKTsKLSAgICByZWJhc2VkQ29tbWl0QnVpbGRlci5zZXRQYXJlbnRJZChiYXNlKTsKLSAgICByZWJhc2VkQ29tbWl0QnVpbGRlci5zZXRBdXRob3Iob3JpZ2luYWwuZ2V0QXV0aG9ySWRlbnQoKSk7Ci0gICAgcmViYXNlZENvbW1pdEJ1aWxkZXIuc2V0TWVzc2FnZShvcmlnaW5hbC5nZXRGdWxsTWVzc2FnZSgpKTsKLSAgICByZWJhc2VkQ29tbWl0QnVpbGRlci5zZXRDb21taXR0ZXIoY29tbWl0dGVySWRlbnQpOwotCi0gICAgcmV0dXJuIHJlYmFzZWRDb21taXRCdWlsZGVyOwotICB9Ci0KLSAgcHVibGljIHN0YXRpYyB2b2lkIHJlYmFzZUNoYW5nZShmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAotICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIgdXNlciwgZmluYWwgUmV2aWV3RGIgZGIsCi0gICAgICBSZWJhc2VkUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeSByZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5LAotICAgICAgZmluYWwgQ2hhbmdlSG9va1J1bm5lciBob29rcywgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlciwKLSAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKLSAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb24sIFBlcnNvbklkZW50IG15SWRlbnQsCi0gICAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCi0gICAgICBmaW5hbCBBcHByb3ZhbHNVdGlsIGFwcHJvdmFsc1V0aWwpIHRocm93cyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sCi0gICAgICBFbWFpbEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLCBNaXNzaW5nT2JqZWN0RXhjZXB0aW9uLAotICAgICAgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sCi0gICAgICBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uIHsKLQotICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7Ci0gICAgZmluYWwgQ2hhbmdlQ29udHJvbCBjaGFuZ2VDb250cm9sID0KLSAgICAgICAgY2hhbmdlQ29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoY2hhbmdlSWQpOwotCi0gICAgaWYgKCFjaGFuZ2VDb250cm9sLmNhblJlYmFzZSgpKSB7Ci0gICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbigKLSAgICAgICAgICAiQ2Fubm90IHJlYmFzZTogTmV3IHBhdGNoIHNldHMgYXJlIG5vdCBhbGxvd2VkIHRvIGJlIGFkZGVkIHRvIGNoYW5nZTogIgotICAgICAgICAgICAgICArIGNoYW5nZUlkLnRvU3RyaW5nKCkpOwotICAgIH0KLQotICAgIENoYW5nZSBjaGFuZ2UgPSBjaGFuZ2VDb250cm9sLmdldENoYW5nZSgpOwotICAgIGZpbmFsIFJlcG9zaXRvcnkgZ2l0ID0gZ2l0TWFuYWdlci5vcGVuUmVwb3NpdG9yeShjaGFuZ2UuZ2V0UHJvamVjdCgpKTsKLSAgICB0cnkgewotICAgICAgZmluYWwgUmV2V2FsayByZXZXYWxrID0gbmV3IFJldldhbGsoZ2l0KTsKLSAgICAgIHRyeSB7Ci0gICAgICAgIGZpbmFsIFBhdGNoU2V0IG9yaWdpbmFsUGF0Y2hTZXQgPSBkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCk7Ci0gICAgICAgIFJldkNvbW1pdCBicmFuY2hUaXBDb21taXQgPSBudWxsOwotCi0gICAgICAgIExpc3Q8UGF0Y2hTZXRBbmNlc3Rvcj4gcGF0Y2hTZXRBbmNlc3RvcnMgPQotICAgICAgICAgICAgZGIucGF0Y2hTZXRBbmNlc3RvcnMoKS5hbmNlc3RvcnNPZihwYXRjaFNldElkKS50b0xpc3QoKTsKLSAgICAgICAgaWYgKHBhdGNoU2V0QW5jZXN0b3JzLnNpemUoKSA+IDEpIHsKLSAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oCi0gICAgICAgICAgICAgICJUaGUgcGF0Y2ggc2V0IHlvdSBhcmUgdHJ5aW5nIHRvIHJlYmFzZSBpcyBkZXBlbmRlbnQgb24gc2V2ZXJhbCBvdGhlciBwYXRjaCBzZXRzOiAiCi0gICAgICAgICAgICAgICAgICArIHBhdGNoU2V0QW5jZXN0b3JzLnRvU3RyaW5nKCkpOwotICAgICAgICB9Ci0gICAgICAgIGlmIChwYXRjaFNldEFuY2VzdG9ycy5zaXplKCkgPT0gMSkgewotICAgICAgICAgIExpc3Q8UGF0Y2hTZXQ+IGRlcFBhdGNoU2V0TGlzdCA9IGRiLnBhdGNoU2V0cygpCi0gICAgICAgICAgICAgICAgICAuYnlSZXZpc2lvbihwYXRjaFNldEFuY2VzdG9ycy5nZXQoMCkuZ2V0QW5jZXN0b3JSZXZpc2lvbigpKQotICAgICAgICAgICAgICAgICAgLnRvTGlzdCgpOwotICAgICAgICAgIGlmICghZGVwUGF0Y2hTZXRMaXN0LmlzRW1wdHkoKSkgewotICAgICAgICAgICAgUGF0Y2hTZXQgZGVwUGF0Y2hTZXQgPSBkZXBQYXRjaFNldExpc3QuZ2V0KDApOwotCi0gICAgICAgICAgICBDaGFuZ2UuSWQgZGVwQ2hhbmdlSWQgPSBkZXBQYXRjaFNldC5nZXRJZCgpLmdldFBhcmVudEtleSgpOwotICAgICAgICAgICAgQ2hhbmdlIGRlcENoYW5nZSA9IGRiLmNoYW5nZXMoKS5nZXQoZGVwQ2hhbmdlSWQpOwotCi0gICAgICAgICAgICBpZiAoZGVwQ2hhbmdlLmdldFN0YXR1cygpID09IFN0YXR1cy5BQkFORE9ORUQpIHsKLSAgICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKCJDYW5ub3QgcmViYXNlIGFnYWluc3QgYW4gYWJhbmRvbmVkIGNoYW5nZTogIgotICAgICAgICAgICAgICAgICAgKyBkZXBDaGFuZ2UuZ2V0S2V5KCkudG9TdHJpbmcoKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoZGVwQ2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7Ci0gICAgICAgICAgICAgIFBhdGNoU2V0IGxhdGVzdERlcFBhdGNoU2V0ID0KLSAgICAgICAgICAgICAgICAgIGRiLnBhdGNoU2V0cygpLmdldChkZXBDaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSk7Ci0gICAgICAgICAgICAgIGlmICghZGVwUGF0Y2hTZXQuZ2V0SWQoKS5lcXVhbHMoZGVwQ2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpKSB7Ci0gICAgICAgICAgICAgICAgYnJhbmNoVGlwQ29tbWl0ID0KLSAgICAgICAgICAgICAgICAgICAgcmV2V2Fsay5wYXJzZUNvbW1pdChPYmplY3RJZAotICAgICAgICAgICAgICAgICAgICAgICAgLmZyb21TdHJpbmcobGF0ZXN0RGVwUGF0Y2hTZXQuZ2V0UmV2aXNpb24oKS5nZXQoKSkpOwotICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigKLSAgICAgICAgICAgICAgICAgICAgIkNoYW5nZSBpcyBhbHJlYWR5IGJhc2VkIG9uIHRoZSBsYXRlc3QgcGF0Y2ggc2V0IG9mIHRoZSBkZXBlbmRlbnQgY2hhbmdlLiIpOwotICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKGJyYW5jaFRpcENvbW1pdCA9PSBudWxsKSB7Ci0gICAgICAgICAgLy8gV2UgYXJlIGRlcGVuZGVudCBvbiBhIG1lcmdlZCBQYXRjaFNldCBvciBoYXZlIG5vIFBhdGNoU2V0Ci0gICAgICAgICAgLy8gZGVwZW5kZW5jaWVzIGF0IGFsbC4KLSAgICAgICAgICBSZWYgZGVzdFJlZiA9IGdpdC5nZXRSZWYoY2hhbmdlLmdldERlc3QoKS5nZXQoKSk7Ci0gICAgICAgICAgaWYgKGRlc3RSZWYgPT0gbnVsbCkgewotICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAotICAgICAgICAgICAgICAgICJUaGUgZGVzdGluYXRpb24gYnJhbmNoIGRvZXMgbm90IGV4aXN0OiAiCi0gICAgICAgICAgICAgICAgICAgICsgY2hhbmdlLmdldERlc3QoKS5nZXQoKSk7Ci0gICAgICAgICAgfQotICAgICAgICAgIGJyYW5jaFRpcENvbW1pdCA9IHJldldhbGsucGFyc2VDb21taXQoZGVzdFJlZi5nZXRPYmplY3RJZCgpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIFJldkNvbW1pdCByZWJhc2VkQ29tbWl0OwotICAgICAgICBmaW5hbCBPYmplY3RJbnNlcnRlciBvaSA9IGdpdC5uZXdPYmplY3RJbnNlcnRlcigpOwotICAgICAgICB0cnkgewotICAgICAgICAgIE9iamVjdElkIG9sZElkID0gT2JqZWN0SWQuZnJvbVN0cmluZyhvcmlnaW5hbFBhdGNoU2V0LmdldFJldmlzaW9uKCkuZ2V0KCkpOwotICAgICAgICAgIE9iamVjdElkIG5ld0lkID0gb2kuaW5zZXJ0KHJlYmFzZUNvbW1pdCgKLSAgICAgICAgICAgICAgZ2l0LCBvaSwgcmV2V2Fsay5wYXJzZUNvbW1pdChvbGRJZCksIGJyYW5jaFRpcENvbW1pdCwgbXlJZGVudCkpOwotICAgICAgICAgIG9pLmZsdXNoKCk7Ci0gICAgICAgICAgcmViYXNlZENvbW1pdCA9IHJldldhbGsucGFyc2VDb21taXQobmV3SWQpOwotICAgICAgICB9IGZpbmFsbHkgewotICAgICAgICAgIG9pLnJlbGVhc2UoKTsKLSAgICAgICAgfQotCi0gICAgICAgIGNoYW5nZS5uZXh0UGF0Y2hTZXRJZCgpOwotICAgICAgICBmaW5hbCBQYXRjaFNldCBuZXdQYXRjaFNldCA9IG5ldyBQYXRjaFNldChjaGFuZ2UuY3VyclBhdGNoU2V0SWQoKSk7Ci0gICAgICAgIG5ld1BhdGNoU2V0LnNldENyZWF0ZWRPbihuZXcgVGltZXN0YW1wKFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpKSk7Ci0gICAgICAgIG5ld1BhdGNoU2V0LnNldFVwbG9hZGVyKHVzZXIuZ2V0QWNjb3VudElkKCkpOwotICAgICAgICBuZXdQYXRjaFNldC5zZXRSZXZpc2lvbihuZXcgUmV2SWQocmViYXNlZENvbW1pdC5uYW1lKCkpKTsKLSAgICAgICAgbmV3UGF0Y2hTZXQuc2V0RHJhZnQob3JpZ2luYWxQYXRjaFNldC5pc0RyYWZ0KCkpOwotCi0gICAgICAgIGZpbmFsIFBhdGNoU2V0SW5mbyBpbmZvID0KLSAgICAgICAgICAgIHBhdGNoU2V0SW5mb0ZhY3RvcnkuZ2V0KHJlYmFzZWRDb21taXQsIG5ld1BhdGNoU2V0LmdldElkKCkpOwotCi0gICAgICAgIFJlZlVwZGF0ZSBydSA9IGdpdC51cGRhdGVSZWYobmV3UGF0Y2hTZXQuZ2V0UmVmTmFtZSgpKTsKLSAgICAgICAgcnUuc2V0RXhwZWN0ZWRPbGRPYmplY3RJZChPYmplY3RJZC56ZXJvSWQoKSk7Ci0gICAgICAgIHJ1LnNldE5ld09iamVjdElkKHJlYmFzZWRDb21taXQpOwotICAgICAgICBydS5kaXNhYmxlUmVmTG9nKCk7Ci0gICAgICAgIGlmIChydS51cGRhdGUocmV2V2FsaykgIT0gUmVmVXBkYXRlLlJlc3VsdC5ORVcpIHsKLSAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKLSAgICAgICAgICAgICAgIkZhaWxlZCB0byBjcmVhdGUgcmVmICVzIGluICVzOiAlcyIsIG5ld1BhdGNoU2V0LmdldFJlZk5hbWUoKSwKLSAgICAgICAgICAgICAgY2hhbmdlLmdldERlc3QoKS5nZXRQYXJlbnRLZXkoKS5nZXQoKSwgcnUuZ2V0UmVzdWx0KCkpKTsKLSAgICAgICAgfQotICAgICAgICByZXBsaWNhdGlvbi5maXJlKGNoYW5nZS5nZXRQcm9qZWN0KCksIHJ1LmdldE5hbWUoKSk7Ci0KLSAgICAgICAgZmluYWwgU2V0PEFjY291bnQuSWQ+IG9sZFJldmlld2VycyA9IFNldHMubmV3SGFzaFNldCgpOwotICAgICAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gb2xkQ0MgPSBTZXRzLm5ld0hhc2hTZXQoKTsKLSAgICAgICAgZGIuY2hhbmdlcygpLmJlZ2luVHJhbnNhY3Rpb24oY2hhbmdlLmdldElkKCkpOwotICAgICAgICB0cnkgewotICAgICAgICAgIENoYW5nZSB1cGRhdGVkQ2hhbmdlOwotCi0gICAgICAgICAgdXBkYXRlZENoYW5nZSA9IGRiLmNoYW5nZXMoKS5hdG9taWNVcGRhdGUoY2hhbmdlSWQsCi0gICAgICAgICAgICAgIG5ldyBBdG9taWNVcGRhdGU8Q2hhbmdlPigpIHsKLSAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICAgICAgICBwdWJsaWMgQ2hhbmdlIHVwZGF0ZShDaGFuZ2UgY2hhbmdlKSB7Ci0gICAgICAgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNoYW5nZS51cGRhdGVOdW1iZXJPZlBhdGNoU2V0cyhuZXdQYXRjaFNldC5nZXRQYXRjaFNldElkKCkpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm4gY2hhbmdlOwotICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICB9KTsKLSAgICAgICAgICBpZiAodXBkYXRlZENoYW5nZSAhPSBudWxsKSB7Ci0gICAgICAgICAgICBjaGFuZ2UgPSB1cGRhdGVkQ2hhbmdlOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbigKLSAgICAgICAgICAgICAgICBTdHJpbmcuZm9ybWF0KCJDaGFuZ2UgJXMgaXMgY2xvc2VkIiwgY2hhbmdlLmdldElkKCkpKTsKLSAgICAgICAgICB9Ci0KLSAgICAgICAgICBpbnNlcnRBbmNlc3RvcnMoZGIsIG5ld1BhdGNoU2V0LmdldElkKCksIHJlYmFzZWRDb21taXQpOwotICAgICAgICAgIGRiLnBhdGNoU2V0cygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3UGF0Y2hTZXQpKTsKLSAgICAgICAgICB1cGRhdGVkQ2hhbmdlID0gZGIuY2hhbmdlcygpLmF0b21pY1VwZGF0ZShjaGFuZ2VJZCwKLSAgICAgICAgICAgICAgbmV3IEF0b21pY1VwZGF0ZTxDaGFuZ2U+KCkgewotICAgICAgICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgICAgICAgIHB1YmxpYyBDaGFuZ2UgdXBkYXRlKENoYW5nZSBjaGFuZ2UpIHsKLSAgICAgICAgICAgICAgICAgIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkuaXNDbG9zZWQoKSkgewotICAgICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgIGlmICghY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkuZXF1YWxzKHBhdGNoU2V0SWQpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBudWxsOwotICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKSAhPSBDaGFuZ2UuU3RhdHVzLkRSQUZUKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNoYW5nZS5zZXRTdGF0dXMoQ2hhbmdlLlN0YXR1cy5ORVcpOwotICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgY2hhbmdlLnNldExhc3RTaGExTWVyZ2VUZXN0ZWQobnVsbCk7Ci0gICAgICAgICAgICAgICAgICBjaGFuZ2Uuc2V0Q3VycmVudFBhdGNoU2V0KGluZm8pOwotICAgICAgICAgICAgICAgICAgQ2hhbmdlVXRpbC51cGRhdGVkKGNoYW5nZSk7Ci0gICAgICAgICAgICAgICAgICByZXR1cm4gY2hhbmdlOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgaWYgKHVwZGF0ZWRDaGFuZ2UgIT0gbnVsbCkgewotICAgICAgICAgICAgY2hhbmdlID0gdXBkYXRlZENoYW5nZTsKLSAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhyb3cgbmV3IEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24oCi0gICAgICAgICAgICAgICAgU3RyaW5nLmZvcm1hdCgiQ2hhbmdlICVzIHdhcyBtb2RpZmllZCIsIGNoYW5nZS5nZXRJZCgpKSk7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGEgOiBhcHByb3ZhbHNVdGlsLmNvcHlWZXRvc1RvTGF0ZXN0UGF0Y2hTZXQoY2hhbmdlKSkgewotICAgICAgICAgICAgaWYgKGEuZ2V0VmFsdWUoKSAhPSAwKSB7Ci0gICAgICAgICAgICAgIG9sZFJldmlld2Vycy5hZGQoYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICBvbGRDQy5hZGQoYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgZmluYWwgQ2hhbmdlTWVzc2FnZSBjbXNnID0KLSAgICAgICAgICAgICAgbmV3IENoYW5nZU1lc3NhZ2UobmV3IENoYW5nZU1lc3NhZ2UuS2V5KGNoYW5nZUlkLAotICAgICAgICAgICAgICAgICAgQ2hhbmdlVXRpbC5tZXNzYWdlVVVJRChkYikpLCB1c2VyLmdldEFjY291bnRJZCgpLCBwYXRjaFNldElkKTsKLSAgICAgICAgICBjbXNnLnNldE1lc3NhZ2UoIlBhdGNoIFNldCAiICsgcGF0Y2hTZXRJZC5nZXQoKSArICI6IFJlYmFzZWQiKTsKLSAgICAgICAgICBkYi5jaGFuZ2VNZXNzYWdlcygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24oY21zZykpOwotICAgICAgICAgIGRiLmNvbW1pdCgpOwotICAgICAgICB9IGZpbmFsbHkgewotICAgICAgICAgIGRiLnJvbGxiYWNrKCk7Ci0gICAgICAgIH0KLQotICAgICAgICBmaW5hbCBSZXBsYWNlUGF0Y2hTZXRTZW5kZXIgY20gPQotICAgICAgICAgICAgcmViYXNlZFBhdGNoU2V0U2VuZGVyRmFjdG9yeS5jcmVhdGUoY2hhbmdlKTsKLSAgICAgICAgY20uc2V0RnJvbSh1c2VyLmdldEFjY291bnRJZCgpKTsKLSAgICAgICAgY20uc2V0UGF0Y2hTZXQobmV3UGF0Y2hTZXQpOwotICAgICAgICBjbS5hZGRSZXZpZXdlcnMob2xkUmV2aWV3ZXJzKTsKLSAgICAgICAgY20uYWRkRXh0cmFDQyhvbGRDQyk7Ci0gICAgICAgIGNtLnNlbmQoKTsKLQotICAgICAgICBob29rcy5kb1BhdGNoc2V0Q3JlYXRlZEhvb2soY2hhbmdlLCBuZXdQYXRjaFNldCwgZGIpOwotICAgICAgfSBmaW5hbGx5IHsKLSAgICAgICAgcmV2V2Fsay5yZWxlYXNlKCk7Ci0gICAgICB9Ci0gICAgfSBmaW5hbGx5IHsKLSAgICAgIGdpdC5jbG9zZSgpOwotICAgIH0KLSAgfQotCi0gIHB1YmxpYyBzdGF0aWMgQ2hhbmdlLklkIHJldmVydChmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAotICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIgdXNlciwgZmluYWwgU3RyaW5nIG1lc3NhZ2UsIGZpbmFsIFJldmlld0RiIGRiLAotICAgICAgZmluYWwgUmV2ZXJ0ZWRTZW5kZXIuRmFjdG9yeSByZXZlcnRlZFNlbmRlckZhY3RvcnksCi0gICAgICBmaW5hbCBDaGFuZ2VIb29rcyBob29rcywgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlciwKLSAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKLSAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb24sIFBlcnNvbklkZW50IG15SWRlbnQpCi0gICAgICB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBFbWFpbEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLAotICAgICAgTWlzc2luZ09iamVjdEV4Y2VwdGlvbiwgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICBwdWJsaWMgc3RhdGljIENoYW5nZS5JZCByZXZlcnQoUmVmQ29udHJvbCByZWZDb250cm9sLCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAorICAgICAgSWRlbnRpZmllZFVzZXIgdXNlciwgQ29tbWl0VmFsaWRhdG9ycyBjb21taXRWYWxpZGF0b3JzLCBTdHJpbmcgbWVzc2FnZSwKKyAgICAgIFJldmlld0RiIGRiLCBSZXZlcnRlZFNlbmRlci5GYWN0b3J5IHJldmVydGVkU2VuZGVyRmFjdG9yeSwKKyAgICAgIENoYW5nZUhvb2tzIGhvb2tzLCBSZXBvc2l0b3J5IGdpdCwKKyAgICAgIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKKyAgICAgIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZ2l0UmVmVXBkYXRlZCwgUGVyc29uSWRlbnQgbXlJZGVudCwKKyAgICAgIFN0cmluZyBjYW5vbmljYWxXZWJVcmwpIHRocm93cyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sIEVtYWlsRXhjZXB0aW9uLAorICAgICAgT3JtRXhjZXB0aW9uLCBNaXNzaW5nT2JqZWN0RXhjZXB0aW9uLCBJbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uLAorICAgICAgSU9FeGNlcHRpb24sIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24gewogICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7CiAgICAgZmluYWwgUGF0Y2hTZXQgcGF0Y2ggPSBkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCk7CiAgICAgaWYgKHBhdGNoID09IG51bGwpIHsKICAgICAgIHRocm93IG5ldyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24oY2hhbmdlSWQpOwogICAgIH0KLQotICAgIGZpbmFsIFJlcG9zaXRvcnkgZ2l0OwotICAgIHRyeSB7Ci0gICAgICBnaXQgPSBnaXRNYW5hZ2VyLm9wZW5SZXBvc2l0b3J5KGRiLmNoYW5nZXMoKS5nZXQoY2hhbmdlSWQpLmdldFByb2plY3QoKSk7Ci0gICAgfSBjYXRjaCAoUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uIGUpIHsKLSAgICAgIHRocm93IG5ldyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24oY2hhbmdlSWQsIGUpOwotICAgIH0KKyAgICBmaW5hbCBDaGFuZ2UgY2hhbmdlVG9SZXZlcnQgPSBkYi5jaGFuZ2VzKCkuZ2V0KGNoYW5nZUlkKTsKIAogICAgIGZpbmFsIFJldldhbGsgcmV2V2FsayA9IG5ldyBSZXZXYWxrKGdpdCk7CiAgICAgdHJ5IHsKQEAgLTQ5NSw2ICsyMjgsMTIgQEAKICAgICAgIHJldmVydENvbW1pdEJ1aWxkZXIuc2V0QXV0aG9yKGF1dGhvcklkZW50KTsKICAgICAgIHJldmVydENvbW1pdEJ1aWxkZXIuc2V0Q29tbWl0dGVyKG15SWRlbnQpOwogCisgICAgICBpZiAobWVzc2FnZSA9PSBudWxsKSB7CisgICAgICAgIG1lc3NhZ2UgPSBNZXNzYWdlRm9ybWF0LmZvcm1hdCgKKyAgICAgICAgICAgIENoYW5nZU1lc3NhZ2VzLmdldCgpLnJldmVydENoYW5nZURlZmF1bHRNZXNzYWdlLAorICAgICAgICAgICAgY2hhbmdlVG9SZXZlcnQuZ2V0U3ViamVjdCgpLCBwYXRjaC5nZXRSZXZpc2lvbigpLmdldCgpKTsKKyAgICAgIH0KKwogICAgICAgZmluYWwgT2JqZWN0SWQgY29tcHV0ZWRDaGFuZ2VJZCA9CiAgICAgICAgICAgQ2hhbmdlSWRVdGlsLmNvbXB1dGVDaGFuZ2VJZChwYXJlbnRUb0NvbW1pdFRvUmV2ZXJ0LmdldFRyZWUoKSwKICAgICAgICAgICAgICAgY29tbWl0VG9SZXZlcnQsIGF1dGhvcklkZW50LCBteUlkZW50LCBtZXNzYWdlKTsKQEAgLTUxNCwxNCArMjUzLDI4IEBACiAgICAgICAgICAgbmV3IENoYW5nZS5LZXkoIkkiICsgY29tcHV0ZWRDaGFuZ2VJZC5uYW1lKCkpLAogICAgICAgICAgIG5ldyBDaGFuZ2UuSWQoZGIubmV4dENoYW5nZUlkKCkpLAogICAgICAgICAgIHVzZXIuZ2V0QWNjb3VudElkKCksCi0gICAgICAgICAgZGIuY2hhbmdlcygpLmdldChjaGFuZ2VJZCkuZ2V0RGVzdCgpKTsKLSAgICAgIGNoYW5nZS5uZXh0UGF0Y2hTZXRJZCgpOworICAgICAgICAgIGNoYW5nZVRvUmV2ZXJ0LmdldERlc3QoKSk7CisgICAgICBjaGFuZ2Uuc2V0VG9waWMoY2hhbmdlVG9SZXZlcnQuZ2V0VG9waWMoKSk7CiAKLSAgICAgIGZpbmFsIFBhdGNoU2V0IHBzID0gbmV3IFBhdGNoU2V0KGNoYW5nZS5jdXJyUGF0Y2hTZXRJZCgpKTsKKyAgICAgIFBhdGNoU2V0LklkIGlkID0KKyAgICAgICAgICBuZXcgUGF0Y2hTZXQuSWQoY2hhbmdlLmdldElkKCksIENoYW5nZS5JTklUSUFMX1BBVENIX1NFVF9JRCk7CisgICAgICBmaW5hbCBQYXRjaFNldCBwcyA9IG5ldyBQYXRjaFNldChpZCk7CiAgICAgICBwcy5zZXRDcmVhdGVkT24oY2hhbmdlLmdldENyZWF0ZWRPbigpKTsKICAgICAgIHBzLnNldFVwbG9hZGVyKGNoYW5nZS5nZXRPd25lcigpKTsKICAgICAgIHBzLnNldFJldmlzaW9uKG5ldyBSZXZJZChyZXZlcnRDb21taXQubmFtZSgpKSk7CiAKKyAgICAgIENvbW1pdFJlY2VpdmVkRXZlbnQgY29tbWl0UmVjZWl2ZWRFdmVudCA9CisgICAgICAgICAgbmV3IENvbW1pdFJlY2VpdmVkRXZlbnQobmV3IFJlY2VpdmVDb21tYW5kKE9iamVjdElkLnplcm9JZCgpLAorICAgICAgICAgICAgICByZXZlcnRDb21taXQuZ2V0SWQoKSwgcHMuZ2V0UmVmTmFtZSgpKSwgcmVmQ29udHJvbAorICAgICAgICAgICAgICAuZ2V0UHJvamVjdENvbnRyb2woKS5nZXRQcm9qZWN0KCksIHJlZkNvbnRyb2wuZ2V0UmVmTmFtZSgpLAorICAgICAgICAgICAgICByZXZlcnRDb21taXQsIHVzZXIpOworCisgICAgICB0cnkgeworICAgICAgICBjb21taXRWYWxpZGF0b3JzLnZhbGlkYXRlRm9yR2Vycml0Q29tbWl0cyhjb21taXRSZWNlaXZlZEV2ZW50KTsKKyAgICAgIH0gY2F0Y2ggKENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgICB9CisKICAgICAgIGNoYW5nZS5zZXRDdXJyZW50UGF0Y2hTZXQocGF0Y2hTZXRJbmZvRmFjdG9yeS5nZXQocmV2ZXJ0Q29tbWl0LCBwcy5nZXRJZCgpKSk7CiAgICAgICBDaGFuZ2VVdGlsLnVwZGF0ZWQoY2hhbmdlKTsKIApAQCAtNTM0LDcgKzI4Nyw3IEBACiAgICAgICAgICAgICAiRmFpbGVkIHRvIGNyZWF0ZSByZWYgJXMgaW4gJXM6ICVzIiwgcHMuZ2V0UmVmTmFtZSgpLAogICAgICAgICAgICAgY2hhbmdlLmdldERlc3QoKS5nZXRQYXJlbnRLZXkoKS5nZXQoKSwgcnUuZ2V0UmVzdWx0KCkpKTsKICAgICAgIH0KLSAgICAgIHJlcGxpY2F0aW9uLmZpcmUoY2hhbmdlLmdldFByb2plY3QoKSwgcnUuZ2V0TmFtZSgpKTsKKyAgICAgIGdpdFJlZlVwZGF0ZWQuZmlyZShjaGFuZ2UuZ2V0UHJvamVjdCgpLCBydSk7CiAKICAgICAgIGRiLmNoYW5nZXMoKS5iZWdpblRyYW5zYWN0aW9uKGNoYW5nZS5nZXRJZCgpKTsKICAgICAgIHRyeSB7CkBAIC01NjcsMTMgKzMyMCwxNjUgQEAKICAgICAgIHJldHVybiBjaGFuZ2UuZ2V0SWQoKTsKICAgICB9IGZpbmFsbHkgewogICAgICAgcmV2V2Fsay5yZWxlYXNlKCk7Ci0gICAgICBnaXQuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgc3RhdGljIENoYW5nZS5JZCBlZGl0Q29tbWl0TWVzc2FnZShmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAorICAgICAgZmluYWwgUmVmQ29udHJvbCByZWZDb250cm9sLCBDb21taXRWYWxpZGF0b3JzIGNvbW1pdFZhbGlkYXRvcnMsCisgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyLCBmaW5hbCBTdHJpbmcgbWVzc2FnZSwgZmluYWwgUmV2aWV3RGIgZGIsCisgICAgICBmaW5hbCBDb21taXRNZXNzYWdlRWRpdGVkU2VuZGVyLkZhY3RvcnkgY29tbWl0TWVzc2FnZUVkaXRlZFNlbmRlckZhY3RvcnksCisgICAgICBmaW5hbCBDaGFuZ2VIb29rcyBob29rcywgUmVwb3NpdG9yeSBnaXQsCisgICAgICBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3RvcnksCisgICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQsIFBlcnNvbklkZW50IG15SWRlbnQsCisgICAgICBmaW5hbCBBcHByb3ZhbHNVdGlsIGFwcHJvdmFsc1V0aWwsIGZpbmFsIFRyYWNraW5nRm9vdGVycyB0cmFja2luZ0Zvb3RlcnMpCisgICAgICB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBFbWFpbEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLAorICAgICAgTWlzc2luZ09iamVjdEV4Y2VwdGlvbiwgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sCisgICAgICBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uLCBQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24geworICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7CisgICAgZmluYWwgUGF0Y2hTZXQgb3JpZ2luYWxQUyA9IGRiLnBhdGNoU2V0cygpLmdldChwYXRjaFNldElkKTsKKyAgICBpZiAob3JpZ2luYWxQUyA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uKGNoYW5nZUlkKTsKKyAgICB9CisKKyAgICBpZiAobWVzc2FnZSA9PSBudWxsIHx8IG1lc3NhZ2UubGVuZ3RoKCkgPT0gMCkgeworICAgICAgdGhyb3cgbmV3IEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24oIlRoZSBjb21taXQgbWVzc2FnZSBjYW5ub3QgYmUgZW1wdHkiKTsKKyAgICB9CisKKyAgICBmaW5hbCBSZXZXYWxrIHJldldhbGsgPSBuZXcgUmV2V2FsayhnaXQpOworICAgIHRyeSB7CisgICAgICBSZXZDb21taXQgY29tbWl0ID0KKyAgICAgICAgICByZXZXYWxrLnBhcnNlQ29tbWl0KE9iamVjdElkLmZyb21TdHJpbmcob3JpZ2luYWxQUy5nZXRSZXZpc2lvbigpLmdldCgpKSk7CisgICAgICBpZiAoY29tbWl0LmdldEZ1bGxNZXNzYWdlKCkuZXF1YWxzKG1lc3NhZ2UpKSB7CisgICAgICAgIHRocm93IG5ldyBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uKCJOZXcgY29tbWl0IG1lc3NhZ2UgY2Fubm90IGJlIHNhbWUgYXMgZXhpc3RpbmcgY29tbWl0IG1lc3NhZ2UiKTsKKyAgICAgIH0KKworICAgICAgRGF0ZSBub3cgPSBteUlkZW50LmdldFdoZW4oKTsKKyAgICAgIENoYW5nZSBjaGFuZ2UgPSBkYi5jaGFuZ2VzKCkuZ2V0KGNoYW5nZUlkKTsKKyAgICAgIFBlcnNvbklkZW50IGF1dGhvcklkZW50ID0KKyAgICAgICAgICB1c2VyLm5ld0NvbW1pdHRlcklkZW50KG5vdywgbXlJZGVudC5nZXRUaW1lWm9uZSgpKTsKKworICAgICAgQ29tbWl0QnVpbGRlciBjb21taXRCdWlsZGVyID0gbmV3IENvbW1pdEJ1aWxkZXIoKTsKKyAgICAgIGNvbW1pdEJ1aWxkZXIuc2V0VHJlZUlkKGNvbW1pdC5nZXRUcmVlKCkpOworICAgICAgY29tbWl0QnVpbGRlci5zZXRQYXJlbnRJZHMoY29tbWl0LmdldFBhcmVudHMoKSk7CisgICAgICBjb21taXRCdWlsZGVyLnNldEF1dGhvcihjb21taXQuZ2V0QXV0aG9ySWRlbnQoKSk7CisgICAgICBjb21taXRCdWlsZGVyLnNldENvbW1pdHRlcihhdXRob3JJZGVudCk7CisgICAgICBjb21taXRCdWlsZGVyLnNldE1lc3NhZ2UobWVzc2FnZSk7CisKKyAgICAgIFJldkNvbW1pdCBuZXdDb21taXQ7CisgICAgICBmaW5hbCBPYmplY3RJbnNlcnRlciBvaSA9IGdpdC5uZXdPYmplY3RJbnNlcnRlcigpOworICAgICAgdHJ5IHsKKyAgICAgICAgT2JqZWN0SWQgaWQgPSBvaS5pbnNlcnQoY29tbWl0QnVpbGRlcik7CisgICAgICAgIG9pLmZsdXNoKCk7CisgICAgICAgIG5ld0NvbW1pdCA9IHJldldhbGsucGFyc2VDb21taXQoaWQpOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgb2kucmVsZWFzZSgpOworICAgICAgfQorCisgICAgICBQYXRjaFNldC5JZCBpZCA9IG5leHRQYXRjaFNldElkKGdpdCwgY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpOworICAgICAgZmluYWwgUGF0Y2hTZXQgbmV3UGF0Y2hTZXQgPSBuZXcgUGF0Y2hTZXQoaWQpOworICAgICAgbmV3UGF0Y2hTZXQuc2V0Q3JlYXRlZE9uKG5ldyBUaW1lc3RhbXAobm93LmdldFRpbWUoKSkpOworICAgICAgbmV3UGF0Y2hTZXQuc2V0VXBsb2FkZXIodXNlci5nZXRBY2NvdW50SWQoKSk7CisgICAgICBuZXdQYXRjaFNldC5zZXRSZXZpc2lvbihuZXcgUmV2SWQobmV3Q29tbWl0Lm5hbWUoKSkpOworICAgICAgbmV3UGF0Y2hTZXQuc2V0RHJhZnQob3JpZ2luYWxQUy5pc0RyYWZ0KCkpOworCisgICAgICBmaW5hbCBQYXRjaFNldEluZm8gaW5mbyA9CisgICAgICAgICAgcGF0Y2hTZXRJbmZvRmFjdG9yeS5nZXQobmV3Q29tbWl0LCBuZXdQYXRjaFNldC5nZXRJZCgpKTsKKworICAgICAgQ29tbWl0UmVjZWl2ZWRFdmVudCBjb21taXRSZWNlaXZlZEV2ZW50ID0KKyAgICAgICAgICBuZXcgQ29tbWl0UmVjZWl2ZWRFdmVudChuZXcgUmVjZWl2ZUNvbW1hbmQoT2JqZWN0SWQuemVyb0lkKCksCisgICAgICAgICAgICAgIG5ld0NvbW1pdC5nZXRJZCgpLCBuZXdQYXRjaFNldC5nZXRSZWZOYW1lKCkpLCByZWZDb250cm9sCisgICAgICAgICAgICAgIC5nZXRQcm9qZWN0Q29udHJvbCgpLmdldFByb2plY3QoKSwgcmVmQ29udHJvbC5nZXRSZWZOYW1lKCksCisgICAgICAgICAgICAgIG5ld0NvbW1pdCwgdXNlcik7CisKKyAgICAgIHRyeSB7CisgICAgICAgIGNvbW1pdFZhbGlkYXRvcnMudmFsaWRhdGVGb3JSZWNlaXZlQ29tbWl0cyhjb21taXRSZWNlaXZlZEV2ZW50KTsKKyAgICAgIH0gY2F0Y2ggKENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgICB9CisKKyAgICAgIGZpbmFsIFJlZlVwZGF0ZSBydSA9IGdpdC51cGRhdGVSZWYobmV3UGF0Y2hTZXQuZ2V0UmVmTmFtZSgpKTsKKyAgICAgIHJ1LnNldEV4cGVjdGVkT2xkT2JqZWN0SWQoT2JqZWN0SWQuemVyb0lkKCkpOworICAgICAgcnUuc2V0TmV3T2JqZWN0SWQobmV3Q29tbWl0KTsKKyAgICAgIHJ1LmRpc2FibGVSZWZMb2coKTsKKyAgICAgIGlmIChydS51cGRhdGUocmV2V2FsaykgIT0gUmVmVXBkYXRlLlJlc3VsdC5ORVcpIHsKKyAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAiRmFpbGVkIHRvIGNyZWF0ZSByZWYgJXMgaW4gJXM6ICVzIiwgbmV3UGF0Y2hTZXQuZ2V0UmVmTmFtZSgpLAorICAgICAgICAgICAgY2hhbmdlLmdldERlc3QoKS5nZXRQYXJlbnRLZXkoKS5nZXQoKSwgcnUuZ2V0UmVzdWx0KCkpKTsKKyAgICAgIH0KKyAgICAgIGdpdFJlZlVwZGF0ZWQuZmlyZShjaGFuZ2UuZ2V0UHJvamVjdCgpLCBydSk7CisKKyAgICAgIGRiLmNoYW5nZXMoKS5iZWdpblRyYW5zYWN0aW9uKGNoYW5nZS5nZXRJZCgpKTsKKyAgICAgIHRyeSB7CisgICAgICAgIENoYW5nZSB1cGRhdGVkQ2hhbmdlID0gZGIuY2hhbmdlcygpLmdldChjaGFuZ2UuZ2V0SWQoKSk7CisgICAgICAgIGlmICh1cGRhdGVkQ2hhbmdlICE9IG51bGwgJiYgdXBkYXRlZENoYW5nZS5nZXRTdGF0dXMoKS5pc09wZW4oKSkgeworICAgICAgICAgIGNoYW5nZSA9IHVwZGF0ZWRDaGFuZ2U7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgdGhyb3cgbmV3IEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAgICAgIkNoYW5nZSAlcyBpcyBjbG9zZWQiLCBjaGFuZ2UuZ2V0SWQoKSkpOworICAgICAgICB9CisKKyAgICAgICAgQ2hhbmdlVXRpbC5pbnNlcnRBbmNlc3RvcnMoZGIsIG5ld1BhdGNoU2V0LmdldElkKCksIGNvbW1pdCk7CisgICAgICAgIGRiLnBhdGNoU2V0cygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3UGF0Y2hTZXQpKTsKKyAgICAgICAgdXBkYXRlZENoYW5nZSA9CisgICAgICAgICAgICBkYi5jaGFuZ2VzKCkuYXRvbWljVXBkYXRlKGNoYW5nZS5nZXRJZCgpLCBuZXcgQXRvbWljVXBkYXRlPENoYW5nZT4oKSB7CisgICAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgICBwdWJsaWMgQ2hhbmdlIHVwZGF0ZShDaGFuZ2UgY2hhbmdlKSB7CisgICAgICAgICAgICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKS5pc0Nsb3NlZCgpKSB7CisgICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKCFjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKS5lcXVhbHMocGF0Y2hTZXRJZCkpIHsKKyAgICAgICAgICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpICE9IENoYW5nZS5TdGF0dXMuRFJBRlQpIHsKKyAgICAgICAgICAgICAgICAgIGNoYW5nZS5zZXRTdGF0dXMoQ2hhbmdlLlN0YXR1cy5ORVcpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBjaGFuZ2Uuc2V0TGFzdFNoYTFNZXJnZVRlc3RlZChudWxsKTsKKyAgICAgICAgICAgICAgICBjaGFuZ2Uuc2V0Q3VycmVudFBhdGNoU2V0KGluZm8pOworICAgICAgICAgICAgICAgIENoYW5nZVV0aWwudXBkYXRlZChjaGFuZ2UpOworICAgICAgICAgICAgICAgIHJldHVybiBjaGFuZ2U7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pOworICAgICAgICBpZiAodXBkYXRlZENoYW5nZSAhPSBudWxsKSB7CisgICAgICAgICAgY2hhbmdlID0gdXBkYXRlZENoYW5nZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgICAiQ2hhbmdlICVzIHdhcyBtb2RpZmllZCIsIGNoYW5nZS5nZXRJZCgpKSk7CisgICAgICAgIH0KKworICAgICAgICBhcHByb3ZhbHNVdGlsLmNvcHlWZXRvc1RvUGF0Y2hTZXQoZGIsCisgICAgICAgICAgICByZWZDb250cm9sLmdldFByb2plY3RDb250cm9sKCkuZ2V0TGFiZWxUeXBlcygpLAorICAgICAgICAgICAgY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpOworCisgICAgICAgIGZpbmFsIExpc3Q8Rm9vdGVyTGluZT4gZm9vdGVyTGluZXMgPSBuZXdDb21taXQuZ2V0Rm9vdGVyTGluZXMoKTsKKyAgICAgICAgdXBkYXRlVHJhY2tpbmdJZHMoZGIsIGNoYW5nZSwgdHJhY2tpbmdGb290ZXJzLCBmb290ZXJMaW5lcyk7CisKKyAgICAgICAgZmluYWwgQ2hhbmdlTWVzc2FnZSBjbXNnID0KKyAgICAgICAgICAgIG5ldyBDaGFuZ2VNZXNzYWdlKG5ldyBDaGFuZ2VNZXNzYWdlLktleShjaGFuZ2VJZCwKKyAgICAgICAgICAgICAgICBDaGFuZ2VVdGlsLm1lc3NhZ2VVVUlEKGRiKSksIHVzZXIuZ2V0QWNjb3VudElkKCksIHBhdGNoU2V0SWQpOworICAgICAgICBmaW5hbCBTdHJpbmcgbXNnID0gIlBhdGNoIFNldCAiICsgbmV3UGF0Y2hTZXQuZ2V0UGF0Y2hTZXRJZCgpICsgIjogQ29tbWl0IG1lc3NhZ2Ugd2FzIHVwZGF0ZWQiOworICAgICAgICBjbXNnLnNldE1lc3NhZ2UobXNnKTsKKyAgICAgICAgZGIuY2hhbmdlTWVzc2FnZXMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGNtc2cpKTsKKyAgICAgICAgZGIuY29tbWl0KCk7CisKKyAgICAgICAgZmluYWwgQ29tbWl0TWVzc2FnZUVkaXRlZFNlbmRlciBjbSA9IGNvbW1pdE1lc3NhZ2VFZGl0ZWRTZW5kZXJGYWN0b3J5LmNyZWF0ZShjaGFuZ2UpOworICAgICAgICBjbS5zZXRGcm9tKHVzZXIuZ2V0QWNjb3VudElkKCkpOworICAgICAgICBjbS5zZXRDaGFuZ2VNZXNzYWdlKGNtc2cpOworICAgICAgICBjbS5zZW5kKCk7CisgICAgICB9IGZpbmFsbHkgeworICAgICAgICBkYi5yb2xsYmFjaygpOworICAgICAgfQorCisgICAgICBob29rcy5kb1BhdGNoc2V0Q3JlYXRlZEhvb2soY2hhbmdlLCBuZXdQYXRjaFNldCwgZGIpOworCisgICAgICByZXR1cm4gY2hhbmdlLmdldElkKCk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIHJldldhbGsucmVsZWFzZSgpOwogICAgIH0KICAgfQogCiAgIHB1YmxpYyBzdGF0aWMgdm9pZCBkZWxldGVEcmFmdENoYW5nZShmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAogICAgICAgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlciwKLSAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb24sIGZpbmFsIFJldmlld0RiIGRiKQorICAgICAgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkLCBmaW5hbCBSZXZpZXdEYiBkYikKICAgICAgIHRocm93cyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewogICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7CiAgICAgZmluYWwgQ2hhbmdlIGNoYW5nZSA9IGRiLmNoYW5nZXMoKS5nZXQoY2hhbmdlSWQpOwpAQCAtNTgzLDcgKzQ4OCw3IEBACiAKICAgICBmb3IgKFBhdGNoU2V0IHBzIDogZGIucGF0Y2hTZXRzKCkuYnlDaGFuZ2UoY2hhbmdlSWQpKSB7CiAgICAgICAvLyBUaGVzZSBzaG91bGQgYWxsIGJlIGRyYWZ0IHBhdGNoIHNldHMuCi0gICAgICBkZWxldGVPbmx5RHJhZnRQYXRjaFNldChwcywgY2hhbmdlLCBnaXRNYW5hZ2VyLCByZXBsaWNhdGlvbiwgZGIpOworICAgICAgZGVsZXRlT25seURyYWZ0UGF0Y2hTZXQocHMsIGNoYW5nZSwgZ2l0TWFuYWdlciwgZ2l0UmVmVXBkYXRlZCwgZGIpOwogICAgIH0KIAogICAgIGRiLmNoYW5nZU1lc3NhZ2VzKCkuZGVsZXRlKGRiLmNoYW5nZU1lc3NhZ2VzKCkuYnlDaGFuZ2UoY2hhbmdlSWQpKTsKQEAgLTU5NCw3ICs0OTksNyBAQAogCiAgIHB1YmxpYyBzdGF0aWMgdm9pZCBkZWxldGVPbmx5RHJhZnRQYXRjaFNldChmaW5hbCBQYXRjaFNldCBwYXRjaCwKICAgICAgIGZpbmFsIENoYW5nZSBjaGFuZ2UsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIGdpdE1hbmFnZXIsCi0gICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uLCBmaW5hbCBSZXZpZXdEYiBkYikKKyAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZ2l0UmVmVXBkYXRlZCwgZmluYWwgUmV2aWV3RGIgZGIpCiAgICAgICB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKICAgICBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkID0gcGF0Y2guZ2V0SWQoKTsKICAgICBpZiAocGF0Y2ggPT0gbnVsbCB8fCAhcGF0Y2guaXNEcmFmdCgpKSB7CkBAIC02MTcsNyArNTIyLDcgQEAKICAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIkZhaWxlZCB0byBkZWxldGUgcmVmICIgKyBwYXRjaC5nZXRSZWZOYW1lKCkgKwogICAgICAgICAgICAgICAiIGluICIgKyByZXBvLmdldERpcmVjdG9yeSgpICsgIjogIiArIHVwZGF0ZS5nZXRSZXN1bHQoKSk7CiAgICAgICB9Ci0gICAgICByZXBsaWNhdGlvbi5maXJlKGNoYW5nZS5nZXRQcm9qZWN0KCksIHVwZGF0ZS5nZXROYW1lKCkpOworICAgICAgZ2l0UmVmVXBkYXRlZC5maXJlKGNoYW5nZS5nZXRQcm9qZWN0KCksIHVwZGF0ZSk7CiAgICAgfSBmaW5hbGx5IHsKICAgICAgIHJlcG8uY2xvc2UoKTsKICAgICB9CkBAIC02MzEsMjUgKzUzNiw2IEBACiAgICAgZGIucGF0Y2hTZXRzKCkuZGVsZXRlKENvbGxlY3Rpb25zLnNpbmdsZXRvbihwYXRjaCkpOwogICB9CiAKLSAgcHVibGljIHN0YXRpYyA8VCBleHRlbmRzIFJlcGx5VG9DaGFuZ2VTZW5kZXI+IHZvaWQgdXBkYXRlZENoYW5nZSgKLSAgICAgIGZpbmFsIFJldmlld0RiIGRiLCBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyLCBmaW5hbCBDaGFuZ2UgY2hhbmdlLAotICAgICAgZmluYWwgQ2hhbmdlTWVzc2FnZSBjbXNnLCBSZXBseVRvQ2hhbmdlU2VuZGVyLkZhY3Rvcnk8VD4gc2VuZGVyRmFjdG9yeSkKLSAgICAgIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIGRiLmNoYW5nZU1lc3NhZ2VzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihjbXNnKSk7Ci0KLSAgICBuZXcgQXBwcm92YWxzVXRpbChkYiwgbnVsbCkuc3luY0NoYW5nZVN0YXR1cyhjaGFuZ2UpOwotCi0gICAgLy8gRW1haWwgdGhlIHJldmlld2VycwotICAgIHRyeSB7Ci0gICAgICBmaW5hbCBSZXBseVRvQ2hhbmdlU2VuZGVyIGNtID0gc2VuZGVyRmFjdG9yeS5jcmVhdGUoY2hhbmdlKTsKLSAgICAgIGNtLnNldEZyb20odXNlci5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICBjbS5zZXRDaGFuZ2VNZXNzYWdlKGNtc2cpOwotICAgICAgY20uc2VuZCgpOwotICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0gICAgICBsb2cuZXJyb3IoIkNhbm5vdCBlbWFpbCB1cGRhdGUgZm9yIGNoYW5nZSAiICsgY2hhbmdlLmdldENoYW5nZUlkKCksIGUpOwotICAgIH0KLSAgfQotCiAgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIHNvcnRLZXkobG9uZyBsYXN0VXBkYXRlZCwgaW50IGlkKXsKICAgICAvLyBUaGUgZW5jb2RpbmcgdXNlcyBtaW51dGVzIHNpbmNlIFdlZCBPY3QgMSAwMDowMDowMCAyMDA4IFVUQy4KICAgICAvLyBXZSBvdmVycnVuIGFwcHJveGltYXRlbHkgNCwwODUgeWVhcnMgbGF0ZXIsIHNvIH42MDkzLgpAQCAtNjY4LDYgKzU1NCwyMyBAQAogICAgIGMuc2V0U29ydEtleShzb3J0S2V5KGxhc3RVcGRhdGVkLCBpZCkpOwogICB9CiAKKyAgcHVibGljIHN0YXRpYyBQYXRjaFNldC5JZCBuZXh0UGF0Y2hTZXRJZChNYXA8U3RyaW5nLCBSZWY+IGFsbFJlZnMsCisgICAgICBQYXRjaFNldC5JZCBpZCkgeworICAgIFBhdGNoU2V0LklkIG5leHQgPSBuZXh0UGF0Y2hTZXRJZChpZCk7CisgICAgd2hpbGUgKGFsbFJlZnMuY29udGFpbnNLZXkobmV4dC50b1JlZk5hbWUoKSkpIHsKKyAgICAgIG5leHQgPSBuZXh0UGF0Y2hTZXRJZChuZXh0KTsKKyAgICB9CisgICAgcmV0dXJuIG5leHQ7CisgIH0KKworICBwdWJsaWMgc3RhdGljIFBhdGNoU2V0LklkIG5leHRQYXRjaFNldElkKFJlcG9zaXRvcnkgZ2l0LCBQYXRjaFNldC5JZCBpZCkgeworICAgIHJldHVybiBuZXh0UGF0Y2hTZXRJZChnaXQuZ2V0QWxsUmVmcygpLCBpZCk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBQYXRjaFNldC5JZCBuZXh0UGF0Y2hTZXRJZChQYXRjaFNldC5JZCBpZCkgeworICAgIHJldHVybiBuZXcgUGF0Y2hTZXQuSWQoaWQuZ2V0UGFyZW50S2V5KCksIGlkLmdldCgpICsgMSk7CisgIH0KKwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBjaGFyW10gaGV4Y2hhciA9CiAgICAgICB7JzAnLCAnMScsICcyJywgJzMnLCAnNCcsICc1JywgJzYnLCAnNycsICc4JywgJzknLCAvLwogICAgICAgICAgICdhJywgJ2InLCAnYycsICdkJywgJ2UnLCAnZid9OwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9DdXJyZW50VXNlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9DdXJyZW50VXNlci5qYXZhCmluZGV4IGYwNTdjM2EuLjg2YTZlZjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvQ3VycmVudFVzZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL0N1cnJlbnRVc2VyLmphdmEKQEAgLTMzLDE1ICszMywxMiBAQAogICovCiBwdWJsaWMgYWJzdHJhY3QgY2xhc3MgQ3VycmVudFVzZXIgewogICBwcml2YXRlIGZpbmFsIENhcGFiaWxpdHlDb250cm9sLkZhY3RvcnkgY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIEFjY2Vzc1BhdGggYWNjZXNzUGF0aDsKKyAgcHJpdmF0ZSBBY2Nlc3NQYXRoIGFjY2Vzc1BhdGggPSBBY2Nlc3NQYXRoLlVOS05PV047CiAKICAgcHJpdmF0ZSBDYXBhYmlsaXR5Q29udHJvbCBjYXBhYmlsaXRpZXM7CiAKLSAgcHJvdGVjdGVkIEN1cnJlbnRVc2VyKAotICAgICAgQ2FwYWJpbGl0eUNvbnRyb2wuRmFjdG9yeSBjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksCi0gICAgICBBY2Nlc3NQYXRoIGFjY2Vzc1BhdGgpIHsKKyAgcHJvdGVjdGVkIEN1cnJlbnRVc2VyKENhcGFiaWxpdHlDb250cm9sLkZhY3RvcnkgY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5KSB7CiAgICAgdGhpcy5jYXBhYmlsaXR5Q29udHJvbEZhY3RvcnkgPSBjYXBhYmlsaXR5Q29udHJvbEZhY3Rvcnk7Ci0gICAgdGhpcy5hY2Nlc3NQYXRoID0gYWNjZXNzUGF0aDsKICAgfQogCiAgIC8qKiBIb3cgdGhpcyB1c2VyIGlzIGFjY2Vzc2luZyB0aGUgR2Vycml0IENvZGUgUmV2aWV3IGFwcGxpY2F0aW9uLiAqLwpAQCAtNDksNiArNDYsMTAgQEAKICAgICByZXR1cm4gYWNjZXNzUGF0aDsKICAgfQogCisgIHB1YmxpYyB2b2lkIHNldEFjY2Vzc1BhdGgoQWNjZXNzUGF0aCBwYXRoKSB7CisgICAgYWNjZXNzUGF0aCA9IHBhdGg7CisgIH0KKwogICAvKioKICAgICogR2V0IHRoZSBzZXQgb2YgZ3JvdXBzIHRoZSB1c2VyIGlzIGN1cnJlbnRseSBhIG1lbWJlciBvZi4KICAgICogPHA+CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL0lkZW50aWZpZWRVc2VyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL0lkZW50aWZpZWRVc2VyLmphdmEKaW5kZXggODljYmFjMS4uMzgyNjI5MyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9JZGVudGlmaWVkVXNlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvSWRlbnRpZmllZFVzZXIuamF2YQpAQCAtMzgsNiArMzgsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lk91dE9mU2NvcGVFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LnV0aWwuUHJvdmlkZXJzOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUGVyc29uSWRlbnQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLlN5c3RlbVJlYWRlcjsKQEAgLTkwLDIwICs5MSwxOSBAQAogICAgIH0KIAogICAgIHB1YmxpYyBJZGVudGlmaWVkVXNlciBjcmVhdGUoZmluYWwgQWNjb3VudC5JZCBpZCkgewotICAgICAgcmV0dXJuIGNyZWF0ZShBY2Nlc3NQYXRoLlVOS05PV04sIG51bGwsIGlkKTsKKyAgICAgIHJldHVybiBjcmVhdGUoKFNvY2tldEFkZHJlc3MpIG51bGwsIGlkKTsKICAgICB9CiAKICAgICBwdWJsaWMgSWRlbnRpZmllZFVzZXIgY3JlYXRlKFByb3ZpZGVyPFJldmlld0RiPiBkYiwgQWNjb3VudC5JZCBpZCkgewotICAgICAgcmV0dXJuIG5ldyBJZGVudGlmaWVkVXNlcihjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksIEFjY2Vzc1BhdGguVU5LTk9XTiwKKyAgICAgIHJldHVybiBuZXcgSWRlbnRpZmllZFVzZXIoY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5LAogICAgICAgICAgIGF1dGhDb25maWcsIGFub255bW91c0Nvd2FyZE5hbWUsIGNhbm9uaWNhbFVybCwgcmVhbG0sIGFjY291bnRDYWNoZSwKICAgICAgICAgICBncm91cEJhY2tlbmQsIG51bGwsIGRiLCBpZCk7CiAgICAgfQogCi0gICAgcHVibGljIElkZW50aWZpZWRVc2VyIGNyZWF0ZShBY2Nlc3NQYXRoIGFjY2Vzc1BhdGgsCi0gICAgICAgIFByb3ZpZGVyPFNvY2tldEFkZHJlc3M+IHJlbW90ZVBlZXJQcm92aWRlciwgQWNjb3VudC5JZCBpZCkgewotICAgICAgcmV0dXJuIG5ldyBJZGVudGlmaWVkVXNlcihjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksIGFjY2Vzc1BhdGgsCisgICAgcHVibGljIElkZW50aWZpZWRVc2VyIGNyZWF0ZShTb2NrZXRBZGRyZXNzIHJlbW90ZVBlZXIsIEFjY291bnQuSWQgaWQpIHsKKyAgICAgIHJldHVybiBuZXcgSWRlbnRpZmllZFVzZXIoY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5LAogICAgICAgICAgIGF1dGhDb25maWcsIGFub255bW91c0Nvd2FyZE5hbWUsIGNhbm9uaWNhbFVybCwgcmVhbG0sIGFjY291bnRDYWNoZSwKLSAgICAgICAgICBncm91cEJhY2tlbmQsIHJlbW90ZVBlZXJQcm92aWRlciwgbnVsbCwgaWQpOworICAgICAgICAgIGdyb3VwQmFja2VuZCwgUHJvdmlkZXJzLm9mKHJlbW90ZVBlZXIpLCBudWxsLCBpZCk7CiAgICAgfQogICB9CiAKQEAgLTE0OSw5ICsxNDksOCBAQAogICAgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKICAgICB9CiAKLSAgICBwdWJsaWMgSWRlbnRpZmllZFVzZXIgY3JlYXRlKGZpbmFsIEFjY2Vzc1BhdGggYWNjZXNzUGF0aCwKLSAgICAgICAgZmluYWwgQWNjb3VudC5JZCBpZCkgewotICAgICAgcmV0dXJuIG5ldyBJZGVudGlmaWVkVXNlcihjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksIGFjY2Vzc1BhdGgsCisgICAgcHVibGljIElkZW50aWZpZWRVc2VyIGNyZWF0ZShBY2NvdW50LklkIGlkKSB7CisgICAgICByZXR1cm4gbmV3IElkZW50aWZpZWRVc2VyKGNhcGFiaWxpdHlDb250cm9sRmFjdG9yeSwKICAgICAgICAgICBhdXRoQ29uZmlnLCBhbm9ueW1vdXNDb3dhcmROYW1lLCBjYW5vbmljYWxVcmwsIHJlYWxtLCBhY2NvdW50Q2FjaGUsCiAgICAgICAgICAgZ3JvdXBCYWNrZW5kLCByZW1vdGVQZWVyUHJvdmlkZXIsIGRiUHJvdmlkZXIsIGlkKTsKICAgICB9CkBAIC0xODcsNyArMTg2LDYgQEAKIAogICBwcml2YXRlIElkZW50aWZpZWRVc2VyKAogICAgICAgQ2FwYWJpbGl0eUNvbnRyb2wuRmFjdG9yeSBjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksCi0gICAgICBmaW5hbCBBY2Nlc3NQYXRoIGFjY2Vzc1BhdGgsCiAgICAgICBmaW5hbCBBdXRoQ29uZmlnIGF1dGhDb25maWcsCiAgICAgICBmaW5hbCBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwKICAgICAgIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gY2Fub25pY2FsVXJsLApAQCAtMTk1LDcgKzE5Myw3IEBACiAgICAgICBmaW5hbCBHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kLAogICAgICAgQE51bGxhYmxlIGZpbmFsIFByb3ZpZGVyPFNvY2tldEFkZHJlc3M+IHJlbW90ZVBlZXJQcm92aWRlciwKICAgICAgIEBOdWxsYWJsZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlciwgZmluYWwgQWNjb3VudC5JZCBpZCkgewotICAgIHN1cGVyKGNhcGFiaWxpdHlDb250cm9sRmFjdG9yeSwgYWNjZXNzUGF0aCk7CisgICAgc3VwZXIoY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5KTsKICAgICB0aGlzLmNhbm9uaWNhbFVybCA9IGNhbm9uaWNhbFVybDsKICAgICB0aGlzLmFjY291bnRDYWNoZSA9IGFjY291bnRDYWNoZTsKICAgICB0aGlzLmdyb3VwQmFja2VuZCA9IGdyb3VwQmFja2VuZDsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvSW50ZXJuYWxVc2VyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL0ludGVybmFsVXNlci5qYXZhCmluZGV4IGViYTU5YzguLjZmNTYxOGIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvSW50ZXJuYWxVc2VyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9JbnRlcm5hbFVzZXIuamF2YQpAQCAtMzEsNiArMzEsOCBAQAogICogYW55dGhpbmcgaXQgd2FudHMsIGFueXRpbWUgaXQgd2FudHMsIGdpdmVuIHRoZSBKVk0ncyBvd24gZGlyZWN0IGFjY2VzcyB0bwogICogZGF0YS4gUGx1Z2lucyBtYXkgdXNlIHRoaXMgd2hlbiB0aGV5IG5lZWQgdG8gaGF2ZSBhIEN1cnJlbnRVc2VyIHdpdGggcmVhZAogICogcGVybWlzc2lvbiBvbiBhbnl0aGluZy4KKyAqCisgKiBAc2VlIFBsdWdpblVzZXIKICAqLwogcHVibGljIGNsYXNzIEludGVybmFsVXNlciBleHRlbmRzIEN1cnJlbnRVc2VyIHsKICAgcHVibGljIGludGVyZmFjZSBGYWN0b3J5IHsKQEAgLTM5LDcgKzQxLDcgQEAKIAogICBASW5qZWN0CiAgIHByb3RlY3RlZCBJbnRlcm5hbFVzZXIoQ2FwYWJpbGl0eUNvbnRyb2wuRmFjdG9yeSBjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnkpIHsKLSAgICBzdXBlcihjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksIEFjY2Vzc1BhdGguVU5LTk9XTik7CisgICAgc3VwZXIoY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5KTsKICAgfQogCiAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9QZWVyRGFlbW9uVXNlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9QZWVyRGFlbW9uVXNlci5qYXZhCmluZGV4IDc1YmEwZDcuLjRkMjZmMDIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvUGVlckRhZW1vblVzZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL1BlZXJEYWVtb25Vc2VyLmphdmEKQEAgLTQwLDcgKzQwLDcgQEAKICAgQEluamVjdAogICBwcm90ZWN0ZWQgUGVlckRhZW1vblVzZXIoQ2FwYWJpbGl0eUNvbnRyb2wuRmFjdG9yeSBjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksCiAgICAgICBAQXNzaXN0ZWQgU29ja2V0QWRkcmVzcyBwZWVyKSB7Ci0gICAgc3VwZXIoY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5LCBBY2Nlc3NQYXRoLlNTSF9DT01NQU5EKTsKKyAgICBzdXBlcihjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnkpOwogICAgIHRoaXMucGVlciA9IHBlZXI7CiAgIH0KIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9QbHVnaW5Vc2VyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL1BsdWdpblVzZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40OTBhYjA3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9QbHVnaW5Vc2VyLmphdmEKQEAgLTAsMCArMSw0NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlcjsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkNhcGFiaWxpdHlDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKKworLyoqIFVzZXIgaWRlbnRpdHkgZm9yIHBsdWdpbiBjb2RlIHRoYXQgbmVlZHMgYW4gaWRlbnRpdHkuICovCitwdWJsaWMgY2xhc3MgUGx1Z2luVXNlciBleHRlbmRzIEludGVybmFsVXNlciB7CisgIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7CisgICAgUGx1Z2luVXNlciBjcmVhdGUoU3RyaW5nIHBsdWdpbk5hbWUpOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcGx1Z2luTmFtZTsKKworICBASW5qZWN0CisgIHByb3RlY3RlZCBQbHVnaW5Vc2VyKAorICAgICAgQ2FwYWJpbGl0eUNvbnRyb2wuRmFjdG9yeSBjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksCisgICAgICBAQXNzaXN0ZWQgU3RyaW5nIHBsdWdpbk5hbWUpIHsKKyAgICBzdXBlcihjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnkpOworICAgIHRoaXMucGx1Z2luTmFtZSA9IHBsdWdpbk5hbWU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRVc2VyTmFtZSgpIHsKKyAgICByZXR1cm4gInBsdWdpbiAiICsgcGx1Z2luTmFtZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgIHJldHVybiAiUGx1Z2luVXNlclsiICsgcGx1Z2luTmFtZSArICJdIjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9VcmxFbmNvZGVkLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL1VybEVuY29kZWQuamF2YQppbmRleCBmMWY2ZGNkLi4zYWM2Yzk4IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL1VybEVuY29kZWQuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL1VybEVuY29kZWQuamF2YQpAQCAtMTUsOCArMTUsOCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlcjsKIAotaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLm5ldC5VUkxFbmNvZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CisKIGltcG9ydCBqYXZhLnV0aWwuTGlua2VkSGFzaE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCkBAIC00NiwyMSArNDYsMTMgQEAKICAgICAgIGlmIChzZXBhcmF0b3IgIT0gMCkgewogICAgICAgICBidWZmZXIuYXBwZW5kKHNlcGFyYXRvcik7CiAgICAgICB9Ci0gICAgICBidWZmZXIuYXBwZW5kKGVuY29kZShrZXkpKTsKKyAgICAgIGJ1ZmZlci5hcHBlbmQoVXJsLmVuY29kZShrZXkpKTsKICAgICAgIGJ1ZmZlci5hcHBlbmQoJz0nKTsKICAgICAgIGlmICh2YWwgIT0gbnVsbCkgewotICAgICAgICBidWZmZXIuYXBwZW5kKGVuY29kZSh2YWwpKTsKKyAgICAgICAgYnVmZmVyLmFwcGVuZChVcmwuZW5jb2RlKHZhbCkpOwogICAgICAgfQogICAgICAgc2VwYXJhdG9yID0gJyYnOwogICAgIH0KICAgICByZXR1cm4gYnVmZmVyLnRvU3RyaW5nKCk7CiAgIH0KLQotICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZW5jb2RlKGZpbmFsIFN0cmluZyBzdHIpIHsKLSAgICB0cnkgewotICAgICAgcmV0dXJuIFVSTEVuY29kZXIuZW5jb2RlKHN0ciwgIlVURi04Iik7Ci0gICAgfSBjYXRjaCAoVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbihlKTsKLSAgICB9Ci0gIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50Q2FjaGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50Q2FjaGUuamF2YQppbmRleCAwNTZiYWJkLi44NjMwOGE5IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvQWNjb3VudENhY2hlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0FjY291bnRDYWNoZS5qYXZhCkBAIC0yMCw2ICsyMCw4IEBACiBwdWJsaWMgaW50ZXJmYWNlIEFjY291bnRDYWNoZSB7CiAgIHB1YmxpYyBBY2NvdW50U3RhdGUgZ2V0KEFjY291bnQuSWQgYWNjb3VudElkKTsKIAorICBwdWJsaWMgQWNjb3VudFN0YXRlIGdldElmUHJlc2VudChBY2NvdW50LklkIGFjY291bnRJZCk7CisKICAgcHVibGljIEFjY291bnRTdGF0ZSBnZXRCeVVzZXJuYW1lKFN0cmluZyB1c2VybmFtZSk7CiAKICAgcHVibGljIHZvaWQgZXZpY3QoQWNjb3VudC5JZCBhY2NvdW50SWQpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0FjY291bnRDYWNoZUltcGwuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50Q2FjaGVJbXBsLmphdmEKaW5kZXggNDIxN2Y5Zi4uYjc0ZGFhNSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0FjY291bnRDYWNoZUltcGwuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvQWNjb3VudENhY2hlSW1wbC5qYXZhCkBAIC04Nyw2ICs4NywxMCBAQAogICAgIH0KICAgfQogCisgIHB1YmxpYyBBY2NvdW50U3RhdGUgZ2V0SWZQcmVzZW50KEFjY291bnQuSWQgYWNjb3VudElkKSB7CisgICAgcmV0dXJuIGJ5SWQuZ2V0SWZQcmVzZW50KGFjY291bnRJZCk7CisgIH0KKwogICBAT3ZlcnJpZGUKICAgcHVibGljIEFjY291bnRTdGF0ZSBnZXRCeVVzZXJuYW1lKFN0cmluZyB1c2VybmFtZSkgewogICAgIHRyeSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvQWNjb3VudENvbnRyb2wuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50Q29udHJvbC5qYXZhCmluZGV4IDMyYjRlMmMuLmYxNDhiMzEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50Q29udHJvbC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50Q29udHJvbC5qYXZhCkBAIC0xMzksNyArMTM5LDcgQEAKICAgICAgIGRlZmF1bHQ6CiAgICAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oIkJhZCBBY2NvdW50VmlzaWJpbGl0eSAiICsgYWNjb3VudFZpc2liaWxpdHkpOwogICAgIH0KLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIGN1cnJlbnRVc2VyLmdldENhcGFiaWxpdGllcygpLmNhbkFkbWluaXN0cmF0ZVNlcnZlcigpOwogICB9CiAKICAgcHJpdmF0ZSBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGdyb3Vwc09mKEFjY291bnQuSWQgYWNjb3VudCkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0FjY291bnRJbmZvLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvQWNjb3VudEluZm8uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMjk2NzE2Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0FjY291bnRJbmZvLmphdmEKQEAgLTAsMCArMSwxMjMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuQXJyYXlMaXN0TXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JdGVyYWJsZXM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitwdWJsaWMgY2xhc3MgQWNjb3VudEluZm8geworICBwdWJsaWMgc3RhdGljIGNsYXNzIExvYWRlciB7CisgICAgcHVibGljIGludGVyZmFjZSBGYWN0b3J5IHsKKyAgICAgIExvYWRlciBjcmVhdGUoYm9vbGVhbiBkZXRhaWxlZCk7CisgICAgfQorCisgICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGI7CisgICAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlOworICAgIHByaXZhdGUgZmluYWwgYm9vbGVhbiBkZXRhaWxlZDsKKyAgICBwcml2YXRlIGZpbmFsIE1hcDxBY2NvdW50LklkLCBBY2NvdW50SW5mbz4gY3JlYXRlZDsKKyAgICBwcml2YXRlIGZpbmFsIExpc3Q8QWNjb3VudEluZm8+IHByb3ZpZGVkOworCisgICAgQEluamVjdAorICAgIExvYWRlcihQcm92aWRlcjxSZXZpZXdEYj4gZGIsCisgICAgICAgIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGUsCisgICAgICAgIEBBc3Npc3RlZCBib29sZWFuIGRldGFpbGVkKSB7CisgICAgICB0aGlzLmRiID0gZGI7CisgICAgICB0aGlzLmFjY291bnRDYWNoZSA9IGFjY291bnRDYWNoZTsKKyAgICAgIHRoaXMuZGV0YWlsZWQgPSBkZXRhaWxlZDsKKyAgICAgIGNyZWF0ZWQgPSBNYXBzLm5ld0hhc2hNYXAoKTsKKyAgICAgIHByb3ZpZGVkID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgfQorCisgICAgcHVibGljIEFjY291bnRJbmZvIGdldChBY2NvdW50LklkIGlkKSB7CisgICAgICBpZiAoaWQgPT0gbnVsbCkgeworICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgIH0KKyAgICAgIEFjY291bnRJbmZvIGluZm8gPSBjcmVhdGVkLmdldChpZCk7CisgICAgICBpZiAoaW5mbyA9PSBudWxsKSB7CisgICAgICAgIGluZm8gPSBuZXcgQWNjb3VudEluZm8oaWQpOworICAgICAgICBjcmVhdGVkLnB1dChpZCwgaW5mbyk7CisgICAgICB9CisgICAgICByZXR1cm4gaW5mbzsKKyAgICB9CisKKyAgICBwdWJsaWMgdm9pZCBwdXQoQWNjb3VudEluZm8gaW5mbykgeworICAgICAgcHJvdmlkZWQuYWRkKGluZm8pOworICAgIH0KKworICAgIHB1YmxpYyB2b2lkIGZpbGwoKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAgIE11bHRpbWFwPEFjY291bnQuSWQsIEFjY291bnRJbmZvPiBtaXNzaW5nID0gQXJyYXlMaXN0TXVsdGltYXAuY3JlYXRlKCk7CisgICAgICBmb3IgKEFjY291bnRJbmZvIGluZm8gOiBJdGVyYWJsZXMuY29uY2F0KGNyZWF0ZWQudmFsdWVzKCksIHByb3ZpZGVkKSkgeworICAgICAgICBBY2NvdW50U3RhdGUgc3RhdGUgPSBhY2NvdW50Q2FjaGUuZ2V0SWZQcmVzZW50KGluZm8uX2lkKTsKKyAgICAgICAgaWYgKHN0YXRlICE9IG51bGwpIHsKKyAgICAgICAgICBpbmZvLmZpbGwoc3RhdGUuZ2V0QWNjb3VudCgpLCBkZXRhaWxlZCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgbWlzc2luZy5wdXQoaW5mby5faWQsIGluZm8pOworICAgICAgICB9CisgICAgICB9CisgICAgICBpZiAoIW1pc3NpbmcuaXNFbXB0eSgpKSB7CisgICAgICAgIGZvciAoQWNjb3VudCBhY2NvdW50IDogZGIuZ2V0KCkuYWNjb3VudHMoKS5nZXQobWlzc2luZy5rZXlTZXQoKSkpIHsKKyAgICAgICAgICBmb3IgKEFjY291bnRJbmZvIGluZm8gOiBtaXNzaW5nLmdldChhY2NvdW50LmdldElkKCkpKSB7CisgICAgICAgICAgICBpbmZvLmZpbGwoYWNjb3VudCwgZGV0YWlsZWQpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKworICAgIHB1YmxpYyB2b2lkIGZpbGwoQ29sbGVjdGlvbjw/IGV4dGVuZHMgQWNjb3VudEluZm8+IGluZm9zKQorICAgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAgIGZvciAoQWNjb3VudEluZm8gaW5mbyA6IGluZm9zKSB7CisgICAgICAgIHB1dChpbmZvKTsKKyAgICAgIH0KKyAgICAgIGZpbGwoKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgc3RhdGljIEFjY291bnRJbmZvIHBhcnNlKEFjY291bnQgYSwgYm9vbGVhbiBkZXRhaWxlZCkgeworICAgIEFjY291bnRJbmZvIGFpID0gbmV3IEFjY291bnRJbmZvKGEuZ2V0SWQoKSk7CisgICAgYWkuZmlsbChhLCBkZXRhaWxlZCk7CisgICAgcmV0dXJuIGFpOworICB9CisKKyAgcHVibGljIHRyYW5zaWVudCBBY2NvdW50LklkIF9pZDsKKworICBwdWJsaWMgQWNjb3VudEluZm8oQWNjb3VudC5JZCBpZCkgeworICAgIF9pZCA9IGlkOworICB9CisKKyAgcHVibGljIEludGVnZXIgX2FjY291bnRfaWQ7CisgIHB1YmxpYyBTdHJpbmcgbmFtZTsKKyAgcHVibGljIFN0cmluZyBlbWFpbDsKKworICBwcml2YXRlIHZvaWQgZmlsbChBY2NvdW50IGFjY291bnQsIGJvb2xlYW4gZGV0YWlsZWQpIHsKKyAgICBuYW1lID0gYWNjb3VudC5nZXRGdWxsTmFtZSgpOworICAgIGlmIChkZXRhaWxlZCkgeworICAgICAgX2FjY291bnRfaWQgPSBhY2NvdW50LmdldElkKCkuZ2V0KCk7CisgICAgICBlbWFpbCA9IGFjY291bnQuZ2V0UHJlZmVycmVkRW1haWwoKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50UmVzb2x2ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50UmVzb2x2ZXIuamF2YQppbmRleCBhYmRmMjllLi42N2Q4N2IzIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvQWNjb3VudFJlc29sdmVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0FjY291bnRSZXNvbHZlci5qYXZhCkBAIC02MCw3ICs2MCw3IEBACiAgIH0KIAogICAvKioKLSAgICogTG9jYXRlIGV4YWN0bHkgb25lIGFjY291bnQgbWF0Y2hpbmcgdGhlIG5hbWUgb3IgbmFtZS9lbWFpbCBzdHJpbmcuCisgICAqIEZpbmQgYWxsIGFjY291bnRzIG1hdGNoaW5nIHRoZSBuYW1lIG9yIG5hbWUvZW1haWwgc3RyaW5nLgogICAgKgogICAgKiBAcGFyYW0gbmFtZU9yRW1haWwgYSBzdHJpbmcgb2YgdGhlIGZvcm1hdAogICAgKiAgICAgICAgIkZ1bGwgTmFtZSAmbHQ7ZW1haWxAZXhhbXBsZSZndDsiLCBqdXN0IHRoZSBlbWFpbCBhZGRyZXNzCkBAIC03MSwxMSArNzEsMjEgQEAKICAgcHVibGljIFNldDxBY2NvdW50LklkPiBmaW5kQWxsKFN0cmluZyBuYW1lT3JFbWFpbCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CiAgICAgTWF0Y2hlciBtID0gUGF0dGVybi5jb21waWxlKCJeLiogXFwoKFsxLTldWzAtOV0qKVxcKSQiKS5tYXRjaGVyKG5hbWVPckVtYWlsKTsKICAgICBpZiAobS5tYXRjaGVzKCkpIHsKLSAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5zaW5nbGV0b24oQWNjb3VudC5JZC5wYXJzZShtLmdyb3VwKDEpKSk7CisgICAgICBBY2NvdW50LklkIGlkID0gQWNjb3VudC5JZC5wYXJzZShtLmdyb3VwKDEpKTsKKyAgICAgIGlmIChleGlzdHMoaWQpKSB7CisgICAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5zaW5nbGV0b24oaWQpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5U2V0KCk7CisgICAgICB9CiAgICAgfQogCiAgICAgaWYgKG5hbWVPckVtYWlsLm1hdGNoZXMoIl5bMS05XVswLTldKiQiKSkgewotICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLnNpbmdsZXRvbihBY2NvdW50LklkLnBhcnNlKG5hbWVPckVtYWlsKSk7CisgICAgICBBY2NvdW50LklkIGlkID0gQWNjb3VudC5JZC5wYXJzZShuYW1lT3JFbWFpbCk7CisgICAgICBpZiAoZXhpc3RzKGlkKSkgeworICAgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuc2luZ2xldG9uKGlkKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eVNldCgpOworICAgICAgfQogICAgIH0KIAogICAgIGlmIChuYW1lT3JFbWFpbC5tYXRjaGVzKEFjY291bnQuVVNFUl9OQU1FX1BBVFRFUk4pKSB7CkBAIC04OCw2ICs5OCwxMCBAQAogICAgIHJldHVybiBmaW5kQWxsQnlOYW1lT3JFbWFpbChuYW1lT3JFbWFpbCk7CiAgIH0KIAorICBwcml2YXRlIGJvb2xlYW4gZXhpc3RzKEFjY291bnQuSWQgaWQpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHJldHVybiBzY2hlbWEuZ2V0KCkuYWNjb3VudHMoKS5nZXQoaWQpICE9IG51bGw7CisgIH0KKwogICAvKioKICAgICogTG9jYXRlIGV4YWN0bHkgb25lIGFjY291bnQgbWF0Y2hpbmcgdGhlIG5hbWUgb3IgbmFtZS9lbWFpbCBzdHJpbmcuCiAgICAqCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvQWNjb3VudFJlc291cmNlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvQWNjb3VudFJlc291cmNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWRjNDIzYQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50UmVzb3VyY2UuamF2YQpAQCAtMCwwICsxLDYwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuVHlwZUxpdGVyYWw7CisKK3B1YmxpYyBjbGFzcyBBY2NvdW50UmVzb3VyY2UgaW1wbGVtZW50cyBSZXN0UmVzb3VyY2UgeworICBwdWJsaWMgc3RhdGljIGZpbmFsIFR5cGVMaXRlcmFsPFJlc3RWaWV3PEFjY291bnRSZXNvdXJjZT4+IEFDQ09VTlRfS0lORCA9CisgICAgICBuZXcgVHlwZUxpdGVyYWw8UmVzdFZpZXc8QWNjb3VudFJlc291cmNlPj4oKSB7fTsKKworICBwdWJsaWMgc3RhdGljIGZpbmFsIFR5cGVMaXRlcmFsPFJlc3RWaWV3PENhcGFiaWxpdHk+PiBDQVBBQklMSVRZX0tJTkQgPQorICAgICAgbmV3IFR5cGVMaXRlcmFsPFJlc3RWaWV3PENhcGFiaWxpdHk+PigpIHt9OworCisgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIgdXNlcjsKKworICBwdWJsaWMgQWNjb3VudFJlc291cmNlKElkZW50aWZpZWRVc2VyIHVzZXIpIHsKKyAgICB0aGlzLnVzZXIgPSB1c2VyOworICB9CisKKyAgcHVibGljIElkZW50aWZpZWRVc2VyIGdldFVzZXIoKSB7CisgICAgcmV0dXJuIHVzZXI7CisgIH0KKworICBzdGF0aWMgY2xhc3MgQ2FwYWJpbGl0eSBpbXBsZW1lbnRzIFJlc3RSZXNvdXJjZSB7CisgICAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyOworICAgIHByaXZhdGUgZmluYWwgU3RyaW5nIGNhcGFiaWxpdHk7CisKKyAgICBDYXBhYmlsaXR5KElkZW50aWZpZWRVc2VyIHVzZXIsIFN0cmluZyBjYXBhYmlsaXR5KSB7CisgICAgICB0aGlzLnVzZXIgPSB1c2VyOworICAgICAgdGhpcy5jYXBhYmlsaXR5ID0gY2FwYWJpbGl0eTsKKyAgICB9CisKKyAgICBwdWJsaWMgSWRlbnRpZmllZFVzZXIgZ2V0VXNlcigpIHsKKyAgICAgIHJldHVybiB1c2VyOworICAgIH0KKworICAgIHB1YmxpYyBTdHJpbmcgZ2V0Q2FwYWJpbGl0eSgpIHsKKyAgICAgIHJldHVybiBjYXBhYmlsaXR5OworICAgIH0KKworICAgIHB1YmxpYyBib29sZWFuIGhhcygpIHsKKyAgICAgIHJldHVybiB1c2VyLmdldENhcGFiaWxpdGllcygpLmNhblBlcmZvcm0oZ2V0Q2FwYWJpbGl0eSgpKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50c0NvbGxlY3Rpb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BY2NvdW50c0NvbGxlY3Rpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42NzQwNDZjCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0FjY291bnRzQ29sbGVjdGlvbi5qYXZhCkBAIC0wLDAgKzEsMTE5IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljTWFwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5JZFN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdENvbGxlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Ub3BMZXZlbFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5VbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5Bbm9ueW1vdXNVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitwdWJsaWMgY2xhc3MgQWNjb3VudHNDb2xsZWN0aW9uIGltcGxlbWVudHMKKyAgICBSZXN0Q29sbGVjdGlvbjxUb3BMZXZlbFJlc291cmNlLCBBY2NvdW50UmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gc2VsZjsKKyAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50UmVzb2x2ZXIgcmVzb2x2ZXI7CisgIHByaXZhdGUgZmluYWwgQWNjb3VudENvbnRyb2wuRmFjdG9yeSBhY2NvdW50Q29udHJvbEZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdXNlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgRHluYW1pY01hcDxSZXN0VmlldzxBY2NvdW50UmVzb3VyY2U+PiB2aWV3czsKKworICBASW5qZWN0CisgIEFjY291bnRzQ29sbGVjdGlvbihQcm92aWRlcjxDdXJyZW50VXNlcj4gc2VsZiwKKyAgICAgIEFjY291bnRSZXNvbHZlciByZXNvbHZlciwKKyAgICAgIEFjY291bnRDb250cm9sLkZhY3RvcnkgYWNjb3VudENvbnRyb2xGYWN0b3J5LAorICAgICAgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdXNlckZhY3RvcnksCisgICAgICBEeW5hbWljTWFwPFJlc3RWaWV3PEFjY291bnRSZXNvdXJjZT4+IHZpZXdzKSB7CisgICAgdGhpcy5zZWxmID0gc2VsZjsKKyAgICB0aGlzLnJlc29sdmVyID0gcmVzb2x2ZXI7CisgICAgdGhpcy5hY2NvdW50Q29udHJvbEZhY3RvcnkgPSBhY2NvdW50Q29udHJvbEZhY3Rvcnk7CisgICAgdGhpcy51c2VyRmFjdG9yeSA9IHVzZXJGYWN0b3J5OworICAgIHRoaXMudmlld3MgPSB2aWV3czsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgQWNjb3VudFJlc291cmNlIHBhcnNlKFRvcExldmVsUmVzb3VyY2Ugcm9vdCwgSWRTdHJpbmcgaWQpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBJZGVudGlmaWVkVXNlciB1c2VyID0gX3BhcnNlKGlkLmdldCgpKTsKKyAgICBpZiAodXNlciA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgICAgfSBlbHNlIGlmICghYWNjb3VudENvbnRyb2xGYWN0b3J5LmdldCgpLmNhblNlZSh1c2VyLmdldEFjY291bnQoKSkpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGlkKTsKKyAgICB9CisgICAgcmV0dXJuIG5ldyBBY2NvdW50UmVzb3VyY2UodXNlcik7CisgIH0KKworICAvKioKKyAgICogUGFyc2VzIGEgYWNjb3VudCBJRCBmcm9tIGEgcmVxdWVzdCBib2R5IGFuZCByZXR1cm5zIHRoZSB1c2VyLgorICAgKgorICAgKiBAcGFyYW0gaWQgSUQgb2YgdGhlIGFjY291bnQsIGNhbiBiZSBhIHN0cmluZyBvZiB0aGUgZm9ybWF0CisgICAqICAgICAgICAiRnVsbCBOYW1lIDxlbWFpbEBleGFtcGxlLmNvbT4iLCBqdXN0IHRoZSBlbWFpbCBhZGRyZXNzLCBhIGZ1bGwgbmFtZQorICAgKiAgICAgICAgaWYgaXQgaXMgdW5pcXVlLCBhbiBhY2NvdW50IElELCBhIHVzZXIgbmFtZSBvciAnc2VsZicgZm9yIHRoZQorICAgKiAgICAgICAgY2FsbGluZyB1c2VyCisgICAqIEByZXR1cm4gdGhlIHByb2plY3QKKyAgICogQHRocm93cyBVbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uIHRocm93biBpZiB0aGUgYWNjb3VudCBJRCBjYW5ub3QgYmUKKyAgICogICAgICAgICByZXNvbHZlZCBvciBpZiB0aGUgYWNjb3VudCBpcyBub3QgdmlzaWJsZSB0byB0aGUgY2FsbGluZyB1c2VyCisgICAqLworICBwdWJsaWMgSWRlbnRpZmllZFVzZXIgcGFyc2UoU3RyaW5nIGlkKSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwKKyAgICAgIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgSWRlbnRpZmllZFVzZXIgdXNlciA9IF9wYXJzZShpZCk7CisgICAgaWYgKHVzZXIgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAiQWNjb3VudCBOb3QgRm91bmQ6ICVzIiwgaWQpKTsKKyAgICB9CisgICAgcmV0dXJuIHVzZXI7CisgIH0KKworICBwcml2YXRlIElkZW50aWZpZWRVc2VyIF9wYXJzZShTdHJpbmcgaWQpIHRocm93cyBBdXRoRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24geworICAgIEN1cnJlbnRVc2VyIHVzZXIgPSBzZWxmLmdldCgpOworCisgICAgaWYgKGlkLmVxdWFscygic2VsZiIpKSB7CisgICAgICBpZiAodXNlciBpbnN0YW5jZW9mIElkZW50aWZpZWRVc2VyKSB7CisgICAgICAgIHJldHVybiAoSWRlbnRpZmllZFVzZXIpIHVzZXI7CisgICAgICB9IGVsc2UgaWYgKHVzZXIgaW5zdGFuY2VvZiBBbm9ueW1vdXNVc2VyKSB7CisgICAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJBdXRoZW50aWNhdGlvbiByZXF1aXJlZCIpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICB9CisgICAgfQorCisgICAgU2V0PEFjY291bnQuSWQ+IG1hdGNoZXMgPSByZXNvbHZlci5maW5kQWxsKGlkKTsKKyAgICBpZiAobWF0Y2hlcy5zaXplKCkgIT0gMSkgeworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorICAgIHJldHVybiB1c2VyRmFjdG9yeS5jcmVhdGUoSXRlcmFibGVzLmdldE9ubHlFbGVtZW50KG1hdGNoZXMpKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUmVzdFZpZXc8VG9wTGV2ZWxSZXNvdXJjZT4gbGlzdCgpIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIHsKKyAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbigpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBEeW5hbWljTWFwPFJlc3RWaWV3PEFjY291bnRSZXNvdXJjZT4+IHZpZXdzKCkgeworICAgIHJldHVybiB2aWV3czsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0F1dGhNZXRob2QuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9BdXRoTWV0aG9kLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGZkYWFiZDIuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0F1dGhNZXRob2QuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDMwICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudDsKLQotLyoqIE1ldGhvZCBieSB3aGljaCBhIHVzZXIgaGFzIGF1dGhlbnRpY2F0ZWQgZm9yIGEgZ2l2ZW4gcmVxdWVzdC4gKi8KLXB1YmxpYyBlbnVtIEF1dGhNZXRob2QgewotICAvKiogVGhlIHVzZXIgaXMgbm90IGF1dGhlbnRpY2F0ZWQgKi8KLSAgTk9ORSwKLQotICAvKiogVGhlIHVzZXIgaXMgYXV0aGVudGljYXRlZCB2aWEgYSBjb29raWUuICovCi0gIENPT0tJRSwKLQotICAvKiogVGhlIHVzZXIgYXV0aGVudGljYXRlZCB3aXRoIGEgcGFzc3dvcmQgZm9yIHRoaXMgcmVxdWVzdC4gKi8KLSAgUEFTU1dPUkQsCi0KLSAgLyoqIFRoZSB1c2VyIGhhcyB1c2VkIGEgY3JlZGVudGlhbGVzcyBkZXZlbG9wbWVudCBmZWF0dXJlIHRvIGxvZ2luLiAqLwotICBCQUNLRE9PUjsKLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9DYXBhYmlsaXRpZXMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9DYXBhYmlsaXRpZXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zOGU1MDEzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0NhcGFiaWxpdGllcy5qYXZhCkBAIC0wLDAgKzEsNzEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQ2hpbGRDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5JZFN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRSZXNvdXJjZS5DYXBhYmlsaXR5OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworY2xhc3MgQ2FwYWJpbGl0aWVzIGltcGxlbWVudHMKKyAgICBDaGlsZENvbGxlY3Rpb248QWNjb3VudFJlc291cmNlLCBBY2NvdW50UmVzb3VyY2UuQ2FwYWJpbGl0eT4geworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPEN1cnJlbnRVc2VyPiBzZWxmOworICBwcml2YXRlIGZpbmFsIER5bmFtaWNNYXA8UmVzdFZpZXc8QWNjb3VudFJlc291cmNlLkNhcGFiaWxpdHk+PiB2aWV3czsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxHZXRDYXBhYmlsaXRpZXM+IGdldDsKKworICBASW5qZWN0CisgIENhcGFiaWxpdGllcygKKyAgICAgIFByb3ZpZGVyPEN1cnJlbnRVc2VyPiBzZWxmLAorICAgICAgRHluYW1pY01hcDxSZXN0VmlldzxBY2NvdW50UmVzb3VyY2UuQ2FwYWJpbGl0eT4+IHZpZXdzLAorICAgICAgUHJvdmlkZXI8R2V0Q2FwYWJpbGl0aWVzPiBnZXQpIHsKKyAgICB0aGlzLnNlbGYgPSBzZWxmOworICAgIHRoaXMudmlld3MgPSB2aWV3czsKKyAgICB0aGlzLmdldCA9IGdldDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgR2V0Q2FwYWJpbGl0aWVzIGxpc3QoKSB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGdldC5nZXQoKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgQ2FwYWJpbGl0eSBwYXJzZShBY2NvdW50UmVzb3VyY2UgcGFyZW50LCBJZFN0cmluZyBpZCkKKyAgICAgIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uIHsKKyAgICBpZiAoc2VsZi5nZXQoKSAhPSBwYXJlbnQuZ2V0VXNlcigpCisgICAgICAgICYmICFzZWxmLmdldCgpLmdldENhcGFiaWxpdGllcygpLmNhbkFkbWluaXN0cmF0ZVNlcnZlcigpKSB7CisgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbigicmVzdHJpY3RlZCB0byBhZG1pbmlzdHJhdG9yIik7CisgICAgfQorCisgICAgU3RyaW5nIG5hbWUgPSBpZC5nZXQoKTsKKyAgICBDYXBhYmlsaXR5Q29udHJvbCBjYXAgPSBwYXJlbnQuZ2V0VXNlcigpLmdldENhcGFiaWxpdGllcygpOworICAgIGlmIChjYXAuY2FuUGVyZm9ybShuYW1lKQorICAgICAgICB8fCAoY2FwLmNhbkFkbWluaXN0cmF0ZVNlcnZlcigpICYmIEdsb2JhbENhcGFiaWxpdHkuaXNDYXBhYmlsaXR5KG5hbWUpKSkgeworICAgICAgcmV0dXJuIG5ldyBBY2NvdW50UmVzb3VyY2UuQ2FwYWJpbGl0eShwYXJlbnQuZ2V0VXNlcigpLCBuYW1lKTsKKyAgICB9CisgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBEeW5hbWljTWFwPFJlc3RWaWV3PENhcGFiaWxpdHk+PiB2aWV3cygpIHsKKyAgICByZXR1cm4gdmlld3M7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9DYXBhYmlsaXR5Q29udHJvbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0NhcGFiaWxpdHlDb250cm9sLmphdmEKaW5kZXggMTUyNDE4NS4uOTQyYjBkNyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0NhcGFiaWxpdHlDb250cm9sLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0NhcGFiaWxpdHlDb250cm9sLmphdmEKQEAgLTEzMCwxMiArMTMwLDI0IEBACiAgICAgICB8fCBjYW5BZG1pbmlzdHJhdGVTZXJ2ZXIoKTsKICAgfQogCisKKyAgLyoqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgdXNlciBjYW4gYWNjZXNzIHRoZSBkYXRhYmFzZSAod2l0aCBnc3FsKS4gKi8KKyAgcHVibGljIGJvb2xlYW4gY2FuQWNjZXNzRGF0YWJhc2UoKSB7CisgICAgcmV0dXJuIGNhblBlcmZvcm0oR2xvYmFsQ2FwYWJpbGl0eS5BQ0NFU1NfREFUQUJBU0UpOworICB9CisKICAgLyoqIEByZXR1cm4gdHJ1ZSBpZiB0aGUgdXNlciBjYW4gZm9yY2UgcmVwbGljYXRpb24gdG8gYW55IGNvbmZpZ3VyZWQgZGVzdGluYXRpb24uICovCiAgIHB1YmxpYyBib29sZWFuIGNhblN0YXJ0UmVwbGljYXRpb24oKSB7CiAgICAgcmV0dXJuIGNhblBlcmZvcm0oR2xvYmFsQ2FwYWJpbGl0eS5TVEFSVF9SRVBMSUNBVElPTikKICAgICAgICAgfHwgY2FuQWRtaW5pc3RyYXRlU2VydmVyKCk7CiAgIH0KIAorICAvKiogQHJldHVybiB0cnVlIGlmIHRoZSB1c2VyIGNhbiBydW4gdGhlIEdpdCBnYXJiYWdlIGNvbGxlY3Rpb24uICovCisgIHB1YmxpYyBib29sZWFuIGNhblJ1bkdDKCkgeworICAgIHJldHVybiBjYW5QZXJmb3JtKEdsb2JhbENhcGFiaWxpdHkuUlVOX0dDKQorICAgICAgICB8fCBjYW5BZG1pbmlzdHJhdGVTZXJ2ZXIoKTsKKyAgfQorCiAgIC8qKiBAcmV0dXJuIHdoaWNoIHByaW9yaXR5IHF1ZXVlIHRoZSB1c2VyJ3MgdGFza3Mgc2hvdWxkIGJlIHN1Ym1pdHRlZCB0by4gKi8KICAgcHVibGljIFF1ZXVlUHJvdmlkZXIuUXVldWVUeXBlIGdldFF1ZXVlVHlwZSgpIHsKICAgICAvLyBJZiBhIG5vbi1nZW5lcmljIGdyb3VwICh0aGF0IGlzIG5vdCBBbm9ueW1vdXMgVXNlcnMgb3IgUmVnaXN0ZXJlZCBVc2VycykKQEAgLTE1OSw2ICsxNzEsMTEgQEAKICAgICAgICAgICBjYXNlIEJBVENIOgogICAgICAgICAgICAgYmF0Y2ggPSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICBjYXNlIEFMTE9XOgorICAgICAgICAgIGNhc2UgQkxPQ0s6CisgICAgICAgICAgY2FzZSBERU5ZOgorICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvQ2hhbmdlVXNlck5hbWUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9DaGFuZ2VVc2VyTmFtZS5qYXZhCmluZGV4IGQ2ZjQ1ZjUuLjFiNzNjNTQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9DaGFuZ2VVc2VyTmFtZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9DaGFuZ2VVc2VyTmFtZS5qYXZhCkBAIC0xMjMsNyArMTIzLDcgQEAKIAogICAgICAgICAvLyBPdGhlcndpc2UsIHNvbWVvbmUgZWxzZSBoYXMgdGhpcyBpZGVudGl0eS4KICAgICAgICAgLy8KLSAgICAgICAgdGhyb3cgbmV3IE5hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbigpOworICAgICAgICB0aHJvdyBuZXcgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uKG5ld1VzZXJuYW1lKTsKICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9HZXRBY2NvdW50LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR2V0QWNjb3VudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmIwMjI0MjAKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR2V0QWNjb3VudC5qYXZhCkBAIC0wLDAgKzEsMjQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CisKK3B1YmxpYyBjbGFzcyBHZXRBY2NvdW50IGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PEFjY291bnRSZXNvdXJjZT4geworICBAT3ZlcnJpZGUKKyAgcHVibGljIEFjY291bnRJbmZvIGFwcGx5KEFjY291bnRSZXNvdXJjZSByc3JjKSB7CisgICAgcmV0dXJuIEFjY291bnRJbmZvLnBhcnNlKHJzcmMuZ2V0VXNlcigpLmdldEFjY291bnQoKSwgdHJ1ZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9HZXRBdmF0YXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9HZXRBdmF0YXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xYzY2NTU1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dldEF2YXRhci5qYXZhCkBAIC0wLDAgKzEsNTQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljSXRlbTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXZhdGFyLkF2YXRhclByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5PcHRpb247CisKK2NsYXNzIEdldEF2YXRhciBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxBY2NvdW50UmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBEeW5hbWljSXRlbTxBdmF0YXJQcm92aWRlcj4gYXZhdGFyUHJvdmlkZXI7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tc2l6ZSIsIGFsaWFzZXMgPSB7Ii1zIn0sCisgICAgICB1c2FnZSA9ICJyZWNvbW1lbmRlZCBzaXplIGluIHBpeGVscywgaGVpZ2h0IGFuZCB3aWR0aCIpCisgIHByaXZhdGUgaW50IHNpemU7CisKKyAgQEluamVjdAorICBHZXRBdmF0YXIoRHluYW1pY0l0ZW08QXZhdGFyUHJvdmlkZXI+IGF2YXRhclByb3ZpZGVyKSB7CisgICAgdGhpcy5hdmF0YXJQcm92aWRlciA9IGF2YXRhclByb3ZpZGVyOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBSZXNwb25zZS5SZWRpcmVjdCBhcHBseShBY2NvdW50UmVzb3VyY2UgcnNyYykKKyAgICAgIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIHsKKyAgICBBdmF0YXJQcm92aWRlciBpbXBsID0gYXZhdGFyUHJvdmlkZXIuZ2V0KCk7CisgICAgaWYgKGltcGwgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oKTsKKyAgICB9CisKKyAgICBTdHJpbmcgdXJsID0gaW1wbC5nZXRVcmwocnNyYy5nZXRVc2VyKCksIHNpemUpOworICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkodXJsKSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oKTsKKyAgICB9IGVsc2UgeworICAgICAgcmV0dXJuIFJlc3BvbnNlLnJlZGlyZWN0KHVybCk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR2V0Q2FwYWJpbGl0aWVzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR2V0Q2FwYWJpbGl0aWVzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODEyMjFhYQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9HZXRDYXBhYmlsaXRpZXMuamF2YQpAQCAtMCwwICsxLDE4MCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50OworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuQUNDRVNTX0RBVEFCQVNFOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5LkNSRUFURV9BQ0NPVU5UOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5LkNSRUFURV9HUk9VUDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5DUkVBVEVfUFJPSkVDVDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5FTUFJTF9SRVZJRVdFUlM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuRkxVU0hfQ0FDSEVTOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5LktJTExfVEFTSzsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5QUklPUklUWTsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5SVU5fR0M7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuU1RBUlRfUkVQTElDQVRJT047CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuVklFV19DQUNIRVM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHkuVklFV19DT05ORUNUSU9OUzsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eS5WSUVXX1FVRVVFOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5GdW5jdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlNwbGl0dGVyOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSXRlcmFibGVzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUmFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJpbmFyeVJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuT3V0cHV0Rm9ybWF0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRSZXNvdXJjZS5DYXBhYmlsaXR5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUXVldWVQcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdzb24ucmVmbGVjdC5UeXBlVG9rZW47CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKKworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK2NsYXNzIEdldENhcGFiaWxpdGllcyBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxBY2NvdW50UmVzb3VyY2U+IHsKKyAgQERlcHJlY2F0ZWQKKyAgQE9wdGlvbihuYW1lID0gIi0tZm9ybWF0IiwgdXNhZ2UgPSAiKGRlcHJlY2F0ZWQpIG91dHB1dCBmb3JtYXQiKQorICBwcml2YXRlIE91dHB1dEZvcm1hdCBmb3JtYXQ7CisKKyAgQE9wdGlvbihuYW1lID0gIi1xIiwgbWV0YVZhciA9ICJDQVAiLCBtdWx0aVZhbHVlZCA9IHRydWUsIHVzYWdlID0gIkNhcGFiaWxpdHkgdG8gaW5zcGVjdCIpCisgIHZvaWQgYWRkUXVlcnkoU3RyaW5nIG5hbWUpIHsKKyAgICBpZiAocXVlcnkgPT0gbnVsbCkgeworICAgICAgcXVlcnkgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICB9CisgICAgSXRlcmFibGVzLmFkZEFsbChxdWVyeSwgSXRlcmFibGVzLnRyYW5zZm9ybSgKKyAgICAgICAgU3BsaXR0ZXIub25QYXR0ZXJuKCJbLCBdIikub21pdEVtcHR5U3RyaW5ncygpLnRyaW1SZXN1bHRzKCkuc3BsaXQobmFtZSksCisgICAgICAgIG5ldyBGdW5jdGlvbjxTdHJpbmcsIFN0cmluZz4oKSB7CisgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgcHVibGljIFN0cmluZyBhcHBseShTdHJpbmcgaW5wdXQpIHsKKyAgICAgICAgICAgIHJldHVybiBpbnB1dC50b0xvd2VyQ2FzZSgpOworICAgICAgICAgIH0KKyAgICAgICAgfSkpOworICB9CisgIHByaXZhdGUgU2V0PFN0cmluZz4gcXVlcnk7CisKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gc2VsZjsKKworICBASW5qZWN0CisgIEdldENhcGFiaWxpdGllcyhQcm92aWRlcjxDdXJyZW50VXNlcj4gc2VsZikgeworICAgIHRoaXMuc2VsZiA9IHNlbGY7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShBY2NvdW50UmVzb3VyY2UgcmVzb3VyY2UpCisgICAgICB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiwgRXhjZXB0aW9uIHsKKyAgICBpZiAoc2VsZi5nZXQoKSAhPSByZXNvdXJjZS5nZXRVc2VyKCkKKyAgICAgICAgJiYgIXNlbGYuZ2V0KCkuZ2V0Q2FwYWJpbGl0aWVzKCkuY2FuQWRtaW5pc3RyYXRlU2VydmVyKCkpIHsKKyAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJyZXN0cmljdGVkIHRvIGFkbWluaXN0cmF0b3IiKTsKKyAgICB9CisKKyAgICBDYXBhYmlsaXR5Q29udHJvbCBjYyA9IHJlc291cmNlLmdldFVzZXIoKS5nZXRDYXBhYmlsaXRpZXMoKTsKKyAgICBNYXA8U3RyaW5nLCBPYmplY3Q+IGhhdmUgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKKyAgICBmb3IgKFN0cmluZyBuYW1lIDogR2xvYmFsQ2FwYWJpbGl0eS5nZXRBbGxOYW1lcygpKSB7CisgICAgICBpZiAoIW5hbWUuZXF1YWxzKFBSSU9SSVRZKSAmJiB3YW50KG5hbWUpICYmIGNjLmNhblBlcmZvcm0obmFtZSkpIHsKKyAgICAgICAgaWYgKEdsb2JhbENhcGFiaWxpdHkuaGFzUmFuZ2UobmFtZSkpIHsKKyAgICAgICAgICBoYXZlLnB1dChuYW1lLCBuZXcgUmFuZ2UoY2MuZ2V0UmFuZ2UobmFtZSkpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBoYXZlLnB1dChuYW1lLCB0cnVlKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKworICAgIGhhdmUucHV0KENSRUFURV9BQ0NPVU5ULCBjYy5jYW5DcmVhdGVBY2NvdW50KCkpOworICAgIGhhdmUucHV0KENSRUFURV9HUk9VUCwgY2MuY2FuQ3JlYXRlR3JvdXAoKSk7CisgICAgaGF2ZS5wdXQoQ1JFQVRFX1BST0pFQ1QsIGNjLmNhbkNyZWF0ZVByb2plY3QoKSk7CisgICAgaGF2ZS5wdXQoRU1BSUxfUkVWSUVXRVJTLCBjYy5jYW5FbWFpbFJldmlld2VycygpKTsKKyAgICBoYXZlLnB1dChLSUxMX1RBU0ssIGNjLmNhbktpbGxUYXNrKCkpOworICAgIGhhdmUucHV0KFZJRVdfQ0FDSEVTLCBjYy5jYW5WaWV3Q2FjaGVzKCkpOworICAgIGhhdmUucHV0KEZMVVNIX0NBQ0hFUywgY2MuY2FuRmx1c2hDYWNoZXMoKSk7CisgICAgaGF2ZS5wdXQoVklFV19DT05ORUNUSU9OUywgY2MuY2FuVmlld0Nvbm5lY3Rpb25zKCkpOworICAgIGhhdmUucHV0KFZJRVdfUVVFVUUsIGNjLmNhblZpZXdRdWV1ZSgpKTsKKyAgICBoYXZlLnB1dChSVU5fR0MsIGNjLmNhblJ1bkdDKCkpOworICAgIGhhdmUucHV0KFNUQVJUX1JFUExJQ0FUSU9OLCBjYy5jYW5TdGFydFJlcGxpY2F0aW9uKCkpOworICAgIGhhdmUucHV0KEFDQ0VTU19EQVRBQkFTRSwgY2MuY2FuQWNjZXNzRGF0YWJhc2UoKSk7CisKKyAgICBRdWV1ZVByb3ZpZGVyLlF1ZXVlVHlwZSBxdWV1ZSA9IGNjLmdldFF1ZXVlVHlwZSgpOworICAgIGlmIChxdWV1ZSAhPSBRdWV1ZVByb3ZpZGVyLlF1ZXVlVHlwZS5JTlRFUkFDVElWRQorICAgICAgICB8fCAocXVlcnkgIT0gbnVsbCAmJiBxdWVyeS5jb250YWlucyhQUklPUklUWSkpKSB7CisgICAgICBoYXZlLnB1dChQUklPUklUWSwgcXVldWUpOworICAgIH0KKworICAgIEl0ZXJhdG9yPE1hcC5FbnRyeTxTdHJpbmcsIE9iamVjdD4+IGl0ciA9IGhhdmUuZW50cnlTZXQoKS5pdGVyYXRvcigpOworICAgIHdoaWxlIChpdHIuaGFzTmV4dCgpKSB7CisgICAgICBNYXAuRW50cnk8U3RyaW5nLCBPYmplY3Q+IGUgPSBpdHIubmV4dCgpOworICAgICAgaWYgKCF3YW50KGUuZ2V0S2V5KCkpKSB7CisgICAgICAgIGl0ci5yZW1vdmUoKTsKKyAgICAgIH0gZWxzZSBpZiAoZS5nZXRWYWx1ZSgpIGluc3RhbmNlb2YgQm9vbGVhbiAmJiAhKChCb29sZWFuKSBlLmdldFZhbHVlKCkpKSB7CisgICAgICAgIGl0ci5yZW1vdmUoKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoZm9ybWF0ID09IE91dHB1dEZvcm1hdC5URVhUKSB7CisgICAgICBTdHJpbmdCdWlsZGVyIHNiID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKKyAgICAgIGZvciAoTWFwLkVudHJ5PFN0cmluZywgT2JqZWN0PiBlIDogaGF2ZS5lbnRyeVNldCgpKSB7CisgICAgICAgIHNiLmFwcGVuZChlLmdldEtleSgpKTsKKyAgICAgICAgaWYgKCEoZS5nZXRWYWx1ZSgpIGluc3RhbmNlb2YgQm9vbGVhbikpIHsKKyAgICAgICAgICBzYi5hcHBlbmQoIjogIik7CisgICAgICAgICAgc2IuYXBwZW5kKGUuZ2V0VmFsdWUoKS50b1N0cmluZygpKTsKKyAgICAgICAgfQorICAgICAgICBzYi5hcHBlbmQoJ1xuJyk7CisgICAgICB9CisgICAgICByZXR1cm4gQmluYXJ5UmVzdWx0LmNyZWF0ZShzYi50b1N0cmluZygpKTsKKyAgICB9IGVsc2UgeworICAgICAgcmV0dXJuIE91dHB1dEZvcm1hdC5KU09OLm5ld0dzb24oKS50b0pzb25UcmVlKAorICAgICAgICBoYXZlLAorICAgICAgICBuZXcgVHlwZVRva2VuPE1hcDxTdHJpbmcsIE9iamVjdD4+KCkge30uZ2V0VHlwZSgpKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIGJvb2xlYW4gd2FudChTdHJpbmcgbmFtZSkgeworICAgIHJldHVybiBxdWVyeSA9PSBudWxsIHx8IHF1ZXJ5LmNvbnRhaW5zKG5hbWUudG9Mb3dlckNhc2UoKSk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBSYW5nZSB7CisgICAgcHJpdmF0ZSB0cmFuc2llbnQgUGVybWlzc2lvblJhbmdlIHJhbmdlOworICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bnVzZWQiKQorICAgIHByaXZhdGUgaW50IG1pbjsKKyAgICBAU3VwcHJlc3NXYXJuaW5ncygidW51c2VkIikKKyAgICBwcml2YXRlIGludCBtYXg7CisKKyAgICBSYW5nZShQZXJtaXNzaW9uUmFuZ2UgcikgeworICAgICAgcmFuZ2UgPSByOworICAgICAgbWluID0gci5nZXRNaW4oKTsKKyAgICAgIG1heCA9IHIuZ2V0TWF4KCk7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKyAgICAgIHJldHVybiByYW5nZS50b1N0cmluZygpOworICAgIH0KKyAgfQorCisgIHN0YXRpYyBjbGFzcyBDaGVja09uZSBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxBY2NvdW50UmVzb3VyY2UuQ2FwYWJpbGl0eT4geworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBPYmplY3QgYXBwbHkoQ2FwYWJpbGl0eSByZXNvdXJjZSkgeworICAgICAgcmV0dXJuIEJpbmFyeVJlc3VsdC5jcmVhdGUoIm9rXG4iKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9HZXRHcm91cHMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9HZXRHcm91cHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45N2U0ZTcwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dldEdyb3Vwcy5qYXZhCkBAIC0wLDAgKzEsNTggQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5Hcm91cEpzb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkdyb3VwSnNvbi5Hcm91cEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworcHVibGljIGNsYXNzIEdldEdyb3VwcyBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxBY2NvdW50UmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cENvbnRyb2wuRmFjdG9yeSBncm91cENvbnRyb2xGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIEdyb3VwSnNvbiBqc29uOworCisgIEBJbmplY3QKKyAgR2V0R3JvdXBzKEdyb3VwQ29udHJvbC5GYWN0b3J5IGdyb3VwQ29udHJvbEZhY3RvcnksIEdyb3VwSnNvbiBqc29uKSB7CisgICAgdGhpcy5ncm91cENvbnRyb2xGYWN0b3J5ID0gZ3JvdXBDb250cm9sRmFjdG9yeTsKKyAgICB0aGlzLmpzb24gPSBqc29uOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBMaXN0PEdyb3VwSW5mbz4gYXBwbHkoQWNjb3VudFJlc291cmNlIHJlc291cmNlKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBJZGVudGlmaWVkVXNlciB1c2VyID0gcmVzb3VyY2UuZ2V0VXNlcigpOworICAgIEFjY291bnQuSWQgdXNlcklkID0gdXNlci5nZXRBY2NvdW50SWQoKTsKKyAgICBMaXN0PEdyb3VwSW5mbz4gZ3JvdXBzID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgZm9yIChBY2NvdW50R3JvdXAuVVVJRCB1dWlkIDogdXNlci5nZXRFZmZlY3RpdmVHcm91cHMoKS5nZXRLbm93bkdyb3VwcygpKSB7CisgICAgICBHcm91cENvbnRyb2wgY3RsOworICAgICAgdHJ5IHsKKyAgICAgICAgY3RsID0gZ3JvdXBDb250cm9sRmFjdG9yeS5jb250cm9sRm9yKHV1aWQpOworICAgICAgfSBjYXRjaCAoTm9TdWNoR3JvdXBFeGNlcHRpb24gZSkgeworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKyAgICAgIGlmIChjdGwuaXNWaXNpYmxlKCkgJiYgY3RsLmNhblNlZU1lbWJlcih1c2VySWQpKSB7CisgICAgICAgIGdyb3Vwcy5hZGQoanNvbi5mb3JtYXQoY3RsLmdldEdyb3VwKCkpKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGdyb3VwczsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwQ29udHJvbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwQ29udHJvbC5qYXZhCmluZGV4IGQ5YjEyYWMuLjJhOGU3YzkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Hcm91cENvbnRyb2wuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBDb250cm9sLmphdmEKQEAgLTIxLDExICsyMSwzNCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSW50ZXJuYWxVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKIC8qKiBBY2Nlc3MgY29udHJvbCBtYW5hZ2VtZW50IGZvciBhIGdyb3VwIG9mIGFjY291bnRzIG1hbmFnZWQgaW4gR2Vycml0LiAqLwogcHVibGljIGNsYXNzIEdyb3VwQ29udHJvbCB7CisKKyAgQFNpbmdsZXRvbgorICBwdWJsaWMgc3RhdGljIGNsYXNzIEdlbmVyaWNGYWN0b3J5IHsKKyAgICBwcml2YXRlIGZpbmFsIEdyb3VwQmFja2VuZCBncm91cEJhY2tlbmQ7CisKKyAgICBASW5qZWN0CisgICAgR2VuZXJpY0ZhY3RvcnkoZmluYWwgR3JvdXBCYWNrZW5kIGdiKSB7CisgICAgICBncm91cEJhY2tlbmQgPSBnYjsKKyAgICB9CisKKyAgICBwdWJsaWMgR3JvdXBDb250cm9sIGNvbnRyb2xGb3IoZmluYWwgQ3VycmVudFVzZXIgd2hvLAorICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAuVVVJRCBncm91cElkKQorICAgICAgICB0aHJvd3MgTm9TdWNoR3JvdXBFeGNlcHRpb24geworICAgICAgZmluYWwgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBncm91cCA9IGdyb3VwQmFja2VuZC5nZXQoZ3JvdXBJZCk7CisgICAgICBpZiAoZ3JvdXAgPT0gbnVsbCkgeworICAgICAgICB0aHJvdyBuZXcgTm9TdWNoR3JvdXBFeGNlcHRpb24oZ3JvdXBJZCk7CisgICAgICB9CisgICAgICByZXR1cm4gbmV3IEdyb3VwQ29udHJvbCh3aG8sIGdyb3VwKTsKKyAgICB9CisgIH0KKwogICBwdWJsaWMgc3RhdGljIGNsYXNzIEZhY3RvcnkgewogICAgIHByaXZhdGUgZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlOwogICAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IHVzZXI7CkBAIC00NSw3ICs2OCw3IEBACiAgICAgICBpZiAoZ3JvdXAgPT0gbnVsbCkgewogICAgICAgICB0aHJvdyBuZXcgTm9TdWNoR3JvdXBFeGNlcHRpb24oZ3JvdXBJZCk7CiAgICAgICB9Ci0gICAgICByZXR1cm4gbmV3IEdyb3VwQ29udHJvbCh1c2VyLmdldCgpLCBncm91cCk7CisgICAgICByZXR1cm4gY29udHJvbEZvcihHcm91cERlc2NyaXB0aW9ucy5mb3JBY2NvdW50R3JvdXAoZ3JvdXApKTsKICAgICB9CiAKICAgICBwdWJsaWMgR3JvdXBDb250cm9sIGNvbnRyb2xGb3IoZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBJZCkKQEAgLTU0LDEwICs3NywxNCBAQAogICAgICAgaWYgKGdyb3VwID09IG51bGwpIHsKICAgICAgICAgdGhyb3cgbmV3IE5vU3VjaEdyb3VwRXhjZXB0aW9uKGdyb3VwSWQpOwogICAgICAgfQotICAgICAgcmV0dXJuIG5ldyBHcm91cENvbnRyb2wodXNlci5nZXQoKSwgZ3JvdXApOworICAgICAgcmV0dXJuIGNvbnRyb2xGb3IoZ3JvdXApOwogICAgIH0KIAotICAgIHB1YmxpYyBHcm91cENvbnRyb2wgY29udHJvbEZvcihmaW5hbCBBY2NvdW50R3JvdXAgZ3JvdXApIHsKKyAgICBwdWJsaWMgR3JvdXBDb250cm9sIGNvbnRyb2xGb3IoQWNjb3VudEdyb3VwIGdyb3VwKSB7CisgICAgICByZXR1cm4gY29udHJvbEZvcihHcm91cERlc2NyaXB0aW9ucy5mb3JBY2NvdW50R3JvdXAoZ3JvdXApKTsKKyAgICB9CisKKyAgICBwdWJsaWMgR3JvdXBDb250cm9sIGNvbnRyb2xGb3IoR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBncm91cCkgewogICAgICAgcmV0dXJuIG5ldyBHcm91cENvbnRyb2wodXNlci5nZXQoKSwgZ3JvdXApOwogICAgIH0KIApAQCAtNjksNiArOTYsMTUgQEAKICAgICAgIH0KICAgICAgIHJldHVybiBjOwogICAgIH0KKworICAgIHB1YmxpYyBHcm91cENvbnRyb2wgdmFsaWRhdGVGb3IoZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBVVUlEKQorICAgICAgICB0aHJvd3MgTm9TdWNoR3JvdXBFeGNlcHRpb24geworICAgICAgZmluYWwgR3JvdXBDb250cm9sIGMgPSBjb250cm9sRm9yKGdyb3VwVVVJRCk7CisgICAgICBpZiAoIWMuaXNWaXNpYmxlKCkpIHsKKyAgICAgICAgdGhyb3cgbmV3IE5vU3VjaEdyb3VwRXhjZXB0aW9uKGdyb3VwVVVJRCk7CisgICAgICB9CisgICAgICByZXR1cm4gYzsKKyAgICB9CiAgIH0KIAogICBwcml2YXRlIGZpbmFsIEN1cnJlbnRVc2VyIHVzZXI7CkBAIC04MCw4ICsxMTYsOCBAQAogICAgIGdyb3VwID0gIGdkOwogICB9CiAKLSAgR3JvdXBDb250cm9sKEN1cnJlbnRVc2VyIHdobywgQWNjb3VudEdyb3VwIGFnKSB7Ci0gICAgdGhpcyh3aG8sIEdyb3VwRGVzY3JpcHRpb25zLmZvckFjY291bnRHcm91cChhZykpOworICBwdWJsaWMgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBnZXRHcm91cCgpIHsKKyAgICByZXR1cm4gZ3JvdXA7CiAgIH0KIAogICBwdWJsaWMgQ3VycmVudFVzZXIgZ2V0Q3VycmVudFVzZXIoKSB7CkBAIC05MCw3ICsxMjYsOSBAQAogCiAgIC8qKiBDYW4gdGhpcyB1c2VyIHNlZSB0aGlzIGdyb3VwIGV4aXN0cz8gKi8KICAgcHVibGljIGJvb2xlYW4gaXNWaXNpYmxlKCkgewotICAgIHJldHVybiBncm91cC5pc1Zpc2libGVUb0FsbCgpCisgICAgQWNjb3VudEdyb3VwIGFjY291bnRHcm91cCA9IEdyb3VwRGVzY3JpcHRpb25zLnRvQWNjb3VudEdyb3VwKGdyb3VwKTsKKyAgICByZXR1cm4gKGFjY291bnRHcm91cCAhPSBudWxsICYmIGFjY291bnRHcm91cC5pc1Zpc2libGVUb0FsbCgpKQorICAgICAgfHwgdXNlciBpbnN0YW5jZW9mIEludGVybmFsVXNlcgogICAgICAgfHwgdXNlci5nZXRFZmZlY3RpdmVHcm91cHMoKS5jb250YWlucyhncm91cC5nZXRHcm91cFVVSUQoKSkKICAgICAgIHx8IGlzT3duZXIoKTsKICAgfQpAQCAtMTIzLDE5ICsxNjEsMjEgQEAKICAgICByZXR1cm4gY2FuU2VlTWVtYmVycygpOwogICB9CiAKLSAgcHVibGljIGJvb2xlYW4gY2FuQWRkR3JvdXAoQWNjb3VudEdyb3VwLklkIGlkKSB7CisgIHB1YmxpYyBib29sZWFuIGNhbkFkZEdyb3VwKEFjY291bnRHcm91cC5VVUlEIHV1aWQpIHsKICAgICByZXR1cm4gaXNPd25lcigpOwogICB9CiAKLSAgcHVibGljIGJvb2xlYW4gY2FuUmVtb3ZlR3JvdXAoQWNjb3VudEdyb3VwLklkIGlkKSB7CisgIHB1YmxpYyBib29sZWFuIGNhblJlbW92ZUdyb3VwKEFjY291bnRHcm91cC5VVUlEIHV1aWQpIHsKICAgICByZXR1cm4gaXNPd25lcigpOwogICB9CiAKLSAgcHVibGljIGJvb2xlYW4gY2FuU2VlR3JvdXAoQWNjb3VudEdyb3VwLklkIGlkKSB7CisgIHB1YmxpYyBib29sZWFuIGNhblNlZUdyb3VwKEFjY291bnRHcm91cC5VVUlEIHV1aWQpIHsKICAgICByZXR1cm4gY2FuU2VlTWVtYmVycygpOwogICB9CiAKICAgcHJpdmF0ZSBib29sZWFuIGNhblNlZU1lbWJlcnMoKSB7Ci0gICAgcmV0dXJuIGdyb3VwLmlzVmlzaWJsZVRvQWxsKCkgfHwgaXNPd25lcigpOworICAgIEFjY291bnRHcm91cCBhY2NvdW50R3JvdXAgPSBHcm91cERlc2NyaXB0aW9ucy50b0FjY291bnRHcm91cChncm91cCk7CisgICAgcmV0dXJuIChhY2NvdW50R3JvdXAgIT0gbnVsbCAmJiBhY2NvdW50R3JvdXAuaXNWaXNpYmxlVG9BbGwoKSkKKyAgICAgICAgfHwgaXNPd25lcigpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBEZXRhaWxGYWN0b3J5LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBEZXRhaWxGYWN0b3J5LmphdmEKaW5kZXggMmU1MDBiZC4uY2FkZTljNyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwRGV0YWlsRmFjdG9yeS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Hcm91cERldGFpbEZhY3RvcnkuamF2YQpAQCAtMjAsNyArMjAsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTWVtYmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwpAQCAtODAsMTAgKzgwLDExIEBACiAgICAgICAgIGRldGFpbC5zZXRNZW1iZXJzKGxvYWRNZW1iZXJzKCkpOwogICAgICAgICBkZXRhaWwuc2V0SW5jbHVkZXMobG9hZEluY2x1ZGVzKCkpOwogICAgICAgICBicmVhazsKKyAgICAgIGNhc2UgU1lTVEVNOgorICAgICAgICBicmVhazsKICAgICB9CiAgICAgZGV0YWlsLnNldEFjY291bnRzKGFpYy5jcmVhdGUoKSk7CiAgICAgZGV0YWlsLnNldENhbk1vZGlmeShjb250cm9sLmlzT3duZXIoKSk7Ci0gICAgZGV0YWlsLnNldEdyb3VwcyhnaWMuY3JlYXRlKCkpOwogICAgIHJldHVybiBkZXRhaWw7CiAgIH0KIApAQCAtMTIxLDM2ICsxMjIsMzQgQEAKICAgICByZXR1cm4gbWVtYmVyczsKICAgfQogCi0gIHByaXZhdGUgTGlzdDxBY2NvdW50R3JvdXBJbmNsdWRlPiBsb2FkSW5jbHVkZXMoKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBMaXN0PEFjY291bnRHcm91cEluY2x1ZGU+IGdyb3VwcyA9IG5ldyBBcnJheUxpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZT4oKTsKKyAgcHJpdmF0ZSBMaXN0PEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ+IGxvYWRJbmNsdWRlcygpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIExpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZD4gZ3JvdXBzID0gbmV3IEFycmF5TGlzdDxBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkPigpOwogCi0gICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlIG0gOiBkYi5hY2NvdW50R3JvdXBJbmNsdWRlcygpLmJ5R3JvdXAoZ3JvdXBJZCkpIHsKLSAgICAgIGlmIChjb250cm9sLmNhblNlZUdyb3VwKG0uZ2V0SW5jbHVkZUlkKCkpKSB7Ci0gICAgICAgIGdpYy53YW50KG0uZ2V0SW5jbHVkZUlkKCkpOworICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZCBtIDogZGIuYWNjb3VudEdyb3VwSW5jbHVkZXNCeVV1aWQoKS5ieUdyb3VwKGdyb3VwSWQpKSB7CisgICAgICBpZiAoY29udHJvbC5jYW5TZWVHcm91cChtLmdldEluY2x1ZGVVVUlEKCkpKSB7CisgICAgICAgIGdpYy53YW50KG0uZ2V0SW5jbHVkZVVVSUQoKSk7CiAgICAgICAgIGdyb3Vwcy5hZGQobSk7CiAgICAgICB9CiAgICAgfQogCi0gICAgQ29sbGVjdGlvbnMuc29ydChncm91cHMsIG5ldyBDb21wYXJhdG9yPEFjY291bnRHcm91cEluY2x1ZGU+KCkgewotICAgICAgcHVibGljIGludCBjb21wYXJlKGZpbmFsIEFjY291bnRHcm91cEluY2x1ZGUgbzEsCi0gICAgICAgICAgZmluYWwgQWNjb3VudEdyb3VwSW5jbHVkZSBvMikgewotICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAgYSA9IGdpYy5nZXQobzEuZ2V0SW5jbHVkZUlkKCkpOwotICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAgYiA9IGdpYy5nZXQobzIuZ2V0SW5jbHVkZUlkKCkpOworICAgIENvbGxlY3Rpb25zLnNvcnQoZ3JvdXBzLCBuZXcgQ29tcGFyYXRvcjxBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkPigpIHsKKyAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIG8xLAorICAgICAgICAgIGZpbmFsIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQgbzIpIHsKKyAgICAgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBhID0gZ2ljLmdldChvMS5nZXRJbmNsdWRlVVVJRCgpKTsKKyAgICAgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBiID0gZ2ljLmdldChvMi5nZXRJbmNsdWRlVVVJRCgpKTsKICAgICAgICAgcmV0dXJuIG4oYSkuY29tcGFyZVRvKG4oYikpOwogICAgICAgfQogCi0gICAgICBwcml2YXRlIFN0cmluZyBuKGZpbmFsIEFjY291bnRHcm91cCBhKSB7CisgICAgICBwcml2YXRlIFN0cmluZyBuIChHcm91cERlc2NyaXB0aW9uLkJhc2ljIGEpIHsKKyAgICAgICAgaWYgKGEgPT0gbnVsbCkgeworICAgICAgICAgIHJldHVybiAiIjsKKyAgICAgICAgfQorCiAgICAgICAgIFN0cmluZyBuID0gYS5nZXROYW1lKCk7CiAgICAgICAgIGlmIChuICE9IG51bGwgJiYgbi5sZW5ndGgoKSA+IDApIHsKICAgICAgICAgICByZXR1cm4gbjsKICAgICAgICAgfQotCi0gICAgICAgIG4gPSBhLmdldERlc2NyaXB0aW9uKCk7Ci0gICAgICAgIGlmIChuICE9IG51bGwgJiYgbi5sZW5ndGgoKSA+IDApIHsKLSAgICAgICAgICByZXR1cm4gbjsKLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBhLmdldElkKCkudG9TdHJpbmcoKTsKKyAgICAgICAgcmV0dXJuIGEuZ2V0R3JvdXBVVUlEKCkuZ2V0KCk7CiAgICAgICB9CiAgICAgfSk7CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Hcm91cEluY2x1ZGVDYWNoZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwSW5jbHVkZUNhY2hlLmphdmEKaW5kZXggNDMyYThiOC4uZDEzMDI0MyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwSW5jbHVkZUNhY2hlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwSW5jbHVkZUNhY2hlLmphdmEKQEAgLTE2LDEyICsxNiwxOSBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKIAotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIC8qKiBUcmFja3MgZ3JvdXAgaW5jbHVzaW9ucyBpbiBtZW1vcnkgZm9yIGVmZmljaWVudCBhY2Nlc3MuICovCiBwdWJsaWMgaW50ZXJmYWNlIEdyb3VwSW5jbHVkZUNhY2hlIHsKLSAgcHVibGljIENvbGxlY3Rpb248QWNjb3VudEdyb3VwLlVVSUQ+IGdldEJ5SW5jbHVkZShBY2NvdW50R3JvdXAuVVVJRCBncm91cElkKTsKKyAgLyoqIEByZXR1cm4gZ3JvdXBzIGRpcmVjdGx5IGEgbWVtYmVyIG9mIHRoZSBwYXNzZWQgZ3JvdXAuICovCisgIHB1YmxpYyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IG1lbWJlcnNPZihBY2NvdW50R3JvdXAuVVVJRCBncm91cCk7CiAKLSAgcHVibGljIHZvaWQgZXZpY3RJbmNsdWRlKEFjY291bnRHcm91cC5VVUlEIGdyb3VwSWQpOworICAvKiogQHJldHVybiBhbnkgZ3JvdXBzIHRoZSBwYXNzZWQgZ3JvdXAgYmVsb25ncyB0by4gKi8KKyAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gbWVtYmVySW4oQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBJZCk7CisKKyAgLyoqIEByZXR1cm4gc2V0IG9mIGFueSBVVUlEcyB0aGF0IGFyZSBub3QgaW50ZXJuYWwgZ3JvdXBzLiAqLworICBwdWJsaWMgU2V0PEFjY291bnRHcm91cC5VVUlEPiBhbGxFeHRlcm5hbE1lbWJlcnMoKTsKKworICBwdWJsaWMgdm9pZCBldmljdE1lbWJlcnNPZihBY2NvdW50R3JvdXAuVVVJRCBncm91cElkKTsKKyAgcHVibGljIHZvaWQgZXZpY3RNZW1iZXJJbihBY2NvdW50R3JvdXAuVVVJRCBncm91cElkKTsKIH0KLQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwSW5jbHVkZUNhY2hlSW1wbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwSW5jbHVkZUNhY2hlSW1wbC5qYXZhCmluZGV4IDdmYmJhNDUuLmJiY2RmYWYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Hcm91cEluY2x1ZGVDYWNoZUltcGwuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBJbmNsdWRlQ2FjaGVJbXBsLmphdmEKQEAgLTE5LDcgKzE5LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZVNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNhY2hlLkNhY2hlTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwpAQCAtMzIsNyArMzIsNiBAQAogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CiAKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKQEAgLTQ0LDYgKzQzLDggQEAKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkKICAgICAgIC5nZXRMb2dnZXIoR3JvdXBJbmNsdWRlQ2FjaGVJbXBsLmNsYXNzKTsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEJZSU5DTFVERV9OQU1FID0gImdyb3Vwc19ieWluY2x1ZGUiOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgTUVNQkVSU19OQU1FID0gImdyb3Vwc19tZW1iZXJzIjsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEVYVEVSTkFMX05BTUUgPSAiZ3JvdXBzX2V4dGVybmFsIjsKIAogICBwdWJsaWMgc3RhdGljIE1vZHVsZSBtb2R1bGUoKSB7CiAgICAgcmV0dXJuIG5ldyBDYWNoZU1vZHVsZSgpIHsKQEAgLTUyLDcgKzUzLDE3IEBACiAgICAgICAgIGNhY2hlKEJZSU5DTFVERV9OQU1FLAogICAgICAgICAgICAgQWNjb3VudEdyb3VwLlVVSUQuY2xhc3MsCiAgICAgICAgICAgICBuZXcgVHlwZUxpdGVyYWw8U2V0PEFjY291bnRHcm91cC5VVUlEPj4oKSB7fSkKLSAgICAgICAgICAubG9hZGVyKEJ5SW5jbHVkZUxvYWRlci5jbGFzcyk7CisgICAgICAgICAgLmxvYWRlcihNZW1iZXJJbkxvYWRlci5jbGFzcyk7CisKKyAgICAgICAgY2FjaGUoTUVNQkVSU19OQU1FLAorICAgICAgICAgICAgQWNjb3VudEdyb3VwLlVVSUQuY2xhc3MsCisgICAgICAgICAgICBuZXcgVHlwZUxpdGVyYWw8U2V0PEFjY291bnRHcm91cC5VVUlEPj4oKSB7fSkKKyAgICAgICAgICAubG9hZGVyKE1lbWJlcnNPZkxvYWRlci5jbGFzcyk7CisKKyAgICAgICAgY2FjaGUoRVhURVJOQUxfTkFNRSwKKyAgICAgICAgICAgIFN0cmluZy5jbGFzcywKKyAgICAgICAgICAgIG5ldyBUeXBlTGl0ZXJhbDxTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+PigpIHt9KQorICAgICAgICAgIC5sb2FkZXIoQWxsRXh0ZXJuYWxMb2FkZXIuY2xhc3MpOwogCiAgICAgICAgIGJpbmQoR3JvdXBJbmNsdWRlQ2FjaGVJbXBsLmNsYXNzKTsKICAgICAgICAgYmluZChHcm91cEluY2x1ZGVDYWNoZS5jbGFzcykudG8oR3JvdXBJbmNsdWRlQ2FjaGVJbXBsLmNsYXNzKTsKQEAgLTYwLDM1ICs3MSw3NCBAQAogICAgIH07CiAgIH0KIAotICBwcml2YXRlIGZpbmFsIExvYWRpbmdDYWNoZTxBY2NvdW50R3JvdXAuVVVJRCwgU2V0PEFjY291bnRHcm91cC5VVUlEPj4gYnlJbmNsdWRlOworICBwcml2YXRlIGZpbmFsIExvYWRpbmdDYWNoZTxBY2NvdW50R3JvdXAuVVVJRCwgU2V0PEFjY291bnRHcm91cC5VVUlEPj4gbWVtYmVyc09mOworICBwcml2YXRlIGZpbmFsIExvYWRpbmdDYWNoZTxBY2NvdW50R3JvdXAuVVVJRCwgU2V0PEFjY291bnRHcm91cC5VVUlEPj4gbWVtYmVySW47CisgIHByaXZhdGUgZmluYWwgTG9hZGluZ0NhY2hlPFN0cmluZywgU2V0PEFjY291bnRHcm91cC5VVUlEPj4gZXh0ZXJuYWw7CiAKICAgQEluamVjdAogICBHcm91cEluY2x1ZGVDYWNoZUltcGwoCi0gICAgICBATmFtZWQoQllJTkNMVURFX05BTUUpIExvYWRpbmdDYWNoZTxBY2NvdW50R3JvdXAuVVVJRCwgU2V0PEFjY291bnRHcm91cC5VVUlEPj4gYnlJbmNsdWRlKSB7Ci0gICAgdGhpcy5ieUluY2x1ZGUgPSBieUluY2x1ZGU7CisgICAgICBATmFtZWQoTUVNQkVSU19OQU1FKSBMb2FkaW5nQ2FjaGU8QWNjb3VudEdyb3VwLlVVSUQsIFNldDxBY2NvdW50R3JvdXAuVVVJRD4+IG1lbWJlcnNPZiwKKyAgICAgIEBOYW1lZChCWUlOQ0xVREVfTkFNRSkgTG9hZGluZ0NhY2hlPEFjY291bnRHcm91cC5VVUlELCBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+PiBtZW1iZXJJbiwKKyAgICAgIEBOYW1lZChFWFRFUk5BTF9OQU1FKSBMb2FkaW5nQ2FjaGU8U3RyaW5nLCBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+PiBleHRlcm5hbCkgeworICAgIHRoaXMubWVtYmVyc09mID0gbWVtYmVyc09mOworICAgIHRoaXMubWVtYmVySW4gPSBtZW1iZXJJbjsKKyAgICB0aGlzLmV4dGVybmFsID0gZXh0ZXJuYWw7CiAgIH0KIAotICBwdWJsaWMgQ29sbGVjdGlvbjxBY2NvdW50R3JvdXAuVVVJRD4gZ2V0QnlJbmNsdWRlKEFjY291bnRHcm91cC5VVUlEIGdyb3VwSWQpIHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IG1lbWJlcnNPZihBY2NvdW50R3JvdXAuVVVJRCBncm91cElkKSB7CiAgICAgdHJ5IHsKLSAgICAgIHJldHVybiBieUluY2x1ZGUuZ2V0KGdyb3VwSWQpOworICAgICAgcmV0dXJuIG1lbWJlcnNPZi5nZXQoZ3JvdXBJZCk7CisgICAgfSBjYXRjaCAoRXhlY3V0aW9uRXhjZXB0aW9uIGUpIHsKKyAgICAgIGxvZy53YXJuKCJDYW5ub3QgbG9hZCBtZW1iZXJzIG9mIGdyb3VwIiwgZSk7CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlTZXQoKTsKKyAgICB9CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gbWVtYmVySW4oQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBJZCkgeworICAgIHRyeSB7CisgICAgICByZXR1cm4gbWVtYmVySW4uZ2V0KGdyb3VwSWQpOwogICAgIH0gY2F0Y2ggKEV4ZWN1dGlvbkV4Y2VwdGlvbiBlKSB7CiAgICAgICBsb2cud2FybigiQ2Fubm90IGxvYWQgaW5jbHVkZWQgZ3JvdXBzIiwgZSk7CiAgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlTZXQoKTsKICAgICB9CiAgIH0KIAotICBwdWJsaWMgdm9pZCBldmljdEluY2x1ZGUoQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBJZCkgeworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgZXZpY3RNZW1iZXJzT2YoQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBJZCkgewogICAgIGlmIChncm91cElkICE9IG51bGwpIHsKLSAgICAgIGJ5SW5jbHVkZS5pbnZhbGlkYXRlKGdyb3VwSWQpOworICAgICAgbWVtYmVyc09mLmludmFsaWRhdGUoZ3JvdXBJZCk7CiAgICAgfQogICB9CiAKLSAgc3RhdGljIGNsYXNzIEJ5SW5jbHVkZUxvYWRlciBleHRlbmRzCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBldmljdE1lbWJlckluKEFjY291bnRHcm91cC5VVUlEIGdyb3VwSWQpIHsKKyAgICBpZiAoZ3JvdXBJZCAhPSBudWxsKSB7CisgICAgICBtZW1iZXJJbi5pbnZhbGlkYXRlKGdyb3VwSWQpOworCisgICAgICBpZiAoIUFjY291bnRHcm91cC5pc0ludGVybmFsR3JvdXAoZ3JvdXBJZCkpIHsKKyAgICAgICAgZXh0ZXJuYWwuaW52YWxpZGF0ZShFWFRFUk5BTF9OQU1FKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gYWxsRXh0ZXJuYWxNZW1iZXJzKCkgeworICAgIHRyeSB7CisgICAgICByZXR1cm4gZXh0ZXJuYWwuZ2V0KEVYVEVSTkFMX05BTUUpOworICAgIH0gY2F0Y2ggKEV4ZWN1dGlvbkV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cud2FybigiQ2Fubm90IGxvYWQgc2V0IG9mIG5vbi1pbnRlcm5hbCBncm91cHMiLCBlKTsKKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eVNldCgpOworICAgIH0KKyAgfQorCisgIHN0YXRpYyBjbGFzcyBNZW1iZXJzT2ZMb2FkZXIgZXh0ZW5kcwogICAgICAgQ2FjaGVMb2FkZXI8QWNjb3VudEdyb3VwLlVVSUQsIFNldDxBY2NvdW50R3JvdXAuVVVJRD4+IHsKICAgICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYTsKIAogICAgIEBJbmplY3QKLSAgICBCeUluY2x1ZGVMb2FkZXIoZmluYWwgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2YpIHsKKyAgICBNZW1iZXJzT2ZMb2FkZXIoZmluYWwgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2YpIHsKICAgICAgIHNjaGVtYSA9IHNmOwogICAgIH0KIApAQCAtMTAxLDkgKzE1MSwzNCBAQAogICAgICAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eVNldCgpOwogICAgICAgICB9CiAKKyAgICAgICAgU2V0PEFjY291bnRHcm91cC5VVUlEPiBpZHMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICAgICAgZm9yIChBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGFnaSA6IGRiLmFjY291bnRHcm91cEluY2x1ZGVzQnlVdWlkKCkKKyAgICAgICAgICAgIC5ieUdyb3VwKGdyb3VwLmdldCgwKS5nZXRJZCgpKSkgeworICAgICAgICAgIGlkcy5hZGQoYWdpLmdldEluY2x1ZGVVVUlEKCkpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBJbW11dGFibGVTZXQuY29weU9mKGlkcyk7CisgICAgICB9IGZpbmFsbHkgeworICAgICAgICBkYi5jbG9zZSgpOworICAgICAgfQorICAgIH0KKyAgfQorCisgIHN0YXRpYyBjbGFzcyBNZW1iZXJJbkxvYWRlciBleHRlbmRzCisgICAgICBDYWNoZUxvYWRlcjxBY2NvdW50R3JvdXAuVVVJRCwgU2V0PEFjY291bnRHcm91cC5VVUlEPj4geworICAgIHByaXZhdGUgZmluYWwgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2NoZW1hOworCisgICAgQEluamVjdAorICAgIE1lbWJlckluTG9hZGVyKGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNmKSB7CisgICAgICBzY2hlbWEgPSBzZjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU2V0PEFjY291bnRHcm91cC5VVUlEPiBsb2FkKEFjY291bnRHcm91cC5VVUlEIGtleSkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICBmaW5hbCBSZXZpZXdEYiBkYiA9IHNjaGVtYS5vcGVuKCk7CisgICAgICB0cnkgewogICAgICAgICBTZXQ8QWNjb3VudEdyb3VwLklkPiBpZHMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKLSAgICAgICAgZm9yIChBY2NvdW50R3JvdXBJbmNsdWRlIGFnaSA6IGRiLmFjY291bnRHcm91cEluY2x1ZGVzKCkKLSAgICAgICAgICAgIC5ieUluY2x1ZGUoZ3JvdXAuZ2V0KDApLmdldElkKCkpKSB7CisgICAgICAgIGZvciAoQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZCBhZ2kgOiBkYi5hY2NvdW50R3JvdXBJbmNsdWRlc0J5VXVpZCgpCisgICAgICAgICAgICAuYnlJbmNsdWRlVVVJRChrZXkpKSB7CiAgICAgICAgICAgaWRzLmFkZChhZ2kuZ2V0R3JvdXBJZCgpKTsKICAgICAgICAgfQogCkBAIC0xMTcsNCArMTkyLDMwIEBACiAgICAgICB9CiAgICAgfQogICB9CisKKyAgc3RhdGljIGNsYXNzIEFsbEV4dGVybmFsTG9hZGVyIGV4dGVuZHMKKyAgICAgIENhY2hlTG9hZGVyPFN0cmluZywgU2V0PEFjY291bnRHcm91cC5VVUlEPj4geworICAgIHByaXZhdGUgZmluYWwgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2NoZW1hOworCisgICAgQEluamVjdAorICAgIEFsbEV4dGVybmFsTG9hZGVyKGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNmKSB7CisgICAgICBzY2hlbWEgPSBzZjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgU2V0PEFjY291bnRHcm91cC5VVUlEPiBsb2FkKFN0cmluZyBrZXkpIHRocm93cyBFeGNlcHRpb24geworICAgICAgZmluYWwgUmV2aWV3RGIgZGIgPSBzY2hlbWEub3BlbigpOworICAgICAgdHJ5IHsKKyAgICAgICAgU2V0PEFjY291bnRHcm91cC5VVUlEPiBpZHMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICAgICAgZm9yIChBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGFnaSA6IGRiLmFjY291bnRHcm91cEluY2x1ZGVzQnlVdWlkKCkuYWxsKCkpIHsKKyAgICAgICAgICBpZiAoIUFjY291bnRHcm91cC5pc0ludGVybmFsR3JvdXAoYWdpLmdldEluY2x1ZGVVVUlEKCkpKSB7CisgICAgICAgICAgICBpZHMuYWRkKGFnaS5nZXRJbmNsdWRlVVVJRCgpKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIEltbXV0YWJsZVNldC5jb3B5T2YoaWRzKTsKKyAgICAgIH0gZmluYWxseSB7CisgICAgICAgIGRiLmNsb3NlKCk7CisgICAgICB9CisgICAgfQorICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBJbmZvQ2FjaGVGYWN0b3J5LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBJbmZvQ2FjaGVGYWN0b3J5LmphdmEKaW5kZXggMTlkOTUzZC4uZTM0NjgwMSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwSW5mb0NhY2hlRmFjdG9yeS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Hcm91cEluZm9DYWNoZUZhY3RvcnkuamF2YQpAQCAtMTQsMTQgKzE0LDEyIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQ7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBJbmZvQ2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiAKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKIC8qKiBFZmZpY2llbnRseSBidWlsZHMgYSB7QGxpbmsgR3JvdXBJbmZvQ2FjaGV9LiAqLwpAQCAtMzAsNDYgKzI4LDM1IEBACiAgICAgR3JvdXBJbmZvQ2FjaGVGYWN0b3J5IGNyZWF0ZSgpOwogICB9CiAKLSAgcHJpdmF0ZSBmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGU7Ci0gIHByaXZhdGUgZmluYWwgTWFwPEFjY291bnRHcm91cC5JZCwgQWNjb3VudEdyb3VwPiBvdXQ7CisgIHByaXZhdGUgZmluYWwgR3JvdXBCYWNrZW5kIGdyb3VwQmFja2VuZDsKKyAgcHJpdmF0ZSBmaW5hbCBNYXA8QWNjb3VudEdyb3VwLlVVSUQsIEdyb3VwRGVzY3JpcHRpb24uQmFzaWM+IG91dDsKIAogICBASW5qZWN0Ci0gIEdyb3VwSW5mb0NhY2hlRmFjdG9yeShmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGUpIHsKLSAgICB0aGlzLmdyb3VwQ2FjaGUgPSBncm91cENhY2hlOwotICAgIHRoaXMub3V0ID0gbmV3IEhhc2hNYXA8QWNjb3VudEdyb3VwLklkLCBBY2NvdW50R3JvdXA+KCk7CisgIEdyb3VwSW5mb0NhY2hlRmFjdG9yeShHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kKSB7CisgICAgdGhpcy5ncm91cEJhY2tlbmQgPSBncm91cEJhY2tlbmQ7CisgICAgdGhpcy5vdXQgPSBNYXBzLm5ld0hhc2hNYXAoKTsKICAgfQogCiAgIC8qKgogICAgKiBJbmRpY2F0ZSBhIGdyb3VwIHdpbGwgYmUgbmVlZGVkIGxhdGVyIG9uLgogICAgKgotICAgKiBAcGFyYW0gaWQgaWRlbnRpdHkgdGhhdCB3aWxsIGJlIG5lZWRlZCBpbiB0aGUgZnV0dXJlOyBtYXkgYmUgbnVsbC4KKyAgICogQHBhcmFtIHV1aWQgaWRlbnRpdHkgdGhhdCB3aWxsIGJlIG5lZWRlZCBpbiB0aGUgZnV0dXJlOyBtYXkgYmUgbnVsbC4KICAgICovCi0gIHB1YmxpYyB2b2lkIHdhbnQoZmluYWwgQWNjb3VudEdyb3VwLklkIGlkKSB7Ci0gICAgaWYgKGlkICE9IG51bGwgJiYgIW91dC5jb250YWluc0tleShpZCkpIHsKLSAgICAgIG91dC5wdXQoaWQsIGdyb3VwQ2FjaGUuZ2V0KGlkKSk7CisgIHB1YmxpYyB2b2lkIHdhbnQoZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgdXVpZCkgeworICAgIGlmICh1dWlkICE9IG51bGwgJiYgIW91dC5jb250YWluc0tleSh1dWlkKSkgeworICAgICAgb3V0LnB1dCh1dWlkLCBncm91cEJhY2tlbmQuZ2V0KHV1aWQpKTsKICAgICB9CiAgIH0KIAogICAvKiogSW5kaWNhdGUgb25lIG9yIG1vcmUgZ3JvdXBzIHdpbGwgYmUgbmVlZGVkIGxhdGVyIG9uLiAqLwotICBwdWJsaWMgdm9pZCB3YW50KGZpbmFsIEl0ZXJhYmxlPEFjY291bnRHcm91cC5JZD4gaWRzKSB7Ci0gICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXAuSWQgaWQgOiBpZHMpIHsKLSAgICAgIHdhbnQoaWQpOworICBwdWJsaWMgdm9pZCB3YW50KGZpbmFsIEl0ZXJhYmxlPEFjY291bnRHcm91cC5VVUlEPiB1dWlkcykgeworICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgdXVpZCA6IHV1aWRzKSB7CisgICAgICB3YW50KHV1aWQpOwogICAgIH0KICAgfQogCi0gIHB1YmxpYyBBY2NvdW50R3JvdXAgZ2V0KGZpbmFsIEFjY291bnRHcm91cC5JZCBpZCkgewotICAgIHdhbnQoaWQpOwotICAgIHJldHVybiBvdXQuZ2V0KGlkKTsKLSAgfQotCi0gIC8qKgotICAgKiBDcmVhdGUgYW4gR3JvdXBJbmZvQ2FjaGUgd2l0aCB0aGUgY3VycmVudGx5IGxvYWRlZCBBY2NvdW50R3JvdXAgZW50aXRpZXMuCi0gICAqICovCi0gIHB1YmxpYyBHcm91cEluZm9DYWNoZSBjcmVhdGUoKSB7Ci0gICAgZmluYWwgTGlzdDxHcm91cEluZm8+IHIgPSBuZXcgQXJyYXlMaXN0PEdyb3VwSW5mbz4ob3V0LnNpemUoKSk7Ci0gICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXAgYSA6IG91dC52YWx1ZXMoKSkgewotICAgICAgci5hZGQobmV3IEdyb3VwSW5mbyhhKSk7Ci0gICAgfQotICAgIHJldHVybiBuZXcgR3JvdXBJbmZvQ2FjaGUocik7CisgIHB1YmxpYyBHcm91cERlc2NyaXB0aW9uLkJhc2ljIGdldChmaW5hbCBBY2NvdW50R3JvdXAuVVVJRCB1dWlkKSB7CisgICAgd2FudCh1dWlkKTsKKyAgICByZXR1cm4gb3V0LmdldCh1dWlkKTsKICAgfQogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Hcm91cE1lbWJlcnMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Hcm91cE1lbWJlcnMuamF2YQppbmRleCA4NDI4MmI1Li4wOGNmMWE3IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBNZW1iZXJzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwTWVtYmVycy5qYXZhCkBAIC0xOCwxNCArMTgsMTUgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEdyb3VwRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cEluY2x1ZGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cE1lbWJlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaFByb2plY3RFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CiAKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CkBAIC0zMywyMSArMzQsMjEgQEAKIAogcHVibGljIGNsYXNzIEdyb3VwTWVtYmVycyB7CiAgIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgR3JvdXBNZW1iZXJzIGNyZWF0ZSgpOworICAgIEdyb3VwTWVtYmVycyBjcmVhdGUoQ3VycmVudFVzZXIgY3VycmVudFVzZXIpOwogICB9CiAKICAgcHJpdmF0ZSBmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGU7CiAgIHByaXZhdGUgZmluYWwgR3JvdXBEZXRhaWxGYWN0b3J5LkZhY3RvcnkgZ3JvdXBEZXRhaWxGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGU7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgcHJvamVjdENvbnRyb2w7Ci0gIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXI7CisgIHByaXZhdGUgZmluYWwgQ3VycmVudFVzZXIgY3VycmVudFVzZXI7CiAKICAgQEluamVjdAogICBHcm91cE1lbWJlcnMoZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlLAogICAgICAgZmluYWwgR3JvdXBEZXRhaWxGYWN0b3J5LkZhY3RvcnkgZ3JvdXBEZXRhaWxGYWN0b3J5LAogICAgICAgZmluYWwgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZSwKICAgICAgIGZpbmFsIFByb2plY3RDb250cm9sLkdlbmVyaWNGYWN0b3J5IHByb2plY3RDb250cm9sLAotICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXIpIHsKKyAgICAgIEBBc3Npc3RlZCBmaW5hbCBDdXJyZW50VXNlciBjdXJyZW50VXNlcikgewogICAgIHRoaXMuZ3JvdXBDYWNoZSA9IGdyb3VwQ2FjaGU7CiAgICAgdGhpcy5ncm91cERldGFpbEZhY3RvcnkgPSBncm91cERldGFpbEZhY3Rvcnk7CiAgICAgdGhpcy5hY2NvdW50Q2FjaGUgPSBhY2NvdW50Q2FjaGU7CkBAIC0xMTEsMTAgKzExMiwxMCBAQAogICAgICAgfQogICAgIH0KICAgICBpZiAoZ3JvdXBEZXRhaWwuaW5jbHVkZXMgIT0gbnVsbCkgewotICAgICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlIGdyb3VwSW5jbHVkZSA6IGdyb3VwRGV0YWlsLmluY2x1ZGVzKSB7CisgICAgICBmb3IgKGZpbmFsIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQgZ3JvdXBJbmNsdWRlIDogZ3JvdXBEZXRhaWwuaW5jbHVkZXMpIHsKICAgICAgICAgZmluYWwgQWNjb3VudEdyb3VwIGluY2x1ZGVkR3JvdXAgPQotICAgICAgICAgICAgZ3JvdXBDYWNoZS5nZXQoZ3JvdXBJbmNsdWRlLmdldEluY2x1ZGVJZCgpKTsKLSAgICAgICAgaWYgKCFzZWVuLmNvbnRhaW5zKGluY2x1ZGVkR3JvdXAuZ2V0R3JvdXBVVUlEKCkpKSB7CisgICAgICAgICAgICBncm91cENhY2hlLmdldChncm91cEluY2x1ZGUuZ2V0SW5jbHVkZVVVSUQoKSk7CisgICAgICAgIGlmIChpbmNsdWRlZEdyb3VwICE9IG51bGwgJiYgIXNlZW4uY29udGFpbnMoaW5jbHVkZWRHcm91cC5nZXRHcm91cFVVSUQoKSkpIHsKICAgICAgICAgICBtZW1iZXJzLmFkZEFsbChsaXN0QWNjb3VudHMoaW5jbHVkZWRHcm91cC5nZXRHcm91cFVVSUQoKSwgcHJvamVjdCwgc2VlbikpOwogICAgICAgICB9CiAgICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBNZW1iZXJzaGlwLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvR3JvdXBNZW1iZXJzaGlwLmphdmEKaW5kZXggZDUzNmMwOS4uZDdhOTdmYiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0dyb3VwTWVtYmVyc2hpcC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Hcm91cE1lbWJlcnNoaXAuamF2YQpAQCAtNDAsNiArNDAsMjAgQEAKICAgYm9vbGVhbiBjb250YWluc0FueU9mKEl0ZXJhYmxlPEFjY291bnRHcm91cC5VVUlEPiBncm91cElkcyk7CiAKICAgLyoqCisgICAqIFJldHVybnMgYSBzZXQgY29udGFpbmluZyBhbiBpbnB1dCBtZW1iZXIgb2Yge0Bjb2RlIGNvbnRhaW5zKGlkKX0gaXMgdHJ1ZS4KKyAgICogPHA+CisgICAqIFRoaXMgaXMgYmF0Y2ggZm9ybSBvZiBjb250YWlucyB0aGF0IHJldHVybnMgc3BlY2lmaWMgZ3JvdXAgaW5mb3JtYXRpb24uCisgICAqIEltcGxlbWVudG9ycyBtYXkgaW1wbGVtZW50IHRoZSBtZXRob2QgYXM6CisgICAqCisgICAqIDxwcmU+CisgICAqIFNldCZsdDtBY2NvdW50R3JvdXAuVVVJRCZndDsgciA9IFNldHMubmV3SGFzaFNldCgpOworICAgKiBmb3IgKEFjY291bnRHcm91cC5VVUlEIGlkIDogZ3JvdXBJZHMpCisgICAqICAgaWYgKGNvbnRhaW5zKGlkKSkgci5hZGQoaWQpOworICAgKiA8L3ByZT4KKyAgICovCisgIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gaW50ZXJzZWN0aW9uKEl0ZXJhYmxlPEFjY291bnRHcm91cC5VVUlEPiBncm91cElkcyk7CisKKyAgLyoqCiAgICAqIFJldHVybnMgdGhlIHNldCBvZiBncm91cHMgdGhhdCBjYW4gYmUgZGV0ZXJtaW5lZCBieSB0aGUgaW1wbGVtZW50YXRpb24uCiAgICAqIFRoaXMgbWF5IG5vdCByZXR1cm4gYWxsIGdyb3VwcyB0aGUge0BsaW5rICNjb250YWlucyhBY2NvdW50R3JvdXAuVVVJRCl9CiAgICAqIHdvdWxkIHJldHVybiB7QGNvZGUgdHJ1ZX0gZm9yLCBidXQgd2lsbCBhdCBsZWFzdCBjb250YWluIGFsbCB0b3AgbGV2ZWwKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9JbmNsdWRpbmdHcm91cE1lbWJlcnNoaXAuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9JbmNsdWRpbmdHcm91cE1lbWJlcnNoaXAuamF2YQppbmRleCBkNDQ4ZmZmLi5iMDIwZTIyIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvSW5jbHVkaW5nR3JvdXBNZW1iZXJzaGlwLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0luY2x1ZGluZ0dyb3VwTWVtYmVyc2hpcC5qYXZhCkBAIC0xNCwzNiArMTQsNDkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudDsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlU2V0OwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CiAKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7Ci1pbXBvcnQgamF2YS51dGlsLlF1ZXVlOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIAogLyoqCi0gKiBDcmVhdGVzIGEgR3JvdXBNZW1iZXJzaGlwIGNoZWNrZXIgZm9yIHRoZSBpbnRlcm5hbCBncm91cCBzeXN0ZW0sIHdoaWNoCi0gKiBzdGFydHMgd2l0aCB0aGUgc2VlZCBncm91cHMgYW5kIGluY2x1ZGVzIGFsbCBjaGlsZCBncm91cHMuCisgKiBHcm91cCBtZW1iZXJzaGlwIGNoZWNrZXIgZm9yIHRoZSBpbnRlcm5hbCBncm91cCBzeXN0ZW0uCisgKiA8cD4KKyAqIEdyb3VwcyB0aGUgdXNlciBpcyBkaXJlY3RseSBhIG1lbWJlciBvZiBhcmUgcHVsbGVkIGZyb20gdGhlIGluLW1lbW9yeQorICogQWNjb3VudENhY2hlIGJ5IHdheSBvZiB0aGUgSWRlbnRpZmllZFVzZXIuIFRyYW5zaXRpdmUgZ3JvdXAgbWVtYmVyaGlwcyBhcmUKKyAqIHJlc29sdmVkIG9uIGRlbWFuZCBzdGFydGluZyBmcm9tIHRoZSByZXF1ZXN0ZWQgZ3JvdXAgYW5kIGxvb2tpbmcgZm9yIGEgcGF0aAorICogdG8gYSBncm91cCB0aGUgdXNlciBpcyBhIG1lbWJlciBvZi4gT3RoZXIgZ3JvdXAgYmFja2VuZHMgYXJlIHN1cHBvcnRlZCBieQorICogcmVjdXJzaXZlbHkgaW52b2tpbmcgdGhlIHVuaXZlcnNhbCBHcm91cE1lbWJlcnNoaXAuCiAgKi8KIHB1YmxpYyBjbGFzcyBJbmNsdWRpbmdHcm91cE1lbWJlcnNoaXAgaW1wbGVtZW50cyBHcm91cE1lbWJlcnNoaXAgewogICBwdWJsaWMgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIEluY2x1ZGluZ0dyb3VwTWVtYmVyc2hpcCBjcmVhdGUoSXRlcmFibGU8QWNjb3VudEdyb3VwLlVVSUQ+IGdyb3VwSWRzKTsKKyAgICBJbmNsdWRpbmdHcm91cE1lbWJlcnNoaXAgY3JlYXRlKElkZW50aWZpZWRVc2VyIHVzZXIpOwogICB9CiAKLSAgcHJpdmF0ZSBmaW5hbCBHcm91cEluY2x1ZGVDYWNoZSBncm91cEluY2x1ZGVDYWNoZTsKLSAgcHJpdmF0ZSBmaW5hbCBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGluY2x1ZGVzOwotICBwcml2YXRlIGZpbmFsIFF1ZXVlPEFjY291bnRHcm91cC5VVUlEPiBncm91cFF1ZXVlOworICBwcml2YXRlIGZpbmFsIEdyb3VwSW5jbHVkZUNhY2hlIGluY2x1ZGVDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyOworICBwcml2YXRlIGZpbmFsIE1hcDxBY2NvdW50R3JvdXAuVVVJRCwgQm9vbGVhbj4gbWVtYmVyT2Y7CisgIHByaXZhdGUgU2V0PEFjY291bnRHcm91cC5VVUlEPiBrbm93bkdyb3VwczsKIAogICBASW5qZWN0Ci0gIEluY2x1ZGluZ0dyb3VwTWVtYmVyc2hpcCgKLSAgICAgIEdyb3VwSW5jbHVkZUNhY2hlIGdyb3VwSW5jbHVkZUNhY2hlLAotICAgICAgQEFzc2lzdGVkIEl0ZXJhYmxlPEFjY291bnRHcm91cC5VVUlEPiBzZWVkR3JvdXBzKSB7Ci0gICAgdGhpcy5ncm91cEluY2x1ZGVDYWNoZSA9IGdyb3VwSW5jbHVkZUNhY2hlOwotICAgIHRoaXMuaW5jbHVkZXMgPSBTZXRzLm5ld0hhc2hTZXQoc2VlZEdyb3Vwcyk7Ci0gICAgdGhpcy5ncm91cFF1ZXVlID0gTGlzdHMubmV3TGlua2VkTGlzdChzZWVkR3JvdXBzKTsKKyAgSW5jbHVkaW5nR3JvdXBNZW1iZXJzaGlwKEdyb3VwSW5jbHVkZUNhY2hlIGluY2x1ZGVDYWNoZSwKKyAgICAgIEBBc3Npc3RlZCBJZGVudGlmaWVkVXNlciB1c2VyKSB7CisgICAgdGhpcy5pbmNsdWRlQ2FjaGUgPSBpbmNsdWRlQ2FjaGU7CisgICAgdGhpcy51c2VyID0gdXNlcjsKKworICAgIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZ3JvdXBzID0gdXNlci5zdGF0ZSgpLmdldEludGVybmFsR3JvdXBzKCk7CisgICAgbWVtYmVyT2YgPSBNYXBzLm5ld0hhc2hNYXBXaXRoRXhwZWN0ZWRTaXplKGdyb3Vwcy5zaXplKCkpOworICAgIGZvciAoQWNjb3VudEdyb3VwLlVVSUQgZyA6IGdyb3VwcykgeworICAgICAgbWVtYmVyT2YucHV0KGcsIHRydWUpOworICAgIH0KICAgfQogCiAgIEBPdmVycmlkZQpAQCAtNTEsNDQgKzY0LDg3IEBACiAgICAgaWYgKGlkID09IG51bGwpIHsKICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0gICAgaWYgKGluY2x1ZGVzLmNvbnRhaW5zKGlkKSkgewotICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIHJldHVybiBmaW5kSW5jbHVkZWRHcm91cChDb2xsZWN0aW9ucy5zaW5nbGV0b24oaWQpKTsKKworICAgIEJvb2xlYW4gYiA9IG1lbWJlck9mLmdldChpZCk7CisgICAgcmV0dXJuIGIgIT0gbnVsbCA/IGIgOiBjb250YWluc0FueU9mKEltbXV0YWJsZVNldC5vZihpZCkpOwogICB9CiAKICAgQE92ZXJyaWRlCi0gIHB1YmxpYyBib29sZWFuIGNvbnRhaW5zQW55T2YoSXRlcmFibGU8QWNjb3VudEdyb3VwLlVVSUQ+IGlkcykgewotICAgIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gcXVlcnkgPSBTZXRzLm5ld0hhc2hTZXQoKTsKLSAgICBmb3IgKEFjY291bnRHcm91cC5VVUlEIGdyb3VwSWQgOiBpZHMpIHsKLSAgICAgIGlmIChpbmNsdWRlcy5jb250YWlucyhncm91cElkKSkgeworICBwdWJsaWMgYm9vbGVhbiBjb250YWluc0FueU9mKEl0ZXJhYmxlPEFjY291bnRHcm91cC5VVUlEPiBxdWVyeUlkcykgeworICAgIC8vIFByZWZlciBsb29rdXAgb2YgYSBjYWNoZWQgcmVzdWx0IG92ZXIgZXhwYW5kaW5nIGluY2x1ZGVzLgorICAgIGJvb2xlYW4gdHJ5RXhwYW5kaW5nID0gZmFsc2U7CisgICAgZm9yIChBY2NvdW50R3JvdXAuVVVJRCBpZCA6IHF1ZXJ5SWRzKSB7CisgICAgICBCb29sZWFuIGIgPSBtZW1iZXJPZi5nZXQoaWQpOworICAgICAgaWYgKGIgPT0gbnVsbCkgeworICAgICAgICB0cnlFeHBhbmRpbmcgPSB0cnVlOworICAgICAgfSBlbHNlIGlmIChiKSB7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgfQotICAgICAgcXVlcnkuYWRkKGdyb3VwSWQpOwogICAgIH0KIAotICAgIHJldHVybiBmaW5kSW5jbHVkZWRHcm91cChxdWVyeSk7Ci0gIH0KKyAgICBpZiAodHJ5RXhwYW5kaW5nKSB7CisgICAgICBmb3IgKEFjY291bnRHcm91cC5VVUlEIGlkIDogcXVlcnlJZHMpIHsKKyAgICAgICAgaWYgKG1lbWJlck9mLmNvbnRhaW5zS2V5KGlkKSkgeworICAgICAgICAgIC8vIE1lbWJlcnNoaXAgd2FzIGVhcmxpZXIgcHJvdmVuIHRvIGJlIGZhbHNlLgorICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAKLSAgcHJpdmF0ZSBib29sZWFuIGZpbmRJbmNsdWRlZEdyb3VwKFNldDxBY2NvdW50R3JvdXAuVVVJRD4gcXVlcnkpIHsKLSAgICBib29sZWFuIGZvdW5kID0gZmFsc2U7Ci0gICAgd2hpbGUgKCFmb3VuZCAmJiAhZ3JvdXBRdWV1ZS5pc0VtcHR5KCkpIHsKLSAgICAgIEFjY291bnRHcm91cC5VVUlEIGlkID0gZ3JvdXBRdWV1ZS5yZW1vdmUoKTsKLQotICAgICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXAuVVVJRCBncm91cElkIDogZ3JvdXBJbmNsdWRlQ2FjaGUuZ2V0QnlJbmNsdWRlKGlkKSkgewotICAgICAgICBpZiAoaW5jbHVkZXMuYWRkKGdyb3VwSWQpKSB7Ci0gICAgICAgICAgZ3JvdXBRdWV1ZS5hZGQoZ3JvdXBJZCk7Ci0gICAgICAgICAgZm91bmQgfD0gcXVlcnkuY29udGFpbnMoZ3JvdXBJZCk7CisgICAgICAgIG1lbWJlck9mLnB1dChpZCwgZmFsc2UpOworICAgICAgICBpZiAoc2VhcmNoKGluY2x1ZGVDYWNoZS5tZW1iZXJzT2YoaWQpKSkgeworICAgICAgICAgIG1lbWJlck9mLnB1dChpZCwgdHJ1ZSk7CisgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICAgIH0KICAgICB9CiAKLSAgICByZXR1cm4gZm91bmQ7CisgICAgcmV0dXJuIGZhbHNlOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGludGVyc2VjdGlvbihJdGVyYWJsZTxBY2NvdW50R3JvdXAuVVVJRD4gZ3JvdXBJZHMpIHsKKyAgICBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IHIgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICBmb3IgKEFjY291bnRHcm91cC5VVUlEIGlkIDogZ3JvdXBJZHMpIHsKKyAgICAgIGlmIChjb250YWlucyhpZCkpIHsKKyAgICAgICAgci5hZGQoaWQpOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gcjsKKyAgfQorCisgIHByaXZhdGUgYm9vbGVhbiBzZWFyY2goU2V0PEFjY291bnRHcm91cC5VVUlEPiBpZHMpIHsKKyAgICByZXR1cm4gdXNlci5nZXRFZmZlY3RpdmVHcm91cHMoKS5jb250YWluc0FueU9mKGlkcyk7CisgIH0KKworICBwcml2YXRlIEltbXV0YWJsZVNldDxBY2NvdW50R3JvdXAuVVVJRD4gY29tcHV0ZUtub3duR3JvdXBzKCkgeworICAgIEdyb3VwTWVtYmVyc2hpcCBtZW1iZXJzaGlwID0gdXNlci5nZXRFZmZlY3RpdmVHcm91cHMoKTsKKyAgICBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGRpcmVjdCA9IHVzZXIuc3RhdGUoKS5nZXRJbnRlcm5hbEdyb3VwcygpOworICAgIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gciA9IFNldHMubmV3SGFzaFNldChkaXJlY3QpOworICAgIExpc3Q8QWNjb3VudEdyb3VwLlVVSUQ+IHEgPSBMaXN0cy5uZXdBcnJheUxpc3Qocik7CisKKyAgICBmb3IgKEFjY291bnRHcm91cC5VVUlEIGcgOiBtZW1iZXJzaGlwLmludGVyc2VjdGlvbigKKyAgICAgICAgaW5jbHVkZUNhY2hlLmFsbEV4dGVybmFsTWVtYmVycygpKSkgeworICAgICAgaWYgKHIuYWRkKGcpKSB7CisgICAgICAgIHEuYWRkKGcpOworICAgICAgfQorICAgIH0KKworICAgIHdoaWxlICghcS5pc0VtcHR5KCkpIHsKKyAgICAgIEFjY291bnRHcm91cC5VVUlEIGlkID0gcS5yZW1vdmUocS5zaXplKCkgLSAxKTsKKyAgICAgIGZvciAoQWNjb3VudEdyb3VwLlVVSUQgZyA6IGluY2x1ZGVDYWNoZS5tZW1iZXJJbihpZCkpIHsKKyAgICAgICAgaWYgKHIuYWRkKGcpKSB7CisgICAgICAgICAgcS5hZGQoZyk7CisgICAgICAgICAgbWVtYmVyT2YucHV0KGcsIHRydWUpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBJbW11dGFibGVTZXQuY29weU9mKHIpOwogICB9CiAKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGdldEtub3duR3JvdXBzKCkgewotICAgIGZpbmRJbmNsdWRlZEdyb3VwKENvbGxlY3Rpb25zLjxBY2NvdW50R3JvdXAuVVVJRD5lbXB0eVNldCgpKTsgLy8gZmluZCBhbGwKLSAgICByZXR1cm4gU2V0cy5uZXdIYXNoU2V0KGluY2x1ZGVzKTsKKyAgICBpZiAoa25vd25Hcm91cHMgPT0gbnVsbCkgeworICAgICAga25vd25Hcm91cHMgPSBjb21wdXRlS25vd25Hcm91cHMoKTsKKyAgICB9CisgICAgcmV0dXJuIGtub3duR3JvdXBzOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvSW50ZXJuYWxHcm91cEJhY2tlbmQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9JbnRlcm5hbEdyb3VwQmFja2VuZC5qYXZhCmluZGV4IGFkNjU0OTkuLmQwNmRiNGQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9JbnRlcm5hbEdyb3VwQmFja2VuZC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9JbnRlcm5hbEdyb3VwQmFja2VuZC5qYXZhCkBAIC0yOCw5ICsyOCw3IEBACiAKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIAotLyoqCi0gKiBJbXBsZW1lbnRhdGlvbiBvZiBHcm91cEJhY2tlbmQgZm9yIHRoZSBpbnRlcm5hbCBncm91cCBzeXN0ZW0uCi0gKi8KKy8qKiBJbXBsZW1lbnRhdGlvbiBvZiBHcm91cEJhY2tlbmQgZm9yIHRoZSBpbnRlcm5hbCBncm91cCBzeXN0ZW0uICovCiBAU2luZ2xldG9uCiBwdWJsaWMgY2xhc3MgSW50ZXJuYWxHcm91cEJhY2tlbmQgaW1wbGVtZW50cyBHcm91cEJhY2tlbmQgewogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBGdW5jdGlvbjxBY2NvdW50R3JvdXAsIEdyb3VwUmVmZXJlbmNlPiBBQ1RfR1JPVVBfVE9fR1JPVVBfUkVGID0KQEAgLTQ1LDcgKzQzLDYgQEAKICAgcHJpdmF0ZSBmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGU7CiAgIHByaXZhdGUgZmluYWwgSW5jbHVkaW5nR3JvdXBNZW1iZXJzaGlwLkZhY3RvcnkgZ3JvdXBNZW1iZXJzaGlwRmFjdG9yeTsKIAotCiAgIEBJbmplY3QKICAgSW50ZXJuYWxHcm91cEJhY2tlbmQoR3JvdXBDb250cm9sLkZhY3RvcnkgZ3JvdXBDb250cm9sRmFjdG9yeSwKICAgICAgIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZSwKQEAgLTg5LDYgKzg2LDYgQEAKIAogICBAT3ZlcnJpZGUKICAgcHVibGljIEdyb3VwTWVtYmVyc2hpcCBtZW1iZXJzaGlwc09mKElkZW50aWZpZWRVc2VyIHVzZXIpIHsKLSAgICByZXR1cm4gZ3JvdXBNZW1iZXJzaGlwRmFjdG9yeS5jcmVhdGUodXNlci5zdGF0ZSgpLmdldEludGVybmFsR3JvdXBzKCkpOworICAgIHJldHVybiBncm91cE1lbWJlcnNoaXBGYWN0b3J5LmNyZWF0ZSh1c2VyKTsKICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0xpc3RHcm91cE1lbWJlcnNoaXAuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9MaXN0R3JvdXBNZW1iZXJzaGlwLmphdmEKaW5kZXggMzQ2ZjQwNi4uMTE4OTQwZiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L0xpc3RHcm91cE1lbWJlcnNoaXAuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvTGlzdEdyb3VwTWVtYmVyc2hpcC5qYXZhCkBAIC0yNCw3ICsyNCw2IEBACiAgKiBHcm91cE1lbWJlcnNoaXAgb3ZlciBhbiBleHBsaWNpdCBsaXN0LgogICovCiBwdWJsaWMgY2xhc3MgTGlzdEdyb3VwTWVtYmVyc2hpcCBpbXBsZW1lbnRzIEdyb3VwTWVtYmVyc2hpcCB7Ci0KICAgcHJpdmF0ZSBmaW5hbCBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGdyb3VwczsKIAogICBwdWJsaWMgTGlzdEdyb3VwTWVtYmVyc2hpcChJdGVyYWJsZTxBY2NvdW50R3JvdXAuVVVJRD4gZ3JvdXBJZHMpIHsKQEAgLTQ3LDYgKzQ2LDExIEBACiAgIH0KIAogICBAT3ZlcnJpZGUKKyAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gaW50ZXJzZWN0aW9uKEl0ZXJhYmxlPEFjY291bnRHcm91cC5VVUlEPiBncm91cElkcykgeworICAgIHJldHVybiBTZXRzLmludGVyc2VjdGlvbihJbW11dGFibGVTZXQuY29weU9mKGdyb3VwSWRzKSwgZ3JvdXBzKTsKKyAgfQorCisgIEBPdmVycmlkZQogICBwdWJsaWMgU2V0PEFjY291bnRHcm91cC5VVUlEPiBnZXRLbm93bkdyb3VwcygpIHsKICAgICByZXR1cm4gU2V0cy5uZXdIYXNoU2V0KGdyb3Vwcyk7CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Nb2R1bGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Nb2R1bGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hYzA0NWY3NWU5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L01vZHVsZS5qYXZhCkBAIC0wLDAgKzEsMzggQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50UmVzb3VyY2UuQUNDT1VOVF9LSU5EOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50UmVzb3VyY2UuQ0FQQUJJTElUWV9LSU5EOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdEFwaU1vZHVsZTsKKworcHVibGljIGNsYXNzIE1vZHVsZSBleHRlbmRzIFJlc3RBcGlNb2R1bGUgeworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgIGJpbmQoQWNjb3VudHNDb2xsZWN0aW9uLmNsYXNzKTsKKyAgICBiaW5kKENhcGFiaWxpdGllcy5jbGFzcyk7CisKKyAgICBEeW5hbWljTWFwLm1hcE9mKGJpbmRlcigpLCBBQ0NPVU5UX0tJTkQpOworICAgIER5bmFtaWNNYXAubWFwT2YoYmluZGVyKCksIENBUEFCSUxJVFlfS0lORCk7CisKKyAgICBnZXQoQUNDT1VOVF9LSU5EKS50byhHZXRBY2NvdW50LmNsYXNzKTsKKyAgICBnZXQoQUNDT1VOVF9LSU5ELCAiYXZhdGFyIikudG8oR2V0QXZhdGFyLmNsYXNzKTsKKyAgICBjaGlsZChBQ0NPVU5UX0tJTkQsICJjYXBhYmlsaXRpZXMiKS50byhDYXBhYmlsaXRpZXMuY2xhc3MpOworICAgIGdldChBQ0NPVU5UX0tJTkQsICJncm91cHMiKS50byhHZXRHcm91cHMuY2xhc3MpOworICAgIGdldChDQVBBQklMSVRZX0tJTkQpLnRvKEdldENhcGFiaWxpdGllcy5DaGVja09uZS5jbGFzcyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9QZXJmb3JtQ3JlYXRlR3JvdXAuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9QZXJmb3JtQ3JlYXRlR3JvdXAuamF2YQppbmRleCAxZmYxYTNlLi44Yjk2NmNiIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvUGVyZm9ybUNyZWF0ZUdyb3VwLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L1BlcmZvcm1DcmVhdGVHcm91cC5qYXZhCkBAIC0xOCw4ICsxOCw4IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5QZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cEluY2x1ZGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cEluY2x1ZGVBdWRpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBNZW1iZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cE1lbWJlckF1ZGl0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBOYW1lOwpAQCAtMzUsNyArMzUsNiBAQAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogCiBwdWJsaWMgY2xhc3MgUGVyZm9ybUNyZWF0ZUdyb3VwIHsKQEAgLTg1LDExICs4NCwxMSBAQAogICAgKiAgICAgICAgIG5hbWUgYWxyZWFkeSBleGlzdHMKICAgICogQHRocm93cyBQZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uIHVzZXIgY2Fubm90IGNyZWF0ZSBhIGdyb3VwLgogICAgKi8KLSAgcHVibGljIEFjY291bnRHcm91cC5JZCBjcmVhdGVHcm91cChmaW5hbCBTdHJpbmcgZ3JvdXBOYW1lLAorICBwdWJsaWMgQWNjb3VudEdyb3VwIGNyZWF0ZUdyb3VwKGZpbmFsIFN0cmluZyBncm91cE5hbWUsCiAgICAgICBmaW5hbCBTdHJpbmcgZ3JvdXBEZXNjcmlwdGlvbiwgZmluYWwgYm9vbGVhbiB2aXNpYmxlVG9BbGwsCiAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAuSWQgb3duZXJHcm91cElkLAogICAgICAgZmluYWwgQ29sbGVjdGlvbjw/IGV4dGVuZHMgQWNjb3VudC5JZD4gaW5pdGlhbE1lbWJlcnMsCi0gICAgICBmaW5hbCBDb2xsZWN0aW9uPD8gZXh0ZW5kcyBBY2NvdW50R3JvdXAuSWQ+IGluaXRpYWxHcm91cHMpCisgICAgICBmaW5hbCBDb2xsZWN0aW9uPD8gZXh0ZW5kcyBBY2NvdW50R3JvdXAuVVVJRD4gaW5pdGlhbEdyb3VwcykKICAgICAgIHRocm93cyBPcm1FeGNlcHRpb24sIE5hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbiwgUGVybWlzc2lvbkRlbmllZEV4Y2VwdGlvbiB7CiAgICAgaWYgKCFjdXJyZW50VXNlci5nZXRDYXBhYmlsaXRpZXMoKS5jYW5DcmVhdGVHcm91cCgpKSB7CiAgICAgICB0aHJvdyBuZXcgUGVybWlzc2lvbkRlbmllZEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KApAQCAtMTIxLDcgKzEyMCw3IEBACiAgICAgdHJ5IHsKICAgICAgIGRiLmFjY291bnRHcm91cE5hbWVzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihnbikpOwogICAgIH0gY2F0Y2ggKE9ybUR1cGxpY2F0ZUtleUV4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uKCk7CisgICAgICB0aHJvdyBuZXcgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uKGdyb3VwTmFtZSk7CiAgICAgfQogICAgIGRiLmFjY291bnRHcm91cHMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGdyb3VwKSk7CiAKQEAgLTEyOSwxMSArMTI4LDEyIEBACiAKICAgICBpZiAoaW5pdGlhbEdyb3VwcyAhPSBudWxsKSB7CiAgICAgICBhZGRHcm91cHMoZ3JvdXBJZCwgaW5pdGlhbEdyb3Vwcyk7CisgICAgICBncm91cEluY2x1ZGVDYWNoZS5ldmljdE1lbWJlcnNPZih1dWlkKTsKICAgICB9CiAKICAgICBncm91cENhY2hlLm9uQ3JlYXRlR3JvdXAobmFtZUtleSk7CiAKLSAgICByZXR1cm4gZ3JvdXBJZDsKKyAgICByZXR1cm4gZ3JvdXA7CiAgIH0KIAogICBwcml2YXRlIHZvaWQgYWRkTWVtYmVycyhmaW5hbCBBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZCwKQEAgLTE2MCwyNiArMTYwLDI1IEBACiAgIH0KIAogICBwcml2YXRlIHZvaWQgYWRkR3JvdXBzKGZpbmFsIEFjY291bnRHcm91cC5JZCBncm91cElkLAotICAgICAgZmluYWwgQ29sbGVjdGlvbjw/IGV4dGVuZHMgQWNjb3VudEdyb3VwLklkPiBncm91cHMpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZT4gaW5jbHVkZUxpc3QgPQotICAgICAgbmV3IEFycmF5TGlzdDxBY2NvdW50R3JvdXBJbmNsdWRlPigpOwotICAgIGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0PiBpbmNsdWRlc0F1ZGl0ID0KLSAgICAgIG5ldyBBcnJheUxpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZUF1ZGl0PigpOwotICAgIGZvciAoQWNjb3VudEdyb3VwLklkIGluY2x1ZGVJZCA6IGdyb3VwcykgewotICAgICAgZmluYWwgQWNjb3VudEdyb3VwSW5jbHVkZSBncm91cEluY2x1ZGUgPQotICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZShuZXcgQWNjb3VudEdyb3VwSW5jbHVkZS5LZXkoZ3JvdXBJZCwgaW5jbHVkZUlkKSk7CisgICAgICBmaW5hbCBDb2xsZWN0aW9uPD8gZXh0ZW5kcyBBY2NvdW50R3JvdXAuVVVJRD4gZ3JvdXBzKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBMaXN0PEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ+IGluY2x1ZGVMaXN0ID0KKyAgICAgIG5ldyBBcnJheUxpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZD4oKTsKKyAgICBmaW5hbCBMaXN0PEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdD4gaW5jbHVkZXNBdWRpdCA9CisgICAgICBuZXcgQXJyYXlMaXN0PEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdD4oKTsKKyAgICBmb3IgKEFjY291bnRHcm91cC5VVUlEIGluY2x1ZGVVVUlEIDogZ3JvdXBzKSB7CisgICAgICBmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGdyb3VwSW5jbHVkZSA9CisgICAgICAgIG5ldyBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkKG5ldyBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkLktleShncm91cElkLCBpbmNsdWRlVVVJRCkpOwogICAgICAgaW5jbHVkZUxpc3QuYWRkKGdyb3VwSW5jbHVkZSk7CiAKLSAgICAgIGZpbmFsIEFjY291bnRHcm91cEluY2x1ZGVBdWRpdCBhdWRpdCA9Ci0gICAgICAgIG5ldyBBY2NvdW50R3JvdXBJbmNsdWRlQXVkaXQoZ3JvdXBJbmNsdWRlLCBjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKSk7CisgICAgICBmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQgYXVkaXQgPQorICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0KGdyb3VwSW5jbHVkZSwgY3VycmVudFVzZXIuZ2V0QWNjb3VudElkKCkpOwogICAgICAgaW5jbHVkZXNBdWRpdC5hZGQoYXVkaXQpOwogICAgIH0KLSAgICBkYi5hY2NvdW50R3JvdXBJbmNsdWRlcygpLmluc2VydChpbmNsdWRlTGlzdCk7Ci0gICAgZGIuYWNjb3VudEdyb3VwSW5jbHVkZXNBdWRpdCgpLmluc2VydChpbmNsdWRlc0F1ZGl0KTsKKyAgICBkYi5hY2NvdW50R3JvdXBJbmNsdWRlc0J5VXVpZCgpLmluc2VydChpbmNsdWRlTGlzdCk7CisgICAgZGIuYWNjb3VudEdyb3VwSW5jbHVkZXNCeVV1aWRBdWRpdCgpLmluc2VydChpbmNsdWRlc0F1ZGl0KTsKIAotICAgIGZvciAoQWNjb3VudEdyb3VwIGdyb3VwIDogZGIuYWNjb3VudEdyb3VwcygpLmdldCgKLSAgICAgICAgbmV3IEhhc2hTZXQ8QWNjb3VudEdyb3VwLklkPihncm91cHMpKSkgewotICAgICAgZ3JvdXBJbmNsdWRlQ2FjaGUuZXZpY3RJbmNsdWRlKGdyb3VwLmdldEdyb3VwVVVJRCgpKTsKKyAgICBmb3IgKEFjY291bnRHcm91cC5VVUlEIHV1aWQgOiBncm91cHMpIHsKKyAgICAgIGdyb3VwSW5jbHVkZUNhY2hlLmV2aWN0TWVtYmVySW4odXVpZCk7CiAgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvUGVyZm9ybVJlbmFtZUdyb3VwLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvUGVyZm9ybVJlbmFtZUdyb3VwLmphdmEKaW5kZXggNGM3MmQ0OS4uMzYyM2NjMyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L1BlcmZvcm1SZW5hbWVHcm91cC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9QZXJmb3JtUmVuYW1lR3JvdXAuamF2YQpAQCAtMjMsNyArMjMsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5SZW5hbWVHcm91cE9wOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1EdXBsaWNhdGVLZXlFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiAKQEAgLTg5LDE3ICs4OCwyMSBAQAogICAgIHRyeSB7CiAgICAgICBmaW5hbCBBY2NvdW50R3JvdXBOYW1lIGlkID0gbmV3IEFjY291bnRHcm91cE5hbWUoa2V5LCBncm91cElkKTsKICAgICAgIGRiLmFjY291bnRHcm91cE5hbWVzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihpZCkpOwotICAgIH0gY2F0Y2ggKE9ybUR1cGxpY2F0ZUtleUV4Y2VwdGlvbiBkdXBlRXJyKSB7Ci0gICAgICAvLyBJZiB3ZSBhcmUgdXNpbmcgdGhpcyBpZGVudGl0eSwgZG9uJ3QgcmVwb3J0IHRoZSBleGNlcHRpb24uCi0gICAgICAvLworICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CiAgICAgICBBY2NvdW50R3JvdXBOYW1lIG90aGVyID0gZGIuYWNjb3VudEdyb3VwTmFtZXMoKS5nZXQoa2V5KTsKLSAgICAgIGlmIChvdGhlciAhPSBudWxsICYmIG90aGVyLmdldElkKCkuZXF1YWxzKGdyb3VwSWQpKSB7Ci0gICAgICAgIHJldHVybiBncm91cERldGFpbEZhY3RvcnkuY3JlYXRlKGdyb3VwSWQpLmNhbGwoKTsKLSAgICAgIH0KKyAgICAgIGlmIChvdGhlciAhPSBudWxsKSB7CisgICAgICAgIC8vIElmIHdlIGFyZSB1c2luZyB0aGlzIGlkZW50aXR5LCBkb24ndCByZXBvcnQgdGhlIGV4Y2VwdGlvbi4KKyAgICAgICAgLy8KKyAgICAgICAgaWYgKG90aGVyLmdldElkKCkuZXF1YWxzKGdyb3VwSWQpKSB7CisgICAgICAgICAgcmV0dXJuIGdyb3VwRGV0YWlsRmFjdG9yeS5jcmVhdGUoZ3JvdXBJZCkuY2FsbCgpOworICAgICAgICB9CiAKLSAgICAgIC8vIE90aGVyd2lzZSwgc29tZW9uZSBlbHNlIGhhcyB0aGlzIGlkZW50aXR5LgotICAgICAgLy8KLSAgICAgIHRocm93IG5ldyBOYW1lQWxyZWFkeVVzZWRFeGNlcHRpb24oKTsKKyAgICAgICAgLy8gT3RoZXJ3aXNlLCBzb21lb25lIGVsc2UgaGFzIHRoaXMgaWRlbnRpdHkuCisgICAgICAgIC8vCisgICAgICAgIHRocm93IG5ldyBOYW1lQWxyZWFkeVVzZWRFeGNlcHRpb24obmV3TmFtZSk7CisgICAgICB9IGVsc2UgeworICAgICAgICB0aHJvdyBlOworICAgICAgfQogICAgIH0KIAogICAgIGdyb3VwLnNldE5hbWVLZXkoa2V5KTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Vbml2ZXJzYWxHcm91cEJhY2tlbmQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYWNjb3VudC9Vbml2ZXJzYWxHcm91cEJhY2tlbmQuamF2YQppbmRleCAxOTc0OTYxLi5kOWM5MjU3IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvVW5pdmVyc2FsR3JvdXBCYWNrZW5kLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L1VuaXZlcnNhbEdyb3VwQmFja2VuZC5qYXZhCkBAIC0xOCw2ICsxOCw3IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkFycmF5TGlzdE11bHRpbWFwOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlTWFwOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSXRlcmFibGVzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTXVsdGltYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CkBAIC0xMjgsMzQgKzEyOSw2MCBAQAogICAgICByZXR1cm4gbS5jb250YWlucyh1dWlkKTsKICAgIH0KIAotICAgQE92ZXJyaWRlCi0gICBwdWJsaWMgYm9vbGVhbiBjb250YWluc0FueU9mKEl0ZXJhYmxlPEFjY291bnRHcm91cC5VVUlEPiB1dWlkcykgewotICAgICBNdWx0aW1hcDxHcm91cE1lbWJlcnNoaXAsIEFjY291bnRHcm91cC5VVUlEPiBsb29rdXBzID0KLSAgICAgICAgIEFycmF5TGlzdE11bHRpbWFwLmNyZWF0ZSgpOwotICAgICBmb3IgKEFjY291bnRHcm91cC5VVUlEIHV1aWQgOiB1dWlkcykgewotICAgICAgIEdyb3VwTWVtYmVyc2hpcCBtID0gbWVtYmVyc2hpcCh1dWlkKTsKLSAgICAgICBpZiAobSA9PSBudWxsKSB7Ci0gICAgICAgICBsb2cud2FybigiVW5rbm93biBHcm91cE1lbWJlcnNoaXAgZm9yIFVVSUQ6ICIgKyB1dWlkKTsKLSAgICAgICAgIGNvbnRpbnVlOwotICAgICAgIH0KLSAgICAgICBsb29rdXBzLnB1dChtLCB1dWlkKTsKLSAgICAgfQotICAgICBmb3IgKE1hcC5FbnRyeTxHcm91cE1lbWJlcnNoaXAsIENvbGxlY3Rpb248QWNjb3VudEdyb3VwLlVVSUQ+PiBlbnRyeSA6Ci0gICAgICAgICAgbG9va3Vwcy5hc01hcCgpLmVudHJ5U2V0KCkpIHsKLSAgICAgICBpZiAoZW50cnkuZ2V0S2V5KCkuY29udGFpbnNBbnlPZihlbnRyeS5nZXRWYWx1ZSgpKSkgewotICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgfQotICAgICB9Ci0gICAgIHJldHVybiBmYWxzZTsKLSAgIH0KKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgYm9vbGVhbiBjb250YWluc0FueU9mKEl0ZXJhYmxlPEFjY291bnRHcm91cC5VVUlEPiB1dWlkcykgeworICAgICAgTXVsdGltYXA8R3JvdXBNZW1iZXJzaGlwLCBBY2NvdW50R3JvdXAuVVVJRD4gbG9va3VwcyA9CisgICAgICAgICAgQXJyYXlMaXN0TXVsdGltYXAuY3JlYXRlKCk7CisgICAgICBmb3IgKEFjY291bnRHcm91cC5VVUlEIHV1aWQgOiB1dWlkcykgeworICAgICAgICBHcm91cE1lbWJlcnNoaXAgbSA9IG1lbWJlcnNoaXAodXVpZCk7CisgICAgICAgIGlmIChtID09IG51bGwpIHsKKyAgICAgICAgICBsb2cud2FybigiVW5rbm93biBHcm91cE1lbWJlcnNoaXAgZm9yIFVVSUQ6ICIgKyB1dWlkKTsKKyAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBsb29rdXBzLnB1dChtLCB1dWlkKTsKKyAgICAgIH0KKyAgICAgIGZvciAoTWFwLkVudHJ5PEdyb3VwTWVtYmVyc2hpcCwgQ29sbGVjdGlvbjxBY2NvdW50R3JvdXAuVVVJRD4+IGVudHJ5CisgICAgICAgICAgOiBsb29rdXBzIC5hc01hcCgpLmVudHJ5U2V0KCkpIHsKKyAgICAgICAgR3JvdXBNZW1iZXJzaGlwIG0gPSBlbnRyeS5nZXRLZXkoKTsKKyAgICAgICAgQ29sbGVjdGlvbjxBY2NvdW50R3JvdXAuVVVJRD4gaWRzID0gZW50cnkuZ2V0VmFsdWUoKTsKKyAgICAgICAgaWYgKGlkcy5zaXplKCkgPT0gMSkgeworICAgICAgICAgIGlmIChtLmNvbnRhaW5zKEl0ZXJhYmxlcy5nZXRPbmx5RWxlbWVudChpZHMpKSkgeworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgaWYgKG0uY29udGFpbnNBbnlPZihpZHMpKSB7CisgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKLSAgIEBPdmVycmlkZQotICAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZ2V0S25vd25Hcm91cHMoKSB7Ci0gICAgIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZ3JvdXBzID0gU2V0cy5uZXdIYXNoU2V0KCk7Ci0gICAgIGZvciAoR3JvdXBNZW1iZXJzaGlwIG0gOiBtZW1iZXJzaGlwcy52YWx1ZXMoKSkgewotICAgICAgIGdyb3Vwcy5hZGRBbGwobS5nZXRLbm93bkdyb3VwcygpKTsKLSAgICAgfQotICAgICByZXR1cm4gZ3JvdXBzOwotICAgfQorICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGludGVyc2VjdGlvbihJdGVyYWJsZTxBY2NvdW50R3JvdXAuVVVJRD4gdXVpZHMpIHsKKyAgICAgIE11bHRpbWFwPEdyb3VwTWVtYmVyc2hpcCwgQWNjb3VudEdyb3VwLlVVSUQ+IGxvb2t1cHMgPQorICAgICAgICAgIEFycmF5TGlzdE11bHRpbWFwLmNyZWF0ZSgpOworICAgICAgZm9yIChBY2NvdW50R3JvdXAuVVVJRCB1dWlkIDogdXVpZHMpIHsKKyAgICAgICAgR3JvdXBNZW1iZXJzaGlwIG0gPSBtZW1iZXJzaGlwKHV1aWQpOworICAgICAgICBpZiAobSA9PSBudWxsKSB7CisgICAgICAgICAgbG9nLndhcm4oIlVua25vd24gR3JvdXBNZW1iZXJzaGlwIGZvciBVVUlEOiAiICsgdXVpZCk7CisgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgbG9va3Vwcy5wdXQobSwgdXVpZCk7CisgICAgICB9CisgICAgICBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGdyb3VwcyA9IFNldHMubmV3SGFzaFNldCgpOworICAgICAgZm9yIChNYXAuRW50cnk8R3JvdXBNZW1iZXJzaGlwLCBDb2xsZWN0aW9uPEFjY291bnRHcm91cC5VVUlEPj4gZW50cnkKKyAgICAgICAgICA6IGxvb2t1cHMuYXNNYXAoKS5lbnRyeVNldCgpKSB7CisgICAgICAgIGdyb3Vwcy5hZGRBbGwoZW50cnkuZ2V0S2V5KCkuaW50ZXJzZWN0aW9uKGVudHJ5LmdldFZhbHVlKCkpKTsKKyAgICAgIH0KKyAgICAgIHJldHVybiBncm91cHM7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZ2V0S25vd25Hcm91cHMoKSB7CisgICAgICBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGdyb3VwcyA9IFNldHMubmV3SGFzaFNldCgpOworICAgICAgZm9yIChHcm91cE1lbWJlcnNoaXAgbSA6IG1lbWJlcnNoaXBzLnZhbHVlcygpKSB7CisgICAgICAgIGdyb3Vwcy5hZGRBbGwobS5nZXRLbm93bkdyb3VwcygpKTsKKyAgICAgIH0KKyAgICAgIHJldHVybiBncm91cHM7CisgICAgfQogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvVmlzaWJsZUdyb3Vwcy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hY2NvdW50L1Zpc2libGVHcm91cHMuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZDNiMmM4My4uMDAwMDAwMAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FjY291bnQvVmlzaWJsZUdyb3Vwcy5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMTMzICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZQotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50OwotCi1pbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBMaXN0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwUmVmZXJlbmNlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwotCi1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247Ci1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotaW1wb3J0IGphdmEudXRpbC5NYXA7Ci1pbXBvcnQgamF2YS51dGlsLlNldDsKLQotcHVibGljIGNsYXNzIFZpc2libGVHcm91cHMgewotCi0gIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgVmlzaWJsZUdyb3VwcyBjcmVhdGUoKTsKLSAgfQotCi0gIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8SWRlbnRpZmllZFVzZXI+IGlkZW50aWZpZWRVc2VyOwotICBwcml2YXRlIGZpbmFsIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZTsKLSAgcHJpdmF0ZSBmaW5hbCBHcm91cENvbnRyb2wuRmFjdG9yeSBncm91cENvbnRyb2xGYWN0b3J5OwotCi0gIHByaXZhdGUgYm9vbGVhbiBvbmx5VmlzaWJsZVRvQWxsOwotICBwcml2YXRlIEFjY291bnRHcm91cC5UeXBlIGdyb3VwVHlwZTsKLQotICBASW5qZWN0Ci0gIFZpc2libGVHcm91cHMoZmluYWwgUHJvdmlkZXI8SWRlbnRpZmllZFVzZXI+IGN1cnJlbnRVc2VyLAotICAgICAgZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlLAotICAgICAgZmluYWwgR3JvdXBDb250cm9sLkZhY3RvcnkgZ3JvdXBDb250cm9sRmFjdG9yeSkgewotICAgIHRoaXMuaWRlbnRpZmllZFVzZXIgPSBjdXJyZW50VXNlcjsKLSAgICB0aGlzLmdyb3VwQ2FjaGUgPSBncm91cENhY2hlOwotICAgIHRoaXMuZ3JvdXBDb250cm9sRmFjdG9yeSA9IGdyb3VwQ29udHJvbEZhY3Rvcnk7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBzZXRPbmx5VmlzaWJsZVRvQWxsKGZpbmFsIGJvb2xlYW4gb25seVZpc2libGVUb0FsbCkgewotICAgIHRoaXMub25seVZpc2libGVUb0FsbCA9IG9ubHlWaXNpYmxlVG9BbGw7Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBzZXRHcm91cFR5cGUoZmluYWwgQWNjb3VudEdyb3VwLlR5cGUgZ3JvdXBUeXBlKSB7Ci0gICAgdGhpcy5ncm91cFR5cGUgPSBncm91cFR5cGU7Ci0gIH0KLQotICBwdWJsaWMgR3JvdXBMaXN0IGdldCgpIHsKLSAgICByZXR1cm4gY3JlYXRlR3JvdXBMaXN0KGZpbHRlckdyb3Vwcyhncm91cENhY2hlLmFsbCgpKSk7Ci0gIH0KLQotICBwdWJsaWMgR3JvdXBMaXN0IGdldChmaW5hbCBDb2xsZWN0aW9uPFByb2plY3RDb250cm9sPiBwcm9qZWN0cykKLSAgICAgIHRocm93cyBOb1N1Y2hHcm91cEV4Y2VwdGlvbiB7Ci0gICAgTWFwPEFjY291bnRHcm91cC5VVUlELCBBY2NvdW50R3JvdXA+IGdyb3VwcyA9IE1hcHMubmV3SGFzaE1hcCgpOwotICAgIGZvciAoZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdENvbnRyb2wgOiBwcm9qZWN0cykgewotICAgICAgZmluYWwgU2V0PEdyb3VwUmVmZXJlbmNlPiBncm91cHNSZWZzID0gcHJvamVjdENvbnRyb2wuZ2V0QWxsR3JvdXBzKCk7Ci0gICAgICBmb3IgKGZpbmFsIEdyb3VwUmVmZXJlbmNlIGdyb3VwUmVmIDogZ3JvdXBzUmVmcykgewotICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAgZ3JvdXAgPSBncm91cENhY2hlLmdldChncm91cFJlZi5nZXRVVUlEKCkpOwotICAgICAgICBpZiAoZ3JvdXAgPT0gbnVsbCkgewotICAgICAgICAgIHRocm93IG5ldyBOb1N1Y2hHcm91cEV4Y2VwdGlvbihncm91cFJlZi5nZXRVVUlEKCkpOwotICAgICAgICB9Ci0gICAgICAgIGdyb3Vwcy5wdXQoZ3JvdXAuZ2V0R3JvdXBVVUlEKCksIGdyb3VwKTsKLSAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIGNyZWF0ZUdyb3VwTGlzdChmaWx0ZXJHcm91cHMoZ3JvdXBzLnZhbHVlcygpKSk7Ci0gIH0KLQotICAvKioKLSAgICogUmV0dXJucyB2aXNpYmxlIGxpc3Qgb2Yga25vd24gZ3JvdXBzIGZvciB0aGUgdXNlci4gRGVwZW5kaW5nIG9uIHRoZSBncm91cAotICAgKiBtZW1iZXJzaGlwIHJlYWxtcyBzdXBwb3J0ZWQsIHRoaXMgbWF5IG9ubHkgcmV0dXJuIGEgc3Vic2V0IG9mIHRoZSBlZmZlY3RpdmUKLSAgICogZ3JvdXBzLgotICAgKiBAU2VlIEdyb3VwTWVtYmVyc2hpcCNnZXRLbm93bkdyb3VwcygpCi0gICAqLwotICBwdWJsaWMgR3JvdXBMaXN0IGdldChmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyKSB0aHJvd3MgTm9TdWNoR3JvdXBFeGNlcHRpb24gewotICAgIGlmIChpZGVudGlmaWVkVXNlci5nZXQoKS5nZXRBY2NvdW50SWQoKS5lcXVhbHModXNlci5nZXRBY2NvdW50SWQoKSkKLSAgICAgICAgfHwgaWRlbnRpZmllZFVzZXIuZ2V0KCkuZ2V0Q2FwYWJpbGl0aWVzKCkuY2FuQWRtaW5pc3RyYXRlU2VydmVyKCkpIHsKLSAgICAgIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gbWluZSA9IHVzZXIuZ2V0RWZmZWN0aXZlR3JvdXBzKCkuZ2V0S25vd25Hcm91cHMoKTsKLSAgICAgIE1hcDxBY2NvdW50R3JvdXAuVVVJRCwgQWNjb3VudEdyb3VwPiBncm91cHMgPSBNYXBzLm5ld0hhc2hNYXAoKTsKLSAgICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBJZCA6IG1pbmUpIHsKLSAgICAgICAgQWNjb3VudEdyb3VwIGdyb3VwID0gZ3JvdXBDYWNoZS5nZXQoZ3JvdXBJZCk7Ci0gICAgICAgIGlmIChncm91cCAhPSBudWxsKSB7Ci0gICAgICAgICAgZ3JvdXBzLnB1dChncm91cElkLCBncm91cCk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICAgIHJldHVybiBjcmVhdGVHcm91cExpc3QoZmlsdGVyR3JvdXBzKGdyb3Vwcy52YWx1ZXMoKSkpOwotICAgIH0gZWxzZSB7Ci0gICAgICB0aHJvdyBuZXcgTm9TdWNoR3JvdXBFeGNlcHRpb24oIkdyb3VwcyBvZiB1c2VyICciICsgdXNlci5nZXRBY2NvdW50SWQoKQotICAgICAgICAgICsgIicgYXJlIG5vdCB2aXNpYmxlLiIpOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgTGlzdDxBY2NvdW50R3JvdXA+IGZpbHRlckdyb3VwcyhmaW5hbCBJdGVyYWJsZTxBY2NvdW50R3JvdXA+IGdyb3VwcykgewotICAgIGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwPiBmaWx0ZXJlZEdyb3VwcyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOwotICAgIGZpbmFsIGJvb2xlYW4gaXNBZG1pbiA9Ci0gICAgICAgIGlkZW50aWZpZWRVc2VyLmdldCgpLmdldENhcGFiaWxpdGllcygpLmNhbkFkbWluaXN0cmF0ZVNlcnZlcigpOwotICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwIGdyb3VwIDogZ3JvdXBzKSB7Ci0gICAgICBpZiAoIWlzQWRtaW4pIHsKLSAgICAgICAgZmluYWwgR3JvdXBDb250cm9sIGMgPSBncm91cENvbnRyb2xGYWN0b3J5LmNvbnRyb2xGb3IoZ3JvdXApOwotICAgICAgICBpZiAoIWMuaXNWaXNpYmxlKCkpIHsKLSAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotICAgICAgfQotICAgICAgaWYgKChvbmx5VmlzaWJsZVRvQWxsICYmICFncm91cC5pc1Zpc2libGVUb0FsbCgpKQotICAgICAgICAgIHx8IChncm91cFR5cGUgIT0gbnVsbCAmJiAhZ3JvdXBUeXBlLmVxdWFscyhncm91cC5nZXRUeXBlKCkpKSkgewotICAgICAgICBjb250aW51ZTsKLSAgICAgIH0KLSAgICAgIGZpbHRlcmVkR3JvdXBzLmFkZChncm91cCk7Ci0gICAgfQotICAgIENvbGxlY3Rpb25zLnNvcnQoZmlsdGVyZWRHcm91cHMsIG5ldyBHcm91cENvbXBhcmF0b3IoKSk7Ci0gICAgcmV0dXJuIGZpbHRlcmVkR3JvdXBzOwotICB9Ci0KLSAgcHJpdmF0ZSBHcm91cExpc3QgY3JlYXRlR3JvdXBMaXN0KGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwPiBncm91cHMpIHsKLSAgICByZXR1cm4gbmV3IEdyb3VwTGlzdChncm91cHMsIGlkZW50aWZpZWRVc2VyLmdldCgpCi0gICAgICAgIC5nZXRDYXBhYmlsaXRpZXMoKS5jYW5DcmVhdGVHcm91cCgpKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hcmdzNGovUHJvamVjdENvbnRyb2xIYW5kbGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FyZ3M0ai9Qcm9qZWN0Q29udHJvbEhhbmRsZXIuamF2YQppbmRleCBkYTAzM2U3Li43YjQ0YzAyIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FyZ3M0ai9Qcm9qZWN0Q29udHJvbEhhbmRsZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2FyZ3M0ai9Qcm9qZWN0Q29udHJvbEhhbmRsZXIuamF2YQpAQCAtMTQsNiArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hcmdzNGo7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uUHJvamVjdFV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoUHJvamVjdEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q29udHJvbDsKQEAgLTQyLDIzICs0MywxMiBAQAogICBAT3ZlcnJpZGUKICAgcHVibGljIGZpbmFsIGludCBwYXJzZUFyZ3VtZW50cyhmaW5hbCBQYXJhbWV0ZXJzIHBhcmFtcykKICAgICAgIHRocm93cyBDbWRMaW5lRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBTdHJpbmcgdG9rZW4gPSBwYXJhbXMuZ2V0UGFyYW1ldGVyKDApOwotICAgIFN0cmluZyBwcm9qZWN0TmFtZSA9IHRva2VuOworICAgIFN0cmluZyBwcm9qZWN0TmFtZSA9IHBhcmFtcy5nZXRQYXJhbWV0ZXIoMCk7CiAKICAgICB3aGlsZSAocHJvamVjdE5hbWUuZW5kc1dpdGgoIi8iKSkgewogICAgICAgcHJvamVjdE5hbWUgPSBwcm9qZWN0TmFtZS5zdWJzdHJpbmcoMCwgcHJvamVjdE5hbWUubGVuZ3RoKCkgLSAxKTsKICAgICB9CiAKLSAgICBpZiAocHJvamVjdE5hbWUuZW5kc1dpdGgoIi5naXQiKSkgewotICAgICAgLy8gQmUgbmljZSBhbmQgZHJvcCB0aGUgdHJhaWxpbmcgIi5naXQiIHN1ZmZpeCwgd2hpY2ggd2UgbmV2ZXIga2VlcAotICAgICAgLy8gaW4gb3VyIGRhdGFiYXNlLCBidXQgY2xpZW50cyBtaWdodCBtaXN0YWtlbmx5IHByb3ZpZGUgYW55d2F5LgotICAgICAgLy8KLSAgICAgIHByb2plY3ROYW1lID0gcHJvamVjdE5hbWUuc3Vic3RyaW5nKDAsIHByb2plY3ROYW1lLmxlbmd0aCgpIC0gNCk7Ci0gICAgICB3aGlsZSAocHJvamVjdE5hbWUuZW5kc1dpdGgoIi8iKSkgewotICAgICAgICBwcm9qZWN0TmFtZSA9IHByb2plY3ROYW1lLnN1YnN0cmluZygwLCBwcm9qZWN0TmFtZS5sZW5ndGgoKSAtIDEpOwotICAgICAgfQotICAgIH0KLQogICAgIHdoaWxlIChwcm9qZWN0TmFtZS5zdGFydHNXaXRoKCIvIikpIHsKICAgICAgIC8vIEJlIG5pY2UgYW5kIGRyb3AgdGhlIGxlYWRpbmcgIi8iIGlmIHN1cHBsaWVkIGJ5IGFuIGFic29sdXRlIHBhdGguCiAgICAgICAvLyBXZSBkb24ndCBoYXZlIGEgZmlsZSBzeXN0ZW0gaGllcmFyY2h5LCBqdXN0IGEgZmxhdCBuYW1lc3BhY2UgaW4KQEAgLTY4LDEyICs1OCwxNCBAQAogICAgICAgcHJvamVjdE5hbWUgPSBwcm9qZWN0TmFtZS5zdWJzdHJpbmcoMSk7CiAgICAgfQogCisgICAgU3RyaW5nIG5hbWVXaXRob3V0U3VmZml4ID0gUHJvamVjdFV0aWwuc3RyaXBHaXRTdWZmaXgocHJvamVjdE5hbWUpOworCiAgICAgZmluYWwgUHJvamVjdENvbnRyb2wgY29udHJvbDsKICAgICB0cnkgewotICAgICAgUHJvamVjdC5OYW1lS2V5IG5hbWVLZXkgPSBuZXcgUHJvamVjdC5OYW1lS2V5KHByb2plY3ROYW1lKTsKKyAgICAgIFByb2plY3QuTmFtZUtleSBuYW1lS2V5ID0gbmV3IFByb2plY3QuTmFtZUtleShuYW1lV2l0aG91dFN1ZmZpeCk7CiAgICAgICBjb250cm9sID0gcHJvamVjdENvbnRyb2xGYWN0b3J5LnZhbGlkYXRlRm9yKG5hbWVLZXksIFByb2plY3RDb250cm9sLk9XTkVSIHwgUHJvamVjdENvbnRyb2wuVklTSUJMRSk7CiAgICAgfSBjYXRjaCAoTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgQ21kTGluZUV4Y2VwdGlvbihvd25lciwgIiciICsgdG9rZW4gKyAiJzogbm90IGEgR2Vycml0IHByb2plY3QiKTsKKyAgICAgIHRocm93IG5ldyBDbWRMaW5lRXhjZXB0aW9uKG93bmVyLCBlLmdldE1lc3NhZ2UoKSk7CiAgICAgfQogCiAgICAgc2V0dGVyLmFkZFZhbHVlKGNvbnRyb2wpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0F1dGhCYWNrZW5kLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvQXV0aEJhY2tlbmQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xMDUwOTI2Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0F1dGhCYWNrZW5kLmphdmEKQEAgLTAsMCArMSw0OSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5FeHRlbnNpb25Qb2ludDsKKworLyoqCisgKiBJbXBsZW1lbnRhdGlvbnMgb2YgQXV0aEJhY2tlbmQgYXV0aGVudGljYXRlIHVzZXJzIGZvciBpbmNvbWluZyByZXF1ZXN0LgorICovCitARXh0ZW5zaW9uUG9pbnQKK3B1YmxpYyBpbnRlcmZhY2UgQXV0aEJhY2tlbmQgeworCisgIC8qKiBAcmV0dXJuIGFuIGlkZW50aWZpZXIgdGhhdCB1bmlxdWVseSBkZXNjcmliZXMgdGhlIGJhY2tlbmQuICovCisgIFN0cmluZyBnZXREb21haW4oKTsKKworICAvKioKKyAgICogQXV0aGVudGljYXRlIGluc3BlY3RzIHRoZSBBdXRoUmVxdWVzdCBhbmQgcmV0dXJucyBhdXRoZW50aWNhdGVkIHVzZXIuIElmCisgICAqIHRoZSByZXF1ZXN0IGlzIHVuYWJsZSB0byBiZSBhdXRoZW50aWNhdGVkLCBhbiBleGNlcHRpb24gd2lsbCBiZSB0aHJvd24uIFRoZQorICAgKiB7QGxpbmsgTWlzc2luZ0NyZWRlbnRpYWxzRXhjZXB0aW9ufSBtdXN0IGJlIHRocm93biB3aGVuIHRoZXJlIGFyZSBubworICAgKiBjcmVkZW50aWFscyBmb3IgdGhlIHJlcXVlc3QuIEl0IGlzIGV4cGVjdGVkIHRoYXQgYXQgbW9zdCBvbmUgQXV0aEJhY2tlbmQKKyAgICogd2lsbCBlaXRoZXIgcmV0dXJuIGFuIEF1dGhVc2VyIG9yIHRocm93IGEgbm9uLU1pc3NpbmdDcmVkZW50aWFsc0V4Y2VwdGlvbi4KKyAgICoKKyAgICogQHBhcmFtIHJlcSB0aGUgb2JqZWN0IGRlc2NyaWJpbmcgdGhlIHJlcXVlc3QuCisgICAqIEByZXR1cm4gdGhlIHN1Y2Nlc3NmdWxseSBhdXRoZW50aWNhdGVkIHVzZXIuCisgICAqIEB0aHJvd3MgTWlzc2luZ0NyZWRlbnRpYWxzRXhjZXB0aW9uIHdoZW4gdGhlcmUgYXJlIG5vIGNyZWRlbnRpYWxzLgorICAgKiBAdGhyb3dzIEludmFsaWRDcmVkZW50aWFsc0V4Y2VwdGlvbiB3aGVuIHRoZSBjcmVkZW50aWFscyBhcmUgcHJlc2VudCBhbmQKKyAgICogICAgICAgICBpbnZhbGlkLgorICAgKiBAdGhyb3dzIFVua25vd25Vc2VyRXhjZXB0aW9uIHdoZW4gdGhlIGNyZWRlbnRpYWxzIGFyZSB2YWxpZCBidXQgdGhlcmUgaXMKKyAgICogICAgICAgICBubyBtYXRjaGluZyB1c2VyLgorICAgKiBAdGhyb3dzIFVzZXJOb3RBbGxvd2VkRXhjZXB0aW9uIHdoZW4gdGhlIGNyZWRlbnRpYWxzIGFyZSB2YWxpZCBidXQgdGhlIHVzZXIKKyAgICogICAgICAgICBpcyBub3QgYWxsb3dlZC4KKyAgICogQHRocm93cyBBdXRoRXhjZXB0aW9uIHdoZW4gYW55IG90aGVyIGVycm9yIG9jY3Vycy4KKyAgICovCisgIEF1dGhVc2VyIGF1dGhlbnRpY2F0ZShBdXRoUmVxdWVzdCByZXEpIHRocm93cyBNaXNzaW5nQ3JlZGVudGlhbHNFeGNlcHRpb24sCisgICAgICBJbnZhbGlkQ3JlZGVudGlhbHNFeGNlcHRpb24sIFVua25vd25Vc2VyRXhjZXB0aW9uLAorICAgICAgVXNlck5vdEFsbG93ZWRFeGNlcHRpb24sIEF1dGhFeGNlcHRpb247Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvQXV0aEV4Y2VwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0F1dGhFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44Y2Y0YTBhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0F1dGhFeGNlcHRpb24uamF2YQpAQCAtMCwwICsxLDM3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGg7CisKKy8qKgorICogQmFzZSB0eXBlIGZvciBhdXRoZW50aWNhdGlvbiBleGNlcHRpb25zLgorICovCitwdWJsaWMgY2xhc3MgQXV0aEV4Y2VwdGlvbiBleHRlbmRzIEV4Y2VwdGlvbiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IC04OTQ2MzAyNjc2NTI1NTgwMzcyTDsKKworICBwdWJsaWMgQXV0aEV4Y2VwdGlvbigpIHsKKyAgfQorCisgIHB1YmxpYyBBdXRoRXhjZXB0aW9uKFN0cmluZyBtc2cpIHsKKyAgICBzdXBlcihtc2cpOworICB9CisKKyAgcHVibGljIEF1dGhFeGNlcHRpb24oVGhyb3dhYmxlIGV4KSB7CisgICAgc3VwZXIoZXgpOworICB9CisKKyAgcHVibGljIEF1dGhFeGNlcHRpb24oU3RyaW5nIG1zZywgVGhyb3dhYmxlIGV4KSB7CisgICAgc3VwZXIobXNnLCBleCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9BdXRoUmVxdWVzdC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0F1dGhSZXF1ZXN0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODE3OWQ0ZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9BdXRoUmVxdWVzdC5qYXZhCkBAIC0wLDAgKzEsNTggQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKKworaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CisKKy8qKgorICogRGVmaW5lcyBhbiBhYnN0cmFjdCByZXF1ZXN0IGZvciB1c2VyIGF1dGhlbnRpY2F0aW9uIHRvIEdlcnJpdC4KKyAqLworcHVibGljIGFic3RyYWN0IGNsYXNzIEF1dGhSZXF1ZXN0IHsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgdXNlcm5hbWU7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIHBhc3N3b3JkOworCisgIHByb3RlY3RlZCBBdXRoUmVxdWVzdChTdHJpbmcgdXNlcm5hbWUsIFN0cmluZyBwYXNzd29yZCkgeworICAgIHRoaXMudXNlcm5hbWUgPSB1c2VybmFtZTsKKyAgICB0aGlzLnBhc3N3b3JkID0gcGFzc3dvcmQ7CisgIH0KKworICAvKioKKyAgICogUmV0dXJucyB0aGUgdXNlcm5hbWUgdG8gYmUgYXV0aGVudGljYXRlZC4KKyAgICoKKyAgICogQHJldHVybiB1c2VybmFtZSBmb3IgYXV0aGVudGljYXRpb24gb3IgbnVsbCBmb3IgYW5vbnltb3VzIGFjY2Vzcy4KKyAgICovCisgIEBOdWxsYWJsZQorICBwdWJsaWMgZmluYWwgU3RyaW5nIGdldFVzZXJuYW1lKCkgeworICAgIHJldHVybiB1c2VybmFtZTsKKyAgfQorCisgIC8qKgorICAgKiBSZXR1cm5zIHRoZSB1c2VyJ3MgY3JlZGVudGlhbHMKKyAgICoKKyAgICogQHJldHVybiB1c2VyJ3MgY3JlZGVudGlhbHMgb3IgbnVsbAorICAgKi8KKyAgQE51bGxhYmxlCisgIHB1YmxpYyBmaW5hbCBTdHJpbmcgZ2V0UGFzc3dvcmQoKSB7CisgICAgcmV0dXJuIHBhc3N3b3JkOworICB9CisKKyAgcHVibGljIHZvaWQgY2hlY2tQYXNzd29yZChTdHJpbmcgcHdkKSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiB7CisgICAgaWYgKCFPYmplY3RzLmVxdWFsKGdldFBhc3N3b3JkKCksIHB3ZCkpIHsKKyAgICAgIHRocm93IG5ldyBJbnZhbGlkQ3JlZGVudGlhbHNFeGNlcHRpb24oKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9BdXRoVXNlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0F1dGhVc2VyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2QwODE3MwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9BdXRoVXNlci5qYXZhCkBAIC0wLDAgKzEsMTEzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGg7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5jb21tb24uYmFzZS5QcmVjb25kaXRpb25zLmNoZWNrTm90TnVsbDsKKworaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CisKKy8qKgorICogQW4gYXV0aGVudGljYXRlZCB1c2VyIGFzIHNwZWNpZmllZCBieSB0aGUgQXV0aEJhY2tlbmQuCisgKi8KK3B1YmxpYyBjbGFzcyBBdXRoVXNlciB7CisKKyAgLyoqCisgICAqIEdsb2JhbGx5IHVuaXF1ZSBpZGVudGlmaWVyIGZvciB0aGUgdXNlci4KKyAgICovCisgIHB1YmxpYyBmaW5hbCBzdGF0aWMgY2xhc3MgVVVJRCB7CisgICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgdXVpZDsKKworICAgIC8qKgorICAgICAqIEEgbmV3IHVuaXF1ZSBpZGVudGlmaWVyLgorICAgICAqCisgICAgICogQHBhcmFtIHV1aWQgdGhlIHVuaXF1ZSBpZGVudGlmaWVyLgorICAgICAqLworICAgIHB1YmxpYyBVVUlEKFN0cmluZyB1dWlkKSB7CisgICAgICB0aGlzLnV1aWQgPSBjaGVja05vdE51bGwodXVpZCk7CisgICAgfQorCisgICAgLyoqIEByZXR1cm4gdGhlIGdsb2JhbGx5IHVuaXF1ZSBpZGVudGlmaWVyLiAqLworICAgIHB1YmxpYyBTdHJpbmcgZ2V0KCkgeworICAgICAgcmV0dXJuIHV1aWQ7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvYmopIHsKKyAgICAgIGlmIChvYmogaW5zdGFuY2VvZiBVVUlEKSB7CisgICAgICAgIHJldHVybiBnZXQoKS5lcXVhbHMoKChVVUlEKSBvYmopLmdldCgpKTsKKyAgICAgIH0KKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworICAgICAgcmV0dXJuIGdldCgpLmhhc2hDb2RlKCk7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKyAgICAgIHJldHVybiBTdHJpbmcuZm9ybWF0KCJBdXRoVXNlci5VVUlEWyVzXSIsIGdldCgpKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIGZpbmFsIFVVSUQgdXVpZDsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgdXNlcm5hbWU7CisKKyAgLyoqCisgICAqIEFuIGF1dGhlbnRpY2F0ZWQgdXNlci4KKyAgICoKKyAgICogQHBhcmFtIHV1aWQgdGhlIGdsb2JhbGx5IHVuaXF1ZSBJRC4KKyAgICogQHBhcmFtIHVzZXJuYW1lIHRoZSBuYW1lIG9mIHRoZSBhdXRoZW50aWNhdGVkIHVzZXIuCisgICAqLworICBwdWJsaWMgQXV0aFVzZXIoVVVJRCB1dWlkLCBATnVsbGFibGUgU3RyaW5nIHVzZXJuYW1lKSB7CisgICAgdGhpcy51dWlkID0gY2hlY2tOb3ROdWxsKHV1aWQpOworICAgIHRoaXMudXNlcm5hbWUgPSB1c2VybmFtZTsKKyAgfQorCisgIC8qKiBAcmV0dXJuIHRoZSBnbG9iYWxseSB1bmlxdWUgaWRlbnRpZmllci4gKi8KKyAgcHVibGljIGZpbmFsIFVVSUQgZ2V0VVVJRCgpIHsKKyAgICByZXR1cm4gdXVpZDsKKyAgfQorCisgIC8qKiBAcmV0dXJuIHRoZSBiYWNrZW5kIHNwZWNpZmljIHVzZXIgbmFtZSwgb3IgbnVsbCBpZiBvbmUgZG9lcyBub3QgZXhpc3QuICovCisgIEBOdWxsYWJsZQorICBwdWJsaWMgZmluYWwgU3RyaW5nIGdldFVzZXJuYW1lKCkgeworICAgIHJldHVybiB1c2VybmFtZTsKKyAgfQorCisgIC8qKiBAcmV0dXJuIHtAY29kZSB0cnVlfSBpZiB7QGxpbmsgI2dldFVzZXJuYW1lKCl9IGlzIG5vdCBudWxsLiAqLworICBwdWJsaWMgZmluYWwgYm9vbGVhbiBoYXNVc2VybmFtZSgpIHsKKyAgICByZXR1cm4gZ2V0VXNlcm5hbWUoKSAhPSBudWxsOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBib29sZWFuIGVxdWFscyhPYmplY3Qgb2JqKSB7CisgICAgaWYgKG9iaiBpbnN0YW5jZW9mIEF1dGhVc2VyKSB7CisgICAgICByZXR1cm4gZ2V0VVVJRCgpLmVxdWFscygoKEF1dGhVc2VyKSBvYmopLmdldFVVSUQoKSk7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgaW50IGhhc2hDb2RlKCkgeworICAgIHJldHVybiBnZXRVVUlEKCkuaGFzaENvZGUoKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgIHJldHVybiBTdHJpbmcuZm9ybWF0KCJBdXRoVXNlclt1dWlkPSVzLCB1c2VybmFtZT0lc10iLCBnZXRVVUlEKCksCisgICAgICAgIGdldFVzZXJuYW1lKCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvSW50ZXJuYWxBdXRoQmFja2VuZC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0ludGVybmFsQXV0aEJhY2tlbmQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42ZTllNzFiCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0ludGVybmFsQXV0aEJhY2tlbmQuamF2YQpAQCAtMCwwICsxLDY3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGg7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50Q2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudFN0YXRlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQXV0aENvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworCitpbXBvcnQgamF2YS51dGlsLkxvY2FsZTsKKworQFNpbmdsZXRvbgorcHVibGljIGNsYXNzIEludGVybmFsQXV0aEJhY2tlbmQgaW1wbGVtZW50cyBBdXRoQmFja2VuZCB7CisgIHByaXZhdGUgZmluYWwgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBBdXRoQ29uZmlnIGF1dGhDb25maWc7CisKKyAgQEluamVjdAorICBJbnRlcm5hbEF1dGhCYWNrZW5kKEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGUsIEF1dGhDb25maWcgYXV0aENvbmZpZykgeworICAgIHRoaXMuYWNjb3VudENhY2hlID0gYWNjb3VudENhY2hlOworICAgIHRoaXMuYXV0aENvbmZpZyA9IGF1dGhDb25maWc7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXREb21haW4oKSB7CisgICAgcmV0dXJuICJnZXJyaXQiOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBBdXRoVXNlciBhdXRoZW50aWNhdGUoQXV0aFJlcXVlc3QgcmVxKQorICAgICAgdGhyb3dzIE1pc3NpbmdDcmVkZW50aWFsc0V4Y2VwdGlvbiwgSW52YWxpZENyZWRlbnRpYWxzRXhjZXB0aW9uLAorICAgICAgVW5rbm93blVzZXJFeGNlcHRpb24sIFVzZXJOb3RBbGxvd2VkRXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uIHsKKyAgICBpZiAocmVxLmdldFVzZXJuYW1lKCkgPT0gbnVsbCB8fCByZXEuZ2V0UGFzc3dvcmQoKSA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgTWlzc2luZ0NyZWRlbnRpYWxzRXhjZXB0aW9uKCk7CisgICAgfQorCisgICAgU3RyaW5nIHVzZXJuYW1lOworICAgIGlmIChhdXRoQ29uZmlnLmlzVXNlck5hbWVUb0xvd2VyQ2FzZSgpKSB7CisgICAgICB1c2VybmFtZSA9IHJlcS5nZXRVc2VybmFtZSgpLnRvTG93ZXJDYXNlKExvY2FsZS5VUyk7CisgICAgfSBlbHNlIHsKKyAgICAgIHVzZXJuYW1lID0gcmVxLmdldFVzZXJuYW1lKCk7CisgICAgfQorCisgICAgZmluYWwgQWNjb3VudFN0YXRlIHdobyA9IGFjY291bnRDYWNoZS5nZXRCeVVzZXJuYW1lKHVzZXJuYW1lKTsKKyAgICBpZiAod2hvID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBVbmtub3duVXNlckV4Y2VwdGlvbigpOworICAgIH0gZWxzZSBpZiAoIXdoby5nZXRBY2NvdW50KCkuaXNBY3RpdmUoKSkgeworICAgICAgdGhyb3cgbmV3IFVzZXJOb3RBbGxvd2VkRXhjZXB0aW9uKCJBdXRoZW50aWNhdGlvbiBmYWlsZWQgZm9yICIgKyB1c2VybmFtZQorICAgICAgICAgICsgIjogYWNjb3VudCBpbmFjdGl2ZSBvciBub3QgcHJvdmlzaW9uZWQgaW4gR2Vycml0Iik7CisgICAgfQorCisgICAgcmVxLmNoZWNrUGFzc3dvcmQod2hvLmdldFBhc3N3b3JkKHVzZXJuYW1lKSk7CisgICAgcmV0dXJuIG5ldyBBdXRoVXNlcihuZXcgQXV0aFVzZXIuVVVJRCh1c2VybmFtZSksIHVzZXJuYW1lKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0ludmFsaWRDcmVkZW50aWFsc0V4Y2VwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL0ludmFsaWRDcmVkZW50aWFsc0V4Y2VwdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJjYTg1ODYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvSW52YWxpZENyZWRlbnRpYWxzRXhjZXB0aW9uLmphdmEKQEAgLTAsMCArMSwzOCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoOworCisvKioKKyAqIEFuIGF1dGhlbnRpY2F0aW9uIGV4Y2VwdGlvbiB0aGF0IGlzIHRocm93biB3aGVuIHRoZSBjcmVkZW50aWFscyBhcmUgcHJlc2VudAorICogYW5kIGFyZSB1bmFibGUgdG8gYmUgdmVyaWZpZWQuCisgKi8KK3B1YmxpYyBjbGFzcyBJbnZhbGlkQ3JlZGVudGlhbHNFeGNlcHRpb24gZXh0ZW5kcyBBdXRoRXhjZXB0aW9uIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMzcwOTIwMTA0MjA4MDQ0NDI3Nkw7CisKKyAgcHVibGljIEludmFsaWRDcmVkZW50aWFsc0V4Y2VwdGlvbigpIHsKKyAgfQorCisgIHB1YmxpYyBJbnZhbGlkQ3JlZGVudGlhbHNFeGNlcHRpb24oU3RyaW5nIG1zZykgeworICAgIHN1cGVyKG1zZyk7CisgIH0KKworICBwdWJsaWMgSW52YWxpZENyZWRlbnRpYWxzRXhjZXB0aW9uKFRocm93YWJsZSBleCkgeworICAgIHN1cGVyKGV4KTsKKyAgfQorCisgIHB1YmxpYyBJbnZhbGlkQ3JlZGVudGlhbHNFeGNlcHRpb24oU3RyaW5nIG1zZywgVGhyb3dhYmxlIGV4KSB7CisgICAgc3VwZXIobXNnLCBleCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9NaXNzaW5nQ3JlZGVudGlhbHNFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9NaXNzaW5nQ3JlZGVudGlhbHNFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wNjI3MjhhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL01pc3NpbmdDcmVkZW50aWFsc0V4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsNDEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aDsKKworLyoqCisgKiBBbiBhdXRoZW50aWNhdGlvbiBleGNlcHRpb24gdGhhdCBpcyB0aHJvd24gd2hlbiB0aGUgY3JlZGVudGlhbHMgYXJlIG5vdAorICogcHJlc2VudC4gVGhpcyBpbmRpY2F0ZXMgdGhhdCB0aGUgQXV0aEJhY2tlbmQgaGFzIG5vbmUgb2YgdGhlIG5lZWRlZAorICogaW5mb3JtYXRpb24gaW4gdGhlIHJlcXVlc3QgdG8gcGVyZm9ybSBhdXRoZW50aWNhdGlvbi4gSWYgcGFydHMgb2YgdGhlCisgKiBhdXRoZW50aWNhdGlvbiBpbmZvcm1hdGlvbiBpcyBhdmFpbGFibGUgdG8gdGhlIGJhY2tlbmQsIHRoZW4gYSBkaWZmZXJlbnQKKyAqIEF1dGhFeGNlcHRpb24gc2hvdWxkIGJlIHVzZWQuCisgKi8KK3B1YmxpYyBjbGFzcyBNaXNzaW5nQ3JlZGVudGlhbHNFeGNlcHRpb24gZXh0ZW5kcyBBdXRoRXhjZXB0aW9uIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gLTY0OTk4NjY5Nzc1MTM1MDgwNTFMOworCisgIHB1YmxpYyBNaXNzaW5nQ3JlZGVudGlhbHNFeGNlcHRpb24oKSB7CisgIH0KKworICBwdWJsaWMgTWlzc2luZ0NyZWRlbnRpYWxzRXhjZXB0aW9uKFN0cmluZyBtc2cpIHsKKyAgICBzdXBlcihtc2cpOworICB9CisKKyAgcHVibGljIE1pc3NpbmdDcmVkZW50aWFsc0V4Y2VwdGlvbihUaHJvd2FibGUgZXgpIHsKKyAgICBzdXBlcihleCk7CisgIH0KKworICBwdWJsaWMgTWlzc2luZ0NyZWRlbnRpYWxzRXhjZXB0aW9uKFN0cmluZyBtc2csIFRocm93YWJsZSBleCkgeworICAgIHN1cGVyKG1zZywgZXgpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvVW5pdmVyc2FsQXV0aEJhY2tlbmQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9Vbml2ZXJzYWxBdXRoQmFja2VuZC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY4OWM5NGMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvVW5pdmVyc2FsQXV0aEJhY2tlbmQuamF2YQpAQCAtMCwwICsxLDczIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGg7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5jb21tb24uYmFzZS5QcmVjb25kaXRpb25zLmNoZWNrTm90TnVsbDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitpbXBvcnQgamF2YXguaW5qZWN0LkluamVjdDsKK2ltcG9ydCBqYXZheC5pbmplY3QuU2luZ2xldG9uOworCisvKioKKyAqIFVuaXZlcnNhbCBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgQXV0aEJhY2tlbmQgdGhhdCB3b3JrcyB3aXRoIHRoZSBpbmplY3RlZAorICogc2V0IG9mIEF1dGhCYWNrZW5kcy4KKyAqLworQFNpbmdsZXRvbgorcHVibGljIGZpbmFsIGNsYXNzIFVuaXZlcnNhbEF1dGhCYWNrZW5kIGltcGxlbWVudHMgQXV0aEJhY2tlbmQgeworICBwcml2YXRlIGZpbmFsIER5bmFtaWNTZXQ8QXV0aEJhY2tlbmQ+IGF1dGhCYWNrZW5kczsKKworICBASW5qZWN0CisgIFVuaXZlcnNhbEF1dGhCYWNrZW5kKER5bmFtaWNTZXQ8QXV0aEJhY2tlbmQ+IGF1dGhCYWNrZW5kcykgeworICAgIHRoaXMuYXV0aEJhY2tlbmRzID0gYXV0aEJhY2tlbmRzOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBBdXRoVXNlciBhdXRoZW50aWNhdGUoZmluYWwgQXV0aFJlcXVlc3QgcmVxdWVzdCkgdGhyb3dzIEF1dGhFeGNlcHRpb24geworICAgIExpc3Q8QXV0aFVzZXI+IGF1dGhVc2VycyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIExpc3Q8QXV0aEV4Y2VwdGlvbj4gYXV0aEV4cyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIGZvciAoQXV0aEJhY2tlbmQgYmFja2VuZCA6IGF1dGhCYWNrZW5kcykgeworICAgICAgdHJ5IHsKKyAgICAgICAgYXV0aFVzZXJzLmFkZChjaGVja05vdE51bGwoYmFja2VuZC5hdXRoZW50aWNhdGUocmVxdWVzdCkpKTsKKyAgICAgIH0gY2F0Y2ggKE1pc3NpbmdDcmVkZW50aWFsc0V4Y2VwdGlvbiBleCkgeworICAgICAgICAvLyBOb3QgaGFuZGxlZCBieSB0aGlzIGJhY2tlbmQuCisgICAgICB9IGNhdGNoIChBdXRoRXhjZXB0aW9uIGV4KSB7CisgICAgICAgIGF1dGhFeHMuYWRkKGV4KTsKKyAgICAgIH0KKyAgICB9CisKKyAgICAvLyBIYW5kbGUgdGhlIHZhbGlkIHJlc3BvbnNlcworICAgIGlmIChhdXRoVXNlcnMuc2l6ZSgpID09IDEpIHsKKyAgICAgIHJldHVybiBhdXRoVXNlcnMuZ2V0KDApOworICAgIH0gZWxzZSBpZiAoYXV0aFVzZXJzLmlzRW1wdHkoKSAmJiBhdXRoRXhzLnNpemUoKSA9PSAxKSB7CisgICAgICB0aHJvdyBhdXRoRXhzLmdldCgwKTsKKyAgICB9IGVsc2UgaWYgKGF1dGhFeHMuaXNFbXB0eSgpICYmIGF1dGhVc2Vycy5pc0VtcHR5KCkpIHsKKyAgICAgIHRocm93IG5ldyBNaXNzaW5nQ3JlZGVudGlhbHNFeGNlcHRpb24oKTsKKyAgICB9CisKKyAgICBTdHJpbmcgbXNnID0gU3RyaW5nLmZvcm1hdCgiTXVsdGlwbGUgQXV0aEJhY2tlbmRzIGF0dGVtcHRlZCB0byBoYW5kbGUgcmVxdWVzdDoiCisgICAgICAgICsgIiBhdXRoVXNlcnM9JXMgYXV0aEV4cz0lcyIsIGF1dGhVc2VycywgYXV0aEV4cyk7CisgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24obXNnKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGdldERvbWFpbigpIHsKKyAgICB0aHJvdyBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24oCisgICAgICAgICJVbml2ZXJzYWxBdXRoQmFja2VuZCBkb2Vzbid0IHN1cHBvcnQgZG9tYWluLiIpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvVW5rbm93blVzZXJFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9Vbmtub3duVXNlckV4Y2VwdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjEyNDkxMmEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvVW5rbm93blVzZXJFeGNlcHRpb24uamF2YQpAQCAtMCwwICsxLDM4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGg7CisKKy8qKgorICogQW4gYXV0aGVudGljYXRpb24gZXhjZXB0aW9uIHRoYXQgaXMgdGhyb3duIHdoZW4gY3JlZGVudGlhbHMgYXJlIHByZXNlbnRlZCBmb3IKKyAqIGFuIHVua25vd24gdXNlci4KKyAqLworcHVibGljIGNsYXNzIFVua25vd25Vc2VyRXhjZXB0aW9uIGV4dGVuZHMgQXV0aEV4Y2VwdGlvbiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDE2MjYxODYxNjY5MjQ2NzA3NTRMOworCisgIHB1YmxpYyBVbmtub3duVXNlckV4Y2VwdGlvbigpIHsKKyAgfQorCisgIHB1YmxpYyBVbmtub3duVXNlckV4Y2VwdGlvbihTdHJpbmcgbXNnKSB7CisgICAgc3VwZXIobXNnKTsKKyAgfQorCisgIHB1YmxpYyBVbmtub3duVXNlckV4Y2VwdGlvbihUaHJvd2FibGUgZXgpIHsKKyAgICBzdXBlcihleCk7CisgIH0KKworICBwdWJsaWMgVW5rbm93blVzZXJFeGNlcHRpb24oU3RyaW5nIG1zZywgVGhyb3dhYmxlIGV4KSB7CisgICAgc3VwZXIobXNnLCBleCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9Vc2VyTm90QWxsb3dlZEV4Y2VwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL1VzZXJOb3RBbGxvd2VkRXhjZXB0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjQyMDMzMAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9Vc2VyTm90QWxsb3dlZEV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMzkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aDsKKworLyoqCisgKiBBbiBhdXRoZW50aWNhdGlvbiBleGNlcHRpb24gdGhhdCBpcyB0aHJvd24gd2hlbiB0aGUgdXNlciBjcmVkZW50aWFscyBhcmUKKyAqIHZhbGlkLCBidXQgbm90IGFsbG93ZWQgdG8gYXV0aGVudGljYXRlIGZvciBvdGhlciByZWFzb25zIGkuZS4gYWNjb3VudAorICogZGlzYWJsZWQuCisgKi8KK3B1YmxpYyBjbGFzcyBVc2VyTm90QWxsb3dlZEV4Y2VwdGlvbiBleHRlbmRzIEF1dGhFeGNlcHRpb24geworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAtMTUzMTQxMTk5OTkzMjkyMjU1OEw7CisKKyAgcHVibGljIFVzZXJOb3RBbGxvd2VkRXhjZXB0aW9uKCkgeworICB9CisKKyAgcHVibGljIFVzZXJOb3RBbGxvd2VkRXhjZXB0aW9uKFN0cmluZyBtc2cpIHsKKyAgICBzdXBlcihtc2cpOworICB9CisKKyAgcHVibGljIFVzZXJOb3RBbGxvd2VkRXhjZXB0aW9uKFRocm93YWJsZSBleCkgeworICAgIHN1cGVyKGV4KTsKKyAgfQorCisgIHB1YmxpYyBVc2VyTm90QWxsb3dlZEV4Y2VwdGlvbihTdHJpbmcgbXNnLCBUaHJvd2FibGUgZXgpIHsKKyAgICBzdXBlcihtc2csIGV4KTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvSGVscGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9IZWxwZXIuamF2YQppbmRleCA2NDRmNWRmLi4wMTUxZGRlIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9IZWxwZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9IZWxwZXIuamF2YQpAQCAtMTQsNiArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoLmxkYXA7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlRocm93YWJsZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY2FjaGUuQ2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGFyYW1ldGVyaXplZFN0cmluZzsKQEAgLTI4LDYgKzI5LDggQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKIAoraW1wb3J0IGphdmEuc2VjdXJpdHkuUHJpdmlsZWdlZEFjdGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnNlY3VyaXR5LlByaXZpbGVnZWRFeGNlcHRpb25BY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CkBAIC00Nyw2ICs1MCw5IEBACiBpbXBvcnQgamF2YXgubmFtaW5nLmRpcmVjdG9yeS5EaXJDb250ZXh0OwogaW1wb3J0IGphdmF4Lm5hbWluZy5kaXJlY3RvcnkuSW5pdGlhbERpckNvbnRleHQ7CiBpbXBvcnQgamF2YXgubmV0LnNzbC5TU0xTb2NrZXRGYWN0b3J5OworaW1wb3J0IGphdmF4LnNlY3VyaXR5LmF1dGguU3ViamVjdDsKK2ltcG9ydCBqYXZheC5zZWN1cml0eS5hdXRoLmxvZ2luLkxvZ2luQ29udGV4dDsKK2ltcG9ydCBqYXZheC5zZWN1cml0eS5hdXRoLmxvZ2luLkxvZ2luRXhjZXB0aW9uOwogCiBAU2luZ2xldG9uIGNsYXNzIEhlbHBlciB7CiAgIHN0YXRpYyBmaW5hbCBTdHJpbmcgTERBUF9VVUlEID0gImxkYXA6IjsKQEAgLTU4LDYgKzY0LDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcGFzc3dvcmQ7CiAgIHByaXZhdGUgZmluYWwgU3RyaW5nIHJlZmVycmFsOwogICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gc3NsVmVyaWZ5OworICBwcml2YXRlIGZpbmFsIFN0cmluZyBhdXRoZW50aWNhdGlvbjsKICAgcHJpdmF0ZSB2b2xhdGlsZSBMZGFwU2NoZW1hIGxkYXBTY2hlbWE7CiAgIHByaXZhdGUgZmluYWwgU3RyaW5nIHJlYWRUaW1lT3V0TWlsbGlzOwogCkBAIC02NiwxMSArNzMsMTIgQEAKICAgICAgIEBOYW1lZChMZGFwTW9kdWxlLkdST1VQU19CWUlOQ0xVREVfQ0FDSEUpCiAgICAgICBDYWNoZTxTdHJpbmcsIEltbXV0YWJsZVNldDxTdHJpbmc+PiBncm91cHNCeUluY2x1ZGUpIHsKICAgICB0aGlzLmNvbmZpZyA9IGNvbmZpZzsKLSAgICB0aGlzLnNlcnZlciA9IExkYXBSZWFsbS5yZXF1aXJlZChjb25maWcsICJzZXJ2ZXIiKTsKKyAgICB0aGlzLnNlcnZlciA9IExkYXBSZWFsbS5vcHRpb25hbChjb25maWcsICJzZXJ2ZXIiKTsKICAgICB0aGlzLnVzZXJuYW1lID0gTGRhcFJlYWxtLm9wdGlvbmFsKGNvbmZpZywgInVzZXJuYW1lIik7CiAgICAgdGhpcy5wYXNzd29yZCA9IExkYXBSZWFsbS5vcHRpb25hbChjb25maWcsICJwYXNzd29yZCIpOwogICAgIHRoaXMucmVmZXJyYWwgPSBMZGFwUmVhbG0ub3B0aW9uYWwoY29uZmlnLCAicmVmZXJyYWwiKTsKICAgICB0aGlzLnNzbFZlcmlmeSA9IGNvbmZpZy5nZXRCb29sZWFuKCJsZGFwIiwgInNzbHZlcmlmeSIsIHRydWUpOworICAgIHRoaXMuYXV0aGVudGljYXRpb24gPSBMZGFwUmVhbG0ub3B0aW9uYWwoY29uZmlnLCAiYXV0aGVudGljYXRpb24iKTsKICAgICBTdHJpbmcgdGltZW91dCA9IExkYXBSZWFsbS5vcHRpb25hbChjb25maWcsICJyZWFkVGltZW91dCIpOwogICAgIGlmICh0aW1lb3V0ICE9IG51bGwpIHsKICAgICAgIHJlYWRUaW1lT3V0TWlsbGlzID0KQEAgLTk2LDE1ICsxMDQsNDEgQEAKICAgICByZXR1cm4gZW52OwogICB9CiAKLSAgRGlyQ29udGV4dCBvcGVuKCkgdGhyb3dzIE5hbWluZ0V4Y2VwdGlvbiB7CisgIERpckNvbnRleHQgb3BlbigpIHRocm93cyBOYW1pbmdFeGNlcHRpb24sIExvZ2luRXhjZXB0aW9uIHsKICAgICBmaW5hbCBQcm9wZXJ0aWVzIGVudiA9IGNyZWF0ZUNvbnRleHRQcm9wZXJ0aWVzKCk7Ci0gICAgaWYgKHVzZXJuYW1lICE9IG51bGwpIHsKLSAgICAgIGVudi5wdXQoQ29udGV4dC5TRUNVUklUWV9BVVRIRU5USUNBVElPTiwgInNpbXBsZSIpOwotICAgICAgZW52LnB1dChDb250ZXh0LlNFQ1VSSVRZX1BSSU5DSVBBTCwgdXNlcm5hbWUpOwotICAgICAgZW52LnB1dChDb250ZXh0LlNFQ1VSSVRZX0NSRURFTlRJQUxTLCBwYXNzd29yZCAhPSBudWxsID8gcGFzc3dvcmQgOiAiIik7Ci0gICAgICBlbnYucHV0KENvbnRleHQuUkVGRVJSQUwsIHJlZmVycmFsICE9IG51bGwgPyByZWZlcnJhbCA6ICJpZ25vcmUiKTsKKyAgICBlbnYucHV0KENvbnRleHQuU0VDVVJJVFlfQVVUSEVOVElDQVRJT04sIGF1dGhlbnRpY2F0aW9uICE9IG51bGwgPyBhdXRoZW50aWNhdGlvbiA6ICJzaW1wbGUiKTsKKyAgICBlbnYucHV0KENvbnRleHQuUkVGRVJSQUwsIHJlZmVycmFsICE9IG51bGwgPyByZWZlcnJhbCA6ICJpZ25vcmUiKTsKKyAgICBpZiAoIkdTU0FQSSIuZXF1YWxzKGF1dGhlbnRpY2F0aW9uKSkgeworICAgICAgcmV0dXJuIGtlcmJlcm9zT3BlbihlbnYpOworICAgIH0gZWxzZSB7CisgICAgICBpZiAodXNlcm5hbWUgIT0gbnVsbCkgeworICAgICAgICBlbnYucHV0KENvbnRleHQuU0VDVVJJVFlfUFJJTkNJUEFMLCB1c2VybmFtZSk7CisgICAgICAgIGVudi5wdXQoQ29udGV4dC5TRUNVUklUWV9DUkVERU5USUFMUywgcGFzc3dvcmQgIT0gbnVsbCA/IHBhc3N3b3JkIDogIiIpOworICAgICAgfQorICAgICAgcmV0dXJuIG5ldyBJbml0aWFsRGlyQ29udGV4dChlbnYpOwogICAgIH0KLSAgICByZXR1cm4gbmV3IEluaXRpYWxEaXJDb250ZXh0KGVudik7CisgIH0KKworICBwcml2YXRlIERpckNvbnRleHQga2VyYmVyb3NPcGVuKGZpbmFsIFByb3BlcnRpZXMgZW52KSB0aHJvd3MgTG9naW5FeGNlcHRpb24sCisgICAgICBOYW1pbmdFeGNlcHRpb24geworICAgIExvZ2luQ29udGV4dCBjdHggPSBuZXcgTG9naW5Db250ZXh0KCJLZXJiZXJvc0xvZ2luIik7CisgICAgY3R4LmxvZ2luKCk7CisgICAgU3ViamVjdCBzdWJqZWN0ID0gY3R4LmdldFN1YmplY3QoKTsKKyAgICB0cnkgeworICAgICAgcmV0dXJuIFN1YmplY3QuZG9BcyhzdWJqZWN0LCBuZXcgUHJpdmlsZWdlZEV4Y2VwdGlvbkFjdGlvbjxEaXJDb250ZXh0PigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgRGlyQ29udGV4dCBydW4oKSB0aHJvd3MgTmFtaW5nRXhjZXB0aW9uIHsKKyAgICAgICAgICAgIHJldHVybiBuZXcgSW5pdGlhbERpckNvbnRleHQoZW52KTsKKyAgICAgICAgICB9CisgICAgICAgIH0pOworICAgIH0gY2F0Y2ggKFByaXZpbGVnZWRBY3Rpb25FeGNlcHRpb24gZSkgeworICAgICAgVGhyb3dhYmxlcy5wcm9wYWdhdGVJZlBvc3NpYmxlKGUuZ2V0RXhjZXB0aW9uKCksIE5hbWluZ0V4Y2VwdGlvbi5jbGFzcyk7CisgICAgICBUaHJvd2FibGVzLnByb3BhZ2F0ZUlmUG9zc2libGUoZS5nZXRFeGNlcHRpb24oKSwgUnVudGltZUV4Y2VwdGlvbi5jbGFzcyk7CisgICAgICBMZGFwUmVhbG0ubG9nLndhcm4oIkludGVybmFsIGVycm9yIiwgZS5nZXRFeGNlcHRpb24oKSk7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9IGZpbmFsbHkgeworICAgICAgY3R4LmxvZ291dCgpOworICAgIH0KICAgfQogCiAgIERpckNvbnRleHQgYXV0aGVudGljYXRlKFN0cmluZyBkbiwgU3RyaW5nIHBhc3N3b3JkKSB0aHJvd3MgQWNjb3VudEV4Y2VwdGlvbiB7CkBAIC0yMDcsNyArMjQxLDcgQEAKICAgICBpZiAoYWN0dWFsLmlzRW1wdHkoKSkgewogICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5U2V0KCk7CiAgICAgfSBlbHNlIHsKLSAgICAgIHJldHVybiBDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVTZXQoYWN0dWFsKTsKKyAgICAgIHJldHVybiBJbW11dGFibGVTZXQuY29weU9mKGFjdHVhbCk7CiAgICAgfQogICB9CiAKQEAgLTI1Niw2ICsyOTAsNyBAQAogICAgIGZpbmFsIExpc3Q8U3RyaW5nPiBncm91cEJhc2VzOwogICAgIGZpbmFsIFNlYXJjaFNjb3BlIGdyb3VwU2NvcGU7CiAgICAgZmluYWwgUGFyYW1ldGVyaXplZFN0cmluZyBncm91cFBhdHRlcm47CisgICAgZmluYWwgUGFyYW1ldGVyaXplZFN0cmluZyBncm91cE5hbWU7CiAgICAgZmluYWwgTGlzdDxMZGFwUXVlcnk+IGdyb3VwTWVtYmVyUXVlcnlMaXN0OwogCiAgICAgTGRhcFNjaGVtYShmaW5hbCBEaXJDb250ZXh0IGN0eCkgewpAQCAtMjcxLDYgKzMwNiw3IEBACiAgICAgICBncm91cEJhc2VzID0gTGRhcFJlYWxtLm9wdGlvbmFsTGlzdChjb25maWcsICJncm91cEJhc2UiKTsKICAgICAgIGdyb3VwU2NvcGUgPSBMZGFwUmVhbG0uc2NvcGUoY29uZmlnLCAiZ3JvdXBTY29wZSIpOwogICAgICAgZ3JvdXBQYXR0ZXJuID0gTGRhcFJlYWxtLnBhcmFtU3RyaW5nKGNvbmZpZywgImdyb3VwUGF0dGVybiIsIHR5cGUuZ3JvdXBQYXR0ZXJuKCkpOworICAgICAgZ3JvdXBOYW1lID0gTGRhcFJlYWxtLnBhcmFtU3RyaW5nKGNvbmZpZywgImdyb3VwTmFtZSIsIHR5cGUuZ3JvdXBOYW1lKCkpOwogICAgICAgZmluYWwgU3RyaW5nIGdyb3VwTWVtYmVyUGF0dGVybiA9CiAgICAgICAgICAgTGRhcFJlYWxtLm9wdGRlZihjb25maWcsICJncm91cE1lbWJlclBhdHRlcm4iLCB0eXBlLmdyb3VwTWVtYmVyUGF0dGVybigpKTsKIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcEF1dGhCYWNrZW5kLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwQXV0aEJhY2tlbmQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZjY4YThiCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcEF1dGhCYWNrZW5kLmphdmEKQEAgLTAsMCArMSwxMTMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aC5sZGFwOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkF1dGhUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGguQXV0aEJhY2tlbmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGguQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aC5BdXRoUmVxdWVzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aC5BdXRoVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aC5JbnZhbGlkQ3JlZGVudGlhbHNFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGguTWlzc2luZ0NyZWRlbnRpYWxzRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoLlVua25vd25Vc2VyRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoLlVzZXJOb3RBbGxvd2VkRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQXV0aENvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKKworaW1wb3J0IGphdmEudXRpbC5Mb2NhbGU7CisKK2ltcG9ydCBqYXZheC5uYW1pbmcuTmFtaW5nRXhjZXB0aW9uOworaW1wb3J0IGphdmF4Lm5hbWluZy5kaXJlY3RvcnkuRGlyQ29udGV4dDsKK2ltcG9ydCBqYXZheC5zZWN1cml0eS5hdXRoLmxvZ2luLkxvZ2luRXhjZXB0aW9uOworCisvKioKKyAqIEltcGxlbWVudGF0aW9uIG9mIEF1dGhCYWNrZW5kIGZvciB0aGUgTERBUCBhdXRoZW50aWNhdGlvbiBzeXN0ZW0uCisgKi8KK3B1YmxpYyBjbGFzcyBMZGFwQXV0aEJhY2tlbmQgaW1wbGVtZW50cyBBdXRoQmFja2VuZCB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihMZGFwQXV0aEJhY2tlbmQuY2xhc3MpOworCisgIHByaXZhdGUgZmluYWwgSGVscGVyIGhlbHBlcjsKKyAgcHJpdmF0ZSBmaW5hbCBBdXRoQ29uZmlnIGF1dGhDb25maWc7CisgIHByaXZhdGUgZmluYWwgYm9vbGVhbiBsb3dlckNhc2VVc2VybmFtZTsKKworICBASW5qZWN0CisgIHB1YmxpYyBMZGFwQXV0aEJhY2tlbmQoSGVscGVyIGhlbHBlciwKKyAgICAgIEF1dGhDb25maWcgYXV0aENvbmZpZywKKyAgICAgIEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNvbmZpZykgeworICAgIHRoaXMuaGVscGVyID0gaGVscGVyOworICAgIHRoaXMuYXV0aENvbmZpZyA9IGF1dGhDb25maWc7CisgICAgdGhpcy5sb3dlckNhc2VVc2VybmFtZSA9CisgICAgICAgIGNvbmZpZy5nZXRCb29sZWFuKCJsZGFwIiwgImxvY2FsVXNlcm5hbWVUb0xvd2VyQ2FzZSIsIGZhbHNlKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGdldERvbWFpbigpIHsKKyAgICByZXR1cm4gImxkYXAiOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBBdXRoVXNlciBhdXRoZW50aWNhdGUoQXV0aFJlcXVlc3QgcmVxKQorICAgICAgdGhyb3dzIE1pc3NpbmdDcmVkZW50aWFsc0V4Y2VwdGlvbiwgSW52YWxpZENyZWRlbnRpYWxzRXhjZXB0aW9uLAorICAgICAgVW5rbm93blVzZXJFeGNlcHRpb24sIFVzZXJOb3RBbGxvd2VkRXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uIHsKKyAgICBpZiAocmVxLmdldFVzZXJuYW1lKCkgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IE1pc3NpbmdDcmVkZW50aWFsc0V4Y2VwdGlvbigpOworICAgIH0KKworICAgIGZpbmFsIFN0cmluZyB1c2VybmFtZSA9IGxvd2VyQ2FzZVVzZXJuYW1lCisgICAgICAgID8gcmVxLmdldFVzZXJuYW1lKCkudG9Mb3dlckNhc2UoTG9jYWxlLlVTKQorICAgICAgICA6IHJlcS5nZXRVc2VybmFtZSgpOworICAgIHRyeSB7CisgICAgICBmaW5hbCBEaXJDb250ZXh0IGN0eDsKKyAgICAgIGlmIChhdXRoQ29uZmlnLmdldEF1dGhUeXBlKCkgPT0gQXV0aFR5cGUuTERBUF9CSU5EKSB7CisgICAgICAgIGN0eCA9IGhlbHBlci5hdXRoZW50aWNhdGUodXNlcm5hbWUsIHJlcS5nZXRQYXNzd29yZCgpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGN0eCA9IGhlbHBlci5vcGVuKCk7CisgICAgICB9CisgICAgICB0cnkgeworICAgICAgICBmaW5hbCBIZWxwZXIuTGRhcFNjaGVtYSBzY2hlbWEgPSBoZWxwZXIuZ2V0U2NoZW1hKGN0eCk7CisgICAgICAgIGZpbmFsIExkYXBRdWVyeS5SZXN1bHQgbSA9IGhlbHBlci5maW5kQWNjb3VudChzY2hlbWEsIGN0eCwgdXNlcm5hbWUpOworCisgICAgICAgIGlmIChhdXRoQ29uZmlnLmdldEF1dGhUeXBlKCkgPT0gQXV0aFR5cGUuTERBUCkgeworICAgICAgICAgIC8vIFdlIGZvdW5kIHRoZSB1c2VyIGFjY291bnQsIGJ1dCB3ZSBuZWVkIHRvIHZlcmlmeQorICAgICAgICAgIC8vIHRoZSBwYXNzd29yZCBtYXRjaGVzIGl0IGJlZm9yZSB3ZSBjYW4gY29udGludWUuCisgICAgICAgICAgLy8KKyAgICAgICAgICBoZWxwZXIuYXV0aGVudGljYXRlKG0uZ2V0RE4oKSwgcmVxLmdldFBhc3N3b3JkKCkpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBuZXcgQXV0aFVzZXIobmV3IEF1dGhVc2VyLlVVSUQodXNlcm5hbWUpLCB1c2VybmFtZSk7CisgICAgICB9IGZpbmFsbHkgeworICAgICAgICB0cnkgeworICAgICAgICAgIGN0eC5jbG9zZSgpOworICAgICAgICB9IGNhdGNoIChOYW1pbmdFeGNlcHRpb24gZSkgeworICAgICAgICAgIGxvZy53YXJuKCJDYW5ub3QgY2xvc2UgTERBUCBxdWVyeSBoYW5kbGUiLCBlKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0gY2F0Y2ggKEFjY291bnRFeGNlcHRpb24gZSkgeworICAgICAgbG9nLmVycm9yKCJDYW5ub3QgcXVlcnkgTERBUCB0byBhdXRoZW50aWNhdGUgdXNlciIsIGUpOworICAgICAgdGhyb3cgbmV3IEludmFsaWRDcmVkZW50aWFsc0V4Y2VwdGlvbigiQ2Fubm90IHF1ZXJ5IExEQVAgZm9yIGFjY291bnQiLCBlKTsKKyAgICB9IGNhdGNoIChOYW1pbmdFeGNlcHRpb24gZSkgeworICAgICAgbG9nLmVycm9yKCJDYW5ub3QgcXVlcnkgTERBUCB0byBhdXRoZW50aWNhdGUgdXNlciIsIGUpOworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oIkNhbm5vdCBxdWVyeSBMREFQIGZvciBhY2NvdW50IiwgZSk7CisgICAgfSBjYXRjaCAoTG9naW5FeGNlcHRpb24gZSkgeworICAgICAgbG9nLmVycm9yKCJDYW5ub3QgYXV0aGVudGljYXRlIHNlcnZlciB2aWEgSkFBUyIsIGUpOworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oIkNhbm5vdCBxdWVyeSBMREFQIGZvciBhY2NvdW50IiwgZSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwR3JvdXBCYWNrZW5kLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwR3JvdXBCYWNrZW5kLmphdmEKaW5kZXggNWMzMGU1Yy4uMmNmMzcyYiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcEdyb3VwQmFja2VuZC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBHcm91cEJhY2tlbmQuamF2YQpAQCAtMzIsNiArMzIsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwTWVtYmVyc2hpcDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5MaXN0R3JvdXBNZW1iZXJzaGlwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoLmxkYXAuSGVscGVyLkxkYXBTY2hlbWE7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5uYW1lLk5hbWVkOwpAQCAtNDEsMTUgKzQyLDE4IEBACiAKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkV4ZWN1dGlvbkV4Y2VwdGlvbjsKIAoraW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CiBpbXBvcnQgamF2YXgubmFtaW5nLkludmFsaWROYW1lRXhjZXB0aW9uOwogaW1wb3J0IGphdmF4Lm5hbWluZy5OYW1pbmdFeGNlcHRpb247CiBpbXBvcnQgamF2YXgubmFtaW5nLmRpcmVjdG9yeS5EaXJDb250ZXh0OwogaW1wb3J0IGphdmF4Lm5hbWluZy5sZGFwLkxkYXBOYW1lOwogaW1wb3J0IGphdmF4Lm5hbWluZy5sZGFwLlJkbjsKK2ltcG9ydCBqYXZheC5zZWN1cml0eS5hdXRoLmxvZ2luLkxvZ2luRXhjZXB0aW9uOwogCiAvKioKICAqIEltcGxlbWVudGF0aW9uIG9mIEdyb3VwQmFja2VuZCBmb3IgdGhlIExEQVAgZ3JvdXAgc3lzdGVtLgpAQCAtNjMsNiArNjcsNyBAQAogICBwcml2YXRlIGZpbmFsIEhlbHBlciBoZWxwZXI7CiAgIHByaXZhdGUgZmluYWwgTG9hZGluZ0NhY2hlPFN0cmluZywgU2V0PEFjY291bnRHcm91cC5VVUlEPj4gbWVtYmVyc2hpcENhY2hlOwogICBwcml2YXRlIGZpbmFsIExvYWRpbmdDYWNoZTxTdHJpbmcsIEJvb2xlYW4+IGV4aXN0c0NhY2hlOworICBwcml2YXRlIGZpbmFsIFByb2plY3RDYWNoZSBwcm9qZWN0Q2FjaGU7CiAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IHVzZXJQcm92aWRlcjsKIAogICBASW5qZWN0CkBAIC03MCwyMiArNzUsMjQgQEAKICAgICAgIEhlbHBlciBoZWxwZXIsCiAgICAgICBATmFtZWQoR1JPVVBfQ0FDSEUpIExvYWRpbmdDYWNoZTxTdHJpbmcsIFNldDxBY2NvdW50R3JvdXAuVVVJRD4+IG1lbWJlcnNoaXBDYWNoZSwKICAgICAgIEBOYW1lZChHUk9VUF9FWElTVF9DQUNIRSkgTG9hZGluZ0NhY2hlPFN0cmluZywgQm9vbGVhbj4gZXhpc3RzQ2FjaGUsCisgICAgICBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlLAogICAgICAgUHJvdmlkZXI8Q3VycmVudFVzZXI+IHVzZXJQcm92aWRlcikgewogICAgIHRoaXMuaGVscGVyID0gaGVscGVyOwogICAgIHRoaXMubWVtYmVyc2hpcENhY2hlID0gbWVtYmVyc2hpcENhY2hlOworICAgIHRoaXMucHJvamVjdENhY2hlID0gcHJvamVjdENhY2hlOwogICAgIHRoaXMuZXhpc3RzQ2FjaGUgPSBleGlzdHNDYWNoZTsKICAgICB0aGlzLnVzZXJQcm92aWRlciA9IHVzZXJQcm92aWRlcjsKICAgfQogCi0gIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gaXNMZGFwVVVJRChBY2NvdW50R3JvdXAuVVVJRCB1dWlkKSB7CisgIHByaXZhdGUgYm9vbGVhbiBpc0xkYXBVVUlEKEFjY291bnRHcm91cC5VVUlEIHV1aWQpIHsKICAgICByZXR1cm4gdXVpZC5nZXQoKS5zdGFydHNXaXRoKExEQVBfVVVJRCk7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBHcm91cFJlZmVyZW5jZSBncm91cFJlZmVyZW5jZShMZGFwUXVlcnkuUmVzdWx0IHJlcykKLSAgICAgIHRocm93cyBOYW1pbmdFeGNlcHRpb24geworICBwcml2YXRlIHN0YXRpYyBHcm91cFJlZmVyZW5jZSBncm91cFJlZmVyZW5jZShQYXJhbWV0ZXJpemVkU3RyaW5nIHAsCisgICAgICBMZGFwUXVlcnkuUmVzdWx0IHJlcykgdGhyb3dzIE5hbWluZ0V4Y2VwdGlvbiB7CiAgICAgcmV0dXJuIG5ldyBHcm91cFJlZmVyZW5jZSgKICAgICAgICAgbmV3IEFjY291bnRHcm91cC5VVUlEKExEQVBfVVVJRCArIHJlcy5nZXRETigpKSwKLSAgICAgICAgTERBUF9OQU1FICsgY25Gb3IocmVzLmdldEROKCkpKTsKKyAgICAgICAgTERBUF9OQU1FICsgTGRhcFJlYWxtLmFwcGx5KHAsIHJlcykpOwogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGNuRm9yKFN0cmluZyBkbikgewpAQCAtMTQzLDggKzE1MCwxNSBAQAogICAgICAgfQogCiAgICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyBib29sZWFuIGlzVmlzaWJsZVRvQWxsKCkgewotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICBATnVsbGFibGUKKyAgICAgIHB1YmxpYyBTdHJpbmcgZ2V0RW1haWxBZGRyZXNzKCkgeworICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgIH0KKworICAgICAgQE92ZXJyaWRlCisgICAgICBATnVsbGFibGUKKyAgICAgIHB1YmxpYyBTdHJpbmcgZ2V0VXJsKCkgeworICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgIH0KICAgICB9OwogICB9CkBAIC0xNzIsNyArMTg2LDE1IEBACiAgICAgfQogCiAgICAgdHJ5IHsKLSAgICAgIHJldHVybiBuZXcgTGlzdEdyb3VwTWVtYmVyc2hpcChtZW1iZXJzaGlwQ2FjaGUuZ2V0KGlkKSk7CisgICAgICBmaW5hbCBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGdyb3VwcyA9IG1lbWJlcnNoaXBDYWNoZS5nZXQoaWQpOworICAgICAgcmV0dXJuIG5ldyBMaXN0R3JvdXBNZW1iZXJzaGlwKGdyb3VwcykgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZ2V0S25vd25Hcm91cHMoKSB7CisgICAgICAgICAgU2V0PEFjY291bnRHcm91cC5VVUlEPiBnID0gU2V0cy5uZXdIYXNoU2V0KGdyb3Vwcyk7CisgICAgICAgICAgZy5yZXRhaW5BbGwocHJvamVjdENhY2hlLmd1ZXNzUmVsZXZhbnRHcm91cFVVSURzKCkpOworICAgICAgICAgIHJldHVybiBnOworICAgICAgICB9CisgICAgICB9OwogICAgIH0gY2F0Y2ggKEV4ZWN1dGlvbkV4Y2VwdGlvbiBlKSB7CiAgICAgICBsb2cud2FybihTdHJpbmcuZm9ybWF0KCJDYW5ub3QgbG9va3VwIG1lbWJlcnNoaXBzT2YgJXMgaW4gTERBUCIsIGlkKSwgZSk7CiAgICAgICByZXR1cm4gR3JvdXBNZW1iZXJzaGlwLkVNUFRZOwpAQCAtMjAzLDEzICsyMjUsMTQgQEAKICAgICAgICAgTGRhcFNjaGVtYSBzY2hlbWEgPSBoZWxwZXIuZ2V0U2NoZW1hKGN0eCk7CiAgICAgICAgIFBhcmFtZXRlcml6ZWRTdHJpbmcgZmlsdGVyID0gUGFyYW1ldGVyaXplZFN0cmluZy5hc2lzKAogICAgICAgICAgICAgc2NoZW1hLmdyb3VwUGF0dGVybi5yZXBsYWNlKEdST1VQTkFNRSwgbmFtZSkudG9TdHJpbmcoKSk7Ci0gICAgICAgIFNldDxTdHJpbmc+IHJldHVybkF0dHJzID0gQ29sbGVjdGlvbnMuPFN0cmluZz5lbXB0eVNldCgpOworICAgICAgICBTZXQ8U3RyaW5nPiByZXR1cm5BdHRycyA9CisgICAgICAgICAgICBuZXcgSGFzaFNldDxTdHJpbmc+KHNjaGVtYS5ncm91cE5hbWUuZ2V0UGFyYW1ldGVyTmFtZXMoKSk7CiAgICAgICAgIE1hcDxTdHJpbmcsIFN0cmluZz4gcGFyYW1zID0gQ29sbGVjdGlvbnMuZW1wdHlNYXAoKTsKICAgICAgICAgZm9yIChTdHJpbmcgZ3JvdXBCYXNlIDogc2NoZW1hLmdyb3VwQmFzZXMpIHsKICAgICAgICAgICBMZGFwUXVlcnkgcXVlcnkgPSBuZXcgTGRhcFF1ZXJ5KAogICAgICAgICAgICAgICBncm91cEJhc2UsIHNjaGVtYS5ncm91cFNjb3BlLCBmaWx0ZXIsIHJldHVybkF0dHJzKTsKICAgICAgICAgICBmb3IgKExkYXBRdWVyeS5SZXN1bHQgcmVzIDogcXVlcnkucXVlcnkoY3R4LCBwYXJhbXMpKSB7Ci0gICAgICAgICAgICBvdXQuYWRkKGdyb3VwUmVmZXJlbmNlKHJlcykpOworICAgICAgICAgICAgb3V0LmFkZChncm91cFJlZmVyZW5jZShzY2hlbWEuZ3JvdXBOYW1lLCByZXMpKTsKICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgIH0gZmluYWxseSB7CkBAIC0yMjEsNiArMjQ0LDggQEAKICAgICAgIH0KICAgICB9IGNhdGNoIChOYW1pbmdFeGNlcHRpb24gZSkgewogICAgICAgbG9nLndhcm4oIkNhbm5vdCBxdWVyeSBMREFQIGZvciBncm91cHMgbWF0Y2hpbmcgcmVxdWVzdGVkIG5hbWUiLCBlKTsKKyAgICB9IGNhdGNoIChMb2dpbkV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cud2FybigiQ2Fubm90IHF1ZXJ5IExEQVAgZm9yIGdyb3VwcyBtYXRjaGluZyByZXF1ZXN0ZWQgbmFtZSIsIGUpOwogICAgIH0KICAgICByZXR1cm4gb3V0OwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwTW9kdWxlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwTW9kdWxlLmphdmEKaW5kZXggZjFiMTVmOS4uODhjZjQ1YiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBNb2R1bGUuamF2YQpAQCAtNjAsOCArNjAsOCBAQAogICAgICAgICBuZXcgVHlwZUxpdGVyYWw8SW1tdXRhYmxlU2V0PFN0cmluZz4+KCkge30pCiAgICAgICAuZXhwaXJlQWZ0ZXJXcml0ZSgxLCBIT1VSUyk7CiAKLSAgICBiaW5kKFJlYWxtLmNsYXNzKS50byhMZGFwUmVhbG0uY2xhc3MpLmluKFNjb3Blcy5TSU5HTEVUT04pOwogICAgIGJpbmQoSGVscGVyLmNsYXNzKTsKKyAgICBiaW5kKFJlYWxtLmNsYXNzKS50byhMZGFwUmVhbG0uY2xhc3MpLmluKFNjb3Blcy5TSU5HTEVUT04pOwogCiAgICAgRHluYW1pY1NldC5iaW5kKGJpbmRlcigpLCBHcm91cEJhY2tlbmQuY2xhc3MpLnRvKExkYXBHcm91cEJhY2tlbmQuY2xhc3MpOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwUmVhbG0uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBSZWFsbS5qYXZhCmluZGV4IDcyZWI3ZWMuLmZjMTEwMmUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBSZWFsbS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBSZWFsbS5qYXZhCkBAIC01Niw2ICs1Niw3IEBACiBpbXBvcnQgamF2YXgubmFtaW5nLk5hbWU7CiBpbXBvcnQgamF2YXgubmFtaW5nLk5hbWluZ0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZheC5uYW1pbmcuZGlyZWN0b3J5LkRpckNvbnRleHQ7CitpbXBvcnQgamF2YXguc2VjdXJpdHkuYXV0aC5sb2dpbi5Mb2dpbkV4Y2VwdGlvbjsKIAogQFNpbmdsZXRvbgogY2xhc3MgTGRhcFJlYWxtIGltcGxlbWVudHMgUmVhbG0gewpAQCAtMTY3LDcgKzE2OCw3IEBACiAgICAgcmV0dXJuICFyZWFkT25seUFjY291bnRGaWVsZHMuY29udGFpbnMoZmllbGQpOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGFwcGx5KFBhcmFtZXRlcml6ZWRTdHJpbmcgcCwgTGRhcFF1ZXJ5LlJlc3VsdCBtKQorICBzdGF0aWMgU3RyaW5nIGFwcGx5KFBhcmFtZXRlcml6ZWRTdHJpbmcgcCwgTGRhcFF1ZXJ5LlJlc3VsdCBtKQogICAgICAgdGhyb3dzIE5hbWluZ0V4Y2VwdGlvbiB7CiAgICAgaWYgKHAgPT0gbnVsbCkgewogICAgICAgcmV0dXJuIG51bGw7CkBAIC0yNDAsNiArMjQxLDkgQEAKICAgICB9IGNhdGNoIChOYW1pbmdFeGNlcHRpb24gZSkgewogICAgICAgbG9nLmVycm9yKCJDYW5ub3QgcXVlcnkgTERBUCB0byBhdXRlbnRpY2F0ZSB1c2VyIiwgZSk7CiAgICAgICB0aHJvdyBuZXcgQXV0aGVudGljYXRpb25VbmF2YWlsYWJsZUV4Y2VwdGlvbigiQ2Fubm90IHF1ZXJ5IExEQVAgZm9yIGFjY291bnQiLCBlKTsKKyAgICB9IGNhdGNoIChMb2dpbkV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBhdXRoZW50aWNhdGUgc2VydmVyIHZpYSBKQUFTIiwgZSk7CisgICAgICB0aHJvdyBuZXcgQXV0aGVudGljYXRpb25VbmF2YWlsYWJsZUV4Y2VwdGlvbigiQ2Fubm90IHF1ZXJ5IExEQVAgZm9yIGFjY291bnQiLCBlKTsKICAgICB9CiAgIH0KIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcFR5cGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9sZGFwL0xkYXBUeXBlLmphdmEKaW5kZXggM2M0YTU0Yi4uZGI1YmFlYiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdXRoL2xkYXAvTGRhcFR5cGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvbGRhcC9MZGFwVHlwZS5qYXZhCkBAIC0yNSw4ICsyNSw5IEBACiAgIHN0YXRpYyBMZGFwVHlwZSBndWVzc1R5cGUoZmluYWwgRGlyQ29udGV4dCBjdHgpIHRocm93cyBOYW1pbmdFeGNlcHRpb24gewogICAgIGZpbmFsIEF0dHJpYnV0ZXMgcm9vdEF0dHMgPSBjdHguZ2V0QXR0cmlidXRlcygiIik7CiAgICAgQXR0cmlidXRlIHN1cHBvcnRlZCA9IHJvb3RBdHRzLmdldCgic3VwcG9ydGVkQ2FwYWJpbGl0aWVzIik7Ci0gICAgaWYgKHN1cHBvcnRlZCAhPSBudWxsICYmIHN1cHBvcnRlZC5jb250YWlucygiMS4yLjg0MC4xMTM1NTYuMS40LjgwMCIpKSB7Ci0gICAgICByZXR1cm4gbmV3IEFjdGl2ZURpcmVjdG9yeShyb290QXR0cyk7CisgICAgaWYgKHN1cHBvcnRlZCAhPSBudWxsICYmIChzdXBwb3J0ZWQuY29udGFpbnMoIjEuMi44NDAuMTEzNTU2LjEuNC44MDAiKQorICAgICAgICAgIHx8IHN1cHBvcnRlZC5jb250YWlucygiMS4yLjg0MC4xMTM1NTYuMS40LjE4NTEiKSkpIHsKKyAgICAgIHJldHVybiBuZXcgQWN0aXZlRGlyZWN0b3J5KCk7CiAgICAgfQogCiAgICAgcmV0dXJuIFJGQ18yMzA3OwpAQCAtMzYsNiArMzcsOCBAQAogCiAgIGFic3RyYWN0IFN0cmluZyBncm91cE1lbWJlclBhdHRlcm4oKTsKIAorICBhYnN0cmFjdCBTdHJpbmcgZ3JvdXBOYW1lKCk7CisKICAgYWJzdHJhY3QgU3RyaW5nIGFjY291bnRGdWxsTmFtZSgpOwogCiAgIGFic3RyYWN0IFN0cmluZyBhY2NvdW50RW1haWxBZGRyZXNzKCk7CkBAIC01OCw2ICs2MSwxMSBAQAogICAgIH0KIAogICAgIEBPdmVycmlkZQorICAgIFN0cmluZyBncm91cE5hbWUoKSB7CisgICAgICByZXR1cm4gImNuIjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKICAgICBTdHJpbmcgYWNjb3VudEZ1bGxOYW1lKCkgewogICAgICAgcmV0dXJuICJkaXNwbGF5TmFtZSI7CiAgICAgfQpAQCAtODQsMjMgKzkyLDE3IEBACiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBjbGFzcyBBY3RpdmVEaXJlY3RvcnkgZXh0ZW5kcyBMZGFwVHlwZSB7Ci0gICAgQWN0aXZlRGlyZWN0b3J5KGZpbmFsIEF0dHJpYnV0ZXMgYXR0cykgdGhyb3dzIE5hbWluZ0V4Y2VwdGlvbiB7Ci0gICAgICAvLyBDb252ZXJ0ICJkZWZhdWx0TmFtaW5nQ29udGV4dDogREM9Zm9vLERDPWV4YW1wbGUsREM9Y29tIiBpbnRvCi0gICAgICAvLyB0aGUgYSBzdGFuZGFyZCBETlMgbmFtZSBhcyB3ZSB3b3VsZCBleHBlY3QgdG8gZmluZCBpbiB0aGUgc3VmZml4Ci0gICAgICAvLyBwYXJ0IG9mIHRoZSB1c2VyUHJpbmNpcGFsTmFtZS4KLSAgICAgIC8vCi0gICAgICBBdHRyaWJ1dGUgZGVmYXVsdE5hbWluZ0NvbnRleHQgPSBhdHRzLmdldCgiZGVmYXVsdE5hbWluZ0NvbnRleHQiKTsKLSAgICAgIGlmIChkZWZhdWx0TmFtaW5nQ29udGV4dCA9PSBudWxsIHx8IGRlZmF1bHROYW1pbmdDb250ZXh0LnNpemUoKSA8IDEpIHsKLSAgICAgICAgdGhyb3cgbmV3IE5hbWluZ0V4Y2VwdGlvbigicm9vdERTRSBoYXMgbm8gZGVmYXVsdE5hbWluZ0NvbnRleHQiKTsKLSAgICAgIH0KLSAgICB9Ci0KICAgICBAT3ZlcnJpZGUKICAgICBTdHJpbmcgZ3JvdXBQYXR0ZXJuKCkgewogICAgICAgcmV0dXJuICIoJihvYmplY3RDbGFzcz1ncm91cCkoY249JHtncm91cG5hbWV9KSkiOwogICAgIH0KIAogICAgIEBPdmVycmlkZQorICAgIFN0cmluZyBncm91cE5hbWUoKSB7CisgICAgICByZXR1cm4gImNuIjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKICAgICBTdHJpbmcgZ3JvdXBNZW1iZXJQYXR0ZXJuKCkgewogICAgICAgcmV0dXJuIG51bGw7IC8vIEFjdGl2ZSBEaXJlY3RvcnkgdXNlcyBtZW1iZXJPZiBpbiB0aGUgYWNjb3VudAogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXV0aC9vcGVuaWQvT3BlbklkUHJvdmlkZXJQYXR0ZXJuLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvb3BlbmlkL09wZW5JZFByb3ZpZGVyUGF0dGVybi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjdlMTVmNTIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2F1dGgvb3BlbmlkL09wZW5JZFByb3ZpZGVyUGF0dGVybi5qYXZhCkBAIC0wLDAgKzEsNDUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aC5vcGVuaWQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEV4dGVybmFsSWQ7CisKK3B1YmxpYyBjbGFzcyBPcGVuSWRQcm92aWRlclBhdHRlcm4geworICBwdWJsaWMgc3RhdGljIE9wZW5JZFByb3ZpZGVyUGF0dGVybiBjcmVhdGUoU3RyaW5nIHBhdHRlcm4pIHsKKyAgICBPcGVuSWRQcm92aWRlclBhdHRlcm4gciA9IG5ldyBPcGVuSWRQcm92aWRlclBhdHRlcm4oKTsKKyAgICByLnJlZ2V4ID0gcGF0dGVybi5zdGFydHNXaXRoKCJeIikgJiYgcGF0dGVybi5lbmRzV2l0aCgiJCIpOworICAgIHIucGF0dGVybiA9IHBhdHRlcm47CisgICAgcmV0dXJuIHI7CisgIH0KKworICBwcm90ZWN0ZWQgYm9vbGVhbiByZWdleDsKKyAgcHJvdGVjdGVkIFN0cmluZyBwYXR0ZXJuOworCisgIHByb3RlY3RlZCBPcGVuSWRQcm92aWRlclBhdHRlcm4oKSB7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBtYXRjaGVzKFN0cmluZyBpZCkgeworICAgIHJldHVybiByZWdleCA/IGlkLm1hdGNoZXMocGF0dGVybikgOiBpZC5zdGFydHNXaXRoKHBhdHRlcm4pOworICB9CisKKyAgcHVibGljIGJvb2xlYW4gbWF0Y2hlcyhBY2NvdW50RXh0ZXJuYWxJZCBpZCkgeworICAgIHJldHVybiBtYXRjaGVzKGlkLmdldEV4dGVybmFsSWQoKSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKyAgICByZXR1cm4gcGF0dGVybjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9hdmF0YXIvQXZhdGFyUHJvdmlkZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXZhdGFyL0F2YXRhclByb3ZpZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzAxNDBkMAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvYXZhdGFyL0F2YXRhclByb3ZpZGVyLmphdmEKQEAgLTAsMCArMSw1MCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdmF0YXI7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLkV4dGVuc2lvblBvaW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKKworLyoqCisgKiBQcm92aWRlIGF2YXRhciBVUkxzIGZvciBzcGVjaWZpZWQgdXNlci4KKyAqCisgKiBJbnZva2VkIGJ5IEdlcnJpdCB3aGVuIEF2YXRhciBpbWFnZSByZXF1ZXN0cyBhcmUgbWFkZS4KKyAqLworQEV4dGVuc2lvblBvaW50CitwdWJsaWMgaW50ZXJmYWNlIEF2YXRhclByb3ZpZGVyIHsKKyAgLyoqCisgICAqIEdldCBhdmF0YXIgVVJMLgorICAgKgorICAgKiBAcGFyYW0gZm9yVXNlciBUaGUgdXNlciBmb3Igd2hpY2ggdG8gbG9hZCBhbiBhdmF0YXIgaW1hZ2UKKyAgICogQHBhcmFtIGltYWdlU2l6ZSBBIHJlcXVlc3RlZCBpbWFnZSBzaXplLCBpbiBwaXhlbHMuIEFuIGltYWdlU2l6ZSBvZiAwCisgICAqICAgICAgICBpbmRpY2F0ZXMgdG8gdXNlIHdoYXRldmVyIGRlZmF1bHQgc2l6ZSB0aGUgcHJvdmlkZXIgZGV0ZXJtaW5lcy4KKyAgICogICAgICAgIEF2YXRhclByb3ZpZGVycyBtYXkgaWdub3JlIHRoZSByZXF1ZXN0ZWQgaW1hZ2Ugc2l6ZS4gVGhlIHdlYgorICAgKiAgICAgICAgaW50ZXJmYWNlIHdpbGwgcmVzaXplIGFueSBpbWFnZSB0byBtYXRjaCBpbWFnZVNpemUsIHNvIGlkZWFsbHkgdGhlCisgICAqICAgICAgICBwcm92aWRlciBzaG91bGQgcmV0dXJuIGFuIGltYWdlIHNpemVkIGNvcnJlY3RseS4KKyAgICogQHJldHVybiBhIFVSTCBvZiBhbiBhdmF0YXIgaW1hZ2UgZm9yIHRoZSBzcGVjaWZpZWQgdXNlci4gQSByZXR1cm4gdmFsdWUgb2YKKyAgICogICAgICAgICB7QGNvZGUgbnVsbH0gaXMgYWNjZXB0YWJsZSwgYW5kIHJlc3VsdHMgaW4gdGhlIHNlcnZlciByZXNwb25kaW5nCisgICAqICAgICAgICAgd2l0aCBhIDQwNC4gVGhpcyB3aWxsIGhpZGUgdGhlIGF2YXRhciBpbWFnZSBpbiB0aGUgd2ViIFVJLgorICAgKi8KKyAgcHVibGljIFN0cmluZyBnZXRVcmwoSWRlbnRpZmllZFVzZXIgZm9yVXNlciwgaW50IGltYWdlU2l6ZSk7CisKKyAgLyoqCisgICAqIEdldHMgYSBVUkwgZm9yIGEgdXNlciB0byBtb2RpZnkgdGhlaXIgYXZhdGFyIGltYWdlLgorICAgKgorICAgKiBAcGFyYW0gdXNlciBUaGUgdXNlciB3aXNoaW5nIHRvIGNoYW5nZSB0aGVpciBhdmF0YXIgaW1hZ2UKKyAgICogQHJldHVybiBhIFVSTCB0aGUgdXNlciBzaG91bGQgdmlzaXQgdG8gbW9kaWZ5IHRoZWlyIGF2YXRhciwgb3IgbnVsbCBpZgorICAgKiAgICAgICAgIG1vZGlmaWNhdGlvbiBpcyBub3QgcG9zc2libGUuCisgICAqLworICBwdWJsaWMgU3RyaW5nIGdldENoYW5nZUF2YXRhclVybChJZGVudGlmaWVkVXNlciBmb3JVc2VyKTsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0FiYW5kb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0FiYW5kb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNzY2Mjk3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvQWJhbmRvbi5qYXZhCkBAIC0wLDAgKzEsMTQ4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkRlZmF1bHRJbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFwcHJvdmFsc1V0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuQWJhbmRvbi5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5BYmFuZG9uZWRTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmVwbHlUb0NoYW5nZVNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5BdG9taWNVcGRhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworCitwdWJsaWMgY2xhc3MgQWJhbmRvbiBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PENoYW5nZVJlc291cmNlLCBJbnB1dD4geworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoQWJhbmRvbi5jbGFzcyk7CisKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VIb29rcyBob29rczsKKyAgcHJpdmF0ZSBmaW5hbCBBYmFuZG9uZWRTZW5kZXIuRmFjdG9yeSBhYmFuZG9uZWRTZW5kZXJGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOworICBwcml2YXRlIGZpbmFsIENoYW5nZUpzb24ganNvbjsKKworICBwdWJsaWMgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBARGVmYXVsdElucHV0CisgICAgcHVibGljIFN0cmluZyBtZXNzYWdlOworICB9CisKKyAgQEluamVjdAorICBBYmFuZG9uKENoYW5nZUhvb2tzIGhvb2tzLAorICAgICAgQWJhbmRvbmVkU2VuZGVyLkZhY3RvcnkgYWJhbmRvbmVkU2VuZGVyRmFjdG9yeSwKKyAgICAgIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyLAorICAgICAgQ2hhbmdlSnNvbiBqc29uKSB7CisgICAgdGhpcy5ob29rcyA9IGhvb2tzOworICAgIHRoaXMuYWJhbmRvbmVkU2VuZGVyRmFjdG9yeSA9IGFiYW5kb25lZFNlbmRlckZhY3Rvcnk7CisgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgICB0aGlzLmpzb24gPSBqc29uOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoQ2hhbmdlUmVzb3VyY2UgcmVxLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiwgRXhjZXB0aW9uIHsKKyAgICBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSByZXEuZ2V0Q29udHJvbCgpOworICAgIElkZW50aWZpZWRVc2VyIGNhbGxlciA9IChJZGVudGlmaWVkVXNlcikgY29udHJvbC5nZXRDdXJyZW50VXNlcigpOworICAgIENoYW5nZSBjaGFuZ2UgPSByZXEuZ2V0Q2hhbmdlKCk7CisgICAgaWYgKCFjb250cm9sLmNhbkFiYW5kb24oKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oImFiYW5kb24gbm90IHBlcm1pdHRlZCIpOworICAgIH0gZWxzZSBpZiAoIWNoYW5nZS5nZXRTdGF0dXMoKS5pc09wZW4oKSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oImNoYW5nZSBpcyAiICsgc3RhdHVzKGNoYW5nZSkpOworICAgIH0KKworICAgIENoYW5nZU1lc3NhZ2UgbWVzc2FnZTsKKyAgICBSZXZpZXdEYiBkYiA9IGRiUHJvdmlkZXIuZ2V0KCk7CisgICAgZGIuY2hhbmdlcygpLmJlZ2luVHJhbnNhY3Rpb24oY2hhbmdlLmdldElkKCkpOworICAgIHRyeSB7CisgICAgICBjaGFuZ2UgPSBkYi5jaGFuZ2VzKCkuYXRvbWljVXBkYXRlKAorICAgICAgICBjaGFuZ2UuZ2V0SWQoKSwKKyAgICAgICAgbmV3IEF0b21pY1VwZGF0ZTxDaGFuZ2U+KCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyBDaGFuZ2UgdXBkYXRlKENoYW5nZSBjaGFuZ2UpIHsKKyAgICAgICAgICAgIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkuaXNPcGVuKCkpIHsKKyAgICAgICAgICAgICAgY2hhbmdlLnNldFN0YXR1cyhDaGFuZ2UuU3RhdHVzLkFCQU5ET05FRCk7CisgICAgICAgICAgICAgIENoYW5nZVV0aWwudXBkYXRlZChjaGFuZ2UpOworICAgICAgICAgICAgICByZXR1cm4gY2hhbmdlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgICAgfQorICAgICAgICB9KTsKKyAgICAgIGlmIChjaGFuZ2UgPT0gbnVsbCkgeworICAgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbigiY2hhbmdlIGlzICIKKyAgICAgICAgICAgICsgc3RhdHVzKGRiLmNoYW5nZXMoKS5nZXQocmVxLmdldENoYW5nZSgpLmdldElkKCkpKSk7CisgICAgICB9CisgICAgICBtZXNzYWdlID0gbmV3TWVzc2FnZShpbnB1dCwgY2FsbGVyLCBjaGFuZ2UpOworICAgICAgZGIuY2hhbmdlTWVzc2FnZXMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKG1lc3NhZ2UpKTsKKyAgICAgIG5ldyBBcHByb3ZhbHNVdGlsKGRiKS5zeW5jQ2hhbmdlU3RhdHVzKGNoYW5nZSk7CisgICAgICBkYi5jb21taXQoKTsKKyAgICB9IGZpbmFsbHkgeworICAgICAgZGIucm9sbGJhY2soKTsKKyAgICB9CisKKyAgICB0cnkgeworICAgICAgUmVwbHlUb0NoYW5nZVNlbmRlciBjbSA9IGFiYW5kb25lZFNlbmRlckZhY3RvcnkuY3JlYXRlKGNoYW5nZSk7CisgICAgICBjbS5zZXRGcm9tKGNhbGxlci5nZXRBY2NvdW50SWQoKSk7CisgICAgICBjbS5zZXRDaGFuZ2VNZXNzYWdlKG1lc3NhZ2UpOworICAgICAgY20uc2VuZCgpOworICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBlbWFpbCB1cGRhdGUgZm9yIGNoYW5nZSAiICsgY2hhbmdlLmdldENoYW5nZUlkKCksIGUpOworICAgIH0KKyAgICBob29rcy5kb0NoYW5nZUFiYW5kb25lZEhvb2soY2hhbmdlLAorICAgICAgICBjYWxsZXIuZ2V0QWNjb3VudCgpLAorICAgICAgICBTdHJpbmdzLmVtcHR5VG9OdWxsKGlucHV0Lm1lc3NhZ2UpLAorICAgICAgICBkYik7CisgICAgcmV0dXJuIGpzb24uZm9ybWF0KGNoYW5nZSk7CisgIH0KKworICBwcml2YXRlIENoYW5nZU1lc3NhZ2UgbmV3TWVzc2FnZShJbnB1dCBpbnB1dCwgSWRlbnRpZmllZFVzZXIgY2FsbGVyLAorICAgICAgQ2hhbmdlIGNoYW5nZSkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgU3RyaW5nQnVpbGRlciBtc2cgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIG1zZy5hcHBlbmQoIkFiYW5kb25lZCIpOworICAgIGlmICghU3RyaW5ncy5udWxsVG9FbXB0eShpbnB1dC5tZXNzYWdlKS50cmltKCkuaXNFbXB0eSgpKSB7CisgICAgICBtc2cuYXBwZW5kKCJcblxuIik7CisgICAgICBtc2cuYXBwZW5kKGlucHV0Lm1lc3NhZ2UudHJpbSgpKTsKKyAgICB9CisKKyAgICBDaGFuZ2VNZXNzYWdlIG1lc3NhZ2UgPSBuZXcgQ2hhbmdlTWVzc2FnZSgKKyAgICAgICAgbmV3IENoYW5nZU1lc3NhZ2UuS2V5KAorICAgICAgICAgICAgY2hhbmdlLmdldElkKCksCisgICAgICAgICAgICBDaGFuZ2VVdGlsLm1lc3NhZ2VVVUlEKGRiUHJvdmlkZXIuZ2V0KCkpKSwKKyAgICAgICAgY2FsbGVyLmdldEFjY291bnRJZCgpLAorICAgICAgICBjaGFuZ2UuZ2V0TGFzdFVwZGF0ZWRPbigpLAorICAgICAgICBjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSk7CisgICAgbWVzc2FnZS5zZXRNZXNzYWdlKG1zZy50b1N0cmluZygpKTsKKyAgICByZXR1cm4gbWVzc2FnZTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBzdGF0dXMoQ2hhbmdlIGNoYW5nZSkgeworICAgIHJldHVybiBjaGFuZ2UgIT0gbnVsbCA/IGNoYW5nZS5nZXRTdGF0dXMoKS5uYW1lKCkudG9Mb3dlckNhc2UoKSA6ICJkZWxldGVkIjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvQ2hhbmdlSW5zZXJ0ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0NoYW5nZUluc2VydGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTBjNzhlYQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0NoYW5nZUluc2VydGVyLmphdmEKQEAgLTAsMCArMSw3NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQXBwcm92YWxzVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ2hhbmdlVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlRyYWNraW5nRm9vdGVyczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdElkOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5Gb290ZXJMaW5lOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworcHVibGljIGNsYXNzIENoYW5nZUluc2VydGVyIHsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQ7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlSG9va3MgaG9va3M7CisgIHByaXZhdGUgZmluYWwgQXBwcm92YWxzVXRpbCBhcHByb3ZhbHNVdGlsOworICBwcml2YXRlIGZpbmFsIFRyYWNraW5nRm9vdGVycyB0cmFja2luZ0Zvb3RlcnM7CisKKyAgQEluamVjdAorICBwdWJsaWMgQ2hhbmdlSW5zZXJ0ZXIoZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkLAorICAgICAgQ2hhbmdlSG9va3MgaG9va3MsIEFwcHJvdmFsc1V0aWwgYXBwcm92YWxzVXRpbCwKKyAgICAgIFRyYWNraW5nRm9vdGVycyB0cmFja2luZ0Zvb3RlcnMpIHsKKyAgICB0aGlzLmdpdFJlZlVwZGF0ZWQgPSBnaXRSZWZVcGRhdGVkOworICAgIHRoaXMuaG9va3MgPSBob29rczsKKyAgICB0aGlzLmFwcHJvdmFsc1V0aWwgPSBhcHByb3ZhbHNVdGlsOworICAgIHRoaXMudHJhY2tpbmdGb290ZXJzID0gdHJhY2tpbmdGb290ZXJzOworICB9CisKKyAgcHVibGljIHZvaWQgaW5zZXJ0Q2hhbmdlKFJldmlld0RiIGRiLCBDaGFuZ2UgY2hhbmdlLCBQYXRjaFNldCBwcywKKyAgICAgIFJldkNvbW1pdCBjb21taXQsIExhYmVsVHlwZXMgbGFiZWxUeXBlcywgTGlzdDxGb290ZXJMaW5lPiBmb290ZXJMaW5lcywKKyAgICAgIFBhdGNoU2V0SW5mbyBpbmZvLCBTZXQ8QWNjb3VudC5JZD4gcmV2aWV3ZXJzKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKworICAgIGRiLmNoYW5nZXMoKS5iZWdpblRyYW5zYWN0aW9uKGNoYW5nZS5nZXRJZCgpKTsKKyAgICB0cnkgeworICAgICAgQ2hhbmdlVXRpbC5pbnNlcnRBbmNlc3RvcnMoZGIsIHBzLmdldElkKCksIGNvbW1pdCk7CisgICAgICBkYi5wYXRjaFNldHMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKHBzKSk7CisgICAgICBkYi5jaGFuZ2VzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihjaGFuZ2UpKTsKKyAgICAgIENoYW5nZVV0aWwudXBkYXRlVHJhY2tpbmdJZHMoZGIsIGNoYW5nZSwgdHJhY2tpbmdGb290ZXJzLCBmb290ZXJMaW5lcyk7CisgICAgICBhcHByb3ZhbHNVdGlsLmFkZFJldmlld2VycyhkYiwgbGFiZWxUeXBlcywgY2hhbmdlLCBwcywgaW5mbywgcmV2aWV3ZXJzLAorICAgICAgICAgIENvbGxlY3Rpb25zLjxBY2NvdW50LklkPiBlbXB0eVNldCgpKTsKKyAgICAgIGRiLmNvbW1pdCgpOworICAgIH0gZmluYWxseSB7CisgICAgICBkYi5yb2xsYmFjaygpOworICAgIH0KKworICAgIGdpdFJlZlVwZGF0ZWQuZmlyZShjaGFuZ2UuZ2V0UHJvamVjdCgpLCBwcy5nZXRSZWZOYW1lKCksIE9iamVjdElkLnplcm9JZCgpLAorICAgICAgICBjb21taXQpOworICAgIGhvb2tzLmRvUGF0Y2hzZXRDcmVhdGVkSG9vayhjaGFuZ2UsIHBzLCBkYik7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0NoYW5nZUpzb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0NoYW5nZUpzb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zNTkyYmJmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvQ2hhbmdlSnNvbi5qYXZhCkBAIC0wLDAgKzEsOTM0IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbi5BTExfQ09NTUlUUzsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmNoYW5nZXMuTGlzdENoYW5nZXNPcHRpb24uQUxMX0ZJTEVTOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbi5BTExfUkVWSVNJT05TOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbi5DVVJSRU5UX0NPTU1JVDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmNoYW5nZXMuTGlzdENoYW5nZXNPcHRpb24uQ1VSUkVOVF9GSUxFUzsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmNoYW5nZXMuTGlzdENoYW5nZXNPcHRpb24uQ1VSUkVOVF9SRVZJU0lPTjsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmNoYW5nZXMuTGlzdENoYW5nZXNPcHRpb24uREVUQUlMRURfQUNDT1VOVFM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5jaGFuZ2VzLkxpc3RDaGFuZ2VzT3B0aW9uLkRFVEFJTEVEX0xBQkVMUzsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmNoYW5nZXMuTGlzdENoYW5nZXNPcHRpb24uTEFCRUxTOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5Kb2luZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkhhc2hCYXNlZFRhYmxlOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSGFzaE11bHRpbWFwOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlTGlzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkxpbmtlZExpc3RNdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RNdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk11bHRpbWFwOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlRhYmxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5jaGFuZ2VzLkxpc3RDaGFuZ2VzT3B0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVmFsdWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUmFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0UmVjb3JkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlLlN0YXR1czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0SW5mby5QYXJlbnRJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Vc2VySWRlbnRpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5Bbm9ueW1vdXNVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5MYWJlbE5vcm1hbGl6ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoTGlzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hMaXN0Q2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoTGlzdEVudHJ5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3ROb3RBdmFpbGFibGVFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZURhdGE7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKKworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5Ib3N0S2V5OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CisKK2ltcG9ydCBqYXZhLnNxbC5UaW1lc3RhbXA7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5FbnVtU2V0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwuVHJlZU1hcDsKKworcHVibGljIGNsYXNzIENoYW5nZUpzb24geworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoQ2hhbmdlSnNvbi5jbGFzcyk7CisKKyAgQFNpbmdsZXRvbgorICBzdGF0aWMgY2xhc3MgVXJscyB7CisgICAgZmluYWwgU3RyaW5nIGdpdDsKKyAgICBmaW5hbCBTdHJpbmcgaHR0cDsKKworICAgIEBJbmplY3QKKyAgICBVcmxzKEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNmZykgeworICAgICAgdGhpcy5naXQgPSBlbnN1cmVTbGFzaChjZmcuZ2V0U3RyaW5nKCJnZXJyaXQiLCBudWxsLCAiY2Fub25pY2FsR2l0VXJsIikpOworICAgICAgdGhpcy5odHRwID0gZW5zdXJlU2xhc2goY2ZnLmdldFN0cmluZygiZ2Vycml0IiwgbnVsbCwgImdpdEh0dHBVcmwiKSk7CisgICAgfQorCisgICAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGVuc3VyZVNsYXNoKFN0cmluZyBpbikgeworICAgICAgaWYgKGluICE9IG51bGwgJiYgIWluLmVuZHNXaXRoKCIvIikpIHsKKyAgICAgICAgcmV0dXJuIGluICsgIi8iOworICAgICAgfQorICAgICAgcmV0dXJuIGluOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmV2aWV3RGI+IGRiOworICBwcml2YXRlIGZpbmFsIExhYmVsTm9ybWFsaXplciBsYWJlbE5vcm1hbGl6ZXI7CisgIHByaXZhdGUgZmluYWwgQ3VycmVudFVzZXIgdXNlcjsKKyAgcHJpdmF0ZSBmaW5hbCBBbm9ueW1vdXNVc2VyIGFub255bW91czsKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNoYW5nZUNvbnRyb2xHZW5lcmljRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUGF0Y2hMaXN0Q2FjaGUgcGF0Y2hMaXN0Q2FjaGU7CisgIHByaXZhdGUgZmluYWwgQWNjb3VudEluZm8uTG9hZGVyLkZhY3RvcnkgYWNjb3VudExvYWRlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8U3RyaW5nPiB1cmxQcm92aWRlcjsKKyAgcHJpdmF0ZSBmaW5hbCBVcmxzIHVybHM7CisgIHByaXZhdGUgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xVc2VyRmFjdG9yeTsKKyAgcHJpdmF0ZSBTc2hJbmZvIHNzaEluZm87CisgIHByaXZhdGUgRW51bVNldDxMaXN0Q2hhbmdlc09wdGlvbj4gb3B0aW9uczsKKyAgcHJpdmF0ZSBBY2NvdW50SW5mby5Mb2FkZXIgYWNjb3VudExvYWRlcjsKKyAgcHJpdmF0ZSBDaGFuZ2VDb250cm9sIGxhc3RDb250cm9sOworCisgIEBJbmplY3QKKyAgQ2hhbmdlSnNvbigKKyAgICAgIFByb3ZpZGVyPFJldmlld0RiPiBkYiwKKyAgICAgIExhYmVsTm9ybWFsaXplciBsbiwKKyAgICAgIEN1cnJlbnRVc2VyIHUsCisgICAgICBBbm9ueW1vdXNVc2VyIGF1LAorICAgICAgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdWYsCisgICAgICBDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNjZiwKKyAgICAgIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcHNpLAorICAgICAgUGF0Y2hMaXN0Q2FjaGUgcGxjLAorICAgICAgQWNjb3VudEluZm8uTG9hZGVyLkZhY3RvcnkgYWlsZiwKKyAgICAgIEBDYW5vbmljYWxXZWJVcmwgUHJvdmlkZXI8U3RyaW5nPiBjdXJsLAorICAgICAgVXJscyB1cmxzKSB7CisgICAgdGhpcy5kYiA9IGRiOworICAgIHRoaXMubGFiZWxOb3JtYWxpemVyID0gbG47CisgICAgdGhpcy51c2VyID0gdTsKKyAgICB0aGlzLmFub255bW91cyA9IGF1OworICAgIHRoaXMudXNlckZhY3RvcnkgPSB1ZjsKKyAgICB0aGlzLmNoYW5nZUNvbnRyb2xHZW5lcmljRmFjdG9yeSA9IGNjZjsKKyAgICB0aGlzLnBhdGNoU2V0SW5mb0ZhY3RvcnkgPSBwc2k7CisgICAgdGhpcy5wYXRjaExpc3RDYWNoZSA9IHBsYzsKKyAgICB0aGlzLmFjY291bnRMb2FkZXJGYWN0b3J5ID0gYWlsZjsKKyAgICB0aGlzLnVybFByb3ZpZGVyID0gY3VybDsKKyAgICB0aGlzLnVybHMgPSB1cmxzOworCisgICAgb3B0aW9ucyA9IEVudW1TZXQubm9uZU9mKExpc3RDaGFuZ2VzT3B0aW9uLmNsYXNzKTsKKyAgfQorCisgIHB1YmxpYyBDaGFuZ2VKc29uIGFkZE9wdGlvbihMaXN0Q2hhbmdlc09wdGlvbiBvKSB7CisgICAgb3B0aW9ucy5hZGQobyk7CisgICAgcmV0dXJuIHRoaXM7CisgIH0KKworICBwdWJsaWMgQ2hhbmdlSnNvbiBhZGRPcHRpb25zKENvbGxlY3Rpb248TGlzdENoYW5nZXNPcHRpb24+IG8pIHsKKyAgICBvcHRpb25zLmFkZEFsbChvKTsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIHB1YmxpYyBDaGFuZ2VKc29uIHNldFNzaEluZm8oU3NoSW5mbyBpbmZvKSB7CisgICAgc3NoSW5mbyA9IGluZm87CisgICAgcmV0dXJuIHRoaXM7CisgIH0KKworICBwdWJsaWMgQ2hhbmdlSnNvbiBzZXRDaGFuZ2VDb250cm9sRmFjdG9yeShDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2YpIHsKKyAgICBjaGFuZ2VDb250cm9sVXNlckZhY3RvcnkgPSBjZjsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIHB1YmxpYyBDaGFuZ2VJbmZvIGZvcm1hdChDaGFuZ2VSZXNvdXJjZSByc3JjKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gZm9ybWF0KG5ldyBDaGFuZ2VEYXRhKHJzcmMuZ2V0Q29udHJvbCgpKSk7CisgIH0KKworICBwdWJsaWMgQ2hhbmdlSW5mbyBmb3JtYXQoQ2hhbmdlIGNoYW5nZSkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGZvcm1hdChuZXcgQ2hhbmdlRGF0YShjaGFuZ2UpKTsKKyAgfQorCisgIHB1YmxpYyBDaGFuZ2VJbmZvIGZvcm1hdChDaGFuZ2UuSWQgaWQpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHJldHVybiBmb3JtYXQobmV3IENoYW5nZURhdGEoaWQpKTsKKyAgfQorCisgIHB1YmxpYyBDaGFuZ2VJbmZvIGZvcm1hdChDaGFuZ2VEYXRhIGNkKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBMaXN0PENoYW5nZURhdGE+IHRtcCA9IEltbXV0YWJsZUxpc3Qub2YoY2QpOworICAgIHJldHVybiBmb3JtYXRMaXN0MihJbW11dGFibGVMaXN0Lm9mKHRtcCkpLmdldCgwKS5nZXQoMCk7CisgIH0KKworICBwdWJsaWMgQ2hhbmdlSW5mbyBmb3JtYXQoUmV2aXNpb25SZXNvdXJjZSByc3JjKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBDaGFuZ2VEYXRhIGNkID0gbmV3IENoYW5nZURhdGEocnNyYy5nZXRDb250cm9sKCkpOworICAgIGNkLmxpbWl0VG9QYXRjaFNldHMoSW1tdXRhYmxlTGlzdC5vZihyc3JjLmdldFBhdGNoU2V0KCkuZ2V0SWQoKSkpOworICAgIHJldHVybiBmb3JtYXQoY2QpOworICB9CisKKyAgcHVibGljIExpc3Q8TGlzdDxDaGFuZ2VJbmZvPj4gZm9ybWF0TGlzdDIoTGlzdDxMaXN0PENoYW5nZURhdGE+PiBpbikKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIGFjY291bnRMb2FkZXIgPSBhY2NvdW50TG9hZGVyRmFjdG9yeS5jcmVhdGUoaGFzKERFVEFJTEVEX0FDQ09VTlRTKSk7CisgICAgTGlzdDxMaXN0PENoYW5nZUluZm8+PiByZXMgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoaW4uc2l6ZSgpKTsKKyAgICBmb3IgKExpc3Q8Q2hhbmdlRGF0YT4gY2hhbmdlcyA6IGluKSB7CisgICAgICBDaGFuZ2VEYXRhLmVuc3VyZUNoYW5nZUxvYWRlZChkYiwgY2hhbmdlcyk7CisgICAgICBDaGFuZ2VEYXRhLmVuc3VyZUN1cnJlbnRQYXRjaFNldExvYWRlZChkYiwgY2hhbmdlcyk7CisgICAgICBDaGFuZ2VEYXRhLmVuc3VyZUN1cnJlbnRBcHByb3ZhbHNMb2FkZWQoZGIsIGNoYW5nZXMpOworICAgICAgcmVzLmFkZCh0b0NoYW5nZUluZm8oY2hhbmdlcykpOworICAgIH0KKyAgICBhY2NvdW50TG9hZGVyLmZpbGwoKTsKKyAgICByZXR1cm4gcmVzOworICB9CisKKyAgcHJpdmF0ZSBib29sZWFuIGhhcyhMaXN0Q2hhbmdlc09wdGlvbiBvcHRpb24pIHsKKyAgICByZXR1cm4gb3B0aW9ucy5jb250YWlucyhvcHRpb24pOworICB9CisKKyAgcHJpdmF0ZSBMaXN0PENoYW5nZUluZm8+IHRvQ2hhbmdlSW5mbyhMaXN0PENoYW5nZURhdGE+IGNoYW5nZXMpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBMaXN0PENoYW5nZUluZm8+IGluZm8gPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoY2hhbmdlcy5zaXplKCkpOworICAgIGZvciAoQ2hhbmdlRGF0YSBjZCA6IGNoYW5nZXMpIHsKKyAgICAgIGluZm8uYWRkKHRvQ2hhbmdlSW5mbyhjZCkpOworICAgIH0KKyAgICByZXR1cm4gaW5mbzsKKyAgfQorCisgIHByaXZhdGUgQ2hhbmdlSW5mbyB0b0NoYW5nZUluZm8oQ2hhbmdlRGF0YSBjZCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgQ2hhbmdlSW5mbyBvdXQgPSBuZXcgQ2hhbmdlSW5mbygpOworICAgIENoYW5nZSBpbiA9IGNkLmNoYW5nZShkYik7CisgICAgb3V0LnByb2plY3QgPSBpbi5nZXRQcm9qZWN0KCkuZ2V0KCk7CisgICAgb3V0LmJyYW5jaCA9IGluLmdldERlc3QoKS5nZXRTaG9ydE5hbWUoKTsKKyAgICBvdXQudG9waWMgPSBpbi5nZXRUb3BpYygpOworICAgIG91dC5jaGFuZ2VJZCA9IGluLmdldEtleSgpLmdldCgpOworICAgIG91dC5tZXJnZWFibGUgPSBpbi5nZXRTdGF0dXMoKSAhPSBDaGFuZ2UuU3RhdHVzLk1FUkdFRCA/IGluLmlzTWVyZ2VhYmxlKCkgOiBudWxsOworICAgIG91dC5zdWJqZWN0ID0gaW4uZ2V0U3ViamVjdCgpOworICAgIG91dC5zdGF0dXMgPSBpbi5nZXRTdGF0dXMoKTsKKyAgICBvdXQub3duZXIgPSBhY2NvdW50TG9hZGVyLmdldChpbi5nZXRPd25lcigpKTsKKyAgICBvdXQuY3JlYXRlZCA9IGluLmdldENyZWF0ZWRPbigpOworICAgIG91dC51cGRhdGVkID0gaW4uZ2V0TGFzdFVwZGF0ZWRPbigpOworICAgIG91dC5fbnVtYmVyID0gaW4uZ2V0SWQoKS5nZXQoKTsKKyAgICBvdXQuX3NvcnRrZXkgPSBpbi5nZXRTb3J0S2V5KCk7CisgICAgb3V0LnN0YXJyZWQgPSB1c2VyLmdldFN0YXJyZWRDaGFuZ2VzKCkuY29udGFpbnMoaW4uZ2V0SWQoKSkgPyB0cnVlIDogbnVsbDsKKyAgICBvdXQucmV2aWV3ZWQgPSBpbi5nZXRTdGF0dXMoKS5pc09wZW4oKSAmJiBpc0NoYW5nZVJldmlld2VkKGNkKSA/IHRydWUgOiBudWxsOworICAgIG91dC5sYWJlbHMgPSBsYWJlbHNGb3IoY2QsIGhhcyhMQUJFTFMpLCBoYXMoREVUQUlMRURfTEFCRUxTKSk7CisKKyAgICBDb2xsZWN0aW9uPFBhdGNoU2V0LklkPiBsaW1pdGVkID0gY2QuZ2V0TGltaXRlZFBhdGNoU2V0cygpOworICAgIGlmIChvdXQubGFiZWxzICE9IG51bGwgJiYgaGFzKERFVEFJTEVEX0xBQkVMUykpIHsKKyAgICAgIC8vIElmIGxpbWl0ZWQgdG8gc3BlY2lmaWMgcGF0Y2ggc2V0cyBidXQgbm90IHRoZSBjdXJyZW50IHBhdGNoIHNldCwgZG9uJ3QKKyAgICAgIC8vIGxpc3QgcGVybWl0dGVkIGxhYmVscywgc2luY2UgdXNlcnMgY2FuJ3Qgdm90ZSBvbiB0aG9zZSBwYXRjaCBzZXRzLgorICAgICAgaWYgKGxpbWl0ZWQgPT0gbnVsbCB8fCBsaW1pdGVkLmNvbnRhaW5zKGluLmN1cnJlbnRQYXRjaFNldElkKCkpKSB7CisgICAgICAgIG91dC5wZXJtaXR0ZWRfbGFiZWxzID0gcGVybWl0dGVkTGFiZWxzKGNkKTsKKyAgICAgIH0KKyAgICAgIG91dC5yZW1vdmFibGVfcmV2aWV3ZXJzID0gcmVtb3ZhYmxlUmV2aWV3ZXJzKGNkLCBvdXQubGFiZWxzLnZhbHVlcygpKTsKKyAgICB9CisgICAgb3V0LmZpbmlzaCgpOworCisgICAgaWYgKGhhcyhBTExfUkVWSVNJT05TKSB8fCBoYXMoQ1VSUkVOVF9SRVZJU0lPTikgfHwgbGltaXRlZCAhPSBudWxsKSB7CisgICAgICBvdXQucmV2aXNpb25zID0gcmV2aXNpb25zKGNkKTsKKyAgICAgIGlmIChvdXQucmV2aXNpb25zICE9IG51bGwpIHsKKyAgICAgICAgZm9yIChTdHJpbmcgY29tbWl0IDogb3V0LnJldmlzaW9ucy5rZXlTZXQoKSkgeworICAgICAgICAgIGlmIChvdXQucmV2aXNpb25zLmdldChjb21taXQpLmlzQ3VycmVudCkgeworICAgICAgICAgICAgb3V0LmN1cnJlbnRfcmV2aXNpb24gPSBjb21taXQ7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisKKyAgICBsYXN0Q29udHJvbCA9IG51bGw7CisgICAgcmV0dXJuIG91dDsKKyAgfQorCisgIHByaXZhdGUgQ2hhbmdlQ29udHJvbCBjb250cm9sKENoYW5nZURhdGEgY2QpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIENoYW5nZUNvbnRyb2wgY3RybCA9IGNkLmNoYW5nZUNvbnRyb2woKTsKKyAgICBpZiAoY3RybCAhPSBudWxsICYmIGN0cmwuZ2V0Q3VycmVudFVzZXIoKSA9PSB1c2VyKSB7CisgICAgICByZXR1cm4gY3RybDsKKyAgICB9IGVsc2UgaWYgKGxhc3RDb250cm9sICE9IG51bGwKKyAgICAgICAgJiYgY2QuZ2V0SWQoKS5lcXVhbHMobGFzdENvbnRyb2wuZ2V0Q2hhbmdlKCkuZ2V0SWQoKSkpIHsKKyAgICAgIHJldHVybiBsYXN0Q29udHJvbDsKKyAgICB9CisKKyAgICB0cnkgeworICAgICAgaWYgKGNoYW5nZUNvbnRyb2xVc2VyRmFjdG9yeSAhPSBudWxsKSB7CisgICAgICAgIGN0cmwgPSBjaGFuZ2VDb250cm9sVXNlckZhY3RvcnkuY29udHJvbEZvcihjZC5jaGFuZ2UoZGIpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGN0cmwgPSBjaGFuZ2VDb250cm9sR2VuZXJpY0ZhY3RvcnkuY29udHJvbEZvcihjZC5jaGFuZ2UoZGIpLCB1c2VyKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChOb1N1Y2hDaGFuZ2VFeGNlcHRpb24gZSkgeworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorICAgIGxhc3RDb250cm9sID0gY3RybDsKKyAgICByZXR1cm4gY3RybDsKKyAgfQorCisgIHByaXZhdGUgTGlzdDxTdWJtaXRSZWNvcmQ+IHN1Ym1pdFJlY29yZHMoQ2hhbmdlRGF0YSBjZCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKGNkLmdldFN1Ym1pdFJlY29yZHMoKSAhPSBudWxsKSB7CisgICAgICByZXR1cm4gY2QuZ2V0U3VibWl0UmVjb3JkcygpOworICAgIH0KKyAgICBDaGFuZ2VDb250cm9sIGN0bCA9IGNvbnRyb2woY2QpOworICAgIGlmIChjdGwgPT0gbnVsbCkgeworICAgICAgcmV0dXJuIEltbXV0YWJsZUxpc3Qub2YoKTsKKyAgICB9CisgICAgUGF0Y2hTZXQgcHMgPSBjZC5jdXJyZW50UGF0Y2hTZXQoZGIpOworICAgIGlmIChwcyA9PSBudWxsKSB7CisgICAgICByZXR1cm4gSW1tdXRhYmxlTGlzdC5vZigpOworICAgIH0KKyAgICBjZC5zZXRTdWJtaXRSZWNvcmRzKGN0bC5jYW5TdWJtaXQoZGIuZ2V0KCksIHBzLCBjZCwgdHJ1ZSwgZmFsc2UsIHRydWUpKTsKKyAgICByZXR1cm4gY2QuZ2V0U3VibWl0UmVjb3JkcygpOworICB9CisKKyAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBMYWJlbEluZm8+IGxhYmVsc0ZvcihDaGFuZ2VEYXRhIGNkLCBib29sZWFuIHN0YW5kYXJkLAorICAgICAgYm9vbGVhbiBkZXRhaWxlZCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKCFzdGFuZGFyZCAmJiAhZGV0YWlsZWQpIHsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKworICAgIENoYW5nZUNvbnRyb2wgY3RsID0gY29udHJvbChjZCk7CisgICAgaWYgKGN0bCA9PSBudWxsKSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisKKyAgICBQYXRjaFNldCBwcyA9IGNkLmN1cnJlbnRQYXRjaFNldChkYik7CisgICAgaWYgKHBzID09IG51bGwpIHsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKworICAgIExhYmVsVHlwZXMgbGFiZWxUeXBlcyA9IGN0bC5nZXRMYWJlbFR5cGVzKCk7CisgICAgaWYgKGNkLmdldENoYW5nZSgpLmdldFN0YXR1cygpLmlzT3BlbigpKSB7CisgICAgICByZXR1cm4gbGFiZWxzRm9yT3BlbkNoYW5nZShjZCwgbGFiZWxUeXBlcywgc3RhbmRhcmQsIGRldGFpbGVkKTsKKyAgICB9IGVsc2UgeworICAgICAgcmV0dXJuIGxhYmVsc0ZvckNsb3NlZENoYW5nZShjZCwgbGFiZWxUeXBlcywgc3RhbmRhcmQsIGRldGFpbGVkKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIE1hcDxTdHJpbmcsIExhYmVsSW5mbz4gbGFiZWxzRm9yT3BlbkNoYW5nZShDaGFuZ2VEYXRhIGNkLAorICAgICAgTGFiZWxUeXBlcyBsYWJlbFR5cGVzLCBib29sZWFuIHN0YW5kYXJkLCBib29sZWFuIGRldGFpbGVkKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgTWFwPFN0cmluZywgTGFiZWxJbmZvPiBsYWJlbHMgPSBpbml0TGFiZWxzKGNkLCBsYWJlbFR5cGVzLCBzdGFuZGFyZCk7CisgICAgaWYgKGRldGFpbGVkKSB7CisgICAgICBzZXRBbGxBcHByb3ZhbHMoY2QsIGxhYmVscyk7CisgICAgfQorICAgIGZvciAoTWFwLkVudHJ5PFN0cmluZywgTGFiZWxJbmZvPiBlIDogbGFiZWxzLmVudHJ5U2V0KCkpIHsKKyAgICAgIExhYmVsVHlwZSB0eXBlID0gbGFiZWxUeXBlcy5ieUxhYmVsKGUuZ2V0S2V5KCkpOworICAgICAgaWYgKHR5cGUgPT0gbnVsbCkgeworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKyAgICAgIGlmIChzdGFuZGFyZCkgeworICAgICAgICBzZXRSZWNvbW1lbmRlZEFuZERpc2xpa2VkKGNkLCB0eXBlLCBlLmdldFZhbHVlKCkpOworICAgICAgfQorICAgICAgaWYgKGRldGFpbGVkKSB7CisgICAgICAgIHNldExhYmVsVmFsdWVzKHR5cGUsIGUuZ2V0VmFsdWUoKSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBsYWJlbHM7CisgIH0KKworICBwcml2YXRlIE1hcDxTdHJpbmcsIExhYmVsSW5mbz4gaW5pdExhYmVscyhDaGFuZ2VEYXRhIGNkLAorICAgICAgTGFiZWxUeXBlcyBsYWJlbFR5cGVzLCBib29sZWFuIHN0YW5kYXJkKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAvLyBEb24ndCB1c2UgTWFwcy5uZXdUcmVlTWFwKENvbXBhcmF0b3IpIGR1ZSB0byBPcGVuSkRLIGJ1ZyAxMDAxNjcuCisgICAgTWFwPFN0cmluZywgTGFiZWxJbmZvPiBsYWJlbHMgPQorICAgICAgICBuZXcgVHJlZU1hcDxTdHJpbmcsIExhYmVsSW5mbz4obGFiZWxUeXBlcy5uYW1lQ29tcGFyYXRvcigpKTsKKyAgICBmb3IgKFN1Ym1pdFJlY29yZCByZWMgOiBzdWJtaXRSZWNvcmRzKGNkKSkgeworICAgICAgaWYgKHJlYy5sYWJlbHMgPT0gbnVsbCkgeworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKyAgICAgIGZvciAoU3VibWl0UmVjb3JkLkxhYmVsIHIgOiByZWMubGFiZWxzKSB7CisgICAgICAgIExhYmVsSW5mbyBwID0gbGFiZWxzLmdldChyLmxhYmVsKTsKKyAgICAgICAgaWYgKHAgPT0gbnVsbCB8fCBwLl9zdGF0dXMuY29tcGFyZVRvKHIuc3RhdHVzKSA8IDApIHsKKyAgICAgICAgICBMYWJlbEluZm8gbiA9IG5ldyBMYWJlbEluZm8oKTsKKyAgICAgICAgICBuLl9zdGF0dXMgPSByLnN0YXR1czsKKyAgICAgICAgICBpZiAoc3RhbmRhcmQpIHsKKyAgICAgICAgICAgIHN3aXRjaCAoci5zdGF0dXMpIHsKKyAgICAgICAgICAgICAgY2FzZSBPSzoKKyAgICAgICAgICAgICAgICBuLmFwcHJvdmVkID0gYWNjb3VudExvYWRlci5nZXQoci5hcHBsaWVkQnkpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICBjYXNlIFJFSkVDVDoKKyAgICAgICAgICAgICAgICBuLnJlamVjdGVkID0gYWNjb3VudExvYWRlci5nZXQoci5hcHBsaWVkQnkpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKworICAgICAgICAgIG4ub3B0aW9uYWwgPSBuLl9zdGF0dXMgPT0gU3VibWl0UmVjb3JkLkxhYmVsLlN0YXR1cy5NQVkgPyB0cnVlIDogbnVsbDsKKyAgICAgICAgICBsYWJlbHMucHV0KHIubGFiZWwsIG4pOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBsYWJlbHM7CisgIH0KKworICBwcml2YXRlIHZvaWQgc2V0UmVjb21tZW5kZWRBbmREaXNsaWtlZChDaGFuZ2VEYXRhIGNkLCBMYWJlbFR5cGUgdHlwZSwKKyAgICAgIExhYmVsSW5mbyBsYWJlbCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKGxhYmVsLmFwcHJvdmVkICE9IG51bGwgfHwgbGFiZWwucmVqZWN0ZWQgIT0gbnVsbCkgeworICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmICh0eXBlLmdldE1pbigpID09IG51bGwgfHwgdHlwZS5nZXRNYXgoKSA9PSBudWxsKSB7CisgICAgICAvLyBVbmtub3duIG9yIG1pc2NvbmZpZ3VyZWQgdHlwZSBjYW4ndCBoYXZlIGludGVybWVkaWF0ZSBzY29yZXMuCisgICAgICByZXR1cm47CisgICAgfQorCisgICAgc2hvcnQgbWluID0gdHlwZS5nZXRNaW4oKS5nZXRWYWx1ZSgpOworICAgIHNob3J0IG1heCA9IHR5cGUuZ2V0TWF4KCkuZ2V0VmFsdWUoKTsKKyAgICBpZiAoLTEgPD0gbWluICYmIG1heCA8PSAxKSB7CisgICAgICAvLyBUeXBlcyB3aXRoIGEgcmFuZ2Ugb2YgLTEuLisxIGNhbid0IGhhdmUgaW50ZXJtZWRpYXRlIHNjb3Jlcy4KKyAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgcHNhIDogY2QuY3VycmVudEFwcHJvdmFscyhkYikpIHsKKyAgICAgIHNob3J0IHZhbCA9IHBzYS5nZXRWYWx1ZSgpOworICAgICAgaWYgKHZhbCAhPSAwICYmIG1pbiA8IHZhbCAmJiB2YWwgPCBtYXggJiYgdHlwZS5tYXRjaGVzKHBzYSkpIHsKKyAgICAgICAgaWYgKDAgPCB2YWwpIHsKKyAgICAgICAgICBsYWJlbC5yZWNvbW1lbmRlZCA9IGFjY291bnRMb2FkZXIuZ2V0KHBzYS5nZXRBY2NvdW50SWQoKSk7CisgICAgICAgICAgbGFiZWwudmFsdWUgPSB2YWwgIT0gMSA/IHZhbCA6IG51bGw7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgbGFiZWwuZGlzbGlrZWQgPSBhY2NvdW50TG9hZGVyLmdldChwc2EuZ2V0QWNjb3VudElkKCkpOworICAgICAgICAgIGxhYmVsLnZhbHVlID0gdmFsICE9IC0xID8gdmFsIDogbnVsbDsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgICByZXR1cm47CisgIH0KKworICBwcml2YXRlIHZvaWQgc2V0QWxsQXBwcm92YWxzKENoYW5nZURhdGEgY2QsCisgICAgICBNYXA8U3RyaW5nLCBMYWJlbEluZm8+IGxhYmVscykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgQ2hhbmdlQ29udHJvbCBiYXNlQ3RybCA9IGNvbnRyb2woY2QpOworICAgIGlmIChiYXNlQ3RybCA9PSBudWxsKSB7CisgICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gQWxsIHVzZXJzIGV2ZXIgYWRkZWQsIGV2ZW4gaWYgdGhleSBjYW4ndCB2b3RlIG9uIG9uZSBvciBhbGwgbGFiZWxzLgorICAgIFNldDxBY2NvdW50LklkPiBhbGxVc2VycyA9IFNldHMubmV3SGFzaFNldCgpOworICAgIExpc3RNdWx0aW1hcDxQYXRjaFNldC5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4gYWxsQXBwcm92YWxzID0KKyAgICAgICAgY2QuYWxsQXBwcm92YWxzTWFwKGRiKTsKKyAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgcHNhIDogYWxsQXBwcm92YWxzLnZhbHVlcygpKSB7CisgICAgICBhbGxVc2Vycy5hZGQocHNhLmdldEFjY291bnRJZCgpKTsKKyAgICB9CisKKyAgICBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGN1cnJlbnRMaXN0ID0gbGFiZWxOb3JtYWxpemVyLm5vcm1hbGl6ZSgKKyAgICAgICAgYmFzZUN0cmwsIGFsbEFwcHJvdmFscy5nZXQoYmFzZUN0cmwuZ2V0Q2hhbmdlKCkuY3VycmVudFBhdGNoU2V0SWQoKSkpOworICAgIC8vIE1vc3QgcmVjZW50LCBub3JtYWxpemVkIHZvdGUgb24gZWFjaCBsYWJlbCBmb3IgdGhlIGN1cnJlbnQgcGF0Y2ggc2V0IGJ5CisgICAgLy8gZWFjaCB1c2VyIChtYXkgYmUgMCkuCisgICAgVGFibGU8QWNjb3VudC5JZCwgU3RyaW5nLCBQYXRjaFNldEFwcHJvdmFsPiBjdXJyZW50ID0gSGFzaEJhc2VkVGFibGUuY3JlYXRlKAorICAgICAgICBhbGxVc2Vycy5zaXplKCksIGJhc2VDdHJsLmdldExhYmVsVHlwZXMoKS5nZXRMYWJlbFR5cGVzKCkuc2l6ZSgpKTsKKyAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgcHNhIDogY3VycmVudExpc3QpIHsKKyAgICAgIGN1cnJlbnQucHV0KHBzYS5nZXRBY2NvdW50SWQoKSwgcHNhLmdldExhYmVsKCksIHBzYSk7CisgICAgfQorCisgICAgZm9yIChBY2NvdW50LklkIGFjY291bnRJZCA6IGFsbFVzZXJzKSB7CisgICAgICBJZGVudGlmaWVkVXNlciB1c2VyID0gdXNlckZhY3RvcnkuY3JlYXRlKGFjY291bnRJZCk7CisgICAgICBDaGFuZ2VDb250cm9sIGN0bCA9IGJhc2VDdHJsLmZvclVzZXIodXNlcik7CisgICAgICBmb3IgKE1hcC5FbnRyeTxTdHJpbmcsIExhYmVsSW5mbz4gZSA6IGxhYmVscy5lbnRyeVNldCgpKSB7CisgICAgICAgIExhYmVsVHlwZSBsdCA9IGN0bC5nZXRMYWJlbFR5cGVzKCkuYnlMYWJlbChlLmdldEtleSgpKTsKKyAgICAgICAgaWYgKGx0ID09IG51bGwpIHsKKyAgICAgICAgICAvLyBJZ25vcmUgc3VibWl0IHJlY29yZCBmb3IgdW5kZWZpbmVkIGxhYmVsOyBsaWtlbHkgdGhlIHN1Ym1pdCBydWxlCisgICAgICAgICAgLy8gYXV0aG9yIGRpZG4ndCBpbnRlbmQgZm9yIHRoZSBsYWJlbCB0byBzaG93IHVwIGluIHRoZSB0YWJsZS4KKyAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBJbnRlZ2VyIHZhbHVlOworICAgICAgICBQYXRjaFNldEFwcHJvdmFsIHBzYSA9IGN1cnJlbnQuZ2V0KGFjY291bnRJZCwgbHQuZ2V0TmFtZSgpKTsKKyAgICAgICAgaWYgKHBzYSAhPSBudWxsKSB7CisgICAgICAgICAgdmFsdWUgPSBJbnRlZ2VyLnZhbHVlT2YocHNhLmdldFZhbHVlKCkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIC8vIEVpdGhlciB0aGUgdXNlciBjYW5ub3Qgdm90ZSBvbiB0aGlzIGxhYmVsLCBvciB0aGVyZSBqdXN0IHdhc24ndCBhCisgICAgICAgICAgLy8gZHVtbXkgYXBwcm92YWwgZm9yIHRoaXMgbGFiZWwuIEV4cGxpY2l0bHkgY2hlY2sgd2hldGhlciB0aGUgdXNlcgorICAgICAgICAgIC8vIGNhbiB2b3RlIG9uIHRoaXMgbGFiZWwuCisgICAgICAgICAgdmFsdWUgPSBsYWJlbE5vcm1hbGl6ZXIuY2FuVm90ZShjdGwsIGx0LCBhY2NvdW50SWQpID8gMCA6IG51bGw7CisgICAgICAgIH0KKyAgICAgICAgZS5nZXRWYWx1ZSgpLmFkZEFwcHJvdmFsKGFwcHJvdmFsSW5mbyhhY2NvdW50SWQsIHZhbHVlKSk7CisgICAgICB9CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBMYWJlbEluZm8+IGxhYmVsc0ZvckNsb3NlZENoYW5nZShDaGFuZ2VEYXRhIGNkLAorICAgICAgTGFiZWxUeXBlcyBsYWJlbFR5cGVzLCBib29sZWFuIHN0YW5kYXJkLCBib29sZWFuIGRldGFpbGVkKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgU2V0PEFjY291bnQuSWQ+IGFsbFVzZXJzID0gU2V0cy5uZXdIYXNoU2V0KCk7CisgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIHBzYSA6IGNkLmFsbEFwcHJvdmFscyhkYikpIHsKKyAgICAgIGFsbFVzZXJzLmFkZChwc2EuZ2V0QWNjb3VudElkKCkpOworICAgIH0KKworICAgIFNldDxTdHJpbmc+IGxhYmVsTmFtZXMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICBNdWx0aW1hcDxBY2NvdW50LklkLCBQYXRjaFNldEFwcHJvdmFsPiBjdXJyZW50ID0gSGFzaE11bHRpbWFwLmNyZWF0ZSgpOworICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogY2QuY3VycmVudEFwcHJvdmFscyhkYikpIHsKKyAgICAgIExhYmVsVHlwZSB0eXBlID0gbGFiZWxUeXBlcy5ieUxhYmVsKGEuZ2V0TGFiZWxJZCgpKTsKKyAgICAgIGlmICh0eXBlICE9IG51bGwgJiYgYS5nZXRWYWx1ZSgpICE9IDApIHsKKyAgICAgICAgbGFiZWxOYW1lcy5hZGQodHlwZS5nZXROYW1lKCkpOworICAgICAgICBjdXJyZW50LnB1dChhLmdldEFjY291bnRJZCgpLCBhKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICAvLyBXZSBjYW4gb25seSBhcHByb3hpbWF0ZWx5IHJlY29uc3RydWN0IHdoYXQgdGhlIHN1Ym1pdCBydWxlIGV2YWx1YXRvcgorICAgIC8vIHdvdWxkIGhhdmUgZG9uZS4gVGhlc2Ugc2hvdWxkIHJlYWxseSBjb21lIGZyb20gYSBzdG9yZWQgc3VibWl0IHJlY29yZC4KKyAgICAvLworICAgIC8vIERvbid0IHVzZSBNYXBzLm5ld1RyZWVNYXAoQ29tcGFyYXRvcikgZHVlIHRvIE9wZW5KREsgYnVnIDEwMDE2Ny4KKyAgICBNYXA8U3RyaW5nLCBMYWJlbEluZm8+IGxhYmVscyA9CisgICAgICAgIG5ldyBUcmVlTWFwPFN0cmluZywgTGFiZWxJbmZvPihsYWJlbFR5cGVzLm5hbWVDb21wYXJhdG9yKCkpOworICAgIGZvciAoU3RyaW5nIG5hbWUgOiBsYWJlbE5hbWVzKSB7CisgICAgICBMYWJlbFR5cGUgdHlwZSA9IGxhYmVsVHlwZXMuYnlMYWJlbChuYW1lKTsKKyAgICAgIExhYmVsSW5mbyBsaSA9IG5ldyBMYWJlbEluZm8oKTsKKyAgICAgIGlmIChkZXRhaWxlZCkgeworICAgICAgICBzZXRMYWJlbFZhbHVlcyh0eXBlLCBsaSk7CisgICAgICB9CisgICAgICBsYWJlbHMucHV0KHR5cGUuZ2V0TmFtZSgpLCBsaSk7CisgICAgfQorCisgICAgZm9yIChBY2NvdW50LklkIGFjY291bnRJZCA6IGFsbFVzZXJzKSB7CisgICAgICBNYXA8U3RyaW5nLCBBcHByb3ZhbEluZm8+IGJ5TGFiZWwgPQorICAgICAgICAgIE1hcHMubmV3SGFzaE1hcFdpdGhFeHBlY3RlZFNpemUobGFiZWxzLnNpemUoKSk7CisKKyAgICAgIGlmIChkZXRhaWxlZCkgeworICAgICAgICBmb3IgKFN0cmluZyBuYW1lIDogbGFiZWxzLmtleVNldCgpKSB7CisgICAgICAgICAgQXBwcm92YWxJbmZvIGFpID0gYXBwcm92YWxJbmZvKGFjY291bnRJZCwgMCk7CisgICAgICAgICAgYnlMYWJlbC5wdXQobmFtZSwgYWkpOworICAgICAgICAgIGxhYmVscy5nZXQobmFtZSkuYWRkQXBwcm92YWwoYWkpOworICAgICAgICB9CisgICAgICB9CisgICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgcHNhIDogY3VycmVudC5nZXQoYWNjb3VudElkKSkgeworICAgICAgICBMYWJlbFR5cGUgdHlwZSA9IGxhYmVsVHlwZXMuYnlMYWJlbChwc2EuZ2V0TGFiZWxJZCgpKTsKKyAgICAgICAgaWYgKHR5cGUgPT0gbnVsbCkgeworICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgc2hvcnQgdmFsID0gcHNhLmdldFZhbHVlKCk7CisgICAgICAgIEFwcHJvdmFsSW5mbyBpbmZvID0gYnlMYWJlbC5nZXQodHlwZS5nZXROYW1lKCkpOworICAgICAgICBpZiAoaW5mbyAhPSBudWxsKSB7CisgICAgICAgICAgaW5mby52YWx1ZSA9IEludGVnZXIudmFsdWVPZih2YWwpOworICAgICAgICB9CisKKyAgICAgICAgTGFiZWxJbmZvIGxpID0gbGFiZWxzLmdldCh0eXBlLmdldE5hbWUoKSk7CisgICAgICAgIGlmICghc3RhbmRhcmQgfHwgbGkuYXBwcm92ZWQgIT0gbnVsbCB8fCBsaS5yZWplY3RlZCAhPSBudWxsKSB7CisgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKHZhbCA9PSB0eXBlLmdldE1heCgpLmdldFZhbHVlKCkpIHsKKyAgICAgICAgICBsaS5hcHByb3ZlZCA9IGFjY291bnRMb2FkZXIuZ2V0KGFjY291bnRJZCk7CisgICAgICAgIH0gZWxzZSBpZiAodmFsID09IHR5cGUuZ2V0TWluKCkuZ2V0VmFsdWUoKQorICAgICAgICAgICAgLy8gQSBtZXJnZWQgY2hhbmdlIGNhbid0IGhhdmUgYmVlbiByZWplY3RlZC4KKyAgICAgICAgICAgICYmIGNkLmdldENoYW5nZSgpLmdldFN0YXR1cygpICE9IFN0YXR1cy5NRVJHRUQpIHsKKyAgICAgICAgICBsaS5yZWplY3RlZCA9IGFjY291bnRMb2FkZXIuZ2V0KGFjY291bnRJZCk7CisgICAgICAgIH0gZWxzZSBpZiAodmFsID4gMCkgeworICAgICAgICAgIGxpLnJlY29tbWVuZGVkID0gYWNjb3VudExvYWRlci5nZXQoYWNjb3VudElkKTsKKyAgICAgICAgICBsaS52YWx1ZSA9IHZhbDsKKyAgICAgICAgfSBlbHNlIGlmICh2YWwgPCAwKSB7CisgICAgICAgICAgbGkuZGlzbGlrZWQgPSBhY2NvdW50TG9hZGVyLmdldChhY2NvdW50SWQpOworICAgICAgICAgIGxpLnZhbHVlID0gdmFsOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBsYWJlbHM7CisgIH0KKworICBwcml2YXRlIEFwcHJvdmFsSW5mbyBhcHByb3ZhbEluZm8oQWNjb3VudC5JZCBpZCwgSW50ZWdlciB2YWx1ZSkgeworICAgIEFwcHJvdmFsSW5mbyBhaSA9IG5ldyBBcHByb3ZhbEluZm8oaWQpOworICAgIGFpLnZhbHVlID0gdmFsdWU7CisgICAgYWNjb3VudExvYWRlci5wdXQoYWkpOworICAgIHJldHVybiBhaTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gaXNPbmx5WmVybyhDb2xsZWN0aW9uPFN0cmluZz4gdmFsdWVzKSB7CisgICAgcmV0dXJuIHZhbHVlcy5pc0VtcHR5KCkgfHwgKHZhbHVlcy5zaXplKCkgPT0gMSAmJiB2YWx1ZXMuY29udGFpbnMoIiAwIikpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHNldExhYmVsVmFsdWVzKExhYmVsVHlwZSB0eXBlLCBMYWJlbEluZm8gbGFiZWwpIHsKKyAgICBsYWJlbC52YWx1ZXMgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKKyAgICBmb3IgKExhYmVsVmFsdWUgdiA6IHR5cGUuZ2V0VmFsdWVzKCkpIHsKKyAgICAgIGxhYmVsLnZhbHVlcy5wdXQodi5mb3JtYXRWYWx1ZSgpLCB2LmdldFRleHQoKSk7CisgICAgfQorICAgIGlmIChpc09ubHlaZXJvKGxhYmVsLnZhbHVlcy5rZXlTZXQoKSkpIHsKKyAgICAgIGxhYmVsLnZhbHVlcyA9IG51bGw7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBDb2xsZWN0aW9uPFN0cmluZz4+IHBlcm1pdHRlZExhYmVscyhDaGFuZ2VEYXRhIGNkKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgQ2hhbmdlQ29udHJvbCBjdGwgPSBjb250cm9sKGNkKTsKKyAgICBpZiAoY3RsID09IG51bGwpIHsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKworICAgIExhYmVsVHlwZXMgbGFiZWxUeXBlcyA9IGN0bC5nZXRMYWJlbFR5cGVzKCk7CisgICAgTGlzdE11bHRpbWFwPFN0cmluZywgU3RyaW5nPiBwZXJtaXR0ZWQgPSBMaW5rZWRMaXN0TXVsdGltYXAuY3JlYXRlKCk7CisgICAgZm9yIChTdWJtaXRSZWNvcmQgcmVjIDogc3VibWl0UmVjb3JkcyhjZCkpIHsKKyAgICAgIGlmIChyZWMubGFiZWxzID09IG51bGwpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgICBmb3IgKFN1Ym1pdFJlY29yZC5MYWJlbCByIDogcmVjLmxhYmVscykgeworICAgICAgICBMYWJlbFR5cGUgdHlwZSA9IGxhYmVsVHlwZXMuYnlMYWJlbChyLmxhYmVsKTsKKyAgICAgICAgaWYgKHR5cGUgPT0gbnVsbCkgeworICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIFBlcm1pc3Npb25SYW5nZSByYW5nZSA9IGN0bC5nZXRSYW5nZShQZXJtaXNzaW9uLmZvckxhYmVsKHIubGFiZWwpKTsKKyAgICAgICAgZm9yIChMYWJlbFZhbHVlIHYgOiB0eXBlLmdldFZhbHVlcygpKSB7CisgICAgICAgICAgaWYgKHJhbmdlLmNvbnRhaW5zKHYuZ2V0VmFsdWUoKSkpIHsKKyAgICAgICAgICAgIHBlcm1pdHRlZC5wdXQoci5sYWJlbCwgdi5mb3JtYXRWYWx1ZSgpKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgTGlzdDxTdHJpbmc+IHRvQ2xlYXIgPQorICAgICAgTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KHBlcm1pdHRlZC5rZXlTZXQoKS5zaXplKCkpOworICAgIGZvciAoTWFwLkVudHJ5PFN0cmluZywgQ29sbGVjdGlvbjxTdHJpbmc+PiBlCisgICAgICAgIDogcGVybWl0dGVkLmFzTWFwKCkuZW50cnlTZXQoKSkgeworICAgICAgaWYgKGlzT25seVplcm8oZS5nZXRWYWx1ZSgpKSkgeworICAgICAgICB0b0NsZWFyLmFkZChlLmdldEtleSgpKTsKKyAgICAgIH0KKyAgICB9CisgICAgZm9yIChTdHJpbmcgbGFiZWwgOiB0b0NsZWFyKSB7CisgICAgICBwZXJtaXR0ZWQucmVtb3ZlQWxsKGxhYmVsKTsKKyAgICB9CisgICAgcmV0dXJuIHBlcm1pdHRlZC5hc01hcCgpOworICB9CisKKyAgcHJpdmF0ZSBDb2xsZWN0aW9uPEFjY291bnRJbmZvPiByZW1vdmFibGVSZXZpZXdlcnMoQ2hhbmdlRGF0YSBjZCwKKyAgICAgIENvbGxlY3Rpb248TGFiZWxJbmZvPiBsYWJlbHMpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIENoYW5nZUNvbnRyb2wgY3RsID0gY29udHJvbChjZCk7CisgICAgaWYgKGN0bCA9PSBudWxsKSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisKKyAgICBTZXQ8QWNjb3VudC5JZD4gZml4ZWQgPSBTZXRzLm5ld0hhc2hTZXRXaXRoRXhwZWN0ZWRTaXplKGxhYmVscy5zaXplKCkpOworICAgIFNldDxBY2NvdW50LklkPiByZW1vdmFibGUgPSBTZXRzLm5ld0hhc2hTZXRXaXRoRXhwZWN0ZWRTaXplKGxhYmVscy5zaXplKCkpOworICAgIGZvciAoTGFiZWxJbmZvIGxhYmVsIDogbGFiZWxzKSB7CisgICAgICBpZiAobGFiZWwuYWxsID09IG51bGwpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgICBmb3IgKEFwcHJvdmFsSW5mbyBhaSA6IGxhYmVsLmFsbCkgeworICAgICAgICBpZiAoY3RsLmNhblJlbW92ZVJldmlld2VyKGFpLl9pZCwgT2JqZWN0cy5maXJzdE5vbk51bGwoYWkudmFsdWUsIDApKSkgeworICAgICAgICAgIHJlbW92YWJsZS5hZGQoYWkuX2lkKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBmaXhlZC5hZGQoYWkuX2lkKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgICByZW1vdmFibGUucmVtb3ZlQWxsKGZpeGVkKTsKKworICAgIExpc3Q8QWNjb3VudEluZm8+IHJlc3VsdCA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShyZW1vdmFibGUuc2l6ZSgpKTsKKyAgICBmb3IgKEFjY291bnQuSWQgaWQgOiByZW1vdmFibGUpIHsKKyAgICAgIHJlc3VsdC5hZGQoYWNjb3VudExvYWRlci5nZXQoaWQpKTsKKyAgICB9CisgICAgcmV0dXJuIHJlc3VsdDsKKyAgfQorCisgIHByaXZhdGUgYm9vbGVhbiBpc0NoYW5nZVJldmlld2VkKENoYW5nZURhdGEgY2QpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIGlmICh1c2VyIGluc3RhbmNlb2YgSWRlbnRpZmllZFVzZXIpIHsKKyAgICAgIFBhdGNoU2V0IGN1cnJlbnRQYXRjaFNldCA9IGNkLmN1cnJlbnRQYXRjaFNldChkYik7CisgICAgICBpZiAoY3VycmVudFBhdGNoU2V0ID09IG51bGwpIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgfQorCisgICAgICBMaXN0PENoYW5nZU1lc3NhZ2U+IG1lc3NhZ2VzID0KKyAgICAgICAgICBkYi5nZXQoKS5jaGFuZ2VNZXNzYWdlcygpLmJ5UGF0Y2hTZXQoY3VycmVudFBhdGNoU2V0LmdldElkKCkpLnRvTGlzdCgpOworCisgICAgICBpZiAobWVzc2FnZXMuaXNFbXB0eSgpKSB7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgIH0KKworICAgICAgLy8gU29ydCBtZXNzYWdlcyB0byBsZXQgdGhlIG1vc3QgcmVjZW50IG9uZXMgYXQgdGhlIGJlZ2lubmluZy4KKyAgICAgIENvbGxlY3Rpb25zLnNvcnQobWVzc2FnZXMsIG5ldyBDb21wYXJhdG9yPENoYW5nZU1lc3NhZ2U+KCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIGludCBjb21wYXJlKENoYW5nZU1lc3NhZ2UgYSwgQ2hhbmdlTWVzc2FnZSBiKSB7CisgICAgICAgICAgcmV0dXJuIGIuZ2V0V3JpdHRlbk9uKCkuY29tcGFyZVRvKGEuZ2V0V3JpdHRlbk9uKCkpOworICAgICAgICB9CisgICAgICB9KTsKKworICAgICAgQWNjb3VudC5JZCBjdXJyZW50VXNlcklkID0gKChJZGVudGlmaWVkVXNlcikgdXNlcikuZ2V0QWNjb3VudElkKCk7CisgICAgICBBY2NvdW50LklkIGNoYW5nZU93bmVySWQgPSBjZC5jaGFuZ2UoZGIpLmdldE93bmVyKCk7CisgICAgICBmb3IgKENoYW5nZU1lc3NhZ2UgY20gOiBtZXNzYWdlcykgeworICAgICAgICBpZiAoY3VycmVudFVzZXJJZC5lcXVhbHMoY20uZ2V0QXV0aG9yKCkpKSB7CisgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0gZWxzZSBpZiAoY2hhbmdlT3duZXJJZC5lcXVhbHMoY20uZ2V0QXV0aG9yKCkpKSB7CisgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKKyAgfQorCisgIHByaXZhdGUgTWFwPFN0cmluZywgUmV2aXNpb25JbmZvPiByZXZpc2lvbnMoQ2hhbmdlRGF0YSBjZCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgQ2hhbmdlQ29udHJvbCBjdGwgPSBjb250cm9sKGNkKTsKKyAgICBpZiAoY3RsID09IG51bGwpIHsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKworICAgIENvbGxlY3Rpb248UGF0Y2hTZXQ+IHNyYzsKKyAgICBpZiAoY2QuZ2V0TGltaXRlZFBhdGNoU2V0cygpICE9IG51bGwgfHwgaGFzKEFMTF9SRVZJU0lPTlMpKSB7CisgICAgICBzcmMgPSBjZC5wYXRjaGVzKGRiKTsKKyAgICB9IGVsc2UgeworICAgICAgc3JjID0gQ29sbGVjdGlvbnMuc2luZ2xldG9uTGlzdChjZC5jdXJyZW50UGF0Y2hTZXQoZGIpKTsKKyAgICB9CisgICAgTWFwPFN0cmluZywgUmV2aXNpb25JbmZvPiByZXMgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKKyAgICBmb3IgKFBhdGNoU2V0IGluIDogc3JjKSB7CisgICAgICBpZiAoY3RsLmlzUGF0Y2hWaXNpYmxlKGluLCBkYi5nZXQoKSkpIHsKKyAgICAgICAgcmVzLnB1dChpbi5nZXRSZXZpc2lvbigpLmdldCgpLCB0b1JldmlzaW9uSW5mbyhjZCwgaW4pKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIHJlczsKKyAgfQorCisgIHByaXZhdGUgUmV2aXNpb25JbmZvIHRvUmV2aXNpb25JbmZvKENoYW5nZURhdGEgY2QsIFBhdGNoU2V0IGluKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgUmV2aXNpb25JbmZvIG91dCA9IG5ldyBSZXZpc2lvbkluZm8oKTsKKyAgICBvdXQuaXNDdXJyZW50ID0gaW4uZ2V0SWQoKS5lcXVhbHMoY2QuY2hhbmdlKGRiKS5jdXJyZW50UGF0Y2hTZXRJZCgpKTsKKyAgICBvdXQuX251bWJlciA9IGluLmdldElkKCkuZ2V0KCk7CisgICAgb3V0LmRyYWZ0ID0gaW4uaXNEcmFmdCgpID8gdHJ1ZSA6IG51bGw7CisgICAgb3V0LmZldGNoID0gbWFrZUZldGNoTWFwKGNkLCBpbik7CisKKyAgICBpZiAoaGFzKEFMTF9DT01NSVRTKSB8fCAob3V0LmlzQ3VycmVudCAmJiBoYXMoQ1VSUkVOVF9DT01NSVQpKSkgeworICAgICAgdHJ5IHsKKyAgICAgICAgUGF0Y2hTZXRJbmZvIGluZm8gPSBwYXRjaFNldEluZm9GYWN0b3J5LmdldChkYi5nZXQoKSwgaW4uZ2V0SWQoKSk7CisgICAgICAgIG91dC5jb21taXQgPSBuZXcgQ29tbWl0SW5mbygpOworICAgICAgICBvdXQuY29tbWl0LnBhcmVudHMgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoaW5mby5nZXRQYXJlbnRzKCkuc2l6ZSgpKTsKKyAgICAgICAgb3V0LmNvbW1pdC5hdXRob3IgPSB0b0dpdFBlcnNvbihpbmZvLmdldEF1dGhvcigpKTsKKyAgICAgICAgb3V0LmNvbW1pdC5jb21taXR0ZXIgPSB0b0dpdFBlcnNvbihpbmZvLmdldENvbW1pdHRlcigpKTsKKyAgICAgICAgb3V0LmNvbW1pdC5zdWJqZWN0ID0gaW5mby5nZXRTdWJqZWN0KCk7CisgICAgICAgIG91dC5jb21taXQubWVzc2FnZSA9IGluZm8uZ2V0TWVzc2FnZSgpOworCisgICAgICAgIGZvciAoUGFyZW50SW5mbyBwYXJlbnQgOiBpbmZvLmdldFBhcmVudHMoKSkgeworICAgICAgICAgIENvbW1pdEluZm8gaSA9IG5ldyBDb21taXRJbmZvKCk7CisgICAgICAgICAgaS5jb21taXQgPSBwYXJlbnQuaWQuZ2V0KCk7CisgICAgICAgICAgaS5zdWJqZWN0ID0gcGFyZW50LnNob3J0TWVzc2FnZTsKKyAgICAgICAgICBvdXQuY29tbWl0LnBhcmVudHMuYWRkKGkpOworICAgICAgICB9CisgICAgICB9IGNhdGNoIChQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24gZSkgeworICAgICAgICBsb2cud2FybigiQ2Fubm90IGxvYWQgUGF0Y2hTZXRJbmZvICIgKyBpbi5nZXRJZCgpLCBlKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoaGFzKEFMTF9GSUxFUykgfHwgKG91dC5pc0N1cnJlbnQgJiYgaGFzKENVUlJFTlRfRklMRVMpKSkgeworICAgICAgUGF0Y2hMaXN0IGxpc3Q7CisgICAgICB0cnkgeworICAgICAgICBsaXN0ID0gcGF0Y2hMaXN0Q2FjaGUuZ2V0KGNkLmNoYW5nZShkYiksIGluKTsKKyAgICAgIH0gY2F0Y2ggKFBhdGNoTGlzdE5vdEF2YWlsYWJsZUV4Y2VwdGlvbiBlKSB7CisgICAgICAgIGxvZy53YXJuKCJDYW5ub3QgbG9hZCBQYXRjaExpc3QgIiArIGluLmdldElkKCksIGUpOworICAgICAgICBsaXN0ID0gbnVsbDsKKyAgICAgIH0KKyAgICAgIGlmIChsaXN0ICE9IG51bGwpIHsKKyAgICAgICAgb3V0LmZpbGVzID0gTWFwcy5uZXdUcmVlTWFwKCk7CisgICAgICAgIGZvciAoUGF0Y2hMaXN0RW50cnkgZSA6IGxpc3QuZ2V0UGF0Y2hlcygpKSB7CisgICAgICAgICAgaWYgKFBhdGNoLkNPTU1JVF9NU0cuZXF1YWxzKGUuZ2V0TmV3TmFtZSgpKSkgeworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgfQorCisgICAgICAgICAgRmlsZUluZm8gZCA9IG5ldyBGaWxlSW5mbygpOworICAgICAgICAgIGQuc3RhdHVzID0gZS5nZXRDaGFuZ2VUeXBlKCkgIT0gUGF0Y2guQ2hhbmdlVHlwZS5NT0RJRklFRAorICAgICAgICAgICAgICA/IGUuZ2V0Q2hhbmdlVHlwZSgpLmdldENvZGUoKQorICAgICAgICAgICAgICA6IG51bGw7CisgICAgICAgICAgZC5vbGRQYXRoID0gZS5nZXRPbGROYW1lKCk7CisgICAgICAgICAgaWYgKGUuZ2V0UGF0Y2hUeXBlKCkgPT0gUGF0Y2guUGF0Y2hUeXBlLkJJTkFSWSkgeworICAgICAgICAgICAgZC5iaW5hcnkgPSB0cnVlOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBkLmxpbmVzSW5zZXJ0ZWQgPSBlLmdldEluc2VydGlvbnMoKSA+IDAgPyBlLmdldEluc2VydGlvbnMoKSA6IG51bGw7CisgICAgICAgICAgICBkLmxpbmVzRGVsZXRlZCA9IGUuZ2V0RGVsZXRpb25zKCkgPiAwID8gZS5nZXREZWxldGlvbnMoKSA6IG51bGw7CisgICAgICAgICAgfQorCisgICAgICAgICAgRmlsZUluZm8gbyA9IG91dC5maWxlcy5wdXQoZS5nZXROZXdOYW1lKCksIGQpOworICAgICAgICAgIGlmIChvICE9IG51bGwpIHsKKyAgICAgICAgICAgIC8vIFRoaXMgc2hvdWxkIG9ubHkgaGFwcGVuIG9uIGEgZGVsZXRlLWFkZCBicmVhayBjcmVhdGVkIGJ5IEpHaXQKKyAgICAgICAgICAgIC8vIHdoZW4gdGhlIGZpbGUgd2FzIHJld3JpdHRlbiBhbmQgdG9vIGxpdHRsZSBjb250ZW50IHN1cnZpdmVkLiBXcml0ZQorICAgICAgICAgICAgLy8gYSBzaW5nbGUgcmVjb3JkIHdpdGggZGF0YSBmcm9tIGJvdGggc2lkZXMuCisgICAgICAgICAgICBkLnN0YXR1cyA9IFBhdGNoLkNoYW5nZVR5cGUuUkVXUklURS5nZXRDb2RlKCk7CisgICAgICAgICAgICBpZiAoby5iaW5hcnkgIT0gbnVsbCAmJiBvLmJpbmFyeSkgeworICAgICAgICAgICAgICBkLmJpbmFyeSA9IHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoby5saW5lc0luc2VydGVkICE9IG51bGwpIHsKKyAgICAgICAgICAgICAgZC5saW5lc0luc2VydGVkID0gby5saW5lc0luc2VydGVkOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKG8ubGluZXNEZWxldGVkICE9IG51bGwpIHsKKyAgICAgICAgICAgICAgZC5saW5lc0RlbGV0ZWQgPSBvLmxpbmVzRGVsZXRlZDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG91dDsKKyAgfQorCisgIHByaXZhdGUgTWFwPFN0cmluZywgRmV0Y2hJbmZvPiBtYWtlRmV0Y2hNYXAoQ2hhbmdlRGF0YSBjZCwgUGF0Y2hTZXQgaW4pCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBNYXA8U3RyaW5nLCBGZXRjaEluZm8+IHIgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKKyAgICBTdHJpbmcgcmVmTmFtZSA9IGluLmdldFJlZk5hbWUoKTsKKyAgICBDaGFuZ2VDb250cm9sIGN0bCA9IGNvbnRyb2woY2QpOworICAgIGlmIChjdGwgIT0gbnVsbCAmJiBjdGwuZm9yVXNlcihhbm9ueW1vdXMpLmlzUGF0Y2hWaXNpYmxlKGluLCBkYi5nZXQoKSkpIHsKKyAgICAgIGlmICh1cmxzLmdpdCAhPSBudWxsKSB7CisgICAgICAgIHIucHV0KCJnaXQiLCBuZXcgRmV0Y2hJbmZvKHVybHMuZ2l0CisgICAgICAgICAgICArIGNkLmNoYW5nZShkYikuZ2V0UHJvamVjdCgpLmdldCgpLCByZWZOYW1lKSk7CisgICAgICB9CisgICAgfQorICAgIGlmICh1cmxzLmh0dHAgIT0gbnVsbCkgeworICAgICAgci5wdXQoImh0dHAiLCBuZXcgRmV0Y2hJbmZvKHVybHMuaHR0cAorICAgICAgICAgICsgY2QuY2hhbmdlKGRiKS5nZXRQcm9qZWN0KCkuZ2V0KCksIHJlZk5hbWUpKTsKKyAgICB9IGVsc2UgeworICAgICAgU3RyaW5nIGh0dHAgPSB1cmxQcm92aWRlci5nZXQoKTsKKyAgICAgIGlmICghU3RyaW5ncy5pc051bGxPckVtcHR5KGh0dHApKSB7CisgICAgICAgIHIucHV0KCJodHRwIiwgbmV3IEZldGNoSW5mbyhodHRwCisgICAgICAgICAgICArIGNkLmNoYW5nZShkYikuZ2V0UHJvamVjdCgpLmdldCgpLCByZWZOYW1lKSk7CisgICAgICB9CisgICAgfQorICAgIGlmIChzc2hJbmZvICE9IG51bGwgJiYgIXNzaEluZm8uZ2V0SG9zdEtleXMoKS5pc0VtcHR5KCkpIHsKKyAgICAgIEhvc3RLZXkgaG9zdCA9IHNzaEluZm8uZ2V0SG9zdEtleXMoKS5nZXQoMCk7CisgICAgICByLnB1dCgic3NoIiwgbmV3IEZldGNoSW5mbyhTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICJzc2g6Ly8lcy8lcyIsCisgICAgICAgICAgaG9zdC5nZXRIb3N0KCksIGNkLmNoYW5nZShkYikuZ2V0UHJvamVjdCgpLmdldCgpKSwKKyAgICAgICAgICByZWZOYW1lKSk7CisgICAgfQorCisgICAgcmV0dXJuIHI7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBHaXRQZXJzb24gdG9HaXRQZXJzb24oVXNlcklkZW50aXR5IGNvbW1pdHRlcikgeworICAgIEdpdFBlcnNvbiBwID0gbmV3IEdpdFBlcnNvbigpOworICAgIHAubmFtZSA9IGNvbW1pdHRlci5nZXROYW1lKCk7CisgICAgcC5lbWFpbCA9IGNvbW1pdHRlci5nZXRFbWFpbCgpOworICAgIHAuZGF0ZSA9IGNvbW1pdHRlci5nZXREYXRlKCk7CisgICAgcC50eiA9IGNvbW1pdHRlci5nZXRUaW1lWm9uZSgpOworICAgIHJldHVybiBwOworICB9CisKKyAgcHVibGljIHN0YXRpYyBjbGFzcyBDaGFuZ2VJbmZvIHsKKyAgICBmaW5hbCBTdHJpbmcga2luZCA9ICJnZXJyaXRjb2RlcmV2aWV3I2NoYW5nZSI7CisgICAgU3RyaW5nIGlkOworICAgIFN0cmluZyBwcm9qZWN0OworICAgIFN0cmluZyBicmFuY2g7CisgICAgU3RyaW5nIHRvcGljOworICAgIHB1YmxpYyBTdHJpbmcgY2hhbmdlSWQ7CisgICAgcHVibGljIFN0cmluZyBzdWJqZWN0OworICAgIENoYW5nZS5TdGF0dXMgc3RhdHVzOworICAgIFRpbWVzdGFtcCBjcmVhdGVkOworICAgIFRpbWVzdGFtcCB1cGRhdGVkOworICAgIEJvb2xlYW4gc3RhcnJlZDsKKyAgICBCb29sZWFuIHJldmlld2VkOworICAgIEJvb2xlYW4gbWVyZ2VhYmxlOworCisgICAgU3RyaW5nIF9zb3J0a2V5OworICAgIGludCBfbnVtYmVyOworCisgICAgQWNjb3VudEluZm8gb3duZXI7CisKKyAgICBNYXA8U3RyaW5nLCBMYWJlbEluZm8+IGxhYmVsczsKKyAgICBNYXA8U3RyaW5nLCBDb2xsZWN0aW9uPFN0cmluZz4+IHBlcm1pdHRlZF9sYWJlbHM7CisgICAgQ29sbGVjdGlvbjxBY2NvdW50SW5mbz4gcmVtb3ZhYmxlX3Jldmlld2VyczsKKworICAgIFN0cmluZyBjdXJyZW50X3JldmlzaW9uOworICAgIE1hcDxTdHJpbmcsIFJldmlzaW9uSW5mbz4gcmV2aXNpb25zOworICAgIHB1YmxpYyBCb29sZWFuIF9tb3JlQ2hhbmdlczsKKworICAgIHZvaWQgZmluaXNoKCkgeworICAgICAgaWQgPSBKb2luZXIub24oJ34nKS5qb2luKAorICAgICAgICAgIFVybC5lbmNvZGUocHJvamVjdCksCisgICAgICAgICAgVXJsLmVuY29kZShicmFuY2gpLAorICAgICAgICAgIFVybC5lbmNvZGUoY2hhbmdlSWQpKTsKKyAgICB9CisgIH0KKworICBzdGF0aWMgY2xhc3MgUmV2aXNpb25JbmZvIHsKKyAgICBwcml2YXRlIHRyYW5zaWVudCBib29sZWFuIGlzQ3VycmVudDsKKyAgICBCb29sZWFuIGRyYWZ0OworICAgIGludCBfbnVtYmVyOworICAgIE1hcDxTdHJpbmcsIEZldGNoSW5mbz4gZmV0Y2g7CisgICAgQ29tbWl0SW5mbyBjb21taXQ7CisgICAgTWFwPFN0cmluZywgRmlsZUluZm8+IGZpbGVzOworICB9CisKKyAgc3RhdGljIGNsYXNzIEZldGNoSW5mbyB7CisgICAgU3RyaW5nIHVybDsKKyAgICBTdHJpbmcgcmVmOworCisgICAgRmV0Y2hJbmZvKFN0cmluZyB1cmwsIFN0cmluZyByZWYpIHsKKyAgICAgIHRoaXMudXJsID0gdXJsOworICAgICAgdGhpcy5yZWYgPSByZWY7CisgICAgfQorICB9CisKKyAgc3RhdGljIGNsYXNzIEdpdFBlcnNvbiB7CisgICAgU3RyaW5nIG5hbWU7CisgICAgU3RyaW5nIGVtYWlsOworICAgIFRpbWVzdGFtcCBkYXRlOworICAgIGludCB0ejsKKyAgfQorCisgIHN0YXRpYyBjbGFzcyBDb21taXRJbmZvIHsKKyAgICBTdHJpbmcgY29tbWl0OworICAgIExpc3Q8Q29tbWl0SW5mbz4gcGFyZW50czsKKyAgICBHaXRQZXJzb24gYXV0aG9yOworICAgIEdpdFBlcnNvbiBjb21taXR0ZXI7CisgICAgU3RyaW5nIHN1YmplY3Q7CisgICAgU3RyaW5nIG1lc3NhZ2U7CisgIH0KKworICBzdGF0aWMgY2xhc3MgRmlsZUluZm8geworICAgIENoYXJhY3RlciBzdGF0dXM7CisgICAgQm9vbGVhbiBiaW5hcnk7CisgICAgU3RyaW5nIG9sZFBhdGg7CisgICAgSW50ZWdlciBsaW5lc0luc2VydGVkOworICAgIEludGVnZXIgbGluZXNEZWxldGVkOworICB9CisKKyAgc3RhdGljIGNsYXNzIExhYmVsSW5mbyB7CisgICAgdHJhbnNpZW50IFN1Ym1pdFJlY29yZC5MYWJlbC5TdGF0dXMgX3N0YXR1czsKKworICAgIEFjY291bnRJbmZvIGFwcHJvdmVkOworICAgIEFjY291bnRJbmZvIHJlamVjdGVkOworICAgIEFjY291bnRJbmZvIHJlY29tbWVuZGVkOworICAgIEFjY291bnRJbmZvIGRpc2xpa2VkOworICAgIExpc3Q8QXBwcm92YWxJbmZvPiBhbGw7CisKKyAgICBNYXA8U3RyaW5nLCBTdHJpbmc+IHZhbHVlczsKKworICAgIFNob3J0IHZhbHVlOworICAgIEJvb2xlYW4gb3B0aW9uYWw7CisKKyAgICB2b2lkIGFkZEFwcHJvdmFsKEFwcHJvdmFsSW5mbyBhaSkgeworICAgICAgaWYgKGFsbCA9PSBudWxsKSB7CisgICAgICAgIGFsbCA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgICAgfQorICAgICAgYWxsLmFkZChhaSk7CisgICAgfQorICB9CisKKyAgc3RhdGljIGNsYXNzIEFwcHJvdmFsSW5mbyBleHRlbmRzIEFjY291bnRJbmZvIHsKKyAgICBJbnRlZ2VyIHZhbHVlOworCisgICAgQXBwcm92YWxJbmZvKEFjY291bnQuSWQgaWQpIHsKKyAgICAgIHN1cGVyKGlkKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0NoYW5nZU1lc3NhZ2VzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9DaGFuZ2VNZXNzYWdlcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjgyMzZkM2QKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9DaGFuZ2VNZXNzYWdlcy5qYXZhCkBAIC0wLDAgKzEsMzEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5ubHMuTkxTOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubmxzLlRyYW5zbGF0aW9uQnVuZGxlOworCitwdWJsaWMgY2xhc3MgQ2hhbmdlTWVzc2FnZXMgZXh0ZW5kcyBUcmFuc2xhdGlvbkJ1bmRsZSB7CisgIHB1YmxpYyBzdGF0aWMgQ2hhbmdlTWVzc2FnZXMgZ2V0KCkgeworICAgIHJldHVybiBOTFMuZ2V0QnVuZGxlRm9yKENoYW5nZU1lc3NhZ2VzLmNsYXNzKTsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgcmV2ZXJ0Q2hhbmdlRGVmYXVsdE1lc3NhZ2U7CisgIHB1YmxpYyBTdHJpbmcgcmV2aWV3ZXJOb3RGb3VuZDsKKworICBwdWJsaWMgU3RyaW5nIGdyb3VwSXNOb3RBbGxvd2VkOworICBwdWJsaWMgU3RyaW5nIGdyb3VwSGFzVG9vTWFueU1lbWJlcnM7CisgIHB1YmxpYyBTdHJpbmcgZ3JvdXBNYW55TWVtYmVyc0NvbmZpcm1hdGlvbjsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0NoYW5nZVJlc291cmNlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9DaGFuZ2VSZXNvdXJjZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJlMzA4MWEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9DaGFuZ2VSZXNvdXJjZS5qYXZhCkBAIC0wLDAgKzEsNDQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworCitwdWJsaWMgY2xhc3MgQ2hhbmdlUmVzb3VyY2UgaW1wbGVtZW50cyBSZXN0UmVzb3VyY2UgeworICBwdWJsaWMgc3RhdGljIGZpbmFsIFR5cGVMaXRlcmFsPFJlc3RWaWV3PENoYW5nZVJlc291cmNlPj4gQ0hBTkdFX0tJTkQgPQorICAgICAgbmV3IFR5cGVMaXRlcmFsPFJlc3RWaWV3PENoYW5nZVJlc291cmNlPj4oKSB7fTsKKworICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wgY29udHJvbDsKKworICBwdWJsaWMgQ2hhbmdlUmVzb3VyY2UoQ2hhbmdlQ29udHJvbCBjb250cm9sKSB7CisgICAgdGhpcy5jb250cm9sID0gY29udHJvbDsKKyAgfQorCisgIHByb3RlY3RlZCBDaGFuZ2VSZXNvdXJjZShDaGFuZ2VSZXNvdXJjZSBjb3B5KSB7CisgICAgdGhpcy5jb250cm9sID0gY29weS5jb250cm9sOworICB9CisKKyAgcHVibGljIENoYW5nZUNvbnRyb2wgZ2V0Q29udHJvbCgpIHsKKyAgICByZXR1cm4gY29udHJvbDsKKyAgfQorCisgIHB1YmxpYyBDaGFuZ2UgZ2V0Q2hhbmdlKCkgeworICAgIHJldHVybiBnZXRDb250cm9sKCkuZ2V0Q2hhbmdlKCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0NoYW5nZXNDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9DaGFuZ2VzQ29sbGVjdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjAxMDBlYmMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9DaGFuZ2VzQ29sbGVjdGlvbi5qYXZhCkBAIC0wLDAgKzEsMTQ1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlTGlzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljTWFwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5JZFN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdENvbGxlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Ub3BMZXZlbFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLlF1ZXJ5Q2hhbmdlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKKworaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBDaGFuZ2VzQ29sbGVjdGlvbiBpbXBsZW1lbnRzCisgICAgUmVzdENvbGxlY3Rpb248VG9wTGV2ZWxSZXNvdXJjZSwgQ2hhbmdlUmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGI7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFF1ZXJ5Q2hhbmdlcz4gcXVlcnlGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIER5bmFtaWNNYXA8UmVzdFZpZXc8Q2hhbmdlUmVzb3VyY2U+PiB2aWV3czsKKworICBASW5qZWN0CisgIENoYW5nZXNDb2xsZWN0aW9uKAorICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXIsCisgICAgICBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCisgICAgICBQcm92aWRlcjxRdWVyeUNoYW5nZXM+IHF1ZXJ5RmFjdG9yeSwKKyAgICAgIER5bmFtaWNNYXA8UmVzdFZpZXc8Q2hhbmdlUmVzb3VyY2U+PiB2aWV3cykgeworICAgIHRoaXMuZGIgPSBkYlByb3ZpZGVyOworICAgIHRoaXMuY2hhbmdlQ29udHJvbEZhY3RvcnkgPSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKKyAgICB0aGlzLnF1ZXJ5RmFjdG9yeSA9IHF1ZXJ5RmFjdG9yeTsKKyAgICB0aGlzLnZpZXdzID0gdmlld3M7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFJlc3RWaWV3PFRvcExldmVsUmVzb3VyY2U+IGxpc3QoKSB7CisgICAgcmV0dXJuIHF1ZXJ5RmFjdG9yeS5nZXQoKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgRHluYW1pY01hcDxSZXN0VmlldzxDaGFuZ2VSZXNvdXJjZT4+IHZpZXdzKCkgeworICAgIHJldHVybiB2aWV3czsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgQ2hhbmdlUmVzb3VyY2UgcGFyc2UoVG9wTGV2ZWxSZXNvdXJjZSByb290LCBJZFN0cmluZyBpZCkKKyAgICAgIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sCisgICAgICBVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHsKKyAgICBQYXJzZWRJZCBwID0gbmV3IFBhcnNlZElkKGlkLmVuY29kZWQoKSk7CisgICAgTGlzdDxDaGFuZ2U+IGNoYW5nZXMgPSBmaW5kQ2hhbmdlcyhwKTsKKyAgICBpZiAoY2hhbmdlcy5zaXplKCkgIT0gMSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQpOworICAgIH0KKworICAgIENoYW5nZUNvbnRyb2wgY29udHJvbDsKKyAgICB0cnkgeworICAgICAgY29udHJvbCA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5LnZhbGlkYXRlRm9yKGNoYW5nZXMuZ2V0KDApKTsKKyAgICB9IGNhdGNoIChOb1N1Y2hDaGFuZ2VFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQpOworICAgIH0KKyAgICByZXR1cm4gbmV3IENoYW5nZVJlc291cmNlKGNvbnRyb2wpOworICB9CisKKyAgcHJpdmF0ZSBMaXN0PENoYW5nZT4gZmluZENoYW5nZXMoUGFyc2VkSWQgaykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKGsubGVnYWN5SWQgIT0gbnVsbCkgeworICAgICAgQ2hhbmdlIGMgPSBkYi5nZXQoKS5jaGFuZ2VzKCkuZ2V0KGsubGVnYWN5SWQpOworICAgICAgaWYgKGMgIT0gbnVsbCkgeworICAgICAgICByZXR1cm4gSW1tdXRhYmxlTGlzdC5vZihjKTsKKyAgICAgIH0KKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKKyAgICB9IGVsc2UgaWYgKGsucHJvamVjdCA9PSBudWxsICYmIGsuYnJhbmNoID09IG51bGwgJiYgay5jaGFuZ2VJZCAhPSBudWxsKSB7CisgICAgICBDaGFuZ2UuS2V5IGlkID0gbmV3IENoYW5nZS5LZXkoay5jaGFuZ2VJZCk7CisgICAgICBpZiAoaWQuZ2V0KCkubGVuZ3RoKCkgPT0gNDEpIHsKKyAgICAgICAgcmV0dXJuIGRiLmdldCgpLmNoYW5nZXMoKS5ieUtleShpZCkudG9MaXN0KCk7CisgICAgICB9IGVsc2UgeworICAgICAgICByZXR1cm4gZGIuZ2V0KCkuY2hhbmdlcygpLmJ5S2V5UmFuZ2UoaWQsIGlkLm1heCgpKS50b0xpc3QoKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGRiLmdldCgpLmNoYW5nZXMoKS5ieUJyYW5jaEtleSgKKyAgICAgICAgay5icmFuY2goKSwKKyAgICAgICAgbmV3IENoYW5nZS5LZXkoay5jaGFuZ2VJZCkpLnRvTGlzdCgpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgUGFyc2VkSWQgeworICAgIENoYW5nZS5JZCBsZWdhY3lJZDsKKyAgICBTdHJpbmcgcHJvamVjdDsKKyAgICBTdHJpbmcgYnJhbmNoOworICAgIFN0cmluZyBjaGFuZ2VJZDsKKworICAgIFBhcnNlZElkKFN0cmluZyBpZCkgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24geworICAgICAgaWYgKGlkLm1hdGNoZXMoIl5bMS05XVswLTldKiQiKSkgeworICAgICAgICBsZWdhY3lJZCA9IENoYW5nZS5JZC5wYXJzZShpZCk7CisgICAgICAgIHJldHVybjsKKyAgICAgIH0KKworICAgICAgaW50IHQyID0gaWQubGFzdEluZGV4T2YoJ34nKTsKKyAgICAgIGludCB0MSA9IGlkLmxhc3RJbmRleE9mKCd+JywgdDIgLSAxKTsKKyAgICAgIGlmICh0MSA8IDAgfHwgdDIgPCAwKSB7CisgICAgICAgIGlmICghaWQubWF0Y2hlcygiXklbMC05YS16XXs0LDQwfSQiKSkgeworICAgICAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGlkKTsKKyAgICAgICAgfQorICAgICAgICBjaGFuZ2VJZCA9IGlkOworICAgICAgICByZXR1cm47CisgICAgICB9CisKKyAgICAgIHByb2plY3QgPSBVcmwuZGVjb2RlKGlkLnN1YnN0cmluZygwLCB0MSkpOworICAgICAgYnJhbmNoID0gVXJsLmRlY29kZShpZC5zdWJzdHJpbmcodDEgKyAxLCB0MikpOworICAgICAgY2hhbmdlSWQgPSBVcmwuZGVjb2RlKGlkLnN1YnN0cmluZyh0MiArIDEpKTsKKworICAgICAgaWYgKCFicmFuY2guc3RhcnRzV2l0aChDb25zdGFudHMuUl9SRUZTKSkgeworICAgICAgICBicmFuY2ggPSBDb25zdGFudHMuUl9IRUFEUyArIGJyYW5jaDsKKyAgICAgIH0KKyAgICB9CisKKyAgICBCcmFuY2guTmFtZUtleSBicmFuY2goKSB7CisgICAgICByZXR1cm4gbmV3IEJyYW5jaC5OYW1lS2V5KG5ldyBQcm9qZWN0Lk5hbWVLZXkocHJvamVjdCksIGJyYW5jaCk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9DcmVhdGVEcmFmdC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvQ3JlYXRlRHJhZnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zNDhiZTk3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvQ3JlYXRlRHJhZnQuamF2YQpAQCAtMCwwICsxLDY4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaExpbmVDb21tZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaExpbmVDb21tZW50LlN0YXR1czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5QdXREcmFmdC5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKKworY2xhc3MgQ3JlYXRlRHJhZnQgaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxSZXZpc2lvblJlc291cmNlLCBJbnB1dD4geworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYjsKKworICBASW5qZWN0CisgIENyZWF0ZURyYWZ0KFByb3ZpZGVyPFJldmlld0RiPiBkYikgeworICAgIHRoaXMuZGIgPSBkYjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUmVzcG9uc2U8R2V0RHJhZnQuQ29tbWVudD4gYXBwbHkoUmV2aXNpb25SZXNvdXJjZSByc3JjLCBJbnB1dCBpbikKKyAgICAgIHRocm93cyBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLCBPcm1FeGNlcHRpb24geworICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkoaW4ucGF0aCkpIHsKKyAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKCJwYXRoIG11c3QgYmUgbm9uLWVtcHR5Iik7CisgICAgfSBlbHNlIGlmIChpbi5tZXNzYWdlID09IG51bGwgfHwgaW4ubWVzc2FnZS50cmltKCkuaXNFbXB0eSgpKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbigibWVzc2FnZSBtdXN0IGJlIG5vbi1lbXB0eSIpOworICAgIH0gZWxzZSBpZiAoaW4ubGluZSAhPSBudWxsICYmIGluLmxpbmUgPD0gMCkgeworICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oImxpbmUgbXVzdCBiZSA+IDAiKTsKKyAgICB9CisKKyAgICBQYXRjaExpbmVDb21tZW50IGMgPSBuZXcgUGF0Y2hMaW5lQ29tbWVudCgKKyAgICAgICAgbmV3IFBhdGNoTGluZUNvbW1lbnQuS2V5KAorICAgICAgICAgICAgbmV3IFBhdGNoLktleShyc3JjLmdldFBhdGNoU2V0KCkuZ2V0SWQoKSwgaW4ucGF0aCksCisgICAgICAgICAgICBDaGFuZ2VVdGlsLm1lc3NhZ2VVVUlEKGRiLmdldCgpKSksCisgICAgICAgIGluLmxpbmUgIT0gbnVsbCA/IGluLmxpbmUgOiAwLAorICAgICAgICByc3JjLmdldEFjY291bnRJZCgpLAorICAgICAgICBVcmwuZGVjb2RlKGluLmluUmVwbHlUbykpOworICAgIGMuc2V0U3RhdHVzKFN0YXR1cy5EUkFGVCk7CisgICAgYy5zZXRTaWRlKGluLnNpZGUgPT0gR2V0RHJhZnQuU2lkZS5QQVJFTlQgPyAoc2hvcnQpIDAgOiAoc2hvcnQpIDEpOworICAgIGMuc2V0TWVzc2FnZShpbi5tZXNzYWdlLnRyaW0oKSk7CisgICAgZGIuZ2V0KCkucGF0Y2hDb21tZW50cygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24oYykpOworICAgIHJldHVybiBSZXNwb25zZS5jcmVhdGVkKG5ldyBHZXREcmFmdC5Db21tZW50KGMpKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvRGVsZXRlRHJhZnQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0RlbGV0ZURyYWZ0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGQ1ODk4ZQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0RlbGV0ZURyYWZ0LmphdmEKQEAgLTAsMCArMSw0MyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkRlbGV0ZURyYWZ0LklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworCitjbGFzcyBEZWxldGVEcmFmdCBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PERyYWZ0UmVzb3VyY2UsIElucHV0PiB7CisgIHN0YXRpYyBjbGFzcyBJbnB1dCB7CisgIH0KKworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYjsKKworICBASW5qZWN0CisgIERlbGV0ZURyYWZ0KFByb3ZpZGVyPFJldmlld0RiPiBkYikgeworICAgIHRoaXMuZGIgPSBkYjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KERyYWZ0UmVzb3VyY2UgcnNyYywgSW5wdXQgaW5wdXQpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIGRiLmdldCgpLnBhdGNoQ29tbWVudHMoKS5kZWxldGUoQ29sbGVjdGlvbnMuc2luZ2xldG9uKHJzcmMuZ2V0Q29tbWVudCgpKSk7CisgICAgcmV0dXJuIFJlc3BvbnNlLm5vbmUoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvRGVsZXRlUmV2aWV3ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0RlbGV0ZVJldmlld2VyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWJmZmZhYwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0RlbGV0ZVJldmlld2VyLmphdmEKQEAgLTAsMCArMSw4NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlByZWRpY2F0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNwb25zZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5EZWxldGVSZXZpZXdlci5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBEZWxldGVSZXZpZXdlciBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFJldmlld2VyUmVzb3VyY2UsIElucHV0PiB7CisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgSW5wdXQgeworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlcjsKKworICBASW5qZWN0CisgIERlbGV0ZVJldmlld2VyKFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyKSB7CisgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KFJldmlld2VyUmVzb3VyY2UgcnNyYywgSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSByc3JjLmdldENvbnRyb2woKTsKKyAgICBDaGFuZ2UuSWQgY2hhbmdlSWQgPSByc3JjLmdldENoYW5nZSgpLmdldElkKCk7CisgICAgUmV2aWV3RGIgZGIgPSBkYlByb3ZpZGVyLmdldCgpOworICAgIGRiLmNoYW5nZXMoKS5iZWdpblRyYW5zYWN0aW9uKGNoYW5nZUlkKTsKKyAgICB0cnkgeworICAgICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBkZWwgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXBwcm92YWxzKGRiLCByc3JjKSkgeworICAgICAgICBpZiAoY29udHJvbC5jYW5SZW1vdmVSZXZpZXdlcihhKSkgeworICAgICAgICAgIGRlbC5hZGQoYSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oImRlbGV0ZSBub3QgcGVybWl0dGVkIik7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIGlmIChkZWwuaXNFbXB0eSgpKSB7CisgICAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKCk7CisgICAgICB9CisgICAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmRlbGV0ZShkZWwpOworICAgICAgZGIuY29tbWl0KCk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGRiLnJvbGxiYWNrKCk7CisgICAgfQorICAgIHJldHVybiBSZXNwb25zZS5ub25lKCk7CisgIH0KKworICBwcml2YXRlIEl0ZXJhYmxlPFBhdGNoU2V0QXBwcm92YWw+IGFwcHJvdmFscyhSZXZpZXdEYiBkYiwKKyAgICAgIFJldmlld2VyUmVzb3VyY2UgcnNyYykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgZmluYWwgQWNjb3VudC5JZCB1c2VyID0gcnNyYy5nZXRVc2VyKCkuZ2V0QWNjb3VudElkKCk7CisgICAgcmV0dXJuIEl0ZXJhYmxlcy5maWx0ZXIoCisgICAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlDaGFuZ2UocnNyYy5nZXRDaGFuZ2UoKS5nZXRJZCgpKSwKKyAgICAgICAgbmV3IFByZWRpY2F0ZTxQYXRjaFNldEFwcHJvdmFsPigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgYm9vbGVhbiBhcHBseShQYXRjaFNldEFwcHJvdmFsIGlucHV0KSB7CisgICAgICAgICAgICByZXR1cm4gdXNlci5lcXVhbHMoaW5wdXQuZ2V0QWNjb3VudElkKCkpOworICAgICAgICAgIH0KKyAgICAgICAgfSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0RyYWZ0UmVzb3VyY2UuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0RyYWZ0UmVzb3VyY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iY2Q4OTAyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvRHJhZnRSZXNvdXJjZS5qYXZhCkBAIC0wLDAgKzEsNjIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hMaW5lQ29tbWVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuVHlwZUxpdGVyYWw7CisKK3B1YmxpYyBjbGFzcyBEcmFmdFJlc291cmNlIGltcGxlbWVudHMgUmVzdFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxEcmFmdFJlc291cmNlPj4gRFJBRlRfS0lORCA9CisgICAgICBuZXcgVHlwZUxpdGVyYWw8UmVzdFZpZXc8RHJhZnRSZXNvdXJjZT4+KCkge307CisKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpc2lvblJlc291cmNlIHJldjsKKyAgcHJpdmF0ZSBmaW5hbCBQYXRjaExpbmVDb21tZW50IGNvbW1lbnQ7CisKKyAgRHJhZnRSZXNvdXJjZShSZXZpc2lvblJlc291cmNlIHJldiwgUGF0Y2hMaW5lQ29tbWVudCBjKSB7CisgICAgdGhpcy5yZXYgPSByZXY7CisgICAgdGhpcy5jb21tZW50ID0gYzsKKyAgfQorCisgIHB1YmxpYyBDaGFuZ2VDb250cm9sIGdldENvbnRyb2woKSB7CisgICAgcmV0dXJuIHJldi5nZXRDb250cm9sKCk7CisgIH0KKworICBwdWJsaWMgQ2hhbmdlIGdldENoYW5nZSgpIHsKKyAgICByZXR1cm4gZ2V0Q29udHJvbCgpLmdldENoYW5nZSgpOworICB9CisKKyAgcHVibGljIFBhdGNoU2V0IGdldFBhdGNoU2V0KCkgeworICAgIHJldHVybiByZXYuZ2V0UGF0Y2hTZXQoKTsKKyAgfQorCisgIFBhdGNoTGluZUNvbW1lbnQgZ2V0Q29tbWVudCgpIHsKKyAgICByZXR1cm4gY29tbWVudDsKKyAgfQorCisgIFN0cmluZyBnZXRJZCgpIHsKKyAgICByZXR1cm4gY29tbWVudC5nZXRLZXkoKS5nZXQoKTsKKyAgfQorCisgIEFjY291bnQuSWQgZ2V0QXV0aG9ySWQoKSB7CisgICAgcmV0dXJuICgoSWRlbnRpZmllZFVzZXIpIGdldENvbnRyb2woKS5nZXRDdXJyZW50VXNlcigpKS5nZXRBY2NvdW50SWQoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvRHJhZnRzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9EcmFmdHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44MjgyZDdjCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvRHJhZnRzLmphdmEKQEAgLTAsMCArMSw4MCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljTWFwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5DaGlsZENvbGxlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLklkU3RyaW5nOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hMaW5lQ29tbWVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworY2xhc3MgRHJhZnRzIGltcGxlbWVudHMgQ2hpbGRDb2xsZWN0aW9uPFJldmlzaW9uUmVzb3VyY2UsIERyYWZ0UmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBEeW5hbWljTWFwPFJlc3RWaWV3PERyYWZ0UmVzb3VyY2U+PiB2aWV3czsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gdXNlcjsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxMaXN0RHJhZnRzPiBsaXN0OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOworCisgIEBJbmplY3QKKyAgRHJhZnRzKER5bmFtaWNNYXA8UmVzdFZpZXc8RHJhZnRSZXNvdXJjZT4+IHZpZXdzLAorICAgICAgUHJvdmlkZXI8Q3VycmVudFVzZXI+IHVzZXIsCisgICAgICBQcm92aWRlcjxMaXN0RHJhZnRzPiBsaXN0LAorICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXIpIHsKKyAgICB0aGlzLnZpZXdzID0gdmlld3M7CisgICAgdGhpcy51c2VyID0gdXNlcjsKKyAgICB0aGlzLmxpc3QgPSBsaXN0OworICAgIHRoaXMuZGJQcm92aWRlciA9IGRiUHJvdmlkZXI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIER5bmFtaWNNYXA8UmVzdFZpZXc8RHJhZnRSZXNvdXJjZT4+IHZpZXdzKCkgeworICAgIHJldHVybiB2aWV3czsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUmVzdFZpZXc8UmV2aXNpb25SZXNvdXJjZT4gbGlzdCgpIHRocm93cyBBdXRoRXhjZXB0aW9uIHsKKyAgICBjaGVja0lkZW50aWZpZWRVc2VyKCk7CisgICAgcmV0dXJuIGxpc3QuZ2V0KCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIERyYWZ0UmVzb3VyY2UgcGFyc2UoUmV2aXNpb25SZXNvdXJjZSByZXYsIElkU3RyaW5nIGlkKQorICAgICAgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiB7CisgICAgY2hlY2tJZGVudGlmaWVkVXNlcigpOworICAgIFN0cmluZyB1dWlkID0gaWQuZ2V0KCk7CisgICAgZm9yIChQYXRjaExpbmVDb21tZW50IGMgOiBkYlByb3ZpZGVyLmdldCgpLnBhdGNoQ29tbWVudHMoKQorICAgICAgICAuZHJhZnRCeVBhdGNoU2V0QXV0aG9yKAorICAgICAgICAgICAgcmV2LmdldFBhdGNoU2V0KCkuZ2V0SWQoKSwKKyAgICAgICAgICAgIHJldi5nZXRBY2NvdW50SWQoKSkpIHsKKyAgICAgIGlmICh1dWlkLmVxdWFscyhjLmdldEtleSgpLmdldCgpKSkgeworICAgICAgICByZXR1cm4gbmV3IERyYWZ0UmVzb3VyY2UocmV2LCBjKTsKKyAgICAgIH0KKyAgICB9CisgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGNoZWNrSWRlbnRpZmllZFVzZXIoKSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiB7CisgICAgaWYgKCEodXNlci5nZXQoKSBpbnN0YW5jZW9mIElkZW50aWZpZWRVc2VyKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oImRyYWZ0cyBvbmx5IGF2YWlsYWJsZSB0byBhdXRoZW50aWNhdGVkIHVzZXJzIik7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9FbWFpbFJldmlld0NvbW1lbnRzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9FbWFpbFJldmlld0NvbW1lbnRzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTFhOWVkZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0VtYWlsUmV2aWV3Q29tbWVudHMuamF2YQpAQCAtMCwwICsxLDE3MyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5Qb3N0UmV2aWV3Lk5vdGlmeUhhbmRsaW5nOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuV29ya1F1ZXVlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkNvbW1lbnRTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuUmVxdWVzdENvbnRleHQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuVGhyZWFkTG9jYWxSZXF1ZXN0Q29udGV4dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aXNpb25FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CisKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitjbGFzcyBFbWFpbFJldmlld0NvbW1lbnRzIGltcGxlbWVudHMgUnVubmFibGUsIFJlcXVlc3RDb250ZXh0IHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKEVtYWlsUmV2aWV3Q29tbWVudHMuY2xhc3MpOworCisgIGludGVyZmFjZSBGYWN0b3J5IHsKKyAgICBFbWFpbFJldmlld0NvbW1lbnRzIGNyZWF0ZSgKKyAgICAgICAgTm90aWZ5SGFuZGxpbmcgbm90aWZ5LAorICAgICAgICBDaGFuZ2UgY2hhbmdlLAorICAgICAgICBQYXRjaFNldCBwYXRjaFNldCwKKyAgICAgICAgQWNjb3VudC5JZCBhdXRob3JJZCwKKyAgICAgICAgQ2hhbmdlTWVzc2FnZSBtZXNzYWdlLAorICAgICAgICBMaXN0PFBhdGNoTGluZUNvbW1lbnQ+IGNvbW1lbnRzKTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgV29ya1F1ZXVlIHdvcmtRdWV1ZTsKKyAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgQ29tbWVudFNlbmRlci5GYWN0b3J5IGNvbW1lbnRTZW5kZXJGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYUZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgVGhyZWFkTG9jYWxSZXF1ZXN0Q29udGV4dCByZXF1ZXN0Q29udGV4dDsKKworICBwcml2YXRlIGZpbmFsIFBvc3RSZXZpZXcuTm90aWZ5SGFuZGxpbmcgbm90aWZ5OworICBwcml2YXRlIGZpbmFsIENoYW5nZSBjaGFuZ2U7CisgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXQgcGF0Y2hTZXQ7CisgIHByaXZhdGUgZmluYWwgQWNjb3VudC5JZCBhdXRob3JJZDsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VNZXNzYWdlIG1lc3NhZ2U7CisgIHByaXZhdGUgTGlzdDxQYXRjaExpbmVDb21tZW50PiBjb21tZW50czsKKyAgcHJpdmF0ZSBSZXZpZXdEYiBkYjsKKworICBASW5qZWN0CisgIEVtYWlsUmV2aWV3Q29tbWVudHMgKAorICAgICAgV29ya1F1ZXVlIHdvcmtRdWV1ZSwKKyAgICAgIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKKyAgICAgIENvbW1lbnRTZW5kZXIuRmFjdG9yeSBjb21tZW50U2VuZGVyRmFjdG9yeSwKKyAgICAgIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYUZhY3RvcnksCisgICAgICBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IHJlcXVlc3RDb250ZXh0LAorICAgICAgQEFzc2lzdGVkIE5vdGlmeUhhbmRsaW5nIG5vdGlmeSwKKyAgICAgIEBBc3Npc3RlZCBDaGFuZ2UgY2hhbmdlLAorICAgICAgQEFzc2lzdGVkIFBhdGNoU2V0IHBhdGNoU2V0LAorICAgICAgQEFzc2lzdGVkIEFjY291bnQuSWQgYXV0aG9ySWQsCisgICAgICBAQXNzaXN0ZWQgQ2hhbmdlTWVzc2FnZSBtZXNzYWdlLAorICAgICAgQEFzc2lzdGVkIExpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gY29tbWVudHMpIHsKKyAgICB0aGlzLndvcmtRdWV1ZSA9IHdvcmtRdWV1ZTsKKyAgICB0aGlzLnBhdGNoU2V0SW5mb0ZhY3RvcnkgPSBwYXRjaFNldEluZm9GYWN0b3J5OworICAgIHRoaXMuY29tbWVudFNlbmRlckZhY3RvcnkgPSBjb21tZW50U2VuZGVyRmFjdG9yeTsKKyAgICB0aGlzLnNjaGVtYUZhY3RvcnkgPSBzY2hlbWFGYWN0b3J5OworICAgIHRoaXMucmVxdWVzdENvbnRleHQgPSByZXF1ZXN0Q29udGV4dDsKKyAgICB0aGlzLm5vdGlmeSA9IG5vdGlmeTsKKyAgICB0aGlzLmNoYW5nZSA9IGNoYW5nZTsKKyAgICB0aGlzLnBhdGNoU2V0ID0gcGF0Y2hTZXQ7CisgICAgdGhpcy5hdXRob3JJZCA9IGF1dGhvcklkOworICAgIHRoaXMubWVzc2FnZSA9IG1lc3NhZ2U7CisgICAgdGhpcy5jb21tZW50cyA9IGNvbW1lbnRzOworICB9CisKKyAgdm9pZCBzZW5kQXN5bmMoKSB7CisgICAgd29ya1F1ZXVlLmdldERlZmF1bHRRdWV1ZSgpLnN1Ym1pdCh0aGlzKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBydW4oKSB7CisgICAgdHJ5IHsKKyAgICAgIHJlcXVlc3RDb250ZXh0LnNldENvbnRleHQodGhpcyk7CisKKyAgICAgIGNvbW1lbnRzID0gTGlzdHMubmV3QXJyYXlMaXN0KGNvbW1lbnRzKTsKKyAgICAgIENvbGxlY3Rpb25zLnNvcnQoY29tbWVudHMsIG5ldyBDb21wYXJhdG9yPFBhdGNoTGluZUNvbW1lbnQ+KCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIGludCBjb21wYXJlKFBhdGNoTGluZUNvbW1lbnQgYSwgUGF0Y2hMaW5lQ29tbWVudCBiKSB7CisgICAgICAgICAgaW50IGNtcCA9IHBhdGgoYSkuY29tcGFyZVRvKHBhdGgoYikpOworICAgICAgICAgIGlmIChjbXAgIT0gMCkgeworICAgICAgICAgICAgcmV0dXJuIGNtcDsKKyAgICAgICAgICB9CisKKyAgICAgICAgICAvLyAwIGlzIGFuY2VzdG9yLCAxIGlzIHJldmlzaW9uLiBTb3J0IGFuY2VzdG9yIGZpcnN0LgorICAgICAgICAgIGNtcCA9IGEuZ2V0U2lkZSgpIC0gYi5nZXRTaWRlKCk7CisgICAgICAgICAgaWYgKGNtcCAhPSAwKSB7CisgICAgICAgICAgICByZXR1cm4gY21wOworICAgICAgICAgIH0KKworICAgICAgICAgIHJldHVybiBhLmdldExpbmUoKSAtIGIuZ2V0TGluZSgpOworICAgICAgICB9CisKKyAgICAgICAgcHJpdmF0ZSBTdHJpbmcgcGF0aChQYXRjaExpbmVDb21tZW50IGMpIHsKKyAgICAgICAgICByZXR1cm4gYy5nZXRLZXkoKS5nZXRQYXJlbnRLZXkoKS5nZXRGaWxlTmFtZSgpOworICAgICAgICB9CisgICAgICB9KTsKKworICAgICAgQ29tbWVudFNlbmRlciBjbSA9IGNvbW1lbnRTZW5kZXJGYWN0b3J5LmNyZWF0ZShub3RpZnksIGNoYW5nZSk7CisgICAgICBjbS5zZXRGcm9tKGF1dGhvcklkKTsKKyAgICAgIGNtLnNldFBhdGNoU2V0KHBhdGNoU2V0LCBwYXRjaFNldEluZm9GYWN0b3J5LmdldChjaGFuZ2UsIHBhdGNoU2V0KSk7CisgICAgICBjbS5zZXRDaGFuZ2VNZXNzYWdlKG1lc3NhZ2UpOworICAgICAgY20uc2V0UGF0Y2hMaW5lQ29tbWVudHMoY29tbWVudHMpOworICAgICAgY20uc2VuZCgpOworICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBlbWFpbCBjb21tZW50cyBmb3IgIiArIHBhdGNoU2V0LmdldElkKCksIGUpOworICAgIH0gZmluYWxseSB7CisgICAgICByZXF1ZXN0Q29udGV4dC5zZXRDb250ZXh0KG51bGwpOworICAgICAgaWYgKGRiICE9IG51bGwpIHsKKyAgICAgICAgZGIuY2xvc2UoKTsKKyAgICAgICAgZGIgPSBudWxsOworICAgICAgfQorICAgIH0KKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgeworICAgIHJldHVybiAic2VuZC1lbWFpbCBjb21tZW50cyI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIEN1cnJlbnRVc2VyIGdldEN1cnJlbnRVc2VyKCkgeworICAgIHJldHVybiBudWxsOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBQcm92aWRlcjxSZXZpZXdEYj4gZ2V0UmV2aWV3RGJQcm92aWRlcigpIHsKKyAgICByZXR1cm4gbmV3IFByb3ZpZGVyPFJldmlld0RiPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIFJldmlld0RiIGdldCgpIHsKKyAgICAgICAgaWYgKGRiID09IG51bGwpIHsKKyAgICAgICAgICB0cnkgeworICAgICAgICAgICAgZGIgPSBzY2hlbWFGYWN0b3J5Lm9wZW4oKTsKKyAgICAgICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgeworICAgICAgICAgICAgdGhyb3cgbmV3IFByb3Zpc2lvbkV4Y2VwdGlvbigiQ2Fubm90IG9wZW4gUmV2aWV3RGIiLCBlKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGRiOworICAgICAgfQorICAgIH07CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0dldENoYW5nZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvR2V0Q2hhbmdlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGRiNTQ1OQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0dldENoYW5nZS5qYXZhCkBAIC0wLDAgKzEsMzMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworcHVibGljIGNsYXNzIEdldENoYW5nZSBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxDaGFuZ2VSZXNvdXJjZT4geworICBwcml2YXRlIGZpbmFsIENoYW5nZUpzb24ganNvbjsKKworICBASW5qZWN0CisgIEdldENoYW5nZShDaGFuZ2VKc29uIGpzb24pIHsKKyAgICB0aGlzLmpzb24gPSBqc29uOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoQ2hhbmdlUmVzb3VyY2UgcnNyYykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGpzb24uZm9ybWF0KHJzcmMpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9HZXREZXRhaWwuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0dldERldGFpbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFlMGQ5ZTkyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvR2V0RGV0YWlsLmphdmEKQEAgLTAsMCArMSwzNyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitwdWJsaWMgY2xhc3MgR2V0RGV0YWlsIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PENoYW5nZVJlc291cmNlPiB7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlSnNvbiBqc29uOworCisgIEBJbmplY3QKKyAgR2V0RGV0YWlsKENoYW5nZUpzb24ganNvbikgeworICAgIHRoaXMuanNvbiA9IGpzb24KKyAgICAgICAgLmFkZE9wdGlvbihMaXN0Q2hhbmdlc09wdGlvbi5MQUJFTFMpCisgICAgICAgIC5hZGRPcHRpb24oTGlzdENoYW5nZXNPcHRpb24uREVUQUlMRURfTEFCRUxTKQorICAgICAgICAuYWRkT3B0aW9uKExpc3RDaGFuZ2VzT3B0aW9uLkRFVEFJTEVEX0FDQ09VTlRTKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KENoYW5nZVJlc291cmNlIHJzcmMpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHJldHVybiBqc29uLmZvcm1hdChyc3JjKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvR2V0RHJhZnQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0dldERyYWZ0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTk2NjU5ZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0dldERyYWZ0LmphdmEKQEAgLTAsMCArMSw2MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVXJsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaExpbmVDb21tZW50OworCitpbXBvcnQgamF2YS5zcWwuVGltZXN0YW1wOworCitjbGFzcyBHZXREcmFmdCBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxEcmFmdFJlc291cmNlPiB7CisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KERyYWZ0UmVzb3VyY2UgcnNyYykgdGhyb3dzIEF1dGhFeGNlcHRpb24sCisgICAgICBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLCBFeGNlcHRpb24geworICAgIHJldHVybiBuZXcgQ29tbWVudChyc3JjLmdldENvbW1lbnQoKSk7CisgIH0KKworICBzdGF0aWMgZW51bSBTaWRlIHsKKyAgICBQQVJFTlQsIFJFVklTSU9OOworICB9CisKKyAgc3RhdGljIGNsYXNzIENvbW1lbnQgeworICAgIGZpbmFsIFN0cmluZyBraW5kID0gImdlcnJpdGNvZGVyZXZpZXcjY29tbWVudCI7CisgICAgU3RyaW5nIGlkOworICAgIFN0cmluZyBwYXRoOworICAgIFNpZGUgc2lkZTsKKyAgICBJbnRlZ2VyIGxpbmU7CisgICAgU3RyaW5nIGluUmVwbHlUbzsKKyAgICBTdHJpbmcgbWVzc2FnZTsKKyAgICBUaW1lc3RhbXAgdXBkYXRlZDsKKworICAgIENvbW1lbnQoUGF0Y2hMaW5lQ29tbWVudCBjKSB7CisgICAgICBpZCA9IFVybC5lbmNvZGUoYy5nZXRLZXkoKS5nZXQoKSk7CisgICAgICBwYXRoID0gYy5nZXRLZXkoKS5nZXRQYXJlbnRLZXkoKS5nZXRGaWxlTmFtZSgpOworICAgICAgaWYgKGMuZ2V0U2lkZSgpID09IDApIHsKKyAgICAgICAgc2lkZSA9IFNpZGUuUEFSRU5UOworICAgICAgfQorICAgICAgaWYgKGMuZ2V0TGluZSgpID4gMCkgeworICAgICAgICBsaW5lID0gYy5nZXRMaW5lKCk7CisgICAgICB9CisgICAgICBpblJlcGx5VG8gPSBVcmwuZW5jb2RlKGMuZ2V0UGFyZW50VXVpZCgpKTsKKyAgICAgIG1lc3NhZ2UgPSBTdHJpbmdzLmVtcHR5VG9OdWxsKGMuZ2V0TWVzc2FnZSgpKTsKKyAgICAgIHVwZGF0ZWQgPSBjLmdldFdyaXR0ZW5PbigpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvR2V0UmV2aWV3LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9HZXRSZXZpZXcuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45OTdmNWU3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvR2V0UmV2aWV3LmphdmEKQEAgLTAsMCArMSwzNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitwdWJsaWMgY2xhc3MgR2V0UmV2aWV3IGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PFJldmlzaW9uUmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VKc29uIGpzb247CisKKyAgQEluamVjdAorICBHZXRSZXZpZXcoQ2hhbmdlSnNvbiBqc29uKSB7CisgICAgdGhpcy5qc29uID0ganNvbi5hZGRPcHRpb24oTGlzdENoYW5nZXNPcHRpb24uREVUQUlMRURfTEFCRUxTKQorICAgICAgICAuYWRkT3B0aW9uKExpc3RDaGFuZ2VzT3B0aW9uLkRFVEFJTEVEX0FDQ09VTlRTKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KFJldmlzaW9uUmVzb3VyY2UgcmVzb3VyY2UpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHJldHVybiBqc29uLmZvcm1hdChyZXNvdXJjZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0dldFJldmlld2VyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9HZXRSZXZpZXdlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjhjNDFiZTgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9HZXRSZXZpZXdlci5qYXZhCkBAIC0wLDAgKzEsMzMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworcHVibGljIGNsYXNzIEdldFJldmlld2VyIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PFJldmlld2VyUmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdlckpzb24ganNvbjsKKworICBASW5qZWN0CisgIEdldFJldmlld2VyKFJldmlld2VySnNvbiBqc29uKSB7CisgICAgdGhpcy5qc29uID0ganNvbjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KFJldmlld2VyUmVzb3VyY2UgcnNyYykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGpzb24uZm9ybWF0KHJzcmMpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9HZXRUb3BpYy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvR2V0VG9waWMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45NmE1Yzc2Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvR2V0VG9waWMuamF2YQpAQCAtMCwwICsxLDI2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CisKK2NsYXNzIEdldFRvcGljIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PENoYW5nZVJlc291cmNlPiB7CisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KENoYW5nZVJlc291cmNlIHJzcmMpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHJldHVybiBTdHJpbmdzLm51bGxUb0VtcHR5KHJzcmMuZ2V0Q2hhbmdlKCkuZ2V0VG9waWMoKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0xpc3REcmFmdHMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0xpc3REcmFmdHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41NjQzNjNlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvTGlzdERyYWZ0cy5qYXZhCkBAIC0wLDAgKzEsODAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0cy5maXJzdE5vbk51bGw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaExpbmVDb21tZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkdldERyYWZ0LkNvbW1lbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5HZXREcmFmdC5TaWRlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitjbGFzcyBMaXN0RHJhZnRzIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PFJldmlzaW9uUmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGI7CisKKyAgQEluamVjdAorICBMaXN0RHJhZnRzKFByb3ZpZGVyPFJldmlld0RiPiBkYikgeworICAgIHRoaXMuZGIgPSBkYjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KFJldmlzaW9uUmVzb3VyY2UgcnNyYykgdGhyb3dzIEF1dGhFeGNlcHRpb24sCisgICAgICBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLCBFeGNlcHRpb24geworICAgIE1hcDxTdHJpbmcsIExpc3Q8Q29tbWVudD4+IG91dCA9IE1hcHMubmV3VHJlZU1hcCgpOworICAgIGZvciAoUGF0Y2hMaW5lQ29tbWVudCBjIDogZGIuZ2V0KCkucGF0Y2hDb21tZW50cygpCisgICAgICAgIC5kcmFmdEJ5UGF0Y2hTZXRBdXRob3IoCisgICAgICAgICAgICByc3JjLmdldFBhdGNoU2V0KCkuZ2V0SWQoKSwKKyAgICAgICAgICAgIHJzcmMuZ2V0QWNjb3VudElkKCkpKSB7CisgICAgICBDb21tZW50IG8gPSBuZXcgQ29tbWVudChjKTsKKyAgICAgIExpc3Q8Q29tbWVudD4gbGlzdCA9IG91dC5nZXQoby5wYXRoKTsKKyAgICAgIGlmIChsaXN0ID09IG51bGwpIHsKKyAgICAgICAgbGlzdCA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgICAgICBvdXQucHV0KG8ucGF0aCwgbGlzdCk7CisgICAgICB9CisgICAgICBvLnBhdGggPSBudWxsOworICAgICAgbGlzdC5hZGQobyk7CisgICAgfQorICAgIGZvciAoTGlzdDxDb21tZW50PiBsaXN0IDogb3V0LnZhbHVlcygpKSB7CisgICAgICBDb2xsZWN0aW9ucy5zb3J0KGxpc3QsIG5ldyBDb21wYXJhdG9yPENvbW1lbnQ+KCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIGludCBjb21wYXJlKENvbW1lbnQgYSwgQ29tbWVudCBiKSB7CisgICAgICAgICAgaW50IGMgPSBmaXJzdE5vbk51bGwoYS5zaWRlLCBTaWRlLlJFVklTSU9OKS5vcmRpbmFsKCkKKyAgICAgICAgICAgICAgICAtIGZpcnN0Tm9uTnVsbChiLnNpZGUsIFNpZGUuUkVWSVNJT04pLm9yZGluYWwoKTsKKyAgICAgICAgICBpZiAoYyA9PSAwKSB7CisgICAgICAgICAgICBjID0gZmlyc3ROb25OdWxsKGEubGluZSwgMCkgLSBmaXJzdE5vbk51bGwoYi5saW5lLCAwKTsKKyAgICAgICAgICB9CisgICAgICAgICAgaWYgKGMgPT0gMCkgeworICAgICAgICAgICAgYyA9IGEuaWQuY29tcGFyZVRvKGIuaWQpOworICAgICAgICAgIH0KKyAgICAgICAgICByZXR1cm4gYzsKKyAgICAgICAgfQorICAgICAgfSk7CisgICAgfQorICAgIHJldHVybiBvdXQ7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0xpc3RSZXZpZXdlcnMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL0xpc3RSZXZpZXdlcnMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42OGNjMWI0Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvTGlzdFJldmlld2Vycy5qYXZhCkBAIC0wLDAgKzEsNTkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5CYWRSZXF1ZXN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitjbGFzcyBMaXN0UmV2aWV3ZXJzIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PENoYW5nZVJlc291cmNlPiB7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXI7CisgIHByaXZhdGUgZmluYWwgUmV2aWV3ZXJKc29uIGpzb247CisgIHByaXZhdGUgZmluYWwgUmV2aWV3ZXJSZXNvdXJjZS5GYWN0b3J5IHJlc291cmNlRmFjdG9yeTsKKworICBASW5qZWN0CisgIExpc3RSZXZpZXdlcnMoUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXIsCisgICAgICBSZXZpZXdlclJlc291cmNlLkZhY3RvcnkgcmVzb3VyY2VGYWN0b3J5LAorICAgICAgUmV2aWV3ZXJKc29uIGpzb24pIHsKKyAgICB0aGlzLmRiUHJvdmlkZXIgPSBkYlByb3ZpZGVyOworICAgIHRoaXMucmVzb3VyY2VGYWN0b3J5ID0gcmVzb3VyY2VGYWN0b3J5OworICAgIHRoaXMuanNvbiA9IGpzb247CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShDaGFuZ2VSZXNvdXJjZSByc3JjKSB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiwKKyAgICAgIE9ybUV4Y2VwdGlvbiB7CisgICAgTWFwPEFjY291bnQuSWQsIFJldmlld2VyUmVzb3VyY2U+IHJldmlld2VycyA9IE1hcHMubmV3TGlua2VkSGFzaE1hcCgpOworICAgIFJldmlld0RiIGRiID0gZGJQcm92aWRlci5nZXQoKTsKKyAgICBDaGFuZ2UuSWQgY2hhbmdlSWQgPSByc3JjLmdldENoYW5nZSgpLmdldElkKCk7CisgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIHBhdGNoU2V0QXBwcm92YWwKKyAgICAgICAgIDogZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieUNoYW5nZShjaGFuZ2VJZCkpIHsKKyAgICAgIEFjY291bnQuSWQgYWNjb3VudElkID0gcGF0Y2hTZXRBcHByb3ZhbC5nZXRBY2NvdW50SWQoKTsKKyAgICAgIGlmICghcmV2aWV3ZXJzLmNvbnRhaW5zS2V5KGFjY291bnRJZCkpIHsKKyAgICAgICAgcmV2aWV3ZXJzLnB1dChhY2NvdW50SWQsIHJlc291cmNlRmFjdG9yeS5jcmVhdGUocnNyYywgYWNjb3VudElkKSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBqc29uLmZvcm1hdChyZXZpZXdlcnMudmFsdWVzKCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9Nb2R1bGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL01vZHVsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjdlMTc1YTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9Nb2R1bGUuamF2YQpAQCAtMCwwICsxLDg2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkNoYW5nZVJlc291cmNlLkNIQU5HRV9LSU5EOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkRyYWZ0UmVzb3VyY2UuRFJBRlRfS0lORDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5QYXRjaFJlc291cmNlLlBBVENIX0tJTkQ7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuUmV2aWV3ZXJSZXNvdXJjZS5SRVZJRVdFUl9LSU5EOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlJldmlzaW9uUmVzb3VyY2UuUkVWSVNJT05fS0lORDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLkR5bmFtaWNNYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RBcGlNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5SZXZpZXdlZC5EZWxldGVSZXZpZXdlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlJldmlld2VkLlB1dFJldmlld2VkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuRmFjdG9yeU1vZHVsZTsKKworcHVibGljIGNsYXNzIE1vZHVsZSBleHRlbmRzIFJlc3RBcGlNb2R1bGUgeworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgIGJpbmQoUmV2aXNpb25zLmNsYXNzKTsKKyAgICBiaW5kKFJldmlld2Vycy5jbGFzcyk7CisgICAgYmluZChEcmFmdHMuY2xhc3MpOworICAgIGJpbmQoUGF0Y2hlcy5jbGFzcyk7CisKKyAgICBEeW5hbWljTWFwLm1hcE9mKGJpbmRlcigpLCBDSEFOR0VfS0lORCk7CisgICAgRHluYW1pY01hcC5tYXBPZihiaW5kZXIoKSwgRFJBRlRfS0lORCk7CisgICAgRHluYW1pY01hcC5tYXBPZihiaW5kZXIoKSwgUEFUQ0hfS0lORCk7CisgICAgRHluYW1pY01hcC5tYXBPZihiaW5kZXIoKSwgUkVWSUVXRVJfS0lORCk7CisgICAgRHluYW1pY01hcC5tYXBPZihiaW5kZXIoKSwgUkVWSVNJT05fS0lORCk7CisKKyAgICBnZXQoQ0hBTkdFX0tJTkQpLnRvKEdldENoYW5nZS5jbGFzcyk7CisgICAgZ2V0KENIQU5HRV9LSU5ELCAiZGV0YWlsIikudG8oR2V0RGV0YWlsLmNsYXNzKTsKKyAgICBnZXQoQ0hBTkdFX0tJTkQsICJ0b3BpYyIpLnRvKEdldFRvcGljLmNsYXNzKTsKKyAgICBwdXQoQ0hBTkdFX0tJTkQsICJ0b3BpYyIpLnRvKFB1dFRvcGljLmNsYXNzKTsKKyAgICBkZWxldGUoQ0hBTkdFX0tJTkQsICJ0b3BpYyIpLnRvKFB1dFRvcGljLmNsYXNzKTsKKyAgICBwb3N0KENIQU5HRV9LSU5ELCAiYWJhbmRvbiIpLnRvKEFiYW5kb24uY2xhc3MpOworICAgIHBvc3QoQ0hBTkdFX0tJTkQsICJyZXN0b3JlIikudG8oUmVzdG9yZS5jbGFzcyk7CisgICAgcG9zdChDSEFOR0VfS0lORCwgInJldmVydCIpLnRvKFJldmVydC5jbGFzcyk7CisgICAgcG9zdChDSEFOR0VfS0lORCwgInN1Ym1pdCIpLnRvKFN1Ym1pdC5DdXJyZW50UmV2aXNpb24uY2xhc3MpOworCisgICAgcG9zdChDSEFOR0VfS0lORCwgInJldmlld2VycyIpLnRvKFBvc3RSZXZpZXdlcnMuY2xhc3MpOworICAgIGNoaWxkKENIQU5HRV9LSU5ELCAicmV2aWV3ZXJzIikudG8oUmV2aWV3ZXJzLmNsYXNzKTsKKyAgICBnZXQoUkVWSUVXRVJfS0lORCkudG8oR2V0UmV2aWV3ZXIuY2xhc3MpOworICAgIGRlbGV0ZShSRVZJRVdFUl9LSU5EKS50byhEZWxldGVSZXZpZXdlci5jbGFzcyk7CisKKyAgICBjaGlsZChDSEFOR0VfS0lORCwgInJldmlzaW9ucyIpLnRvKFJldmlzaW9ucy5jbGFzcyk7CisgICAgZ2V0KFJFVklTSU9OX0tJTkQsICJyZXZpZXciKS50byhHZXRSZXZpZXcuY2xhc3MpOworICAgIHBvc3QoUkVWSVNJT05fS0lORCwgInJldmlldyIpLnRvKFBvc3RSZXZpZXcuY2xhc3MpOworICAgIHBvc3QoUkVWSVNJT05fS0lORCwgInN1Ym1pdCIpLnRvKFN1Ym1pdC5jbGFzcyk7CisgICAgZ2V0KFJFVklTSU9OX0tJTkQsICJzdWJtaXRfdHlwZSIpLnRvKFRlc3RTdWJtaXRUeXBlLkdldC5jbGFzcyk7CisgICAgcG9zdChSRVZJU0lPTl9LSU5ELCAidGVzdC5zdWJtaXRfcnVsZSIpLnRvKFRlc3RTdWJtaXRSdWxlLmNsYXNzKTsKKyAgICBwb3N0KFJFVklTSU9OX0tJTkQsICJ0ZXN0LnN1Ym1pdF90eXBlIikudG8oVGVzdFN1Ym1pdFR5cGUuY2xhc3MpOworCisgICAgY2hpbGQoUkVWSVNJT05fS0lORCwgImRyYWZ0cyIpLnRvKERyYWZ0cy5jbGFzcyk7CisgICAgcHV0KFJFVklTSU9OX0tJTkQsICJkcmFmdHMiKS50byhDcmVhdGVEcmFmdC5jbGFzcyk7CisgICAgZ2V0KERSQUZUX0tJTkQpLnRvKEdldERyYWZ0LmNsYXNzKTsKKyAgICBwdXQoRFJBRlRfS0lORCkudG8oUHV0RHJhZnQuY2xhc3MpOworICAgIGRlbGV0ZShEUkFGVF9LSU5EKS50byhEZWxldGVEcmFmdC5jbGFzcyk7CisKKyAgICBjaGlsZChSRVZJU0lPTl9LSU5ELCAiZmlsZXMiKS50byhQYXRjaGVzLmNsYXNzKTsKKyAgICBwdXQoUEFUQ0hfS0lORCwgInJldmlld2VkIikudG8oUHV0UmV2aWV3ZWQuY2xhc3MpOworICAgIGRlbGV0ZShQQVRDSF9LSU5ELCAicmV2aWV3ZWQiKS50byhEZWxldGVSZXZpZXdlZC5jbGFzcyk7CisKKyAgICBpbnN0YWxsKG5ldyBGYWN0b3J5TW9kdWxlKCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CisgICAgICAgIGZhY3RvcnkoUmV2aWV3ZXJSZXNvdXJjZS5GYWN0b3J5LmNsYXNzKTsKKyAgICAgICAgZmFjdG9yeShBY2NvdW50SW5mby5Mb2FkZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgICAgIGZhY3RvcnkoRW1haWxSZXZpZXdDb21tZW50cy5GYWN0b3J5LmNsYXNzKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUGF0Y2hSZXNvdXJjZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUGF0Y2hSZXNvdXJjZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQzY2Y1YzYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9QYXRjaFJlc291cmNlLmphdmEKQEAgLTAsMCArMSw0MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuVHlwZUxpdGVyYWw7CisKK3B1YmxpYyBjbGFzcyBQYXRjaFJlc291cmNlIGltcGxlbWVudHMgUmVzdFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxQYXRjaFJlc291cmNlPj4gUEFUQ0hfS0lORCA9CisgICAgICBuZXcgVHlwZUxpdGVyYWw8UmVzdFZpZXc8UGF0Y2hSZXNvdXJjZT4+KCkge307CisKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpc2lvblJlc291cmNlIHJldjsKKyAgcHJpdmF0ZSBmaW5hbCBQYXRjaC5LZXkga2V5OworCisgIFBhdGNoUmVzb3VyY2UoUmV2aXNpb25SZXNvdXJjZSByZXYsIFN0cmluZyBuYW1lKSB7CisgICAgdGhpcy5yZXYgPSByZXY7CisgICAgdGhpcy5rZXkgPSBuZXcgUGF0Y2guS2V5KHJldi5nZXRQYXRjaFNldCgpLmdldElkKCksIG5hbWUpOworICB9CisKKyAgcHVibGljIFBhdGNoLktleSBnZXRQYXRjaEtleSgpIHsKKyAgICByZXR1cm4ga2V5OworICB9CisKKyAgQWNjb3VudC5JZCBnZXRBY2NvdW50SWQoKSB7CisgICAgcmV0dXJuIHJldi5nZXRBY2NvdW50SWQoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUGF0Y2hlcy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUGF0Y2hlcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNiMGE5YmYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9QYXRjaGVzLmphdmEKQEAgLTAsMCArMSw0OSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljTWFwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5DaGlsZENvbGxlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLklkU3RyaW5nOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworY2xhc3MgUGF0Y2hlcyBpbXBsZW1lbnRzIENoaWxkQ29sbGVjdGlvbjxSZXZpc2lvblJlc291cmNlLCBQYXRjaFJlc291cmNlPiB7CisgIHByaXZhdGUgZmluYWwgRHluYW1pY01hcDxSZXN0VmlldzxQYXRjaFJlc291cmNlPj4gdmlld3M7CisKKyAgQEluamVjdAorICBQYXRjaGVzKER5bmFtaWNNYXA8UmVzdFZpZXc8UGF0Y2hSZXNvdXJjZT4+IHZpZXdzKSB7CisgICAgdGhpcy52aWV3cyA9IHZpZXdzOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBEeW5hbWljTWFwPFJlc3RWaWV3PFBhdGNoUmVzb3VyY2U+PiB2aWV3cygpIHsKKyAgICByZXR1cm4gdmlld3M7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFJlc3RWaWV3PFJldmlzaW9uUmVzb3VyY2U+IGxpc3QoKSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiB7CisgICAgdGhyb3cgbmV3IFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uKCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFBhdGNoUmVzb3VyY2UgcGFyc2UoUmV2aXNpb25SZXNvdXJjZSByZXYsIElkU3RyaW5nIGlkKQorICAgICAgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIG5ldyBQYXRjaFJlc291cmNlKHJldiwgaWQuZ2V0KCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9Qb3N0UmV2aWV3LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9Qb3N0UmV2aWV3LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjZiOTM5YgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1Bvc3RSZXZpZXcuamF2YQpAQCAtMCwwICsxLDQ5NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5jb21tb24uYmFzZS5QcmVjb25kaXRpb25zLmNoZWNrTm90TnVsbDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvblJhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5CYWRSZXF1ZXN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5EZWZhdWx0SW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DaGFuZ2VVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlBvc3RSZXZpZXcuSW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CisKK2ltcG9ydCBqYXZhLnNxbC5UaW1lc3RhbXA7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitwdWJsaWMgY2xhc3MgUG9zdFJldmlldyBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFJldmlzaW9uUmVzb3VyY2UsIElucHV0PiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihQb3N0UmV2aWV3LmNsYXNzKTsKKworICBwdWJsaWMgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBARGVmYXVsdElucHV0CisgICAgcHVibGljIFN0cmluZyBtZXNzYWdlOworCisgICAgcHVibGljIE1hcDxTdHJpbmcsIFNob3J0PiBsYWJlbHM7CisgICAgTWFwPFN0cmluZywgTGlzdDxDb21tZW50Pj4gY29tbWVudHM7CisKKyAgICAvKioKKyAgICAgKiBJZiB0cnVlIHJlcXVpcmUgYWxsIGxhYmVscyB0byBiZSB3aXRoaW4gdGhlIHVzZXIncyBwZXJtaXR0ZWQgcmFuZ2VzIGJhc2VkCisgICAgICogb24gYWNjZXNzIGNvbnRyb2xzLCBhdHRlbXB0aW5nIHRvIHVzZSBhIGxhYmVsIG5vdCBncmFudGVkIHRvIHRoZSB1c2VyCisgICAgICogd2lsbCBmYWlsIHRoZSBlbnRpcmUgbW9kaWZ5IG9wZXJhdGlvbiBlYXJseS4gSWYgZmFsc2UgdGhlIG9wZXJhdGlvbiB3aWxsCisgICAgICogZXhlY3V0ZSBhbnl3YXksIGJ1dCB0aGUgcHJvcG9zZWQgbGFiZWxzIGdpdmVuIGJ5IHRoZSB1c2VyIHdpbGwgYmUKKyAgICAgKiBtb2RpZmllZCB0byBiZSB0aGUgImJlc3QiIHZhbHVlIGFsbG93ZWQgYnkgdGhlIGFjY2VzcyBjb250cm9scywgb3IKKyAgICAgKiBpZ25vcmVkIGlmIHRoZSBsYWJlbCBkb2VzIG5vdCBleGlzdC4KKyAgICAgKi8KKyAgICBwdWJsaWMgYm9vbGVhbiBzdHJpY3RMYWJlbHMgPSB0cnVlOworCisgICAgLyoqCisgICAgICogSG93IHRvIHByb2Nlc3MgZHJhZnQgY29tbWVudHMgYWxyZWFkeSBpbiB0aGUgZGF0YWJhc2UgdGhhdCB3ZXJlIG5vdCBhbHNvCisgICAgICogZGVzY3JpYmVkIGluIHRoaXMgaW5wdXQgcmVxdWVzdC4KKyAgICAgKi8KKyAgICBwdWJsaWMgRHJhZnRIYW5kbGluZyBkcmFmdHMgPSBEcmFmdEhhbmRsaW5nLkRFTEVURTsKKworICAgIC8qKiBXaG8gdG8gc2VuZCBlbWFpbCBub3RpZmljYXRpb25zIHRvIGFmdGVyIHJldmlldyBpcyBzdG9yZWQuICovCisgICAgcHVibGljIE5vdGlmeUhhbmRsaW5nIG5vdGlmeSA9IE5vdGlmeUhhbmRsaW5nLkFMTDsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgZW51bSBEcmFmdEhhbmRsaW5nIHsKKyAgICBERUxFVEUsIFBVQkxJU0gsIEtFRVA7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGVudW0gTm90aWZ5SGFuZGxpbmcgeworICAgIE5PTkUsIE9XTkVSLCBPV05FUl9SRVZJRVdFUlMsIEFMTDsKKyAgfQorCisgIHN0YXRpYyBjbGFzcyBDb21tZW50IHsKKyAgICBTdHJpbmcgaWQ7CisgICAgR2V0RHJhZnQuU2lkZSBzaWRlOworICAgIGludCBsaW5lOworICAgIFN0cmluZyBpblJlcGx5VG87CisgICAgU3RyaW5nIG1lc3NhZ2U7CisgIH0KKworICBzdGF0aWMgY2xhc3MgT3V0cHV0IHsKKyAgICBNYXA8U3RyaW5nLCBTaG9ydD4gbGFiZWxzOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKKyAgcHJpdmF0ZSBmaW5hbCBFbWFpbFJldmlld0NvbW1lbnRzLkZhY3RvcnkgZW1haWw7CisgIEBEZXByZWNhdGVkIHByaXZhdGUgZmluYWwgQ2hhbmdlSG9va3MgaG9va3M7CisKKyAgcHJpdmF0ZSBDaGFuZ2UgY2hhbmdlOworICBwcml2YXRlIENoYW5nZU1lc3NhZ2UgbWVzc2FnZTsKKyAgcHJpdmF0ZSBUaW1lc3RhbXAgdGltZXN0YW1wOworICBwcml2YXRlIExpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gY29tbWVudHMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgcHJpdmF0ZSBMaXN0PFN0cmluZz4gbGFiZWxEZWx0YSA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICBwcml2YXRlIE1hcDxTdHJpbmcsIFNob3J0PiBjYXRlZ29yaWVzID0gTWFwcy5uZXdIYXNoTWFwKCk7CisKKyAgQEluamVjdAorICBQb3N0UmV2aWV3KFJldmlld0RiIGRiLAorICAgICAgRW1haWxSZXZpZXdDb21tZW50cy5GYWN0b3J5IGVtYWlsLAorICAgICAgQ2hhbmdlSG9va3MgaG9va3MpIHsKKyAgICB0aGlzLmRiID0gZGI7CisgICAgdGhpcy5lbWFpbCA9IGVtYWlsOworICAgIHRoaXMuaG9va3MgPSBob29rczsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KFJldmlzaW9uUmVzb3VyY2UgcmV2aXNpb24sIElucHV0IGlucHV0KQorICAgICAgdGhyb3dzIEF1dGhFeGNlcHRpb24sIEJhZFJlcXVlc3RFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKGlucHV0LmxhYmVscyAhPSBudWxsKSB7CisgICAgICBjaGVja0xhYmVscyhyZXZpc2lvbiwgaW5wdXQuc3RyaWN0TGFiZWxzLCBpbnB1dC5sYWJlbHMpOworICAgIH0KKyAgICBpZiAoaW5wdXQuY29tbWVudHMgIT0gbnVsbCkgeworICAgICAgY2hlY2tDb21tZW50cyhpbnB1dC5jb21tZW50cyk7CisgICAgfQorICAgIGlmIChpbnB1dC5ub3RpZnkgPT0gbnVsbCkgeworICAgICAgaW5wdXQubm90aWZ5ID0gTm90aWZ5SGFuZGxpbmcuTk9ORTsKKyAgICB9CisKKyAgICBkYi5jaGFuZ2VzKCkuYmVnaW5UcmFuc2FjdGlvbihyZXZpc2lvbi5nZXRDaGFuZ2UoKS5nZXRJZCgpKTsKKyAgICB0cnkgeworICAgICAgY2hhbmdlID0gZGIuY2hhbmdlcygpLmdldChyZXZpc2lvbi5nZXRDaGFuZ2UoKS5nZXRJZCgpKTsKKyAgICAgIENoYW5nZVV0aWwudXBkYXRlZChjaGFuZ2UpOworICAgICAgdGltZXN0YW1wID0gY2hhbmdlLmdldExhc3RVcGRhdGVkT24oKTsKKworICAgICAgYm9vbGVhbiBkaXJ0eSA9IGZhbHNlOworICAgICAgZGlydHkgfD0gaW5zZXJ0Q29tbWVudHMocmV2aXNpb24sIGlucHV0LmNvbW1lbnRzLCBpbnB1dC5kcmFmdHMpOworICAgICAgZGlydHkgfD0gdXBkYXRlTGFiZWxzKHJldmlzaW9uLCBpbnB1dC5sYWJlbHMpOworICAgICAgZGlydHkgfD0gaW5zZXJ0TWVzc2FnZShyZXZpc2lvbiwgaW5wdXQubWVzc2FnZSk7CisgICAgICBpZiAoZGlydHkpIHsKKyAgICAgICAgZGIuY2hhbmdlcygpLnVwZGF0ZShDb2xsZWN0aW9ucy5zaW5nbGV0b24oY2hhbmdlKSk7CisgICAgICAgIGRiLmNvbW1pdCgpOworICAgICAgfQorICAgIH0gZmluYWxseSB7CisgICAgICBkYi5yb2xsYmFjaygpOworICAgIH0KKworICAgIGlmIChpbnB1dC5ub3RpZnkuY29tcGFyZVRvKE5vdGlmeUhhbmRsaW5nLk5PTkUpID4gMCAmJiBtZXNzYWdlICE9IG51bGwpIHsKKyAgICAgIGVtYWlsLmNyZWF0ZSgKKyAgICAgICAgICBpbnB1dC5ub3RpZnksCisgICAgICAgICAgY2hhbmdlLAorICAgICAgICAgIHJldmlzaW9uLmdldFBhdGNoU2V0KCksCisgICAgICAgICAgcmV2aXNpb24uZ2V0QWNjb3VudElkKCksCisgICAgICAgICAgbWVzc2FnZSwKKyAgICAgICAgICBjb21tZW50cykuc2VuZEFzeW5jKCk7CisgICAgICBmaXJlQ29tbWVudEFkZGVkSG9vayhyZXZpc2lvbik7CisgICAgfQorCisgICAgT3V0cHV0IG91dHB1dCA9IG5ldyBPdXRwdXQoKTsKKyAgICBvdXRwdXQubGFiZWxzID0gaW5wdXQubGFiZWxzOworICAgIHJldHVybiBvdXRwdXQ7CisgIH0KKworICBwcml2YXRlIHZvaWQgY2hlY2tMYWJlbHMoUmV2aXNpb25SZXNvdXJjZSByZXZpc2lvbiwgYm9vbGVhbiBzdHJpY3QsCisgICAgICBNYXA8U3RyaW5nLCBTaG9ydD4gbGFiZWxzKSB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiB7CisgICAgQ2hhbmdlQ29udHJvbCBjdGwgPSByZXZpc2lvbi5nZXRDb250cm9sKCk7CisgICAgSXRlcmF0b3I8TWFwLkVudHJ5PFN0cmluZywgU2hvcnQ+PiBpdHIgPSBsYWJlbHMuZW50cnlTZXQoKS5pdGVyYXRvcigpOworICAgIHdoaWxlIChpdHIuaGFzTmV4dCgpKSB7CisgICAgICBNYXAuRW50cnk8U3RyaW5nLCBTaG9ydD4gZW50ID0gaXRyLm5leHQoKTsKKworICAgICAgTGFiZWxUeXBlIGx0ID0gcmV2aXNpb24uZ2V0Q29udHJvbCgpLmdldExhYmVsVHlwZXMoKQorICAgICAgICAgIC5ieUxhYmVsKGVudC5nZXRLZXkoKSk7CisgICAgICBpZiAobHQgPT0gbnVsbCkgeworICAgICAgICBpZiAoc3RyaWN0KSB7CisgICAgICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAgICAgImxhYmVsIFwiJXNcIiBpcyBub3QgYSBjb25maWd1cmVkIGxhYmVsIiwgZW50LmdldEtleSgpKSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgaXRyLnJlbW92ZSgpOworICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICB9CisKKyAgICAgIGlmIChlbnQuZ2V0VmFsdWUoKSA9PSBudWxsIHx8IGVudC5nZXRWYWx1ZSgpID09IDApIHsKKyAgICAgICAgLy8gQWx3YXlzIHBlcm1pdCAwLCBldmVuIGlmIGl0IGlzIG5vdCB3aXRoaW4gcmFuZ2UuCisgICAgICAgIC8vIExhdGVyIG51bGwvMCB3aWxsIGJlIGRlbGV0ZWQgYW5kIHJldm9rZSB0aGUgbGFiZWwuCisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBpZiAobHQuZ2V0VmFsdWUoZW50LmdldFZhbHVlKCkpID09IG51bGwpIHsKKyAgICAgICAgaWYgKHN0cmljdCkgeworICAgICAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAgICJsYWJlbCBcIiVzXCI6ICVkIGlzIG5vdCBhIHZhbGlkIHZhbHVlIiwKKyAgICAgICAgICAgICAgZW50LmdldEtleSgpLCBlbnQuZ2V0VmFsdWUoKSkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIGl0ci5yZW1vdmUoKTsKKyAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgfQorCisgICAgICBTdHJpbmcgbmFtZSA9IGx0LmdldE5hbWUoKTsKKyAgICAgIFBlcm1pc3Npb25SYW5nZSByYW5nZSA9IGN0bC5nZXRSYW5nZShQZXJtaXNzaW9uLmZvckxhYmVsKG5hbWUpKTsKKyAgICAgIGlmIChyYW5nZSA9PSBudWxsIHx8ICFyYW5nZS5jb250YWlucyhlbnQuZ2V0VmFsdWUoKSkpIHsKKyAgICAgICAgaWYgKHN0cmljdCkgeworICAgICAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAgICJBcHBseWluZyBsYWJlbCBcIiVzXCI6ICVkIGlzIHJlc3RyaWN0ZWQiLAorICAgICAgICAgICAgICBlbnQuZ2V0S2V5KCksIGVudC5nZXRWYWx1ZSgpKSk7CisgICAgICAgIH0gZWxzZSBpZiAocmFuZ2UgPT0gbnVsbCB8fCByYW5nZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICBlbnQuc2V0VmFsdWUoKHNob3J0KSAwKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBlbnQuc2V0VmFsdWUoKHNob3J0KSByYW5nZS5zcXVhc2goZW50LmdldFZhbHVlKCkpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBjaGVja0NvbW1lbnRzKE1hcDxTdHJpbmcsIExpc3Q8Q29tbWVudD4+IGluKQorICAgICAgdGhyb3dzIEJhZFJlcXVlc3RFeGNlcHRpb24geworICAgIEl0ZXJhdG9yPE1hcC5FbnRyeTxTdHJpbmcsIExpc3Q8Q29tbWVudD4+PiBtYXBJdHIgPQorICAgICAgICBpbi5lbnRyeVNldCgpLml0ZXJhdG9yKCk7CisgICAgd2hpbGUgKG1hcEl0ci5oYXNOZXh0KCkpIHsKKyAgICAgIE1hcC5FbnRyeTxTdHJpbmcsIExpc3Q8Q29tbWVudD4+IGVudCA9IG1hcEl0ci5uZXh0KCk7CisgICAgICBTdHJpbmcgcGF0aCA9IGVudC5nZXRLZXkoKTsKKyAgICAgIExpc3Q8Q29tbWVudD4gbGlzdCA9IGVudC5nZXRWYWx1ZSgpOworICAgICAgaWYgKGxpc3QgPT0gbnVsbCkgeworICAgICAgICBtYXBJdHIucmVtb3ZlKCk7CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBJdGVyYXRvcjxDb21tZW50PiBsaXN0SXRyID0gbGlzdC5pdGVyYXRvcigpOworICAgICAgd2hpbGUgKGxpc3RJdHIuaGFzTmV4dCgpKSB7CisgICAgICAgIENvbW1lbnQgYyA9IGxpc3RJdHIubmV4dCgpOworICAgICAgICBpZiAoYy5saW5lIDwgMCkgeworICAgICAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAgICJuZWdhdGl2ZSBsaW5lIG51bWJlciAlZCBub3QgYWxsb3dlZCBvbiAlcyIsCisgICAgICAgICAgICAgIGMubGluZSwgcGF0aCkpOworICAgICAgICB9CisgICAgICAgIGMubWVzc2FnZSA9IFN0cmluZ3MuZW1wdHlUb051bGwoYy5tZXNzYWdlKS50cmltKCk7CisgICAgICAgIGlmIChjLm1lc3NhZ2UuaXNFbXB0eSgpKSB7CisgICAgICAgICAgbGlzdEl0ci5yZW1vdmUoKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgaWYgKGxpc3QuaXNFbXB0eSgpKSB7CisgICAgICAgIG1hcEl0ci5yZW1vdmUoKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwcml2YXRlIGJvb2xlYW4gaW5zZXJ0Q29tbWVudHMoUmV2aXNpb25SZXNvdXJjZSByc3JjLAorICAgICAgTWFwPFN0cmluZywgTGlzdDxDb21tZW50Pj4gaW4sIERyYWZ0SGFuZGxpbmcgZHJhZnRzSGFuZGxpbmcpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBpZiAoaW4gPT0gbnVsbCkgeworICAgICAgaW4gPSBDb2xsZWN0aW9ucy5lbXB0eU1hcCgpOworICAgIH0KKworICAgIE1hcDxTdHJpbmcsIFBhdGNoTGluZUNvbW1lbnQ+IGRyYWZ0cyA9IENvbGxlY3Rpb25zLmVtcHR5TWFwKCk7CisgICAgaWYgKCFpbi5pc0VtcHR5KCkgfHwgZHJhZnRzSGFuZGxpbmcgIT0gRHJhZnRIYW5kbGluZy5LRUVQKSB7CisgICAgICBkcmFmdHMgPSBzY2FuRHJhZnRDb21tZW50cyhyc3JjKTsKKyAgICB9CisKKyAgICBMaXN0PFBhdGNoTGluZUNvbW1lbnQ+IGRlbCA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIExpc3Q8UGF0Y2hMaW5lQ29tbWVudD4gaW5zID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgTGlzdDxQYXRjaExpbmVDb21tZW50PiB1cGQgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKworICAgIGZvciAoTWFwLkVudHJ5PFN0cmluZywgTGlzdDxDb21tZW50Pj4gZW50IDogaW4uZW50cnlTZXQoKSkgeworICAgICAgU3RyaW5nIHBhdGggPSBlbnQuZ2V0S2V5KCk7CisgICAgICBmb3IgKENvbW1lbnQgYyA6IGVudC5nZXRWYWx1ZSgpKSB7CisgICAgICAgIFN0cmluZyBwYXJlbnQgPSBVcmwuZGVjb2RlKGMuaW5SZXBseVRvKTsKKyAgICAgICAgUGF0Y2hMaW5lQ29tbWVudCBlID0gZHJhZnRzLnJlbW92ZShVcmwuZGVjb2RlKGMuaWQpKTsKKyAgICAgICAgYm9vbGVhbiBjcmVhdGUgPSBlID09IG51bGw7CisgICAgICAgIGlmIChjcmVhdGUpIHsKKyAgICAgICAgICBlID0gbmV3IFBhdGNoTGluZUNvbW1lbnQoCisgICAgICAgICAgICAgIG5ldyBQYXRjaExpbmVDb21tZW50LktleSgKKyAgICAgICAgICAgICAgICAgIG5ldyBQYXRjaC5LZXkocnNyYy5nZXRQYXRjaFNldCgpLmdldElkKCksIHBhdGgpLAorICAgICAgICAgICAgICAgICAgQ2hhbmdlVXRpbC5tZXNzYWdlVVVJRChkYikpLAorICAgICAgICAgICAgICBjLmxpbmUsCisgICAgICAgICAgICAgIHJzcmMuZ2V0QWNjb3VudElkKCksCisgICAgICAgICAgICAgIHBhcmVudCk7CisgICAgICAgIH0gZWxzZSBpZiAocGFyZW50ICE9IG51bGwpIHsKKyAgICAgICAgICBlLnNldFBhcmVudFV1aWQocGFyZW50KTsKKyAgICAgICAgfQorICAgICAgICBlLnNldFN0YXR1cyhQYXRjaExpbmVDb21tZW50LlN0YXR1cy5QVUJMSVNIRUQpOworICAgICAgICBlLnNldFdyaXR0ZW5Pbih0aW1lc3RhbXApOworICAgICAgICBlLnNldFNpZGUoYy5zaWRlID09IEdldERyYWZ0LlNpZGUuUEFSRU5UID8gKHNob3J0KSAwIDogKHNob3J0KSAxKTsKKyAgICAgICAgZS5zZXRNZXNzYWdlKGMubWVzc2FnZSk7CisgICAgICAgIChjcmVhdGUgPyBpbnMgOiB1cGQpLmFkZChlKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBzd2l0Y2ggKE9iamVjdHMuZmlyc3ROb25OdWxsKGRyYWZ0c0hhbmRsaW5nLCBEcmFmdEhhbmRsaW5nLkRFTEVURSkpIHsKKyAgICAgIGNhc2UgS0VFUDoKKyAgICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgICAgY2FzZSBERUxFVEU6CisgICAgICAgIGRlbC5hZGRBbGwoZHJhZnRzLnZhbHVlcygpKTsKKyAgICAgICAgYnJlYWs7CisgICAgICBjYXNlIFBVQkxJU0g6CisgICAgICAgIGZvciAoUGF0Y2hMaW5lQ29tbWVudCBlIDogZHJhZnRzLnZhbHVlcygpKSB7CisgICAgICAgICAgZS5zZXRTdGF0dXMoUGF0Y2hMaW5lQ29tbWVudC5TdGF0dXMuUFVCTElTSEVEKTsKKyAgICAgICAgICBlLnNldFdyaXR0ZW5Pbih0aW1lc3RhbXApOworICAgICAgICAgIHVwZC5hZGQoZSk7CisgICAgICAgIH0KKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIGRiLnBhdGNoQ29tbWVudHMoKS5kZWxldGUoZGVsKTsKKyAgICBkYi5wYXRjaENvbW1lbnRzKCkuaW5zZXJ0KGlucyk7CisgICAgZGIucGF0Y2hDb21tZW50cygpLnVwZGF0ZSh1cGQpOworICAgIGNvbW1lbnRzLmFkZEFsbChpbnMpOworICAgIGNvbW1lbnRzLmFkZEFsbCh1cGQpOworICAgIHJldHVybiAhZGVsLmlzRW1wdHkoKSB8fCAhaW5zLmlzRW1wdHkoKSB8fCAhdXBkLmlzRW1wdHkoKTsKKyAgfQorCisgIHByaXZhdGUgTWFwPFN0cmluZywgUGF0Y2hMaW5lQ29tbWVudD4gc2NhbkRyYWZ0Q29tbWVudHMoCisgICAgICBSZXZpc2lvblJlc291cmNlIHJzcmMpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIE1hcDxTdHJpbmcsIFBhdGNoTGluZUNvbW1lbnQ+IGRyYWZ0cyA9IE1hcHMubmV3SGFzaE1hcCgpOworICAgIGZvciAoUGF0Y2hMaW5lQ29tbWVudCBjIDogZGIucGF0Y2hDb21tZW50cygpLmRyYWZ0QnlQYXRjaFNldEF1dGhvcigKKyAgICAgICAgICByc3JjLmdldFBhdGNoU2V0KCkuZ2V0SWQoKSwKKyAgICAgICAgICByc3JjLmdldEFjY291bnRJZCgpKSkgeworICAgICAgZHJhZnRzLnB1dChjLmdldEtleSgpLmdldCgpLCBjKTsKKyAgICB9CisgICAgcmV0dXJuIGRyYWZ0czsKKyAgfQorCisgIHByaXZhdGUgYm9vbGVhbiB1cGRhdGVMYWJlbHMoUmV2aXNpb25SZXNvdXJjZSByc3JjLCBNYXA8U3RyaW5nLCBTaG9ydD4gbGFiZWxzKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKGxhYmVscyA9PSBudWxsKSB7CisgICAgICBsYWJlbHMgPSBDb2xsZWN0aW9ucy5lbXB0eU1hcCgpOworICAgIH0KKworICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gZGVsID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBpbnMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgICBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IHVwZCA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIE1hcDxTdHJpbmcsIFBhdGNoU2V0QXBwcm92YWw+IGN1cnJlbnQgPSBzY2FuTGFiZWxzKHJzcmMsIGRlbCk7CisKKyAgICBMYWJlbFR5cGVzIGxhYmVsVHlwZXMgPSByc3JjLmdldENvbnRyb2woKS5nZXRMYWJlbFR5cGVzKCk7CisgICAgZm9yIChNYXAuRW50cnk8U3RyaW5nLCBTaG9ydD4gZW50IDogbGFiZWxzLmVudHJ5U2V0KCkpIHsKKyAgICAgIFN0cmluZyBuYW1lID0gZW50LmdldEtleSgpOworICAgICAgTGFiZWxUeXBlIGx0ID0gY2hlY2tOb3ROdWxsKGxhYmVsVHlwZXMuYnlMYWJlbChuYW1lKSwgbmFtZSk7CisgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpLmlzQ2xvc2VkKCkpIHsKKyAgICAgICAgLy8gVE9ETyBBbGxvdyB1cGRhdGluZyBzb21lIGxhYmVscyBldmVuIHdoZW4gY2xvc2VkLgorICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKworICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBjID0gY3VycmVudC5yZW1vdmUobmFtZSk7CisgICAgICBpZiAoZW50LmdldFZhbHVlKCkgPT0gbnVsbCB8fCBlbnQuZ2V0VmFsdWUoKSA9PSAwKSB7CisgICAgICAgIC8vIFVzZXIgcmVxdWVzdGVkIGRlbGV0ZSBvZiB0aGlzIGxhYmVsLgorICAgICAgICBpZiAoYyAhPSBudWxsKSB7CisgICAgICAgICAgaWYgKGMuZ2V0VmFsdWUoKSAhPSAwKSB7CisgICAgICAgICAgICBsYWJlbERlbHRhLmFkZCgiLSIgKyBuYW1lKTsKKyAgICAgICAgICB9CisgICAgICAgICAgZGVsLmFkZChjKTsKKyAgICAgICAgfQorICAgICAgfSBlbHNlIGlmIChjICE9IG51bGwgJiYgYy5nZXRWYWx1ZSgpICE9IGVudC5nZXRWYWx1ZSgpKSB7CisgICAgICAgIGMuc2V0VmFsdWUoZW50LmdldFZhbHVlKCkpOworICAgICAgICBjLnNldEdyYW50ZWQodGltZXN0YW1wKTsKKyAgICAgICAgYy5jYWNoZShjaGFuZ2UpOworICAgICAgICB1cGQuYWRkKGMpOworICAgICAgICBsYWJlbERlbHRhLmFkZChmb3JtYXQobmFtZSwgYy5nZXRWYWx1ZSgpKSk7CisgICAgICAgIGNhdGVnb3JpZXMucHV0KG5hbWUsIGMuZ2V0VmFsdWUoKSk7CisgICAgICB9IGVsc2UgaWYgKGMgIT0gbnVsbCAmJiBjLmdldFZhbHVlKCkgPT0gZW50LmdldFZhbHVlKCkpIHsKKyAgICAgICAgY3VycmVudC5wdXQobmFtZSwgYyk7CisgICAgICB9IGVsc2UgaWYgKGMgPT0gbnVsbCkgeworICAgICAgICBjID0gbmV3IFBhdGNoU2V0QXBwcm92YWwobmV3IFBhdGNoU2V0QXBwcm92YWwuS2V5KAorICAgICAgICAgICAgICAgIHJzcmMuZ2V0UGF0Y2hTZXQoKS5nZXRJZCgpLAorICAgICAgICAgICAgICAgIHJzcmMuZ2V0QWNjb3VudElkKCksCisgICAgICAgICAgICAgICAgbHQuZ2V0TGFiZWxJZCgpKSwKKyAgICAgICAgICAgIGVudC5nZXRWYWx1ZSgpKTsKKyAgICAgICAgYy5zZXRHcmFudGVkKHRpbWVzdGFtcCk7CisgICAgICAgIGMuY2FjaGUoY2hhbmdlKTsKKyAgICAgICAgaW5zLmFkZChjKTsKKyAgICAgICAgbGFiZWxEZWx0YS5hZGQoZm9ybWF0KG5hbWUsIGMuZ2V0VmFsdWUoKSkpOworICAgICAgICBjYXRlZ29yaWVzLnB1dChuYW1lLCBjLmdldFZhbHVlKCkpOworICAgICAgfQorICAgIH0KKworICAgIGZvcmNlQ2FsbGVyQXNSZXZpZXdlcihyc3JjLCBjdXJyZW50LCBpbnMsIHVwZCwgZGVsKTsKKyAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmRlbGV0ZShkZWwpOworICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuaW5zZXJ0KGlucyk7CisgICAgZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS51cGRhdGUodXBkKTsKKyAgICByZXR1cm4gIWRlbC5pc0VtcHR5KCkgfHwgIWlucy5pc0VtcHR5KCkgfHwgIXVwZC5pc0VtcHR5KCk7CisgIH0KKworICBwcml2YXRlIHZvaWQgZm9yY2VDYWxsZXJBc1Jldmlld2VyKFJldmlzaW9uUmVzb3VyY2UgcnNyYywKKyAgICAgIE1hcDxTdHJpbmcsIFBhdGNoU2V0QXBwcm92YWw+IGN1cnJlbnQsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gaW5zLAorICAgICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiB1cGQsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gZGVsKSB7CisgICAgaWYgKGN1cnJlbnQuaXNFbXB0eSgpICYmIGlucy5pc0VtcHR5KCkgJiYgdXBkLmlzRW1wdHkoKSkgeworICAgICAgLy8gVE9ETyBGaW5kIGFub3RoZXIgd2F5IHRvIGxpbmsgcmV2aWV3ZXJzIHRvIGNoYW5nZXMuCisgICAgICBpZiAoZGVsLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBJZiBubyBleGlzdGluZyBsYWJlbCBpcyBiZWluZyBzZXQgdG8gMCwgaGFjayBpbiB0aGUgY2FsbGVyCisgICAgICAgIC8vIGFzIGEgcmV2aWV3ZXIgYnkgcGlja2luZyB0aGUgZmlyc3Qgc2VydmVyLXdpZGUgTGFiZWxUeXBlLgorICAgICAgICBQYXRjaFNldEFwcHJvdmFsIGMgPSBuZXcgUGF0Y2hTZXRBcHByb3ZhbChuZXcgUGF0Y2hTZXRBcHByb3ZhbC5LZXkoCisgICAgICAgICAgICByc3JjLmdldFBhdGNoU2V0KCkuZ2V0SWQoKSwKKyAgICAgICAgICAgIHJzcmMuZ2V0QWNjb3VudElkKCksCisgICAgICAgICAgICByc3JjLmdldENvbnRyb2woKS5nZXRMYWJlbFR5cGVzKCkuZ2V0TGFiZWxUeXBlcygpLmdldCgwKQorICAgICAgICAgICAgICAgIC5nZXRMYWJlbElkKCkpLAorICAgICAgICAgICAgKHNob3J0KSAwKTsKKyAgICAgICAgYy5zZXRHcmFudGVkKHRpbWVzdGFtcCk7CisgICAgICAgIGMuY2FjaGUoY2hhbmdlKTsKKyAgICAgICAgaW5zLmFkZChjKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIC8vIFBpY2sgYSByYW5kb20gbGFiZWwgdGhhdCBpcyBhYm91dCB0byBiZSBkZWxldGVkIGFuZCBrZWVwIGl0LgorICAgICAgICBJdGVyYXRvcjxQYXRjaFNldEFwcHJvdmFsPiBpID0gZGVsLml0ZXJhdG9yKCk7CisgICAgICAgIFBhdGNoU2V0QXBwcm92YWwgYyA9IGkubmV4dCgpOworICAgICAgICBjLnNldFZhbHVlKChzaG9ydCkgMCk7CisgICAgICAgIGMuc2V0R3JhbnRlZCh0aW1lc3RhbXApOworICAgICAgICBjLmNhY2hlKGNoYW5nZSk7CisgICAgICAgIGkucmVtb3ZlKCk7CisgICAgICAgIHVwZC5hZGQoYyk7CisgICAgICB9CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBQYXRjaFNldEFwcHJvdmFsPiBzY2FuTGFiZWxzKFJldmlzaW9uUmVzb3VyY2UgcnNyYywKKyAgICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gZGVsKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBMYWJlbFR5cGVzIGxhYmVsVHlwZXMgPSByc3JjLmdldENvbnRyb2woKS5nZXRMYWJlbFR5cGVzKCk7CisgICAgTWFwPFN0cmluZywgUGF0Y2hTZXRBcHByb3ZhbD4gY3VycmVudCA9IE1hcHMubmV3SGFzaE1hcCgpOworICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieVBhdGNoU2V0VXNlcigKKyAgICAgICAgICByc3JjLmdldFBhdGNoU2V0KCkuZ2V0SWQoKSwgcnNyYy5nZXRBY2NvdW50SWQoKSkpIHsKKyAgICAgIGlmIChhLmlzU3VibWl0KCkpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisKKyAgICAgIExhYmVsVHlwZSBsdCA9IGxhYmVsVHlwZXMuYnlMYWJlbChhLmdldExhYmVsSWQoKSk7CisgICAgICBpZiAobHQgIT0gbnVsbCkgeworICAgICAgICBjdXJyZW50LnB1dChsdC5nZXROYW1lKCksIGEpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgZGVsLmFkZChhKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGN1cnJlbnQ7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZm9ybWF0KFN0cmluZyBuYW1lLCBzaG9ydCB2YWx1ZSkgeworICAgIFN0cmluZ0J1aWxkZXIgc2IgPSBuZXcgU3RyaW5nQnVpbGRlcihuYW1lLmxlbmd0aCgpICsgMik7CisgICAgc2IuYXBwZW5kKG5hbWUpOworICAgIGlmICh2YWx1ZSA+PSAwKSB7CisgICAgICBzYi5hcHBlbmQoJysnKTsKKyAgICB9CisgICAgc2IuYXBwZW5kKHZhbHVlKTsKKyAgICByZXR1cm4gc2IudG9TdHJpbmcoKTsKKyAgfQorCisgIHByaXZhdGUgYm9vbGVhbiBpbnNlcnRNZXNzYWdlKFJldmlzaW9uUmVzb3VyY2UgcnNyYywgU3RyaW5nIG1zZykKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIG1zZyA9IFN0cmluZ3MubnVsbFRvRW1wdHkobXNnKS50cmltKCk7CisKKyAgICBTdHJpbmdCdWlsZGVyIGJ1ZiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgZm9yIChTdHJpbmcgZCA6IGxhYmVsRGVsdGEpIHsKKyAgICAgIGJ1Zi5hcHBlbmQoIiAiKS5hcHBlbmQoZCk7CisgICAgfQorICAgIGlmIChjb21tZW50cy5zaXplKCkgPT0gMSkgeworICAgICAgYnVmLmFwcGVuZCgiXG5cbigxIGNvbW1lbnQpIik7CisgICAgfSBlbHNlIGlmIChjb21tZW50cy5zaXplKCkgPiAxKSB7CisgICAgICBidWYuYXBwZW5kKFN0cmluZy5mb3JtYXQoIlxuXG4oJWQgY29tbWVudHMpIiwgY29tbWVudHMuc2l6ZSgpKSk7CisgICAgfQorICAgIGlmICghbXNnLmlzRW1wdHkoKSkgeworICAgICAgYnVmLmFwcGVuZCgiXG5cbiIpLmFwcGVuZChtc2cpOworICAgIH0KKyAgICBpZiAoYnVmLmxlbmd0aCgpID09IDApIHsKKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBtZXNzYWdlID0gbmV3IENoYW5nZU1lc3NhZ2UoCisgICAgICAgIG5ldyBDaGFuZ2VNZXNzYWdlLktleShjaGFuZ2UuZ2V0SWQoKSwgQ2hhbmdlVXRpbC5tZXNzYWdlVVVJRChkYikpLAorICAgICAgICByc3JjLmdldEFjY291bnRJZCgpLAorICAgICAgICB0aW1lc3RhbXAsCisgICAgICAgIHJzcmMuZ2V0UGF0Y2hTZXQoKS5nZXRJZCgpKTsKKyAgICBtZXNzYWdlLnNldE1lc3NhZ2UoU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgIlBhdGNoIFNldCAlZDolcyIsCisgICAgICAgIHJzcmMuZ2V0UGF0Y2hTZXQoKS5nZXRQYXRjaFNldElkKCksCisgICAgICAgIGJ1Zi50b1N0cmluZygpKSk7CisgICAgZGIuY2hhbmdlTWVzc2FnZXMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKG1lc3NhZ2UpKTsKKyAgICByZXR1cm4gdHJ1ZTsKKyAgfQorCisgIEBEZXByZWNhdGVkCisgIHByaXZhdGUgdm9pZCBmaXJlQ29tbWVudEFkZGVkSG9vayhSZXZpc2lvblJlc291cmNlIHJzcmMpIHsKKyAgICBJZGVudGlmaWVkVXNlciB1c2VyID0gKElkZW50aWZpZWRVc2VyKSByc3JjLmdldENvbnRyb2woKS5nZXRDdXJyZW50VXNlcigpOworICAgIHRyeSB7CisgICAgICBob29rcy5kb0NvbW1lbnRBZGRlZEhvb2soY2hhbmdlLAorICAgICAgICAgIHVzZXIuZ2V0QWNjb3VudCgpLAorICAgICAgICAgIHJzcmMuZ2V0UGF0Y2hTZXQoKSwKKyAgICAgICAgICBtZXNzYWdlLmdldE1lc3NhZ2UoKSwKKyAgICAgICAgICBjYXRlZ29yaWVzLCBkYik7CisgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKKyAgICAgIGxvZy53YXJuKCJDaGFuZ2VIb29rLmRvQ29tbWVudEFkZGVkSG9vayBkZWxpdmVyeSBmYWlsZWQiLCBlKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1Bvc3RSZXZpZXdlcnMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1Bvc3RSZXZpZXdlcnMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43MGNmMjU5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUG9zdFJldmlld2Vycy5qYXZhCkBAIC0wLDAgKzEsMjkwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZUxpc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JdGVyYWJsZXM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEdyb3VwRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5CYWRSZXF1ZXN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5EZWZhdWx0SW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5VbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWwuTGFiZWxJZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50c0NvbGxlY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBNZW1iZXJzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuUG9zdFJldmlld2Vycy5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlJldmlld2VySnNvbi5Qb3N0UmVzdWx0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuUmV2aWV3ZXJKc29uLlJldmlld2VySW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuR3JvdXBzQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5BZGRSZXZpZXdlclNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaFByb2plY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CisKK2ltcG9ydCBqYXZhLnRleHQuTWVzc2FnZUZvcm1hdDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitwdWJsaWMgY2xhc3MgUG9zdFJldmlld2VycyBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PENoYW5nZVJlc291cmNlLCBJbnB1dD4geworICBwdWJsaWMgZmluYWwgc3RhdGljIGludCBERUZBVUxUX01BWF9SRVZJRVdFUlNfV0lUSE9VVF9DSEVDSyA9IDEwOworICBwdWJsaWMgZmluYWwgc3RhdGljIGludCBERUZBVUxUX01BWF9SRVZJRVdFUlMgPSAyMDsKKworICBwdWJsaWMgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBARGVmYXVsdElucHV0CisgICAgcHVibGljIFN0cmluZyByZXZpZXdlcjsKKyAgICBCb29sZWFuIGNvbmZpcm1lZDsKKworICAgIGJvb2xlYW4gY29uZmlybWVkKCkgeworICAgICAgcmV0dXJuIE9iamVjdHMuZmlyc3ROb25OdWxsKGNvbmZpcm1lZCwgZmFsc2UpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgZmluYWwgQWNjb3VudHNDb2xsZWN0aW9uIGFjY291bnRzOworICBwcml2YXRlIGZpbmFsIFJldmlld2VyUmVzb3VyY2UuRmFjdG9yeSByZXZpZXdlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgQWRkUmV2aWV3ZXJTZW5kZXIuRmFjdG9yeSBhZGRSZXZpZXdlclNlbmRlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8R3JvdXBzQ29sbGVjdGlvbj4gZ3JvdXBzQ29sbGVjdGlvbjsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cE1lbWJlcnMuRmFjdG9yeSBncm91cE1lbWJlcnNGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIEFjY291bnRJbmZvLkxvYWRlci5GYWN0b3J5IGFjY291bnRMb2FkZXJGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYjsKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlcjsKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgQ29uZmlnIGNmZzsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VIb29rcyBob29rczsKKyAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlOworICBwcml2YXRlIGZpbmFsIFJldmlld2VySnNvbiBqc29uOworCisgIEBJbmplY3QKKyAgUG9zdFJldmlld2VycyhBY2NvdW50c0NvbGxlY3Rpb24gYWNjb3VudHMsCisgICAgICBSZXZpZXdlclJlc291cmNlLkZhY3RvcnkgcmV2aWV3ZXJGYWN0b3J5LAorICAgICAgQWRkUmV2aWV3ZXJTZW5kZXIuRmFjdG9yeSBhZGRSZXZpZXdlclNlbmRlckZhY3RvcnksCisgICAgICBQcm92aWRlcjxHcm91cHNDb2xsZWN0aW9uPiBncm91cHNDb2xsZWN0aW9uLAorICAgICAgR3JvdXBNZW1iZXJzLkZhY3RvcnkgZ3JvdXBNZW1iZXJzRmFjdG9yeSwKKyAgICAgIEFjY291bnRJbmZvLkxvYWRlci5GYWN0b3J5IGFjY291bnRMb2FkZXJGYWN0b3J5LAorICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiLAorICAgICAgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXIsCisgICAgICBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3RvcnksCisgICAgICBAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBjZmcsCisgICAgICBDaGFuZ2VIb29rcyBob29rcywKKyAgICAgIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGUsCisgICAgICBSZXZpZXdlckpzb24ganNvbikgeworICAgIHRoaXMuYWNjb3VudHMgPSBhY2NvdW50czsKKyAgICB0aGlzLnJldmlld2VyRmFjdG9yeSA9IHJldmlld2VyRmFjdG9yeTsKKyAgICB0aGlzLmFkZFJldmlld2VyU2VuZGVyRmFjdG9yeSA9IGFkZFJldmlld2VyU2VuZGVyRmFjdG9yeTsKKyAgICB0aGlzLmdyb3Vwc0NvbGxlY3Rpb24gPSBncm91cHNDb2xsZWN0aW9uOworICAgIHRoaXMuZ3JvdXBNZW1iZXJzRmFjdG9yeSA9IGdyb3VwTWVtYmVyc0ZhY3Rvcnk7CisgICAgdGhpcy5hY2NvdW50TG9hZGVyRmFjdG9yeSA9IGFjY291bnRMb2FkZXJGYWN0b3J5OworICAgIHRoaXMuZGIgPSBkYjsKKyAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7CisgICAgdGhpcy5pZGVudGlmaWVkVXNlckZhY3RvcnkgPSBpZGVudGlmaWVkVXNlckZhY3Rvcnk7CisgICAgdGhpcy5jZmcgPSBjZmc7CisgICAgdGhpcy5ob29rcyA9IGhvb2tzOworICAgIHRoaXMuYWNjb3VudENhY2hlID0gYWNjb3VudENhY2hlOworICAgIHRoaXMuanNvbiA9IGpzb247CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFBvc3RSZXN1bHQgYXBwbHkoQ2hhbmdlUmVzb3VyY2UgcnNyYywgSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiwgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiwKKyAgICAgIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwgRW1haWxFeGNlcHRpb24geworICAgIGlmIChpbnB1dC5yZXZpZXdlciA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbigibWlzc2luZyByZXZpZXdlciBmaWVsZCIpOworICAgIH0KKworICAgIHRyeSB7CisgICAgICBBY2NvdW50LklkIGFjY291bnRJZCA9IGFjY291bnRzLnBhcnNlKGlucHV0LnJldmlld2VyKS5nZXRBY2NvdW50SWQoKTsKKyAgICAgIHJldHVybiBwdXRBY2NvdW50KHJldmlld2VyRmFjdG9yeS5jcmVhdGUocnNyYywgYWNjb3VudElkKSk7CisgICAgfSBjYXRjaCAoVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiBlKSB7CisgICAgICB0cnkgeworICAgICAgICByZXR1cm4gcHV0R3JvdXAocnNyYywgaW5wdXQpOworICAgICAgfSBjYXRjaCAoVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiBlMikgeworICAgICAgICB0aHJvdyBuZXcgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbihNZXNzYWdlRm9ybWF0LmZvcm1hdCgKKyAgICAgICAgICAgIENoYW5nZU1lc3NhZ2VzLmdldCgpLnJldmlld2VyTm90Rm91bmQsCisgICAgICAgICAgICBpbnB1dC5yZXZpZXdlcikpOworICAgICAgfQorICAgIH0KKyAgfQorCisgIHByaXZhdGUgUG9zdFJlc3VsdCBwdXRBY2NvdW50KFJldmlld2VyUmVzb3VyY2UgcnNyYykgdGhyb3dzIE9ybUV4Y2VwdGlvbiwKKyAgICAgIEVtYWlsRXhjZXB0aW9uIHsKKyAgICBQb3N0UmVzdWx0IHJlc3VsdCA9IG5ldyBQb3N0UmVzdWx0KCk7CisgICAgYWRkUmV2aWV3ZXJzKHJzcmMsIHJlc3VsdCwgSW1tdXRhYmxlU2V0Lm9mKHJzcmMuZ2V0VXNlcigpKSk7CisgICAgcmV0dXJuIHJlc3VsdDsKKyAgfQorCisgIHByaXZhdGUgUG9zdFJlc3VsdCBwdXRHcm91cChDaGFuZ2VSZXNvdXJjZSByc3JjLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLAorICAgICAgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLCBFbWFpbEV4Y2VwdGlvbiB7CisgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBncm91cCA9IGdyb3Vwc0NvbGxlY3Rpb24uZ2V0KCkucGFyc2VJbnRlcm5hbChpbnB1dC5yZXZpZXdlcik7CisgICAgUG9zdFJlc3VsdCByZXN1bHQgPSBuZXcgUG9zdFJlc3VsdCgpOworICAgIGlmICghaXNMZWdhbFJldmlld2VyR3JvdXAoZ3JvdXAuZ2V0R3JvdXBVVUlEKCkpKSB7CisgICAgICByZXN1bHQuZXJyb3IgPSBNZXNzYWdlRm9ybWF0LmZvcm1hdCgKKyAgICAgICAgICBDaGFuZ2VNZXNzYWdlcy5nZXQoKS5ncm91cElzTm90QWxsb3dlZCwgZ3JvdXAuZ2V0TmFtZSgpKTsKKyAgICAgIHJldHVybiByZXN1bHQ7CisgICAgfQorCisgICAgU2V0PElkZW50aWZpZWRVc2VyPiByZXZpZXdlcnMgPSBTZXRzLm5ld0xpbmtlZEhhc2hTZXQoKTsKKyAgICBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSByc3JjLmdldENvbnRyb2woKTsKKyAgICBTZXQ8QWNjb3VudD4gbWVtYmVyczsKKyAgICB0cnkgeworICAgICAgbWVtYmVycyA9IGdyb3VwTWVtYmVyc0ZhY3RvcnkuY3JlYXRlKGNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKSkubGlzdEFjY291bnRzKAorICAgICAgICAgICAgICBncm91cC5nZXRHcm91cFVVSUQoKSwgY29udHJvbC5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpKTsKKyAgICB9IGNhdGNoIChOb1N1Y2hHcm91cEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgfSBjYXRjaCAoTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgfQorCisgICAgLy8gaWYgbWF4QWxsb3dlZCBpcyBzZXQgdG8gMCwgaXQgaXMgYWxsb3dlZCB0byBhZGQgYW55IG51bWJlciBvZgorICAgIC8vIHJldmlld2VycworICAgIGludCBtYXhBbGxvd2VkID0KKyAgICAgICAgY2ZnLmdldEludCgiYWRkcmV2aWV3ZXIiLCAibWF4QWxsb3dlZCIsIERFRkFVTFRfTUFYX1JFVklFV0VSUyk7CisgICAgaWYgKG1heEFsbG93ZWQgPiAwICYmIG1lbWJlcnMuc2l6ZSgpID4gbWF4QWxsb3dlZCkgeworICAgICAgcmVzdWx0LmVycm9yID0gTWVzc2FnZUZvcm1hdC5mb3JtYXQoCisgICAgICAgICAgQ2hhbmdlTWVzc2FnZXMuZ2V0KCkuZ3JvdXBIYXNUb29NYW55TWVtYmVycywgZ3JvdXAuZ2V0TmFtZSgpKTsKKyAgICAgIHJldHVybiByZXN1bHQ7CisgICAgfQorCisgICAgLy8gaWYgbWF4V2l0aG91dENoZWNrIGlzIHNldCB0byAwLCB3ZSBuZXZlciBhc2sgZm9yIGNvbmZpcm1hdGlvbgorICAgIGludCBtYXhXaXRob3V0Q29uZmlybWF0aW9uID0KKyAgICAgICAgY2ZnLmdldEludCgiYWRkcmV2aWV3ZXIiLCAibWF4V2l0aG91dENvbmZpcm1hdGlvbiIsCisgICAgICAgICAgICBERUZBVUxUX01BWF9SRVZJRVdFUlNfV0lUSE9VVF9DSEVDSyk7CisgICAgaWYgKCFpbnB1dC5jb25maXJtZWQoKSAmJiBtYXhXaXRob3V0Q29uZmlybWF0aW9uID4gMAorICAgICAgICAmJiBtZW1iZXJzLnNpemUoKSA+IG1heFdpdGhvdXRDb25maXJtYXRpb24pIHsKKyAgICAgIHJlc3VsdC5jb25maXJtID0gdHJ1ZTsKKyAgICAgIHJlc3VsdC5lcnJvciA9IE1lc3NhZ2VGb3JtYXQuZm9ybWF0KAorICAgICAgICAgIENoYW5nZU1lc3NhZ2VzLmdldCgpLmdyb3VwTWFueU1lbWJlcnNDb25maXJtYXRpb24sCisgICAgICAgICAgZ3JvdXAuZ2V0TmFtZSgpLCBtZW1iZXJzLnNpemUoKSk7CisgICAgICByZXR1cm4gcmVzdWx0OworICAgIH0KKworICAgIGZvciAoQWNjb3VudCBtZW1iZXIgOiBtZW1iZXJzKSB7CisgICAgICBpZiAobWVtYmVyLmlzQWN0aXZlKCkpIHsKKyAgICAgICAgSWRlbnRpZmllZFVzZXIgdXNlciA9IGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUobWVtYmVyLmdldElkKCkpOworICAgICAgICAvLyBEb2VzIG5vdCBhY2NvdW50IGZvciBkcmFmdCBzdGF0dXMgYXMgYSB1c2VyIG1pZ2h0IHdhbnQgdG8gbGV0IGEKKyAgICAgICAgLy8gcmV2aWV3ZXIgc2VlIGEgZHJhZnQuCisgICAgICAgIGlmIChjb250cm9sLmZvclVzZXIodXNlcikuaXNSZWZWaXNpYmxlKCkpIHsKKyAgICAgICAgICByZXZpZXdlcnMuYWRkKHVzZXIpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorCisgICAgYWRkUmV2aWV3ZXJzKHJzcmMsIHJlc3VsdCwgcmV2aWV3ZXJzKTsKKyAgICByZXR1cm4gcmVzdWx0OworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGFkZFJldmlld2VycyhDaGFuZ2VSZXNvdXJjZSByc3JjLCBQb3N0UmVzdWx0IHJlc3VsdCwKKyAgICAgIFNldDxJZGVudGlmaWVkVXNlcj4gcmV2aWV3ZXJzKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBFbWFpbEV4Y2VwdGlvbiB7CisgICAgaWYgKHJldmlld2Vycy5pc0VtcHR5KCkpIHsKKyAgICAgIHJlc3VsdC5yZXZpZXdlcnMgPSBJbW11dGFibGVMaXN0Lm9mKCk7CisgICAgICByZXR1cm47CisgICAgfQorCisgICAgUGF0Y2hTZXQuSWQgcHNpZCA9IHJzcmMuZ2V0Q2hhbmdlKCkuY3VycmVudFBhdGNoU2V0SWQoKTsKKyAgICBTZXQ8QWNjb3VudC5JZD4gZXhpc3RpbmcgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgcHNhIDogZGIuZ2V0KCkucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieVBhdGNoU2V0KHBzaWQpKSB7CisgICAgICBleGlzdGluZy5hZGQocHNhLmdldEFjY291bnRJZCgpKTsKKyAgICB9CisKKyAgICByZXN1bHQucmV2aWV3ZXJzID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KHJldmlld2Vycy5zaXplKCkpOworICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gdG9JbnNlcnQgPQorICAgICAgICBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkocmV2aWV3ZXJzLnNpemUoKSk7CisgICAgZm9yIChJZGVudGlmaWVkVXNlciB1c2VyIDogcmV2aWV3ZXJzKSB7CisgICAgICBBY2NvdW50LklkIGlkID0gdXNlci5nZXRBY2NvdW50SWQoKTsKKyAgICAgIGlmIChleGlzdGluZy5jb250YWlucyhpZCkpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgICBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSByc3JjLmdldENvbnRyb2woKS5mb3JVc2VyKHVzZXIpOworICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBwc2EgPSBkdW1teUFwcHJvdmFsKGNvbnRyb2wsIHBzaWQsIGlkKTsKKyAgICAgIHJlc3VsdC5yZXZpZXdlcnMuYWRkKGpzb24uZm9ybWF0KAorICAgICAgICAgIG5ldyBSZXZpZXdlckluZm8oaWQpLCBjb250cm9sLCBJbW11dGFibGVMaXN0Lm9mKHBzYSkpKTsKKyAgICAgIHRvSW5zZXJ0LmFkZChwc2EpOworICAgIH0KKyAgICBkYi5nZXQoKS5wYXRjaFNldEFwcHJvdmFscygpLmluc2VydCh0b0luc2VydCk7CisgICAgYWNjb3VudExvYWRlckZhY3RvcnkuY3JlYXRlKHRydWUpLmZpbGwocmVzdWx0LnJldmlld2Vycyk7CisgICAgcG9zdEFkZChyc3JjLmdldENoYW5nZSgpLCByZXN1bHQpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHBvc3RBZGQoQ2hhbmdlIGNoYW5nZSwgUG9zdFJlc3VsdCByZXN1bHQpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uLCBFbWFpbEV4Y2VwdGlvbiB7CisgICAgaWYgKHJlc3VsdC5yZXZpZXdlcnMuaXNFbXB0eSgpKSB7CisgICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gRXhlY3V0ZSBob29rIGZvciBhZGRlZCByZXZpZXdlcnMKKyAgICAvLworICAgIFBhdGNoU2V0IHBhdGNoU2V0ID0gZGIuZ2V0KCkucGF0Y2hTZXRzKCkuZ2V0KGNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpKTsKKyAgICBmb3IgKEFjY291bnRJbmZvIGluZm8gOiByZXN1bHQucmV2aWV3ZXJzKSB7CisgICAgICBBY2NvdW50IGFjY291bnQgPSBhY2NvdW50Q2FjaGUuZ2V0KGluZm8uX2lkKS5nZXRBY2NvdW50KCk7CisgICAgICBob29rcy5kb1Jldmlld2VyQWRkZWRIb29rKGNoYW5nZSwgYWNjb3VudCwgcGF0Y2hTZXQsIGRiLmdldCgpKTsKKyAgICB9CisKKyAgICAvLyBFbWFpbCB0aGUgcmV2aWV3ZXJzCisgICAgLy8KKyAgICAvLyBUaGUgdXNlciBrbm93cyB0aGV5IGFkZGVkIHRoZW1zZWx2ZXMsIGRvbid0IGJvdGhlciBlbWFpbGluZyB0aGVtLgorICAgIExpc3Q8QWNjb3VudC5JZD4gYWRkZWQgPQorICAgICAgICBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkocmVzdWx0LnJldmlld2Vycy5zaXplKCkpOworICAgIGZvciAoQWNjb3VudEluZm8gaW5mbyA6IHJlc3VsdC5yZXZpZXdlcnMpIHsKKyAgICAgIGlmICghaW5mby5faWQuZXF1YWxzKGN1cnJlbnRVc2VyLmdldEFjY291bnRJZCgpKSkgeworICAgICAgICBhZGRlZC5hZGQoaW5mby5faWQpOworICAgICAgfQorICAgIH0KKyAgICBpZiAoIWFkZGVkLmlzRW1wdHkoKSkgeworICAgICAgQWRkUmV2aWV3ZXJTZW5kZXIgY207CisKKyAgICAgIGNtID0gYWRkUmV2aWV3ZXJTZW5kZXJGYWN0b3J5LmNyZWF0ZShjaGFuZ2UpOworICAgICAgY20uc2V0RnJvbShjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKSk7CisgICAgICBjbS5hZGRSZXZpZXdlcnMoYWRkZWQpOworICAgICAgY20uc2VuZCgpOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc0xlZ2FsUmV2aWV3ZXJHcm91cChBY2NvdW50R3JvdXAuVVVJRCBncm91cFVVSUQpIHsKKyAgICByZXR1cm4gIShBY2NvdW50R3JvdXAuQU5PTllNT1VTX1VTRVJTLmVxdWFscyhncm91cFVVSUQpCisgICAgICAgICAgICAgfHwgQWNjb3VudEdyb3VwLlJFR0lTVEVSRURfVVNFUlMuZXF1YWxzKGdyb3VwVVVJRCkpOworICB9CisKKyAgcHJpdmF0ZSBQYXRjaFNldEFwcHJvdmFsIGR1bW15QXBwcm92YWwoQ2hhbmdlQ29udHJvbCBjdGwsCisgICAgICBQYXRjaFNldC5JZCBwYXRjaFNldElkLCBBY2NvdW50LklkIHJldmlld2VySWQpIHsKKyAgICBMYWJlbElkIGlkID0KKyAgICAgICAgSXRlcmFibGVzLmdldExhc3QoY3RsLmdldExhYmVsVHlwZXMoKS5nZXRMYWJlbFR5cGVzKCkpLmdldExhYmVsSWQoKTsKKyAgICBQYXRjaFNldEFwcHJvdmFsIGR1bW15QXBwcm92YWwgPSBuZXcgUGF0Y2hTZXRBcHByb3ZhbCgKKyAgICAgICAgbmV3IFBhdGNoU2V0QXBwcm92YWwuS2V5KHBhdGNoU2V0SWQsIHJldmlld2VySWQsIGlkKSwgKHNob3J0KSAwKTsKKyAgICBkdW1teUFwcHJvdmFsLmNhY2hlKGN0bC5nZXRDaGFuZ2UoKSk7CisgICAgcmV0dXJuIGR1bW15QXBwcm92YWw7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1B1dERyYWZ0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9QdXREcmFmdC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQ1ZWFhOWIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9QdXREcmFmdC5qYXZhCkBAIC0wLDAgKzEsMTA1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5CYWRSZXF1ZXN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5EZWZhdWx0SW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaExpbmVDb21tZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkdldERyYWZ0LlNpZGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5QdXREcmFmdC5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CisKK2NsYXNzIFB1dERyYWZ0IGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8RHJhZnRSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBTdHJpbmcga2luZDsKKyAgICBTdHJpbmcgaWQ7CisgICAgU3RyaW5nIHBhdGg7CisgICAgU2lkZSBzaWRlOworICAgIEludGVnZXIgbGluZTsKKyAgICBTdHJpbmcgaW5SZXBseVRvOworICAgIFRpbWVzdGFtcCB1cGRhdGVkOyAvLyBBY2NlcHRlZCBidXQgaWdub3JlZC4KKworICAgIEBEZWZhdWx0SW5wdXQKKyAgICBTdHJpbmcgbWVzc2FnZTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmV2aWV3RGI+IGRiOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPERlbGV0ZURyYWZ0PiBkZWxldGU7CisKKyAgQEluamVjdAorICBQdXREcmFmdChQcm92aWRlcjxSZXZpZXdEYj4gZGIsIFByb3ZpZGVyPERlbGV0ZURyYWZ0PiBkZWxldGUpIHsKKyAgICB0aGlzLmRiID0gZGI7CisgICAgdGhpcy5kZWxldGUgPSBkZWxldGU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShEcmFmdFJlc291cmNlIHJzcmMsIElucHV0IGluKSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwKKyAgICAgIEJhZFJlcXVlc3RFeGNlcHRpb24sIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgUGF0Y2hMaW5lQ29tbWVudCBjID0gcnNyYy5nZXRDb21tZW50KCk7CisgICAgaWYgKGluID09IG51bGwgfHwgaW4ubWVzc2FnZSA9PSBudWxsIHx8IGluLm1lc3NhZ2UudHJpbSgpLmlzRW1wdHkoKSkgeworICAgICAgcmV0dXJuIGRlbGV0ZS5nZXQoKS5hcHBseShyc3JjLCBudWxsKTsKKyAgICB9IGVsc2UgaWYgKGluLmtpbmQgIT0gbnVsbCAmJiAhImdlcnJpdGNvZGVyZXZpZXcjY29tbWVudCIuZXF1YWxzKGluLmtpbmQpKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbigiZXhwZWN0ZWQga2luZCBnZXJyaXRjb2RlcmV2aWV3I2NvbW1lbnQiKTsKKyAgICB9IGVsc2UgaWYgKGluLmlkICE9IG51bGwgJiYgIXJzcmMuZ2V0SWQoKS5lcXVhbHMoaW4uaWQpKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbigiaWQgbXVzdCBtYXRjaCBVUkwiKTsKKyAgICB9IGVsc2UgaWYgKGluLmxpbmUgIT0gbnVsbCAmJiBpbi5saW5lIDwgMCkgeworICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oImxpbmUgbXVzdCBiZSA+PSAwIik7CisgICAgfQorCisgICAgaWYgKGluLnBhdGggIT0gbnVsbAorICAgICAgICAmJiAhaW4ucGF0aC5lcXVhbHMoYy5nZXRLZXkoKS5nZXRQYXJlbnRLZXkoKS5nZXRGaWxlTmFtZSgpKSkgeworICAgICAgLy8gVXBkYXRpbmcgdGhlIHBhdGggYWx0ZXJzIHRoZSBwcmltYXJ5IGtleSwgd2hpY2ggaXNuJ3QgcG9zc2libGUuCisgICAgICAvLyBEZWxldGUgdGhlbiByZWNyZWF0ZSB0aGUgY29tbWVudCBpbnN0ZWFkIG9mIGFuIHVwZGF0ZS4KKyAgICAgIGRiLmdldCgpLnBhdGNoQ29tbWVudHMoKS5kZWxldGUoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGMpKTsKKyAgICAgIGMgPSBuZXcgUGF0Y2hMaW5lQ29tbWVudCgKKyAgICAgICAgICBuZXcgUGF0Y2hMaW5lQ29tbWVudC5LZXkoCisgICAgICAgICAgICAgIG5ldyBQYXRjaC5LZXkocnNyYy5nZXRQYXRjaFNldCgpLmdldElkKCksIGluLnBhdGgpLAorICAgICAgICAgICAgICBjLmdldEtleSgpLmdldCgpKSwKKyAgICAgICAgICBjLmdldExpbmUoKSwKKyAgICAgICAgICByc3JjLmdldEF1dGhvcklkKCksCisgICAgICAgICAgYy5nZXRQYXJlbnRVdWlkKCkpOworICAgICAgZGIuZ2V0KCkucGF0Y2hDb21tZW50cygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24odXBkYXRlKGMsIGluKSkpOworICAgIH0gZWxzZSB7CisgICAgICBkYi5nZXQoKS5wYXRjaENvbW1lbnRzKCkudXBkYXRlKENvbGxlY3Rpb25zLnNpbmdsZXRvbih1cGRhdGUoYywgaW4pKSk7CisgICAgfQorICAgIHJldHVybiBuZXcgR2V0RHJhZnQuQ29tbWVudChjKTsKKyAgfQorCisgIHByaXZhdGUgUGF0Y2hMaW5lQ29tbWVudCB1cGRhdGUoUGF0Y2hMaW5lQ29tbWVudCBlLCBJbnB1dCBpbikgeworICAgIGlmIChpbi5zaWRlICE9IG51bGwpIHsKKyAgICAgIGUuc2V0U2lkZShpbi5zaWRlID09IEdldERyYWZ0LlNpZGUuUEFSRU5UID8gKHNob3J0KSAwIDogKHNob3J0KSAxKTsKKyAgICB9CisgICAgaWYgKGluLmxpbmUgIT0gbnVsbCkgeworICAgICAgZS5zZXRMaW5lKGluLmxpbmUpOworICAgIH0KKyAgICBpZiAoaW4uaW5SZXBseVRvICE9IG51bGwpIHsKKyAgICAgIGUuc2V0UGFyZW50VXVpZChVcmwuZGVjb2RlKGluLmluUmVwbHlUbykpOworICAgIH0KKyAgICBlLnNldE1lc3NhZ2UoaW4ubWVzc2FnZS50cmltKCkpOworICAgIGUudXBkYXRlZCgpOworICAgIHJldHVybiBlOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9QdXRUb3BpYy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUHV0VG9waWMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iOTZiNDgwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUHV0VG9waWMuamF2YQpAQCAtMCwwICsxLDEwNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkRlZmF1bHRJbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DaGFuZ2VVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlB1dFRvcGljLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLkF0b21pY1VwZGF0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CisKK2NsYXNzIFB1dFRvcGljIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8Q2hhbmdlUmVzb3VyY2UsIElucHV0PiB7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXI7CisKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBARGVmYXVsdElucHV0CisgICAgU3RyaW5nIHRvcGljOworICAgIFN0cmluZyBtZXNzYWdlOworICB9CisKKyAgQEluamVjdAorICBQdXRUb3BpYyhQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlcikgeworICAgIHRoaXMuZGJQcm92aWRlciA9IGRiUHJvdmlkZXI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShDaGFuZ2VSZXNvdXJjZSByZXEsIElucHV0IGlucHV0KQorICAgICAgdGhyb3dzIEJhZFJlcXVlc3RFeGNlcHRpb24sIEF1dGhFeGNlcHRpb24sCisgICAgICBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLCBFeGNlcHRpb24geworICAgIGlmIChpbnB1dCA9PSBudWxsKSB7CisgICAgICBpbnB1dCA9IG5ldyBJbnB1dCgpOworICAgIH0KKworICAgIENoYW5nZUNvbnRyb2wgY29udHJvbCA9IHJlcS5nZXRDb250cm9sKCk7CisgICAgQ2hhbmdlIGNoYW5nZSA9IHJlcS5nZXRDaGFuZ2UoKTsKKyAgICBpZiAoIWNvbnRyb2wuY2FuRWRpdFRvcGljTmFtZSgpKSB7CisgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbigiY2hhbmdpbmcgdG9waWMgbm90IHBlcm1pdHRlZCIpOworICAgIH0KKworICAgIFJldmlld0RiIGRiID0gZGJQcm92aWRlci5nZXQoKTsKKyAgICBmaW5hbCBTdHJpbmcgbmV3VG9waWNOYW1lID0gU3RyaW5ncy5udWxsVG9FbXB0eShpbnB1dC50b3BpYyk7CisgICAgU3RyaW5nIG9sZFRvcGljTmFtZSA9IFN0cmluZ3MubnVsbFRvRW1wdHkoY2hhbmdlLmdldFRvcGljKCkpOworICAgIGlmICghb2xkVG9waWNOYW1lLmVxdWFscyhuZXdUb3BpY05hbWUpKSB7CisgICAgICBTdHJpbmcgc3VtbWFyeTsKKyAgICAgIGlmIChvbGRUb3BpY05hbWUuaXNFbXB0eSgpKSB7CisgICAgICAgIHN1bW1hcnkgPSAiVG9waWMgc2V0IHRvIFwiIiArIG5ld1RvcGljTmFtZSArICJcIi4iOworICAgICAgfSBlbHNlIGlmIChuZXdUb3BpY05hbWUuaXNFbXB0eSgpKSB7CisgICAgICAgIHN1bW1hcnkgPSAiVG9waWMgXCIiICsgb2xkVG9waWNOYW1lICsgIlwiIHJlbW92ZWQuIjsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHN1bW1hcnkgPSBTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgIlRvcGljIHVwZGF0ZWQgZnJvbSBcIiVzXCIgdG8gXCIlc1wiLiIsCisgICAgICAgICAgICBvbGRUb3BpY05hbWUsIG5ld1RvcGljTmFtZSk7CisgICAgICB9CisKKyAgICAgIENoYW5nZU1lc3NhZ2UgY21zZyA9IG5ldyBDaGFuZ2VNZXNzYWdlKAorICAgICAgICAgIG5ldyBDaGFuZ2VNZXNzYWdlLktleShjaGFuZ2UuZ2V0SWQoKSwgQ2hhbmdlVXRpbC5tZXNzYWdlVVVJRChkYikpLAorICAgICAgICAgICgoSWRlbnRpZmllZFVzZXIpIGNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKSkuZ2V0QWNjb3VudElkKCksCisgICAgICAgICAgY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpOworICAgICAgU3RyaW5nQnVpbGRlciBtc2dCdWYgPSBuZXcgU3RyaW5nQnVpbGRlcihzdW1tYXJ5KTsKKyAgICAgIGlmICghU3RyaW5ncy5pc051bGxPckVtcHR5KGlucHV0Lm1lc3NhZ2UpKSB7CisgICAgICAgIG1zZ0J1Zi5hcHBlbmQoIlxuXG4iKTsKKyAgICAgICAgbXNnQnVmLmFwcGVuZChpbnB1dC5tZXNzYWdlKTsKKyAgICAgIH0KKyAgICAgIGNtc2cuc2V0TWVzc2FnZShtc2dCdWYudG9TdHJpbmcoKSk7CisKKyAgICAgIGRiLmNoYW5nZXMoKS5hdG9taWNVcGRhdGUoY2hhbmdlLmdldElkKCksCisgICAgICAgIG5ldyBBdG9taWNVcGRhdGU8Q2hhbmdlPigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgQ2hhbmdlIHVwZGF0ZShDaGFuZ2UgY2hhbmdlKSB7CisgICAgICAgICAgICBjaGFuZ2Uuc2V0VG9waWMoU3RyaW5ncy5lbXB0eVRvTnVsbChuZXdUb3BpY05hbWUpKTsKKyAgICAgICAgICAgIHJldHVybiBjaGFuZ2U7CisgICAgICAgICAgfQorICAgICAgICB9KTsKKyAgICAgIGRiLmNoYW5nZU1lc3NhZ2VzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihjbXNnKSk7CisgICAgfQorICAgIHJldHVybiBTdHJpbmdzLmlzTnVsbE9yRW1wdHkobmV3VG9waWNOYW1lKQorICAgICAgICA/IFJlc3BvbnNlLm5vbmUoKQorICAgICAgICA6IG5ld1RvcGljTmFtZTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmVzdG9yZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmVzdG9yZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFmYjU4ZjkKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9SZXN0b3JlLmphdmEKQEAgLTAsMCArMSwxNDcgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5DaGFuZ2VIb29rczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuRGVmYXVsdElucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2UuU3RhdHVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2VNZXNzYWdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQXBwcm92YWxzVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ2hhbmdlVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5SZXN0b3JlLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJlcGx5VG9DaGFuZ2VTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmVzdG9yZWRTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuQXRvbWljVXBkYXRlOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKKworcHVibGljIGNsYXNzIFJlc3RvcmUgaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxDaGFuZ2VSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKFJlc3RvcmUuY2xhc3MpOworCisgIHByaXZhdGUgZmluYWwgQ2hhbmdlSG9va3MgaG9va3M7CisgIHByaXZhdGUgZmluYWwgUmVzdG9yZWRTZW5kZXIuRmFjdG9yeSByZXN0b3JlZFNlbmRlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXI7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlSnNvbiBqc29uOworCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIEBEZWZhdWx0SW5wdXQKKyAgICBwdWJsaWMgU3RyaW5nIG1lc3NhZ2U7CisgIH0KKworICBASW5qZWN0CisgIFJlc3RvcmUoQ2hhbmdlSG9va3MgaG9va3MsCisgICAgICBSZXN0b3JlZFNlbmRlci5GYWN0b3J5IHJlc3RvcmVkU2VuZGVyRmFjdG9yeSwKKyAgICAgIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyLAorICAgICAgQ2hhbmdlSnNvbiBqc29uKSB7CisgICAgdGhpcy5ob29rcyA9IGhvb2tzOworICAgIHRoaXMucmVzdG9yZWRTZW5kZXJGYWN0b3J5ID0gcmVzdG9yZWRTZW5kZXJGYWN0b3J5OworICAgIHRoaXMuZGJQcm92aWRlciA9IGRiUHJvdmlkZXI7CisgICAgdGhpcy5qc29uID0ganNvbjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KENoYW5nZVJlc291cmNlIHJlcSwgSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSByZXEuZ2V0Q29udHJvbCgpOworICAgIElkZW50aWZpZWRVc2VyIGNhbGxlciA9IChJZGVudGlmaWVkVXNlcikgY29udHJvbC5nZXRDdXJyZW50VXNlcigpOworICAgIENoYW5nZSBjaGFuZ2UgPSByZXEuZ2V0Q2hhbmdlKCk7CisgICAgaWYgKCFjb250cm9sLmNhblJlc3RvcmUoKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oInJlc3RvcmUgbm90IHBlcm1pdHRlZCIpOworICAgIH0gZWxzZSBpZiAoY2hhbmdlLmdldFN0YXR1cygpICE9IFN0YXR1cy5BQkFORE9ORUQpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uKCJjaGFuZ2UgaXMgIiArIHN0YXR1cyhjaGFuZ2UpKTsKKyAgICB9CisKKyAgICBDaGFuZ2VNZXNzYWdlIG1lc3NhZ2U7CisgICAgUmV2aWV3RGIgZGIgPSBkYlByb3ZpZGVyLmdldCgpOworICAgIGRiLmNoYW5nZXMoKS5iZWdpblRyYW5zYWN0aW9uKGNoYW5nZS5nZXRJZCgpKTsKKyAgICB0cnkgeworICAgICAgY2hhbmdlID0gZGIuY2hhbmdlcygpLmF0b21pY1VwZGF0ZSgKKyAgICAgICAgY2hhbmdlLmdldElkKCksCisgICAgICAgIG5ldyBBdG9taWNVcGRhdGU8Q2hhbmdlPigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgQ2hhbmdlIHVwZGF0ZShDaGFuZ2UgY2hhbmdlKSB7CisgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpID09IENoYW5nZS5TdGF0dXMuQUJBTkRPTkVEKSB7CisgICAgICAgICAgICAgIGNoYW5nZS5zZXRTdGF0dXMoQ2hhbmdlLlN0YXR1cy5ORVcpOworICAgICAgICAgICAgICBDaGFuZ2VVdGlsLnVwZGF0ZWQoY2hhbmdlKTsKKyAgICAgICAgICAgICAgcmV0dXJuIGNoYW5nZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICAgIH0KKyAgICAgICAgfSk7CisgICAgICBpZiAoY2hhbmdlID09IG51bGwpIHsKKyAgICAgICAgdGhyb3cgbmV3IFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oImNoYW5nZSBpcyAiCisgICAgICAgICAgICArIHN0YXR1cyhkYi5jaGFuZ2VzKCkuZ2V0KHJlcS5nZXRDaGFuZ2UoKS5nZXRJZCgpKSkpOworICAgICAgfQorICAgICAgbWVzc2FnZSA9IG5ld01lc3NhZ2UoaW5wdXQsIGNhbGxlciwgY2hhbmdlKTsKKyAgICAgIGRiLmNoYW5nZU1lc3NhZ2VzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihtZXNzYWdlKSk7CisgICAgICBuZXcgQXBwcm92YWxzVXRpbChkYikuc3luY0NoYW5nZVN0YXR1cyhjaGFuZ2UpOworICAgICAgZGIuY29tbWl0KCk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGRiLnJvbGxiYWNrKCk7CisgICAgfQorCisgICAgdHJ5IHsKKyAgICAgIFJlcGx5VG9DaGFuZ2VTZW5kZXIgY20gPSByZXN0b3JlZFNlbmRlckZhY3RvcnkuY3JlYXRlKGNoYW5nZSk7CisgICAgICBjbS5zZXRGcm9tKGNhbGxlci5nZXRBY2NvdW50SWQoKSk7CisgICAgICBjbS5zZXRDaGFuZ2VNZXNzYWdlKG1lc3NhZ2UpOworICAgICAgY20uc2VuZCgpOworICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBlbWFpbCB1cGRhdGUgZm9yIGNoYW5nZSAiICsgY2hhbmdlLmdldENoYW5nZUlkKCksIGUpOworICAgIH0KKyAgICBob29rcy5kb0NoYW5nZVJlc3RvcmVkSG9vayhjaGFuZ2UsCisgICAgICAgIGNhbGxlci5nZXRBY2NvdW50KCksCisgICAgICAgIFN0cmluZ3MuZW1wdHlUb051bGwoaW5wdXQubWVzc2FnZSksCisgICAgICAgIGRiUHJvdmlkZXIuZ2V0KCkpOworICAgIHJldHVybiBqc29uLmZvcm1hdChjaGFuZ2UpOworICB9CisKKyAgcHJpdmF0ZSBDaGFuZ2VNZXNzYWdlIG5ld01lc3NhZ2UoSW5wdXQgaW5wdXQsIElkZW50aWZpZWRVc2VyIGNhbGxlciwKKyAgICAgIENoYW5nZSBjaGFuZ2UpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIFN0cmluZ0J1aWxkZXIgbXNnID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKKyAgICBtc2cuYXBwZW5kKCJSZXN0b3JlZCIpOworICAgIGlmICghU3RyaW5ncy5udWxsVG9FbXB0eShpbnB1dC5tZXNzYWdlKS50cmltKCkuaXNFbXB0eSgpKSB7CisgICAgICBtc2cuYXBwZW5kKCJcblxuIik7CisgICAgICBtc2cuYXBwZW5kKGlucHV0Lm1lc3NhZ2UudHJpbSgpKTsKKyAgICB9CisKKyAgICBDaGFuZ2VNZXNzYWdlIG1lc3NhZ2UgPSBuZXcgQ2hhbmdlTWVzc2FnZSgKKyAgICAgICAgbmV3IENoYW5nZU1lc3NhZ2UuS2V5KAorICAgICAgICAgICAgY2hhbmdlLmdldElkKCksCisgICAgICAgICAgICBDaGFuZ2VVdGlsLm1lc3NhZ2VVVUlEKGRiUHJvdmlkZXIuZ2V0KCkpKSwKKyAgICAgICAgY2FsbGVyLmdldEFjY291bnRJZCgpLAorICAgICAgICBjaGFuZ2UuZ2V0TGFzdFVwZGF0ZWRPbigpLAorICAgICAgICBjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSk7CisgICAgbWVzc2FnZS5zZXRNZXNzYWdlKG1zZy50b1N0cmluZygpKTsKKyAgICByZXR1cm4gbWVzc2FnZTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBzdGF0dXMoQ2hhbmdlIGNoYW5nZSkgeworICAgIHJldHVybiBjaGFuZ2UgIT0gbnVsbCA/IGNoYW5nZS5nZXRTdGF0dXMoKS5uYW1lKCkudG9Mb3dlckNhc2UoKSA6ICJkZWxldGVkIjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2ZXJ0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9SZXZlcnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMjY4NTMwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2ZXJ0LmphdmEKQEAgLTAsMCArMSwxMjAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5DaGFuZ2VIb29rczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlLlN0YXR1czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlJldmVydC5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQudmFsaWRhdG9ycy5Db21taXRWYWxpZGF0b3JzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJldmVydGVkU2VuZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9GYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc3NoLk5vU3NoSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworCitpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKKworcHVibGljIGNsYXNzIFJldmVydCBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PENoYW5nZVJlc291cmNlLCBJbnB1dD4geworICBwcml2YXRlIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzOworICBwcml2YXRlIGZpbmFsIFJldmVydGVkU2VuZGVyLkZhY3RvcnkgcmV2ZXJ0ZWRTZW5kZXJGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIENvbW1pdFZhbGlkYXRvcnMuRmFjdG9yeSBjb21taXRWYWxpZGF0b3JzRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlcjsKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VKc29uIGpzb247CisgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlcjsKKyAgcHJpdmF0ZSBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50OworICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQ7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIGNhbm9uaWNhbFdlYlVybDsKKworICBwdWJsaWMgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBwdWJsaWMgU3RyaW5nIG1lc3NhZ2U7CisgIH0KKworICBASW5qZWN0CisgIFJldmVydChDaGFuZ2VIb29rcyBob29rcywKKyAgICAgIFJldmVydGVkU2VuZGVyLkZhY3RvcnkgcmV2ZXJ0ZWRTZW5kZXJGYWN0b3J5LAorICAgICAgZmluYWwgQ29tbWl0VmFsaWRhdG9ycy5GYWN0b3J5IGNvbW1pdFZhbGlkYXRvcnNGYWN0b3J5LAorICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXIsCisgICAgICBDaGFuZ2VKc29uIGpzb24sCisgICAgICBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyLAorICAgICAgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5LAorICAgICAgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkLAorICAgICAgQEdlcnJpdFBlcnNvbklkZW50IGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQsCisgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBmaW5hbCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsKSB7CisgICAgdGhpcy5ob29rcyA9IGhvb2tzOworICAgIHRoaXMucmV2ZXJ0ZWRTZW5kZXJGYWN0b3J5ID0gcmV2ZXJ0ZWRTZW5kZXJGYWN0b3J5OworICAgIHRoaXMuY29tbWl0VmFsaWRhdG9yc0ZhY3RvcnkgPSBjb21taXRWYWxpZGF0b3JzRmFjdG9yeTsKKyAgICB0aGlzLmRiUHJvdmlkZXIgPSBkYlByb3ZpZGVyOworICAgIHRoaXMuanNvbiA9IGpzb247CisgICAgdGhpcy5naXRNYW5hZ2VyID0gZ2l0TWFuYWdlcjsKKyAgICB0aGlzLm15SWRlbnQgPSBteUlkZW50OworICAgIHRoaXMuZ2l0UmVmVXBkYXRlZCA9IGdpdFJlZlVwZGF0ZWQ7CisgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgICB0aGlzLmNhbm9uaWNhbFdlYlVybCA9IGNhbm9uaWNhbFdlYlVybDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KENoYW5nZVJlc291cmNlIHJlcSwgSW5wdXQgaW5wdXQpIHRocm93cyBFeGNlcHRpb24geworICAgIENoYW5nZUNvbnRyb2wgY29udHJvbCA9IHJlcS5nZXRDb250cm9sKCk7CisgICAgQ2hhbmdlIGNoYW5nZSA9IHJlcS5nZXRDaGFuZ2UoKTsKKyAgICBpZiAoIWNvbnRyb2wuY2FuQWRkUGF0Y2hTZXQoKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oInJldmVydCBub3QgcGVybWl0dGVkIik7CisgICAgfSBlbHNlIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkgIT0gU3RhdHVzLk1FUkdFRCkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oImNoYW5nZSBpcyAiICsgc3RhdHVzKGNoYW5nZSkpOworICAgIH0KKworICAgIGZpbmFsIFJlcG9zaXRvcnkgZ2l0ID0gZ2l0TWFuYWdlci5vcGVuUmVwb3NpdG9yeShjb250cm9sLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpOworICAgIHRyeSB7CisgICAgICBDb21taXRWYWxpZGF0b3JzIGNvbW1pdFZhbGlkYXRvcnMgPQorICAgICAgICAgIGNvbW1pdFZhbGlkYXRvcnNGYWN0b3J5LmNyZWF0ZShjb250cm9sLmdldFJlZkNvbnRyb2woKSwgbmV3IE5vU3NoSW5mbygpLCBnaXQpOworCisgICAgICBDaGFuZ2UuSWQgcmV2ZXJ0ZWRDaGFuZ2VJZCA9CisgICAgICAgICAgQ2hhbmdlVXRpbC5yZXZlcnQoY29udHJvbC5nZXRSZWZDb250cm9sKCksIGNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpLAorICAgICAgICAgICAgICAoSWRlbnRpZmllZFVzZXIpIGNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKSwKKyAgICAgICAgICAgICAgY29tbWl0VmFsaWRhdG9ycywKKyAgICAgICAgICAgICAgU3RyaW5ncy5lbXB0eVRvTnVsbChpbnB1dC5tZXNzYWdlKSwgZGJQcm92aWRlci5nZXQoKSwKKyAgICAgICAgICAgICAgcmV2ZXJ0ZWRTZW5kZXJGYWN0b3J5LCBob29rcywgZ2l0LCBwYXRjaFNldEluZm9GYWN0b3J5LAorICAgICAgICAgICAgICBnaXRSZWZVcGRhdGVkLCBteUlkZW50LCBjYW5vbmljYWxXZWJVcmwpOworCisgICAgICByZXR1cm4ganNvbi5mb3JtYXQocmV2ZXJ0ZWRDaGFuZ2VJZCk7CisgICAgfSBjYXRjaCAoSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGdpdC5jbG9zZSgpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBzdGF0dXMoQ2hhbmdlIGNoYW5nZSkgeworICAgIHJldHVybiBjaGFuZ2UgIT0gbnVsbCA/IGNoYW5nZS5nZXRTdGF0dXMoKS5uYW1lKCkudG9Mb3dlckNhc2UoKSA6ICJkZWxldGVkIjsKKyAgIH0KKyB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9SZXZpZXdlZC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2aWV3ZWQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wODk4YmNlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2aWV3ZWQuamF2YQpAQCAtMCwwICsxLDg0IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNwb25zZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRQYXRjaFJldmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CisKK2NsYXNzIFJldmlld2VkIHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgfQorCisgIHN0YXRpYyBjbGFzcyBQdXRSZXZpZXdlZCBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFBhdGNoUmVzb3VyY2UsIElucHV0PiB7CisgICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlcjsKKworICAgIEBJbmplY3QKKyAgICBQdXRSZXZpZXdlZChQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlcikgeworICAgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgT2JqZWN0IGFwcGx5KFBhdGNoUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAgIFJldmlld0RiIGRiID0gZGJQcm92aWRlci5nZXQoKTsKKyAgICAgIEFjY291bnRQYXRjaFJldmlldyBhcHIgPSBnZXRFeGlzdGluZyhkYiwgcmVzb3VyY2UpOworICAgICAgaWYgKGFwciA9PSBudWxsKSB7CisgICAgICAgIGRiLmFjY291bnRQYXRjaFJldmlld3MoKS5pbnNlcnQoCisgICAgICAgICAgICBDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3IEFjY291bnRQYXRjaFJldmlldyhyZXNvdXJjZS5nZXRQYXRjaEtleSgpLAorICAgICAgICAgICAgICAgIHJlc291cmNlLmdldEFjY291bnRJZCgpKSkpOworICAgICAgICByZXR1cm4gUmVzcG9uc2UuY3JlYXRlZCgiIik7CisgICAgICB9IGVsc2UgeworICAgICAgICByZXR1cm4gUmVzcG9uc2Uub2soIiIpOworICAgICAgfQorICAgIH0KKyAgfQorCisgIHN0YXRpYyBjbGFzcyBEZWxldGVSZXZpZXdlZCBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFBhdGNoUmVzb3VyY2UsIElucHV0PiB7CisgICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlcjsKKworICAgIEBJbmplY3QKKyAgICBEZWxldGVSZXZpZXdlZChQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlcikgeworICAgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgT2JqZWN0IGFwcGx5KFBhdGNoUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAgIFJldmlld0RiIGRiID0gZGJQcm92aWRlci5nZXQoKTsKKyAgICAgIEFjY291bnRQYXRjaFJldmlldyBhcHIgPSBnZXRFeGlzdGluZyhkYiwgcmVzb3VyY2UpOworICAgICAgaWYgKGFwciAhPSBudWxsKSB7CisgICAgICAgIGRiLmFjY291bnRQYXRjaFJldmlld3MoKS5kZWxldGUoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGFwcikpOworICAgICAgfQorICAgICAgcmV0dXJuIFJlc3BvbnNlLm5vbmUoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBBY2NvdW50UGF0Y2hSZXZpZXcgZ2V0RXhpc3RpbmcoUmV2aWV3RGIgZGIsCisgICAgICBQYXRjaFJlc291cmNlIHJlc291cmNlKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50UGF0Y2hSZXZpZXcuS2V5IGtleSA9IG5ldyBBY2NvdW50UGF0Y2hSZXZpZXcuS2V5KAorICAgICAgICByZXNvdXJjZS5nZXRQYXRjaEtleSgpLCByZXNvdXJjZS5nZXRBY2NvdW50SWQoKSk7CisgICAgcmV0dXJuIGRiLmFjY291bnRQYXRjaFJldmlld3MoKS5nZXQoa2V5KTsKKyAgfQorCisgIHByaXZhdGUgUmV2aWV3ZWQoKSB7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1Jldmlld2VySnNvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2aWV3ZXJKc29uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzM0ZDUyNAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1Jldmlld2VySnNvbi5qYXZhCkBAIC0wLDAgKzEsMTQ1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFZhbHVlLmZvcm1hdFZhbHVlOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVMaXN0OworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUmFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0UmVjb3JkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5MYWJlbE5vcm1hbGl6ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZURhdGE7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5UcmVlTWFwOworCitwdWJsaWMgY2xhc3MgUmV2aWV3ZXJKc29uIHsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGI7CisgIHByaXZhdGUgZmluYWwgTGFiZWxOb3JtYWxpemVyIGxhYmVsTm9ybWFsaXplcjsKKyAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50SW5mby5Mb2FkZXIuRmFjdG9yeSBhY2NvdW50TG9hZGVyRmFjdG9yeTsKKworICBASW5qZWN0CisgIFJldmlld2VySnNvbihQcm92aWRlcjxSZXZpZXdEYj4gZGIsCisgICAgICBMYWJlbE5vcm1hbGl6ZXIgbGFiZWxOb3JtYWxpemVyLAorICAgICAgQWNjb3VudEluZm8uTG9hZGVyLkZhY3RvcnkgYWNjb3VudExvYWRlckZhY3RvcnkpIHsKKyAgICB0aGlzLmRiID0gZGI7CisgICAgdGhpcy5sYWJlbE5vcm1hbGl6ZXIgPSBsYWJlbE5vcm1hbGl6ZXI7CisgICAgdGhpcy5hY2NvdW50TG9hZGVyRmFjdG9yeSA9IGFjY291bnRMb2FkZXJGYWN0b3J5OworICB9CisKKyAgcHVibGljIExpc3Q8UmV2aWV3ZXJJbmZvPiBmb3JtYXQoQ29sbGVjdGlvbjxSZXZpZXdlclJlc291cmNlPiByc3JjcykKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIExpc3Q8UmV2aWV3ZXJJbmZvPiBpbmZvcyA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShyc3Jjcy5zaXplKCkpOworICAgIEFjY291bnRJbmZvLkxvYWRlciBsb2FkZXIgPSBhY2NvdW50TG9hZGVyRmFjdG9yeS5jcmVhdGUodHJ1ZSk7CisgICAgZm9yIChSZXZpZXdlclJlc291cmNlIHJzcmMgOiByc3JjcykgeworICAgICAgUmV2aWV3ZXJJbmZvIGluZm8gPSBmb3JtYXQocnNyYywgbnVsbCk7CisgICAgICBsb2FkZXIucHV0KGluZm8pOworICAgICAgaW5mb3MuYWRkKGluZm8pOworICAgIH0KKyAgICBsb2FkZXIuZmlsbCgpOworICAgIHJldHVybiBpbmZvczsKKyAgfQorCisgIHB1YmxpYyBMaXN0PFJldmlld2VySW5mbz4gZm9ybWF0KFJldmlld2VyUmVzb3VyY2UgcnNyYykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGZvcm1hdChJbW11dGFibGVMaXN0LjxSZXZpZXdlclJlc291cmNlPiBvZihyc3JjKSk7CisgIH0KKworICBwdWJsaWMgUmV2aWV3ZXJJbmZvIGZvcm1hdChSZXZpZXdlckluZm8gb3V0LCBDaGFuZ2VDb250cm9sIGN0bCwKKyAgICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBQYXRjaFNldC5JZCBwc0lkID0gY3RsLmdldENoYW5nZSgpLmN1cnJlbnRQYXRjaFNldElkKCk7CisKKyAgICBpZiAoYXBwcm92YWxzID09IG51bGwpIHsKKyAgICAgIGFwcHJvdmFscyA9IENoYW5nZURhdGEuc29ydEFwcHJvdmFscyhkYi5nZXQoKS5wYXRjaFNldEFwcHJvdmFscygpCisgICAgICAgICAgLmJ5UGF0Y2hTZXRVc2VyKHBzSWQsIG91dC5faWQpKTsKKyAgICB9CisgICAgYXBwcm92YWxzID0gbGFiZWxOb3JtYWxpemVyLm5vcm1hbGl6ZShjdGwsIGFwcHJvdmFscyk7CisgICAgTGFiZWxUeXBlcyBsYWJlbFR5cGVzID0gY3RsLmdldExhYmVsVHlwZXMoKTsKKworICAgIC8vIERvbid0IHVzZSBNYXBzLm5ld1RyZWVNYXAoQ29tcGFyYXRvcikgZHVlIHRvIE9wZW5KREsgYnVnIDEwMDE2Ny4KKyAgICBvdXQuYXBwcm92YWxzID0gbmV3IFRyZWVNYXA8U3RyaW5nLFN0cmluZz4obGFiZWxUeXBlcy5uYW1lQ29tcGFyYXRvcigpKTsKKyAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgY2EgOiBhcHByb3ZhbHMpIHsKKyAgICAgIGZvciAoUGVybWlzc2lvblJhbmdlIHByIDogY3RsLmdldExhYmVsUmFuZ2VzKCkpIHsKKyAgICAgICAgaWYgKCFwci5pc0VtcHR5KCkpIHsKKyAgICAgICAgICBMYWJlbFR5cGUgYXQgPSBsYWJlbFR5cGVzLmJ5TGFiZWwoY2EuZ2V0TGFiZWxJZCgpKTsKKyAgICAgICAgICBpZiAoYXQgIT0gbnVsbCkgeworICAgICAgICAgICAgb3V0LmFwcHJvdmFscy5wdXQoYXQuZ2V0TmFtZSgpLCBmb3JtYXRWYWx1ZShjYS5nZXRWYWx1ZSgpKSk7CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICB9CisgICAgfQorCisgICAgLy8gQWRkIGR1bW15IGFwcHJvdmFscyBmb3IgYWxsIHBlcm1pdHRlZCBsYWJlbHMgZm9yIHRoZSB1c2VyIGV2ZW4gaWYgdGhleQorICAgIC8vIGRvIG5vdCBleGlzdCBpbiB0aGUgREIuCisgICAgQ2hhbmdlRGF0YSBjZCA9IG5ldyBDaGFuZ2VEYXRhKGN0bCk7CisgICAgUGF0Y2hTZXQgcHMgPSBjZC5jdXJyZW50UGF0Y2hTZXQoZGIpOworICAgIGlmIChwcyAhPSBudWxsKSB7CisgICAgICBmb3IgKFN1Ym1pdFJlY29yZCByZWMgOgorICAgICAgICAgIGN0bC5jYW5TdWJtaXQoZGIuZ2V0KCksIHBzLCBjZCwgdHJ1ZSwgZmFsc2UsIHRydWUpKSB7CisgICAgICAgIGlmIChyZWMubGFiZWxzID09IG51bGwpIHsKKyAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBmb3IgKFN1Ym1pdFJlY29yZC5MYWJlbCBsYWJlbCA6IHJlYy5sYWJlbHMpIHsKKyAgICAgICAgICBTdHJpbmcgbmFtZSA9IGxhYmVsLmxhYmVsOworICAgICAgICAgIGlmICghb3V0LmFwcHJvdmFscy5jb250YWluc0tleShuYW1lKQorICAgICAgICAgICAgICAmJiAhY3RsLmdldFJhbmdlKFBlcm1pc3Npb24uZm9yTGFiZWwobmFtZSkpLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgb3V0LmFwcHJvdmFscy5wdXQobmFtZSwgZm9ybWF0VmFsdWUoKHNob3J0KSAwKSk7CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICB9CisgICAgfQorCisgICAgaWYgKG91dC5hcHByb3ZhbHMuaXNFbXB0eSgpKSB7CisgICAgICBvdXQuYXBwcm92YWxzID0gbnVsbDsKKyAgICB9CisKKyAgICByZXR1cm4gb3V0OworICB9CisKKyAgcHJpdmF0ZSBSZXZpZXdlckluZm8gZm9ybWF0KFJldmlld2VyUmVzb3VyY2UgcnNyYywKKyAgICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gZm9ybWF0KG5ldyBSZXZpZXdlckluZm8ocnNyYy5nZXRVc2VyKCkuZ2V0QWNjb3VudElkKCkpLAorICAgICAgICByc3JjLmdldFVzZXJDb250cm9sKCksIGFwcHJvdmFscyk7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIFJldmlld2VySW5mbyBleHRlbmRzIEFjY291bnRJbmZvIHsKKyAgICBmaW5hbCBTdHJpbmcga2luZCA9ICJnZXJyaXRjb2RlcmV2aWV3I3Jldmlld2VyIjsKKyAgICBNYXA8U3RyaW5nLCBTdHJpbmc+IGFwcHJvdmFsczsKKworICAgIHByb3RlY3RlZCBSZXZpZXdlckluZm8oQWNjb3VudC5JZCBpZCkgeworICAgICAgc3VwZXIoaWQpOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgUG9zdFJlc3VsdCB7CisgICAgcHVibGljIExpc3Q8UmV2aWV3ZXJJbmZvPiByZXZpZXdlcnM7CisgICAgcHVibGljIFN0cmluZyBlcnJvcjsKKyAgICBCb29sZWFuIGNvbmZpcm07CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1Jldmlld2VyUmVzb3VyY2UuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1Jldmlld2VyUmVzb3VyY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mN2I1MjI4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2aWV3ZXJSZXNvdXJjZS5qYXZhCkBAIC0wLDAgKzEsNjEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkSW5qZWN0OworCitwdWJsaWMgY2xhc3MgUmV2aWV3ZXJSZXNvdXJjZSBleHRlbmRzIENoYW5nZVJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxSZXZpZXdlclJlc291cmNlPj4gUkVWSUVXRVJfS0lORCA9CisgICAgICBuZXcgVHlwZUxpdGVyYWw8UmVzdFZpZXc8UmV2aWV3ZXJSZXNvdXJjZT4+KCkge307CisKKyAgcHVibGljIHN0YXRpYyBpbnRlcmZhY2UgRmFjdG9yeSB7CisgICAgUmV2aWV3ZXJSZXNvdXJjZSBjcmVhdGUoQ2hhbmdlUmVzb3VyY2UgcnNyYywgSWRlbnRpZmllZFVzZXIgdXNlcik7CisgICAgUmV2aWV3ZXJSZXNvdXJjZSBjcmVhdGUoQ2hhbmdlUmVzb3VyY2UgcnNyYywgQWNjb3VudC5JZCBpZCk7CisgIH0KKworICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyIHVzZXI7CisKKyAgQEFzc2lzdGVkSW5qZWN0CisgIFJldmlld2VyUmVzb3VyY2UoQEFzc2lzdGVkIENoYW5nZVJlc291cmNlIHJzcmMsCisgICAgICBAQXNzaXN0ZWQgSWRlbnRpZmllZFVzZXIgdXNlcikgeworICAgIHN1cGVyKHJzcmMpOworICAgIHRoaXMudXNlciA9IHVzZXI7CisgIH0KKworICBAQXNzaXN0ZWRJbmplY3QKKyAgUmV2aWV3ZXJSZXNvdXJjZShJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeSwKKyAgICAgIEBBc3Npc3RlZCBDaGFuZ2VSZXNvdXJjZSByc3JjLAorICAgICAgQEFzc2lzdGVkIEFjY291bnQuSWQgaWQpIHsKKyAgICB0aGlzKHJzcmMsIHVzZXJGYWN0b3J5LmNyZWF0ZShpZCkpOworICB9CisKKyAgcHVibGljIElkZW50aWZpZWRVc2VyIGdldFVzZXIoKSB7CisgICAgcmV0dXJuIHVzZXI7CisgIH0KKworICAvKioKKyAgICogQHJldHVybiB0aGUgY29udHJvbCBmb3IgdGhlIHJldmlld2VyJ3MgdXNlciAoYXMgb3Bwb3NlZCB0byB0aGUgY2FsbGVyJ3MKKyAgICogICAgIHVzZXIgYXMgcmV0dXJuZWQgYnkge0BsaW5rICNnZXRDb250cm9sKCl9KS4KKyAgICovCisgIHB1YmxpYyBDaGFuZ2VDb250cm9sIGdldFVzZXJDb250cm9sKCkgeworICAgIHJldHVybiBnZXRDb250cm9sKCkuZm9yVXNlcih1c2VyKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2aWV3ZXJzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9SZXZpZXdlcnMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZjllMDg5Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2aWV3ZXJzLmphdmEKQEAgLTAsMCArMSw4OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQ2hpbGRDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5JZFN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlRvcExldmVsUmVzb3VyY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRzQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK3B1YmxpYyBjbGFzcyBSZXZpZXdlcnMgaW1wbGVtZW50cworICAgIENoaWxkQ29sbGVjdGlvbjxDaGFuZ2VSZXNvdXJjZSwgUmV2aWV3ZXJSZXNvdXJjZT4geworICBwcml2YXRlIGZpbmFsIER5bmFtaWNNYXA8UmVzdFZpZXc8UmV2aWV3ZXJSZXNvdXJjZT4+IHZpZXdzOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOworICBwcml2YXRlIGZpbmFsIEFjY291bnRzQ29sbGVjdGlvbiBhY2NvdW50czsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdlclJlc291cmNlLkZhY3RvcnkgcmVzb3VyY2VGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPExpc3RSZXZpZXdlcnM+IGxpc3Q7CisKKyAgQEluamVjdAorICBSZXZpZXdlcnMoUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXIsCisgICAgICBBY2NvdW50c0NvbGxlY3Rpb24gYWNjb3VudHMsCisgICAgICBSZXZpZXdlclJlc291cmNlLkZhY3RvcnkgcmVzb3VyY2VGYWN0b3J5LAorICAgICAgRHluYW1pY01hcDxSZXN0VmlldzxSZXZpZXdlclJlc291cmNlPj4gdmlld3MsCisgICAgICBQcm92aWRlcjxMaXN0UmV2aWV3ZXJzPiBsaXN0KSB7CisgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgICB0aGlzLmFjY291bnRzID0gYWNjb3VudHM7CisgICAgdGhpcy5yZXNvdXJjZUZhY3RvcnkgPSByZXNvdXJjZUZhY3Rvcnk7CisgICAgdGhpcy52aWV3cyA9IHZpZXdzOworICAgIHRoaXMubGlzdCA9IGxpc3Q7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIER5bmFtaWNNYXA8UmVzdFZpZXc8UmV2aWV3ZXJSZXNvdXJjZT4+IHZpZXdzKCkgeworICAgIHJldHVybiB2aWV3czsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUmVzdFZpZXc8Q2hhbmdlUmVzb3VyY2U+IGxpc3QoKSB7CisgICAgcmV0dXJuIGxpc3QuZ2V0KCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFJldmlld2VyUmVzb3VyY2UgcGFyc2UoQ2hhbmdlUmVzb3VyY2UgcnNyYywgSWRTdHJpbmcgaWQpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uLCBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50LklkIGFjY291bnRJZCA9CisgICAgICAgIGFjY291bnRzLnBhcnNlKFRvcExldmVsUmVzb3VyY2UuSU5TVEFOQ0UsIGlkKS5nZXRVc2VyKCkuZ2V0QWNjb3VudElkKCk7CisKKyAgICAvLyBTZWUgaWYgdGhlIGlkIGV4aXN0cyBhcyBhIHJldmlld2VyIGZvciB0aGlzIGNoYW5nZQorICAgIGlmIChmZXRjaEFjY291bnRJZHMocnNyYykuY29udGFpbnMoYWNjb3VudElkKSkgeworICAgICAgcmV0dXJuIHJlc291cmNlRmFjdG9yeS5jcmVhdGUocnNyYywgYWNjb3VudElkKTsKKyAgICB9CisgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQpOworICB9CisKKyAgcHJpdmF0ZSBTZXQ8QWNjb3VudC5JZD4gZmV0Y2hBY2NvdW50SWRzKENoYW5nZVJlc291cmNlIHJzcmMpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBTZXQ8QWNjb3VudC5JZD4gYWNjb3VudElkcyA9IFNldHMubmV3SGFzaFNldCgpOworICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhCisgICAgICAgICA6IGRiUHJvdmlkZXIuZ2V0KCkucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieUNoYW5nZShyc3JjLmdldENoYW5nZSgpLmdldElkKCkpKSB7CisgICAgICBhY2NvdW50SWRzLmFkZChhLmdldEFjY291bnRJZCgpKTsKKyAgICB9CisgICAgcmV0dXJuIGFjY291bnRJZHM7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1JldmlzaW9uUmVzb3VyY2UuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1JldmlzaW9uUmVzb3VyY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZGQ5ZTBmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2aXNpb25SZXNvdXJjZS5qYXZhCkBAIC0wLDAgKzEsNTMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuVHlwZUxpdGVyYWw7CisKK3B1YmxpYyBjbGFzcyBSZXZpc2lvblJlc291cmNlIGltcGxlbWVudHMgUmVzdFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxSZXZpc2lvblJlc291cmNlPj4gUkVWSVNJT05fS0lORCA9CisgICAgICBuZXcgVHlwZUxpdGVyYWw8UmVzdFZpZXc8UmV2aXNpb25SZXNvdXJjZT4+KCkge307CisKKyAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VSZXNvdXJjZSBjaGFuZ2U7CisgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXQgcHM7CisKKyAgcHVibGljIFJldmlzaW9uUmVzb3VyY2UoQ2hhbmdlUmVzb3VyY2UgY2hhbmdlLCBQYXRjaFNldCBwcykgeworICAgIHRoaXMuY2hhbmdlID0gY2hhbmdlOworICAgIHRoaXMucHMgPSBwczsKKyAgfQorCisgIHB1YmxpYyBDaGFuZ2VDb250cm9sIGdldENvbnRyb2woKSB7CisgICAgcmV0dXJuIGNoYW5nZS5nZXRDb250cm9sKCk7CisgIH0KKworICBwdWJsaWMgQ2hhbmdlIGdldENoYW5nZSgpIHsKKyAgICByZXR1cm4gZ2V0Q29udHJvbCgpLmdldENoYW5nZSgpOworICB9CisKKyAgcHVibGljIFBhdGNoU2V0IGdldFBhdGNoU2V0KCkgeworICAgIHJldHVybiBwczsKKyAgfQorCisgIEFjY291bnQuSWQgZ2V0QWNjb3VudElkKCkgeworICAgIHJldHVybiAoKElkZW50aWZpZWRVc2VyKSBnZXRDb250cm9sKCkuZ2V0Q3VycmVudFVzZXIoKSkuZ2V0QWNjb3VudElkKCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1JldmlzaW9ucy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvUmV2aXNpb25zLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjhlZjYzYwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1JldmlzaW9ucy5qYXZhCkBAIC0wLDAgKzEsMTIzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQ2hpbGRDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5JZFN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlJldklkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworcHVibGljIGNsYXNzIFJldmlzaW9ucyBpbXBsZW1lbnRzIENoaWxkQ29sbGVjdGlvbjxDaGFuZ2VSZXNvdXJjZSwgUmV2aXNpb25SZXNvdXJjZT4geworICBwcml2YXRlIGZpbmFsIER5bmFtaWNNYXA8UmVzdFZpZXc8UmV2aXNpb25SZXNvdXJjZT4+IHZpZXdzOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOworCisgIEBJbmplY3QKKyAgUmV2aXNpb25zKER5bmFtaWNNYXA8UmVzdFZpZXc8UmV2aXNpb25SZXNvdXJjZT4+IHZpZXdzLAorICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXIpIHsKKyAgICB0aGlzLnZpZXdzID0gdmlld3M7CisgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgRHluYW1pY01hcDxSZXN0VmlldzxSZXZpc2lvblJlc291cmNlPj4gdmlld3MoKSB7CisgICAgcmV0dXJuIHZpZXdzOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBSZXN0VmlldzxDaGFuZ2VSZXNvdXJjZT4gbGlzdCgpIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIHsKKyAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbigpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBSZXZpc2lvblJlc291cmNlIHBhcnNlKENoYW5nZVJlc291cmNlIGNoYW5nZSwgSWRTdHJpbmcgaWQpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBpZiAoaWQuZXF1YWxzKCJjdXJyZW50IikpIHsKKyAgICAgIFBhdGNoU2V0LklkIHAgPSBjaGFuZ2UuZ2V0Q2hhbmdlKCkuY3VycmVudFBhdGNoU2V0SWQoKTsKKyAgICAgIFBhdGNoU2V0IHBzID0gcCAhPSBudWxsID8gZGJQcm92aWRlci5nZXQoKS5wYXRjaFNldHMoKS5nZXQocCkgOiBudWxsOworICAgICAgaWYgKHBzICE9IG51bGwgJiYgdmlzaWJsZShjaGFuZ2UsIHBzKSkgeworICAgICAgICByZXR1cm4gbmV3IFJldmlzaW9uUmVzb3VyY2UoY2hhbmdlLCBwcyk7CisgICAgICB9CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgICAgfQorICAgIExpc3Q8UGF0Y2hTZXQ+IG1hdGNoID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aEV4cGVjdGVkU2l6ZSgyKTsKKyAgICBmb3IgKFBhdGNoU2V0IHBzIDogZmluZChjaGFuZ2UsIGlkLmdldCgpKSkgeworICAgICAgQ2hhbmdlLklkIGNoYW5nZUlkID0gcHMuZ2V0SWQoKS5nZXRQYXJlbnRLZXkoKTsKKyAgICAgIGlmIChjaGFuZ2VJZC5lcXVhbHMoY2hhbmdlLmdldENoYW5nZSgpLmdldElkKCkpICYmIHZpc2libGUoY2hhbmdlLCBwcykpIHsKKyAgICAgICAgbWF0Y2guYWRkKHBzKTsKKyAgICAgIH0KKyAgICB9CisgICAgaWYgKG1hdGNoLnNpemUoKSAhPSAxKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgICAgfQorICAgIHJldHVybiBuZXcgUmV2aXNpb25SZXNvdXJjZShjaGFuZ2UsIG1hdGNoLmdldCgwKSk7CisgIH0KKworICBwcml2YXRlIGJvb2xlYW4gdmlzaWJsZShDaGFuZ2VSZXNvdXJjZSBjaGFuZ2UsIFBhdGNoU2V0IHBzKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGNoYW5nZS5nZXRDb250cm9sKCkuaXNQYXRjaFZpc2libGUocHMsIGRiUHJvdmlkZXIuZ2V0KCkpOworICB9CisKKyAgcHJpdmF0ZSBMaXN0PFBhdGNoU2V0PiBmaW5kKENoYW5nZVJlc291cmNlIGNoYW5nZSwgU3RyaW5nIGlkKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgUmV2aWV3RGIgZGIgPSBkYlByb3ZpZGVyLmdldCgpOworCisgICAgaWYgKGlkLmxlbmd0aCgpIDwgNiAmJiBpZC5tYXRjaGVzKCJeWzEtOV1bMC05XXswLDR9JCIpKSB7CisgICAgICAvLyBMZWdhY3kgcGF0Y2ggc2V0IG51bWJlciBzeW50YXguCisgICAgICBQYXRjaFNldCBwcyA9IGRiUHJvdmlkZXIuZ2V0KCkucGF0Y2hTZXRzKCkuZ2V0KG5ldyBQYXRjaFNldC5JZCgKKyAgICAgICAgICBjaGFuZ2UuZ2V0Q2hhbmdlKCkuZ2V0SWQoKSwKKyAgICAgICAgICBJbnRlZ2VyLnBhcnNlSW50KGlkKSkpOworICAgICAgaWYgKHBzICE9IG51bGwpIHsKKyAgICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLnNpbmdsZXRvbkxpc3QocHMpOworICAgICAgfQorICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOworICAgIH0gZWxzZSBpZiAoaWQubGVuZ3RoKCkgPCA0IHx8IGlkLmxlbmd0aCgpID4gUmV2SWQuTEVOKSB7CisgICAgICAvLyBSZXF1aXJlIGEgbWluaW11bSBvZiA0IGRpZ2l0cy4KKyAgICAgIC8vIEltcG9zc2libHkgbG9uZyBpZGVudGlmaWVyIHdpbGwgbmV2ZXIgbWF0Y2guCisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CisgICAgfSBlbHNlIGlmIChpZC5sZW5ndGgoKSA+PSA4KSB7CisgICAgICAvLyBDb21taXQgbmFtZXMgYXJlIHJhdGhlciB1bmlxdWUuIFF1ZXJ5IGZvciB0aGUgY29tbWl0IGFuZCBsYXRlcgorICAgICAgLy8gbWF0Y2ggdG8gdGhlIGNoYW5nZS4gVGhpcyBpcyBtb3N0IGxpa2VseSBnb2luZyB0byBpZGVudGlmeSAxIG9yCisgICAgICAvLyBhdCBtb3N0IDIgcGF0Y2ggc2V0cyB0byBjb25zaWRlciwgd2hpY2ggaXMgc21hbGxlciB0aGFuIGxvb2tpbmcKKyAgICAgIC8vIGZvciBhbGwgcGF0Y2ggc2V0cyBpbiB0aGUgY2hhbmdlLgorICAgICAgUmV2SWQgcmV2aWQgPSBuZXcgUmV2SWQoaWQpOworICAgICAgaWYgKHJldmlkLmlzQ29tcGxldGUoKSkgeworICAgICAgICByZXR1cm4gZGIucGF0Y2hTZXRzKCkuYnlSZXZpc2lvbihyZXZpZCkudG9MaXN0KCk7CisgICAgICB9IGVsc2UgeworICAgICAgICByZXR1cm4gZGIucGF0Y2hTZXRzKCkuYnlSZXZpc2lvblJhbmdlKHJldmlkLCByZXZpZC5tYXgoKSkudG9MaXN0KCk7CisgICAgICB9CisgICAgfSBlbHNlIHsKKyAgICAgIC8vIENoYW5jZSBvZiBjb2xsaXNpb24gcmlzZXM7IGxvb2sgYXQgYWxsIHBhdGNoIHNldHMgb24gdGhlIGNoYW5nZS4KKyAgICAgIExpc3Q8UGF0Y2hTZXQ+IG91dCA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgICAgZm9yIChQYXRjaFNldCBwcyA6IGRiLnBhdGNoU2V0cygpLmJ5Q2hhbmdlKGNoYW5nZS5nZXRDaGFuZ2UoKS5nZXRJZCgpKSkgeworICAgICAgICBpZiAocHMuZ2V0UmV2aXNpb24oKSAhPSBudWxsICYmIHBzLmdldFJldmlzaW9uKCkuZ2V0KCkuc3RhcnRzV2l0aChpZCkpIHsKKyAgICAgICAgICBvdXQuYWRkKHBzKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgcmV0dXJuIG91dDsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1N1Ym1pdC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvU3VibWl0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzYzYmY1ZAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1N1Ym1pdC5qYXZhCkBAIC0wLDAgKzEsMzE4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5TdWJtaXRSZWNvcmQuU3RhdHVzLk9LOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PcHRpb25hbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlByZWRpY2F0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlN1Ym1pdFJlY29yZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWwuTGFiZWxJZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5Qcm9qZWN0VXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlN1Ym1pdC5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VRdWV1ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5BdG9taWNVcGRhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5SZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb247CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBTdWJtaXQgaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxSZXZpc2lvblJlc291cmNlLCBJbnB1dD4geworICBwdWJsaWMgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBwdWJsaWMgYm9vbGVhbiB3YWl0Rm9yTWVyZ2U7CisgIH0KKworICBwdWJsaWMgZW51bSBTdGF0dXMgeworICAgIFNVQk1JVFRFRCwgTUVSR0VEOworICB9CisKKyAgcHVibGljIHN0YXRpYyBjbGFzcyBPdXRwdXQgeworICAgIHB1YmxpYyBTdGF0dXMgc3RhdHVzOworICAgIHRyYW5zaWVudCBDaGFuZ2UgY2hhbmdlOworCisgICAgcHJpdmF0ZSBPdXRwdXQoU3RhdHVzIHMsIENoYW5nZSBjKSB7CisgICAgICBzdGF0dXMgPSBzOworICAgICAgY2hhbmdlID0gYzsKKyAgICB9CisgIH0KKworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOworICBwcml2YXRlIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyOworICBwcml2YXRlIGZpbmFsIE1lcmdlUXVldWUgbWVyZ2VRdWV1ZTsKKworICBASW5qZWN0CisgIFN1Ym1pdChQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlciwKKyAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLAorICAgICAgTWVyZ2VRdWV1ZSBtZXJnZVF1ZXVlKSB7CisgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgICB0aGlzLnJlcG9NYW5hZ2VyID0gcmVwb01hbmFnZXI7CisgICAgdGhpcy5tZXJnZVF1ZXVlID0gbWVyZ2VRdWV1ZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT3V0cHV0IGFwcGx5KFJldmlzaW9uUmVzb3VyY2UgcnNyYywgSW5wdXQgaW5wdXQpIHRocm93cyBBdXRoRXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiwgUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwKKyAgICAgIE9ybUV4Y2VwdGlvbiB7CisgICAgQ2hhbmdlQ29udHJvbCBjb250cm9sID0gcnNyYy5nZXRDb250cm9sKCk7CisgICAgSWRlbnRpZmllZFVzZXIgY2FsbGVyID0gKElkZW50aWZpZWRVc2VyKSBjb250cm9sLmdldEN1cnJlbnRVc2VyKCk7CisgICAgQ2hhbmdlIGNoYW5nZSA9IHJzcmMuZ2V0Q2hhbmdlKCk7CisgICAgaWYgKCFjb250cm9sLmNhblN1Ym1pdCgpKSB7CisgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbigic3VibWl0IG5vdCBwZXJtaXR0ZWQiKTsKKyAgICB9IGVsc2UgaWYgKCFjaGFuZ2UuZ2V0U3RhdHVzKCkuaXNPcGVuKCkpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uKCJjaGFuZ2UgaXMgIiArIHN0YXR1cyhjaGFuZ2UpKTsKKyAgICB9IGVsc2UgaWYgKCFQcm9qZWN0VXRpbC5icmFuY2hFeGlzdHMocmVwb01hbmFnZXIsIGNoYW5nZS5nZXREZXN0KCkpKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICJkZXN0aW5hdGlvbiBicmFuY2ggXCIlc1wiIG5vdCBmb3VuZC4iLAorICAgICAgICAgIGNoYW5nZS5nZXREZXN0KCkuZ2V0KCkpKTsKKyAgICB9IGVsc2UgaWYgKCFyc3JjLmdldFBhdGNoU2V0KCkuZ2V0SWQoKS5lcXVhbHMoY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpKSB7CisgICAgICAvLyBUT0RPIEFsbG93IHN1Ym1pdHRpbmcgbm9uLWN1cnJlbnQgcmV2aXNpb24gYnkgY2hhbmdpbmcgdGhlIGN1cnJlbnQuCisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICJyZXZpc2lvbiAlcyBpcyBub3QgY3VycmVudCByZXZpc2lvbiIsCisgICAgICAgICAgcnNyYy5nZXRQYXRjaFNldCgpLmdldFJldmlzaW9uKCkuZ2V0KCkpKTsKKyAgICB9CisKKyAgICBjaGVja1N1Ym1pdFJ1bGUocnNyYyk7CisgICAgY2hhbmdlID0gc3VibWl0KHJzcmMsIGNhbGxlcik7CisKKyAgICBpZiAoaW5wdXQud2FpdEZvck1lcmdlKSB7CisgICAgICBtZXJnZVF1ZXVlLm1lcmdlKGNoYW5nZS5nZXREZXN0KCkpOworICAgICAgY2hhbmdlID0gZGJQcm92aWRlci5nZXQoKS5jaGFuZ2VzKCkuZ2V0KGNoYW5nZS5nZXRJZCgpKTsKKyAgICB9IGVsc2UgeworICAgICAgbWVyZ2VRdWV1ZS5zY2hlZHVsZShjaGFuZ2UuZ2V0RGVzdCgpKTsKKyAgICB9CisKKyAgICBpZiAoY2hhbmdlID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uKCJjaGFuZ2UgaXMgZGVsZXRlZCIpOworICAgIH0KKyAgICBzd2l0Y2ggKGNoYW5nZS5nZXRTdGF0dXMoKSkgeworICAgICAgY2FzZSBTVUJNSVRURUQ6CisgICAgICAgIHJldHVybiBuZXcgT3V0cHV0KFN0YXR1cy5TVUJNSVRURUQsIGNoYW5nZSk7CisgICAgICBjYXNlIE1FUkdFRDoKKyAgICAgICAgcmV0dXJuIG5ldyBPdXRwdXQoU3RhdHVzLk1FUkdFRCwgY2hhbmdlKTsKKyAgICAgIGNhc2UgTkVXOgorICAgICAgICAvLyBJZiB0aGUgbWVyZ2Ugd2FzIGF0dGVtcHRlZCBhbmQgaXQgZmFpbGVkIHRoZSBzeXN0ZW0gdXN1YWxseQorICAgICAgICAvLyB3cml0ZXMgYSBjb21tZW50IGFzIGEgQ2hhbmdlTWVzc2FnZSBhbmQgc2V0cyBzdGF0dXMgdG8gTkVXLgorICAgICAgICAvLyBGaW5kIHRoZSByZWxldmFudCBtZXNzYWdlIGFuZCByZXBvcnQgdGhhdCBhcyB0aGUgY29uZmxpY3QuCisgICAgICAgIGZpbmFsIFRpbWVzdGFtcCBiZWZvcmUgPSByc3JjLmdldENoYW5nZSgpLmdldExhc3RVcGRhdGVkT24oKTsKKyAgICAgICAgQ2hhbmdlTWVzc2FnZSBtc2cgPSBJdGVyYWJsZXMuZ2V0Rmlyc3QoSXRlcmFibGVzLmZpbHRlcigKKyAgICAgICAgICBMaXN0cy5yZXZlcnNlKGRiUHJvdmlkZXIuZ2V0KCkuY2hhbmdlTWVzc2FnZXMoKQorICAgICAgICAgICAgICAuYnlDaGFuZ2UoY2hhbmdlLmdldElkKCkpCisgICAgICAgICAgICAgIC50b0xpc3QoKSksCisgICAgICAgICAgbmV3IFByZWRpY2F0ZTxDaGFuZ2VNZXNzYWdlPigpIHsKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIGJvb2xlYW4gYXBwbHkoQ2hhbmdlTWVzc2FnZSBpbnB1dCkgeworICAgICAgICAgICAgICByZXR1cm4gaW5wdXQuZ2V0QXV0aG9yKCkgPT0gbnVsbAorICAgICAgICAgICAgICAgICAgJiYgaW5wdXQuZ2V0V3JpdHRlbk9uKCkuZ2V0VGltZSgpID49IGJlZm9yZS5nZXRUaW1lKCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSksIG51bGwpOworICAgICAgICBpZiAobXNnICE9IG51bGwpIHsKKyAgICAgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihtc2cuZ2V0TWVzc2FnZSgpKTsKKyAgICAgICAgfQorICAgICAgZGVmYXVsdDoKKyAgICAgICAgdGhyb3cgbmV3IFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oImNoYW5nZSBpcyAiICsgc3RhdHVzKGNoYW5nZSkpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgQ2hhbmdlIHN1Ym1pdChSZXZpc2lvblJlc291cmNlIHJzcmMsIElkZW50aWZpZWRVc2VyIGNhbGxlcikKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24sIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24geworICAgIGZpbmFsIFRpbWVzdGFtcCB0aW1lc3RhbXAgPSBuZXcgVGltZXN0YW1wKFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpKTsKKyAgICBDaGFuZ2UgY2hhbmdlID0gcnNyYy5nZXRDaGFuZ2UoKTsKKyAgICBSZXZpZXdEYiBkYiA9IGRiUHJvdmlkZXIuZ2V0KCk7CisgICAgZGIuY2hhbmdlcygpLmJlZ2luVHJhbnNhY3Rpb24oY2hhbmdlLmdldElkKCkpOworICAgIHRyeSB7CisgICAgICBhcHByb3ZlKHJzcmMuZ2V0UGF0Y2hTZXQoKSwgY2FsbGVyLCB0aW1lc3RhbXApOworICAgICAgY2hhbmdlID0gZGIuY2hhbmdlcygpLmF0b21pY1VwZGF0ZSgKKyAgICAgICAgY2hhbmdlLmdldElkKCksCisgICAgICAgIG5ldyBBdG9taWNVcGRhdGU8Q2hhbmdlPigpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgQ2hhbmdlIHVwZGF0ZShDaGFuZ2UgY2hhbmdlKSB7CisgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7CisgICAgICAgICAgICAgIGNoYW5nZS5zZXRTdGF0dXMoQ2hhbmdlLlN0YXR1cy5TVUJNSVRURUQpOworICAgICAgICAgICAgICBjaGFuZ2Uuc2V0TGFzdFVwZGF0ZWRPbih0aW1lc3RhbXApOworICAgICAgICAgICAgICBDaGFuZ2VVdGlsLmNvbXB1dGVTb3J0S2V5KGNoYW5nZSk7CisgICAgICAgICAgICAgIHJldHVybiBjaGFuZ2U7CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgICB9CisgICAgICAgIH0pOworICAgICAgaWYgKGNoYW5nZSA9PSBudWxsKSB7CisgICAgICAgIHRocm93IG5ldyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uKCJjaGFuZ2UgaXMgIgorICAgICAgICAgICAgKyBzdGF0dXMoZGIuY2hhbmdlcygpLmdldChyc3JjLmdldENoYW5nZSgpLmdldElkKCkpKSk7CisgICAgICB9CisgICAgICBkYi5jb21taXQoKTsKKyAgICB9IGZpbmFsbHkgeworICAgICAgZGIucm9sbGJhY2soKTsKKyAgICB9CisgICAgcmV0dXJuIGNoYW5nZTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBhcHByb3ZlKFBhdGNoU2V0IHJldiwgSWRlbnRpZmllZFVzZXIgY2FsbGVyLCBUaW1lc3RhbXAgdGltZXN0YW1wKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXQgPSBJdGVyYWJsZXMuZ2V0Rmlyc3QoSXRlcmFibGVzLmZpbHRlcigKKyAgICAgIGRiUHJvdmlkZXIuZ2V0KCkucGF0Y2hTZXRBcHByb3ZhbHMoKQorICAgICAgICAuYnlQYXRjaFNldFVzZXIocmV2LmdldElkKCksIGNhbGxlci5nZXRBY2NvdW50SWQoKSksCisgICAgICBuZXcgUHJlZGljYXRlPFBhdGNoU2V0QXBwcm92YWw+KCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIGJvb2xlYW4gYXBwbHkoUGF0Y2hTZXRBcHByb3ZhbCBpbnB1dCkgeworICAgICAgICAgIHJldHVybiBpbnB1dC5pc1N1Ym1pdCgpOworICAgICAgICB9CisgICAgICB9KSwgbnVsbCk7CisgICAgaWYgKHN1Ym1pdCA9PSBudWxsKSB7CisgICAgICBzdWJtaXQgPSBuZXcgUGF0Y2hTZXRBcHByb3ZhbCgKKyAgICAgICAgICBuZXcgUGF0Y2hTZXRBcHByb3ZhbC5LZXkoCisgICAgICAgICAgICAgIHJldi5nZXRJZCgpLAorICAgICAgICAgICAgICBjYWxsZXIuZ2V0QWNjb3VudElkKCksCisgICAgICAgICAgICAgIExhYmVsSWQuU1VCTUlUKSwKKyAgICAgICAgICAoc2hvcnQpIDEpOworICAgIH0KKyAgICBzdWJtaXQuc2V0VmFsdWUoKHNob3J0KSAxKTsKKyAgICBzdWJtaXQuc2V0R3JhbnRlZCh0aW1lc3RhbXApOworICAgIGRiUHJvdmlkZXIuZ2V0KCkucGF0Y2hTZXRBcHByb3ZhbHMoKS51cHNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKHN1Ym1pdCkpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGNoZWNrU3VibWl0UnVsZShSZXZpc2lvblJlc291cmNlIHJzcmMpCisgICAgICB0aHJvd3MgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiB7CisgIExpc3Q8U3VibWl0UmVjb3JkPiByZXN1bHRzID0gcnNyYy5nZXRDb250cm9sKCkuY2FuU3VibWl0KAorICAgICAgICBkYlByb3ZpZGVyLmdldCgpLAorICAgICAgICByc3JjLmdldFBhdGNoU2V0KCkpOworICAgIE9wdGlvbmFsPFN1Ym1pdFJlY29yZD4gb2sgPSBmaW5kT2tSZWNvcmQocmVzdWx0cyk7CisgICAgaWYgKG9rLmlzUHJlc2VudCgpKSB7CisgICAgICAvLyBSdWxlcyBzdXBwbGllZCBhIHZhbGlkIHNvbHV0aW9uLgorICAgICAgcmV0dXJuOworICAgIH0gZWxzZSBpZiAocmVzdWx0cy5pc0VtcHR5KCkpIHsKKyAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAiQ2hhbmdlQ29udHJvbC5jYW5TdWJtaXQgcmV0dXJuZWQgZW1wdHkgbGlzdCBmb3IgJXMgaW4gJXMiLAorICAgICAgICAgIHJzcmMuZ2V0UGF0Y2hTZXQoKS5nZXRJZCgpLAorICAgICAgICAgIHJzcmMuZ2V0Q2hhbmdlKCkuZ2V0UHJvamVjdCgpLmdldCgpKSk7CisgICAgfQorCisgICAgZm9yIChTdWJtaXRSZWNvcmQgcmVjb3JkIDogcmVzdWx0cykgeworICAgICAgc3dpdGNoIChyZWNvcmQuc3RhdHVzKSB7CisgICAgICAgIGNhc2UgQ0xPU0VEOgorICAgICAgICAgIHRocm93IG5ldyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uKCJjaGFuZ2UgaXMgY2xvc2VkIik7CisKKyAgICAgICAgY2FzZSBSVUxFX0VSUk9SOgorICAgICAgICAgIHRocm93IG5ldyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAgICJydWxlIGVycm9yOiAlcyIsCisgICAgICAgICAgICAgIHJlY29yZC5lcnJvck1lc3NhZ2UpKTsKKworICAgICAgICBjYXNlIE5PVF9SRUFEWToKKyAgICAgICAgICBTdHJpbmdCdWlsZGVyIG1zZyA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgICAgICAgZm9yIChTdWJtaXRSZWNvcmQuTGFiZWwgbGJsIDogcmVjb3JkLmxhYmVscykgeworICAgICAgICAgICAgc3dpdGNoIChsYmwuc3RhdHVzKSB7CisgICAgICAgICAgICAgIGNhc2UgT0s6CisgICAgICAgICAgICAgIGNhc2UgTUFZOgorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICAgIGNhc2UgUkVKRUNUOgorICAgICAgICAgICAgICAgIGlmIChtc2cubGVuZ3RoKCkgPiAwKSBtc2cuYXBwZW5kKCI7ICIpOworICAgICAgICAgICAgICAgIG1zZy5hcHBlbmQoImJsb2NrZWQgYnkgIiArIGxibC5sYWJlbCk7CisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgY2FzZSBORUVEOgorICAgICAgICAgICAgICAgIGlmIChtc2cubGVuZ3RoKCkgPiAwKSBtc2cuYXBwZW5kKCI7ICIpOworICAgICAgICAgICAgICAgIG1zZy5hcHBlbmQoIm5lZWRzICIgKyBsYmwubGFiZWwpOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICAgIGNhc2UgSU1QT1NTSUJMRToKKyAgICAgICAgICAgICAgICBpZiAobXNnLmxlbmd0aCgpID4gMCkgbXNnLmFwcGVuZCgiOyAiKTsKKyAgICAgICAgICAgICAgICBtc2cuYXBwZW5kKCJuZWVkcyAiICsgbGJsLmxhYmVsICsgIiAoY2hlY2sgcHJvamVjdCBhY2Nlc3MpIik7CisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICB0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAgICAgICAgICJVbnN1cHBvcnRlZCBTdWJtaXRSZWNvcmQuTGFiZWwgJXMgZm9yICVzIGluICVzIiwKKyAgICAgICAgICAgICAgICAgICAgbGJsLnRvU3RyaW5nKCksCisgICAgICAgICAgICAgICAgICAgIHJzcmMuZ2V0UGF0Y2hTZXQoKS5nZXRJZCgpLAorICAgICAgICAgICAgICAgICAgICByc3JjLmdldENoYW5nZSgpLmdldFByb2plY3QoKS5nZXQoKSkpOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAgICAgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihtc2cudG9TdHJpbmcoKSk7CisKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICB0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAgICJVbnN1cHBvcnRlZCBTdWJtaXRSZWNvcmQgJXMgZm9yICVzIGluICVzIiwKKyAgICAgICAgICAgICAgcmVjb3JkLAorICAgICAgICAgICAgICByc3JjLmdldFBhdGNoU2V0KCkuZ2V0SWQoKSwKKyAgICAgICAgICAgICAgcnNyYy5nZXRDaGFuZ2UoKS5nZXRQcm9qZWN0KCkuZ2V0KCkpKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBPcHRpb25hbDxTdWJtaXRSZWNvcmQ+IGZpbmRPa1JlY29yZChDb2xsZWN0aW9uPFN1Ym1pdFJlY29yZD4gaW4pIHsKKyAgICByZXR1cm4gSXRlcmFibGVzLnRyeUZpbmQoaW4sIG5ldyBQcmVkaWNhdGU8U3VibWl0UmVjb3JkPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIGJvb2xlYW4gYXBwbHkoU3VibWl0UmVjb3JkIGlucHV0KSB7CisgICAgICAgIHJldHVybiBpbnB1dC5zdGF0dXMgPT0gT0s7CisgICAgICB9CisgICAgfSk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgc3RhdHVzKENoYW5nZSBjaGFuZ2UpIHsKKyAgICByZXR1cm4gY2hhbmdlICE9IG51bGwgPyBjaGFuZ2UuZ2V0U3RhdHVzKCkubmFtZSgpLnRvTG93ZXJDYXNlKCkgOiAiZGVsZXRlZCI7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIEN1cnJlbnRSZXZpc2lvbiBpbXBsZW1lbnRzCisgICAgICBSZXN0TW9kaWZ5VmlldzxDaGFuZ2VSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOworICAgIHByaXZhdGUgZmluYWwgU3VibWl0IHN1Ym1pdDsKKyAgICBwcml2YXRlIGZpbmFsIENoYW5nZUpzb24ganNvbjsKKworICAgIEBJbmplY3QKKyAgICBDdXJyZW50UmV2aXNpb24oUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXIsCisgICAgICAgIFN1Ym1pdCBzdWJtaXQsCisgICAgICAgIENoYW5nZUpzb24ganNvbikgeworICAgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgICAgIHRoaXMuc3VibWl0ID0gc3VibWl0OworICAgICAgdGhpcy5qc29uID0ganNvbjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgT2JqZWN0IGFwcGx5KENoYW5nZVJlc291cmNlIHJzcmMsIElucHV0IGlucHV0KSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwKKyAgICAgICAgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiwgUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwKKyAgICAgICAgT3JtRXhjZXB0aW9uIHsKKyAgICAgIFBhdGNoU2V0IHBzID0gZGJQcm92aWRlci5nZXQoKS5wYXRjaFNldHMoKQorICAgICAgICAuZ2V0KHJzcmMuZ2V0Q2hhbmdlKCkuY3VycmVudFBhdGNoU2V0SWQoKSk7CisgICAgICBpZiAocHMgPT0gbnVsbCkgeworICAgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbigiY3VycmVudCByZXZpc2lvbiBpcyBtaXNzaW5nIik7CisgICAgICB9IGVsc2UgaWYgKCFyc3JjLmdldENvbnRyb2woKS5pc1BhdGNoVmlzaWJsZShwcywgZGJQcm92aWRlci5nZXQoKSkpIHsKKyAgICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oImN1cnJlbnQgcmV2aXNpb24gbm90IGFjY2Vzc2libGUiKTsKKyAgICAgIH0KKyAgICAgIE91dHB1dCBvdXQgPSBzdWJtaXQuYXBwbHkobmV3IFJldmlzaW9uUmVzb3VyY2UocnNyYywgcHMpLCBpbnB1dCk7CisgICAgICByZXR1cm4ganNvbi5mb3JtYXQob3V0LmNoYW5nZSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9UZXN0U3VibWl0UnVsZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvVGVzdFN1Ym1pdFJ1bGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kYjE4ZjBkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvVGVzdFN1Ym1pdFJ1bGUuamF2YQpAQCAtMCwwICsxLDE5OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2U7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLkNoYXJzZXRzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuRnVuY3Rpb247CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5Kb2luZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuVGhyb3dhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5TdWJtaXRSZWNvcmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkRlZmF1bHRJbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlJ1bGVzQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5UZXN0U3VibWl0UnVsZS5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5SdWxlRXZhbEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5TdWJtaXRSdWxlRXZhbHVhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2UuQ2hhbmdlRGF0YTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuVGVybTsKKworaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5PcHRpb247CisKK2ltcG9ydCBqYXZhLmlvLkJ5dGVBcnJheUlucHV0U3RyZWFtOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK3B1YmxpYyBjbGFzcyBUZXN0U3VibWl0UnVsZSBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFJldmlzaW9uUmVzb3VyY2UsIElucHV0PiB7CisgIHB1YmxpYyBlbnVtIEZpbHRlcnMgeworICAgIFJVTiwgU0tJUDsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIEBEZWZhdWx0SW5wdXQKKyAgICBwdWJsaWMgU3RyaW5nIHJ1bGU7CisgICAgcHVibGljIEZpbHRlcnMgZmlsdGVyczsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CisgIHByaXZhdGUgZmluYWwgUnVsZXNDYWNoZSBydWxlczsKKyAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50SW5mby5Mb2FkZXIuRmFjdG9yeSBhY2NvdW50SW5mb0ZhY3Rvcnk7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tZmlsdGVycyIsIHVzYWdlID0gImltcGFjdCBvZiBmaWx0ZXJzIGluIHBhcmVudCBwcm9qZWN0cyIpCisgIHByaXZhdGUgRmlsdGVycyBmaWx0ZXJzID0gRmlsdGVycy5SVU47CisKKyAgQEluamVjdAorICBUZXN0U3VibWl0UnVsZShSZXZpZXdEYiBkYiwgUnVsZXNDYWNoZSBydWxlcywKKyAgICAgIEFjY291bnRJbmZvLkxvYWRlci5GYWN0b3J5IGluZm9GYWN0b3J5KSB7CisgICAgdGhpcy5kYiA9IGRiOworICAgIHRoaXMucnVsZXMgPSBydWxlczsKKyAgICB0aGlzLmFjY291bnRJbmZvRmFjdG9yeSA9IGluZm9GYWN0b3J5OworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoUmV2aXNpb25SZXNvdXJjZSByc3JjLCBJbnB1dCBpbnB1dCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiwKKyAgICAgIEJhZFJlcXVlc3RFeGNlcHRpb24sIEF1dGhFeGNlcHRpb24geworICAgIGlmIChpbnB1dCA9PSBudWxsKSB7CisgICAgICBpbnB1dCA9IG5ldyBJbnB1dCgpOworICAgIH0KKyAgICBpZiAoaW5wdXQucnVsZSAhPSBudWxsICYmICFydWxlcy5pc1Byb2plY3RSdWxlc0VuYWJsZWQoKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oInByb2plY3QgcnVsZXMgYXJlIGRpc2FibGVkIik7CisgICAgfQorICAgIGlucHV0LmZpbHRlcnMgPSBPYmplY3RzLmZpcnN0Tm9uTnVsbChpbnB1dC5maWx0ZXJzLCBmaWx0ZXJzKTsKKworICAgIFN1Ym1pdFJ1bGVFdmFsdWF0b3IgZXZhbHVhdG9yID0gbmV3IFN1Ym1pdFJ1bGVFdmFsdWF0b3IoCisgICAgICAgIGRiLAorICAgICAgICByc3JjLmdldFBhdGNoU2V0KCksCisgICAgICAgIHJzcmMuZ2V0Q29udHJvbCgpLmdldFByb2plY3RDb250cm9sKCksCisgICAgICAgIHJzcmMuZ2V0Q29udHJvbCgpLAorICAgICAgICByc3JjLmdldENoYW5nZSgpLAorICAgICAgICBuZXcgQ2hhbmdlRGF0YShyc3JjLmdldENoYW5nZSgpKSwKKyAgICAgICAgZmFsc2UsCisgICAgICAgICJsb2NhdGVfc3VibWl0X3J1bGUiLCAiY2FuX3N1Ym1pdCIsCisgICAgICAgICJsb2NhdGVfc3VibWl0X2ZpbHRlciIsICJmaWx0ZXJfc3VibWl0X3Jlc3VsdHMiLAorICAgICAgICBpbnB1dC5maWx0ZXJzID09IEZpbHRlcnMuU0tJUCwKKyAgICAgICAgaW5wdXQucnVsZSAhPSBudWxsCisgICAgICAgICAgPyBuZXcgQnl0ZUFycmF5SW5wdXRTdHJlYW0oaW5wdXQucnVsZS5nZXRCeXRlcyhDaGFyc2V0cy5VVEZfOCkpCisgICAgICAgICAgOiBudWxsKTsKKworICAgIExpc3Q8VGVybT4gcmVzdWx0czsKKyAgICB0cnkgeworICAgICAgcmVzdWx0cyA9IGV2YWwoZXZhbHVhdG9yKTsKKyAgICB9IGNhdGNoIChSdWxlRXZhbEV4Y2VwdGlvbiBlKSB7CisgICAgICBTdHJpbmcgbXNnID0gSm9pbmVyLm9uKCI6ICIpLnNraXBOdWxscygpLmpvaW4oSXRlcmFibGVzLnRyYW5zZm9ybSgKKyAgICAgICAgICBUaHJvd2FibGVzLmdldENhdXNhbENoYWluKGUpLAorICAgICAgICAgIG5ldyBGdW5jdGlvbjxUaHJvd2FibGUsIFN0cmluZz4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyBTdHJpbmcgYXBwbHkoVGhyb3dhYmxlIGluKSB7CisgICAgICAgICAgICAgIHJldHVybiBpbi5nZXRNZXNzYWdlKCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSkpOworICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oInJ1bGUgZmFpbGVkOiAiICsgbXNnKTsKKyAgICB9CisgICAgaWYgKHJlc3VsdHMuaXNFbXB0eSgpKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICJydWxlICVzIGhhcyBubyBzb2x1dGlvbnMiLAorICAgICAgICAgIGV2YWx1YXRvci5nZXRTdWJtaXRSdWxlKCkudG9TdHJpbmcoKSkpOworICAgIH0KKworICAgIExpc3Q8U3VibWl0UmVjb3JkPiByZWNvcmRzID0gcnNyYy5nZXRDb250cm9sKCkucmVzdWx0c1RvU3VibWl0UmVjb3JkKAorICAgICAgICBldmFsdWF0b3IuZ2V0U3VibWl0UnVsZSgpLAorICAgICAgICByZXN1bHRzKTsKKyAgICBMaXN0PFJlY29yZD4gb3V0ID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KHJlY29yZHMuc2l6ZSgpKTsKKyAgICBBY2NvdW50SW5mby5Mb2FkZXIgYWNjb3VudHMgPSBhY2NvdW50SW5mb0ZhY3RvcnkuY3JlYXRlKHRydWUpOworICAgIGZvciAoU3VibWl0UmVjb3JkIHIgOiByZWNvcmRzKSB7CisgICAgICBvdXQuYWRkKG5ldyBSZWNvcmQociwgYWNjb3VudHMpKTsKKyAgICB9CisgICAgYWNjb3VudHMuZmlsbCgpOworICAgIHJldHVybiBvdXQ7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBMaXN0PFRlcm0+IGV2YWwoU3VibWl0UnVsZUV2YWx1YXRvciBldmFsdWF0b3IpCisgICAgICB0aHJvd3MgUnVsZUV2YWxFeGNlcHRpb24geworICAgIHJldHVybiBldmFsdWF0b3IuZXZhbHVhdGUoKTsKKyAgfQorCisgIHN0YXRpYyBjbGFzcyBSZWNvcmQgeworICAgIFN1Ym1pdFJlY29yZC5TdGF0dXMgc3RhdHVzOworICAgIFN0cmluZyBlcnJvck1lc3NhZ2U7CisgICAgTWFwPFN0cmluZywgQWNjb3VudEluZm8+IG9rOworICAgIE1hcDxTdHJpbmcsIEFjY291bnRJbmZvPiByZWplY3Q7CisgICAgTWFwPFN0cmluZywgTm9uZT4gbmVlZDsKKyAgICBNYXA8U3RyaW5nLCBBY2NvdW50SW5mbz4gbWF5OworICAgIE1hcDxTdHJpbmcsIE5vbmU+IGltcG9zc2libGU7CisKKyAgICBSZWNvcmQoU3VibWl0UmVjb3JkIHIsIEFjY291bnRJbmZvLkxvYWRlciBhY2NvdW50cykgeworICAgICAgdGhpcy5zdGF0dXMgPSByLnN0YXR1czsKKyAgICAgIHRoaXMuZXJyb3JNZXNzYWdlID0gci5lcnJvck1lc3NhZ2U7CisKKyAgICAgIGlmIChyLmxhYmVscyAhPSBudWxsKSB7CisgICAgICAgIGZvciAoU3VibWl0UmVjb3JkLkxhYmVsIG4gOiByLmxhYmVscykgeworICAgICAgICAgIEFjY291bnRJbmZvIHdobyA9IG4uYXBwbGllZEJ5ICE9IG51bGwKKyAgICAgICAgICAgICAgPyBhY2NvdW50cy5nZXQobi5hcHBsaWVkQnkpCisgICAgICAgICAgICAgIDogbmV3IEFjY291bnRJbmZvKG51bGwpOworICAgICAgICAgIGxhYmVsKG4sIHdobyk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisKKyAgICBwcml2YXRlIHZvaWQgbGFiZWwoU3VibWl0UmVjb3JkLkxhYmVsIG4sIEFjY291bnRJbmZvIHdobykgeworICAgICAgc3dpdGNoIChuLnN0YXR1cykgeworICAgICAgICBjYXNlIE9LOgorICAgICAgICAgIGlmIChvayA9PSBudWxsKSB7CisgICAgICAgICAgICBvayA9IE1hcHMubmV3TGlua2VkSGFzaE1hcCgpOworICAgICAgICAgIH0KKyAgICAgICAgICBvay5wdXQobi5sYWJlbCwgd2hvKTsKKyAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBSRUpFQ1Q6CisgICAgICAgICAgaWYgKHJlamVjdCA9PSBudWxsKSB7CisgICAgICAgICAgICByZWplY3QgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKKyAgICAgICAgICB9CisgICAgICAgICAgcmVqZWN0LnB1dChuLmxhYmVsLCB3aG8pOworICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIE5FRUQ6CisgICAgICAgICAgaWYgKG5lZWQgPT0gbnVsbCkgeworICAgICAgICAgICAgbmVlZCA9IE1hcHMubmV3TGlua2VkSGFzaE1hcCgpOworICAgICAgICAgIH0KKyAgICAgICAgICBuZWVkLnB1dChuLmxhYmVsLCBuZXcgTm9uZSgpKTsKKyAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBNQVk6CisgICAgICAgICAgaWYgKG1heSA9PSBudWxsKSB7CisgICAgICAgICAgICBtYXkgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKKyAgICAgICAgICB9CisgICAgICAgICAgbWF5LnB1dChuLmxhYmVsLCB3aG8pOworICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIElNUE9TU0lCTEU6CisgICAgICAgICAgaWYgKGltcG9zc2libGUgPT0gbnVsbCkgeworICAgICAgICAgICAgaW1wb3NzaWJsZSA9IE1hcHMubmV3TGlua2VkSGFzaE1hcCgpOworICAgICAgICAgIH0KKyAgICAgICAgICBpbXBvc3NpYmxlLnB1dChuLmxhYmVsLCBuZXcgTm9uZSgpKTsKKyAgICAgICAgICBicmVhazsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBzdGF0aWMgY2xhc3MgTm9uZSB7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlL1Rlc3RTdWJtaXRUeXBlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9UZXN0U3VibWl0VHlwZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU3ZTFmMzIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9UZXN0U3VibWl0VHlwZS5qYXZhCkBAIC0wLDAgKzEsMTE2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuQ2hhcnNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5CYWRSZXF1ZXN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5ydWxlcy5SdWxlc0NhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuVGVzdFN1Ym1pdFJ1bGUuRmlsdGVyczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlRlc3RTdWJtaXRSdWxlLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlJ1bGVFdmFsRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlN1Ym1pdFJ1bGVFdmFsdWF0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LmNoYW5nZS5DaGFuZ2VEYXRhOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5UZXJtOworCitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKKworaW1wb3J0IGphdmEuaW8uQnl0ZUFycmF5SW5wdXRTdHJlYW07CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBUZXN0U3VibWl0VHlwZSBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFJldmlzaW9uUmVzb3VyY2UsIElucHV0PiB7CisgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CisgIHByaXZhdGUgZmluYWwgUnVsZXNDYWNoZSBydWxlczsKKworICBAT3B0aW9uKG5hbWUgPSAiLS1maWx0ZXJzIiwgdXNhZ2UgPSAiaW1wYWN0IG9mIGZpbHRlcnMgaW4gcGFyZW50IHByb2plY3RzIikKKyAgcHJpdmF0ZSBGaWx0ZXJzIGZpbHRlcnMgPSBGaWx0ZXJzLlJVTjsKKworICBASW5qZWN0CisgIFRlc3RTdWJtaXRUeXBlKFJldmlld0RiIGRiLCBSdWxlc0NhY2hlIHJ1bGVzKSB7CisgICAgdGhpcy5kYiA9IGRiOworICAgIHRoaXMucnVsZXMgPSBydWxlczsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGFwcGx5KFJldmlzaW9uUmVzb3VyY2UgcnNyYywgSW5wdXQgaW5wdXQpIHRocm93cyBPcm1FeGNlcHRpb24sCisgICAgICBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uIHsKKyAgICBpZiAoaW5wdXQgPT0gbnVsbCkgeworICAgICAgaW5wdXQgPSBuZXcgSW5wdXQoKTsKKyAgICB9CisgICAgaWYgKGlucHV0LnJ1bGUgIT0gbnVsbCAmJiAhcnVsZXMuaXNQcm9qZWN0UnVsZXNFbmFibGVkKCkpIHsKKyAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJwcm9qZWN0IHJ1bGVzIGFyZSBkaXNhYmxlZCIpOworICAgIH0KKyAgICBpbnB1dC5maWx0ZXJzID0gT2JqZWN0cy5maXJzdE5vbk51bGwoaW5wdXQuZmlsdGVycywgZmlsdGVycyk7CisKKyAgICBTdWJtaXRSdWxlRXZhbHVhdG9yIGV2YWx1YXRvciA9IG5ldyBTdWJtaXRSdWxlRXZhbHVhdG9yKAorICAgICAgICBkYiwKKyAgICAgICAgcnNyYy5nZXRQYXRjaFNldCgpLAorICAgICAgICByc3JjLmdldENvbnRyb2woKS5nZXRQcm9qZWN0Q29udHJvbCgpLAorICAgICAgICByc3JjLmdldENvbnRyb2woKSwKKyAgICAgICAgcnNyYy5nZXRDaGFuZ2UoKSwKKyAgICAgICAgbmV3IENoYW5nZURhdGEocnNyYy5nZXRDaGFuZ2UoKSksCisgICAgICAgIGZhbHNlLAorICAgICAgICAibG9jYXRlX3N1Ym1pdF90eXBlIiwgImdldF9zdWJtaXRfdHlwZSIsCisgICAgICAgICJsb2NhdGVfc3VibWl0X3R5cGVfZmlsdGVyIiwgImZpbHRlcl9zdWJtaXRfdHlwZV9yZXN1bHRzIiwKKyAgICAgICAgaW5wdXQuZmlsdGVycyA9PSBGaWx0ZXJzLlNLSVAsCisgICAgICAgIGlucHV0LnJ1bGUgIT0gbnVsbAorICAgICAgICAgID8gbmV3IEJ5dGVBcnJheUlucHV0U3RyZWFtKGlucHV0LnJ1bGUuZ2V0Qnl0ZXMoQ2hhcnNldHMuVVRGXzgpKQorICAgICAgICAgIDogbnVsbCk7CisKKyAgICBMaXN0PFRlcm0+IHJlc3VsdHM7CisgICAgdHJ5IHsKKyAgICAgIHJlc3VsdHMgPSBldmFsdWF0b3IuZXZhbHVhdGUoKTsKKyAgICB9IGNhdGNoIChSdWxlRXZhbEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICJydWxlIGZhaWxlZCB3aXRoIGV4Y2VwdGlvbjogJXMiLAorICAgICAgICAgIGUuZ2V0TWVzc2FnZSgpKSk7CisgICAgfQorICAgIGlmIChyZXN1bHRzLmlzRW1wdHkoKSkgeworICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAicnVsZSAlcyBoYXMgbm8gc29sdXRpb24iLAorICAgICAgICAgIGV2YWx1YXRvci5nZXRTdWJtaXRSdWxlKCkpKTsKKyAgICB9CisgICAgVGVybSB0eXBlID0gcmVzdWx0cy5nZXQoMCk7CisgICAgaWYgKCF0eXBlLmlzU3ltYm9sKCkpIHsKKyAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgInJ1bGUgJXMgcHJvZHVjZWQgaW52YWxpZCByZXN1bHQ6ICVzIiwKKyAgICAgICAgICBldmFsdWF0b3IuZ2V0U3VibWl0UnVsZSgpLnRvU3RyaW5nKCksCisgICAgICAgICAgdHlwZSkpOworICAgIH0KKyAgICByZXR1cm4gdHlwZS50b1N0cmluZygpOworICB9CisKKyAgc3RhdGljIGNsYXNzIEdldCBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxSZXZpc2lvblJlc291cmNlPiB7CisgICAgcHJpdmF0ZSBmaW5hbCBUZXN0U3VibWl0VHlwZSB0ZXN0OworCisgICAgQEluamVjdAorICAgIEdldChUZXN0U3VibWl0VHlwZSB0ZXN0KSB7CisgICAgICB0aGlzLnRlc3QgPSB0ZXN0OworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBTdHJpbmcgYXBwbHkoUmV2aXNpb25SZXNvdXJjZSByZXNvdXJjZSkgdGhyb3dzIEJhZFJlcXVlc3RFeGNlcHRpb24sCisgICAgICAgIE9ybUV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiB7CisgICAgICByZXR1cm4gdGVzdC5hcHBseShyZXNvdXJjZSwgbnVsbCk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9BYmFuZG9uQ2hhbmdlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9BYmFuZG9uQ2hhbmdlLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGRjYTRhODMuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvQWJhbmRvbkNoYW5nZS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMTM5ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWw7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUmV2aWV3UmVzdWx0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ2hhbmdlVXRpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuQWJhbmRvbmVkU2VuZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkVtYWlsRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLkF0b21pY1VwZGF0ZTsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLQotaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNhbGxhYmxlOwotCi1pbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLkFyZ3VtZW50OwotaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5PcHRpb247Ci0KLXB1YmxpYyBjbGFzcyBBYmFuZG9uQ2hhbmdlIGltcGxlbWVudHMgQ2FsbGFibGU8UmV2aWV3UmVzdWx0PiB7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBBYmFuZG9uZWRTZW5kZXIuRmFjdG9yeSBhYmFuZG9uZWRTZW5kZXJGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKLSAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlcjsKLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VIb29rcyBob29rczsKLQotICBAQXJndW1lbnQoaW5kZXggPSAwLCByZXF1aXJlZCA9IHRydWUsIG11bHRpVmFsdWVkID0gZmFsc2UsIHVzYWdlID0gImNoYW5nZSB0byBhYmFuZG9uIikKLSAgcHJpdmF0ZSBDaGFuZ2UuSWQgY2hhbmdlSWQ7Ci0KLSAgcHVibGljIHZvaWQgc2V0Q2hhbmdlSWQoZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkKSB7Ci0gICAgdGhpcy5jaGFuZ2VJZCA9IGNoYW5nZUlkOwotICB9Ci0KLSAgQE9wdGlvbihuYW1lID0gIi0tbWVzc2FnZSIsIGFsaWFzZXMgPSB7Ii1tIn0sCi0gICAgICAgICAgdXNhZ2UgPSAib3B0aW9uYWwgbWVzc2FnZSB0byBhcHBlbmQgdG8gY2hhbmdlIikKLSAgcHJpdmF0ZSBTdHJpbmcgbWVzc2FnZTsKLQotICBwdWJsaWMgdm9pZCBzZXRNZXNzYWdlKGZpbmFsIFN0cmluZyBtZXNzYWdlKSB7Ci0gICAgdGhpcy5tZXNzYWdlID0gbWVzc2FnZTsKLSAgfQotCi0gIEBJbmplY3QKLSAgQWJhbmRvbkNoYW5nZShmaW5hbCBBYmFuZG9uZWRTZW5kZXIuRmFjdG9yeSBhYmFuZG9uZWRTZW5kZXJGYWN0b3J5LAotICAgICAgZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5LCBmaW5hbCBSZXZpZXdEYiBkYiwKLSAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLCBmaW5hbCBDaGFuZ2VIb29rcyBob29rcykgewotICAgIHRoaXMuYWJhbmRvbmVkU2VuZGVyRmFjdG9yeSA9IGFiYW5kb25lZFNlbmRlckZhY3Rvcnk7Ci0gICAgdGhpcy5jaGFuZ2VDb250cm9sRmFjdG9yeSA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5OwotICAgIHRoaXMuZGIgPSBkYjsKLSAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7Ci0gICAgdGhpcy5ob29rcyA9IGhvb2tzOwotCi0gICAgY2hhbmdlSWQgPSBudWxsOwotICAgIG1lc3NhZ2UgPSBudWxsOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBSZXZpZXdSZXN1bHQgY2FsbCgpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiwKLSAgICAgIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24sIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKLSAgICBpZiAoY2hhbmdlSWQgPT0gbnVsbCkgewotICAgICAgdGhyb3cgbmV3IEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24oImNoYW5nZUlkIGlzIHJlcXVpcmVkIik7Ci0gICAgfQotCi0gICAgZmluYWwgUmV2aWV3UmVzdWx0IHJlc3VsdCA9IG5ldyBSZXZpZXdSZXN1bHQoKTsKLSAgICByZXN1bHQuc2V0Q2hhbmdlSWQoY2hhbmdlSWQpOwotCi0gICAgZmluYWwgQ2hhbmdlQ29udHJvbCBjb250cm9sID0gY2hhbmdlQ29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoY2hhbmdlSWQpOwotICAgIGZpbmFsIENoYW5nZSBjaGFuZ2UgPSBkYi5jaGFuZ2VzKCkuZ2V0KGNoYW5nZUlkKTsKLSAgICBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkID0gY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCk7Ci0gICAgZmluYWwgUGF0Y2hTZXQgcGF0Y2ggPSBkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCk7Ci0gICAgaWYgKCFjb250cm9sLmNhbkFiYW5kb24oKSkgewotICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdSZXN1bHQuRXJyb3IoCi0gICAgICAgICAgUmV2aWV3UmVzdWx0LkVycm9yLlR5cGUuQUJBTkRPTl9OT1RfUEVSTUlUVEVEKSk7Ci0gICAgfSBlbHNlIGlmIChwYXRjaCA9PSBudWxsKSB7Ci0gICAgICB0aHJvdyBuZXcgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uKGNoYW5nZUlkKTsKLSAgICB9IGVsc2UgewotCi0gICAgICAvLyBDcmVhdGUgYSBtZXNzYWdlIHRvIGFjY29tcGFueSB0aGUgYWJhbmRvbmVkIGNoYW5nZQotICAgICAgZmluYWwgQ2hhbmdlTWVzc2FnZSBjbXNnID0gbmV3IENoYW5nZU1lc3NhZ2UoCi0gICAgICAgICAgbmV3IENoYW5nZU1lc3NhZ2UuS2V5KGNoYW5nZUlkLCBDaGFuZ2VVdGlsLm1lc3NhZ2VVVUlEKGRiKSksCi0gICAgICAgICAgY3VycmVudFVzZXIuZ2V0QWNjb3VudElkKCksIHBhdGNoU2V0SWQpOwotICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciBtc2dCdWYgPQotICAgICAgICAgIG5ldyBTdHJpbmdCdWlsZGVyKCJQYXRjaCBTZXQgIiArIHBhdGNoU2V0SWQuZ2V0KCkgKyAiOiBBYmFuZG9uZWQiKTsKLSAgICAgIGlmIChtZXNzYWdlICE9IG51bGwgJiYgbWVzc2FnZS5sZW5ndGgoKSA+IDApIHsKLSAgICAgICAgbXNnQnVmLmFwcGVuZCgiXG5cbiIpOwotICAgICAgICBtc2dCdWYuYXBwZW5kKG1lc3NhZ2UpOwotICAgICAgfQotICAgICAgY21zZy5zZXRNZXNzYWdlKG1zZ0J1Zi50b1N0cmluZygpKTsKLQotICAgICAgLy8gQWJhbmRvbiB0aGUgY2hhbmdlCi0gICAgICBmaW5hbCBDaGFuZ2UgdXBkYXRlZENoYW5nZSA9IGRiLmNoYW5nZXMoKS5hdG9taWNVcGRhdGUoY2hhbmdlSWQsCi0gICAgICAgICAgbmV3IEF0b21pY1VwZGF0ZTxDaGFuZ2U+KCkgewotICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgcHVibGljIENoYW5nZSB1cGRhdGUoQ2hhbmdlIGNoYW5nZSkgewotICAgICAgICAgIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkuaXNPcGVuKCkpIHsKLSAgICAgICAgICAgIGNoYW5nZS5zZXRTdGF0dXMoQ2hhbmdlLlN0YXR1cy5BQkFORE9ORUQpOwotICAgICAgICAgICAgQ2hhbmdlVXRpbC51cGRhdGVkKGNoYW5nZSk7Ci0gICAgICAgICAgICByZXR1cm4gY2hhbmdlOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0pOwotCi0gICAgICBpZiAodXBkYXRlZENoYW5nZSA9PSBudWxsKSB7Ci0gICAgICAgIHJlc3VsdC5hZGRFcnJvcihuZXcgUmV2aWV3UmVzdWx0LkVycm9yKAotICAgICAgICAgICAgUmV2aWV3UmVzdWx0LkVycm9yLlR5cGUuQ0hBTkdFX0lTX0NMT1NFRCkpOwotICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgICAgfQotCi0gICAgICBDaGFuZ2VVdGlsLnVwZGF0ZWRDaGFuZ2UoZGIsIGN1cnJlbnRVc2VyLCB1cGRhdGVkQ2hhbmdlLCBjbXNnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFiYW5kb25lZFNlbmRlckZhY3RvcnkpOwotICAgICAgaG9va3MuZG9DaGFuZ2VBYmFuZG9uZWRIb29rKHVwZGF0ZWRDaGFuZ2UsIGN1cnJlbnRVc2VyLmdldEFjY291bnQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZXNzYWdlLCBkYik7Ci0gICAgfQotCi0gICAgcmV0dXJuIHJlc3VsdDsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvRGVsZXRlRHJhZnRQYXRjaFNldC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvRGVsZXRlRHJhZnRQYXRjaFNldC5qYXZhCmluZGV4IGY0NjYyMzEuLmFkZWMyOTIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlZGV0YWlsL0RlbGV0ZURyYWZ0UGF0Y2hTZXQuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9EZWxldGVEcmFmdFBhdGNoU2V0LmphdmEKQEAgLTQ0LDcgKzQ0LDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CiAgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlcjsKLSAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uOworICBwcml2YXRlIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZ2l0UmVmVXBkYXRlZDsKICAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7CiAKICAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkOwpAQCAtNTIsMTIgKzUyLDEyIEBACiAgIEBJbmplY3QKICAgRGVsZXRlRHJhZnRQYXRjaFNldChDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCiAgICAgICBSZXZpZXdEYiBkYiwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlciwKLSAgICAgIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVwbGljYXRpb24sIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKKyAgICAgIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZ2l0UmVmVXBkYXRlZCwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5LAogICAgICAgQEFzc2lzdGVkIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQpIHsKICAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgICAgdGhpcy5kYiA9IGRiOwogICAgIHRoaXMuZ2l0TWFuYWdlciA9IGdpdE1hbmFnZXI7Ci0gICAgdGhpcy5yZXBsaWNhdGlvbiA9IHJlcGxpY2F0aW9uOworICAgIHRoaXMuZ2l0UmVmVXBkYXRlZCA9IGdpdFJlZlVwZGF0ZWQ7CiAgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKIAogICAgIHRoaXMucGF0Y2hTZXRJZCA9IHBhdGNoU2V0SWQ7CkBAIC04OCw3ICs4OCw3IEBACiAgICAgZmluYWwgQ2hhbmdlIGNoYW5nZSA9IGNvbnRyb2wuZ2V0Q2hhbmdlKCk7CiAKICAgICB0cnkgewotICAgICAgQ2hhbmdlVXRpbC5kZWxldGVPbmx5RHJhZnRQYXRjaFNldChwYXRjaCwgY2hhbmdlLCBnaXRNYW5hZ2VyLCByZXBsaWNhdGlvbiwgZGIpOworICAgICAgQ2hhbmdlVXRpbC5kZWxldGVPbmx5RHJhZnRQYXRjaFNldChwYXRjaCwgY2hhbmdlLCBnaXRNYW5hZ2VyLCBnaXRSZWZVcGRhdGVkLCBkYik7CiAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewogICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdSZXN1bHQuRXJyb3IoCiAgICAgICAgICAgUmV2aWV3UmVzdWx0LkVycm9yLlR5cGUuR0lUX0VSUk9SLCBlLmdldE1lc3NhZ2UoKSkpOwpAQCAtOTcsNyArOTcsNyBAQAogICAgIExpc3Q8UGF0Y2hTZXQ+IHJlc3RPZlBhdGNoZXMgPSBkYi5wYXRjaFNldHMoKS5ieUNoYW5nZShjaGFuZ2VJZCkudG9MaXN0KCk7CiAgICAgaWYgKHJlc3RPZlBhdGNoZXMuc2l6ZSgpID09IDApIHsKICAgICAgIHRyeSB7Ci0gICAgICAgIENoYW5nZVV0aWwuZGVsZXRlRHJhZnRDaGFuZ2UocGF0Y2hTZXRJZCwgZ2l0TWFuYWdlciwgcmVwbGljYXRpb24sIGRiKTsKKyAgICAgICAgQ2hhbmdlVXRpbC5kZWxldGVEcmFmdENoYW5nZShwYXRjaFNldElkLCBnaXRNYW5hZ2VyLCBnaXRSZWZVcGRhdGVkLCBkYik7CiAgICAgICAgIHJlc3VsdC5zZXRDaGFuZ2VJZChudWxsKTsKICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKICAgICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdSZXN1bHQuRXJyb3IoCkBAIC0xMTEsOSArMTExLDEwIEBACiAgICAgICAgIH0KICAgICAgIH0KICAgICAgIGlmIChjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKS5lcXVhbHMocGF0Y2hTZXRJZCkpIHsKLSAgICAgICAgY2hhbmdlLnJlbW92ZUxhc3RQYXRjaFNldElkKCk7CiAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgY2hhbmdlLnNldEN1cnJlbnRQYXRjaFNldChwYXRjaFNldEluZm9GYWN0b3J5LmdldChkYiwgY2hhbmdlLmN1cnJQYXRjaFNldElkKCkpKTsKKyAgICAgICAgICBQYXRjaFNldC5JZCBpZCA9CisgICAgICAgICAgICAgIG5ldyBQYXRjaFNldC5JZChwYXRjaFNldElkLmdldFBhcmVudEtleSgpLCBwYXRjaFNldElkLmdldCgpIC0gMSk7CisgICAgICAgICAgY2hhbmdlLnNldEN1cnJlbnRQYXRjaFNldChwYXRjaFNldEluZm9GYWN0b3J5LmdldChkYiwgaWQpKTsKICAgICAgICAgfSBjYXRjaCAoUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uIGUpIHsKICAgICAgICAgICB0aHJvdyBuZXcgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uKGNoYW5nZUlkKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvUGF0aENvbmZsaWN0RXhjZXB0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9QYXRoQ29uZmxpY3RFeGNlcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43ZTJmMmQ3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvUGF0aENvbmZsaWN0RXhjZXB0aW9uLmphdmEKQEAgLTAsMCArMSwyNCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWw7CisKKy8qKiBJbmRpY2F0ZXMgYSBwYXRoIGNvbmZsaWN0IGR1cmluZyByZWJhc2Ugb3IgbWVyZ2UgKi8KK3B1YmxpYyBjbGFzcyBQYXRoQ29uZmxpY3RFeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24geworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKKworICBwdWJsaWMgUGF0aENvbmZsaWN0RXhjZXB0aW9uKFN0cmluZyBtc2cpIHsKKyAgICBzdXBlcihtc2cpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9QdWJsaXNoRHJhZnQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlZGV0YWlsL1B1Ymxpc2hEcmFmdC5qYXZhCmluZGV4IGE3MWUxMmUuLjIyZWFlMmQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlZGV0YWlsL1B1Ymxpc2hEcmFmdC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlZGV0YWlsL1B1Ymxpc2hEcmFmdC5qYXZhCkBAIC0xNSwxMiArMTUsMjkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsOwogCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLk1haWxVdGlsLmdldFJlY2lwaWVudHNGcm9tQXBwcm92YWxzOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5NYWlsVXRpbC5nZXRSZWNpcGllbnRzRnJvbUZvb3RlcnM7CisKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uQ2hhbmdlSG9va3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdSZXN1bHQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0SW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFwcHJvdmFsc1V0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRSZXNvbHZlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkNyZWF0ZUNoYW5nZVNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5NYWlsVXRpbC5NYWlsUmVjaXBpZW50czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5SZXBsYWNlUGF0Y2hTZXRTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuQXRvbWljVXBkYXRlOwpAQCAtMjgsOSArNDUsMjIgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5Gb290ZXJMaW5lOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeTsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNhbGxhYmxlOwogCiBwdWJsaWMgY2xhc3MgUHVibGlzaERyYWZ0IGltcGxlbWVudHMgQ2FsbGFibGU8UmV2aWV3UmVzdWx0PiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPQorICAgICAgTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoUHVibGlzaERyYWZ0LmNsYXNzKTsKIAogICBwdWJsaWMgaW50ZXJmYWNlIEZhY3RvcnkgewogICAgIFB1Ymxpc2hEcmFmdCBjcmVhdGUoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCk7CkBAIC0zOSwyNyArNjksNDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CiAgIHByaXZhdGUgZmluYWwgQ2hhbmdlSG9va3MgaG9va3M7CisgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXI7CisgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5OworICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsc1V0aWwgYXBwcm92YWxzVXRpbDsKKyAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50UmVzb2x2ZXIgYWNjb3VudFJlc29sdmVyOworICBwcml2YXRlIGZpbmFsIENyZWF0ZUNoYW5nZVNlbmRlci5GYWN0b3J5IGNyZWF0ZUNoYW5nZVNlbmRlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUmVwbGFjZVBhdGNoU2V0U2VuZGVyLkZhY3RvcnkgcmVwbGFjZVBhdGNoU2V0RmFjdG9yeTsKIAogICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7CiAKICAgQEluamVjdAotICBQdWJsaXNoRHJhZnQoQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5LAotICAgICAgUmV2aWV3RGIgZGIsIEBBc3Npc3RlZCBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAotICAgICAgZmluYWwgQ2hhbmdlSG9va3MgaG9va3MpIHsKKyAgUHVibGlzaERyYWZ0KGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwKKyAgICAgIGZpbmFsIFJldmlld0RiIGRiLCBmaW5hbCBDaGFuZ2VIb29rcyBob29rcywKKyAgICAgIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLAorICAgICAgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5LAorICAgICAgZmluYWwgQXBwcm92YWxzVXRpbCBhcHByb3ZhbHNVdGlsLAorICAgICAgZmluYWwgQWNjb3VudFJlc29sdmVyIGFjY291bnRSZXNvbHZlciwKKyAgICAgIGZpbmFsIENyZWF0ZUNoYW5nZVNlbmRlci5GYWN0b3J5IGNyZWF0ZUNoYW5nZVNlbmRlckZhY3RvcnksCisgICAgICBmaW5hbCBSZXBsYWNlUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeSByZXBsYWNlUGF0Y2hTZXRGYWN0b3J5LAorICAgICAgQEFzc2lzdGVkIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQpIHsKICAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgICAgdGhpcy5kYiA9IGRiOwogICAgIHRoaXMuaG9va3MgPSBob29rczsKKyAgICB0aGlzLnJlcG9NYW5hZ2VyID0gcmVwb01hbmFnZXI7CisgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgICB0aGlzLmFwcHJvdmFsc1V0aWwgPSBhcHByb3ZhbHNVdGlsOworICAgIHRoaXMuYWNjb3VudFJlc29sdmVyID0gYWNjb3VudFJlc29sdmVyOworICAgIHRoaXMuY3JlYXRlQ2hhbmdlU2VuZGVyRmFjdG9yeSA9IGNyZWF0ZUNoYW5nZVNlbmRlckZhY3Rvcnk7CisgICAgdGhpcy5yZXBsYWNlUGF0Y2hTZXRGYWN0b3J5ID0gcmVwbGFjZVBhdGNoU2V0RmFjdG9yeTsKIAogICAgIHRoaXMucGF0Y2hTZXRJZCA9IHBhdGNoU2V0SWQ7CiAgIH0KIAogICBAT3ZlcnJpZGUKLSAgcHVibGljIFJldmlld1Jlc3VsdCBjYWxsKCkgdGhyb3dzIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgcHVibGljIFJldmlld1Jlc3VsdCBjYWxsKCkgdGhyb3dzIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLAorICAgICAgSU9FeGNlcHRpb24sIFBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbiB7CiAgICAgZmluYWwgUmV2aWV3UmVzdWx0IHJlc3VsdCA9IG5ldyBSZXZpZXdSZXN1bHQoKTsKIAogICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7CiAgICAgcmVzdWx0LnNldENoYW5nZUlkKGNoYW5nZUlkKTsKICAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSBjaGFuZ2VDb250cm9sRmFjdG9yeS52YWxpZGF0ZUZvcihjaGFuZ2VJZCk7CisgICAgZmluYWwgTGFiZWxUeXBlcyBsYWJlbFR5cGVzID0gY29udHJvbC5nZXRMYWJlbFR5cGVzKCk7CiAgICAgZmluYWwgUGF0Y2hTZXQgcGF0Y2ggPSBkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCk7CiAgICAgaWYgKHBhdGNoID09IG51bGwpIHsKICAgICAgIHRocm93IG5ldyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24oY2hhbmdlSWQpOwpAQCAtNzQsNyArMTI0LDcgQEAKICAgICAgIHJlc3VsdC5hZGRFcnJvcihuZXcgUmV2aWV3UmVzdWx0LkVycm9yKAogICAgICAgICAgIFJldmlld1Jlc3VsdC5FcnJvci5UeXBlLlBVQkxJU0hfTk9UX1BFUk1JVFRFRCkpOwogICAgIH0gZWxzZSB7Ci0gICAgICBmaW5hbCBQYXRjaFNldCB1cGRhdGVkUGF0Y2ggPSBkYi5wYXRjaFNldHMoKS5hdG9taWNVcGRhdGUocGF0Y2hTZXRJZCwKKyAgICAgIGZpbmFsIFBhdGNoU2V0IHVwZGF0ZWRQYXRjaFNldCA9IGRiLnBhdGNoU2V0cygpLmF0b21pY1VwZGF0ZShwYXRjaFNldElkLAogICAgICAgICAgIG5ldyBBdG9taWNVcGRhdGU8UGF0Y2hTZXQ+KCkgewogICAgICAgICBAT3ZlcnJpZGUKICAgICAgICAgcHVibGljIFBhdGNoU2V0IHVwZGF0ZShQYXRjaFNldCBwYXRjaHNldCkgewpAQCAtOTUsMTEgKzE0NSw3NyBAQAogICAgICAgICB9CiAgICAgICB9KTsKIAotICAgICAgaWYgKCF1cGRhdGVkUGF0Y2guaXNEcmFmdCgpIHx8IHVwZGF0ZWRDaGFuZ2UuZ2V0U3RhdHVzKCkgPT0gQ2hhbmdlLlN0YXR1cy5ORVcpIHsKLSAgICAgICAgaG9va3MuZG9EcmFmdFB1Ymxpc2hlZEhvb2sodXBkYXRlZENoYW5nZSwgdXBkYXRlZFBhdGNoLCBkYik7CisgICAgICBpZiAoIXVwZGF0ZWRQYXRjaFNldC5pc0RyYWZ0KCkgfHwgdXBkYXRlZENoYW5nZS5nZXRTdGF0dXMoKSA9PSBDaGFuZ2UuU3RhdHVzLk5FVykgeworICAgICAgICBob29rcy5kb0RyYWZ0UHVibGlzaGVkSG9vayh1cGRhdGVkQ2hhbmdlLCB1cGRhdGVkUGF0Y2hTZXQsIGRiKTsKKworICAgICAgICBzZW5kTm90aWZpY2F0aW9ucyhjb250cm9sLmdldENoYW5nZSgpLmdldFN0YXR1cygpID09IENoYW5nZS5TdGF0dXMuRFJBRlQsCisgICAgICAgICAgICAoSWRlbnRpZmllZFVzZXIpIGNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKSwgdXBkYXRlZENoYW5nZSwgdXBkYXRlZFBhdGNoU2V0LAorICAgICAgICAgICAgbGFiZWxUeXBlcyk7CiAgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIHJlc3VsdDsKICAgfQorCisgIHByaXZhdGUgdm9pZCBzZW5kTm90aWZpY2F0aW9ucyhmaW5hbCBib29sZWFuIG5ld0NoYW5nZSwKKyAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLCBmaW5hbCBDaGFuZ2UgdXBkYXRlZENoYW5nZSwKKyAgICAgIGZpbmFsIFBhdGNoU2V0IHVwZGF0ZWRQYXRjaFNldCwgZmluYWwgTGFiZWxUeXBlcyBsYWJlbFR5cGVzKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sIFBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbiB7CisgICAgZmluYWwgUmVwb3NpdG9yeSBnaXQgPSByZXBvTWFuYWdlci5vcGVuUmVwb3NpdG9yeSh1cGRhdGVkQ2hhbmdlLmdldFByb2plY3QoKSk7CisgICAgdHJ5IHsKKyAgICAgIGZpbmFsIFJldldhbGsgcmV2V2FsayA9IG5ldyBSZXZXYWxrKGdpdCk7CisgICAgICBmaW5hbCBSZXZDb21taXQgY29tbWl0OworICAgICAgdHJ5IHsKKyAgICAgICAgY29tbWl0ID0gcmV2V2Fsay5wYXJzZUNvbW1pdChPYmplY3RJZC5mcm9tU3RyaW5nKHVwZGF0ZWRQYXRjaFNldC5nZXRSZXZpc2lvbigpLmdldCgpKSk7CisgICAgICB9IGZpbmFsbHkgeworICAgICAgICByZXZXYWxrLnJlbGVhc2UoKTsKKyAgICAgIH0KKyAgICAgIGZpbmFsIFBhdGNoU2V0SW5mbyBpbmZvID0gcGF0Y2hTZXRJbmZvRmFjdG9yeS5nZXQoY29tbWl0LCB1cGRhdGVkUGF0Y2hTZXQuZ2V0SWQoKSk7CisgICAgICBmaW5hbCBMaXN0PEZvb3RlckxpbmU+IGZvb3RlckxpbmVzID0gY29tbWl0LmdldEZvb3RlckxpbmVzKCk7CisgICAgICBmaW5hbCBBY2NvdW50LklkIG1lID0gY3VycmVudFVzZXIuZ2V0QWNjb3VudElkKCk7CisgICAgICBmaW5hbCBNYWlsUmVjaXBpZW50cyByZWNpcGllbnRzID0KKyAgICAgICAgICBnZXRSZWNpcGllbnRzRnJvbUZvb3RlcnMoYWNjb3VudFJlc29sdmVyLCB1cGRhdGVkUGF0Y2hTZXQsIGZvb3RlckxpbmVzKTsKKyAgICAgIHJlY2lwaWVudHMucmVtb3ZlKG1lKTsKKworICAgICAgaWYgKG5ld0NoYW5nZSkgeworICAgICAgICBhcHByb3ZhbHNVdGlsLmFkZFJldmlld2VycyhkYiwgbGFiZWxUeXBlcywgdXBkYXRlZENoYW5nZSwgdXBkYXRlZFBhdGNoU2V0LCBpbmZvLAorICAgICAgICAgICAgcmVjaXBpZW50cy5nZXRSZXZpZXdlcnMoKSwgQ29sbGVjdGlvbnMuPEFjY291bnQuSWQ+IGVtcHR5U2V0KCkpOworICAgICAgICB0cnkgeworICAgICAgICAgIENyZWF0ZUNoYW5nZVNlbmRlciBjbSA9IGNyZWF0ZUNoYW5nZVNlbmRlckZhY3RvcnkuY3JlYXRlKHVwZGF0ZWRDaGFuZ2UpOworICAgICAgICAgIGNtLnNldEZyb20obWUpOworICAgICAgICAgIGNtLnNldFBhdGNoU2V0KHVwZGF0ZWRQYXRjaFNldCwgaW5mbyk7CisgICAgICAgICAgY20uYWRkUmV2aWV3ZXJzKHJlY2lwaWVudHMuZ2V0UmV2aWV3ZXJzKCkpOworICAgICAgICAgIGNtLmFkZEV4dHJhQ0MocmVjaXBpZW50cy5nZXRDY09ubHkoKSk7CisgICAgICAgICAgY20uc2VuZCgpOworICAgICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgeworICAgICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHNlbmQgZW1haWwgZm9yIG5ldyBjaGFuZ2UgIiArIHVwZGF0ZWRDaGFuZ2UuZ2V0SWQoKSwgZSk7CisgICAgICAgIH0KKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGZpbmFsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gcGF0Y2hTZXRBcHByb3ZhbHMgPQorICAgICAgICAgICAgZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieUNoYW5nZSh1cGRhdGVkQ2hhbmdlLmdldElkKCkpLnRvTGlzdCgpOworICAgICAgICBmaW5hbCBNYWlsUmVjaXBpZW50cyBvbGRSZWNpcGllbnRzID0KKyAgICAgICAgICAgIGdldFJlY2lwaWVudHNGcm9tQXBwcm92YWxzKHBhdGNoU2V0QXBwcm92YWxzKTsKKyAgICAgICAgYXBwcm92YWxzVXRpbC5hZGRSZXZpZXdlcnMoZGIsIGxhYmVsVHlwZXMsIHVwZGF0ZWRDaGFuZ2UsIHVwZGF0ZWRQYXRjaFNldCwgaW5mbywKKyAgICAgICAgICAgIHJlY2lwaWVudHMuZ2V0UmV2aWV3ZXJzKCksIG9sZFJlY2lwaWVudHMuZ2V0QWxsKCkpOworICAgICAgICBmaW5hbCBDaGFuZ2VNZXNzYWdlIG1zZyA9CisgICAgICAgICAgICBuZXcgQ2hhbmdlTWVzc2FnZShuZXcgQ2hhbmdlTWVzc2FnZS5LZXkodXBkYXRlZENoYW5nZS5nZXRJZCgpLAorICAgICAgICAgICAgICAgIENoYW5nZVV0aWwubWVzc2FnZVVVSUQoZGIpKSwgbWUsCisgICAgICAgICAgICAgICAgdXBkYXRlZFBhdGNoU2V0LmdldENyZWF0ZWRPbigpLCB1cGRhdGVkUGF0Y2hTZXQuZ2V0SWQoKSk7CisgICAgICAgIG1zZy5zZXRNZXNzYWdlKCJVcGxvYWRlZCBwYXRjaCBzZXQgIiArIHVwZGF0ZWRQYXRjaFNldC5nZXRQYXRjaFNldElkKCkgKyAiLiIpOworICAgICAgICB0cnkgeworICAgICAgICAgIFJlcGxhY2VQYXRjaFNldFNlbmRlciBjbSA9IHJlcGxhY2VQYXRjaFNldEZhY3RvcnkuY3JlYXRlKHVwZGF0ZWRDaGFuZ2UpOworICAgICAgICAgIGNtLnNldEZyb20obWUpOworICAgICAgICAgIGNtLnNldFBhdGNoU2V0KHVwZGF0ZWRQYXRjaFNldCwgaW5mbyk7CisgICAgICAgICAgY20uc2V0Q2hhbmdlTWVzc2FnZShtc2cpOworICAgICAgICAgIGNtLmFkZFJldmlld2VycyhyZWNpcGllbnRzLmdldFJldmlld2VycygpKTsKKyAgICAgICAgICBjbS5hZGRFeHRyYUNDKHJlY2lwaWVudHMuZ2V0Q2NPbmx5KCkpOworICAgICAgICAgIGNtLnNlbmQoKTsKKyAgICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBzZW5kIGVtYWlsIGZvciBuZXcgcGF0Y2ggc2V0ICIgKyB1cGRhdGVkUGF0Y2hTZXQuZ2V0SWQoKSwgZSk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9IGZpbmFsbHkgeworICAgICAgZ2l0LmNsb3NlKCk7CisgICAgfQorICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2UuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlZGV0YWlsL1JlYmFzZUNoYW5nZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkwODk3MTAKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9SZWJhc2VDaGFuZ2UuamF2YQpAQCAtMCwwICsxLDQ2NyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tSdW5uZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkVtYWlsRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlLlN0YXR1czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QW5jZXN0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUmV2SWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5BcHByb3ZhbHNVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DaGFuZ2VVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJlYmFzZWRQYXRjaFNldFNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5SZXBsYWNlUGF0Y2hTZXRTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5JbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLkF0b21pY1VwZGF0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db21taXRCdWlsZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdElkOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdEluc2VydGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlBlcnNvbklkZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlZjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWZVcGRhdGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0Lm1lcmdlLlRocmVlV2F5TWVyZ2VyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworcHVibGljIGNsYXNzIFJlYmFzZUNoYW5nZSB7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyOworICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQ7CisgIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkOworICBwcml2YXRlIGZpbmFsIFJlYmFzZWRQYXRjaFNldFNlbmRlci5GYWN0b3J5IHJlYmFzZWRQYXRjaFNldFNlbmRlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlSG9va1J1bm5lciBob29rczsKKyAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbHNVdGlsIGFwcHJvdmFsc1V0aWw7CisgIHByaXZhdGUgZmluYWwgTWVyZ2VVdGlsLkZhY3RvcnkgbWVyZ2VVdGlsRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlOworCisgIEBJbmplY3QKKyAgUmViYXNlQ2hhbmdlKGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwKKyAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwgZmluYWwgUmV2aWV3RGIgZGIsCisgICAgICBAR2Vycml0UGVyc29uSWRlbnQgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudCwKKyAgICAgIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIGdpdE1hbmFnZXIsCisgICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQsCisgICAgICBmaW5hbCBSZWJhc2VkUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeSByZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5LAorICAgICAgZmluYWwgQ2hhbmdlSG9va1J1bm5lciBob29rcywgZmluYWwgQXBwcm92YWxzVXRpbCBhcHByb3ZhbHNVdGlsLAorICAgICAgZmluYWwgTWVyZ2VVdGlsLkZhY3RvcnkgbWVyZ2VVdGlsRmFjdG9yeSwKKyAgICAgIGZpbmFsIFByb2plY3RDYWNoZSBwcm9qZWN0Q2FjaGUpIHsKKyAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7CisgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgICB0aGlzLmRiID0gZGI7CisgICAgdGhpcy5naXRNYW5hZ2VyID0gZ2l0TWFuYWdlcjsKKyAgICB0aGlzLm15SWRlbnQgPSBteUlkZW50OworICAgIHRoaXMuZ2l0UmVmVXBkYXRlZCA9IGdpdFJlZlVwZGF0ZWQ7CisgICAgdGhpcy5yZWJhc2VkUGF0Y2hTZXRTZW5kZXJGYWN0b3J5ID0gcmViYXNlZFBhdGNoU2V0U2VuZGVyRmFjdG9yeTsKKyAgICB0aGlzLmhvb2tzID0gaG9va3M7CisgICAgdGhpcy5hcHByb3ZhbHNVdGlsID0gYXBwcm92YWxzVXRpbDsKKyAgICB0aGlzLm1lcmdlVXRpbEZhY3RvcnkgPSBtZXJnZVV0aWxGYWN0b3J5OworICAgIHRoaXMucHJvamVjdENhY2hlID0gcHJvamVjdENhY2hlOworICB9CisKKyAgLyoqCisgICAqIFJlYmFzZXMgdGhlIGNoYW5nZSBvZiB0aGUgZ2l2ZW4gcGF0Y2ggc2V0LgorICAgKgorICAgKiBJdCBpcyB2ZXJpZmllZCB0aGF0IHRoZSBjdXJyZW50IHVzZXIgaXMgYWxsb3dlZCB0byBkbyB0aGUgcmViYXNlLgorICAgKgorICAgKiBJZiB0aGUgcGF0Y2ggc2V0IGhhcyBubyBkZXBlbmRlbmN5IHRvIGFuIG9wZW4gY2hhbmdlLCB0aGVuIHRoZSBjaGFuZ2UgaXMKKyAgICogcmViYXNlZCBvbiB0aGUgdGlwIG9mIHRoZSBkZXN0aW5hdGlvbiBicmFuY2guCisgICAqCisgICAqIElmIHRoZSBwYXRjaCBzZXQgZGVwZW5kcyBvbiBhbiBvcGVuIGNoYW5nZSwgaXQgaXMgcmViYXNlZCBvbiB0aGUgbGF0ZXN0CisgICAqIHBhdGNoIHNldCBvZiB0aGlzIGNoYW5nZS4KKyAgICoKKyAgICogVGhlIHJlYmFzZWQgY29tbWl0IGlzIGFkZGVkIGFzIG5ldyBwYXRjaCBzZXQgdG8gdGhlIGNoYW5nZS4KKyAgICoKKyAgICogRS1tYWlsIG5vdGlmaWNhdGlvbiBhbmQgdHJpZ2dlcmluZyBvZiBob29rcyBoYXBwZW5zIGZvciB0aGUgY3JlYXRpb24gb2YgdGhlCisgICAqIG5ldyBwYXRjaCBzZXQuCisgICAqCisgICAqIEBwYXJhbSBwYXRjaFNldElkIHRoZSBpZCBvZiB0aGUgcGF0Y2ggc2V0CisgICAqIEBwYXJhbSB1cGxvYWRlciB0aGUgdXNlciB0aGF0IGNyZWF0ZXMgdGhlIHJlYmFzZWQgcGF0Y2ggc2V0CisgICAqIEB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIHRocm93biBpZiB0aGUgY2hhbmdlIHRvIHdoaWNoIHRoZSBwYXRjaCBzZXQKKyAgICogICAgICAgICBiZWxvbmdzIGRvZXMgbm90IGV4aXN0IG9yIGlzIG5vdCB2aXNpYmxlIHRvIHRoZSB1c2VyCisgICAqIEB0aHJvd3MgRW1haWxFeGNlcHRpb24gdGhyb3duIGlmIHNlbmRpbmcgdGhlIGUtbWFpbCB0byBub3RpZnkgYWJvdXQgdGhlIG5ldworICAgKiAgICAgICAgIHBhdGNoIHNldCBmYWlscworICAgKiBAdGhyb3dzIE9ybUV4Y2VwdGlvbiB0aHJvd24gaW4gY2FzZSBhY2Nlc3NpbmcgdGhlIGRhdGFiYXNlIGZhaWxzCisgICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gdGhyb3duIGlmIHJlYmFzZSBpcyBub3QgcG9zc2libGUgb3Igbm90IG5lZWRlZAorICAgKiBAdGhyb3dzIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24gdGhyb3duIGlmIHJlYmFzZSBpcyBub3QgYWxsb3dlZAorICAgKi8KKyAgcHVibGljIHZvaWQgcmViYXNlKGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsIGZpbmFsIEFjY291bnQuSWQgdXBsb2FkZXIpCisgICAgICB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBFbWFpbEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwKKyAgICAgIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24geworICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCk7CisgICAgZmluYWwgQ2hhbmdlQ29udHJvbCBjaGFuZ2VDb250cm9sID0KKyAgICAgICAgY2hhbmdlQ29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoY2hhbmdlSWQpOworICAgIGlmICghY2hhbmdlQ29udHJvbC5jYW5SZWJhc2UoKSkgeworICAgICAgdGhyb3cgbmV3IEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24oCisgICAgICAgICAgIkNhbm5vdCByZWJhc2U6IE5ldyBwYXRjaCBzZXRzIGFyZSBub3QgYWxsb3dlZCB0byBiZSBhZGRlZCB0byBjaGFuZ2U6ICIKKyAgICAgICAgICAgICAgKyBjaGFuZ2VJZC50b1N0cmluZygpKTsKKyAgICB9CisgICAgZmluYWwgQ2hhbmdlIGNoYW5nZSA9IGNoYW5nZUNvbnRyb2wuZ2V0Q2hhbmdlKCk7CisgICAgUmVwb3NpdG9yeSBnaXQgPSBudWxsOworICAgIFJldldhbGsgcncgPSBudWxsOworICAgIE9iamVjdEluc2VydGVyIGluc2VydGVyID0gbnVsbDsKKyAgICB0cnkgeworICAgICAgZ2l0ID0gZ2l0TWFuYWdlci5vcGVuUmVwb3NpdG9yeShjaGFuZ2UuZ2V0UHJvamVjdCgpKTsKKyAgICAgIHJ3ID0gbmV3IFJldldhbGsoZ2l0KTsKKyAgICAgIGluc2VydGVyID0gZ2l0Lm5ld09iamVjdEluc2VydGVyKCk7CisKKyAgICAgIGZpbmFsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gb2xkUGF0Y2hTZXRBcHByb3ZhbHMgPQorICAgICAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlDaGFuZ2UoY2hhbmdlLmdldElkKCkpLnRvTGlzdCgpOworCisgICAgICBmaW5hbCBTdHJpbmcgYmFzZVJldiA9IGZpbmRCYXNlUmV2aXNpb24ocGF0Y2hTZXRJZCwgZGIsCisgICAgICAgICAgY2hhbmdlLmdldERlc3QoKSwgZ2l0LCBudWxsLCBudWxsLCBudWxsKTsKKyAgICAgIGZpbmFsIFJldkNvbW1pdCBiYXNlQ29tbWl0ID0KKyAgICAgICAgICBydy5wYXJzZUNvbW1pdChPYmplY3RJZC5mcm9tU3RyaW5nKGJhc2VSZXYpKTsKKworICAgICAgZmluYWwgUGF0Y2hTZXQgbmV3UGF0Y2hTZXQgPQorICAgICAgICAgIHJlYmFzZShnaXQsIHJ3LCBpbnNlcnRlciwgcGF0Y2hTZXRJZCwgY2hhbmdlLCB1cGxvYWRlciwgYmFzZUNvbW1pdCwKKyAgICAgICAgICAgICAgbWVyZ2VVdGlsRmFjdG9yeS5jcmVhdGUoCisgICAgICAgICAgICAgICAgICBjaGFuZ2VDb250cm9sLmdldFByb2plY3RDb250cm9sKCkuZ2V0UHJvamVjdFN0YXRlKCksIHRydWUpKTsKKworICAgICAgZmluYWwgU2V0PEFjY291bnQuSWQ+IG9sZFJldmlld2VycyA9IFNldHMubmV3SGFzaFNldCgpOworICAgICAgZmluYWwgU2V0PEFjY291bnQuSWQ+IG9sZENDID0gU2V0cy5uZXdIYXNoU2V0KCk7CisgICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgYSA6IG9sZFBhdGNoU2V0QXBwcm92YWxzKSB7CisgICAgICAgIGlmIChhLmdldFZhbHVlKCkgIT0gMCkgeworICAgICAgICAgIG9sZFJldmlld2Vycy5hZGQoYS5nZXRBY2NvdW50SWQoKSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgb2xkQ0MuYWRkKGEuZ2V0QWNjb3VudElkKCkpOworICAgICAgICB9CisgICAgICB9CisgICAgICBmaW5hbCBSZXBsYWNlUGF0Y2hTZXRTZW5kZXIgY20gPQorICAgICAgICAgIHJlYmFzZWRQYXRjaFNldFNlbmRlckZhY3RvcnkuY3JlYXRlKGNoYW5nZSk7CisgICAgICBjbS5zZXRGcm9tKHVwbG9hZGVyKTsKKyAgICAgIGNtLnNldFBhdGNoU2V0KG5ld1BhdGNoU2V0KTsKKyAgICAgIGNtLmFkZFJldmlld2VycyhvbGRSZXZpZXdlcnMpOworICAgICAgY20uYWRkRXh0cmFDQyhvbGRDQyk7CisgICAgICBjbS5zZW5kKCk7CisKKyAgICAgIGhvb2tzLmRvUGF0Y2hzZXRDcmVhdGVkSG9vayhjaGFuZ2UsIG5ld1BhdGNoU2V0LCBkYik7CisgICAgfSBjYXRjaCAoUGF0aENvbmZsaWN0RXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGlmIChpbnNlcnRlciAhPSBudWxsKSB7CisgICAgICAgIGluc2VydGVyLnJlbGVhc2UoKTsKKyAgICAgIH0KKyAgICAgIGlmIChydyAhPSBudWxsKSB7CisgICAgICAgIHJ3LnJlbGVhc2UoKTsKKyAgICAgIH0KKyAgICAgIGlmIChnaXQgIT0gbnVsbCkgeworICAgICAgICBnaXQuY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICAvKioKKyAgICogRmluZHMgdGhlIHJldmlzaW9uIG9mIGNvbW1pdCBvbiB3aGljaCB0aGUgZ2l2ZW4gcGF0Y2ggc2V0IHNob3VsZCBiZSBiYXNlZC4KKyAgICoKKyAgICogQHBhcmFtIHBhdGNoU2V0SWQgdGhlIGlkIG9mIHRoZSBwYXRjaCBzZXQgZm9yIHdoaWNoIHRoZSBuZXcgYmFzZSBjb21taXQKKyAgICogICAgICAgIHNob3VsZCBiZSBmb3VuZAorICAgKiBAcGFyYW0gZGIgdGhlIFJldmlld0RiCisgICAqIEBwYXJhbSBkZXN0QnJhbmNoIHRoZSBkZXN0aW5hdGlvbiBicmFuY2gKKyAgICogQHBhcmFtIGdpdCB0aGUgcmVwb3NpdG9yeQorICAgKiBAcGFyYW0gcGF0Y2hTZXRBbmNlc3RvcnMgdGhlIG9yaWdpbmFsIFBhdGNoU2V0QW5jZXN0b3Igb2YgdGhlIGdpdmVuIHBhdGNoCisgICAqICAgICAgICBzZXQgdGhhdCBzaG91bGQgYmUgYmFzZWQKKyAgICogQHBhcmFtIGRlcFBhdGNoU2V0TGlzdCB0aGUgb3JpZ2luYWwgcGF0Y2ggc2V0IGxpc3Qgb24gd2hpY2ggdGhlIHJlYmFzZWQKKyAgICogICAgICAgIHBhdGNoIHNldCBkZXBlbmRzCisgICAqIEBwYXJhbSBkZXBDaGFuZ2VMaXN0IHRoZSBvcmlnaW5hbCBjaGFuZ2UgbGlzdCBvbiB3aG9zZSBwYXRjaCBzZXQgdGhlCisgICAqICAgICAgICByZWJhc2VkIHBhdGNoIHNldCBkZXBlbmRzCisgICAqIEByZXR1cm4gdGhlIHJldmlzaW9uIG9mIGNvbW1pdCBvbiB3aGljaCB0aGUgZ2l2ZW4gcGF0Y2ggc2V0IHNob3VsZCBiZSBiYXNlZAorICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uIHRocm93biBpZiByZWJhc2UgaXMgbm90IHBvc3NpYmxlIG9yIG5vdCBuZWVkZWQKKyAgICogQHRocm93cyBPcm1FeGNlcHRpb24gdGhyb3duIGluIGNhc2UgYWNjZXNzaW5nIHRoZSBkYXRhYmFzZSBmYWlscworICAgKi8KKyAgICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZmluZEJhc2VSZXZpc2lvbihmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLAorICAgICAgICBmaW5hbCBSZXZpZXdEYiBkYiwgZmluYWwgQnJhbmNoLk5hbWVLZXkgZGVzdEJyYW5jaCwgZmluYWwgUmVwb3NpdG9yeSBnaXQsCisgICAgICAgIExpc3Q8UGF0Y2hTZXRBbmNlc3Rvcj4gcGF0Y2hTZXRBbmNlc3RvcnMsIExpc3Q8UGF0Y2hTZXQ+IGRlcFBhdGNoU2V0TGlzdCwKKyAgICAgICAgTGlzdDxDaGFuZ2U+IGRlcENoYW5nZUxpc3QpIHRocm93cyBJT0V4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKworICAgICAgU3RyaW5nIGJhc2VSZXYgPSBudWxsOworCisgICAgICBpZiAocGF0Y2hTZXRBbmNlc3RvcnMgPT0gbnVsbCkgeworICAgICAgICBwYXRjaFNldEFuY2VzdG9ycyA9CisgICAgICAgICAgICBkYi5wYXRjaFNldEFuY2VzdG9ycygpLmFuY2VzdG9yc09mKHBhdGNoU2V0SWQpLnRvTGlzdCgpOworICAgICAgfQorCisgICAgICBpZiAocGF0Y2hTZXRBbmNlc3RvcnMuc2l6ZSgpID4gMSkgeworICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oCisgICAgICAgICAgICAiQ2Fubm90IHJlYmFzZSBhIGNoYW5nZSB3aXRoIG11bHRpcGxlIHBhcmVudHMuIFBhcmVudHMgY29tbWl0czogIgorICAgICAgICAgICAgICAgICsgcGF0Y2hTZXRBbmNlc3RvcnMudG9TdHJpbmcoKSk7CisgICAgICB9CisgICAgICBpZiAocGF0Y2hTZXRBbmNlc3RvcnMuc2l6ZSgpID09IDApIHsKKyAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAorICAgICAgICAgICAgIkNhbm5vdCByZWJhc2UgYSBjaGFuZ2Ugd2l0aG91dCBhbnkgcGFyZW50cyAoaXMgdGhpcyB0aGUgaW5pdGlhbCBjb21taXQ/KS4iKTsKKyAgICAgIH0KKworICAgICAgUmV2SWQgYW5jZXN0b3JSZXYgPSBwYXRjaFNldEFuY2VzdG9ycy5nZXQoMCkuZ2V0QW5jZXN0b3JSZXZpc2lvbigpOworICAgICAgaWYgKGRlcFBhdGNoU2V0TGlzdCA9PSBudWxsIHx8IGRlcFBhdGNoU2V0TGlzdC5zaXplKCkgIT0gMSB8fAorICAgICAgICAgICFkZXBQYXRjaFNldExpc3QuZ2V0KDApLmdldFJldmlzaW9uKCkuZXF1YWxzKGFuY2VzdG9yUmV2KSkgeworICAgICAgICBkZXBQYXRjaFNldExpc3QgPSBkYi5wYXRjaFNldHMoKS5ieVJldmlzaW9uKGFuY2VzdG9yUmV2KS50b0xpc3QoKTsKKyAgICAgIH0KKworICAgICAgaWYgKCFkZXBQYXRjaFNldExpc3QuaXNFbXB0eSgpKSB7CisgICAgICAgIFBhdGNoU2V0IGRlcFBhdGNoU2V0ID0gZGVwUGF0Y2hTZXRMaXN0LmdldCgwKTsKKworICAgICAgICBDaGFuZ2UuSWQgZGVwQ2hhbmdlSWQgPSBkZXBQYXRjaFNldC5nZXRJZCgpLmdldFBhcmVudEtleSgpOworICAgICAgICBDaGFuZ2UgZGVwQ2hhbmdlOworICAgICAgICBpZiAoZGVwQ2hhbmdlTGlzdCA9PSBudWxsIHx8IGRlcENoYW5nZUxpc3Quc2l6ZSgpICE9IDEgfHwKKyAgICAgICAgICAgICFkZXBDaGFuZ2VMaXN0LmdldCgwKS5nZXRJZCgpLmVxdWFscyhkZXBDaGFuZ2VJZCkpIHsKKyAgICAgICAgICBkZXBDaGFuZ2UgPSBkYi5jaGFuZ2VzKCkuZ2V0KGRlcENoYW5nZUlkKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBkZXBDaGFuZ2UgPSBkZXBDaGFuZ2VMaXN0LmdldCgwKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChkZXBDaGFuZ2UuZ2V0U3RhdHVzKCkgPT0gU3RhdHVzLkFCQU5ET05FRCkgeworICAgICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiQ2Fubm90IHJlYmFzZSBhIGNoYW5nZSB3aXRoIGFuIGFiYW5kb25lZCBwYXJlbnQ6ICIKKyAgICAgICAgICAgICAgKyBkZXBDaGFuZ2UuZ2V0S2V5KCkudG9TdHJpbmcoKSk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoZGVwQ2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7CisgICAgICAgICAgaWYgKGRlcFBhdGNoU2V0LmdldElkKCkuZXF1YWxzKGRlcENoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpKSkgeworICAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKAorICAgICAgICAgICAgICAgICJDaGFuZ2UgaXMgYWxyZWFkeSBiYXNlZCBvbiB0aGUgbGF0ZXN0IHBhdGNoIHNldCBvZiB0aGUgZGVwZW5kZW50IGNoYW5nZS4iKTsKKyAgICAgICAgICB9CisgICAgICAgICAgUGF0Y2hTZXQgbGF0ZXN0RGVwUGF0Y2hTZXQgPQorICAgICAgICAgICAgICBkYi5wYXRjaFNldHMoKS5nZXQoZGVwQ2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpOworICAgICAgICAgIGJhc2VSZXYgPSBsYXRlc3REZXBQYXRjaFNldC5nZXRSZXZpc2lvbigpLmdldCgpOworICAgICAgICB9CisgICAgICB9CisKKyAgICAgIGlmIChiYXNlUmV2ID09IG51bGwpIHsKKyAgICAgICAgLy8gV2UgYXJlIGRlcGVuZGVudCBvbiBhIG1lcmdlZCBQYXRjaFNldCBvciBoYXZlIG5vIFBhdGNoU2V0CisgICAgICAgIC8vIGRlcGVuZGVuY2llcyBhdCBhbGwuCisgICAgICAgIFJlZiBkZXN0UmVmID0gZ2l0LmdldFJlZihkZXN0QnJhbmNoLmdldCgpKTsKKyAgICAgICAgaWYgKGRlc3RSZWYgPT0gbnVsbCkgeworICAgICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigKKyAgICAgICAgICAgICAgIlRoZSBkZXN0aW5hdGlvbiBicmFuY2ggZG9lcyBub3QgZXhpc3Q6ICIKKyAgICAgICAgICAgICAgICAgICsgZGVzdEJyYW5jaC5nZXQoKSk7CisgICAgICAgIH0KKyAgICAgICAgYmFzZVJldiA9IGRlc3RSZWYuZ2V0T2JqZWN0SWQoKS5nZXROYW1lKCk7CisgICAgICAgIGlmIChiYXNlUmV2LmVxdWFscyhhbmNlc3RvclJldi5nZXQoKSkpIHsKKyAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIkNoYW5nZSBpcyBhbHJlYWR5IHVwIHRvIGRhdGUuIik7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIHJldHVybiBiYXNlUmV2OworICAgIH0KKworICAvKioKKyAgICogUmViYXNlcyB0aGUgY2hhbmdlIG9mIHRoZSBnaXZlbiBwYXRjaCBzZXQgb24gdGhlIGdpdmVuIGJhc2UgY29tbWl0LgorICAgKgorICAgKiBUaGUgcmViYXNlZCBjb21taXQgaXMgYWRkZWQgYXMgbmV3IHBhdGNoIHNldCB0byB0aGUgY2hhbmdlLgorICAgKgorICAgKiBFLW1haWwgbm90aWZpY2F0aW9uIGFuZCB0cmlnZ2VyaW5nIG9mIGhvb2tzIGlzIE5PVCBkb25lIGZvciB0aGUgY3JlYXRpb24gb2YKKyAgICogdGhlIG5ldyBwYXRjaCBzZXQuCisgICAqCisgICAqIEBwYXJhbSBnaXQgdGhlIHJlcG9zaXRvcnkKKyAgICogQHBhcmFtIHJldldhbGsgdGhlIFJldldhbGsKKyAgICogQHBhcmFtIGluc2VydGVyIHRoZSBvYmplY3QgaW5zZXJ0ZXIKKyAgICogQHBhcmFtIHBhdGNoU2V0SWQgdGhlIGlkIG9mIHRoZSBwYXRjaCBzZXQKKyAgICogQHBhcmFtIGNoZyB0aGUgY2hhbmdlIHRoYXQgc2hvdWxkIGJlIHJlYmFzZWQKKyAgICogQHBhcmFtIHVwbG9hZGVyIHRoZSB1c2VyIHRoYXQgY3JlYXRlcyB0aGUgcmViYXNlZCBwYXRjaCBzZXQKKyAgICogQHBhcmFtIGJhc2VDb21taXQgdGhlIGNvbW1pdCB0aGF0IHNob3VsZCBiZSB0aGUgbmV3IGJhc2UKKyAgICogQHBhcmFtIG1lcmdlVXRpbCBtZXJnZSB1dGlsaXRpZXMgZm9yIHRoZSBkZXN0aW5hdGlvbiBwcm9qZWN0CisgICAqIEByZXR1cm4gdGhlIG5ldyBwYXRjaCBzZXQgd2hpY2ggaXMgYmFzZWQgb24gdGhlIGdpdmVuIGJhc2UgY29tbWl0CisgICAqIEB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uIHRocm93biBpZiB0aGUgY2hhbmdlIHRvIHdoaWNoIHRoZSBwYXRjaCBzZXQKKyAgICogICAgICAgICBiZWxvbmdzIGRvZXMgbm90IGV4aXN0IG9yIGlzIG5vdCB2aXNpYmxlIHRvIHRoZSB1c2VyCisgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uIHRocm93biBpbiBjYXNlIGFjY2Vzc2luZyB0aGUgZGF0YWJhc2UgZmFpbHMKKyAgICogQHRocm93cyBJT0V4Y2VwdGlvbiB0aHJvd24gaWYgcmViYXNlIGlzIG5vdCBwb3NzaWJsZSBvciBub3QgbmVlZGVkCisgICAqIEB0aHJvd3MgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbiB0aHJvd24gaWYgcmViYXNlIGlzIG5vdCBhbGxvd2VkCisgICAqLworICBwdWJsaWMgUGF0Y2hTZXQgcmViYXNlKGZpbmFsIFJlcG9zaXRvcnkgZ2l0LCBmaW5hbCBSZXZXYWxrIHJldldhbGssCisgICAgICBmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlciwgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwKKyAgICAgIGZpbmFsIENoYW5nZSBjaGcsIGZpbmFsIEFjY291bnQuSWQgdXBsb2FkZXIsIGZpbmFsIFJldkNvbW1pdCBiYXNlQ29tbWl0LAorICAgICAgZmluYWwgTWVyZ2VVdGlsIG1lcmdlVXRpbCkgdGhyb3dzIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiwKKyAgICAgIE9ybUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24sCisgICAgICBQYXRoQ29uZmxpY3RFeGNlcHRpb24geworICAgIENoYW5nZSBjaGFuZ2UgPSBjaGc7CisgICAgZmluYWwgUGF0Y2hTZXQgb3JpZ2luYWxQYXRjaFNldCA9IGRiLnBhdGNoU2V0cygpLmdldChwYXRjaFNldElkKTsKKworICAgIGZpbmFsIFJldkNvbW1pdCByZWJhc2VkQ29tbWl0OworICAgIE9iamVjdElkIG9sZElkID0gT2JqZWN0SWQuZnJvbVN0cmluZyhvcmlnaW5hbFBhdGNoU2V0LmdldFJldmlzaW9uKCkuZ2V0KCkpOworICAgIE9iamVjdElkIG5ld0lkID0gcmViYXNlQ29tbWl0KGdpdCwgaW5zZXJ0ZXIsIHJldldhbGsucGFyc2VDb21taXQob2xkSWQpLAorICAgICAgICBiYXNlQ29tbWl0LCBtZXJnZVV0aWwsIG15SWRlbnQpOworCisgICAgcmViYXNlZENvbW1pdCA9IHJldldhbGsucGFyc2VDb21taXQobmV3SWQpOworCisgICAgUGF0Y2hTZXQuSWQgaWQgPSBDaGFuZ2VVdGlsLm5leHRQYXRjaFNldElkKGdpdCwgY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpOworICAgIGZpbmFsIFBhdGNoU2V0IG5ld1BhdGNoU2V0ID0gbmV3IFBhdGNoU2V0KGlkKTsKKyAgICBuZXdQYXRjaFNldC5zZXRDcmVhdGVkT24obmV3IFRpbWVzdGFtcChTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKSkpOworICAgIG5ld1BhdGNoU2V0LnNldFVwbG9hZGVyKHVwbG9hZGVyKTsKKyAgICBuZXdQYXRjaFNldC5zZXRSZXZpc2lvbihuZXcgUmV2SWQocmViYXNlZENvbW1pdC5uYW1lKCkpKTsKKyAgICBuZXdQYXRjaFNldC5zZXREcmFmdChvcmlnaW5hbFBhdGNoU2V0LmlzRHJhZnQoKSk7CisKKyAgICBmaW5hbCBQYXRjaFNldEluZm8gaW5mbyA9CisgICAgICAgIHBhdGNoU2V0SW5mb0ZhY3RvcnkuZ2V0KHJlYmFzZWRDb21taXQsIG5ld1BhdGNoU2V0LmdldElkKCkpOworCisgICAgZmluYWwgUmVmVXBkYXRlIHJ1ID0gZ2l0LnVwZGF0ZVJlZihuZXdQYXRjaFNldC5nZXRSZWZOYW1lKCkpOworICAgIHJ1LnNldEV4cGVjdGVkT2xkT2JqZWN0SWQoT2JqZWN0SWQuemVyb0lkKCkpOworICAgIHJ1LnNldE5ld09iamVjdElkKHJlYmFzZWRDb21taXQpOworICAgIHJ1LmRpc2FibGVSZWZMb2coKTsKKyAgICBpZiAocnUudXBkYXRlKHJldldhbGspICE9IFJlZlVwZGF0ZS5SZXN1bHQuTkVXKSB7CisgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgiRmFpbGVkIHRvIGNyZWF0ZSByZWYgJXMgaW4gJXM6ICVzIiwKKyAgICAgICAgICBuZXdQYXRjaFNldC5nZXRSZWZOYW1lKCksIGNoYW5nZS5nZXREZXN0KCkuZ2V0UGFyZW50S2V5KCkuZ2V0KCksCisgICAgICAgICAgcnUuZ2V0UmVzdWx0KCkpKTsKKyAgICB9CisgICAgZ2l0UmVmVXBkYXRlZC5maXJlKGNoYW5nZS5nZXRQcm9qZWN0KCksIHJ1KTsKKworICAgIGRiLmNoYW5nZXMoKS5iZWdpblRyYW5zYWN0aW9uKGNoYW5nZS5nZXRJZCgpKTsKKyAgICB0cnkgeworICAgICAgQ2hhbmdlIHVwZGF0ZWRDaGFuZ2UgPSBkYi5jaGFuZ2VzKCkuZ2V0KGNoYW5nZS5nZXRJZCgpKTsKKyAgICAgIGlmICh1cGRhdGVkQ2hhbmdlICE9IG51bGwgJiYgY2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7CisgICAgICAgIGNoYW5nZSA9IHVwZGF0ZWRDaGFuZ2U7CisgICAgICB9IGVsc2UgeworICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgIkNoYW5nZSAlcyBpcyBjbG9zZWQiLCBjaGFuZ2UuZ2V0SWQoKSkpOworICAgICAgfQorCisgICAgICBDaGFuZ2VVdGlsLmluc2VydEFuY2VzdG9ycyhkYiwgbmV3UGF0Y2hTZXQuZ2V0SWQoKSwgcmViYXNlZENvbW1pdCk7CisgICAgICBkYi5wYXRjaFNldHMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKG5ld1BhdGNoU2V0KSk7CisgICAgICB1cGRhdGVkQ2hhbmdlID0KKyAgICAgICAgICBkYi5jaGFuZ2VzKCkuYXRvbWljVXBkYXRlKGNoYW5nZS5nZXRJZCgpLCBuZXcgQXRvbWljVXBkYXRlPENoYW5nZT4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyBDaGFuZ2UgdXBkYXRlKENoYW5nZSBjaGFuZ2UpIHsKKyAgICAgICAgICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKS5pc0Nsb3NlZCgpKSB7CisgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgaWYgKCFjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKS5lcXVhbHMocGF0Y2hTZXRJZCkpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpICE9IENoYW5nZS5TdGF0dXMuRFJBRlQpIHsKKyAgICAgICAgICAgICAgICBjaGFuZ2Uuc2V0U3RhdHVzKENoYW5nZS5TdGF0dXMuTkVXKTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICBjaGFuZ2Uuc2V0TGFzdFNoYTFNZXJnZVRlc3RlZChudWxsKTsKKyAgICAgICAgICAgICAgY2hhbmdlLnNldEN1cnJlbnRQYXRjaFNldChpbmZvKTsKKyAgICAgICAgICAgICAgQ2hhbmdlVXRpbC51cGRhdGVkKGNoYW5nZSk7CisgICAgICAgICAgICAgIHJldHVybiBjaGFuZ2U7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSk7CisgICAgICBpZiAodXBkYXRlZENoYW5nZSAhPSBudWxsKSB7CisgICAgICAgIGNoYW5nZSA9IHVwZGF0ZWRDaGFuZ2U7CisgICAgICB9IGVsc2UgeworICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgIkNoYW5nZSAlcyB3YXMgbW9kaWZpZWQiLCBjaGFuZ2UuZ2V0SWQoKSkpOworICAgICAgfQorCisgICAgICBmaW5hbCBMYWJlbFR5cGVzIGxhYmVsVHlwZXMgPQorICAgICAgICAgIHByb2plY3RDYWNoZS5nZXQoY2hhbmdlLmdldFByb2plY3QoKSkuZ2V0TGFiZWxUeXBlcygpOworICAgICAgYXBwcm92YWxzVXRpbC5jb3B5VmV0b3NUb1BhdGNoU2V0KGRiLCBsYWJlbFR5cGVzLAorICAgICAgICAgIGNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpKTsKKworICAgICAgZmluYWwgQ2hhbmdlTWVzc2FnZSBjbXNnID0KKyAgICAgICAgICBuZXcgQ2hhbmdlTWVzc2FnZShuZXcgQ2hhbmdlTWVzc2FnZS5LZXkoY2hhbmdlLmdldElkKCksCisgICAgICAgICAgICAgIENoYW5nZVV0aWwubWVzc2FnZVVVSUQoZGIpKSwgdXBsb2FkZXIsIHBhdGNoU2V0SWQpOworICAgICAgY21zZy5zZXRNZXNzYWdlKCJQYXRjaCBTZXQgIiArIGNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpLmdldCgpCisgICAgICAgICAgKyAiOiBQYXRjaCBTZXQgIiArIHBhdGNoU2V0SWQuZ2V0KCkgKyAiIHdhcyByZWJhc2VkIik7CisgICAgICBkYi5jaGFuZ2VNZXNzYWdlcygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24oY21zZykpOworICAgICAgZGIuY29tbWl0KCk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGRiLnJvbGxiYWNrKCk7CisgICAgfQorCisgICAgcmV0dXJuIG5ld1BhdGNoU2V0OworICB9CisKKyAgLyoqCisgICAqIFJlYmFzZXMgYSBjb21taXQuCisgICAqCisgICAqIEBwYXJhbSBnaXQgcmVwb3NpdG9yeSB0byBmaW5kIGNvbW1pdHMgaW4KKyAgICogQHBhcmFtIGluc2VydGVyIGluc2VydGVyIHRvIGhhbmRsZSBuZXcgdHJlZXMgYW5kIGJsb2JzCisgICAqIEBwYXJhbSBvcmlnaW5hbCBUaGUgY29tbWl0IHRvIHJlYmFzZQorICAgKiBAcGFyYW0gYmFzZSBCYXNlIHRvIHJlYmFzZSBhZ2FpbnN0CisgICAqIEBwYXJhbSBtZXJnZVV0aWwgbWVyZ2UgdXRpbGl0aWVzIGZvciB0aGUgZGVzdGluYXRpb24gcHJvamVjdAorICAgKiBAcGFyYW0gY29tbWl0dGVySWRlbnQgY29tbWl0dGVyIGlkZW50aXR5CisgICAqIEByZXR1cm4gdGhlIGlkIG9mIHRoZSByZWJhc2VkIGNvbW1pdAorICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uIE1lcmdlZCBmYWlsZWQKKyAgICogQHRocm93cyBQYXRoQ29uZmxpY3RFeGNlcHRpb24gdGhlIHJlYmFzZSBmYWlsZWQgZHVlIHRvIGEgcGF0aCBjb25mbGljdAorICAgKi8KKyAgcHJpdmF0ZSBPYmplY3RJZCByZWJhc2VDb21taXQoZmluYWwgUmVwb3NpdG9yeSBnaXQsCisgICAgICBmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlciwgZmluYWwgUmV2Q29tbWl0IG9yaWdpbmFsLAorICAgICAgZmluYWwgUmV2Q29tbWl0IGJhc2UsIGZpbmFsIE1lcmdlVXRpbCBtZXJnZVV0aWwsCisgICAgICBmaW5hbCBQZXJzb25JZGVudCBjb21taXR0ZXJJZGVudCkgdGhyb3dzIElPRXhjZXB0aW9uLAorICAgICAgUGF0aENvbmZsaWN0RXhjZXB0aW9uIHsKKworICAgIGZpbmFsIFJldkNvbW1pdCBwYXJlbnRDb21taXQgPSBvcmlnaW5hbC5nZXRQYXJlbnQoMCk7CisKKyAgICBpZiAoYmFzZS5lcXVhbHMocGFyZW50Q29tbWl0KSkgeworICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKCJDaGFuZ2UgaXMgYWxyZWFkeSB1cCB0byBkYXRlLiIpOworICAgIH0KKworICAgIGZpbmFsIFRocmVlV2F5TWVyZ2VyIG1lcmdlciA9IG1lcmdlVXRpbC5uZXdUaHJlZVdheU1lcmdlcihnaXQsIGluc2VydGVyKTsKKyAgICBtZXJnZXIuc2V0QmFzZShwYXJlbnRDb21taXQpOworICAgIG1lcmdlci5tZXJnZShvcmlnaW5hbCwgYmFzZSk7CisKKyAgICBpZiAobWVyZ2VyLmdldFJlc3VsdFRyZWVJZCgpID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBQYXRoQ29uZmxpY3RFeGNlcHRpb24oCisgICAgICAgICAgIlRoZSBjaGFuZ2UgY291bGQgbm90IGJlIHJlYmFzZWQgZHVlIHRvIGEgcGF0aCBjb25mbGljdCBkdXJpbmcgbWVyZ2UuIik7CisgICAgfQorCisgICAgZmluYWwgQ29tbWl0QnVpbGRlciBjYiA9IG5ldyBDb21taXRCdWlsZGVyKCk7CisgICAgY2Iuc2V0VHJlZUlkKG1lcmdlci5nZXRSZXN1bHRUcmVlSWQoKSk7CisgICAgY2Iuc2V0UGFyZW50SWQoYmFzZSk7CisgICAgY2Iuc2V0QXV0aG9yKG9yaWdpbmFsLmdldEF1dGhvcklkZW50KCkpOworICAgIGNiLnNldE1lc3NhZ2Uob3JpZ2luYWwuZ2V0RnVsbE1lc3NhZ2UoKSk7CisgICAgY2Iuc2V0Q29tbWl0dGVyKGNvbW1pdHRlcklkZW50KTsKKyAgICBmaW5hbCBPYmplY3RJZCBvYmplY3RJZCA9IGluc2VydGVyLmluc2VydChjYik7CisgICAgaW5zZXJ0ZXIuZmx1c2goKTsKKyAgICByZXR1cm4gb2JqZWN0SWQ7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGJvb2xlYW4gY2FuRG9SZWJhc2UoZmluYWwgUmV2aWV3RGIgZGIsCisgICAgICBmaW5hbCBDaGFuZ2UgY2hhbmdlLCBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyLAorICAgICAgTGlzdDxQYXRjaFNldEFuY2VzdG9yPiBwYXRjaFNldEFuY2VzdG9ycywKKyAgICAgIExpc3Q8UGF0Y2hTZXQ+IGRlcFBhdGNoU2V0TGlzdCwgTGlzdDxDaGFuZ2U+IGRlcENoYW5nZUxpc3QpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uLCBSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKworICAgIGZpbmFsIFJlcG9zaXRvcnkgZ2l0ID0gZ2l0TWFuYWdlci5vcGVuUmVwb3NpdG9yeShjaGFuZ2UuZ2V0UHJvamVjdCgpKTsKKworICAgIHRyeSB7CisgICAgICAvLyBJZiBubyBleGNlcHRpb24gaXMgdGhyb3duLCB0aGVuIHdlIGNhbiBkbyBhIHJlYmFzZS4KKyAgICAgIGZpbmRCYXNlUmV2aXNpb24oY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCksIGRiLCBjaGFuZ2UuZ2V0RGVzdCgpLCBnaXQsCisgICAgICAgICAgcGF0Y2hTZXRBbmNlc3RvcnMsIGRlcFBhdGNoU2V0TGlzdCwgZGVwQ2hhbmdlTGlzdCk7CisgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICByZXR1cm4gZmFsc2U7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGdpdC5jbG9zZSgpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvUmVzdG9yZUNoYW5nZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvUmVzdG9yZUNoYW5nZS5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA1M2RhMmI2Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY2hhbmdlZGV0YWlsL1Jlc3RvcmVDaGFuZ2UuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDE1NyArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlJldmlld1Jlc3VsdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ2hhbmdlVXRpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLlByb2plY3RVdGlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuRW1haWxFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmVzdG9yZWRTZW5kZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5JbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuQXRvbWljVXBkYXRlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOwotCi1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5DYWxsYWJsZTsKLQotaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5Bcmd1bWVudDsKLWltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouT3B0aW9uOwotCi1wdWJsaWMgY2xhc3MgUmVzdG9yZUNoYW5nZSBpbXBsZW1lbnRzIENhbGxhYmxlPFJldmlld1Jlc3VsdD4gewotCi0gIHByaXZhdGUgZmluYWwgUmVzdG9yZWRTZW5kZXIuRmFjdG9yeSByZXN0b3JlZFNlbmRlckZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIFJldmlld0RiIGRiOwotICBwcml2YXRlIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyOwotICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyOwotICBwcml2YXRlIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzOwotCi0gIEBBcmd1bWVudChpbmRleCA9IDAsIHJlcXVpcmVkID0gdHJ1ZSwgbXVsdGlWYWx1ZWQgPSBmYWxzZSwKLSAgICAgICAgICAgIHVzYWdlID0gImNoYW5nZSB0byByZXN0b3JlIiwgbWV0YVZhciA9ICJDSEFOR0UiKQotICBwcml2YXRlIENoYW5nZS5JZCBjaGFuZ2VJZDsKLSAgcHVibGljIHZvaWQgc2V0Q2hhbmdlSWQoZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkKSB7Ci0gICAgdGhpcy5jaGFuZ2VJZCA9IGNoYW5nZUlkOwotICB9Ci0KLSAgQE9wdGlvbihuYW1lID0gIi0tbWVzc2FnZSIsIGFsaWFzZXMgPSB7Ii1tIn0sCi0gICAgICAgICAgdXNhZ2UgPSAib3B0aW9uYWwgbWVzc2FnZSB0byBhcHBlbmQgdG8gY2hhbmdlIikKLSAgcHJpdmF0ZSBTdHJpbmcgbWVzc2FnZTsKLSAgcHVibGljIHZvaWQgc2V0TWVzc2FnZShmaW5hbCBTdHJpbmcgbWVzc2FnZSkgewotICAgIHRoaXMubWVzc2FnZSA9IG1lc3NhZ2U7Ci0gIH0KLQotICBASW5qZWN0Ci0gIFJlc3RvcmVDaGFuZ2UoZmluYWwgUmVzdG9yZWRTZW5kZXIuRmFjdG9yeSByZXN0b3JlZFNlbmRlckZhY3RvcnksCi0gICAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksIGZpbmFsIFJldmlld0RiIGRiLAotICAgICAgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXIsIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLAotICAgICAgZmluYWwgQ2hhbmdlSG9va3MgaG9va3MpIHsKLSAgICB0aGlzLnJlc3RvcmVkU2VuZGVyRmFjdG9yeSA9IHJlc3RvcmVkU2VuZGVyRmFjdG9yeTsKLSAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7Ci0gICAgdGhpcy5kYiA9IGRiOwotICAgIHRoaXMucmVwb01hbmFnZXIgPSByZXBvTWFuYWdlcjsKLSAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7Ci0gICAgdGhpcy5ob29rcyA9IGhvb2tzOwotCi0gICAgY2hhbmdlSWQgPSBudWxsOwotICAgIG1lc3NhZ2UgPSBudWxsOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBSZXZpZXdSZXN1bHQgY2FsbCgpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiwgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLAotICAgICAgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLAotICAgICAgUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7Ci0gICAgaWYgKGNoYW5nZUlkID09IG51bGwpIHsKLSAgICAgIHRocm93IG5ldyBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uKCJjaGFuZ2VJZCBpcyByZXF1aXJlZCIpOwotICAgIH0KLQotICAgIGZpbmFsIFJldmlld1Jlc3VsdCByZXN1bHQgPSBuZXcgUmV2aWV3UmVzdWx0KCk7Ci0gICAgcmVzdWx0LnNldENoYW5nZUlkKGNoYW5nZUlkKTsKLQotICAgIGZpbmFsIENoYW5nZUNvbnRyb2wgY29udHJvbCA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5LnZhbGlkYXRlRm9yKGNoYW5nZUlkKTsKLSAgICBmaW5hbCBDaGFuZ2UgY2hhbmdlID0gZGIuY2hhbmdlcygpLmdldChjaGFuZ2VJZCk7Ci0gICAgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCA9IGNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpOwotICAgIGlmICghY29udHJvbC5jYW5SZXN0b3JlKCkpIHsKLSAgICAgIHJlc3VsdC5hZGRFcnJvcihuZXcgUmV2aWV3UmVzdWx0LkVycm9yKAotICAgICAgICAgIFJldmlld1Jlc3VsdC5FcnJvci5UeXBlLlJFU1RPUkVfTk9UX1BFUk1JVFRFRCkpOwotICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICB9Ci0KLSAgICBmaW5hbCBQYXRjaFNldCBwYXRjaCA9IGRiLnBhdGNoU2V0cygpLmdldChwYXRjaFNldElkKTsKLSAgICBpZiAocGF0Y2ggPT0gbnVsbCkgewotICAgICAgdGhyb3cgbmV3IE5vU3VjaENoYW5nZUV4Y2VwdGlvbihjaGFuZ2VJZCk7Ci0gICAgfQotCi0gICAgZmluYWwgQnJhbmNoLk5hbWVLZXkgZGVzdEJyYW5jaCA9IGNvbnRyb2wuZ2V0Q2hhbmdlKCkuZ2V0RGVzdCgpOwotICAgIGlmICghUHJvamVjdFV0aWwuYnJhbmNoRXhpc3RzKHJlcG9NYW5hZ2VyLCBkZXN0QnJhbmNoKSkgewotICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdSZXN1bHQuRXJyb3IoCi0gICAgICAgICAgUmV2aWV3UmVzdWx0LkVycm9yLlR5cGUuREVTVF9CUkFOQ0hfTk9UX0ZPVU5ELCBkZXN0QnJhbmNoLmdldCgpKSk7Ci0gICAgICByZXR1cm4gcmVzdWx0OwotICAgIH0KLQotICAgIC8vIENyZWF0ZSBhIG1lc3NhZ2UgdG8gYWNjb21wYW55IHRoZSByZXN0b3JlZCBjaGFuZ2UKLSAgICBmaW5hbCBDaGFuZ2VNZXNzYWdlIGNtc2cgPQotICAgICAgICBuZXcgQ2hhbmdlTWVzc2FnZShuZXcgQ2hhbmdlTWVzc2FnZS5LZXkoY2hhbmdlSWQsIENoYW5nZVV0aWwKLSAgICAgICAgICAgIC5tZXNzYWdlVVVJRChkYikpLCBjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKSwgcGF0Y2hTZXRJZCk7Ci0gICAgZmluYWwgU3RyaW5nQnVpbGRlciBtc2dCdWYgPQotICAgICAgICBuZXcgU3RyaW5nQnVpbGRlcigiUGF0Y2ggU2V0ICIgKyBwYXRjaFNldElkLmdldCgpICsgIjogUmVzdG9yZWQiKTsKLSAgICBpZiAobWVzc2FnZSAhPSBudWxsICYmIG1lc3NhZ2UubGVuZ3RoKCkgPiAwKSB7Ci0gICAgICBtc2dCdWYuYXBwZW5kKCJcblxuIik7Ci0gICAgICBtc2dCdWYuYXBwZW5kKG1lc3NhZ2UpOwotICAgIH0KLSAgICBjbXNnLnNldE1lc3NhZ2UobXNnQnVmLnRvU3RyaW5nKCkpOwotCi0gICAgLy8gUmVzdG9yZSB0aGUgY2hhbmdlCi0gICAgZmluYWwgQ2hhbmdlIHVwZGF0ZWRDaGFuZ2UgPSBkYi5jaGFuZ2VzKCkuYXRvbWljVXBkYXRlKGNoYW5nZUlkLAotICAgICAgICBuZXcgQXRvbWljVXBkYXRlPENoYW5nZT4oKSB7Ci0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHVibGljIENoYW5nZSB1cGRhdGUoQ2hhbmdlIGNoYW5nZSkgewotICAgICAgICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKSA9PSBDaGFuZ2UuU3RhdHVzLkFCQU5ET05FRCkgewotICAgICAgICAgICAgICBjaGFuZ2Uuc2V0U3RhdHVzKENoYW5nZS5TdGF0dXMuTkVXKTsKLSAgICAgICAgICAgICAgQ2hhbmdlVXRpbC51cGRhdGVkKGNoYW5nZSk7Ci0gICAgICAgICAgICAgIHJldHVybiBjaGFuZ2U7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9Ci0gICAgICAgIH0pOwotCi0gICAgaWYgKHVwZGF0ZWRDaGFuZ2UgPT0gbnVsbCkgewotICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdSZXN1bHQuRXJyb3IoCi0gICAgICAgICAgUmV2aWV3UmVzdWx0LkVycm9yLlR5cGUuQ0hBTkdFX05PVF9BQkFORE9ORUQpKTsKLSAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgfQotCi0gICAgQ2hhbmdlVXRpbC51cGRhdGVkQ2hhbmdlKGRiLCBjdXJyZW50VXNlciwgdXBkYXRlZENoYW5nZSwgY21zZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdG9yZWRTZW5kZXJGYWN0b3J5KTsKLSAgICBob29rcy5kb0NoYW5nZVJlc3RvcmVkSG9vayh1cGRhdGVkQ2hhbmdlLCBjdXJyZW50VXNlci5nZXRBY2NvdW50KCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWVzc2FnZSwgZGIpOwotCi0gICAgcmV0dXJuIHJlc3VsdDsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2VkZXRhaWwvU3VibWl0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9TdWJtaXQuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMzI4N2FhMS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZWRldGFpbC9TdWJtaXQuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDIwNyArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZWRldGFpbDsKLQotaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeS5TVUJNSVQ7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0UmVjb3JkOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ2hhbmdlVXRpbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLlByb2plY3RVdGlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZU9wOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VRdWV1ZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5BdG9taWNVcGRhdGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7Ci0KLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNhbGxhYmxlOwotCi1wdWJsaWMgY2xhc3MgU3VibWl0IGltcGxlbWVudHMgQ2FsbGFibGU8UmV2aWV3UmVzdWx0PiB7Ci0KLSAgcHVibGljIGludGVyZmFjZSBGYWN0b3J5IHsKLSAgICBTdWJtaXQgY3JlYXRlKFBhdGNoU2V0LklkIHBhdGNoU2V0SWQpOwotICB9Ci0KLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgTWVyZ2VPcC5GYWN0b3J5IG9wRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBNZXJnZVF1ZXVlIG1lcmdlcjsKLSAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKLSAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcjsKLSAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlcjsKLQotICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQ7Ci0KLSAgQEluamVjdAotICBTdWJtaXQoZmluYWwgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNoYW5nZUNvbnRyb2xGYWN0b3J5LAotICAgICAgZmluYWwgTWVyZ2VPcC5GYWN0b3J5IG9wRmFjdG9yeSwgZmluYWwgTWVyZ2VRdWV1ZSBtZXJnZXIsCi0gICAgICBmaW5hbCBSZXZpZXdEYiBkYiwgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXIsCi0gICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlciwgQEFzc2lzdGVkIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQpIHsKLSAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7Ci0gICAgdGhpcy5vcEZhY3RvcnkgPSBvcEZhY3Rvcnk7Ci0gICAgdGhpcy5tZXJnZXIgPSBtZXJnZXI7Ci0gICAgdGhpcy5kYiA9IGRiOwotICAgIHRoaXMucmVwb01hbmFnZXIgPSByZXBvTWFuYWdlcjsKLSAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7Ci0KLSAgICB0aGlzLnBhdGNoU2V0SWQgPSBwYXRjaFNldElkOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBSZXZpZXdSZXN1bHQgY2FsbCgpIHRocm93cyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24sCi0gICAgICBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uLCBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiwKLSAgICAgIElPRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBSZXZpZXdSZXN1bHQgcmVzdWx0ID0gbmV3IFJldmlld1Jlc3VsdCgpOwotCi0gICAgZmluYWwgUGF0Y2hTZXQgcGF0Y2ggPSBkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCk7Ci0gICAgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkID0gcGF0Y2hTZXRJZC5nZXRQYXJlbnRLZXkoKTsKLSAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSBjaGFuZ2VDb250cm9sRmFjdG9yeS52YWxpZGF0ZUZvcihjaGFuZ2VJZCk7Ci0gICAgcmVzdWx0LnNldENoYW5nZUlkKGNoYW5nZUlkKTsKLSAgICBpZiAocGF0Y2ggPT0gbnVsbCkgewotICAgICAgdGhyb3cgbmV3IE5vU3VjaENoYW5nZUV4Y2VwdGlvbihjaGFuZ2VJZCk7Ci0gICAgfQotCi0gICAgTGlzdDxTdWJtaXRSZWNvcmQ+IHN1Ym1pdFJlc3VsdCA9IGNvbnRyb2wuY2FuU3VibWl0KGRiLCBwYXRjaCk7Ci0gICAgaWYgKHN1Ym1pdFJlc3VsdC5pc0VtcHR5KCkpIHsKLSAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oCi0gICAgICAgICAgIkNoYW5nZUNvbnRyb2wuY2FuU3VibWl0IHJldHVybmVkIGVtcHR5IGxpc3QiKTsKLSAgICB9Ci0KLSAgICBmb3IgKFN1Ym1pdFJlY29yZCBzdWJtaXRSZWNvcmQgOiBzdWJtaXRSZXN1bHQpIHsKLSAgICAgIHN3aXRjaCAoc3VibWl0UmVjb3JkLnN0YXR1cykgewotICAgICAgICBjYXNlIE9LOgotICAgICAgICAgIGlmICghY29udHJvbC5nZXRSZWZDb250cm9sKCkuY2FuU3VibWl0KCkpIHsKLSAgICAgICAgICAgIHJlc3VsdC5hZGRFcnJvcihuZXcgUmV2aWV3UmVzdWx0LkVycm9yKAotICAgICAgICAgICAgICBSZXZpZXdSZXN1bHQuRXJyb3IuVHlwZS5TVUJNSVRfTk9UX1BFUk1JVFRFRCkpOwotICAgICAgICAgIH0KLSAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIE5PVF9SRUFEWToKLSAgICAgICAgICBTdHJpbmdCdWlsZGVyIGVyck1zZyA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgICAgICAgZm9yIChTdWJtaXRSZWNvcmQuTGFiZWwgbGJsIDogc3VibWl0UmVjb3JkLmxhYmVscykgewotICAgICAgICAgICAgc3dpdGNoIChsYmwuc3RhdHVzKSB7Ci0gICAgICAgICAgICAgIGNhc2UgT0s6Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgY2FzZSBSRUpFQ1Q6Ci0gICAgICAgICAgICAgICAgaWYgKGVyck1zZy5sZW5ndGgoKSA+IDApIGVyck1zZy5hcHBlbmQoIjsgIik7Ci0gICAgICAgICAgICAgICAgZXJyTXNnLmFwcGVuZCgiY2hhbmdlICIgKyBjaGFuZ2VJZCArICI6IGJsb2NrZWQgYnkgIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyBsYmwubGFiZWwpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgICAgICAgIGNhc2UgTkVFRDoKLSAgICAgICAgICAgICAgICBpZiAoZXJyTXNnLmxlbmd0aCgpID4gMCkgZXJyTXNnLmFwcGVuZCgiOyAiKTsKLSAgICAgICAgICAgICAgICBlcnJNc2cuYXBwZW5kKCJjaGFuZ2UgIiArIGNoYW5nZUlkICsgIjogbmVlZHMgIiArIGxibC5sYWJlbCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgY2FzZSBNQVk6Ci0gICAgICAgICAgICAgICAgLy8gVGhlIE1BWSBsYWJlbCBkaWRuJ3QgY2F1c2UgdGhlIE5PVF9SRUFEWSBzdGF0dXMKLSAgICAgICAgICAgICAgICBicmVhazsKLQotICAgICAgICAgICAgICBjYXNlIElNUE9TU0lCTEU6Ci0gICAgICAgICAgICAgICAgaWYgKGVyck1zZy5sZW5ndGgoKSA+IDApIGVyck1zZy5hcHBlbmQoIjsgIik7Ci0gICAgICAgICAgICAgICAgZXJyTXNnLmFwcGVuZCgiY2hhbmdlICIgKyBjaGFuZ2VJZCArICI6IG5lZWRzICIgKyBsYmwubGFiZWwKLSAgICAgICAgICAgICAgICAgICAgKyAiIChjaGVjayBwcm9qZWN0IGFjY2VzcykiKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLQotICAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIHRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oCi0gICAgICAgICAgICAgICAgICAgICJVbnN1cHBvcnRlZCBTdWJtaXRSZWNvcmQuTGFiZWwuc3RhdHVzICgiICsgbGJsLnN0YXR1cwotICAgICAgICAgICAgICAgICAgICArICIpIik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgfQotICAgICAgICAgIHJlc3VsdC5hZGRFcnJvcihuZXcgUmV2aWV3UmVzdWx0LkVycm9yKAotICAgICAgICAgICAgUmV2aWV3UmVzdWx0LkVycm9yLlR5cGUuU1VCTUlUX05PVF9SRUFEWSwgZXJyTXNnLnRvU3RyaW5nKCkpKTsKLSAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIENMT1NFRDoKLSAgICAgICAgICByZXN1bHQuYWRkRXJyb3IobmV3IFJldmlld1Jlc3VsdC5FcnJvcigKLSAgICAgICAgICAgIFJldmlld1Jlc3VsdC5FcnJvci5UeXBlLkNIQU5HRV9JU19DTE9TRUQpKTsKLSAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIFJVTEVfRVJST1I6Ci0gICAgICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdSZXN1bHQuRXJyb3IoCi0gICAgICAgICAgICBSZXZpZXdSZXN1bHQuRXJyb3IuVHlwZS5SVUxFX0VSUk9SLAotICAgICAgICAgICAgc3VibWl0UmVzdWx0LmdldCgwKS5lcnJvck1lc3NhZ2UpKTsKLSAgICAgICAgICBicmVhazsKLQotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oCi0gICAgICAgICAgICAgICJVbnN1cHBvcnRlZCBTdWJtaXRSZWNvcmQuc3RhdHVzICsgKCIgKyBzdWJtaXRSZWNvcmQuc3RhdHVzCi0gICAgICAgICAgICAgICsgIikiKTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBpZiAoIVByb2plY3RVdGlsLmJyYW5jaEV4aXN0cyhyZXBvTWFuYWdlciwgY29udHJvbC5nZXRDaGFuZ2UoKS5nZXREZXN0KCkpKSB7Ci0gICAgICByZXN1bHQuYWRkRXJyb3IobmV3IFJldmlld1Jlc3VsdC5FcnJvcigKLSAgICAgICAgICBSZXZpZXdSZXN1bHQuRXJyb3IuVHlwZS5ERVNUX0JSQU5DSF9OT1RfRk9VTkQsCi0gICAgICAgICAgIkRlc3RpbmF0aW9uIGJyYW5jaCBcIiIgKyBjb250cm9sLmdldENoYW5nZSgpLmdldERlc3QoKS5nZXQoKQotICAgICAgICAgICAgICArICJcIiBub3QgZm91bmQuIikpOwotICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICB9Ci0KLSAgICAvLyBTdWJtaXQgdGhlIGNoYW5nZSBpZiB3ZSBjYW4KLSAgICBpZiAocmVzdWx0LmdldEVycm9ycygpLmlzRW1wdHkoKSkgewotICAgICAgZmluYWwgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBhbGxBcHByb3ZhbHMgPQotICAgICAgICAgIG5ldyBBcnJheUxpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4oZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieVBhdGNoU2V0KAotICAgICAgICAgICAgICBwYXRjaFNldElkKS50b0xpc3QoKSk7Ci0KLSAgICAgIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwuS2V5IGFrZXkgPQotICAgICAgICAgIG5ldyBQYXRjaFNldEFwcHJvdmFsLktleShwYXRjaFNldElkLCBjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU1VCTUlUKTsKLQotICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBhcHByb3ZhbCA9IG5ldyBQYXRjaFNldEFwcHJvdmFsKGFrZXksIChzaG9ydCkgMSk7Ci0gICAgICBmb3IgKGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgY2FuZGlkYXRlQXBwcm92YWwgOiBhbGxBcHByb3ZhbHMpIHsKLSAgICAgICAgaWYgKGFrZXkuZXF1YWxzKGNhbmRpZGF0ZUFwcHJvdmFsLmdldEtleSgpKSkgewotICAgICAgICAgIGNhbmRpZGF0ZUFwcHJvdmFsLnNldFZhbHVlKChzaG9ydCkgMSk7Ci0gICAgICAgICAgY2FuZGlkYXRlQXBwcm92YWwuc2V0R3JhbnRlZCgpOwotICAgICAgICAgIGFwcHJvdmFsID0gY2FuZGlkYXRlQXBwcm92YWw7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkudXBzZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihhcHByb3ZhbCkpOwotCi0gICAgICBmaW5hbCBDaGFuZ2UgdXBkYXRlZENoYW5nZSA9IGRiLmNoYW5nZXMoKS5hdG9taWNVcGRhdGUoY2hhbmdlSWQsCi0gICAgICAgICAgbmV3IEF0b21pY1VwZGF0ZTxDaGFuZ2U+KCkgewotICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgcHVibGljIENoYW5nZSB1cGRhdGUoQ2hhbmdlIGNoYW5nZSkgewotICAgICAgICAgIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkgPT0gQ2hhbmdlLlN0YXR1cy5ORVcpIHsKLSAgICAgICAgICAgIGNoYW5nZS5zZXRTdGF0dXMoQ2hhbmdlLlN0YXR1cy5TVUJNSVRURUQpOwotICAgICAgICAgICAgQ2hhbmdlVXRpbC51cGRhdGVkKGNoYW5nZSk7Ci0gICAgICAgICAgfQotICAgICAgICAgIHJldHVybiBjaGFuZ2U7Ci0gICAgICAgIH0KLSAgICAgIH0pOwotCi0gICAgICBpZiAodXBkYXRlZENoYW5nZS5nZXRTdGF0dXMoKSA9PSBDaGFuZ2UuU3RhdHVzLlNVQk1JVFRFRCkgewotICAgICAgICBtZXJnZXIubWVyZ2Uob3BGYWN0b3J5LCB1cGRhdGVkQ2hhbmdlLmdldERlc3QoKSk7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiByZXN1bHQ7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0FwcHJvdmFsVHlwZXNQcm92aWRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQXBwcm92YWxUeXBlc1Byb3ZpZGVyLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGVkOTQxNmQuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQXBwcm92YWxUeXBlc1Byb3ZpZGVyLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw2MSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZzsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlNjaGVtYUZhY3Rvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3Zpc2lvbkV4Y2VwdGlvbjsKLQotaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotCi1wdWJsaWMgY2xhc3MgQXBwcm92YWxUeXBlc1Byb3ZpZGVyIGltcGxlbWVudHMgUHJvdmlkZXI8QXBwcm92YWxUeXBlcz4gewotICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYTsKLQotICBASW5qZWN0Ci0gIEFwcHJvdmFsVHlwZXNQcm92aWRlcihmaW5hbCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzZikgewotICAgIHNjaGVtYSA9IHNmOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBBcHByb3ZhbFR5cGVzIGdldCgpIHsKLSAgICBMaXN0PEFwcHJvdmFsVHlwZT4gdHlwZXMgPSBuZXcgQXJyYXlMaXN0PEFwcHJvdmFsVHlwZT4oMik7Ci0KLSAgICB0cnkgewotICAgICAgZmluYWwgUmV2aWV3RGIgZGIgPSBzY2hlbWEub3BlbigpOwotICAgICAgdHJ5IHsKLSAgICAgICAgZm9yIChmaW5hbCBBcHByb3ZhbENhdGVnb3J5IGMgOiBkYi5hcHByb3ZhbENhdGVnb3JpZXMoKS5hbGwoKSkgewotICAgICAgICAgIGZpbmFsIExpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPiB2YWx1ZXMgPQotICAgICAgICAgICAgICBkYi5hcHByb3ZhbENhdGVnb3J5VmFsdWVzKCkuYnlDYXRlZ29yeShjLmdldElkKCkpLnRvTGlzdCgpOwotICAgICAgICAgIHR5cGVzLmFkZChuZXcgQXBwcm92YWxUeXBlKGMsIHZhbHVlcykpOwotICAgICAgICB9Ci0gICAgICB9IGZpbmFsbHkgewotICAgICAgICBkYi5jbG9zZSgpOwotICAgICAgfQotICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgUHJvdmlzaW9uRXhjZXB0aW9uKCJDYW5ub3QgcXVlcnkgYXBwcm92YWwgY2F0ZWdvcmllcyIsIGUpOwotICAgIH0KLQotICAgIHJldHVybiBuZXcgQXBwcm92YWxUeXBlcyhDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVMaXN0KHR5cGVzKSk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0F1dGhDb25maWcuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0F1dGhDb25maWcuamF2YQppbmRleCA5OTE2MjU3Li45YTgwNGMxIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9BdXRoQ29uZmlnLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQXV0aENvbmZpZy5qYXZhCkBAIC0xNCw5ICsxNCw5IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZzsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5hdXRoLm9wZW5pZC5PcGVuSWRQcm92aWRlclBhdHRlcm47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRFeHRlcm5hbElkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BdXRoVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYXV0aC5vcGVuaWQuT3BlbklkUHJvdmlkZXJQYXR0ZXJuOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5zZXJ2ZXIuU2lnbmVkVG9rZW47CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rqc29ucnBjLnNlcnZlci5Yc3JmRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTI1LDYgKzI1LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwpAQCAtNDAsNiArNDEsNyBAQAogICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gZ2l0QmFzaWNBdXRoOwogICBwcml2YXRlIGZpbmFsIFN0cmluZyBsb2dvdXRVcmw7CiAgIHByaXZhdGUgZmluYWwgU3RyaW5nIG9wZW5JZFNzb1VybDsKKyAgcHJpdmF0ZSBmaW5hbCBMaXN0PFN0cmluZz4gb3BlbklkRG9tYWluczsKICAgcHJpdmF0ZSBmaW5hbCBMaXN0PE9wZW5JZFByb3ZpZGVyUGF0dGVybj4gdHJ1c3RlZE9wZW5JRHM7CiAgIHByaXZhdGUgZmluYWwgTGlzdDxPcGVuSWRQcm92aWRlclBhdHRlcm4+IGFsbG93ZWRPcGVuSURzOwogICBwcml2YXRlIGZpbmFsIFN0cmluZyBjb29raWVQYXRoOwpAQCAtNTYsNiArNTgsNyBAQAogICAgIGh0dHBIZWFkZXIgPSBjZmcuZ2V0U3RyaW5nKCJhdXRoIiwgbnVsbCwgImh0dHBoZWFkZXIiKTsKICAgICBsb2dvdXRVcmwgPSBjZmcuZ2V0U3RyaW5nKCJhdXRoIiwgbnVsbCwgImxvZ291dHVybCIpOwogICAgIG9wZW5JZFNzb1VybCA9IGNmZy5nZXRTdHJpbmcoImF1dGgiLCBudWxsLCAib3Blbmlkc3NvdXJsIik7CisgICAgb3BlbklkRG9tYWlucyA9IEFycmF5cy5hc0xpc3QoY2ZnLmdldFN0cmluZ0xpc3QoImF1dGgiLCBudWxsLCAib3BlbklkRG9tYWluIikpOwogICAgIHRydXN0ZWRPcGVuSURzID0gdG9QYXR0ZXJucyhjZmcsICJ0cnVzdGVkT3BlbklEIik7CiAgICAgYWxsb3dlZE9wZW5JRHMgPSB0b1BhdHRlcm5zKGNmZywgImFsbG93ZWRPcGVuSUQiKTsKICAgICBjb29raWVQYXRoID0gY2ZnLmdldFN0cmluZygiYXV0aCIsIG51bGwsICJjb29raWVwYXRoIik7CkBAIC0xMjcsNiArMTMwLDEwIEBACiAgICAgcmV0dXJuIG9wZW5JZFNzb1VybDsKICAgfQogCisgIHB1YmxpYyBMaXN0PFN0cmluZz4gZ2V0T3BlbklkRG9tYWlucygpIHsKKyAgICByZXR1cm4gb3BlbklkRG9tYWluczsKKyAgfQorCiAgIHB1YmxpYyBTdHJpbmcgZ2V0Q29va2llUGF0aCgpIHsKICAgICByZXR1cm4gY29va2llUGF0aDsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQ29uZmlnU2VjdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQ29uZmlnU2VjdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA1N2NlOTkKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9Db25maWdTZWN0aW9uLmphdmEKQEAgLTAsMCArMSwzNyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWc7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CisKKy8qKiBQcm92aWRlcyBhY2Nlc3MgdG8gb25lIHNlY3Rpb24gZnJvbSB7QGxpbmsgQ29uZmlnfSAqLworcHVibGljIGNsYXNzIENvbmZpZ1NlY3Rpb24geworCisgIHByaXZhdGUgZmluYWwgQ29uZmlnIGNmZzsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgc2VjdGlvbjsKKworICBwdWJsaWMgQ29uZmlnU2VjdGlvbihDb25maWcgY2ZnLCBTdHJpbmcgc2VjdGlvbikgeworICAgIHRoaXMuY2ZnID0gY2ZnOworICAgIHRoaXMuc2VjdGlvbiA9IHNlY3Rpb247CisgIH0KKworICBwdWJsaWMgU3RyaW5nIG9wdGlvbmFsKFN0cmluZyBuYW1lKSB7CisgICAgcmV0dXJuIGNmZy5nZXRTdHJpbmcoc2VjdGlvbiwgbnVsbCwgbmFtZSk7CisgIH0KKworICBwdWJsaWMgU3RyaW5nIHJlcXVpcmVkKFN0cmluZyBuYW1lKSB7CisgICAgcmV0dXJuIENvbmZpZ1V0aWwuZ2V0UmVxdWlyZWQoY2ZnLCBzZWN0aW9uLCBuYW1lKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQ29uZmlnVXRpbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvQ29uZmlnVXRpbC5qYXZhCmluZGV4IGNjNTQwNTQuLjk1YzE1MDAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0NvbmZpZ1V0aWwuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9Db25maWdVdGlsLmphdmEKQEAgLTEwMiw3ICsxMDIsNyBAQAogICAgICAgZmluYWwgU3RyaW5nIHN1YnNlY3Rpb24sIGZpbmFsIFN0cmluZyBzZXR0aW5nLCBTdHJpbmcgdmFsdWVTdHJpbmcsCiAgICAgICBmaW5hbCBUW10gYWxsKSB7CiAKLSAgICBTdHJpbmcgbiA9IHZhbHVlU3RyaW5nLnJlcGxhY2UoJyAnLCAnXycpOworICAgIFN0cmluZyBuID0gdmFsdWVTdHJpbmcucmVwbGFjZSgnICcsICdfJykucmVwbGFjZSgnLScsICdfJyk7CiAgICAgZm9yIChmaW5hbCBUIGUgOiBhbGwpIHsKICAgICAgIGlmIChlcXVhbHNJZ25vcmVDYXNlKGUubmFtZSgpLCBuKSkgewogICAgICAgICByZXR1cm4gZTsKQEAgLTI4Niw2ICsyODYsMTUgQEAKICAgICB9CiAgIH0KIAorICBwdWJsaWMgc3RhdGljIFN0cmluZyBnZXRSZXF1aXJlZChDb25maWcgY2ZnLCBTdHJpbmcgc2VjdGlvbiwgU3RyaW5nIG5hbWUpIHsKKyAgICBmaW5hbCBTdHJpbmcgdiA9IGNmZy5nZXRTdHJpbmcoc2VjdGlvbiwgbnVsbCwgbmFtZSk7CisgICAgaWYgKHYgPT0gbnVsbCB8fCAiIi5lcXVhbHModikpIHsKKyAgICAgIHRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oIk5vICIgKyBzZWN0aW9uICsgIi4iICsgbmFtZQorICAgICAgICAgICsgIiBjb25maWd1cmVkIik7CisgICAgfQorICAgIHJldHVybiB2OworICB9CisKICAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBtYXRjaChmaW5hbCBTdHJpbmcgYSwgZmluYWwgU3RyaW5nLi4uIGNhc2VzKSB7CiAgICAgZm9yIChmaW5hbCBTdHJpbmcgYiA6IGNhc2VzKSB7CiAgICAgICBpZiAoZXF1YWxzSWdub3JlQ2FzZShhLCBiKSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvR2Vycml0R2xvYmFsTW9kdWxlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9HZXJyaXRHbG9iYWxNb2R1bGUuamF2YQppbmRleCAyYTY2NzA2Li4xZGE2MTFjIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9HZXJyaXRHbG9iYWxNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9HZXJyaXRHbG9iYWxNb2R1bGUuamF2YQpAQCAtMTgsOSArMTgsMTAgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkNhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmF1ZGl0LkF1ZGl0TW9kdWxlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUxpc3RlbmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuZXZlbnRzLkdpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5OZXdQcm9qZWN0Q3JlYXRlZExpc3RlbmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLkR5bmFtaWNJdGVtOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLkR5bmFtaWNNYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXV0aFR5cGU7CkBAIC0zMSw1MCArMzIsODAgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkludGVybmFsVXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuTWltZVV0aWxGaWxlVHlwZVJlZ2lzdHJ5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5QbHVnaW5Vc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRCeUVtYWlsQ2FjaGVJbXBsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZUltcGw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudENvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEluZm9DYWNoZUZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudE1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudFJlc29sdmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRWaXNpYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRWaXNpYmlsaXR5UHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2FwYWJpbGl0eUNvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2hhbmdlVXNlck5hbWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuRGVmYXVsdFJlYWxtOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkVtYWlsRXhwYW5kZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBCYWNrZW5kOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGVJbXBsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cERldGFpbEZhY3Rvcnk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBJbmNsdWRlQ2FjaGVJbXBsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwSW5mb0NhY2hlRmFjdG9yeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cE1lbWJlcnM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuSW5jbHVkaW5nR3JvdXBNZW1iZXJzaGlwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkludGVybmFsR3JvdXBCYWNrZW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LlBlcmZvcm1DcmVhdGVHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5QZXJmb3JtUmVuYW1lR3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuUmVhbG07CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuVW5pdmVyc2FsR3JvdXBCYWNrZW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoLkF1dGhCYWNrZW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoLkludGVybmFsQXV0aEJhY2tlbmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGguVW5pdmVyc2FsQXV0aEJhY2tlbmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGgubGRhcC5MZGFwTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdmF0YXIuQXZhdGFyUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNhY2hlLkNhY2hlUmVtb3ZhbExpc3RlbmVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuRXZlbnRGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5leHRlbnNpb25zLmV2ZW50cy5HaXRSZWZlcmVuY2VVcGRhdGVkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuQ2hhbmdlQ2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5DaGFuZ2VNZXJnZVF1ZXVlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2FyYmFnZUNvbGxlY3Rpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVF1ZXVlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTm90ZXNCcmFuY2hVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUmVsb2FkU3VibWl0UXVldWVPcDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlRhZ0NhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuVHJhbnNmZXJDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC52YWxpZGF0b3JzLkNvbW1pdFZhbGlkYXRpb25MaXN0ZW5lcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LnZhbGlkYXRvcnMuQ29tbWl0VmFsaWRhdG9yczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5BZGRSZXZpZXdlclNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5Db21taXRNZXNzYWdlRWRpdGVkU2VuZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkNyZWF0ZUNoYW5nZVNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5FbWFpbE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5Gcm9tQWRkcmVzc0dlbmVyYXRvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5Gcm9tQWRkcmVzc0dlbmVyYXRvclByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLk1lcmdlRmFpbFNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5NZXJnZWRTZW5kZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmViYXNlZFBhdGNoU2V0U2VuZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJlcGxhY2VQYXRjaFNldFNlbmRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5WZWxvY2l0eVJ1bnRpbWVQcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hMaXN0Q2FjaGVJbXBsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9GYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkFjY2Vzc0NvbnRyb2xNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5QZXJmb3JtQ3JlYXRlUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5QZXJtaXNzaW9uQ29sbGVjdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q2FjaGVJbXBsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3ROb2RlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RTdGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5TZWN0aW9uU29ydENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2UuQ2hhbmdlUXVlcnlCdWlsZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2UuQ2hhbmdlUXVlcnlSZXdyaXRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc3NoLlNzaEFkZHJlc3Nlc01vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudG9vbHMuVG9vbHNDYXRhbG9nOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLklkR2VuZXJhdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLlRocmVhZExvY2FsUmVxdWVzdENvbnRleHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLndvcmtmbG93LkZ1bmN0aW9uU3RhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOwogCkBAIC0xMDcsMTEgKzEzOCwxMCBAQAogCiAgICAgICBkZWZhdWx0OgogICAgICAgICBiaW5kKFJlYWxtLmNsYXNzKS50byhEZWZhdWx0UmVhbG0uY2xhc3MpOworICAgICAgICBEeW5hbWljU2V0LmJpbmQoYmluZGVyKCksIEF1dGhCYWNrZW5kLmNsYXNzKS50byhJbnRlcm5hbEF1dGhCYWNrZW5kLmNsYXNzKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgYmluZChBcHByb3ZhbFR5cGVzLmNsYXNzKS50b1Byb3ZpZGVyKEFwcHJvdmFsVHlwZXNQcm92aWRlci5jbGFzcykuaW4oCi0gICAgICAgIFNJTkdMRVRPTik7CiAgICAgYmluZChFbWFpbEV4cGFuZGVyLmNsYXNzKS50b1Byb3ZpZGVyKEVtYWlsRXhwYW5kZXJQcm92aWRlci5jbGFzcykuaW4oCiAgICAgICAgIFNJTkdMRVRPTik7CiAKQEAgLTEyNSwyNyArMTU1LDU1IEBACiAgICAgaW5zdGFsbChQcm9qZWN0Q2FjaGVJbXBsLm1vZHVsZSgpKTsKICAgICBpbnN0YWxsKFNlY3Rpb25Tb3J0Q2FjaGUubW9kdWxlKCkpOwogICAgIGluc3RhbGwoVGFnQ2FjaGUubW9kdWxlKCkpOworICAgIGluc3RhbGwoQ2hhbmdlQ2FjaGUubW9kdWxlKCkpOworCiAgICAgaW5zdGFsbChuZXcgQWNjZXNzQ29udHJvbE1vZHVsZSgpKTsKKyAgICBpbnN0YWxsKG5ldyBFbWFpbE1vZHVsZSgpKTsKICAgICBpbnN0YWxsKG5ldyBHaXRNb2R1bGUoKSk7CiAgICAgaW5zdGFsbChuZXcgUHJvbG9nTW9kdWxlKCkpOworICAgIGluc3RhbGwobmV3IFNzaEFkZHJlc3Nlc01vZHVsZSgpKTsKICAgICBpbnN0YWxsKFRocmVhZExvY2FsUmVxdWVzdENvbnRleHQubW9kdWxlKCkpOwogCisgICAgYmluZChBY2NvdW50UmVzb2x2ZXIuY2xhc3MpOworICAgIGJpbmQoQ2hhbmdlUXVlcnlSZXdyaXRlci5jbGFzcyk7CisKICAgICBmYWN0b3J5KEFjY291bnRJbmZvQ2FjaGVGYWN0b3J5LkZhY3RvcnkuY2xhc3MpOworICAgIGZhY3RvcnkoQWRkUmV2aWV3ZXJTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShDYXBhYmlsaXR5Q29udHJvbC5GYWN0b3J5LmNsYXNzKTsKKyAgICBmYWN0b3J5KENoYW5nZVF1ZXJ5QnVpbGRlci5GYWN0b3J5LmNsYXNzKTsKKyAgICBmYWN0b3J5KENvbW1pdE1lc3NhZ2VFZGl0ZWRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShDcmVhdGVDaGFuZ2VTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShHcm91cERldGFpbEZhY3RvcnkuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShHcm91cEluZm9DYWNoZUZhY3RvcnkuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShHcm91cE1lbWJlcnMuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShJbnRlcm5hbFVzZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShNZXJnZWRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShNZXJnZUZhaWxTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShNZXJnZVV0aWwuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShQZXJmb3JtQ3JlYXRlR3JvdXAuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShQZXJmb3JtUmVuYW1lR3JvdXAuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShQbHVnaW5Vc2VyLkZhY3RvcnkuY2xhc3MpOwogICAgIGZhY3RvcnkoUHJvamVjdE5vZGUuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShQcm9qZWN0U3RhdGUuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShSZWJhc2VkUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShSZXBsYWNlUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShQZXJmb3JtQ3JlYXRlUHJvamVjdC5GYWN0b3J5LmNsYXNzKTsKKyAgICBmYWN0b3J5KEdhcmJhZ2VDb2xsZWN0aW9uLkZhY3RvcnkuY2xhc3MpOwogICAgIGJpbmQoUGVybWlzc2lvbkNvbGxlY3Rpb24uRmFjdG9yeS5jbGFzcyk7CiAgICAgYmluZChBY2NvdW50VmlzaWJpbGl0eS5jbGFzcykKICAgICAgICAgLnRvUHJvdmlkZXIoQWNjb3VudFZpc2liaWxpdHlQcm92aWRlci5jbGFzcykKICAgICAgICAgLmluKFNJTkdMRVRPTik7CiAKKyAgICBiaW5kKEF1dGhCYWNrZW5kLmNsYXNzKS50byhVbml2ZXJzYWxBdXRoQmFja2VuZC5jbGFzcykuaW4oU0lOR0xFVE9OKTsKKyAgICBEeW5hbWljU2V0LnNldE9mKGJpbmRlcigpLCBBdXRoQmFja2VuZC5jbGFzcyk7CisKICAgICBiaW5kKEdyb3VwQ29udHJvbC5GYWN0b3J5LmNsYXNzKS5pbihTSU5HTEVUT04pOworICAgIGJpbmQoR3JvdXBDb250cm9sLkdlbmVyaWNGYWN0b3J5LmNsYXNzKS5pbihTSU5HTEVUT04pOwogICAgIGZhY3RvcnkoSW5jbHVkaW5nR3JvdXBNZW1iZXJzaGlwLkZhY3RvcnkuY2xhc3MpOwotICAgIGJpbmQoSW50ZXJuYWxHcm91cEJhY2tlbmQuY2xhc3MpLmluKFNJTkdMRVRPTik7CiAgICAgYmluZChHcm91cEJhY2tlbmQuY2xhc3MpLnRvKFVuaXZlcnNhbEdyb3VwQmFja2VuZC5jbGFzcykuaW4oU0lOR0xFVE9OKTsKICAgICBEeW5hbWljU2V0LnNldE9mKGJpbmRlcigpLCBHcm91cEJhY2tlbmQuY2xhc3MpOworCisgICAgYmluZChJbnRlcm5hbEdyb3VwQmFja2VuZC5jbGFzcykuaW4oU0lOR0xFVE9OKTsKICAgICBEeW5hbWljU2V0LmJpbmQoYmluZGVyKCksIEdyb3VwQmFja2VuZC5jbGFzcykudG8oSW50ZXJuYWxHcm91cEJhY2tlbmQuY2xhc3MpOwogCiAgICAgYmluZChGaWxlVHlwZVJlZ2lzdHJ5LmNsYXNzKS50byhNaW1lVXRpbEZpbGVUeXBlUmVnaXN0cnkuY2xhc3MpOwpAQCAtMTY3LDE2ICsyMjUsMzEgQEAKICAgICBiaW5kKElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5LmNsYXNzKS5pbihTSU5HTEVUT04pOwogICAgIGJpbmQoQ2hhbmdlQ29udHJvbC5HZW5lcmljRmFjdG9yeS5jbGFzcyk7CiAgICAgYmluZChQcm9qZWN0Q29udHJvbC5HZW5lcmljRmFjdG9yeS5jbGFzcyk7Ci0gICAgZmFjdG9yeShGdW5jdGlvblN0YXRlLkZhY3RvcnkuY2xhc3MpOworICAgIGJpbmQoQWNjb3VudENvbnRyb2wuRmFjdG9yeS5jbGFzcyk7CiAKICAgICBpbnN0YWxsKG5ldyBBdWRpdE1vZHVsZSgpKTsKKyAgICBpbnN0YWxsKG5ldyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Nb2R1bGUoKSk7CisgICAgaW5zdGFsbChuZXcgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5Nb2R1bGUoKSk7CisgICAgaW5zdGFsbChuZXcgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLk1vZHVsZSgpKTsKKyAgICBpbnN0YWxsKG5ldyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Nb2R1bGUoKSk7CiAKICAgICBiaW5kKEdpdFJlZmVyZW5jZVVwZGF0ZWQuY2xhc3MpOwogICAgIER5bmFtaWNNYXAubWFwT2YoYmluZGVyKCksIG5ldyBUeXBlTGl0ZXJhbDxDYWNoZTw/LCA/Pj4oKSB7fSk7CiAgICAgRHluYW1pY1NldC5zZXRPZihiaW5kZXIoKSwgQ2FjaGVSZW1vdmFsTGlzdGVuZXIuY2xhc3MpOwogICAgIER5bmFtaWNTZXQuc2V0T2YoYmluZGVyKCksIEdpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lci5jbGFzcyk7CiAgICAgRHluYW1pY1NldC5zZXRPZihiaW5kZXIoKSwgTmV3UHJvamVjdENyZWF0ZWRMaXN0ZW5lci5jbGFzcyk7CisgICAgRHluYW1pY1NldC5iaW5kKGJpbmRlcigpLCBHaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXIuY2xhc3MpLnRvKENoYW5nZUNhY2hlLmNsYXNzKTsKKyAgICBEeW5hbWljU2V0LnNldE9mKGJpbmRlcigpLCBDaGFuZ2VMaXN0ZW5lci5jbGFzcyk7CisgICAgRHluYW1pY1NldC5zZXRPZihiaW5kZXIoKSwgQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyLmNsYXNzKTsKKyAgICBEeW5hbWljSXRlbS5pdGVtT2YoYmluZGVyKCksIEF2YXRhclByb3ZpZGVyLmNsYXNzKTsKIAogICAgIGJpbmQoQW5vbnltb3VzVXNlci5jbGFzcyk7CisKKyAgICBmYWN0b3J5KENvbW1pdFZhbGlkYXRvcnMuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShOb3Rlc0JyYW5jaFV0aWwuRmFjdG9yeS5jbGFzcyk7CisKKyAgICBiaW5kKEFjY291bnRNYW5hZ2VyLmNsYXNzKTsKKyAgICBiaW5kKENoYW5nZVVzZXJOYW1lLkN1cnJlbnRVc2VyLmNsYXNzKTsKKyAgICBmYWN0b3J5KENoYW5nZVVzZXJOYW1lLkZhY3RvcnkuY2xhc3MpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9HZXJyaXRSZXF1ZXN0TW9kdWxlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9HZXJyaXRSZXF1ZXN0TW9kdWxlLmphdmEKaW5kZXggYmE1NGM1Ni4uZWMxNDg4MyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvR2Vycml0UmVxdWVzdE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL0dlcnJpdFJlcXVlc3RNb2R1bGUuamF2YQpAQCAtMTYsNDggKzE2LDIwIEBACiAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5pbmplY3QuU2NvcGVzLlNJTkdMRVRPTjsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQXBwcm92YWxzVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLlJlcXVlc3RDbGVhbnVwOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDb250cm9sOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRSZXNvbHZlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cERldGFpbEZhY3Rvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBNZW1iZXJzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LlBlcmZvcm1DcmVhdGVHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5QZXJmb3JtUmVuYW1lR3JvdXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuVmlzaWJsZUdyb3VwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkNoYW5nZUluc2VydGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuRGVsZXRlRHJhZnRQYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLlB1Ymxpc2hEcmFmdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLlN1Ym1pdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkFzeW5jUmVjZWl2ZUNvbW1pdHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5CYW5Db21taXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5DcmVhdGVDb2RlUmV2aWV3Tm90ZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZU9wOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWV0YURhdGFVcGRhdGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Ob3Rlc0JyYW5jaFV0aWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5TdWJtb2R1bGVPcDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5BYmFuZG9uZWRTZW5kZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuQWRkUmV2aWV3ZXJTZW5kZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuQ29tbWVudFNlbmRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5DcmVhdGVDaGFuZ2VTZW5kZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuTWVyZ2VGYWlsU2VuZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLk1lcmdlZFNlbmRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5SZWJhc2VkUGF0Y2hTZXRTZW5kZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmVwbGFjZVBhdGNoU2V0U2VuZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJlc3RvcmVkU2VuZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlJldmVydGVkU2VuZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5BZGRSZXZpZXdlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUHVibGlzaENvbW1lbnRzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5SZW1vdmVSZXZpZXdlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNyZWF0ZVByb2plY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTGlzdFByb2plY3RzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlBlclJlcXVlc3RQcm9qZWN0Q29udHJvbENhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlN1Z2dlc3RQYXJlbnRDYW5kaWRhdGVzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2UuQ2hhbmdlUXVlcnlCdWlsZGVyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2UuQ2hhbmdlUXVlcnlSZXdyaXRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zZXJ2bGV0LlJlcXVlc3RTY29wZWQ7CiAKIC8qKiBCaW5kaW5ncyBmb3Ige0BsaW5rIFJlcXVlc3RTY29wZWR9IGVudGl0aWVzLiAqLwpAQCAtNjUsNTIgKzM3LDI0IEBACiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CiAgICAgYmluZChSZXF1ZXN0Q2xlYW51cC5jbGFzcykuaW4oUmVxdWVzdFNjb3BlZC5jbGFzcyk7Ci0gICAgYmluZChSZXZpZXdEYi5jbGFzcykudG9Qcm92aWRlcihSZXF1ZXN0U2NvcGVkUmV2aWV3RGJQcm92aWRlci5jbGFzcykuaW4oCi0gICAgICAgIFJlcXVlc3RTY29wZWQuY2xhc3MpOworICAgIGJpbmQoUmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXIuY2xhc3MpOwogICAgIGJpbmQoSWRlbnRpZmllZFVzZXIuUmVxdWVzdEZhY3RvcnkuY2xhc3MpLmluKFNJTkdMRVRPTik7Ci0gICAgYmluZChNZXRhRGF0YVVwZGF0ZS5Vc2VyLmNsYXNzKS5pbihSZXF1ZXN0U2NvcGVkLmNsYXNzKTsKLSAgICBiaW5kKEFjY291bnRSZXNvbHZlci5jbGFzcyk7Ci0gICAgYmluZChDaGFuZ2VRdWVyeVJld3JpdGVyLmNsYXNzKTsKLSAgICBiaW5kKExpc3RQcm9qZWN0cy5jbGFzcyk7CiAgICAgYmluZChBcHByb3ZhbHNVdGlsLmNsYXNzKTsKKyAgICBiaW5kKENoYW5nZUluc2VydGVyLmNsYXNzKTsKIAogICAgIGJpbmQoUGVyUmVxdWVzdFByb2plY3RDb250cm9sQ2FjaGUuY2xhc3MpLmluKFJlcXVlc3RTY29wZWQuY2xhc3MpOwogICAgIGJpbmQoQ2hhbmdlQ29udHJvbC5GYWN0b3J5LmNsYXNzKS5pbihTSU5HTEVUT04pOwogICAgIGJpbmQoUHJvamVjdENvbnRyb2wuRmFjdG9yeS5jbGFzcykuaW4oU0lOR0xFVE9OKTsKLSAgICBiaW5kKEFjY291bnRDb250cm9sLkZhY3RvcnkuY2xhc3MpLmluKFNJTkdMRVRPTik7CiAKLSAgICBmYWN0b3J5KENoYW5nZVF1ZXJ5QnVpbGRlci5GYWN0b3J5LmNsYXNzKTsKICAgICBmYWN0b3J5KFN1Ym1vZHVsZU9wLkZhY3RvcnkuY2xhc3MpOwogICAgIGZhY3RvcnkoTWVyZ2VPcC5GYWN0b3J5LmNsYXNzKTsKLSAgICBmYWN0b3J5KENyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5GYWN0b3J5LmNsYXNzKTsKLSAgICBmYWN0b3J5KE5vdGVzQnJhbmNoVXRpbC5GYWN0b3J5LmNsYXNzKTsKLSAgICBpbnN0YWxsKG5ldyBBc3luY1JlY2VpdmVDb21taXRzLk1vZHVsZSgpKTsKIAogICAgIC8vIE5vdCByZWFsbHkgcGVyLXJlcXVlc3QsIGJ1dCBkYW1taXQsIEkgZG9uJ3Qga25vdyB3aGVyZSBlbHNlIHRvCiAgICAgLy8gZWFzaWx5IHBhcmsgdGhpcyBzdHVmZi4KICAgICAvLwotICAgIGZhY3RvcnkoQWRkUmV2aWV3ZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgZmFjdG9yeShBZGRSZXZpZXdlclNlbmRlci5GYWN0b3J5LmNsYXNzKTsKLSAgICBmYWN0b3J5KENyZWF0ZUNoYW5nZVNlbmRlci5GYWN0b3J5LmNsYXNzKTsKICAgICBmYWN0b3J5KERlbGV0ZURyYWZ0UGF0Y2hTZXQuRmFjdG9yeS5jbGFzcyk7Ci0gICAgZmFjdG9yeShQdWJsaXNoQ29tbWVudHMuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShQdWJsaXNoRHJhZnQuRmFjdG9yeS5jbGFzcyk7Ci0gICAgZmFjdG9yeShSZXBsYWNlUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgZmFjdG9yeShSZWJhc2VkUGF0Y2hTZXRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgZmFjdG9yeShBYmFuZG9uZWRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShSZW1vdmVSZXZpZXdlci5GYWN0b3J5LmNsYXNzKTsKLSAgICBmYWN0b3J5KFJlc3RvcmVkU2VuZGVyLkZhY3RvcnkuY2xhc3MpOwotICAgIGZhY3RvcnkoUmV2ZXJ0ZWRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7Ci0gICAgZmFjdG9yeShDb21tZW50U2VuZGVyLkZhY3RvcnkuY2xhc3MpOwotICAgIGZhY3RvcnkoTWVyZ2VkU2VuZGVyLkZhY3RvcnkuY2xhc3MpOwotICAgIGZhY3RvcnkoTWVyZ2VGYWlsU2VuZGVyLkZhY3RvcnkuY2xhc3MpOwotICAgIGZhY3RvcnkoUGVyZm9ybUNyZWF0ZUdyb3VwLkZhY3RvcnkuY2xhc3MpOwotICAgIGZhY3RvcnkoUGVyZm9ybVJlbmFtZUdyb3VwLkZhY3RvcnkuY2xhc3MpOwotICAgIGZhY3RvcnkoVmlzaWJsZUdyb3Vwcy5GYWN0b3J5LmNsYXNzKTsKLSAgICBmYWN0b3J5KEdyb3VwRGV0YWlsRmFjdG9yeS5GYWN0b3J5LmNsYXNzKTsKLSAgICBmYWN0b3J5KEdyb3VwTWVtYmVycy5GYWN0b3J5LmNsYXNzKTsKLSAgICBmYWN0b3J5KENyZWF0ZVByb2plY3QuRmFjdG9yeS5jbGFzcyk7Ci0gICAgZmFjdG9yeShTdWJtaXQuRmFjdG9yeS5jbGFzcyk7CiAgICAgZmFjdG9yeShTdWdnZXN0UGFyZW50Q2FuZGlkYXRlcy5GYWN0b3J5LmNsYXNzKTsKICAgICBmYWN0b3J5KEJhbkNvbW1pdC5GYWN0b3J5LmNsYXNzKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvTWFzdGVyTm9kZVN0YXJ0dXAuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL01hc3Rlck5vZGVTdGFydHVwLmphdmEKaW5kZXggYmI5NWRjYS4uYmY5NmEyMiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvTWFzdGVyTm9kZVN0YXJ0dXAuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9NYXN0ZXJOb2RlU3RhcnR1cC5qYXZhCkBAIC0xNCwzNSArMTQsNjAgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnOwogCitpbXBvcnQgc3RhdGljIGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0Lk1JTlVURVM7CitpbXBvcnQgc3RhdGljIGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0LlNFQ09ORFM7CisKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5MaWZlY3ljbGVMaXN0ZW5lcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5saWZlY3ljbGUuTGlmZWN5Y2xlTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUmVsb2FkU3VibWl0UXVldWVPcDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOwogCi1pbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOworCitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuU2NoZWR1bGVkRnV0dXJlOwogCiAvKiogQ29uZmlndXJhdGlvbiBmb3IgYSBtYXN0ZXIgbm9kZSBpbiBhIGNsdXN0ZXIgb2Ygc2VydmVycy4gKi8KIHB1YmxpYyBjbGFzcyBNYXN0ZXJOb2RlU3RhcnR1cCBleHRlbmRzIExpZmVjeWNsZU1vZHVsZSB7CiAgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBjb25maWd1cmUoKSB7Ci0gICAgbGlzdGVuZXIoKS50byhPblN0YXJ0LmNsYXNzKTsKKyAgICBsaXN0ZW5lcigpLnRvKExpZmVjeWNsZS5jbGFzcyk7CiAgIH0KIAotICBzdGF0aWMgY2xhc3MgT25TdGFydCBpbXBsZW1lbnRzIExpZmVjeWNsZUxpc3RlbmVyIHsKKyAgQFNpbmdsZXRvbgorICBzdGF0aWMgY2xhc3MgTGlmZWN5Y2xlIGltcGxlbWVudHMgTGlmZWN5Y2xlTGlzdGVuZXIgeworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBJTklUSUFMX0RFTEFZX1MgPSAxNTsKKwogICAgIHByaXZhdGUgZmluYWwgUmVsb2FkU3VibWl0UXVldWVPcC5GYWN0b3J5IHN1Ym1pdDsKKyAgICBwcml2YXRlIGZpbmFsIGxvbmcgZGVsYXk7CisgICAgcHJpdmF0ZSB2b2xhdGlsZSBTY2hlZHVsZWRGdXR1cmU8Pz4gaGFuZGxlOwogCiAgICAgQEluamVjdAotICAgIE9uU3RhcnQoZmluYWwgUmVsb2FkU3VibWl0UXVldWVPcC5GYWN0b3J5IHN1Ym1pdCkgeworICAgIExpZmVjeWNsZShSZWxvYWRTdWJtaXRRdWV1ZU9wLkZhY3Rvcnkgc3VibWl0LAorICAgICAgICBAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBjb25maWcpIHsKICAgICAgIHRoaXMuc3VibWl0ID0gc3VibWl0OworICAgICAgdGhpcy5kZWxheSA9IENvbmZpZ1V0aWwuZ2V0VGltZVVuaXQoY29uZmlnLAorICAgICAgICAgICJjaGFuZ2VNZXJnZSIsIG51bGwsICJjaGVja0ZyZXF1ZW5jeSIsCisgICAgICAgICAgU0VDT05EUy5jb252ZXJ0KDUsIE1JTlVURVMpLCBTRUNPTkRTKTsKICAgICB9CiAKICAgICBAT3ZlcnJpZGUKICAgICBwdWJsaWMgdm9pZCBzdGFydCgpIHsKLSAgICAgIHN1Ym1pdC5jcmVhdGUoKS5zdGFydCgxNSwgVGltZVVuaXQuU0VDT05EUyk7CisgICAgICBpZiAoZGVsYXkgPiAwKSB7CisgICAgICAgIGhhbmRsZSA9IHN1Ym1pdC5jcmVhdGUoKQorICAgICAgICAgICAgLnN0YXJ0V2l0aEZpeGVkRGVsYXkoSU5JVElBTF9ERUxBWV9TLCBkZWxheSwgU0VDT05EUyk7CisgICAgICB9IGVsc2UgeworICAgICAgICBoYW5kbGUgPSBzdWJtaXQuY3JlYXRlKCkuc3RhcnQoSU5JVElBTF9ERUxBWV9TLCBTRUNPTkRTKTsKKyAgICAgIH0KICAgICB9CiAKICAgICBAT3ZlcnJpZGUKICAgICBwdWJsaWMgdm9pZCBzdG9wKCkgeworICAgICAgU2NoZWR1bGVkRnV0dXJlPD8+IGYgPSBoYW5kbGU7CisgICAgICBpZiAoZiAhPSBudWxsKSB7CisgICAgICAgIGhhbmRsZSA9IG51bGw7CisgICAgICAgIGYuY2FuY2VsKHRydWUpOworICAgICAgfQogICAgIH0KICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvUmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29uZmlnL1JlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyLmphdmEKaW5kZXggNDUxOGEyZS4uNGFkYTdiMSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb25maWcvUmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbmZpZy9SZXF1ZXN0U2NvcGVkUmV2aWV3RGJQcm92aWRlci5qYXZhCkBAIC0yMSwxNiArMjEsMTcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlzaW9uRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zZXJ2bGV0LlJlcXVlc3RTY29wZWQ7CiAKIC8qKiBQcm92aWRlcyB7QGxpbmsgUmV2aWV3RGJ9IGRhdGFiYXNlIGhhbmRsZSBsaXZlIG9ubHkgZm9yIHRoaXMgcmVxdWVzdC4gKi8KLUBTaW5nbGV0b24KLWZpbmFsIGNsYXNzIFJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyIGltcGxlbWVudHMgUHJvdmlkZXI8UmV2aWV3RGI+IHsKK0BSZXF1ZXN0U2NvcGVkCitwdWJsaWMgY2xhc3MgUmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXIgaW1wbGVtZW50cyBQcm92aWRlcjxSZXZpZXdEYj4gewogICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYTsKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXF1ZXN0Q2xlYW51cD4gY2xlYW51cDsKKyAgcHJpdmF0ZSBSZXZpZXdEYiBkYjsKIAogICBASW5qZWN0Ci0gIFJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyKGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYSwKKyAgcHVibGljIFJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyKGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYSwKICAgICAgIGZpbmFsIFByb3ZpZGVyPFJlcXVlc3RDbGVhbnVwPiBjbGVhbnVwKSB7CiAgICAgdGhpcy5zY2hlbWEgPSBzY2hlbWE7CiAgICAgdGhpcy5jbGVhbnVwID0gY2xlYW51cDsKQEAgLTM4LDI2ICszOSwyNyBAQAogCiAgIEBPdmVycmlkZQogICBwdWJsaWMgUmV2aWV3RGIgZ2V0KCkgewotICAgIGZpbmFsIFJldmlld0RiIGM7Ci0gICAgdHJ5IHsKLSAgICAgIGMgPSBzY2hlbWEub3BlbigpOwotICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgUHJvdmlzaW9uRXhjZXB0aW9uKCJDYW5ub3Qgb3BlbiBSZXZpZXdEYiIsIGUpOworICAgIGlmIChkYiA9PSBudWxsKSB7CisgICAgICBmaW5hbCBSZXZpZXdEYiBjOworICAgICAgdHJ5IHsKKyAgICAgICAgYyA9IHNjaGVtYS5vcGVuKCk7CisgICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgUHJvdmlzaW9uRXhjZXB0aW9uKCJDYW5ub3Qgb3BlbiBSZXZpZXdEYiIsIGUpOworICAgICAgfQorICAgICAgdHJ5IHsKKyAgICAgICAgY2xlYW51cC5nZXQoKS5hZGQobmV3IFJ1bm5hYmxlKCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKKyAgICAgICAgICAgIGMuY2xvc2UoKTsKKyAgICAgICAgICAgIGRiID0gbnVsbDsKKyAgICAgICAgICB9CisgICAgICAgIH0pOworICAgICAgfSBjYXRjaCAoVGhyb3dhYmxlIGUpIHsKKyAgICAgICAgYy5jbG9zZSgpOworICAgICAgICB0aHJvdyBuZXcgUHJvdmlzaW9uRXhjZXB0aW9uKCJDYW5ub3QgZGVmZXIgY2xlYW51cCBvZiBSZXZpZXdEYiIsIGUpOworICAgICAgfQorICAgICAgZGIgPSBjOwogICAgIH0KLSAgICB0cnkgewotICAgICAgY2xlYW51cC5nZXQoKS5hZGQobmV3IFJ1bm5hYmxlKCkgewotICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgcHVibGljIHZvaWQgcnVuKCkgewotICAgICAgICAgIGMuY2xvc2UoKTsKLSAgICAgICAgfQotICAgICAgfSk7Ci0gICAgICByZXR1cm4gYzsKLSAgICB9IGNhdGNoIChFcnJvciBlKSB7Ci0gICAgICBjLmNsb3NlKCk7Ci0gICAgICB0aHJvdyBlOwotICAgIH0gY2F0Y2ggKFJ1bnRpbWVFeGNlcHRpb24gZSkgewotICAgICAgYy5jbG9zZSgpOwotICAgICAgdGhyb3cgZTsKLSAgICB9CisgICAgcmV0dXJuIGRiOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbnRhY3QvRW5jcnlwdGVkQ29udGFjdFN0b3JlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NvbnRhY3QvRW5jcnlwdGVkQ29udGFjdFN0b3JlLmphdmEKaW5kZXggYmM4OGNkMi4uYmQxYzBkNyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jb250YWN0L0VuY3J5cHRlZENvbnRhY3RTdG9yZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvY29udGFjdC9FbmNyeXB0ZWRDb250YWN0U3RvcmUuamF2YQpAQCAtMTA3LDYgKzEwNyw3IEBACiAgICAgcmV0dXJuIHRydWU7CiAgIH0KIAorICBAU3VwcHJlc3NXYXJuaW5ncygicmVzb3VyY2UiKQogICBwcml2YXRlIHN0YXRpYyBQR1BQdWJsaWNLZXlSaW5nQ29sbGVjdGlvbiByZWFkUHViUmluZyhmaW5hbCBGaWxlIHB1YikgewogICAgIHRyeSB7CiAgICAgICBJbnB1dFN0cmVhbSBpbiA9IG5ldyBGaWxlSW5wdXRTdHJlYW0ocHViKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZG9jdW1lbnRhdGlvbi9NYXJrZG93bkZvcm1hdHRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9kb2N1bWVudGF0aW9uL01hcmtkb3duRm9ybWF0dGVyLmphdmEKaW5kZXggNmJiN2JhOC4uYWYwOGQxZSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9kb2N1bWVudGF0aW9uL01hcmtkb3duRm9ybWF0dGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9kb2N1bWVudGF0aW9uL01hcmtkb3duRm9ybWF0dGVyLmphdmEKQEAgLTEzNiw4ICsxMzYsMTIgQEAKICAgICBJbnB1dFN0cmVhbSBpbiA9IHVybC5vcGVuU3RyZWFtKCk7CiAgICAgdHJ5IHsKICAgICAgIFRlbXBvcmFyeUJ1ZmZlci5IZWFwIHRtcCA9IG5ldyBUZW1wb3JhcnlCdWZmZXIuSGVhcCgxMjggKiAxMDI0KTsKLSAgICAgIHRtcC5jb3B5KGluKTsKLSAgICAgIHJldHVybiBuZXcgU3RyaW5nKHRtcC50b0J5dGVBcnJheSgpLCAiVVRGLTgiKTsKKyAgICAgIHRyeSB7CisgICAgICAgIHRtcC5jb3B5KGluKTsKKyAgICAgICAgcmV0dXJuIG5ldyBTdHJpbmcodG1wLnRvQnl0ZUFycmF5KCksICJVVEYtOCIpOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgdG1wLmNsb3NlKCk7CisgICAgICB9CiAgICAgfSBmaW5hbGx5IHsKICAgICAgIGluLmNsb3NlKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvQ29tbWl0UmVjZWl2ZWRFdmVudC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvQ29tbWl0UmVjZWl2ZWRFdmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjhkZDEwODQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9Db21taXRSZWNlaXZlZEV2ZW50LmphdmEKQEAgLTAsMCArMSwzOCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2Q29tbWl0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlJlY2VpdmVDb21tYW5kOworCitwdWJsaWMgY2xhc3MgQ29tbWl0UmVjZWl2ZWRFdmVudCBleHRlbmRzIENoYW5nZUV2ZW50IHsKKyAgcHVibGljIGZpbmFsIFJlY2VpdmVDb21tYW5kIGNvbW1hbmQ7CisgIHB1YmxpYyBmaW5hbCBQcm9qZWN0IHByb2plY3Q7CisgIHB1YmxpYyBmaW5hbCBTdHJpbmcgcmVmTmFtZTsKKyAgcHVibGljIGZpbmFsIFJldkNvbW1pdCBjb21taXQ7CisgIHB1YmxpYyBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyOworCisgIHB1YmxpYyBDb21taXRSZWNlaXZlZEV2ZW50KFJlY2VpdmVDb21tYW5kIGNvbW1hbmQsIFByb2plY3QgcHJvamVjdCwKKyAgICAgIFN0cmluZyByZWZOYW1lLCBSZXZDb21taXQgY29tbWl0LCBJZGVudGlmaWVkVXNlciB1c2VyKSB7CisgICAgdGhpcy5jb21tYW5kID0gY29tbWFuZDsKKyAgICB0aGlzLnByb2plY3QgPSBwcm9qZWN0OworICAgIHRoaXMucmVmTmFtZSA9IHJlZk5hbWU7CisgICAgdGhpcy5jb21taXQgPSBjb21taXQ7CisgICAgdGhpcy51c2VyID0gdXNlcjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvRXZlbnRGYWN0b3J5LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9FdmVudEZhY3RvcnkuamF2YQppbmRleCBmMDdhZTBjLi5kNTU2ZTczIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9FdmVudEZhY3RvcnkuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9FdmVudEZhY3RvcnkuamF2YQpAQCAtMTQsMTkgKzE0LDIxIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50czsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlN1Ym1pdFJlY29yZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaExpbmVDb21tZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBbmNlc3RvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUmV2SWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlRyYWNraW5nSWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlVzZXJJZGVudGl0eTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKQEAgLTM1LDYgKzM3LDggQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hMaXN0Q2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoTGlzdEVudHJ5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3ROb3RBdmFpbGFibGVFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb0ZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTQ4LDggKzUyLDggQEAKIAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247Ci1pbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOwogCiBpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKIApAQCAtNTgsMjIgKzYyLDIyIEBACiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihFdmVudEZhY3RvcnkuY2xhc3MpOwogICBwcml2YXRlIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGU7CiAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8U3RyaW5nPiB1cmxQcm92aWRlcjsKLSAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXM7CiAgIHByaXZhdGUgZmluYWwgUGF0Y2hMaXN0Q2FjaGUgcGF0Y2hMaXN0Q2FjaGU7CiAgIHByaXZhdGUgZmluYWwgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2NoZW1hOworICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcHNJbmZvRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50OwogCiAgIEBJbmplY3QKICAgRXZlbnRGYWN0b3J5KEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGUsCiAgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyLAotICAgICAgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzLAorICAgICAgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwc2lmLAogICAgICAgUGF0Y2hMaXN0Q2FjaGUgcGF0Y2hMaXN0Q2FjaGUsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYSwKICAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBQZXJzb25JZGVudCBteUlkZW50KSB7CiAgICAgdGhpcy5hY2NvdW50Q2FjaGUgPSBhY2NvdW50Q2FjaGU7CiAgICAgdGhpcy51cmxQcm92aWRlciA9IHVybFByb3ZpZGVyOwotICAgIHRoaXMuYXBwcm92YWxUeXBlcyA9IGFwcHJvdmFsVHlwZXM7CiAgICAgdGhpcy5wYXRjaExpc3RDYWNoZSA9IHBhdGNoTGlzdENhY2hlOwogICAgIHRoaXMuc2NoZW1hID0gc2NoZW1hOworICAgIHRoaXMucHNJbmZvRmFjdG9yeSA9IHBzaWY7CiAgICAgdGhpcy5teUlkZW50ID0gbXlJZGVudDsKICAgfQogCkBAIC0xODQsMTEgKzE4OCwyNCBAQAogICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIGZpbmFsIFJldklkIHJldklkID0gZGIucGF0Y2hTZXRzKCkuZ2V0KHBzSWQpLmdldFJldmlzaW9uKCk7Ci0gICAgICAgIGZvciAoUGF0Y2hTZXRBbmNlc3RvciBhIDogZGIucGF0Y2hTZXRBbmNlc3RvcnMoKS5kZXNjZW5kYW50c09mKHJldklkKSkgewotICAgICAgICAgIGZpbmFsIFBhdGNoU2V0IHAgPSBkYi5wYXRjaFNldHMoKS5nZXQoYS5nZXRQYXRjaFNldCgpKTsKLSAgICAgICAgICBmaW5hbCBDaGFuZ2UgYyA9IGRiLmNoYW5nZXMoKS5nZXQocC5nZXRJZCgpLmdldFBhcmVudEtleSgpKTsKLSAgICAgICAgICBjYS5uZWVkZWRCeS5hZGQobmV3TmVlZGVkQnkoYywgcCkpOworICAgICAgICBmaW5hbCBQYXRjaFNldCBwcyA9IGRiLnBhdGNoU2V0cygpLmdldChwc0lkKTsKKyAgICAgICAgaWYgKHBzID09IG51bGwpIHsKKyAgICAgICAgICBsb2cuZXJyb3IoIkVycm9yIHdoaWxlIGdlbmVyYXRpbmcgdGhlIGxpc3Qgb2YgZGVzY2VuZGFudHMgZm9yIgorICAgICAgICAgICAgICArICIgUGF0Y2hTZXQgIiArIHBzSWQgKyAiOiBDYW5ub3QgZmluZCBQYXRjaFNldCBlbnRyeSBpbiIKKyAgICAgICAgICAgICAgKyAiIGRhdGFiYXNlLiIpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIGZpbmFsIFJldklkIHJldklkID0gcHMuZ2V0UmV2aXNpb24oKTsKKyAgICAgICAgICBmb3IgKFBhdGNoU2V0QW5jZXN0b3IgYSA6IGRiLnBhdGNoU2V0QW5jZXN0b3JzKCkuZGVzY2VuZGFudHNPZihyZXZJZCkpIHsKKyAgICAgICAgICAgIGZpbmFsIFBhdGNoU2V0IHAgPSBkYi5wYXRjaFNldHMoKS5nZXQoYS5nZXRQYXRjaFNldCgpKTsKKyAgICAgICAgICAgIGlmIChwID09IG51bGwpIHsKKyAgICAgICAgICAgICAgbG9nLmVycm9yKCJFcnJvciB3aGlsZSBnZW5lcmF0aW5nIHRoZSBsaXN0IG9mIGRlc2NlbmRhbnRzIGZvciIKKyAgICAgICAgICAgICAgICAgICsgIiByZXZpc2lvbiAiICsgcmV2SWQuZ2V0KCkgKyAiOiBDYW5ub3QgZmluZCBQYXRjaFNldCBlbnRyeSBpbiIKKyAgICAgICAgICAgICAgICAgICsgIiBkYXRhYmFzZSBmb3IgIiArIGEuZ2V0UGF0Y2hTZXQoKSk7CisgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgZmluYWwgQ2hhbmdlIGMgPSBkYi5jaGFuZ2VzKCkuZ2V0KHAuZ2V0SWQoKS5nZXRQYXJlbnRLZXkoKSk7CisgICAgICAgICAgICBjYS5uZWVkZWRCeS5hZGQobmV3TmVlZGVkQnkoYywgcCkpOworICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgZGIuY2xvc2UoKTsKQEAgLTIwNyw3ICsyMjQsNyBAQAogCiAgIHByaXZhdGUgRGVwZW5kZW5jeUF0dHJpYnV0ZSBuZXdEZXBlbmRzT24oQ2hhbmdlIGMsIFBhdGNoU2V0IHBzKSB7CiAgICAgRGVwZW5kZW5jeUF0dHJpYnV0ZSBkID0gbmV3RGVwZW5kZW5jeUF0dHJpYnV0ZShjLCBwcyk7Ci0gICAgZC5pc0N1cnJlbnRQYXRjaFNldCA9IGMuY3VyclBhdGNoU2V0SWQoKS5lcXVhbHMocHMuZ2V0SWQoKSk7CisgICAgZC5pc0N1cnJlbnRQYXRjaFNldCA9IHBzLmdldElkKCkuZXF1YWxzKGMuY3VycmVudFBhdGNoU2V0SWQoKSk7CiAgICAgcmV0dXJuIGQ7CiAgIH0KIApAQCAtMjM3LDI1ICsyNTQsMjYgQEAKICAgICBhLmNvbW1pdE1lc3NhZ2UgPSBjb21taXRNZXNzYWdlOwogICB9CiAKLSAgcHVibGljIHZvaWQgYWRkUGF0Y2hTZXRzKENoYW5nZUF0dHJpYnV0ZSBhLCBDb2xsZWN0aW9uPFBhdGNoU2V0PiBwcykgewotICAgIGFkZFBhdGNoU2V0cyhhLCBwcywgbnVsbCwgZmFsc2UsIG51bGwpOworICBwdWJsaWMgdm9pZCBhZGRQYXRjaFNldHMoQ2hhbmdlQXR0cmlidXRlIGEsIENvbGxlY3Rpb248UGF0Y2hTZXQ+IHBzLAorICAgICAgTGFiZWxUeXBlcyBsYWJlbFR5cGVzKSB7CisgICAgYWRkUGF0Y2hTZXRzKGEsIHBzLCBudWxsLCBmYWxzZSwgbnVsbCwgbGFiZWxUeXBlcyk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBhZGRQYXRjaFNldHMoQ2hhbmdlQXR0cmlidXRlIGNhLCBDb2xsZWN0aW9uPFBhdGNoU2V0PiBwcywKLSAgICAgIE1hcDxQYXRjaFNldC5JZCxDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+PiBhcHByb3ZhbHMpIHsKLSAgICBhZGRQYXRjaFNldHMoY2EsIHBzLCBhcHByb3ZhbHMsIGZhbHNlLCBudWxsKTsKKyAgICAgIE1hcDxQYXRjaFNldC5JZCwgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPj4gYXBwcm92YWxzLAorICAgICAgTGFiZWxUeXBlcyBsYWJlbFR5cGVzKSB7CisgICAgYWRkUGF0Y2hTZXRzKGNhLCBwcywgYXBwcm92YWxzLCBmYWxzZSwgbnVsbCwgbGFiZWxUeXBlcyk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBhZGRQYXRjaFNldHMoQ2hhbmdlQXR0cmlidXRlIGNhLCBDb2xsZWN0aW9uPFBhdGNoU2V0PiBwcywKLSAgICAgIE1hcDxQYXRjaFNldC5JZCxDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+PiBhcHByb3ZhbHMsCi0gICAgICBib29sZWFuIGluY2x1ZGVGaWxlcywgQ2hhbmdlIGNoYW5nZSkgewotCisgICAgICBNYXA8UGF0Y2hTZXQuSWQsIENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4+IGFwcHJvdmFscywKKyAgICAgIGJvb2xlYW4gaW5jbHVkZUZpbGVzLCBDaGFuZ2UgY2hhbmdlLCBMYWJlbFR5cGVzIGxhYmVsVHlwZXMpIHsKICAgICBpZiAoIXBzLmlzRW1wdHkoKSkgewogICAgICAgY2EucGF0Y2hTZXRzID0gbmV3IEFycmF5TGlzdDxQYXRjaFNldEF0dHJpYnV0ZT4ocHMuc2l6ZSgpKTsKICAgICAgIGZvciAoUGF0Y2hTZXQgcCA6IHBzKSB7CiAgICAgICAgIFBhdGNoU2V0QXR0cmlidXRlIHBzYSA9IGFzUGF0Y2hTZXRBdHRyaWJ1dGUocCk7CiAgICAgICAgIGlmIChhcHByb3ZhbHMgIT0gbnVsbCkgewotICAgICAgICAgIGFkZEFwcHJvdmFscyhwc2EsIHAuZ2V0SWQoKSwgYXBwcm92YWxzKTsKKyAgICAgICAgICBhZGRBcHByb3ZhbHMocHNhLCBwLmdldElkKCksIGFwcHJvdmFscywgbGFiZWxUeXBlcyk7CiAgICAgICAgIH0KICAgICAgICAgY2EucGF0Y2hTZXRzLmFkZChwc2EpOwogICAgICAgICBpZiAoaW5jbHVkZUZpbGVzICYmIGNoYW5nZSAhPSBudWxsKSB7CkBAIC0yOTAsNyArMzA4LDEwIEBACiAKICAgICAgICAgUGF0Y2hBdHRyaWJ1dGUgcCA9IG5ldyBQYXRjaEF0dHJpYnV0ZSgpOwogICAgICAgICBwLmZpbGUgPSBwYXRjaC5nZXROZXdOYW1lKCk7CisgICAgICAgIHAuZmlsZU9sZCA9IHBhdGNoLmdldE9sZE5hbWUoKTsKICAgICAgICAgcC50eXBlID0gcGF0Y2guZ2V0Q2hhbmdlVHlwZSgpOworICAgICAgICBwLmRlbGV0aW9ucyAtPSBwYXRjaC5nZXREZWxldGlvbnMoKTsKKyAgICAgICAgcC5pbnNlcnRpb25zID0gcGF0Y2guZ2V0SW5zZXJ0aW9ucygpOwogICAgICAgICBwYXRjaFNldEF0dHJpYnV0ZS5maWxlcy5hZGQocCk7CiAgICAgICB9CiAgICAgfSBjYXRjaCAoUGF0Y2hMaXN0Tm90QXZhaWxhYmxlRXhjZXB0aW9uIGUpIHsKQEAgLTMyOCw2ICszNDksNyBAQAogICAgIHAucmVmID0gcGF0Y2hTZXQuZ2V0UmVmTmFtZSgpOwogICAgIHAudXBsb2FkZXIgPSBhc0FjY291bnRBdHRyaWJ1dGUocGF0Y2hTZXQuZ2V0VXBsb2FkZXIoKSk7CiAgICAgcC5jcmVhdGVkT24gPSBwYXRjaFNldC5nZXRDcmVhdGVkT24oKS5nZXRUaW1lKCkgLyAxMDAwTDsKKyAgICBmaW5hbCBQYXRjaFNldC5JZCBwSWQgPSBwYXRjaFNldC5nZXRJZCgpOwogICAgIHRyeSB7CiAgICAgICBmaW5hbCBSZXZpZXdEYiBkYiA9IHNjaGVtYS5vcGVuKCk7CiAgICAgICB0cnkgewpAQCAtMzM2LDMwICszNTgsNTUgQEAKICAgICAgICAgICAgIHBhdGNoU2V0LmdldElkKCkpKSB7CiAgICAgICAgICAgcC5wYXJlbnRzLmFkZChhLmdldEFuY2VzdG9yUmV2aXNpb24oKS5nZXQoKSk7CiAgICAgICAgIH0KKworICAgICAgICBVc2VySWRlbnRpdHkgYXV0aG9yID0gcHNJbmZvRmFjdG9yeS5nZXQoZGIsIHBJZCkuZ2V0QXV0aG9yKCk7CisgICAgICAgIGlmIChhdXRob3IuZ2V0QWNjb3VudCgpID09IG51bGwpIHsKKyAgICAgICAgICBwLmF1dGhvciA9IG5ldyBBY2NvdW50QXR0cmlidXRlKCk7CisgICAgICAgICAgcC5hdXRob3IuZW1haWwgPSBhdXRob3IuZ2V0RW1haWwoKTsKKyAgICAgICAgICBwLmF1dGhvci5uYW1lID0gYXV0aG9yLmdldE5hbWUoKTsKKyAgICAgICAgICBwLmF1dGhvci51c2VybmFtZSA9ICIiOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIHAuYXV0aG9yID0gYXNBY2NvdW50QXR0cmlidXRlKGF1dGhvci5nZXRBY2NvdW50KCkpOworICAgICAgICB9CisKKyAgICAgICAgQ2hhbmdlIGNoYW5nZSA9IGRiLmNoYW5nZXMoKS5nZXQocElkLmdldFBhcmVudEtleSgpKTsKKyAgICAgICAgTGlzdDxQYXRjaD4gbGlzdCA9CisgICAgICAgICAgICBwYXRjaExpc3RDYWNoZS5nZXQoY2hhbmdlLCBwYXRjaFNldCkudG9QYXRjaExpc3QocElkKTsKKyAgICAgICAgZm9yIChQYXRjaCBwZSA6IGxpc3QpIHsKKyAgICAgICAgICBpZiAoIVBhdGNoLkNPTU1JVF9NU0cuZXF1YWxzKHBlLmdldEZpbGVOYW1lKCkpKSB7CisgICAgICAgICAgICBwLnNpemVEZWxldGlvbnMgLT0gcGUuZ2V0RGVsZXRpb25zKCk7CisgICAgICAgICAgICBwLnNpemVJbnNlcnRpb25zICs9IHBlLmdldEluc2VydGlvbnMoKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KICAgICAgIH0gZmluYWxseSB7CiAgICAgICAgIGRiLmNsb3NlKCk7CiAgICAgICB9CiAgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IGxvYWQgcGF0Y2ggc2V0IGRhdGEgZm9yICIgKyBwYXRjaFNldC5nZXRJZCgpLCBlKTsKKyAgICB9IGNhdGNoIChQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24gZSkgeworICAgICAgbG9nLmVycm9yKFN0cmluZy5mb3JtYXQoIkNhbm5vdCBnZXQgYXV0aG9yRW1haWwgZm9yICVzLiIsIHBJZCksIGUpOworICAgIH0gY2F0Y2ggKFBhdGNoTGlzdE5vdEF2YWlsYWJsZUV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoU3RyaW5nLmZvcm1hdCgiQ2Fubm90IGdldCBzaXplIGluZm9ybWF0aW9uIGZvciAlcy4iLCBwSWQpLCBlKTsKICAgICB9CiAgICAgcmV0dXJuIHA7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBhZGRBcHByb3ZhbHMoUGF0Y2hTZXRBdHRyaWJ1dGUgcCwgUGF0Y2hTZXQuSWQgaWQsCi0gICAgICBNYXA8UGF0Y2hTZXQuSWQsQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPj4gYWxsKSB7CisgICAgICBNYXA8UGF0Y2hTZXQuSWQsIENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4+IGFsbCwKKyAgICAgIExhYmVsVHlwZXMgbGFiZWxUeXBlcykgewogICAgIENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4gbGlzdCA9IGFsbC5nZXQoaWQpOwogICAgIGlmIChsaXN0ICE9IG51bGwpIHsKLSAgICAgIGFkZEFwcHJvdmFscyhwLCBsaXN0KTsKKyAgICAgIGFkZEFwcHJvdmFscyhwLCBsaXN0LCBsYWJlbFR5cGVzKTsKICAgICB9CiAgIH0KIAogICBwdWJsaWMgdm9pZCBhZGRBcHByb3ZhbHMoUGF0Y2hTZXRBdHRyaWJ1dGUgcCwKLSAgICAgIENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4gbGlzdCkgeworICAgICAgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPiBsaXN0LCBMYWJlbFR5cGVzIGxhYmVsVHlwZXMpIHsKICAgICBpZiAoIWxpc3QuaXNFbXB0eSgpKSB7CiAgICAgICBwLmFwcHJvdmFscyA9IG5ldyBBcnJheUxpc3Q8QXBwcm92YWxBdHRyaWJ1dGU+KGxpc3Quc2l6ZSgpKTsKICAgICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogbGlzdCkgewogICAgICAgICBpZiAoYS5nZXRWYWx1ZSgpICE9IDApIHsKLSAgICAgICAgICBwLmFwcHJvdmFscy5hZGQoYXNBcHByb3ZhbEF0dHJpYnV0ZShhKSk7CisgICAgICAgICAgcC5hcHByb3ZhbHMuYWRkKGFzQXBwcm92YWxBdHRyaWJ1dGUoYSwgbGFiZWxUeXBlcykpOwogICAgICAgICB9CiAgICAgICB9CiAgICAgICBpZiAocC5hcHByb3ZhbHMuaXNFbXB0eSgpKSB7CkBAIC0zNzYsNiArNDIzLDkgQEAKICAgICogQHJldHVybiBvYmplY3Qgc3VpdGFibGUgZm9yIHNlcmlhbGl6YXRpb24gdG8gSlNPTgogICAgKi8KICAgcHVibGljIEFjY291bnRBdHRyaWJ1dGUgYXNBY2NvdW50QXR0cmlidXRlKEFjY291bnQuSWQgaWQpIHsKKyAgICBpZiAoaWQgPT0gbnVsbCkgeworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQogICAgIHJldHVybiBhc0FjY291bnRBdHRyaWJ1dGUoYWNjb3VudENhY2hlLmdldChpZCkuZ2V0QWNjb3VudCgpKTsKICAgfQogCkBAIC00MTMsMTggKzQ2MywyMCBAQAogICAgKiBzZXJpYWxpemF0aW9uIHRvIEpTT04uCiAgICAqCiAgICAqIEBwYXJhbSBhcHByb3ZhbAorICAgKiBAcGFyYW0gbGFiZWxUeXBlcyBsYWJlbCB0eXBlcyBmb3IgdGhlIGNvbnRhaW5pbmcgcHJvamVjdAogICAgKiBAcmV0dXJuIG9iamVjdCBzdWl0YWJsZSBmb3Igc2VyaWFsaXphdGlvbiB0byBKU09OCiAgICAqLwotICBwdWJsaWMgQXBwcm92YWxBdHRyaWJ1dGUgYXNBcHByb3ZhbEF0dHJpYnV0ZShQYXRjaFNldEFwcHJvdmFsIGFwcHJvdmFsKSB7CisgIHB1YmxpYyBBcHByb3ZhbEF0dHJpYnV0ZSBhc0FwcHJvdmFsQXR0cmlidXRlKFBhdGNoU2V0QXBwcm92YWwgYXBwcm92YWwsCisgICAgICBMYWJlbFR5cGVzIGxhYmVsVHlwZXMpIHsKICAgICBBcHByb3ZhbEF0dHJpYnV0ZSBhID0gbmV3IEFwcHJvdmFsQXR0cmlidXRlKCk7Ci0gICAgYS50eXBlID0gYXBwcm92YWwuZ2V0Q2F0ZWdvcnlJZCgpLmdldCgpOworICAgIGEudHlwZSA9IGFwcHJvdmFsLmdldExhYmVsSWQoKS5nZXQoKTsKICAgICBhLnZhbHVlID0gU2hvcnQudG9TdHJpbmcoYXBwcm92YWwuZ2V0VmFsdWUoKSk7CiAgICAgYS5ieSA9IGFzQWNjb3VudEF0dHJpYnV0ZShhcHByb3ZhbC5nZXRBY2NvdW50SWQoKSk7CiAgICAgYS5ncmFudGVkT24gPSBhcHByb3ZhbC5nZXRHcmFudGVkKCkuZ2V0VGltZSgpIC8gMTAwMEw7CiAKLSAgICBBcHByb3ZhbFR5cGUgYXQgPSBhcHByb3ZhbFR5cGVzLmJ5SWQoYXBwcm92YWwuZ2V0Q2F0ZWdvcnlJZCgpKTsKLSAgICBpZiAoYXQgIT0gbnVsbCkgewotICAgICAgYS5kZXNjcmlwdGlvbiA9IGF0LmdldENhdGVnb3J5KCkuZ2V0TmFtZSgpOworICAgIExhYmVsVHlwZSBsdCA9IGxhYmVsVHlwZXMuYnlMYWJlbChhcHByb3ZhbC5nZXRMYWJlbElkKCkpOworICAgIGlmIChsdCAhPSBudWxsKSB7CisgICAgICBhLmRlc2NyaXB0aW9uID0gbHQuZ2V0TmFtZSgpOwogICAgIH0KICAgICByZXR1cm4gYTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvTWVyZ2VGYWlsZWRFdmVudC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvTWVyZ2VGYWlsZWRFdmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU2ZmY1MjUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9NZXJnZUZhaWxlZEV2ZW50LmphdmEKQEAgLTAsMCArMSwyMyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHM7CisKK3B1YmxpYyBjbGFzcyBNZXJnZUZhaWxlZEV2ZW50IGV4dGVuZHMgQ2hhbmdlRXZlbnQgeworICAgIHB1YmxpYyBmaW5hbCBTdHJpbmcgdHlwZSA9ICJtZXJnZS1mYWlsZWQiOworICAgIHB1YmxpYyBDaGFuZ2VBdHRyaWJ1dGUgY2hhbmdlOworICAgIHB1YmxpYyBQYXRjaFNldEF0dHJpYnV0ZSBwYXRjaFNldDsKKyAgICBwdWJsaWMgQWNjb3VudEF0dHJpYnV0ZSBzdWJtaXR0ZXI7CisgICAgcHVibGljIFN0cmluZyByZWFzb247Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9QYXRjaEF0dHJpYnV0ZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUGF0Y2hBdHRyaWJ1dGUuamF2YQppbmRleCAzODAyZmRkLi44MmY0NGExIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9QYXRjaEF0dHJpYnV0ZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1BhdGNoQXR0cmlidXRlLmphdmEKQEAgLTE4LDUgKzE4LDggQEAKIAogcHVibGljIGNsYXNzIFBhdGNoQXR0cmlidXRlIHsKICAgICBwdWJsaWMgU3RyaW5nIGZpbGU7CisgICAgcHVibGljIFN0cmluZyBmaWxlT2xkOwogICAgIHB1YmxpYyBDaGFuZ2VUeXBlIHR5cGU7CisgICAgcHVibGljIGludCBpbnNlcnRpb25zOworICAgIHB1YmxpYyBpbnQgZGVsZXRpb25zOwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUGF0Y2hTZXRBdHRyaWJ1dGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1BhdGNoU2V0QXR0cmlidXRlLmphdmEKaW5kZXggZjcyNmNlMy4uMTEyM2U1ZiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUGF0Y2hTZXRBdHRyaWJ1dGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9QYXRjaFNldEF0dHJpYnV0ZS5qYXZhCkBAIC0yMyw4ICsyMywxMSBAQAogICBwdWJsaWMgU3RyaW5nIHJlZjsKICAgcHVibGljIEFjY291bnRBdHRyaWJ1dGUgdXBsb2FkZXI7CiAgIHB1YmxpYyBMb25nIGNyZWF0ZWRPbjsKKyAgcHVibGljIEFjY291bnRBdHRyaWJ1dGUgYXV0aG9yOwogCiAgIHB1YmxpYyBMaXN0PEFwcHJvdmFsQXR0cmlidXRlPiBhcHByb3ZhbHM7CiAgIHB1YmxpYyBMaXN0PFBhdGNoU2V0Q29tbWVudEF0dHJpYnV0ZT4gY29tbWVudHM7CiAgIHB1YmxpYyBMaXN0PFBhdGNoQXR0cmlidXRlPiBmaWxlczsKKyAgcHVibGljIGludCBzaXplSW5zZXJ0aW9uczsKKyAgcHVibGljIGludCBzaXplRGVsZXRpb25zOwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUXVlcnlTdGF0cy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUXVlcnlTdGF0cy5qYXZhCmluZGV4IDFjNWU3ZDcuLmVjZjJiOWEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXZlbnRzL1F1ZXJ5U3RhdHMuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9RdWVyeVN0YXRzLmphdmEKQEAgLTE4LDQgKzE4LDUgQEAKICAgcHVibGljIGZpbmFsIFN0cmluZyB0eXBlID0gInN0YXRzIjsKICAgcHVibGljIGludCByb3dDb3VudDsKICAgcHVibGljIGxvbmcgcnVuVGltZU1pbGxpc2Vjb25kczsKKyAgcHVibGljIFN0cmluZyByZXN1bWVTb3J0S2V5OwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUmV2aWV3ZXJBZGRlZEV2ZW50LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V2ZW50cy9SZXZpZXdlckFkZGVkRXZlbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hODgxZDhkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ldmVudHMvUmV2aWV3ZXJBZGRlZEV2ZW50LmphdmEKQEAgLTAsMCArMSwyMiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHM7CisKK3B1YmxpYyBjbGFzcyBSZXZpZXdlckFkZGVkRXZlbnQgZXh0ZW5kcyBDaGFuZ2VFdmVudCB7CisgICAgcHVibGljIGZpbmFsIFN0cmluZyB0eXBlID0gInJldmlld2VyLWFkZGVkIjsKKyAgICBwdWJsaWMgQ2hhbmdlQXR0cmlidXRlIGNoYW5nZTsKKyAgICBwdWJsaWMgUGF0Y2hTZXRBdHRyaWJ1dGUgcGF0Y2hTZXQ7CisgICAgcHVibGljIEFjY291bnRBdHRyaWJ1dGUgcmV2aWV3ZXI7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2V4dGVuc2lvbnMvZXZlbnRzL0dpdFJlZmVyZW5jZVVwZGF0ZWQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXh0ZW5zaW9ucy9ldmVudHMvR2l0UmVmZXJlbmNlVXBkYXRlZC5qYXZhCmluZGV4IDgzM2I2MTEuLjQ5YzkwYmQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXh0ZW5zaW9ucy9ldmVudHMvR2l0UmVmZXJlbmNlVXBkYXRlZC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZXh0ZW5zaW9ucy9ldmVudHMvR2l0UmVmZXJlbmNlVXBkYXRlZC5qYXZhCkBAIC0yMCw2ICsyMCw5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOworCiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogCkBAIC0zOCw4ICs0MSwxNiBAQAogICAgIHRoaXMubGlzdGVuZXJzID0gbGlzdGVuZXJzOwogICB9CiAKLSAgcHVibGljIHZvaWQgZmlyZShQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgU3RyaW5nIHJlZikgewotICAgIEV2ZW50IGV2ZW50ID0gbmV3IEV2ZW50KHByb2plY3QsIHJlZik7CisgIHB1YmxpYyB2b2lkIGZpcmUoUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIFJlZlVwZGF0ZSByZWZVcGRhdGUpIHsKKyAgICBmaXJlKHByb2plY3QsIHJlZlVwZGF0ZS5nZXROYW1lKCksIHJlZlVwZGF0ZS5nZXRPbGRPYmplY3RJZCgpLAorICAgICAgICByZWZVcGRhdGUuZ2V0TmV3T2JqZWN0SWQoKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCBmaXJlKFByb2plY3QuTmFtZUtleSBwcm9qZWN0LCBTdHJpbmcgcmVmLAorICAgICAgT2JqZWN0SWQgb2xkT2JqZWN0SWQsIE9iamVjdElkIG5ld09iamVjdElkKSB7CisgICAgT2JqZWN0SWQgbyA9IG9sZE9iamVjdElkICE9IG51bGwgPyBvbGRPYmplY3RJZCA6IE9iamVjdElkLnplcm9JZCgpOworICAgIE9iamVjdElkIG4gPSBuZXdPYmplY3RJZCAhPSBudWxsID8gbmV3T2JqZWN0SWQgOiBPYmplY3RJZC56ZXJvSWQoKTsKKyAgICBFdmVudCBldmVudCA9IG5ldyBFdmVudChwcm9qZWN0LCByZWYsIG8ubmFtZSgpLCBuLm5hbWUoKSk7CiAgICAgZm9yIChHaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXIgbCA6IGxpc3RlbmVycykgewogICAgICAgbC5vbkdpdFJlZmVyZW5jZVVwZGF0ZWQoZXZlbnQpOwogICAgIH0KQEAgLTQ4LDEwICs1OSwxNSBAQAogICBwcml2YXRlIHN0YXRpYyBjbGFzcyBFdmVudCBpbXBsZW1lbnRzIEdpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lci5FdmVudCB7CiAgICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcHJvamVjdE5hbWU7CiAgICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcmVmOworICAgIHByaXZhdGUgZmluYWwgU3RyaW5nIG9sZE9iamVjdElkOworICAgIHByaXZhdGUgZmluYWwgU3RyaW5nIG5ld09iamVjdElkOwogCi0gICAgRXZlbnQoUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIFN0cmluZyByZWYpIHsKKyAgICBFdmVudChQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgU3RyaW5nIHJlZiwKKyAgICAgICAgU3RyaW5nIG9sZE9iamVjdElkLCBTdHJpbmcgbmV3T2JqZWN0SWQpIHsKICAgICAgIHRoaXMucHJvamVjdE5hbWUgPSBwcm9qZWN0LmdldCgpOwogICAgICAgdGhpcy5yZWYgPSByZWY7CisgICAgICB0aGlzLm9sZE9iamVjdElkID0gb2xkT2JqZWN0SWQ7CisgICAgICB0aGlzLm5ld09iamVjdElkID0gbmV3T2JqZWN0SWQ7CiAgICAgfQogCiAgICAgQE92ZXJyaWRlCkBAIC02Myw5ICs3OSwyMCBAQAogICAgIHB1YmxpYyBMaXN0PEdpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lci5VcGRhdGU+IGdldFVwZGF0ZXMoKSB7CiAgICAgICBHaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXIuVXBkYXRlIHVwZGF0ZSA9CiAgICAgICAgICAgbmV3IEdpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lci5VcGRhdGUoKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKICAgICAgICAgICAgIHB1YmxpYyBTdHJpbmcgZ2V0UmVmTmFtZSgpIHsKICAgICAgICAgICAgICAgcmV0dXJuIHJlZjsKICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgICBwdWJsaWMgU3RyaW5nIGdldE9sZE9iamVjdElkKCkgeworICAgICAgICAgICAgICByZXR1cm4gb2xkT2JqZWN0SWQ7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgICAgcHVibGljIFN0cmluZyBnZXROZXdPYmplY3RJZCgpIHsKKyAgICAgICAgICAgICAgcmV0dXJuIG5ld09iamVjdElkOworICAgICAgICAgICAgfQogICAgICAgICAgIH07CiAgICAgICByZXR1cm4gSW1tdXRhYmxlTGlzdC5vZih1cGRhdGUpOwogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0FzeW5jUmVjZWl2ZUNvbW1pdHMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0FzeW5jUmVjZWl2ZUNvbW1pdHMuamF2YQppbmRleCBjOGQ3NDFiLi5hYWYwMjczIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9Bc3luY1JlY2VpdmVDb21taXRzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQXN5bmNSZWNlaXZlQ29tbWl0cy5qYXZhCkBAIC0xNjUsNyArMTY1LDcgQEAKICAgICAgICAgICB0aW1lb3V0TWlsbGlzLCBUaW1lVW5pdC5NSUxMSVNFQ09ORFMpOwogICAgIH0gY2F0Y2ggKEV4ZWN1dGlvbkV4Y2VwdGlvbiBlKSB7CiAgICAgICBsb2cud2FybigiRXJyb3IgaW4gUmVjZWl2ZUNvbW1pdHMiLCBlKTsKLSAgICAgIHJjLmFkZEVycm9yKCJpbnRlcm5hbCBlcnJvciB3aGlsZSBwcm9jZXNzaW5nIGNoYW5nZXMiKTsKKyAgICAgIHJjLmFkZEVycm9yKCJpbnRlcm5hbCBlcnJvciB3aGlsZSBwcm9jZXNzaW5nIGNoYW5nZXMgIiArIGUuZ2V0TWVzc2FnZSgpKTsKICAgICAgIC8vIFJlY2VpdmVDb21taXRzIGhhcyB0cmllZCBpdHMgYmVzdCB0byBjYXRjaCBlcnJvcnMsIHNvIGFueXRoaW5nIGF0IHRoaXMKICAgICAgIC8vIHBvaW50IGlzIHZlcnkgYmFkLgogICAgICAgZm9yIChmaW5hbCBSZWNlaXZlQ29tbWFuZCBjIDogY29tbWFuZHMpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0JhbkNvbW1pdC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQmFuQ29tbWl0LmphdmEKaW5kZXggYzBlMDBhYS4uNjg1OTI2MiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQmFuQ29tbWl0LmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQmFuQ29tbWl0LmphdmEKQEAgLTE3LDYgKzE3LDcgQEAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZfUkVKRUNUX0NPTU1JVFM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLlBlcm1pc3Npb25EZW5pZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q29udHJvbDsKQEAgLTc0LDggKzc1LDggQEAKICAgICBmaW5hbCBCYW5Db21taXRSZXN1bHQgcmVzdWx0ID0gbmV3IEJhbkNvbW1pdFJlc3VsdCgpOwogICAgIE5vdGVNYXAgYmFuQ29tbWl0Tm90ZXMgPSBOb3RlTWFwLm5ld0VtcHR5TWFwKCk7CiAgICAgLy8gYWRkIGEgbm90ZSBmb3IgZWFjaCBiYW5uZWQgY29tbWl0IHRvIG5vdGVzCi0gICAgZmluYWwgUmVwb3NpdG9yeSByZXBvID0KLSAgICAgICAgcmVwb01hbmFnZXIub3BlblJlcG9zaXRvcnkocHJvamVjdENvbnRyb2wuZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSk7CisgICAgZmluYWwgUHJvamVjdC5OYW1lS2V5IHByb2plY3QgPSBwcm9qZWN0Q29udHJvbC5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpOworICAgIGZpbmFsIFJlcG9zaXRvcnkgcmVwbyA9IHJlcG9NYW5hZ2VyLm9wZW5SZXBvc2l0b3J5KHByb2plY3QpOwogICAgIHRyeSB7CiAgICAgICBmaW5hbCBSZXZXYWxrIHJldldhbGsgPSBuZXcgUmV2V2FsayhyZXBvKTsKICAgICAgIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyID0gcmVwby5uZXdPYmplY3RJbnNlcnRlcigpOwpAQCAtOTIsNyArOTMsOCBAQAogICAgICAgICAgIGJhbkNvbW1pdE5vdGVzLnNldChjb21taXRUb0JhbiwgY3JlYXRlTm90ZUNvbnRlbnQocmVhc29uLCBpbnNlcnRlcikpOwogICAgICAgICB9CiAgICAgICAgIGluc2VydGVyLmZsdXNoKCk7Ci0gICAgICAgIE5vdGVzQnJhbmNoVXRpbCBub3Rlc0JyYW5jaFV0aWwgPSBub3Rlc0JyYW5jaFV0aWxGYWN0b3J5LmNyZWF0ZShyZXBvKTsKKyAgICAgICAgTm90ZXNCcmFuY2hVdGlsIG5vdGVzQnJhbmNoVXRpbCA9IG5vdGVzQnJhbmNoVXRpbEZhY3RvcnkuY3JlYXRlKHByb2plY3QsCisgICAgICAgICAgICByZXBvLCBpbnNlcnRlcik7CiAgICAgICAgIE5vdGVNYXAgbmV3bHlDcmVhdGVkID0KICAgICAgICAgICAgIG5vdGVzQnJhbmNoVXRpbC5jb21taXROZXdOb3RlcyhiYW5Db21taXROb3RlcywgUkVGX1JFSkVDVF9DT01NSVRTLAogICAgICAgICAgICAgICAgIGNyZWF0ZVBlcnNvbklkZW50KCksIGJ1aWxkQ29tbWl0TWVzc2FnZShjb21taXRzVG9CYW4sIHJlYXNvbikpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ2hhbmdlQ2FjaGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoYW5nZUNhY2hlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNmY3MTkzNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoYW5nZUNhY2hlLmphdmEKQEAgLTAsMCArMSwxMDEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkNhY2hlTG9hZGVyOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkxvYWRpbmdDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5HaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNhY2hlLkNhY2hlTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Nb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lm5hbWUuTmFtZWQ7CisKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkV4ZWN1dGlvbkV4Y2VwdGlvbjsKKworQFNpbmdsZXRvbgorcHVibGljIGNsYXNzIENoYW5nZUNhY2hlIGltcGxlbWVudHMgR2l0UmVmZXJlbmNlVXBkYXRlZExpc3RlbmVyIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9CisgICAgICBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihDaGFuZ2VDYWNoZS5jbGFzcyk7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBJRF9DQUNIRSA9ICJjaGFuZ2VzIjsKKworICBwdWJsaWMgc3RhdGljIE1vZHVsZSBtb2R1bGUoKSB7CisgICAgcmV0dXJuIG5ldyBDYWNoZU1vZHVsZSgpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgICAgICBjYWNoZShJRF9DQUNIRSwKKyAgICAgICAgICAgIFByb2plY3QuTmFtZUtleS5jbGFzcywKKyAgICAgICAgICAgIG5ldyBUeXBlTGl0ZXJhbDxMaXN0PENoYW5nZT4+KCkge30pCisgICAgICAgICAgLm1heGltdW1XZWlnaHQoMCkKKyAgICAgICAgICAubG9hZGVyKExvYWRlci5jbGFzcyk7CisgICAgICB9CisgICAgfTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgTG9hZGluZ0NhY2hlPFByb2plY3QuTmFtZUtleSwgTGlzdDxDaGFuZ2U+PiBjYWNoZTsKKworICBASW5qZWN0CisgIENoYW5nZUNhY2hlKEBOYW1lZChJRF9DQUNIRSkgTG9hZGluZ0NhY2hlPFByb2plY3QuTmFtZUtleSwgTGlzdDxDaGFuZ2U+PiBjYWNoZSkgeworICAgIHRoaXMuY2FjaGUgPSBjYWNoZTsKKyAgfQorCisgIExpc3Q8Q2hhbmdlPiBnZXQoUHJvamVjdC5OYW1lS2V5IG5hbWUpIHsKKyAgICB0cnkgeworICAgICAgcmV0dXJuIGNhY2hlLmdldChuYW1lKTsKKyAgICB9IGNhdGNoIChFeGVjdXRpb25FeGNlcHRpb24gZSkgeworICAgICAgbG9nLndhcm4oIkNhbm5vdCBmZXRjaCBjaGFuZ2VzIGZvciAiICsgbmFtZSwgZSk7CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CisgICAgfQorICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIG9uR2l0UmVmZXJlbmNlVXBkYXRlZChHaXRSZWZlcmVuY2VVcGRhdGVkTGlzdGVuZXIuRXZlbnQgZXZlbnQpIHsKKyAgICBmb3IgKEdpdFJlZmVyZW5jZVVwZGF0ZWRMaXN0ZW5lci5VcGRhdGUgdSA6IGV2ZW50LmdldFVwZGF0ZXMoKSkgeworICAgICAgaWYgKHUuZ2V0UmVmTmFtZSgpLnN0YXJ0c1dpdGgoInJlZnMvY2hhbmdlcy8iKSkgeworICAgICAgICBjYWNoZS5pbnZhbGlkYXRlKG5ldyBQcm9qZWN0Lk5hbWVLZXkoZXZlbnQuZ2V0UHJvamVjdE5hbWUoKSkpOworICAgICAgICBicmVhazsKKyAgICAgIH0KKyAgICB9CisgIH0KKworICBzdGF0aWMgY2xhc3MgTG9hZGVyIGV4dGVuZHMgQ2FjaGVMb2FkZXI8UHJvamVjdC5OYW1lS2V5LCBMaXN0PENoYW5nZT4+IHsKKyAgICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYTsKKworICAgIEBJbmplY3QKKyAgICBMb2FkZXIoU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2NoZW1hKSB7CisgICAgICB0aGlzLnNjaGVtYSA9IHNjaGVtYTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgTGlzdDxDaGFuZ2U+IGxvYWQoUHJvamVjdC5OYW1lS2V5IGtleSkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICBmaW5hbCBSZXZpZXdEYiBkYiA9IHNjaGVtYS5vcGVuKCk7CisgICAgICB0cnkgeworICAgICAgICByZXR1cm4gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlTGlzdChkYi5jaGFuZ2VzKCkuYnlQcm9qZWN0KGtleSkudG9MaXN0KCkpOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgZGIuY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoYW5nZU1lcmdlUXVldWUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoYW5nZU1lcmdlUXVldWUuamF2YQppbmRleCA2ZDFiMTU1Li4xMjIxOWUyIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9DaGFuZ2VNZXJnZVF1ZXVlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ2hhbmdlTWVyZ2VRdWV1ZS5qYXZhCkBAIC0xOSw5ICsxOSwxMSBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5SZW1vdGVQZWVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0UmVxdWVzdE1vZHVsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guU3NoSW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5SZXF1ZXN0Q29udGV4dDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5SZXF1ZXN0U2NvcGVQcm9wYWdhdG9yOwpAQCAtOTEsMTIgKzkzLDE4IEBACiAKICAgICAgIEBQcm92aWRlcwogICAgICAgcHVibGljIFBlclRocmVhZFJlcXVlc3RTY29wZS5TY29wZXIgcHJvdmlkZVNjb3BlcigKLSAgICAgICAgICBmaW5hbCBQZXJUaHJlYWRSZXF1ZXN0U2NvcGUuUHJvcGFnYXRvciBwcm9wYWdhdG9yKSB7CisgICAgICAgICAgZmluYWwgUGVyVGhyZWFkUmVxdWVzdFNjb3BlLlByb3BhZ2F0b3IgcHJvcGFnYXRvciwKKyAgICAgICAgICBmaW5hbCBQcm92aWRlcjxSZXF1ZXN0U2NvcGVkUmV2aWV3RGJQcm92aWRlcj4gZGJQcm92aWRlcikgewogICAgICAgICBmaW5hbCBSZXF1ZXN0Q29udGV4dCByZXF1ZXN0Q29udGV4dCA9IG5ldyBSZXF1ZXN0Q29udGV4dCgpIHsKICAgICAgICAgICBAT3ZlcnJpZGUKICAgICAgICAgICBwdWJsaWMgQ3VycmVudFVzZXIgZ2V0Q3VycmVudFVzZXIoKSB7CiAgICAgICAgICAgICB0aHJvdyBuZXcgT3V0T2ZTY29wZUV4Y2VwdGlvbigiTm8gdXNlciBvbiBtZXJnZSB0aHJlYWQiKTsKICAgICAgICAgICB9CisKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgUHJvdmlkZXI8UmV2aWV3RGI+IGdldFJldmlld0RiUHJvdmlkZXIoKSB7CisgICAgICAgICAgICByZXR1cm4gZGJQcm92aWRlci5nZXQoKTsKKyAgICAgICAgICB9CiAgICAgICAgIH07CiAgICAgICAgIHJldHVybiBuZXcgUGVyVGhyZWFkUmVxdWVzdFNjb3BlLlNjb3BlcigpIHsKICAgICAgICAgICBAT3ZlcnJpZGUKQEAgLTExMSw5ICsxMTksOSBAQAogICB9CiAKICAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIG1lcmdlKE1lcmdlT3AuRmFjdG9yeSBtb2YsIEJyYW5jaC5OYW1lS2V5IGJyYW5jaCkgeworICBwdWJsaWMgdm9pZCBtZXJnZShCcmFuY2guTmFtZUtleSBicmFuY2gpIHsKICAgICBpZiAoc3RhcnQoYnJhbmNoKSkgewotICAgICAgbWVyZ2VJbXBsKG1vZiwgYnJhbmNoKTsKKyAgICAgIG1lcmdlSW1wbChicmFuY2gpOwogICAgIH0KICAgfQogCkBAIC0xOTEsMTYgKzE5OSw2IEBACiAgICAgZS5uZWVkTWVyZ2UgPSBmYWxzZTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBtZXJnZUltcGwoTWVyZ2VPcC5GYWN0b3J5IG9wRmFjdG9yeSwgQnJhbmNoLk5hbWVLZXkgYnJhbmNoKSB7Ci0gICAgdHJ5IHsKLSAgICAgIG9wRmFjdG9yeS5jcmVhdGUoYnJhbmNoKS5tZXJnZSgpOwotICAgIH0gY2F0Y2ggKFRocm93YWJsZSBlKSB7Ci0gICAgICBsb2cuZXJyb3IoIk1lcmdlIGF0dGVtcHQgZm9yICIgKyBicmFuY2ggKyAiIGZhaWxlZCIsIGUpOwotICAgIH0gZmluYWxseSB7Ci0gICAgICBmaW5pc2goYnJhbmNoKTsKLSAgICB9Ci0gIH0KLQogICBwcml2YXRlIHZvaWQgbWVyZ2VJbXBsKGZpbmFsIEJyYW5jaC5OYW1lS2V5IGJyYW5jaCkgewogICAgIHRyeSB7CiAgICAgICB0aHJlYWRTY29wZXIuc2NvcGUobmV3IENhbGxhYmxlPFZvaWQ+KCl7CkBAIC0yNDMsNiArMjQxLDcgQEAKICAgICAgIGRlc3QgPSBkOwogICAgIH0KIAorICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKICAgICAgIHVuc2NoZWR1bGUodGhpcyk7CiAgICAgICBtZXJnZUltcGwoZGVzdCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9DaGFuZ2VVcGRhdGVFeGVjdXRvci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ2hhbmdlVXBkYXRlRXhlY3V0b3IuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zNDUyYmIwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ2hhbmdlVXBkYXRlRXhlY3V0b3IuamF2YQpAQCAtMCwwICsxLDMxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IHN0YXRpYyBqYXZhLmxhbmcuYW5ub3RhdGlvbi5SZXRlbnRpb25Qb2xpY3kuUlVOVElNRTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLnV0aWwuY29uY3VycmVudC5MaXN0ZW5pbmdFeGVjdXRvclNlcnZpY2U7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQmluZGluZ0Fubm90YXRpb247CisKK2ltcG9ydCBqYXZhLmxhbmcuYW5ub3RhdGlvbi5SZXRlbnRpb247CisKKy8qKgorICogTWFya2VyIG9uIHRoZSBnbG9iYWwge0BsaW5rIExpc3RlbmluZ0V4ZWN1dG9yU2VydmljZX0gdXNlZCBieQorICoge0BsaW5rIFJlY2VpdmVDb21taXRzfSB0byBjcmVhdGUgb3IgcmVwbGFjZSBjaGFuZ2VzLgorICovCitAUmV0ZW50aW9uKFJVTlRJTUUpCitAQmluZGluZ0Fubm90YXRpb24KK3B1YmxpYyBAaW50ZXJmYWNlIENoYW5nZVVwZGF0ZUV4ZWN1dG9yIHsKK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoZXJyeVBpY2suamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NoZXJyeVBpY2suamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZTUzMDhmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ2hlcnJ5UGljay5qYXZhCkBAIC0wLDAgKzEsMjIwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QW5jZXN0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlJldklkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ2hhbmdlVXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvRmFjdG9yeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUGVyc29uSWRlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitwdWJsaWMgY2xhc3MgQ2hlcnJ5UGljayBleHRlbmRzIFN1Ym1pdFN0cmF0ZWd5IHsKKyAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkOworICBwcml2YXRlIGZpbmFsIE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+IG5ld0NvbW1pdHM7CisKKyAgQ2hlcnJ5UGljayhmaW5hbCBTdWJtaXRTdHJhdGVneS5Bcmd1bWVudHMgYXJncywKKyAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKKyAgICAgIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZ2l0UmVmVXBkYXRlZCkgeworICAgIHN1cGVyKGFyZ3MpOworCisgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgICB0aGlzLmdpdFJlZlVwZGF0ZWQgPSBnaXRSZWZVcGRhdGVkOworICAgIHRoaXMubmV3Q29tbWl0cyA9IG5ldyBIYXNoTWFwPENoYW5nZS5JZCwgQ29kZVJldmlld0NvbW1pdD4oKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgQ29kZVJldmlld0NvbW1pdCBfcnVuKGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgQ29kZVJldmlld0NvbW1pdCBuZXdNZXJnZVRpcCA9IG1lcmdlVGlwOworICAgIHdoaWxlICghdG9NZXJnZS5pc0VtcHR5KCkpIHsKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbiA9IHRvTWVyZ2UucmVtb3ZlKDApOworCisgICAgICB0cnkgeworICAgICAgICBpZiAobmV3TWVyZ2VUaXAgPT0gbnVsbCkgeworICAgICAgICAgIC8vIFRoZSBicmFuY2ggaXMgdW5ib3JuLiBUYWtlIGEgZmFzdC1mb3J3YXJkIHJlc29sdXRpb24gdG8KKyAgICAgICAgICAvLyBjcmVhdGUgdGhlIGJyYW5jaC4KKyAgICAgICAgICAvLworICAgICAgICAgIG5ld01lcmdlVGlwID0gbjsKKyAgICAgICAgICBuLnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9NRVJHRTsKKworICAgICAgICB9IGVsc2UgaWYgKG4uZ2V0UGFyZW50Q291bnQoKSA9PSAwKSB7CisgICAgICAgICAgLy8gUmVmdXNlIHRvIG1lcmdlIGEgcm9vdCBjb21taXQgaW50byBhbiBleGlzdGluZyBicmFuY2gsCisgICAgICAgICAgLy8gd2UgY2Fubm90IG9idGFpbiBhIGRlbHRhIGZvciB0aGUgY2hlcnJ5LXBpY2sgdG8gYXBwbHkuCisgICAgICAgICAgLy8KKyAgICAgICAgICBuLnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5DQU5OT1RfQ0hFUlJZX1BJQ0tfUk9PVDsKKworICAgICAgICB9IGVsc2UgaWYgKG4uZ2V0UGFyZW50Q291bnQoKSA9PSAxKSB7CisgICAgICAgICAgLy8gSWYgdGhlcmUgaXMgb25seSBvbmUgcGFyZW50LCBhIGNoZXJyeS1waWNrIGNhbiBiZSBkb25lIGJ5CisgICAgICAgICAgLy8gdGFraW5nIHRoZSBkZWx0YSByZWxhdGl2ZSB0byB0aGF0IG9uZSBwYXJlbnQgYW5kIHJlZG9pbmcKKyAgICAgICAgICAvLyB0aGF0IG9uIHRoZSBjdXJyZW50IG1lcmdlIHRpcC4KKyAgICAgICAgICAvLworCisgICAgICAgICAgbmV3TWVyZ2VUaXAgPSB3cml0ZUNoZXJyeVBpY2tDb21taXQobWVyZ2VUaXAsIG4pOworCisgICAgICAgICAgaWYgKG5ld01lcmdlVGlwICE9IG51bGwpIHsKKyAgICAgICAgICAgIG5ld0NvbW1pdHMucHV0KG5ld01lcmdlVGlwLnBhdGNoc2V0SWQuZ2V0UGFyZW50S2V5KCksIG5ld01lcmdlVGlwKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuUEFUSF9DT05GTElDVDsKKyAgICAgICAgICB9CisKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAvLyBUaGVyZSBhcmUgbXVsdGlwbGUgcGFyZW50cywgc28gdGhpcyBpcyBhIG1lcmdlIGNvbW1pdC4gV2UKKyAgICAgICAgICAvLyBkb24ndCB3YW50IHRvIGNoZXJyeS1waWNrIHRoZSBtZXJnZSBhcyBjbGllbnRzIGNhbid0IGVhc2lseQorICAgICAgICAgIC8vIHJlYmFzZSB0aGVpciBoaXN0b3J5IHdpdGggdGhhdCBtZXJnZSBwcmVzZW50IGFuZCByZXBsYWNlZAorICAgICAgICAgIC8vIGJ5IGFuIGVxdWl2YWxlbnQgbWVyZ2Ugd2l0aCBhIGRpZmZlcmVudCBmaXJzdCBwYXJlbnQuIFNvCisgICAgICAgICAgLy8gaW5zdGVhZCBiZWhhdmUgYXMgdGhvdWdoIE1FUkdFX0lGX05FQ0VTU0FSWSB3YXMgY29uZmlndXJlZC4KKyAgICAgICAgICAvLworICAgICAgICAgIGlmICghYXJncy5tZXJnZVV0aWwuaGFzTWlzc2luZ0RlcGVuZGVuY2llcyhhcmdzLm1lcmdlU29ydGVyLCBuKSkgeworICAgICAgICAgICAgaWYgKGFyZ3MucncuaXNNZXJnZWRJbnRvKG5ld01lcmdlVGlwLCBuKSkgeworICAgICAgICAgICAgICBuZXdNZXJnZVRpcCA9IG47CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICBuZXdNZXJnZVRpcCA9CisgICAgICAgICAgICAgICAgICBhcmdzLm1lcmdlVXRpbC5tZXJnZU9uZUNvbW1pdChhcmdzLm15SWRlbnQsIGFyZ3MucmVwbywKKyAgICAgICAgICAgICAgICAgICAgICBhcmdzLnJ3LCBhcmdzLmluc2VydGVyLCBhcmdzLmNhbk1lcmdlRmxhZywKKyAgICAgICAgICAgICAgICAgICAgICBhcmdzLmRlc3RCcmFuY2gsIG5ld01lcmdlVGlwLCBuKTsKKyAgICAgICAgICAgfQorICAgICAgICAgICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXRBcHByb3ZhbCA9CisgICAgICAgICAgICAgICAgYXJncy5tZXJnZVV0aWwubWFya0NsZWFuTWVyZ2VzKGFyZ3MucncsIGFyZ3MuY2FuTWVyZ2VGbGFnLAorICAgICAgICAgICAgICAgICAgICBuZXdNZXJnZVRpcCwgYXJncy5hbHJlYWR5QWNjZXB0ZWQpOworICAgICAgICAgICAgc2V0UmVmTG9nSWRlbnQoc3VibWl0QXBwcm92YWwpOworCisgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIE9uZSBvciBtb3JlIGRlcGVuZGVuY2llcyB3ZXJlIG5vdCBtZXQuIFRoZSBzdGF0dXMgd2FzCisgICAgICAgICAgICAvLyBhbHJlYWR5IG1hcmtlZCBvbiB0aGUgY29tbWl0IHNvIHdlIGhhdmUgbm90aGluZyBmdXJ0aGVyCisgICAgICAgICAgICAvLyB0byBwZXJmb3JtIGF0IHRoaXMgdGltZS4KKyAgICAgICAgICAgIC8vCisgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWVyZ2UgIiArIG4ubmFtZSgpLCBlKTsKKyAgICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CisgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG1lcmdlICIgKyBuLm5hbWUoKSwgZSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBuZXdNZXJnZVRpcDsKKyAgfQorCisgIHByaXZhdGUgQ29kZVJldmlld0NvbW1pdCB3cml0ZUNoZXJyeVBpY2tDb21taXQoZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuKQorICAgICAgdGhyb3dzIElPRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24geworCisgICAgYXJncy5ydy5wYXJzZUJvZHkobik7CisKKyAgICBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdEF1ZGl0ID0KKyAgICAgICAgYXJncy5tZXJnZVV0aWwuZ2V0U3VibWl0dGVyKG4uY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpOworCisgICAgUGVyc29uSWRlbnQgY2hlcnJ5UGlja0NvbW1pdHRlcklkZW50ID0gbnVsbDsKKyAgICBpZiAoc3VibWl0QXVkaXQgIT0gbnVsbCkgeworICAgICAgY2hlcnJ5UGlja0NvbW1pdHRlcklkZW50ID0KKyAgICAgICAgICBhcmdzLmlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoc3VibWl0QXVkaXQuZ2V0QWNjb3VudElkKCkpCisgICAgICAgICAgICAgIC5uZXdDb21taXR0ZXJJZGVudChzdWJtaXRBdWRpdC5nZXRHcmFudGVkKCksCisgICAgICAgICAgICAgICAgICBhcmdzLm15SWRlbnQuZ2V0VGltZVpvbmUoKSk7CisgICAgfSBlbHNlIHsKKyAgICAgIGNoZXJyeVBpY2tDb21taXR0ZXJJZGVudCA9IGFyZ3MubXlJZGVudDsKKyAgICB9CisKKyAgICBmaW5hbCBTdHJpbmcgY2hlcnJ5UGlja0NtdE1zZyA9IGFyZ3MubWVyZ2VVdGlsLmNyZWF0ZUNoZXJyeVBpY2tDb21taXRNZXNzYWdlKG4pOworCisgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuZXdDb21taXQgPQorICAgICAgICBhcmdzLm1lcmdlVXRpbC5jcmVhdGVDaGVycnlQaWNrRnJvbUNvbW1pdChhcmdzLnJlcG8sIGFyZ3MuaW5zZXJ0ZXIsIG1lcmdlVGlwLCBuLAorICAgICAgICAgICAgY2hlcnJ5UGlja0NvbW1pdHRlcklkZW50LCBjaGVycnlQaWNrQ210TXNnLCBhcmdzLnJ3KTsKKworICAgIGlmIChuZXdDb21taXQgPT0gbnVsbCkgeworICAgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisKKyAgICBQYXRjaFNldC5JZCBpZCA9CisgICAgICAgIENoYW5nZVV0aWwubmV4dFBhdGNoU2V0SWQoYXJncy5yZXBvLCBuLmNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpKTsKKyAgICBmaW5hbCBQYXRjaFNldCBwcyA9IG5ldyBQYXRjaFNldChpZCk7CisgICAgcHMuc2V0Q3JlYXRlZE9uKG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpKTsKKyAgICBwcy5zZXRVcGxvYWRlcihzdWJtaXRBdWRpdC5nZXRBY2NvdW50SWQoKSk7CisgICAgcHMuc2V0UmV2aXNpb24obmV3IFJldklkKG5ld0NvbW1pdC5nZXRJZCgpLmdldE5hbWUoKSkpOworICAgIGluc2VydEFuY2VzdG9ycyhhcmdzLmRiLCBwcy5nZXRJZCgpLCBuZXdDb21taXQpOworICAgIGFyZ3MuZGIucGF0Y2hTZXRzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihwcykpOworCisgICAgbi5jaGFuZ2Uuc2V0Q3VycmVudFBhdGNoU2V0KHBhdGNoU2V0SW5mb0ZhY3RvcnkuZ2V0KG5ld0NvbW1pdCwgcHMuZ2V0SWQoKSkpOworICAgIGFyZ3MuZGIuY2hhbmdlcygpLnVwZGF0ZShDb2xsZWN0aW9ucy5zaW5nbGV0b25MaXN0KG4uY2hhbmdlKSk7CisKKyAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGFwcHJvdmFscyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXJncy5tZXJnZVV0aWwuZ2V0QXBwcm92YWxzRm9yQ29tbWl0KG4pKSB7CisgICAgICBhcHByb3ZhbHMuYWRkKG5ldyBQYXRjaFNldEFwcHJvdmFsKHBzLmdldElkKCksIGEpKTsKKyAgICB9CisgICAgYXJncy5kYi5wYXRjaFNldEFwcHJvdmFscygpLmluc2VydChhcHByb3ZhbHMpOworCisgICAgZmluYWwgUmVmVXBkYXRlIHJ1ID0gYXJncy5yZXBvLnVwZGF0ZVJlZihwcy5nZXRSZWZOYW1lKCkpOworICAgIHJ1LnNldEV4cGVjdGVkT2xkT2JqZWN0SWQoT2JqZWN0SWQuemVyb0lkKCkpOworICAgIHJ1LnNldE5ld09iamVjdElkKG5ld0NvbW1pdCk7CisgICAgcnUuZGlzYWJsZVJlZkxvZygpOworICAgIGlmIChydS51cGRhdGUoYXJncy5ydykgIT0gUmVmVXBkYXRlLlJlc3VsdC5ORVcpIHsKKyAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KCJGYWlsZWQgdG8gY3JlYXRlIHJlZiAlcyBpbiAlczogJXMiLAorICAgICAgICAgIHBzLmdldFJlZk5hbWUoKSwgbi5jaGFuZ2UuZ2V0RGVzdCgpLmdldFBhcmVudEtleSgpLmdldCgpLAorICAgICAgICAgIHJ1LmdldFJlc3VsdCgpKSk7CisgICAgfQorCisgICAgZ2l0UmVmVXBkYXRlZC5maXJlKG4uY2hhbmdlLmdldFByb2plY3QoKSwgcnUpOworCisgICAgbmV3Q29tbWl0LmNvcHlGcm9tKG4pOworICAgIG5ld0NvbW1pdC5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fUElDSzsKKyAgICBuZXdDb21taXRzLnB1dChuZXdDb21taXQucGF0Y2hzZXRJZC5nZXRQYXJlbnRLZXkoKSwgbmV3Q29tbWl0KTsKKyAgICBzZXRSZWZMb2dJZGVudChzdWJtaXRBdWRpdCk7CisgICAgcmV0dXJuIG5ld0NvbW1pdDsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIHZvaWQgaW5zZXJ0QW5jZXN0b3JzKFJldmlld0RiIGRiLCBQYXRjaFNldC5JZCBpZCwgUmV2Q29tbWl0IHNyYykKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIGZpbmFsIGludCBjbnQgPSBzcmMuZ2V0UGFyZW50Q291bnQoKTsKKyAgICBMaXN0PFBhdGNoU2V0QW5jZXN0b3I+IHRvSW5zZXJ0ID0gbmV3IEFycmF5TGlzdDxQYXRjaFNldEFuY2VzdG9yPihjbnQpOworICAgIGZvciAoaW50IHAgPSAwOyBwIDwgY250OyBwKyspIHsKKyAgICAgIFBhdGNoU2V0QW5jZXN0b3IgYTsKKworICAgICAgYSA9IG5ldyBQYXRjaFNldEFuY2VzdG9yKG5ldyBQYXRjaFNldEFuY2VzdG9yLklkKGlkLCBwICsgMSkpOworICAgICAgYS5zZXRBbmNlc3RvclJldmlzaW9uKG5ldyBSZXZJZChzcmMuZ2V0UGFyZW50KHApLmdldElkKCkubmFtZSgpKSk7CisgICAgICB0b0luc2VydC5hZGQoYSk7CisgICAgfQorICAgIGRiLnBhdGNoU2V0QW5jZXN0b3JzKCkuaW5zZXJ0KHRvSW5zZXJ0KTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgTWFwPENoYW5nZS5JZCwgQ29kZVJldmlld0NvbW1pdD4gZ2V0TmV3Q29tbWl0cygpIHsKKyAgICByZXR1cm4gbmV3Q29tbWl0czsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgYm9vbGVhbiBkcnlSdW4oZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gYXJncy5tZXJnZVV0aWwuY2FuQ2hlcnJ5UGljayhhcmdzLm1lcmdlU29ydGVyLCBhcmdzLnJlcG8sCisgICAgICAgIG1lcmdlVGlwLCBhcmdzLnJ3LCB0b01lcmdlKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ29kZVJldmlld05vdGVDcmVhdGlvbkV4Y2VwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ29kZVJldmlld05vdGVDcmVhdGlvbkV4Y2VwdGlvbi5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAzNjdlZDU2Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NvZGVSZXZpZXdOb3RlQ3JlYXRpb25FeGNlcHRpb24uamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDM3ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7Ci0KLS8qKgotICogVGhyb3duIHdoZW4gY3JlYXRpb24gb2YgYSBjb2RlIHJldmlldyBub3RlIGZhaWxzLgotICovCi1wdWJsaWMgY2xhc3MgQ29kZVJldmlld05vdGVDcmVhdGlvbkV4Y2VwdGlvbiBleHRlbmRzIEV4Y2VwdGlvbiB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOwotCi0gIHB1YmxpYyBDb2RlUmV2aWV3Tm90ZUNyZWF0aW9uRXhjZXB0aW9uKGZpbmFsIFN0cmluZyBtc2cpIHsKLSAgICBzdXBlcihtc2cpOwotICB9Ci0KLSAgcHVibGljIENvZGVSZXZpZXdOb3RlQ3JlYXRpb25FeGNlcHRpb24oZmluYWwgVGhyb3dhYmxlIHdoeSkgewotICAgIHN1cGVyKHdoeSk7Ci0gIH0KLQotICBwdWJsaWMgQ29kZVJldmlld05vdGVDcmVhdGlvbkV4Y2VwdGlvbihmaW5hbCBSZXZDb21taXQgY29tbWl0LAotICAgICAgZmluYWwgVGhyb3dhYmxlIGNhdXNlKSB7Ci0gICAgc3VwZXIoIkNvdWxkbid0IGNyZWF0ZSBjb2RlIHJldmlldyBub3RlIGZvciB0aGUgZm9sbG93aW5nIGNvbW1pdDogIgotICAgICAgICArIGNvbW1pdC5uYW1lKCksIGNhdXNlKTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ29tbWl0TWVyZ2VTdGF0dXMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NvbW1pdE1lcmdlU3RhdHVzLmphdmEKaW5kZXggNmI1MzEyMS4uNjlkY2IxNSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvQ29tbWl0TWVyZ2VTdGF0dXMuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9Db21taXRNZXJnZVN0YXR1cy5qYXZhCkBAIC0yMiwxMiArMjIsMTUgQEAKICAgQ0xFQU5fUElDSygiQ2hhbmdlIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSBjaGVycnktcGlja2VkIiksCiAKICAgLyoqICovCisgIENMRUFOX1JFQkFTRSgiQ2hhbmdlIGhhcyBiZWVuIHN1Y2Nlc3NmdWxseSByZWJhc2VkIiksCisKKyAgLyoqICovCiAgIEFMUkVBRFlfTUVSR0VEKCIiKSwKIAogICAvKiogKi8KLSAgUEFUSF9DT05GTElDVCgiWW91ciBjaGFuZ2UgY291bGQgbm90IGJlIG1lcmdlZCBkdWUgdG8gYSBwYXRoIGNvbmZsaWN0LlxuIgorICBQQVRIX0NPTkZMSUNUKCJUaGUgY2hhbmdlIGNvdWxkIG5vdCBiZSBtZXJnZWQgZHVlIHRvIGEgcGF0aCBjb25mbGljdC5cbiIKICAgICAgICAgICAgICAgICAgICsgIlxuIgotICAgICAgICAgICAgICAgICAgKyAiUGxlYXNlIG1lcmdlIChvciByZWJhc2UpIHRoZSBjaGFuZ2UgbG9jYWxseSBhbmQgdXBsb2FkIHRoZSByZXNvbHV0aW9uIGZvciByZXZpZXcuIiksCisgICAgICAgICAgICAgICAgICArICJQbGVhc2UgcmViYXNlIHRoZSBjaGFuZ2UgbG9jYWxseSBhbmQgdXBsb2FkIHRoZSByZWJhc2VkIGNvbW1pdCBmb3IgcmV2aWV3LiIpLAogCiAgIC8qKiAqLwogICBNSVNTSU5HX0RFUEVOREVOQ1koIiIpLApAQCAtMzksOSArNDIsMTIgQEAKICAgUkVWSVNJT05fR09ORSgiIiksCiAKICAgLyoqICovCi0gIENSSVNTX0NST1NTX01FUkdFKCJZb3VyIGNoYW5nZSByZXF1aXJlcyBhIHJlY3Vyc2l2ZSBtZXJnZSB0byByZXNvbHZlLlxuIgotICAgICAgICAgICAgICAgICAgKyAiXG4iCi0gICAgICAgICAgICAgICAgICArICJQbGVhc2UgbWVyZ2UgKG9yIHJlYmFzZSkgdGhlIGNoYW5nZSBsb2NhbGx5IGFuZCB1cGxvYWQgdGhlIHJlc29sdXRpb24gZm9yIHJldmlldy4iKSwKKyAgTk9fU1VCTUlUX1RZUEUoIiIpLAorCisgIC8qKiAqLworICBNQU5VQUxfUkVDVVJTSVZFX01FUkdFKCJUaGUgY2hhbmdlIHJlcXVpcmVzIGEgbG9jYWwgbWVyZ2UgdG8gcmVzb2x2ZS5cbiIKKyAgICAgICAgICAgICAgICAgICAgICAgKyAiXG4iCisgICAgICAgICAgICAgICAgICAgICAgICsgIlBsZWFzZSBtZXJnZSAob3IgcmViYXNlKSB0aGUgY2hhbmdlIGxvY2FsbHkgYW5kIHVwbG9hZCB0aGUgcmVzb2x1dGlvbiBmb3IgcmV2aWV3LiIpLAogCiAgIC8qKiAqLwogICBDQU5OT1RfQ0hFUlJZX1BJQ0tfUk9PVCgiQ2Fubm90IGNoZXJyeS1waWNrIGFuIGluaXRpYWwgY29tbWl0IG9udG8gYW4gZXhpc3RpbmcgYnJhbmNoLlxuIgpAQCAtNDksNiArNTUsMTEgQEAKICAgICAgICAgICAgICAgICAgICsgIlBsZWFzZSBtZXJnZSB0aGUgY2hhbmdlIGxvY2FsbHkgYW5kIHVwbG9hZCB0aGUgbWVyZ2UgY29tbWl0IGZvciByZXZpZXcuIiksCiAKICAgLyoqICovCisgIENBTk5PVF9SRUJBU0VfUk9PVCgiQ2Fubm90IHJlYmFzZSBhbiBpbml0aWFsIGNvbW1pdCBvbnRvIGFuIGV4aXN0aW5nIGJyYW5jaC5cbiIKKyAgICAgICAgICAgICAgICAgICArICJcbiIKKyAgICAgICAgICAgICAgICAgICArICJQbGVhc2UgbWVyZ2UgdGhlIGNoYW5nZSBsb2NhbGx5IGFuZCB1cGxvYWQgdGhlIG1lcmdlIGNvbW1pdCBmb3IgcmV2aWV3LiIpLAorCisgIC8qKiAqLwogICBOT1RfRkFTVF9GT1JXQVJEKCJQcm9qZWN0IHBvbGljeSByZXF1aXJlcyBhbGwgc3VibWlzc2lvbnMgdG8gYmUgYSBmYXN0LWZvcndhcmQuXG4iCiAgICAgICAgICAgICAgICAgICArICJcbiIKICAgICAgICAgICAgICAgICAgICsgIlBsZWFzZSByZWJhc2UgdGhlIGNoYW5nZSBsb2NhbGx5IGFuZCB1cGxvYWQgYWdhaW4gZm9yIHJldmlldy4iKSwKQEAgLTgxLDQgKzkyLDQgQEAKICAgcHVibGljIFN0cmluZyBnZXRNZXNzYWdlKCl7CiAgICAgcmV0dXJuIG1lc3NhZ2U7CiAgIH0KLX0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9DcmVhdGVDb2RlUmV2aWV3Tm90ZXMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5YTBmZTE3Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0NyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMjE0ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OwotCi1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXIuUkVGU19OT1RFU19SRVZJRVc7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuUmVzdWx0U2V0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuYXBpLmVycm9ycy5Db25jdXJyZW50UmVmVXBkYXRlRXhjZXB0aW9uOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5OdWxsUHJvZ3Jlc3NNb25pdG9yOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdElkOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdEluc2VydGVyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlBlcnNvbklkZW50OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlByb2dyZXNzTW9uaXRvcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubm90ZXMuTm90ZU1hcDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuRm9vdGVyS2V5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7Ci0KLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotCi1pbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKLQotLyoqCi0gKiBUaGlzIGNsYXNzIGNyZWF0ZSBjb2RlIHJldmlldyBub3RlcyBmb3IgZ2l2ZW4ge0BsaW5rIENvZGVSZXZpZXdDb21taXR9cy4KLSAqIDxwPgotICogQWZ0ZXIgdGhlIHtAbGluayAjY3JlYXRlKExpc3QsIFBlcnNvbklkZW50KX0gbWV0aG9kIGlzIGludm9rZWQgb25jZSB0aGlzCi0gKiBpbnN0YW5jZSBtdXN0IG5vdCBiZSByZXVzZWQuIENyZWF0ZSBhIG5ldyBpbnN0YW5jZSBvZiB0aGlzIGNsYXNzIGlmIG5lZWRlZC4KLSAqLwotcHVibGljIGNsYXNzIENyZWF0ZUNvZGVSZXZpZXdOb3RlcyB7Ci0gIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgQ3JlYXRlQ29kZVJldmlld05vdGVzIGNyZWF0ZShSZXZpZXdEYiByZXZpZXdEYiwgUmVwb3NpdG9yeSBkYik7Ci0gIH0KLQotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBGb290ZXJLZXkgQ0hBTkdFX0lEID0gbmV3IEZvb3RlcktleSgiQ2hhbmdlLUlkIik7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlOwotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKLSAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsOwotICBwcml2YXRlIGZpbmFsIFN0cmluZyBhbm9ueW1vdXNDb3dhcmROYW1lOwotICBwcml2YXRlIGZpbmFsIFJldmlld0RiIHNjaGVtYTsKLSAgcHJpdmF0ZSBmaW5hbCBSZXBvc2l0b3J5IGRiOwotCi0gIHByaXZhdGUgUGVyc29uSWRlbnQgYXV0aG9yOwotCi0gIHByaXZhdGUgUmV2V2FsayByZXZXYWxrOwotICBwcml2YXRlIE9iamVjdEluc2VydGVyIGluc2VydGVyOwotCi0gIHByaXZhdGUgZmluYWwgTm90ZXNCcmFuY2hVdGlsLkZhY3Rvcnkgbm90ZXNCcmFuY2hVdGlsRmFjdG9yeTsKLQotICBASW5qZWN0Ci0gIENyZWF0ZUNvZGVSZXZpZXdOb3RlcygKLSAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBmaW5hbCBQZXJzb25JZGVudCBnZXJyaXRJZGVudCwKLSAgICAgIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGUsCi0gICAgICBmaW5hbCBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXMsCi0gICAgICBmaW5hbCBATnVsbGFibGUgQENhbm9uaWNhbFdlYlVybCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsLAotICAgICAgZmluYWwgQEFub255bW91c0Nvd2FyZE5hbWUgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWUsCi0gICAgICBmaW5hbCBOb3Rlc0JyYW5jaFV0aWwuRmFjdG9yeSBub3Rlc0JyYW5jaFV0aWxGYWN0b3J5LAotICAgICAgZmluYWwgQEFzc2lzdGVkICBSZXZpZXdEYiByZXZpZXdEYiwKLSAgICAgIGZpbmFsIEBBc3Npc3RlZCAgUmVwb3NpdG9yeSBkYikgewotICAgIHRoaXMuYXV0aG9yID0gZ2Vycml0SWRlbnQ7Ci0gICAgdGhpcy5hY2NvdW50Q2FjaGUgPSBhY2NvdW50Q2FjaGU7Ci0gICAgdGhpcy5hcHByb3ZhbFR5cGVzID0gYXBwcm92YWxUeXBlczsKLSAgICB0aGlzLmNhbm9uaWNhbFdlYlVybCA9IGNhbm9uaWNhbFdlYlVybDsKLSAgICB0aGlzLmFub255bW91c0Nvd2FyZE5hbWUgPSBhbm9ueW1vdXNDb3dhcmROYW1lOwotICAgIHRoaXMubm90ZXNCcmFuY2hVdGlsRmFjdG9yeSA9IG5vdGVzQnJhbmNoVXRpbEZhY3Rvcnk7Ci0gICAgc2NoZW1hID0gcmV2aWV3RGI7Ci0gICAgdGhpcy5kYiA9IGRiOwotICB9Ci0KLSAgcHVibGljIHZvaWQgY3JlYXRlKExpc3Q8Q29kZVJldmlld0NvbW1pdD4gY29tbWl0cywgUGVyc29uSWRlbnQgYXV0aG9yKQotICAgICAgdGhyb3dzIENvZGVSZXZpZXdOb3RlQ3JlYXRpb25FeGNlcHRpb24gewotICAgIHRyeSB7Ci0gICAgICByZXZXYWxrID0gbmV3IFJldldhbGsoZGIpOwotICAgICAgaW5zZXJ0ZXIgPSBkYi5uZXdPYmplY3RJbnNlcnRlcigpOwotICAgICAgaWYgKGF1dGhvciAhPSBudWxsKSB7Ci0gICAgICAgIHRoaXMuYXV0aG9yID0gYXV0aG9yOwotICAgICAgfQotCi0gICAgICBOb3RlTWFwIG5vdGVzID0gTm90ZU1hcC5uZXdFbXB0eU1hcCgpOwotICAgICAgU3RyaW5nQnVpbGRlciBtZXNzYWdlID0KLSAgICAgICAgICBuZXcgU3RyaW5nQnVpbGRlcigiVXBkYXRlIG5vdGVzIGZvciBzdWJtaXR0ZWQgY2hhbmdlc1xuXG4iKTsKLSAgICAgIGZvciAoQ29kZVJldmlld0NvbW1pdCBjIDogY29tbWl0cykgewotICAgICAgICBub3Rlcy5zZXQoYywgY3JlYXRlTm90ZUNvbnRlbnQoYy5jaGFuZ2UsIGMpKTsKLSAgICAgICAgbWVzc2FnZS5hcHBlbmQoIiogIikuYXBwZW5kKGMuZ2V0U2hvcnRNZXNzYWdlKCkpLmFwcGVuZCgiXG4iKTsKLSAgICAgIH0KLQotICAgICAgTm90ZXNCcmFuY2hVdGlsIG5vdGVzQnJhbmNoVXRpbCA9IG5vdGVzQnJhbmNoVXRpbEZhY3RvcnkuY3JlYXRlKGRiKTsKLSAgICAgIG5vdGVzQnJhbmNoVXRpbC5jb21taXRBbGxOb3Rlcyhub3RlcywgUkVGU19OT1RFU19SRVZJRVcsIGF1dGhvciwKLSAgICAgICAgICBtZXNzYWdlLnRvU3RyaW5nKCkpOwotICAgICAgaW5zZXJ0ZXIuZmx1c2goKTsKLSAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgQ29kZVJldmlld05vdGVDcmVhdGlvbkV4Y2VwdGlvbihlKTsKLSAgICB9IGNhdGNoIChDb25jdXJyZW50UmVmVXBkYXRlRXhjZXB0aW9uIGUpIHsKLSAgICAgIHRocm93IG5ldyBDb2RlUmV2aWV3Tm90ZUNyZWF0aW9uRXhjZXB0aW9uKGUpOwotICAgIH0gZmluYWxseSB7Ci0gICAgICByZXZXYWxrLnJlbGVhc2UoKTsKLSAgICAgIGluc2VydGVyLnJlbGVhc2UoKTsKLSAgICB9Ci0gIH0KLQotICBwdWJsaWMgdm9pZCBjcmVhdGUoTGlzdDxDaGFuZ2U+IGNoYW5nZXMsIFBlcnNvbklkZW50IGF1dGhvciwKLSAgICAgIFN0cmluZyBjb21taXRNZXNzYWdlLCBQcm9ncmVzc01vbml0b3IgbW9uaXRvcikgdGhyb3dzIE9ybUV4Y2VwdGlvbiwKLSAgICAgIElPRXhjZXB0aW9uLCBDb2RlUmV2aWV3Tm90ZUNyZWF0aW9uRXhjZXB0aW9uIHsKLSAgICB0cnkgewotICAgICAgcmV2V2FsayA9IG5ldyBSZXZXYWxrKGRiKTsKLSAgICAgIGluc2VydGVyID0gZGIubmV3T2JqZWN0SW5zZXJ0ZXIoKTsKLSAgICAgIGlmIChhdXRob3IgIT0gbnVsbCkgewotICAgICAgICB0aGlzLmF1dGhvciA9IGF1dGhvcjsKLSAgICAgIH0KLSAgICAgIGlmIChtb25pdG9yID09IG51bGwpIHsKLSAgICAgICAgbW9uaXRvciA9IE51bGxQcm9ncmVzc01vbml0b3IuSU5TVEFOQ0U7Ci0gICAgICB9Ci0KLSAgICAgIE5vdGVNYXAgbm90ZXMgPSBOb3RlTWFwLm5ld0VtcHR5TWFwKCk7Ci0gICAgICBmb3IgKENoYW5nZSBjIDogY2hhbmdlcykgewotICAgICAgICBtb25pdG9yLnVwZGF0ZSgxKTsKLSAgICAgICAgUGF0Y2hTZXQgcHMgPSBzY2hlbWEucGF0Y2hTZXRzKCkuZ2V0KGMuY3VycmVudFBhdGNoU2V0SWQoKSk7Ci0gICAgICAgIE9iamVjdElkIGNvbW1pdElkID0gT2JqZWN0SWQuZnJvbVN0cmluZyhwcy5nZXRSZXZpc2lvbigpLmdldCgpKTsKLSAgICAgICAgbm90ZXMuc2V0KGNvbW1pdElkLCBjcmVhdGVOb3RlQ29udGVudChjLCBjb21taXRJZCkpOwotICAgICAgfQotCi0gICAgICBOb3Rlc0JyYW5jaFV0aWwgbm90ZXNCcmFuY2hVdGlsID0gbm90ZXNCcmFuY2hVdGlsRmFjdG9yeS5jcmVhdGUoZGIpOwotICAgICAgbm90ZXNCcmFuY2hVdGlsLmNvbW1pdEFsbE5vdGVzKG5vdGVzLCBSRUZTX05PVEVTX1JFVklFVywgYXV0aG9yLAotICAgICAgICAgIGNvbW1pdE1lc3NhZ2UpOwotICAgICAgaW5zZXJ0ZXIuZmx1c2goKTsKLSAgICB9IGNhdGNoIChDb25jdXJyZW50UmVmVXBkYXRlRXhjZXB0aW9uIGUpIHsKLSAgICAgIHRocm93IG5ldyBDb2RlUmV2aWV3Tm90ZUNyZWF0aW9uRXhjZXB0aW9uKGUpOwotICAgIH0gZmluYWxseSB7Ci0gICAgICByZXZXYWxrLnJlbGVhc2UoKTsKLSAgICAgIGluc2VydGVyLnJlbGVhc2UoKTsKLSAgICB9Ci0gIH0KLQotICBwcml2YXRlIE9iamVjdElkIGNyZWF0ZU5vdGVDb250ZW50KENoYW5nZSBjaGFuZ2UsIE9iamVjdElkIGNvbW1pdCkKLSAgICAgIHRocm93cyBDb2RlUmV2aWV3Tm90ZUNyZWF0aW9uRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiAgewotICAgIGlmICghKGNvbW1pdCBpbnN0YW5jZW9mIFJldkNvbW1pdCkpIHsKLSAgICAgIGNvbW1pdCA9IHJldldhbGsucGFyc2VDb21taXQoY29tbWl0KTsKLSAgICB9Ci0gICAgcmV0dXJuIGNyZWF0ZU5vdGVDb250ZW50KGNoYW5nZSwgKFJldkNvbW1pdCkgY29tbWl0KTsKLSAgfQotCi0gIHByaXZhdGUgT2JqZWN0SWQgY3JlYXRlTm90ZUNvbnRlbnQoQ2hhbmdlIGNoYW5nZSwgUmV2Q29tbWl0IGNvbW1pdCkKLSAgICAgIHRocm93cyBDb2RlUmV2aWV3Tm90ZUNyZWF0aW9uRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7Ci0gICAgdHJ5IHsKLSAgICAgIFJldmlld05vdGVIZWFkZXJGb3JtYXR0ZXIgZm9ybWF0dGVyID0KLSAgICAgICAgICBuZXcgUmV2aWV3Tm90ZUhlYWRlckZvcm1hdHRlcihhdXRob3IuZ2V0VGltZVpvbmUoKSwKLSAgICAgICAgICAgICAgYW5vbnltb3VzQ293YXJkTmFtZSk7Ci0gICAgICBmaW5hbCBMaXN0PFN0cmluZz4gaWRMaXN0ID0gY29tbWl0LmdldEZvb3RlckxpbmVzKENIQU5HRV9JRCk7Ci0gICAgICBpZiAoaWRMaXN0LmlzRW1wdHkoKSkKLSAgICAgICAgZm9ybWF0dGVyLmFwcGVuZENoYW5nZUlkKGNoYW5nZS5nZXRLZXkoKSk7Ci0gICAgICBSZXN1bHRTZXQ8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzID0KLSAgICAgICAgc2NoZW1hLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlQYXRjaFNldChjaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKSk7Ci0gICAgICBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdCA9IG51bGw7Ci0gICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgYSA6IGFwcHJvdmFscykgewotICAgICAgICBpZiAoYS5nZXRWYWx1ZSgpID09IDApIHsKLSAgICAgICAgICAvLyBJZ25vcmUgMCB2YWx1ZXMuCi0gICAgICAgIH0gZWxzZSBpZiAoQXBwcm92YWxDYXRlZ29yeS5TVUJNSVQuZXF1YWxzKGEuZ2V0Q2F0ZWdvcnlJZCgpKSkgewotICAgICAgICAgIHN1Ym1pdCA9IGE7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgQXBwcm92YWxUeXBlIHR5cGUgPSBhcHByb3ZhbFR5cGVzLmJ5SWQoYS5nZXRDYXRlZ29yeUlkKCkpOwotICAgICAgICAgIGlmICh0eXBlICE9IG51bGwpIHsKLSAgICAgICAgICAgIGZvcm1hdHRlci5hcHBlbmRBcHByb3ZhbCgKLSAgICAgICAgICAgICAgICB0eXBlLmdldENhdGVnb3J5KCksCi0gICAgICAgICAgICAgICAgYS5nZXRWYWx1ZSgpLAotICAgICAgICAgICAgICAgIGFjY291bnRDYWNoZS5nZXQoYS5nZXRBY2NvdW50SWQoKSkuZ2V0QWNjb3VudCgpKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0KLQotICAgICAgaWYgKHN1Ym1pdCAhPSBudWxsKSB7Ci0gICAgICAgIGZvcm1hdHRlci5hcHBlbmRTdWJtaXR0ZWRCeShhY2NvdW50Q2FjaGUuZ2V0KHN1Ym1pdC5nZXRBY2NvdW50SWQoKSkuZ2V0QWNjb3VudCgpKTsKLSAgICAgICAgZm9ybWF0dGVyLmFwcGVuZFN1Ym1pdHRlZEF0KHN1Ym1pdC5nZXRHcmFudGVkKCkpOwotICAgICAgfQotICAgICAgaWYgKGNhbm9uaWNhbFdlYlVybCAhPSBudWxsKSB7Ci0gICAgICAgIGZvcm1hdHRlci5hcHBlbmRSZXZpZXdlZE9uKGNhbm9uaWNhbFdlYlVybCwgY2hhbmdlLmdldElkKCkpOwotICAgICAgfQotICAgICAgZm9ybWF0dGVyLmFwcGVuZFByb2plY3QoY2hhbmdlLmdldFByb2plY3QoKS5nZXQoKSk7Ci0gICAgICBmb3JtYXR0ZXIuYXBwZW5kQnJhbmNoKGNoYW5nZS5nZXREZXN0KCkpOwotICAgICAgcmV0dXJuIGluc2VydGVyLmluc2VydChDb25zdGFudHMuT0JKX0JMT0IsIGZvcm1hdHRlci50b1N0cmluZygpLmdldEJ5dGVzKCJVVEYtOCIpKTsKLSAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgbmV3IENvZGVSZXZpZXdOb3RlQ3JlYXRpb25FeGNlcHRpb24oY29tbWl0LCBlKTsKLSAgICB9Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0RlZmF1bHRRdWV1ZU9wLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9EZWZhdWx0UXVldWVPcC5qYXZhCmluZGV4IDgyZDA0OTMuLmNmZjY5YzYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0RlZmF1bHRRdWV1ZU9wLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvRGVmYXVsdFF1ZXVlT3AuamF2YQpAQCAtMTQsNiArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CiAKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5TY2hlZHVsZWRGdXR1cmU7CiBpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQ7CiAKIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBEZWZhdWx0UXVldWVPcCBpbXBsZW1lbnRzIFJ1bm5hYmxlIHsKQEAgLTIzLDcgKzI0LDEzIEBACiAgICAgd29ya1F1ZXVlID0gd3E7CiAgIH0KIAotICBwdWJsaWMgdm9pZCBzdGFydChmaW5hbCBpbnQgZGVsYXksIGZpbmFsIFRpbWVVbml0IHVuaXQpIHsKLSAgICB3b3JrUXVldWUuZ2V0RGVmYXVsdFF1ZXVlKCkuc2NoZWR1bGUodGhpcywgZGVsYXksIHVuaXQpOworICBwdWJsaWMgU2NoZWR1bGVkRnV0dXJlPD8+IHN0YXJ0KGxvbmcgZGVsYXksIFRpbWVVbml0IHVuaXQpIHsKKyAgICByZXR1cm4gd29ya1F1ZXVlLmdldERlZmF1bHRRdWV1ZSgpLnNjaGVkdWxlKHRoaXMsIGRlbGF5LCB1bml0KTsKKyAgfQorCisgIHB1YmxpYyBTY2hlZHVsZWRGdXR1cmU8Pz4gc3RhcnRXaXRoRml4ZWREZWxheShsb25nIGluaXRpYWxEZWxheSwgbG9uZyBkZWxheSwKKyAgICAgIFRpbWVVbml0IHVuaXQpIHsKKyAgICByZXR1cm4gd29ya1F1ZXVlLmdldERlZmF1bHRRdWV1ZSgpCisgICAgICAgIC5zY2hlZHVsZVdpdGhGaXhlZERlbGF5KHRoaXMsIGluaXRpYWxEZWxheSwgZGVsYXksIHVuaXQpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9GYXN0Rm9yd2FyZE9ubHkuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0Zhc3RGb3J3YXJkT25seS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjdhZGY0ZDUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9GYXN0Rm9yd2FyZE9ubHkuamF2YQpAQCAtMCwwICsxLDU3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBGYXN0Rm9yd2FyZE9ubHkgZXh0ZW5kcyBTdWJtaXRTdHJhdGVneSB7CisKKyAgRmFzdEZvcndhcmRPbmx5KGZpbmFsIFN1Ym1pdFN0cmF0ZWd5LkFyZ3VtZW50cyBhcmdzKSB7CisgICAgc3VwZXIoYXJncyk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIENvZGVSZXZpZXdDb21taXQgX3J1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIGFyZ3MubWVyZ2VVdGlsLnJlZHVjZVRvTWluaW1hbE1lcmdlKGFyZ3MubWVyZ2VTb3J0ZXIsIHRvTWVyZ2UpOworICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbmV3TWVyZ2VUaXAgPQorICAgICAgICBhcmdzLm1lcmdlVXRpbC5nZXRGaXJzdEZhc3RGb3J3YXJkKG1lcmdlVGlwLCBhcmdzLnJ3LCB0b01lcmdlKTsKKworICAgIHdoaWxlICghdG9NZXJnZS5pc0VtcHR5KCkpIHsKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbiA9IHRvTWVyZ2UucmVtb3ZlKDApOworICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuTk9UX0ZBU1RfRk9SV0FSRDsKKyAgICB9CisKKyAgICBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdEFwcHJvdmFsID0KKyAgICAgICAgYXJncy5tZXJnZVV0aWwubWFya0NsZWFuTWVyZ2VzKGFyZ3MucncsIGFyZ3MuY2FuTWVyZ2VGbGFnLCBuZXdNZXJnZVRpcCwKKyAgICAgICAgICAgIGFyZ3MuYWxyZWFkeUFjY2VwdGVkKTsKKyAgICBzZXRSZWZMb2dJZGVudChzdWJtaXRBcHByb3ZhbCk7CisKKyAgICByZXR1cm4gbmV3TWVyZ2VUaXA7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIGJvb2xlYW4gcmV0cnlPbkxvY2tGYWlsdXJlKCkgeworICAgIHJldHVybiBmYWxzZTsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGRyeVJ1bihmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHJldHVybiBhcmdzLm1lcmdlVXRpbC5jYW5GYXN0Rm9yd2FyZChhcmdzLm1lcmdlU29ydGVyLCBtZXJnZVRpcCwgYXJncy5ydywKKyAgICAgICAgdG9NZXJnZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0dhcmJhZ2VDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9HYXJiYWdlQ29sbGVjdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY4NWU4N2MKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9HYXJiYWdlQ29sbGVjdGlvbi5qYXZhCkBAIC0wLDAgKzEsMTg0IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HYXJiYWdlQ29sbGVjdGlvblJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmFwaS5HYXJiYWdlQ29sbGVjdENvbW1hbmQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5hcGkuR2l0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuYXBpLmVycm9ycy5HaXRBUElFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5hcGkuZXJyb3JzLkpHaXRJbnRlcm5hbEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5SZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZ0NvbnN0YW50czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5OdWxsUHJvZ3Jlc3NNb25pdG9yOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuVGV4dFByb2dyZXNzTW9uaXRvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnN0b3JhZ2UucGFjay5QYWNrQ29uZmlnOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuaW8uUHJpbnRXcml0ZXI7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlByb3BlcnRpZXM7CitpbXBvcnQgamF2YS51dGlsLlNldDsKKworcHVibGljIGNsYXNzIEdhcmJhZ2VDb2xsZWN0aW9uIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkKKyAgICAgIC5nZXRMb2dnZXIoR2FyYmFnZUNvbGxlY3Rpb24uY2xhc3MpOworCisgIHB1YmxpYyBzdGF0aWMgZmluYWwgU3RyaW5nIExPR19OQU1FID0gImdjX2xvZyI7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBnY0xvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKExPR19OQU1FKTsKKworCisgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXI7CisgIHByaXZhdGUgZmluYWwgR2FyYmFnZUNvbGxlY3Rpb25RdWV1ZSBnY1F1ZXVlOworCisgIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7CisgICAgR2FyYmFnZUNvbGxlY3Rpb24gY3JlYXRlKCk7CisgIH0KKworICBASW5qZWN0CisgIEdhcmJhZ2VDb2xsZWN0aW9uKEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLCBHYXJiYWdlQ29sbGVjdGlvblF1ZXVlIGdjUXVldWUpIHsKKyAgICB0aGlzLnJlcG9NYW5hZ2VyID0gcmVwb01hbmFnZXI7CisgICAgdGhpcy5nY1F1ZXVlID0gZ2NRdWV1ZTsKKyAgfQorCisgIHB1YmxpYyBHYXJiYWdlQ29sbGVjdGlvblJlc3VsdCBydW4oTGlzdDxQcm9qZWN0Lk5hbWVLZXk+IHByb2plY3ROYW1lcykgeworICAgIHJldHVybiBydW4ocHJvamVjdE5hbWVzLCBudWxsKTsKKyAgfQorCisgIHB1YmxpYyBHYXJiYWdlQ29sbGVjdGlvblJlc3VsdCBydW4oTGlzdDxQcm9qZWN0Lk5hbWVLZXk+IHByb2plY3ROYW1lcywKKyAgICAgIFByaW50V3JpdGVyIHdyaXRlcikgeworICAgIEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0IHJlc3VsdCA9IG5ldyBHYXJiYWdlQ29sbGVjdGlvblJlc3VsdCgpOworICAgIFNldDxQcm9qZWN0Lk5hbWVLZXk+IHByb2plY3RzVG9HYyA9IGdjUXVldWUuYWRkQWxsKHByb2plY3ROYW1lcyk7CisgICAgZm9yIChQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUgOiBTZXRzLmRpZmZlcmVuY2UoCisgICAgICAgIFNldHMubmV3SGFzaFNldChwcm9qZWN0TmFtZXMpLCBwcm9qZWN0c1RvR2MpKSB7CisgICAgICByZXN1bHQuYWRkRXJyb3IobmV3IEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0LkVycm9yKAorICAgICAgICAgIEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0LkVycm9yLlR5cGUuR0NfQUxSRUFEWV9TQ0hFRFVMRUQsIHByb2plY3ROYW1lKSk7CisgICAgfQorICAgIGZvciAoUHJvamVjdC5OYW1lS2V5IHAgOiBwcm9qZWN0c1RvR2MpIHsKKyAgICAgIFJlcG9zaXRvcnkgcmVwbyA9IG51bGw7CisgICAgICB0cnkgeworICAgICAgICByZXBvID0gcmVwb01hbmFnZXIub3BlblJlcG9zaXRvcnkocCk7CisgICAgICAgIGxvZ0djQ29uZmlndXJhdGlvbihwLCByZXBvKTsKKyAgICAgICAgcHJpbnQod3JpdGVyLCAiY29sbGVjdGluZyBnYXJiYWdlIGZvciBcIiIgKyBwICsgIlwiOlxuIik7CisgICAgICAgIEdhcmJhZ2VDb2xsZWN0Q29tbWFuZCBnYyA9IEdpdC53cmFwKHJlcG8pLmdjKCk7CisgICAgICAgIGxvZ0djSW5mbyhwLCAiYmVmb3JlOiIsIGdjLmdldFN0YXRpc3RpY3MoKSk7CisgICAgICAgIGdjLnNldFByb2dyZXNzTW9uaXRvcih3cml0ZXIgIT0gbnVsbCA/IG5ldyBUZXh0UHJvZ3Jlc3NNb25pdG9yKHdyaXRlcikKKyAgICAgICAgICAgIDogTnVsbFByb2dyZXNzTW9uaXRvci5JTlNUQU5DRSk7CisgICAgICAgIFByb3BlcnRpZXMgc3RhdGlzdGljcyA9IGdjLmNhbGwoKTsKKyAgICAgICAgbG9nR2NJbmZvKHAsICJhZnRlcjogIiwgc3RhdGlzdGljcyk7CisgICAgICAgIHByaW50KHdyaXRlciwgImRvbmUuXG5cbiIpOworICAgICAgfSBjYXRjaCAoUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgbG9nR2NFcnJvcih3cml0ZXIsIHAsIGUpOworICAgICAgICByZXN1bHQuYWRkRXJyb3IobmV3IEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0LkVycm9yKAorICAgICAgICAgICAgR2FyYmFnZUNvbGxlY3Rpb25SZXN1bHQuRXJyb3IuVHlwZS5SRVBPU0lUT1JZX05PVF9GT1VORCwKKyAgICAgICAgICAgIHApKTsKKyAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgbG9nR2NFcnJvcih3cml0ZXIsIHAsIGUpOworICAgICAgICByZXN1bHQuYWRkRXJyb3IobmV3IEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0LkVycm9yKAorICAgICAgICAgICAgR2FyYmFnZUNvbGxlY3Rpb25SZXN1bHQuRXJyb3IuVHlwZS5HQ19GQUlMRUQsIHApKTsKKyAgICAgIH0gY2F0Y2ggKEdpdEFQSUV4Y2VwdGlvbiBlKSB7CisgICAgICAgIGxvZ0djRXJyb3Iod3JpdGVyLCBwLCBlKTsKKyAgICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBHYXJiYWdlQ29sbGVjdGlvblJlc3VsdC5FcnJvcigKKyAgICAgICAgICAgIEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0LkVycm9yLlR5cGUuR0NfRkFJTEVELCBwKSk7CisgICAgICB9IGNhdGNoIChKR2l0SW50ZXJuYWxFeGNlcHRpb24gZSkgeworICAgICAgICBsb2dHY0Vycm9yKHdyaXRlciwgcCwgZSk7CisgICAgICAgIHJlc3VsdC5hZGRFcnJvcihuZXcgR2FyYmFnZUNvbGxlY3Rpb25SZXN1bHQuRXJyb3IoCisgICAgICAgICAgICBHYXJiYWdlQ29sbGVjdGlvblJlc3VsdC5FcnJvci5UeXBlLkdDX0ZBSUxFRCwgcCkpOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgaWYgKHJlcG8gIT0gbnVsbCkgeworICAgICAgICAgIHJlcG8uY2xvc2UoKTsKKyAgICAgICAgfQorICAgICAgICBnY1F1ZXVlLmdjRmluaXNoZWQocCk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiByZXN1bHQ7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyB2b2lkIGxvZ0djSW5mbyhQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUsIFN0cmluZyBtc2cpIHsKKyAgICBsb2dHY0luZm8ocHJvamVjdE5hbWUsIG1zZywgbnVsbCk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyB2b2lkIGxvZ0djSW5mbyhQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUsIFN0cmluZyBtc2csCisgICAgICBQcm9wZXJ0aWVzIHN0YXRpc3RpY3MpIHsKKyAgICBTdHJpbmdCdWlsZGVyIGIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIGIuYXBwZW5kKCJbIikuYXBwZW5kKHByb2plY3ROYW1lLmdldCgpKS5hcHBlbmQoIl0gIik7CisgICAgYi5hcHBlbmQobXNnKTsKKyAgICBpZiAoc3RhdGlzdGljcyAhPSBudWxsKSB7CisgICAgICBiLmFwcGVuZCgiICIpOworICAgICAgU3RyaW5nIHMgPSBzdGF0aXN0aWNzLnRvU3RyaW5nKCk7CisgICAgICBpZiAocy5zdGFydHNXaXRoKCJ7IikgJiYgcy5lbmRzV2l0aCgifSIpKSB7CisgICAgICAgIHMgPSBzLnN1YnN0cmluZygxLCBzLmxlbmd0aCgpIC0gMSk7CisgICAgICB9CisgICAgICBiLmFwcGVuZChzKTsKKyAgICB9CisgICAgZ2NMb2cuaW5mbyhiLnRvU3RyaW5nKCkpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBsb2dHY0NvbmZpZ3VyYXRpb24oUHJvamVjdC5OYW1lS2V5IHByb2plY3ROYW1lLAorICAgICAgUmVwb3NpdG9yeSByZXBvKSB7CisgICAgU3RyaW5nQnVpbGRlciBiID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKKyAgICBDb25maWcgY2ZnID0gcmVwby5nZXRDb25maWcoKTsKKyAgICBiLmFwcGVuZChmb3JtYXRDb25maWdWYWx1ZXMoY2ZnLCBDb25maWdDb25zdGFudHMuQ09ORklHX0dDX1NFQ1RJT04sIG51bGwpKTsKKyAgICBmb3IgKFN0cmluZyBzdWJzZWN0aW9uIDogY2ZnLmdldFN1YnNlY3Rpb25zKENvbmZpZ0NvbnN0YW50cy5DT05GSUdfR0NfU0VDVElPTikpIHsKKyAgICAgIGIuYXBwZW5kKGZvcm1hdENvbmZpZ1ZhbHVlcyhjZmcsIENvbmZpZ0NvbnN0YW50cy5DT05GSUdfR0NfU0VDVElPTiwKKyAgICAgICAgICBzdWJzZWN0aW9uKSk7CisgICAgfQorICAgIGlmIChiLmxlbmd0aCgpID09IDApIHsKKyAgICAgIGIuYXBwZW5kKCJubyBzZXQiKTsKKyAgICB9CisKKyAgICBsb2dHY0luZm8ocHJvamVjdE5hbWUsICJnYyBjb25maWc6ICIgKyBiLnRvU3RyaW5nKCkpOworICAgIGxvZ0djSW5mbyhwcm9qZWN0TmFtZSwgInBhY2sgY29uZmlnOiAiICsgKG5ldyBQYWNrQ29uZmlnKHJlcG8pKS50b1N0cmluZygpKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBmb3JtYXRDb25maWdWYWx1ZXMoQ29uZmlnIGNvbmZpZywgU3RyaW5nIHNlY3Rpb24sCisgICAgICBTdHJpbmcgc3Vic2VjdGlvbikgeworICAgIFN0cmluZ0J1aWxkZXIgYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgU2V0PFN0cmluZz4gbmFtZXMgPSBjb25maWcuZ2V0TmFtZXMoc2VjdGlvbiwgc3Vic2VjdGlvbik7CisgICAgZm9yIChTdHJpbmcgbmFtZSA6IG5hbWVzKSB7CisgICAgICBTdHJpbmcgdmFsdWUgPSBjb25maWcuZ2V0U3RyaW5nKHNlY3Rpb24sIHN1YnNlY3Rpb24sIG5hbWUpOworICAgICAgYi5hcHBlbmQoc2VjdGlvbik7CisgICAgICBpZiAoc3Vic2VjdGlvbiAhPSBudWxsKSB7CisgICAgICAgIGIuYXBwZW5kKCIuIikuYXBwZW5kKHN1YnNlY3Rpb24pOworICAgICAgfQorICAgICAgYi5hcHBlbmQoIi4iKTsKKyAgICAgIGIuYXBwZW5kKG5hbWUpLmFwcGVuZCgiPSIpLmFwcGVuZCh2YWx1ZSk7CisgICAgICBiLmFwcGVuZCgiOyAiKTsKKyAgICB9CisgICAgcmV0dXJuIGIudG9TdHJpbmcoKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIHZvaWQgbG9nR2NFcnJvcihQcmludFdyaXRlciB3cml0ZXIsCisgICAgICBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUsIEV4Y2VwdGlvbiBlKSB7CisgICAgcHJpbnQod3JpdGVyLCAiZmFpbGVkLlxuXG4iKTsKKyAgICBTdHJpbmdCdWlsZGVyIGIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIGIuYXBwZW5kKCJbIikuYXBwZW5kKHByb2plY3ROYW1lLmdldCgpKS5hcHBlbmQoIl0iKTsKKyAgICBnY0xvZy5lcnJvcihiLnRvU3RyaW5nKCksIGUpOworICAgIGxvZy5lcnJvcihiLnRvU3RyaW5nKCksIGUpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBwcmludChQcmludFdyaXRlciB3cml0ZXIsIFN0cmluZyBtZXNzYWdlKSB7CisgICAgaWYgKHdyaXRlciAhPSBudWxsKSB7CisgICAgICB3cml0ZXIucHJpbnQobWVzc2FnZSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9HYXJiYWdlQ29sbGVjdGlvblF1ZXVlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9HYXJiYWdlQ29sbGVjdGlvblF1ZXVlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDJkYzUwNQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0dhcmJhZ2VDb2xsZWN0aW9uUXVldWUuamF2YQpAQCAtMCwwICsxLDQyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitAU2luZ2xldG9uCitwdWJsaWMgY2xhc3MgR2FyYmFnZUNvbGxlY3Rpb25RdWV1ZSB7CisgIHByaXZhdGUgZmluYWwgU2V0PFByb2plY3QuTmFtZUtleT4gcHJvamVjdHNTY2hlZHVsZWRGb3JHYyA9IFNldHMubmV3SGFzaFNldCgpOworCisgIHB1YmxpYyBzeW5jaHJvbml6ZWQgU2V0PFByb2plY3QuTmFtZUtleT4gYWRkQWxsKENvbGxlY3Rpb248UHJvamVjdC5OYW1lS2V5PiBwcm9qZWN0cykgeworICAgIFNldDxQcm9qZWN0Lk5hbWVLZXk+IGFkZGVkID0KKyAgICAgICAgU2V0cy5uZXdMaW5rZWRIYXNoU2V0V2l0aEV4cGVjdGVkU2l6ZShwcm9qZWN0cy5zaXplKCkpOworICAgIGZvciAoUHJvamVjdC5OYW1lS2V5IHAgOiBwcm9qZWN0cykgeworICAgICAgaWYgKHByb2plY3RzU2NoZWR1bGVkRm9yR2MuYWRkKHApKSB7CisgICAgICAgIGFkZGVkLmFkZChwKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGFkZGVkOworICB9CisKKyAgcHVibGljIHN5bmNocm9uaXplZCB2b2lkIGdjRmluaXNoZWQoUHJvamVjdC5OYW1lS2V5IHByb2plY3QpIHsKKyAgICBwcm9qZWN0c1NjaGVkdWxlZEZvckdjLnJlbW92ZShwcm9qZWN0KTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvR2l0TW9kdWxlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9HaXRNb2R1bGUuamF2YQppbmRleCA3OTQ3ZDMwLi45ZWY3MjU2IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9HaXRNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9HaXRNb2R1bGUuamF2YQpAQCAtMjMsNSArMjMsNiBAQAogICAgIGZhY3RvcnkoUmVuYW1lR3JvdXBPcC5GYWN0b3J5LmNsYXNzKTsKICAgICBmYWN0b3J5KE1ldGFEYXRhVXBkYXRlLkludGVybmFsRmFjdG9yeS5jbGFzcyk7CiAgICAgYmluZChNZXRhRGF0YVVwZGF0ZS5TZXJ2ZXIuY2xhc3MpOworICAgIGJpbmQoUmVjZWl2ZUNvbmZpZy5jbGFzcyk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0dpdFJlcG9zaXRvcnlNYW5hZ2VyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9HaXRSZXBvc2l0b3J5TWFuYWdlci5qYXZhCmluZGV4IDFiZjE1N2IuLjAxMTg0MDQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0dpdFJlcG9zaXRvcnlNYW5hZ2VyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvR2l0UmVwb3NpdG9yeU1hbmFnZXIuamF2YQpAQCAtMzEsMTUgKzMxLDE1IEBACiAgKiBlbnZpcm9ubWVudC4KICAqLwogcHVibGljIGludGVyZmFjZSBHaXRSZXBvc2l0b3J5TWFuYWdlciB7Ci0gIC8qKiBOb3RlcyBicmFuY2ggc3VjY2Vzc2Z1bCByZXZpZXdzIGFyZSB3cml0dGVuIHRvIGFmdGVyIGJlaW5nIG1lcmdlZC4gKi8KLSAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgUkVGU19OT1RFU19SRVZJRVcgPSAicmVmcy9ub3Rlcy9yZXZpZXciOwotCiAgIC8qKiBOb3RlIHRyZWUgbGlzdGluZyBjb21taXRzIHdlIHJlZnVzZSB7QGNvZGUgcmVmcy9tZXRhL3JlamVjdC1jb21taXRzfSAqLwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBSRUZfUkVKRUNUX0NPTU1JVFMgPSAicmVmcy9tZXRhL3JlamVjdC1jb21taXRzIjsKIAogICAvKiogQ29uZmlndXJhdGlvbiBzZXR0aW5ncyBmb3IgYSBwcm9qZWN0IHtAY29kZSByZWZzL21ldGEvY29uZmlnfSAqLwogICBwdWJsaWMgc3RhdGljIGZpbmFsIFN0cmluZyBSRUZfQ09ORklHID0gInJlZnMvbWV0YS9jb25maWciOwogCisgIC8qKiBDb25maWd1cmF0aW9ucyBvZiBwcm9qZWN0LXNwZWNpZmljIGRhc2hib2FyZHMgKGNhbm5lZCBzZWFyY2ggcXVlcmllcykuICovCisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIFJFRlNfREFTSEJPQVJEUyA9ICJyZWZzL21ldGEvZGFzaGJvYXJkcy8iOworCiAgIC8qKgogICAgKiBQcmVmaXggYXBwbGllZCB0byBtZXJnZSBjb21taXQgYmFzZSBub2Rlcy4KICAgICogPHA+CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9MYWJlbE5vcm1hbGl6ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0xhYmVsTm9ybWFsaXplci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNmMDk5MTYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9MYWJlbE5vcm1hbGl6ZXIuamF2YQpAQCAtMCwwICsxLDE0MSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5jb21tb24uYmFzZS5QcmVjb25kaXRpb25zLmNoZWNrQXJndW1lbnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVmFsdWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUmFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBMYWJlbE5vcm1hbGl6ZXIgeworICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgY2hhbmdlRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeTsKKworICBASW5qZWN0CisgIExhYmVsTm9ybWFsaXplcihDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNoYW5nZUZhY3RvcnksCisgICAgICBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeSkgeworICAgIHRoaXMuY2hhbmdlRmFjdG9yeSA9IGNoYW5nZUZhY3Rvcnk7CisgICAgdGhpcy51c2VyRmFjdG9yeSA9IHVzZXJGYWN0b3J5OworICB9CisKKyAgLyoqCisgICAqIEBwYXJhbSBjaGFuZ2UgY2hhbmdlIGNvbnRhaW5pbmcgdGhlIGdpdmVuIGFwcHJvdmFscy4KKyAgICogQHBhcmFtIGFwcHJvdmFscyBsaXN0IG9mIGFwcHJvdmFscy4KKyAgICogQHJldHVybiBjb3BpZXMgb2YgYXBwcm92YWxzIG5vcm1hbGl6ZWQgdG8gdGhlIGRlZmluZWQgcmFuZ2VzIGZvciB0aGUgbGFiZWwKKyAgICogICAgIHR5cGUgYW5kIHBlcm1pc3Npb25zIGZvciB0aGUgdXNlci4gQXBwcm92YWxzIGZvciB1bmtub3duIGxhYmVscyBhcmUgbm90CisgICAqICAgICBpbmNsdWRlZCBpbiB0aGUgb3V0cHV0LCBub3IgYXJlIGFwcHJvdmFscyB3aGVyZSB0aGUgdXNlciBoYXMgbm8KKyAgICogICAgIHBlcm1pc3Npb25zIGZvciB0aGF0IGxhYmVsLgorICAgKiBAdGhyb3dzIE5vU3VjaENoYW5nZUV4Y2VwdGlvbgorICAgKi8KKyAgcHVibGljIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gbm9ybWFsaXplKENoYW5nZSBjaGFuZ2UsCisgICAgICBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+IGFwcHJvdmFscykgdGhyb3dzIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIG5vcm1hbGl6ZSgKKyAgICAgICAgY2hhbmdlRmFjdG9yeS5jb250cm9sRm9yKGNoYW5nZSwgdXNlckZhY3RvcnkuY3JlYXRlKGNoYW5nZS5nZXRPd25lcigpKSksCisgICAgICAgIGFwcHJvdmFscyk7CisgIH0KKworICAvKioKKyAgICogQHBhcmFtIGN0bCBjaGFuZ2UgY29udHJvbCBjb250YWluaW5nIHRoZSBnaXZlbiBhcHByb3ZhbHMuCisgICAqIEBwYXJhbSBhcHByb3ZhbHMgbGlzdCBvZiBhcHByb3ZhbHMuCisgICAqIEByZXR1cm4gY29waWVzIG9mIGFwcHJvdmFscyBub3JtYWxpemVkIHRvIHRoZSBkZWZpbmVkIHJhbmdlcyBmb3IgdGhlIGxhYmVsCisgICAqICAgICB0eXBlIGFuZCBwZXJtaXNzaW9ucyBmb3IgdGhlIHVzZXIuIEFwcHJvdmFscyBmb3IgdW5rbm93biBsYWJlbHMgYXJlIG5vdAorICAgKiAgICAgaW5jbHVkZWQgaW4gdGhlIG91dHB1dCwgbm9yIGFyZSBhcHByb3ZhbHMgd2hlcmUgdGhlIHVzZXIgaGFzIG5vCisgICAqICAgICBwZXJtaXNzaW9ucyBmb3IgdGhhdCBsYWJlbC4KKyAgICovCisgIHB1YmxpYyBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IG5vcm1hbGl6ZShDaGFuZ2VDb250cm9sIGN0bCwKKyAgICAgIENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzKSB7CisgICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiByZXN1bHQgPQorICAgICAgICBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoYXBwcm92YWxzLnNpemUoKSk7CisgICAgTGFiZWxUeXBlcyBsYWJlbFR5cGVzID0gY3RsLmdldExhYmVsVHlwZXMoKTsKKyAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgcHNhIDogYXBwcm92YWxzKSB7CisgICAgICBDaGFuZ2UuSWQgY2hhbmdlSWQgPSBwc2EuZ2V0S2V5KCkuZ2V0UGFyZW50S2V5KCkuZ2V0UGFyZW50S2V5KCk7CisgICAgICBjaGVja0FyZ3VtZW50KGNoYW5nZUlkLmVxdWFscyhjdGwuZ2V0Q2hhbmdlKCkuZ2V0SWQoKSksCisgICAgICAgICAgIkFwcHJvdmFsICVzIGRvZXMgbm90IG1hdGNoIGNoYW5nZSAlcyIsCisgICAgICAgICAgcHNhLmdldEtleSgpLCBjdGwuZ2V0Q2hhbmdlKCkuZ2V0S2V5KCkpOworICAgICAgaWYgKHBzYS5pc1N1Ym1pdCgpKSB7CisgICAgICAgIHJlc3VsdC5hZGQoY29weShwc2EsIGN0bCkpOworICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKyAgICAgIExhYmVsVHlwZSBsYWJlbCA9IGxhYmVsVHlwZXMuYnlMYWJlbChwc2EuZ2V0TGFiZWxJZCgpKTsKKyAgICAgIGlmIChsYWJlbCAhPSBudWxsKSB7CisgICAgICAgIHBzYSA9IGNvcHkocHNhLCBjdGwpOworICAgICAgICBhcHBseVR5cGVGbG9vcihsYWJlbCwgcHNhKTsKKyAgICAgICAgaWYgKGFwcGx5UmlnaHRGbG9vcihjdGwsIGxhYmVsLCBwc2EpKSB7CisgICAgICAgICAgcmVzdWx0LmFkZChwc2EpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIHJldHVybiByZXN1bHQ7CisgIH0KKworICAvKioKKyAgICogQHBhcmFtIGN0bCBjaGFuZ2UgY29udHJvbCAoZm9yIGFueSB1c2VyKS4KKyAgICogQHBhcmFtIGx0IGxhYmVsIHR5cGUuCisgICAqIEBwYXJhbSBpZCBhY2NvdW50IElELgorICAgKiBAcmV0dXJuIHdoZXRoZXIgdGhlIGdpdmVuIGFjY291bnQgSUQgaGFzIGFueSBwZXJtaXNzaW9ucyB0byB2b3RlIG9uIHRoaXMKKyAgICogICAgIGxhYmVsIGZvciB0aGlzIGNoYW5nZS4KKyAgICovCisgIHB1YmxpYyBib29sZWFuIGNhblZvdGUoQ2hhbmdlQ29udHJvbCBjdGwsIExhYmVsVHlwZSBsdCwgQWNjb3VudC5JZCBpZCkgeworICAgIHJldHVybiAhZ2V0UmFuZ2UoY3RsLCBsdCwgaWQpLmlzRW1wdHkoKTsKKyAgfQorCisgIHByaXZhdGUgUGF0Y2hTZXRBcHByb3ZhbCBjb3B5KFBhdGNoU2V0QXBwcm92YWwgc3JjLCBDaGFuZ2VDb250cm9sIGN0bCkgeworICAgIFBhdGNoU2V0QXBwcm92YWwgZGVzdCA9IG5ldyBQYXRjaFNldEFwcHJvdmFsKHNyYy5nZXRQYXRjaFNldElkKCksIHNyYyk7CisgICAgZGVzdC5jYWNoZShjdGwuZ2V0Q2hhbmdlKCkpOworICAgIHJldHVybiBkZXN0OworICB9CisKKyAgcHJpdmF0ZSBQZXJtaXNzaW9uUmFuZ2UgZ2V0UmFuZ2UoQ2hhbmdlQ29udHJvbCBjdGwsIExhYmVsVHlwZSBsdCwKKyAgICAgIEFjY291bnQuSWQgaWQpIHsKKyAgICBTdHJpbmcgcGVybWlzc2lvbiA9IFBlcm1pc3Npb24uZm9yTGFiZWwobHQuZ2V0TmFtZSgpKTsKKyAgICBJZGVudGlmaWVkVXNlciB1c2VyID0gdXNlckZhY3RvcnkuY3JlYXRlKGlkKTsKKyAgICByZXR1cm4gY3RsLmZvclVzZXIodXNlcikuZ2V0UmFuZ2UocGVybWlzc2lvbik7CisgIH0KKworICBwcml2YXRlIGJvb2xlYW4gYXBwbHlSaWdodEZsb29yKENoYW5nZUNvbnRyb2wgY3RsLCBMYWJlbFR5cGUgbHQsCisgICAgICBQYXRjaFNldEFwcHJvdmFsIGEpIHsKKyAgICBQZXJtaXNzaW9uUmFuZ2UgcmFuZ2UgPSBnZXRSYW5nZShjdGwsIGx0LCBhLmdldEFjY291bnRJZCgpKTsKKyAgICBpZiAocmFuZ2UuaXNFbXB0eSgpKSB7CisgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIGEuc2V0VmFsdWUoKHNob3J0KSByYW5nZS5zcXVhc2goYS5nZXRWYWx1ZSgpKSk7CisgICAgcmV0dXJuIHRydWU7CisgIH0KKworICBwcml2YXRlIHZvaWQgYXBwbHlUeXBlRmxvb3IoTGFiZWxUeXBlIGx0LCBQYXRjaFNldEFwcHJvdmFsIGEpIHsKKyAgICBMYWJlbFZhbHVlIGF0TWluID0gbHQuZ2V0TWluKCk7CisgICAgaWYgKGF0TWluICE9IG51bGwgJiYgYS5nZXRWYWx1ZSgpIDwgYXRNaW4uZ2V0VmFsdWUoKSkgeworICAgICAgYS5zZXRWYWx1ZShhdE1pbi5nZXRWYWx1ZSgpKTsKKyAgICB9CisgICAgTGFiZWxWYWx1ZSBhdE1heCA9IGx0LmdldE1heCgpOworICAgIGlmIChhdE1heCAhPSBudWxsICYmIGEuZ2V0VmFsdWUoKSA+IGF0TWF4LmdldFZhbHVlKCkpIHsKKyAgICAgIGEuc2V0VmFsdWUoYXRNYXguZ2V0VmFsdWUoKSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9Mb2NhbERpc2tSZXBvc2l0b3J5TWFuYWdlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTG9jYWxEaXNrUmVwb3NpdG9yeU1hbmFnZXIuamF2YQppbmRleCA0ZTNmMzI0Li4xY2E3NGIxIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9Mb2NhbERpc2tSZXBvc2l0b3J5TWFuYWdlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L0xvY2FsRGlza1JlcG9zaXRvcnlNYW5hZ2VyLmphdmEKQEAgLTI2LDYgKzI2LDcgQEAKIGltcG9ydCBjb20uamNyYWZ0LmpzY2guU2Vzc2lvbjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmludGVybmFsLnN0b3JhZ2UuZmlsZS5Mb2NrRmlsZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnQ29uc3RhbnRzOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKQEAgLTMzLDggKzM0LDYgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5Q2FjaGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeUNhY2hlLkZpbGVLZXk7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuU3RvcmVkQ29uZmlnOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuc3RvcmFnZS5maWxlLkxvY2tGaWxlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuc3RvcmFnZS5maWxlLldpbmRvd0NhY2hlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuc3RvcmFnZS5maWxlLldpbmRvd0NhY2hlQ29uZmlnOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LkpzY2hDb25maWdTZXNzaW9uRmFjdG9yeTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5PcGVuU3NoQ29uZmlnOwpAQCAtNzgsMTEgKzc3LDExIEBACiAgIH0KIAogICBwdWJsaWMgc3RhdGljIGNsYXNzIExpZmVjeWNsZSBpbXBsZW1lbnRzIExpZmVjeWNsZUxpc3RlbmVyIHsKLSAgICBwcml2YXRlIGZpbmFsIENvbmZpZyBjZmc7CisgICAgcHJpdmF0ZSBmaW5hbCBDb25maWcgc2VydmVyQ29uZmlnOwogCiAgICAgQEluamVjdAogICAgIExpZmVjeWNsZShAR2Vycml0U2VydmVyQ29uZmlnIGZpbmFsIENvbmZpZyBjZmcpIHsKLSAgICAgIHRoaXMuY2ZnID0gY2ZnOworICAgICAgdGhpcy5zZXJ2ZXJDb25maWcgPSBjZmc7CiAgICAgfQogCiAgICAgQE92ZXJyaWRlCkBAIC05Niw5ICs5NSwzNCBAQAogICAgICAgICB9CiAgICAgICB9KTsKIAotICAgICAgZmluYWwgV2luZG93Q2FjaGVDb25maWcgYyA9IG5ldyBXaW5kb3dDYWNoZUNvbmZpZygpOwotICAgICAgYy5mcm9tQ29uZmlnKGNmZyk7Ci0gICAgICBXaW5kb3dDYWNoZS5yZWNvbmZpZ3VyZShjKTsKKyAgICAgIFdpbmRvd0NhY2hlQ29uZmlnIGNmZyA9IG5ldyBXaW5kb3dDYWNoZUNvbmZpZygpOworICAgICAgY2ZnLmZyb21Db25maWcoc2VydmVyQ29uZmlnKTsKKyAgICAgIGlmIChzZXJ2ZXJDb25maWcuZ2V0U3RyaW5nKCJjb3JlIiwgbnVsbCwgInN0cmVhbUZpbGVUaHJlc2hvbGQiKSA9PSBudWxsKSB7CisgICAgICAgIGxvbmcgbXggPSBSdW50aW1lLmdldFJ1bnRpbWUoKS5tYXhNZW1vcnkoKTsKKyAgICAgICAgaW50IGxpbWl0ID0gKGludCkgTWF0aC5taW4oCisgICAgICAgICAgICBteCAvIDQsIC8vIGRvbid0IHVzZSBtb3JlIHRoYW4gMS80IG9mIHRoZSBoZWFwLgorICAgICAgICAgICAgMjA0NyA8PCAyMCk7IC8vIGNhbm5vdCBleGNlZWQgYXJyYXkgbGVuZ3RoCisgICAgICAgIGlmICgoNSA8PCAyMCkgPCBsaW1pdCAmJiBsaW1pdCAlICgxIDw8IDIwKSAhPSAwKSB7CisgICAgICAgICAgLy8gSWYgdGhlIGxpbWl0IGlzIGF0IGxlYXN0IDUgTWlCIGJ1dCBpcyBub3QgYSB3aG9sZSBtdWx0aXBsZQorICAgICAgICAgIC8vIG9mIE1pQiByb3VuZCB1cCB0byB0aGUgbmV4dCBvbmUgZnVsbCBtZWdhYnl0ZS4gVGhpcyBpcyBhIHZlcnkKKyAgICAgICAgICAvLyB0aW55IG1lbW9yeSBpbmNyZWFzZSBpbiBleGNoYW5nZSBmb3IgbmljZSByb3VuZCB1bml0cy4KKyAgICAgICAgICBsaW1pdCA9ICgobGltaXQgLyAoMSA8PCAyMCkpICsgMSkgPDwgMjA7CisgICAgICAgIH0KKworICAgICAgICBTdHJpbmcgZGVzYzsKKyAgICAgICAgaWYgKGxpbWl0ICUgKDEgPDwgMjApID09IDApIHsKKyAgICAgICAgICBkZXNjID0gU3RyaW5nLmZvcm1hdCgiJWRtIiwgbGltaXQgLyAoMSA8PCAyMCkpOworICAgICAgICB9IGVsc2UgaWYgKGxpbWl0ICUgKDEgPDwgMTApID09IDApIHsKKyAgICAgICAgICBkZXNjID0gU3RyaW5nLmZvcm1hdCgiJWRrIiwgbGltaXQgLyAoMSA8PCAxMCkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIGRlc2MgPSBTdHJpbmcuZm9ybWF0KCIlZCIsIGxpbWl0KTsKKyAgICAgICAgfQorICAgICAgICBsb2cuaW5mbyhTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgIkRlZmF1bHRpbmcgY29yZS5zdHJlYW1GaWxlVGhyZXNob2xkIHRvICVzIiwKKyAgICAgICAgICAgIGRlc2MpKTsKKyAgICAgICAgY2ZnLnNldFN0cmVhbUZpbGVUaHJlc2hvbGQobGltaXQpOworICAgICAgfQorICAgICAgY2ZnLmluc3RhbGwoKTsKICAgICB9CiAKICAgICBAT3ZlcnJpZGUKQEAgLTE3NywxMCArMjAxLDcgQEAKICAgICAgIC8vIEl0IGRvZXNuJ3QgZXhpc3QgdW5kZXIgYW55IG9mIHRoZSBzdGFuZGFyZCBwZXJtdXRhdGlvbnMKICAgICAgIC8vIG9mIHRoZSByZXBvc2l0b3J5IG5hbWUsIHNvIHByZWZlciB0aGUgc3RhbmRhcmQgYmFyZSBuYW1lLgogICAgICAgLy8KLSAgICAgIFN0cmluZyBuID0gbmFtZS5nZXQoKTsKLSAgICAgIGlmICghbi5lbmRzV2l0aChDb25zdGFudHMuRE9UX0dJVF9FWFQpKSB7Ci0gICAgICAgIG4gPSBuICsgQ29uc3RhbnRzLkRPVF9HSVRfRVhUOwotICAgICAgfQorICAgICAgU3RyaW5nIG4gPSBuYW1lLmdldCgpICsgQ29uc3RhbnRzLkRPVF9HSVRfRVhUOwogICAgICAgbG9jID0gRmlsZUtleS5leGFjdChuZXcgRmlsZShiYXNlUGF0aCwgbiksIEZTLkRFVEVDVEVEKTsKICAgICB9CiAKQEAgLTI5MCw3ICszMTEsNyBAQAogICAgIGlmIChuYW1lLmxlbmd0aCgpID09IDApIHJldHVybiB0cnVlOyAvLyBubyBlbXB0eSBwYXRocwogICAgIGlmIChuYW1lLmNoYXJBdChuYW1lLmxlbmd0aCgpIC0xKSA9PSAnLycpIHJldHVybiB0cnVlOyAvLyBubyBzdWZmaXgKIAotICAgIGlmIChuYW1lLmluZGV4T2YoJ1xcJykgPj0gMCkgcmV0dXJuIHRydWU7IC8vIG5vIHdpbmRvd3MvZG9zIHN0bHllIHBhdGhzCisgICAgaWYgKG5hbWUuaW5kZXhPZignXFwnKSA+PSAwKSByZXR1cm4gdHJ1ZTsgLy8gbm8gd2luZG93cy9kb3Mgc3R5bGUgcGF0aHMKICAgICBpZiAobmFtZS5jaGFyQXQoMCkgPT0gJy8nKSByZXR1cm4gdHJ1ZTsgLy8gbm8gYWJzb2x1dGUgcGF0aHMKICAgICBpZiAobmV3IEZpbGUobmFtZSkuaXNBYnNvbHV0ZSgpKSByZXR1cm4gdHJ1ZTsgLy8gbm8gYWJzb2x1dGUgcGF0aHMKIApAQCAtMjk4LDYgKzMxOSwxNSBAQAogICAgIGlmIChuYW1lLmNvbnRhaW5zKCIvLi4vIikpIHJldHVybiB0cnVlOyAvLyBubyAiZm9vLy4uL2V0Yy9wYXNzd2QiCiAgICAgaWYgKG5hbWUuY29udGFpbnMoIi8uLyIpKSByZXR1cm4gdHJ1ZTsgLy8gImZvby8uL2ZvbyIgaXMgaW5zYW5lIHRvIGFzawogICAgIGlmIChuYW1lLmNvbnRhaW5zKCIvLyIpKSByZXR1cm4gdHJ1ZTsgLy8gd2luZG93cyBVTkMgcGF0aCBjYW4gYmUgIi8vLi4uIgorICAgIGlmIChuYW1lLmNvbnRhaW5zKCI/IikpIHJldHVybiB0cnVlOyAvLyBjb21tb24gdW5peCB3aWxkY2FyZAorICAgIGlmIChuYW1lLmNvbnRhaW5zKCIlIikpIHJldHVybiB0cnVlOyAvLyB3aWxkY2FyZCBvciBzdHJpbmcgcGFyYW1ldGVyCisgICAgaWYgKG5hbWUuY29udGFpbnMoIioiKSkgcmV0dXJuIHRydWU7IC8vIHdpbGRjYXJkCisgICAgaWYgKG5hbWUuY29udGFpbnMoIjoiKSkgcmV0dXJuIHRydWU7IC8vIENvdWxkIGJlIHVzZWQgZm9yIGFic29sdXRlIHBhdGhzIGluIHdpbmRvd3M/CisgICAgaWYgKG5hbWUuY29udGFpbnMoIjwiKSkgcmV0dXJuIHRydWU7IC8vIHJlZGlyZWN0IGlucHV0CisgICAgaWYgKG5hbWUuY29udGFpbnMoIj4iKSkgcmV0dXJuIHRydWU7IC8vIHJlZGlyZWN0IG91dHB1dAorICAgIGlmIChuYW1lLmNvbnRhaW5zKCJ8IikpIHJldHVybiB0cnVlOyAvLyBwaXBlCisgICAgaWYgKG5hbWUuY29udGFpbnMoIiQiKSkgcmV0dXJuIHRydWU7IC8vIGRvbGxhciBzaWduCisgICAgaWYgKG5hbWUuY29udGFpbnMoIlxyIikpIHJldHVybiB0cnVlOyAvLyBjYXJyaWFnZSByZXR1cm4KIAogICAgIHJldHVybiBmYWxzZTsgLy8gaXMgYSByZWFzb25hYmxlIG5hbWUKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VBbHdheXMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlQWx3YXlzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDkzYTQwZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlQWx3YXlzLmphdmEKQEAgLTAsMCArMSw1NCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitwdWJsaWMgY2xhc3MgTWVyZ2VBbHdheXMgZXh0ZW5kcyBTdWJtaXRTdHJhdGVneSB7CisKKyAgTWVyZ2VBbHdheXMoZmluYWwgU3VibWl0U3RyYXRlZ3kuQXJndW1lbnRzIGFyZ3MpIHsKKyAgICBzdXBlcihhcmdzKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgQ29kZVJldmlld0NvbW1pdCBfcnVuKGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgYXJncy5tZXJnZVV0aWwucmVkdWNlVG9NaW5pbWFsTWVyZ2UoYXJncy5tZXJnZVNvcnRlciwgdG9NZXJnZSk7CisKKyAgICBDb2RlUmV2aWV3Q29tbWl0IG5ld01lcmdlVGlwID0gbWVyZ2VUaXA7CisgICAgd2hpbGUgKCF0b01lcmdlLmlzRW1wdHkoKSkgeworICAgICAgbmV3TWVyZ2VUaXAgPQorICAgICAgICAgIGFyZ3MubWVyZ2VVdGlsLm1lcmdlT25lQ29tbWl0KGFyZ3MubXlJZGVudCwgYXJncy5yZXBvLCBhcmdzLnJ3LAorICAgICAgICAgICAgICBhcmdzLmluc2VydGVyLCBhcmdzLmNhbk1lcmdlRmxhZywgYXJncy5kZXN0QnJhbmNoLCBtZXJnZVRpcCwKKyAgICAgICAgICAgICAgdG9NZXJnZS5yZW1vdmUoMCkpOworICAgIH0KKworICAgIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0QXBwcm92YWwgPQorICAgICAgICBhcmdzLm1lcmdlVXRpbC5tYXJrQ2xlYW5NZXJnZXMoYXJncy5ydywgYXJncy5jYW5NZXJnZUZsYWcsIG5ld01lcmdlVGlwLAorICAgICAgICAgICAgYXJncy5hbHJlYWR5QWNjZXB0ZWQpOworICAgIHNldFJlZkxvZ0lkZW50KHN1Ym1pdEFwcHJvdmFsKTsKKworICAgIHJldHVybiBuZXdNZXJnZVRpcDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgYm9vbGVhbiBkcnlSdW4oZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gYXJncy5tZXJnZVV0aWwuY2FuTWVyZ2UoYXJncy5tZXJnZVNvcnRlciwgYXJncy5yZXBvLCBtZXJnZVRpcCwKKyAgICAgICAgdG9NZXJnZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlRXhjZXB0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZUV4Y2VwdGlvbi5qYXZhCmluZGV4IDE5OTdjMTMuLjU0Y2QzMjkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlRXhjZXB0aW9uLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VFeGNlcHRpb24uamF2YQpAQCAtMTgsMTEgKzE4LDExIEBACiBwdWJsaWMgY2xhc3MgTWVyZ2VFeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24gewogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKIAotICBNZXJnZUV4Y2VwdGlvbihmaW5hbCBTdHJpbmcgbXNnKSB7CisgIHB1YmxpYyBNZXJnZUV4Y2VwdGlvbihmaW5hbCBTdHJpbmcgbXNnKSB7CiAgICAgc3VwZXIobXNnLCBudWxsKTsKICAgfQogCi0gIE1lcmdlRXhjZXB0aW9uKGZpbmFsIFN0cmluZyBtc2csIGZpbmFsIFRocm93YWJsZSB3aHkpIHsKKyAgcHVibGljIE1lcmdlRXhjZXB0aW9uKGZpbmFsIFN0cmluZyBtc2csIGZpbmFsIFRocm93YWJsZSB3aHkpIHsKICAgICBzdXBlcihtc2csIHdoeSk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlSWZOZWNlc3NhcnkuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlSWZOZWNlc3NhcnkuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMzFlZGIyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VJZk5lY2Vzc2FyeS5qYXZhCkBAIC0wLDAgKzEsNTcgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworcHVibGljIGNsYXNzIE1lcmdlSWZOZWNlc3NhcnkgZXh0ZW5kcyBTdWJtaXRTdHJhdGVneSB7CisKKyAgTWVyZ2VJZk5lY2Vzc2FyeShmaW5hbCBTdWJtaXRTdHJhdGVneS5Bcmd1bWVudHMgYXJncykgeworICAgIHN1cGVyKGFyZ3MpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCBDb2RlUmV2aWV3Q29tbWl0IF9ydW4oZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBhcmdzLm1lcmdlVXRpbC5yZWR1Y2VUb01pbmltYWxNZXJnZShhcmdzLm1lcmdlU29ydGVyLCB0b01lcmdlKTsKKyAgICBDb2RlUmV2aWV3Q29tbWl0IG5ld01lcmdlVGlwID0KKyAgICAgICAgYXJncy5tZXJnZVV0aWwuZ2V0Rmlyc3RGYXN0Rm9yd2FyZChtZXJnZVRpcCwgYXJncy5ydywgdG9NZXJnZSk7CisKKyAgICAvLyBGb3IgZXZlcnkgb3RoZXIgY29tbWl0IGRvIGEgcGFpci13aXNlIG1lcmdlLgorICAgIHdoaWxlICghdG9NZXJnZS5pc0VtcHR5KCkpIHsKKyAgICAgIG5ld01lcmdlVGlwID0KKyAgICAgICAgICBhcmdzLm1lcmdlVXRpbC5tZXJnZU9uZUNvbW1pdChhcmdzLm15SWRlbnQsIGFyZ3MucmVwbywgYXJncy5ydywKKyAgICAgICAgICAgICAgYXJncy5pbnNlcnRlciwgYXJncy5jYW5NZXJnZUZsYWcsIGFyZ3MuZGVzdEJyYW5jaCwgbWVyZ2VUaXAsCisgICAgICAgICAgICAgIHRvTWVyZ2UucmVtb3ZlKDApKTsKKyAgICB9CisKKyAgICBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdEFwcHJvdmFsID0gYXJncy5tZXJnZVV0aWwubWFya0NsZWFuTWVyZ2VzKAorICAgICAgICBhcmdzLnJ3LCBhcmdzLmNhbk1lcmdlRmxhZywgbmV3TWVyZ2VUaXAsIGFyZ3MuYWxyZWFkeUFjY2VwdGVkKTsKKyAgICBzZXRSZWZMb2dJZGVudChzdWJtaXRBcHByb3ZhbCk7CisKKyAgICByZXR1cm4gbmV3TWVyZ2VUaXA7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIGJvb2xlYW4gZHJ5UnVuKGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGFyZ3MubWVyZ2VVdGlsLmNhbkZhc3RGb3J3YXJkKAorICAgICAgICAgIGFyZ3MubWVyZ2VTb3J0ZXIsIG1lcmdlVGlwLCBhcmdzLnJ3LCB0b01lcmdlKQorICAgICAgICB8fCBhcmdzLm1lcmdlVXRpbC5jYW5NZXJnZSgKKyAgICAgICAgICBhcmdzLm1lcmdlU29ydGVyLCBhcmdzLnJlcG8sIG1lcmdlVGlwLCB0b01lcmdlKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VPcC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VPcC5qYXZhCmluZGV4IDJlOGYxODMuLmRhY2UwYWUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlT3AuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZU9wLmphdmEKQEAgLTE0LDMwICsxNCwzNSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CiAKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXJnZVV0aWwuZ2V0U3VibWl0dGVyOworaW1wb3J0IHN0YXRpYyBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdC5EQVlTOwogaW1wb3J0IHN0YXRpYyBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdC5NSUxMSVNFQ09ORFM7CiBpbXBvcnQgc3RhdGljIGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0Lk1JTlVURVM7CitpbXBvcnQgc3RhdGljIGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0LlNFQ09ORFM7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLk9iamVjdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5BcnJheUxpc3RNdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RNdWx0aW1hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNhcGFibGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5TdWJtaXRUeXBlUmVjb3JkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QW5jZXN0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3QuU3VibWl0VHlwZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUmV2SWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DaGFuZ2VVdGlsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudENhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQWxsUHJvamVjdHNOYW1lOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ2Fub25pY2FsV2ViVXJsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5leHRlbnNpb25zLmV2ZW50cy5HaXRSZWZlcmVuY2VVcGRhdGVkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLk1lcmdlRmFpbFNlbmRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5NZXJnZWRTZW5kZXI7CkBAIC00NSwyNCArNTAsMjAgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNoYW5nZUNvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuTm9TdWNoQ2hhbmdlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaFByb2plY3RFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RTdGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5SZXF1ZXN0U2NvcGVQcm9wYWdhdG9yOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci53b3JrZmxvdy5DYXRlZ29yeUZ1bmN0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci53b3JrZmxvdy5GdW5jdGlvblN0YXRlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5BdG9taWNVcGRhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUNvbmN1cnJlbmN5RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlNjaGVtYUZhY3Rvcnk7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5NaXNzaW5nT2JqZWN0RXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5BbnlPYmplY3RJZDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db21taXRCdWlsZGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJbnNlcnRlcjsKQEAgLTcwLDExICs3MSw2IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlZlVwZGF0ZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubWVyZ2UuTWVyZ2VTdHJhdGVneTsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0Lm1lcmdlLk1lcmdlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0Lm1lcmdlLlRocmVlV2F5TWVyZ2VyOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5Gb290ZXJLZXk7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLkZvb3RlckxpbmU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkNvbW1pdDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2RmxhZzsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2U29ydDsKQEAgLTgzLDIxICs3OSwxNSBAQAogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwogCiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLmlvLlVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb247Ci1pbXBvcnQgamF2YS5zcWwuVGltZXN0YW1wOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5NYXAuRW50cnk7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKLWltcG9ydCBqYXZhLnV0aWwuVGltZVpvbmU7Ci0KLWltcG9ydCBqYXZheC5hbm5vdGF0aW9uLk51bGxhYmxlOwogCiAvKioKICAqIE1lcmdlcyBjaGFuZ2VzIGluIHN1Ym1pc3Npb24gb3JkZXIgaW50byBhIHNpbmdsZSBicmFuY2guCkBAIC0xMTksNTMgKzEwOSw0NyBAQAogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKE1lcmdlT3AuY2xhc3MpOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgUl9IRUFEU19NQVNURVIgPQotICAgICAgQ29uc3RhbnRzLlJfSEVBRFMgKyBDb25zdGFudHMuTUFTVEVSOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBBcHByb3ZhbENhdGVnb3J5LklkIENSVlcgPQotICAgICAgbmV3IEFwcHJvdmFsQ2F0ZWdvcnkuSWQoIkNSVlciKTsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgQXBwcm92YWxDYXRlZ29yeS5JZCBWUklGID0KLSAgICAgIG5ldyBBcHByb3ZhbENhdGVnb3J5LklkKCJWUklGIik7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIEZvb3RlcktleSBSRVZJRVdFRF9PTiA9IG5ldyBGb290ZXJLZXkoIlJldmlld2VkLW9uIik7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIEZvb3RlcktleSBDSEFOR0VfSUQgPSBuZXcgRm9vdGVyS2V5KCJDaGFuZ2UtSWQiKTsKIAogICAvKiogQW1vdW50IG9mIHRpbWUgdG8gd2FpdCBiZXR3ZWVuIHN1Ym1pdCBhbmQgY2hlY2tpbmcgZm9yIG1pc3NpbmcgZGVwcy4gKi8KICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBERVBFTkRFTkNZX0RFTEFZID0KICAgICAgIE1JTExJU0VDT05EUy5jb252ZXJ0KDE1LCBNSU5VVEVTKTsKIAorICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIExPQ0tfRkFJTFVSRV9SRVRSWV9ERUxBWSA9CisgICAgICBNSUxMSVNFQ09ORFMuY29udmVydCgxNSwgU0VDT05EUyk7CisKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBEVVBMSUNBVEVfTUVTU0FHRV9JTlRFUlZBTCA9CisgICAgICBNSUxMSVNFQ09ORFMuY29udmVydCgxLCBEQVlTKTsKKwogICBwcml2YXRlIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyOwogICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYUZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENhY2hlIHByb2plY3RDYWNoZTsKLSAgcHJpdmF0ZSBmaW5hbCBGdW5jdGlvblN0YXRlLkZhY3RvcnkgZnVuY3Rpb25TdGF0ZTsKLSAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uOworICBwcml2YXRlIGZpbmFsIExhYmVsTm9ybWFsaXplciBsYWJlbE5vcm1hbGl6ZXI7CisgIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkOwogICBwcml2YXRlIGZpbmFsIE1lcmdlZFNlbmRlci5GYWN0b3J5IG1lcmdlZFNlbmRlckZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgTWVyZ2VGYWlsU2VuZGVyLkZhY3RvcnkgbWVyZ2VGYWlsU2VuZGVyRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyOwotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKICAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgaWRlbnRpZmllZFVzZXJGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgTWVyZ2VRdWV1ZSBtZXJnZVF1ZXVlOwogCi0gIHByaXZhdGUgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudDsKICAgcHJpdmF0ZSBmaW5hbCBCcmFuY2guTmFtZUtleSBkZXN0QnJhbmNoOwotICBwcml2YXRlIFByb2plY3QgZGVzdFByb2plY3Q7Ci0gIHByaXZhdGUgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlOwotICBwcml2YXRlIExpc3Q8Q2hhbmdlPiBzdWJtaXR0ZWQ7CisgIHByaXZhdGUgUHJvamVjdFN0YXRlIGRlc3RQcm9qZWN0OworICBwcml2YXRlIGZpbmFsIExpc3RNdWx0aW1hcDxTdWJtaXRUeXBlLCBDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlOworICBwcml2YXRlIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gcG90ZW50aWFsbHlTdGlsbFN1Ym1pdHRhYmxlOwogICBwcml2YXRlIGZpbmFsIE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+IGNvbW1pdHM7CiAgIHByaXZhdGUgUmV2aWV3RGIgZGI7CiAgIHByaXZhdGUgUmVwb3NpdG9yeSByZXBvOwogICBwcml2YXRlIFJldldhbGsgcnc7Ci0gIHByaXZhdGUgUmV2RmxhZyBDQU5fTUVSR0U7CisgIHByaXZhdGUgUmV2RmxhZyBjYW5NZXJnZUZsYWc7CiAgIHByaXZhdGUgQ29kZVJldmlld0NvbW1pdCBicmFuY2hUaXA7CiAgIHByaXZhdGUgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcDsKLSAgcHJpdmF0ZSBTZXQ8UmV2Q29tbWl0PiBhbHJlYWR5QWNjZXB0ZWQ7Ci0gIHByaXZhdGUgUmVmVXBkYXRlIGJyYW5jaFVwZGF0ZTsKICAgcHJpdmF0ZSBPYmplY3RJbnNlcnRlciBpbnNlcnRlcjsKKyAgcHJpdmF0ZSBQZXJzb25JZGVudCByZWZMb2dJZGVudDsKIAogICBwcml2YXRlIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzOwogICBwcml2YXRlIGZpbmFsIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGU7CiAgIHByaXZhdGUgZmluYWwgVGFnQ2FjaGUgdGFnQ2FjaGU7Ci0gIHByaXZhdGUgZmluYWwgQ3JlYXRlQ29kZVJldmlld05vdGVzLkZhY3RvcnkgY29kZVJldmlld05vdGVzRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBTdWJtaXRTdHJhdGVneUZhY3Rvcnkgc3VibWl0U3RyYXRlZ3lGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIFN1Ym1vZHVsZU9wLkZhY3Rvcnkgc3ViT3BGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIFdvcmtRdWV1ZSB3b3JrUXVldWU7CiAgIHByaXZhdGUgZmluYWwgUmVxdWVzdFNjb3BlUHJvcGFnYXRvciByZXF1ZXN0U2NvcGVQcm9wYWdhdG9yOwpAQCAtMTczLDMwICsxNTcsMjcgQEAKIAogICBASW5qZWN0CiAgIE1lcmdlT3AoZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ3JtLCBmaW5hbCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzZiwKLSAgICAgIGZpbmFsIFByb2plY3RDYWNoZSBwYywgZmluYWwgRnVuY3Rpb25TdGF0ZS5GYWN0b3J5IGZzLAotICAgICAgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBycSwgZmluYWwgTWVyZ2VkU2VuZGVyLkZhY3RvcnkgbXNmLAorICAgICAgZmluYWwgUHJvamVjdENhY2hlIHBjLCBmaW5hbCBMYWJlbE5vcm1hbGl6ZXIgZnMsCisgICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdydSwgZmluYWwgTWVyZ2VkU2VuZGVyLkZhY3RvcnkgbXNmLAogICAgICAgZmluYWwgTWVyZ2VGYWlsU2VuZGVyLkZhY3RvcnkgbWZzZiwKLSAgICAgIEBDYW5vbmljYWxXZWJVcmwgQE51bGxhYmxlIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gY3d1LAotICAgICAgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzLCBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBzaWYsCisgICAgICBmaW5hbCBMYWJlbFR5cGVzIGxhYmVsVHlwZXMsIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcHNpZiwKICAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGl1ZiwKICAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCi0gICAgICBAR2Vycml0UGVyc29uSWRlbnQgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudCwKICAgICAgIGZpbmFsIE1lcmdlUXVldWUgbWVyZ2VRdWV1ZSwgQEFzc2lzdGVkIGZpbmFsIEJyYW5jaC5OYW1lS2V5IGJyYW5jaCwKICAgICAgIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzLCBmaW5hbCBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlLAotICAgICAgZmluYWwgVGFnQ2FjaGUgdGFnQ2FjaGUsIGZpbmFsIENyZWF0ZUNvZGVSZXZpZXdOb3Rlcy5GYWN0b3J5IGNybmYsCisgICAgICBmaW5hbCBUYWdDYWNoZSB0YWdDYWNoZSwKKyAgICAgIGZpbmFsIFN1Ym1pdFN0cmF0ZWd5RmFjdG9yeSBzdWJtaXRTdHJhdGVneUZhY3RvcnksCiAgICAgICBmaW5hbCBTdWJtb2R1bGVPcC5GYWN0b3J5IHN1Yk9wRmFjdG9yeSwKICAgICAgIGZpbmFsIFdvcmtRdWV1ZSB3b3JrUXVldWUsCiAgICAgICBmaW5hbCBSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yIHJlcXVlc3RTY29wZVByb3BhZ2F0b3IsCiAgICAgICBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lKSB7CiAgICAgcmVwb01hbmFnZXIgPSBncm07CiAgICAgc2NoZW1hRmFjdG9yeSA9IHNmOwotICAgIGZ1bmN0aW9uU3RhdGUgPSBmczsKKyAgICBsYWJlbE5vcm1hbGl6ZXIgPSBmczsKICAgICBwcm9qZWN0Q2FjaGUgPSBwYzsKLSAgICByZXBsaWNhdGlvbiA9IHJxOworICAgIGdpdFJlZlVwZGF0ZWQgPSBncnU7CiAgICAgbWVyZ2VkU2VuZGVyRmFjdG9yeSA9IG1zZjsKICAgICBtZXJnZUZhaWxTZW5kZXJGYWN0b3J5ID0gbWZzZjsKLSAgICB1cmxQcm92aWRlciA9IGN3dTsKLSAgICB0aGlzLmFwcHJvdmFsVHlwZXMgPSBhcHByb3ZhbFR5cGVzOwogICAgIHBhdGNoU2V0SW5mb0ZhY3RvcnkgPSBwc2lmOwogICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeSA9IGl1ZjsKICAgICB0aGlzLmNoYW5nZUNvbnRyb2xGYWN0b3J5ID0gY2hhbmdlQ29udHJvbEZhY3Rvcnk7CkBAIC0yMDQsMjQgKzE4NSwyMiBAQAogICAgIHRoaXMuaG9va3MgPSBob29rczsKICAgICB0aGlzLmFjY291bnRDYWNoZSA9IGFjY291bnRDYWNoZTsKICAgICB0aGlzLnRhZ0NhY2hlID0gdGFnQ2FjaGU7Ci0gICAgY29kZVJldmlld05vdGVzRmFjdG9yeSA9IGNybmY7CisgICAgdGhpcy5zdWJtaXRTdHJhdGVneUZhY3RvcnkgPSBzdWJtaXRTdHJhdGVneUZhY3Rvcnk7CiAgICAgdGhpcy5zdWJPcEZhY3RvcnkgPSBzdWJPcEZhY3Rvcnk7CiAgICAgdGhpcy53b3JrUXVldWUgPSB3b3JrUXVldWU7CiAgICAgdGhpcy5yZXF1ZXN0U2NvcGVQcm9wYWdhdG9yID0gcmVxdWVzdFNjb3BlUHJvcGFnYXRvcjsKICAgICB0aGlzLmFsbFByb2plY3RzTmFtZSA9IGFsbFByb2plY3RzTmFtZTsKLSAgICB0aGlzLm15SWRlbnQgPSBteUlkZW50OwogICAgIGRlc3RCcmFuY2ggPSBicmFuY2g7Ci0gICAgdG9NZXJnZSA9IG5ldyBBcnJheUxpc3Q8Q29kZVJldmlld0NvbW1pdD4oKTsKKyAgICB0b01lcmdlID0gQXJyYXlMaXN0TXVsdGltYXAuY3JlYXRlKCk7CisgICAgcG90ZW50aWFsbHlTdGlsbFN1Ym1pdHRhYmxlID0gbmV3IEFycmF5TGlzdDxDb2RlUmV2aWV3Q29tbWl0PigpOwogICAgIGNvbW1pdHMgPSBuZXcgSGFzaE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+KCk7CiAgIH0KIAotICBwdWJsaWMgdm9pZCB2ZXJpZnlNZXJnZWFiaWxpdHkoQ2hhbmdlIGNoYW5nZSkgeworICBwdWJsaWMgdm9pZCB2ZXJpZnlNZXJnZWFiaWxpdHkoQ2hhbmdlIGNoYW5nZSkgdGhyb3dzIE5vU3VjaFByb2plY3RFeGNlcHRpb24gewogICAgIHRyeSB7CiAgICAgICBzZXREZXN0UHJvamVjdCgpOwogICAgICAgb3BlblJlcG9zaXRvcnkoKTsKICAgICAgIGZpbmFsIFJlZiBkZXN0QnJhbmNoUmVmID0gcmVwby5nZXRSZWYoZGVzdEJyYW5jaC5nZXQoKSk7Ci0gICAgICBzdWJtaXR0ZWQgPSBuZXcgQXJyYXlMaXN0PENoYW5nZT4oKTsKLSAgICAgIHN1Ym1pdHRlZC5hZGQoY2hhbmdlKTsKIAogICAgICAgLy8gVGVzdCBtZXJnZWFiaWxpdHkgb2YgdGhlIGNoYW5nZSBpZiB0aGUgbGFzdCBtZXJnZWQgc2hhMQogICAgICAgLy8gaW4gdGhlIGJyYW5jaCBpcyBkaWZmZXJlbnQgZnJvbSB0aGUgbGFzdCBzaGExCkBAIC0yMzEsMTcgKzIxMCwyNyBAQAogICAgICAgICAgIHx8IChkZXN0QnJhbmNoUmVmICE9IG51bGwgJiYgIWRlc3RCcmFuY2hSZWYuZ2V0T2JqZWN0SWQoKS5nZXROYW1lKCkKICAgICAgICAgICAgICAgLmVxdWFscyhjaGFuZ2UuZ2V0TGFzdFNoYTFNZXJnZVRlc3RlZCgpLmdldCgpKSkpIHsKICAgICAgICAgb3BlblNjaGVtYSgpOwotICAgICAgICBwcmVNZXJnZSgpOworICAgICAgICBvcGVuQnJhbmNoKCk7CisgICAgICAgIHZhbGlkYXRlQ2hhbmdlTGlzdChDb2xsZWN0aW9ucy5zaW5nbGV0b25MaXN0KGNoYW5nZSkpOworICAgICAgICBpZiAoIXRvTWVyZ2UuaXNFbXB0eSgpKSB7CisgICAgICAgICAgZmluYWwgRW50cnk8U3VibWl0VHlwZSwgQ29kZVJldmlld0NvbW1pdD4gZSA9CisgICAgICAgICAgICAgIHRvTWVyZ2UuZW50cmllcygpLml0ZXJhdG9yKCkubmV4dCgpOworICAgICAgICAgIGZpbmFsIGJvb2xlYW4gaXNNZXJnZWFibGUgPQorICAgICAgICAgICAgICBjcmVhdGVTdHJhdGVneShlLmdldEtleSgpKS5kcnlSdW4oYnJhbmNoVGlwLCBlLmdldFZhbHVlKCkpOwogCi0gICAgICAgIC8vIHVwZGF0ZSBzaGExIHRlc3RlZCBtZXJnZS4KLSAgICAgICAgaWYgKGRlc3RCcmFuY2hSZWYgIT0gbnVsbCkgewotICAgICAgICAgIGNoYW5nZS5zZXRMYXN0U2hhMU1lcmdlVGVzdGVkKG5ldyBSZXZJZChkZXN0QnJhbmNoUmVmCi0gICAgICAgICAgICAgIC5nZXRPYmplY3RJZCgpLmdldE5hbWUoKSkpOworICAgICAgICAgIC8vIHVwZGF0ZSBzaGExIHRlc3RlZCBtZXJnZS4KKyAgICAgICAgICBpZiAoZGVzdEJyYW5jaFJlZiAhPSBudWxsKSB7CisgICAgICAgICAgICBjaGFuZ2Uuc2V0TGFzdFNoYTFNZXJnZVRlc3RlZChuZXcgUmV2SWQoZGVzdEJyYW5jaFJlZgorICAgICAgICAgICAgICAgIC5nZXRPYmplY3RJZCgpLmdldE5hbWUoKSkpOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBjaGFuZ2Uuc2V0TGFzdFNoYTFNZXJnZVRlc3RlZChuZXcgUmV2SWQoIiIpKTsKKyAgICAgICAgICB9CisgICAgICAgICAgY2hhbmdlLnNldE1lcmdlYWJsZShpc01lcmdlYWJsZSk7CisgICAgICAgICAgZGIuY2hhbmdlcygpLnVwZGF0ZShDb2xsZWN0aW9ucy5zaW5nbGV0b24oY2hhbmdlKSk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgY2hhbmdlLnNldExhc3RTaGExTWVyZ2VUZXN0ZWQobmV3IFJldklkKCIiKSk7CisgICAgICAgICAgbG9nLmVycm9yKCJUZXN0IG1lcmdlIGF0dGVtcHQgZm9yIGNoYW5nZTogIiArIGNoYW5nZS5nZXRJZCgpCisgICAgICAgICAgICAgICsgIiBmYWlsZWQiKTsKICAgICAgICAgfQotICAgICAgICBjaGFuZ2Uuc2V0TWVyZ2VhYmxlKGlzTWVyZ2VhYmxlKGNoYW5nZSkpOwotICAgICAgICBkYi5jaGFuZ2VzKCkudXBkYXRlKENvbGxlY3Rpb25zLnNpbmdsZXRvbihjaGFuZ2UpKTsKICAgICAgIH0KICAgICB9IGNhdGNoIChNZXJnZUV4Y2VwdGlvbiBlKSB7CiAgICAgICBsb2cuZXJyb3IoIlRlc3QgbWVyZ2UgYXR0ZW1wdCBmb3IgY2hhbmdlOiAiICsgY2hhbmdlLmdldElkKCkKQEAgLTI2MywxMSArMjUyLDEwIEBACiAgIH0KIAogICBwcml2YXRlIHZvaWQgc2V0RGVzdFByb2plY3QoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24gewotICAgIGZpbmFsIFByb2plY3RTdGF0ZSBwZSA9IHByb2plY3RDYWNoZS5nZXQoZGVzdEJyYW5jaC5nZXRQYXJlbnRLZXkoKSk7Ci0gICAgaWYgKHBlID09IG51bGwpIHsKKyAgICBkZXN0UHJvamVjdCA9IHByb2plY3RDYWNoZS5nZXQoZGVzdEJyYW5jaC5nZXRQYXJlbnRLZXkoKSk7CisgICAgaWYgKGRlc3RQcm9qZWN0ID09IG51bGwpIHsKICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiTm8gc3VjaCBwcm9qZWN0OiAiICsgZGVzdEJyYW5jaC5nZXRQYXJlbnRLZXkoKSk7CiAgICAgfQotICAgIGRlc3RQcm9qZWN0ID0gcGUuZ2V0UHJvamVjdCgpOwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIG9wZW5TY2hlbWEoKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKQEAgLTI3NiwxNiArMjY0LDU5IEBACiAgICAgfQogICB9CiAKLSAgcHVibGljIHZvaWQgbWVyZ2UoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICBwdWJsaWMgdm9pZCBtZXJnZSgpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiwgTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiB7CiAgICAgc2V0RGVzdFByb2plY3QoKTsKICAgICB0cnkgewogICAgICAgb3BlblNjaGVtYSgpOwogICAgICAgb3BlblJlcG9zaXRvcnkoKTsKLSAgICAgIHN1Ym1pdHRlZCA9IGRiLmNoYW5nZXMoKS5zdWJtaXR0ZWQoZGVzdEJyYW5jaCkudG9MaXN0KCk7Ci0gICAgICBwcmVNZXJnZSgpOwotICAgICAgdXBkYXRlQnJhbmNoKCk7Ci0gICAgICB1cGRhdGVDaGFuZ2VTdGF0dXMoKTsKLSAgICAgIHVwZGF0ZVN1YnNjcmlwdGlvbnMoKTsKKyAgICAgIG9wZW5CcmFuY2goKTsKKyAgICAgIGZpbmFsIExpc3RNdWx0aW1hcDxTdWJtaXRUeXBlLCBDaGFuZ2U+IHRvU3VibWl0ID0KKyAgICAgICAgICB2YWxpZGF0ZUNoYW5nZUxpc3QoZGIuY2hhbmdlcygpLnN1Ym1pdHRlZChkZXN0QnJhbmNoKS50b0xpc3QoKSk7CisKKyAgICAgIGZpbmFsIExpc3RNdWx0aW1hcDxTdWJtaXRUeXBlLCBDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlTmV4dFR1cm4gPQorICAgICAgICAgIEFycmF5TGlzdE11bHRpbWFwLmNyZWF0ZSgpOworICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiBwb3RlbnRpYWxseVN0aWxsU3VibWl0dGFibGVPbk5leHRSdW4gPQorICAgICAgICAgIG5ldyBBcnJheUxpc3Q8Q29kZVJldmlld0NvbW1pdD4oKTsKKyAgICAgIHdoaWxlICghdG9NZXJnZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgdG9NZXJnZU5leHRUdXJuLmNsZWFyKCk7CisgICAgICAgIGZpbmFsIFNldDxTdWJtaXRUeXBlPiBzdWJtaXRUeXBlcyA9CisgICAgICAgICAgICBuZXcgSGFzaFNldDxQcm9qZWN0LlN1Ym1pdFR5cGU+KHRvTWVyZ2Uua2V5U2V0KCkpOworICAgICAgICBmb3IgKGZpbmFsIFN1Ym1pdFR5cGUgc3VibWl0VHlwZSA6IHN1Ym1pdFR5cGVzKSB7CisgICAgICAgICAgZmluYWwgUmVmVXBkYXRlIGJyYW5jaFVwZGF0ZSA9IG9wZW5CcmFuY2goKTsKKyAgICAgICAgICBmaW5hbCBTdWJtaXRTdHJhdGVneSBzdHJhdGVneSA9IGNyZWF0ZVN0cmF0ZWd5KHN1Ym1pdFR5cGUpOworICAgICAgICAgIHByZU1lcmdlKHN0cmF0ZWd5LCB0b01lcmdlLmdldChzdWJtaXRUeXBlKSk7CisgICAgICAgICAgdXBkYXRlQnJhbmNoKHN0cmF0ZWd5LCBicmFuY2hVcGRhdGUpOworICAgICAgICAgIHVwZGF0ZUNoYW5nZVN0YXR1cyh0b1N1Ym1pdC5nZXQoc3VibWl0VHlwZSkpOworICAgICAgICAgIHVwZGF0ZVN1YnNjcmlwdGlvbnModG9TdWJtaXQuZ2V0KHN1Ym1pdFR5cGUpKTsKKworICAgICAgICAgIGZvciAoZmluYWwgSXRlcmF0b3I8Q29kZVJldmlld0NvbW1pdD4gaXQgPQorICAgICAgICAgICAgICBwb3RlbnRpYWxseVN0aWxsU3VibWl0dGFibGUuaXRlcmF0b3IoKTsgaXQuaGFzTmV4dCgpOykgeworICAgICAgICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBjb21taXQgPSBpdC5uZXh0KCk7CisgICAgICAgICAgICBpZiAoY29udGFpbnNNaXNzaW5nQ29tbWl0cyh0b01lcmdlLCBjb21taXQpCisgICAgICAgICAgICAgICAgfHwgY29udGFpbnNNaXNzaW5nQ29tbWl0cyh0b01lcmdlTmV4dFR1cm4sIGNvbW1pdCkpIHsKKyAgICAgICAgICAgICAgLy8gY2hhbmdlIGhhcyBtaXNzaW5nIGRlcGVuZGVuY2llcywgYnV0IGFsbCBjb21taXRzIHdoaWNoIGFyZQorICAgICAgICAgICAgICAvLyBtaXNzaW5nIGFyZSBzdGlsbCBhdHRlbXB0ZWQgdG8gYmUgbWVyZ2VkIHdpdGggYW5vdGhlciBzdWJtaXQKKyAgICAgICAgICAgICAgLy8gc3RyYXRlZ3ksIHJldHJ5IHRvIG1lcmdlIHRoaXMgY29tbWl0IGluIHRoZSBuZXh0IHR1cm4KKyAgICAgICAgICAgICAgaXQucmVtb3ZlKCk7CisgICAgICAgICAgICAgIGNvbW1pdC5zdGF0dXNDb2RlID0gbnVsbDsKKyAgICAgICAgICAgICAgY29tbWl0Lm1pc3NpbmcgPSBudWxsOworICAgICAgICAgICAgICB0b01lcmdlTmV4dFR1cm4ucHV0KHN1Ym1pdFR5cGUsIGNvbW1pdCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfQorICAgICAgICAgIHBvdGVudGlhbGx5U3RpbGxTdWJtaXR0YWJsZU9uTmV4dFJ1bi5hZGRBbGwocG90ZW50aWFsbHlTdGlsbFN1Ym1pdHRhYmxlKTsKKyAgICAgICAgICBwb3RlbnRpYWxseVN0aWxsU3VibWl0dGFibGUuY2xlYXIoKTsKKyAgICAgICAgfQorICAgICAgICB0b01lcmdlLmNsZWFyKCk7CisgICAgICAgIHRvTWVyZ2UucHV0QWxsKHRvTWVyZ2VOZXh0VHVybik7CisgICAgICB9CisKKyAgICAgIGZvciAoZmluYWwgQ29kZVJldmlld0NvbW1pdCBjb21taXQgOiBwb3RlbnRpYWxseVN0aWxsU3VibWl0dGFibGVPbk5leHRSdW4pIHsKKyAgICAgICAgZmluYWwgQ2FwYWJsZSBjYXBhYmxlID0gaXNTdWJtaXRTdGlsbFBvc3NpYmxlKGNvbW1pdCk7CisgICAgICAgIGlmIChjYXBhYmxlICE9IENhcGFibGUuT0spIHsKKyAgICAgICAgICBzZW5kTWVyZ2VGYWlsKGNvbW1pdC5jaGFuZ2UsCisgICAgICAgICAgICAgIG1lc3NhZ2UoY29tbWl0LmNoYW5nZSwgY2FwYWJsZS5nZXRNZXNzYWdlKCkpLCBmYWxzZSk7CisgICAgICAgIH0KKyAgICAgIH0KICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgewogICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgcXVlcnkgdGhlIGRhdGFiYXNlIiwgZSk7CiAgICAgfSBmaW5hbGx5IHsKQEAgLTMwNCwyNCArMzM1LDU5IEBACiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIHByZU1lcmdlKCkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24gewotICAgIG9wZW5CcmFuY2goKTsKLSAgICB2YWxpZGF0ZUNoYW5nZUxpc3QoKTsKLSAgICBtZXJnZVRpcCA9IGJyYW5jaFRpcDsKLSAgICBzd2l0Y2ggKGRlc3RQcm9qZWN0LmdldFN1Ym1pdFR5cGUoKSkgewotICAgICAgY2FzZSBDSEVSUllfUElDSzoKLSAgICAgICAgY2hlcnJ5UGlja0NoYW5nZXMoKTsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICAgIGNhc2UgRkFTVF9GT1JXQVJEX09OTFk6Ci0gICAgICBjYXNlIE1FUkdFX0FMV0FZUzoKLSAgICAgIGNhc2UgTUVSR0VfSUZfTkVDRVNTQVJZOgotICAgICAgZGVmYXVsdDoKLSAgICAgICAgcmVkdWNlVG9NaW5pbWFsTWVyZ2UoKTsKLSAgICAgICAgbWVyZ2VUb3BpY3MoKTsKLSAgICAgICAgbWFya0NsZWFuTWVyZ2VzKCk7Ci0gICAgICAgIGJyZWFrOworICBwcml2YXRlIGJvb2xlYW4gY29udGFpbnNNaXNzaW5nQ29tbWl0cygKKyAgICAgIGZpbmFsIExpc3RNdWx0aW1hcDxTdWJtaXRUeXBlLCBDb2RlUmV2aWV3Q29tbWl0PiBtYXAsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGNvbW1pdCkgeworICAgIGlmICghaXNTdWJtaXRGb3JNaXNzaW5nQ29tbWl0c1N0aWxsUG9zc2libGUoY29tbWl0KSkgeworICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKworICAgIGZvciAoZmluYWwgQ29kZVJldmlld0NvbW1pdCBtaXNzaW5nQ29tbWl0IDogY29tbWl0Lm1pc3NpbmcpIHsKKyAgICAgIGlmICghbWFwLmNvbnRhaW5zVmFsdWUobWlzc2luZ0NvbW1pdCkpIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKKyAgfQorCisgIHByaXZhdGUgYm9vbGVhbiBpc1N1Ym1pdEZvck1pc3NpbmdDb21taXRzU3RpbGxQb3NzaWJsZShmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGNvbW1pdCkgeworICAgIGlmIChjb21taXQubWlzc2luZyA9PSBudWxsIHx8IGNvbW1pdC5taXNzaW5nLmlzRW1wdHkoKSkgeworICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIGZvciAoQ29kZVJldmlld0NvbW1pdCBtaXNzaW5nQ29tbWl0IDogY29tbWl0Lm1pc3NpbmcpIHsKKyAgICAgIGxvYWRDaGFuZ2VJbmZvKG1pc3NpbmdDb21taXQpOworCisgICAgICBpZiAobWlzc2luZ0NvbW1pdC5wYXRjaHNldElkID09IG51bGwpIHsKKyAgICAgICAgLy8gVGhlIGNvbW1pdCBkb2Vzbid0IGhhdmUgYSBwYXRjaCBzZXQsIHNvIGl0IGNhbm5vdCBiZQorICAgICAgICAvLyBzdWJtaXR0ZWQgdG8gdGhlIGJyYW5jaC4KKyAgICAgICAgLy8KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgfQorCisgICAgICBpZiAoIW1pc3NpbmdDb21taXQuY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkuZXF1YWxzKAorICAgICAgICAgIG1pc3NpbmdDb21taXQucGF0Y2hzZXRJZCkpIHsKKyAgICAgICAgLy8gSWYgdGhlIG1pc3NpbmcgY29tbWl0IGlzIG5vdCB0aGUgY3VycmVudCBwYXRjaCBzZXQsCisgICAgICAgIC8vIHRoZSBjaGFuZ2UgbXVzdCBiZSByZWJhc2VkIHRvIHVzZSB0aGUgcHJvcGVyIHBhcmVudC4KKyAgICAgICAgLy8KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgfQorICAgIH0KKworICAgIHJldHVybiB0cnVlOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHByZU1lcmdlKGZpbmFsIFN1Ym1pdFN0cmF0ZWd5IHN0cmF0ZWd5LAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIG1lcmdlVGlwID0gc3RyYXRlZ3kucnVuKGJyYW5jaFRpcCwgdG9NZXJnZSk7CisgICAgcmVmTG9nSWRlbnQgPSBzdHJhdGVneS5nZXRSZWZMb2dJZGVudCgpOworICAgIGNvbW1pdHMucHV0QWxsKHN0cmF0ZWd5LmdldE5ld0NvbW1pdHMoKSk7CisgIH0KKworICBwcml2YXRlIFN1Ym1pdFN0cmF0ZWd5IGNyZWF0ZVN0cmF0ZWd5KGZpbmFsIFN1Ym1pdFR5cGUgc3VibWl0VHlwZSkKKyAgICAgIHRocm93cyBNZXJnZUV4Y2VwdGlvbiwgTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIHN1Ym1pdFN0cmF0ZWd5RmFjdG9yeS5jcmVhdGUoc3VibWl0VHlwZSwgZGIsIHJlcG8sIHJ3LCBpbnNlcnRlciwKKyAgICAgICAgY2FuTWVyZ2VGbGFnLCBnZXRBbHJlYWR5QWNjZXB0ZWQoYnJhbmNoVGlwKSwgZGVzdEJyYW5jaCk7CiAgIH0KIAogICBwcml2YXRlIHZvaWQgb3BlblJlcG9zaXRvcnkoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24gewpAQCAtMzQ0LDIwICs0MTAsMTcgQEAKICAgICB9OwogICAgIHJ3LnNvcnQoUmV2U29ydC5UT1BPKTsKICAgICBydy5zb3J0KFJldlNvcnQuQ09NTUlUX1RJTUVfREVTQywgdHJ1ZSk7Ci0gICAgQ0FOX01FUkdFID0gcncubmV3RmxhZygiQ0FOX01FUkdFIik7CisgICAgY2FuTWVyZ2VGbGFnID0gcncubmV3RmxhZygiQ0FOX01FUkdFIik7CiAKICAgICBpbnNlcnRlciA9IHJlcG8ubmV3T2JqZWN0SW5zZXJ0ZXIoKTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBvcGVuQnJhbmNoKCkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKLSAgICBhbHJlYWR5QWNjZXB0ZWQgPSBuZXcgSGFzaFNldDxSZXZDb21taXQ+KCk7Ci0KKyAgcHJpdmF0ZSBSZWZVcGRhdGUgb3BlbkJyYW5jaCgpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKICAgICB0cnkgewotICAgICAgYnJhbmNoVXBkYXRlID0gcmVwby51cGRhdGVSZWYoZGVzdEJyYW5jaC5nZXQoKSk7CisgICAgICBmaW5hbCBSZWZVcGRhdGUgYnJhbmNoVXBkYXRlID0gcmVwby51cGRhdGVSZWYoZGVzdEJyYW5jaC5nZXQoKSk7CiAgICAgICBpZiAoYnJhbmNoVXBkYXRlLmdldE9sZE9iamVjdElkKCkgIT0gbnVsbCkgewogICAgICAgICBicmFuY2hUaXAgPQogICAgICAgICAgICAgKENvZGVSZXZpZXdDb21taXQpIHJ3LnBhcnNlQ29tbWl0KGJyYW5jaFVwZGF0ZS5nZXRPbGRPYmplY3RJZCgpKTsKLSAgICAgICAgYWxyZWFkeUFjY2VwdGVkLmFkZChicmFuY2hUaXApOwogICAgICAgfSBlbHNlIHsKICAgICAgICAgYnJhbmNoVGlwID0gbnVsbDsKICAgICAgIH0KQEAgLTM2OSwxNCArNDMyLDMxIEBACiAgICAgICAgIH0gZWxzZSBpZiAocmVwby5nZXRGdWxsQnJhbmNoKCkuZXF1YWxzKGRlc3RCcmFuY2guZ2V0KCkpKSB7CiAgICAgICAgICAgYnJhbmNoVXBkYXRlLnNldEV4cGVjdGVkT2xkT2JqZWN0SWQoT2JqZWN0SWQuemVyb0lkKCkpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiRGVzdGluYXRpb24gYnJhbmNoIFwiIgotICAgICAgICAgICAgICArIGJyYW5jaFVwZGF0ZS5nZXRSZWYoKS5nZXROYW1lKCkgKyAiXCIgZG9lcyBub3QgZXhpc3QiKTsKKyAgICAgICAgICBmb3IgKGZpbmFsIENoYW5nZSBjIDogZGIuY2hhbmdlcygpLnN1Ym1pdHRlZChkZXN0QnJhbmNoKS50b0xpc3QoKSkgeworICAgICAgICAgICAgc2V0TmV3KGMsIG1lc3NhZ2UoYywgIllvdXIgY2hhbmdlIGNvdWxkIG5vdCBiZSBtZXJnZWQsICIKKyAgICAgICAgICAgICAgICArICJiZWNhdXNlIHRoZSBkZXN0aW5hdGlvbiBicmFuY2ggZG9lcyBub3QgZXhpc3QgYW55bW9yZS4iKSk7CisgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CiAgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigKICAgICAgICAgICAgICJGYWlsZWQgdG8gY2hlY2sgZXhpc3RlbmNlIG9mIGRlc3RpbmF0aW9uIGJyYW5jaCIsIGUpOwogICAgICAgfQogCisgICAgICByZXR1cm4gYnJhbmNoVXBkYXRlOworICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG9wZW4gYnJhbmNoIiwgZSk7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBTZXQ8UmV2Q29tbWl0PiBnZXRBbHJlYWR5QWNjZXB0ZWQoZmluYWwgQ29kZVJldmlld0NvbW1pdCBicmFuY2hUaXApCisgICAgICB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCA9IG5ldyBIYXNoU2V0PFJldkNvbW1pdD4oKTsKKworICAgIGlmIChicmFuY2hUaXAgIT0gbnVsbCkgeworICAgICAgYWxyZWFkeUFjY2VwdGVkLmFkZChicmFuY2hUaXApOworICAgIH0KKworICAgIHRyeSB7CiAgICAgICBmb3IgKGZpbmFsIFJlZiByIDogcmVwby5nZXRBbGxSZWZzKCkudmFsdWVzKCkpIHsKICAgICAgICAgaWYgKHIuZ2V0TmFtZSgpLnN0YXJ0c1dpdGgoQ29uc3RhbnRzLlJfSEVBRFMpCiAgICAgICAgICAgICB8fCByLmdldE5hbWUoKS5zdGFydHNXaXRoKENvbnN0YW50cy5SX1RBR1MpKSB7CkBAIC0zODgsMTEgKzQ2OCwxNyBAQAogICAgICAgICB9CiAgICAgICB9CiAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3Qgb3BlbiBicmFuY2giLCBlKTsKKyAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiRmFpbGVkIHRvIGRldGVybWluZSBhbHJlYWR5IGFjY2VwdGVkIGNvbW1pdHMuIiwgZSk7CiAgICAgfQorCisgICAgcmV0dXJuIGFscmVhZHlBY2NlcHRlZDsKICAgfQogCi0gIHByaXZhdGUgdm9pZCB2YWxpZGF0ZUNoYW5nZUxpc3QoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICBwcml2YXRlIExpc3RNdWx0aW1hcDxTdWJtaXRUeXBlLCBDaGFuZ2U+IHZhbGlkYXRlQ2hhbmdlTGlzdCgKKyAgICAgIGZpbmFsIExpc3Q8Q2hhbmdlPiBzdWJtaXR0ZWQpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgZmluYWwgTGlzdE11bHRpbWFwPFN1Ym1pdFR5cGUsIENoYW5nZT4gdG9TdWJtaXQgPQorICAgICAgICBBcnJheUxpc3RNdWx0aW1hcC5jcmVhdGUoKTsKKwogICAgIGZpbmFsIFNldDxPYmplY3RJZD4gdGlwcyA9IG5ldyBIYXNoU2V0PE9iamVjdElkPigpOwogICAgIGZvciAoZmluYWwgUmVmIHIgOiByZXBvLmdldEFsbFJlZnMoKS52YWx1ZXMoKSkgewogICAgICAgdGlwcy5hZGQoci5nZXRPYmplY3RJZCgpKTsKQEAgLTQ1NSwxMCArNTQxLDExIEBACiAgICAgICAgIGNvbnRpbnVlOwogICAgICAgfQogCi0gICAgICBpZiAoR2l0UmVwb3NpdG9yeU1hbmFnZXIuUkVGX0NPTkZJRy5lcXVhbHMoYnJhbmNoVXBkYXRlLmdldE5hbWUoKSkpIHsKKyAgICAgIGlmIChHaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZfQ09ORklHLmVxdWFscyhkZXN0QnJhbmNoLmdldCgpKSkgewogICAgICAgICBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgbmV3UGFyZW50OwogICAgICAgICB0cnkgewotICAgICAgICAgIFByb2plY3RDb25maWcgY2ZnID0gbmV3IFByb2plY3RDb25maWcoZGVzdFByb2plY3QuZ2V0TmFtZUtleSgpKTsKKyAgICAgICAgICBQcm9qZWN0Q29uZmlnIGNmZyA9CisgICAgICAgICAgICAgIG5ldyBQcm9qZWN0Q29uZmlnKGRlc3RQcm9qZWN0LmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpOwogICAgICAgICAgIGNmZy5sb2FkKHJlcG8sIGNvbW1pdCk7CiAgICAgICAgICAgbmV3UGFyZW50ID0gY2ZnLmdldFByb2plY3QoKS5nZXRQYXJlbnQoYWxsUHJvamVjdHNOYW1lKTsKICAgICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKQEAgLTQ2Niw3ICs1NTMsOCBAQAogICAgICAgICAgICAgICAuZXJyb3IoQ29tbWl0TWVyZ2VTdGF0dXMuSU5WQUxJRF9QUk9KRUNUX0NPTkZJR1VSQVRJT04pKTsKICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgb2xkUGFyZW50ID0gZGVzdFByb2plY3QuZ2V0UGFyZW50KGFsbFByb2plY3RzTmFtZSk7CisgICAgICAgIGZpbmFsIFByb2plY3QuTmFtZUtleSBvbGRQYXJlbnQgPQorICAgICAgICAgICAgZGVzdFByb2plY3QuZ2V0UHJvamVjdCgpLmdldFBhcmVudChhbGxQcm9qZWN0c05hbWUpOwogICAgICAgICBpZiAob2xkUGFyZW50ID09IG51bGwpIHsKICAgICAgICAgICAvLyB1cGRhdGUgb2YgdGhlICdBbGwtUHJvamVjdHMnIHByb2plY3QKICAgICAgICAgICBpZiAobmV3UGFyZW50ICE9IG51bGwpIHsKQEAgLTUwNiw3ICs1OTQsNyBAQAogCiAgICAgICBpZiAoYnJhbmNoVGlwICE9IG51bGwpIHsKICAgICAgICAgLy8gSWYgdGhpcyBjb21taXQgaXMgYWxyZWFkeSBtZXJnZWQgaXRzIGEgYnVnIGluIHRoZSBxdWV1aW5nIGNvZGUKLSAgICAgICAgLy8gdGhhdCB3ZSBnb3QgYmFjayBoZXJlLiBKdXN0IG1hcmsgaXQgY29tcGxldGUgYW5kIG1vdmUgb24uIEl0cworICAgICAgICAvLyB0aGF0IHdlIGdvdCBiYWNrIGhlcmUuIEp1c3QgbWFyayBpdCBjb21wbGV0ZSBhbmQgbW92ZSBvbi4gSXQncwogICAgICAgICAvLyBtZXJnZWQgYW5kIHRoYXQgaXMgYWxsIHRoYXQgbWF0dGVyZWQgdG8gdGhlIHJlcXVlc3Rvci4KICAgICAgICAgLy8KICAgICAgICAgdHJ5IHsKQEAgLTUxOSw1OTMgKzYwNyw1OCBAQAogICAgICAgICB9CiAgICAgICB9CiAKLSAgICAgIGNvbW1pdC5hZGQoQ0FOX01FUkdFKTsKLSAgICAgIHRvTWVyZ2UuYWRkKGNvbW1pdCk7CisgICAgICBmaW5hbCBTdWJtaXRUeXBlIHN1Ym1pdFR5cGUgPSBnZXRTdWJtaXRUeXBlKGNoZywgcHMpOworICAgICAgaWYgKHN1Ym1pdFR5cGUgPT0gbnVsbCkgeworICAgICAgICBjb21taXRzLnB1dChjaGFuZ2VJZCwKKyAgICAgICAgICAgIENvZGVSZXZpZXdDb21taXQuZXJyb3IoQ29tbWl0TWVyZ2VTdGF0dXMuTk9fU1VCTUlUX1RZUEUpKTsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisKKyAgICAgIGNvbW1pdC5hZGQoY2FuTWVyZ2VGbGFnKTsKKyAgICAgIHRvTWVyZ2UucHV0KHN1Ym1pdFR5cGUsIGNvbW1pdCk7CisgICAgICB0b1N1Ym1pdC5wdXQoc3VibWl0VHlwZSwgY2hnKTsKICAgICB9CisgICAgcmV0dXJuIHRvU3VibWl0OwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIHJlZHVjZVRvTWluaW1hbE1lcmdlKCkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBDb2xsZWN0aW9uPENvZGVSZXZpZXdDb21taXQ+IGhlYWRzOworICBwcml2YXRlIFN1Ym1pdFR5cGUgZ2V0U3VibWl0VHlwZShmaW5hbCBDaGFuZ2UgY2hhbmdlLCBmaW5hbCBQYXRjaFNldCBwcykgewogICAgIHRyeSB7Ci0gICAgICBoZWFkcyA9IG5ldyBNZXJnZVNvcnRlcihydywgYWxyZWFkeUFjY2VwdGVkLCBDQU5fTUVSR0UpLnNvcnQodG9NZXJnZSk7Ci0gICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJCcmFuY2ggaGVhZCBzb3J0aW5nIGZhaWxlZCIsIGUpOwotICAgIH0KLQotICAgIHRvTWVyZ2UuY2xlYXIoKTsKLSAgICB0b01lcmdlLmFkZEFsbChoZWFkcyk7Ci0gICAgQ29sbGVjdGlvbnMuc29ydCh0b01lcmdlLCBuZXcgQ29tcGFyYXRvcjxDb2RlUmV2aWV3Q29tbWl0PigpIHsKLSAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGEsIGZpbmFsIENvZGVSZXZpZXdDb21taXQgYikgewotICAgICAgICByZXR1cm4gYS5vcmlnaW5hbE9yZGVyIC0gYi5vcmlnaW5hbE9yZGVyOworICAgICAgZmluYWwgU3VibWl0VHlwZVJlY29yZCByID0KKyAgICAgICAgICBjaGFuZ2VDb250cm9sRmFjdG9yeS5jb250cm9sRm9yKGNoYW5nZSwKKyAgICAgICAgICAgICAgaWRlbnRpZmllZFVzZXJGYWN0b3J5LmNyZWF0ZShjaGFuZ2UuZ2V0T3duZXIoKSkpCisgICAgICAgICAgICAgIC5nZXRTdWJtaXRUeXBlUmVjb3JkKGRiLCBwcyk7CisgICAgICBpZiAoci5zdGF0dXMgIT0gU3VibWl0VHlwZVJlY29yZC5TdGF0dXMuT0spIHsKKyAgICAgICAgbG9nLmVycm9yKCJGYWlsZWQgdG8gZ2V0IHN1Ym1pdCB0eXBlIGZvciAiICsgY2hhbmdlLmdldEtleSgpKTsKKyAgICAgICAgcmV0dXJuIG51bGw7CiAgICAgICB9Ci0gICAgfSk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgbWVyZ2VUb3BpY3MoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24gewotICAgIC8vIFRha2UgdGhlIGZpcnN0IGZhc3QtZm9yd2FyZCBhdmFpbGFibGUsIGlmIGFueSBpcyBhdmFpbGFibGUgaW4gdGhlIHNldC4KLSAgICAvLwotICAgIGlmIChkZXN0UHJvamVjdC5nZXRTdWJtaXRUeXBlKCkgIT0gUHJvamVjdC5TdWJtaXRUeXBlLk1FUkdFX0FMV0FZUykgewotICAgICAgZm9yIChmaW5hbCBJdGVyYXRvcjxDb2RlUmV2aWV3Q29tbWl0PiBpID0gdG9NZXJnZS5pdGVyYXRvcigpOyBpLmhhc05leHQoKTspIHsKLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4gPSBpLm5leHQoKTsKLSAgICAgICAgICBpZiAobWVyZ2VUaXAgPT0gbnVsbCB8fCBydy5pc01lcmdlZEludG8obWVyZ2VUaXAsIG4pKSB7Ci0gICAgICAgICAgICBtZXJnZVRpcCA9IG47Ci0gICAgICAgICAgICBpLnJlbW92ZSgpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgfQotICAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgZmFzdC1mb3J3YXJkIHRlc3QgZHVyaW5nIG1lcmdlIiwgZSk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9Ci0KLSAgICBpZiAoZGVzdFByb2plY3QuZ2V0U3VibWl0VHlwZSgpID09IFByb2plY3QuU3VibWl0VHlwZS5GQVNUX0ZPUldBUkRfT05MWSkgewotICAgICAgLy8gSWYgdGhpcyBwcm9qZWN0IG9ubHkgcGVybWl0cyBmYXN0LWZvcndhcmRzLCBhYm9ydCBldmVyeXRoaW5nIGVsc2UuCi0gICAgICAvLwotICAgICAgd2hpbGUgKCF0b01lcmdlLmlzRW1wdHkoKSkgewotICAgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4gPSB0b01lcmdlLnJlbW92ZSgwKTsKLSAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuTk9UX0ZBU1RfRk9SV0FSRDsKLSAgICAgIH0KLQotICAgIH0gZWxzZSB7Ci0gICAgICAvLyBGb3IgZXZlcnkgb3RoZXIgY29tbWl0IGRvIGEgcGFpci13aXNlIG1lcmdlLgotICAgICAgLy8KLSAgICAgIHdoaWxlICghdG9NZXJnZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgbWVyZ2VPbmVDb21taXQodG9NZXJnZS5yZW1vdmUoMCkpOwotICAgICAgfQorICAgICAgcmV0dXJuIHIudHlwZTsKKyAgICB9IGNhdGNoIChOb1N1Y2hDaGFuZ2VFeGNlcHRpb24gZSkgeworICAgICAgbG9nLmVycm9yKCJGYWlsZWQgdG8gZ2V0IHN1Ym1pdCB0eXBlIGZvciAiICsgY2hhbmdlLmdldEtleSgpLCBlKTsKKyAgICAgIHJldHVybiBudWxsOwogICAgIH0KICAgfQogCi0gIHByaXZhdGUgdm9pZCBtZXJnZU9uZUNvbW1pdChmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4pIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7Ci0gICAgZmluYWwgVGhyZWVXYXlNZXJnZXIgbSA9IG5ld1RocmVlV2F5TWVyZ2VyKCk7Ci0gICAgdHJ5IHsKLSAgICAgIGlmIChtLm1lcmdlKG5ldyBBbnlPYmplY3RJZFtdIHttZXJnZVRpcCwgbn0pKSB7Ci0gICAgICAgIHdyaXRlTWVyZ2VDb21taXQobS5nZXRSZXN1bHRUcmVlSWQoKSwgbik7Ci0KLSAgICAgIH0gZWxzZSB7Ci0gICAgICAgIGZhaWxlZChuLCBDb21taXRNZXJnZVN0YXR1cy5QQVRIX0NPTkZMSUNUKTsKLSAgICAgIH0KLSAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICBpZiAoZS5nZXRNZXNzYWdlKCkuc3RhcnRzV2l0aCgiTXVsdGlwbGUgbWVyZ2UgYmFzZXMgZm9yIikpIHsKLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICBmYWlsZWQobiwgQ29tbWl0TWVyZ2VTdGF0dXMuQ1JJU1NfQ1JPU1NfTUVSR0UpOwotICAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlMikgewotICAgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG1lcmdlICIgKyBuLm5hbWUoKSwgZSk7Ci0gICAgICAgIH0KLSAgICAgIH0gZWxzZSB7Ci0gICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG1lcmdlICIgKyBuLm5hbWUoKSwgZSk7Ci0gICAgICB9Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSBUaHJlZVdheU1lcmdlciBuZXdUaHJlZVdheU1lcmdlcigpIHsKLSAgICBUaHJlZVdheU1lcmdlciBtOwotICAgIGlmIChkZXN0UHJvamVjdC5pc1VzZUNvbnRlbnRNZXJnZSgpKSB7Ci0gICAgICAvLyBTZXR0aW5ncyBmb3IgdGhpcyBwcm9qZWN0IGFsbG93IHVzIHRvIHRyeSBhbmQKLSAgICAgIC8vIGF1dG9tYXRpY2FsbHkgcmVzb2x2ZSBjb25mbGljdHMgd2l0aGluIGZpbGVzIGlmIG5lZWRlZC4KLSAgICAgIC8vIFVzZSBSZXNvbHZlTWVyZ2UgYW5kIGluc3RydWN0IHRvIG9wZXJhdGUgaW4gY29yZS4KLSAgICAgIG0gPSBNZXJnZVN0cmF0ZWd5LlJFU09MVkUubmV3TWVyZ2VyKHJlcG8sIHRydWUpOwotICAgIH0gZWxzZSB7Ci0gICAgICAvLyBObyBhdXRvIGNvbmZsaWN0IHJlc29sdmluZyBhbGxvd2VkLiBJZiBhbnkgb2YgdGhlCi0gICAgICAvLyBhZmZlY3RlZCBmaWxlcyB3YXMgbW9kaWZpZWQsIG1lcmdlIHdpbGwgZmFpbC4KLSAgICAgIG0gPSBNZXJnZVN0cmF0ZWd5LlNJTVBMRV9UV09fV0FZX0lOX0NPUkUubmV3TWVyZ2VyKHJlcG8pOwotICAgIH0KLSAgICBtLnNldE9iamVjdEluc2VydGVyKG5ldyBPYmplY3RJbnNlcnRlci5GaWx0ZXIoKSB7Ci0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHByb3RlY3RlZCBPYmplY3RJbnNlcnRlciBkZWxlZ2F0ZSgpIHsKLSAgICAgICAgcmV0dXJuIGluc2VydGVyOwotICAgICAgfQotCi0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIGZsdXNoKCkgewotICAgICAgfQotCi0gICAgICBAT3ZlcnJpZGUKLSAgICAgIHB1YmxpYyB2b2lkIHJlbGVhc2UoKSB7Ci0gICAgICB9Ci0gICAgfSk7Ci0gICAgcmV0dXJuIG07Ci0gIH0KLQotICBwcml2YXRlIENvZGVSZXZpZXdDb21taXQgZmFpbGVkKGZpbmFsIENvZGVSZXZpZXdDb21taXQgbiwKLSAgICAgIGZpbmFsIENvbW1pdE1lcmdlU3RhdHVzIGZhaWx1cmUpIHRocm93cyBNaXNzaW5nT2JqZWN0RXhjZXB0aW9uLAotICAgICAgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewotICAgIHJ3LnJlc2V0KCk7Ci0gICAgcncubWFya1N0YXJ0KG4pOwotICAgIHJ3Lm1hcmtVbmludGVyZXN0aW5nKG1lcmdlVGlwKTsKLSAgICBDb2RlUmV2aWV3Q29tbWl0IGZhaWxlZDsKLSAgICB3aGlsZSAoKGZhaWxlZCA9IChDb2RlUmV2aWV3Q29tbWl0KSBydy5uZXh0KCkpICE9IG51bGwpIHsKLSAgICAgIGZhaWxlZC5zdGF0dXNDb2RlID0gZmFpbHVyZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhaWxlZDsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCB3cml0ZU1lcmdlQ29tbWl0KE9iamVjdElkIHRyZWVJZCwgQ29kZVJldmlld0NvbW1pdCBuKQotICAgICAgdGhyb3dzIElPRXhjZXB0aW9uLCBNaXNzaW5nT2JqZWN0RXhjZXB0aW9uLCBJbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IG1lcmdlZCA9IG5ldyBBcnJheUxpc3Q8Q29kZVJldmlld0NvbW1pdD4oKTsKLSAgICBydy5yZXNldCgpOwotICAgIHJ3Lm1hcmtTdGFydChuKTsKLSAgICBydy5tYXJrVW5pbnRlcmVzdGluZyhtZXJnZVRpcCk7Ci0gICAgZm9yIChmaW5hbCBSZXZDb21taXQgYyA6IHJ3KSB7Ci0gICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGNyYyA9IChDb2RlUmV2aWV3Q29tbWl0KSBjOwotICAgICAgaWYgKGNyYy5wYXRjaHNldElkICE9IG51bGwpIHsKLSAgICAgICAgbWVyZ2VkLmFkZChjcmMpOwotICAgICAgfQotICAgIH0KLQotICAgIGZpbmFsIFN0cmluZ0J1aWxkZXIgbXNnYnVmID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICBpZiAobWVyZ2VkLnNpemUoKSA9PSAxKSB7Ci0gICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IGMgPSBtZXJnZWQuZ2V0KDApOwotICAgICAgcncucGFyc2VCb2R5KGMpOwotICAgICAgbXNnYnVmLmFwcGVuZCgiTWVyZ2UgXCIiKTsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoYy5nZXRTaG9ydE1lc3NhZ2UoKSk7Ci0gICAgICBtc2didWYuYXBwZW5kKCJcIiIpOwotCi0gICAgfSBlbHNlIHsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoIk1lcmdlIGNoYW5nZXMgIik7Ci0gICAgICBmb3IgKGZpbmFsIEl0ZXJhdG9yPENvZGVSZXZpZXdDb21taXQ+IGkgPSBtZXJnZWQuaXRlcmF0b3IoKTsgaS5oYXNOZXh0KCk7KSB7Ci0gICAgICAgIG1zZ2J1Zi5hcHBlbmQoaS5uZXh0KCkuY2hhbmdlLmdldEtleSgpLmFiYnJldmlhdGUoKSk7Ci0gICAgICAgIGlmIChpLmhhc05leHQoKSkgewotICAgICAgICAgIG1zZ2J1Zi5hcHBlbmQoJywnKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLQotICAgIGlmICghUl9IRUFEU19NQVNURVIuZXF1YWxzKGRlc3RCcmFuY2guZ2V0KCkpKSB7Ci0gICAgICBtc2didWYuYXBwZW5kKCIgaW50byAiKTsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoZGVzdEJyYW5jaC5nZXRTaG9ydE5hbWUoKSk7Ci0gICAgfQotCi0gICAgaWYgKG1lcmdlZC5zaXplKCkgPiAxKSB7Ci0gICAgICBtc2didWYuYXBwZW5kKCJcblxuKiBjaGFuZ2VzOlxuIik7Ci0gICAgICBmb3IgKGZpbmFsIENvZGVSZXZpZXdDb21taXQgYyA6IG1lcmdlZCkgewotICAgICAgICBydy5wYXJzZUJvZHkoYyk7Ci0gICAgICAgIG1zZ2J1Zi5hcHBlbmQoIiAgIik7Ci0gICAgICAgIG1zZ2J1Zi5hcHBlbmQoYy5nZXRTaG9ydE1lc3NhZ2UoKSk7Ci0gICAgICAgIG1zZ2J1Zi5hcHBlbmQoIlxuIik7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgUGVyc29uSWRlbnQgYXV0aG9ySWRlbnQgPSBjb21wdXRlQXV0aG9yKG1lcmdlZCk7Ci0KLSAgICBmaW5hbCBDb21taXRCdWlsZGVyIG1lcmdlQ29tbWl0ID0gbmV3IENvbW1pdEJ1aWxkZXIoKTsKLSAgICBtZXJnZUNvbW1pdC5zZXRUcmVlSWQodHJlZUlkKTsKLSAgICBtZXJnZUNvbW1pdC5zZXRQYXJlbnRJZHMobWVyZ2VUaXAsIG4pOwotICAgIG1lcmdlQ29tbWl0LnNldEF1dGhvcihhdXRob3JJZGVudCk7Ci0gICAgbWVyZ2VDb21taXQuc2V0Q29tbWl0dGVyKG15SWRlbnQpOwotICAgIG1lcmdlQ29tbWl0LnNldE1lc3NhZ2UobXNnYnVmLnRvU3RyaW5nKCkpOwotCi0gICAgbWVyZ2VUaXAgPSAoQ29kZVJldmlld0NvbW1pdCkgcncucGFyc2VDb21taXQoY29tbWl0KG1lcmdlQ29tbWl0KSk7Ci0gIH0KLQotICBwcml2YXRlIFBlcnNvbklkZW50IGNvbXB1dGVBdXRob3IoCi0gICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IGNvZGVSZXZpZXdDb21taXRzKSB7Ci0gICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXR0ZXIgPSBudWxsOwotICAgIGZvciAoZmluYWwgQ29kZVJldmlld0NvbW1pdCBjIDogY29kZVJldmlld0NvbW1pdHMpIHsKLSAgICAgIFBhdGNoU2V0QXBwcm92YWwgcyA9IGdldFN1Ym1pdHRlcihkYiwgYy5wYXRjaHNldElkKTsKLSAgICAgIGlmIChzdWJtaXR0ZXIgPT0gbnVsbAotICAgICAgICAgIHx8IChzICE9IG51bGwgJiYgcy5nZXRHcmFudGVkKCkuY29tcGFyZVRvKHN1Ym1pdHRlci5nZXRHcmFudGVkKCkpID4gMCkpIHsKLSAgICAgICAgc3VibWl0dGVyID0gczsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICAvLyBUcnkgdG8gdXNlIHRoZSBzdWJtaXR0ZXIncyBpZGVudGl0eSBmb3IgdGhlIG1lcmdlIGNvbW1pdCBhdXRob3IuCi0gICAgLy8gSWYgYWxsIG9mIHRoZSBjb21taXRzIGJlaW5nIG1lcmdlZCBhcmUgY3JlYXRlZCBieSB0aGUgc3VibWl0dGVyLAotICAgIC8vIHByZWZlciB0aGUgaWRlbnRpdHkgbGluZSB0aGV5IHVzZWQgaW4gdGhlIGNvbW1pdHMgcmF0aGVyIHRoYW4gdGhlCi0gICAgLy8gcHJlZmVycmVkIGlkZW50aXR5IHN0b3JlZCBpbiB0aGUgdXNlciBhY2NvdW50LiBUaGlzIHdheSB0aGUgR2l0Ci0gICAgLy8gY29tbWl0IHJlY29yZHMgYXJlIG1vcmUgY29uc2lzdGVudCBpbnRlcm5hbGx5LgotICAgIC8vCi0gICAgUGVyc29uSWRlbnQgYXV0aG9ySWRlbnQ7Ci0gICAgaWYgKHN1Ym1pdHRlciAhPSBudWxsKSB7Ci0gICAgICBJZGVudGlmaWVkVXNlciB3aG8gPQotICAgICAgICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoc3VibWl0dGVyLmdldEFjY291bnRJZCgpKTsKLSAgICAgIFNldDxTdHJpbmc+IGVtYWlscyA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKLSAgICAgIGZvciAoUmV2Q29tbWl0IGMgOiBjb2RlUmV2aWV3Q29tbWl0cykgewotICAgICAgICB0cnkgewotICAgICAgICAgIHJ3LnBhcnNlQm9keShjKTsKLSAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewotICAgICAgICAgIGxvZy53YXJuKCJDYW5ub3QgcGFyc2UgY29tbWl0ICIgKyBjLm5hbWUoKSArICIgaW4gIiArIGRlc3RCcmFuY2gsIGUpOwotICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGVtYWlscy5hZGQoYy5nZXRBdXRob3JJZGVudCgpLmdldEVtYWlsQWRkcmVzcygpKTsKLSAgICAgIH0KLQotICAgICAgZmluYWwgVGltZXN0YW1wIGR0ID0gc3VibWl0dGVyLmdldEdyYW50ZWQoKTsKLSAgICAgIGZpbmFsIFRpbWVab25lIHR6ID0gbXlJZGVudC5nZXRUaW1lWm9uZSgpOwotICAgICAgaWYgKGVtYWlscy5zaXplKCkgPT0gMQotICAgICAgICAgICYmIHdoby5nZXRFbWFpbEFkZHJlc3NlcygpLmNvbnRhaW5zKGVtYWlscy5pdGVyYXRvcigpLm5leHQoKSkpIHsKLSAgICAgICAgYXV0aG9ySWRlbnQgPQotICAgICAgICAgICAgbmV3IFBlcnNvbklkZW50KGNvZGVSZXZpZXdDb21taXRzLmdldCgwKS5nZXRBdXRob3JJZGVudCgpLCBkdCwgdHopOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgYXV0aG9ySWRlbnQgPSB3aG8ubmV3Q29tbWl0dGVySWRlbnQoZHQsIHR6KTsKLSAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAgYXV0aG9ySWRlbnQgPSBteUlkZW50OwotICAgIH0KLSAgICByZXR1cm4gYXV0aG9ySWRlbnQ7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgbWFya0NsZWFuTWVyZ2VzKCkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKLSAgICBpZiAobWVyZ2VUaXAgPT0gbnVsbCkgewotICAgICAgLy8gSWYgbWVyZ2VUaXAgaXMgbnVsbCBoZXJlLCBicmFuY2hUaXAgd2FzIG51bGwsIGluZGljYXRpbmcgYSBuZXcgYnJhbmNoCi0gICAgICAvLyBhdCB0aGUgc3RhcnQgb2YgdGhlIG1lcmdlIHByb2Nlc3MuIFdlIGFsc28gZWxlY3RlZCB0byBtZXJnZSBub3RoaW5nLAotICAgICAgLy8gcHJvYmFibHkgZHVlIHRvIG1pc3NpbmcgZGVwZW5kZW5jaWVzLiBOb3RoaW5nIHdhcyBjbGVhbmx5IG1lcmdlZC4KLSAgICAgIC8vCisgIHByaXZhdGUgdm9pZCB1cGRhdGVCcmFuY2goZmluYWwgU3VibWl0U3RyYXRlZ3kgc3RyYXRlZ3ksCisgICAgICBmaW5hbCBSZWZVcGRhdGUgYnJhbmNoVXBkYXRlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIGlmICgoYnJhbmNoVGlwID09IG51bGwgJiYgbWVyZ2VUaXAgPT0gbnVsbCkgfHwgYnJhbmNoVGlwID09IG1lcmdlVGlwKSB7CisgICAgICAvLyBub3RoaW5nIHRvIGRvCiAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgdHJ5IHsKLSAgICAgIHJ3LnJlc2V0KCk7Ci0gICAgICBydy5zb3J0KFJldlNvcnQuVE9QTyk7Ci0gICAgICBydy5zb3J0KFJldlNvcnQuUkVWRVJTRSwgdHJ1ZSk7Ci0gICAgICBydy5tYXJrU3RhcnQobWVyZ2VUaXApOwotICAgICAgZm9yIChSZXZDb21taXQgYyA6IGFscmVhZHlBY2NlcHRlZCkgewotICAgICAgICBydy5tYXJrVW5pbnRlcmVzdGluZyhjKTsKLSAgICAgIH0KLQotICAgICAgQ29kZVJldmlld0NvbW1pdCBjOwotICAgICAgd2hpbGUgKChjID0gKENvZGVSZXZpZXdDb21taXQpIHJ3Lm5leHQoKSkgIT0gbnVsbCkgewotICAgICAgICBpZiAoYy5wYXRjaHNldElkICE9IG51bGwpIHsKLSAgICAgICAgICBjLnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9NRVJHRTsKLSAgICAgICAgICBpZiAoYnJhbmNoVXBkYXRlLmdldFJlZkxvZ0lkZW50KCkgPT0gbnVsbCkgewotICAgICAgICAgICAgc2V0UmVmTG9nSWRlbnQoZ2V0U3VibWl0dGVyKGRiLCBjLnBhdGNoc2V0SWQpKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBtYXJrIGNsZWFuIG1lcmdlcyIsIGUpOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgdm9pZCBzZXRSZWZMb2dJZGVudChmaW5hbCBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdEF1ZGl0KSB7Ci0gICAgaWYgKHN1Ym1pdEF1ZGl0ICE9IG51bGwpIHsKLSAgICAgIGJyYW5jaFVwZGF0ZS5zZXRSZWZMb2dJZGVudChpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKAotICAgICAgICAgIHN1Ym1pdEF1ZGl0LmdldEFjY291bnRJZCgpKS5uZXdSZWZMb2dJZGVudCgpKTsKLSAgICB9Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgY2hlcnJ5UGlja0NoYW5nZXMoKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7Ci0gICAgd2hpbGUgKCF0b01lcmdlLmlzRW1wdHkoKSkgewotICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuID0gdG9NZXJnZS5yZW1vdmUoMCk7Ci0gICAgICBmaW5hbCBUaHJlZVdheU1lcmdlciBtID0gbmV3VGhyZWVXYXlNZXJnZXIoKTsKLSAgICAgIHRyeSB7Ci0gICAgICAgIGlmIChtZXJnZVRpcCA9PSBudWxsKSB7Ci0gICAgICAgICAgLy8gVGhlIGJyYW5jaCBpcyB1bmJvcm4uIFRha2UgYSBmYXN0LWZvcndhcmQgcmVzb2x1dGlvbiB0bwotICAgICAgICAgIC8vIGNyZWF0ZSB0aGUgYnJhbmNoLgotICAgICAgICAgIC8vCi0gICAgICAgICAgbWVyZ2VUaXAgPSBuOwotICAgICAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLkNMRUFOX01FUkdFOwotCi0gICAgICAgIH0gZWxzZSBpZiAobi5nZXRQYXJlbnRDb3VudCgpID09IDApIHsKLSAgICAgICAgICAvLyBSZWZ1c2UgdG8gbWVyZ2UgYSByb290IGNvbW1pdCBpbnRvIGFuIGV4aXN0aW5nIGJyYW5jaCwKLSAgICAgICAgICAvLyB3ZSBjYW5ub3Qgb2J0YWluIGEgZGVsdGEgZm9yIHRoZSBjaGVycnktcGljayB0byBhcHBseS4KLSAgICAgICAgICAvLwotICAgICAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLkNBTk5PVF9DSEVSUllfUElDS19ST09UOwotCi0gICAgICAgIH0gZWxzZSBpZiAobi5nZXRQYXJlbnRDb3VudCgpID09IDEpIHsKLSAgICAgICAgICAvLyBJZiB0aGVyZSBpcyBvbmx5IG9uZSBwYXJlbnQsIGEgY2hlcnJ5LXBpY2sgY2FuIGJlIGRvbmUgYnkKLSAgICAgICAgICAvLyB0YWtpbmcgdGhlIGRlbHRhIHJlbGF0aXZlIHRvIHRoYXQgb25lIHBhcmVudCBhbmQgcmVkb2luZwotICAgICAgICAgIC8vIHRoYXQgb24gdGhlIGN1cnJlbnQgbWVyZ2UgdGlwLgotICAgICAgICAgIC8vCi0gICAgICAgICAgbS5zZXRCYXNlKG4uZ2V0UGFyZW50KDApKTsKLSAgICAgICAgICBpZiAobS5tZXJnZShtZXJnZVRpcCwgbikpIHsKLSAgICAgICAgICAgIHdyaXRlQ2hlcnJ5UGlja0NvbW1pdChtLCBuKTsKLQotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBuLnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5QQVRIX0NPTkZMSUNUOwotICAgICAgICAgIH0KLQotICAgICAgICB9IGVsc2UgewotICAgICAgICAgIC8vIFRoZXJlIGFyZSBtdWx0aXBsZSBwYXJlbnRzLCBzbyB0aGlzIGlzIGEgbWVyZ2UgY29tbWl0LiBXZQotICAgICAgICAgIC8vIGRvbid0IHdhbnQgdG8gY2hlcnJ5LXBpY2sgdGhlIG1lcmdlIGFzIGNsaWVudHMgY2FuJ3QgZWFzaWx5Ci0gICAgICAgICAgLy8gcmViYXNlIHRoZWlyIGhpc3Rvcnkgd2l0aCB0aGF0IG1lcmdlIHByZXNlbnQgYW5kIHJlcGxhY2VkCi0gICAgICAgICAgLy8gYnkgYW4gZXF1aXZhbGVudCBtZXJnZSB3aXRoIGEgZGlmZmVyZW50IGZpcnN0IHBhcmVudC4gU28KLSAgICAgICAgICAvLyBpbnN0ZWFkIGJlaGF2ZSBhcyB0aG91Z2ggTUVSR0VfSUZfTkVDRVNTQVJZIHdhcyBjb25maWd1cmVkLgotICAgICAgICAgIC8vCi0gICAgICAgICAgaWYgKGhhc0RlcGVuZGVuY2llc01ldChuKSkgewotICAgICAgICAgICAgaWYgKHJ3LmlzTWVyZ2VkSW50byhtZXJnZVRpcCwgbikpIHsKLSAgICAgICAgICAgICAgbWVyZ2VUaXAgPSBuOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgbWVyZ2VPbmVDb21taXQobik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBtYXJrQ2xlYW5NZXJnZXMoKTsKLQotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvLyBPbmUgb3IgbW9yZSBkZXBlbmRlbmNpZXMgd2VyZSBub3QgbWV0LiBUaGUgc3RhdHVzIHdhcwotICAgICAgICAgICAgLy8gYWxyZWFkeSBtYXJrZWQgb24gdGhlIGNvbW1pdCBzbyB3ZSBoYXZlIG5vdGhpbmcgZnVydGhlcgotICAgICAgICAgICAgLy8gdG8gcGVyZm9ybSBhdCB0aGlzIHRpbWUuCi0gICAgICAgICAgICAvLwotICAgICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG1lcmdlICIgKyBuLm5hbWUoKSwgZSk7Ci0gICAgICB9Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSBib29sZWFuIGhhc0RlcGVuZGVuY2llc01ldChmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4pCi0gICAgICB0aHJvd3MgSU9FeGNlcHRpb24gewotICAgIC8vIE9kZGx5IHdlIGNhbiBkZXRlcm1pbmUgdGhpcyBieSBydW5uaW5nIHRoZSBtZXJnZSBzb3J0ZXIgYW5kCi0gICAgLy8gbG9vayBmb3IgdGhlIG9uZSBjb21taXQgdG8gY29tZSBvdXQgYXMgYSByZXN1bHQuIFRoaXMgd29ya3MKLSAgICAvLyBhcyB0aGUgbWVyZ2Ugc29ydGVyIGNoZWNrcyB0aGUgZGVwZW5kZW5jeSBjaGFpbiBhcyBwYXJ0IG9mCi0gICAgLy8gaXRzIGxvZ2ljIHRyeWluZyB0byBmaW5kIGEgbWluaW1hbCBtZXJnZSBwYXRoLgotICAgIC8vCi0gICAgcmV0dXJuIG5ldyBNZXJnZVNvcnRlcihydywgYWxyZWFkeUFjY2VwdGVkLCBDQU5fTUVSR0UpLnNvcnQoCi0gICAgICAgIENvbGxlY3Rpb25zLnNpbmdsZXRvbihuKSkuY29udGFpbnMobik7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgd3JpdGVDaGVycnlQaWNrQ29tbWl0KGZpbmFsIE1lcmdlciBtLCBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4pCi0gICAgICB0aHJvd3MgSU9FeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7Ci0gICAgcncucGFyc2VCb2R5KG4pOwotCi0gICAgZmluYWwgTGlzdDxGb290ZXJMaW5lPiBmb290ZXJzID0gbi5nZXRGb290ZXJMaW5lcygpOwotICAgIGZpbmFsIFN0cmluZ0J1aWxkZXIgbXNnYnVmID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICBtc2didWYuYXBwZW5kKG4uZ2V0RnVsbE1lc3NhZ2UoKSk7Ci0KLSAgICBpZiAobXNnYnVmLmxlbmd0aCgpID09IDApIHsKLSAgICAgIC8vIFdURiwgYW4gZW1wdHkgY29tbWl0IG1lc3NhZ2U/Ci0gICAgICBtc2didWYuYXBwZW5kKCI8bm8gY29tbWl0IG1lc3NhZ2UgcHJvdmlkZWQ+Iik7Ci0gICAgfQotICAgIGlmIChtc2didWYuY2hhckF0KG1zZ2J1Zi5sZW5ndGgoKSAtIDEpICE9ICdcbicpIHsKLSAgICAgIC8vIE1pc3NpbmcgYSB0cmFpbGluZyBMRj8gQ29ycmVjdCBpdCAocGVyaGFwcyB0aGUgZWRpdG9yIHdhcyBicm9rZW4pLgotICAgICAgbXNnYnVmLmFwcGVuZCgnXG4nKTsKLSAgICB9Ci0gICAgaWYgKGZvb3RlcnMuaXNFbXB0eSgpKSB7Ci0gICAgICAvLyBEb2Vzbid0IGVuZCBpbiBhICJTaWduZWQtb2ZmLWJ5OiAuLi4iIHN0eWxlIGxpbmU/IEFkZCBhbm90aGVyIGxpbmUKLSAgICAgIC8vIGJyZWFrIHRvIHN0YXJ0IGEgbmV3IHBhcmFncmFwaCBmb3IgdGhlIHJldmlld2VkLWJ5IHRhZyBsaW5lcy4KLSAgICAgIC8vCi0gICAgICBtc2didWYuYXBwZW5kKCdcbicpOwotICAgIH0KLQotICAgIGlmICghY29udGFpbnMoZm9vdGVycywgQ0hBTkdFX0lELCBuLmNoYW5nZS5nZXRLZXkoKS5nZXQoKSkpIHsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoQ0hBTkdFX0lELmdldE5hbWUoKSk7Ci0gICAgICBtc2didWYuYXBwZW5kKCI6ICIpOwotICAgICAgbXNnYnVmLmFwcGVuZChuLmNoYW5nZS5nZXRLZXkoKS5nZXQoKSk7Ci0gICAgICBtc2didWYuYXBwZW5kKCdcbicpOwotICAgIH0KLQotICAgIGZpbmFsIFN0cmluZyBzaXRlVXJsID0gdXJsUHJvdmlkZXIuZ2V0KCk7Ci0gICAgaWYgKHNpdGVVcmwgIT0gbnVsbCkgewotICAgICAgZmluYWwgU3RyaW5nIHVybCA9IHNpdGVVcmwgKyBuLnBhdGNoc2V0SWQuZ2V0UGFyZW50S2V5KCkuZ2V0KCk7Ci0gICAgICBpZiAoIWNvbnRhaW5zKGZvb3RlcnMsIFJFVklFV0VEX09OLCB1cmwpKSB7Ci0gICAgICAgIG1zZ2J1Zi5hcHBlbmQoUkVWSUVXRURfT04uZ2V0TmFtZSgpKTsKLSAgICAgICAgbXNnYnVmLmFwcGVuZCgiOiAiKTsKLSAgICAgICAgbXNnYnVmLmFwcGVuZCh1cmwpOwotICAgICAgICBtc2didWYuYXBwZW5kKCdcbicpOwotICAgICAgfQotICAgIH0KLQotICAgIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0QXVkaXQgPSBudWxsOwotICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxMaXN0ID0gbnVsbDsKLSAgICB0cnkgewotICAgICAgYXBwcm92YWxMaXN0ID0KLSAgICAgICAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmJ5UGF0Y2hTZXQobi5wYXRjaHNldElkKS50b0xpc3QoKTsKLSAgICAgIENvbGxlY3Rpb25zLnNvcnQoYXBwcm92YWxMaXN0LCBuZXcgQ29tcGFyYXRvcjxQYXRjaFNldEFwcHJvdmFsPigpIHsKLSAgICAgICAgcHVibGljIGludCBjb21wYXJlKGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgYSwgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBiKSB7Ci0gICAgICAgICAgcmV0dXJuIGEuZ2V0R3JhbnRlZCgpLmNvbXBhcmVUbyhiLmdldEdyYW50ZWQoKSk7Ci0gICAgICAgIH0KLSAgICAgIH0pOwotCi0gICAgICBmb3IgKGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgYSA6IGFwcHJvdmFsTGlzdCkgewotICAgICAgICBpZiAoYS5nZXRWYWx1ZSgpIDw9IDApIHsKLSAgICAgICAgICAvLyBOZWdhdGl2ZSB2b3RlcyBhcmVuJ3QgY291bnRlZC4KLSAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChBcHByb3ZhbENhdGVnb3J5LlNVQk1JVC5lcXVhbHMoYS5nZXRDYXRlZ29yeUlkKCkpKSB7Ci0gICAgICAgICAgLy8gU3VibWl0IGlzIHRyZWF0ZWQgc3BlY2lhbGx5LCBiZWxvdyAoYmVjb21lcyBjb21taXR0ZXIpCi0gICAgICAgICAgLy8KLSAgICAgICAgICBpZiAoc3VibWl0QXVkaXQgPT0gbnVsbAotICAgICAgICAgICAgICB8fCBhLmdldEdyYW50ZWQoKS5jb21wYXJlVG8oc3VibWl0QXVkaXQuZ2V0R3JhbnRlZCgpKSA+IDApIHsKLSAgICAgICAgICAgIHN1Ym1pdEF1ZGl0ID0gYTsKLSAgICAgICAgICB9Ci0gICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLQotICAgICAgICBmaW5hbCBBY2NvdW50IGFjYyA9Ci0gICAgICAgICAgICBpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGEuZ2V0QWNjb3VudElkKCkpLmdldEFjY291bnQoKTsKLSAgICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciBpZGVudGJ1ZiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgICAgIGlmIChhY2MuZ2V0RnVsbE5hbWUoKSAhPSBudWxsICYmIGFjYy5nZXRGdWxsTmFtZSgpLmxlbmd0aCgpID4gMCkgewotICAgICAgICAgIGlmIChpZGVudGJ1Zi5sZW5ndGgoKSA+IDApIHsKLSAgICAgICAgICAgIGlkZW50YnVmLmFwcGVuZCgnICcpOwotICAgICAgICAgIH0KLSAgICAgICAgICBpZGVudGJ1Zi5hcHBlbmQoYWNjLmdldEZ1bGxOYW1lKCkpOwotICAgICAgICB9Ci0gICAgICAgIGlmIChhY2MuZ2V0UHJlZmVycmVkRW1haWwoKSAhPSBudWxsCi0gICAgICAgICAgICAmJiBhY2MuZ2V0UHJlZmVycmVkRW1haWwoKS5sZW5ndGgoKSA+IDApIHsKLSAgICAgICAgICBpZiAoaXNTaWduZWRPZmZCeShmb290ZXJzLCBhY2MuZ2V0UHJlZmVycmVkRW1haWwoKSkpIHsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgIH0KLSAgICAgICAgICBpZiAoaWRlbnRidWYubGVuZ3RoKCkgPiAwKSB7Ci0gICAgICAgICAgICBpZGVudGJ1Zi5hcHBlbmQoJyAnKTsKLSAgICAgICAgICB9Ci0gICAgICAgICAgaWRlbnRidWYuYXBwZW5kKCc8Jyk7Ci0gICAgICAgICAgaWRlbnRidWYuYXBwZW5kKGFjYy5nZXRQcmVmZXJyZWRFbWFpbCgpKTsKLSAgICAgICAgICBpZGVudGJ1Zi5hcHBlbmQoJz4nKTsKLSAgICAgICAgfQotICAgICAgICBpZiAoaWRlbnRidWYubGVuZ3RoKCkgPT0gMCkgewotICAgICAgICAgIC8vIE5vdGhpbmcgcmVhc29uYWJsZSB0byBkZXNjcmliZSB0aGVtIGJ5PyBJZ25vcmUgdGhlbS4KLSAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIFN0cmluZyB0YWc7Ci0gICAgICAgIGlmIChDUlZXLmVxdWFscyhhLmdldENhdGVnb3J5SWQoKSkpIHsKLSAgICAgICAgICB0YWcgPSAiUmV2aWV3ZWQtYnkiOwotICAgICAgICB9IGVsc2UgaWYgKFZSSUYuZXF1YWxzKGEuZ2V0Q2F0ZWdvcnlJZCgpKSkgewotICAgICAgICAgIHRhZyA9ICJUZXN0ZWQtYnkiOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgIGZpbmFsIEFwcHJvdmFsVHlwZSBhdCA9Ci0gICAgICAgICAgICAgIGFwcHJvdmFsVHlwZXMuYnlJZChhLmdldENhdGVnb3J5SWQoKSk7Ci0gICAgICAgICAgaWYgKGF0ID09IG51bGwpIHsKLSAgICAgICAgICAgIC8vIEEgZGVwcmVjYXRlZC9kZWxldGVkIGFwcHJvdmFsIHR5cGUsIGlnbm9yZSBpdC4KLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgIH0KLSAgICAgICAgICB0YWcgPSBhdC5nZXRDYXRlZ29yeSgpLmdldE5hbWUoKS5yZXBsYWNlKCcgJywgJy0nKTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmICghY29udGFpbnMoZm9vdGVycywgbmV3IEZvb3RlcktleSh0YWcpLCBpZGVudGJ1Zi50b1N0cmluZygpKSkgewotICAgICAgICAgIG1zZ2J1Zi5hcHBlbmQodGFnKTsKLSAgICAgICAgICBtc2didWYuYXBwZW5kKCI6ICIpOwotICAgICAgICAgIG1zZ2J1Zi5hcHBlbmQoaWRlbnRidWYpOwotICAgICAgICAgIG1zZ2J1Zi5hcHBlbmQoJ1xuJyk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgewotICAgICAgbG9nLmVycm9yKCJDYW4ndCByZWFkIGFwcHJvdmFsIHJlY29yZHMgZm9yICIgKyBuLnBhdGNoc2V0SWQsIGUpOwotICAgIH0KLQotICAgIGZpbmFsIENvbW1pdEJ1aWxkZXIgbWVyZ2VDb21taXQgPSBuZXcgQ29tbWl0QnVpbGRlcigpOwotICAgIG1lcmdlQ29tbWl0LnNldFRyZWVJZChtLmdldFJlc3VsdFRyZWVJZCgpKTsKLSAgICBtZXJnZUNvbW1pdC5zZXRQYXJlbnRJZChtZXJnZVRpcCk7Ci0gICAgbWVyZ2VDb21taXQuc2V0QXV0aG9yKG4uZ2V0QXV0aG9ySWRlbnQoKSk7Ci0gICAgbWVyZ2VDb21taXQuc2V0Q29tbWl0dGVyKHRvQ29tbWl0dGVySWRlbnQoc3VibWl0QXVkaXQpKTsKLSAgICBtZXJnZUNvbW1pdC5zZXRNZXNzYWdlKG1zZ2J1Zi50b1N0cmluZygpKTsKLQotICAgIGZpbmFsIE9iamVjdElkIGlkID0gY29tbWl0KG1lcmdlQ29tbWl0KTsKLSAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG5ld0NvbW1pdCA9IChDb2RlUmV2aWV3Q29tbWl0KSBydy5wYXJzZUNvbW1pdChpZCk7Ci0KLSAgICBpZiAoc3VibWl0QXVkaXQgIT0gbnVsbCkgewotICAgICAgZmluYWwgQ2hhbmdlIG9sZENoYW5nZSA9IG4uY2hhbmdlOwotCi0gICAgICBuLmNoYW5nZSA9Ci0gICAgICAgICAgZGIuY2hhbmdlcygpLmF0b21pY1VwZGF0ZShuLmNoYW5nZS5nZXRJZCgpLAotICAgICAgICAgICAgICBuZXcgQXRvbWljVXBkYXRlPENoYW5nZT4oKSB7Ci0gICAgICAgICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgICAgICAgcHVibGljIENoYW5nZSB1cGRhdGUoQ2hhbmdlIGNoYW5nZSkgewotICAgICAgICAgICAgICAgICAgY2hhbmdlLm5leHRQYXRjaFNldElkKCk7Ci0gICAgICAgICAgICAgICAgICByZXR1cm4gY2hhbmdlOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgfSk7Ci0KLSAgICAgIGZpbmFsIFBhdGNoU2V0IHBzID0gbmV3IFBhdGNoU2V0KG4uY2hhbmdlLmN1cnJQYXRjaFNldElkKCkpOwotICAgICAgcHMuc2V0Q3JlYXRlZE9uKG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpKTsKLSAgICAgIHBzLnNldFVwbG9hZGVyKHN1Ym1pdEF1ZGl0LmdldEFjY291bnRJZCgpKTsKLSAgICAgIHBzLnNldFJldmlzaW9uKG5ldyBSZXZJZChpZC5nZXROYW1lKCkpKTsKLSAgICAgIGluc2VydEFuY2VzdG9ycyhwcy5nZXRJZCgpLCBuZXdDb21taXQpOwotICAgICAgZGIucGF0Y2hTZXRzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihwcykpOwotCi0gICAgICBuLmNoYW5nZSA9Ci0gICAgICAgICAgZGIuY2hhbmdlcygpLmF0b21pY1VwZGF0ZShuLmNoYW5nZS5nZXRJZCgpLAotICAgICAgICAgICAgICBuZXcgQXRvbWljVXBkYXRlPENoYW5nZT4oKSB7Ci0gICAgICAgICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgICAgICAgcHVibGljIENoYW5nZSB1cGRhdGUoQ2hhbmdlIGNoYW5nZSkgewotICAgICAgICAgICAgICAgICAgY2hhbmdlLnNldEN1cnJlbnRQYXRjaFNldChwYXRjaFNldEluZm9GYWN0b3J5LmdldChuZXdDb21taXQsCi0gICAgICAgICAgICAgICAgICAgICAgcHMuZ2V0SWQoKSkpOwotICAgICAgICAgICAgICAgICAgcmV0dXJuIGNoYW5nZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIH0pOwotCi0gICAgICB0aGlzLnN1Ym1pdHRlZC5yZW1vdmUob2xkQ2hhbmdlKTsKLSAgICAgIHRoaXMuc3VibWl0dGVkLmFkZChuLmNoYW5nZSk7Ci0KLSAgICAgIGlmIChhcHByb3ZhbExpc3QgIT0gbnVsbCkgewotICAgICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgYSA6IGFwcHJvdmFsTGlzdCkgewotICAgICAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuaW5zZXJ0KAotICAgICAgICAgICAgICBDb2xsZWN0aW9ucy5zaW5nbGV0b24obmV3IFBhdGNoU2V0QXBwcm92YWwocHMuZ2V0SWQoKSwgYSkpKTsKLSAgICAgICAgfQotICAgICAgfQotCi0gICAgICBmaW5hbCBSZWZVcGRhdGUgcnUgPSByZXBvLnVwZGF0ZVJlZihwcy5nZXRSZWZOYW1lKCkpOwotICAgICAgcnUuc2V0RXhwZWN0ZWRPbGRPYmplY3RJZChPYmplY3RJZC56ZXJvSWQoKSk7Ci0gICAgICBydS5zZXROZXdPYmplY3RJZChuZXdDb21taXQpOwotICAgICAgcnUuZGlzYWJsZVJlZkxvZygpOwotICAgICAgaWYgKHJ1LnVwZGF0ZShydykgIT0gUmVmVXBkYXRlLlJlc3VsdC5ORVcpIHsKLSAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCi0gICAgICAgICAgICAiRmFpbGVkIHRvIGNyZWF0ZSByZWYgJXMgaW4gJXM6ICVzIiwgcHMuZ2V0UmVmTmFtZSgpLCBuLmNoYW5nZQotICAgICAgICAgICAgICAgIC5nZXREZXN0KCkuZ2V0UGFyZW50S2V5KCkuZ2V0KCksIHJ1LmdldFJlc3VsdCgpKSk7Ci0gICAgICB9Ci0gICAgICByZXBsaWNhdGlvbi5maXJlKG4uY2hhbmdlLmdldFByb2plY3QoKSwgcnUuZ2V0TmFtZSgpKTsKLSAgICB9Ci0KLSAgICBuZXdDb21taXQuY29weUZyb20obik7Ci0gICAgbmV3Q29tbWl0LnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9QSUNLOwotICAgIGNvbW1pdHMucHV0KG5ld0NvbW1pdC5wYXRjaHNldElkLmdldFBhcmVudEtleSgpLCBuZXdDb21taXQpOwotICAgIG1lcmdlVGlwID0gbmV3Q29tbWl0OwotICAgIHNldFJlZkxvZ0lkZW50KHN1Ym1pdEF1ZGl0KTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBpbnNlcnRBbmNlc3RvcnMoUGF0Y2hTZXQuSWQgaWQsIFJldkNvbW1pdCBzcmMpCi0gICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBpbnQgY250ID0gc3JjLmdldFBhcmVudENvdW50KCk7Ci0gICAgTGlzdDxQYXRjaFNldEFuY2VzdG9yPiB0b0luc2VydCA9IG5ldyBBcnJheUxpc3Q8UGF0Y2hTZXRBbmNlc3Rvcj4oY250KTsKLSAgICBmb3IgKGludCBwID0gMDsgcCA8IGNudDsgcCsrKSB7Ci0gICAgICBQYXRjaFNldEFuY2VzdG9yIGE7Ci0KLSAgICAgIGEgPSBuZXcgUGF0Y2hTZXRBbmNlc3RvcihuZXcgUGF0Y2hTZXRBbmNlc3Rvci5JZChpZCwgcCArIDEpKTsKLSAgICAgIGEuc2V0QW5jZXN0b3JSZXZpc2lvbihuZXcgUmV2SWQoc3JjLmdldFBhcmVudChwKS5nZXRJZCgpLm5hbWUoKSkpOwotICAgICAgdG9JbnNlcnQuYWRkKGEpOwotICAgIH0KLSAgICBkYi5wYXRjaFNldEFuY2VzdG9ycygpLmluc2VydCh0b0luc2VydCk7Ci0gIH0KLQotICBwcml2YXRlIE9iamVjdElkIGNvbW1pdChDb21taXRCdWlsZGVyIG1lcmdlQ29tbWl0KQotICAgICAgdGhyb3dzIElPRXhjZXB0aW9uLCBVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHsKLSAgICBPYmplY3RJZCBpZCA9IGluc2VydGVyLmluc2VydChtZXJnZUNvbW1pdCk7Ci0gICAgaW5zZXJ0ZXIuZmx1c2goKTsKLSAgICByZXR1cm4gaWQ7Ci0gIH0KLQotICBwcml2YXRlIGJvb2xlYW4gY29udGFpbnMoTGlzdDxGb290ZXJMaW5lPiBmb290ZXJzLCBGb290ZXJLZXkga2V5LCBTdHJpbmcgdmFsKSB7Ci0gICAgZm9yIChmaW5hbCBGb290ZXJMaW5lIGxpbmUgOiBmb290ZXJzKSB7Ci0gICAgICBpZiAobGluZS5tYXRjaGVzKGtleSkgJiYgdmFsLmVxdWFscyhsaW5lLmdldFZhbHVlKCkpKSB7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci0gIH0KLQotICBwcml2YXRlIGJvb2xlYW4gaXNTaWduZWRPZmZCeShMaXN0PEZvb3RlckxpbmU+IGZvb3RlcnMsIFN0cmluZyBlbWFpbCkgewotICAgIGZvciAoZmluYWwgRm9vdGVyTGluZSBsaW5lIDogZm9vdGVycykgewotICAgICAgaWYgKGxpbmUubWF0Y2hlcyhGb290ZXJLZXkuU0lHTkVEX09GRl9CWSkKLSAgICAgICAgICAmJiBlbWFpbC5lcXVhbHMobGluZS5nZXRFbWFpbEFkZHJlc3MoKSkpIHsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLSAgfQotCi0gIHByaXZhdGUgUGVyc29uSWRlbnQgdG9Db21taXR0ZXJJZGVudChmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGF1ZGl0KSB7Ci0gICAgaWYgKGF1ZGl0ICE9IG51bGwpIHsKLSAgICAgIHJldHVybiBpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGF1ZGl0LmdldEFjY291bnRJZCgpKQotICAgICAgICAgIC5uZXdDb21taXR0ZXJJZGVudChhdWRpdC5nZXRHcmFudGVkKCksIG15SWRlbnQuZ2V0VGltZVpvbmUoKSk7Ci0gICAgfQotICAgIHJldHVybiBteUlkZW50OwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHVwZGF0ZUJyYW5jaCgpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CiAgICAgaWYgKG1lcmdlVGlwICE9IG51bGwgJiYgKGJyYW5jaFRpcCA9PSBudWxsIHx8IGJyYW5jaFRpcCAhPSBtZXJnZVRpcCkpIHsKICAgICAgIGlmIChHaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZfQ09ORklHLmVxdWFscyhicmFuY2hVcGRhdGUuZ2V0TmFtZSgpKSkgewogICAgICAgICB0cnkgewotICAgICAgICAgIFByb2plY3RDb25maWcgY2ZnID0gbmV3IFByb2plY3RDb25maWcoZGVzdFByb2plY3QuZ2V0TmFtZUtleSgpKTsKKyAgICAgICAgICBQcm9qZWN0Q29uZmlnIGNmZyA9CisgICAgICAgICAgICAgIG5ldyBQcm9qZWN0Q29uZmlnKGRlc3RQcm9qZWN0LmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpOwogICAgICAgICAgIGNmZy5sb2FkKHJlcG8sIG1lcmdlVGlwKTsKICAgICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKICAgICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIlN1Ym1pdCB3b3VsZCBzdG9yZSBpbnZhbGlkIgogICAgICAgICAgICAgICArICIgcHJvamVjdCBjb25maWd1cmF0aW9uICIgKyBtZXJnZVRpcC5uYW1lKCkgKyAiIGZvciAiCi0gICAgICAgICAgICAgICsgZGVzdFByb2plY3QuZ2V0TmFtZSgpLCBlKTsKKyAgICAgICAgICAgICAgKyBkZXN0UHJvamVjdC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlKTsKICAgICAgICAgfQogICAgICAgfQogCisgICAgICBicmFuY2hVcGRhdGUuc2V0UmVmTG9nSWRlbnQocmVmTG9nSWRlbnQpOwogICAgICAgYnJhbmNoVXBkYXRlLnNldEZvcmNlVXBkYXRlKGZhbHNlKTsKICAgICAgIGJyYW5jaFVwZGF0ZS5zZXROZXdPYmplY3RJZChtZXJnZVRpcCk7CiAgICAgICBicmFuY2hVcGRhdGUuc2V0UmVmTG9nTWVzc2FnZSgibWVyZ2VkIiwgdHJ1ZSk7CkBAIC0xMTIxLDEzICs2NzQsMTQgQEAKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKEdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRl9DT05GSUcuZXF1YWxzKGJyYW5jaFVwZGF0ZS5nZXROYW1lKCkpKSB7Ci0gICAgICAgICAgICAgIHByb2plY3RDYWNoZS5ldmljdChkZXN0UHJvamVjdCk7Ci0gICAgICAgICAgICAgIFByb2plY3RTdGF0ZSBwcyA9IHByb2plY3RDYWNoZS5nZXQoZGVzdFByb2plY3QuZ2V0TmFtZUtleSgpKTsKLSAgICAgICAgICAgICAgcmVwb01hbmFnZXIuc2V0UHJvamVjdERlc2NyaXB0aW9uKGRlc3RQcm9qZWN0LmdldE5hbWVLZXkoKSwgLy8KLSAgICAgICAgICAgICAgICAgIHBzLmdldFByb2plY3QoKS5nZXREZXNjcmlwdGlvbigpKTsKKyAgICAgICAgICAgICAgcHJvamVjdENhY2hlLmV2aWN0KGRlc3RQcm9qZWN0LmdldFByb2plY3QoKSk7CisgICAgICAgICAgICAgIGRlc3RQcm9qZWN0ID0gcHJvamVjdENhY2hlLmdldChkZXN0UHJvamVjdC5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpKTsKKyAgICAgICAgICAgICAgcmVwb01hbmFnZXIuc2V0UHJvamVjdERlc2NyaXB0aW9uKAorICAgICAgICAgICAgICAgICAgZGVzdFByb2plY3QuZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSwKKyAgICAgICAgICAgICAgICAgIGRlc3RQcm9qZWN0LmdldFByb2plY3QoKS5nZXREZXNjcmlwdGlvbigpKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgcmVwbGljYXRpb24uZmlyZShkZXN0QnJhbmNoLmdldFBhcmVudEtleSgpLCBicmFuY2hVcGRhdGUuZ2V0TmFtZSgpKTsKKyAgICAgICAgICAgIGdpdFJlZlVwZGF0ZWQuZmlyZShkZXN0QnJhbmNoLmdldFBhcmVudEtleSgpLCBicmFuY2hVcGRhdGUpOwogCiAgICAgICAgICAgICBBY2NvdW50IGFjY291bnQgPSBudWxsOwogICAgICAgICAgICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXR0ZXIgPSBnZXRTdWJtaXR0ZXIoZGIsIG1lcmdlVGlwLnBhdGNoc2V0SWQpOwpAQCAtMTEzNyw2ICs2OTEsMTYgQEAKICAgICAgICAgICAgIGhvb2tzLmRvUmVmVXBkYXRlZEhvb2soZGVzdEJyYW5jaCwgYnJhbmNoVXBkYXRlLCBhY2NvdW50KTsKICAgICAgICAgICAgIGJyZWFrOwogCisgICAgICAgICAgY2FzZSBMT0NLX0ZBSUxVUkU6CisgICAgICAgICAgICBTdHJpbmcgbXNnOworICAgICAgICAgICAgaWYgKHN0cmF0ZWd5LnJldHJ5T25Mb2NrRmFpbHVyZSgpKSB7CisgICAgICAgICAgICAgIG1lcmdlUXVldWUucmVjaGVja0FmdGVyKGRlc3RCcmFuY2gsIExPQ0tfRkFJTFVSRV9SRVRSWV9ERUxBWSwKKyAgICAgICAgICAgICAgICAgIE1JTExJU0VDT05EUyk7CisgICAgICAgICAgICAgIG1zZyA9ICJ3aWxsIHJldHJ5IjsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgIG1zZyA9ICJ3aWxsIG5vdCByZXRyeSI7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oYnJhbmNoVXBkYXRlLmdldFJlc3VsdCgpLm5hbWUoKSArICIsICIgKyBtc2cpOwogICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oYnJhbmNoVXBkYXRlLmdldFJlc3VsdCgpLm5hbWUoKSk7CiAgICAgICAgIH0KQEAgLTExNDYsMjMgKzcxMCw3IEBACiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSBib29sZWFuIGlzTWVyZ2VhYmxlKENoYW5nZSBjKSB7Ci0gICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBjb21taXQgPSBjb21taXRzLmdldChjLmdldElkKCkpOwotICAgIGZpbmFsIENvbW1pdE1lcmdlU3RhdHVzIHMgPSBjb21taXQgIT0gbnVsbCA/IGNvbW1pdC5zdGF0dXNDb2RlIDogbnVsbDsKLSAgICBib29sZWFuIGlzTWVyZ2VhYmxlID0gZmFsc2U7Ci0gICAgaWYgKHMgIT0gbnVsbAotICAgICAgICAmJiAocy5lcXVhbHMoQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0UpCi0gICAgICAgICAgICB8fCBzLmVxdWFscyhDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9QSUNLKSB8fCBzCi0gICAgICAgICAgICAuZXF1YWxzKENvbW1pdE1lcmdlU3RhdHVzLkFMUkVBRFlfTUVSR0VEKSkpIHsKLSAgICAgIGlzTWVyZ2VhYmxlID0gdHJ1ZTsKLSAgICB9Ci0KLSAgICByZXR1cm4gaXNNZXJnZWFibGU7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgdXBkYXRlQ2hhbmdlU3RhdHVzKCkgewotICAgIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gbWVyZ2VkID0gbmV3IEFycmF5TGlzdDxDb2RlUmV2aWV3Q29tbWl0PigpOwotCisgIHByaXZhdGUgdm9pZCB1cGRhdGVDaGFuZ2VTdGF0dXMoZmluYWwgTGlzdDxDaGFuZ2U+IHN1Ym1pdHRlZCkgewogICAgIGZvciAoZmluYWwgQ2hhbmdlIGMgOiBzdWJtaXR0ZWQpIHsKICAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgY29tbWl0ID0gY29tbWl0cy5nZXQoYy5nZXRJZCgpKTsKICAgICAgIGZpbmFsIENvbW1pdE1lcmdlU3RhdHVzIHMgPSBjb21taXQgIT0gbnVsbCA/IGNvbW1pdC5zdGF0dXNDb2RlIDogbnVsbDsKQEAgLTExNzUsNjYgKzcyMyw1MSBAQAogCiAgICAgICBmaW5hbCBTdHJpbmcgdHh0ID0gcy5nZXRNZXNzYWdlKCk7CiAKLSAgICAgIHN3aXRjaCAocykgewotICAgICAgICBjYXNlIENMRUFOX01FUkdFOiB7Ci0gICAgICAgICAgc2V0TWVyZ2VkKGMsIG1lc3NhZ2UoYywgdHh0KSk7Ci0gICAgICAgICAgbWVyZ2VkLmFkZChjb21taXQpOwotICAgICAgICAgIGJyZWFrOworICAgICAgdHJ5IHsKKyAgICAgICAgc3dpdGNoIChzKSB7CisgICAgICAgICAgY2FzZSBDTEVBTl9NRVJHRToKKyAgICAgICAgICAgIHNldE1lcmdlZChjLCBtZXNzYWdlKGMsIHR4dCkpOworICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICBjYXNlIENMRUFOX1JFQkFTRToKKyAgICAgICAgICBjYXNlIENMRUFOX1BJQ0s6CisgICAgICAgICAgICBzZXRNZXJnZWQoYywgbWVzc2FnZShjLCB0eHQgKyAiIGFzICIgKyBjb21taXQubmFtZSgpKSk7CisgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgIGNhc2UgQUxSRUFEWV9NRVJHRUQ6CisgICAgICAgICAgICBzZXRNZXJnZWQoYywgbnVsbCk7CisgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgIGNhc2UgUEFUSF9DT05GTElDVDoKKyAgICAgICAgICBjYXNlIE1BTlVBTF9SRUNVUlNJVkVfTUVSR0U6CisgICAgICAgICAgY2FzZSBDQU5OT1RfQ0hFUlJZX1BJQ0tfUk9PVDoKKyAgICAgICAgICBjYXNlIE5PVF9GQVNUX0ZPUldBUkQ6CisgICAgICAgICAgY2FzZSBJTlZBTElEX1BST0pFQ1RfQ09ORklHVVJBVElPTjoKKyAgICAgICAgICBjYXNlIElOVkFMSURfUFJPSkVDVF9DT05GSUdVUkFUSU9OX1BBUkVOVF9QUk9KRUNUX05PVF9GT1VORDoKKyAgICAgICAgICBjYXNlIElOVkFMSURfUFJPSkVDVF9DT05GSUdVUkFUSU9OX1JPT1RfUFJPSkVDVF9DQU5OT1RfSEFWRV9QQVJFTlQ6CisgICAgICAgICAgY2FzZSBTRVRUSU5HX1BBUkVOVF9QUk9KRUNUX09OTFlfQUxMT1dFRF9CWV9BRE1JTjoKKyAgICAgICAgICAgIHNldE5ldyhjLCBtZXNzYWdlKGMsIHR4dCkpOworICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICBjYXNlIE1JU1NJTkdfREVQRU5ERU5DWToKKyAgICAgICAgICAgIHBvdGVudGlhbGx5U3RpbGxTdWJtaXR0YWJsZS5hZGQoY29tbWl0KTsKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHNldE5ldyhjLCBtZXNzYWdlKGMsICJVbnNwZWNpZmllZCBtZXJnZSBmYWlsdXJlOiAiICsgcy5uYW1lKCkpKTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0KLSAgICAgICAgY2FzZSBDTEVBTl9QSUNLOiB7Ci0gICAgICAgICAgc2V0TWVyZ2VkKGMsIG1lc3NhZ2UoYywgdHh0ICsgIiBhcyAiICsgY29tbWl0Lm5hbWUoKSkpOwotICAgICAgICAgIG1lcmdlZC5hZGQoY29tbWl0KTsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotCi0gICAgICAgIGNhc2UgQUxSRUFEWV9NRVJHRUQ6Ci0gICAgICAgICAgc2V0TWVyZ2VkKGMsIG51bGwpOwotICAgICAgICAgIG1lcmdlZC5hZGQoY29tbWl0KTsKLSAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIFBBVEhfQ09ORkxJQ1Q6Ci0gICAgICAgIGNhc2UgQ1JJU1NfQ1JPU1NfTUVSR0U6Ci0gICAgICAgIGNhc2UgQ0FOTk9UX0NIRVJSWV9QSUNLX1JPT1Q6Ci0gICAgICAgIGNhc2UgTk9UX0ZBU1RfRk9SV0FSRDoKLSAgICAgICAgY2FzZSBJTlZBTElEX1BST0pFQ1RfQ09ORklHVVJBVElPTjoKLSAgICAgICAgY2FzZSBJTlZBTElEX1BST0pFQ1RfQ09ORklHVVJBVElPTl9QQVJFTlRfUFJPSkVDVF9OT1RfRk9VTkQ6Ci0gICAgICAgIGNhc2UgSU5WQUxJRF9QUk9KRUNUX0NPTkZJR1VSQVRJT05fUk9PVF9QUk9KRUNUX0NBTk5PVF9IQVZFX1BBUkVOVDoKLSAgICAgICAgY2FzZSBTRVRUSU5HX1BBUkVOVF9QUk9KRUNUX09OTFlfQUxMT1dFRF9CWV9BRE1JTjogewotICAgICAgICAgIHNldE5ldyhjLCBtZXNzYWdlKGMsIHR4dCkpOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0KLSAgICAgICAgY2FzZSBNSVNTSU5HX0RFUEVOREVOQ1k6IHsKLSAgICAgICAgICBmaW5hbCBDYXBhYmxlIGNhcGFibGUgPSBpc1N1Ym1pdFN0aWxsUG9zc2libGUoY29tbWl0KTsKLSAgICAgICAgICBpZiAoY2FwYWJsZSAhPSBDYXBhYmxlLk9LKSB7Ci0gICAgICAgICAgICBzZW5kTWVyZ2VGYWlsKGMsIG1lc3NhZ2UoYywgY2FwYWJsZS5nZXRNZXNzYWdlKCkpLCBmYWxzZSk7Ci0gICAgICAgICAgfQotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0KLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICBzZXROZXcoYywgbWVzc2FnZShjLCAiVW5zcGVjaWZpZWQgbWVyZ2UgZmFpbHVyZTogIiArIHMubmFtZSgpKSk7Ci0gICAgICAgICAgYnJlYWs7CisgICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXJyKSB7CisgICAgICAgIGxvZy53YXJuKCJFcnJvciB1cGRhdGluZyBjaGFuZ2Ugc3RhdHVzIGZvciAiICsgYy5nZXRJZCgpLCBlcnIpOwogICAgICAgfQogICAgIH0KLQotICAgIENyZWF0ZUNvZGVSZXZpZXdOb3RlcyBjb2RlUmV2aWV3Tm90ZXMgPQotICAgICAgICBjb2RlUmV2aWV3Tm90ZXNGYWN0b3J5LmNyZWF0ZShkYiwgcmVwbyk7Ci0gICAgdHJ5IHsKLSAgICAgIGNvZGVSZXZpZXdOb3Rlcy5jcmVhdGUobWVyZ2VkLCBjb21wdXRlQXV0aG9yKG1lcmdlZCkpOwotICAgIH0gY2F0Y2ggKENvZGVSZXZpZXdOb3RlQ3JlYXRpb25FeGNlcHRpb24gZSkgewotICAgICAgbG9nLmVycm9yKGUuZ2V0TWVzc2FnZSgpKTsKLSAgICB9Ci0gICAgcmVwbGljYXRpb24uZmlyZShkZXN0QnJhbmNoLmdldFBhcmVudEtleSgpLAotICAgICAgICBHaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZTX05PVEVTX1JFVklFVyk7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgdXBkYXRlU3Vic2NyaXB0aW9ucygpIHsKKyAgcHJpdmF0ZSB2b2lkIHVwZGF0ZVN1YnNjcmlwdGlvbnMoZmluYWwgTGlzdDxDaGFuZ2U+IHN1Ym1pdHRlZCkgewogICAgIGlmIChtZXJnZVRpcCAhPSBudWxsICYmIChicmFuY2hUaXAgPT0gbnVsbCB8fCBicmFuY2hUaXAgIT0gbWVyZ2VUaXApKSB7CiAgICAgICBTdWJtb2R1bGVPcCBzdWJPcCA9Ci0gICAgICAgICAgc3ViT3BGYWN0b3J5LmNyZWF0ZShkZXN0QnJhbmNoLCBtZXJnZVRpcCwgcncsIHJlcG8sIGRlc3RQcm9qZWN0LAotICAgICAgICAgICAgICBzdWJtaXR0ZWQsIGNvbW1pdHMpOworICAgICAgICAgIHN1Yk9wRmFjdG9yeS5jcmVhdGUoZGVzdEJyYW5jaCwgbWVyZ2VUaXAsIHJ3LCByZXBvLAorICAgICAgICAgICAgICBkZXN0UHJvamVjdC5nZXRQcm9qZWN0KCksIHN1Ym1pdHRlZCwgY29tbWl0cyk7CiAgICAgICB0cnkgewogICAgICAgICBzdWJPcC51cGRhdGUoKTsKICAgICAgIH0gY2F0Y2ggKFN1Ym1vZHVsZUV4Y2VwdGlvbiBlKSB7CkBAIC0xMjQ4LDMyICs3ODEsNyBAQAogICBwcml2YXRlIENhcGFibGUgaXNTdWJtaXRTdGlsbFBvc3NpYmxlKGZpbmFsIENvZGVSZXZpZXdDb21taXQgY29tbWl0KSB7CiAgICAgZmluYWwgQ2FwYWJsZSBjYXBhYmxlOwogICAgIGZpbmFsIENoYW5nZSBjID0gY29tbWl0LmNoYW5nZTsKLSAgICBpZiAoY29tbWl0Lm1pc3NpbmcgPT0gbnVsbCkgewotICAgICAgY29tbWl0Lm1pc3NpbmcgPSBuZXcgQXJyYXlMaXN0PENvZGVSZXZpZXdDb21taXQ+KCk7Ci0gICAgfQotCi0gICAgYm9vbGVhbiBzdWJtaXRTdGlsbFBvc3NpYmxlID0gY29tbWl0Lm1pc3Npbmcuc2l6ZSgpID4gMDsKLSAgICBmb3IgKENvZGVSZXZpZXdDb21taXQgbWlzc2luZ0NvbW1pdCA6IGNvbW1pdC5taXNzaW5nKSB7Ci0gICAgICBsb2FkQ2hhbmdlSW5mbyhtaXNzaW5nQ29tbWl0KTsKLQotICAgICAgaWYgKG1pc3NpbmdDb21taXQucGF0Y2hzZXRJZCA9PSBudWxsKSB7Ci0gICAgICAgIC8vIFRoZSBjb21taXQgZG9lc24ndCBoYXZlIGEgcGF0Y2ggc2V0LCBzbyBpdCBjYW5ub3QgYmUKLSAgICAgICAgLy8gc3VibWl0dGVkIHRvIHRoZSBicmFuY2guCi0gICAgICAgIC8vCi0gICAgICAgIHN1Ym1pdFN0aWxsUG9zc2libGUgPSBmYWxzZTsKLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIGlmICghbWlzc2luZ0NvbW1pdC5jaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKS5lcXVhbHMoCi0gICAgICAgICAgbWlzc2luZ0NvbW1pdC5wYXRjaHNldElkKSkgewotICAgICAgICAvLyBJZiB0aGUgbWlzc2luZyBjb21taXQgaXMgbm90IHRoZSBjdXJyZW50IHBhdGNoIHNldCwKLSAgICAgICAgLy8gdGhlIGNoYW5nZSBtdXN0IGJlIHJlYmFzZWQgdG8gdXNlIHRoZSBwcm9wZXIgcGFyZW50LgotICAgICAgICAvLwotICAgICAgICBzdWJtaXRTdGlsbFBvc3NpYmxlID0gZmFsc2U7Ci0gICAgICAgIGJyZWFrOwotICAgICAgfQotICAgIH0KLQorICAgIGZpbmFsIGJvb2xlYW4gc3VibWl0U3RpbGxQb3NzaWJsZSA9IGlzU3VibWl0Rm9yTWlzc2luZ0NvbW1pdHNTdGlsbFBvc3NpYmxlKGNvbW1pdCk7CiAgICAgZmluYWwgbG9uZyBub3cgPSBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKTsKICAgICBmaW5hbCBsb25nIHdhaXRVbnRpbCA9IGMuZ2V0TGFzdFVwZGF0ZWRPbigpLmdldFRpbWUoKSArIERFUEVOREVOQ1lfREVMQVk7CiAgICAgaWYgKHN1Ym1pdFN0aWxsUG9zc2libGUgJiYgbm93IDwgd2FpdFVudGlsKSB7CkBAIC0xMjg3LDI1ICs3OTUsMjAgQEAKICAgICAgIC8vIGRlcGVuZGVuY2llcyBhcmUgYWxzbyBzdWJtaXR0ZWQuIFBlcmhhcHMgdGhlIHVzZXIganVzdAogICAgICAgLy8gZm9yZ290IHRvIHN1Ym1pdCB0aG9zZS4KICAgICAgIC8vCi0gICAgICBTdHJpbmcgdHh0ID0KLSAgICAgICAgICAiQ2hhbmdlIGNvdWxkIG5vdCBiZSBtZXJnZWQgYmVjYXVzZSBvZiBhIG1pc3NpbmcgZGVwZW5kZW5jeS4iOwotICAgICAgaWYgKCFpc0FscmVhZHlTZW50KGMsIHR4dCkpIHsKLSAgICAgICAgU3RyaW5nQnVpbGRlciBtID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgICAgbS5hcHBlbmQodHh0KTsKLSAgICAgICAgbS5hcHBlbmQoIlxuIik7CisgICAgICBTdHJpbmdCdWlsZGVyIG0gPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgICAgbS5hcHBlbmQoIkNoYW5nZSBjb3VsZCBub3QgYmUgbWVyZ2VkIGJlY2F1c2Ugb2YgYSBtaXNzaW5nIGRlcGVuZGVuY3kuIik7CisgICAgICBtLmFwcGVuZCgiXG4iKTsKIAotICAgICAgICBtLmFwcGVuZCgiXG4iKTsKKyAgICAgIG0uYXBwZW5kKCJcbiIpOwogCi0gICAgICAgIG0uYXBwZW5kKCJUaGUgZm9sbG93aW5nIGNoYW5nZXMgbXVzdCBhbHNvIGJlIHN1Ym1pdHRlZDpcbiIpOworICAgICAgbS5hcHBlbmQoIlRoZSBmb2xsb3dpbmcgY2hhbmdlcyBtdXN0IGFsc28gYmUgc3VibWl0dGVkOlxuIik7CisgICAgICBtLmFwcGVuZCgiXG4iKTsKKyAgICAgIGZvciAoQ29kZVJldmlld0NvbW1pdCBtaXNzaW5nQ29tbWl0IDogY29tbWl0Lm1pc3NpbmcpIHsKKyAgICAgICAgbS5hcHBlbmQoIiogIik7CisgICAgICAgIG0uYXBwZW5kKG1pc3NpbmdDb21taXQuY2hhbmdlLmdldEtleSgpLmdldCgpKTsKICAgICAgICAgbS5hcHBlbmQoIlxuIik7Ci0gICAgICAgIGZvciAoQ29kZVJldmlld0NvbW1pdCBtaXNzaW5nQ29tbWl0IDogY29tbWl0Lm1pc3NpbmcpIHsKLSAgICAgICAgICBtLmFwcGVuZCgiKiAiKTsKLSAgICAgICAgICBtLmFwcGVuZChtaXNzaW5nQ29tbWl0LmNoYW5nZS5nZXRLZXkoKS5nZXQoKSk7Ci0gICAgICAgICAgbS5hcHBlbmQoIlxuIik7Ci0gICAgICAgIH0KLSAgICAgICAgdHh0ID0gbS50b1N0cmluZygpOwogICAgICAgfQotICAgICAgY2FwYWJsZSA9IG5ldyBDYXBhYmxlKHR4dCk7CisgICAgICBjYXBhYmxlID0gbmV3IENhcGFibGUobS50b1N0cmluZygpKTsKICAgICB9IGVsc2UgewogICAgICAgLy8gSXQgaXMgaW1wb3NzaWJsZSB0byBzdWJtaXQgdGhpcyBjaGFuZ2UgYXMtaXMuIFRoZSBhdXRob3IKICAgICAgIC8vIG5lZWRzIHRvIHJlYmFzZSBpdCBpbiBvcmRlciB0byB3b3JrIGFyb3VuZCB0aGUgbWlzc2luZwpAQCAtMTMyMyw4ICs4MjYsMTAgQEAKICAgICAgICAgICBtLmFwcGVuZChtaXNzaW5nQ29tbWl0LnBhdGNoc2V0SWQuZ2V0KCkpOwogICAgICAgICAgIG0uYXBwZW5kKCIgb2YgIik7CiAgICAgICAgICAgbS5hcHBlbmQobWlzc2luZ0NvbW1pdC5jaGFuZ2UuZ2V0S2V5KCkuYWJicmV2aWF0ZSgpKTsKLSAgICAgICAgICBtLmFwcGVuZCgiLCBob3dldmVyIHRoZSBjdXJyZW50IHBhdGNoIHNldCBpcyAiKTsKLSAgICAgICAgICBtLmFwcGVuZChtaXNzaW5nQ29tbWl0LmNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpLmdldCgpKTsKKyAgICAgICAgICBpZiAobWlzc2luZ0NvbW1pdC5wYXRjaHNldElkLmdldCgpICE9IG1pc3NpbmdDb21taXQuY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkuZ2V0KCkpIHsKKyAgICAgICAgICAgIG0uYXBwZW5kKCIsIGhvd2V2ZXIgdGhlIGN1cnJlbnQgcGF0Y2ggc2V0IGlzICIpOworICAgICAgICAgICAgbS5hcHBlbmQobWlzc2luZ0NvbW1pdC5jaGFuZ2UuY3VycmVudFBhdGNoU2V0SWQoKS5nZXQoKSk7CisgICAgICAgICAgfQogICAgICAgICAgIG0uYXBwZW5kKCIuXG4iKTsKIAogICAgICAgICB9IGVsc2UgewpAQCAtMTM1NiwzMCArODYxLDYgQEAKICAgICB9CiAgIH0KIAotICBwcml2YXRlIGJvb2xlYW4gaXNBbHJlYWR5U2VudChmaW5hbCBDaGFuZ2UgYywgZmluYWwgU3RyaW5nIHByZWZpeCkgewotICAgIHRyeSB7Ci0gICAgICBmaW5hbCBMaXN0PENoYW5nZU1lc3NhZ2U+IG1zZ0xpc3QgPQotICAgICAgICAgIGRiLmNoYW5nZU1lc3NhZ2VzKCkuYnlDaGFuZ2UoYy5nZXRJZCgpKS50b0xpc3QoKTsKLSAgICAgIGlmIChtc2dMaXN0LnNpemUoKSA+IDApIHsKLSAgICAgICAgZmluYWwgQ2hhbmdlTWVzc2FnZSBsYXN0ID0gbXNnTGlzdC5nZXQobXNnTGlzdC5zaXplKCkgLSAxKTsKLSAgICAgICAgaWYgKGxhc3QuZ2V0QXV0aG9yKCkgPT0gbnVsbCAmJiBsYXN0LmdldE1lc3NhZ2UoKS5zdGFydHNXaXRoKHByZWZpeCkpIHsKLSAgICAgICAgICAvLyBUaGUgbGFzdCBtZXNzYWdlIHdhcyB3cml0dGVuIGJ5IHVzLCBhbmQgaXQgc2FpZCB0aGlzCi0gICAgICAgICAgLy8gc2FtZSBtZXNzYWdlIGFscmVhZHkuIEl0cyB1bmxpa2VseSBhbnl0aGluZyBoYXMgY2hhbmdlZAotICAgICAgICAgIC8vIHRoYXQgd291bGQgY2F1c2UgdXMgdG8gbmVlZCB0byByZXBlYXQgb3Vyc2VsdmVzLgotICAgICAgICAgIC8vCi0gICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICAgIH0KLQotICAgICAgLy8gVGhlIGxhc3QgbWVzc2FnZSB3YXMgbm90IHNlbnQgYnkgdXMsIG9yIGRvZXNuJ3QgbWF0Y2ggdGhlIHRleHQKLSAgICAgIC8vIHdlIGFyZSBhYm91dCB0byBzZW5kLgotICAgICAgLy8KLSAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgewotICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICB9Ci0KICAgcHJpdmF0ZSBDaGFuZ2VNZXNzYWdlIG1lc3NhZ2UoZmluYWwgQ2hhbmdlIGMsIGZpbmFsIFN0cmluZyBib2R5KSB7CiAgICAgZmluYWwgU3RyaW5nIHV1aWQ7CiAgICAgdHJ5IHsKQEAgLTEzOTQsODcgKzg3NSw4NyBAQAogICAgIHJldHVybiBtOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgUGF0Y2hTZXRBcHByb3ZhbCBnZXRTdWJtaXR0ZXIoUmV2aWV3RGIgcmV2aWV3RGIsCi0gICAgICBQYXRjaFNldC5JZCBjKSB7Ci0gICAgaWYgKGMgPT0gbnVsbCkgewotICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfQotICAgIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0dGVyID0gbnVsbDsKKyAgcHJpdmF0ZSB2b2lkIHNldE1lcmdlZChmaW5hbCBDaGFuZ2UgYywgZmluYWwgQ2hhbmdlTWVzc2FnZSBtc2cpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKICAgICB0cnkgewotICAgICAgZmluYWwgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBhcHByb3ZhbHMgPQotICAgICAgICAgIHJldmlld0RiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlQYXRjaFNldChjKS50b0xpc3QoKTsKLSAgICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXBwcm92YWxzKSB7Ci0gICAgICAgIGlmIChhLmdldFZhbHVlKCkgPiAwCi0gICAgICAgICAgICAmJiBBcHByb3ZhbENhdGVnb3J5LlNVQk1JVC5lcXVhbHMoYS5nZXRDYXRlZ29yeUlkKCkpKSB7Ci0gICAgICAgICAgaWYgKHN1Ym1pdHRlciA9PSBudWxsCi0gICAgICAgICAgICAgIHx8IGEuZ2V0R3JhbnRlZCgpLmNvbXBhcmVUbyhzdWJtaXR0ZXIuZ2V0R3JhbnRlZCgpKSA+IDApIHsKLSAgICAgICAgICAgIHN1Ym1pdHRlciA9IGE7Ci0gICAgICAgICAgfQorICAgICAgZGIuY2hhbmdlcygpLmJlZ2luVHJhbnNhY3Rpb24oYy5nZXRJZCgpKTsKKworICAgICAgLy8gV2UgbXVzdCBwdWxsIHRoZSBwYXRjaHNldCBvdXQgb2YgY29tbWl0cywgYmVjYXVzZSB0aGUgcGF0Y2hzZXQgSUQgaXMKKyAgICAgIC8vIG1vZGlmaWVkIHdoZW4gdXNpbmcgdGhlIGNoZXJyeS1waWNrIG1lcmdlIHN0cmF0ZWd5LgorICAgICAgQ29kZVJldmlld0NvbW1pdCBjb21taXQgPSBjb21taXRzLmdldChjLmdldElkKCkpOworICAgICAgUGF0Y2hTZXQuSWQgbWVyZ2VkID0gY29tbWl0LmNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpOworICAgICAgc2V0TWVyZ2VkUGF0Y2hTZXQoYy5nZXRJZCgpLCBtZXJnZWQpOworICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXR0ZXIgPSBzYXZlQXBwcm92YWxzKGMsIG1lcmdlZCk7CisgICAgICBhZGRNZXJnZWRNZXNzYWdlKHN1Ym1pdHRlciwgbXNnKTsKKworICAgICAgZGIuY29tbWl0KCk7CisKKyAgICAgIHNlbmRNZXJnZWRFbWFpbChjLCBzdWJtaXR0ZXIpOworICAgICAgaWYgKHN1Ym1pdHRlciAhPSBudWxsKSB7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgaG9va3MuZG9DaGFuZ2VNZXJnZWRIb29rKGMsCisgICAgICAgICAgICAgIGFjY291bnRDYWNoZS5nZXQoc3VibWl0dGVyLmdldEFjY291bnRJZCgpKS5nZXRBY2NvdW50KCksCisgICAgICAgICAgICAgIGRiLnBhdGNoU2V0cygpLmdldChjLmN1cnJlbnRQYXRjaFNldElkKCkpLCBkYik7CisgICAgICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBleCkgeworICAgICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHJ1biBob29rIGZvciBzdWJtaXR0ZWQgcGF0Y2ggc2V0ICIgKyBjLmdldElkKCksIGV4KTsKICAgICAgICAgfQogICAgICAgfQotICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGRiLnJvbGxiYWNrKCk7CiAgICAgfQotICAgIHJldHVybiBzdWJtaXR0ZXI7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgc2V0TWVyZ2VkKGZpbmFsIENoYW5nZSBjLCBmaW5hbCBDaGFuZ2VNZXNzYWdlIG1zZykgewotICAgIGZpbmFsIENoYW5nZS5JZCBjaGFuZ2VJZCA9IGMuZ2V0SWQoKTsKLSAgICAvLyBXZSBtdXN0IHB1bGwgdGhlIHBhdGNoc2V0IG91dCBvZiBjb21taXRzLCBiZWNhdXNlIHRoZSBwYXRjaHNldCBJRCBpcwotICAgIC8vIG1vZGlmaWVkIHdoZW4gdXNpbmcgdGhlIGNoZXJyeS1waWNrIG1lcmdlIHN0cmF0ZWd5LgotICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgY29tbWl0ID0gY29tbWl0cy5nZXQoYy5nZXRJZCgpKTsKLSAgICBmaW5hbCBQYXRjaFNldC5JZCBtZXJnZWQgPSBjb21taXQuY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCk7Ci0KLSAgICB0cnkgewotICAgICAgZGIuY2hhbmdlcygpLmF0b21pY1VwZGF0ZShjaGFuZ2VJZCwgbmV3IEF0b21pY1VwZGF0ZTxDaGFuZ2U+KCkgewotICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgcHVibGljIENoYW5nZSB1cGRhdGUoQ2hhbmdlIGMpIHsKLSAgICAgICAgICBjLnNldFN0YXR1cyhDaGFuZ2UuU3RhdHVzLk1FUkdFRCk7Ci0gICAgICAgICAgLy8gSXQgY291bGQgYmUgcG9zc2libGUgdGhhdCB0aGUgY2hhbmdlIGJlaW5nIG1lcmdlZAotICAgICAgICAgIC8vIGhhcyBuZXZlciBoYWQgaXRzIG1lcmdlYWJpbGl0eSB0ZXN0ZWQuIFNvIHdlIGluc3VyZQotICAgICAgICAgIC8vIG1lcmdlZCBjaGFuZ2VzIGhhcyBtZXJnZWFibGUgZmllbGQgdHJ1ZS4KLSAgICAgICAgICBjLnNldE1lcmdlYWJsZSh0cnVlKTsKLSAgICAgICAgICBpZiAoIW1lcmdlZC5lcXVhbHMoYy5jdXJyZW50UGF0Y2hTZXRJZCgpKSkgewotICAgICAgICAgICAgLy8gVW5jb29sOyB0aGUgcGF0Y2ggc2V0IGNoYW5nZWQgYWZ0ZXIgd2UgbWVyZ2VkIGl0LgotICAgICAgICAgICAgLy8gR28gYmFjayB0byB0aGUgcGF0Y2ggc2V0IHRoYXQgd2FzIGFjdHVhbGx5IG1lcmdlZC4KLSAgICAgICAgICAgIC8vCi0gICAgICAgICAgICB0cnkgewotICAgICAgICAgICAgICBjLnNldEN1cnJlbnRQYXRjaFNldChwYXRjaFNldEluZm9GYWN0b3J5LmdldChkYiwgbWVyZ2VkKSk7Ci0gICAgICAgICAgICB9IGNhdGNoIChQYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb24gZTEpIHsKLSAgICAgICAgICAgICAgbG9nLmVycm9yKCJDYW5ub3QgcmVhZCBtZXJnZWQgcGF0Y2ggc2V0ICIgKyBtZXJnZWQsIGUxKTsKLSAgICAgICAgICAgIH0KKyAgcHJpdmF0ZSB2b2lkIHNldE1lcmdlZFBhdGNoU2V0KENoYW5nZS5JZCBjaGFuZ2VJZCwgZmluYWwgUGF0Y2hTZXQuSWQgbWVyZ2VkKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgZGIuY2hhbmdlcygpLmF0b21pY1VwZGF0ZShjaGFuZ2VJZCwgbmV3IEF0b21pY1VwZGF0ZTxDaGFuZ2U+KCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgQ2hhbmdlIHVwZGF0ZShDaGFuZ2UgYykgeworICAgICAgICBjLnNldFN0YXR1cyhDaGFuZ2UuU3RhdHVzLk1FUkdFRCk7CisgICAgICAgIC8vIEl0IGNvdWxkIGJlIHBvc3NpYmxlIHRoYXQgdGhlIGNoYW5nZSBiZWluZyBtZXJnZWQKKyAgICAgICAgLy8gaGFzIG5ldmVyIGhhZCBpdHMgbWVyZ2VhYmlsaXR5IHRlc3RlZC4gU28gd2UgaW5zdXJlCisgICAgICAgIC8vIG1lcmdlZCBjaGFuZ2VzIGhhcyBtZXJnZWFibGUgZmllbGQgdHJ1ZS4KKyAgICAgICAgYy5zZXRNZXJnZWFibGUodHJ1ZSk7CisgICAgICAgIGlmICghbWVyZ2VkLmVxdWFscyhjLmN1cnJlbnRQYXRjaFNldElkKCkpKSB7CisgICAgICAgICAgLy8gVW5jb29sOyB0aGUgcGF0Y2ggc2V0IGNoYW5nZWQgYWZ0ZXIgd2UgbWVyZ2VkIGl0LgorICAgICAgICAgIC8vIEdvIGJhY2sgdG8gdGhlIHBhdGNoIHNldCB0aGF0IHdhcyBhY3R1YWxseSBtZXJnZWQuCisgICAgICAgICAgLy8KKyAgICAgICAgICB0cnkgeworICAgICAgICAgICAgYy5zZXRDdXJyZW50UGF0Y2hTZXQocGF0Y2hTZXRJbmZvRmFjdG9yeS5nZXQoZGIsIG1lcmdlZCkpOworICAgICAgICAgIH0gY2F0Y2ggKFBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbiBlMSkgeworICAgICAgICAgICAgbG9nLmVycm9yKCJDYW5ub3QgcmVhZCBtZXJnZWQgcGF0Y2ggc2V0ICIgKyBtZXJnZWQsIGUxKTsKICAgICAgICAgICB9Ci0gICAgICAgICAgQ2hhbmdlVXRpbC51cGRhdGVkKGMpOwotICAgICAgICAgIHJldHVybiBjOwogICAgICAgICB9Ci0gICAgICB9KTsKLSAgICB9IGNhdGNoIChPcm1Db25jdXJyZW5jeUV4Y2VwdGlvbiBlcnIpIHsKLSAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXJyKSB7Ci0gICAgICBsb2cud2FybigiQ2Fubm90IHVwZGF0ZSBjaGFuZ2Ugc3RhdHVzIiwgZXJyKTsKLSAgICB9CisgICAgICAgIENoYW5nZVV0aWwudXBkYXRlZChjKTsKKyAgICAgICAgcmV0dXJuIGM7CisgICAgICB9CisgICAgfSk7CisgIH0KIAotICAgIC8vIEZsYXR0ZW4gb3V0IGFsbCBleGlzdGluZyBhcHByb3ZhbHMgYmFzZWQgdXBvbiB0aGUgY3VycmVudAotICAgIC8vIHBlcm1pc3Npb25zLiBPbmNlIHRoZSBjaGFuZ2UgaXMgY2xvc2VkIHRoZSBhcHByb3ZhbHMgYXJlCi0gICAgLy8gbm90IHVwZGF0ZWQgYXQgcHJlc2VudGF0aW9uIHZpZXcgdGltZSwgc28gd2UgbmVlZCB0byBtYWtlLgotICAgIC8vIHN1cmUgdGhleSBhcmUgYWNjdXJhdGUgbm93LiBUaGlzIHdheSBpZiBwZXJtaXNzaW9ucyBnZXQKLSAgICAvLyBtb2RpZmllZCBpbiB0aGUgZnV0dXJlLCBoaXN0b3JpY2FsIHJlY29yZHMgc3RheSBhY2N1cmF0ZS4KLSAgICAvLworICBwcml2YXRlIFBhdGNoU2V0QXBwcm92YWwgc2F2ZUFwcHJvdmFscyhDaGFuZ2UgYywgUGF0Y2hTZXQuSWQgbWVyZ2VkKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgLy8gRmxhdHRlbiBvdXQgZXhpc3RpbmcgYXBwcm92YWxzIGZvciB0aGlzIHBhdGNoIHNldCBiYXNlZCB1cG9uIHRoZSBjdXJyZW50CisgICAgLy8gcGVybWlzc2lvbnMuIE9uY2UgdGhlIGNoYW5nZSBpcyBjbG9zZWQgdGhlIGFwcHJvdmFscyBhcmUgbm90IHVwZGF0ZWQgYXQKKyAgICAvLyBwcmVzZW50YXRpb24gdmlldyB0aW1lLCBleGNlcHQgZm9yIHplcm8gdm90ZXMgdXNlZCB0byBpbmRpY2F0ZSBhIHJldmlld2VyCisgICAgLy8gd2FzIGFkZGVkLiBTbyB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB2b3RlcyBhcmUgYWNjdXJhdGUgbm93LiBUaGlzIHdheSBpZgorICAgIC8vIHBlcm1pc3Npb25zIGdldCBtb2RpZmllZCBpbiB0aGUgZnV0dXJlLCBoaXN0b3JpY2FsIHJlY29yZHMgc3RheSBhY2N1cmF0ZS4KICAgICBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdHRlciA9IG51bGw7CiAgICAgdHJ5IHsKICAgICAgIGMuc2V0U3RhdHVzKENoYW5nZS5TdGF0dXMuTUVSR0VEKTsKLSAgICAgIGZpbmFsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzID0KLSAgICAgICAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmJ5Q2hhbmdlKGNoYW5nZUlkKS50b0xpc3QoKTsKLSAgICAgIGZpbmFsIEZ1bmN0aW9uU3RhdGUgZnMgPSBmdW5jdGlvblN0YXRlLmNyZWF0ZSgKLSAgICAgICAgICBjaGFuZ2VDb250cm9sRmFjdG9yeS5jb250cm9sRm9yKAotICAgICAgICAgICAgICBjLAotICAgICAgICAgICAgICBpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGMuZ2V0T3duZXIoKSkpLAotICAgICAgICAgICAgICBtZXJnZWQsIGFwcHJvdmFscyk7Ci0gICAgICBmb3IgKEFwcHJvdmFsVHlwZSBhdCA6IGFwcHJvdmFsVHlwZXMuZ2V0QXBwcm92YWxUeXBlcygpKSB7Ci0gICAgICAgIENhdGVnb3J5RnVuY3Rpb24uZm9yQ2F0ZWdvcnkoYXQuZ2V0Q2F0ZWdvcnkoKSkucnVuKGF0LCBmcyk7Ci0gICAgICB9CisKKyAgICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzID0KKyAgICAgICAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmJ5UGF0Y2hTZXQobWVyZ2VkKS50b0xpc3QoKTsKKyAgICAgIFNldDxQYXRjaFNldEFwcHJvdmFsLktleT4gdG9EZWxldGUgPQorICAgICAgICAgIFNldHMubmV3SGFzaFNldFdpdGhFeHBlY3RlZFNpemUoYXBwcm92YWxzLnNpemUoKSk7CiAgICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgYSA6IGFwcHJvdmFscykgewotICAgICAgICBpZiAoYS5nZXRWYWx1ZSgpID4gMAotICAgICAgICAgICAgJiYgQXBwcm92YWxDYXRlZ29yeS5TVUJNSVQuZXF1YWxzKGEuZ2V0Q2F0ZWdvcnlJZCgpKQotICAgICAgICAgICAgJiYgYS5nZXRQYXRjaFNldElkKCkuZXF1YWxzKG1lcmdlZCkpIHsKKyAgICAgICAgaWYgKGEuZ2V0VmFsdWUoKSAhPSAwKSB7CisgICAgICAgICAgdG9EZWxldGUuYWRkKGEuZ2V0S2V5KCkpOworICAgICAgICB9CisgICAgICB9CisKKyAgICAgIGFwcHJvdmFscyA9IGxhYmVsTm9ybWFsaXplci5ub3JtYWxpemUoYywgYXBwcm92YWxzKTsKKyAgICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXBwcm92YWxzKSB7CisgICAgICAgIHRvRGVsZXRlLnJlbW92ZShhLmdldEtleSgpKTsKKyAgICAgICAgaWYgKGEuZ2V0VmFsdWUoKSA+IDAgJiYgYS5pc1N1Ym1pdCgpKSB7CiAgICAgICAgICAgaWYgKHN1Ym1pdHRlciA9PSBudWxsCiAgICAgICAgICAgICAgIHx8IGEuZ2V0R3JhbnRlZCgpLmNvbXBhcmVUbyhzdWJtaXR0ZXIuZ2V0R3JhbnRlZCgpKSA+IDApIHsKICAgICAgICAgICAgIHN1Ym1pdHRlciA9IGE7CkBAIC0xNDgzLDI0ICs5NjQsMjQgQEAKICAgICAgICAgYS5jYWNoZShjKTsKICAgICAgIH0KICAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkudXBkYXRlKGFwcHJvdmFscyk7CisgICAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmRlbGV0ZUtleXModG9EZWxldGUpOwogICAgIH0gY2F0Y2ggKE5vU3VjaENoYW5nZUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgIGxvZy53YXJuKCJDYW5ub3Qgbm9ybWFsaXplIGFwcHJvdmFscyBmb3IgY2hhbmdlICIgKyBjaGFuZ2VJZCwgZXJyKTsKLSAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXJyKSB7Ci0gICAgICBsb2cud2FybigiQ2Fubm90IG5vcm1hbGl6ZSBhcHByb3ZhbHMgZm9yIGNoYW5nZSAiICsgY2hhbmdlSWQsIGVycik7CisgICAgICB0aHJvdyBuZXcgT3JtRXhjZXB0aW9uKGVycik7CiAgICAgfQorICAgIHJldHVybiBzdWJtaXR0ZXI7CisgIH0KIAorICBwcml2YXRlIHZvaWQgYWRkTWVyZ2VkTWVzc2FnZShQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdHRlciwgQ2hhbmdlTWVzc2FnZSBtc2cpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKICAgICBpZiAobXNnICE9IG51bGwpIHsKICAgICAgIGlmIChzdWJtaXR0ZXIgIT0gbnVsbCAmJiBtc2cuZ2V0QXV0aG9yKCkgPT0gbnVsbCkgewogICAgICAgICBtc2cuc2V0QXV0aG9yKHN1Ym1pdHRlci5nZXRBY2NvdW50SWQoKSk7CiAgICAgICB9Ci0gICAgICB0cnkgewotICAgICAgICBkYi5jaGFuZ2VNZXNzYWdlcygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24obXNnKSk7Ci0gICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXJyKSB7Ci0gICAgICAgIGxvZy53YXJuKCJDYW5ub3Qgc3RvcmUgbWVzc2FnZSBvbiBjaGFuZ2UiLCBlcnIpOwotICAgICAgfQorICAgICAgZGIuY2hhbmdlTWVzc2FnZXMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKG1zZykpOwogICAgIH0KKyAgfQogCi0gICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBmcm9tID0gc3VibWl0dGVyOworICBwcml2YXRlIHZvaWQgc2VuZE1lcmdlZEVtYWlsKGZpbmFsIENoYW5nZSBjLCBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGZyb20pIHsKICAgICB3b3JrUXVldWUuZ2V0RGVmYXVsdFF1ZXVlKCkKICAgICAgICAgLnN1Ym1pdChyZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLndyYXAobmV3IFJ1bm5hYmxlKCkgewogICAgICAgQE92ZXJyaWRlCkBAIC0xNTE5LDcgKzEwMDAsOSBAQAogICAgICAgICB9CiAKICAgICAgICAgdHJ5IHsKLSAgICAgICAgICBmaW5hbCBNZXJnZWRTZW5kZXIgY20gPSBtZXJnZWRTZW5kZXJGYWN0b3J5LmNyZWF0ZShjKTsKKyAgICAgICAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSBjaGFuZ2VDb250cm9sRmFjdG9yeS5jb250cm9sRm9yKGMsCisgICAgICAgICAgICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoYy5nZXRPd25lcigpKSk7CisgICAgICAgICAgZmluYWwgTWVyZ2VkU2VuZGVyIGNtID0gbWVyZ2VkU2VuZGVyRmFjdG9yeS5jcmVhdGUoY29udHJvbCk7CiAgICAgICAgICAgaWYgKGZyb20gIT0gbnVsbCkgewogICAgICAgICAgICAgY20uc2V0RnJvbShmcm9tLmdldEFjY291bnRJZCgpKTsKICAgICAgICAgICB9CkBAIC0xNTM1LDIzICsxMDE4LDM3IEBACiAgICAgICAgIHJldHVybiAic2VuZC1lbWFpbCBtZXJnZWQiOwogICAgICAgfQogICAgIH0pKTsKLQotCi0gICAgdHJ5IHsKLSAgICAgIGhvb2tzLmRvQ2hhbmdlTWVyZ2VkSG9vayhjLCAvLwotICAgICAgICAgIGFjY291bnRDYWNoZS5nZXQoc3VibWl0dGVyLmdldEFjY291bnRJZCgpKS5nZXRBY2NvdW50KCksIC8vCi0gICAgICAgICAgZGIucGF0Y2hTZXRzKCkuZ2V0KGMuY3VycmVudFBhdGNoU2V0SWQoKSksIGRiKTsKLSAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXgpIHsKLSAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHJ1biBob29rIGZvciBzdWJtaXR0ZWQgcGF0Y2ggc2V0ICIgKyBjLmdldElkKCksIGV4KTsKLSAgICB9CiAgIH0KIAogICBwcml2YXRlIHZvaWQgc2V0TmV3KENoYW5nZSBjLCBDaGFuZ2VNZXNzYWdlIG1zZykgewogICAgIHNlbmRNZXJnZUZhaWwoYywgbXNnLCB0cnVlKTsKICAgfQogCisgIHByaXZhdGUgYm9vbGVhbiBpc0R1cGxpY2F0ZShDaGFuZ2VNZXNzYWdlIG1zZykgeworICAgIHRyeSB7CisgICAgICBDaGFuZ2VNZXNzYWdlIGxhc3QgPSBJdGVyYWJsZXMuZ2V0TGFzdChkYi5jaGFuZ2VNZXNzYWdlcygpLmJ5Q2hhbmdlKAorICAgICAgICAgIG1zZy5nZXRQYXRjaFNldElkKCkuZ2V0UGFyZW50S2V5KCkpLCBudWxsKTsKKyAgICAgIGlmIChsYXN0ICE9IG51bGwpIHsKKyAgICAgICAgbG9uZyBsYXN0TXMgPSBsYXN0LmdldFdyaXR0ZW5PbigpLmdldFRpbWUoKTsKKyAgICAgICAgbG9uZyBtc2dNcyA9IG1zZy5nZXRXcml0dGVuT24oKS5nZXRUaW1lKCk7CisgICAgICAgIGlmIChPYmplY3RzLmVxdWFsKGxhc3QuZ2V0QXV0aG9yKCksIG1zZy5nZXRBdXRob3IoKSkKKyAgICAgICAgICAgICYmIE9iamVjdHMuZXF1YWwobGFzdC5nZXRNZXNzYWdlKCksIG1zZy5nZXRNZXNzYWdlKCkpCisgICAgICAgICAgICAmJiBtc2dNcyAtIGxhc3RNcyA8IERVUExJQ0FURV9NRVNTQUdFX0lOVEVSVkFMKSB7CisgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXJyKSB7CisgICAgICBsb2cud2FybigiQ2Fubm90IGNoZWNrIHByZXZpb3VzIG1lcmdlIGZhaWx1cmUgbWVzc2FnZSIsIGVycik7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKKyAgfQorCiAgIHByaXZhdGUgdm9pZCBzZW5kTWVyZ2VGYWlsKGZpbmFsIENoYW5nZSBjLCBmaW5hbCBDaGFuZ2VNZXNzYWdlIG1zZywKICAgICAgIGZpbmFsIGJvb2xlYW4gbWFrZU5ldykgeworICAgIGlmIChpc0R1cGxpY2F0ZShtc2cpKSB7CisgICAgICByZXR1cm47CisgICAgfQorCiAgICAgdHJ5IHsKICAgICAgIGRiLmNoYW5nZU1lc3NhZ2VzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihtc2cpKTsKICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXJyKSB7CkBAIC0xNTgyLDE3ICsxMDc5LDIzIEBACiAgICAgICB9CiAgICAgfQogCisgICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXR0ZXIgPSBudWxsOworICAgIHRyeSB7CisgICAgICBzdWJtaXR0ZXIgPSBnZXRTdWJtaXR0ZXIoZGIsIGMuY3VycmVudFBhdGNoU2V0SWQoKSk7CisgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKyAgICAgIGxvZy5lcnJvcigiQ2Fubm90IGdldCBzdWJtaXR0ZXIiLCBlKTsKKyAgICB9CisKKyAgICBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGZyb20gPSBzdWJtaXR0ZXI7CiAgICAgd29ya1F1ZXVlLmdldERlZmF1bHRRdWV1ZSgpCiAgICAgICAgIC5zdWJtaXQocmVxdWVzdFNjb3BlUHJvcGFnYXRvci53cmFwKG5ldyBSdW5uYWJsZSgpIHsKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIHZvaWQgcnVuKCkgewogICAgICAgICBQYXRjaFNldCBwYXRjaFNldDsKLSAgICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXR0ZXI7CiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgUmV2aWV3RGIgcmV2aWV3RGIgPSBzY2hlbWFGYWN0b3J5Lm9wZW4oKTsKICAgICAgICAgICB0cnkgewogICAgICAgICAgICAgcGF0Y2hTZXQgPSByZXZpZXdEYi5wYXRjaFNldHMoKS5nZXQoYy5jdXJyZW50UGF0Y2hTZXRJZCgpKTsKLSAgICAgICAgICAgIHN1Ym1pdHRlciA9IGdldFN1Ym1pdHRlcihyZXZpZXdEYiwgYy5jdXJyZW50UGF0Y2hTZXRJZCgpKTsKICAgICAgICAgICB9IGZpbmFsbHkgewogICAgICAgICAgICAgcmV2aWV3RGIuY2xvc2UoKTsKICAgICAgICAgICB9CkBAIC0xNjAzLDggKzExMDYsOCBAQAogCiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgZmluYWwgTWVyZ2VGYWlsU2VuZGVyIGNtID0gbWVyZ2VGYWlsU2VuZGVyRmFjdG9yeS5jcmVhdGUoYyk7Ci0gICAgICAgICAgaWYgKHN1Ym1pdHRlciAhPSBudWxsKSB7Ci0gICAgICAgICAgICBjbS5zZXRGcm9tKHN1Ym1pdHRlci5nZXRBY2NvdW50SWQoKSk7CisgICAgICAgICAgaWYgKGZyb20gIT0gbnVsbCkgeworICAgICAgICAgICAgY20uc2V0RnJvbShmcm9tLmdldEFjY291bnRJZCgpKTsKICAgICAgICAgICB9CiAgICAgICAgICAgY20uc2V0UGF0Y2hTZXQocGF0Y2hTZXQpOwogICAgICAgICAgIGNtLnNldENoYW5nZU1lc3NhZ2UobXNnKTsKQEAgLTE2MTksNSArMTEyMiwxNSBAQAogICAgICAgICByZXR1cm4gInNlbmQtZW1haWwgbWVyZ2UtZmFpbGVkIjsKICAgICAgIH0KICAgICB9KSk7CisKKyAgICBpZiAoc3VibWl0dGVyICE9IG51bGwpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIGhvb2tzLmRvTWVyZ2VGYWlsZWRIb29rKGMsCisgICAgICAgICAgICBhY2NvdW50Q2FjaGUuZ2V0KHN1Ym1pdHRlci5nZXRBY2NvdW50SWQoKSkuZ2V0QWNjb3VudCgpLAorICAgICAgICAgICAgZGIucGF0Y2hTZXRzKCkuZ2V0KGMuY3VycmVudFBhdGNoU2V0SWQoKSksIG1zZy5nZXRNZXNzYWdlKCksIGRiKTsKKyAgICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBleCkgeworICAgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBydW4gaG9vayBmb3IgbWVyZ2UgZmFpbGVkICIgKyBjLmdldElkKCksIGV4KTsKKyAgICAgIH0KKyAgICB9CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlUXVldWUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlUXVldWUuamF2YQppbmRleCAxMDcxNzY4Li5hNTNiMDRjIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZVF1ZXVlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VRdWV1ZS5qYXZhCkBAIC0xOSw5ICsxOSw3IEBACiBpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQ7CiAKIHB1YmxpYyBpbnRlcmZhY2UgTWVyZ2VRdWV1ZSB7Ci0gIHZvaWQgbWVyZ2UoTWVyZ2VPcC5GYWN0b3J5IG1vZiwgQnJhbmNoLk5hbWVLZXkgYnJhbmNoKTsKLQorICB2b2lkIG1lcmdlKEJyYW5jaC5OYW1lS2V5IGJyYW5jaCk7CiAgIHZvaWQgc2NoZWR1bGUoQnJhbmNoLk5hbWVLZXkgYnJhbmNoKTsKLQogICB2b2lkIHJlY2hlY2tBZnRlcihCcmFuY2guTmFtZUtleSBicmFuY2gsIGxvbmcgZGVsYXksIFRpbWVVbml0IGRlbGF5VW5pdCk7CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZVNvcnRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VTb3J0ZXIuamF2YQppbmRleCBmZTg3NDgwLi4zOTExZDk2IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZVNvcnRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01lcmdlU29ydGVyLmphdmEKQEAgLTI4LDE0ICsyOCwxNCBAQAogCiBjbGFzcyBNZXJnZVNvcnRlciB7CiAgIHByaXZhdGUgZmluYWwgUmV2V2FsayBydzsKLSAgcHJpdmF0ZSBmaW5hbCBSZXZGbGFnIENBTl9NRVJHRTsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZzsKICAgcHJpdmF0ZSBmaW5hbCBTZXQ8UmV2Q29tbWl0PiBhY2NlcHRlZDsKIAotICBNZXJnZVNvcnRlcihmaW5hbCBSZXZXYWxrIHdhbGssIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCwKLSAgICAgIGZpbmFsIFJldkZsYWcgZmxhZ0NBTl9NRVJHRSkgewotICAgIHJ3ID0gd2FsazsKLSAgICBDQU5fTUVSR0UgPSBmbGFnQ0FOX01FUkdFOwotICAgIGFjY2VwdGVkID0gYWxyZWFkeUFjY2VwdGVkOworICBNZXJnZVNvcnRlcihmaW5hbCBSZXZXYWxrIHJ3LCBmaW5hbCBTZXQ8UmV2Q29tbWl0PiBhbHJlYWR5QWNjZXB0ZWQsCisgICAgICBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZykgeworICAgIHRoaXMucncgPSBydzsKKyAgICB0aGlzLmNhbk1lcmdlRmxhZyA9IGNhbk1lcmdlRmxhZzsKKyAgICB0aGlzLmFjY2VwdGVkID0gYWxyZWFkeUFjY2VwdGVkOwogICB9CiAKICAgQ29sbGVjdGlvbjxDb2RlUmV2aWV3Q29tbWl0PiBzb3J0KGZpbmFsIENvbGxlY3Rpb248Q29kZVJldmlld0NvbW1pdD4gaW5jb21pbmcpCkBAIC00NSw3ICs0NSw3IEBACiAgICAgd2hpbGUgKCFzb3J0LmlzRW1wdHkoKSkgewogICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuID0gcmVtb3ZlT25lKHNvcnQpOwogCi0gICAgICBydy5yZXNldFJldGFpbihDQU5fTUVSR0UpOworICAgICAgcncucmVzZXRSZXRhaW4oY2FuTWVyZ2VGbGFnKTsKICAgICAgIHJ3Lm1hcmtTdGFydChuKTsKICAgICAgIGZvciAoUmV2Q29tbWl0IGMgOiBhY2NlcHRlZCkgewogICAgICAgICBydy5tYXJrVW5pbnRlcmVzdGluZyhjKTsKQEAgLTU0LDcgKzU0LDcgQEAKICAgICAgIFJldkNvbW1pdCBjOwogICAgICAgZmluYWwgUmV2Q29tbWl0TGlzdDxSZXZDb21taXQ+IGNvbnRlbnRzID0gbmV3IFJldkNvbW1pdExpc3Q8UmV2Q29tbWl0PigpOwogICAgICAgd2hpbGUgKChjID0gcncubmV4dCgpKSAhPSBudWxsKSB7Ci0gICAgICAgIGlmICghYy5oYXMoQ0FOX01FUkdFKSkgeworICAgICAgICBpZiAoIWMuaGFzKGNhbk1lcmdlRmxhZykgfHwgIWluY29taW5nLmNvbnRhaW5zKGMpKSB7CiAgICAgICAgICAgLy8gV2UgY2Fubm90IG1lcmdlIG4gYXMgaXQgd291bGQgYnJpbmcgc29tZXRoaW5nIHdlCiAgICAgICAgICAgLy8gYXJlbid0IHBlcm1pdHRlZCB0byBtZXJnZSBhdCB0aGlzIHRpbWUuIERyb3Agbi4KICAgICAgICAgICAvLwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VVdGlsLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXJnZVV0aWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44NjJlYjJiCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWVyZ2VVdGlsLmphdmEKQEAgLTAsMCArMSw3MTMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsLkxhYmVsSWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0U3RhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZEluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLkluY29ycmVjdE9iamVjdFR5cGVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuTWlzc2luZ09iamVjdEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5Ob01lcmdlQmFzZUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5Ob01lcmdlQmFzZUV4Y2VwdGlvbi5NZXJnZUJhc2VGYWlsdXJlUmVhc29uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkFueU9iamVjdElkOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbW1pdEJ1aWxkZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5NdXRhYmxlT2JqZWN0SWQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SW5zZXJ0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUGVyc29uSWRlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0Lm1lcmdlLk1lcmdlU3RyYXRlZ3k7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5tZXJnZS5UaHJlZVdheU1lcmdlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuRm9vdGVyS2V5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5Gb290ZXJMaW5lOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkZsYWc7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldlNvcnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuUGFja1BhcnNlcjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOworaW1wb3J0IGphdmEuaW8uVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnNxbC5UaW1lc3RhbXA7CitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5TZXQ7CitpbXBvcnQgamF2YS51dGlsLlRpbWVab25lOworCitpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKKworcHVibGljIGNsYXNzIE1lcmdlVXRpbCB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihNZXJnZVV0aWwuY2xhc3MpOworCisgIHB1YmxpYyBzdGF0aWMgaW50ZXJmYWNlIEZhY3RvcnkgeworICAgIE1lcmdlVXRpbCBjcmVhdGUoUHJvamVjdFN0YXRlIHByb2plY3QpOworICAgIE1lcmdlVXRpbCBjcmVhdGUoUHJvamVjdFN0YXRlIHByb2plY3QsIGJvb2xlYW4gdXNlQ29udGVudE1lcmdlKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBSX0hFQURTX01BU1RFUiA9CisgICAgICBDb25zdGFudHMuUl9IRUFEUyArIENvbnN0YW50cy5NQVNURVI7CisKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgRm9vdGVyS2V5IFJFVklFV0VEX09OID0gbmV3IEZvb3RlcktleSgiUmV2aWV3ZWQtb24iKTsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgRm9vdGVyS2V5IENIQU5HRV9JRCA9IG5ldyBGb290ZXJLZXkoIkNoYW5nZS1JZCIpOworCisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmV2aWV3RGI+IGRiOworICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyOworICBwcml2YXRlIGZpbmFsIFByb2plY3RTdGF0ZSBwcm9qZWN0OworICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gdXNlQ29udGVudE1lcmdlOworICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gdXNlUmVjdXJzaXZlTWVyZ2U7CisKKyAgQEFzc2lzdGVkSW5qZWN0CisgIE1lcmdlVXRpbChAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBzZXJ2ZXJDb25maWcsCisgICAgICBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGIsCisgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3RvcnksCisgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyLAorICAgICAgQEFzc2lzdGVkIGZpbmFsIFByb2plY3RTdGF0ZSBwcm9qZWN0KSB7CisgICAgdGhpcyhzZXJ2ZXJDb25maWcsIGRiLCBpZGVudGlmaWVkVXNlckZhY3RvcnksIHVybFByb3ZpZGVyLCBwcm9qZWN0LAorICAgICAgICBwcm9qZWN0LmlzVXNlQ29udGVudE1lcmdlKCkpOworICB9CisKKyAgQEFzc2lzdGVkSW5qZWN0CisgIE1lcmdlVXRpbChAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBzZXJ2ZXJDb25maWcsCisgICAgICBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGIsCisgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3RvcnksCisgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyLAorICAgICAgQEFzc2lzdGVkIGZpbmFsIFByb2plY3RTdGF0ZSBwcm9qZWN0LAorICAgICAgQEFzc2lzdGVkIGJvb2xlYW4gdXNlQ29udGVudE1lcmdlKSB7CisgICAgdGhpcy5kYiA9IGRiOworICAgIHRoaXMuaWRlbnRpZmllZFVzZXJGYWN0b3J5ID0gaWRlbnRpZmllZFVzZXJGYWN0b3J5OworICAgIHRoaXMudXJsUHJvdmlkZXIgPSB1cmxQcm92aWRlcjsKKyAgICB0aGlzLnByb2plY3QgPSBwcm9qZWN0OworICAgIHRoaXMudXNlQ29udGVudE1lcmdlID0gdXNlQ29udGVudE1lcmdlOworICAgIHRoaXMudXNlUmVjdXJzaXZlTWVyZ2UgPQorICAgICAgICBzZXJ2ZXJDb25maWcuZ2V0Qm9vbGVhbigiY29yZSIsIG51bGwsICJ1c2VSZWN1cnNpdmVNZXJnZSIsIGZhbHNlKTsKKyAgfQorCisgIHB1YmxpYyBDb2RlUmV2aWV3Q29tbWl0IGdldEZpcnN0RmFzdEZvcndhcmQoCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLCBmaW5hbCBSZXZXYWxrIHJ3LAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIGZvciAoZmluYWwgSXRlcmF0b3I8Q29kZVJldmlld0NvbW1pdD4gaSA9IHRvTWVyZ2UuaXRlcmF0b3IoKTsgaS5oYXNOZXh0KCk7KSB7CisgICAgICB0cnkgeworICAgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4gPSBpLm5leHQoKTsKKyAgICAgICAgaWYgKG1lcmdlVGlwID09IG51bGwgfHwgcncuaXNNZXJnZWRJbnRvKG1lcmdlVGlwLCBuKSkgeworICAgICAgICAgIGkucmVtb3ZlKCk7CisgICAgICAgICAgcmV0dXJuIG47CisgICAgICAgIH0KKyAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgZmFzdC1mb3J3YXJkIHRlc3QgZHVyaW5nIG1lcmdlIiwgZSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBtZXJnZVRpcDsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHJlZHVjZVRvTWluaW1hbE1lcmdlKGZpbmFsIE1lcmdlU29ydGVyIG1lcmdlU29ydGVyLAorICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiB0b1NvcnQpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgZmluYWwgQ29sbGVjdGlvbjxDb2RlUmV2aWV3Q29tbWl0PiBoZWFkczsKKyAgICB0cnkgeworICAgICAgaGVhZHMgPSBtZXJnZVNvcnRlci5zb3J0KHRvU29ydCk7CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJCcmFuY2ggaGVhZCBzb3J0aW5nIGZhaWxlZCIsIGUpOworICAgIH0KKworICAgIHRvU29ydC5jbGVhcigpOworICAgIHRvU29ydC5hZGRBbGwoaGVhZHMpOworICAgIENvbGxlY3Rpb25zLnNvcnQodG9Tb3J0LCBuZXcgQ29tcGFyYXRvcjxDb2RlUmV2aWV3Q29tbWl0PigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIGludCBjb21wYXJlKGZpbmFsIENvZGVSZXZpZXdDb21taXQgYSwgZmluYWwgQ29kZVJldmlld0NvbW1pdCBiKSB7CisgICAgICAgIHJldHVybiBhLm9yaWdpbmFsT3JkZXIgLSBiLm9yaWdpbmFsT3JkZXI7CisgICAgICB9CisgICAgfSk7CisgIH0KKworICBwdWJsaWMgUGF0Y2hTZXRBcHByb3ZhbCBnZXRTdWJtaXR0ZXIoZmluYWwgUGF0Y2hTZXQuSWQgYykgeworICAgIHJldHVybiBnZXRTdWJtaXR0ZXIoZGIuZ2V0KCksIGMpOworICB9CisKKyAgcHVibGljIHN0YXRpYyBQYXRjaFNldEFwcHJvdmFsIGdldFN1Ym1pdHRlcihmaW5hbCBSZXZpZXdEYiByZXZpZXdEYiwKKyAgICAgIGZpbmFsIFBhdGNoU2V0LklkIGMpIHsKKyAgICBpZiAoYyA9PSBudWxsKSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisgICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXR0ZXIgPSBudWxsOworICAgIHRyeSB7CisgICAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGFwcHJvdmFscyA9CisgICAgICAgICAgcmV2aWV3RGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieVBhdGNoU2V0KGMpLnRvTGlzdCgpOworICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGEgOiBhcHByb3ZhbHMpIHsKKyAgICAgICAgaWYgKGEuZ2V0VmFsdWUoKSA+IDAgJiYgYS5pc1N1Ym1pdCgpKSB7CisgICAgICAgICAgaWYgKHN1Ym1pdHRlciA9PSBudWxsCisgICAgICAgICAgICAgIHx8IGEuZ2V0R3JhbnRlZCgpLmNvbXBhcmVUbyhzdWJtaXR0ZXIuZ2V0R3JhbnRlZCgpKSA+IDApIHsKKyAgICAgICAgICAgIHN1Ym1pdHRlciA9IGE7CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICB9CisgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKKyAgICB9CisgICAgcmV0dXJuIHN1Ym1pdHRlcjsKKyAgfQorCisgIHB1YmxpYyBDb2RlUmV2aWV3Q29tbWl0IGNyZWF0ZUNoZXJyeVBpY2tGcm9tQ29tbWl0KFJlcG9zaXRvcnkgcmVwbywKKyAgICAgIE9iamVjdEluc2VydGVyIGluc2VydGVyLCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLCBDb2RlUmV2aWV3Q29tbWl0IG9yaWdpbmFsQ29tbWl0LAorICAgICAgUGVyc29uSWRlbnQgY2hlcnJ5UGlja0NvbW1pdHRlcklkZW50LCBTdHJpbmcgY29tbWl0TXNnLCBSZXZXYWxrIHJ3KQorICAgICAgdGhyb3dzIE1pc3NpbmdPYmplY3RFeGNlcHRpb24sIEluY29ycmVjdE9iamVjdFR5cGVFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKworICAgIGZpbmFsIFRocmVlV2F5TWVyZ2VyIG0gPSBuZXdUaHJlZVdheU1lcmdlcihyZXBvLCBpbnNlcnRlcik7CisKKyAgICBtLnNldEJhc2Uob3JpZ2luYWxDb21taXQuZ2V0UGFyZW50KDApKTsKKyAgICBpZiAobS5tZXJnZShtZXJnZVRpcCwgb3JpZ2luYWxDb21taXQpKSB7CisKKyAgICAgIGZpbmFsIENvbW1pdEJ1aWxkZXIgbWVyZ2VDb21taXQgPSBuZXcgQ29tbWl0QnVpbGRlcigpOworCisgICAgICBtZXJnZUNvbW1pdC5zZXRUcmVlSWQobS5nZXRSZXN1bHRUcmVlSWQoKSk7CisgICAgICBtZXJnZUNvbW1pdC5zZXRQYXJlbnRJZChtZXJnZVRpcCk7CisgICAgICBtZXJnZUNvbW1pdC5zZXRBdXRob3Iob3JpZ2luYWxDb21taXQuZ2V0QXV0aG9ySWRlbnQoKSk7CisgICAgICBtZXJnZUNvbW1pdC5zZXRDb21taXR0ZXIoY2hlcnJ5UGlja0NvbW1pdHRlcklkZW50KTsKKyAgICAgIG1lcmdlQ29tbWl0LnNldE1lc3NhZ2UoY29tbWl0TXNnKTsKKworICAgICAgZmluYWwgT2JqZWN0SWQgaWQgPSBjb21taXQoaW5zZXJ0ZXIsIG1lcmdlQ29tbWl0KTsKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbmV3Q29tbWl0ID0KKyAgICAgICAgICAoQ29kZVJldmlld0NvbW1pdCkgcncucGFyc2VDb21taXQoaWQpOworCisgICAgICByZXR1cm4gbmV3Q29tbWl0OworICAgIH0gZWxzZSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisgIH0KKworICBwdWJsaWMgU3RyaW5nIGNyZWF0ZUNoZXJyeVBpY2tDb21taXRNZXNzYWdlKGZpbmFsIENvZGVSZXZpZXdDb21taXQgbikgeworICAgIGZpbmFsIExpc3Q8Rm9vdGVyTGluZT4gZm9vdGVycyA9IG4uZ2V0Rm9vdGVyTGluZXMoKTsKKyAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIG1zZ2J1ZiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgbXNnYnVmLmFwcGVuZChuLmdldEZ1bGxNZXNzYWdlKCkpOworCisgICAgaWYgKG1zZ2J1Zi5sZW5ndGgoKSA9PSAwKSB7CisgICAgICAvLyBXVEYsIGFuIGVtcHR5IGNvbW1pdCBtZXNzYWdlPworICAgICAgbXNnYnVmLmFwcGVuZCgiPG5vIGNvbW1pdCBtZXNzYWdlIHByb3ZpZGVkPiIpOworICAgIH0KKyAgICBpZiAobXNnYnVmLmNoYXJBdChtc2didWYubGVuZ3RoKCkgLSAxKSAhPSAnXG4nKSB7CisgICAgICAvLyBNaXNzaW5nIGEgdHJhaWxpbmcgTEY/IENvcnJlY3QgaXQgKHBlcmhhcHMgdGhlIGVkaXRvciB3YXMgYnJva2VuKS4KKyAgICAgIG1zZ2J1Zi5hcHBlbmQoJ1xuJyk7CisgICAgfQorICAgIGlmIChmb290ZXJzLmlzRW1wdHkoKSkgeworICAgICAgLy8gRG9lc24ndCBlbmQgaW4gYSAiU2lnbmVkLW9mZi1ieTogLi4uIiBzdHlsZSBsaW5lPyBBZGQgYW5vdGhlciBsaW5lCisgICAgICAvLyBicmVhayB0byBzdGFydCBhIG5ldyBwYXJhZ3JhcGggZm9yIHRoZSByZXZpZXdlZC1ieSB0YWcgbGluZXMuCisgICAgICAvLworICAgICAgbXNnYnVmLmFwcGVuZCgnXG4nKTsKKyAgICB9CisKKyAgICBpZiAoIWNvbnRhaW5zKGZvb3RlcnMsIENIQU5HRV9JRCwgbi5jaGFuZ2UuZ2V0S2V5KCkuZ2V0KCkpKSB7CisgICAgICBtc2didWYuYXBwZW5kKENIQU5HRV9JRC5nZXROYW1lKCkpOworICAgICAgbXNnYnVmLmFwcGVuZCgiOiAiKTsKKyAgICAgIG1zZ2J1Zi5hcHBlbmQobi5jaGFuZ2UuZ2V0S2V5KCkuZ2V0KCkpOworICAgICAgbXNnYnVmLmFwcGVuZCgnXG4nKTsKKyAgICB9CisKKyAgICBmaW5hbCBTdHJpbmcgc2l0ZVVybCA9IHVybFByb3ZpZGVyLmdldCgpOworICAgIGlmIChzaXRlVXJsICE9IG51bGwpIHsKKyAgICAgIGZpbmFsIFN0cmluZyB1cmwgPSBzaXRlVXJsICsgbi5wYXRjaHNldElkLmdldFBhcmVudEtleSgpLmdldCgpOworICAgICAgaWYgKCFjb250YWlucyhmb290ZXJzLCBSRVZJRVdFRF9PTiwgdXJsKSkgeworICAgICAgICBtc2didWYuYXBwZW5kKFJFVklFV0VEX09OLmdldE5hbWUoKSk7CisgICAgICAgIG1zZ2J1Zi5hcHBlbmQoIjogIik7CisgICAgICAgIG1zZ2J1Zi5hcHBlbmQodXJsKTsKKyAgICAgICAgbXNnYnVmLmFwcGVuZCgnXG4nKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBQYXRjaFNldEFwcHJvdmFsIHN1Ym1pdEF1ZGl0ID0gbnVsbDsKKworICAgIGZvciAoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBhIDogZ2V0QXBwcm92YWxzRm9yQ29tbWl0KG4pKSB7CisgICAgICBpZiAoYS5nZXRWYWx1ZSgpIDw9IDApIHsKKyAgICAgICAgLy8gTmVnYXRpdmUgdm90ZXMgYXJlbid0IGNvdW50ZWQuCisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBpZiAoYS5pc1N1Ym1pdCgpKSB7CisgICAgICAgIC8vIFN1Ym1pdCBpcyB0cmVhdGVkIHNwZWNpYWxseSwgYmVsb3cgKGJlY29tZXMgY29tbWl0dGVyKQorICAgICAgICAvLworICAgICAgICBpZiAoc3VibWl0QXVkaXQgPT0gbnVsbAorICAgICAgICAgICAgfHwgYS5nZXRHcmFudGVkKCkuY29tcGFyZVRvKHN1Ym1pdEF1ZGl0LmdldEdyYW50ZWQoKSkgPiAwKSB7CisgICAgICAgICAgc3VibWl0QXVkaXQgPSBhOworICAgICAgICB9CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBmaW5hbCBBY2NvdW50IGFjYyA9CisgICAgICAgICAgaWRlbnRpZmllZFVzZXJGYWN0b3J5LmNyZWF0ZShhLmdldEFjY291bnRJZCgpKS5nZXRBY2NvdW50KCk7CisgICAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIGlkZW50YnVmID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKKyAgICAgIGlmIChhY2MuZ2V0RnVsbE5hbWUoKSAhPSBudWxsICYmIGFjYy5nZXRGdWxsTmFtZSgpLmxlbmd0aCgpID4gMCkgeworICAgICAgICBpZiAoaWRlbnRidWYubGVuZ3RoKCkgPiAwKSB7CisgICAgICAgICAgaWRlbnRidWYuYXBwZW5kKCcgJyk7CisgICAgICAgIH0KKyAgICAgICAgaWRlbnRidWYuYXBwZW5kKGFjYy5nZXRGdWxsTmFtZSgpKTsKKyAgICAgIH0KKyAgICAgIGlmIChhY2MuZ2V0UHJlZmVycmVkRW1haWwoKSAhPSBudWxsCisgICAgICAgICAgJiYgYWNjLmdldFByZWZlcnJlZEVtYWlsKCkubGVuZ3RoKCkgPiAwKSB7CisgICAgICAgIGlmIChpc1NpZ25lZE9mZkJ5KGZvb3RlcnMsIGFjYy5nZXRQcmVmZXJyZWRFbWFpbCgpKSkgeworICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIGlmIChpZGVudGJ1Zi5sZW5ndGgoKSA+IDApIHsKKyAgICAgICAgICBpZGVudGJ1Zi5hcHBlbmQoJyAnKTsKKyAgICAgICAgfQorICAgICAgICBpZGVudGJ1Zi5hcHBlbmQoJzwnKTsKKyAgICAgICAgaWRlbnRidWYuYXBwZW5kKGFjYy5nZXRQcmVmZXJyZWRFbWFpbCgpKTsKKyAgICAgICAgaWRlbnRidWYuYXBwZW5kKCc+Jyk7CisgICAgICB9CisgICAgICBpZiAoaWRlbnRidWYubGVuZ3RoKCkgPT0gMCkgeworICAgICAgICAvLyBOb3RoaW5nIHJlYXNvbmFibGUgdG8gZGVzY3JpYmUgdGhlbSBieT8gSWdub3JlIHRoZW0uCisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBmaW5hbCBTdHJpbmcgdGFnOworICAgICAgaWYgKGlzQ29kZVJldmlldyhhLmdldExhYmVsSWQoKSkpIHsKKyAgICAgICAgdGFnID0gIlJldmlld2VkLWJ5IjsKKyAgICAgIH0gZWxzZSBpZiAoaXNWZXJpZmllZChhLmdldExhYmVsSWQoKSkpIHsKKyAgICAgICAgdGFnID0gIlRlc3RlZC1ieSI7CisgICAgICB9IGVsc2UgeworICAgICAgICBmaW5hbCBMYWJlbFR5cGUgbHQgPSBwcm9qZWN0LmdldExhYmVsVHlwZXMoKS5ieUxhYmVsKGEuZ2V0TGFiZWxJZCgpKTsKKyAgICAgICAgaWYgKGx0ID09IG51bGwpIHsKKyAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICB0YWcgPSBsdC5nZXROYW1lKCk7CisgICAgICB9CisKKyAgICAgIGlmICghY29udGFpbnMoZm9vdGVycywgbmV3IEZvb3RlcktleSh0YWcpLCBpZGVudGJ1Zi50b1N0cmluZygpKSkgeworICAgICAgICBtc2didWYuYXBwZW5kKHRhZyk7CisgICAgICAgIG1zZ2J1Zi5hcHBlbmQoIjogIik7CisgICAgICAgIG1zZ2J1Zi5hcHBlbmQoaWRlbnRidWYpOworICAgICAgICBtc2didWYuYXBwZW5kKCdcbicpOworICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBtc2didWYudG9TdHJpbmcoKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gaXNDb2RlUmV2aWV3KExhYmVsSWQgaWQpIHsKKyAgICByZXR1cm4gIkNvZGUtUmV2aWV3Ii5lcXVhbHNJZ25vcmVDYXNlKGlkLmdldCgpKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gaXNWZXJpZmllZChMYWJlbElkIGlkKSB7CisgICAgcmV0dXJuICJWZXJpZmllZCIuZXF1YWxzSWdub3JlQ2FzZShpZC5nZXQoKSk7CisgIH0KKworICBwdWJsaWMgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBnZXRBcHByb3ZhbHNGb3JDb21taXQoZmluYWwgQ29kZVJldmlld0NvbW1pdCBuKSB7CisgICAgdHJ5IHsKKyAgICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxMaXN0ID0KKyAgICAgICAgICBkYi5nZXQoKS5wYXRjaFNldEFwcHJvdmFscygpLmJ5UGF0Y2hTZXQobi5wYXRjaHNldElkKS50b0xpc3QoKTsKKyAgICAgIENvbGxlY3Rpb25zLnNvcnQoYXBwcm92YWxMaXN0LCBuZXcgQ29tcGFyYXRvcjxQYXRjaFNldEFwcHJvdmFsPigpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGEsIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgYikgeworICAgICAgICAgIHJldHVybiBhLmdldEdyYW50ZWQoKS5jb21wYXJlVG8oYi5nZXRHcmFudGVkKCkpOworICAgICAgICB9CisgICAgICB9KTsKKyAgICAgIHJldHVybiBhcHByb3ZhbExpc3Q7CisgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKKyAgICAgIGxvZy5lcnJvcigiQ2FuJ3QgcmVhZCBhcHByb3ZhbCByZWNvcmRzIGZvciAiICsgbi5wYXRjaHNldElkLCBlKTsKKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBib29sZWFuIGNvbnRhaW5zKExpc3Q8Rm9vdGVyTGluZT4gZm9vdGVycywgRm9vdGVyS2V5IGtleSwgU3RyaW5nIHZhbCkgeworICAgIGZvciAoZmluYWwgRm9vdGVyTGluZSBsaW5lIDogZm9vdGVycykgeworICAgICAgaWYgKGxpbmUubWF0Y2hlcyhrZXkpICYmIHZhbC5lcXVhbHMobGluZS5nZXRWYWx1ZSgpKSkgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc1NpZ25lZE9mZkJ5KExpc3Q8Rm9vdGVyTGluZT4gZm9vdGVycywgU3RyaW5nIGVtYWlsKSB7CisgICAgZm9yIChmaW5hbCBGb290ZXJMaW5lIGxpbmUgOiBmb290ZXJzKSB7CisgICAgICBpZiAobGluZS5tYXRjaGVzKEZvb3RlcktleS5TSUdORURfT0ZGX0JZKQorICAgICAgICAgICYmIGVtYWlsLmVxdWFscyhsaW5lLmdldEVtYWlsQWRkcmVzcygpKSkgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworICB9CisKKyAgcHVibGljIFBlcnNvbklkZW50IGNvbXB1dGVNZXJnZUNvbW1pdEF1dGhvcihmaW5hbCBQZXJzb25JZGVudCBteUlkZW50LAorICAgICAgZmluYWwgUmV2V2FsayBydywgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiBjb2RlUmV2aWV3Q29tbWl0cykgeworICAgIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0dGVyID0gbnVsbDsKKyAgICBmb3IgKGZpbmFsIENvZGVSZXZpZXdDb21taXQgYyA6IGNvZGVSZXZpZXdDb21taXRzKSB7CisgICAgICBQYXRjaFNldEFwcHJvdmFsIHMgPSBnZXRTdWJtaXR0ZXIoYy5wYXRjaHNldElkKTsKKyAgICAgIGlmIChzdWJtaXR0ZXIgPT0gbnVsbAorICAgICAgICAgIHx8IChzICE9IG51bGwgJiYgcy5nZXRHcmFudGVkKCkuY29tcGFyZVRvKHN1Ym1pdHRlci5nZXRHcmFudGVkKCkpID4gMCkpIHsKKyAgICAgICAgc3VibWl0dGVyID0gczsKKyAgICAgIH0KKyAgICB9CisKKyAgICAvLyBUcnkgdG8gdXNlIHRoZSBzdWJtaXR0ZXIncyBpZGVudGl0eSBmb3IgdGhlIG1lcmdlIGNvbW1pdCBhdXRob3IuCisgICAgLy8gSWYgYWxsIG9mIHRoZSBjb21taXRzIGJlaW5nIG1lcmdlZCBhcmUgY3JlYXRlZCBieSB0aGUgc3VibWl0dGVyLAorICAgIC8vIHByZWZlciB0aGUgaWRlbnRpdHkgbGluZSB0aGV5IHVzZWQgaW4gdGhlIGNvbW1pdHMgcmF0aGVyIHRoYW4gdGhlCisgICAgLy8gcHJlZmVycmVkIGlkZW50aXR5IHN0b3JlZCBpbiB0aGUgdXNlciBhY2NvdW50LiBUaGlzIHdheSB0aGUgR2l0CisgICAgLy8gY29tbWl0IHJlY29yZHMgYXJlIG1vcmUgY29uc2lzdGVudCBpbnRlcm5hbGx5LgorICAgIC8vCisgICAgUGVyc29uSWRlbnQgYXV0aG9ySWRlbnQ7CisgICAgaWYgKHN1Ym1pdHRlciAhPSBudWxsKSB7CisgICAgICBJZGVudGlmaWVkVXNlciB3aG8gPQorICAgICAgICAgIGlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoc3VibWl0dGVyLmdldEFjY291bnRJZCgpKTsKKyAgICAgIFNldDxTdHJpbmc+IGVtYWlscyA9IG5ldyBIYXNoU2V0PFN0cmluZz4oKTsKKyAgICAgIGZvciAoUmV2Q29tbWl0IGMgOiBjb2RlUmV2aWV3Q29tbWl0cykgeworICAgICAgICB0cnkgeworICAgICAgICAgIHJ3LnBhcnNlQm9keShjKTsKKyAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgICAgIGxvZy53YXJuKCJDYW5ub3QgcGFyc2UgY29tbWl0ICIgKyBjLm5hbWUoKSwgZSk7CisgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgZW1haWxzLmFkZChjLmdldEF1dGhvcklkZW50KCkuZ2V0RW1haWxBZGRyZXNzKCkpOworICAgICAgfQorCisgICAgICBmaW5hbCBUaW1lc3RhbXAgZHQgPSBzdWJtaXR0ZXIuZ2V0R3JhbnRlZCgpOworICAgICAgZmluYWwgVGltZVpvbmUgdHogPSBteUlkZW50LmdldFRpbWVab25lKCk7CisgICAgICBpZiAoZW1haWxzLnNpemUoKSA9PSAxCisgICAgICAgICAgJiYgd2hvLmdldEVtYWlsQWRkcmVzc2VzKCkuY29udGFpbnMoZW1haWxzLml0ZXJhdG9yKCkubmV4dCgpKSkgeworICAgICAgICBhdXRob3JJZGVudCA9CisgICAgICAgICAgICBuZXcgUGVyc29uSWRlbnQoY29kZVJldmlld0NvbW1pdHMuZ2V0KDApLmdldEF1dGhvcklkZW50KCksIGR0LCB0eik7CisgICAgICB9IGVsc2UgeworICAgICAgICBhdXRob3JJZGVudCA9IHdoby5uZXdDb21taXR0ZXJJZGVudChkdCwgdHopOworICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICBhdXRob3JJZGVudCA9IG15SWRlbnQ7CisgICAgfQorICAgIHJldHVybiBhdXRob3JJZGVudDsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGNhbk1lcmdlKGZpbmFsIE1lcmdlU29ydGVyIG1lcmdlU29ydGVyLAorICAgICAgZmluYWwgUmVwb3NpdG9yeSByZXBvLCBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKQorICAgICAgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBpZiAoaGFzTWlzc2luZ0RlcGVuZGVuY2llcyhtZXJnZVNvcnRlciwgdG9NZXJnZSkpIHsKKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBmaW5hbCBUaHJlZVdheU1lcmdlciBtID0gbmV3VGhyZWVXYXlNZXJnZXIocmVwbywgY3JlYXRlRHJ5UnVuSW5zZXJ0ZXIoKSk7CisgICAgdHJ5IHsKKyAgICAgIHJldHVybiBtLm1lcmdlKG5ldyBBbnlPYmplY3RJZFtdIHttZXJnZVRpcCwgdG9NZXJnZX0pOworICAgIH0gY2F0Y2ggKE5vTWVyZ2VCYXNlRXhjZXB0aW9uIGUpIHsKKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBtZXJnZSAiICsgdG9NZXJnZS5uYW1lKCksIGUpOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGNhbkZhc3RGb3J3YXJkKGZpbmFsIE1lcmdlU29ydGVyIG1lcmdlU29ydGVyLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwgZmluYWwgUmV2V2FsayBydywKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBpZiAoaGFzTWlzc2luZ0RlcGVuZGVuY2llcyhtZXJnZVNvcnRlciwgdG9NZXJnZSkpIHsKKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICB0cnkgeworICAgICAgcmV0dXJuIG1lcmdlVGlwID09IG51bGwgfHwgcncuaXNNZXJnZWRJbnRvKG1lcmdlVGlwLCB0b01lcmdlKTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBmYXN0LWZvcndhcmQgdGVzdCBkdXJpbmcgbWVyZ2UiLCBlKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBjYW5DaGVycnlQaWNrKGZpbmFsIE1lcmdlU29ydGVyIG1lcmdlU29ydGVyLAorICAgICAgZmluYWwgUmVwb3NpdG9yeSByZXBvLCBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLCBmaW5hbCBSZXZXYWxrIHJ3LAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIGlmIChtZXJnZVRpcCA9PSBudWxsKSB7CisgICAgICAvLyBUaGUgYnJhbmNoIGlzIHVuYm9ybi4gRmFzdC1mb3J3YXJkIGlzIHBvc3NpYmxlLgorICAgICAgLy8KKyAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIGlmICh0b01lcmdlLmdldFBhcmVudENvdW50KCkgPT0gMCkgeworICAgICAgLy8gUmVmdXNlIHRvIG1lcmdlIGEgcm9vdCBjb21taXQgaW50byBhbiBleGlzdGluZyBicmFuY2gsCisgICAgICAvLyB3ZSBjYW5ub3Qgb2J0YWluIGEgZGVsdGEgZm9yIHRoZSBjaGVycnktcGljayB0byBhcHBseS4KKyAgICAgIC8vCisgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgaWYgKHRvTWVyZ2UuZ2V0UGFyZW50Q291bnQoKSA9PSAxKSB7CisgICAgICAvLyBJZiB0aGVyZSBpcyBvbmx5IG9uZSBwYXJlbnQsIGEgY2hlcnJ5LXBpY2sgY2FuIGJlIGRvbmUgYnkKKyAgICAgIC8vIHRha2luZyB0aGUgZGVsdGEgcmVsYXRpdmUgdG8gdGhhdCBvbmUgcGFyZW50IGFuZCByZWRvaW5nCisgICAgICAvLyB0aGF0IG9uIHRoZSBjdXJyZW50IG1lcmdlIHRpcC4KKyAgICAgIC8vCisgICAgICB0cnkgeworICAgICAgICBmaW5hbCBUaHJlZVdheU1lcmdlciBtID0KKyAgICAgICAgICAgIG5ld1RocmVlV2F5TWVyZ2VyKHJlcG8sIGNyZWF0ZURyeVJ1bkluc2VydGVyKCkpOworICAgICAgICBtLnNldEJhc2UodG9NZXJnZS5nZXRQYXJlbnQoMCkpOworICAgICAgICByZXR1cm4gbS5tZXJnZShtZXJnZVRpcCwgdG9NZXJnZSk7CisgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG1lcmdlICIgKyB0b01lcmdlLm5hbWUoKSwgZSk7CisgICAgICB9CisgICAgfQorCisgICAgLy8gVGhlcmUgYXJlIG11bHRpcGxlIHBhcmVudHMsIHNvIHRoaXMgaXMgYSBtZXJnZSBjb21taXQuIFdlCisgICAgLy8gZG9uJ3Qgd2FudCB0byBjaGVycnktcGljayB0aGUgbWVyZ2UgYXMgY2xpZW50cyBjYW4ndCBlYXNpbHkKKyAgICAvLyByZWJhc2UgdGhlaXIgaGlzdG9yeSB3aXRoIHRoYXQgbWVyZ2UgcHJlc2VudCBhbmQgcmVwbGFjZWQKKyAgICAvLyBieSBhbiBlcXVpdmFsZW50IG1lcmdlIHdpdGggYSBkaWZmZXJlbnQgZmlyc3QgcGFyZW50LiBTbworICAgIC8vIGluc3RlYWQgYmVoYXZlIGFzIHRob3VnaCBNRVJHRV9JRl9ORUNFU1NBUlkgd2FzIGNvbmZpZ3VyZWQuCisgICAgLy8KKyAgICByZXR1cm4gY2FuRmFzdEZvcndhcmQobWVyZ2VTb3J0ZXIsIG1lcmdlVGlwLCBydywgdG9NZXJnZSkKKyAgICAgICAgfHwgY2FuTWVyZ2UobWVyZ2VTb3J0ZXIsIHJlcG8sIG1lcmdlVGlwLCB0b01lcmdlKTsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGhhc01pc3NpbmdEZXBlbmRlbmNpZXMoZmluYWwgTWVyZ2VTb3J0ZXIgbWVyZ2VTb3J0ZXIsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgdHJ5IHsKKyAgICAgIHJldHVybiAhbWVyZ2VTb3J0ZXIuc29ydChDb2xsZWN0aW9ucy5zaW5nbGV0b24odG9NZXJnZSkpLmNvbnRhaW5zKHRvTWVyZ2UpOworICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQnJhbmNoIGhlYWQgc29ydGluZyBmYWlsZWQiLCBlKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgT2JqZWN0SW5zZXJ0ZXIgY3JlYXRlRHJ5UnVuSW5zZXJ0ZXIoKSB7CisgICAgcmV0dXJuIG5ldyBPYmplY3RJbnNlcnRlcigpIHsKKyAgICAgIHByaXZhdGUgZmluYWwgTXV0YWJsZU9iamVjdElkIGJ1ZiA9IG5ldyBNdXRhYmxlT2JqZWN0SWQoKTsKKyAgICAgIHByaXZhdGUgZmluYWwgc3RhdGljIGludCBMQVNUX0JZVEUgPSBDb25zdGFudHMuT0JKRUNUX0lEX0xFTkdUSCAtIDE7CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIE9iamVjdElkIGluc2VydChpbnQgb2JqZWN0VHlwZSwgbG9uZyBsZW5ndGgsIElucHV0U3RyZWFtIGluKQorICAgICAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgICAgIC8vIGNyZWF0ZSBub24tZXhpc3RpbmcgZHVtbXkgSUQKKyAgICAgICAgYnVmLnNldEJ5dGUoTEFTVF9CWVRFLCBidWYuZ2V0Qnl0ZShMQVNUX0JZVEUpICsgMSk7CisgICAgICAgIHJldHVybiBidWYuY29weSgpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBQYWNrUGFyc2VyIG5ld1BhY2tQYXJzZXIoSW5wdXRTdHJlYW0gaW4pIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgICAgIHRocm93IG5ldyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbigpOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIGZsdXNoKCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICAgICAgLy8gRG8gbm90aGluZy4KKyAgICAgIH0KKworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgdm9pZCByZWxlYXNlKCkgeworICAgICAgICAvLyBEbyBub3RoaW5nLgorICAgICAgfQorICAgIH07CisgIH0KKworICBwdWJsaWMgQ29kZVJldmlld0NvbW1pdCBtZXJnZU9uZUNvbW1pdChmaW5hbCBQZXJzb25JZGVudCBteUlkZW50LAorICAgICAgZmluYWwgUmVwb3NpdG9yeSByZXBvLCBmaW5hbCBSZXZXYWxrIHJ3LCBmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlciwKKyAgICAgIGZpbmFsIFJldkZsYWcgY2FuTWVyZ2VGbGFnLCBmaW5hbCBCcmFuY2guTmFtZUtleSBkZXN0QnJhbmNoLAorICAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwgZmluYWwgQ29kZVJldmlld0NvbW1pdCBuKQorICAgICAgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBUaHJlZVdheU1lcmdlciBtID0gbmV3VGhyZWVXYXlNZXJnZXIocmVwbywgaW5zZXJ0ZXIpOworICAgIHRyeSB7CisgICAgICBpZiAobS5tZXJnZShuZXcgQW55T2JqZWN0SWRbXSB7bWVyZ2VUaXAsIG59KSkgeworICAgICAgICByZXR1cm4gd3JpdGVNZXJnZUNvbW1pdChteUlkZW50LCBydywgaW5zZXJ0ZXIsIGNhbk1lcmdlRmxhZywgZGVzdEJyYW5jaCwKKyAgICAgICAgICAgIG1lcmdlVGlwLCBtLmdldFJlc3VsdFRyZWVJZCgpLCBuKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGZhaWxlZChydywgY2FuTWVyZ2VGbGFnLCBtZXJnZVRpcCwgbiwgQ29tbWl0TWVyZ2VTdGF0dXMuUEFUSF9DT05GTElDVCk7CisgICAgICB9CisgICAgfSBjYXRjaCAoTm9NZXJnZUJhc2VFeGNlcHRpb24gZSkgeworICAgICAgdHJ5IHsKKyAgICAgICAgZmFpbGVkKHJ3LCBjYW5NZXJnZUZsYWcsIG1lcmdlVGlwLCBuLAorICAgICAgICAgICAgZ2V0Q29tbWl0TWVyZ2VTdGF0dXMoZS5nZXRSZWFzb24oKSkpOworICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZTIpIHsKKyAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWVyZ2UgIiArIG4ubmFtZSgpLCBlKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCBtZXJnZSAiICsgbi5uYW1lKCksIGUpOworICAgIH0KKyAgICByZXR1cm4gbWVyZ2VUaXA7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBDb21taXRNZXJnZVN0YXR1cyBnZXRDb21taXRNZXJnZVN0YXR1cygKKyAgICAgIE1lcmdlQmFzZUZhaWx1cmVSZWFzb24gcmVhc29uKSB7CisgICAgc3dpdGNoIChyZWFzb24pIHsKKyAgICAgIGNhc2UgTVVMVElQTEVfTUVSR0VfQkFTRVNfTk9UX1NVUFBPUlRFRDoKKyAgICAgIGNhc2UgVE9PX01BTllfTUVSR0VfQkFTRVM6CisgICAgICBkZWZhdWx0OgorICAgICAgICByZXR1cm4gQ29tbWl0TWVyZ2VTdGF0dXMuTUFOVUFMX1JFQ1VSU0lWRV9NRVJHRTsKKyAgICAgIGNhc2UgQ09ORkxJQ1RTX0RVUklOR19NRVJHRV9CQVNFX0NBTENVTEFUSU9OOgorICAgICAgICByZXR1cm4gQ29tbWl0TWVyZ2VTdGF0dXMuUEFUSF9DT05GTElDVDsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBDb2RlUmV2aWV3Q29tbWl0IGZhaWxlZChmaW5hbCBSZXZXYWxrIHJ3LAorICAgICAgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWcsIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4sIGZpbmFsIENvbW1pdE1lcmdlU3RhdHVzIGZhaWx1cmUpCisgICAgICB0aHJvd3MgTWlzc2luZ09iamVjdEV4Y2VwdGlvbiwgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIHJ3LnJlc2V0UmV0YWluKGNhbk1lcmdlRmxhZyk7CisgICAgcncubWFya1N0YXJ0KG4pOworICAgIHJ3Lm1hcmtVbmludGVyZXN0aW5nKG1lcmdlVGlwKTsKKyAgICBDb2RlUmV2aWV3Q29tbWl0IGZhaWxlZDsKKyAgICB3aGlsZSAoKGZhaWxlZCA9IChDb2RlUmV2aWV3Q29tbWl0KSBydy5uZXh0KCkpICE9IG51bGwpIHsKKyAgICAgIGZhaWxlZC5zdGF0dXNDb2RlID0gZmFpbHVyZTsKKyAgICB9CisgICAgcmV0dXJuIGZhaWxlZDsKKyAgfQorCisgIHB1YmxpYyBDb2RlUmV2aWV3Q29tbWl0IHdyaXRlTWVyZ2VDb21taXQoZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudCwKKyAgICAgIGZpbmFsIFJldldhbGsgcncsIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyLAorICAgICAgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWcsIGZpbmFsIEJyYW5jaC5OYW1lS2V5IGRlc3RCcmFuY2gsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLCBmaW5hbCBPYmplY3RJZCB0cmVlSWQsCisgICAgICBmaW5hbCBDb2RlUmV2aWV3Q29tbWl0IG4pIHRocm93cyBJT0V4Y2VwdGlvbiwKKyAgICAgIE1pc3NpbmdPYmplY3RFeGNlcHRpb24sIEluY29ycmVjdE9iamVjdFR5cGVFeGNlcHRpb24geworICAgIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gbWVyZ2VkID0gbmV3IEFycmF5TGlzdDxDb2RlUmV2aWV3Q29tbWl0PigpOworICAgIHJ3LnJlc2V0UmV0YWluKGNhbk1lcmdlRmxhZyk7CisgICAgcncubWFya1N0YXJ0KG4pOworICAgIHJ3Lm1hcmtVbmludGVyZXN0aW5nKG1lcmdlVGlwKTsKKyAgICBmb3IgKGZpbmFsIFJldkNvbW1pdCBjIDogcncpIHsKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgY3JjID0gKENvZGVSZXZpZXdDb21taXQpIGM7CisgICAgICBpZiAoY3JjLnBhdGNoc2V0SWQgIT0gbnVsbCkgeworICAgICAgICBtZXJnZWQuYWRkKGNyYyk7CisgICAgICB9CisgICAgfQorCisgICAgZmluYWwgU3RyaW5nQnVpbGRlciBtc2didWYgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIGlmIChtZXJnZWQuc2l6ZSgpID09IDEpIHsKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgYyA9IG1lcmdlZC5nZXQoMCk7CisgICAgICBydy5wYXJzZUJvZHkoYyk7CisgICAgICBtc2didWYuYXBwZW5kKCJNZXJnZSBcIiIpOworICAgICAgbXNnYnVmLmFwcGVuZChjLmdldFNob3J0TWVzc2FnZSgpKTsKKyAgICAgIG1zZ2J1Zi5hcHBlbmQoIlwiIik7CisKKyAgICB9IGVsc2UgeworICAgICAgbXNnYnVmLmFwcGVuZCgiTWVyZ2UgY2hhbmdlcyAiKTsKKyAgICAgIGZvciAoZmluYWwgSXRlcmF0b3I8Q29kZVJldmlld0NvbW1pdD4gaSA9IG1lcmdlZC5pdGVyYXRvcigpOyBpLmhhc05leHQoKTspIHsKKyAgICAgICAgbXNnYnVmLmFwcGVuZChpLm5leHQoKS5jaGFuZ2UuZ2V0S2V5KCkuYWJicmV2aWF0ZSgpKTsKKyAgICAgICAgaWYgKGkuaGFzTmV4dCgpKSB7CisgICAgICAgICAgbXNnYnVmLmFwcGVuZCgnLCcpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorCisgICAgaWYgKCFSX0hFQURTX01BU1RFUi5lcXVhbHMoZGVzdEJyYW5jaC5nZXQoKSkpIHsKKyAgICAgIG1zZ2J1Zi5hcHBlbmQoIiBpbnRvICIpOworICAgICAgbXNnYnVmLmFwcGVuZChkZXN0QnJhbmNoLmdldFNob3J0TmFtZSgpKTsKKyAgICB9CisKKyAgICBpZiAobWVyZ2VkLnNpemUoKSA+IDEpIHsKKyAgICAgIG1zZ2J1Zi5hcHBlbmQoIlxuXG4qIGNoYW5nZXM6XG4iKTsKKyAgICAgIGZvciAoZmluYWwgQ29kZVJldmlld0NvbW1pdCBjIDogbWVyZ2VkKSB7CisgICAgICAgIHJ3LnBhcnNlQm9keShjKTsKKyAgICAgICAgbXNnYnVmLmFwcGVuZCgiICAiKTsKKyAgICAgICAgbXNnYnVmLmFwcGVuZChjLmdldFNob3J0TWVzc2FnZSgpKTsKKyAgICAgICAgbXNnYnVmLmFwcGVuZCgiXG4iKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBQZXJzb25JZGVudCBhdXRob3JJZGVudCA9IGNvbXB1dGVNZXJnZUNvbW1pdEF1dGhvcihteUlkZW50LCBydywgbWVyZ2VkKTsKKworICAgIGZpbmFsIENvbW1pdEJ1aWxkZXIgbWVyZ2VDb21taXQgPSBuZXcgQ29tbWl0QnVpbGRlcigpOworICAgIG1lcmdlQ29tbWl0LnNldFRyZWVJZCh0cmVlSWQpOworICAgIG1lcmdlQ29tbWl0LnNldFBhcmVudElkcyhtZXJnZVRpcCwgbik7CisgICAgbWVyZ2VDb21taXQuc2V0QXV0aG9yKGF1dGhvcklkZW50KTsKKyAgICBtZXJnZUNvbW1pdC5zZXRDb21taXR0ZXIobXlJZGVudCk7CisgICAgbWVyZ2VDb21taXQuc2V0TWVzc2FnZShtc2didWYudG9TdHJpbmcoKSk7CisKKyAgICByZXR1cm4gKENvZGVSZXZpZXdDb21taXQpIHJ3LnBhcnNlQ29tbWl0KGNvbW1pdChpbnNlcnRlciwgbWVyZ2VDb21taXQpKTsKKyAgfQorCisgIHB1YmxpYyBUaHJlZVdheU1lcmdlciBuZXdUaHJlZVdheU1lcmdlcihmaW5hbCBSZXBvc2l0b3J5IHJlcG8sCisgICAgICBmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlcikgeworICAgIFRocmVlV2F5TWVyZ2VyIG07CisgICAgaWYgKHVzZUNvbnRlbnRNZXJnZSkgeworICAgICAgLy8gU2V0dGluZ3MgZm9yIHRoaXMgcHJvamVjdCBhbGxvdyB1cyB0byB0cnkgYW5kIGF1dG9tYXRpY2FsbHkgcmVzb2x2ZQorICAgICAgLy8gY29uZmxpY3RzIHdpdGhpbiBmaWxlcyBpZiBuZWVkZWQuIFVzZSBlaXRoZXIgdGhlIG9sZCByZXNvbHZlIG1lcmdlciBvcgorICAgICAgLy8gbmV3IHJlY3Vyc2l2ZSBtZXJnZXIsIGFuZCBpbnN0cnVjdCB0byBvcGVyYXRlIGluIGNvcmUuCisgICAgICBpZiAodXNlUmVjdXJzaXZlTWVyZ2UpIHsKKyAgICAgICAgbSA9IE1lcmdlU3RyYXRlZ3kuUkVDVVJTSVZFLm5ld01lcmdlcihyZXBvLCB0cnVlKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIG0gPSBNZXJnZVN0cmF0ZWd5LlJFU09MVkUubmV3TWVyZ2VyKHJlcG8sIHRydWUpOworICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAvLyBObyBhdXRvIGNvbmZsaWN0IHJlc29sdmluZyBhbGxvd2VkLiBJZiBhbnkgb2YgdGhlCisgICAgICAvLyBhZmZlY3RlZCBmaWxlcyB3YXMgbW9kaWZpZWQsIG1lcmdlIHdpbGwgZmFpbC4KKyAgICAgIG0gPSBNZXJnZVN0cmF0ZWd5LlNJTVBMRV9UV09fV0FZX0lOX0NPUkUubmV3TWVyZ2VyKHJlcG8pOworICAgIH0KKyAgICBtLnNldE9iamVjdEluc2VydGVyKG5ldyBPYmplY3RJbnNlcnRlci5GaWx0ZXIoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCBPYmplY3RJbnNlcnRlciBkZWxlZ2F0ZSgpIHsKKyAgICAgICAgcmV0dXJuIGluc2VydGVyOworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIGZsdXNoKCkgeworICAgICAgfQorCisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIHJlbGVhc2UoKSB7CisgICAgICB9CisgICAgfSk7CisgICAgcmV0dXJuIG07CisgIH0KKworICBwdWJsaWMgT2JqZWN0SWQgY29tbWl0KGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyLAorICAgICAgZmluYWwgQ29tbWl0QnVpbGRlciBtZXJnZUNvbW1pdCkgdGhyb3dzIElPRXhjZXB0aW9uLAorICAgICAgVW5zdXBwb3J0ZWRFbmNvZGluZ0V4Y2VwdGlvbiB7CisgICAgT2JqZWN0SWQgaWQgPSBpbnNlcnRlci5pbnNlcnQobWVyZ2VDb21taXQpOworICAgIGluc2VydGVyLmZsdXNoKCk7CisgICAgcmV0dXJuIGlkOworICB9CisKKyAgcHVibGljIFBhdGNoU2V0QXBwcm92YWwgbWFya0NsZWFuTWVyZ2VzKGZpbmFsIFJldldhbGsgcncsCisgICAgICBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZywgZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBpZiAobWVyZ2VUaXAgPT0gbnVsbCkgeworICAgICAgLy8gSWYgbWVyZ2VUaXAgaXMgbnVsbCBoZXJlLCBicmFuY2hUaXAgd2FzIG51bGwsIGluZGljYXRpbmcgYSBuZXcgYnJhbmNoCisgICAgICAvLyBhdCB0aGUgc3RhcnQgb2YgdGhlIG1lcmdlIHByb2Nlc3MuIFdlIGFsc28gZWxlY3RlZCB0byBtZXJnZSBub3RoaW5nLAorICAgICAgLy8gcHJvYmFibHkgZHVlIHRvIG1pc3NpbmcgZGVwZW5kZW5jaWVzLiBOb3RoaW5nIHdhcyBjbGVhbmx5IG1lcmdlZC4KKyAgICAgIC8vCisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisKKyAgICB0cnkgeworICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXRBcHByb3ZhbCA9IG51bGw7CisKKyAgICAgIHJ3LnJlc2V0UmV0YWluKGNhbk1lcmdlRmxhZyk7CisgICAgICBydy5zb3J0KFJldlNvcnQuVE9QTyk7CisgICAgICBydy5zb3J0KFJldlNvcnQuUkVWRVJTRSwgdHJ1ZSk7CisgICAgICBydy5tYXJrU3RhcnQobWVyZ2VUaXApOworICAgICAgZm9yIChSZXZDb21taXQgYyA6IGFscmVhZHlBY2NlcHRlZCkgeworICAgICAgICBydy5tYXJrVW5pbnRlcmVzdGluZyhjKTsKKyAgICAgIH0KKworICAgICAgQ29kZVJldmlld0NvbW1pdCBjOworICAgICAgd2hpbGUgKChjID0gKENvZGVSZXZpZXdDb21taXQpIHJ3Lm5leHQoKSkgIT0gbnVsbCkgeworICAgICAgICBpZiAoYy5wYXRjaHNldElkICE9IG51bGwpIHsKKyAgICAgICAgICBjLnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9NRVJHRTsKKyAgICAgICAgICBpZiAoc3VibWl0QXBwcm92YWwgPT0gbnVsbCkgeworICAgICAgICAgICAgc3VibWl0QXBwcm92YWwgPSBnZXRTdWJtaXR0ZXIoYy5wYXRjaHNldElkKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0KKworICAgICAgcmV0dXJuIHN1Ym1pdEFwcHJvdmFsOworICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBNZXJnZUV4Y2VwdGlvbigiQ2Fubm90IG1hcmsgY2xlYW4gbWVyZ2VzIiwgZSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXRhRGF0YVVwZGF0ZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTWV0YURhdGFVcGRhdGUuamF2YQppbmRleCA4NmRjMTljLi5kYzA4YTZjIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NZXRhRGF0YVVwZGF0ZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L01ldGFEYXRhVXBkYXRlLmphdmEKQEAgLTI0LDYgKzI0LDcgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5SZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb247CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29tbWl0QnVpbGRlcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWZVcGRhdGU7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKIAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CkBAIC04NywxNSArODgsMTUgQEAKICAgICAgICAgQEFzc2lzdGVkIFJlcG9zaXRvcnkgZGIpOwogICB9CiAKLSAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uOworICBwcml2YXRlIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgZ2l0UmVmVXBkYXRlZDsKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWU7CiAgIHByaXZhdGUgZmluYWwgUmVwb3NpdG9yeSBkYjsKICAgcHJpdmF0ZSBmaW5hbCBDb21taXRCdWlsZGVyIGNvbW1pdDsKIAogICBASW5qZWN0Ci0gIHB1YmxpYyBNZXRhRGF0YVVwZGF0ZShHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uLAorICBwdWJsaWMgTWV0YURhdGFVcGRhdGUoR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkLAogICAgICAgQEFzc2lzdGVkIFByb2plY3QuTmFtZUtleSBwcm9qZWN0TmFtZSwgQEFzc2lzdGVkIFJlcG9zaXRvcnkgZGIpIHsKLSAgICB0aGlzLnJlcGxpY2F0aW9uID0gcmVwbGljYXRpb247CisgICAgdGhpcy5naXRSZWZVcGRhdGVkID0gZ2l0UmVmVXBkYXRlZDsKICAgICB0aGlzLnByb2plY3ROYW1lID0gcHJvamVjdE5hbWU7CiAgICAgdGhpcy5kYiA9IGRiOwogICAgIHRoaXMuY29tbWl0ID0gbmV3IENvbW1pdEJ1aWxkZXIoKTsKQEAgLTEwNiw2ICsxMDcsMTIgQEAKICAgICBnZXRDb21taXRCdWlsZGVyKCkuc2V0TWVzc2FnZShtZXNzYWdlKTsKICAgfQogCisgIHB1YmxpYyB2b2lkIHNldEF1dGhvcihJZGVudGlmaWVkVXNlciB1c2VyKSB7CisgICAgZ2V0Q29tbWl0QnVpbGRlcigpLnNldEF1dGhvcih1c2VyLm5ld0NvbW1pdHRlcklkZW50KAorICAgICAgICBnZXRDb21taXRCdWlsZGVyKCkuZ2V0Q29tbWl0dGVyKCkuZ2V0V2hlbigpLAorICAgICAgICBnZXRDb21taXRCdWlsZGVyKCkuZ2V0Q29tbWl0dGVyKCkuZ2V0VGltZVpvbmUoKSkpOworICB9CisKICAgLyoqIENsb3NlIHRoZSBjYWNoZWQgUmVwb3NpdG9yeSBoYW5kbGUuICovCiAgIHB1YmxpYyB2b2lkIGNsb3NlKCkgewogICAgIGdldFJlcG9zaXRvcnkoKS5jbG9zZSgpOwpAQCAtMTIzLDcgKzEzMCw3IEBACiAgICAgcmV0dXJuIGNvbW1pdDsKICAgfQogCi0gIHZvaWQgcmVwbGljYXRlKFN0cmluZyByZWYpIHsKLSAgICByZXBsaWNhdGlvbi5maXJlKHByb2plY3ROYW1lLCByZWYpOworICB2b2lkIGZpcmVHaXRSZWZVcGRhdGVkRXZlbnQoUmVmVXBkYXRlIHJ1KSB7CisgICAgZ2l0UmVmVXBkYXRlZC5maXJlKHByb2plY3ROYW1lLCBydSk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L011bHRpUHJvZ3Jlc3NNb25pdG9yLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9NdWx0aVByb2dyZXNzTW9uaXRvci5qYXZhCmluZGV4IDIzZDhkYWQuLjljNTYzM2IgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L011bHRpUHJvZ3Jlc3NNb25pdG9yLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTXVsdGlQcm9ncmVzc01vbml0b3IuamF2YQpAQCAtMTgzLDYgKzE4Myw3IEBACiAgICAgICBmaW5hbCBUaW1lVW5pdCB0aW1lb3V0VW5pdCkgdGhyb3dzIEV4ZWN1dGlvbkV4Y2VwdGlvbiB7CiAgICAgbG9uZyBvdmVyYWxsU3RhcnQgPSBTeXN0ZW0ubmFub1RpbWUoKTsKICAgICBsb25nIGRlYWRsaW5lOworICAgIFN0cmluZyBkZXRhaWxNZXNzYWdlID0gIiI7CiAgICAgaWYgKHRpbWVvdXRUaW1lID4gMCkgewogICAgICAgZGVhZGxpbmUgPSBvdmVyYWxsU3RhcnQgKyBOQU5PU0VDT05EUy5jb252ZXJ0KHRpbWVvdXRUaW1lLCB0aW1lb3V0VW5pdCk7CiAgICAgfSBlbHNlIHsKQEAgLTIwNCwxMCArMjA1LDE1IEBACiAgICAgICAgIGxvbmcgbm93ID0gU3lzdGVtLm5hbm9UaW1lKCk7CiAKICAgICAgICAgaWYgKGRlYWRsaW5lID4gMCAmJiBub3cgPiBkZWFkbGluZSkgewotICAgICAgICAgIGxvZy53YXJuKFN0cmluZy5mb3JtYXQoCi0gICAgICAgICAgICAgICJNdWx0aVByb2dyZXNzTW9uaXRvciB3b3JrZXIga2lsbGVkIGFmdGVyICVzbXMiLAotICAgICAgICAgICAgICBUaW1lVW5pdC5NSUxMSVNFQ09ORFMuY29udmVydChub3cgLSBvdmVyYWxsU3RhcnQsIE5BTk9TRUNPTkRTKSkpOwogICAgICAgICAgIHdvcmtlckZ1dHVyZS5jYW5jZWwodHJ1ZSk7CisgICAgICAgICAgaWYgKHdvcmtlckZ1dHVyZS5pc0NhbmNlbGxlZCgpKSB7CisgICAgICAgICAgICBkZXRhaWxNZXNzYWdlID0gU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAgIih0aW1lb3V0ICVzbXMsIGNhbmNlbGxlZCkiLAorICAgICAgICAgICAgICAgICAgICBUaW1lVW5pdC5NSUxMSVNFQ09ORFMuY29udmVydChub3cgLSBkZWFkbGluZSwgTkFOT1NFQ09ORFMpKTsKKyAgICAgICAgICAgIGxvZy53YXJuKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAgICAgICAgICJNdWx0aVByb2dyZXNzTW9uaXRvciB3b3JrZXIga2lsbGVkIGFmdGVyICVzbXMiICsgZGV0YWlsTWVzc2FnZSwgLy8KKyAgICAgICAgICAgICAgICAgICAgVGltZVVuaXQuTUlMTElTRUNPTkRTLmNvbnZlcnQobm93IC0gb3ZlcmFsbFN0YXJ0LCBOQU5PU0VDT05EUykpKTsKKyAgICAgICAgICB9CiAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIApAQCAtMjM1LDcgKzI0MSw3IEBACiAgICAgfSBjYXRjaCAoSW50ZXJydXB0ZWRFeGNlcHRpb24gZSkgewogICAgICAgdGhyb3cgbmV3IEV4ZWN1dGlvbkV4Y2VwdGlvbihlKTsKICAgICB9IGNhdGNoIChDYW5jZWxsYXRpb25FeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgbmV3IEV4ZWN1dGlvbkV4Y2VwdGlvbihlKTsKKyAgICAgIHRocm93IG5ldyBFeGVjdXRpb25FeGNlcHRpb24oZGV0YWlsTWVzc2FnZSwgZSk7CiAgICAgfSBjYXRjaCAoVGltZW91dEV4Y2VwdGlvbiBlKSB7CiAgICAgICB3b3JrZXJGdXR1cmUuY2FuY2VsKHRydWUpOwogICAgICAgdGhyb3cgbmV3IEV4ZWN1dGlvbkV4Y2VwdGlvbihlKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L05vdGVzQnJhbmNoVXRpbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTm90ZXNCcmFuY2hVdGlsLmphdmEKaW5kZXggMTdjZmVhOC4uMmM2YzdiOCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTm90ZXNCcmFuY2hVdGlsLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvTm90ZXNCcmFuY2hVdGlsLmphdmEKQEAgLTE0LDcgKzE0LDkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5leHRlbnNpb25zLmV2ZW50cy5HaXRSZWZlcmVuY2VVcGRhdGVkOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKIApAQCAtNDcsMTQgKzQ5LDE4IEBACiAgKi8KIHB1YmxpYyBjbGFzcyBOb3Rlc0JyYW5jaFV0aWwgewogICBwdWJsaWMgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIE5vdGVzQnJhbmNoVXRpbCBjcmVhdGUoUmVwb3NpdG9yeSBkYik7CisgICAgTm90ZXNCcmFuY2hVdGlsIGNyZWF0ZShQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgUmVwb3NpdG9yeSBkYiwKKyAgICAgICAgT2JqZWN0SW5zZXJ0ZXIgaW5zZXJ0ZXIpOwogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IE1BWF9MT0NLX0ZBSUxVUkVfQ0FMTFMgPSAxMDsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IFNMRUVQX09OX0xPQ0tfRkFJTFVSRV9NUyA9IDI1OwogCi0gIHByaXZhdGUgUGVyc29uSWRlbnQgZ2Vycml0SWRlbnQ7CisgIHByaXZhdGUgZmluYWwgUGVyc29uSWRlbnQgZ2Vycml0SWRlbnQ7CisgIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkOworICBwcml2YXRlIGZpbmFsIFByb2plY3QuTmFtZUtleSBwcm9qZWN0OwogICBwcml2YXRlIGZpbmFsIFJlcG9zaXRvcnkgZGI7CisgIHByaXZhdGUgZmluYWwgT2JqZWN0SW5zZXJ0ZXIgaW5zZXJ0ZXI7CiAKICAgcHJpdmF0ZSBSZXZDb21taXQgYmFzZUNvbW1pdDsKICAgcHJpdmF0ZSBOb3RlTWFwIGJhc2U7CkBAIC02Myw3ICs2OSw2IEBACiAgIHByaXZhdGUgTm90ZU1hcCBvdXJzOwogCiAgIHByaXZhdGUgUmV2V2FsayByZXZXYWxrOwotICBwcml2YXRlIE9iamVjdEluc2VydGVyIGluc2VydGVyOwogICBwcml2YXRlIE9iamVjdFJlYWRlciByZWFkZXI7CiAgIHByaXZhdGUgYm9vbGVhbiBvdmVyd3JpdGU7CiAKQEAgLTcxLDkgKzc2LDE1IEBACiAKICAgQEluamVjdAogICBwdWJsaWMgTm90ZXNCcmFuY2hVdGlsKEBHZXJyaXRQZXJzb25JZGVudCBmaW5hbCBQZXJzb25JZGVudCBnZXJyaXRJZGVudCwKLSAgICAgIEBBc3Npc3RlZCBSZXBvc2l0b3J5IGRiKSB7CisgICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQsCisgICAgICBAQXNzaXN0ZWQgUHJvamVjdC5OYW1lS2V5IHByb2plY3QsCisgICAgICBAQXNzaXN0ZWQgUmVwb3NpdG9yeSBkYiwKKyAgICAgIEBBc3Npc3RlZCBPYmplY3RJbnNlcnRlciBpbnNlcnRlcikgewogICAgIHRoaXMuZ2Vycml0SWRlbnQgPSBnZXJyaXRJZGVudDsKKyAgICB0aGlzLmdpdFJlZlVwZGF0ZWQgPSBnaXRSZWZVcGRhdGVkOworICAgIHRoaXMucHJvamVjdCA9IHByb2plY3Q7CiAgICAgdGhpcy5kYiA9IGRiOworICAgIHRoaXMuaW5zZXJ0ZXIgPSBpbnNlcnRlcjsKICAgfQogCiAgIC8qKgpAQCAtMTI4LDcgKzEzOSw2IEBACiAgICAgICBDb25jdXJyZW50UmVmVXBkYXRlRXhjZXB0aW9uIHsKICAgICB0cnkgewogICAgICAgcmV2V2FsayA9IG5ldyBSZXZXYWxrKGRiKTsKLSAgICAgIGluc2VydGVyID0gZGIubmV3T2JqZWN0SW5zZXJ0ZXIoKTsKICAgICAgIHJlYWRlciA9IGRiLm5ld09iamVjdFJlYWRlcigpOwogICAgICAgbG9hZEJhc2Uobm90ZXNCcmFuY2gpOwogICAgICAgaWYgKG92ZXJ3cml0ZSkgewpAQCAtMTQ0LDcgKzE1NCw2IEBACiAgICAgICB1cGRhdGVSZWYobm90ZXNCcmFuY2gpOwogICAgIH0gZmluYWxseSB7CiAgICAgICByZXZXYWxrLnJlbGVhc2UoKTsKLSAgICAgIGluc2VydGVyLnJlbGVhc2UoKTsKICAgICAgIHJlYWRlci5yZWxlYXNlKCk7CiAgICAgfQogICB9CkBAIC0yNTIsNiArMjYxLDcgQEAKICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKCJDb3VsZG4ndCB1cGRhdGUgIiArIG5vdGVzQnJhbmNoICsgIi4gIgogICAgICAgICAgICAgKyByZXN1bHQubmFtZSgpKTsKICAgICAgIH0gZWxzZSB7CisgICAgICAgIGdpdFJlZlVwZGF0ZWQuZmlyZShwcm9qZWN0LCByZWZVcGRhdGUpOwogICAgICAgICBicmVhazsKICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9Ob3RpZnlDb25maWcuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L05vdGlmeUNvbmZpZy5qYXZhCmluZGV4IGJhMjgzM2QuLjNhMGMyNzggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L05vdGlmeUNvbmZpZy5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L05vdGlmeUNvbmZpZy5qYXZhCkBAIC0yNCwxMCArMjQsMTUgQEAKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiBwdWJsaWMgY2xhc3MgTm90aWZ5Q29uZmlnIGltcGxlbWVudHMgQ29tcGFyYWJsZTxOb3RpZnlDb25maWc+IHsKKyAgcHVibGljIHN0YXRpYyBlbnVtIEhlYWRlciB7CisgICAgVE8sIENDLCBCQ0M7CisgIH0KKwogICBwcml2YXRlIFN0cmluZyBuYW1lOwogICBwcml2YXRlIEVudW1TZXQ8Tm90aWZ5VHlwZT4gdHlwZXMgPSBFbnVtU2V0Lm9mKE5vdGlmeVR5cGUuQUxMKTsKICAgcHJpdmF0ZSBTdHJpbmcgZmlsdGVyOwogCisgIHByaXZhdGUgSGVhZGVyIGhlYWRlcjsKICAgcHJpdmF0ZSBTZXQ8R3JvdXBSZWZlcmVuY2U+IGdyb3VwcyA9IFNldHMubmV3SGFzaFNldCgpOwogICBwcml2YXRlIFNldDxBZGRyZXNzPiBhZGRyZXNzZXMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKIApAQCAtNjMsNiArNjgsMTQgQEAKICAgICB9CiAgIH0KIAorICBwdWJsaWMgSGVhZGVyIGdldEhlYWRlcigpIHsKKyAgICByZXR1cm4gaGVhZGVyOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0SGVhZGVyKEhlYWRlciBoZHIpIHsKKyAgICBoZWFkZXIgPSBoZHI7CisgIH0KKwogICBwdWJsaWMgU2V0PEdyb3VwUmVmZXJlbmNlPiBnZXRHcm91cHMoKSB7CiAgICAgcmV0dXJuIGdyb3VwczsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUGVyVGhyZWFkUmVxdWVzdFNjb3BlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9QZXJUaHJlYWRSZXF1ZXN0U2NvcGUuamF2YQppbmRleCA4YWVhNzNhLi5lN2JiMGFlIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9QZXJUaHJlYWRSZXF1ZXN0U2NvcGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9QZXJUaHJlYWRSZXF1ZXN0U2NvcGUuamF2YQpAQCAtMTUsNiArMTUsNyBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OwogCiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuUmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuUmVxdWVzdENvbnRleHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuVGhyZWFkTG9jYWxSZXF1ZXN0Q29udGV4dDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5UaHJlYWRMb2NhbFJlcXVlc3RTY29wZVByb3BhZ2F0b3I7CkBAIC01Miw4ICs1Myw5IEBACiAKICAgcHVibGljIHN0YXRpYyBjbGFzcyBQcm9wYWdhdG9yIGV4dGVuZHMgVGhyZWFkTG9jYWxSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yPENvbnRleHQ+IHsKICAgICBASW5qZWN0Ci0gICAgUHJvcGFnYXRvcihUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsKSB7Ci0gICAgICBzdXBlcihSRVFVRVNULCBjdXJyZW50LCBsb2NhbCk7CisgICAgUHJvcGFnYXRvcihUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsLAorICAgICAgICBQcm92aWRlcjxSZXF1ZXN0U2NvcGVkUmV2aWV3RGJQcm92aWRlcj4gZGJQcm92aWRlclByb3ZpZGVyKSB7CisgICAgICBzdXBlcihSRVFVRVNULCBjdXJyZW50LCBsb2NhbCwgZGJQcm92aWRlclByb3ZpZGVyKTsKICAgICB9CiAKICAgICBAT3ZlcnJpZGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Byb2plY3RDb25maWcuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Byb2plY3RDb25maWcuamF2YQppbmRleCAxM2U5OTY3Li4yYTI2MGU0ZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUHJvamVjdENvbmZpZy5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Byb2plY3RDb25maWcuamF2YQpAQCAtMTYsMTMgKzE2LDIzIEBACiAKIGltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbi5pc1Blcm1pc3Npb247CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLkNoYXJNYXRjaGVyOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuSm9pbmVyOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlNwbGl0dGVyOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlTGlzdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZVNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24ucHJpbWl0aXZlcy5TaG9ydHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjZXNzU2VjdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Db250cmlidXRvckFncmVlbWVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBSZWZlcmVuY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVmFsdWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUnVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUnVsZS5BY3Rpb247CkBAIC03OSw2ICs4OSw3IEBACiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBLRVlfRU1BSUwgPSAiZW1haWwiOwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZX0ZJTFRFUiA9ICJmaWx0ZXIiOwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZX1RZUEUgPSAidHlwZSI7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBLRVlfSEVBREVSID0gImhlYWRlciI7CiAKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIENBUEFCSUxJVFkgPSAiY2FwYWJpbGl0eSI7CiAKQEAgLTkzLDYgKzEwNCwxOSBAQAogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZX01FUkdFX0NPTlRFTlQgPSAibWVyZ2VDb250ZW50IjsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEtFWV9TVEFURSA9ICJzdGF0ZSI7CiAKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIERBU0hCT0FSRCA9ICJkYXNoYm9hcmQiOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZX0RFRkFVTFQgPSAiZGVmYXVsdCI7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBLRVlfTE9DQUxfREVGQVVMVCA9ICJsb2NhbC1kZWZhdWx0IjsKKworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgTEFCRUwgPSAibGFiZWwiOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZX0FCQlJFVklBVElPTiA9ICJhYmJyZXZpYXRpb24iOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZX0ZVTkNUSU9OID0gImZ1bmN0aW9uIjsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEtFWV9DT1BZX01JTl9TQ09SRSA9ICJjb3B5TWluU2NvcmUiOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgS0VZX1ZBTFVFID0gInZhbHVlIjsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEtFWV9DQU5fT1ZFUlJJREUgPSAiY2FuT3ZlcnJpZGUiOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTZXQ8U3RyaW5nPiBMQUJFTF9GVU5DVElPTlMgPSBJbW11dGFibGVTZXQub2YoCisgICAgICAiTWF4V2l0aEJsb2NrIiwgIk1heE5vQmxvY2siLCAiTm9CbG9jayIsICJOb09wIik7CisKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3VibWl0VHlwZSBkZWZhdWx0U3VibWl0QWN0aW9uID0KICAgICAgIFN1Ym1pdFR5cGUuTUVSR0VfSUZfTkVDRVNTQVJZOwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdGF0ZSBkZWZhdWx0U3RhdGVWYWx1ZSA9CkBAIC0xMDUsNiArMTI5LDcgQEAKICAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBBY2Nlc3NTZWN0aW9uPiBhY2Nlc3NTZWN0aW9uczsKICAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBDb250cmlidXRvckFncmVlbWVudD4gY29udHJpYnV0b3JBZ3JlZW1lbnRzOwogICBwcml2YXRlIE1hcDxTdHJpbmcsIE5vdGlmeUNvbmZpZz4gbm90aWZ5U2VjdGlvbnM7CisgIHByaXZhdGUgTWFwPFN0cmluZywgTGFiZWxUeXBlPiBsYWJlbFNlY3Rpb25zOwogICBwcml2YXRlIExpc3Q8VmFsaWRhdGlvbkVycm9yPiB2YWxpZGF0aW9uRXJyb3JzOwogICBwcml2YXRlIE9iamVjdElkIHJ1bGVzSWQ7CiAKQEAgLTIwMyw2ICsyMjgsMTAgQEAKICAgICByZXR1cm4gbm90aWZ5U2VjdGlvbnMudmFsdWVzKCk7CiAgIH0KIAorICBwdWJsaWMgTWFwPFN0cmluZywgTGFiZWxUeXBlPiBnZXRMYWJlbFNlY3Rpb25zKCkgeworICAgIHJldHVybiBsYWJlbFNlY3Rpb25zOworICB9CisKICAgcHVibGljIEdyb3VwUmVmZXJlbmNlIHJlc29sdmUoQWNjb3VudEdyb3VwIGdyb3VwKSB7CiAgICAgcmV0dXJuIHJlc29sdmUoR3JvdXBSZWZlcmVuY2UuZm9yR3JvdXAoZ3JvdXApKTsKICAgfQpAQCAtMjIzLDYgKzI1MiwxMSBAQAogICAgIHJldHVybiBncm91cHNCeVVVSUQuZ2V0KHV1aWQpOwogICB9CiAKKyAgLyoqIEByZXR1cm4gc2V0IG9mIGFsbCBncm91cHMgdXNlZCBieSB0aGlzIGNvbmZpZ3VyYXRpb24uICovCisgIHB1YmxpYyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGdldEFsbEdyb3VwVVVJRHMoKSB7CisgICAgcmV0dXJuIENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZVNldChncm91cHNCeVVVSUQua2V5U2V0KCkpOworICB9CisKICAgLyoqCiAgICAqIEByZXR1cm4gdGhlIHByb2plY3QncyBydWxlcy5wbCBPYmplY3RJZCwgaWYgcHJlc2VudCBpbiB0aGUgYnJhbmNoLgogICAgKiAgICBOdWxsIGlmIGl0IGRvZXNuJ3QgZXhpc3QuCkBAIC0yODIsMTggKzMxNiwyMiBAQAogICAgIH0KICAgICBwLnNldFBhcmVudE5hbWUocmMuZ2V0U3RyaW5nKEFDQ0VTUywgbnVsbCwgS0VZX0lOSEVSSVRfRlJPTSkpOwogCi0gICAgcC5zZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoZ2V0Qm9vbGVhbihyYywgUkVDRUlWRSwgS0VZX1JFUVVJUkVfQ09OVFJJQlVUT1JfQUdSRUVNRU5ULCBmYWxzZSkpOwotICAgIHAuc2V0VXNlU2lnbmVkT2ZmQnkoZ2V0Qm9vbGVhbihyYywgUkVDRUlWRSwgS0VZX1JFUVVJUkVfU0lHTkVEX09GRl9CWSwgZmFsc2UpKTsKLSAgICBwLnNldFJlcXVpcmVDaGFuZ2VJRChnZXRCb29sZWFuKHJjLCBSRUNFSVZFLCBLRVlfUkVRVUlSRV9DSEFOR0VfSUQsIGZhbHNlKSk7CisgICAgcC5zZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoZ2V0RW51bShyYywgUkVDRUlWRSwgbnVsbCwgS0VZX1JFUVVJUkVfQ09OVFJJQlVUT1JfQUdSRUVNRU5ULCBQcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbi5JTkhFUklUKSk7CisgICAgcC5zZXRVc2VTaWduZWRPZmZCeShnZXRFbnVtKHJjLCBSRUNFSVZFLCBudWxsLCBLRVlfUkVRVUlSRV9TSUdORURfT0ZGX0JZLCBQcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbi5JTkhFUklUKSk7CisgICAgcC5zZXRSZXF1aXJlQ2hhbmdlSUQoZ2V0RW51bShyYywgUkVDRUlWRSwgbnVsbCwgS0VZX1JFUVVJUkVfQ0hBTkdFX0lELCBQcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbi5JTkhFUklUKSk7CiAKICAgICBwLnNldFN1Ym1pdFR5cGUoZ2V0RW51bShyYywgU1VCTUlULCBudWxsLCBLRVlfQUNUSU9OLCBkZWZhdWx0U3VibWl0QWN0aW9uKSk7Ci0gICAgcC5zZXRVc2VDb250ZW50TWVyZ2UoZ2V0Qm9vbGVhbihyYywgU1VCTUlULCBLRVlfTUVSR0VfQ09OVEVOVCwgZmFsc2UpKTsKKyAgICBwLnNldFVzZUNvbnRlbnRNZXJnZShnZXRFbnVtKHJjLCBTVUJNSVQsIG51bGwsIEtFWV9NRVJHRV9DT05URU5ULCBQcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbi5JTkhFUklUKSk7CiAgICAgcC5zZXRTdGF0ZShnZXRFbnVtKHJjLCBQUk9KRUNULCBudWxsLCBLRVlfU1RBVEUsIGRlZmF1bHRTdGF0ZVZhbHVlKSk7CiAKKyAgICBwLnNldERlZmF1bHREYXNoYm9hcmQocmMuZ2V0U3RyaW5nKERBU0hCT0FSRCwgbnVsbCwgS0VZX0RFRkFVTFQpKTsKKyAgICBwLnNldExvY2FsRGVmYXVsdERhc2hib2FyZChyYy5nZXRTdHJpbmcoREFTSEJPQVJELCBudWxsLCBLRVlfTE9DQUxfREVGQVVMVCkpOworCiAgICAgbG9hZEFjY291bnRzU2VjdGlvbihyYywgZ3JvdXBzQnlOYW1lKTsKICAgICBsb2FkQ29udHJpYnV0b3JBZ3JlZW1lbnRzKHJjLCBncm91cHNCeU5hbWUpOwogICAgIGxvYWRBY2Nlc3NTZWN0aW9ucyhyYywgZ3JvdXBzQnlOYW1lKTsKICAgICBsb2FkTm90aWZ5U2VjdGlvbnMocmMsIGdyb3Vwc0J5TmFtZSk7CisgICAgbG9hZExhYmVsU2VjdGlvbnMocmMpOwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGxvYWRBY2NvdW50c1NlY3Rpb24oCkBAIC0zNjgsNiArNDA2LDkgQEAKICAgICAgICAgICBOT1RJRlksIHNlY3Rpb25OYW1lLCBLRVlfVFlQRSwKICAgICAgICAgICBOb3RpZnlUeXBlLkFMTCkpOwogICAgICAgbi5zZXRUeXBlcyh0eXBlcyk7CisgICAgICBuLnNldEhlYWRlcihDb25maWdVdGlsLmdldEVudW0ocmMsCisgICAgICAgICAgTk9USUZZLCBzZWN0aW9uTmFtZSwgS0VZX0hFQURFUiwKKyAgICAgICAgICBOb3RpZnlDb25maWcuSGVhZGVyLkJDQykpOwogCiAgICAgICBmb3IgKFN0cmluZyBkc3QgOiByYy5nZXRTdHJpbmdMaXN0KE5PVElGWSwgc2VjdGlvbk5hbWUsIEtFWV9FTUFJTCkpIHsKICAgICAgICAgaWYgKGRzdC5zdGFydHNXaXRoKCJncm91cCAiKSkgewpAQCAtNDgwLDYgKzUyMSw3MiBAQAogICAgIH0KICAgfQogCisgIHByaXZhdGUgc3RhdGljIExhYmVsVmFsdWUgcGFyc2VMYWJlbFZhbHVlKFN0cmluZyBzcmMpIHsKKyAgICBMaXN0PFN0cmluZz4gcGFydHMgPSBJbW11dGFibGVMaXN0LmNvcHlPZigKKyAgICAgICAgU3BsaXR0ZXIub24oQ2hhck1hdGNoZXIuV0hJVEVTUEFDRSkub21pdEVtcHR5U3RyaW5ncygpLmxpbWl0KDIpCisgICAgICAgIC5zcGxpdChzcmMpKTsKKyAgICBpZiAocGFydHMuaXNFbXB0eSgpKSB7CisgICAgICB0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCJlbXB0eSB2YWx1ZSIpOworICAgIH0KKyAgICByZXR1cm4gbmV3IExhYmVsVmFsdWUoCisgICAgICAgIFNob3J0cy5jaGVja2VkQ2FzdChQZXJtaXNzaW9uUnVsZS5wYXJzZUludChwYXJ0cy5nZXQoMCkpKSwKKyAgICAgICAgcGFydHMuZ2V0KDEpKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBsb2FkTGFiZWxTZWN0aW9ucyhDb25maWcgcmMpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgTWFwPFN0cmluZywgU3RyaW5nPiBsb3dlck5hbWVzID0gTWFwcy5uZXdIYXNoTWFwV2l0aEV4cGVjdGVkU2l6ZSgyKTsKKyAgICBsYWJlbFNlY3Rpb25zID0gTWFwcy5uZXdMaW5rZWRIYXNoTWFwKCk7CisgICAgZm9yIChTdHJpbmcgbmFtZSA6IHJjLmdldFN1YnNlY3Rpb25zKExBQkVMKSkgeworICAgICAgU3RyaW5nIGxvd2VyID0gbmFtZS50b0xvd2VyQ2FzZSgpOworICAgICAgaWYgKGxvd2VyTmFtZXMuY29udGFpbnNLZXkobG93ZXIpKSB7CisgICAgICAgIGVycm9yKG5ldyBWYWxpZGF0aW9uRXJyb3IoUFJPSkVDVF9DT05GSUcsIFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAiTGFiZWwgXCIlc1wiIGNvbmZsaWN0cyB3aXRoIFwiJXNcIiIsCisgICAgICAgICAgICBuYW1lLCBsb3dlck5hbWVzLmdldChsb3dlcikpKSk7CisgICAgICB9CisgICAgICBsb3dlck5hbWVzLnB1dChsb3dlciwgbmFtZSk7CisKKyAgICAgIExpc3Q8TGFiZWxWYWx1ZT4gdmFsdWVzID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgICBmb3IgKFN0cmluZyB2YWx1ZSA6IHJjLmdldFN0cmluZ0xpc3QoTEFCRUwsIG5hbWUsIEtFWV9WQUxVRSkpIHsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICB2YWx1ZXMuYWRkKHBhcnNlTGFiZWxWYWx1ZSh2YWx1ZSkpOworICAgICAgICB9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gbm90VmFsdWUpIHsKKyAgICAgICAgICBlcnJvcihuZXcgVmFsaWRhdGlvbkVycm9yKFBST0pFQ1RfQ09ORklHLCBTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgICAiSW52YWxpZCAlcyBcIiVzXCIgZm9yIGxhYmVsIFwiJXNcIjogJXMiLAorICAgICAgICAgICAgICBLRVlfVkFMVUUsIHZhbHVlLCBuYW1lLCBub3RWYWx1ZS5nZXRNZXNzYWdlKCkpKSk7CisgICAgICAgIH0KKyAgICAgIH0KKworICAgICAgTGFiZWxUeXBlIGxhYmVsOworICAgICAgdHJ5IHsKKyAgICAgICAgbGFiZWwgPSBuZXcgTGFiZWxUeXBlKG5hbWUsIHZhbHVlcyk7CisgICAgICB9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gYmFkTmFtZSkgeworICAgICAgICBlcnJvcihuZXcgVmFsaWRhdGlvbkVycm9yKFBST0pFQ1RfQ09ORklHLCBTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgIkludmFsaWQgbGFiZWwgXCIlc1wiIiwgbmFtZSkpKTsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgICBTdHJpbmcgYWJiciA9IHJjLmdldFN0cmluZyhMQUJFTCwgbmFtZSwgS0VZX0FCQlJFVklBVElPTik7CisgICAgICBpZiAoYWJiciAhPSBudWxsKSB7CisgICAgICAgIGxhYmVsLnNldEFiYnJldmlhdGVkTmFtZShhYmJyKTsKKyAgICAgIH0KKworICAgICAgU3RyaW5nIGZ1bmN0aW9uTmFtZSA9IE9iamVjdHMuZmlyc3ROb25OdWxsKAorICAgICAgICAgIHJjLmdldFN0cmluZyhMQUJFTCwgbmFtZSwgS0VZX0ZVTkNUSU9OKSwgIk1heFdpdGhCbG9jayIpOworICAgICAgaWYgKExBQkVMX0ZVTkNUSU9OUy5jb250YWlucyhmdW5jdGlvbk5hbWUpKSB7CisgICAgICAgIGxhYmVsLnNldEZ1bmN0aW9uTmFtZShmdW5jdGlvbk5hbWUpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgZXJyb3IobmV3IFZhbGlkYXRpb25FcnJvcihQUk9KRUNUX0NPTkZJRywgU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAgICJJbnZhbGlkICVzIGZvciBsYWJlbCBcIiVzXCIuIFZhbGlkIG5hbWVzIGFyZTogJXMiLAorICAgICAgICAgICAgS0VZX0ZVTkNUSU9OLCBuYW1lLCBKb2luZXIub24oIiwgIikuam9pbihMQUJFTF9GVU5DVElPTlMpKSkpOworICAgICAgICBsYWJlbC5zZXRGdW5jdGlvbk5hbWUobnVsbCk7CisgICAgICB9CisgICAgICBsYWJlbC5zZXRDb3B5TWluU2NvcmUoCisgICAgICAgICAgcmMuZ2V0Qm9vbGVhbihMQUJFTCwgbmFtZSwgS0VZX0NPUFlfTUlOX1NDT1JFLCBmYWxzZSkpOworICAgICAgbGFiZWwuc2V0Q2FuT3ZlcnJpZGUoCisgICAgICAgICAgcmMuZ2V0Qm9vbGVhbihMQUJFTCwgbmFtZSwgS0VZX0NBTl9PVkVSUklERSwgdHJ1ZSkpOworICAgICAgbGFiZWxTZWN0aW9ucy5wdXQobmFtZSwgbGFiZWwpOworICAgIH0KKyAgfQorCiAgIHByaXZhdGUgTWFwPFN0cmluZywgR3JvdXBSZWZlcmVuY2U+IHJlYWRHcm91cExpc3QoKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGdyb3Vwc0J5VVVJRCA9IG5ldyBIYXNoTWFwPEFjY291bnRHcm91cC5VVUlELCBHcm91cFJlZmVyZW5jZT4oKTsKICAgICBNYXA8U3RyaW5nLCBHcm91cFJlZmVyZW5jZT4gZ3JvdXBzQnlOYW1lID0KQEAgLTUyNSwyMSArNjMyLDI1IEBACiAgICAgfQogICAgIHNldChyYywgQUNDRVNTLCBudWxsLCBLRVlfSU5IRVJJVF9GUk9NLCBwLmdldFBhcmVudE5hbWUoKSk7CiAKLSAgICBzZXQocmMsIFJFQ0VJVkUsIG51bGwsIEtFWV9SRVFVSVJFX0NPTlRSSUJVVE9SX0FHUkVFTUVOVCwgcC5pc1VzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cygpKTsKLSAgICBzZXQocmMsIFJFQ0VJVkUsIG51bGwsIEtFWV9SRVFVSVJFX1NJR05FRF9PRkZfQlksIHAuaXNVc2VTaWduZWRPZmZCeSgpKTsKLSAgICBzZXQocmMsIFJFQ0VJVkUsIG51bGwsIEtFWV9SRVFVSVJFX0NIQU5HRV9JRCwgcC5pc1JlcXVpcmVDaGFuZ2VJRCgpKTsKKyAgICBzZXQocmMsIFJFQ0VJVkUsIG51bGwsIEtFWV9SRVFVSVJFX0NPTlRSSUJVVE9SX0FHUkVFTUVOVCwgcC5nZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoKSwgUHJvamVjdC5Jbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVCk7CisgICAgc2V0KHJjLCBSRUNFSVZFLCBudWxsLCBLRVlfUkVRVUlSRV9TSUdORURfT0ZGX0JZLCBwLmdldFVzZVNpZ25lZE9mZkJ5KCksIFByb2plY3QuSW5oZXJpdGFibGVCb29sZWFuLklOSEVSSVQpOworICAgIHNldChyYywgUkVDRUlWRSwgbnVsbCwgS0VZX1JFUVVJUkVfQ0hBTkdFX0lELCBwLmdldFJlcXVpcmVDaGFuZ2VJRCgpLCBQcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbi5JTkhFUklUKTsKIAogICAgIHNldChyYywgU1VCTUlULCBudWxsLCBLRVlfQUNUSU9OLCBwLmdldFN1Ym1pdFR5cGUoKSwgZGVmYXVsdFN1Ym1pdEFjdGlvbik7Ci0gICAgc2V0KHJjLCBTVUJNSVQsIG51bGwsIEtFWV9NRVJHRV9DT05URU5ULCBwLmlzVXNlQ29udGVudE1lcmdlKCkpOworICAgIHNldChyYywgU1VCTUlULCBudWxsLCBLRVlfTUVSR0VfQ09OVEVOVCwgcC5nZXRVc2VDb250ZW50TWVyZ2UoKSwgUHJvamVjdC5Jbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVCk7CiAKICAgICBzZXQocmMsIFBST0pFQ1QsIG51bGwsIEtFWV9TVEFURSwgcC5nZXRTdGF0ZSgpLCBudWxsKTsKIAorICAgIHNldChyYywgREFTSEJPQVJELCBudWxsLCBLRVlfREVGQVVMVCwgcC5nZXREZWZhdWx0RGFzaGJvYXJkKCkpOworICAgIHNldChyYywgREFTSEJPQVJELCBudWxsLCBLRVlfTE9DQUxfREVGQVVMVCwgcC5nZXRMb2NhbERlZmF1bHREYXNoYm9hcmQoKSk7CisKICAgICBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGtlZXBHcm91cHMgPSBuZXcgSGFzaFNldDxBY2NvdW50R3JvdXAuVVVJRD4oKTsKICAgICBzYXZlQWNjb3VudHNTZWN0aW9uKHJjLCBrZWVwR3JvdXBzKTsKICAgICBzYXZlQ29udHJpYnV0b3JBZ3JlZW1lbnRzKHJjLCBrZWVwR3JvdXBzKTsKICAgICBzYXZlQWNjZXNzU2VjdGlvbnMocmMsIGtlZXBHcm91cHMpOwogICAgIHNhdmVOb3RpZnlTZWN0aW9ucyhyYywga2VlcEdyb3Vwcyk7CiAgICAgZ3JvdXBzQnlVVUlELmtleVNldCgpLnJldGFpbkFsbChrZWVwR3JvdXBzKTsKKyAgICBzYXZlTGFiZWxTZWN0aW9ucyhyYyk7CiAKICAgICBzYXZlQ29uZmlnKFBST0pFQ1RfQ09ORklHLCByYyk7CiAgICAgc2F2ZUdyb3VwTGlzdCgpOwpAQCAtNTkzLDYgKzcwNCw4IEBACiAgICAgICBDb2xsZWN0aW9ucy5zb3J0KGFkZHJzKTsKICAgICAgIGVtYWlsLmFkZEFsbChhZGRycyk7CiAKKyAgICAgIHNldChyYywgTk9USUZZLCBuYy5nZXROYW1lKCksIEtFWV9IRUFERVIsCisgICAgICAgICAgbmMuZ2V0SGVhZGVyKCksIE5vdGlmeUNvbmZpZy5IZWFkZXIuQkNDKTsKICAgICAgIGlmIChlbWFpbC5pc0VtcHR5KCkpIHsKICAgICAgICAgcmMudW5zZXQoTk9USUZZLCBuYy5nZXROYW1lKCksIEtFWV9FTUFJTCk7CiAgICAgICB9IGVsc2UgewpAQCAtNzA3LDYgKzgyMCw1MyBAQAogICAgIH0KICAgfQogCisgIHByaXZhdGUgdm9pZCBzYXZlTGFiZWxTZWN0aW9ucyhDb25maWcgcmMpIHsKKyAgICBMaXN0PFN0cmluZz4gZXhpc3RpbmcgPSBMaXN0cy5uZXdBcnJheUxpc3QocmMuZ2V0U3Vic2VjdGlvbnMoTEFCRUwpKTsKKyAgICBpZiAoIUxpc3RzLm5ld0FycmF5TGlzdChsYWJlbFNlY3Rpb25zLmtleVNldCgpKS5lcXVhbHMoZXhpc3RpbmcpKSB7CisgICAgICAvLyBPcmRlciBvZiBzZWN0aW9ucyBjaGFuZ2VkLCByZW1vdmUgYW5kIHJld3JpdGUgdGhlbSBhbGwuCisgICAgICBmb3IgKFN0cmluZyBuYW1lIDogZXhpc3RpbmcpIHsKKyAgICAgICAgcmMudW5zZXRTZWN0aW9uKExBQkVMLCBuYW1lKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBTZXQ8U3RyaW5nPiB0b1Vuc2V0ID0gU2V0cy5uZXdIYXNoU2V0KGV4aXN0aW5nKTsKKyAgICBmb3IgKE1hcC5FbnRyeTxTdHJpbmcsIExhYmVsVHlwZT4gZSA6IGxhYmVsU2VjdGlvbnMuZW50cnlTZXQoKSkgeworICAgICAgU3RyaW5nIG5hbWUgPSBlLmdldEtleSgpOworICAgICAgTGFiZWxUeXBlIGxhYmVsID0gZS5nZXRWYWx1ZSgpOworICAgICAgdG9VbnNldC5yZW1vdmUobmFtZSk7CisgICAgICByYy5zZXRTdHJpbmcoTEFCRUwsIG5hbWUsIEtFWV9GVU5DVElPTiwgbGFiZWwuZ2V0RnVuY3Rpb25OYW1lKCkpOworCisgICAgICBpZiAoIUxhYmVsVHlwZS5kZWZhdWx0QWJicmV2aWF0aW9uKG5hbWUpCisgICAgICAgICAgLmVxdWFscyhsYWJlbC5nZXRBYmJyZXZpYXRlZE5hbWUoKSkpIHsKKyAgICAgICAgcmMuc2V0U3RyaW5nKAorICAgICAgICAgICAgTEFCRUwsIG5hbWUsIEtFWV9BQkJSRVZJQVRJT04sIGxhYmVsLmdldEFiYnJldmlhdGVkTmFtZSgpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHJjLnVuc2V0KExBQkVMLCBuYW1lLCBLRVlfQUJCUkVWSUFUSU9OKTsKKyAgICAgIH0KKyAgICAgIGlmIChsYWJlbC5pc0NvcHlNaW5TY29yZSgpKSB7CisgICAgICAgIHJjLnNldEJvb2xlYW4oTEFCRUwsIG5hbWUsIEtFWV9DT1BZX01JTl9TQ09SRSwgdHJ1ZSk7CisgICAgICB9IGVsc2UgeworICAgICAgICByYy51bnNldChMQUJFTCwgbmFtZSwgS0VZX0NPUFlfTUlOX1NDT1JFKTsKKyAgICAgIH0KKyAgICAgIGlmICghbGFiZWwuY2FuT3ZlcnJpZGUoKSkgeworICAgICAgICByYy5zZXRCb29sZWFuKExBQkVMLCBuYW1lLCBLRVlfQ0FOX09WRVJSSURFLCBmYWxzZSk7CisgICAgICB9IGVsc2UgeworICAgICAgICByYy51bnNldChMQUJFTCwgbmFtZSwgS0VZX0NBTl9PVkVSUklERSk7CisgICAgICB9CisKKyAgICAgIExpc3Q8U3RyaW5nPiB2YWx1ZXMgPQorICAgICAgICAgIExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShsYWJlbC5nZXRWYWx1ZXMoKS5zaXplKCkpOworICAgICAgZm9yIChMYWJlbFZhbHVlIHZhbHVlIDogbGFiZWwuZ2V0VmFsdWVzKCkpIHsKKyAgICAgICAgdmFsdWVzLmFkZCh2YWx1ZS5mb3JtYXQoKSk7CisgICAgICB9CisgICAgICByYy5zZXRTdHJpbmdMaXN0KExBQkVMLCBuYW1lLCBLRVlfVkFMVUUsIHZhbHVlcyk7CisgICAgfQorCisgICAgZm9yIChTdHJpbmcgbmFtZSA6IHRvVW5zZXQpIHsKKyAgICAgIHJjLnVuc2V0U2VjdGlvbihMQUJFTCwgbmFtZSk7CisgICAgfQorICB9CisKICAgcHJpdmF0ZSB2b2lkIHNhdmVHcm91cExpc3QoKSB0aHJvd3MgSU9FeGNlcHRpb24gewogICAgIGlmIChncm91cHNCeVVVSUQuaXNFbXB0eSgpKSB7CiAgICAgICBzYXZlRmlsZShHUk9VUF9MSVNULCBudWxsKTsKQEAgLTczNCwxNiArODk0LDYgQEAKICAgICBzYXZlVVRGOChHUk9VUF9MSVNULCBidWYudG9TdHJpbmcoKSk7CiAgIH0KIAotICBwcml2YXRlIGJvb2xlYW4gZ2V0Qm9vbGVhbihDb25maWcgcmMsIFN0cmluZyBzZWN0aW9uLCBTdHJpbmcgbmFtZSwKLSAgICAgIGJvb2xlYW4gZGVmYXVsdFZhbHVlKSB7Ci0gICAgdHJ5IHsKLSAgICAgIHJldHVybiByYy5nZXRCb29sZWFuKHNlY3Rpb24sIG5hbWUsIGRlZmF1bHRWYWx1ZSk7Ci0gICAgfSBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIGVycikgewotICAgICAgZXJyb3IobmV3IFZhbGlkYXRpb25FcnJvcihQUk9KRUNUX0NPTkZJRywgZXJyLmdldE1lc3NhZ2UoKSkpOwotICAgICAgcmV0dXJuIGRlZmF1bHRWYWx1ZTsKLSAgICB9Ci0gIH0KLQogICBwcml2YXRlIDxFIGV4dGVuZHMgRW51bTw/Pj4gRSBnZXRFbnVtKENvbmZpZyByYywgU3RyaW5nIHNlY3Rpb24sCiAgICAgICBTdHJpbmcgc3Vic2VjdGlvbiwgU3RyaW5nIG5hbWUsIEUgZGVmYXVsdFZhbHVlKSB7CiAgICAgdHJ5IHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlYmFzZUlmTmVjZXNzYXJ5LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWJhc2VJZk5lY2Vzc2FyeS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjg0OTBlYTEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWJhc2VJZk5lY2Vzc2FyeS5qYXZhCkBAIC0wLDAgKzEsMTYyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZWRldGFpbC5QYXRoQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZWRldGFpbC5SZWJhc2VDaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdElkOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitwdWJsaWMgY2xhc3MgUmViYXNlSWZOZWNlc3NhcnkgZXh0ZW5kcyBTdWJtaXRTdHJhdGVneSB7CisKKyAgcHJpdmF0ZSBmaW5hbCBSZWJhc2VDaGFuZ2UgcmViYXNlQ2hhbmdlOworICBwcml2YXRlIGZpbmFsIE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+IG5ld0NvbW1pdHM7CisKKyAgUmViYXNlSWZOZWNlc3NhcnkoZmluYWwgU3VibWl0U3RyYXRlZ3kuQXJndW1lbnRzIGFyZ3MsCisgICAgICBmaW5hbCBSZWJhc2VDaGFuZ2UgcmViYXNlQ2hhbmdlKSB7CisgICAgc3VwZXIoYXJncyk7CisgICAgdGhpcy5yZWJhc2VDaGFuZ2UgPSByZWJhc2VDaGFuZ2U7CisgICAgdGhpcy5uZXdDb21taXRzID0gbmV3IEhhc2hNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PigpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCBDb2RlUmV2aWV3Q29tbWl0IF9ydW4oZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICBDb2RlUmV2aWV3Q29tbWl0IG5ld01lcmdlVGlwID0gbWVyZ2VUaXA7CisgICAgc29ydCh0b01lcmdlKTsKKworICAgIHdoaWxlICghdG9NZXJnZS5pc0VtcHR5KCkpIHsKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbiA9IHRvTWVyZ2UucmVtb3ZlKDApOworCisgICAgICBpZiAobmV3TWVyZ2VUaXAgPT0gbnVsbCkgeworICAgICAgICAvLyBUaGUgYnJhbmNoIGlzIHVuYm9ybi4gVGFrZSBhIGZhc3QtZm9yd2FyZCByZXNvbHV0aW9uIHRvCisgICAgICAgIC8vIGNyZWF0ZSB0aGUgYnJhbmNoLgorICAgICAgICAvLworICAgICAgICBuZXdNZXJnZVRpcCA9IG47CisgICAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLkNMRUFOX01FUkdFOworCisgICAgICB9IGVsc2UgaWYgKG4uZ2V0UGFyZW50Q291bnQoKSA9PSAwKSB7CisgICAgICAgIC8vIFJlZnVzZSB0byBtZXJnZSBhIHJvb3QgY29tbWl0IGludG8gYW4gZXhpc3RpbmcgYnJhbmNoLAorICAgICAgICAvLyB3ZSBjYW5ub3Qgb2J0YWluIGEgZGVsdGEgZm9yIHRoZSByZWJhc2UgdG8gYXBwbHkuCisgICAgICAgIC8vCisgICAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLkNBTk5PVF9SRUJBU0VfUk9PVDsKKworICAgICAgfSBlbHNlIGlmIChuLmdldFBhcmVudENvdW50KCkgPT0gMSkgeworICAgICAgICBpZiAoYXJncy5tZXJnZVV0aWwuY2FuRmFzdEZvcndhcmQoCisgICAgICAgICAgICBhcmdzLm1lcmdlU29ydGVyLCBuZXdNZXJnZVRpcCwgYXJncy5ydywgbikpIHsKKyAgICAgICAgICBuZXdNZXJnZVRpcCA9IG47CisgICAgICAgICAgbi5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0U7CisKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICB0cnkgeworICAgICAgICAgICAgZmluYWwgUGF0Y2hTZXQgbmV3UGF0Y2hTZXQgPQorICAgICAgICAgICAgICAgIHJlYmFzZUNoYW5nZS5yZWJhc2UoYXJncy5yZXBvLCBhcmdzLnJ3LCBhcmdzLmluc2VydGVyLAorICAgICAgICAgICAgICAgICAgICBuLnBhdGNoc2V0SWQsIG4uY2hhbmdlLAorICAgICAgICAgICAgICAgICAgICBhcmdzLm1lcmdlVXRpbC5nZXRTdWJtaXR0ZXIobi5wYXRjaHNldElkKS5nZXRBY2NvdW50SWQoKSwKKyAgICAgICAgICAgICAgICAgICAgbmV3TWVyZ2VUaXAsIGFyZ3MubWVyZ2VVdGlsKTsKKyAgICAgICAgICAgIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgICAgICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgYSA6IGFyZ3MubWVyZ2VVdGlsLmdldEFwcHJvdmFsc0ZvckNvbW1pdChuKSkgeworICAgICAgICAgICAgICBhcHByb3ZhbHMuYWRkKG5ldyBQYXRjaFNldEFwcHJvdmFsKG5ld1BhdGNoU2V0LmdldElkKCksIGEpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGFyZ3MuZGIucGF0Y2hTZXRBcHByb3ZhbHMoKS5pbnNlcnQoYXBwcm92YWxzKTsKKyAgICAgICAgICAgIG5ld01lcmdlVGlwID0KKyAgICAgICAgICAgICAgICAoQ29kZVJldmlld0NvbW1pdCkgYXJncy5ydy5wYXJzZUNvbW1pdChPYmplY3RJZAorICAgICAgICAgICAgICAgICAgICAuZnJvbVN0cmluZyhuZXdQYXRjaFNldC5nZXRSZXZpc2lvbigpLmdldCgpKSk7CisgICAgICAgICAgICBuZXdNZXJnZVRpcC5jb3B5RnJvbShuKTsKKyAgICAgICAgICAgIG5ld01lcmdlVGlwLnBhdGNoc2V0SWQgPSBuZXdQYXRjaFNldC5nZXRJZCgpOworICAgICAgICAgICAgbmV3TWVyZ2VUaXAuY2hhbmdlID0KKyAgICAgICAgICAgICAgICBhcmdzLmRiLmNoYW5nZXMoKS5nZXQobmV3UGF0Y2hTZXQuZ2V0SWQoKS5nZXRQYXJlbnRLZXkoKSk7CisgICAgICAgICAgICBuZXdNZXJnZVRpcC5zdGF0dXNDb2RlID0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fUkVCQVNFOworICAgICAgICAgICAgbmV3Q29tbWl0cy5wdXQobmV3UGF0Y2hTZXQuZ2V0SWQoKS5nZXRQYXJlbnRLZXkoKSwgbmV3TWVyZ2VUaXApOworICAgICAgICAgICAgc2V0UmVmTG9nSWRlbnQoYXJncy5tZXJnZVV0aWwuZ2V0U3VibWl0dGVyKG4ucGF0Y2hzZXRJZCkpOworICAgICAgICAgIH0gY2F0Y2ggKFBhdGhDb25mbGljdEV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICBuLnN0YXR1c0NvZGUgPSBDb21taXRNZXJnZVN0YXR1cy5QQVRIX0NPTkZMSUNUOworICAgICAgICAgIH0gY2F0Y2ggKE5vU3VjaENoYW5nZUV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCByZWJhc2UgIiArIG4ubmFtZSgpLCBlKTsKKyAgICAgICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgeworICAgICAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgcmViYXNlICIgKyBuLm5hbWUoKSwgZSk7CisgICAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgcmViYXNlICIgKyBuLm5hbWUoKSwgZSk7CisgICAgICAgICAgfSBjYXRjaCAoSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNhbm5vdCByZWJhc2UgIiArIG4ubmFtZSgpLCBlKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgfSBlbHNlIGlmIChuLmdldFBhcmVudENvdW50KCkgPiAxKSB7CisgICAgICAgIC8vIFRoZXJlIGFyZSBtdWx0aXBsZSBwYXJlbnRzLCBzbyB0aGlzIGlzIGEgbWVyZ2UgY29tbWl0LiBXZQorICAgICAgICAvLyBkb24ndCB3YW50IHRvIHJlYmFzZSB0aGUgbWVyZ2UgYXMgY2xpZW50cyBjYW4ndCBlYXNpbHkKKyAgICAgICAgLy8gcmViYXNlIHRoZWlyIGhpc3Rvcnkgd2l0aCB0aGF0IG1lcmdlIHByZXNlbnQgYW5kIHJlcGxhY2VkCisgICAgICAgIC8vIGJ5IGFuIGVxdWl2YWxlbnQgbWVyZ2Ugd2l0aCBhIGRpZmZlcmVudCBmaXJzdCBwYXJlbnQuIFNvCisgICAgICAgIC8vIGluc3RlYWQgYmVoYXZlIGFzIHRob3VnaCBNRVJHRV9JRl9ORUNFU1NBUlkgd2FzIGNvbmZpZ3VyZWQuCisgICAgICAgIC8vCisgICAgICAgIHRyeSB7CisgICAgICAgICAgaWYgKGFyZ3MucncuaXNNZXJnZWRJbnRvKG5ld01lcmdlVGlwLCBuKSkgeworICAgICAgICAgICAgbmV3TWVyZ2VUaXAgPSBuOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBuZXdNZXJnZVRpcCA9IGFyZ3MubWVyZ2VVdGlsLm1lcmdlT25lQ29tbWl0KAorICAgICAgICAgICAgICAgIGFyZ3MubXlJZGVudCwgYXJncy5yZXBvLCBhcmdzLnJ3LCBhcmdzLmluc2VydGVyLAorICAgICAgICAgICAgICAgIGFyZ3MuY2FuTWVyZ2VGbGFnLCBhcmdzLmRlc3RCcmFuY2gsIG5ld01lcmdlVGlwLCBuKTsKKyAgICAgICAgICB9CisgICAgICAgICAgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBzdWJtaXRBcHByb3ZhbCA9IGFyZ3MubWVyZ2VVdGlsLm1hcmtDbGVhbk1lcmdlcygKKyAgICAgICAgICAgICAgYXJncy5ydywgYXJncy5jYW5NZXJnZUZsYWcsIG5ld01lcmdlVGlwLCBhcmdzLmFscmVhZHlBY2NlcHRlZCk7CisgICAgICAgICAgc2V0UmVmTG9nSWRlbnQoc3VibWl0QXBwcm92YWwpOworICAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgdGhyb3cgbmV3IE1lcmdlRXhjZXB0aW9uKCJDYW5ub3QgbWVyZ2UgIiArIG4ubmFtZSgpLCBlKTsKKyAgICAgICAgfQorICAgICAgfQorCisgICAgICBhcmdzLmFscmVhZHlBY2NlcHRlZC5hZGQobmV3TWVyZ2VUaXApOworICAgIH0KKworICAgIHJldHVybiBuZXdNZXJnZVRpcDsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBzb3J0KGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gdG9Tb3J0KSB0aHJvd3MgTWVyZ2VFeGNlcHRpb24geworICAgIHRyeSB7CisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHNvcnRlZCA9CisgICAgICAgICAgbmV3IFJlYmFzZVNvcnRlcihhcmdzLnJ3LCBhcmdzLmFscmVhZHlBY2NlcHRlZCwgYXJncy5jYW5NZXJnZUZsYWcpCisgICAgICAgICAgICAgIC5zb3J0KHRvU29ydCk7CisgICAgICB0b1NvcnQuY2xlYXIoKTsKKyAgICAgIHRvU29ydC5hZGRBbGwoc29ydGVkKTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oIkNvbW1pdCBzb3J0aW5nIGZhaWxlZCIsIGUpOworICAgIH0KKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgTWFwPENoYW5nZS5JZCwgQ29kZVJldmlld0NvbW1pdD4gZ2V0TmV3Q29tbWl0cygpIHsKKyAgICByZXR1cm4gbmV3Q29tbWl0czsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgYm9vbGVhbiBkcnlSdW4oZmluYWwgQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gIWFyZ3MubWVyZ2VVdGlsLmhhc01pc3NpbmdEZXBlbmRlbmNpZXMoYXJncy5tZXJnZVNvcnRlciwgdG9NZXJnZSkKKyAgICAgICAgJiYgYXJncy5tZXJnZVV0aWwuY2FuQ2hlcnJ5UGljayhhcmdzLm1lcmdlU29ydGVyLCBhcmdzLnJlcG8sIG1lcmdlVGlwLAorICAgICAgICAgICAgYXJncy5ydywgdG9NZXJnZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlYmFzZVNvcnRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmViYXNlU29ydGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWMxOTI5YgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlYmFzZVNvcnRlci5qYXZhCkBAIC0wLDAgKzEsOTEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkNvbW1pdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2RmxhZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2V2FsazsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK2NsYXNzIFJlYmFzZVNvcnRlciB7CisKKyAgcHJpdmF0ZSBmaW5hbCBSZXZXYWxrIHJ3OworICBwcml2YXRlIGZpbmFsIFJldkZsYWcgY2FuTWVyZ2VGbGFnOworICBwcml2YXRlIGZpbmFsIFNldDxSZXZDb21taXQ+IGFjY2VwdGVkOworCisgIFJlYmFzZVNvcnRlcihmaW5hbCBSZXZXYWxrIHJ3LCBmaW5hbCBTZXQ8UmV2Q29tbWl0PiBhbHJlYWR5QWNjZXB0ZWQsCisgICAgICBmaW5hbCBSZXZGbGFnIGNhbk1lcmdlRmxhZykgeworICAgIHRoaXMucncgPSBydzsKKyAgICB0aGlzLmNhbk1lcmdlRmxhZyA9IGNhbk1lcmdlRmxhZzsKKyAgICB0aGlzLmFjY2VwdGVkID0gYWxyZWFkeUFjY2VwdGVkOworICB9CisKKyAgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiBzb3J0KENvbGxlY3Rpb248Q29kZVJldmlld0NvbW1pdD4gaW5jb21pbmcpCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIGZpbmFsIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gc29ydGVkID0gbmV3IEFycmF5TGlzdDxDb2RlUmV2aWV3Q29tbWl0PigpOworICAgIGZpbmFsIFNldDxDb2RlUmV2aWV3Q29tbWl0PiBzb3J0ID0gbmV3IEhhc2hTZXQ8Q29kZVJldmlld0NvbW1pdD4oaW5jb21pbmcpOworICAgIHdoaWxlICghc29ydC5pc0VtcHR5KCkpIHsKKyAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgbiA9IHJlbW92ZU9uZShzb3J0KTsKKworICAgICAgcncucmVzZXRSZXRhaW4oY2FuTWVyZ2VGbGFnKTsKKyAgICAgIHJ3Lm1hcmtTdGFydChuKTsKKyAgICAgIGZvciAoUmV2Q29tbWl0IGMgOiBhY2NlcHRlZCkgeworICAgICAgICBydy5tYXJrVW5pbnRlcmVzdGluZyhjKTsKKyAgICAgIH0KKworICAgICAgQ29kZVJldmlld0NvbW1pdCBjOworICAgICAgZmluYWwgTGlzdDxDb2RlUmV2aWV3Q29tbWl0PiBjb250ZW50cyA9IG5ldyBBcnJheUxpc3Q8Q29kZVJldmlld0NvbW1pdD4oKTsKKyAgICAgIHdoaWxlICgoYyA9IChDb2RlUmV2aWV3Q29tbWl0KSBydy5uZXh0KCkpICE9IG51bGwpIHsKKyAgICAgICAgaWYgKCFjLmhhcyhjYW5NZXJnZUZsYWcpIHx8ICFpbmNvbWluZy5jb250YWlucyhjKSkgeworICAgICAgICAgIC8vIFdlIGNhbm5vdCBtZXJnZSBuIGFzIGl0IHdvdWxkIGJyaW5nIHNvbWV0aGluZyB3ZQorICAgICAgICAgIC8vIGFyZW4ndCBwZXJtaXR0ZWQgdG8gbWVyZ2UgYXQgdGhpcyB0aW1lLiBEcm9wIG4uCisgICAgICAgICAgLy8KKyAgICAgICAgICBpZiAobi5taXNzaW5nID09IG51bGwpIHsKKyAgICAgICAgICAgIG4uc3RhdHVzQ29kZSA9IENvbW1pdE1lcmdlU3RhdHVzLk1JU1NJTkdfREVQRU5ERU5DWTsKKyAgICAgICAgICAgIG4ubWlzc2luZyA9IG5ldyBBcnJheUxpc3Q8Q29kZVJldmlld0NvbW1pdD4oKTsKKyAgICAgICAgICB9CisgICAgICAgICAgbi5taXNzaW5nLmFkZCgoQ29kZVJldmlld0NvbW1pdCkgYyk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgY29udGVudHMuYWRkKGMpOworICAgICAgICB9CisgICAgICB9CisKKyAgICAgIGlmIChuLnN0YXR1c0NvZGUgPT0gQ29tbWl0TWVyZ2VTdGF0dXMuTUlTU0lOR19ERVBFTkRFTkNZKSB7CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBzb3J0LnJlbW92ZUFsbChjb250ZW50cyk7CisgICAgICBDb2xsZWN0aW9ucy5yZXZlcnNlKGNvbnRlbnRzKTsKKyAgICAgIHNvcnRlZC5yZW1vdmVBbGwoY29udGVudHMpOworICAgICAgc29ydGVkLmFkZEFsbChjb250ZW50cyk7CisgICAgfQorICAgIHJldHVybiBzb3J0ZWQ7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyA8VD4gVCByZW1vdmVPbmUoZmluYWwgQ29sbGVjdGlvbjxUPiBjKSB7CisgICAgZmluYWwgSXRlcmF0b3I8VD4gaSA9IGMuaXRlcmF0b3IoKTsKKyAgICBmaW5hbCBUIHIgPSBpLm5leHQoKTsKKyAgICBpLnJlbW92ZSgpOworICAgIHJldHVybiByOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWNlaXZlQ29tbWl0cy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmVjZWl2ZUNvbW1pdHMuamF2YQppbmRleCBhMmE4MDliLi5hNTQ3OGFiIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWNlaXZlQ29tbWl0cy5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlY2VpdmVDb21taXRzLmphdmEKQEAgLTE0LDE1ICsxNCwyMiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CiAKLWltcG9ydCBzdGF0aWMgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uc3RhbnRzLlJfSEVBRFM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2UuSU5JVElBTF9QQVRDSF9TRVRfSUQ7CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTXVsdGlQcm9ncmVzc01vbml0b3IuVU5LTk9XTjsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuTWFpbFV0aWwuZ2V0UmVjaXBpZW50c0Zyb21BcHByb3ZhbHM7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLk1haWxVdGlsLmdldFJlY2lwaWVudHNGcm9tRm9vdGVyczsKKworaW1wb3J0IHN0YXRpYyBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHMuUl9IRUFEUzsKIGltcG9ydCBzdGF0aWMgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuUmVjZWl2ZUNvbW1hbmQuUmVzdWx0Lk5PVF9BVFRFTVBURUQ7CiBpbXBvcnQgc3RhdGljIG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlJlY2VpdmVDb21tYW5kLlJlc3VsdC5PSzsKIGltcG9ydCBzdGF0aWMgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuUmVjZWl2ZUNvbW1hbmQuUmVzdWx0LlJFSkVDVEVEX01JU1NJTkdfT0JKRUNUOwogaW1wb3J0IHN0YXRpYyBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5SZWNlaXZlQ29tbWFuZC5SZXN1bHQuUkVKRUNURURfTk9ORkFTVEZPUldBUkQ7CiBpbXBvcnQgc3RhdGljIG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlJlY2VpdmVDb21tYW5kLlJlc3VsdC5SRUpFQ1RFRF9PVEhFUl9SRUFTT047CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLkZ1bmN0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuUHJlZGljYXRlOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3BsaXR0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSXRlcmFibGVzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlua2VkTGlzdE11bHRpbWFwOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdE11bHRpbWFwOwpAQCAtMzAsMTcgKzM3LDE5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi51dGlsLmNvbmN1cnJlbnQuQ2hlY2tlZEZ1dHVyZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi51dGlsLmNvbmN1cnJlbnQuRnV0dXJlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi51dGlsLmNvbmN1cnJlbnQuTGlzdGVuYWJsZUZ1dHVyZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi51dGlsLmNvbmN1cnJlbnQuTGlzdGVuaW5nRXhlY3V0b3JTZXJ2aWNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5DaGFuZ2VIb29rUnVubmVyLkhvb2tSZXN1bHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5QYWdlTGlua3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ2FwYWJsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb25SdWxlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoQWNjb3VudEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFuY2VzdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CkBAIC01MSwxMiArNjAsMTggQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuR2Vycml0UGVyc29uSWRlbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRSZXNvbHZlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkNoYW5nZUluc2VydGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQWxsUHJvamVjdHNOYW1lOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ2Fub25pY2FsV2ViVXJsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuVHJhY2tpbmdGb290ZXJzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuQ29tbWl0UmVjZWl2ZWRFdmVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk11bHRpUHJvZ3Jlc3NNb25pdG9yLlRhc2s7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC52YWxpZGF0b3JzLkNvbW1pdFZhbGlkYXRpb25FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC52YWxpZGF0b3JzLkNvbW1pdFZhbGlkYXRpb25NZXNzYWdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQudmFsaWRhdG9ycy5Db21taXRWYWxpZGF0b3JzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkNyZWF0ZUNoYW5nZVNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5NYWlsVXRpbC5NYWlsUmVjaXBpZW50czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5NZXJnZWRTZW5kZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUmVwbGFjZVBhdGNoU2V0U2VuZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9GYWN0b3J5OwpAQCAtNjUsMTcgKzgwLDE5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdFN0YXRlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlJlZkNvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLk1hZ2ljQnJhbmNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLlJlcXVlc3RTY29wZVByb3BhZ2F0b3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQudXRpbC5jbGkuQ21kTGluZVBhcnNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuQXRvbWljVXBkYXRlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlJlc3VsdFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuU2NoZW1hRmFjdG9yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CiAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5JbmNvcnJlY3RPYmplY3RUeXBlRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLk1pc3NpbmdPYmplY3RFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQWJicmV2aWF0ZWRPYmplY3RJZDsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5CYXRjaFJlZlVwZGF0ZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CkBAIC05MywxMyArMTEwLDE4IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLmZpbHRlci5SZXZGaWx0ZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuQWR2ZXJ0aXNlUmVmc0hvb2s7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuQWR2ZXJ0aXNlUmVmc0hvb2tDaGFpbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5CYXNlUmVjZWl2ZVBhY2s7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuUmVjZWl2ZUNvbW1hbmQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuUmVjZWl2ZUNvbW1hbmQuUmVzdWx0OwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlJlY2VpdmVQYWNrOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJhbnNwb3J0LlVwbG9hZFBhY2s7CitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLkNtZExpbmVFeGNlcHRpb247CitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKIGltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOwogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwogCiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLlN0cmluZ1dyaXRlcjsKIGltcG9ydCBqYXZhLnNxbC5UaW1lc3RhbXA7CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKQEAgLTEwOSw2ICsxMzEsNyBAQAogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5DYWxsYWJsZTsKIGltcG9ydCBqYXZhLnV0aWwucmVnZXguTWF0Y2hlcjsKIGltcG9ydCBqYXZhLnV0aWwucmVnZXguUGF0dGVybjsKIApAQCAtMTIyLDggKzE0NSw2IEBACiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFBhdHRlcm4gTkVXX1BBVENIU0VUID0KICAgICAgIFBhdHRlcm4uY29tcGlsZSgiXnJlZnMvY2hhbmdlcy8oPzpbMC05XVswLTldLyk/KFsxLTldWzAtOV0qKSg/Oi9uZXcpPyQiKTsKIAotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBGb290ZXJLZXkgUkVWSUVXRURfQlkgPSBuZXcgRm9vdGVyS2V5KCJSZXZpZXdlZC1ieSIpOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBGb290ZXJLZXkgVEVTVEVEX0JZID0gbmV3IEZvb3RlcktleSgiVGVzdGVkLWJ5Iik7CiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIEZvb3RlcktleSBDSEFOR0VfSUQgPSBuZXcgRm9vdGVyS2V5KCJDaGFuZ2UtSWQiKTsKIAogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgQ09NTUFORF9SRUpFQ1RJT05fTUVTU0FHRV9GT09URVIgPQpAQCAtMTM4LDYgKzE1OSw3IEBACiAgICAgICAgICsgIlRvIHB1c2ggaW50byB0aGlzIHJlZmVyZW5jZSB5b3UgbmVlZCAnUHVzaCcgcmlnaHRzLiIpLAogICAgICAgICBERUxFVEUoIllvdSBuZWVkICdQdXNoJyByaWdodHMgd2l0aCB0aGUgJ0ZvcmNlIFB1c2gnXG4iCiAgICAgICAgICAgICArICJmbGFnIHNldCB0byBkZWxldGUgcmVmZXJlbmNlcy4iKSwKKyAgICAgICAgREVMRVRFX0NIQU5HRVMoIkNhbm5vdCBkZWxldGUgZnJvbSAncmVmcy9jaGFuZ2VzJyIpLAogICAgICAgICBDT0RFX1JFVklFVygiWW91IG5lZWQgJ1B1c2gnIHJpZ2h0cyB0byB1cGxvYWQgY29kZSByZXZpZXcgcmVxdWVzdHMuXG4iCiAgICAgICAgICAgICArICJWZXJpZnkgdGhhdCB5b3UgYXJlIHB1c2hpbmcgdG8gdGhlIHJpZ2h0IGJyYW5jaC4iKTsKIApAQCAtMTk5LDYxICsyMjEsNjcgQEAKICAgICB9CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBjbGFzcyBNZXNzYWdlIHsKLSAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBtZXNzYWdlOwotICAgIHByaXZhdGUgZmluYWwgYm9vbGVhbiBpc0Vycm9yOworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBGdW5jdGlvbjxFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbj4gT1JNX0VYQ0VQVElPTiA9CisgICAgICBuZXcgRnVuY3Rpb248RXhjZXB0aW9uLCBPcm1FeGNlcHRpb24+KCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIE9ybUV4Y2VwdGlvbiBhcHBseShFeGNlcHRpb24gaW5wdXQpIHsKKyAgICAgICAgICBpZiAoaW5wdXQgaW5zdGFuY2VvZiBPcm1FeGNlcHRpb24pIHsKKyAgICAgICAgICAgIHJldHVybiAoT3JtRXhjZXB0aW9uKSBpbnB1dDsKKyAgICAgICAgICB9CisgICAgICAgICAgcmV0dXJuIG5ldyBPcm1FeGNlcHRpb24oIkVycm9yIHVwZGF0aW5nIGRhdGFiYXNlIiwgaW5wdXQpOworICAgICAgICB9CisgICAgICB9OwogCi0gICAgcHJpdmF0ZSBNZXNzYWdlKGZpbmFsIFN0cmluZyBtZXNzYWdlLCBmaW5hbCBib29sZWFuIGlzRXJyb3IpIHsKLSAgICAgIHRoaXMubWVzc2FnZSA9IG1lc3NhZ2U7Ci0gICAgICB0aGlzLmlzRXJyb3IgPSBpc0Vycm9yOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgZmluYWwgU2V0PEFjY291bnQuSWQ+IHJldmlld2VySWQgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPigpOwotICBwcml2YXRlIGZpbmFsIFNldDxBY2NvdW50LklkPiBjY0lkID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4oKTsKKyAgcHJpdmF0ZSBTZXQ8QWNjb3VudC5JZD4gcmV2aWV3ZXJzRnJvbUNvbW1hbmRMaW5lID0gU2V0cy5uZXdMaW5rZWRIYXNoU2V0KCk7CisgIHByaXZhdGUgU2V0PEFjY291bnQuSWQ+IGNjRnJvbUNvbW1hbmRMaW5lID0gU2V0cy5uZXdMaW5rZWRIYXNoU2V0KCk7CiAKICAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlcjsKICAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKKyAgcHJpdmF0ZSBmaW5hbCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzY2hlbWFGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIEFjY291bnRSZXNvbHZlciBhY2NvdW50UmVzb2x2ZXI7CisgIHByaXZhdGUgZmluYWwgQ21kTGluZVBhcnNlci5GYWN0b3J5IG9wdGlvblBhcnNlckZhY3Rvcnk7CiAgIHByaXZhdGUgZmluYWwgQ3JlYXRlQ2hhbmdlU2VuZGVyLkZhY3RvcnkgY3JlYXRlQ2hhbmdlU2VuZGVyRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBNZXJnZWRTZW5kZXIuRmFjdG9yeSBtZXJnZWRTZW5kZXJGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIFJlcGxhY2VQYXRjaFNldFNlbmRlci5GYWN0b3J5IHJlcGxhY2VQYXRjaFNldEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbjsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQ7CiAgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzOwogICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsc1V0aWwgYXBwcm92YWxzVXRpbDsKICAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcjsKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlOwogICBwcml2YXRlIGZpbmFsIFN0cmluZyBjYW5vbmljYWxXZWJVcmw7Ci0gIHByaXZhdGUgZmluYWwgUGVyc29uSWRlbnQgZ2Vycml0SWRlbnQ7CisgIHByaXZhdGUgZmluYWwgQ29tbWl0VmFsaWRhdG9ycy5GYWN0b3J5IGNvbW1pdFZhbGlkYXRvcnNGYWN0b3J5OwogICBwcml2YXRlIGZpbmFsIFRyYWNraW5nRm9vdGVycyB0cmFja2luZ0Zvb3RlcnM7CiAgIHByaXZhdGUgZmluYWwgVGFnQ2FjaGUgdGFnQ2FjaGU7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlSW5zZXJ0ZXIgY2hhbmdlSW5zZXJ0ZXI7CiAgIHByaXZhdGUgZmluYWwgV29ya1F1ZXVlIHdvcmtRdWV1ZTsKKyAgcHJpdmF0ZSBmaW5hbCBMaXN0ZW5pbmdFeGVjdXRvclNlcnZpY2UgY2hhbmdlVXBkYXRlRXhlY3RvcjsKICAgcHJpdmF0ZSBmaW5hbCBSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yIHJlcXVlc3RTY29wZVByb3BhZ2F0b3I7CisgIHByaXZhdGUgZmluYWwgU3NoSW5mbyBzc2hJbmZvOwogICBwcml2YXRlIGZpbmFsIEFsbFByb2plY3RzTmFtZSBhbGxQcm9qZWN0c05hbWU7CisgIHByaXZhdGUgZmluYWwgUmVjZWl2ZUNvbmZpZyByZWNlaXZlQ29uZmlnOwogCiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdENvbnRyb2w7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdCBwcm9qZWN0OworICBwcml2YXRlIGZpbmFsIExhYmVsVHlwZXMgbGFiZWxUeXBlczsKICAgcHJpdmF0ZSBmaW5hbCBSZXBvc2l0b3J5IHJlcG87CiAgIHByaXZhdGUgZmluYWwgUmVjZWl2ZVBhY2sgcnA7CiAgIHByaXZhdGUgZmluYWwgTm90ZU1hcCByZWplY3RDb21taXRzOwotICBwcml2YXRlIFJlY2VpdmVDb21tYW5kIG5ld0NoYW5nZTsKLSAgcHJpdmF0ZSBCcmFuY2guTmFtZUtleSBkZXN0QnJhbmNoOwotICBwcml2YXRlIFJlZkNvbnRyb2wgZGVzdEJyYW5jaEN0bDsKKyAgcHJpdmF0ZSBNYWdpY0JyYW5jaElucHV0IG1hZ2ljQnJhbmNoOwogCiAgIHByaXZhdGUgTGlzdDxDcmVhdGVSZXF1ZXN0PiBuZXdDaGFuZ2VzID0gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CiAgIHByaXZhdGUgZmluYWwgTWFwPENoYW5nZS5JZCwgUmVwbGFjZVJlcXVlc3Q+IHJlcGxhY2VCeUNoYW5nZSA9CiAgICAgICBuZXcgSGFzaE1hcDxDaGFuZ2UuSWQsIFJlcGxhY2VSZXF1ZXN0PigpOwogICBwcml2YXRlIGZpbmFsIE1hcDxSZXZDb21taXQsIFJlcGxhY2VSZXF1ZXN0PiByZXBsYWNlQnlDb21taXQgPQogICAgICAgbmV3IEhhc2hNYXA8UmV2Q29tbWl0LCBSZXBsYWNlUmVxdWVzdD4oKTsKKyAgcHJpdmF0ZSBmaW5hbCBTZXQ8UmV2Q29tbWl0PiB2YWxpZENvbW1pdHMgPSBuZXcgSGFzaFNldDxSZXZDb21taXQ+KCk7CiAKICAgcHJpdmF0ZSBNYXA8T2JqZWN0SWQsIFJlZj4gcmVmc0J5SWQ7Ci0KLSAgcHJpdmF0ZSBTdHJpbmcgZGVzdFRvcGljTmFtZTsKKyAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBSZWY+IGFsbFJlZnM7CiAKICAgcHJpdmF0ZSBmaW5hbCBTdWJtb2R1bGVPcC5GYWN0b3J5IHN1Yk9wRmFjdG9yeTsKIAotICBwcml2YXRlIGZpbmFsIExpc3Q8TWVzc2FnZT4gbWVzc2FnZXMgPSBuZXcgQXJyYXlMaXN0PE1lc3NhZ2U+KCk7CisgIHByaXZhdGUgZmluYWwgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gbWVzc2FnZXMgPSBuZXcgQXJyYXlMaXN0PENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPigpOwogICBwcml2YXRlIExpc3RNdWx0aW1hcDxFcnJvciwgU3RyaW5nPiBlcnJvcnMgPSBMaW5rZWRMaXN0TXVsdGltYXAuY3JlYXRlKCk7CiAgIHByaXZhdGUgVGFzayBuZXdQcm9ncmVzczsKICAgcHJpdmF0ZSBUYXNrIHJlcGxhY2VQcm9ncmVzczsKQEAgLTI2NCw0OCArMjkyLDYyIEBACiAKICAgQEluamVjdAogICBSZWNlaXZlQ29tbWl0cyhmaW5hbCBSZXZpZXdEYiBkYiwKKyAgICAgIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYUZhY3RvcnksCiAgICAgICBmaW5hbCBBY2NvdW50UmVzb2x2ZXIgYWNjb3VudFJlc29sdmVyLAorICAgICAgZmluYWwgQ21kTGluZVBhcnNlci5GYWN0b3J5IG9wdGlvblBhcnNlckZhY3RvcnksCiAgICAgICBmaW5hbCBDcmVhdGVDaGFuZ2VTZW5kZXIuRmFjdG9yeSBjcmVhdGVDaGFuZ2VTZW5kZXJGYWN0b3J5LAogICAgICAgZmluYWwgTWVyZ2VkU2VuZGVyLkZhY3RvcnkgbWVyZ2VkU2VuZGVyRmFjdG9yeSwKICAgICAgIGZpbmFsIFJlcGxhY2VQYXRjaFNldFNlbmRlci5GYWN0b3J5IHJlcGxhY2VQYXRjaFNldEZhY3RvcnksCi0gICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uLAorICAgICAgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkLAogICAgICAgZmluYWwgUGF0Y2hTZXRJbmZvRmFjdG9yeSBwYXRjaFNldEluZm9GYWN0b3J5LAogICAgICAgZmluYWwgQ2hhbmdlSG9va3MgaG9va3MsCiAgICAgICBmaW5hbCBBcHByb3ZhbHNVdGlsIGFwcHJvdmFsc1V0aWwsCiAgICAgICBmaW5hbCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlLAogICAgICAgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXIsCiAgICAgICBmaW5hbCBUYWdDYWNoZSB0YWdDYWNoZSwKKyAgICAgIGZpbmFsIENoYW5nZUNhY2hlIGNoYW5nZUNhY2hlLAorICAgICAgZmluYWwgQ2hhbmdlSW5zZXJ0ZXIgY2hhbmdlSW5zZXJ0ZXIsCisgICAgICBmaW5hbCBDb21taXRWYWxpZGF0b3JzLkZhY3RvcnkgY29tbWl0VmFsaWRhdG9yc0ZhY3RvcnksCiAgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBmaW5hbCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsLAogICAgICAgQEdlcnJpdFBlcnNvbklkZW50IGZpbmFsIFBlcnNvbklkZW50IGdlcnJpdElkZW50LAogICAgICAgZmluYWwgVHJhY2tpbmdGb290ZXJzIHRyYWNraW5nRm9vdGVycywKICAgICAgIGZpbmFsIFdvcmtRdWV1ZSB3b3JrUXVldWUsCisgICAgICBAQ2hhbmdlVXBkYXRlRXhlY3V0b3IgTGlzdGVuaW5nRXhlY3V0b3JTZXJ2aWNlIGNoYW5nZVVwZGF0ZUV4ZWN0b3IsCiAgICAgICBmaW5hbCBSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yIHJlcXVlc3RTY29wZVByb3BhZ2F0b3IsCisgICAgICBmaW5hbCBTc2hJbmZvIHNzaEluZm8sCiAgICAgICBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lLAotCisgICAgICBSZWNlaXZlQ29uZmlnIGNvbmZpZywKICAgICAgIEBBc3Npc3RlZCBmaW5hbCBQcm9qZWN0Q29udHJvbCBwcm9qZWN0Q29udHJvbCwKICAgICAgIEBBc3Npc3RlZCBmaW5hbCBSZXBvc2l0b3J5IHJlcG8sCiAgICAgICBmaW5hbCBTdWJtb2R1bGVPcC5GYWN0b3J5IHN1Yk9wRmFjdG9yeSkgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICB0aGlzLmN1cnJlbnRVc2VyID0gKElkZW50aWZpZWRVc2VyKSBwcm9qZWN0Q29udHJvbC5nZXRDdXJyZW50VXNlcigpOwogICAgIHRoaXMuZGIgPSBkYjsKKyAgICB0aGlzLnNjaGVtYUZhY3RvcnkgPSBzY2hlbWFGYWN0b3J5OwogICAgIHRoaXMuYWNjb3VudFJlc29sdmVyID0gYWNjb3VudFJlc29sdmVyOworICAgIHRoaXMub3B0aW9uUGFyc2VyRmFjdG9yeSA9IG9wdGlvblBhcnNlckZhY3Rvcnk7CiAgICAgdGhpcy5jcmVhdGVDaGFuZ2VTZW5kZXJGYWN0b3J5ID0gY3JlYXRlQ2hhbmdlU2VuZGVyRmFjdG9yeTsKICAgICB0aGlzLm1lcmdlZFNlbmRlckZhY3RvcnkgPSBtZXJnZWRTZW5kZXJGYWN0b3J5OwogICAgIHRoaXMucmVwbGFjZVBhdGNoU2V0RmFjdG9yeSA9IHJlcGxhY2VQYXRjaFNldEZhY3Rvcnk7Ci0gICAgdGhpcy5yZXBsaWNhdGlvbiA9IHJlcGxpY2F0aW9uOworICAgIHRoaXMuZ2l0UmVmVXBkYXRlZCA9IGdpdFJlZlVwZGF0ZWQ7CiAgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKICAgICB0aGlzLmhvb2tzID0gaG9va3M7CiAgICAgdGhpcy5hcHByb3ZhbHNVdGlsID0gYXBwcm92YWxzVXRpbDsKICAgICB0aGlzLnByb2plY3RDYWNoZSA9IHByb2plY3RDYWNoZTsKICAgICB0aGlzLnJlcG9NYW5hZ2VyID0gcmVwb01hbmFnZXI7CiAgICAgdGhpcy5jYW5vbmljYWxXZWJVcmwgPSBjYW5vbmljYWxXZWJVcmw7Ci0gICAgdGhpcy5nZXJyaXRJZGVudCA9IGdlcnJpdElkZW50OwogICAgIHRoaXMudHJhY2tpbmdGb290ZXJzID0gdHJhY2tpbmdGb290ZXJzOwogICAgIHRoaXMudGFnQ2FjaGUgPSB0YWdDYWNoZTsKKyAgICB0aGlzLmNoYW5nZUluc2VydGVyID0gY2hhbmdlSW5zZXJ0ZXI7CisgICAgdGhpcy5jb21taXRWYWxpZGF0b3JzRmFjdG9yeSA9IGNvbW1pdFZhbGlkYXRvcnNGYWN0b3J5OwogICAgIHRoaXMud29ya1F1ZXVlID0gd29ya1F1ZXVlOworICAgIHRoaXMuY2hhbmdlVXBkYXRlRXhlY3RvciA9IGNoYW5nZVVwZGF0ZUV4ZWN0b3I7CiAgICAgdGhpcy5yZXF1ZXN0U2NvcGVQcm9wYWdhdG9yID0gcmVxdWVzdFNjb3BlUHJvcGFnYXRvcjsKKyAgICB0aGlzLnNzaEluZm8gPSBzc2hJbmZvOwogICAgIHRoaXMuYWxsUHJvamVjdHNOYW1lID0gYWxsUHJvamVjdHNOYW1lOworICAgIHRoaXMucmVjZWl2ZUNvbmZpZyA9IGNvbmZpZzsKIAogICAgIHRoaXMucHJvamVjdENvbnRyb2wgPSBwcm9qZWN0Q29udHJvbDsKKyAgICB0aGlzLmxhYmVsVHlwZXMgPSBwcm9qZWN0Q29udHJvbC5nZXRMYWJlbFR5cGVzKCk7CiAgICAgdGhpcy5wcm9qZWN0ID0gcHJvamVjdENvbnRyb2wuZ2V0UHJvamVjdCgpOwogICAgIHRoaXMucmVwbyA9IHJlcG87CiAgICAgdGhpcy5ycCA9IG5ldyBSZWNlaXZlUGFjayhyZXBvKTsKQEAgLTMyMSwxMCArMzYzLDI0IEBACiAgICAgcnAuc2V0Q2hlY2tSZWNlaXZlZE9iamVjdHModHJ1ZSk7CiAKICAgICBpZiAoIXByb2plY3RDb250cm9sLmFsbFJlZnNBcmVWaXNpYmxlKCkpIHsKLSAgICAgIHJwLnNldENoZWNrUmVmZXJlbmNlZE9iamVjdHNBcmVSZWFjaGFibGUodHJ1ZSk7Ci0gICAgICBycC5zZXRBZHZlcnRpc2VSZWZzSG9vayhuZXcgVmlzaWJsZVJlZkZpbHRlcih0YWdDYWNoZSwgcmVwbywgcHJvamVjdENvbnRyb2wsIGRiLCBmYWxzZSkpOworICAgICAgcnAuc2V0Q2hlY2tSZWZlcmVuY2VkT2JqZWN0c0FyZVJlYWNoYWJsZShjb25maWcuY2hlY2tSZWZlcmVuY2VkT2JqZWN0c0FyZVJlYWNoYWJsZSk7CisgICAgICBycC5zZXRBZHZlcnRpc2VSZWZzSG9vayhuZXcgVmlzaWJsZVJlZkZpbHRlcih0YWdDYWNoZSwgY2hhbmdlQ2FjaGUsIHJlcG8sIHByb2plY3RDb250cm9sLCBkYiwgZmFsc2UpKTsKICAgICB9Ci0gICAgTGlzdDxBZHZlcnRpc2VSZWZzSG9vaz4gYWR2SG9va3MgPSBuZXcgQXJyYXlMaXN0PEFkdmVydGlzZVJlZnNIb29rPigyKTsKKyAgICBMaXN0PEFkdmVydGlzZVJlZnNIb29rPiBhZHZIb29rcyA9IG5ldyBBcnJheUxpc3Q8QWR2ZXJ0aXNlUmVmc0hvb2s+KDMpOworICAgIGFkdkhvb2tzLmFkZChuZXcgQWR2ZXJ0aXNlUmVmc0hvb2soKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIGFkdmVydGlzZVJlZnMoQmFzZVJlY2VpdmVQYWNrIHJwKSB7CisgICAgICAgIGFsbFJlZnMgPSBycC5nZXRBZHZlcnRpc2VkUmVmcygpOworICAgICAgICBpZiAoYWxsUmVmcyA9PSBudWxsKSB7CisgICAgICAgICAgYWxsUmVmcyA9IHJwLmdldFJlcG9zaXRvcnkoKS5nZXRBbGxSZWZzKCk7CisgICAgICAgIH0KKyAgICAgICAgcnAuc2V0QWR2ZXJ0aXNlZFJlZnMoYWxsUmVmcywgcnAuZ2V0QWR2ZXJ0aXNlZE9iamVjdHMoKSk7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgYWR2ZXJ0aXNlUmVmcyhVcGxvYWRQYWNrIHVwbG9hZFBhY2spIHsKKyAgICAgIH0KKyAgICB9KTsKICAgICBhZHZIb29rcy5hZGQocnAuZ2V0QWR2ZXJ0aXNlUmVmc0hvb2soKSk7CiAgICAgYWR2SG9va3MuYWRkKG5ldyBSZWNlaXZlQ29tbWl0c0FkdmVydGlzZVJlZnNIb29rKCkpOwogICAgIHJwLnNldEFkdmVydGlzZVJlZnNIb29rKEFkdmVydGlzZVJlZnNIb29rQ2hhaW4ubmV3Q2hhaW4oYWR2SG9va3MpKTsKQEAgLTMzMiwxMiArMzg4LDEyIEBACiAKICAgLyoqIEFkZCByZXZpZXdlcnMgZm9yIG5ldyAob3IgdXBkYXRlZCkgY2hhbmdlcy4gKi8KICAgcHVibGljIHZvaWQgYWRkUmV2aWV3ZXJzKENvbGxlY3Rpb248QWNjb3VudC5JZD4gd2hvKSB7Ci0gICAgcmV2aWV3ZXJJZC5hZGRBbGwod2hvKTsKKyAgICByZXZpZXdlcnNGcm9tQ29tbWFuZExpbmUuYWRkQWxsKHdobyk7CiAgIH0KIAogICAvKiogQWRkIHJldmlld2VycyBmb3IgbmV3IChvciB1cGRhdGVkKSBjaGFuZ2VzLiAqLwogICBwdWJsaWMgdm9pZCBhZGRFeHRyYUNDKENvbGxlY3Rpb248QWNjb3VudC5JZD4gd2hvKSB7Ci0gICAgY2NJZC5hZGRBbGwod2hvKTsKKyAgICBjY0Zyb21Db21tYW5kTGluZS5hZGRBbGwod2hvKTsKICAgfQogCiAgIC8qKiBTZXQgYSBtZXNzYWdlIHNlbmRlciBmb3IgdGhpcyBvcGVyYXRpb24uICovCkBAIC00NDEsMjQgKzQ5NywyNiBAQAogICAgIGlmIChyZXN1bHQgIT0gQ2FwYWJsZS5PSykgewogICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9Ci0KLSAgICByZXR1cm4gTWFnaWNCcmFuY2guY2hlY2tNYWdpY0JyYW5jaFJlZnMocmVwbywgcHJvamVjdCk7CisgICAgaWYgKHJlY2VpdmVDb25maWcuY2hlY2tNYWdpY1JlZnMpIHsKKyAgICAgIHJlc3VsdCA9IE1hZ2ljQnJhbmNoLmNoZWNrTWFnaWNCcmFuY2hSZWZzKHJlcG8sIHByb2plY3QpOworICAgIH0KKyAgICByZXR1cm4gcmVzdWx0OwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGFkZE1lc3NhZ2UoU3RyaW5nIG1lc3NhZ2UpIHsKLSAgICBtZXNzYWdlcy5hZGQobmV3IE1lc3NhZ2UobWVzc2FnZSwgZmFsc2UpKTsKKyAgICBtZXNzYWdlcy5hZGQobmV3IENvbW1pdFZhbGlkYXRpb25NZXNzYWdlKG1lc3NhZ2UsIGZhbHNlKSk7CiAgIH0KIAogICB2b2lkIGFkZEVycm9yKFN0cmluZyBlcnJvcikgewotICAgIG1lc3NhZ2VzLmFkZChuZXcgTWVzc2FnZShlcnJvciwgdHJ1ZSkpOworICAgIG1lc3NhZ2VzLmFkZChuZXcgQ29tbWl0VmFsaWRhdGlvbk1lc3NhZ2UoZXJyb3IsIHRydWUpKTsKICAgfQogCiAgIHZvaWQgc2VuZE1lc3NhZ2VzKCkgewotICAgIGZvciAoTWVzc2FnZSBtIDogbWVzc2FnZXMpIHsKLSAgICAgIGlmIChtLmlzRXJyb3IpIHsKLSAgICAgICAgbWVzc2FnZVNlbmRlci5zZW5kRXJyb3IobS5tZXNzYWdlKTsKKyAgICBmb3IgKENvbW1pdFZhbGlkYXRpb25NZXNzYWdlIG0gOiBtZXNzYWdlcykgeworICAgICAgaWYgKG0uaXNFcnJvcigpKSB7CisgICAgICAgIG1lc3NhZ2VTZW5kZXIuc2VuZEVycm9yKG0uZ2V0TWVzc2FnZSgpKTsKICAgICAgIH0gZWxzZSB7Ci0gICAgICAgIG1lc3NhZ2VTZW5kZXIuc2VuZE1lc3NhZ2UobS5tZXNzYWdlKTsKKyAgICAgICAgbWVzc2FnZVNlbmRlci5zZW5kTWVzc2FnZShtLmdldE1lc3NhZ2UoKSk7CiAgICAgICB9CiAgICAgfQogICB9CkBAIC00NzUsNyArNTMzLDcgQEAKICAgICBiYXRjaC5zZXRSZWZMb2dNZXNzYWdlKCJwdXNoIiwgdHJ1ZSk7CiAKICAgICBwYXJzZUNvbW1hbmRzKGNvbW1hbmRzKTsKLSAgICBpZiAobmV3Q2hhbmdlICE9IG51bGwgJiYgbmV3Q2hhbmdlLmdldFJlc3VsdCgpID09IE5PVF9BVFRFTVBURUQpIHsKKyAgICBpZiAobWFnaWNCcmFuY2ggIT0gbnVsbCAmJiBtYWdpY0JyYW5jaC5jbWQuZ2V0UmVzdWx0KCkgPT0gTk9UX0FUVEVNUFRFRCkgewogICAgICAgbmV3Q2hhbmdlcyA9IHNlbGVjdE5ld0NoYW5nZXMoKTsKICAgICB9CiAgICAgcHJlcGFyZVBhdGNoU2V0c0ZvclJlcGxhY2UoKTsKQEAgLTUzMiw2ICs1OTAsOSBAQAogICAgICAgICAgICAgICBhdXRvQ2xvc2VDaGFuZ2VzKGMpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICBjYXNlIERFTEVURToKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKGlzQ29uZmlnKGMpKSB7CkBAIC01NDIsMTAgKzYwMywxMSBAQAogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFNYWdpY0JyYW5jaC5pc01hZ2ljQnJhbmNoKGMuZ2V0UmVmTmFtZSgpKSkgewotICAgICAgICAgIC8vIFdlIG9ubHkgc2NoZWR1bGUgZGlyZWN0IHJlZnMgdXBkYXRlcyBmb3IgcmVwbGljYXRpb24uCi0gICAgICAgICAgLy8gQ2hhbmdlIHJlZnMgYXJlIHNjaGVkdWxlZCB3aGVuIHRoZXkgYXJlIGNyZWF0ZWQuCisgICAgICAgICAgLy8gV2Ugb25seSBmaXJlIGdpdFJlZlVwZGF0ZWQgZm9yIGRpcmVjdCByZWZzIHVwZGF0ZXMuCisgICAgICAgICAgLy8gRXZlbnRzIGZvciBjaGFuZ2UgcmVmcyBhcmUgZmlyZWQgd2hlbiB0aGV5IGFyZSBjcmVhdGVkLgogICAgICAgICAgIC8vCi0gICAgICAgICAgcmVwbGljYXRpb24uZmlyZShwcm9qZWN0LmdldE5hbWVLZXkoKSwgYy5nZXRSZWZOYW1lKCkpOworICAgICAgICAgIGdpdFJlZlVwZGF0ZWQuZmlyZShwcm9qZWN0LmdldE5hbWVLZXkoKSwgYy5nZXRSZWZOYW1lKCksCisgICAgICAgICAgICAgIGMuZ2V0T2xkSWQoKSwgYy5nZXROZXdJZCgpKTsKICAgICAgICAgICBob29rcy5kb1JlZlVwZGF0ZWRIb29rKAogICAgICAgICAgICAgICBuZXcgQnJhbmNoLk5hbWVLZXkocHJvamVjdC5nZXROYW1lS2V5KCksIGMuZ2V0UmVmTmFtZSgpKSwKICAgICAgICAgICAgICAgYy5nZXRPbGRJZCgpLApAQCAtNTg3LDggKzY0OSw5IEBACiAgICAgaW50IHJlcGxhY2VDb3VudCA9IDA7CiAgICAgaW50IG9rVG9JbnNlcnQgPSAwOwogCi0gICAgZm9yIChSZXBsYWNlUmVxdWVzdCByZXBsYWNlIDogcmVwbGFjZUJ5Q2hhbmdlLnZhbHVlcygpKSB7Ci0gICAgICBpZiAocmVwbGFjZS5pbnB1dENvbW1hbmQgPT0gbmV3Q2hhbmdlKSB7CisgICAgZm9yIChNYXAuRW50cnk8Q2hhbmdlLklkLCBSZXBsYWNlUmVxdWVzdD4gZSA6IHJlcGxhY2VCeUNoYW5nZS5lbnRyeVNldCgpKSB7CisgICAgICBSZXBsYWNlUmVxdWVzdCByZXBsYWNlID0gZS5nZXRWYWx1ZSgpOworICAgICAgaWYgKG1hZ2ljQnJhbmNoICE9IG51bGwgJiYgcmVwbGFjZS5pbnB1dENvbW1hbmQgPT0gbWFnaWNCcmFuY2guY21kKSB7CiAgICAgICAgIHJlcGxhY2VDb3VudCsrOwogCiAgICAgICAgIGlmIChyZXBsYWNlLmNtZCAhPSBudWxsICYmIHJlcGxhY2UuY21kLmdldFJlc3VsdCgpID09IE9LKSB7CkBAIC01OTYsMjYgKzY1OSwyNiBAQAogICAgICAgICB9CiAgICAgICB9IGVsc2UgaWYgKHJlcGxhY2UuY21kICE9IG51bGwgJiYgcmVwbGFjZS5jbWQuZ2V0UmVzdWx0KCkgPT0gT0spIHsKICAgICAgICAgdHJ5IHsKLSAgICAgICAgICBpZiAocmVwbGFjZS5pbnNlcnRQYXRjaFNldCgpICE9IG51bGwpIHsKKyAgICAgICAgICBpZiAocmVwbGFjZS5pbnNlcnRQYXRjaFNldCgpLmNoZWNrZWRHZXQoKSAhPSBudWxsKSB7CiAgICAgICAgICAgICByZXBsYWNlLmlucHV0Q29tbWFuZC5zZXRSZXN1bHQoT0spOwogICAgICAgICAgIH0KICAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZXJyKSB7CiAgICAgICAgICAgcmVqZWN0KHJlcGxhY2UuaW5wdXRDb21tYW5kLCAiaW50ZXJuYWwgc2VydmVyIGVycm9yIik7CiAgICAgICAgICAgbG9nLmVycm9yKFN0cmluZy5mb3JtYXQoCiAgICAgICAgICAgICAgICJDYW5ub3QgYWRkIHBhdGNoIHNldCB0byAlZCBvZiAlcyIsCi0gICAgICAgICAgICAgIHJlcGxhY2UubmV3UGF0Y2hTZXQuZ2V0SWQoKSwgcHJvamVjdC5nZXROYW1lKCkpLCBlcnIpOworICAgICAgICAgICAgICBlLmdldEtleSgpLmdldCgpLCBwcm9qZWN0LmdldE5hbWUoKSksIGVycik7CiAgICAgICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlcnIpIHsKICAgICAgICAgICByZWplY3QocmVwbGFjZS5pbnB1dENvbW1hbmQsICJpbnRlcm5hbCBzZXJ2ZXIgZXJyb3IiKTsKICAgICAgICAgICBsb2cuZXJyb3IoU3RyaW5nLmZvcm1hdCgKICAgICAgICAgICAgICAgIkNhbm5vdCBhZGQgcGF0Y2ggc2V0IHRvICVkIG9mICVzIiwKLSAgICAgICAgICAgICAgcmVwbGFjZS5uZXdQYXRjaFNldC5nZXRJZCgpLCBwcm9qZWN0LmdldE5hbWUoKSksIGVycik7CisgICAgICAgICAgICAgIGUuZ2V0S2V5KCkuZ2V0KCksIHByb2plY3QuZ2V0TmFtZSgpKSwgZXJyKTsKICAgICAgICAgfQotICAgICAgfSBlbHNlIHsKKyAgICAgIH0gZWxzZSBpZiAocmVwbGFjZS5pbnB1dENvbW1hbmQuZ2V0UmVzdWx0KCkgPT0gTk9UX0FUVEVNUFRFRCkgewogICAgICAgICByZWplY3QocmVwbGFjZS5pbnB1dENvbW1hbmQsICJpbnRlcm5hbCBzZXJ2ZXIgZXJyb3IiKTsKICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAobmV3Q2hhbmdlID09IG51bGwgfHwgbmV3Q2hhbmdlLmdldFJlc3VsdCgpICE9IE5PVF9BVFRFTVBURUQpIHsKKyAgICBpZiAobWFnaWNCcmFuY2ggPT0gbnVsbCB8fCBtYWdpY0JyYW5jaC5jbWQuZ2V0UmVzdWx0KCkgIT0gTk9UX0FUVEVNUFRFRCkgewogICAgICAgLy8gcmVmcy9mb3IvIG9yIHJlZnMvZHJhZnRzLyBub3QgdXNlZCwgb3IgaXQgYWxyZWFkeSBmYWlsZWQgZWFybGllci4KICAgICAgIC8vIE5vIG5lZWQgdG8gY29udGludWUuCiAgICAgICByZXR1cm47CkBAIC02MzAsMzAgKzY5MywzNSBAQAogICAgIGlmIChva1RvSW5zZXJ0ICE9IHJlcGxhY2VDb3VudCArIG5ld0NoYW5nZXMuc2l6ZSgpKSB7CiAgICAgICAvLyBPbmUgb3IgbW9yZSBuZXcgcmVmZXJlbmNlcyBmYWlsZWQgdG8gY3JlYXRlLiBBc3N1bWUgdGhlCiAgICAgICAvLyBzeXN0ZW0gaXNuJ3Qgd29ya2luZyBjb3JyZWN0bHkgYW55bW9yZSBhbmQgYWJvcnQuCi0gICAgICByZWplY3QobmV3Q2hhbmdlLCAiaW50ZXJuYWwgc2VydmVyIGVycm9yIik7CisgICAgICByZWplY3QobWFnaWNCcmFuY2guY21kLCAiaW50ZXJuYWwgc2VydmVyIGVycm9yIik7CiAgICAgICBsb2cuZXJyb3IoU3RyaW5nLmZvcm1hdCgKICAgICAgICAgICAiT25seSAlZCBvZiAlZCBuZXcgY2hhbmdlIHJlZnMgY3JlYXRlZCBpbiAlczsgYWJvcnRpbmciLAotICAgICAgICAgIG9rVG9JbnNlcnQsIG5ld0NoYW5nZXMuc2l6ZSgpLCBwcm9qZWN0LmdldE5hbWUoKSkpOworICAgICAgICAgIG9rVG9JbnNlcnQsIHJlcGxhY2VDb3VudCArIG5ld0NoYW5nZXMuc2l6ZSgpLCBwcm9qZWN0LmdldE5hbWUoKSkpOwogICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIHRyeSB7CisgICAgICBMaXN0PENoZWNrZWRGdXR1cmU8PywgT3JtRXhjZXB0aW9uPj4gZnV0dXJlcyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOwogICAgICAgZm9yIChSZXBsYWNlUmVxdWVzdCByZXBsYWNlIDogcmVwbGFjZUJ5Q2hhbmdlLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmIChyZXBsYWNlLmlucHV0Q29tbWFuZCA9PSBuZXdDaGFuZ2UpIHsKLSAgICAgICAgICByZXBsYWNlLmluc2VydFBhdGNoU2V0KCk7CisgICAgICAgIGlmIChtYWdpY0JyYW5jaCAhPSBudWxsICYmIHJlcGxhY2UuaW5wdXRDb21tYW5kID09IG1hZ2ljQnJhbmNoLmNtZCkgeworICAgICAgICAgIGZ1dHVyZXMuYWRkKHJlcGxhY2UuaW5zZXJ0UGF0Y2hTZXQoKSk7CiAgICAgICAgIH0KICAgICAgIH0KIAogICAgICAgZm9yIChDcmVhdGVSZXF1ZXN0IGNyZWF0ZSA6IG5ld0NoYW5nZXMpIHsKLSAgICAgICAgY3JlYXRlLmluc2VydENoYW5nZSgpOworICAgICAgICBmdXR1cmVzLmFkZChjcmVhdGUuaW5zZXJ0Q2hhbmdlKCkpOwogICAgICAgfQotICAgICAgbmV3Q2hhbmdlLnNldFJlc3VsdChPSyk7CisKKyAgICAgIGZvciAoQ2hlY2tlZEZ1dHVyZTw/LCBPcm1FeGNlcHRpb24+IGYgOiBmdXR1cmVzKSB7CisgICAgICAgIGYuY2hlY2tlZEdldCgpOworICAgICAgfQorICAgICAgbWFnaWNCcmFuY2guY21kLnNldFJlc3VsdChPSyk7CiAgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGVycikgewogICAgICAgbG9nLmVycm9yKCJDYW4ndCBpbnNlcnQgY2hhbmdlcyBmb3IgIiArIHByb2plY3QuZ2V0TmFtZSgpLCBlcnIpOwotICAgICAgcmVqZWN0KG5ld0NoYW5nZSwgImludGVybmFsIHNlcnZlciBlcnJvciIpOworICAgICAgcmVqZWN0KG1hZ2ljQnJhbmNoLmNtZCwgImludGVybmFsIHNlcnZlciBlcnJvciIpOwogICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGVycikgewogICAgICAgbG9nLmVycm9yKCJDYW4ndCByZWFkIGNvbW1pdHMgZm9yICIgKyBwcm9qZWN0LmdldE5hbWUoKSwgZXJyKTsKLSAgICAgIHJlamVjdChuZXdDaGFuZ2UsICJpbnRlcm5hbCBzZXJ2ZXIgZXJyb3IiKTsKKyAgICAgIHJlamVjdChtYWdpY0JyYW5jaC5jbWQsICJpbnRlcm5hbCBzZXJ2ZXIgZXJyb3IiKTsKICAgICB9CiAgIH0KIApAQCAtNjgxLDE2ICs3NDksNiBAQAogICAgIHJldHVybiBkaXNwbGF5TmFtZTsKICAgfQogCi0gIHByaXZhdGUgQWNjb3VudC5JZCB0b0FjY291bnRJZChmaW5hbCBTdHJpbmcgbmFtZU9yRW1haWwpIHRocm93cyBPcm1FeGNlcHRpb24sCi0gICAgICBOb1N1Y2hBY2NvdW50RXhjZXB0aW9uIHsKLSAgICBmaW5hbCBBY2NvdW50IGEgPSBhY2NvdW50UmVzb2x2ZXIuZmluZEJ5TmFtZU9yRW1haWwobmFtZU9yRW1haWwpOwotICAgIGlmIChhID09IG51bGwpIHsKLSAgICAgIHRocm93IG5ldyBOb1N1Y2hBY2NvdW50RXhjZXB0aW9uKCJcIiIgKyBuYW1lT3JFbWFpbAotICAgICAgICAgICsgIlwiIGlzIG5vdCByZWdpc3RlcmVkIik7Ci0gICAgfQotICAgIHJldHVybiBhLmdldElkKCk7Ci0gIH0KLQogICBwcml2YXRlIHZvaWQgcGFyc2VDb21tYW5kcyhmaW5hbCBDb2xsZWN0aW9uPFJlY2VpdmVDb21tYW5kPiBjb21tYW5kcykgewogICAgIGZvciAoZmluYWwgUmVjZWl2ZUNvbW1hbmQgY21kIDogY29tbWFuZHMpIHsKICAgICAgIGlmIChjbWQuZ2V0UmVzdWx0KCkgIT0gTk9UX0FUVEVNUFRFRCkgewpAQCAtNzA1LDggKzc2MywyMSBAQAogICAgICAgICBjb250aW51ZTsKICAgICAgIH0KIAorICAgICAgSG9va1Jlc3VsdCByZXN1bHQgPSBob29rcy5kb1JlZlVwZGF0ZUhvb2socHJvamVjdCwgY21kLmdldFJlZk5hbWUoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRVc2VyLmdldEFjY291bnQoKSwgY21kLmdldE9sZElkKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbWQuZ2V0TmV3SWQoKSk7CisKKyAgICAgIGlmIChyZXN1bHQgIT0gbnVsbCkgeworICAgICAgICBmaW5hbCBTdHJpbmcgbWVzc2FnZSA9IHJlc3VsdC50b1N0cmluZygpLnRyaW0oKTsKKyAgICAgICAgaWYgKHJlc3VsdC5nZXRFeGl0VmFsdWUoKSAhPSAwKSB7CisgICAgICAgICAgcmVqZWN0KGNtZCwgbWVzc2FnZSk7CisgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgcnAuc2VuZE1lc3NhZ2UobWVzc2FnZSk7CisgICAgICB9CisKICAgICAgIGlmIChNYWdpY0JyYW5jaC5pc01hZ2ljQnJhbmNoKGNtZC5nZXRSZWZOYW1lKCkpKSB7Ci0gICAgICAgIHBhcnNlTmV3Q2hhbmdlQ29tbWFuZChjbWQpOworICAgICAgICBwYXJzZU1hZ2ljQnJhbmNoKGNtZCk7CiAgICAgICAgIGNvbnRpbnVlOwogICAgICAgfQogCkBAIC04NzMsMTQgKzk0NCwxNyBAQAogCiAgIHByaXZhdGUgdm9pZCBwYXJzZURlbGV0ZShmaW5hbCBSZWNlaXZlQ29tbWFuZCBjbWQpIHsKICAgICBSZWZDb250cm9sIGN0bCA9IHByb2plY3RDb250cm9sLmNvbnRyb2xGb3JSZWYoY21kLmdldFJlZk5hbWUoKSk7Ci0gICAgaWYgKGN0bC5jYW5EZWxldGUoKSkgeworICAgIGlmIChjdGwuZ2V0UmVmTmFtZSgpLnN0YXJ0c1dpdGgoInJlZnMvY2hhbmdlcy8iKSkgeworICAgICAgZXJyb3JzLnB1dChFcnJvci5ERUxFVEVfQ0hBTkdFUywgY3RsLmdldFJlZk5hbWUoKSk7CisgICAgICByZWplY3QoY21kLCAiY2Fubm90IGRlbGV0ZSBjaGFuZ2VzIik7CisgICAgfSBlbHNlIGlmIChjdGwuY2FuRGVsZXRlKCkpIHsKICAgICAgIGJhdGNoLmFkZENvbW1hbmQoY21kKTsKICAgICB9IGVsc2UgewogICAgICAgaWYgKEdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRl9DT05GSUcuZXF1YWxzKGN0bC5nZXRSZWZOYW1lKCkpKSB7CiAgICAgICAgIHJlamVjdChjbWQsICJjYW5ub3QgZGVsZXRlIHByb2plY3QgY29uZmlndXJhdGlvbiIpOwogICAgICAgfSBlbHNlIHsKICAgICAgICAgZXJyb3JzLnB1dChFcnJvci5ERUxFVEUsIGN0bC5nZXRSZWZOYW1lKCkpOwotICAgICAgICByZWplY3QoY21kLCAiY2FuIG5vdCBkZWxldGUgcmVmZXJlbmNlcyIpOworICAgICAgICByZWplY3QoY21kLCAiY2Fubm90IGRlbGV0ZSByZWZlcmVuY2VzIik7CiAgICAgICB9CiAgICAgfQogICB9CkBAIC05MTQsNzIgKzk4OCwxMzggQEAKICAgICB9CiAgIH0KIAotICBwcml2YXRlIHZvaWQgcGFyc2VOZXdDaGFuZ2VDb21tYW5kKGZpbmFsIFJlY2VpdmVDb21tYW5kIGNtZCkgeworICBwcml2YXRlIHN0YXRpYyBjbGFzcyBNYWdpY0JyYW5jaElucHV0IHsKKyAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTcGxpdHRlciBDT01NQVMgPSBTcGxpdHRlci5vbignLCcpLm9taXRFbXB0eVN0cmluZ3MoKTsKKworICAgIGZpbmFsIFJlY2VpdmVDb21tYW5kIGNtZDsKKyAgICBCcmFuY2guTmFtZUtleSBkZXN0OworICAgIFJlZkNvbnRyb2wgY3RsOworICAgIFNldDxBY2NvdW50LklkPiByZXZpZXdlciA9IFNldHMubmV3TGlua2VkSGFzaFNldCgpOworICAgIFNldDxBY2NvdW50LklkPiBjYyA9IFNldHMubmV3TGlua2VkSGFzaFNldCgpOworCisgICAgQE9wdGlvbihuYW1lID0gIi0tdG9waWMiLCBtZXRhVmFyID0gIk5BTUUiLCB1c2FnZSA9ICJhdHRhY2ggdG9waWMgdG8gY2hhbmdlcyIpCisgICAgU3RyaW5nIHRvcGljOworCisgICAgQE9wdGlvbihuYW1lID0gIi0tZHJhZnQiLCB1c2FnZSA9ICJtYXJrIG5ldy91cGRhdGVkIGNoYW5nZXMgYXMgZHJhZnQiKQorICAgIGJvb2xlYW4gZHJhZnQ7CisKKyAgICBAT3B0aW9uKG5hbWUgPSAiLXIiLCBtZXRhVmFyID0gIkVNQUlMIiwgdXNhZ2UgPSAiYWRkIHJldmlld2VyIHRvIGNoYW5nZXMiKQorICAgIHZvaWQgcmV2aWV3ZXIoQWNjb3VudC5JZCBpZCkgeworICAgICAgcmV2aWV3ZXIuYWRkKGlkKTsKKyAgICB9CisKKyAgICBAT3B0aW9uKG5hbWUgPSAiLS1jYyIsIG1ldGFWYXIgPSAiRU1BSUwiLCB1c2FnZSA9ICJub3RpZnkgdXNlciBieSBDQyIpCisgICAgdm9pZCBjYyhBY2NvdW50LklkIGlkKSB7CisgICAgICBjYy5hZGQoaWQpOworICAgIH0KKworICAgIEBPcHRpb24obmFtZSA9ICItLXB1Ymxpc2giLCB1c2FnZSA9ICJwdWJsaXNoIG5ldy91cGRhdGVkIGNoYW5nZXMiKQorICAgIHZvaWQgcHVibGlzaChib29sZWFuIHB1Ymxpc2gpIHsKKyAgICAgIGRyYWZ0ID0gIXB1Ymxpc2g7CisgICAgfQorCisgICAgTWFnaWNCcmFuY2hJbnB1dChSZWNlaXZlQ29tbWFuZCBjbWQpIHsKKyAgICAgIHRoaXMuY21kID0gY21kOworICAgICAgdGhpcy5kcmFmdCA9IGNtZC5nZXRSZWZOYW1lKCkuc3RhcnRzV2l0aChNYWdpY0JyYW5jaC5ORVdfRFJBRlRfQ0hBTkdFKTsKKyAgICB9CisKKyAgICBib29sZWFuIGlzRHJhZnQoKSB7CisgICAgICByZXR1cm4gZHJhZnQ7CisgICAgfQorCisgICAgTWFpbFJlY2lwaWVudHMgZ2V0TWFpbFJlY2lwaWVudHMoKSB7CisgICAgICByZXR1cm4gbmV3IE1haWxSZWNpcGllbnRzKHJldmlld2VyLCBjYyk7CisgICAgfQorCisgICAgU3RyaW5nIHBhcnNlKENtZExpbmVQYXJzZXIgY2xwLCBSZXBvc2l0b3J5IHJlcG8sIFNldDxTdHJpbmc+IHJlZnMpCisgICAgICAgIHRocm93cyBDbWRMaW5lRXhjZXB0aW9uIHsKKyAgICAgIFN0cmluZyByZWYgPSBNYWdpY0JyYW5jaC5nZXREZXN0QnJhbmNoTmFtZShjbWQuZ2V0UmVmTmFtZSgpKTsKKyAgICAgIGlmICghcmVmLnN0YXJ0c1dpdGgoQ29uc3RhbnRzLlJfUkVGUykpIHsKKyAgICAgICAgcmVmID0gQ29uc3RhbnRzLlJfSEVBRFMgKyByZWY7CisgICAgICB9CisKKyAgICAgIGludCBvcHRpb25TdGFydCA9IHJlZi5pbmRleE9mKCclJyk7CisgICAgICBpZiAoMCA8IG9wdGlvblN0YXJ0KSB7CisgICAgICAgIExpc3RNdWx0aW1hcDxTdHJpbmcsIFN0cmluZz4gb3B0aW9ucyA9IExpbmtlZExpc3RNdWx0aW1hcC5jcmVhdGUoKTsKKyAgICAgICAgZm9yIChTdHJpbmcgcyA6IENPTU1BUy5zcGxpdChyZWYuc3Vic3RyaW5nKG9wdGlvblN0YXJ0ICsgMSkpKSB7CisgICAgICAgICAgaW50IGUgPSBzLmluZGV4T2YoJz0nKTsKKyAgICAgICAgICBpZiAoMCA8IGUpIHsKKyAgICAgICAgICAgIG9wdGlvbnMucHV0KHMuc3Vic3RyaW5nKDAsIGUpLCBzLnN1YnN0cmluZyhlICsgMSkpOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBvcHRpb25zLnB1dChzLCAiIik7CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGNscC5wYXJzZU9wdGlvbk1hcChvcHRpb25zKTsKKyAgICAgICAgcmVmID0gcmVmLnN1YnN0cmluZygwLCBvcHRpb25TdGFydCk7CisgICAgICB9CisKKyAgICAgIC8vIFNwbGl0IHRoZSBkZXN0aW5hdGlvbiBicmFuY2ggYnkgYnJhbmNoIGFuZCB0b3BpYy4gVGhlIHRvcGljCisgICAgICAvLyBzdWZmaXggaXMgZW50aXJlbHkgb3B0aW9uYWwsIHNvIGl0IG1pZ2h0IG5vdCBldmVuIGV4aXN0LgorICAgICAgU3RyaW5nIGhlYWQgPSByZWFkSEVBRChyZXBvKTsKKyAgICAgIGludCBzcGxpdCA9IHJlZi5sZW5ndGgoKTsKKyAgICAgIGZvciAoOzspIHsKKyAgICAgICAgU3RyaW5nIG5hbWUgPSByZWYuc3Vic3RyaW5nKDAsIHNwbGl0KTsKKyAgICAgICAgaWYgKHJlZnMuY29udGFpbnMobmFtZSkgfHwgbmFtZS5lcXVhbHMoaGVhZCkpIHsKKyAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorCisgICAgICAgIHNwbGl0ID0gbmFtZS5sYXN0SW5kZXhPZignLycsIHNwbGl0IC0gMSk7CisgICAgICAgIGlmIChzcGxpdCA8PSBDb25zdGFudHMuUl9SRUZTLmxlbmd0aCgpKSB7CisgICAgICAgICAgcmV0dXJuIHJlZjsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgaWYgKHNwbGl0IDwgcmVmLmxlbmd0aCgpKSB7CisgICAgICAgIHRvcGljID0gU3RyaW5ncy5lbXB0eVRvTnVsbChyZWYuc3Vic3RyaW5nKHNwbGl0ICsgMSkpOworICAgICAgfQorICAgICAgcmV0dXJuIHJlZi5zdWJzdHJpbmcoMCwgc3BsaXQpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBwYXJzZU1hZ2ljQnJhbmNoKGZpbmFsIFJlY2VpdmVDb21tYW5kIGNtZCkgewogICAgIC8vIFBlcm1pdCBleGFjdGx5IG9uZSBuZXcgY2hhbmdlIHJlcXVlc3QgcGVyIHB1c2guCi0gICAgLy8KLSAgICBpZiAobmV3Q2hhbmdlICE9IG51bGwpIHsKKyAgICBpZiAobWFnaWNCcmFuY2ggIT0gbnVsbCkgewogICAgICAgcmVqZWN0KGNtZCwgImR1cGxpY2F0ZSByZXF1ZXN0Iik7CiAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbmV3Q2hhbmdlID0gY21kOwotICAgIFN0cmluZyBkZXN0QnJhbmNoTmFtZSA9IE1hZ2ljQnJhbmNoLmdldERlc3RCcmFuY2hOYW1lKGNtZC5nZXRSZWZOYW1lKCkpOwotICAgIGlmICghZGVzdEJyYW5jaE5hbWUuc3RhcnRzV2l0aChDb25zdGFudHMuUl9SRUZTKSkgewotICAgICAgZGVzdEJyYW5jaE5hbWUgPSBDb25zdGFudHMuUl9IRUFEUyArIGRlc3RCcmFuY2hOYW1lOwotICAgIH0KKyAgICBtYWdpY0JyYW5jaCA9IG5ldyBNYWdpY0JyYW5jaElucHV0KGNtZCk7CisgICAgbWFnaWNCcmFuY2gucmV2aWV3ZXIuYWRkQWxsKHJldmlld2Vyc0Zyb21Db21tYW5kTGluZSk7CisgICAgbWFnaWNCcmFuY2guY2MuYWRkQWxsKGNjRnJvbUNvbW1hbmRMaW5lKTsKIAotICAgIGZpbmFsIFN0cmluZyBoZWFkOworICAgIFN0cmluZyByZWY7CisgICAgQ21kTGluZVBhcnNlciBjbHAgPSBvcHRpb25QYXJzZXJGYWN0b3J5LmNyZWF0ZShtYWdpY0JyYW5jaCk7CiAgICAgdHJ5IHsKLSAgICAgIGhlYWQgPSByZXBvLmdldEZ1bGxCcmFuY2goKTsKLSAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICBsb2cuZXJyb3IoIkNhbm5vdCByZWFkIEhFQUQgc3ltcmVmIiwgZSk7Ci0gICAgICByZWplY3QoY21kLCAiaW50ZXJuYWwgZXJyb3IiKTsKKyAgICAgIHJlZiA9IG1hZ2ljQnJhbmNoLnBhcnNlKGNscCwgcmVwbywgcnAuZ2V0QWR2ZXJ0aXNlZFJlZnMoKS5rZXlTZXQoKSk7CisgICAgfSBjYXRjaCAoQ21kTGluZUV4Y2VwdGlvbiBlKSB7CisgICAgICBpZiAoIWNscC53YXNIZWxwUmVxdWVzdGVkQnlPcHRpb24oKSkgeworICAgICAgICByZWplY3QoY21kLCBlLmdldE1lc3NhZ2UoKSk7CisgICAgICAgIHJldHVybjsKKyAgICAgIH0KKyAgICAgIHJlZiA9IG51bGw7IC8vIG5ldmVyIGhhcHBlbgorICAgIH0KKyAgICBpZiAoY2xwLndhc0hlbHBSZXF1ZXN0ZWRCeU9wdGlvbigpKSB7CisgICAgICBTdHJpbmdXcml0ZXIgdyA9IG5ldyBTdHJpbmdXcml0ZXIoKTsKKyAgICAgIHcud3JpdGUoIlxuSGVscCBmb3IgcmVmcy9mb3IvYnJhbmNoOlxuXG4iKTsKKyAgICAgIGNscC5wcmludFVzYWdlKHcsIG51bGwpOworICAgICAgYWRkTWVzc2FnZSh3LnRvU3RyaW5nKCkpOworICAgICAgcmVqZWN0KGNtZCwgInNlZSBoZWxwIik7CisgICAgICByZXR1cm47CisgICAgfQorICAgIGlmICghcnAuZ2V0QWR2ZXJ0aXNlZFJlZnMoKS5jb250YWluc0tleShyZWYpICYmICFyZWYuZXF1YWxzKHJlYWRIRUFEKHJlcG8pKSkgeworICAgICAgaWYgKHJlZi5zdGFydHNXaXRoKENvbnN0YW50cy5SX0hFQURTKSkgeworICAgICAgICBTdHJpbmcgbiA9IHJlZi5zdWJzdHJpbmcoQ29uc3RhbnRzLlJfSEVBRFMubGVuZ3RoKCkpOworICAgICAgICByZWplY3QoY21kLCAiYnJhbmNoICIgKyBuICsgIiBub3QgZm91bmQiKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHJlamVjdChjbWQsIHJlZiArICIgbm90IGZvdW5kIik7CisgICAgICB9CiAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8gU3BsaXQgdGhlIGRlc3RpbmF0aW9uIGJyYW5jaCBieSBicmFuY2ggYW5kIHRvcGljLiAgVGhlIHRvcGljCi0gICAgLy8gc3VmZml4IGlzIGVudGlyZWx5IG9wdGlvbmFsLCBzbyBpdCBtaWdodCBub3QgZXZlbiBleGlzdC4KLSAgICAvLwotICAgIGludCBzcGxpdCA9IGRlc3RCcmFuY2hOYW1lLmxlbmd0aCgpOwotICAgIGZvciAoOzspIHsKLSAgICAgIFN0cmluZyBuYW1lID0gZGVzdEJyYW5jaE5hbWUuc3Vic3RyaW5nKDAsIHNwbGl0KTsKLQotICAgICAgaWYgKHJwLmdldEFkdmVydGlzZWRSZWZzKCkuY29udGFpbnNLZXkobmFtZSkpIHsKLSAgICAgICAgLy8gV2UgYWR2ZXJ0aXNlZCB0aGUgYnJhbmNoIHRvIHRoZSBjbGllbnQgc28gd2Uga25vdwotICAgICAgICAvLyB0aGUgYnJhbmNoIGV4aXN0cy4gVGFyZ2V0IHRoaXMgYnJhbmNoIGZvciB0aGUgdXBsb2FkLgotICAgICAgICAvLwotICAgICAgICBicmVhazsKLSAgICAgIH0gZWxzZSBpZiAoaGVhZC5lcXVhbHMobmFtZSkpIHsKLSAgICAgICAgLy8gV2UgZGlkbid0IGFkdmVydGlzZSB0aGUgYnJhbmNoLCBiZWNhdXNlIGl0IGRvZXNuJ3QgZXhpc3QgeWV0LgotICAgICAgICAvLyBBbGxvdyBpdCBhbnl3YXkgYXMgSEVBRCBpcyBhIHN5bWJvbGljIHJlZmVyZW5jZSB0byB0aGUgbmFtZS4KLSAgICAgICAgLy8KLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0KLSAgICAgIHNwbGl0ID0gbmFtZS5sYXN0SW5kZXhPZignLycsIHNwbGl0IC0gMSk7Ci0gICAgICBpZiAoc3BsaXQgPD0gQ29uc3RhbnRzLlJfUkVGUy5sZW5ndGgoKSkgewotICAgICAgICBTdHJpbmcgbiA9IGRlc3RCcmFuY2hOYW1lOwotICAgICAgICBpZiAobi5zdGFydHNXaXRoKENvbnN0YW50cy5SX0hFQURTKSkKLSAgICAgICAgICBuID0gbi5zdWJzdHJpbmcoQ29uc3RhbnRzLlJfSEVBRFMubGVuZ3RoKCkpOwotICAgICAgICByZWplY3QoY21kLCAiYnJhbmNoICIgKyBuICsgIiBub3QgZm91bmQiKTsKLSAgICAgICAgcmV0dXJuOwotICAgICAgfQotICAgIH0KLQotICAgIGlmIChzcGxpdCA8IGRlc3RCcmFuY2hOYW1lLmxlbmd0aCgpKSB7Ci0gICAgICBkZXN0VG9waWNOYW1lID0gZGVzdEJyYW5jaE5hbWUuc3Vic3RyaW5nKHNwbGl0ICsgMSk7Ci0gICAgICBpZiAoZGVzdFRvcGljTmFtZS5pc0VtcHR5KCkpIHsKLSAgICAgICAgZGVzdFRvcGljTmFtZSA9IG51bGw7Ci0gICAgICB9Ci0gICAgfSBlbHNlIHsKLSAgICAgIGRlc3RUb3BpY05hbWUgPSBudWxsOwotICAgIH0KLSAgICBkZXN0QnJhbmNoID0gbmV3IEJyYW5jaC5OYW1lS2V5KHByb2plY3QuZ2V0TmFtZUtleSgpLCAvLwotICAgICAgICBkZXN0QnJhbmNoTmFtZS5zdWJzdHJpbmcoMCwgc3BsaXQpKTsKLSAgICBkZXN0QnJhbmNoQ3RsID0gcHJvamVjdENvbnRyb2wuY29udHJvbEZvclJlZihkZXN0QnJhbmNoKTsKLSAgICBpZiAoIWRlc3RCcmFuY2hDdGwuY2FuVXBsb2FkKCkpIHsKLSAgICAgIGVycm9ycy5wdXQoRXJyb3IuQ09ERV9SRVZJRVcsIGNtZC5nZXRSZWZOYW1lKCkpOwotICAgICAgcmVqZWN0KGNtZCwgImNhbiBub3QgdXBsb2FkIHJldmlldyIpOworICAgIG1hZ2ljQnJhbmNoLmRlc3QgPSBuZXcgQnJhbmNoLk5hbWVLZXkocHJvamVjdC5nZXROYW1lS2V5KCksIHJlZik7CisgICAgbWFnaWNCcmFuY2guY3RsID0gcHJvamVjdENvbnRyb2wuY29udHJvbEZvclJlZihyZWYpOworICAgIGlmICghbWFnaWNCcmFuY2guY3RsLmNhblVwbG9hZCgpKSB7CisgICAgICBlcnJvcnMucHV0KEVycm9yLkNPREVfUkVWSUVXLCByZWYpOworICAgICAgcmVqZWN0KGNtZCwgImNhbm5vdCB1cGxvYWQgcmV2aWV3Iik7CiAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC05OTAsOSArMTEzMCw4IEBACiAgICAgLy8KICAgICB0cnkgewogICAgICAgZmluYWwgUmV2V2FsayB3YWxrID0gcnAuZ2V0UmV2V2FsaygpOwotCi0gICAgICBmaW5hbCBSZXZDb21taXQgdGlwID0gd2Fsay5wYXJzZUNvbW1pdChuZXdDaGFuZ2UuZ2V0TmV3SWQoKSk7Ci0gICAgICBSZWYgdGFyZ2V0UmVmID0gcnAuZ2V0QWR2ZXJ0aXNlZFJlZnMoKS5nZXQoZGVzdEJyYW5jaE5hbWUpOworICAgICAgZmluYWwgUmV2Q29tbWl0IHRpcCA9IHdhbGsucGFyc2VDb21taXQobWFnaWNCcmFuY2guY21kLmdldE5ld0lkKCkpOworICAgICAgUmVmIHRhcmdldFJlZiA9IHJwLmdldEFkdmVydGlzZWRSZWZzKCkuZ2V0KG1hZ2ljQnJhbmNoLmN0bC5nZXRSZWZOYW1lKCkpOwogICAgICAgaWYgKHRhcmdldFJlZiA9PSBudWxsIHx8IHRhcmdldFJlZi5nZXRPYmplY3RJZCgpID09IG51bGwpIHsKICAgICAgICAgLy8gVGhlIGRlc3RpbmF0aW9uIGJyYW5jaCBkb2VzIG5vdCB5ZXQgZXhpc3QuIEFzc3VtZSB0aGUKICAgICAgICAgLy8gaGlzdG9yeSBiZWluZyBzZW50IGZvciByZXZpZXcgd2lsbCBzdGFydCBpdCBhbmQgdGh1cwpAQCAtMTAwMCw3ICsxMTM5LDYgQEAKICAgICAgICAgcmV0dXJuOwogICAgICAgfQogICAgICAgZmluYWwgUmV2Q29tbWl0IGggPSB3YWxrLnBhcnNlQ29tbWl0KHRhcmdldFJlZi5nZXRPYmplY3RJZCgpKTsKLQogICAgICAgZmluYWwgUmV2RmlsdGVyIG9sZFJldkZpbHRlciA9IHdhbGsuZ2V0UmV2RmlsdGVyKCk7CiAgICAgICB0cnkgewogICAgICAgICB3YWxrLnJlc2V0KCk7CkBAIC0xMDA4LDcgKzExNDYsNyBAQAogICAgICAgICB3YWxrLm1hcmtTdGFydCh0aXApOwogICAgICAgICB3YWxrLm1hcmtTdGFydChoKTsKICAgICAgICAgaWYgKHdhbGsubmV4dCgpID09IG51bGwpIHsKLSAgICAgICAgICByZWplY3QobmV3Q2hhbmdlLCAibm8gY29tbW9uIGFuY2VzdHJ5Iik7CisgICAgICAgICAgcmVqZWN0KG1hZ2ljQnJhbmNoLmNtZCwgIm5vIGNvbW1vbiBhbmNlc3RyeSIpOwogICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgfSBmaW5hbGx5IHsKQEAgLTEwMTYsMTIgKzExNTQsMjEgQEAKICAgICAgICAgd2Fsay5zZXRSZXZGaWx0ZXIob2xkUmV2RmlsdGVyKTsKICAgICAgIH0KICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICBuZXdDaGFuZ2Uuc2V0UmVzdWx0KFJFSkVDVEVEX01JU1NJTkdfT0JKRUNUKTsKKyAgICAgIG1hZ2ljQnJhbmNoLmNtZC5zZXRSZXN1bHQoUkVKRUNURURfTUlTU0lOR19PQkpFQ1QpOwogICAgICAgbG9nLmVycm9yKCJJbnZhbGlkIHBhY2sgdXBsb2FkOyBvbmUgb3IgbW9yZSBvYmplY3RzIHdlcmVuJ3Qgc2VudCIsIGUpOwogICAgICAgcmV0dXJuOwogICAgIH0KICAgfQogCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyByZWFkSEVBRChSZXBvc2l0b3J5IHJlcG8pIHsKKyAgICB0cnkgeworICAgICAgcmV0dXJuIHJlcG8uZ2V0RnVsbEJyYW5jaCgpOworICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHJlYWQgSEVBRCBzeW1yZWYiLCBlKTsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKyAgfQorCiAgIC8qKgogICAgKiBMb2FkcyBhIGxpc3Qgb2YgY29tbWl0cyB0byByZWplY3QgZnJvbSB7QGNvZGUgcmVmcy9tZXRhL3JlamVjdC1jb21taXRzfS4KICAgICoKQEAgLTExMTEsOCArMTI1OCwxMSBAQAogICAgIHdhbGsuc29ydChSZXZTb3J0LlJFVkVSU0UsIHRydWUpOwogICAgIHRyeSB7CiAgICAgICBTZXQ8T2JqZWN0SWQ+IGV4aXN0aW5nID0gU2V0cy5uZXdIYXNoU2V0KCk7Ci0gICAgICB3YWxrLm1hcmtTdGFydCh3YWxrLnBhcnNlQ29tbWl0KG5ld0NoYW5nZS5nZXROZXdJZCgpKSk7Ci0gICAgICBtYXJrSGVhZHNBc1VuaW50ZXJlc3Rpbmcod2FsaywgZXhpc3RpbmcpOworICAgICAgd2Fsay5tYXJrU3RhcnQod2Fsay5wYXJzZUNvbW1pdChtYWdpY0JyYW5jaC5jbWQuZ2V0TmV3SWQoKSkpOworICAgICAgbWFya0hlYWRzQXNVbmludGVyZXN0aW5nKAorICAgICAgICAgIHdhbGssCisgICAgICAgICAgZXhpc3RpbmcsCisgICAgICAgICAgbWFnaWNCcmFuY2guY3RsICE9IG51bGwgPyBtYWdpY0JyYW5jaC5jdGwuZ2V0UmVmTmFtZSgpIDogbnVsbCk7CiAKICAgICAgIExpc3Q8Q2hhbmdlTG9va3VwPiBwZW5kaW5nID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CiAgICAgICBmaW5hbCBTZXQ8Q2hhbmdlLktleT4gbmV3Q2hhbmdlSWRzID0gbmV3IEhhc2hTZXQ8Q2hhbmdlLktleT4oKTsKQEAgLTExMjYsNyArMTI3Niw4IEBACiAgICAgICAgICAgLy8KICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQotICAgICAgICBpZiAoIXZhbGlkQ29tbWl0KGRlc3RCcmFuY2hDdGwsIG5ld0NoYW5nZSwgYykpIHsKKworICAgICAgICBpZiAoIXZhbGlkQ29tbWl0KG1hZ2ljQnJhbmNoLmN0bCwgbWFnaWNCcmFuY2guY21kLCBjKSkgewogICAgICAgICAgIC8vIE5vdCBhIGNoYW5nZSB0aGUgdXNlciBjYW4gcHJvcG9zZT8gQWJvcnQgYXMgZWFybHkgYXMgcG9zc2libGUuCiAgICAgICAgICAgLy8KICAgICAgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CkBAIC0xMTQyLDcgKzEyOTMsNyBAQAogICAgICAgICBmaW5hbCBTdHJpbmcgaWRTdHIgPSBpZExpc3QuZ2V0KGlkTGlzdC5zaXplKCkgLSAxKS50cmltKCk7CiAgICAgICAgIGlmIChpZFN0ci5tYXRjaGVzKCJeSTAwKiQiKSkgewogICAgICAgICAgIC8vIFJlamVjdCB0aGlzIGludmFsaWQgbGluZSBmcm9tIEVHaXQuCi0gICAgICAgICAgcmVqZWN0KG5ld0NoYW5nZSwgImludmFsaWQgQ2hhbmdlLUlkIik7CisgICAgICAgICAgcmVqZWN0KG1hZ2ljQnJhbmNoLmNtZCwgImludmFsaWQgQ2hhbmdlLUlkIik7CiAgICAgICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwogICAgICAgICB9CiAKQEAgLTExNTIsNyArMTMwMyw3IEBACiAKICAgICAgIGZvciAoQ2hhbmdlTG9va3VwIHAgOiBwZW5kaW5nKSB7CiAgICAgICAgIGlmIChuZXdDaGFuZ2VJZHMuY29udGFpbnMocC5jaGFuZ2VLZXkpKSB7Ci0gICAgICAgICAgcmVqZWN0KG5ld0NoYW5nZSwgInNxdWFzaCBjb21taXRzIGZpcnN0Iik7CisgICAgICAgICAgcmVqZWN0KG1hZ2ljQnJhbmNoLmNtZCwgInNxdWFzaCBjb21taXRzIGZpcnN0Iik7CiAgICAgICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwogICAgICAgICB9CiAKQEAgLTExNjMsMTQgKzEzMTQsMTQgQEAKICAgICAgICAgICAvLyBhIGRpZmZlcmVudCBDaGFuZ2UtSWQuIEluIHByYWN0aWNlLCB3ZSBzaG91bGQgbmV2ZXIgc2VlCiAgICAgICAgICAgLy8gdGhpcyBlcnJvciBtZXNzYWdlIGFzIENoYW5nZS1JZCBzaG91bGQgYmUgdW5pcXVlLgogICAgICAgICAgIC8vCi0gICAgICAgICAgcmVqZWN0KG5ld0NoYW5nZSwgcC5jaGFuZ2VLZXkuZ2V0KCkgKyAiIGhhcyBkdXBsaWNhdGVzIik7CisgICAgICAgICAgcmVqZWN0KG1hZ2ljQnJhbmNoLmNtZCwgcC5jaGFuZ2VLZXkuZ2V0KCkgKyAiIGhhcyBkdXBsaWNhdGVzIik7CiAgICAgICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKGNoYW5nZXMuc2l6ZSgpID09IDEpIHsKICAgICAgICAgICAvLyBTY2hlZHVsZSBhcyBhIHJlcGxhY2VtZW50IHRvIHRoaXMgb25lIG1hdGNoaW5nIGNoYW5nZS4KICAgICAgICAgICAvLwotICAgICAgICAgIGlmIChyZXF1ZXN0UmVwbGFjZShuZXdDaGFuZ2UsIGZhbHNlLCBjaGFuZ2VzLmdldCgwKSwgcC5jb21taXQpKSB7CisgICAgICAgICAgaWYgKHJlcXVlc3RSZXBsYWNlKG1hZ2ljQnJhbmNoLmNtZCwgZmFsc2UsIGNoYW5nZXMuZ2V0KDApLCBwLmNvbW1pdCkpIHsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CkBAIC0xMTc5LDcgKzEzMzAsNyBAQAogCiAgICAgICAgIGlmIChjaGFuZ2VzLnNpemUoKSA9PSAwKSB7CiAgICAgICAgICAgaWYgKCFpc1ZhbGlkQ2hhbmdlSWQocC5jaGFuZ2VLZXkuZ2V0KCkpKSB7Ci0gICAgICAgICAgICByZWplY3QobmV3Q2hhbmdlLCAiaW52YWxpZCBDaGFuZ2UtSWQiKTsKKyAgICAgICAgICAgIHJlamVjdChtYWdpY0JyYW5jaC5jbWQsICJpbnZhbGlkIENoYW5nZS1JZCIpOwogICAgICAgICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwogICAgICAgICAgIH0KIApAQCAtMTE5MSwxNyArMTM0MiwxNyBAQAogICAgICAgLy8gU2hvdWxkIG5ldmVyIGhhcHBlbiwgdGhlIGNvcmUgcmVjZWl2ZSBwcm9jZXNzIHdvdWxkIGhhdmUKICAgICAgIC8vIGlkZW50aWZpZWQgdGhlIG1pc3Npbmcgb2JqZWN0IGVhcmxpZXIgYmVmb3JlIHdlIGdvdCBjb250cm9sLgogICAgICAgLy8KLSAgICAgIG5ld0NoYW5nZS5zZXRSZXN1bHQoUkVKRUNURURfTUlTU0lOR19PQkpFQ1QpOworICAgICAgbWFnaWNCcmFuY2guY21kLnNldFJlc3VsdChSRUpFQ1RFRF9NSVNTSU5HX09CSkVDVCk7CiAgICAgICBsb2cuZXJyb3IoIkludmFsaWQgcGFjayB1cGxvYWQ7IG9uZSBvciBtb3JlIG9iamVjdHMgd2VyZW4ndCBzZW50IiwgZSk7CiAgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7CiAgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGUpIHsKICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHF1ZXJ5IGRhdGFiYXNlIHRvIGxvY2F0ZSBwcmlvciBjaGFuZ2VzIiwgZSk7Ci0gICAgICByZWplY3QobmV3Q2hhbmdlLCAiZGF0YWJhc2UgZXJyb3IiKTsKKyAgICAgIHJlamVjdChtYWdpY0JyYW5jaC5jbWQsICJkYXRhYmFzZSBlcnJvciIpOwogICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwogICAgIH0KIAogICAgIGlmIChuZXdDaGFuZ2VzLmlzRW1wdHkoKSAmJiByZXBsYWNlQnlDaGFuZ2UuaXNFbXB0eSgpKSB7Ci0gICAgICByZWplY3QobmV3Q2hhbmdlLCAibm8gbmV3IGNoYW5nZXMiKTsKKyAgICAgIHJlamVjdChtYWdpY0JyYW5jaC5jbWQsICJubyBuZXcgY2hhbmdlcyIpOwogICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwogICAgIH0KICAgICBmb3IgKENyZWF0ZVJlcXVlc3QgY3JlYXRlIDogbmV3Q2hhbmdlcykgewpAQCAtMTIxMCwxNSArMTM2MSwxNyBAQAogICAgIHJldHVybiBuZXdDaGFuZ2VzOwogICB9CiAKLQotICBwcml2YXRlIHZvaWQgbWFya0hlYWRzQXNVbmludGVyZXN0aW5nKGZpbmFsIFJldldhbGsgd2FsaywgU2V0PE9iamVjdElkPiBleGlzdGluZykgewotICAgIGZvciAoUmVmIHJlZiA6IHJlcG8uZ2V0QWxsUmVmcygpLnZhbHVlcygpKSB7CisgIHByaXZhdGUgdm9pZCBtYXJrSGVhZHNBc1VuaW50ZXJlc3RpbmcoCisgICAgICBmaW5hbCBSZXZXYWxrIHdhbGssCisgICAgICBTZXQ8T2JqZWN0SWQ+IGV4aXN0aW5nLAorICAgICAgQE51bGxhYmxlIFN0cmluZyBmb3JSZWYpIHsKKyAgICBmb3IgKFJlZiByZWYgOiBhbGxSZWZzLnZhbHVlcygpKSB7CiAgICAgICBpZiAocmVmLmdldE9iamVjdElkKCkgPT0gbnVsbCkgewogICAgICAgICBjb250aW51ZTsKICAgICAgIH0gZWxzZSBpZiAocmVmLmdldE5hbWUoKS5zdGFydHNXaXRoKCJyZWZzL2NoYW5nZXMvIikpIHsKICAgICAgICAgZXhpc3RpbmcuYWRkKHJlZi5nZXRPYmplY3RJZCgpKTsKICAgICAgIH0gZWxzZSBpZiAocmVmLmdldE5hbWUoKS5zdGFydHNXaXRoKFJfSEVBRFMpCi0gICAgICAgICAgfHwgKGRlc3RCcmFuY2hDdGwgIT0gbnVsbCAmJiByZWYuZ2V0TmFtZSgpLmVxdWFscyhkZXN0QnJhbmNoQ3RsLmdldFJlZk5hbWUoKSkpKSB7CisgICAgICAgICAgfHwgKGZvclJlZiAhPSBudWxsICYmIGZvclJlZi5lcXVhbHMocmVmLmdldE5hbWUoKSkpKSB7CiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgd2Fsay5tYXJrVW5pbnRlcmVzdGluZyh3YWxrLnBhcnNlQ29tbWl0KHJlZi5nZXRPYmplY3RJZCgpKSk7CiAgICAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKQEAgLTEyNDIsNyArMTM5NSw3IEBACiAgICAgQ2hhbmdlTG9va3VwKFJldkNvbW1pdCBjLCBDaGFuZ2UuS2V5IGtleSkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CiAgICAgICBjb21taXQgPSBjOwogICAgICAgY2hhbmdlS2V5ID0ga2V5OwotICAgICAgY2hhbmdlcyA9IGRiLmNoYW5nZXMoKS5ieUJyYW5jaEtleShkZXN0QnJhbmNoLCBrZXkpOworICAgICAgY2hhbmdlcyA9IGRiLmNoYW5nZXMoKS5ieUJyYW5jaEtleShtYWdpY0JyYW5jaC5kZXN0LCBrZXkpOwogICAgIH0KICAgfQogCkBAIC0xMjYwLDE2ICsxNDEzLDE1IEBACiAgICAgICBjaGFuZ2UgPSBuZXcgQ2hhbmdlKGNoYW5nZUtleSwKICAgICAgICAgICBuZXcgQ2hhbmdlLklkKGRiLm5leHRDaGFuZ2VJZCgpKSwKICAgICAgICAgICBjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKSwKLSAgICAgICAgICBkZXN0QnJhbmNoKTsKLSAgICAgIGNoYW5nZS5zZXRUb3BpYyhkZXN0VG9waWNOYW1lKTsKLSAgICAgIGNoYW5nZS5uZXh0UGF0Y2hTZXRJZCgpOworICAgICAgICAgIG1hZ2ljQnJhbmNoLmRlc3QpOworICAgICAgY2hhbmdlLnNldFRvcGljKG1hZ2ljQnJhbmNoLnRvcGljKTsKIAotICAgICAgcHMgPSBuZXcgUGF0Y2hTZXQoY2hhbmdlLmN1cnJQYXRjaFNldElkKCkpOworICAgICAgcHMgPSBuZXcgUGF0Y2hTZXQobmV3IFBhdGNoU2V0LklkKGNoYW5nZS5nZXRJZCgpLCBJTklUSUFMX1BBVENIX1NFVF9JRCkpOwogICAgICAgcHMuc2V0Q3JlYXRlZE9uKGNoYW5nZS5nZXRDcmVhdGVkT24oKSk7CiAgICAgICBwcy5zZXRVcGxvYWRlcihjaGFuZ2UuZ2V0T3duZXIoKSk7CiAgICAgICBwcy5zZXRSZXZpc2lvbih0b1JldklkKGMpKTsKIAotICAgICAgaWYgKE1hZ2ljQnJhbmNoLmlzRHJhZnQobmV3Q2hhbmdlLmdldFJlZk5hbWUoKSkpIHsKKyAgICAgIGlmIChtYWdpY0JyYW5jaC5pc0RyYWZ0KCkpIHsKICAgICAgICAgY2hhbmdlLnNldFN0YXR1cyhDaGFuZ2UuU3RhdHVzLkRSQUZUKTsKICAgICAgICAgcHMuc2V0RHJhZnQodHJ1ZSk7CiAgICAgICB9CkBAIC0xMjgwLDQ4ICsxNDMyLDQ4IEBACiAgICAgICBjbWQgPSBuZXcgUmVjZWl2ZUNvbW1hbmQoT2JqZWN0SWQuemVyb0lkKCksIGMsIHBzLmdldFJlZk5hbWUoKSk7CiAgICAgfQogCi0gICAgdm9pZCBpbnNlcnRDaGFuZ2UoKSB0aHJvd3MgSU9FeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgQ2hlY2tlZEZ1dHVyZTxWb2lkLCBPcm1FeGNlcHRpb24+IGluc2VydENoYW5nZSgpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAgICAgICBycC5nZXRSZXZXYWxrKCkucGFyc2VCb2R5KGNvbW1pdCk7Ci0gICAgICB3YXJuTWFsZm9ybWVkTWVzc2FnZShjb21taXQpOwogCi0gICAgICBmaW5hbCBBY2NvdW50LklkIG1lID0gY3VycmVudFVzZXIuZ2V0QWNjb3VudElkKCk7Ci0gICAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gcmV2aWV3ZXJzID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4ocmV2aWV3ZXJJZCk7Ci0gICAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gY2MgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPihjY0lkKTsKLSAgICAgIGZpbmFsIExpc3Q8Rm9vdGVyTGluZT4gZm9vdGVyTGluZXMgPSBjb21taXQuZ2V0Rm9vdGVyTGluZXMoKTsKLSAgICAgIGZvciAoZmluYWwgRm9vdGVyTGluZSBmb290ZXJMaW5lIDogZm9vdGVyTGluZXMpIHsKLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICBpZiAocHMuaXNEcmFmdCgpKSB7Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgIGZpbmFsIFRocmVhZCBjYWxsZXIgPSBUaHJlYWQuY3VycmVudFRocmVhZCgpOworICAgICAgTGlzdGVuYWJsZUZ1dHVyZTxWb2lkPiBmdXR1cmUgPSBjaGFuZ2VVcGRhdGVFeGVjdG9yLnN1Ym1pdCgKKyAgICAgICAgICByZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLndyYXAobmV3IENhbGxhYmxlPFZvaWQ+KCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIFZvaWQgY2FsbCgpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgICAgICAgIGlmIChjYWxsZXIgPT0gVGhyZWFkLmN1cnJlbnRUaHJlYWQoKSkgeworICAgICAgICAgICAgaW5zZXJ0Q2hhbmdlKGRiKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgUmV2aWV3RGIgZGIgPSBzY2hlbWFGYWN0b3J5Lm9wZW4oKTsKKyAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgIGluc2VydENoYW5nZShkYik7CisgICAgICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAgICAgICBkYi5jbG9zZSgpOworICAgICAgICAgICAgfQogICAgICAgICAgIH0KLSAgICAgICAgICBpZiAoaXNSZXZpZXdlcihmb290ZXJMaW5lKSkgewotICAgICAgICAgICAgcmV2aWV3ZXJzLmFkZCh0b0FjY291bnRJZChmb290ZXJMaW5lLmdldFZhbHVlKCkudHJpbSgpKSk7Ci0gICAgICAgICAgfSBlbHNlIGlmIChmb290ZXJMaW5lLm1hdGNoZXMoRm9vdGVyS2V5LkNDKSkgewotICAgICAgICAgICAgY2MuYWRkKHRvQWNjb3VudElkKGZvb3RlckxpbmUuZ2V0VmFsdWUoKS50cmltKCkpKTsKKyAgICAgICAgICBzeW5jaHJvbml6ZWQgKG5ld1Byb2dyZXNzKSB7CisgICAgICAgICAgICBuZXdQcm9ncmVzcy51cGRhdGUoMSk7CiAgICAgICAgICAgfQotICAgICAgICB9IGNhdGNoIChOb1N1Y2hBY2NvdW50RXhjZXB0aW9uIGUpIHsKLSAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgfQotICAgICAgfQotICAgICAgcmV2aWV3ZXJzLnJlbW92ZShtZSk7Ci0gICAgICBjYy5yZW1vdmUobWUpOwotICAgICAgY2MucmVtb3ZlQWxsKHJldmlld2Vycyk7CisgICAgICB9KSk7CisgICAgICByZXR1cm4gRnV0dXJlcy5tYWtlQ2hlY2tlZChmdXR1cmUsIE9STV9FWENFUFRJT04pOworICAgIH0KIAotICAgICAgZGIuY2hhbmdlcygpLmJlZ2luVHJhbnNhY3Rpb24oY2hhbmdlLmdldElkKCkpOwotICAgICAgdHJ5IHsKLSAgICAgICAgaW5zZXJ0QW5jZXN0b3JzKHBzLmdldElkKCksIGNvbW1pdCk7Ci0gICAgICAgIGRiLnBhdGNoU2V0cygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24ocHMpKTsKLSAgICAgICAgZGIuY2hhbmdlcygpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24oY2hhbmdlKSk7Ci0gICAgICAgIENoYW5nZVV0aWwudXBkYXRlVHJhY2tpbmdJZHMoZGIsIGNoYW5nZSwgdHJhY2tpbmdGb290ZXJzLCBmb290ZXJMaW5lcyk7Ci0gICAgICAgIGFwcHJvdmFsc1V0aWwuYWRkUmV2aWV3ZXJzKGNoYW5nZSwgcHMsIGluZm8sIHJldmlld2Vycyk7Ci0gICAgICAgIGRiLmNvbW1pdCgpOwotICAgICAgfSBmaW5hbGx5IHsKLSAgICAgICAgZGIucm9sbGJhY2soKTsKKyAgICBwcml2YXRlIHZvaWQgaW5zZXJ0Q2hhbmdlKFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICAgIGZpbmFsIEFjY291bnQuSWQgbWUgPSBjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKTsKKyAgICAgIGZpbmFsIExpc3Q8Rm9vdGVyTGluZT4gZm9vdGVyTGluZXMgPSBjb21taXQuZ2V0Rm9vdGVyTGluZXMoKTsKKyAgICAgIGZpbmFsIE1haWxSZWNpcGllbnRzIHJlY2lwaWVudHMgPSBuZXcgTWFpbFJlY2lwaWVudHMoKTsKKyAgICAgIGlmIChtYWdpY0JyYW5jaCAhPSBudWxsKSB7CisgICAgICAgIHJlY2lwaWVudHMuYWRkKG1hZ2ljQnJhbmNoLmdldE1haWxSZWNpcGllbnRzKCkpOwogICAgICAgfQorICAgICAgcmVjaXBpZW50cy5hZGQoZ2V0UmVjaXBpZW50c0Zyb21Gb290ZXJzKGFjY291bnRSZXNvbHZlciwgcHMsIGZvb3RlckxpbmVzKSk7CisgICAgICByZWNpcGllbnRzLnJlbW92ZShtZSk7CisKKyAgICAgIGNoYW5nZUluc2VydGVyLmluc2VydENoYW5nZShkYiwgY2hhbmdlLCBwcywgY29tbWl0LCBsYWJlbFR5cGVzLAorICAgICAgICAgIGZvb3RlckxpbmVzLCBpbmZvLCByZWNpcGllbnRzLmdldFJldmlld2VycygpKTsKIAogICAgICAgY3JlYXRlZCA9IHRydWU7Ci0gICAgICByZXBsaWNhdGlvbi5maXJlKHByb2plY3QuZ2V0TmFtZUtleSgpLCBwcy5nZXRSZWZOYW1lKCkpOwotICAgICAgaG9va3MuZG9QYXRjaHNldENyZWF0ZWRIb29rKGNoYW5nZSwgcHMsIGRiKTsKLSAgICAgIG5ld1Byb2dyZXNzLnVwZGF0ZSgxKTsKKwogICAgICAgd29ya1F1ZXVlLmdldERlZmF1bHRRdWV1ZSgpCiAgICAgICAgICAgLnN1Ym1pdChyZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLndyYXAobmV3IFJ1bm5hYmxlKCkgewogICAgICAgICBAT3ZlcnJpZGUKQEAgLTEzMzEsOCArMTQ4Myw4IEBACiAgICAgICAgICAgICAgICAgY3JlYXRlQ2hhbmdlU2VuZGVyRmFjdG9yeS5jcmVhdGUoY2hhbmdlKTsKICAgICAgICAgICAgIGNtLnNldEZyb20obWUpOwogICAgICAgICAgICAgY20uc2V0UGF0Y2hTZXQocHMsIGluZm8pOwotICAgICAgICAgICAgY20uYWRkUmV2aWV3ZXJzKHJldmlld2Vycyk7Ci0gICAgICAgICAgICBjbS5hZGRFeHRyYUNDKGNjKTsKKyAgICAgICAgICAgIGNtLmFkZFJldmlld2VycyhyZWNpcGllbnRzLmdldFJldmlld2VycygpKTsKKyAgICAgICAgICAgIGNtLmFkZEV4dHJhQ0MocmVjaXBpZW50cy5nZXRDY09ubHkoKSk7CiAgICAgICAgICAgICBjbS5zZW5kKCk7CiAgICAgICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKICAgICAgICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHNlbmQgZW1haWwgZm9yIG5ldyBjaGFuZ2UgIiArIGNoYW5nZS5nZXRJZCgpLCBlKTsKQEAgLTEzNDcsMTggKzE0OTksMTAgQEAKICAgICB9CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBib29sZWFuIGlzUmV2aWV3ZXIoZmluYWwgRm9vdGVyTGluZSBjYW5kaWRhdGVGb290ZXJMaW5lKSB7Ci0gICAgcmV0dXJuIGNhbmRpZGF0ZUZvb3RlckxpbmUubWF0Y2hlcyhGb290ZXJLZXkuU0lHTkVEX09GRl9CWSkKLSAgICAgICAgfHwgY2FuZGlkYXRlRm9vdGVyTGluZS5tYXRjaGVzKEZvb3RlcktleS5BQ0tFRF9CWSkKLSAgICAgICAgfHwgY2FuZGlkYXRlRm9vdGVyTGluZS5tYXRjaGVzKFJFVklFV0VEX0JZKQotICAgICAgICB8fCBjYW5kaWRhdGVGb290ZXJMaW5lLm1hdGNoZXMoVEVTVEVEX0JZKTsKLSAgfQotCiAgIHByaXZhdGUgdm9pZCBwcmVwYXJlUGF0Y2hTZXRzRm9yUmVwbGFjZSgpIHsKICAgICB0cnkgewogICAgICAgcmVhZENoYW5nZXNGb3JSZXBsYWNlKCk7CiAgICAgICByZWFkUGF0Y2hTZXRzRm9yUmVwbGFjZSgpOwotCiAgICAgICBmb3IgKFJlcGxhY2VSZXF1ZXN0IHJlcSA6IHJlcGxhY2VCeUNoYW5nZS52YWx1ZXMoKSkgewogICAgICAgICBpZiAocmVxLmlucHV0Q29tbWFuZC5nZXRSZXN1bHQoKSA9PSBOT1RfQVRURU1QVEVEKSB7CiAgICAgICAgICAgcmVxLnZhbGlkYXRlKGZhbHNlKTsKQEAgLTEzODYsMTAgKzE1MzAsMTAgQEAKICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAobmV3Q2hhbmdlICE9IG51bGwgJiYgbmV3Q2hhbmdlLmdldFJlc3VsdCgpICE9IE5PVF9BVFRFTVBURUQpIHsKKyAgICBpZiAobWFnaWNCcmFuY2ggIT0gbnVsbCAmJiBtYWdpY0JyYW5jaC5jbWQuZ2V0UmVzdWx0KCkgIT0gTk9UX0FUVEVNUFRFRCkgewogICAgICAgLy8gQ2FuY2VsIGNyZWF0aW9ucyB0aWVkIHRvIHJlZnMvZm9yLyBvciByZWZzL2RyYWZ0cy8gY29tbWFuZC4KICAgICAgIGZvciAoUmVwbGFjZVJlcXVlc3QgcmVxIDogcmVwbGFjZUJ5Q2hhbmdlLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmIChyZXEuaW5wdXRDb21tYW5kID09IG5ld0NoYW5nZSAmJiByZXEuY21kICE9IG51bGwpIHsKKyAgICAgICAgaWYgKHJlcS5pbnB1dENvbW1hbmQgPT0gbWFnaWNCcmFuY2guY21kICYmIHJlcS5jbWQgIT0gbnVsbCkgewogICAgICAgICAgIHJlcS5jbWQuc2V0UmVzdWx0KFJlc3VsdC5SRUpFQ1RFRF9PVEhFUl9SRUFTT04sICJhYm9ydGVkIik7CiAgICAgICAgIH0KICAgICAgIH0KQEAgLTE0NjksNiArMTYxMyw3IEBACiAgICAgICB9CiAKICAgICAgIHJwLmdldFJldldhbGsoKS5wYXJzZUJvZHkobmV3Q29tbWl0KTsKKwogICAgICAgaWYgKCF2YWxpZENvbW1pdChjaGFuZ2VDdGwuZ2V0UmVmQ29udHJvbCgpLCBpbnB1dENvbW1hbmQsIG5ld0NvbW1pdCkpIHsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgfQpAQCAtMTQ5NCw2ICsxNjM5LDEzIEBACiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgZmluYWwgUmV2Q29tbWl0IHByaW9yID0gcnAuZ2V0UmV2V2FsaygpLnBhcnNlQ29tbWl0KGNvbW1pdElkKTsKIAorICAgICAgICAgIC8vIERvbid0IGFsbG93IHRoZSBzYW1lIGNvbW1pdCB0byBhcHBlYXIgdHdpY2Ugb24gdGhlIHNhbWUgY2hhbmdlCisgICAgICAgICAgLy8KKyAgICAgICAgICBpZiAobmV3Q29tbWl0ID09IHByaW9yKSB7CisgICAgICAgICAgICByZWplY3QoaW5wdXRDb21tYW5kLCAiY29tbWl0IGFscmVhZHkgZXhpc3RzIik7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgfQorCiAgICAgICAgICAgLy8gRG9uJ3QgYWxsb3cgYSBjaGFuZ2UgdG8gZGlyZWN0bHkgZGVwZW5kIHVwb24gaXRzZWxmLiBUaGlzIGlzIGEKICAgICAgICAgICAvLyB2ZXJ5IGNvbW1vbiBlcnJvciBkdWUgdG8gdXNlcnMgbWFraW5nIGEgbmV3IGNvbW1pdCByYXRoZXIgdGhhbgogICAgICAgICAgIC8vIGFtZW5kaW5nIHdoZW4gdHJ5aW5nIHRvIGFkZHJlc3MgcmV2aWV3IGNvbW1lbnRzLgpAQCAtMTUwMywxMyArMTY1NSw2IEBACiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgfQogCi0gICAgICAgICAgLy8gRG9uJ3QgYWxsb3cgdGhlIHNhbWUgY29tbWl0IHRvIGFwcGVhciB0d2ljZSBvbiB0aGUgc2FtZSBjaGFuZ2UKLSAgICAgICAgICAvLwotICAgICAgICAgIGlmIChuZXdDb21taXQgPT0gcHJpb3IpIHsKLSAgICAgICAgICAgIHJlamVjdChpbnB1dENvbW1hbmQsICJjb21taXQgYWxyZWFkeSBleGlzdHMiKTsKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICB9Ci0KICAgICAgICAgICAvLyBEb24ndCBhbGxvdyB0aGUgc2FtZSB0cmVlIGlmIHRoZSBjb21taXQgbWVzc2FnZSBpcyB1bm1vZGlmaWVkCiAgICAgICAgICAgLy8gb3Igbm8gcGFyZW50cyB3ZXJlIHVwZGF0ZWQgKHJlYmFzZSksIGVsc2Ugd2FybiB0aGF0IG9ubHkgcGFydAogICAgICAgICAgIC8vIG9mIHRoZSBjb21taXQgd2FzIG1vZGlmaWVkLgpAQCAtMTU1MCwxMiArMTY5NSwxMyBAQAogICAgICAgICB9CiAgICAgICB9CiAKLSAgICAgIGNoYW5nZS5uZXh0UGF0Y2hTZXRJZCgpOwotICAgICAgbmV3UGF0Y2hTZXQgPSBuZXcgUGF0Y2hTZXQoY2hhbmdlLmN1cnJQYXRjaFNldElkKCkpOworICAgICAgUGF0Y2hTZXQuSWQgaWQgPQorICAgICAgICAgIENoYW5nZVV0aWwubmV4dFBhdGNoU2V0SWQoYWxsUmVmcywgY2hhbmdlLmN1cnJlbnRQYXRjaFNldElkKCkpOworICAgICAgbmV3UGF0Y2hTZXQgPSBuZXcgUGF0Y2hTZXQoaWQpOwogICAgICAgbmV3UGF0Y2hTZXQuc2V0Q3JlYXRlZE9uKG5ldyBUaW1lc3RhbXAoU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpKTsKICAgICAgIG5ld1BhdGNoU2V0LnNldFVwbG9hZGVyKGN1cnJlbnRVc2VyLmdldEFjY291bnRJZCgpKTsKICAgICAgIG5ld1BhdGNoU2V0LnNldFJldmlzaW9uKHRvUmV2SWQobmV3Q29tbWl0KSk7Ci0gICAgICBpZiAobmV3Q2hhbmdlICE9IG51bGwgJiYgTWFnaWNCcmFuY2guaXNEcmFmdChuZXdDaGFuZ2UuZ2V0UmVmTmFtZSgpKSkgeworICAgICAgaWYgKG1hZ2ljQnJhbmNoICE9IG51bGwgJiYgbWFnaWNCcmFuY2guaXNEcmFmdCgpKSB7CiAgICAgICAgIG5ld1BhdGNoU2V0LnNldERyYWZ0KHRydWUpOwogICAgICAgfQogICAgICAgaW5mbyA9IHBhdGNoU2V0SW5mb0ZhY3RvcnkuZ2V0KG5ld0NvbW1pdCwgbmV3UGF0Y2hTZXQuZ2V0SWQoKSk7CkBAIC0xNTY2LDUyICsxNzEyLDU1IEBACiAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKLSAgICBQYXRjaFNldC5JZCBpbnNlcnRQYXRjaFNldCgpIHRocm93cyBJT0V4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBDaGVja2VkRnV0dXJlPFBhdGNoU2V0LklkLCBPcm1FeGNlcHRpb24+IGluc2VydFBhdGNoU2V0KCkKKyAgICAgICAgdGhyb3dzIElPRXhjZXB0aW9uIHsKICAgICAgIHJwLmdldFJldldhbGsoKS5wYXJzZUJvZHkobmV3Q29tbWl0KTsKLSAgICAgIHdhcm5NYWxmb3JtZWRNZXNzYWdlKG5ld0NvbW1pdCk7CiAKLSAgICAgIGZpbmFsIEFjY291bnQuSWQgbWUgPSBjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKTsKLSAgICAgIGZpbmFsIFNldDxBY2NvdW50LklkPiByZXZpZXdlcnMgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPihyZXZpZXdlcklkKTsKLSAgICAgIGZpbmFsIFNldDxBY2NvdW50LklkPiBjYyA9IG5ldyBIYXNoU2V0PEFjY291bnQuSWQ+KGNjSWQpOwotICAgICAgZmluYWwgTGlzdDxGb290ZXJMaW5lPiBmb290ZXJMaW5lcyA9IG5ld0NvbW1pdC5nZXRGb290ZXJMaW5lcygpOwotICAgICAgZm9yIChmaW5hbCBGb290ZXJMaW5lIGZvb3RlckxpbmUgOiBmb290ZXJMaW5lcykgewotICAgICAgICB0cnkgewotICAgICAgICAgIGlmIChpc1Jldmlld2VyKGZvb3RlckxpbmUpKSB7Ci0gICAgICAgICAgICByZXZpZXdlcnMuYWRkKHRvQWNjb3VudElkKGZvb3RlckxpbmUuZ2V0VmFsdWUoKS50cmltKCkpKTsKLSAgICAgICAgICB9IGVsc2UgaWYgKGZvb3RlckxpbmUubWF0Y2hlcyhGb290ZXJLZXkuQ0MpKSB7Ci0gICAgICAgICAgICBjYy5hZGQodG9BY2NvdW50SWQoZm9vdGVyTGluZS5nZXRWYWx1ZSgpLnRyaW0oKSkpOworICAgICAgZmluYWwgVGhyZWFkIGNhbGxlciA9IFRocmVhZC5jdXJyZW50VGhyZWFkKCk7CisgICAgICBMaXN0ZW5hYmxlRnV0dXJlPFBhdGNoU2V0LklkPiBmdXR1cmUgPSBjaGFuZ2VVcGRhdGVFeGVjdG9yLnN1Ym1pdCgKKyAgICAgICAgICByZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLndyYXAobmV3IENhbGxhYmxlPFBhdGNoU2V0LklkPigpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHB1YmxpYyBQYXRjaFNldC5JZCBjYWxsKCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIGlmIChjYWxsZXIgPT0gVGhyZWFkLmN1cnJlbnRUaHJlYWQoKSkgeworICAgICAgICAgICAgICByZXR1cm4gaW5zZXJ0UGF0Y2hTZXQoZGIpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgUmV2aWV3RGIgZGIgPSBzY2hlbWFGYWN0b3J5Lm9wZW4oKTsKKyAgICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICByZXR1cm4gaW5zZXJ0UGF0Y2hTZXQoZGIpOworICAgICAgICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAgICAgICAgIGRiLmNsb3NlKCk7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAgICAgc3luY2hyb25pemVkIChyZXBsYWNlUHJvZ3Jlc3MpIHsKKyAgICAgICAgICAgICAgcmVwbGFjZVByb2dyZXNzLnVwZGF0ZSgxKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICB9Ci0gICAgICAgIH0gY2F0Y2ggKE5vU3VjaEFjY291bnRFeGNlcHRpb24gZSkgewotICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICB9Ci0gICAgICByZXZpZXdlcnMucmVtb3ZlKG1lKTsKLSAgICAgIGNjLnJlbW92ZShtZSk7Ci0gICAgICBjYy5yZW1vdmVBbGwocmV2aWV3ZXJzKTsKKyAgICAgIH0pKTsKKyAgICAgIHJldHVybiBGdXR1cmVzLm1ha2VDaGVja2VkKGZ1dHVyZSwgT1JNX0VYQ0VQVElPTik7CisgICAgfQogCi0gICAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gb2xkUmV2aWV3ZXJzID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4oKTsKLSAgICAgIGZpbmFsIFNldDxBY2NvdW50LklkPiBvbGRDQyA9IG5ldyBIYXNoU2V0PEFjY291bnQuSWQ+KCk7CisgICAgUGF0Y2hTZXQuSWQgaW5zZXJ0UGF0Y2hTZXQoUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgICAgZmluYWwgQWNjb3VudC5JZCBtZSA9IGN1cnJlbnRVc2VyLmdldEFjY291bnRJZCgpOworICAgICAgZmluYWwgTGlzdDxGb290ZXJMaW5lPiBmb290ZXJMaW5lcyA9IG5ld0NvbW1pdC5nZXRGb290ZXJMaW5lcygpOworICAgICAgZmluYWwgTWFpbFJlY2lwaWVudHMgcmVjaXBpZW50cyA9IG5ldyBNYWlsUmVjaXBpZW50cygpOworICAgICAgaWYgKG1hZ2ljQnJhbmNoICE9IG51bGwpIHsKKyAgICAgICAgcmVjaXBpZW50cy5hZGQobWFnaWNCcmFuY2guZ2V0TWFpbFJlY2lwaWVudHMoKSk7CisgICAgICB9CisgICAgICByZWNpcGllbnRzLmFkZChnZXRSZWNpcGllbnRzRnJvbUZvb3RlcnMoYWNjb3VudFJlc29sdmVyLCBuZXdQYXRjaFNldCwgZm9vdGVyTGluZXMpKTsKKyAgICAgIHJlY2lwaWVudHMucmVtb3ZlKG1lKTsKIAogICAgICAgZGIuY2hhbmdlcygpLmJlZ2luVHJhbnNhY3Rpb24oY2hhbmdlLmdldElkKCkpOwogICAgICAgdHJ5IHsKLSAgICAgICAgY2hhbmdlID0KLSAgICAgICAgICBkYi5jaGFuZ2VzKCkuYXRvbWljVXBkYXRlKGNoYW5nZS5nZXRJZCgpLCBuZXcgQXRvbWljVXBkYXRlPENoYW5nZT4oKSB7Ci0gICAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICAgIHB1YmxpYyBDaGFuZ2UgdXBkYXRlKENoYW5nZSBjaGFuZ2UpIHsKLSAgICAgICAgICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKS5pc0Nsb3NlZCgpKSB7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7Ci0gICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICBjaGFuZ2UudXBkYXRlTnVtYmVyT2ZQYXRjaFNldHMobmV3UGF0Y2hTZXQuZ2V0UGF0Y2hTZXRJZCgpKTsKLSAgICAgICAgICAgICAgcmV0dXJuIGNoYW5nZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9KTsKLSAgICAgICAgaWYgKGNoYW5nZSA9PSBudWxsKSB7CisgICAgICAgIGNoYW5nZSA9IGRiLmNoYW5nZXMoKS5nZXQoY2hhbmdlLmdldElkKCkpOworICAgICAgICBpZiAoY2hhbmdlID09IG51bGwgfHwgY2hhbmdlLmdldFN0YXR1cygpLmlzQ2xvc2VkKCkpIHsKICAgICAgICAgICByZWplY3QoaW5wdXRDb21tYW5kLCAiY2hhbmdlIGlzIGNsb3NlZCIpOwogICAgICAgICAgIHJldHVybiBudWxsOwogICAgICAgICB9CiAKLSAgICAgICAgaW5zZXJ0QW5jZXN0b3JzKG5ld1BhdGNoU2V0LmdldElkKCksIG5ld0NvbW1pdCk7CisgICAgICAgIENoYW5nZVV0aWwuaW5zZXJ0QW5jZXN0b3JzKGRiLCBuZXdQYXRjaFNldC5nZXRJZCgpLCBuZXdDb21taXQpOwogICAgICAgICBkYi5wYXRjaFNldHMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKG5ld1BhdGNoU2V0KSk7CiAKICAgICAgICAgaWYgKGNoZWNrTWVyZ2VkSW50bykgewpAQCAtMTYxOSwyMiArMTc2OCwxMyBAQAogICAgICAgICAgIG1lcmdlZEludG9SZWYgPSBtZXJnZWRJbnRvICE9IG51bGwgPyBtZXJnZWRJbnRvLmdldE5hbWUoKSA6IG51bGw7CiAgICAgICAgIH0KIAotICAgICAgICBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IHBhdGNoU2V0QXBwcm92YWxzID0gYXBwcm92YWxzVXRpbC5jb3B5VmV0b3NUb0xhdGVzdFBhdGNoU2V0KGNoYW5nZSk7Ci0KLSAgICAgICAgZmluYWwgU2V0PEFjY291bnQuSWQ+IGhhdmVBcHByb3ZhbHMgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPigpOwotICAgICAgICBvbGRSZXZpZXdlcnMuY2xlYXIoKTsKLSAgICAgICAgb2xkQ0MuY2xlYXIoKTsKLQotICAgICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgYSA6IHBhdGNoU2V0QXBwcm92YWxzKSB7Ci0gICAgICAgICAgaGF2ZUFwcHJvdmFscy5hZGQoYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgICAgaWYgKGEuZ2V0VmFsdWUoKSAhPSAwKSB7Ci0gICAgICAgICAgICBvbGRSZXZpZXdlcnMuYWRkKGEuZ2V0QWNjb3VudElkKCkpOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBvbGRDQy5hZGQoYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgYXBwcm92YWxzVXRpbC5hZGRSZXZpZXdlcnMoY2hhbmdlLCBuZXdQYXRjaFNldCwgaW5mbywgcmV2aWV3ZXJzLCBoYXZlQXBwcm92YWxzKTsKKyAgICAgICAgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBwYXRjaFNldEFwcHJvdmFscyA9CisgICAgICAgICAgICBhcHByb3ZhbHNVdGlsLmNvcHlWZXRvc1RvUGF0Y2hTZXQoZGIsIGxhYmVsVHlwZXMsIG5ld1BhdGNoU2V0LmdldElkKCkpOworICAgICAgICBmaW5hbCBNYWlsUmVjaXBpZW50cyBvbGRSZWNpcGllbnRzID0KKyAgICAgICAgICAgIGdldFJlY2lwaWVudHNGcm9tQXBwcm92YWxzKHBhdGNoU2V0QXBwcm92YWxzKTsKKyAgICAgICAgYXBwcm92YWxzVXRpbC5hZGRSZXZpZXdlcnMoZGIsIGxhYmVsVHlwZXMsIGNoYW5nZSwgbmV3UGF0Y2hTZXQsIGluZm8sCisgICAgICAgICAgICByZWNpcGllbnRzLmdldFJldmlld2VycygpLCBvbGRSZWNpcGllbnRzLmdldEFsbCgpKTsKKyAgICAgICAgcmVjaXBpZW50cy5hZGQob2xkUmVjaXBpZW50cyk7CiAKICAgICAgICAgbXNnID0KICAgICAgICAgICAgIG5ldyBDaGFuZ2VNZXNzYWdlKG5ldyBDaGFuZ2VNZXNzYWdlLktleShjaGFuZ2UuZ2V0SWQoKSwgQ2hhbmdlVXRpbApAQCAtMTY2MCw4ICsxODAwLDggQEAKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGNoYW5nZTsKICAgICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgICAgaWYgKGRlc3RUb3BpY05hbWUgIT0gbnVsbCkgewotICAgICAgICAgICAgICAgICAgICBjaGFuZ2Uuc2V0VG9waWMoZGVzdFRvcGljTmFtZSk7CisgICAgICAgICAgICAgICAgICBpZiAobWFnaWNCcmFuY2ggIT0gbnVsbCAmJiBtYWdpY0JyYW5jaC50b3BpYyAhPSBudWxsKSB7CisgICAgICAgICAgICAgICAgICAgIGNoYW5nZS5zZXRUb3BpYyhtYWdpY0JyYW5jaC50b3BpYyk7CiAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpID09IENoYW5nZS5TdGF0dXMuRFJBRlQgJiYgbmV3UGF0Y2hTZXQuaXNEcmFmdCgpKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIExlYXZlIGluIGRyYWZ0IHN0YXR1cy4KQEAgLTE2OTYsOSArMTgzNiw5IEBACiAgICAgICBpZiAoY21kLmdldFJlc3VsdCgpID09IE5PVF9BVFRFTVBURUQpIHsKICAgICAgICAgY21kLmV4ZWN1dGUocnApOwogICAgICAgfQotICAgICAgcmVwbGljYXRpb24uZmlyZShwcm9qZWN0LmdldE5hbWVLZXkoKSwgbmV3UGF0Y2hTZXQuZ2V0UmVmTmFtZSgpKTsKKyAgICAgIGdpdFJlZlVwZGF0ZWQuZmlyZShwcm9qZWN0LmdldE5hbWVLZXkoKSwgbmV3UGF0Y2hTZXQuZ2V0UmVmTmFtZSgpLAorICAgICAgICAgIE9iamVjdElkLnplcm9JZCgpLCBuZXdDb21taXQpOwogICAgICAgaG9va3MuZG9QYXRjaHNldENyZWF0ZWRIb29rKGNoYW5nZSwgbmV3UGF0Y2hTZXQsIGRiKTsKLSAgICAgIHJlcGxhY2VQcm9ncmVzcy51cGRhdGUoMSk7CiAgICAgICBpZiAobWVyZ2VkSW50b1JlZiAhPSBudWxsKSB7CiAgICAgICAgIGhvb2tzLmRvQ2hhbmdlTWVyZ2VkSG9vaygKICAgICAgICAgICAgIGNoYW5nZSwgY3VycmVudFVzZXIuZ2V0QWNjb3VudCgpLCBuZXdQYXRjaFNldCwgZGIpOwpAQCAtMTcxMywxMCArMTg1Myw4IEBACiAgICAgICAgICAgICBjbS5zZXRGcm9tKG1lKTsKICAgICAgICAgICAgIGNtLnNldFBhdGNoU2V0KG5ld1BhdGNoU2V0LCBpbmZvKTsKICAgICAgICAgICAgIGNtLnNldENoYW5nZU1lc3NhZ2UobXNnKTsKLSAgICAgICAgICAgIGNtLmFkZFJldmlld2VycyhyZXZpZXdlcnMpOwotICAgICAgICAgICAgY20uYWRkRXh0cmFDQyhjYyk7Ci0gICAgICAgICAgICBjbS5hZGRSZXZpZXdlcnMob2xkUmV2aWV3ZXJzKTsKLSAgICAgICAgICAgIGNtLmFkZEV4dHJhQ0Mob2xkQ0MpOworICAgICAgICAgICAgY20uYWRkUmV2aWV3ZXJzKHJlY2lwaWVudHMuZ2V0UmV2aWV3ZXJzKCkpOworICAgICAgICAgICAgY20uYWRkRXh0cmFDQyhyZWNpcGllbnRzLmdldENjT25seSgpKTsKICAgICAgICAgICAgIGNtLnNlbmQoKTsKICAgICAgICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgewogICAgICAgICAgICAgbG9nLmVycm9yKCJDYW5ub3Qgc2VuZCBlbWFpbCBmb3IgbmV3IHBhdGNoIHNldCAiICsgbmV3UGF0Y2hTZXQuZ2V0SWQoKSwgZSk7CkBAIC0xODAzLDcgKzE5NDEsNyBAQAogICAgICAgICAmJiBjdGwuY2FuRm9yZ2VDb21taXR0ZXIoKQogICAgICAgICAmJiBjdGwuY2FuRm9yZ2VHZXJyaXRTZXJ2ZXJJZGVudGl0eSgpCiAgICAgICAgICYmIGN0bC5jYW5VcGxvYWRNZXJnZXMoKQotICAgICAgICAmJiAhcHJvamVjdC5pc1VzZVNpZ25lZE9mZkJ5KCkKKyAgICAgICAgJiYgIXByb2plY3RDb250cm9sLmdldFByb2plY3RTdGF0ZSgpLmlzVXNlU2lnbmVkT2ZmQnkoKQogICAgICAgICAmJiBJdGVyYWJsZXMuaXNFbXB0eShyZWplY3RDb21taXRzKQogICAgICAgICAmJiAhR2l0UmVwb3NpdG9yeU1hbmFnZXIuUkVGX0NPTkZJRy5lcXVhbHMoY3RsLmdldFJlZk5hbWUoKSkKICAgICAgICAgJiYgIShNYWdpY0JyYW5jaC5pc01hZ2ljQnJhbmNoKGNtZC5nZXRSZWZOYW1lKCkpCkBAIC0xODE3LDcgKzE5NTUsNyBAQAogICAgIHRyeSB7CiAgICAgICBTZXQ8T2JqZWN0SWQ+IGV4aXN0aW5nID0gU2V0cy5uZXdIYXNoU2V0KCk7CiAgICAgICB3YWxrLm1hcmtTdGFydCh3YWxrLnBhcnNlQ29tbWl0KGNtZC5nZXROZXdJZCgpKSk7Ci0gICAgICBtYXJrSGVhZHNBc1VuaW50ZXJlc3Rpbmcod2FsaywgZXhpc3RpbmcpOworICAgICAgbWFya0hlYWRzQXNVbmludGVyZXN0aW5nKHdhbGssIGV4aXN0aW5nLCBjbWQuZ2V0UmVmTmFtZSgpKTsKIAogICAgICAgUmV2Q29tbWl0IGM7CiAgICAgICB3aGlsZSAoKGMgPSB3YWxrLm5leHQoKSkgIT0gbnVsbCkgewpAQCAtMTgzNSwyMjIgKzE5NzMsMjcgQEAKIAogICBwcml2YXRlIGJvb2xlYW4gdmFsaWRDb21taXQoZmluYWwgUmVmQ29udHJvbCBjdGwsIGZpbmFsIFJlY2VpdmVDb21tYW5kIGNtZCwKICAgICAgIGZpbmFsIFJldkNvbW1pdCBjKSB0aHJvd3MgTWlzc2luZ09iamVjdEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24gewotICAgIHJwLmdldFJldldhbGsoKS5wYXJzZUJvZHkoYyk7Ci0gICAgZmluYWwgUGVyc29uSWRlbnQgY29tbWl0dGVyID0gYy5nZXRDb21taXR0ZXJJZGVudCgpOwotICAgIGZpbmFsIFBlcnNvbklkZW50IGF1dGhvciA9IGMuZ2V0QXV0aG9ySWRlbnQoKTsKIAotICAgIC8vIFJlcXVpcmUgcGVybWlzc2lvbiB0byB1cGxvYWQgbWVyZ2VzLgotICAgIGlmIChjLmdldFBhcmVudENvdW50KCkgPiAxICYmICFjdGwuY2FuVXBsb2FkTWVyZ2VzKCkpIHsKLSAgICAgIHJlamVjdChjbWQsICJ5b3UgYXJlIG5vdCBhbGxvd2VkIHRvIHVwbG9hZCBtZXJnZXMiKTsKKyAgICBpZiAodmFsaWRDb21taXRzLmNvbnRhaW5zKGMpKSB7CisgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICBDb21taXRSZWNlaXZlZEV2ZW50IHJlY2VpdmVFdmVudCA9CisgICAgICAgIG5ldyBDb21taXRSZWNlaXZlZEV2ZW50KGNtZCwgcHJvamVjdCwgY3RsLmdldFJlZk5hbWUoKSwgYywgY3VycmVudFVzZXIpOworICAgIENvbW1pdFZhbGlkYXRvcnMgY29tbWl0VmFsaWRhdG9ycyA9CisgICAgICAgIGNvbW1pdFZhbGlkYXRvcnNGYWN0b3J5LmNyZWF0ZShjdGwsIHNzaEluZm8sIHJlcG8pOworCisgICAgdHJ5IHsKKyAgICAgIG1lc3NhZ2VzLmFkZEFsbChjb21taXRWYWxpZGF0b3JzLnZhbGlkYXRlRm9yUmVjZWl2ZUNvbW1pdHMocmVjZWl2ZUV2ZW50KSk7CisgICAgfSBjYXRjaCAoQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbiBlKSB7CisgICAgICBtZXNzYWdlcy5hZGRBbGwoZS5nZXRNZXNzYWdlcygpKTsKKyAgICAgIHJlamVjdChjbWQsIGUuZ2V0TWVzc2FnZSgpKTsKICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0KLSAgICAvLyBEb24ndCBhbGxvdyB0aGUgdXNlciB0byBhbWVuZCBhIG1lcmdlIGNyZWF0ZWQgYnkgR2Vycml0IENvZGUgUmV2aWV3LgotICAgIC8vIFRoaXMgc2VlbXMgdG8gaGFwcGVuIGFsbCB0b28gb2Z0ZW4sIGR1ZSB0byB1c2VycyBub3QgcGF5aW5nIGFueQotICAgIC8vIGF0dGVudGlvbiB0byB3aGF0IHRoZXkgYXJlIGRvaW5nLgotICAgIC8vCi0gICAgaWYgKGMuZ2V0UGFyZW50Q291bnQoKSA+IDEKLSAgICAgICAgJiYgYXV0aG9yLmdldE5hbWUoKS5lcXVhbHMoZ2Vycml0SWRlbnQuZ2V0TmFtZSgpKQotICAgICAgICAmJiBhdXRob3IuZ2V0RW1haWxBZGRyZXNzKCkuZXF1YWxzKGdlcnJpdElkZW50LmdldEVtYWlsQWRkcmVzcygpKQotICAgICAgICAmJiAhY3RsLmNhbkZvcmdlR2Vycml0U2VydmVySWRlbnRpdHkoKSkgewotICAgICAgcmVqZWN0KGNtZCwgImRvIG5vdCBhbWVuZCBtZXJnZXMgbm90IG1hZGUgYnkgeW91Iik7Ci0gICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgLy8gUmVxdWlyZSB0aGF0IGF1dGhvciBtYXRjaGVzIHRoZSB1cGxvYWRlci4KLSAgICAvLwotICAgIGlmICghY3VycmVudFVzZXIuZ2V0RW1haWxBZGRyZXNzZXMoKS5jb250YWlucyhhdXRob3IuZ2V0RW1haWxBZGRyZXNzKCkpCi0gICAgICAgICYmICFjdGwuY2FuRm9yZ2VBdXRob3IoKSkgewotICAgICAgc2VuZEludmFsaWRFbWFpbEVycm9yKGMsICJhdXRob3IiLCBhdXRob3IpOwotICAgICAgcmVqZWN0KGNtZCwgImludmFsaWQgYXV0aG9yIik7Ci0gICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgLy8gUmVxdWlyZSB0aGF0IGNvbW1pdHRlciBtYXRjaGVzIHRoZSB1cGxvYWRlci4KLSAgICAvLwotICAgIGlmICghY3VycmVudFVzZXIuZ2V0RW1haWxBZGRyZXNzZXMoKS5jb250YWlucyhjb21taXR0ZXIuZ2V0RW1haWxBZGRyZXNzKCkpCi0gICAgICAgICYmICFjdGwuY2FuRm9yZ2VDb21taXR0ZXIoKSkgewotICAgICAgc2VuZEludmFsaWRFbWFpbEVycm9yKGMsICJjb21taXR0ZXIiLCBjb21taXR0ZXIpOwotICAgICAgcmVqZWN0KGNtZCwgImludmFsaWQgY29tbWl0dGVyIik7Ci0gICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgaWYgKHByb2plY3QuaXNVc2VTaWduZWRPZmZCeSgpKSB7Ci0gICAgICAvLyBJZiB0aGUgcHJvamVjdCB3YW50cyBTaWduZWQtb2ZmLWJ5IC8gQWNrZWQtYnkgbGluZXMsIHZlcmlmeSB3ZQotICAgICAgLy8gaGF2ZSB0aGVtIGZvciB0aGUgYmxhbWFibGUgcGFydGllcyBpbnZvbHZlZCBvbiB0aGlzIGNoYW5nZS4KLSAgICAgIC8vCi0gICAgICBib29sZWFuIHNib0F1dGhvciA9IGZhbHNlLCBzYm9Db21taXR0ZXIgPSBmYWxzZSwgc2JvTWUgPSBmYWxzZTsKLSAgICAgIGZvciAoZmluYWwgRm9vdGVyTGluZSBmb290ZXIgOiBjLmdldEZvb3RlckxpbmVzKCkpIHsKLSAgICAgICAgaWYgKGZvb3Rlci5tYXRjaGVzKEZvb3RlcktleS5TSUdORURfT0ZGX0JZKSkgewotICAgICAgICAgIGZpbmFsIFN0cmluZyBlID0gZm9vdGVyLmdldEVtYWlsQWRkcmVzcygpOwotICAgICAgICAgIGlmIChlICE9IG51bGwpIHsKLSAgICAgICAgICAgIHNib0F1dGhvciB8PSBhdXRob3IuZ2V0RW1haWxBZGRyZXNzKCkuZXF1YWxzKGUpOwotICAgICAgICAgICAgc2JvQ29tbWl0dGVyIHw9IGNvbW1pdHRlci5nZXRFbWFpbEFkZHJlc3MoKS5lcXVhbHMoZSk7Ci0gICAgICAgICAgICBzYm9NZSB8PSBjdXJyZW50VXNlci5nZXRFbWFpbEFkZHJlc3NlcygpLmNvbnRhaW5zKGUpOwotICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgfQotICAgICAgaWYgKCFzYm9BdXRob3IgJiYgIXNib0NvbW1pdHRlciAmJiAhc2JvTWUgJiYgIWN0bC5jYW5Gb3JnZUNvbW1pdHRlcigpKSB7Ci0gICAgICAgIHJlamVjdChjbWQsICJub3QgU2lnbmVkLW9mZi1ieSBhdXRob3IvY29tbWl0dGVyL3VwbG9hZGVyIik7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBmaW5hbCBMaXN0PFN0cmluZz4gaWRMaXN0ID0gYy5nZXRGb290ZXJMaW5lcyhDSEFOR0VfSUQpOwotICAgIGlmIChNYWdpY0JyYW5jaC5pc01hZ2ljQnJhbmNoKGNtZC5nZXRSZWZOYW1lKCkpIHx8IE5FV19QQVRDSFNFVC5tYXRjaGVyKGNtZC5nZXRSZWZOYW1lKCkpLm1hdGNoZXMoKSkgewotICAgICAgaWYgKGlkTGlzdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgaWYgKHByb2plY3QuaXNSZXF1aXJlQ2hhbmdlSUQoKSkgewotICAgICAgICAgIFN0cmluZyBlcnJNc2cgPSAibWlzc2luZyBDaGFuZ2UtSWQgaW4gY29tbWl0IG1lc3NhZ2UiOwotICAgICAgICAgIHJlamVjdChjbWQsIGVyck1zZyk7Ci0gICAgICAgICAgYWRkTWVzc2FnZShnZXRGaXhlZENvbW1pdE1zZ1dpdGhDaGFuZ2VJZChlcnJNc2csIGMpKTsKLSAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAgICAgIH0gZWxzZSBpZiAoaWRMaXN0LnNpemUoKSA+IDEpIHsKLSAgICAgICAgcmVqZWN0KGNtZCwgIm11bHRpcGxlIENoYW5nZS1JZCBsaW5lcyBpbiBjb21taXQgbWVzc2FnZSIpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICB9IGVsc2UgewotICAgICAgICBmaW5hbCBTdHJpbmcgdiA9IGlkTGlzdC5nZXQoaWRMaXN0LnNpemUoKSAtIDEpLnRyaW0oKTsKLSAgICAgICAgaWYgKCF2Lm1hdGNoZXMoIl5JWzAtOWEtZl17OCx9LiokIikpIHsKLSAgICAgICAgICBmaW5hbCBTdHJpbmcgZXJyTXNnID0KLSAgICAgICAgICAgICAgIm1pc3Npbmcgb3IgaW52YWxpZCBDaGFuZ2UtSWQgbGluZSBmb3JtYXQgaW4gY29tbWl0IG1lc3NhZ2UiOwotICAgICAgICAgIHJlamVjdChjbWQsIGVyck1zZyk7Ci0gICAgICAgICAgYWRkTWVzc2FnZShnZXRGaXhlZENvbW1pdE1zZ1dpdGhDaGFuZ2VJZChlcnJNc2csIGMpKTsKLSAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9Ci0KLSAgICAvLyBDaGVjayBmb3IgYmFubmVkIGNvbW1pdHMgdG8gcHJldmVudCB0aGVtIGZyb20gZW50ZXJpbmcgdGhlIHRyZWUgYWdhaW4uCi0gICAgaWYgKHJlamVjdENvbW1pdHMuY29udGFpbnMoYykpIHsKLSAgICAgIHJlamVjdChjbWQsICJjb250YWlucyBiYW5uZWQgY29tbWl0ICIgKyBjLmdldE5hbWUoKSk7Ci0gICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgLy8gSWYgdGhpcyBpcyB0aGUgc3BlY2lhbCBwcm9qZWN0IGNvbmZpZ3VyYXRpb24gYnJhbmNoLCB2YWxpZGF0ZSB0aGUgY29uZmlnLgotICAgIGlmIChHaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZfQ09ORklHLmVxdWFscyhjdGwuZ2V0UmVmTmFtZSgpKSkgewotICAgICAgdHJ5IHsKLSAgICAgICAgUHJvamVjdENvbmZpZyBjZmcgPSBuZXcgUHJvamVjdENvbmZpZyhwcm9qZWN0LmdldE5hbWVLZXkoKSk7Ci0gICAgICAgIGNmZy5sb2FkKHJlcG8sIGNtZC5nZXROZXdJZCgpKTsKLSAgICAgICAgaWYgKCFjZmcuZ2V0VmFsaWRhdGlvbkVycm9ycygpLmlzRW1wdHkoKSkgewotICAgICAgICAgIGFkZEVycm9yKCJJbnZhbGlkIHByb2plY3QgY29uZmlndXJhdGlvbjoiKTsKLSAgICAgICAgICBmb3IgKFZhbGlkYXRpb25FcnJvciBlcnIgOiBjZmcuZ2V0VmFsaWRhdGlvbkVycm9ycygpKSB7Ci0gICAgICAgICAgICBhZGRFcnJvcigiICAiICsgZXJyLmdldE1lc3NhZ2UoKSk7Ci0gICAgICAgICAgfQotICAgICAgICAgIHJlamVjdChjbWQsICJpbnZhbGlkIHByb2plY3QgY29uZmlndXJhdGlvbiIpOwotICAgICAgICAgIGxvZy5lcnJvcigiVXNlciAiICsgY3VycmVudFVzZXIuZ2V0VXNlck5hbWUoKQotICAgICAgICAgICAgICArICIgdHJpZWQgdG8gcHVzaCBpbnZhbGlkIHByb2plY3QgY29uZmlndXJhdGlvbiAiCi0gICAgICAgICAgICAgICsgY21kLmdldE5ld0lkKCkubmFtZSgpICsgIiBmb3IgIiArIHByb2plY3QuZ2V0TmFtZSgpKTsKLSAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIHJlamVjdChjbWQsICJpbnZhbGlkIHByb2plY3QgY29uZmlndXJhdGlvbiIpOwotICAgICAgICBsb2cuZXJyb3IoIlVzZXIgIiArIGN1cnJlbnRVc2VyLmdldFVzZXJOYW1lKCkKLSAgICAgICAgICAgICsgIiB0cmllZCB0byBwdXNoIGludmFsaWQgcHJvamVjdCBjb25maWd1cmF0aW9uICIKLSAgICAgICAgICAgICsgY21kLmdldE5ld0lkKCkubmFtZSgpICsgIiBmb3IgIiArIHByb2plY3QuZ2V0TmFtZSgpLCBlKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgfQotICAgIH0KLQorICAgIHZhbGlkQ29tbWl0cy5hZGQoYyk7CiAgICAgcmV0dXJuIHRydWU7CiAgIH0KIAotICBwcml2YXRlIFN0cmluZyBnZXRGaXhlZENvbW1pdE1zZ1dpdGhDaGFuZ2VJZChTdHJpbmcgZXJyTXNnLCBSZXZDb21taXQgYykgewotICAgIC8vIFdlIGhhbmRsZSAzIGNhc2VzOgotICAgIC8vIDEuIE5vIGNoYW5nZSBpZCBpbiB0aGUgY29tbWl0IG1lc3NhZ2UgYXQgYWxsLgotICAgIC8vIDIuIGNoYW5nZSBpZCBsYXN0IGluIHRoZSBjb21taXQgbWVzc2FnZSBidXQgbWlzc2luZyBlbXB0eSBsaW5lIHRvIGNyZWF0ZSB0aGUgZm9vdGVyLgotICAgIC8vIDMuIHRoZXJlIGlzIGEgY2hhbmdlLWlkIHNvbWV3aGVyZSBpbiB0aGUgY29tbWl0IG1lc3NhZ2UsIGJ1dCB3ZSBpZ25vcmUgaXQuCi0gICAgZmluYWwgU3RyaW5nIGNoYW5nZUlkID0gIkNoYW5nZS1JZDoiOwotICAgIFN0cmluZ0J1aWxkZXIgc2IgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgIHNiLmFwcGVuZCgiRVJST1I6ICIpLmFwcGVuZChlcnJNc2cpOwotICAgIHNiLmFwcGVuZCgiXG4iKTsKLSAgICBzYi5hcHBlbmQoIlN1Z2dlc3Rpb24gZm9yIGNvbW1pdCBtZXNzYWdlOlxuIik7Ci0KLSAgICBpZiAoYy5nZXRGdWxsTWVzc2FnZSgpLmluZGV4T2YoY2hhbmdlSWQpPT0tMSkgewotICAgICAgc2IuYXBwZW5kKGMuZ2V0RnVsbE1lc3NhZ2UoKSk7Ci0gICAgICBzYi5hcHBlbmQoIlxuIik7Ci0gICAgICBzYi5hcHBlbmQoY2hhbmdlSWQpLmFwcGVuZCgiIEkiKS5hcHBlbmQoYy5uYW1lKCkpOwotICAgIH0gZWxzZSB7Ci0gICAgICBTdHJpbmcgbGluZXNbXSA9IGMuZ2V0RnVsbE1lc3NhZ2UoKS50cmltKCkuc3BsaXQoIlxuIik7Ci0gICAgICBTdHJpbmcgbGFzdExpbmUgPSBsaW5lcy5sZW5ndGggPiAwID8gbGluZXNbbGluZXMubGVuZ3RoIC0gMV0gOiAiIjsKLQotICAgICAgaWYgKGxhc3RMaW5lLmluZGV4T2YoY2hhbmdlSWQpPT0wKSB7Ci0gICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbGluZXMubGVuZ3RoIC0gMTsgaSsrKSB7Ci0gICAgICAgICAgc2IuYXBwZW5kKGxpbmVzW2ldKTsKLSAgICAgICAgICBzYi5hcHBlbmQoIlxuIik7Ci0gICAgICAgIH0KLQotICAgICAgICBzYi5hcHBlbmQoIlxuIik7Ci0gICAgICAgIHNiLmFwcGVuZChsYXN0TGluZSk7Ci0gICAgICB9IGVsc2UgewotICAgICAgICBzYi5hcHBlbmQoYy5nZXRGdWxsTWVzc2FnZSgpKTsKLSAgICAgICAgc2IuYXBwZW5kKCJcbiIpOwotICAgICAgICBzYi5hcHBlbmQoY2hhbmdlSWQpLmFwcGVuZCgiIEkiKS5hcHBlbmQoYy5uYW1lKCkpOwotICAgICAgICBzYi5hcHBlbmQoIlxuSGludDogQSBwb3RlbnRpYWwgQ2hhbmdlLUlkIHdhcyBmb3VuZCwgYnV0IGl0IHdhcyBub3QgaW4gdGhlIGZvb3RlciBvZiB0aGUgY29tbWl0IG1lc3NhZ2UuIik7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJuIHNiLnRvU3RyaW5nKCk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgc2VuZEludmFsaWRFbWFpbEVycm9yKFJldkNvbW1pdCBjLCBTdHJpbmcgdHlwZSwgUGVyc29uSWRlbnQgd2hvKSB7Ci0gICAgU3RyaW5nQnVpbGRlciBzYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgc2IuYXBwZW5kKCJcbiIpOwotICAgIHNiLmFwcGVuZCgiRVJST1I6ICBJbiBjb21taXQgIiArIGMubmFtZSgpICsgIlxuIik7Ci0gICAgc2IuYXBwZW5kKCJFUlJPUjogICIgKyB0eXBlICsgIiBlbWFpbCBhZGRyZXNzICIgKyB3aG8uZ2V0RW1haWxBZGRyZXNzKCkgKyAiXG4iKTsKLSAgICBzYi5hcHBlbmQoIkVSUk9SOiAgZG9lcyBub3QgbWF0Y2ggeW91ciB1c2VyIGFjY291bnQuXG4iKTsKLSAgICBzYi5hcHBlbmQoIkVSUk9SOlxuIik7Ci0gICAgaWYgKGN1cnJlbnRVc2VyLmdldEVtYWlsQWRkcmVzc2VzKCkuaXNFbXB0eSgpKSB7Ci0gICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgWW91IGhhdmUgbm90IHJlZ2lzdGVyZWQgYW55IGVtYWlsIGFkZHJlc3Nlcy5cbiIpOwotICAgIH0gZWxzZSB7Ci0gICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgVGhlIGZvbGxvd2luZyBhZGRyZXNzZXMgYXJlIGN1cnJlbnRseSByZWdpc3RlcmVkOlxuIik7Ci0gICAgICBmb3IgKFN0cmluZyBhZGRyZXNzIDogY3VycmVudFVzZXIuZ2V0RW1haWxBZGRyZXNzZXMoKSkgewotICAgICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgICAiICsgYWRkcmVzcyArICJcbiIpOwotICAgICAgfQotICAgIH0KLSAgICBzYi5hcHBlbmQoIkVSUk9SOlxuIik7Ci0gICAgaWYgKGNhbm9uaWNhbFdlYlVybCAhPSBudWxsKSB7Ci0gICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgVG8gcmVnaXN0ZXIgYW4gZW1haWwgYWRkcmVzcywgcGxlYXNlIHZpc2l0OlxuIik7Ci0gICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgIiArIGNhbm9uaWNhbFdlYlVybCArICIjIiArIFBhZ2VMaW5rcy5TRVRUSU5HU19DT05UQUNUICsgIlxuIik7Ci0gICAgfQotICAgIHNiLmFwcGVuZCgiXG4iKTsKLSAgICBhZGRNZXNzYWdlKHNiLnRvU3RyaW5nKCkpOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHdhcm5NYWxmb3JtZWRNZXNzYWdlKFJldkNvbW1pdCBjKSB7Ci0gICAgT2JqZWN0UmVhZGVyIHJlYWRlciA9IHJwLmdldFJldldhbGsoKS5nZXRPYmplY3RSZWFkZXIoKTsKLSAgICBpZiAoNjUgPCBjLmdldFNob3J0TWVzc2FnZSgpLmxlbmd0aCgpKSB7Ci0gICAgICBBYmJyZXZpYXRlZE9iamVjdElkIGlkOwotICAgICAgdHJ5IHsKLSAgICAgICAgaWQgPSByZWFkZXIuYWJicmV2aWF0ZShjKTsKLSAgICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGVycikgewotICAgICAgICBpZCA9IGMuYWJicmV2aWF0ZSg2KTsKLSAgICAgIH0KLSAgICAgIGFkZE1lc3NhZ2UoIihXKSAiICsgaWQubmFtZSgpIC8vCi0gICAgICAgICAgKyAiOiBjb21taXQgc3ViamVjdCA+NjUgY2hhcmFjdGVyczsgdXNlIHNob3J0ZXIgZmlyc3QgcGFyYWdyYXBoIik7Ci0gICAgfQotCi0gICAgaW50IGxvbmdMaW5lQ250ID0gMCwgbm9uRW1wdHlDbnQgPSAwOwotICAgIGZvciAoU3RyaW5nIGxpbmUgOiBjLmdldEZ1bGxNZXNzYWdlKCkuc3BsaXQoIlxuIikpIHsKLSAgICAgIGlmICghbGluZS50cmltKCkuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG5vbkVtcHR5Q250Kys7Ci0gICAgICB9Ci0gICAgICBpZiAoNzAgPCBsaW5lLmxlbmd0aCgpKSB7Ci0gICAgICAgIGxvbmdMaW5lQ250Kys7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgaWYgKDAgPCBsb25nTGluZUNudCAmJiAzMyA8IGxvbmdMaW5lQ250ICogMTAwIC8gbm9uRW1wdHlDbnQpIHsKLSAgICAgIEFiYnJldmlhdGVkT2JqZWN0SWQgaWQ7Ci0gICAgICB0cnkgewotICAgICAgICBpZCA9IHJlYWRlci5hYmJyZXZpYXRlKGMpOwotICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZXJyKSB7Ci0gICAgICAgIGlkID0gYy5hYmJyZXZpYXRlKDYpOwotICAgICAgfQotICAgICAgYWRkTWVzc2FnZSgiKFcpICIgKyBpZC5uYW1lKCkgLy8KLSAgICAgICAgICArICI6IGNvbW1pdCBtZXNzYWdlIGxpbmVzID43MCBjaGFyYWN0ZXJzOyBtYW51YWxseSB3cmFwIGxpbmVzIik7Ci0gICAgfQotICB9Ci0KICAgcHJpdmF0ZSB2b2lkIGF1dG9DbG9zZUNoYW5nZXMoZmluYWwgUmVjZWl2ZUNvbW1hbmQgY21kKSB7CiAgICAgZmluYWwgUmV2V2FsayBydyA9IHJwLmdldFJldldhbGsoKTsKICAgICB0cnkgewpAQCAtMjA5MSw3ICsyMDM0LDkgQEAKICAgICAgIH0KIAogICAgICAgZm9yIChmaW5hbCBSZXBsYWNlUmVxdWVzdCByZXEgOiB0b0Nsb3NlKSB7Ci0gICAgICAgIGZpbmFsIFBhdGNoU2V0LklkIHBzaSA9IHJlcS52YWxpZGF0ZSh0cnVlKSA/IHJlcS5pbnNlcnRQYXRjaFNldCgpIDogbnVsbDsKKyAgICAgICAgZmluYWwgUGF0Y2hTZXQuSWQgcHNpID0gcmVxLnZhbGlkYXRlKHRydWUpCisgICAgICAgICAgICA/IHJlcS5pbnNlcnRQYXRjaFNldCgpLmNoZWNrZWRHZXQoKQorICAgICAgICAgICAgOiBudWxsOwogICAgICAgICBpZiAocHNpICE9IG51bGwpIHsKICAgICAgICAgICBjbG9zZUNoYW5nZShyZXEuaW5wdXRDb21tYW5kLCBwc2ksIHJlcS5uZXdDb21taXQpOwogICAgICAgICAgIGNsb3NlUHJvZ3Jlc3MudXBkYXRlKDEpOwpAQCAtMjEzMSwxMCArMjA3NiwxMCBAQAogICAgIH0KIAogICAgIGlmIChjaGFuZ2UuZ2V0U3RhdHVzKCkgPT0gQ2hhbmdlLlN0YXR1cy5NRVJHRUQgfHwKLSAgICAgICAgY2hhbmdlLmdldFN0YXR1cygpID09IENoYW5nZS5TdGF0dXMuQUJBTkRPTkVEKSB7Ci0gICAgICAvLyBJZiBpdHMgYWxyZWFkeSBtZXJnZWQsIGRvbid0IG1ha2UgZnVydGhlciB1cGRhdGVzLCBpdAotICAgICAgLy8gbWlnaHQganVzdCBiZSBtb3ZpbmcgZnJvbSBhbiBleHBlcmltZW50YWwgYnJhbmNoIGludG8KLSAgICAgIC8vIGEgbW9yZSBzdGFibGUgYnJhbmNoLgorICAgICAgICBjaGFuZ2UuZ2V0U3RhdHVzKCkgPT0gQ2hhbmdlLlN0YXR1cy5BQkFORE9ORUQgfHwKKyAgICAgICAgIWNoYW5nZS5nZXREZXN0KCkuZ2V0KCkuZXF1YWxzKHJlZk5hbWUpKSB7CisgICAgICAvLyBJZiBpdCdzIGFscmVhZHkgbWVyZ2VkIG9yIHRoZSBjb21taXQgaXMgbm90IGFpbWVkIGZvcgorICAgICAgLy8gdGhpcyBjaGFuZ2UncyBkZXN0aW5hdGlvbiwgZG9uJ3QgbWFrZSBmdXJ0aGVyIHVwZGF0ZXMuCiAgICAgICAvLwogICAgICAgcmV0dXJuIG51bGw7CiAgICAgfQpAQCAtMjIyMSw3ICsyMTY2LDcgQEAKICAgICAgIEBPdmVycmlkZQogICAgICAgcHVibGljIHZvaWQgcnVuKCkgewogICAgICAgICB0cnkgewotICAgICAgICAgIGZpbmFsIE1lcmdlZFNlbmRlciBjbSA9IG1lcmdlZFNlbmRlckZhY3RvcnkuY3JlYXRlKHJlc3VsdC5jaGFuZ2UpOworICAgICAgICAgIGZpbmFsIE1lcmdlZFNlbmRlciBjbSA9IG1lcmdlZFNlbmRlckZhY3RvcnkuY3JlYXRlKHJlc3VsdC5jaGFuZ2VDdGwpOwogICAgICAgICAgIGNtLnNldEZyb20oY3VycmVudFVzZXIuZ2V0QWNjb3VudElkKCkpOwogICAgICAgICAgIGNtLnNldFBhdGNoU2V0KHJlc3VsdC5uZXdQYXRjaFNldCwgcmVzdWx0LmluZm8pOwogICAgICAgICAgIGNtLnNlbmQoKTsKQEAgLTIyMzgsMjAgKzIxODMsNiBAQAogICAgIH0pKTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBpbnNlcnRBbmNlc3RvcnMoUGF0Y2hTZXQuSWQgaWQsIFJldkNvbW1pdCBzcmMpCi0gICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBpbnQgY250ID0gc3JjLmdldFBhcmVudENvdW50KCk7Ci0gICAgTGlzdDxQYXRjaFNldEFuY2VzdG9yPiB0b0luc2VydCA9IG5ldyBBcnJheUxpc3Q8UGF0Y2hTZXRBbmNlc3Rvcj4oY250KTsKLSAgICBmb3IgKGludCBwID0gMDsgcCA8IGNudDsgcCsrKSB7Ci0gICAgICBQYXRjaFNldEFuY2VzdG9yIGE7Ci0KLSAgICAgIGEgPSBuZXcgUGF0Y2hTZXRBbmNlc3RvcihuZXcgUGF0Y2hTZXRBbmNlc3Rvci5JZChpZCwgcCArIDEpKTsKLSAgICAgIGEuc2V0QW5jZXN0b3JSZXZpc2lvbih0b1JldklkKHNyYy5nZXRQYXJlbnQocCkpKTsKLSAgICAgIHRvSW5zZXJ0LmFkZChhKTsKLSAgICB9Ci0gICAgZGIucGF0Y2hTZXRBbmNlc3RvcnMoKS5pbnNlcnQodG9JbnNlcnQpOwotICB9Ci0KICAgcHJpdmF0ZSBzdGF0aWMgUmV2SWQgdG9SZXZJZChmaW5hbCBSZXZDb21taXQgc3JjKSB7CiAgICAgcmV0dXJuIG5ldyBSZXZJZChzcmMuZ2V0SWQoKS5uYW1lKCkpOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWNlaXZlQ29tbWl0c0FkdmVydGlzZVJlZnNIb29rLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWNlaXZlQ29tbWl0c0FkdmVydGlzZVJlZnNIb29rLmphdmEKaW5kZXggZWM4YzA4MC4uMGViOWI2MSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmVjZWl2ZUNvbW1pdHNBZHZlcnRpc2VSZWZzSG9vay5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlY2VpdmVDb21taXRzQWR2ZXJ0aXNlUmVmc0hvb2suamF2YQpAQCAtMTQsMTIgKzE0LDE0IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5NYWdpY0JyYW5jaDsKKwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlZjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5BZHZlcnRpc2VSZWZzSG9vazsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnRyYW5zcG9ydC5CYXNlUmVjZWl2ZVBhY2s7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC50cmFuc3BvcnQuVXBsb2FkUGFjazsKIAotaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKIC8qKiBFeHBvc2VzIG9ubHkgdGhlIG5vbiByZWZzL2NoYW5nZXMvIHJlZmVyZW5jZSBuYW1lcy4gKi8KQEAgLTM2LDEyICszOCwxOSBAQAogICAgIGlmIChvbGRSZWZzID09IG51bGwpIHsKICAgICAgIG9sZFJlZnMgPSBycC5nZXRSZXBvc2l0b3J5KCkuZ2V0QWxsUmVmcygpOwogICAgIH0KLSAgICBIYXNoTWFwPFN0cmluZywgUmVmPiByID0gbmV3IEhhc2hNYXA8U3RyaW5nLCBSZWY+KCk7CisgICAgTWFwPFN0cmluZywgUmVmPiByID0gTWFwcy5uZXdIYXNoTWFwV2l0aEV4cGVjdGVkU2l6ZShvbGRSZWZzLnNpemUoKSk7CiAgICAgZm9yIChNYXAuRW50cnk8U3RyaW5nLCBSZWY+IGUgOiBvbGRSZWZzLmVudHJ5U2V0KCkpIHsKLSAgICAgIGlmICghZS5nZXRLZXkoKS5zdGFydHNXaXRoKCJyZWZzL2NoYW5nZXMvIikpIHsKLSAgICAgICAgci5wdXQoZS5nZXRLZXkoKSwgZS5nZXRWYWx1ZSgpKTsKKyAgICAgIFN0cmluZyBuYW1lID0gZS5nZXRLZXkoKTsKKyAgICAgIGlmICghc2tpcChuYW1lKSkgeworICAgICAgICByLnB1dChuYW1lLCBlLmdldFZhbHVlKCkpOwogICAgICAgfQogICAgIH0KICAgICBycC5zZXRBZHZlcnRpc2VkUmVmcyhyLCBycC5nZXRBZHZlcnRpc2VkT2JqZWN0cygpKTsKICAgfQorCisgIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gc2tpcChTdHJpbmcgbmFtZSkgeworICAgIHJldHVybiBuYW1lLnN0YXJ0c1dpdGgoInJlZnMvY2hhbmdlcy8iKQorICAgICAgICB8fCBuYW1lLnN0YXJ0c1dpdGgoR2l0UmVwb3NpdG9yeU1hbmFnZXIuUkVGU19DQUNIRV9BVVRPTUVSR0UpCisgICAgICAgIHx8IE1hZ2ljQnJhbmNoLmlzTWFnaWNCcmFuY2gobmFtZSk7CisgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlY2VpdmVDb21taXRzRXhlY3V0b3JNb2R1bGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlY2VpdmVDb21taXRzRXhlY3V0b3JNb2R1bGUuamF2YQppbmRleCAwNjNkYjJkLi4xY2JkMjI3IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWNlaXZlQ29tbWl0c0V4ZWN1dG9yTW9kdWxlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmVjZWl2ZUNvbW1pdHNFeGVjdXRvck1vZHVsZS5qYXZhCkBAIC0xNCwxNSArMTQsMjAgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0OwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24udXRpbC5jb25jdXJyZW50Lkxpc3RlbmluZ0V4ZWN1dG9yU2VydmljZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi51dGlsLmNvbmN1cnJlbnQuTW9yZUV4ZWN1dG9yczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi51dGlsLmNvbmN1cnJlbnQuVGhyZWFkRmFjdG9yeUJ1aWxkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Xb3JrUXVldWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Xb3JrUXVldWUuRXhlY3V0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOwogCitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuQXJyYXlCbG9ja2luZ1F1ZXVlOworaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LlRocmVhZFBvb2xFeGVjdXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdDsKKwogLyoqIE1vZHVsZSBwcm92aWRpbmcgdGhlIHtAbGluayBSZWNlaXZlQ29tbWl0c0V4ZWN1dG9yfS4gKi8KIHB1YmxpYyBjbGFzcyBSZWNlaXZlQ29tbWl0c0V4ZWN1dG9yTW9kdWxlIGV4dGVuZHMgQWJzdHJhY3RNb2R1bGUgewogICBAT3ZlcnJpZGUKQEAgLTMyLDEwICszNywzMSBAQAogICBAUHJvdmlkZXMKICAgQFNpbmdsZXRvbgogICBAUmVjZWl2ZUNvbW1pdHNFeGVjdXRvcgotICBwdWJsaWMgRXhlY3V0b3IgZ2V0UmVjZWl2ZUNvbW1pdHNFeGVjdXRvcihAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBjb25maWcsCisgIHB1YmxpYyBXb3JrUXVldWUuRXhlY3V0b3IgY3JlYXRlUmVjZWl2ZUNvbW1pdHNFeGVjdXRvcigKKyAgICAgIEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNvbmZpZywKICAgICAgIFdvcmtRdWV1ZSBxdWV1ZXMpIHsKICAgICBpbnQgcG9vbFNpemUgPSBjb25maWcuZ2V0SW50KCJyZWNlaXZlIiwgbnVsbCwgInRocmVhZFBvb2xTaXplIiwKICAgICAgICAgUnVudGltZS5nZXRSdW50aW1lKCkuYXZhaWxhYmxlUHJvY2Vzc29ycygpKTsKICAgICByZXR1cm4gcXVldWVzLmNyZWF0ZVF1ZXVlKHBvb2xTaXplLCAiUmVjZWl2ZUNvbW1pdHMiKTsKICAgfQorCisgIEBQcm92aWRlcworICBAU2luZ2xldG9uCisgIEBDaGFuZ2VVcGRhdGVFeGVjdXRvcgorICBwdWJsaWMgTGlzdGVuaW5nRXhlY3V0b3JTZXJ2aWNlIGNyZWF0ZUNoYW5nZVVwZGF0ZUV4ZWN1dG9yKEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNvbmZpZykgeworICAgIGludCBwb29sU2l6ZSA9IGNvbmZpZy5nZXRJbnQoInJlY2VpdmUiLCBudWxsLCAiY2hhbmdlVXBkYXRlVGhyZWFkcyIsIDEpOworICAgIGlmIChwb29sU2l6ZSA8PSAxKSB7CisgICAgICByZXR1cm4gTW9yZUV4ZWN1dG9ycy5zYW1lVGhyZWFkRXhlY3V0b3IoKTsKKyAgICB9CisgICAgcmV0dXJuIE1vcmVFeGVjdXRvcnMubGlzdGVuaW5nRGVjb3JhdG9yKAorICAgICAgICBNb3JlRXhlY3V0b3JzLmdldEV4aXRpbmdFeGVjdXRvclNlcnZpY2UoCisgICAgICAgICAgbmV3IFRocmVhZFBvb2xFeGVjdXRvcigxLCBwb29sU2l6ZSwKKyAgICAgICAgICAgICAgMTAsIFRpbWVVbml0Lk1JTlVURVMsCisgICAgICAgICAgICAgIG5ldyBBcnJheUJsb2NraW5nUXVldWU8UnVubmFibGU+KHBvb2xTaXplKSwKKyAgICAgICAgICAgICAgbmV3IFRocmVhZEZhY3RvcnlCdWlsZGVyKCkKKyAgICAgICAgICAgICAgICAuc2V0TmFtZUZvcm1hdCgiQ2hhbmdlVXBkYXRlLSVkIikKKyAgICAgICAgICAgICAgICAuc2V0RGFlbW9uKHRydWUpCisgICAgICAgICAgICAgICAgLmJ1aWxkKCksCisgICAgICAgICAgICAgIG5ldyBUaHJlYWRQb29sRXhlY3V0b3IuQ2FsbGVyUnVuc1BvbGljeSgpKSkpOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWNlaXZlQ29uZmlnLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZWNlaXZlQ29uZmlnLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDFhM2U0MAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1JlY2VpdmVDb25maWcuamF2YQpAQCAtMCwwICsxLDM3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CisKK0BTaW5nbGV0b24KK2NsYXNzIFJlY2VpdmVDb25maWcgeworICBmaW5hbCBib29sZWFuIGNoZWNrTWFnaWNSZWZzOworICBmaW5hbCBib29sZWFuIGNoZWNrUmVmZXJlbmNlZE9iamVjdHNBcmVSZWFjaGFibGU7CisKKyAgQEluamVjdAorICBSZWNlaXZlQ29uZmlnKEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNvbmZpZykgeworICAgIGNoZWNrTWFnaWNSZWZzID0gY29uZmlnLmdldEJvb2xlYW4oCisgICAgICAgICJyZWNlaXZlIiwgbnVsbCwgImNoZWNrTWFnaWNSZWZzIiwKKyAgICAgICAgdHJ1ZSk7CisgICAgY2hlY2tSZWZlcmVuY2VkT2JqZWN0c0FyZVJlYWNoYWJsZSA9IGNvbmZpZy5nZXRCb29sZWFuKAorICAgICAgICAicmVjZWl2ZSIsIG51bGwsICJjaGVja1JlZmVyZW5jZWRPYmplY3RzQXJlUmVhY2hhYmxlIiwKKyAgICAgICAgdHJ1ZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Jldmlld05vdGVIZWFkZXJGb3JtYXR0ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Jldmlld05vdGVIZWFkZXJGb3JtYXR0ZXIuamF2YQppbmRleCA3YjY2OWIyLi43MWRiZjg3IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9SZXZpZXdOb3RlSGVhZGVyRm9ybWF0dGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvUmV2aWV3Tm90ZUhlYWRlckZvcm1hdHRlci5qYXZhCkBAIC0xNCw4ICsxNCw4IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiAKQEAgLTUxLDkgKzUxLDggQEAKICAgICBzYi5hcHBlbmQoIkNoYW5nZS1JZDogIikuYXBwZW5kKGNoYW5nZUtleS5nZXQoKSkuYXBwZW5kKCJcbiIpOwogICB9CiAKLSAgdm9pZCBhcHBlbmRBcHByb3ZhbChBcHByb3ZhbENhdGVnb3J5IGNhdGVnb3J5LAotICAgICAgc2hvcnQgdmFsdWUsIEFjY291bnQgdXNlcikgewotICAgIHNiLmFwcGVuZChjYXRlZ29yeS5nZXRMYWJlbE5hbWUoKSk7CisgIHZvaWQgYXBwZW5kQXBwcm92YWwoTGFiZWxUeXBlIHR5cGUsIHNob3J0IHZhbHVlLCBBY2NvdW50IHVzZXIpIHsKKyAgICBzYi5hcHBlbmQodHlwZS5nZXROYW1lKCkpOwogICAgIHNiLmFwcGVuZCh2YWx1ZSA8IDAgPyAiLSIgOiAiKyIpLmFwcGVuZChNYXRoLmFicyh2YWx1ZSkpLmFwcGVuZCgiOiAiKTsKICAgICBhcHBlbmRVc2VyRGF0YSh1c2VyKTsKICAgICBzYi5hcHBlbmQoIlxuIik7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtaXRTdHJhdGVneS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvU3VibWl0U3RyYXRlZ3kuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43YzJiYTg2Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvU3VibWl0U3RyYXRlZ3kuamF2YQpAQCAtMCwwICsxLDE4NyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3QuU3VibWl0VHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SW5zZXJ0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUGVyc29uSWRlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkNvbW1pdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2RmxhZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2V2FsazsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKKy8qKgorICogQmFzZSBjbGFzcyB0aGF0IHN1Ym1pdCBzdHJhdGVnaWVzIG11c3QgZXh0ZW5kLiBBIHN1Ym1pdCBzdHJhdGVneSBmb3IgYQorICogY2VydGFpbiB7QGxpbmsgU3VibWl0VHlwZX0gZGVmaW5lcyBob3cgdGhlIHN1Ym1pdHRlZCBjb21taXRzIHNob3VsZCBiZQorICogbWVyZ2VkLgorICovCitwdWJsaWMgYWJzdHJhY3QgY2xhc3MgU3VibWl0U3RyYXRlZ3kgeworCisgIHByaXZhdGUgUGVyc29uSWRlbnQgcmVmTG9nSWRlbnQ7CisKKyAgc3RhdGljIGNsYXNzIEFyZ3VtZW50cyB7CisgICAgcHJvdGVjdGVkIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKKyAgICBwcm90ZWN0ZWQgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudDsKKyAgICBwcm90ZWN0ZWQgZmluYWwgUmV2aWV3RGIgZGI7CisKKyAgICBwcm90ZWN0ZWQgZmluYWwgUmVwb3NpdG9yeSByZXBvOworICAgIHByb3RlY3RlZCBmaW5hbCBSZXZXYWxrIHJ3OworICAgIHByb3RlY3RlZCBmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlcjsKKyAgICBwcm90ZWN0ZWQgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWc7CisgICAgcHJvdGVjdGVkIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZDsKKyAgICBwcm90ZWN0ZWQgZmluYWwgQnJhbmNoLk5hbWVLZXkgZGVzdEJyYW5jaDsKKyAgICBwcm90ZWN0ZWQgZmluYWwgTWVyZ2VVdGlsIG1lcmdlVXRpbDsKKyAgICBwcm90ZWN0ZWQgZmluYWwgTWVyZ2VTb3J0ZXIgbWVyZ2VTb3J0ZXI7CisKKyAgICBBcmd1bWVudHMoZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgaWRlbnRpZmllZFVzZXJGYWN0b3J5LAorICAgICAgICBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50LCBmaW5hbCBSZXZpZXdEYiBkYiwgZmluYWwgUmVwb3NpdG9yeSByZXBvLAorICAgICAgICBmaW5hbCBSZXZXYWxrIHJ3LCBmaW5hbCBPYmplY3RJbnNlcnRlciBpbnNlcnRlciwKKyAgICAgICAgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWcsIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCwKKyAgICAgICAgZmluYWwgQnJhbmNoLk5hbWVLZXkgZGVzdEJyYW5jaCwgZmluYWwgTWVyZ2VVdGlsIG1lcmdlVXRpbCkgeworICAgICAgdGhpcy5pZGVudGlmaWVkVXNlckZhY3RvcnkgPSBpZGVudGlmaWVkVXNlckZhY3Rvcnk7CisgICAgICB0aGlzLm15SWRlbnQgPSBteUlkZW50OworICAgICAgdGhpcy5kYiA9IGRiOworCisgICAgICB0aGlzLnJlcG8gPSByZXBvOworICAgICAgdGhpcy5ydyA9IHJ3OworICAgICAgdGhpcy5pbnNlcnRlciA9IGluc2VydGVyOworICAgICAgdGhpcy5jYW5NZXJnZUZsYWcgPSBjYW5NZXJnZUZsYWc7CisgICAgICB0aGlzLmFscmVhZHlBY2NlcHRlZCA9IGFscmVhZHlBY2NlcHRlZDsKKyAgICAgIHRoaXMuZGVzdEJyYW5jaCA9IGRlc3RCcmFuY2g7CisgICAgICB0aGlzLm1lcmdlVXRpbCA9IG1lcmdlVXRpbDsKKyAgICAgIHRoaXMubWVyZ2VTb3J0ZXIgPSBuZXcgTWVyZ2VTb3J0ZXIocncsIGFscmVhZHlBY2NlcHRlZCwgY2FuTWVyZ2VGbGFnKTsKKyAgICB9CisgIH0KKworICBwcm90ZWN0ZWQgZmluYWwgQXJndW1lbnRzIGFyZ3M7CisKKyAgU3VibWl0U3RyYXRlZ3koZmluYWwgQXJndW1lbnRzIGFyZ3MpIHsKKyAgICB0aGlzLmFyZ3MgPSBhcmdzOworICB9CisKKyAgLyoqCisgICAqIFJ1bnMgdGhpcyBzdWJtaXQgc3RyYXRlZ3kuIElmIHBvc3NpYmxlIHRoZSBwcm92aWRlZCBjb21taXRzIHdpbGwgYmUgbWVyZ2VkCisgICAqIHdpdGggdGhpcyBzdWJtaXQgc3RyYXRlZ3kuCisgICAqCisgICAqIEBwYXJhbSBtZXJnZVRpcCB0aGUgbWVyZ2VUaXAKKyAgICogQHBhcmFtIHRvTWVyZ2UgdGhlIGxpc3Qgb2Ygc3VibWl0dGVkIGNvbW1pdHMgdGhhdCBzaG91bGQgYmUgbWVyZ2VkIHVzaW5nCisgICAqICAgICAgICB0aGlzIHN1Ym1pdCBzdHJhdGVneQorICAgKiBAcmV0dXJuIHRoZSBuZXcgbWVyZ2VUaXAKKyAgICogQHRocm93cyBNZXJnZUV4Y2VwdGlvbgorICAgKi8KKyAgcHVibGljIGZpbmFsIENvZGVSZXZpZXdDb21taXQgcnVuKGZpbmFsIENvZGVSZXZpZXdDb21taXQgbWVyZ2VUaXAsCisgICAgICBmaW5hbCBMaXN0PENvZGVSZXZpZXdDb21taXQ+IHRvTWVyZ2UpIHRocm93cyBNZXJnZUV4Y2VwdGlvbiB7CisgICAgcmVmTG9nSWRlbnQgPSBudWxsOworICAgIHJldHVybiBfcnVuKG1lcmdlVGlwLCB0b01lcmdlKTsKKyAgfQorCisgIC8qKgorICAgKiBSdW5zIHRoaXMgc3VibWl0IHN0cmF0ZWd5LiBJZiBwb3NzaWJsZSB0aGUgcHJvdmlkZWQgY29tbWl0cyB3aWxsIGJlIG1lcmdlZAorICAgKiB3aXRoIHRoaXMgc3VibWl0IHN0cmF0ZWd5LgorICAgKgorICAgKiBAcGFyYW0gbWVyZ2VUaXAgdGhlIG1lcmdlVGlwCisgICAqIEBwYXJhbSB0b01lcmdlIHRoZSBsaXN0IG9mIHN1Ym1pdHRlZCBjb21taXRzIHRoYXQgc2hvdWxkIGJlIG1lcmdlZCB1c2luZworICAgKiAgICAgICAgdGhpcyBzdWJtaXQgc3RyYXRlZ3kKKyAgICogQHJldHVybiB0aGUgbmV3IG1lcmdlVGlwCisgICAqIEB0aHJvd3MgTWVyZ2VFeGNlcHRpb24KKyAgICovCisgIHByb3RlY3RlZCBhYnN0cmFjdCBDb2RlUmV2aWV3Q29tbWl0IF9ydW4oQ29kZVJldmlld0NvbW1pdCBtZXJnZVRpcCwKKyAgICAgIExpc3Q8Q29kZVJldmlld0NvbW1pdD4gdG9NZXJnZSkgdGhyb3dzIE1lcmdlRXhjZXB0aW9uOworCisgIC8qKgorICAgKiBDaGVja3Mgd2hldGhlciB0aGUgZ2l2ZW4gY29tbWl0IGNhbiBiZSBtZXJnZWQuCisgICAqCisgICAqIFN1YmNsYXNzZXMgbXVzdCBlbnN1cmUgdGhhdCBpbnZva2luZyB0aGlzIG1ldGhvZCBkb2VzIG5laXRoZXIgbW9kaWZ5IHRoZQorICAgKiBnaXQgcmVwb3NpdG9yeSBub3IgdGhlIEdlcnJpdCBkYXRhYmFzZS4KKyAgICoKKyAgICogQHBhcmFtIG1lcmdlVGlwIHRoZSBtZXJnZVRpcAorICAgKiBAcGFyYW0gdG9NZXJnZSB0aGUgY29tbWl0IGZvciB3aGljaCBpdCBzaG91bGQgYmUgY2hlY2tlZCB3aGV0aGVyIGl0IGNhbiBiZQorICAgKiAgICAgICAgbWVyZ2VkIG9yIG5vdAorICAgKiBAcmV0dXJuIDxjb2RlPnRydWU8L2NvZGU+IGlmIHRoZSBnaXZlbiBjb21taXQgY2FuIGJlIG1lcmdlZCwgb3RoZXJ3aXNlCisgICAqICAgICAgICAgPGNvZGU+ZmFsc2U8L2NvZGU+CisgICAqIEB0aHJvd3MgTWVyZ2VFeGNlcHRpb24KKyAgICovCisgIHB1YmxpYyBhYnN0cmFjdCBib29sZWFuIGRyeVJ1bihDb2RlUmV2aWV3Q29tbWl0IG1lcmdlVGlwLAorICAgICAgQ29kZVJldmlld0NvbW1pdCB0b01lcmdlKSB0aHJvd3MgTWVyZ2VFeGNlcHRpb247CisKKyAgLyoqCisgICAqIFJldHVybnMgdGhlIFBlcnNvbklkZW50IHRoYXQgc2hvdWxkIGJlIHVzZWQgZm9yIHRoZSByZWYgbG9nIGVudHJpZXMgd2hlbgorICAgKiB1cGRhdGluZyB0aGUgZGVzdGluYXRpb24gYnJhbmNoLiBUaGUgcmVmIGxvZyBpZGVudGl0eSBtYXkgYmUgc2V0IGFmdGVyIHRoZQorICAgKiB7QGxpbmsgI3J1bihDb2RlUmV2aWV3Q29tbWl0LCBMaXN0KX0gbWV0aG9kIGZpbmlzaGVkLgorICAgKgorICAgKiBEbyBvbmx5IGNhbGwgdGhpcyBtZXRob2QgYWZ0ZXIgdGhlIHtAbGluayAjcnVuKENvZGVSZXZpZXdDb21taXQsIExpc3QpfQorICAgKiBtZXRob2QgaGFzIGJlZW4gaW52b2tlZC4KKyAgICoKKyAgICogQHJldHVybiB0aGUgcmVmIGxvZyBpZGVudGl0eSwgbWF5IGJlIDxjb2RlPm51bGw8L2NvZGU+CisgICAqLworICBwdWJsaWMgZmluYWwgUGVyc29uSWRlbnQgZ2V0UmVmTG9nSWRlbnQoKSB7CisgICAgcmV0dXJuIHJlZkxvZ0lkZW50OworICB9CisKKyAgLyoqCisgICAqIFJldHVybnMgYWxsIGNvbW1pdHMgdGhhdCBoYXZlIGJlZW4gbmV3bHkgY3JlYXRlZCBmb3IgdGhlIGNoYW5nZXMgdGhhdCBhcmUKKyAgICogZ2V0dGluZyBtZXJnZWQuCisgICAqCisgICAqIEJ5IGRlZmF1bHQgdGhpcyBtZXRob2QgaXMgcmV0dXJuaW5nIGFuIGVtcHR5IG1hcCwgYnV0IHN1YmNsYXNzZXMgbWF5CisgICAqIG92ZXJ3cml0ZSB0aGlzIG1ldGhvZCB0byBwcm92aWRlIG5ld2x5IGNyZWF0ZWQgY29tbWl0cy4KKyAgICoKKyAgICogRG8gb25seSBjYWxsIHRoaXMgbWV0aG9kIGFmdGVyIHRoZSB7QGxpbmsgI3J1bihDb2RlUmV2aWV3Q29tbWl0LCBMaXN0KX0KKyAgICogbWV0aG9kIGhhcyBiZWVuIGludm9rZWQuCisgICAqCisgICAqIEByZXR1cm4gbmV3IGNvbW1pdHMgY3JlYXRlZCBmb3IgY2hhbmdlcyB0aGF0IGFyZSBnZXR0aW5nIG1lcmdlZAorICAgKi8KKyAgcHVibGljIE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+IGdldE5ld0NvbW1pdHMoKSB7CisgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TWFwKCk7CisgIH0KKworICAvKioKKyAgICogUmV0dXJucyB3aGV0aGVyIGEgbWVyZ2UgdGhhdCBmYWlsZWQgd2l0aAorICAgKiB7QGxpbmsgUmVmVXBkYXRlLlJlc3VsdCNMT0NLX0ZBSUxVUkV9IHNob3VsZCBiZSByZXRyaWVkLgorICAgKgorICAgKiBNYXkgYmUgb3ZlcndyaXR0ZW4gYnkgc3ViY2xhc3Nlcy4KKyAgICoKKyAgICogQHJldHVybiA8Y29kZT50cnVlPC9jb2RlPiBpZiBhIG1lcmdlIHRoYXQgZmFpbGVkIHdpdGgKKyAgICogICAgICAgICB7QGxpbmsgUmVmVXBkYXRlLlJlc3VsdCNMT0NLX0ZBSUxVUkV9IHNob3VsZCBiZSByZXRyaWVkLCBvdGhlcndpc2UKKyAgICogICAgICAgICA8Y29kZT5mYWxzZTwvY29kZT4KKyAgICovCisgIHB1YmxpYyBib29sZWFuIHJldHJ5T25Mb2NrRmFpbHVyZSgpIHsKKyAgICByZXR1cm4gdHJ1ZTsKKyAgfQorCisgIC8qKgorICAgKiBTZXRzIHRoZSByZWYgbG9nIGlkZW50aXR5IGlmIGl0IHdhc24ndCBzZXQgeWV0LgorICAgKgorICAgKiBAcGFyYW0gc3VibWl0QXBwcm92YWwgdGhlIGFwcHJvdmFsIHRoYXQgc3VibWl0dGVkIHRoZSBwYXRjaCBzZXQKKyAgICovCisgIHByb3RlY3RlZCBmaW5hbCB2b2lkIHNldFJlZkxvZ0lkZW50KGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgc3VibWl0QXBwcm92YWwpIHsKKyAgICBpZiAocmVmTG9nSWRlbnQgPT0gbnVsbCAmJiBzdWJtaXRBcHByb3ZhbCAhPSBudWxsKSB7CisgICAgICByZWZMb2dJZGVudCA9CisgICAgICAgICAgYXJncy5pZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKHN1Ym1pdEFwcHJvdmFsLmdldEFjY291bnRJZCgpKQorICAgICAgICAgICAgICAubmV3UmVmTG9nSWRlbnQoKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1N1Ym1pdFN0cmF0ZWd5RmFjdG9yeS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvU3VibWl0U3RyYXRlZ3lGYWN0b3J5LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGJmODMxYwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1N1Ym1pdFN0cmF0ZWd5RmFjdG9yeS5qYXZhCkBAIC0wLDAgKzEsMTEyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3QuU3VibWl0VHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLlJlYmFzZUNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hTZXRJbmZvRmFjdG9yeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hQcm9qZWN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0U3RhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SW5zZXJ0ZXI7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUGVyc29uSWRlbnQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuUmV2Q29tbWl0OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZGbGFnOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZXYWxrOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CisKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKKworLyoqIEZhY3RvcnkgdG8gY3JlYXRlIGEge0BsaW5rIFN1Ym1pdFN0cmF0ZWd5fSBmb3IgYSB7QGxpbmsgU3VibWl0VHlwZX0uICovCitwdWJsaWMgY2xhc3MgU3VibWl0U3RyYXRlZ3lGYWN0b3J5IHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkKKyAgICAgIC5nZXRMb2dnZXIoU3VibWl0U3RyYXRlZ3lGYWN0b3J5LmNsYXNzKTsKKworICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBQZXJzb25JZGVudCBteUlkZW50OworICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQ7CisgIHByaXZhdGUgZmluYWwgUmViYXNlQ2hhbmdlIHJlYmFzZUNoYW5nZTsKKyAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlOworICBwcml2YXRlIGZpbmFsIE1lcmdlVXRpbC5GYWN0b3J5IG1lcmdlVXRpbEZhY3Rvcnk7CisKKyAgQEluamVjdAorICBTdWJtaXRTdHJhdGVneUZhY3RvcnkoCisgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3RvcnksCisgICAgICBAR2Vycml0UGVyc29uSWRlbnQgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudCwKKyAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKKyAgICAgIEBDYW5vbmljYWxXZWJVcmwgQE51bGxhYmxlIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXIsCisgICAgICBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQsIGZpbmFsIFJlYmFzZUNoYW5nZSByZWJhc2VDaGFuZ2UsCisgICAgICBmaW5hbCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlLAorICAgICAgZmluYWwgTWVyZ2VVdGlsLkZhY3RvcnkgbWVyZ2VVdGlsRmFjdG9yeSkgeworICAgIHRoaXMuaWRlbnRpZmllZFVzZXJGYWN0b3J5ID0gaWRlbnRpZmllZFVzZXJGYWN0b3J5OworICAgIHRoaXMubXlJZGVudCA9IG15SWRlbnQ7CisgICAgdGhpcy5wYXRjaFNldEluZm9GYWN0b3J5ID0gcGF0Y2hTZXRJbmZvRmFjdG9yeTsKKyAgICB0aGlzLmdpdFJlZlVwZGF0ZWQgPSBnaXRSZWZVcGRhdGVkOworICAgIHRoaXMucmViYXNlQ2hhbmdlID0gcmViYXNlQ2hhbmdlOworICAgIHRoaXMucHJvamVjdENhY2hlID0gcHJvamVjdENhY2hlOworICAgIHRoaXMubWVyZ2VVdGlsRmFjdG9yeSA9IG1lcmdlVXRpbEZhY3Rvcnk7CisgIH0KKworICBwdWJsaWMgU3VibWl0U3RyYXRlZ3kgY3JlYXRlKGZpbmFsIFN1Ym1pdFR5cGUgc3VibWl0VHlwZSwgZmluYWwgUmV2aWV3RGIgZGIsCisgICAgICBmaW5hbCBSZXBvc2l0b3J5IHJlcG8sIGZpbmFsIFJldldhbGsgcncsIGZpbmFsIE9iamVjdEluc2VydGVyIGluc2VydGVyLAorICAgICAgZmluYWwgUmV2RmxhZyBjYW5NZXJnZUZsYWcsIGZpbmFsIFNldDxSZXZDb21taXQ+IGFscmVhZHlBY2NlcHRlZCwKKyAgICAgIGZpbmFsIEJyYW5jaC5OYW1lS2V5IGRlc3RCcmFuY2gpCisgICAgICB0aHJvd3MgTWVyZ2VFeGNlcHRpb24sIE5vU3VjaFByb2plY3RFeGNlcHRpb24geworICAgIFByb2plY3RTdGF0ZSBwcm9qZWN0ID0gZ2V0UHJvamVjdChkZXN0QnJhbmNoKTsKKyAgICBmaW5hbCBTdWJtaXRTdHJhdGVneS5Bcmd1bWVudHMgYXJncyA9CisgICAgICAgIG5ldyBTdWJtaXRTdHJhdGVneS5Bcmd1bWVudHMoaWRlbnRpZmllZFVzZXJGYWN0b3J5LCBteUlkZW50LCBkYiwgcmVwbywKKyAgICAgICAgICAgIHJ3LCBpbnNlcnRlciwgY2FuTWVyZ2VGbGFnLCBhbHJlYWR5QWNjZXB0ZWQsIGRlc3RCcmFuY2gsCisgICAgICAgICAgICBtZXJnZVV0aWxGYWN0b3J5LmNyZWF0ZShwcm9qZWN0KSk7CisgICAgc3dpdGNoIChzdWJtaXRUeXBlKSB7CisgICAgICBjYXNlIENIRVJSWV9QSUNLOgorICAgICAgICByZXR1cm4gbmV3IENoZXJyeVBpY2soYXJncywgcGF0Y2hTZXRJbmZvRmFjdG9yeSwgZ2l0UmVmVXBkYXRlZCk7CisgICAgICBjYXNlIEZBU1RfRk9SV0FSRF9PTkxZOgorICAgICAgICByZXR1cm4gbmV3IEZhc3RGb3J3YXJkT25seShhcmdzKTsKKyAgICAgIGNhc2UgTUVSR0VfQUxXQVlTOgorICAgICAgICByZXR1cm4gbmV3IE1lcmdlQWx3YXlzKGFyZ3MpOworICAgICAgY2FzZSBNRVJHRV9JRl9ORUNFU1NBUlk6CisgICAgICAgIHJldHVybiBuZXcgTWVyZ2VJZk5lY2Vzc2FyeShhcmdzKTsKKyAgICAgIGNhc2UgUkVCQVNFX0lGX05FQ0VTU0FSWToKKyAgICAgICAgcmV0dXJuIG5ldyBSZWJhc2VJZk5lY2Vzc2FyeShhcmdzLCByZWJhc2VDaGFuZ2UpOworICAgICAgZGVmYXVsdDoKKyAgICAgICAgZmluYWwgU3RyaW5nIGVycm9yTXNnID0gIk5vIHN1Ym1pdCBzdHJhdGVneSBmb3I6ICIgKyBzdWJtaXRUeXBlOworICAgICAgICBsb2cuZXJyb3IoZXJyb3JNc2cpOworICAgICAgICB0aHJvdyBuZXcgTWVyZ2VFeGNlcHRpb24oZXJyb3JNc2cpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgUHJvamVjdFN0YXRlIGdldFByb2plY3QoQnJhbmNoLk5hbWVLZXkgYnJhbmNoKQorICAgICAgdGhyb3dzIE5vU3VjaFByb2plY3RFeGNlcHRpb24geworICAgIGZpbmFsIFByb2plY3RTdGF0ZSBwID0gcHJvamVjdENhY2hlLmdldChicmFuY2guZ2V0UGFyZW50S2V5KCkpOworICAgIGlmIChwID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uKGJyYW5jaC5nZXRQYXJlbnRLZXkoKSk7CisgICAgfQorICAgIHJldHVybiBwOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtb2R1bGVPcC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvU3VibW9kdWxlT3AuamF2YQppbmRleCBjY2I5MWEzLi5lZWFiOGYzIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtb2R1bGVPcC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1N1Ym1vZHVsZU9wLmphdmEKQEAgLTg1LDcgKzg1LDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PiBjb21taXRzOwogICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IG15SWRlbnQ7CiAgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXI7Ci0gIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbjsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQ7CiAgIHByaXZhdGUgZmluYWwgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2NoZW1hRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBTZXQ8QnJhbmNoLk5hbWVLZXk+IHVwZGF0ZWRTdWJzY3JpYmVyczsKIApAQCAtOTcsNyArOTcsNyBAQAogICAgICAgQEFzc2lzdGVkIFByb2plY3QgZGVzdFByb2plY3QsIEBBc3Npc3RlZCBMaXN0PENoYW5nZT4gc3VibWl0dGVkLAogICAgICAgQEFzc2lzdGVkIGZpbmFsIE1hcDxDaGFuZ2UuSWQsIENvZGVSZXZpZXdDb21taXQ+IGNvbW1pdHMsCiAgICAgICBAR2Vycml0UGVyc29uSWRlbnQgZmluYWwgUGVyc29uSWRlbnQgbXlJZGVudCwKLSAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLCBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlcGxpY2F0aW9uKSB7CisgICAgICBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlciwgR2l0UmVmZXJlbmNlVXBkYXRlZCBnaXRSZWZVcGRhdGVkKSB7CiAgICAgdGhpcy5kZXN0QnJhbmNoID0gZGVzdEJyYW5jaDsKICAgICB0aGlzLm1lcmdlVGlwID0gbWVyZ2VUaXA7CiAgICAgdGhpcy5ydyA9IHJ3OwpAQCAtMTA5LDcgKzEwOSw3IEBACiAgICAgdGhpcy5jb21taXRzID0gY29tbWl0czsKICAgICB0aGlzLm15SWRlbnQgPSBteUlkZW50OwogICAgIHRoaXMucmVwb01hbmFnZXIgPSByZXBvTWFuYWdlcjsKLSAgICB0aGlzLnJlcGxpY2F0aW9uID0gcmVwbGljYXRpb247CisgICAgdGhpcy5naXRSZWZVcGRhdGVkID0gZ2l0UmVmVXBkYXRlZDsKIAogICAgIHVwZGF0ZWRTdWJzY3JpYmVycyA9IG5ldyBIYXNoU2V0PEJyYW5jaC5OYW1lS2V5PigpOwogICB9CkBAIC0yMTcsNyArMjE3LDggQEAKICAgICAgICAgICBmb3IgKGZpbmFsIENoYW5nZSBjaGcgOiBzdWJtaXR0ZWQpIHsKICAgICAgICAgICAgIGZpbmFsIENvZGVSZXZpZXdDb21taXQgYyA9IGNvbW1pdHMuZ2V0KGNoZy5nZXRJZCgpKTsKICAgICAgICAgICAgIGlmIChjICE9IG51bGwKLSAgICAgICAgICAgICAgICAmJiAoYy5zdGF0dXNDb2RlID09IENvbW1pdE1lcmdlU3RhdHVzLkNMRUFOX01FUkdFIHx8IGMuc3RhdHVzQ29kZSA9PSBDb21taXRNZXJnZVN0YXR1cy5DTEVBTl9QSUNLKSkgeworICAgICAgICAgICAgICAgICYmIChjLnN0YXR1c0NvZGUgPT0gQ29tbWl0TWVyZ2VTdGF0dXMuQ0xFQU5fTUVSR0UKKyAgICAgICAgICAgICAgICAgICAgfHwgYy5zdGF0dXNDb2RlID09IENvbW1pdE1lcmdlU3RhdHVzLkNMRUFOX1BJQ0sgfHwgYy5zdGF0dXNDb2RlID09IENvbW1pdE1lcmdlU3RhdHVzLkNMRUFOX1JFQkFTRSkpIHsKICAgICAgICAgICAgICAgbXNnYnVmICs9ICJcbiI7CiAgICAgICAgICAgICAgIG1zZ2J1ZiArPSBjLmdldEZ1bGxNZXNzYWdlKCk7CiAgICAgICAgICAgICB9CkBAIC0zMzYsNyArMzM3LDcgQEAKICAgICAgIHN3aXRjaCAocmZ1LnVwZGF0ZSgpKSB7CiAgICAgICAgIGNhc2UgTkVXOgogICAgICAgICBjYXNlIEZBU1RfRk9SV0FSRDoKLSAgICAgICAgICByZXBsaWNhdGlvbi5maXJlKHN1YnNjcmliZXIuZ2V0UGFyZW50S2V5KCksIHJmdS5nZXROYW1lKCkpOworICAgICAgICAgIGdpdFJlZlVwZGF0ZWQuZmlyZShzdWJzY3JpYmVyLmdldFBhcmVudEtleSgpLCByZnUpOwogICAgICAgICAgIC8vIFRPRE8gc2luY2UgdGhpcyBpcyBwZXJmb3JtZWQgImluIHRoZSBiYWNrZ3JvdW5kIiBubyBtYWlsIHdpbGwgYmUKICAgICAgICAgICAvLyBzZW50IHRvIGluZm9ybSB1c2VycyBhYm91dCB0aGUgdXBkYXRlZCBicmFuY2gKICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1ZlcnNpb25lZE1ldGFEYXRhLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9WZXJzaW9uZWRNZXRhRGF0YS5qYXZhCmluZGV4IGU5YzU1MzYuLjdjM2MwYzcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1ZlcnNpb25lZE1ldGFEYXRhLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvVmVyc2lvbmVkTWV0YURhdGEuamF2YQpAQCAtMjYwLDcgKzI2MCw3IEBACiAgICAgICAgIHN3aXRjaCAocmVzdWx0KSB7CiAgICAgICAgICAgY2FzZSBORVc6CiAgICAgICAgICAgICByZXZpc2lvbiA9IHJ3LnBhcnNlQ29tbWl0KHJ1LmdldE5ld09iamVjdElkKCkpOwotICAgICAgICAgICAgdXBkYXRlLnJlcGxpY2F0ZShydS5nZXROYW1lKCkpOworICAgICAgICAgICAgdXBkYXRlLmZpcmVHaXRSZWZVcGRhdGVkRXZlbnQocnUpOwogICAgICAgICAgICAgcmV0dXJuIHJldmlzaW9uOwogICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oIkNhbm5vdCB1cGRhdGUgIiArIHJ1LmdldE5hbWUoKSArICIgaW4gIgpAQCAtMjkzLDcgKzI5Myw3IEBACiAgICAgICAgICAgY2FzZSBORVc6CiAgICAgICAgICAgY2FzZSBGQVNUX0ZPUldBUkQ6CiAgICAgICAgICAgICByZXZpc2lvbiA9IHJ3LnBhcnNlQ29tbWl0KHJ1LmdldE5ld09iamVjdElkKCkpOwotICAgICAgICAgICAgdXBkYXRlLnJlcGxpY2F0ZShydS5nZXROYW1lKCkpOworICAgICAgICAgICAgdXBkYXRlLmZpcmVHaXRSZWZVcGRhdGVkRXZlbnQocnUpOwogICAgICAgICAgICAgcmV0dXJuIHJldmlzaW9uOwogCiAgICAgICAgICAgZGVmYXVsdDoKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Zpc2libGVSZWZGaWx0ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L1Zpc2libGVSZWZGaWx0ZXIuamF2YQppbmRleCA4ZDI3YzBlLi41Y2QwZGVmIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9WaXNpYmxlUmVmRmlsdGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvVmlzaWJsZVJlZkZpbHRlci5qYXZhCkBAIC0yMiw3ICsyMiw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci0KIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CkBAIC00NCwxNiArNDMsMTkgQEAKICAgICAgIExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKFZpc2libGVSZWZGaWx0ZXIuY2xhc3MpOwogCiAgIHByaXZhdGUgZmluYWwgVGFnQ2FjaGUgdGFnQ2FjaGU7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGU7CiAgIHByaXZhdGUgZmluYWwgUmVwb3NpdG9yeSBkYjsKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWU7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdEN0bDsKICAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiByZXZpZXdEYjsKICAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIHNob3dDaGFuZ2VzOwogCi0gIHB1YmxpYyBWaXNpYmxlUmVmRmlsdGVyKGZpbmFsIFRhZ0NhY2hlIHRhZ0NhY2hlLCBmaW5hbCBSZXBvc2l0b3J5IGRiLAorICBwdWJsaWMgVmlzaWJsZVJlZkZpbHRlcihmaW5hbCBUYWdDYWNoZSB0YWdDYWNoZSwgZmluYWwgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGUsCisgICAgICBmaW5hbCBSZXBvc2l0b3J5IGRiLAogICAgICAgZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdENvbnRyb2wsIGZpbmFsIFJldmlld0RiIHJldmlld0RiLAogICAgICAgZmluYWwgYm9vbGVhbiBzaG93Q2hhbmdlcykgewogICAgIHRoaXMudGFnQ2FjaGUgPSB0YWdDYWNoZTsKKyAgICB0aGlzLmNoYW5nZUNhY2hlID0gY2hhbmdlQ2FjaGU7CiAgICAgdGhpcy5kYiA9IGRiOwogICAgIHRoaXMucHJvamVjdE5hbWUgPSBwcm9qZWN0Q29udHJvbC5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpOwogICAgIHRoaXMucHJvamVjdEN0bCA9IHByb2plY3RDb250cm9sOwpAQCAtNzksNyArODEsNyBAQAogICAgICAgfSBlbHNlIGlmIChQYXRjaFNldC5pc1JlZihyZWYuZ2V0TmFtZSgpKSkgewogICAgICAgICAvLyBSZWZlcmVuY2UgdG8gYSBwYXRjaCBzZXQgaXMgdmlzaWJsZSBpZiB0aGUgY2hhbmdlIGlzIHZpc2libGUuCiAgICAgICAgIC8vCi0gICAgICAgIGlmICh2aXNpYmxlQ2hhbmdlcy5jb250YWlucyhDaGFuZ2UuSWQuZnJvbVJlZihyZWYuZ2V0TmFtZSgpKSkpIHsKKyAgICAgICAgaWYgKHNob3dDaGFuZ2VzICYmIHZpc2libGVDaGFuZ2VzLmNvbnRhaW5zKENoYW5nZS5JZC5mcm9tUmVmKHJlZi5nZXROYW1lKCkpKSkgewogICAgICAgICAgIHJlc3VsdC5wdXQocmVmLmdldE5hbWUoKSwgcmVmKTsKICAgICAgICAgfQogCkBAIC0xMzUsNyArMTM3LDcgQEAKICAgICBmaW5hbCBQcm9qZWN0IHByb2plY3QgPSBwcm9qZWN0Q3RsLmdldFByb2plY3QoKTsKICAgICB0cnkgewogICAgICAgZmluYWwgU2V0PENoYW5nZS5JZD4gdmlzaWJsZUNoYW5nZXMgPSBuZXcgSGFzaFNldDxDaGFuZ2UuSWQ+KCk7Ci0gICAgICBmb3IgKENoYW5nZSBjaGFuZ2UgOiByZXZpZXdEYi5jaGFuZ2VzKCkuYnlQcm9qZWN0KHByb2plY3QuZ2V0TmFtZUtleSgpKSkgeworICAgICAgZm9yIChDaGFuZ2UgY2hhbmdlIDogY2hhbmdlQ2FjaGUuZ2V0KHByb2plY3QuZ2V0TmFtZUtleSgpKSkgewogICAgICAgICBpZiAocHJvamVjdEN0bC5jb250cm9sRm9yKGNoYW5nZSkuaXNWaXNpYmxlKHJldmlld0RiKSkgewogICAgICAgICAgIHZpc2libGVDaGFuZ2VzLmFkZChjaGFuZ2UuZ2V0SWQoKSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L3ZhbGlkYXRvcnMvQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvdmFsaWRhdG9ycy9Db21taXRWYWxpZGF0aW9uRXhjZXB0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDUyNzhmOQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L3ZhbGlkYXRvcnMvQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsNDIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LnZhbGlkYXRvcnM7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uIGV4dGVuZHMgRXhjZXB0aW9uIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CisgIHByaXZhdGUgZmluYWwgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gbWVzc2FnZXM7CisKKyAgcHVibGljIENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24oU3RyaW5nIHJlYXNvbiwgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gbWVzc2FnZXMpIHsKKyAgICBzdXBlcihyZWFzb24pOworICAgIHRoaXMubWVzc2FnZXMgPSBtZXNzYWdlczsKKyAgfQorCisgIHB1YmxpYyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uKFN0cmluZyByZWFzb24pIHsKKyAgICBzdXBlcihyZWFzb24pOworICAgIHRoaXMubWVzc2FnZXMgPSBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKKyAgfQorCisgIHB1YmxpYyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uKFN0cmluZyByZWFzb24sIFRocm93YWJsZSB3aHkpIHsKKyAgICBzdXBlcihyZWFzb24sIHdoeSk7CisgICAgdGhpcy5tZXNzYWdlcyA9IENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOworICB9CisKKyAgcHVibGljIExpc3Q8Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+IGdldE1lc3NhZ2VzKCkgeworICAgIHJldHVybiBtZXNzYWdlczsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvdmFsaWRhdG9ycy9Db21taXRWYWxpZGF0aW9uTGlzdGVuZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L3ZhbGlkYXRvcnMvQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGYxMTI0MwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L3ZhbGlkYXRvcnMvQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyLmphdmEKQEAgLTAsMCArMSwzOSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQudmFsaWRhdG9yczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuRXh0ZW5zaW9uUG9pbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50cy5Db21taXRSZWNlaXZlZEV2ZW50OworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKKy8qKgorICogTGlzdGVuZXIgdG8gcHJvdmlkZSB2YWxpZGF0aW9uIG9uIHJlY2VpdmVkIGNvbW1pdHMuCisgKgorICogSW52b2tlZCBieSBHZXJyaXQgd2hlbiBhIG5ldyBjb21taXQgaXMgcmVjZWl2ZWQsIGhhcyBwYXNzZWQgYmFzaWMgR2Vycml0CisgKiB2YWxpZGF0aW9uIGFuZCBjYW4gYmUgdGhlbiBzdWJqZWN0IHRvIGV4dHJhIHZhbGlkYXRpb24gY2hlY2tzLgorICovCitARXh0ZW5zaW9uUG9pbnQKK3B1YmxpYyBpbnRlcmZhY2UgQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyIHsKKyAgLyoqCisgICAqIENvbW1pdCB2YWxpZGF0aW9uLgorICAgKgorICAgKiBAcGFyYW0gcmVjZWl2ZWQgY29tbWl0IGV2ZW50IGRldGFpbHMKKyAgICogQHJldHVybiBsaXN0IG9mIHZhbGlkYXRpb24gbWVzc2FnZXMKKyAgICogQHRocm93cyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uIGlmIHZhbGlkYXRpb24gZmFpbHMKKyAgICovCisgIHB1YmxpYyBMaXN0PENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPiBvbkNvbW1pdFJlY2VpdmVkKENvbW1pdFJlY2VpdmVkRXZlbnQgcmVjZWl2ZUV2ZW50KQorICAgICAgdGhyb3dzIENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb247Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC92YWxpZGF0b3JzL0NvbW1pdFZhbGlkYXRpb25NZXNzYWdlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC92YWxpZGF0b3JzL0NvbW1pdFZhbGlkYXRpb25NZXNzYWdlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWI4NjMxNwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L3ZhbGlkYXRvcnMvQ29tbWl0VmFsaWRhdGlvbk1lc3NhZ2UuamF2YQpAQCAtMCwwICsxLDMzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC52YWxpZGF0b3JzOworCitwdWJsaWMgY2xhc3MgQ29tbWl0VmFsaWRhdGlvbk1lc3NhZ2UgeworICBwcml2YXRlIGZpbmFsIFN0cmluZyBtZXNzYWdlOworICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gaXNFcnJvcjsKKworICBwdWJsaWMgQ29tbWl0VmFsaWRhdGlvbk1lc3NhZ2UoZmluYWwgU3RyaW5nIG1lc3NhZ2UsIGZpbmFsIGJvb2xlYW4gaXNFcnJvcikgeworICAgIHRoaXMubWVzc2FnZSA9IG1lc3NhZ2U7CisgICAgdGhpcy5pc0Vycm9yID0gaXNFcnJvcjsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgZ2V0TWVzc2FnZSgpIHsKKyAgICByZXR1cm4gbWVzc2FnZTsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGlzRXJyb3IoKSB7CisgICAgcmV0dXJuIGlzRXJyb3I7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L3ZhbGlkYXRvcnMvQ29tbWl0VmFsaWRhdG9ycy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvdmFsaWRhdG9ycy9Db21taXRWYWxpZGF0b3JzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGFiZTUwMQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ2l0L3ZhbGlkYXRvcnMvQ29tbWl0VmFsaWRhdG9ycy5qYXZhCkBAIC0wLDAgKzEsNTgwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC52YWxpZGF0b3JzOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlBhZ2VMaW5rczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50cy5Db21taXRSZWNlaXZlZEV2ZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Qcm9qZWN0Q29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuVmFsaWRhdGlvbkVycm9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlJlZkNvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLk1hZ2ljQnJhbmNoOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKKworaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5Ib3N0S2V5OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuQ29uZmlnSW52YWxpZEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5Gb290ZXJLZXk7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLkZvb3RlckxpbmU7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldkNvbW1pdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuU3lzdGVtUmVhZGVyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CisKK2ltcG9ydCBqYXZhLm5ldC5NYWxmb3JtZWRVUkxFeGNlcHRpb247CitpbXBvcnQgamF2YS5uZXQuVVJMOworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuTGlua2VkTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwucmVnZXguUGF0dGVybjsKKworaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CisKK3B1YmxpYyBjbGFzcyBDb21taXRWYWxpZGF0b3JzIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkKKyAgICAgIC5nZXRMb2dnZXIoQ29tbWl0VmFsaWRhdG9ycy5jbGFzcyk7CisKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgRm9vdGVyS2V5IENIQU5HRV9JRCA9IG5ldyBGb290ZXJLZXkoIkNoYW5nZS1JZCIpOworCisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFBhdHRlcm4gTkVXX1BBVENIU0VUID0gUGF0dGVybgorICAgICAgLmNvbXBpbGUoIl5yZWZzL2NoYW5nZXMvKD86WzAtOV1bMC05XSk/KC9bMS05XVswLTldKil7MSwyfSg/Oi9uZXcpPyQiKTsKKworICBwdWJsaWMgaW50ZXJmYWNlIEZhY3RvcnkgeworICAgIENvbW1pdFZhbGlkYXRvcnMgY3JlYXRlKFJlZkNvbnRyb2wgcmVmQ29udHJvbCwgU3NoSW5mbyBzc2hJbmZvLAorICAgICAgICBSZXBvc2l0b3J5IHJlcG8pOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQZXJzb25JZGVudCBnZXJyaXRJZGVudDsKKyAgcHJpdmF0ZSBmaW5hbCBSZWZDb250cm9sIHJlZkNvbnRyb2w7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIGNhbm9uaWNhbFdlYlVybDsKKyAgcHJpdmF0ZSBmaW5hbCBTc2hJbmZvIHNzaEluZm87CisgIHByaXZhdGUgZmluYWwgUmVwb3NpdG9yeSByZXBvOworICBwcml2YXRlIGZpbmFsIER5bmFtaWNTZXQ8Q29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyPiBjb21taXRWYWxpZGF0aW9uTGlzdGVuZXJzOworCisgIEBJbmplY3QKKyAgQ29tbWl0VmFsaWRhdG9ycyhAR2Vycml0UGVyc29uSWRlbnQgZmluYWwgUGVyc29uSWRlbnQgZ2Vycml0SWRlbnQsCisgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBmaW5hbCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsLAorICAgICAgZmluYWwgRHluYW1pY1NldDxDb21taXRWYWxpZGF0aW9uTGlzdGVuZXI+IGNvbW1pdFZhbGlkYXRpb25MaXN0ZW5lcnMsCisgICAgICBAQXNzaXN0ZWQgZmluYWwgU3NoSW5mbyBzc2hJbmZvLAorICAgICAgQEFzc2lzdGVkIGZpbmFsIFJlcG9zaXRvcnkgcmVwbywgQEFzc2lzdGVkIGZpbmFsIFJlZkNvbnRyb2wgcmVmQ29udHJvbCkgeworICAgIHRoaXMuZ2Vycml0SWRlbnQgPSBnZXJyaXRJZGVudDsKKyAgICB0aGlzLnJlZkNvbnRyb2wgPSByZWZDb250cm9sOworICAgIHRoaXMuY2Fub25pY2FsV2ViVXJsID0gY2Fub25pY2FsV2ViVXJsOworICAgIHRoaXMuc3NoSW5mbyA9IHNzaEluZm87CisgICAgdGhpcy5yZXBvID0gcmVwbzsKKyAgICB0aGlzLmNvbW1pdFZhbGlkYXRpb25MaXN0ZW5lcnMgPSBjb21taXRWYWxpZGF0aW9uTGlzdGVuZXJzOworICB9CisKKyAgcHVibGljIExpc3Q8Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+IHZhbGlkYXRlRm9yUmVjZWl2ZUNvbW1pdHMoCisgICAgICBDb21taXRSZWNlaXZlZEV2ZW50IHJlY2VpdmVFdmVudCkgdGhyb3dzIENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24geworCisgICAgTGlzdDxDb21taXRWYWxpZGF0aW9uTGlzdGVuZXI+IHZhbGlkYXRvcnMgPQorICAgICAgICBuZXcgTGlua2VkTGlzdDxDb21taXRWYWxpZGF0aW9uTGlzdGVuZXI+KCk7CisKKyAgICB2YWxpZGF0b3JzLmFkZChuZXcgVXBsb2FkTWVyZ2VzUGVybWlzc2lvblZhbGlkYXRvcihyZWZDb250cm9sKSk7CisgICAgdmFsaWRhdG9ycy5hZGQobmV3IEFtZW5kZWRHZXJyaXRNZXJnZUNvbW1pdFZhbGlkYXRpb25MaXN0ZW5lcigKKyAgICAgICAgcmVmQ29udHJvbCwgZ2Vycml0SWRlbnQpKTsKKyAgICB2YWxpZGF0b3JzLmFkZChuZXcgQXV0aG9yVXBsb2FkZXJWYWxpZGF0b3IocmVmQ29udHJvbCwgY2Fub25pY2FsV2ViVXJsKSk7CisgICAgdmFsaWRhdG9ycy5hZGQobmV3IENvbW1pdHRlclVwbG9hZGVyVmFsaWRhdG9yKHJlZkNvbnRyb2wsIGNhbm9uaWNhbFdlYlVybCkpOworICAgIHZhbGlkYXRvcnMuYWRkKG5ldyBTaWduZWRPZmZCeVZhbGlkYXRvcihyZWZDb250cm9sLCBjYW5vbmljYWxXZWJVcmwpKTsKKyAgICBpZiAoTWFnaWNCcmFuY2guaXNNYWdpY0JyYW5jaChyZWNlaXZlRXZlbnQuY29tbWFuZC5nZXRSZWZOYW1lKCkpCisgICAgICAgIHx8IE5FV19QQVRDSFNFVC5tYXRjaGVyKHJlY2VpdmVFdmVudC5jb21tYW5kLmdldFJlZk5hbWUoKSkubWF0Y2hlcygpKSB7CisgICAgICB2YWxpZGF0b3JzLmFkZChuZXcgQ2hhbmdlSWRWYWxpZGF0b3IocmVmQ29udHJvbCwgY2Fub25pY2FsV2ViVXJsLCBzc2hJbmZvKSk7CisgICAgfQorICAgIHZhbGlkYXRvcnMuYWRkKG5ldyBDb25maWdWYWxpZGF0b3IocmVmQ29udHJvbCwgcmVwbykpOworICAgIHZhbGlkYXRvcnMuYWRkKG5ldyBQbHVnaW5Db21taXRWYWxpZGF0aW9uTGlzdGVuZXIoY29tbWl0VmFsaWRhdGlvbkxpc3RlbmVycykpOworCisgICAgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gbWVzc2FnZXMgPQorICAgICAgICBuZXcgTGlua2VkTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4oKTsKKworICAgIHRyeSB7CisgICAgICBmb3IgKENvbW1pdFZhbGlkYXRpb25MaXN0ZW5lciBjb21taXRWYWxpZGF0b3IgOiB2YWxpZGF0b3JzKSB7CisgICAgICAgIG1lc3NhZ2VzLmFkZEFsbChjb21taXRWYWxpZGF0b3Iub25Db21taXRSZWNlaXZlZChyZWNlaXZlRXZlbnQpKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uIGUpIHsKKyAgICAgIC8vIEtlZXAgdGhlIG9sZCBtZXNzYWdlcyAoYW5kIHRoZWlyIG9yZGVyKSBpbiBjYXNlIG9mIGFuIGV4Y2VwdGlvbgorICAgICAgbWVzc2FnZXMuYWRkQWxsKGUuZ2V0TWVzc2FnZXMoKSk7CisgICAgICB0aHJvdyBuZXcgQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSwgbWVzc2FnZXMpOworICAgIH0KKyAgICByZXR1cm4gbWVzc2FnZXM7CisgIH0KKworICBwdWJsaWMgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gdmFsaWRhdGVGb3JHZXJyaXRDb21taXRzKAorICAgICAgQ29tbWl0UmVjZWl2ZWRFdmVudCByZWNlaXZlRXZlbnQpIHRocm93cyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uIHsKKworICAgIExpc3Q8Q29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyPiB2YWxpZGF0b3JzID0KKyAgICAgICAgbmV3IExpbmtlZExpc3Q8Q29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyPigpOworCisgICAgdmFsaWRhdG9ycy5hZGQobmV3IFVwbG9hZE1lcmdlc1Blcm1pc3Npb25WYWxpZGF0b3IocmVmQ29udHJvbCkpOworICAgIHZhbGlkYXRvcnMuYWRkKG5ldyBBbWVuZGVkR2Vycml0TWVyZ2VDb21taXRWYWxpZGF0aW9uTGlzdGVuZXIoCisgICAgICAgIHJlZkNvbnRyb2wsIGdlcnJpdElkZW50KSk7CisgICAgdmFsaWRhdG9ycy5hZGQobmV3IEF1dGhvclVwbG9hZGVyVmFsaWRhdG9yKHJlZkNvbnRyb2wsIGNhbm9uaWNhbFdlYlVybCkpOworICAgIHZhbGlkYXRvcnMuYWRkKG5ldyBTaWduZWRPZmZCeVZhbGlkYXRvcihyZWZDb250cm9sLCBjYW5vbmljYWxXZWJVcmwpKTsKKyAgICBpZiAoTWFnaWNCcmFuY2guaXNNYWdpY0JyYW5jaChyZWNlaXZlRXZlbnQuY29tbWFuZC5nZXRSZWZOYW1lKCkpCisgICAgICAgIHx8IE5FV19QQVRDSFNFVC5tYXRjaGVyKHJlY2VpdmVFdmVudC5jb21tYW5kLmdldFJlZk5hbWUoKSkubWF0Y2hlcygpKSB7CisgICAgICB2YWxpZGF0b3JzLmFkZChuZXcgQ2hhbmdlSWRWYWxpZGF0b3IocmVmQ29udHJvbCwgY2Fub25pY2FsV2ViVXJsLCBzc2hJbmZvKSk7CisgICAgfQorICAgIHZhbGlkYXRvcnMuYWRkKG5ldyBDb25maWdWYWxpZGF0b3IocmVmQ29udHJvbCwgcmVwbykpOworICAgIHZhbGlkYXRvcnMuYWRkKG5ldyBQbHVnaW5Db21taXRWYWxpZGF0aW9uTGlzdGVuZXIoY29tbWl0VmFsaWRhdGlvbkxpc3RlbmVycykpOworCisgICAgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gbWVzc2FnZXMgPQorICAgICAgICBuZXcgTGlua2VkTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4oKTsKKworICAgIHRyeSB7CisgICAgICBmb3IgKENvbW1pdFZhbGlkYXRpb25MaXN0ZW5lciBjb21taXRWYWxpZGF0b3IgOiB2YWxpZGF0b3JzKSB7CisgICAgICAgIG1lc3NhZ2VzLmFkZEFsbChjb21taXRWYWxpZGF0b3Iub25Db21taXRSZWNlaXZlZChyZWNlaXZlRXZlbnQpKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uIGUpIHsKKyAgICAgIC8vIEtlZXAgdGhlIG9sZCBtZXNzYWdlcyAoYW5kIHRoZWlyIG9yZGVyKSBpbiBjYXNlIG9mIGFuIGV4Y2VwdGlvbgorICAgICAgbWVzc2FnZXMuYWRkQWxsKGUuZ2V0TWVzc2FnZXMoKSk7CisgICAgICB0aHJvdyBuZXcgQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSwgbWVzc2FnZXMpOworICAgIH0KKyAgICByZXR1cm4gbWVzc2FnZXM7CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIENoYW5nZUlkVmFsaWRhdG9yIGltcGxlbWVudHMgQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyIHsKKyAgICBwcml2YXRlIGZpbmFsIFJlZkNvbnRyb2wgcmVmQ29udHJvbDsKKyAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBjYW5vbmljYWxXZWJVcmw7CisgICAgcHJpdmF0ZSBmaW5hbCBTc2hJbmZvIHNzaEluZm87CisKKyAgICBwdWJsaWMgQ2hhbmdlSWRWYWxpZGF0b3IoUmVmQ29udHJvbCByZWZDb250cm9sLCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsLAorICAgICAgICBTc2hJbmZvIHNzaEluZm8pIHsKKyAgICAgIHRoaXMucmVmQ29udHJvbCA9IHJlZkNvbnRyb2w7CisgICAgICB0aGlzLmNhbm9uaWNhbFdlYlVybCA9IGNhbm9uaWNhbFdlYlVybDsKKyAgICAgIHRoaXMuc3NoSW5mbyA9IHNzaEluZm87CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIExpc3Q8Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+IG9uQ29tbWl0UmVjZWl2ZWQoCisgICAgICAgIENvbW1pdFJlY2VpdmVkRXZlbnQgcmVjZWl2ZUV2ZW50KSB0aHJvd3MgQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbiB7CisKKyAgICAgIGZpbmFsIFByb2plY3RDb250cm9sIHByb2plY3RDb250cm9sID0gcmVmQ29udHJvbC5nZXRQcm9qZWN0Q29udHJvbCgpOworICAgICAgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXIgPSAoSWRlbnRpZmllZFVzZXIpIHJlZkNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKTsKKyAgICAgIGZpbmFsIExpc3Q8U3RyaW5nPiBpZExpc3QgPSByZWNlaXZlRXZlbnQuY29tbWl0LmdldEZvb3RlckxpbmVzKENIQU5HRV9JRCk7CisKKyAgICAgIExpc3Q8Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+IG1lc3NhZ2VzID0KKyAgICAgICAgICBuZXcgTGlua2VkTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4oKTsKKworICAgICAgaWYgKGlkTGlzdC5pc0VtcHR5KCkpIHsKKyAgICAgICAgaWYgKHByb2plY3RDb250cm9sLmdldFByb2plY3RTdGF0ZSgpLmlzUmVxdWlyZUNoYW5nZUlEKCkpIHsKKyAgICAgICAgICBTdHJpbmcgZXJyTXNnID0gIm1pc3NpbmcgQ2hhbmdlLUlkIGluIGNvbW1pdCBtZXNzYWdlIGZvb3RlciI7CisgICAgICAgICAgbWVzc2FnZXMuYWRkKGdldEZpeGVkQ29tbWl0TXNnV2l0aENoYW5nZUlkKGVyck1zZywgcmVjZWl2ZUV2ZW50LmNvbW1pdCwKKyAgICAgICAgICAgICAgY3VycmVudFVzZXIsIGNhbm9uaWNhbFdlYlVybCwgc3NoSW5mbykpOworICAgICAgICAgIHRocm93IG5ldyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uKGVyck1zZywgbWVzc2FnZXMpOworICAgICAgICB9CisgICAgICB9IGVsc2UgaWYgKGlkTGlzdC5zaXplKCkgPiAxKSB7CisgICAgICAgIHRocm93IG5ldyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uKAorICAgICAgICAgICAgIm11bHRpcGxlIENoYW5nZS1JZCBsaW5lcyBpbiBjb21taXQgbWVzc2FnZSBmb290ZXIiLCBtZXNzYWdlcyk7CisgICAgICB9IGVsc2UgeworICAgICAgICBmaW5hbCBTdHJpbmcgdiA9IGlkTGlzdC5nZXQoaWRMaXN0LnNpemUoKSAtIDEpLnRyaW0oKTsKKyAgICAgICAgaWYgKCF2Lm1hdGNoZXMoIl5JWzAtOWEtZl17OCx9LiokIikpIHsKKyAgICAgICAgICBmaW5hbCBTdHJpbmcgZXJyTXNnID0KKyAgICAgICAgICAgICAgIm1pc3Npbmcgb3IgaW52YWxpZCBDaGFuZ2UtSWQgbGluZSBmb3JtYXQgaW4gY29tbWl0IG1lc3NhZ2UgZm9vdGVyIjsKKyAgICAgICAgICBtZXNzYWdlcy5hZGQoZ2V0Rml4ZWRDb21taXRNc2dXaXRoQ2hhbmdlSWQoZXJyTXNnLCByZWNlaXZlRXZlbnQuY29tbWl0LAorICAgICAgICAgICAgICBjdXJyZW50VXNlciwgY2Fub25pY2FsV2ViVXJsLCBzc2hJbmZvKSk7CisgICAgICAgICAgdGhyb3cgbmV3IENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24oZXJyTXNnLCBtZXNzYWdlcyk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy48Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+ZW1wdHlMaXN0KCk7CisgICAgfQorICB9CisKKyAgLyoqCisgICAqIElmIHRoaXMgaXMgdGhlIHNwZWNpYWwgcHJvamVjdCBjb25maWd1cmF0aW9uIGJyYW5jaCwgdmFsaWRhdGUgdGhlIGNvbmZpZy4KKyAgICovCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgQ29uZmlnVmFsaWRhdG9yIGltcGxlbWVudHMgQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyIHsKKyAgICBwcml2YXRlIGZpbmFsIFJlZkNvbnRyb2wgcmVmQ29udHJvbDsKKyAgICBwcml2YXRlIGZpbmFsIFJlcG9zaXRvcnkgcmVwbzsKKworICAgIHB1YmxpYyBDb25maWdWYWxpZGF0b3IoUmVmQ29udHJvbCByZWZDb250cm9sLCBSZXBvc2l0b3J5IHJlcG8pIHsKKyAgICAgIHRoaXMucmVmQ29udHJvbCA9IHJlZkNvbnRyb2w7CisgICAgICB0aGlzLnJlcG8gPSByZXBvOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBMaXN0PENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPiBvbkNvbW1pdFJlY2VpdmVkKAorICAgICAgICBDb21taXRSZWNlaXZlZEV2ZW50IHJlY2VpdmVFdmVudCkgdGhyb3dzIENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24geworICAgICAgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXIgPSAoSWRlbnRpZmllZFVzZXIpIHJlZkNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKTsKKworICAgICAgaWYgKEdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRl9DT05GSUcuZXF1YWxzKHJlZkNvbnRyb2wuZ2V0UmVmTmFtZSgpKSkgeworICAgICAgICBMaXN0PENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPiBtZXNzYWdlcyA9CisgICAgICAgICAgICBuZXcgTGlua2VkTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4oKTsKKworICAgICAgICB0cnkgeworICAgICAgICAgIFByb2plY3RDb25maWcgY2ZnID0KKyAgICAgICAgICAgICAgbmV3IFByb2plY3RDb25maWcocmVjZWl2ZUV2ZW50LnByb2plY3QuZ2V0TmFtZUtleSgpKTsKKyAgICAgICAgICBjZmcubG9hZChyZXBvLCByZWNlaXZlRXZlbnQuY29tbWFuZC5nZXROZXdJZCgpKTsKKyAgICAgICAgICBpZiAoIWNmZy5nZXRWYWxpZGF0aW9uRXJyb3JzKCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBhZGRFcnJvcigiSW52YWxpZCBwcm9qZWN0IGNvbmZpZ3VyYXRpb246IiwgbWVzc2FnZXMpOworICAgICAgICAgICAgZm9yIChWYWxpZGF0aW9uRXJyb3IgZXJyIDogY2ZnLmdldFZhbGlkYXRpb25FcnJvcnMoKSkgeworICAgICAgICAgICAgICBhZGRFcnJvcigiICAiICsgZXJyLmdldE1lc3NhZ2UoKSwgbWVzc2FnZXMpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdGhyb3cgbmV3IENvbmZpZ0ludmFsaWRFeGNlcHRpb24oImludmFsaWQgcHJvamVjdCBjb25maWd1cmF0aW9uIik7CisgICAgICAgICAgfQorICAgICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgeworICAgICAgICAgIGxvZy5lcnJvcigiVXNlciAiICsgY3VycmVudFVzZXIuZ2V0VXNlck5hbWUoKQorICAgICAgICAgICAgICArICIgdHJpZWQgdG8gcHVzaCBpbnZhbGlkIHByb2plY3QgY29uZmlndXJhdGlvbiAiCisgICAgICAgICAgICAgICsgcmVjZWl2ZUV2ZW50LmNvbW1hbmQuZ2V0TmV3SWQoKS5uYW1lKCkgKyAiIGZvciAiCisgICAgICAgICAgICAgICsgcmVjZWl2ZUV2ZW50LnByb2plY3QuZ2V0TmFtZSgpLCBlKTsKKyAgICAgICAgICB0aHJvdyBuZXcgQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbigiaW52YWxpZCBwcm9qZWN0IGNvbmZpZ3VyYXRpb24iLAorICAgICAgICAgICAgICBtZXNzYWdlcyk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy48Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+ZW1wdHlMaXN0KCk7CisgICAgfQorICB9CisKKyAgLyoqIFJlcXVpcmUgcGVybWlzc2lvbiB0byB1cGxvYWQgbWVyZ2VzLiAqLworICBwdWJsaWMgc3RhdGljIGNsYXNzIFVwbG9hZE1lcmdlc1Blcm1pc3Npb25WYWxpZGF0b3IgaW1wbGVtZW50cworICAgICAgQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyIHsKKyAgICBwcml2YXRlIGZpbmFsIFJlZkNvbnRyb2wgcmVmQ29udHJvbDsKKworICAgIHB1YmxpYyBVcGxvYWRNZXJnZXNQZXJtaXNzaW9uVmFsaWRhdG9yKFJlZkNvbnRyb2wgcmVmQ29udHJvbCkgeworICAgICAgdGhpcy5yZWZDb250cm9sID0gcmVmQ29udHJvbDsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gb25Db21taXRSZWNlaXZlZCgKKyAgICAgICAgQ29tbWl0UmVjZWl2ZWRFdmVudCByZWNlaXZlRXZlbnQpIHRocm93cyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uIHsKKyAgICAgIGlmIChyZWNlaXZlRXZlbnQuY29tbWl0LmdldFBhcmVudENvdW50KCkgPiAxCisgICAgICAgICAgJiYgIXJlZkNvbnRyb2wuY2FuVXBsb2FkTWVyZ2VzKCkpIHsKKyAgICAgICAgdGhyb3cgbmV3IENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24oInlvdSBhcmUgbm90IGFsbG93ZWQgdG8gdXBsb2FkIG1lcmdlcyIpOworICAgICAgfQorICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLjxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT5lbXB0eUxpc3QoKTsKKyAgICB9CisgIH0KKworICAvKiogRXhlY3V0ZSBjb21taXQgdmFsaWRhdGlvbiBwbHVnLWlucyAqLworICBwdWJsaWMgc3RhdGljIGNsYXNzIFBsdWdpbkNvbW1pdFZhbGlkYXRpb25MaXN0ZW5lciBpbXBsZW1lbnRzCisgICAgICBDb21taXRWYWxpZGF0aW9uTGlzdGVuZXIgeworICAgIHByaXZhdGUgZmluYWwgRHluYW1pY1NldDxDb21taXRWYWxpZGF0aW9uTGlzdGVuZXI+IGNvbW1pdFZhbGlkYXRpb25MaXN0ZW5lcnM7CisKKyAgICBwdWJsaWMgUGx1Z2luQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyKAorICAgICAgICBmaW5hbCBEeW5hbWljU2V0PENvbW1pdFZhbGlkYXRpb25MaXN0ZW5lcj4gY29tbWl0VmFsaWRhdGlvbkxpc3RlbmVycykgeworICAgICAgdGhpcy5jb21taXRWYWxpZGF0aW9uTGlzdGVuZXJzID0gY29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyczsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gb25Db21taXRSZWNlaXZlZCgKKyAgICAgICAgQ29tbWl0UmVjZWl2ZWRFdmVudCByZWNlaXZlRXZlbnQpIHRocm93cyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uIHsKKyAgICAgIExpc3Q8Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+IG1lc3NhZ2VzID0KKyAgICAgICAgICBuZXcgTGlua2VkTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4oKTsKKworICAgICAgZm9yIChDb21taXRWYWxpZGF0aW9uTGlzdGVuZXIgdmFsaWRhdG9yIDogY29tbWl0VmFsaWRhdGlvbkxpc3RlbmVycykgeworICAgICAgICB0cnkgeworICAgICAgICAgIG1lc3NhZ2VzLmFkZEFsbCh2YWxpZGF0b3Iub25Db21taXRSZWNlaXZlZChyZWNlaXZlRXZlbnQpKTsKKyAgICAgICAgfSBjYXRjaCAoQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgbWVzc2FnZXMuYWRkQWxsKGUuZ2V0TWVzc2FnZXMoKSk7CisgICAgICAgICAgdGhyb3cgbmV3IENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24oZS5nZXRNZXNzYWdlKCksIG1lc3NhZ2VzKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgcmV0dXJuIG1lc3NhZ2VzOworICAgIH0KKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgU2lnbmVkT2ZmQnlWYWxpZGF0b3IgaW1wbGVtZW50cyBDb21taXRWYWxpZGF0aW9uTGlzdGVuZXIgeworICAgIHByaXZhdGUgZmluYWwgUmVmQ29udHJvbCByZWZDb250cm9sOworCisgICAgcHVibGljIFNpZ25lZE9mZkJ5VmFsaWRhdG9yKFJlZkNvbnRyb2wgcmVmQ29udHJvbCwgU3RyaW5nIGNhbm9uaWNhbFdlYlVybCkgeworICAgICAgdGhpcy5yZWZDb250cm9sID0gcmVmQ29udHJvbDsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4gb25Db21taXRSZWNlaXZlZCgKKyAgICAgICAgQ29tbWl0UmVjZWl2ZWRFdmVudCByZWNlaXZlRXZlbnQpIHRocm93cyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uIHsKKyAgICAgIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyID0gKElkZW50aWZpZWRVc2VyKSByZWZDb250cm9sLmdldEN1cnJlbnRVc2VyKCk7CisgICAgICBmaW5hbCBQZXJzb25JZGVudCBjb21taXR0ZXIgPSByZWNlaXZlRXZlbnQuY29tbWl0LmdldENvbW1pdHRlcklkZW50KCk7CisgICAgICBmaW5hbCBQZXJzb25JZGVudCBhdXRob3IgPSByZWNlaXZlRXZlbnQuY29tbWl0LmdldEF1dGhvcklkZW50KCk7CisgICAgICBmaW5hbCBQcm9qZWN0Q29udHJvbCBwcm9qZWN0Q29udHJvbCA9IHJlZkNvbnRyb2wuZ2V0UHJvamVjdENvbnRyb2woKTsKKworICAgICAgaWYgKHByb2plY3RDb250cm9sLmdldFByb2plY3RTdGF0ZSgpLmlzVXNlU2lnbmVkT2ZmQnkoKSkgeworICAgICAgICBib29sZWFuIHNib0F1dGhvciA9IGZhbHNlLCBzYm9Db21taXR0ZXIgPSBmYWxzZSwgc2JvTWUgPSBmYWxzZTsKKyAgICAgICAgZm9yIChmaW5hbCBGb290ZXJMaW5lIGZvb3RlciA6IHJlY2VpdmVFdmVudC5jb21taXQuZ2V0Rm9vdGVyTGluZXMoKSkgeworICAgICAgICAgIGlmIChmb290ZXIubWF0Y2hlcyhGb290ZXJLZXkuU0lHTkVEX09GRl9CWSkpIHsKKyAgICAgICAgICAgIGZpbmFsIFN0cmluZyBlID0gZm9vdGVyLmdldEVtYWlsQWRkcmVzcygpOworICAgICAgICAgICAgaWYgKGUgIT0gbnVsbCkgeworICAgICAgICAgICAgICBzYm9BdXRob3IgfD0gYXV0aG9yLmdldEVtYWlsQWRkcmVzcygpLmVxdWFscyhlKTsKKyAgICAgICAgICAgICAgc2JvQ29tbWl0dGVyIHw9IGNvbW1pdHRlci5nZXRFbWFpbEFkZHJlc3MoKS5lcXVhbHMoZSk7CisgICAgICAgICAgICAgIHNib01lIHw9IGN1cnJlbnRVc2VyLmdldEVtYWlsQWRkcmVzc2VzKCkuY29udGFpbnMoZSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGlmICghc2JvQXV0aG9yICYmICFzYm9Db21taXR0ZXIgJiYgIXNib01lCisgICAgICAgICAgICAmJiAhcmVmQ29udHJvbC5jYW5Gb3JnZUNvbW1pdHRlcigpKSB7CisgICAgICAgICAgdGhyb3cgbmV3IENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24oCisgICAgICAgICAgICAgICJub3QgU2lnbmVkLW9mZi1ieSBhdXRob3IvY29tbWl0dGVyL3VwbG9hZGVyIGluIGNvbW1pdCBtZXNzYWdlIGZvb3RlciIpOworICAgICAgICB9CisgICAgICB9CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuPENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPmVtcHR5TGlzdCgpOworICAgIH0KKyAgfQorCisgIC8qKiBSZXF1aXJlIHRoYXQgYXV0aG9yIG1hdGNoZXMgdGhlIHVwbG9hZGVyLiAqLworICBwdWJsaWMgc3RhdGljIGNsYXNzIEF1dGhvclVwbG9hZGVyVmFsaWRhdG9yIGltcGxlbWVudHMKKyAgICAgIENvbW1pdFZhbGlkYXRpb25MaXN0ZW5lciB7CisgICAgcHJpdmF0ZSBmaW5hbCBSZWZDb250cm9sIHJlZkNvbnRyb2w7CisgICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsOworCisgICAgcHVibGljIEF1dGhvclVwbG9hZGVyVmFsaWRhdG9yKFJlZkNvbnRyb2wgcmVmQ29udHJvbCwgU3RyaW5nIGNhbm9uaWNhbFdlYlVybCkgeworICAgICAgdGhpcy5yZWZDb250cm9sID0gcmVmQ29udHJvbDsKKyAgICAgIHRoaXMuY2Fub25pY2FsV2ViVXJsID0gY2Fub25pY2FsV2ViVXJsOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBMaXN0PENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPiBvbkNvbW1pdFJlY2VpdmVkKAorICAgICAgICBDb21taXRSZWNlaXZlZEV2ZW50IHJlY2VpdmVFdmVudCkgdGhyb3dzIENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24geworICAgICAgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXIgPSAoSWRlbnRpZmllZFVzZXIpIHJlZkNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKTsKKyAgICAgIGZpbmFsIFBlcnNvbklkZW50IGF1dGhvciA9IHJlY2VpdmVFdmVudC5jb21taXQuZ2V0QXV0aG9ySWRlbnQoKTsKKworICAgICAgaWYgKCFjdXJyZW50VXNlci5nZXRFbWFpbEFkZHJlc3NlcygpLmNvbnRhaW5zKGF1dGhvci5nZXRFbWFpbEFkZHJlc3MoKSkKKyAgICAgICAgICAmJiAhcmVmQ29udHJvbC5jYW5Gb3JnZUF1dGhvcigpKSB7CisgICAgICAgIExpc3Q8Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+IG1lc3NhZ2VzID0KKyAgICAgICAgICAgIG5ldyBMaW5rZWRMaXN0PENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPigpOworCisgICAgICAgIG1lc3NhZ2VzLmFkZChnZXRJbnZhbGlkRW1haWxFcnJvcihyZWNlaXZlRXZlbnQuY29tbWl0LCAiYXV0aG9yIiwgYXV0aG9yLAorICAgICAgICAgICAgY3VycmVudFVzZXIsIGNhbm9uaWNhbFdlYlVybCkpOworICAgICAgICB0aHJvdyBuZXcgQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbigiaW52YWxpZCBhdXRob3IiLCBtZXNzYWdlcyk7CisgICAgICB9CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuPENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPmVtcHR5TGlzdCgpOworICAgIH0KKyAgfQorCisgIC8qKiBSZXF1aXJlIHRoYXQgY29tbWl0dGVyIG1hdGNoZXMgdGhlIHVwbG9hZGVyLiAqLworICBwdWJsaWMgc3RhdGljIGNsYXNzIENvbW1pdHRlclVwbG9hZGVyVmFsaWRhdG9yIGltcGxlbWVudHMKKyAgICAgIENvbW1pdFZhbGlkYXRpb25MaXN0ZW5lciB7CisgICAgcHJpdmF0ZSBmaW5hbCBSZWZDb250cm9sIHJlZkNvbnRyb2w7CisgICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsOworCisgICAgcHVibGljIENvbW1pdHRlclVwbG9hZGVyVmFsaWRhdG9yKFJlZkNvbnRyb2wgcmVmQ29udHJvbCwKKyAgICAgICAgU3RyaW5nIGNhbm9uaWNhbFdlYlVybCkgeworICAgICAgdGhpcy5yZWZDb250cm9sID0gcmVmQ29udHJvbDsKKyAgICAgIHRoaXMuY2Fub25pY2FsV2ViVXJsID0gY2Fub25pY2FsV2ViVXJsOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBMaXN0PENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPiBvbkNvbW1pdFJlY2VpdmVkKAorICAgICAgICBDb21taXRSZWNlaXZlZEV2ZW50IHJlY2VpdmVFdmVudCkgdGhyb3dzIENvbW1pdFZhbGlkYXRpb25FeGNlcHRpb24geworICAgICAgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXIgPSAoSWRlbnRpZmllZFVzZXIpIHJlZkNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKTsKKyAgICAgIGZpbmFsIFBlcnNvbklkZW50IGNvbW1pdHRlciA9IHJlY2VpdmVFdmVudC5jb21taXQuZ2V0Q29tbWl0dGVySWRlbnQoKTsKKyAgICAgIGlmICghY3VycmVudFVzZXIuZ2V0RW1haWxBZGRyZXNzZXMoKQorICAgICAgICAgIC5jb250YWlucyhjb21taXR0ZXIuZ2V0RW1haWxBZGRyZXNzKCkpCisgICAgICAgICAgJiYgIXJlZkNvbnRyb2wuY2FuRm9yZ2VDb21taXR0ZXIoKSkgeworICAgICAgICBMaXN0PENvbW1pdFZhbGlkYXRpb25NZXNzYWdlPiBtZXNzYWdlcyA9CisgICAgICAgICAgICBuZXcgTGlua2VkTGlzdDxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT4oKTsKKyAgICAgICAgbWVzc2FnZXMuYWRkKGdldEludmFsaWRFbWFpbEVycm9yKHJlY2VpdmVFdmVudC5jb21taXQsICJjb21taXR0ZXIiLCBjb21taXR0ZXIsCisgICAgICAgICAgICBjdXJyZW50VXNlciwgY2Fub25pY2FsV2ViVXJsKSk7CisgICAgICAgIHRocm93IG5ldyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uKCJpbnZhbGlkIGNvbW1pdHRlciIsIG1lc3NhZ2VzKTsKKyAgICAgIH0KKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy48Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+ZW1wdHlMaXN0KCk7CisgICAgfQorICB9CisKKyAgLyoqCisgICAqIERvbid0IGFsbG93IHRoZSB1c2VyIHRvIGFtZW5kIGEgbWVyZ2UgY3JlYXRlZCBieSBHZXJyaXQgQ29kZSBSZXZpZXcuIFRoaXMKKyAgICogc2VlbXMgdG8gaGFwcGVuIGFsbCB0b28gb2Z0ZW4sIGR1ZSB0byB1c2VycyBub3QgcGF5aW5nIGFueSBhdHRlbnRpb24gdG8KKyAgICogd2hhdCB0aGV5IGFyZSBkb2luZy4KKyAgICovCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgQW1lbmRlZEdlcnJpdE1lcmdlQ29tbWl0VmFsaWRhdGlvbkxpc3RlbmVyIGltcGxlbWVudHMKKyAgICAgIENvbW1pdFZhbGlkYXRpb25MaXN0ZW5lciB7CisgICAgcHJpdmF0ZSBmaW5hbCBQZXJzb25JZGVudCBnZXJyaXRJZGVudDsKKyAgICBwcml2YXRlIGZpbmFsIFJlZkNvbnRyb2wgcmVmQ29udHJvbDsKKworICAgIHB1YmxpYyBBbWVuZGVkR2Vycml0TWVyZ2VDb21taXRWYWxpZGF0aW9uTGlzdGVuZXIoCisgICAgICAgIGZpbmFsIFJlZkNvbnRyb2wgcmVmQ29udHJvbCwgZmluYWwgUGVyc29uSWRlbnQgZ2Vycml0SWRlbnQpIHsKKyAgICAgIHRoaXMucmVmQ29udHJvbCA9IHJlZkNvbnRyb2w7CisgICAgICB0aGlzLmdlcnJpdElkZW50ID0gZ2Vycml0SWRlbnQ7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIExpc3Q8Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+IG9uQ29tbWl0UmVjZWl2ZWQoCisgICAgICAgIENvbW1pdFJlY2VpdmVkRXZlbnQgcmVjZWl2ZUV2ZW50KSB0aHJvd3MgQ29tbWl0VmFsaWRhdGlvbkV4Y2VwdGlvbiB7CisgICAgICBmaW5hbCBQZXJzb25JZGVudCBhdXRob3IgPSByZWNlaXZlRXZlbnQuY29tbWl0LmdldEF1dGhvcklkZW50KCk7CisKKyAgICAgIGlmIChyZWNlaXZlRXZlbnQuY29tbWl0LmdldFBhcmVudENvdW50KCkgPiAxCisgICAgICAgICAgJiYgYXV0aG9yLmdldE5hbWUoKS5lcXVhbHMoZ2Vycml0SWRlbnQuZ2V0TmFtZSgpKQorICAgICAgICAgICYmIGF1dGhvci5nZXRFbWFpbEFkZHJlc3MoKS5lcXVhbHMoZ2Vycml0SWRlbnQuZ2V0RW1haWxBZGRyZXNzKCkpCisgICAgICAgICAgJiYgIXJlZkNvbnRyb2wuY2FuRm9yZ2VHZXJyaXRTZXJ2ZXJJZGVudGl0eSgpKSB7CisgICAgICAgIHRocm93IG5ldyBDb21taXRWYWxpZGF0aW9uRXhjZXB0aW9uKCJkbyBub3QgYW1lbmQgbWVyZ2VzIG5vdCBtYWRlIGJ5IHlvdSIpOworICAgICAgfQorICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLjxDb21taXRWYWxpZGF0aW9uTWVzc2FnZT5lbXB0eUxpc3QoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBDb21taXRWYWxpZGF0aW9uTWVzc2FnZSBnZXRJbnZhbGlkRW1haWxFcnJvcihSZXZDb21taXQgYywgU3RyaW5nIHR5cGUsCisgICAgICBQZXJzb25JZGVudCB3aG8sIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLCBTdHJpbmcgY2Fub25pY2FsV2ViVXJsKSB7CisgICAgU3RyaW5nQnVpbGRlciBzYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgc2IuYXBwZW5kKCJcbiIpOworICAgIHNiLmFwcGVuZCgiRVJST1I6ICBJbiBjb21taXQgIiArIGMubmFtZSgpICsgIlxuIik7CisgICAgc2IuYXBwZW5kKCJFUlJPUjogICIgKyB0eXBlICsgIiBlbWFpbCBhZGRyZXNzICIgKyB3aG8uZ2V0RW1haWxBZGRyZXNzKCkKKyAgICAgICAgKyAiXG4iKTsKKyAgICBzYi5hcHBlbmQoIkVSUk9SOiAgZG9lcyBub3QgbWF0Y2ggeW91ciB1c2VyIGFjY291bnQuXG4iKTsKKyAgICBzYi5hcHBlbmQoIkVSUk9SOlxuIik7CisgICAgaWYgKGN1cnJlbnRVc2VyLmdldEVtYWlsQWRkcmVzc2VzKCkuaXNFbXB0eSgpKSB7CisgICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgWW91IGhhdmUgbm90IHJlZ2lzdGVyZWQgYW55IGVtYWlsIGFkZHJlc3Nlcy5cbiIpOworICAgIH0gZWxzZSB7CisgICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgVGhlIGZvbGxvd2luZyBhZGRyZXNzZXMgYXJlIGN1cnJlbnRseSByZWdpc3RlcmVkOlxuIik7CisgICAgICBmb3IgKFN0cmluZyBhZGRyZXNzIDogY3VycmVudFVzZXIuZ2V0RW1haWxBZGRyZXNzZXMoKSkgeworICAgICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgICAiICsgYWRkcmVzcyArICJcbiIpOworICAgICAgfQorICAgIH0KKyAgICBzYi5hcHBlbmQoIkVSUk9SOlxuIik7CisgICAgaWYgKGNhbm9uaWNhbFdlYlVybCAhPSBudWxsKSB7CisgICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgVG8gcmVnaXN0ZXIgYW4gZW1haWwgYWRkcmVzcywgcGxlYXNlIHZpc2l0OlxuIik7CisgICAgICBzYi5hcHBlbmQoIkVSUk9SOiAgIiArIGNhbm9uaWNhbFdlYlVybCArICIjIiArIFBhZ2VMaW5rcy5TRVRUSU5HU19DT05UQUNUCisgICAgICAgICAgKyAiXG4iKTsKKyAgICB9CisgICAgc2IuYXBwZW5kKCJcbiIpOworICAgIHJldHVybiBuZXcgQ29tbWl0VmFsaWRhdGlvbk1lc3NhZ2Uoc2IudG9TdHJpbmcoKSwgZmFsc2UpOworICB9CisKKyAgLyoqCisgICAqIFdlIGhhbmRsZSAzIGNhc2VzOgorICAgKiAxLiBObyBjaGFuZ2UgaWQgaW4gdGhlIGNvbW1pdCBtZXNzYWdlIGF0IGFsbC4KKyAgICogMi4gQ2hhbmdlIGlkIGxhc3QgaW4gdGhlIGNvbW1pdCBtZXNzYWdlIGJ1dCBtaXNzaW5nIGVtcHR5IGxpbmUgdG8gY3JlYXRlIHRoZSBmb290ZXIuCisgICAqIDMuIFRoZXJlIGlzIGEgY2hhbmdlLWlkIHNvbWV3aGVyZSBpbiB0aGUgY29tbWl0IG1lc3NhZ2UsIGJ1dCB3ZSBpZ25vcmUgaXQuCisgICAqCisgICAqIEByZXR1cm4gVGhlIGZpeGVkIHVwIGNvbW1pdCBtZXNzYWdlCisgICAqLworICBwcml2YXRlIHN0YXRpYyBDb21taXRWYWxpZGF0aW9uTWVzc2FnZSBnZXRGaXhlZENvbW1pdE1zZ1dpdGhDaGFuZ2VJZChmaW5hbCBTdHJpbmcgZXJyTXNnLAorICAgICAgZmluYWwgUmV2Q29tbWl0IGMsIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyLAorICAgICAgU3RyaW5nIGNhbm9uaWNhbFdlYlVybCwgZmluYWwgU3NoSW5mbyBzc2hJbmZvKSB7CisgICAgZmluYWwgU3RyaW5nIGNoYW5nZUlkID0gIkNoYW5nZS1JZDoiOworICAgIFN0cmluZ0J1aWxkZXIgc2IgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIHNiLmFwcGVuZCgiRVJST1I6ICIpLmFwcGVuZChlcnJNc2cpOworICAgIHNiLmFwcGVuZCgnXG4nKTsKKyAgICBzYi5hcHBlbmQoIlN1Z2dlc3Rpb24gZm9yIGNvbW1pdCBtZXNzYWdlOlxuIik7CisKKyAgICBpZiAoYy5nZXRGdWxsTWVzc2FnZSgpLmluZGV4T2YoY2hhbmdlSWQpID09IC0xKSB7CisgICAgICBzYi5hcHBlbmQoYy5nZXRGdWxsTWVzc2FnZSgpKTsKKyAgICAgIHNiLmFwcGVuZCgnXG4nKTsKKyAgICAgIHNiLmFwcGVuZChjaGFuZ2VJZCkuYXBwZW5kKCIgSSIpLmFwcGVuZChjLm5hbWUoKSk7CisgICAgfSBlbHNlIHsKKyAgICAgIFN0cmluZyBsaW5lc1tdID0gYy5nZXRGdWxsTWVzc2FnZSgpLnRyaW0oKS5zcGxpdCgiXG4iKTsKKyAgICAgIFN0cmluZyBsYXN0TGluZSA9IGxpbmVzLmxlbmd0aCA+IDAgPyBsaW5lc1tsaW5lcy5sZW5ndGggLSAxXSA6ICIiOworCisgICAgICBpZiAobGFzdExpbmUuaW5kZXhPZihjaGFuZ2VJZCkgPT0gMCkgeworICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGxpbmVzLmxlbmd0aCAtIDE7IGkrKykgeworICAgICAgICAgIHNiLmFwcGVuZChsaW5lc1tpXSk7CisgICAgICAgICAgc2IuYXBwZW5kKCdcbicpOworICAgICAgICB9CisKKyAgICAgICAgc2IuYXBwZW5kKCdcbicpOworICAgICAgICBzYi5hcHBlbmQobGFzdExpbmUpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgc2IuYXBwZW5kKGMuZ2V0RnVsbE1lc3NhZ2UoKSk7CisgICAgICAgIHNiLmFwcGVuZCgnXG4nKTsKKyAgICAgICAgc2IuYXBwZW5kKGNoYW5nZUlkKS5hcHBlbmQoIiBJIikuYXBwZW5kKGMubmFtZSgpKTsKKyAgICAgICAgc2IuYXBwZW5kKCdcbicpOworICAgICAgICBzYi5hcHBlbmQoIkhpbnQ6IEEgcG90ZW50aWFsIENoYW5nZS1JZCB3YXMgZm91bmQsIGJ1dCBpdCB3YXMgbm90IGluIHRoZSAiKTsKKyAgICAgICAgc2IuYXBwZW5kKCJmb290ZXIgKGxhc3QgcGFyYWdyYXBoKSBvZiB0aGUgY29tbWl0IG1lc3NhZ2UuIik7CisgICAgICB9CisgICAgfQorICAgIHNiLmFwcGVuZCgnXG4nKTsKKyAgICBzYi5hcHBlbmQoJ1xuJyk7CisgICAgc2IuYXBwZW5kKCJIaW50OiBUbyBhdXRvbWF0aWNhbGx5IGluc2VydCBDaGFuZ2UtSWQsIGluc3RhbGwgdGhlIGhvb2s6XG4iKTsKKyAgICBzYi5hcHBlbmQoZ2V0Q29tbWl0TWVzc2FnZUhvb2tJbnN0YWxsYXRpb25IaW50KGN1cnJlbnRVc2VyLAorICAgICAgICBjYW5vbmljYWxXZWJVcmwsIHNzaEluZm8pKS5hcHBlbmQoJ1xuJyk7CisgICAgc2IuYXBwZW5kKCdcbicpOworCisgICAgcmV0dXJuIG5ldyBDb21taXRWYWxpZGF0aW9uTWVzc2FnZShzYi50b1N0cmluZygpLCBmYWxzZSk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZ2V0Q29tbWl0TWVzc2FnZUhvb2tJbnN0YWxsYXRpb25IaW50KAorICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXIsIFN0cmluZyBjYW5vbmljYWxXZWJVcmwsCisgICAgICBmaW5hbCBTc2hJbmZvIHNzaEluZm8pIHsKKyAgICBmaW5hbCBMaXN0PEhvc3RLZXk+IGhvc3RLZXlzID0gc3NoSW5mby5nZXRIb3N0S2V5cygpOworCisgICAgLy8gSWYgdGhlcmUgYXJlIG5vIFNTSCBrZXlzLCB0aGUgY29tbWl0LW1zZyBob29rIG11c3QgYmUgaW5zdGFsbGVkIHZpYQorICAgIC8vIEhUVFAoUykKKyAgICBpZiAoaG9zdEtleXMuaXNFbXB0eSgpKSB7CisgICAgICBTdHJpbmcgcCA9ICIuZ2l0L2hvb2tzL2NvbW1pdC1tc2ciOworICAgICAgcmV0dXJuIFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgIiAgY3VybCAtbyAlcyAlcy90b29scy9ob29rcy9jb21taXQtbXNnIDsgY2htb2QgK3ggJXMiLCBwLAorICAgICAgICAgIGdldEdlcnJpdFVybChjYW5vbmljYWxXZWJVcmwpLCBwKTsKKyAgICB9CisKKyAgICAvLyBTU0gga2V5cyBleGlzdCwgc28gdGhlIGhvb2sgY2FuIGJlIGluc3RhbGxlZCB3aXRoIHNjcC4KKyAgICBTdHJpbmcgc3NoSG9zdDsKKyAgICBpbnQgc3NoUG9ydDsKKyAgICBTdHJpbmcgaG9zdCA9IGhvc3RLZXlzLmdldCgwKS5nZXRIb3N0KCk7CisgICAgaW50IGMgPSBob3N0Lmxhc3RJbmRleE9mKCc6Jyk7CisgICAgaWYgKDAgPD0gYykgeworICAgICAgaWYgKGhvc3Quc3RhcnRzV2l0aCgiKjoiKSkgeworICAgICAgICBzc2hIb3N0ID0gZ2V0R2Vycml0SG9zdChjYW5vbmljYWxXZWJVcmwpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgc3NoSG9zdCA9IGhvc3Quc3Vic3RyaW5nKDAsIGMpOworICAgICAgfQorICAgICAgc3NoUG9ydCA9IEludGVnZXIucGFyc2VJbnQoaG9zdC5zdWJzdHJpbmcoYyArIDEpKTsKKyAgICB9IGVsc2UgeworICAgICAgc3NoSG9zdCA9IGhvc3Q7CisgICAgICBzc2hQb3J0ID0gMjI7CisgICAgfQorCisgICAgcmV0dXJuIFN0cmluZy5mb3JtYXQoIiAgc2NwIC1wIC1QICVkICVzQCVzOmhvb2tzL2NvbW1pdC1tc2cgLmdpdC9ob29rcy8iLAorICAgICAgICBzc2hQb3J0LCBjdXJyZW50VXNlci5nZXRVc2VyTmFtZSgpLCBzc2hIb3N0KTsKKyAgfQorCisgIC8qKgorICAgKiBHZXQgdGhlIEdlcnJpdCBVUkwuCisgICAqCisgICAqIEByZXR1cm4gdGhlIGNhbm9uaWNhbCBVUkwgKHdpdGggYW55IHRyYWlsaW5nIHNsYXNoIHJlbW92ZWQpIGlmIGl0IGlzCisgICAqICAgICAgICAgY29uZmlndXJlZCwgb3RoZXJ3aXNlIGZhbGwgYmFjayB0byAiaHR0cDovL2hvc3RuYW1lIiB3aGVyZSBob3N0bmFtZQorICAgKiAgICAgICAgIGlzIHRoZSB2YWx1ZSByZXR1cm5lZCBieSB7QGxpbmsgI2dldEdlcnJpdEhvc3QoKX0uCisgICAqLworICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZ2V0R2Vycml0VXJsKFN0cmluZyBjYW5vbmljYWxXZWJVcmwpIHsKKyAgICBpZiAoY2Fub25pY2FsV2ViVXJsICE9IG51bGwpIHsKKyAgICAgIGlmIChjYW5vbmljYWxXZWJVcmwuZW5kc1dpdGgoIi8iKSkgeworICAgICAgICByZXR1cm4gY2Fub25pY2FsV2ViVXJsLnN1YnN0cmluZygwLCBjYW5vbmljYWxXZWJVcmwubGFzdEluZGV4T2YoIi8iKSk7CisgICAgICB9CisgICAgICByZXR1cm4gY2Fub25pY2FsV2ViVXJsOworICAgIH0gZWxzZSB7CisgICAgICByZXR1cm4gImh0dHA6Ly8iICsgZ2V0R2Vycml0SG9zdChjYW5vbmljYWxXZWJVcmwpOworICAgIH0KKyAgfQorCisgIC8qKgorICAgKiBHZXQgdGhlIEdlcnJpdCBob3N0bmFtZS4KKyAgICoKKyAgICogQHJldHVybiB0aGUgaG9zdG5hbWUgZnJvbSB0aGUgY2Fub25pY2FsIFVSTCBpZiBpdCBpcyBjb25maWd1cmVkLCBvdGhlcndpc2UKKyAgICogICAgICAgICB3aGF0ZXZlciB0aGUgT1Mgc2F5cyB0aGUgaG9zdG5hbWUgaXMuCisgICAqLworICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZ2V0R2Vycml0SG9zdChTdHJpbmcgY2Fub25pY2FsV2ViVXJsKSB7CisgICAgU3RyaW5nIGhvc3Q7CisgICAgaWYgKGNhbm9uaWNhbFdlYlVybCAhPSBudWxsKSB7CisgICAgICB0cnkgeworICAgICAgICBob3N0ID0gbmV3IFVSTChjYW5vbmljYWxXZWJVcmwpLmdldEhvc3QoKTsKKyAgICAgIH0gY2F0Y2ggKE1hbGZvcm1lZFVSTEV4Y2VwdGlvbiBlKSB7CisgICAgICAgIGhvc3QgPSBTeXN0ZW1SZWFkZXIuZ2V0SW5zdGFuY2UoKS5nZXRIb3N0bmFtZSgpOworICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICBob3N0ID0gU3lzdGVtUmVhZGVyLmdldEluc3RhbmNlKCkuZ2V0SG9zdG5hbWUoKTsKKyAgICB9CisgICAgcmV0dXJuIGhvc3Q7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyB2b2lkIGFkZEVycm9yKFN0cmluZyBlcnJvciwKKyAgICAgIExpc3Q8Q29tbWl0VmFsaWRhdGlvbk1lc3NhZ2U+IG1lc3NhZ2VzKSB7CisgICAgbWVzc2FnZXMuYWRkKG5ldyBDb21taXRWYWxpZGF0aW9uTWVzc2FnZShlcnJvciwgdHJ1ZSkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0FkZEluY2x1ZGVkR3JvdXBzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0FkZEluY2x1ZGVkR3JvdXBzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWEzZjMwZQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvQWRkSW5jbHVkZWRHcm91cHMuamF2YQpAQCAtMCwwICsxLDE3NCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZUxpc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXNjcmlwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuRGVmYXVsdElucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5NZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBJbmNsdWRlQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkFkZEluY2x1ZGVkR3JvdXBzLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5Hcm91cEpzb24uR3JvdXBJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKKworcHVibGljIGNsYXNzIEFkZEluY2x1ZGVkR3JvdXBzIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8R3JvdXBSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBARGVmYXVsdElucHV0CisgICAgU3RyaW5nIF9vbmVHcm91cDsKKworICAgIExpc3Q8U3RyaW5nPiBncm91cHM7CisKKyAgICBzdGF0aWMgSW5wdXQgaW5pdChJbnB1dCBpbikgeworICAgICAgaWYgKGluID09IG51bGwpIHsKKyAgICAgICAgaW4gPSBuZXcgSW5wdXQoKTsKKyAgICAgIH0KKyAgICAgIGlmIChpbi5ncm91cHMgPT0gbnVsbCkgeworICAgICAgICBpbi5ncm91cHMgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoMSk7CisgICAgICB9CisgICAgICBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShpbi5fb25lR3JvdXApKSB7CisgICAgICAgIGluLmdyb3Vwcy5hZGQoaW4uX29uZUdyb3VwKTsKKyAgICAgIH0KKyAgICAgIHJldHVybiBpbjsKKyAgICB9CisgIH0KKworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPEdyb3Vwc0NvbGxlY3Rpb24+IGdyb3Vwc0NvbGxlY3Rpb247CisgIHByaXZhdGUgZmluYWwgR3JvdXBJbmNsdWRlQ2FjaGUgZ3JvdXBJbmNsdWRlQ2FjaGU7CisgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CisgIHByaXZhdGUgZmluYWwgR3JvdXBKc29uIGpzb247CisKKyAgQEluamVjdAorICBwdWJsaWMgQWRkSW5jbHVkZWRHcm91cHMoUHJvdmlkZXI8R3JvdXBzQ29sbGVjdGlvbj4gZ3JvdXBzQ29sbGVjdGlvbiwKKyAgICAgIEdyb3VwSW5jbHVkZUNhY2hlIGdyb3VwSW5jbHVkZUNhY2hlLAorICAgICAgUmV2aWV3RGIgZGIsIEdyb3VwSnNvbiBqc29uKSB7CisgICAgdGhpcy5ncm91cHNDb2xsZWN0aW9uID0gZ3JvdXBzQ29sbGVjdGlvbjsKKyAgICB0aGlzLmdyb3VwSW5jbHVkZUNhY2hlID0gZ3JvdXBJbmNsdWRlQ2FjaGU7CisgICAgdGhpcy5kYiA9IGRiOworICAgIHRoaXMuanNvbiA9IGpzb247CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIExpc3Q8R3JvdXBJbmZvPiBhcHBseShHcm91cFJlc291cmNlIHJlc291cmNlLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLAorICAgICAgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50R3JvdXAgZ3JvdXAgPSByZXNvdXJjZS50b0FjY291bnRHcm91cCgpOworICAgIGlmIChncm91cCA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbigpOworICAgIH0KKyAgICBpbnB1dCA9IElucHV0LmluaXQoaW5wdXQpOworCisgICAgR3JvdXBDb250cm9sIGNvbnRyb2wgPSByZXNvdXJjZS5nZXRDb250cm9sKCk7CisgICAgTWFwPEFjY291bnRHcm91cC5VVUlELCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkPiBuZXdJbmNsdWRlZEdyb3VwcyA9IE1hcHMubmV3SGFzaE1hcCgpOworICAgIExpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0PiBuZXdJbmNsdWRlZEdyb3Vwc0F1ZGl0cyA9IExpc3RzLm5ld0xpbmtlZExpc3QoKTsKKyAgICBMaXN0PEdyb3VwSW5mbz4gcmVzdWx0ID0gTGlzdHMubmV3TGlua2VkTGlzdCgpOworICAgIEFjY291bnQuSWQgbWUgPSAoKElkZW50aWZpZWRVc2VyKSBjb250cm9sLmdldEN1cnJlbnRVc2VyKCkpLmdldEFjY291bnRJZCgpOworCisgICAgZm9yIChTdHJpbmcgaW5jbHVkZWRHcm91cCA6IGlucHV0Lmdyb3VwcykgeworICAgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBkID0gZ3JvdXBzQ29sbGVjdGlvbi5nZXQoKS5wYXJzZShpbmNsdWRlZEdyb3VwKTsKKyAgICAgIGlmICghY29udHJvbC5jYW5BZGRHcm91cChkLmdldEdyb3VwVVVJRCgpKSkgeworICAgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KCJDYW5ub3QgYWRkIGdyb3VwOiAlcyIsCisgICAgICAgICAgICBkLmdldE5hbWUoKSkpOworICAgICAgfQorCisgICAgICBpZiAoIW5ld0luY2x1ZGVkR3JvdXBzLmNvbnRhaW5zS2V5KGQuZ2V0R3JvdXBVVUlEKCkpKSB7CisgICAgICAgIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQuS2V5IGFnaUtleSA9CisgICAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZC5LZXkoZ3JvdXAuZ2V0SWQoKSwKKyAgICAgICAgICAgICAgICBkLmdldEdyb3VwVVVJRCgpKTsKKyAgICAgICAgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZCBhZ2kgPSBkYi5hY2NvdW50R3JvdXBJbmNsdWRlc0J5VXVpZCgpLmdldChhZ2lLZXkpOworICAgICAgICBpZiAoYWdpID09IG51bGwpIHsKKyAgICAgICAgICBhZ2kgPSBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZChhZ2lLZXkpOworICAgICAgICAgIG5ld0luY2x1ZGVkR3JvdXBzLnB1dChkLmdldEdyb3VwVVVJRCgpLCBhZ2kpOworICAgICAgICAgIG5ld0luY2x1ZGVkR3JvdXBzQXVkaXRzLmFkZChuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0KGFnaSwgbWUpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgcmVzdWx0LmFkZChqc29uLmZvcm1hdChkKSk7CisgICAgfQorCisgICAgaWYgKCFuZXdJbmNsdWRlZEdyb3Vwcy5pc0VtcHR5KCkpIHsKKyAgICAgIGRiLmFjY291bnRHcm91cEluY2x1ZGVzQnlVdWlkQXVkaXQoKS5pbnNlcnQobmV3SW5jbHVkZWRHcm91cHNBdWRpdHMpOworICAgICAgZGIuYWNjb3VudEdyb3VwSW5jbHVkZXNCeVV1aWQoKS5pbnNlcnQobmV3SW5jbHVkZWRHcm91cHMudmFsdWVzKCkpOworICAgICAgZm9yIChBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGFnaSA6IG5ld0luY2x1ZGVkR3JvdXBzLnZhbHVlcygpKSB7CisgICAgICAgIGdyb3VwSW5jbHVkZUNhY2hlLmV2aWN0TWVtYmVySW4oYWdpLmdldEluY2x1ZGVVVUlEKCkpOworICAgICAgfQorICAgICAgZ3JvdXBJbmNsdWRlQ2FjaGUuZXZpY3RNZW1iZXJzT2YoZ3JvdXAuZ2V0R3JvdXBVVUlEKCkpOworICAgIH0KKworICAgIHJldHVybiByZXN1bHQ7CisgIH0KKworICBzdGF0aWMgY2xhc3MgUHV0SW5jbHVkZWRHcm91cCBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PEdyb3VwUmVzb3VyY2UsIFB1dEluY2x1ZGVkR3JvdXAuSW5wdXQ+IHsKKyAgICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIH0KKworICAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8QWRkSW5jbHVkZWRHcm91cHM+IHB1dDsKKyAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBpZDsKKworICAgIFB1dEluY2x1ZGVkR3JvdXAoUHJvdmlkZXI8QWRkSW5jbHVkZWRHcm91cHM+IHB1dCwgU3RyaW5nIGlkKSB7CisgICAgICB0aGlzLnB1dCA9IHB1dDsKKyAgICAgIHRoaXMuaWQgPSBpZDsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgR3JvdXBJbmZvIGFwcGx5KEdyb3VwUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgICB0aHJvd3MgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiwgQmFkUmVxdWVzdEV4Y2VwdGlvbiwKKyAgICAgICAgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICAgIEFkZEluY2x1ZGVkR3JvdXBzLklucHV0IGluID0gbmV3IEFkZEluY2x1ZGVkR3JvdXBzLklucHV0KCk7CisgICAgICBpbi5ncm91cHMgPSBJbW11dGFibGVMaXN0Lm9mKGlkKTsKKyAgICAgIExpc3Q8R3JvdXBJbmZvPiBsaXN0ID0gcHV0LmdldCgpLmFwcGx5KHJlc291cmNlLCBpbik7CisgICAgICBpZiAobGlzdC5zaXplKCkgPT0gMSkgeworICAgICAgICByZXR1cm4gbGlzdC5nZXQoMCk7CisgICAgICB9CisgICAgICB0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKCk7CisgICAgfQorICB9CisKKyAgc3RhdGljIGNsYXNzIFVwZGF0ZUluY2x1ZGVkR3JvdXAgaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxJbmNsdWRlZEdyb3VwUmVzb3VyY2UsIFB1dEluY2x1ZGVkR3JvdXAuSW5wdXQ+IHsKKyAgICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIH0KKworICAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8R2V0SW5jbHVkZWRHcm91cD4gZ2V0OworCisgICAgQEluamVjdAorICAgIFVwZGF0ZUluY2x1ZGVkR3JvdXAoUHJvdmlkZXI8R2V0SW5jbHVkZWRHcm91cD4gZ2V0KSB7CisgICAgICB0aGlzLmdldCA9IGdldDsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgT2JqZWN0IGFwcGx5KEluY2x1ZGVkR3JvdXBSZXNvdXJjZSByZXNvdXJjZSwKKyAgICAgICAgUHV0SW5jbHVkZWRHcm91cC5JbnB1dCBpbnB1dCkgdGhyb3dzIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgICAvLyBEbyBub3RoaW5nLCB0aGUgZ3JvdXAgaXMgYWxyZWFkeSBpbmNsdWRlZC4KKyAgICAgIHJldHVybiBnZXQuZ2V0KCkuYXBwbHkocmVzb3VyY2UpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9BZGRNZW1iZXJzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0FkZE1lbWJlcnMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43ZjMyYTRkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9BZGRNZW1iZXJzLmphdmEKQEAgLTAsMCArMSwyMjEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkRlZmF1bHRJbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTWVtYmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBNZW1iZXJBdWRpdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXV0aFR5cGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50Q2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50SW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50TWFuYWdlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50UmVzb2x2ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudHNDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkF1dGhSZXF1ZXN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkF1dGhDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkFkZE1lbWJlcnMuSW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitjbGFzcyBBZGRNZW1iZXJzIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8R3JvdXBSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBARGVmYXVsdElucHV0CisgICAgU3RyaW5nIF9vbmVNZW1iZXI7CisKKyAgICBMaXN0PFN0cmluZz4gbWVtYmVyczsKKworICAgIHN0YXRpYyBJbnB1dCBpbml0KElucHV0IGluKSB7CisgICAgICBpZiAoaW4gPT0gbnVsbCkgeworICAgICAgICBpbiA9IG5ldyBJbnB1dCgpOworICAgICAgfQorICAgICAgaWYgKGluLm1lbWJlcnMgPT0gbnVsbCkgeworICAgICAgICBpbi5tZW1iZXJzID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KDEpOworICAgICAgfQorICAgICAgaWYgKCFTdHJpbmdzLmlzTnVsbE9yRW1wdHkoaW4uX29uZU1lbWJlcikpIHsKKyAgICAgICAgaW4ubWVtYmVycy5hZGQoaW4uX29uZU1lbWJlcik7CisgICAgICB9CisgICAgICByZXR1cm4gaW47CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50TWFuYWdlciBhY2NvdW50TWFuYWdlcjsKKyAgcHJpdmF0ZSBmaW5hbCBBdXRoVHlwZSBhdXRoVHlwZTsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxBY2NvdW50c0NvbGxlY3Rpb24+IGFjY291bnRzOworICBwcml2YXRlIGZpbmFsIEFjY291bnRSZXNvbHZlciBhY2NvdW50UmVzb2x2ZXI7CisgIHByaXZhdGUgZmluYWwgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKKworICBASW5qZWN0CisgIEFkZE1lbWJlcnMoQWNjb3VudE1hbmFnZXIgYWNjb3VudE1hbmFnZXIsCisgICAgICBBdXRoQ29uZmlnIGF1dGhDb25maWcsCisgICAgICBQcm92aWRlcjxBY2NvdW50c0NvbGxlY3Rpb24+IGFjY291bnRzLAorICAgICAgQWNjb3VudFJlc29sdmVyIGFjY291bnRSZXNvbHZlciwKKyAgICAgIEFjY291bnRDYWNoZSBhY2NvdW50Q2FjaGUsCisgICAgICBSZXZpZXdEYiBkYikgeworICAgIHRoaXMuYWNjb3VudE1hbmFnZXIgPSBhY2NvdW50TWFuYWdlcjsKKyAgICB0aGlzLmF1dGhUeXBlID0gYXV0aENvbmZpZy5nZXRBdXRoVHlwZSgpOworICAgIHRoaXMuYWNjb3VudHMgPSBhY2NvdW50czsKKyAgICB0aGlzLmFjY291bnRSZXNvbHZlciA9IGFjY291bnRSZXNvbHZlcjsKKyAgICB0aGlzLmFjY291bnRDYWNoZSA9IGFjY291bnRDYWNoZTsKKyAgICB0aGlzLmRiID0gZGI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIExpc3Q8QWNjb3VudEluZm8+IGFwcGx5KEdyb3VwUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgdGhyb3dzIEF1dGhFeGNlcHRpb24sIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24sCisgICAgICBVbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uLCBPcm1FeGNlcHRpb24geworICAgIEFjY291bnRHcm91cCBpbnRlcm5hbEdyb3VwID0gcmVzb3VyY2UudG9BY2NvdW50R3JvdXAoKTsKKyAgICBpZiAoaW50ZXJuYWxHcm91cCA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbigpOworICAgIH0KKyAgICBpbnB1dCA9IElucHV0LmluaXQoaW5wdXQpOworCisgICAgR3JvdXBDb250cm9sIGNvbnRyb2wgPSByZXNvdXJjZS5nZXRDb250cm9sKCk7CisgICAgTWFwPEFjY291bnQuSWQsIEFjY291bnRHcm91cE1lbWJlcj4gbmV3QWNjb3VudEdyb3VwTWVtYmVycyA9IE1hcHMubmV3SGFzaE1hcCgpOworICAgIExpc3Q8QWNjb3VudEdyb3VwTWVtYmVyQXVkaXQ+IG5ld0FjY291bnRHcm91cE1lbWJlckF1ZGl0cyA9IExpc3RzLm5ld0xpbmtlZExpc3QoKTsKKyAgICBMaXN0PEFjY291bnRJbmZvPiByZXN1bHQgPSBMaXN0cy5uZXdMaW5rZWRMaXN0KCk7CisgICAgQWNjb3VudC5JZCBtZSA9ICgoSWRlbnRpZmllZFVzZXIpIGNvbnRyb2wuZ2V0Q3VycmVudFVzZXIoKSkuZ2V0QWNjb3VudElkKCk7CisKKyAgICBmb3IgKFN0cmluZyBuYW1lT3JFbWFpbCA6IGlucHV0Lm1lbWJlcnMpIHsKKyAgICAgIEFjY291bnQgYSA9IGZpbmRBY2NvdW50KG5hbWVPckVtYWlsKTsKKyAgICAgIGlmICghYS5pc0FjdGl2ZSgpKSB7CisgICAgICAgIHRocm93IG5ldyBVbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAiQWNjb3VudCBJbmFjdGl2ZTogJXMiLCBuYW1lT3JFbWFpbCkpOworICAgICAgfQorCisgICAgICBpZiAoIWNvbnRyb2wuY2FuQWRkTWVtYmVyKGEuZ2V0SWQoKSkpIHsKKyAgICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oIkNhbm5vdCBhZGQgbWVtYmVyOiAiICsgYS5nZXRGdWxsTmFtZSgpKTsKKyAgICAgIH0KKworICAgICAgaWYgKCFuZXdBY2NvdW50R3JvdXBNZW1iZXJzLmNvbnRhaW5zS2V5KGEuZ2V0SWQoKSkpIHsKKyAgICAgICAgQWNjb3VudEdyb3VwTWVtYmVyLktleSBrZXkgPQorICAgICAgICAgICAgbmV3IEFjY291bnRHcm91cE1lbWJlci5LZXkoYS5nZXRJZCgpLCBpbnRlcm5hbEdyb3VwLmdldElkKCkpOworICAgICAgICBBY2NvdW50R3JvdXBNZW1iZXIgbSA9IGRiLmFjY291bnRHcm91cE1lbWJlcnMoKS5nZXQoa2V5KTsKKyAgICAgICAgaWYgKG0gPT0gbnVsbCkgeworICAgICAgICAgIG0gPSBuZXcgQWNjb3VudEdyb3VwTWVtYmVyKGtleSk7CisgICAgICAgICAgbmV3QWNjb3VudEdyb3VwTWVtYmVycy5wdXQobS5nZXRBY2NvdW50SWQoKSwgbSk7CisgICAgICAgICAgbmV3QWNjb3VudEdyb3VwTWVtYmVyQXVkaXRzLmFkZChuZXcgQWNjb3VudEdyb3VwTWVtYmVyQXVkaXQobSwgbWUpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgcmVzdWx0LmFkZChBY2NvdW50SW5mby5wYXJzZShhLCB0cnVlKSk7CisgICAgfQorCisgICAgZGIuYWNjb3VudEdyb3VwTWVtYmVyc0F1ZGl0KCkuaW5zZXJ0KG5ld0FjY291bnRHcm91cE1lbWJlckF1ZGl0cyk7CisgICAgZGIuYWNjb3VudEdyb3VwTWVtYmVycygpLmluc2VydChuZXdBY2NvdW50R3JvdXBNZW1iZXJzLnZhbHVlcygpKTsKKyAgICBmb3IgKEFjY291bnRHcm91cE1lbWJlciBtIDogbmV3QWNjb3VudEdyb3VwTWVtYmVycy52YWx1ZXMoKSkgeworICAgICAgYWNjb3VudENhY2hlLmV2aWN0KG0uZ2V0QWNjb3VudElkKCkpOworICAgIH0KKworICAgIHJldHVybiByZXN1bHQ7CisgIH0KKworICBwcml2YXRlIEFjY291bnQgZmluZEFjY291bnQoU3RyaW5nIG5hbWVPckVtYWlsKSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwKKyAgICAgIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgdHJ5IHsKKyAgICAgIHJldHVybiBhY2NvdW50cy5nZXQoKS5wYXJzZShuYW1lT3JFbWFpbCkuZ2V0QWNjb3VudCgpOworICAgIH0gY2F0Y2ggKFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24gZSkgeworICAgICAgLy8gbWlnaHQgYmUgYmVjYXVzZSB0aGUgYWNjb3VudCBkb2VzIG5vdCBleGlzdCBvciBiZWNhdXNlIHRoZSBhY2NvdW50IGlzCisgICAgICAvLyBub3QgdmlzaWJsZQorICAgICAgc3dpdGNoIChhdXRoVHlwZSkgeworICAgICAgICBjYXNlIEhUVFBfTERBUDoKKyAgICAgICAgY2FzZSBDTElFTlRfU1NMX0NFUlRfTERBUDoKKyAgICAgICAgY2FzZSBMREFQOgorICAgICAgICAgIGlmIChhY2NvdW50UmVzb2x2ZXIuZmluZChuYW1lT3JFbWFpbCkgPT0gbnVsbCkgeworICAgICAgICAgICAgLy8gYWNjb3VudCBkb2VzIG5vdCBleGlzdCwgdHJ5IHRvIGNyZWF0ZSBpdAorICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZUFjY291bnRCeUxkYXAobmFtZU9yRW1haWwpOworICAgICAgICAgIH0KKyAgICAgICAgICBicmVhazsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgIH0KKyAgICAgIHRocm93IGU7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBBY2NvdW50IGNyZWF0ZUFjY291bnRCeUxkYXAoU3RyaW5nIHVzZXIpIHsKKyAgICBpZiAoIXVzZXIubWF0Y2hlcyhBY2NvdW50LlVTRVJfTkFNRV9QQVRURVJOKSkgeworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorCisgICAgdHJ5IHsKKyAgICAgIEF1dGhSZXF1ZXN0IHJlcSA9IEF1dGhSZXF1ZXN0LmZvclVzZXIodXNlcik7CisgICAgICByZXEuc2V0U2tpcEF1dGhlbnRpY2F0aW9uKHRydWUpOworICAgICAgcmV0dXJuIGFjY291bnRDYWNoZS5nZXQoYWNjb3VudE1hbmFnZXIuYXV0aGVudGljYXRlKHJlcSkuZ2V0QWNjb3VudElkKCkpCisgICAgICAgICAgLmdldEFjY291bnQoKTsKKyAgICB9IGNhdGNoIChBY2NvdW50RXhjZXB0aW9uIGUpIHsKKyAgICAgIHJldHVybiBudWxsOworICAgIH0KKyAgfQorCisgIHN0YXRpYyBjbGFzcyBQdXRNZW1iZXIgaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxHcm91cFJlc291cmNlLCBQdXRNZW1iZXIuSW5wdXQ+IHsKKyAgICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIH0KKworICAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8QWRkTWVtYmVycz4gcHV0OworICAgIHByaXZhdGUgZmluYWwgU3RyaW5nIGlkOworCisgICAgUHV0TWVtYmVyKFByb3ZpZGVyPEFkZE1lbWJlcnM+IHB1dCwgU3RyaW5nIGlkKSB7CisgICAgICB0aGlzLnB1dCA9IHB1dDsKKyAgICAgIHRoaXMuaWQgPSBpZDsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgT2JqZWN0IGFwcGx5KEdyb3VwUmVzb3VyY2UgcmVzb3VyY2UsIFB1dE1lbWJlci5JbnB1dCBpbnB1dCkKKyAgICAgICAgdGhyb3dzIEF1dGhFeGNlcHRpb24sIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24sCisgICAgICAgIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgICBBZGRNZW1iZXJzLklucHV0IGluID0gbmV3IEFkZE1lbWJlcnMuSW5wdXQoKTsKKyAgICAgIGluLl9vbmVNZW1iZXIgPSBpZDsKKyAgICAgIExpc3Q8QWNjb3VudEluZm8+IGxpc3QgPSBwdXQuZ2V0KCkuYXBwbHkocmVzb3VyY2UsIGluKTsKKyAgICAgIGlmIChsaXN0LnNpemUoKSA9PSAxKSB7CisgICAgICAgIHJldHVybiBsaXN0LmdldCgwKTsKKyAgICAgIH0KKyAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oKTsKKyAgICB9CisgIH0KKworICBzdGF0aWMgY2xhc3MgVXBkYXRlTWVtYmVyIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8TWVtYmVyUmVzb3VyY2UsIFB1dE1lbWJlci5JbnB1dD4geworICAgIHN0YXRpYyBjbGFzcyBJbnB1dCB7CisgICAgfQorCisgICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxHZXRNZW1iZXI+IGdldDsKKworICAgIEBJbmplY3QKKyAgICBVcGRhdGVNZW1iZXIoUHJvdmlkZXI8R2V0TWVtYmVyPiBnZXQpIHsKKyAgICAgIHRoaXMuZ2V0ID0gZ2V0OworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBPYmplY3QgYXBwbHkoTWVtYmVyUmVzb3VyY2UgcmVzb3VyY2UsIFB1dE1lbWJlci5JbnB1dCBpbnB1dCkgeworICAgICAgLy8gRG8gbm90aGluZywgdGhlIHVzZXIgaXMgYWxyZWFkeSBhIG1lbWJlci4KKyAgICAgIHJldHVybiBnZXQuZ2V0KCkuYXBwbHkocmVzb3VyY2UpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9DcmVhdGVHcm91cC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9DcmVhdGVHcm91cC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjY5MTRjZjIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0NyZWF0ZUdyb3VwLmphdmEKQEAgLTAsMCArMSwxMTYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLk9iamVjdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXNjcmlwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cERlc2NyaXB0aW9uczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLlBlcm1pc3Npb25EZW5pZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Ub3BMZXZlbFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5VbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuUGVyZm9ybUNyZWF0ZUdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5DcmVhdGVHcm91cC5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuR3JvdXBKc29uLkdyb3VwSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKKworQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LkNSRUFURV9HUk9VUCkKK2NsYXNzIENyZWF0ZUdyb3VwIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8VG9wTGV2ZWxSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBTdHJpbmcgbmFtZTsKKyAgICBTdHJpbmcgZGVzY3JpcHRpb247CisgICAgQm9vbGVhbiB2aXNpYmxlVG9BbGw7CisgICAgU3RyaW5nIG93bmVySWQ7CisgIH0KKworICBzdGF0aWMgaW50ZXJmYWNlIEZhY3RvcnkgeworICAgIENyZWF0ZUdyb3VwIGNyZWF0ZShAQXNzaXN0ZWQgU3RyaW5nIG5hbWUpOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxJZGVudGlmaWVkVXNlcj4gc2VsZjsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cHNDb2xsZWN0aW9uIGdyb3VwczsKKyAgcHJpdmF0ZSBmaW5hbCBQZXJmb3JtQ3JlYXRlR3JvdXAuRmFjdG9yeSBvcDsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cEpzb24ganNvbjsKKyAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIGRlZmF1bHRWaXNpYmxlVG9BbGw7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIG5hbWU7CisKKyAgQEluamVjdAorICBDcmVhdGVHcm91cChQcm92aWRlcjxJZGVudGlmaWVkVXNlcj4gc2VsZiwgR3JvdXBzQ29sbGVjdGlvbiBncm91cHMsCisgICAgICBQZXJmb3JtQ3JlYXRlR3JvdXAuRmFjdG9yeSBwZXJmb3JtQ3JlYXRlR3JvdXBGYWN0b3J5LCBHcm91cEpzb24ganNvbiwKKyAgICAgIEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNmZywgQEFzc2lzdGVkIFN0cmluZyBuYW1lKSB7CisgICAgdGhpcy5zZWxmID0gc2VsZjsKKyAgICB0aGlzLmdyb3VwcyA9IGdyb3VwczsKKyAgICB0aGlzLm9wID0gcGVyZm9ybUNyZWF0ZUdyb3VwRmFjdG9yeTsKKyAgICB0aGlzLmpzb24gPSBqc29uOworICAgIHRoaXMuZGVmYXVsdFZpc2libGVUb0FsbCA9IGNmZy5nZXRCb29sZWFuKCJncm91cHMiLCAibmV3R3JvdXBzVmlzaWJsZVRvQWxsIiwgZmFsc2UpOworICAgIHRoaXMubmFtZSA9IG5hbWU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIEdyb3VwSW5mbyBhcHBseShUb3BMZXZlbFJlc291cmNlIHJlc291cmNlLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBVbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uLAorICAgICAgTmFtZUFscmVhZHlVc2VkRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24geworICAgIGlmIChpbnB1dCA9PSBudWxsKSB7CisgICAgICBpbnB1dCA9IG5ldyBJbnB1dCgpOworICAgIH0KKyAgICBpZiAoaW5wdXQubmFtZSAhPSBudWxsICYmICFuYW1lLmVxdWFscyhpbnB1dC5uYW1lKSkgeworICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oIm5hbWUgbXVzdCBtYXRjaCBVUkwiKTsKKyAgICB9CisKKyAgICBBY2NvdW50R3JvdXAuSWQgb3duZXJJZCA9IG93bmVyKGlucHV0KTsKKyAgICBBY2NvdW50R3JvdXAgZ3JvdXA7CisgICAgdHJ5IHsKKyAgICAgIGdyb3VwID0gb3AuY3JlYXRlKCkuY3JlYXRlR3JvdXAoCisgICAgICAgICAgbmFtZSwKKyAgICAgICAgICBTdHJpbmdzLmVtcHR5VG9OdWxsKGlucHV0LmRlc2NyaXB0aW9uKSwKKyAgICAgICAgICBPYmplY3RzLmZpcnN0Tm9uTnVsbChpbnB1dC52aXNpYmxlVG9BbGwsIGRlZmF1bHRWaXNpYmxlVG9BbGwpLAorICAgICAgICAgIG93bmVySWQsCisgICAgICAgICAgb3duZXJJZCA9PSBudWxsCisgICAgICAgICAgICA/IENvbGxlY3Rpb25zLnNpbmdsZXRvbihzZWxmLmdldCgpLmdldEFjY291bnRJZCgpKQorICAgICAgICAgICAgOiBDb2xsZWN0aW9ucy48QWNjb3VudC5JZD4gZW1wdHlTZXQoKSwKKyAgICAgICAgICBudWxsKTsKKyAgICB9IGNhdGNoIChQZXJtaXNzaW9uRGVuaWVkRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKGUuZ2V0TWVzc2FnZSgpKTsKKyAgICB9CisgICAgcmV0dXJuIGpzb24uZm9ybWF0KEdyb3VwRGVzY3JpcHRpb25zLmZvckFjY291bnRHcm91cChncm91cCkpOworICB9CisKKyAgcHJpdmF0ZSBBY2NvdW50R3JvdXAuSWQgb3duZXIoSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiB7CisgICAgaWYgKGlucHV0Lm93bmVySWQgIT0gbnVsbCkgeworICAgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBkID0gZ3JvdXBzLnBhcnNlSW50ZXJuYWwoVXJsLmRlY29kZShpbnB1dC5vd25lcklkKSk7CisgICAgICByZXR1cm4gR3JvdXBEZXNjcmlwdGlvbnMudG9BY2NvdW50R3JvdXAoZCkuZ2V0SWQoKTsKKyAgICB9CisgICAgcmV0dXJuIG51bGw7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvRGVsZXRlSW5jbHVkZWRHcm91cHMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvRGVsZXRlSW5jbHVkZWRHcm91cHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xNWY5MzI1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9EZWxldGVJbmNsdWRlZEdyb3Vwcy5qYXZhCkBAIC0wLDAgKzEsMTUzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVMaXN0OworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLk1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwSW5jbHVkZUNhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5BZGRJbmNsdWRlZEdyb3Vwcy5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK3B1YmxpYyBjbGFzcyBEZWxldGVJbmNsdWRlZEdyb3VwcyBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PEdyb3VwUmVzb3VyY2UsIElucHV0PiB7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8R3JvdXBzQ29sbGVjdGlvbj4gZ3JvdXBzQ29sbGVjdGlvbjsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cEluY2x1ZGVDYWNoZSBncm91cEluY2x1ZGVDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxDdXJyZW50VXNlcj4gc2VsZjsKKworICBASW5qZWN0CisgIERlbGV0ZUluY2x1ZGVkR3JvdXBzKFByb3ZpZGVyPEdyb3Vwc0NvbGxlY3Rpb24+IGdyb3Vwc0NvbGxlY3Rpb24sCisgICAgICBHcm91cEluY2x1ZGVDYWNoZSBncm91cEluY2x1ZGVDYWNoZSwgUmV2aWV3RGIgZGIsCisgICAgICBQcm92aWRlcjxDdXJyZW50VXNlcj4gc2VsZikgeworICAgIHRoaXMuZ3JvdXBzQ29sbGVjdGlvbiA9IGdyb3Vwc0NvbGxlY3Rpb247CisgICAgdGhpcy5ncm91cEluY2x1ZGVDYWNoZSA9IGdyb3VwSW5jbHVkZUNhY2hlOworICAgIHRoaXMuZGIgPSBkYjsKKyAgICB0aGlzLnNlbGYgPSBzZWxmOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoR3JvdXBSZXNvdXJjZSByZXNvdXJjZSwgSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiwgQmFkUmVxdWVzdEV4Y2VwdGlvbiwKKyAgICAgIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgQWNjb3VudEdyb3VwIGludGVybmFsR3JvdXAgPSByZXNvdXJjZS50b0FjY291bnRHcm91cCgpOworICAgIGlmIChpbnRlcm5hbEdyb3VwID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uKCk7CisgICAgfQorICAgIGlucHV0ID0gSW5wdXQuaW5pdChpbnB1dCk7CisKKyAgICBmaW5hbCBHcm91cENvbnRyb2wgY29udHJvbCA9IHJlc291cmNlLmdldENvbnRyb2woKTsKKyAgICBmaW5hbCBNYXA8QWNjb3VudEdyb3VwLlVVSUQsIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ+IGluY2x1ZGVkR3JvdXBzID0gZ2V0SW5jbHVkZWRHcm91cHMoaW50ZXJuYWxHcm91cC5nZXRJZCgpKTsKKyAgICBmaW5hbCBMaXN0PEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ+IHRvUmVtb3ZlID0gTGlzdHMubmV3TGlua2VkTGlzdCgpOworCisgICAgZm9yIChmaW5hbCBTdHJpbmcgaW5jbHVkZWRHcm91cCA6IGlucHV0Lmdyb3VwcykgeworICAgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBkID0gZ3JvdXBzQ29sbGVjdGlvbi5nZXQoKS5wYXJzZShpbmNsdWRlZEdyb3VwKTsKKyAgICAgIGlmICghY29udHJvbC5jYW5SZW1vdmVHcm91cChkLmdldEdyb3VwVVVJRCgpKSkgeworICAgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KCJDYW5ub3QgZGVsZXRlIGdyb3VwOiAlcyIsCisgICAgICAgICAgICBkLmdldE5hbWUoKSkpOworICAgICAgfQorCisgICAgICBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGcgPSBpbmNsdWRlZEdyb3Vwcy5yZW1vdmUoZC5nZXRHcm91cFVVSUQoKSk7CisgICAgICBpZiAoZyAhPSBudWxsKSB7CisgICAgICAgIHRvUmVtb3ZlLmFkZChnKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBpZiAoIXRvUmVtb3ZlLmlzRW1wdHkoKSkgeworICAgICAgd3JpdGVBdWRpdHModG9SZW1vdmUpOworICAgICAgZGIuYWNjb3VudEdyb3VwSW5jbHVkZXNCeVV1aWQoKS5kZWxldGUodG9SZW1vdmUpOworICAgICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGcgOiB0b1JlbW92ZSkgeworICAgICAgICBncm91cEluY2x1ZGVDYWNoZS5ldmljdE1lbWJlckluKGcuZ2V0SW5jbHVkZVVVSUQoKSk7CisgICAgICB9CisgICAgICBncm91cEluY2x1ZGVDYWNoZS5ldmljdE1lbWJlcnNPZihpbnRlcm5hbEdyb3VwLmdldEdyb3VwVVVJRCgpKTsKKyAgICB9CisKKyAgICByZXR1cm4gUmVzcG9uc2Uubm9uZSgpOworICB9CisKKyAgcHJpdmF0ZSBNYXA8QWNjb3VudEdyb3VwLlVVSUQsIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ+IGdldEluY2x1ZGVkR3JvdXBzKAorICAgICAgZmluYWwgQWNjb3VudEdyb3VwLklkIGdyb3VwSWQpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIGZpbmFsIE1hcDxBY2NvdW50R3JvdXAuVVVJRCwgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZD4gZ3JvdXBzID0KKyAgICAgICAgTWFwcy5uZXdIYXNoTWFwKCk7CisgICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGcgOiBkYi5hY2NvdW50R3JvdXBJbmNsdWRlc0J5VXVpZCgpLmJ5R3JvdXAoZ3JvdXBJZCkpIHsKKyAgICAgIGdyb3Vwcy5wdXQoZy5nZXRJbmNsdWRlVVVJRCgpLCBnKTsKKyAgICB9CisgICAgcmV0dXJuIGdyb3VwczsKKyAgfQorCisgIHByaXZhdGUgdm9pZCB3cml0ZUF1ZGl0cyhmaW5hbCBMaXN0PEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ+IHRvQmVSZW1vdmVkKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgZmluYWwgQWNjb3VudC5JZCBtZSA9ICgoSWRlbnRpZmllZFVzZXIpIHNlbGYuZ2V0KCkpLmdldEFjY291bnRJZCgpOworICAgIGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0PiBhdWRpdFVwZGF0ZXMgPSBMaXN0cy5uZXdMaW5rZWRMaXN0KCk7CisgICAgZm9yIChmaW5hbCBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGcgOiB0b0JlUmVtb3ZlZCkgeworICAgICAgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0IGF1ZGl0ID0gbnVsbDsKKyAgICAgIGZvciAoQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0IGEgOiBkYgorICAgICAgICAgIC5hY2NvdW50R3JvdXBJbmNsdWRlc0J5VXVpZEF1ZGl0KCkuYnlHcm91cEluY2x1ZGUoZy5nZXRHcm91cElkKCksCisgICAgICAgICAgICAgIGcuZ2V0SW5jbHVkZVVVSUQoKSkpIHsKKyAgICAgICAgaWYgKGEuaXNBY3RpdmUoKSkgeworICAgICAgICAgIGF1ZGl0ID0gYTsKKyAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgfQorCisgICAgICBpZiAoYXVkaXQgIT0gbnVsbCkgeworICAgICAgICBhdWRpdC5yZW1vdmVkKG1lKTsKKyAgICAgICAgYXVkaXRVcGRhdGVzLmFkZChhdWRpdCk7CisgICAgICB9CisgICAgfQorICAgIGRiLmFjY291bnRHcm91cEluY2x1ZGVzQnlVdWlkQXVkaXQoKS51cGRhdGUoYXVkaXRVcGRhdGVzKTsKKyAgfQorCisgIHN0YXRpYyBjbGFzcyBEZWxldGVJbmNsdWRlZEdyb3VwIGltcGxlbWVudHMKKyAgICAgIFJlc3RNb2RpZnlWaWV3PEluY2x1ZGVkR3JvdXBSZXNvdXJjZSwgRGVsZXRlSW5jbHVkZWRHcm91cC5JbnB1dD4geworICAgIHN0YXRpYyBjbGFzcyBJbnB1dCB7CisgICAgfQorCisgICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxEZWxldGVJbmNsdWRlZEdyb3Vwcz4gZGVsZXRlOworCisgICAgQEluamVjdAorICAgIERlbGV0ZUluY2x1ZGVkR3JvdXAoZmluYWwgUHJvdmlkZXI8RGVsZXRlSW5jbHVkZWRHcm91cHM+IGRlbGV0ZSkgeworICAgICAgdGhpcy5kZWxldGUgPSBkZWxldGU7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIE9iamVjdCBhcHBseShJbmNsdWRlZEdyb3VwUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgICB0aHJvd3MgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiwgQmFkUmVxdWVzdEV4Y2VwdGlvbiwKKyAgICAgICAgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICAgIEFkZEluY2x1ZGVkR3JvdXBzLklucHV0IGluID0gbmV3IEFkZEluY2x1ZGVkR3JvdXBzLklucHV0KCk7CisgICAgICBpbi5ncm91cHMgPSBJbW11dGFibGVMaXN0Lm9mKHJlc291cmNlLmdldE1lbWJlcigpLmdldCgpKTsKKyAgICAgIHJldHVybiBkZWxldGUuZ2V0KCkuYXBwbHkocmVzb3VyY2UsIGluKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvRGVsZXRlTWVtYmVycy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9EZWxldGVNZW1iZXJzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDcyNzZjYQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvRGVsZXRlTWVtYmVycy5qYXZhCkBAIC0wLDAgKzEsMTUxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5VbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cE1lbWJlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTWVtYmVyQXVkaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRzQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkFkZE1lbWJlcnMuSW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOworCitwdWJsaWMgY2xhc3MgRGVsZXRlTWVtYmVycyBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PEdyb3VwUmVzb3VyY2UsIElucHV0PiB7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8QWNjb3VudHNDb2xsZWN0aW9uPiBhY2NvdW50czsKKyAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlOworICBwcml2YXRlIGZpbmFsIFJldmlld0RiIGRiOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPEN1cnJlbnRVc2VyPiBzZWxmOworCisgIEBJbmplY3QKKyAgRGVsZXRlTWVtYmVycyhQcm92aWRlcjxBY2NvdW50c0NvbGxlY3Rpb24+IGFjY291bnRzLAorICAgICAgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZSwgUmV2aWV3RGIgZGIsIFByb3ZpZGVyPEN1cnJlbnRVc2VyPiBzZWxmKSB7CisgICAgdGhpcy5hY2NvdW50cyA9IGFjY291bnRzOworICAgIHRoaXMuYWNjb3VudENhY2hlID0gYWNjb3VudENhY2hlOworICAgIHRoaXMuZGIgPSBkYjsKKyAgICB0aGlzLnNlbGYgPSBzZWxmOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoR3JvdXBSZXNvdXJjZSByZXNvdXJjZSwgSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbiwKKyAgICAgIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgQWNjb3VudEdyb3VwIGludGVybmFsR3JvdXAgPSByZXNvdXJjZS50b0FjY291bnRHcm91cCgpOworICAgIGlmIChpbnRlcm5hbEdyb3VwID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uKCk7CisgICAgfQorICAgIGlucHV0ID0gSW5wdXQuaW5pdChpbnB1dCk7CisKKyAgICBmaW5hbCBHcm91cENvbnRyb2wgY29udHJvbCA9IHJlc291cmNlLmdldENvbnRyb2woKTsKKyAgICBmaW5hbCBNYXA8QWNjb3VudC5JZCwgQWNjb3VudEdyb3VwTWVtYmVyPiBtZW1iZXJzID0gZ2V0TWVtYmVycyhpbnRlcm5hbEdyb3VwLmdldElkKCkpOworICAgIGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwTWVtYmVyPiB0b1JlbW92ZSA9IExpc3RzLm5ld0xpbmtlZExpc3QoKTsKKworICAgIGZvciAoZmluYWwgU3RyaW5nIG5hbWVPckVtYWlsIDogaW5wdXQubWVtYmVycykgeworICAgICAgQWNjb3VudCBhID0gYWNjb3VudHMuZ2V0KCkucGFyc2UobmFtZU9yRW1haWwpLmdldEFjY291bnQoKTsKKworICAgICAgaWYgKCFjb250cm9sLmNhblJlbW92ZU1lbWJlcihhLmdldElkKCkpKSB7CisgICAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJDYW5ub3QgZGVsZXRlIG1lbWJlcjogIiArIGEuZ2V0RnVsbE5hbWUoKSk7CisgICAgICB9CisKKyAgICAgIGZpbmFsIEFjY291bnRHcm91cE1lbWJlciBtID0gbWVtYmVycy5yZW1vdmUoYS5nZXRJZCgpKTsKKyAgICAgIGlmIChtICE9IG51bGwpIHsKKyAgICAgICAgdG9SZW1vdmUuYWRkKG0pOworICAgICAgfQorICAgIH0KKworICAgIHdyaXRlQXVkaXRzKHRvUmVtb3ZlKTsKKyAgICBkYi5hY2NvdW50R3JvdXBNZW1iZXJzKCkuZGVsZXRlKHRvUmVtb3ZlKTsKKyAgICBmb3IgKGZpbmFsIEFjY291bnRHcm91cE1lbWJlciBtIDogdG9SZW1vdmUpIHsKKyAgICAgIGFjY291bnRDYWNoZS5ldmljdChtLmdldEFjY291bnRJZCgpKTsKKyAgICB9CisKKyAgICByZXR1cm4gUmVzcG9uc2Uubm9uZSgpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHdyaXRlQXVkaXRzKGZpbmFsIExpc3Q8QWNjb3VudEdyb3VwTWVtYmVyPiB0b0JlUmVtb3ZlZCkKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIGZpbmFsIEFjY291bnQuSWQgbWUgPSAoKElkZW50aWZpZWRVc2VyKSBzZWxmLmdldCgpKS5nZXRBY2NvdW50SWQoKTsKKyAgICBmaW5hbCBMaXN0PEFjY291bnRHcm91cE1lbWJlckF1ZGl0PiBhdWRpdFVwZGF0ZXMgPSBMaXN0cy5uZXdMaW5rZWRMaXN0KCk7CisgICAgZmluYWwgTGlzdDxBY2NvdW50R3JvdXBNZW1iZXJBdWRpdD4gYXVkaXRJbnNlcnRzID0gTGlzdHMubmV3TGlua2VkTGlzdCgpOworICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwTWVtYmVyIG0gOiB0b0JlUmVtb3ZlZCkgeworICAgICAgQWNjb3VudEdyb3VwTWVtYmVyQXVkaXQgYXVkaXQgPSBudWxsOworICAgICAgZm9yIChBY2NvdW50R3JvdXBNZW1iZXJBdWRpdCBhIDogZGIuYWNjb3VudEdyb3VwTWVtYmVyc0F1ZGl0KCkKKyAgICAgICAgICAuYnlHcm91cEFjY291bnQobS5nZXRBY2NvdW50R3JvdXBJZCgpLCBtLmdldEFjY291bnRJZCgpKSkgeworICAgICAgICBpZiAoYS5pc0FjdGl2ZSgpKSB7CisgICAgICAgICAgYXVkaXQgPSBhOworICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICB9CisKKyAgICAgIGlmIChhdWRpdCAhPSBudWxsKSB7CisgICAgICAgIGF1ZGl0LnJlbW92ZWQobWUpOworICAgICAgICBhdWRpdFVwZGF0ZXMuYWRkKGF1ZGl0KTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGF1ZGl0ID0gbmV3IEFjY291bnRHcm91cE1lbWJlckF1ZGl0KG0sIG1lKTsKKyAgICAgICAgYXVkaXQucmVtb3ZlZExlZ2FjeSgpOworICAgICAgICBhdWRpdEluc2VydHMuYWRkKGF1ZGl0KTsKKyAgICAgIH0KKyAgICB9CisgICAgZGIuYWNjb3VudEdyb3VwTWVtYmVyc0F1ZGl0KCkudXBkYXRlKGF1ZGl0VXBkYXRlcyk7CisgICAgZGIuYWNjb3VudEdyb3VwTWVtYmVyc0F1ZGl0KCkuaW5zZXJ0KGF1ZGl0SW5zZXJ0cyk7CisgIH0KKworICBwcml2YXRlIE1hcDxBY2NvdW50LklkLCBBY2NvdW50R3JvdXBNZW1iZXI+IGdldE1lbWJlcnMoCisgICAgICBmaW5hbCBBY2NvdW50R3JvdXAuSWQgZ3JvdXBJZCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgZmluYWwgTWFwPEFjY291bnQuSWQsIEFjY291bnRHcm91cE1lbWJlcj4gbWVtYmVycyA9IE1hcHMubmV3SGFzaE1hcCgpOworICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwTWVtYmVyIG0gOiBkYi5hY2NvdW50R3JvdXBNZW1iZXJzKCkuYnlHcm91cChncm91cElkKSkgeworICAgICAgbWVtYmVycy5wdXQobS5nZXRBY2NvdW50SWQoKSwgbSk7CisgICAgfQorICAgIHJldHVybiBtZW1iZXJzOworICB9CisKKyAgc3RhdGljIGNsYXNzIERlbGV0ZU1lbWJlciBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PE1lbWJlclJlc291cmNlLCBEZWxldGVNZW1iZXIuSW5wdXQ+IHsKKyAgICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIH0KKworICAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8RGVsZXRlTWVtYmVycz4gZGVsZXRlOworCisgICAgQEluamVjdAorICAgIERlbGV0ZU1lbWJlcihmaW5hbCBQcm92aWRlcjxEZWxldGVNZW1iZXJzPiBkZWxldGUpIHsKKyAgICAgIHRoaXMuZGVsZXRlID0gZGVsZXRlOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBPYmplY3QgYXBwbHkoTWVtYmVyUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgICB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbiwKKyAgICAgICAgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uLCBOb1N1Y2hHcm91cEV4Y2VwdGlvbiB7CisgICAgICBBZGRNZW1iZXJzLklucHV0IGluID0gbmV3IEFkZE1lbWJlcnMuSW5wdXQoKTsKKyAgICAgIGluLl9vbmVNZW1iZXIgPSByZXNvdXJjZS5nZXRNZW1iZXIoKS5nZXRBY2NvdW50SWQoKS50b1N0cmluZygpOworICAgICAgcmV0dXJuIGRlbGV0ZS5nZXQoKS5hcHBseShyZXNvdXJjZSwgaW4pOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9HZXREZXNjcmlwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9HZXREZXNjcmlwdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQ2NzRhMjEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldERlc2NyaXB0aW9uLmphdmEKQEAgLTAsMCArMSwzMSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CisKK2NsYXNzIEdldERlc2NyaXB0aW9uIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PEdyb3VwUmVzb3VyY2U+IHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgYXBwbHkoR3JvdXBSZXNvdXJjZSByZXNvdXJjZSkgdGhyb3dzIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24geworICAgIEFjY291bnRHcm91cCBncm91cCA9IHJlc291cmNlLnRvQWNjb3VudEdyb3VwKCk7CisgICAgaWYgKGdyb3VwID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uKCk7CisgICAgfQorICAgIHJldHVybiBTdHJpbmdzLm51bGxUb0VtcHR5KGdyb3VwLmdldERlc2NyaXB0aW9uKCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldERldGFpbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9HZXREZXRhaWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mMWQyZTE1Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9HZXREZXRhaWwuamF2YQpAQCAtMCwwICsxLDM2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmdyb3Vwcy5MaXN0R3JvdXBzT3B0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkdyb3VwSnNvbi5Hcm91cEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK3B1YmxpYyBjbGFzcyBHZXREZXRhaWwgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8R3JvdXBSZXNvdXJjZT4geworICBwcml2YXRlIGZpbmFsIEdyb3VwSnNvbiBqc29uOworCisgIEBJbmplY3QKKyAgR2V0RGV0YWlsKEdyb3VwSnNvbiBqc29uKSB7CisgICAgdGhpcy5qc29uID0ganNvbi5hZGRPcHRpb24oTGlzdEdyb3Vwc09wdGlvbi5NRU1CRVJTKQorICAgICAgICAuYWRkT3B0aW9uKExpc3RHcm91cHNPcHRpb24uSU5DTFVERVMpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBHcm91cEluZm8gYXBwbHkoR3JvdXBSZXNvdXJjZSByc3JjKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICByZXR1cm4ganNvbi5mb3JtYXQocnNyYyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR2V0R3JvdXAuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR2V0R3JvdXAuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wOTE4MGRkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9HZXRHcm91cC5qYXZhCkBAIC0wLDAgKzEsMzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5Hcm91cEpzb24uR3JvdXBJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitjbGFzcyBHZXRHcm91cCBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxHcm91cFJlc291cmNlPiB7CisgIHByaXZhdGUgZmluYWwgR3JvdXBKc29uIGpzb247CisKKyAgQEluamVjdAorICBHZXRHcm91cChHcm91cEpzb24ganNvbikgeworICAgIHRoaXMuanNvbiA9IGpzb247CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIEdyb3VwSW5mbyBhcHBseShHcm91cFJlc291cmNlIHJlc291cmNlKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICByZXR1cm4ganNvbi5mb3JtYXQocmVzb3VyY2UuZ2V0R3JvdXAoKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR2V0SW5jbHVkZWRHcm91cC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9HZXRJbmNsdWRlZEdyb3VwLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzJmMjBjMAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR2V0SW5jbHVkZWRHcm91cC5qYXZhCkBAIC0wLDAgKzEsMzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5Hcm91cEpzb24uR3JvdXBJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitwdWJsaWMgY2xhc3MgR2V0SW5jbHVkZWRHcm91cCBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxJbmNsdWRlZEdyb3VwUmVzb3VyY2U+ICB7CisgIHByaXZhdGUgZmluYWwgR3JvdXBKc29uIGpzb247CisKKyAgQEluamVjdAorICBHZXRJbmNsdWRlZEdyb3VwKEdyb3VwSnNvbiBqc29uKSB7CisgICAgdGhpcy5qc29uID0ganNvbjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgR3JvdXBJbmZvIGFwcGx5KEluY2x1ZGVkR3JvdXBSZXNvdXJjZSByc3JjKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICByZXR1cm4ganNvbi5mb3JtYXQocnNyYy5nZXRNZW1iZXJEZXNjcmlwdGlvbigpKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9HZXRNZW1iZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR2V0TWVtYmVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTY1MTAwMQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR2V0TWVtYmVyLmphdmEKQEAgLTAsMCArMSwyNSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEluZm87CisKK3B1YmxpYyBjbGFzcyBHZXRNZW1iZXIgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8TWVtYmVyUmVzb3VyY2U+IHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBBY2NvdW50SW5mbyBhcHBseShNZW1iZXJSZXNvdXJjZSByZXNvdXJjZSkgeworICAgIHJldHVybiBBY2NvdW50SW5mby5wYXJzZShyZXNvdXJjZS5nZXRNZW1iZXIoKS5nZXRBY2NvdW50KCksIHRydWUpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldE5hbWUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR2V0TmFtZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM2ZGE3YzQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldE5hbWUuamF2YQpAQCAtMCwwICsxLDI1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKKworcHVibGljIGNsYXNzIEdldE5hbWUgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8R3JvdXBSZXNvdXJjZT4geworCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGFwcGx5KEdyb3VwUmVzb3VyY2UgcmVzb3VyY2UpIHsKKyAgICByZXR1cm4gcmVzb3VyY2UuZ2V0TmFtZSgpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldE9wdGlvbnMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR2V0T3B0aW9ucy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNmYmZjNzAKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldE9wdGlvbnMuamF2YQpAQCAtMCwwICsxLDI1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKKworcHVibGljIGNsYXNzIEdldE9wdGlvbnMgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8R3JvdXBSZXNvdXJjZT4geworCisgIEBPdmVycmlkZQorICBwdWJsaWMgR3JvdXBPcHRpb25zSW5mbyBhcHBseShHcm91cFJlc291cmNlIHJlc291cmNlKSB7CisgICAgcmV0dXJuIG5ldyBHcm91cE9wdGlvbnNJbmZvKHJlc291cmNlLmdldEdyb3VwKCkpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldE93bmVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldE93bmVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDExM2ExNjQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dldE93bmVyLmphdmEKQEAgLTAsMCArMSw1MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLk1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuR3JvdXBKc29uLkdyb3VwSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworcHVibGljIGNsYXNzIEdldE93bmVyIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PEdyb3VwUmVzb3VyY2U+IHsKKworICBwcml2YXRlIGZpbmFsIEdyb3VwQ29udHJvbC5GYWN0b3J5IGNvbnRyb2xGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIEdyb3VwSnNvbiBqc29uOworCisgIEBJbmplY3QKKyAgR2V0T3duZXIoR3JvdXBDb250cm9sLkZhY3RvcnkgY29udHJvbEZhY3RvcnksIEdyb3VwSnNvbiBqc29uKSB7CisgICAgdGhpcy5jb250cm9sRmFjdG9yeSA9IGNvbnRyb2xGYWN0b3J5OworICAgIHRoaXMuanNvbiA9IGpzb247CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIEdyb3VwSW5mbyBhcHBseShHcm91cFJlc291cmNlIHJlc291cmNlKQorICAgICAgdGhyb3dzIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24sIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgQWNjb3VudEdyb3VwIGdyb3VwID0gcmVzb3VyY2UudG9BY2NvdW50R3JvdXAoKTsKKyAgICBpZiAoZ3JvdXAgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24oKTsKKyAgICB9CisgICAgdHJ5IHsKKyAgICAgIEdyb3VwQ29udHJvbCBjID0gY29udHJvbEZhY3RvcnkudmFsaWRhdGVGb3IoZ3JvdXAuZ2V0T3duZXJHcm91cFVVSUQoKSk7CisgICAgICByZXR1cm4ganNvbi5mb3JtYXQoYy5nZXRHcm91cCgpKTsKKyAgICB9IGNhdGNoIChOb1N1Y2hHcm91cEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbigpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9Hcm91cEpzb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR3JvdXBKc29uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTc0ZTZlZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvR3JvdXBKc29uLmphdmEKQEAgLTAsMCArMSwxNDYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmdyb3Vwcy5MaXN0R3JvdXBzT3B0aW9uLklOQ0xVREVTOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZ3JvdXBzLkxpc3RHcm91cHNPcHRpb24uTUVNQkVSUzsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cERlc2NyaXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb25zOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5ncm91cHMuTGlzdEdyb3Vwc09wdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVXJsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBCYWNrZW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOworaW1wb3J0IGphdmEudXRpbC5FbnVtU2V0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitwdWJsaWMgY2xhc3MgR3JvdXBKc29uIHsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kOworICBwcml2YXRlIGZpbmFsIEdyb3VwQ29udHJvbC5GYWN0b3J5IGdyb3VwQ29udHJvbEZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8TGlzdE1lbWJlcnM+IGxpc3RNZW1iZXJzOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPExpc3RJbmNsdWRlZEdyb3Vwcz4gbGlzdEluY2x1ZGVzOworICBwcml2YXRlIEVudW1TZXQ8TGlzdEdyb3Vwc09wdGlvbj4gb3B0aW9uczsKKworICBASW5qZWN0CisgIEdyb3VwSnNvbihHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kLAorICAgICAgR3JvdXBDb250cm9sLkZhY3RvcnkgZ3JvdXBDb250cm9sRmFjdG9yeSwKKyAgICAgIFByb3ZpZGVyPExpc3RNZW1iZXJzPiBsaXN0TWVtYmVycywKKyAgICAgIFByb3ZpZGVyPExpc3RJbmNsdWRlZEdyb3Vwcz4gbGlzdEluY2x1ZGVzKSB7CisgICAgdGhpcy5ncm91cEJhY2tlbmQgPSBncm91cEJhY2tlbmQ7CisgICAgdGhpcy5ncm91cENvbnRyb2xGYWN0b3J5ID0gZ3JvdXBDb250cm9sRmFjdG9yeTsKKyAgICB0aGlzLmxpc3RNZW1iZXJzID0gbGlzdE1lbWJlcnM7CisgICAgdGhpcy5saXN0SW5jbHVkZXMgPSBsaXN0SW5jbHVkZXM7CisKKyAgICBvcHRpb25zID0gRW51bVNldC5ub25lT2YoTGlzdEdyb3Vwc09wdGlvbi5jbGFzcyk7CisgIH0KKworICBwdWJsaWMgR3JvdXBKc29uIGFkZE9wdGlvbihMaXN0R3JvdXBzT3B0aW9uIG8pIHsKKyAgICBvcHRpb25zLmFkZChvKTsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIHB1YmxpYyBHcm91cEpzb24gYWRkT3B0aW9ucyhDb2xsZWN0aW9uPExpc3RHcm91cHNPcHRpb24+IG8pIHsKKyAgICBvcHRpb25zLmFkZEFsbChvKTsKKyAgICByZXR1cm4gdGhpczsKKyAgfQorCisgIHB1YmxpYyBHcm91cEluZm8gZm9ybWF0KEdyb3VwUmVzb3VyY2UgcnNyYykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgR3JvdXBJbmZvIGluZm8gPSBpbml0KHJzcmMuZ2V0R3JvdXAoKSk7CisgICAgaW5pdE1lbWJlcnNBbmRJbmNsdWRlcyhyc3JjLCBpbmZvKTsKKyAgICByZXR1cm4gaW5mbzsKKyAgfQorCisgIHB1YmxpYyBHcm91cEluZm8gZm9ybWF0KEdyb3VwRGVzY3JpcHRpb24uQmFzaWMgZ3JvdXApIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIEdyb3VwSW5mbyBpbmZvID0gaW5pdChncm91cCk7CisgICAgaWYgKG9wdGlvbnMuY29udGFpbnMoTUVNQkVSUykgfHwgb3B0aW9ucy5jb250YWlucyhJTkNMVURFUykpIHsKKyAgICAgIEdyb3VwUmVzb3VyY2UgcnNyYyA9CisgICAgICAgICAgbmV3IEdyb3VwUmVzb3VyY2UoZ3JvdXBDb250cm9sRmFjdG9yeS5jb250cm9sRm9yKGdyb3VwKSk7CisgICAgICBpbml0TWVtYmVyc0FuZEluY2x1ZGVzKHJzcmMsIGluZm8pOworICAgIH0KKyAgICByZXR1cm4gaW5mbzsKKyAgfQorCisgIHByaXZhdGUgR3JvdXBJbmZvIGluaXQoR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBncm91cCkgeworICAgIEdyb3VwSW5mbyBpbmZvID0gbmV3IEdyb3VwSW5mbygpOworICAgIGluZm8uaWQgPSBVcmwuZW5jb2RlKGdyb3VwLmdldEdyb3VwVVVJRCgpLmdldCgpKTsKKyAgICBpbmZvLm5hbWUgPSBTdHJpbmdzLmVtcHR5VG9OdWxsKGdyb3VwLmdldE5hbWUoKSk7CisgICAgaW5mby51cmwgPSBTdHJpbmdzLmVtcHR5VG9OdWxsKGdyb3VwLmdldFVybCgpKTsKKyAgICBpbmZvLm9wdGlvbnMgPSBuZXcgR3JvdXBPcHRpb25zSW5mbyhncm91cCk7CisKKyAgICBBY2NvdW50R3JvdXAgZyA9IEdyb3VwRGVzY3JpcHRpb25zLnRvQWNjb3VudEdyb3VwKGdyb3VwKTsKKyAgICBpZiAoZyAhPSBudWxsKSB7CisgICAgICBpbmZvLmRlc2NyaXB0aW9uID0gU3RyaW5ncy5lbXB0eVRvTnVsbChnLmdldERlc2NyaXB0aW9uKCkpOworICAgICAgaW5mby5ncm91cElkID0gZy5nZXRJZCgpLmdldCgpOworICAgICAgaWYgKGcuZ2V0T3duZXJHcm91cFVVSUQoKSAhPSBudWxsKSB7CisgICAgICAgIGluZm8ub3duZXJJZCA9IFVybC5lbmNvZGUoZy5nZXRPd25lckdyb3VwVVVJRCgpLmdldCgpKTsKKyAgICAgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBvID0gZ3JvdXBCYWNrZW5kLmdldChnLmdldE93bmVyR3JvdXBVVUlEKCkpOworICAgICAgICBpZiAobyAhPSBudWxsKSB7CisgICAgICAgICAgaW5mby5vd25lciA9IG8uZ2V0TmFtZSgpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIGluZm87CisgIH0KKworICBwcml2YXRlIEdyb3VwSW5mbyBpbml0TWVtYmVyc0FuZEluY2x1ZGVzKEdyb3VwUmVzb3VyY2UgcnNyYywgR3JvdXBJbmZvIGluZm8pCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBpZiAocnNyYy50b0FjY291bnRHcm91cCgpID09IG51bGwpIHsKKyAgICAgIHJldHVybiBpbmZvOworICAgIH0KKyAgICB0cnkgeworICAgICAgaWYgKG9wdGlvbnMuY29udGFpbnMoTUVNQkVSUykpIHsKKyAgICAgICAgaW5mby5tZW1iZXJzID0gbGlzdE1lbWJlcnMuZ2V0KCkuYXBwbHkocnNyYyk7CisgICAgICB9CisKKyAgICAgIGlmIChvcHRpb25zLmNvbnRhaW5zKElOQ0xVREVTKSkgeworICAgICAgICBpbmZvLmluY2x1ZGVzID0gbGlzdEluY2x1ZGVzLmdldCgpLmFwcGx5KHJzcmMpOworICAgICAgfQorICAgICAgcmV0dXJuIGluZm87CisgICAgfSBjYXRjaCAoTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbiBlKSB7CisgICAgICAvLyBzaG91bGQgbmV2ZXIgaGFwcGVuLCB0aGlzIGV4Y2VwdGlvbiBpcyBvbmx5IHRocm93biBpZiB3ZSB3b3VsZCB0cnkgdG8KKyAgICAgIC8vIGxpc3QgbWVtYmVycy9pbmNsdWRlcyBvZiBhbiBleHRlcm5hbCBncm91cCwgYnV0IGluIGNhc2Ugb2YgYW4gZXh0ZXJuYWwKKyAgICAgIC8vIGdyb3VwIHdlIHJldHVybiBiZWZvcmUKKyAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oZSk7CisgICAgfQorICB9CisKKyAgcHVibGljIHN0YXRpYyBjbGFzcyBHcm91cEluZm8geworICAgIGZpbmFsIFN0cmluZyBraW5kID0gImdlcnJpdGNvZGVyZXZpZXcjZ3JvdXAiOworICAgIHB1YmxpYyBTdHJpbmcgaWQ7CisgICAgcHVibGljIFN0cmluZyBuYW1lOworICAgIHB1YmxpYyBTdHJpbmcgdXJsOworICAgIHB1YmxpYyBHcm91cE9wdGlvbnNJbmZvIG9wdGlvbnM7CisKKyAgICAvLyBUaGVzZSBmaWVsZHMgYXJlIG9ubHkgc3VwcGxpZWQgZm9yIGludGVybmFsIGdyb3Vwcy4KKyAgICBwdWJsaWMgU3RyaW5nIGRlc2NyaXB0aW9uOworICAgIHB1YmxpYyBJbnRlZ2VyIGdyb3VwSWQ7CisgICAgcHVibGljIFN0cmluZyBvd25lcjsKKyAgICBwdWJsaWMgU3RyaW5nIG93bmVySWQ7CisKKyAgICAvLyBUaGVzZSBmaWVsZHMgYXJlIG9ubHkgc3VwcGxpZWQgZm9yIGludGVybmFsIGdyb3VwcywgYnV0IG9ubHkgaWYgcmVxdWVzdGVkCisgICAgcHVibGljIExpc3Q8QWNjb3VudEluZm8+IG1lbWJlcnM7CisgICAgcHVibGljIExpc3Q8R3JvdXBJbmZvPiBpbmNsdWRlczsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9Hcm91cE9wdGlvbnNJbmZvLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dyb3VwT3B0aW9uc0luZm8uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42YmU5MmQxCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9Hcm91cE9wdGlvbnNJbmZvLmphdmEKQEAgLTAsMCArMSwzMiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXNjcmlwdGlvbnM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKKworcHVibGljIGNsYXNzIEdyb3VwT3B0aW9uc0luZm8geworICBwdWJsaWMgQm9vbGVhbiB2aXNpYmxlVG9BbGw7CisKKyAgcHVibGljIEdyb3VwT3B0aW9uc0luZm8oR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBncm91cCkgeworICAgIEFjY291bnRHcm91cCBhZyA9IEdyb3VwRGVzY3JpcHRpb25zLnRvQWNjb3VudEdyb3VwKGdyb3VwKTsKKyAgICB2aXNpYmxlVG9BbGwgPSBhZyAhPSBudWxsICYmIGFnLmlzVmlzaWJsZVRvQWxsKCkgPyB0cnVlIDogbnVsbDsKKyAgfQorCisgIHB1YmxpYyBHcm91cE9wdGlvbnNJbmZvKEFjY291bnRHcm91cCBncm91cCkgeworICAgIHZpc2libGVUb0FsbCA9IGdyb3VwLmlzVmlzaWJsZVRvQWxsKCkgPyB0cnVlIDogbnVsbDsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9Hcm91cFJlc291cmNlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dyb3VwUmVzb3VyY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zMjUxM2E3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9Hcm91cFJlc291cmNlLmphdmEKQEAgLTAsMCArMSw1OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXNjcmlwdGlvbnM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuVHlwZUxpdGVyYWw7CisKK3B1YmxpYyBjbGFzcyBHcm91cFJlc291cmNlIGltcGxlbWVudHMgUmVzdFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxHcm91cFJlc291cmNlPj4gR1JPVVBfS0lORCA9CisgICAgICBuZXcgVHlwZUxpdGVyYWw8UmVzdFZpZXc8R3JvdXBSZXNvdXJjZT4+KCkge307CisKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cENvbnRyb2wgY29udHJvbDsKKworICBHcm91cFJlc291cmNlKEdyb3VwQ29udHJvbCBjb250cm9sKSB7CisgICAgdGhpcy5jb250cm9sID0gY29udHJvbDsKKyAgfQorCisgIEdyb3VwUmVzb3VyY2UoR3JvdXBSZXNvdXJjZSByc3JjKSB7CisgICAgdGhpcy5jb250cm9sID0gcnNyYy5nZXRDb250cm9sKCk7CisgIH0KKworICBwdWJsaWMgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBnZXRHcm91cCgpIHsKKyAgICByZXR1cm4gY29udHJvbC5nZXRHcm91cCgpOworICB9CisKKyAgcHVibGljIFN0cmluZyBnZXROYW1lKCkgeworICAgIHJldHVybiBnZXRHcm91cCgpLmdldE5hbWUoKTsKKyAgfQorCisgIHB1YmxpYyBBY2NvdW50R3JvdXAuVVVJRCBnZXRHcm91cFVVSUQoKSB7CisgICAgcmV0dXJuIGdldEdyb3VwKCkuZ2V0R3JvdXBVVUlEKCk7CisgIH0KKworICBwdWJsaWMgQWNjb3VudEdyb3VwIHRvQWNjb3VudEdyb3VwKCkgeworICAgIHJldHVybiBHcm91cERlc2NyaXB0aW9ucy50b0FjY291bnRHcm91cChnZXRHcm91cCgpKTsKKyAgfQorCisgIHB1YmxpYyBHcm91cENvbnRyb2wgZ2V0Q29udHJvbCgpIHsKKyAgICByZXR1cm4gY29udHJvbDsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9Hcm91cHNDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0dyb3Vwc0NvbGxlY3Rpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45MThhNTMwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9Hcm91cHNDb2xsZWN0aW9uLmphdmEKQEAgLTAsMCArMSwxODAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cERlc2NyaXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb25zOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwUmVmZXJlbmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQWNjZXB0c0NyZWF0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuSWRTdHJpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVG9wTGV2ZWxSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5Bbm9ueW1vdXNVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBCYWNrZW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQmFja2VuZHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworcHVibGljIGNsYXNzIEdyb3Vwc0NvbGxlY3Rpb24gaW1wbGVtZW50cworICAgIFJlc3RDb2xsZWN0aW9uPFRvcExldmVsUmVzb3VyY2UsIEdyb3VwUmVzb3VyY2U+LAorICAgIEFjY2VwdHNDcmVhdGU8VG9wTGV2ZWxSZXNvdXJjZT4geworICBwcml2YXRlIGZpbmFsIER5bmFtaWNNYXA8UmVzdFZpZXc8R3JvdXBSZXNvdXJjZT4+IHZpZXdzOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPExpc3RHcm91cHM+IGxpc3Q7CisgIHByaXZhdGUgZmluYWwgQ3JlYXRlR3JvdXAuRmFjdG9yeSBjcmVhdGVHcm91cDsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cENvbnRyb2wuRmFjdG9yeSBncm91cENvbnRyb2xGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIEdyb3VwQmFja2VuZCBncm91cEJhY2tlbmQ7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IHNlbGY7CisKKyAgQEluamVjdAorICBHcm91cHNDb2xsZWN0aW9uKGZpbmFsIER5bmFtaWNNYXA8UmVzdFZpZXc8R3JvdXBSZXNvdXJjZT4+IHZpZXdzLAorICAgICAgZmluYWwgUHJvdmlkZXI8TGlzdEdyb3Vwcz4gbGlzdCwKKyAgICAgIGZpbmFsIENyZWF0ZUdyb3VwLkZhY3RvcnkgY3JlYXRlR3JvdXAsCisgICAgICBmaW5hbCBHcm91cENvbnRyb2wuRmFjdG9yeSBncm91cENvbnRyb2xGYWN0b3J5LAorICAgICAgZmluYWwgR3JvdXBCYWNrZW5kIGdyb3VwQmFja2VuZCwKKyAgICAgIGZpbmFsIFByb3ZpZGVyPEN1cnJlbnRVc2VyPiBzZWxmKSB7CisgICAgdGhpcy52aWV3cyA9IHZpZXdzOworICAgIHRoaXMubGlzdCA9IGxpc3Q7CisgICAgdGhpcy5jcmVhdGVHcm91cCA9IGNyZWF0ZUdyb3VwOworICAgIHRoaXMuZ3JvdXBDb250cm9sRmFjdG9yeSA9IGdyb3VwQ29udHJvbEZhY3Rvcnk7CisgICAgdGhpcy5ncm91cEJhY2tlbmQgPSBncm91cEJhY2tlbmQ7CisgICAgdGhpcy5zZWxmID0gc2VsZjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUmVzdFZpZXc8VG9wTGV2ZWxSZXNvdXJjZT4gbGlzdCgpIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uLAorICAgICAgQXV0aEV4Y2VwdGlvbiB7CisgICAgZmluYWwgQ3VycmVudFVzZXIgdXNlciA9IHNlbGYuZ2V0KCk7CisgICAgaWYgKHVzZXIgaW5zdGFuY2VvZiBBbm9ueW1vdXNVc2VyKSB7CisgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbigiQXV0aGVudGljYXRpb24gcmVxdWlyZWQiKTsKKyAgICB9IGVsc2UgaWYoISh1c2VyIGluc3RhbmNlb2YgSWRlbnRpZmllZFVzZXIpKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbigpOworICAgIH0KKworICAgIHJldHVybiBsaXN0LmdldCgpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBHcm91cFJlc291cmNlIHBhcnNlKFRvcExldmVsUmVzb3VyY2UgcGFyZW50LCBJZFN0cmluZyBpZCkKKyAgICAgIHRocm93cyBBdXRoRXhjZXB0aW9uLCBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIHsKKyAgICBmaW5hbCBDdXJyZW50VXNlciB1c2VyID0gc2VsZi5nZXQoKTsKKyAgICBpZiAodXNlciBpbnN0YW5jZW9mIEFub255bW91c1VzZXIpIHsKKyAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJBdXRoZW50aWNhdGlvbiByZXF1aXJlZCIpOworICAgIH0gZWxzZSBpZighKHVzZXIgaW5zdGFuY2VvZiBJZGVudGlmaWVkVXNlcikpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGlkKTsKKyAgICB9CisKKyAgICBHcm91cERlc2NyaXB0aW9uLkJhc2ljIGdyb3VwID0gX3BhcnNlKGlkLmdldCgpKTsKKyAgICBpZiAoZ3JvdXAgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQuZ2V0KCkpOworICAgIH0KKyAgICBHcm91cENvbnRyb2wgY3RsID0gZ3JvdXBDb250cm9sRmFjdG9yeS5jb250cm9sRm9yKGdyb3VwKTsKKyAgICBpZiAoIWN0bC5pc1Zpc2libGUoKSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQpOworICAgIH0KKyAgICByZXR1cm4gbmV3IEdyb3VwUmVzb3VyY2UoY3RsKTsKKyAgfQorCisgIC8qKgorICAgKiBQYXJzZXMgYSBncm91cCBJRCBmcm9tIGEgcmVxdWVzdCBib2R5IGFuZCByZXR1cm5zIHRoZSBncm91cC4KKyAgICoKKyAgICogQHBhcmFtIGlkIElEIG9mIHRoZSBncm91cCwgY2FuIGJlIGEgZ3JvdXAgVVVJRCwgYSBncm91cCBuYW1lIG9yIGEgbGVnYWN5CisgICAqICAgICAgICBncm91cCBJRAorICAgKiBAcmV0dXJuIHRoZSBncm91cAorICAgKiBAdGhyb3dzIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24gdGhyb3duIGlmIHRoZSBncm91cCBJRCBjYW5ub3QgYmUKKyAgICogICAgICAgICByZXNvbHZlZCBvciBpZiB0aGUgZ3JvdXAgaXMgbm90IHZpc2libGUgdG8gdGhlIGNhbGxpbmcgdXNlcgorICAgKi8KKyAgcHVibGljIEdyb3VwRGVzY3JpcHRpb24uQmFzaWMgcGFyc2UoU3RyaW5nIGlkKQorICAgICAgdGhyb3dzIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24geworICAgIEdyb3VwRGVzY3JpcHRpb24uQmFzaWMgZ3JvdXAgPSBfcGFyc2UoaWQpOworICAgIGlmIChncm91cCA9PSBudWxsIHx8ICFncm91cENvbnRyb2xGYWN0b3J5LmNvbnRyb2xGb3IoZ3JvdXApLmlzVmlzaWJsZSgpKSB7CisgICAgICB0aHJvdyBuZXcgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICJHcm91cCBOb3QgRm91bmQ6ICVzIiwgaWQpKTsKKyAgICB9CisgICAgcmV0dXJuIGdyb3VwOworICB9CisKKyAgLyoqCisgICAqIFBhcnNlcyBhIGdyb3VwIElEIGZyb20gYSByZXF1ZXN0IGJvZHkgYW5kIHJldHVybnMgdGhlIGdyb3VwIGlmIGl0IGlzIGEKKyAgICogR2Vycml0IGludGVybmFsIGdyb3VwLgorICAgKgorICAgKiBAcGFyYW0gaWQgSUQgb2YgdGhlIGdyb3VwLCBjYW4gYmUgYSBncm91cCBVVUlELCBhIGdyb3VwIG5hbWUgb3IgYSBsZWdhY3kKKyAgICogICAgICAgIGdyb3VwIElECisgICAqIEByZXR1cm4gdGhlIGdyb3VwCisgICAqIEB0aHJvd3MgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiB0aHJvd24gaWYgdGhlIGdyb3VwIElEIGNhbm5vdCBiZQorICAgKiAgICAgICAgIHJlc29sdmVkLCBpZiB0aGUgZ3JvdXAgaXMgbm90IHZpc2libGUgdG8gdGhlIGNhbGxpbmcgdXNlciBvciBpZgorICAgKiAgICAgICAgIGl0J3MgYW4gZXh0ZXJuYWwgZ3JvdXAKKyAgICovCisgIHB1YmxpYyBHcm91cERlc2NyaXB0aW9uLkJhc2ljIHBhcnNlSW50ZXJuYWwoU3RyaW5nIGlkKQorICAgICAgdGhyb3dzIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24geworICAgIEdyb3VwRGVzY3JpcHRpb24uQmFzaWMgZ3JvdXAgPSBwYXJzZShpZCk7CisgICAgaWYgKEdyb3VwRGVzY3JpcHRpb25zLnRvQWNjb3VudEdyb3VwKGdyb3VwKSA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICJFeHRlcm5hbCBHcm91cCBOb3QgQWxsb3dlZDogJXMiLCBpZCkpOworICAgIH0KKyAgICByZXR1cm4gZ3JvdXA7CisgIH0KKworICBwcml2YXRlIEdyb3VwRGVzY3JpcHRpb24uQmFzaWMgX3BhcnNlKFN0cmluZyBpZCkgeworICAgIEFjY291bnRHcm91cC5VVUlEIHV1aWQgPSBuZXcgQWNjb3VudEdyb3VwLlVVSUQoaWQpOworICAgIGlmIChncm91cEJhY2tlbmQuaGFuZGxlcyh1dWlkKSkgeworICAgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBkID0gZ3JvdXBCYWNrZW5kLmdldCh1dWlkKTsKKyAgICAgIGlmIChkICE9IG51bGwpIHsKKyAgICAgICAgcmV0dXJuIGQ7CisgICAgICB9CisgICAgfQorCisgICAgLy8gTWlnaHQgYmUgYSBsZWdhY3kgQWNjb3VudEdyb3VwLklkLgorICAgIGlmIChpZC5tYXRjaGVzKCJeWzEtOV1bMC05XSokIikpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIEFjY291bnRHcm91cC5JZCBsZWdhY3lJZCA9IEFjY291bnRHcm91cC5JZC5wYXJzZShpZCk7CisgICAgICAgIHJldHVybiBncm91cENvbnRyb2xGYWN0b3J5LmNvbnRyb2xGb3IobGVnYWN5SWQpLmdldEdyb3VwKCk7CisgICAgICB9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gaW52YWxpZElkKSB7CisgICAgICB9IGNhdGNoIChOb1N1Y2hHcm91cEV4Y2VwdGlvbiBlKSB7CisgICAgICB9CisgICAgfQorCisgICAgLy8gTWlnaHQgYmUgYSBncm91cCBuYW1lLCBiZSBuaWNlIGFuZCBhY2NlcHQgdW5pcXVlIG5hbWVzLgorICAgIEdyb3VwUmVmZXJlbmNlIHJlZiA9IEdyb3VwQmFja2VuZHMuZmluZEV4YWN0U3VnZ2VzdGlvbihncm91cEJhY2tlbmQsIGlkKTsKKyAgICBpZiAocmVmICE9IG51bGwpIHsKKyAgICAgIEdyb3VwRGVzY3JpcHRpb24uQmFzaWMgZCA9IGdyb3VwQmFja2VuZC5nZXQocmVmLmdldFVVSUQoKSk7CisgICAgICBpZiAoZCAhPSBudWxsKSB7CisgICAgICAgIHJldHVybiBkOworICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBudWxsOworICB9CisKKyAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgIEBPdmVycmlkZQorICBwdWJsaWMgQ3JlYXRlR3JvdXAgY3JlYXRlKFRvcExldmVsUmVzb3VyY2Ugcm9vdCwgSWRTdHJpbmcgbmFtZSkgeworICAgIHJldHVybiBjcmVhdGVHcm91cC5jcmVhdGUobmFtZS5nZXQoKSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIER5bmFtaWNNYXA8UmVzdFZpZXc8R3JvdXBSZXNvdXJjZT4+IHZpZXdzKCkgeworICAgIHJldHVybiB2aWV3czsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9JbmNsdWRlZEdyb3VwUmVzb3VyY2UuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvSW5jbHVkZWRHcm91cFJlc291cmNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODliOTlhMQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvSW5jbHVkZWRHcm91cFJlc291cmNlLmphdmEKQEAgLTAsMCArMSw0MCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuVHlwZUxpdGVyYWw7CisKK3B1YmxpYyBjbGFzcyBJbmNsdWRlZEdyb3VwUmVzb3VyY2UgZXh0ZW5kcyBHcm91cFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxJbmNsdWRlZEdyb3VwUmVzb3VyY2U+PiBJTkNMVURFRF9HUk9VUF9LSU5EID0KKyAgICAgIG5ldyBUeXBlTGl0ZXJhbDxSZXN0VmlldzxJbmNsdWRlZEdyb3VwUmVzb3VyY2U+PigpIHt9OworCisgIHByaXZhdGUgZmluYWwgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBtZW1iZXI7CisKKyAgSW5jbHVkZWRHcm91cFJlc291cmNlKEdyb3VwUmVzb3VyY2UgZ3JvdXAsIEdyb3VwRGVzY3JpcHRpb24uQmFzaWMgbWVtYmVyKSB7CisgICAgc3VwZXIoZ3JvdXApOworICAgIHRoaXMubWVtYmVyID0gbWVtYmVyOworICB9CisKKyAgcHVibGljIEFjY291bnRHcm91cC5VVUlEIGdldE1lbWJlcigpIHsKKyAgICByZXR1cm4gZ2V0TWVtYmVyRGVzY3JpcHRpb24oKS5nZXRHcm91cFVVSUQoKTsKKyAgfQorCisgIHB1YmxpYyBHcm91cERlc2NyaXB0aW9uLkJhc2ljIGdldE1lbWJlckRlc2NyaXB0aW9uKCkgeworICAgIHJldHVybiBtZW1iZXI7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvSW5jbHVkZWRHcm91cHNDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0luY2x1ZGVkR3JvdXBzQ29sbGVjdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmEzNTJjYWMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0luY2x1ZGVkR3JvdXBzQ29sbGVjdGlvbi5qYXZhCkBAIC0wLDAgKzEsOTcgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cERlc2NyaXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLkR5bmFtaWNNYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkFjY2VwdHNDcmVhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkNoaWxkQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuSWRTdHJpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLk1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Ub3BMZXZlbFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5BZGRJbmNsdWRlZEdyb3Vwcy5QdXRJbmNsdWRlZEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitwdWJsaWMgY2xhc3MgSW5jbHVkZWRHcm91cHNDb2xsZWN0aW9uIGltcGxlbWVudHMKKyAgICBDaGlsZENvbGxlY3Rpb248R3JvdXBSZXNvdXJjZSwgSW5jbHVkZWRHcm91cFJlc291cmNlPiwKKyAgICBBY2NlcHRzQ3JlYXRlPEdyb3VwUmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBEeW5hbWljTWFwPFJlc3RWaWV3PEluY2x1ZGVkR3JvdXBSZXNvdXJjZT4+IHZpZXdzOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPExpc3RJbmNsdWRlZEdyb3Vwcz4gbGlzdDsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxHcm91cHNDb2xsZWN0aW9uPiBncm91cHNDb2xsZWN0aW9uOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPEFkZEluY2x1ZGVkR3JvdXBzPiBwdXQ7CisKKyAgQEluamVjdAorICBJbmNsdWRlZEdyb3Vwc0NvbGxlY3Rpb24oRHluYW1pY01hcDxSZXN0VmlldzxJbmNsdWRlZEdyb3VwUmVzb3VyY2U+PiB2aWV3cywKKyAgICAgIFByb3ZpZGVyPExpc3RJbmNsdWRlZEdyb3Vwcz4gbGlzdCwKKyAgICAgIFByb3ZpZGVyPEdyb3Vwc0NvbGxlY3Rpb24+IGdyb3Vwc0NvbGxlY3Rpb24sCisgICAgICBQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlciwgUHJvdmlkZXI8QWRkSW5jbHVkZWRHcm91cHM+IHB1dCkgeworICAgIHRoaXMudmlld3MgPSB2aWV3czsKKyAgICB0aGlzLmxpc3QgPSBsaXN0OworICAgIHRoaXMuZ3JvdXBzQ29sbGVjdGlvbiA9IGdyb3Vwc0NvbGxlY3Rpb247CisgICAgdGhpcy5kYlByb3ZpZGVyID0gZGJQcm92aWRlcjsKKyAgICB0aGlzLnB1dCA9IHB1dDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUmVzdFZpZXc8R3JvdXBSZXNvdXJjZT4gbGlzdCgpIHsKKyAgICByZXR1cm4gbGlzdC5nZXQoKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgSW5jbHVkZWRHcm91cFJlc291cmNlIHBhcnNlKEdyb3VwUmVzb3VyY2UgcmVzb3VyY2UsIElkU3RyaW5nIGlkKQorICAgICAgdGhyb3dzIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24sIEF1dGhFeGNlcHRpb24sCisgICAgICBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24geworICAgIEFjY291bnRHcm91cCBwYXJlbnQgPSByZXNvdXJjZS50b0FjY291bnRHcm91cCgpOworICAgIGlmIChwYXJlbnQgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24oKTsKKyAgICB9CisKKyAgICBHcm91cERlc2NyaXB0aW9uLkJhc2ljIG1lbWJlciA9CisgICAgICAgIGdyb3Vwc0NvbGxlY3Rpb24uZ2V0KCkucGFyc2UoVG9wTGV2ZWxSZXNvdXJjZS5JTlNUQU5DRSwgaWQpLmdldEdyb3VwKCk7CisgICAgaWYgKGlzTWVtYmVyKHBhcmVudCwgbWVtYmVyKQorICAgICAgICAmJiByZXNvdXJjZS5nZXRDb250cm9sKCkuY2FuU2VlR3JvdXAobWVtYmVyLmdldEdyb3VwVVVJRCgpKSkgeworICAgICAgcmV0dXJuIG5ldyBJbmNsdWRlZEdyb3VwUmVzb3VyY2UocmVzb3VyY2UsIG1lbWJlcik7CisgICAgfQorICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGlkKTsKKyAgfQorCisgIHByaXZhdGUgYm9vbGVhbiBpc01lbWJlcihBY2NvdW50R3JvdXAgcGFyZW50LCBHcm91cERlc2NyaXB0aW9uLkJhc2ljIG1lbWJlcikKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHJldHVybiBkYlByb3ZpZGVyLmdldCgpLmFjY291bnRHcm91cEluY2x1ZGVzQnlVdWlkKCkuZ2V0KAorICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZC5LZXkoCisgICAgICAgICAgICBwYXJlbnQuZ2V0SWQoKSwKKyAgICAgICAgICAgIG1lbWJlci5nZXRHcm91cFVVSUQoKSkpICE9IG51bGw7CisgIH0KKworICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBQdXRJbmNsdWRlZEdyb3VwIGNyZWF0ZShHcm91cFJlc291cmNlIGdyb3VwLCBJZFN0cmluZyBpZCkgeworICAgIHJldHVybiBuZXcgUHV0SW5jbHVkZWRHcm91cChwdXQsIGlkLmdldCgpKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgRHluYW1pY01hcDxSZXN0VmlldzxJbmNsdWRlZEdyb3VwUmVzb3VyY2U+PiB2aWV3cygpIHsKKyAgICByZXR1cm4gdmlld3M7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvTGlzdEdyb3Vwcy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9MaXN0R3JvdXBzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDNlYzA2NwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvTGlzdEdyb3Vwcy5qYXZhCkBAIC0wLDAgKzEsMjM0IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXNjcmlwdGlvbnM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBSZWZlcmVuY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZ3JvdXBzLkxpc3RHcm91cHNPcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVG9wTGV2ZWxSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVXJsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5PdXRwdXRGb3JtYXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkdldEdyb3VwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ29tcGFyYXRvcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkdyb3VwSnNvbi5Hcm91cEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLnJlZmxlY3QuVHlwZVRva2VuOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKKworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5FbnVtU2V0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5Mb2NhbGU7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCisvKiogTGlzdCBncm91cHMgdmlzaWJsZSB0byB0aGUgY2FsbGluZyB1c2VyLiAqLworcHVibGljIGNsYXNzIExpc3RHcm91cHMgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8VG9wTGV2ZWxSZXNvdXJjZT4geworCisgIHByb3RlY3RlZCBmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGU7CisKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cENvbnRyb2wuRmFjdG9yeSBncm91cENvbnRyb2xGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIEdyb3VwQ29udHJvbC5HZW5lcmljRmFjdG9yeSBnZW5lcmljR3JvdXBDb250cm9sRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxJZGVudGlmaWVkVXNlcj4gaWRlbnRpZmllZFVzZXI7CisgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdXNlckZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8R2V0R3JvdXBzPiBhY2NvdW50R2V0R3JvdXBzOworICBwcml2YXRlIGZpbmFsIEdyb3VwSnNvbiBqc29uOworICBwcml2YXRlIEVudW1TZXQ8TGlzdEdyb3Vwc09wdGlvbj4gb3B0aW9uczsKKworICBAT3B0aW9uKG5hbWUgPSAiLS1wcm9qZWN0IiwgYWxpYXNlcyA9IHsiLXAifSwKKyAgICAgIHVzYWdlID0gInByb2plY3RzIGZvciB3aGljaCB0aGUgZ3JvdXBzIHNob3VsZCBiZSBsaXN0ZWQiKQorICBwcml2YXRlIGZpbmFsIExpc3Q8UHJvamVjdENvbnRyb2w+IHByb2plY3RzID0gbmV3IEFycmF5TGlzdDxQcm9qZWN0Q29udHJvbD4oKTsKKworICBAT3B0aW9uKG5hbWUgPSAiLS12aXNpYmxlLXRvLWFsbCIsIHVzYWdlID0gInRvIGxpc3Qgb25seSBncm91cHMgdGhhdCBhcmUgdmlzaWJsZSB0byBhbGwgcmVnaXN0ZXJlZCB1c2VycyIpCisgIHByaXZhdGUgYm9vbGVhbiB2aXNpYmxlVG9BbGw7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tdHlwZSIsIHVzYWdlID0gInR5cGUgb2YgZ3JvdXAiKQorICBwcml2YXRlIEFjY291bnRHcm91cC5UeXBlIGdyb3VwVHlwZTsKKworICBAT3B0aW9uKG5hbWUgPSAiLS11c2VyIiwgYWxpYXNlcyA9IHsiLXUifSwKKyAgICAgIHVzYWdlID0gInVzZXIgZm9yIHdoaWNoIHRoZSBncm91cHMgc2hvdWxkIGJlIGxpc3RlZCIpCisgIHByaXZhdGUgQWNjb3VudC5JZCB1c2VyOworCisgIEBPcHRpb24obmFtZSA9ICItLW93bmVkIiwgdXNhZ2UgPSAidG8gbGlzdCBvbmx5IGdyb3VwcyB0aGF0IGFyZSBvd25lZCBieSB0aGUgc3BlY2lmaWVkIHVzZXIiCisgICAgICArICIgb3IgYnkgdGhlIGNhbGxpbmcgdXNlciBpZiBubyB1c2VyIHdhcyBzcGVjaWZlZCIpCisgIHByaXZhdGUgYm9vbGVhbiBvd25lZDsKKworICBwcml2YXRlIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZ3JvdXBzVG9JbnNwZWN0ID0gU2V0cy5uZXdIYXNoU2V0KCk7CisKKyAgQE9wdGlvbihuYW1lID0gIi1xIiwgdXNhZ2UgPSAiZ3JvdXAgdG8gaW5zcGVjdCIpCisgIHZvaWQgYWRkR3JvdXAoZmluYWwgQWNjb3VudEdyb3VwLlVVSUQgaWQpIHsKKyAgICBncm91cHNUb0luc3BlY3QuYWRkKGlkKTsKKyAgfQorCisgIEBPcHRpb24obmFtZSA9ICItbSIsIG1ldGFWYXIgPSAiTUFUQ0giLCB1c2FnZSA9ICJtYXRjaCBncm91cCBzdWJzdHJpbmciKQorICBwcml2YXRlIFN0cmluZyBtYXRjaFN1YnN0cmluZzsKKworICBAT3B0aW9uKG5hbWUgPSAiLW8iLCBtdWx0aVZhbHVlZCA9IHRydWUsIHVzYWdlID0gIk91dHB1dCBvcHRpb25zIHBlciBncm91cCIpCisgIHB1YmxpYyB2b2lkIGFkZE9wdGlvbihMaXN0R3JvdXBzT3B0aW9uIG8pIHsKKyAgICBvcHRpb25zLmFkZChvKTsKKyAgfQorCisgIEBPcHRpb24obmFtZSA9ICItTyIsIHVzYWdlID0gIk91dHB1dCBvcHRpb24gZmxhZ3MsIGluIGhleCIpCisgIHZvaWQgc2V0T3B0aW9uRmxhZ3NIZXgoU3RyaW5nIGhleCkgeworICAgIG9wdGlvbnMuYWRkQWxsKExpc3RHcm91cHNPcHRpb24uZnJvbUJpdHMoSW50ZWdlci5wYXJzZUludChoZXgsIDE2KSkpOworICB9CisKKyAgQEluamVjdAorICBwcm90ZWN0ZWQgTGlzdEdyb3VwcyhmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGUsCisgICAgICBmaW5hbCBHcm91cENvbnRyb2wuRmFjdG9yeSBncm91cENvbnRyb2xGYWN0b3J5LAorICAgICAgZmluYWwgR3JvdXBDb250cm9sLkdlbmVyaWNGYWN0b3J5IGdlbmVyaWNHcm91cENvbnRyb2xGYWN0b3J5LAorICAgICAgZmluYWwgUHJvdmlkZXI8SWRlbnRpZmllZFVzZXI+IGlkZW50aWZpZWRVc2VyLAorICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdXNlckZhY3RvcnksCisgICAgICBmaW5hbCBQcm92aWRlcjxHZXRHcm91cHM+IGFjY291bnRHZXRHcm91cHMsIEdyb3VwSnNvbiBqc29uKSB7CisgICAgdGhpcy5ncm91cENhY2hlID0gZ3JvdXBDYWNoZTsKKyAgICB0aGlzLmdyb3VwQ29udHJvbEZhY3RvcnkgPSBncm91cENvbnRyb2xGYWN0b3J5OworICAgIHRoaXMuZ2VuZXJpY0dyb3VwQ29udHJvbEZhY3RvcnkgPSBnZW5lcmljR3JvdXBDb250cm9sRmFjdG9yeTsKKyAgICB0aGlzLmlkZW50aWZpZWRVc2VyID0gaWRlbnRpZmllZFVzZXI7CisgICAgdGhpcy51c2VyRmFjdG9yeSA9IHVzZXJGYWN0b3J5OworICAgIHRoaXMuYWNjb3VudEdldEdyb3VwcyA9IGFjY291bnRHZXRHcm91cHM7CisgICAgdGhpcy5qc29uID0ganNvbjsKKyAgICB0aGlzLm9wdGlvbnMgPSBFbnVtU2V0Lm5vbmVPZihMaXN0R3JvdXBzT3B0aW9uLmNsYXNzKTsKKyAgfQorCisgIHB1YmxpYyBBY2NvdW50LklkIGdldFVzZXIoKSB7CisgICAgcmV0dXJuIHVzZXI7CisgIH0KKworICBwdWJsaWMgTGlzdDxQcm9qZWN0Q29udHJvbD4gZ2V0UHJvamVjdHMoKSB7CisgICAgcmV0dXJuIHByb2plY3RzOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoVG9wTGV2ZWxSZXNvdXJjZSByZXNvdXJjZSkgdGhyb3dzIEF1dGhFeGNlcHRpb24sCisgICAgICBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLCBFeGNlcHRpb24geworICAgIGZpbmFsIE1hcDxTdHJpbmcsIEdyb3VwSW5mbz4gb3V0cHV0ID0gTWFwcy5uZXdUcmVlTWFwKCk7CisgICAgZm9yIChHcm91cEluZm8gaW5mbyA6IGdldCgpKSB7CisgICAgICBvdXRwdXQucHV0KE9iamVjdHMuZmlyc3ROb25OdWxsKAorICAgICAgICAgIGluZm8ubmFtZSwKKyAgICAgICAgICAiR3JvdXAgIiArIFVybC5kZWNvZGUoaW5mby5pZCkpLCBpbmZvKTsKKyAgICAgIGluZm8ubmFtZSA9IG51bGw7CisgICAgfQorICAgIHJldHVybiBPdXRwdXRGb3JtYXQuSlNPTi5uZXdHc29uKCkudG9Kc29uVHJlZShvdXRwdXQsCisgICAgICAgIG5ldyBUeXBlVG9rZW48TWFwPFN0cmluZywgR3JvdXBJbmZvPj4oKSB7fS5nZXRUeXBlKCkpOworICB9CisKKyAgcHVibGljIExpc3Q8R3JvdXBJbmZvPiBnZXQoKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBMaXN0PEdyb3VwSW5mbz4gZ3JvdXBJbmZvczsKKyAgICBpZiAodXNlciAhPSBudWxsKSB7CisgICAgICBpZiAob3duZWQpIHsKKyAgICAgICAgZ3JvdXBJbmZvcyA9IGdldEdyb3Vwc093bmVkQnkodXNlckZhY3RvcnkuY3JlYXRlKHVzZXIpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGdyb3VwSW5mb3MgPSBhY2NvdW50R2V0R3JvdXBzLmdldCgpLmFwcGx5KAorICAgICAgICAgICAgbmV3IEFjY291bnRSZXNvdXJjZSh1c2VyRmFjdG9yeS5jcmVhdGUodXNlcikpKTsKKyAgICAgIH0KKyAgICB9IGVsc2UgeworICAgICAgaWYgKG93bmVkKSB7CisgICAgICAgIGdyb3VwSW5mb3MgPSBnZXRHcm91cHNPd25lZEJ5KGlkZW50aWZpZWRVc2VyLmdldCgpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIExpc3Q8QWNjb3VudEdyb3VwPiBncm91cExpc3Q7CisgICAgICAgIGlmICghcHJvamVjdHMuaXNFbXB0eSgpKSB7CisgICAgICAgICAgTWFwPEFjY291bnRHcm91cC5VVUlELCBBY2NvdW50R3JvdXA+IGdyb3VwcyA9IE1hcHMubmV3SGFzaE1hcCgpOworICAgICAgICAgIGZvciAoZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdENvbnRyb2wgOiBwcm9qZWN0cykgeworICAgICAgICAgICAgZmluYWwgU2V0PEdyb3VwUmVmZXJlbmNlPiBncm91cHNSZWZzID0gcHJvamVjdENvbnRyb2wuZ2V0QWxsR3JvdXBzKCk7CisgICAgICAgICAgICBmb3IgKGZpbmFsIEdyb3VwUmVmZXJlbmNlIGdyb3VwUmVmIDogZ3JvdXBzUmVmcykgeworICAgICAgICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAgZ3JvdXAgPSBncm91cENhY2hlLmdldChncm91cFJlZi5nZXRVVUlEKCkpOworICAgICAgICAgICAgICBpZiAoZ3JvdXAgIT0gbnVsbCkgeworICAgICAgICAgICAgICAgIGdyb3Vwcy5wdXQoZ3JvdXAuZ2V0R3JvdXBVVUlEKCksIGdyb3VwKTsKKyAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAgICAgICAgICBncm91cExpc3QgPSBmaWx0ZXJHcm91cHMoZ3JvdXBzLnZhbHVlcygpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBncm91cExpc3QgPSBmaWx0ZXJHcm91cHMoZ3JvdXBDYWNoZS5hbGwoKSk7CisgICAgICAgIH0KKyAgICAgICAgZ3JvdXBJbmZvcyA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShncm91cExpc3Quc2l6ZSgpKTsKKyAgICAgICAgZm9yIChBY2NvdW50R3JvdXAgZ3JvdXAgOiBncm91cExpc3QpIHsKKyAgICAgICAgICBncm91cEluZm9zLmFkZChqc29uLmFkZE9wdGlvbnMob3B0aW9ucykuZm9ybWF0KAorICAgICAgICAgICAgICBHcm91cERlc2NyaXB0aW9ucy5mb3JBY2NvdW50R3JvdXAoZ3JvdXApKSk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGdyb3VwSW5mb3M7CisgIH0KKworICBwcml2YXRlIExpc3Q8R3JvdXBJbmZvPiBnZXRHcm91cHNPd25lZEJ5KElkZW50aWZpZWRVc2VyIHVzZXIpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBMaXN0PEdyb3VwSW5mbz4gZ3JvdXBzID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgZm9yIChBY2NvdW50R3JvdXAgZyA6IGZpbHRlckdyb3Vwcyhncm91cENhY2hlLmFsbCgpKSkgeworICAgICAgR3JvdXBDb250cm9sIGN0bCA9IGdyb3VwQ29udHJvbEZhY3RvcnkuY29udHJvbEZvcihnKTsKKyAgICAgIHRyeSB7CisgICAgICAgIGlmIChnZW5lcmljR3JvdXBDb250cm9sRmFjdG9yeS5jb250cm9sRm9yKHVzZXIsIGcuZ2V0R3JvdXBVVUlEKCkpCisgICAgICAgICAgICAuaXNPd25lcigpKSB7CisgICAgICAgICAgZ3JvdXBzLmFkZChqc29uLmFkZE9wdGlvbnMob3B0aW9ucykuZm9ybWF0KGN0bC5nZXRHcm91cCgpKSk7CisgICAgICAgIH0KKyAgICAgIH0gY2F0Y2ggKE5vU3VjaEdyb3VwRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBncm91cHM7CisgIH0KKworICBwcml2YXRlIExpc3Q8QWNjb3VudEdyb3VwPiBmaWx0ZXJHcm91cHMoZmluYWwgSXRlcmFibGU8QWNjb3VudEdyb3VwPiBncm91cHMpIHsKKyAgICBmaW5hbCBMaXN0PEFjY291bnRHcm91cD4gZmlsdGVyZWRHcm91cHMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgICBmaW5hbCBib29sZWFuIGlzQWRtaW4gPQorICAgICAgICBpZGVudGlmaWVkVXNlci5nZXQoKS5nZXRDYXBhYmlsaXRpZXMoKS5jYW5BZG1pbmlzdHJhdGVTZXJ2ZXIoKTsKKyAgICBmb3IgKGZpbmFsIEFjY291bnRHcm91cCBncm91cCA6IGdyb3VwcykgeworICAgICAgaWYgKCFTdHJpbmdzLmlzTnVsbE9yRW1wdHkobWF0Y2hTdWJzdHJpbmcpKSB7CisgICAgICAgIGlmICghZ3JvdXAuZ2V0TmFtZSgpLnRvTG93ZXJDYXNlKExvY2FsZS5VUykKKyAgICAgICAgICAgIC5jb250YWlucyhtYXRjaFN1YnN0cmluZy50b0xvd2VyQ2FzZShMb2NhbGUuVVMpKSkgeworICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICB9CisgICAgICBpZiAoIWlzQWRtaW4pIHsKKyAgICAgICAgZmluYWwgR3JvdXBDb250cm9sIGMgPSBncm91cENvbnRyb2xGYWN0b3J5LmNvbnRyb2xGb3IoZ3JvdXApOworICAgICAgICBpZiAoIWMuaXNWaXNpYmxlKCkpIHsKKyAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgaWYgKCh2aXNpYmxlVG9BbGwgJiYgIWdyb3VwLmlzVmlzaWJsZVRvQWxsKCkpCisgICAgICAgICAgfHwgKGdyb3VwVHlwZSAhPSBudWxsICYmICFncm91cFR5cGUuZXF1YWxzKGdyb3VwLmdldFR5cGUoKSkpKSB7CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorICAgICAgaWYgKCFncm91cHNUb0luc3BlY3QuaXNFbXB0eSgpCisgICAgICAgICAgJiYgIWdyb3Vwc1RvSW5zcGVjdC5jb250YWlucyhncm91cC5nZXRHcm91cFVVSUQoKSkpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgICBmaWx0ZXJlZEdyb3Vwcy5hZGQoZ3JvdXApOworICAgIH0KKyAgICBDb2xsZWN0aW9ucy5zb3J0KGZpbHRlcmVkR3JvdXBzLCBuZXcgR3JvdXBDb21wYXJhdG9yKCkpOworICAgIHJldHVybiBmaWx0ZXJlZEdyb3VwczsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9MaXN0SW5jbHVkZWRHcm91cHMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvTGlzdEluY2x1ZGVkR3JvdXBzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzY5MWU4MAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvTGlzdEluY2x1ZGVkR3JvdXBzLmphdmEKQEAgLTAsMCArMSw4OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3MubnVsbFRvRW1wdHk7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLk1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5Hcm91cEpzb24uR3JvdXBJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlcjsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuQ29tcGFyYXRvcjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworcHVibGljIGNsYXNzIExpc3RJbmNsdWRlZEdyb3VwcyBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxHcm91cFJlc291cmNlPiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBvcmcuc2xmNGouTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoTGlzdEluY2x1ZGVkR3JvdXBzLmNsYXNzKTsKKworICBwcml2YXRlIGZpbmFsIEdyb3VwQ29udHJvbC5GYWN0b3J5IGNvbnRyb2xGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOworICBwcml2YXRlIGZpbmFsIEdyb3VwSnNvbiBqc29uOworCisgIEBJbmplY3QKKyAgTGlzdEluY2x1ZGVkR3JvdXBzKEdyb3VwQ29udHJvbC5GYWN0b3J5IGNvbnRyb2xGYWN0b3J5LAorICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiUHJvdmlkZXIsIEdyb3VwSnNvbiBqc29uKSB7CisgICAgdGhpcy5jb250cm9sRmFjdG9yeSA9IGNvbnRyb2xGYWN0b3J5OworICAgIHRoaXMuZGJQcm92aWRlciA9IGRiUHJvdmlkZXI7CisgICAgdGhpcy5qc29uID0ganNvbjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgTGlzdDxHcm91cEluZm8+IGFwcGx5KEdyb3VwUmVzb3VyY2UgcnNyYykKKyAgICAgIHRocm93cyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24geworICAgIGlmIChyc3JjLnRvQWNjb3VudEdyb3VwKCkgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24oKTsKKyAgICB9CisKKyAgICBib29sZWFuIG93bmVyT2ZQYXJlbnQgPSByc3JjLmdldENvbnRyb2woKS5pc093bmVyKCk7CisgICAgTGlzdDxHcm91cEluZm8+IGluY2x1ZGVkID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgZm9yIChBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIHUgOiBkYlByb3ZpZGVyLmdldCgpCisgICAgICAgIC5hY2NvdW50R3JvdXBJbmNsdWRlc0J5VXVpZCgpCisgICAgICAgIC5ieUdyb3VwKHJzcmMudG9BY2NvdW50R3JvdXAoKS5nZXRJZCgpKSkgeworICAgICAgdHJ5IHsKKyAgICAgICAgR3JvdXBDb250cm9sIGkgPSBjb250cm9sRmFjdG9yeS5jb250cm9sRm9yKHUuZ2V0SW5jbHVkZVVVSUQoKSk7CisgICAgICAgIGlmIChvd25lck9mUGFyZW50IHx8IGkuaXNWaXNpYmxlKCkpIHsKKyAgICAgICAgICBpbmNsdWRlZC5hZGQoanNvbi5mb3JtYXQoaS5nZXRHcm91cCgpKSk7CisgICAgICAgIH0KKyAgICAgIH0gY2F0Y2ggKE5vU3VjaEdyb3VwRXhjZXB0aW9uIG5vdEZvdW5kKSB7CisgICAgICAgIGxvZy53YXJuKFN0cmluZy5mb3JtYXQoIkdyb3VwICVzIG5vIGxvbmdlciBhdmFpbGFibGUsIGluY2x1ZGVkIGludG8gIiwKKyAgICAgICAgICAgIHUuZ2V0SW5jbHVkZVVVSUQoKSwKKyAgICAgICAgICAgIHJzcmMuZ2V0R3JvdXAoKS5nZXROYW1lKCkpKTsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgfQorICAgIENvbGxlY3Rpb25zLnNvcnQoaW5jbHVkZWQsIG5ldyBDb21wYXJhdG9yPEdyb3VwSW5mbz4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShHcm91cEluZm8gYSwgR3JvdXBJbmZvIGIpIHsKKyAgICAgICAgaW50IGNtcCA9IG51bGxUb0VtcHR5KGEubmFtZSkuY29tcGFyZVRvKG51bGxUb0VtcHR5KGIubmFtZSkpOworICAgICAgICBpZiAoY21wICE9IDApIHsKKyAgICAgICAgICByZXR1cm4gY21wOworICAgICAgICB9CisgICAgICAgIHJldHVybiBudWxsVG9FbXB0eShhLmlkKS5jb21wYXJlVG8obnVsbFRvRW1wdHkoYi5pZCkpOworICAgICAgfQorICAgIH0pOworICAgIHJldHVybiBpbmNsdWRlZDsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9MaXN0TWVtYmVycy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9MaXN0TWVtYmVycy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmQzMmM2MzIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL0xpc3RNZW1iZXJzLmphdmEKQEAgLTAsMCArMSwxMjEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkNvbXBhcmlzb25DaGFpbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk9yZGVyaW5nOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGV0YWlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLk1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBNZW1iZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cERldGFpbEZhY3Rvcnk7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouT3B0aW9uOworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK3B1YmxpYyBjbGFzcyBMaXN0TWVtYmVycyBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxHcm91cFJlc291cmNlPiB7CisgIHByaXZhdGUgZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlOworICBwcml2YXRlIGZpbmFsIEdyb3VwRGV0YWlsRmFjdG9yeS5GYWN0b3J5IGdyb3VwRGV0YWlsRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBBY2NvdW50SW5mby5Mb2FkZXIgYWNjb3VudExvYWRlcjsKKworICBAT3B0aW9uKG5hbWUgPSAiLS1yZWN1cnNpdmUiLCB1c2FnZSA9ICJ0byByZXNvbHZlIGluY2x1ZGVkIGdyb3VwcyByZWN1cnNpdmVseSIpCisgIHByaXZhdGUgYm9vbGVhbiByZWN1cnNpdmU7CisKKyAgQEluamVjdAorICBMaXN0TWVtYmVycyhHcm91cENhY2hlIGdyb3VwQ2FjaGUsCisgICAgICBHcm91cERldGFpbEZhY3RvcnkuRmFjdG9yeSBncm91cERldGFpbEZhY3RvcnksCisgICAgICBBY2NvdW50SW5mby5Mb2FkZXIuRmFjdG9yeSBhY2NvdW50TG9hZGVyRmFjdG9yeSkgeworICAgIHRoaXMuZ3JvdXBDYWNoZSA9IGdyb3VwQ2FjaGU7CisgICAgdGhpcy5ncm91cERldGFpbEZhY3RvcnkgPSBncm91cERldGFpbEZhY3Rvcnk7CisgICAgdGhpcy5hY2NvdW50TG9hZGVyID0gYWNjb3VudExvYWRlckZhY3RvcnkuY3JlYXRlKHRydWUpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBMaXN0PEFjY291bnRJbmZvPiBhcHBseShmaW5hbCBHcm91cFJlc291cmNlIHJlc291cmNlKQorICAgICAgdGhyb3dzIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKHJlc291cmNlLnRvQWNjb3VudEdyb3VwKCkgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24oKTsKKyAgICB9CisgICAgZmluYWwgTWFwPEFjY291bnQuSWQsIEFjY291bnRJbmZvPiBtZW1iZXJzID0KKyAgICAgICAgZ2V0TWVtYmVycyhyZXNvdXJjZS5nZXRHcm91cFVVSUQoKSwgbmV3IEhhc2hTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+KCkpOworICAgIGZpbmFsIExpc3Q8QWNjb3VudEluZm8+IG1lbWJlckluZm9zID0gTGlzdHMubmV3QXJyYXlMaXN0KG1lbWJlcnMudmFsdWVzKCkpOworICAgIENvbGxlY3Rpb25zLnNvcnQobWVtYmVySW5mb3MsIG5ldyBDb21wYXJhdG9yPEFjY291bnRJbmZvPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIGludCBjb21wYXJlKEFjY291bnRJbmZvIGEsIEFjY291bnRJbmZvIGIpIHsKKyAgICAgICAgcmV0dXJuIENvbXBhcmlzb25DaGFpbi5zdGFydCgpCisgICAgICAgICAgICAuY29tcGFyZShhLm5hbWUsIGIubmFtZSwgT3JkZXJpbmcubmF0dXJhbCgpLm51bGxzRmlyc3QoKSkKKyAgICAgICAgICAgIC5jb21wYXJlKGEuZW1haWwsIGIuZW1haWwsIE9yZGVyaW5nLm5hdHVyYWwoKS5udWxsc0ZpcnN0KCkpCisgICAgICAgICAgICAuY29tcGFyZShhLl9hY2NvdW50X2lkLCBiLl9hY2NvdW50X2lkLCBPcmRlcmluZy5uYXR1cmFsKCkubnVsbHNGaXJzdCgpKS5yZXN1bHQoKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgICByZXR1cm4gbWVtYmVySW5mb3M7CisgIH0KKworICBwcml2YXRlIE1hcDxBY2NvdW50LklkLCBBY2NvdW50SW5mbz4gZ2V0TWVtYmVycygKKyAgICAgIGZpbmFsIEFjY291bnRHcm91cC5VVUlEIGdyb3VwVVVJRCwKKyAgICAgIGZpbmFsIEhhc2hTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IHNlZW5Hcm91cHMpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHNlZW5Hcm91cHMuYWRkKGdyb3VwVVVJRCk7CisKKyAgICBmaW5hbCBNYXA8QWNjb3VudC5JZCwgQWNjb3VudEluZm8+IG1lbWJlcnMgPSBNYXBzLm5ld0hhc2hNYXAoKTsKKyAgICBmaW5hbCBBY2NvdW50R3JvdXAgZ3JvdXAgPSBncm91cENhY2hlLmdldChncm91cFVVSUQpOworICAgIGlmIChncm91cCA9PSBudWxsKSB7CisgICAgICAvLyB0aGUgaW5jbHVkZWQgZ3JvdXAgaXMgYW4gZXh0ZXJuYWwgZ3JvdXAgYW5kIGNhbid0IGJlIHJlc29sdmVkCisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlNYXAoKTsKKyAgICB9CisKKyAgICBmaW5hbCBHcm91cERldGFpbCBncm91cERldGFpbDsKKyAgICB0cnkgeworICAgICAgZ3JvdXBEZXRhaWwgPSBncm91cERldGFpbEZhY3RvcnkuY3JlYXRlKGdyb3VwLmdldElkKCkpLmNhbGwoKTsKKyAgICB9IGNhdGNoIChOb1N1Y2hHcm91cEV4Y2VwdGlvbiBlKSB7CisgICAgICAvLyB0aGUgaW5jbHVkZWQgZ3JvdXAgaXMgbm90IHZpc2libGUKKyAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eU1hcCgpOworICAgIH0KKworICAgIGlmIChncm91cERldGFpbC5tZW1iZXJzICE9IG51bGwpIHsKKyAgICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwTWVtYmVyIG0gOiBncm91cERldGFpbC5tZW1iZXJzKSB7CisgICAgICAgIGlmICghbWVtYmVycy5jb250YWluc0tleShtLmdldEFjY291bnRJZCgpKSkgeworICAgICAgICAgIG1lbWJlcnMucHV0KG0uZ2V0QWNjb3VudElkKCksIGFjY291bnRMb2FkZXIuZ2V0KG0uZ2V0QWNjb3VudElkKCkpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKworICAgIGlmIChyZWN1cnNpdmUpIHsKKyAgICAgIGlmIChncm91cERldGFpbC5pbmNsdWRlcyAhPSBudWxsKSB7CisgICAgICAgIGZvciAoZmluYWwgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZCBpbmNsdWRlZEdyb3VwIDogZ3JvdXBEZXRhaWwuaW5jbHVkZXMpIHsKKyAgICAgICAgICBpZiAoIXNlZW5Hcm91cHMuY29udGFpbnMoaW5jbHVkZWRHcm91cC5nZXRJbmNsdWRlVVVJRCgpKSkgeworICAgICAgICAgICAgbWVtYmVycy5wdXRBbGwoZ2V0TWVtYmVycyhpbmNsdWRlZEdyb3VwLmdldEluY2x1ZGVVVUlEKCksIHNlZW5Hcm91cHMpKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgYWNjb3VudExvYWRlci5maWxsKCk7CisgICAgcmV0dXJuIG1lbWJlcnM7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvTWVtYmVyUmVzb3VyY2UuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvTWVtYmVyUmVzb3VyY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41MmEzN2E4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9NZW1iZXJSZXNvdXJjZS5qYXZhCkBAIC0wLDAgKzEsMzUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworCitwdWJsaWMgY2xhc3MgTWVtYmVyUmVzb3VyY2UgZXh0ZW5kcyBHcm91cFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxNZW1iZXJSZXNvdXJjZT4+IE1FTUJFUl9LSU5EID0KKyAgICAgIG5ldyBUeXBlTGl0ZXJhbDxSZXN0VmlldzxNZW1iZXJSZXNvdXJjZT4+KCkge307CisKKyAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyOworCisgIHB1YmxpYyBNZW1iZXJSZXNvdXJjZShHcm91cFJlc291cmNlIGdyb3VwLCBJZGVudGlmaWVkVXNlciB1c2VyKSB7CisgICAgc3VwZXIoZ3JvdXApOworICAgIHRoaXMudXNlciA9IHVzZXI7CisgIH0KKworICBwdWJsaWMgSWRlbnRpZmllZFVzZXIgZ2V0TWVtYmVyKCkgeworICAgIHJldHVybiB1c2VyOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL01lbWJlcnNDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL01lbWJlcnNDb2xsZWN0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZWZlZDExNQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvTWVtYmVyc0NvbGxlY3Rpb24uamF2YQpAQCAtMCwwICsxLDkxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQWNjZXB0c0NyZWF0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQ2hpbGRDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5JZFN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlRvcExldmVsUmVzb3VyY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cE1lbWJlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRzQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuQWRkTWVtYmVycy5QdXRNZW1iZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK3B1YmxpYyBjbGFzcyBNZW1iZXJzQ29sbGVjdGlvbiBpbXBsZW1lbnRzCisgICAgQ2hpbGRDb2xsZWN0aW9uPEdyb3VwUmVzb3VyY2UsIE1lbWJlclJlc291cmNlPiwKKyAgICBBY2NlcHRzQ3JlYXRlPEdyb3VwUmVzb3VyY2U+IHsKKyAgcHJpdmF0ZSBmaW5hbCBEeW5hbWljTWFwPFJlc3RWaWV3PE1lbWJlclJlc291cmNlPj4gdmlld3M7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8TGlzdE1lbWJlcnM+IGxpc3Q7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8QWNjb3VudHNDb2xsZWN0aW9uPiBhY2NvdW50czsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGI7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8QWRkTWVtYmVycz4gcHV0OworCisgIEBJbmplY3QKKyAgTWVtYmVyc0NvbGxlY3Rpb24oRHluYW1pY01hcDxSZXN0VmlldzxNZW1iZXJSZXNvdXJjZT4+IHZpZXdzLAorICAgICAgUHJvdmlkZXI8TGlzdE1lbWJlcnM+IGxpc3QsCisgICAgICBQcm92aWRlcjxBY2NvdW50c0NvbGxlY3Rpb24+IGFjY291bnRzLAorICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiLAorICAgICAgUHJvdmlkZXI8QWRkTWVtYmVycz4gcHV0KSB7CisgICAgdGhpcy52aWV3cyA9IHZpZXdzOworICAgIHRoaXMubGlzdCA9IGxpc3Q7CisgICAgdGhpcy5hY2NvdW50cyA9IGFjY291bnRzOworICAgIHRoaXMuZGIgPSBkYjsKKyAgICB0aGlzLnB1dCA9IHB1dDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUmVzdFZpZXc8R3JvdXBSZXNvdXJjZT4gbGlzdCgpIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uLAorICAgICAgQXV0aEV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGxpc3QuZ2V0KCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE1lbWJlclJlc291cmNlIHBhcnNlKEdyb3VwUmVzb3VyY2UgcGFyZW50LCBJZFN0cmluZyBpZCkKKyAgICAgIHRocm93cyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBpZiAocGFyZW50LnRvQWNjb3VudEdyb3VwKCkgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24oKTsKKyAgICB9CisKKyAgICBJZGVudGlmaWVkVXNlciB1c2VyID0gYWNjb3VudHMuZ2V0KCkucGFyc2UoVG9wTGV2ZWxSZXNvdXJjZS5JTlNUQU5DRSwgaWQpLmdldFVzZXIoKTsKKyAgICBBY2NvdW50R3JvdXBNZW1iZXIuS2V5IGtleSA9CisgICAgICAgIG5ldyBBY2NvdW50R3JvdXBNZW1iZXIuS2V5KHVzZXIuZ2V0QWNjb3VudElkKCksIHBhcmVudC50b0FjY291bnRHcm91cCgpLmdldElkKCkpOworICAgIGlmIChkYi5nZXQoKS5hY2NvdW50R3JvdXBNZW1iZXJzKCkuZ2V0KGtleSkgIT0gbnVsbAorICAgICAgICAmJiBwYXJlbnQuZ2V0Q29udHJvbCgpLmNhblNlZU1lbWJlcih1c2VyLmdldEFjY291bnRJZCgpKSkgeworICAgICAgcmV0dXJuIG5ldyBNZW1iZXJSZXNvdXJjZShwYXJlbnQsIHVzZXIpOworICAgIH0KKyAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgIH0KKworICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBQdXRNZW1iZXIgY3JlYXRlKEdyb3VwUmVzb3VyY2UgZ3JvdXAsIElkU3RyaW5nIGlkKSB7CisgICAgcmV0dXJuIG5ldyBQdXRNZW1iZXIocHV0LCBpZC5nZXQoKSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIER5bmFtaWNNYXA8UmVzdFZpZXc8TWVtYmVyUmVzb3VyY2U+PiB2aWV3cygpIHsKKyAgICByZXR1cm4gdmlld3M7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvTW9kdWxlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL01vZHVsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk3MzM4ZjEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL01vZHVsZS5qYXZhCkBAIC0wLDAgKzEsNjkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkdyb3VwUmVzb3VyY2UuR1JPVVBfS0lORDsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkluY2x1ZGVkR3JvdXBSZXNvdXJjZS5JTkNMVURFRF9HUk9VUF9LSU5EOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuTWVtYmVyUmVzb3VyY2UuTUVNQkVSX0tJTkQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljTWFwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0QXBpTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5BZGRJbmNsdWRlZEdyb3Vwcy5VcGRhdGVJbmNsdWRlZEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5BZGRNZW1iZXJzLlVwZGF0ZU1lbWJlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuRGVsZXRlSW5jbHVkZWRHcm91cHMuRGVsZXRlSW5jbHVkZWRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuRGVsZXRlTWVtYmVycy5EZWxldGVNZW1iZXI7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuRmFjdG9yeU1vZHVsZUJ1aWxkZXI7CisKK3B1YmxpYyBjbGFzcyBNb2R1bGUgZXh0ZW5kcyBSZXN0QXBpTW9kdWxlIHsKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICBiaW5kKEdyb3Vwc0NvbGxlY3Rpb24uY2xhc3MpOworCisgICAgRHluYW1pY01hcC5tYXBPZihiaW5kZXIoKSwgR1JPVVBfS0lORCk7CisgICAgRHluYW1pY01hcC5tYXBPZihiaW5kZXIoKSwgTUVNQkVSX0tJTkQpOworICAgIER5bmFtaWNNYXAubWFwT2YoYmluZGVyKCksIElOQ0xVREVEX0dST1VQX0tJTkQpOworCisgICAgZ2V0KEdST1VQX0tJTkQpLnRvKEdldEdyb3VwLmNsYXNzKTsKKyAgICBwdXQoR1JPVVBfS0lORCkudG8oUHV0R3JvdXAuY2xhc3MpOworICAgIGdldChHUk9VUF9LSU5ELCAiZGV0YWlsIikudG8oR2V0RGV0YWlsLmNsYXNzKTsKKyAgICBwb3N0KEdST1VQX0tJTkQsICJtZW1iZXJzIikudG8oQWRkTWVtYmVycy5jbGFzcyk7CisgICAgcG9zdChHUk9VUF9LSU5ELCAibWVtYmVycy5hZGQiKS50byhBZGRNZW1iZXJzLmNsYXNzKTsKKyAgICBwb3N0KEdST1VQX0tJTkQsICJtZW1iZXJzLmRlbGV0ZSIpLnRvKERlbGV0ZU1lbWJlcnMuY2xhc3MpOworICAgIHBvc3QoR1JPVVBfS0lORCwgImdyb3VwcyIpLnRvKEFkZEluY2x1ZGVkR3JvdXBzLmNsYXNzKTsKKyAgICBwb3N0KEdST1VQX0tJTkQsICJncm91cHMuYWRkIikudG8oQWRkSW5jbHVkZWRHcm91cHMuY2xhc3MpOworICAgIHBvc3QoR1JPVVBfS0lORCwgImdyb3Vwcy5kZWxldGUiKS50byhEZWxldGVJbmNsdWRlZEdyb3Vwcy5jbGFzcyk7CisgICAgZ2V0KEdST1VQX0tJTkQsICJkZXNjcmlwdGlvbiIpLnRvKEdldERlc2NyaXB0aW9uLmNsYXNzKTsKKyAgICBwdXQoR1JPVVBfS0lORCwgImRlc2NyaXB0aW9uIikudG8oUHV0RGVzY3JpcHRpb24uY2xhc3MpOworICAgIGRlbGV0ZShHUk9VUF9LSU5ELCAiZGVzY3JpcHRpb24iKS50byhQdXREZXNjcmlwdGlvbi5jbGFzcyk7CisgICAgZ2V0KEdST1VQX0tJTkQsICJuYW1lIikudG8oR2V0TmFtZS5jbGFzcyk7CisgICAgcHV0KEdST1VQX0tJTkQsICJuYW1lIikudG8oUHV0TmFtZS5jbGFzcyk7CisgICAgZ2V0KEdST1VQX0tJTkQsICJvd25lciIpLnRvKEdldE93bmVyLmNsYXNzKTsKKyAgICBwdXQoR1JPVVBfS0lORCwgIm93bmVyIikudG8oUHV0T3duZXIuY2xhc3MpOworICAgIGdldChHUk9VUF9LSU5ELCAib3B0aW9ucyIpLnRvKEdldE9wdGlvbnMuY2xhc3MpOworICAgIHB1dChHUk9VUF9LSU5ELCAib3B0aW9ucyIpLnRvKFB1dE9wdGlvbnMuY2xhc3MpOworCisgICAgY2hpbGQoR1JPVVBfS0lORCwgIm1lbWJlcnMiKS50byhNZW1iZXJzQ29sbGVjdGlvbi5jbGFzcyk7CisgICAgZ2V0KE1FTUJFUl9LSU5EKS50byhHZXRNZW1iZXIuY2xhc3MpOworICAgIHB1dChNRU1CRVJfS0lORCkudG8oVXBkYXRlTWVtYmVyLmNsYXNzKTsKKyAgICBkZWxldGUoTUVNQkVSX0tJTkQpLnRvKERlbGV0ZU1lbWJlci5jbGFzcyk7CisKKyAgICBjaGlsZChHUk9VUF9LSU5ELCAiZ3JvdXBzIikudG8oSW5jbHVkZWRHcm91cHNDb2xsZWN0aW9uLmNsYXNzKTsKKyAgICBnZXQoSU5DTFVERURfR1JPVVBfS0lORCkudG8oR2V0SW5jbHVkZWRHcm91cC5jbGFzcyk7CisgICAgcHV0KElOQ0xVREVEX0dST1VQX0tJTkQpLnRvKFVwZGF0ZUluY2x1ZGVkR3JvdXAuY2xhc3MpOworICAgIGRlbGV0ZShJTkNMVURFRF9HUk9VUF9LSU5EKS50byhEZWxldGVJbmNsdWRlZEdyb3VwLmNsYXNzKTsKKworICAgIGluc3RhbGwobmV3IEZhY3RvcnlNb2R1bGVCdWlsZGVyKCkuYnVpbGQoQ3JlYXRlR3JvdXAuRmFjdG9yeS5jbGFzcykpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL1B1dERlc2NyaXB0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL1B1dERlc2NyaXB0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGNjMGE3NgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvUHV0RGVzY3JpcHRpb24uamF2YQpAQCAtMCwwICsxLDc3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoR3JvdXBFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkRlZmF1bHRJbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLlB1dERlc2NyaXB0aW9uLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworCitwdWJsaWMgY2xhc3MgUHV0RGVzY3JpcHRpb24gaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxHcm91cFJlc291cmNlLCBJbnB1dD4geworICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIEBEZWZhdWx0SW5wdXQKKyAgICBTdHJpbmcgZGVzY3JpcHRpb247CisgIH0KKworICBwcml2YXRlIGZpbmFsIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKKworICBASW5qZWN0CisgIFB1dERlc2NyaXB0aW9uKEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZSwgUmV2aWV3RGIgZGIpIHsKKyAgICB0aGlzLmdyb3VwQ2FjaGUgPSBncm91cENhY2hlOworICAgIHRoaXMuZGIgPSBkYjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KEdyb3VwUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgdGhyb3dzIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24sIEF1dGhFeGNlcHRpb24sIE5vU3VjaEdyb3VwRXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBpZiAoaW5wdXQgPT0gbnVsbCkgeworICAgICAgaW5wdXQgPSBuZXcgSW5wdXQoKTsgLy8gRGVsZXRlIHdvdWxkIHNldCBkZXNjcmlwdGlvbiB0byBudWxsLgorICAgIH0KKworICAgIGlmIChyZXNvdXJjZS50b0FjY291bnRHcm91cCgpID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uKCk7CisgICAgfSBlbHNlIGlmICghcmVzb3VyY2UuZ2V0Q29udHJvbCgpLmlzT3duZXIoKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oIk5vdCBncm91cCBvd25lciIpOworICAgIH0KKworICAgIEFjY291bnRHcm91cCBncm91cCA9IGRiLmFjY291bnRHcm91cHMoKS5nZXQoCisgICAgICAgIHJlc291cmNlLnRvQWNjb3VudEdyb3VwKCkuZ2V0SWQoKSk7CisgICAgaWYgKGdyb3VwID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKCk7CisgICAgfQorCisgICAgZ3JvdXAuc2V0RGVzY3JpcHRpb24oU3RyaW5ncy5lbXB0eVRvTnVsbChpbnB1dC5kZXNjcmlwdGlvbikpOworICAgIGRiLmFjY291bnRHcm91cHMoKS51cGRhdGUoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGdyb3VwKSk7CisgICAgZ3JvdXBDYWNoZS5ldmljdChncm91cCk7CisKKyAgICByZXR1cm4gU3RyaW5ncy5pc051bGxPckVtcHR5KGlucHV0LmRlc2NyaXB0aW9uKQorICAgICAgICA/IFJlc3BvbnNlLm5vbmUoKQorICAgICAgICA6IGlucHV0LmRlc2NyaXB0aW9uOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL1B1dEdyb3VwLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL1B1dEdyb3VwLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWNiZWQ2YwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvUHV0R3JvdXAuamF2YQpAQCAtMCwwICsxLDI3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5DcmVhdGVHcm91cC5JbnB1dDsKKworcHVibGljIGNsYXNzIFB1dEdyb3VwIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8R3JvdXBSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoR3JvdXBSZXNvdXJjZSByZXNvdXJjZSwgSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiB7CisgICAgdGhyb3cgbmV3IFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oIkdyb3VwIGFscmVhZHkgZXhpc3RzIik7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvUHV0TmFtZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9QdXROYW1lLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTE4MzM3YQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvUHV0TmFtZS5qYXZhCkBAIC0wLDAgKzEsNzQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5JbnZhbGlkTmFtZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLk5vU3VjaEdyb3VwRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5CYWRSZXF1ZXN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5EZWZhdWx0SW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLk1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LlBlcmZvcm1SZW5hbWVHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuUHV0TmFtZS5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworcHVibGljIGNsYXNzIFB1dE5hbWUgaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxHcm91cFJlc291cmNlLCBJbnB1dD4geworICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIEBEZWZhdWx0SW5wdXQKKyAgICBTdHJpbmcgbmFtZTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgUGVyZm9ybVJlbmFtZUdyb3VwLkZhY3RvcnkgcGVyZm9ybVJlbmFtZUdyb3VwRmFjdG9yeTsKKworICBASW5qZWN0CisgIFB1dE5hbWUoUGVyZm9ybVJlbmFtZUdyb3VwLkZhY3RvcnkgcGVyZm9ybVJlbmFtZUdyb3VwRmFjdG9yeSkgeworICAgIHRoaXMucGVyZm9ybVJlbmFtZUdyb3VwRmFjdG9yeSA9IHBlcmZvcm1SZW5hbWVHcm91cEZhY3Rvcnk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBhcHBseShHcm91cFJlc291cmNlIHJlc291cmNlLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBNZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uLCBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBpZiAocmVzb3VyY2UudG9BY2NvdW50R3JvdXAoKSA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbigpOworICAgIH0gZWxzZSBpZiAoIXJlc291cmNlLmdldENvbnRyb2woKS5pc093bmVyKCkpIHsKKyAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJOb3QgZ3JvdXAgb3duZXIiKTsKKyAgICB9IGVsc2UgaWYgKGlucHV0ID09IG51bGwgfHwgU3RyaW5ncy5pc051bGxPckVtcHR5KGlucHV0Lm5hbWUpKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbigibmFtZSBpcyByZXF1aXJlZCIpOworICAgIH0KKworICAgIGZpbmFsIFN0cmluZyBuZXdOYW1lID0gaW5wdXQubmFtZS50cmltKCk7CisgICAgaWYgKHJlc291cmNlLnRvQWNjb3VudEdyb3VwKCkuZ2V0TmFtZSgpLmVxdWFscyhuZXdOYW1lKSkgeworICAgICAgcmV0dXJuIG5ld05hbWU7CisgICAgfQorCisgICAgdHJ5IHsKKyAgICAgIHJldHVybiBwZXJmb3JtUmVuYW1lR3JvdXBGYWN0b3J5LmNyZWF0ZSgpLnJlbmFtZUdyb3VwKAorICAgICAgICAgIHJlc291cmNlLnRvQWNjb3VudEdyb3VwKCkuZ2V0SWQoKSwgbmV3TmFtZSkuZ3JvdXAuZ2V0TmFtZSgpOworICAgIH0gY2F0Y2ggKE5vU3VjaEdyb3VwRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKCk7CisgICAgfSBjYXRjaCAoSW52YWxpZE5hbWVFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oZS5nZXRNZXNzYWdlKCkpOworICAgIH0gY2F0Y2ggKE5hbWVBbHJlYWR5VXNlZEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL1B1dE9wdGlvbnMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvUHV0T3B0aW9ucy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc0MDYwZGUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dyb3VwL1B1dE9wdGlvbnMuamF2YQpAQCAtMCwwICsxLDc0IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLk1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLlB1dE9wdGlvbnMuSW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CisKK3B1YmxpYyBjbGFzcyBQdXRPcHRpb25zIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8R3JvdXBSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBCb29sZWFuIHZpc2libGVUb0FsbDsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlOworICBwcml2YXRlIGZpbmFsIFJldmlld0RiIGRiOworCisgIEBJbmplY3QKKyAgUHV0T3B0aW9ucyhHcm91cENhY2hlIGdyb3VwQ2FjaGUsIFJldmlld0RiIGRiKSB7CisgICAgdGhpcy5ncm91cENhY2hlID0gZ3JvdXBDYWNoZTsKKyAgICB0aGlzLmRiID0gZGI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIEdyb3VwT3B0aW9uc0luZm8gYXBwbHkoR3JvdXBSZXNvdXJjZSByZXNvdXJjZSwgSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiwgQmFkUmVxdWVzdEV4Y2VwdGlvbiwKKyAgICAgIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKHJlc291cmNlLnRvQWNjb3VudEdyb3VwKCkgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24oKTsKKyAgICB9IGVsc2UgaWYgKCFyZXNvdXJjZS5nZXRDb250cm9sKCkuaXNPd25lcigpKSB7CisgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbigiTm90IGdyb3VwIG93bmVyIik7CisgICAgfQorCisgICAgaWYgKGlucHV0ID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKCJvcHRpb25zIGFyZSByZXF1aXJlZCIpOworICAgIH0KKyAgICBpZiAoaW5wdXQudmlzaWJsZVRvQWxsID09IG51bGwpIHsKKyAgICAgIGlucHV0LnZpc2libGVUb0FsbCA9IGZhbHNlOworICAgIH0KKworICAgIEFjY291bnRHcm91cCBncm91cCA9IGRiLmFjY291bnRHcm91cHMoKS5nZXQoCisgICAgICAgIHJlc291cmNlLnRvQWNjb3VudEdyb3VwKCkuZ2V0SWQoKSk7CisgICAgaWYgKGdyb3VwID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKCk7CisgICAgfQorCisgICAgZ3JvdXAuc2V0VmlzaWJsZVRvQWxsKGlucHV0LnZpc2libGVUb0FsbCk7CisgICAgZGIuYWNjb3VudEdyb3VwcygpLnVwZGF0ZShDb2xsZWN0aW9ucy5zaW5nbGV0b24oZ3JvdXApKTsKKyAgICBncm91cENhY2hlLmV2aWN0KGdyb3VwKTsKKworICAgIHJldHVybiBuZXcgR3JvdXBPcHRpb25zSW5mbyhncm91cCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvUHV0T3duZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvZ3JvdXAvUHV0T3duZXIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jYTZjMDZmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9ncm91cC9QdXRPd25lci5qYXZhCkBAIC0wLDAgKzEsODYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXA7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXNjcmlwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuRGVmYXVsdElucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5NZXRob2ROb3RBbGxvd2VkRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5Hcm91cEpzb24uR3JvdXBJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5QdXRPd25lci5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKKworcHVibGljIGNsYXNzIFB1dE93bmVyIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8R3JvdXBSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBARGVmYXVsdElucHV0CisgICAgU3RyaW5nIG93bmVyOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxHcm91cHNDb2xsZWN0aW9uPiBncm91cHNDb2xsZWN0aW9uOworICBwcml2YXRlIGZpbmFsIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cEpzb24ganNvbjsKKworICBASW5qZWN0CisgIFB1dE93bmVyKFByb3ZpZGVyPEdyb3Vwc0NvbGxlY3Rpb24+IGdyb3Vwc0NvbGxlY3Rpb24sIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZSwKKyAgICAgIFJldmlld0RiIGRiLCBHcm91cEpzb24ganNvbikgeworICAgIHRoaXMuZ3JvdXBzQ29sbGVjdGlvbiA9IGdyb3Vwc0NvbGxlY3Rpb247CisgICAgdGhpcy5ncm91cENhY2hlID0gZ3JvdXBDYWNoZTsKKyAgICB0aGlzLmRiID0gZGI7CisgICAgdGhpcy5qc29uID0ganNvbjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgR3JvdXBJbmZvIGFwcGx5KEdyb3VwUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24sCisgICAgICBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBVbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uLAorICAgICAgT3JtRXhjZXB0aW9uIHsKKyAgICBBY2NvdW50R3JvdXAgZ3JvdXAgPSByZXNvdXJjZS50b0FjY291bnRHcm91cCgpOworICAgIGlmIChncm91cCA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbigpOworICAgIH0gZWxzZSBpZiAoIXJlc291cmNlLmdldENvbnRyb2woKS5pc093bmVyKCkpIHsKKyAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJOb3QgZ3JvdXAgb3duZXIiKTsKKyAgICB9CisKKyAgICBpZiAoaW5wdXQgPT0gbnVsbCB8fCBTdHJpbmdzLmlzTnVsbE9yRW1wdHkoaW5wdXQub3duZXIpKSB7CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbigib3duZXIgaXMgcmVxdWlyZWQiKTsKKyAgICB9CisKKyAgICBncm91cCA9IGRiLmFjY291bnRHcm91cHMoKS5nZXQoZ3JvdXAuZ2V0SWQoKSk7CisgICAgaWYgKGdyb3VwID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKCk7CisgICAgfQorCisgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBvd25lciA9IGdyb3Vwc0NvbGxlY3Rpb24uZ2V0KCkucGFyc2UoaW5wdXQub3duZXIpOworICAgIGlmICghZ3JvdXAuZ2V0T3duZXJHcm91cFVVSUQoKS5lcXVhbHMob3duZXIuZ2V0R3JvdXBVVUlEKCkpKSB7CisgICAgICBncm91cC5zZXRPd25lckdyb3VwVVVJRChvd25lci5nZXRHcm91cFVVSUQoKSk7CisgICAgICBkYi5hY2NvdW50R3JvdXBzKCkudXBkYXRlKENvbGxlY3Rpb25zLnNpbmdsZXRvbihncm91cCkpOworICAgICAgZ3JvdXBDYWNoZS5ldmljdChncm91cCk7CisgICAgfQorICAgIHJldHVybiBqc29uLmZvcm1hdChvd25lcik7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9BYmFuZG9uZWRTZW5kZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9BYmFuZG9uZWRTZW5kZXIuamF2YQppbmRleCAwZWIzZGZlLi44Mzg3ZjUxIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQWJhbmRvbmVkU2VuZGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0FiYW5kb25lZFNlbmRlci5qYXZhCkBAIC0xNCw5ICsxNCw5IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWw7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuRW1haWxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRQcm9qZWN0V2F0Y2guTm90aWZ5VHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CiAKQEAgLTI4LDkgKzI4LDggQEAKICAgfQogCiAgIEBJbmplY3QKLSAgcHVibGljIEFiYW5kb25lZFNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwKLSAgICAgIEBBbm9ueW1vdXNDb3dhcmROYW1lIFN0cmluZyBhbm9ueW1vdXNDb3dhcmROYW1lLCBAQXNzaXN0ZWQgQ2hhbmdlIGMpIHsKLSAgICBzdXBlcihlYSwgYW5vbnltb3VzQ293YXJkTmFtZSwgYywgImFiYW5kb24iKTsKKyAgcHVibGljIEFiYW5kb25lZFNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwgQEFzc2lzdGVkIENoYW5nZSBjKSB7CisgICAgc3VwZXIoZWEsIGMsICJhYmFuZG9uIik7CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTM5LDcgKzM4LDggQEAKIAogICAgIGNjQWxsQXBwcm92YWxzKCk7CiAgICAgYmNjU3RhcnJlZEJ5KCk7Ci0gICAgYmNjV2F0Y2hlcyhOb3RpZnlUeXBlLkFMTF9DT01NRU5UUyk7CisgICAgaW5jbHVkZVdhdGNoZXJzKE5vdGlmeVR5cGUuQUJBTkRPTkVEX0NIQU5HRVMpOworICAgIGluY2x1ZGVXYXRjaGVycyhOb3RpZnlUeXBlLkFMTF9DT01NRU5UUyk7CiAgIH0KIAogICBAT3ZlcnJpZGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9BZGRSZXZpZXdlclNlbmRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0FkZFJldmlld2VyU2VuZGVyLmphdmEKaW5kZXggZjdhY2UyNy4uYzE4MWE5YyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0FkZFJldmlld2VyU2VuZGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0FkZFJldmlld2VyU2VuZGVyLmphdmEKQEAgLTE0LDkgKzE0LDggQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbDsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuRW1haWxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKIApAQCAtMjcsMTAgKzI2LDggQEAKICAgfQogCiAgIEBJbmplY3QKLSAgcHVibGljIEFkZFJldmlld2VyU2VuZGVyKEVtYWlsQXJndW1lbnRzIGVhLAotICAgICAgQEFub255bW91c0Nvd2FyZE5hbWUgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWUsIFNzaEluZm8gc3NoSW5mbywKLSAgICAgIEBBc3Npc3RlZCBDaGFuZ2UgYykgewotICAgIHN1cGVyKGVhLCBhbm9ueW1vdXNDb3dhcmROYW1lLCBzc2hJbmZvLCBjKTsKKyAgcHVibGljIEFkZFJldmlld2VyU2VuZGVyKEVtYWlsQXJndW1lbnRzIGVhLCBAQXNzaXN0ZWQgQ2hhbmdlIGMpIHsKKyAgICBzdXBlcihlYSwgYyk7CiAgIH0KIAogICBAT3ZlcnJpZGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9DaGFuZ2VFbWFpbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NoYW5nZUVtYWlsLmphdmEKaW5kZXggNmMzMzk0OS4uODg1ZjFhYSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NoYW5nZUVtYWlsLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NoYW5nZUVtYWlsLmphdmEKQEAgLTE0LDE1ICsxNCw5IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWw7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOwotaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cERlc2NyaXB0aW9uczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cFJlZmVyZW5jZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkVtYWlsRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cEluY2x1ZGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cE1lbWJlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudFByb2plY3RXYXRjaDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudFByb2plY3RXYXRjaC5Ob3RpZnlUeXBlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7CkBAIC0zMCwzNSArMjQsMzUgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0SW5mbzsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuU3RhcnJlZENoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Ob3RpZnlDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUHJvamVjdFdhdGNoLldhdGNoZXJzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoTGlzdEVudHJ5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3ROb3RBdmFpbGFibGVFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoU2V0SW5mb05vdEF2YWlsYWJsZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0U3RhdGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LlByZWRpY2F0ZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuUXVlcnlQYXJzZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZURhdGE7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LmNoYW5nZS5DaGFuZ2VRdWVyeUJ1aWxkZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LmNoYW5nZS5TaW5nbGVHcm91cFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZGlmZi5EaWZmRm9ybWF0dGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuaW50ZXJuYWwuSkdpdFRleHQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuUmF3UGFyc2VVdGlsczsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuVGVtcG9yYXJ5QnVmZmVyOwogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CiAKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEudGV4dC5NZXNzYWdlRm9ybWF0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuRGF0ZTsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKLWltcG9ydCBqYXZhLnV0aWwuUXVldWU7CiBpbXBvcnQgamF2YS51dGlsLlNldDsKIGltcG9ydCBqYXZhLnV0aWwuVHJlZVNldDsKIAogLyoqIFNlbmRzIGFuIGVtYWlsIHRvIG9uZSBvciBtb3JlIGludGVyZXN0ZWQgcGFydGllcy4gKi8KLXB1YmxpYyBhYnN0cmFjdCBjbGFzcyBDaGFuZ2VFbWFpbCBleHRlbmRzIE91dGdvaW5nRW1haWwgeworcHVibGljIGFic3RyYWN0IGNsYXNzIENoYW5nZUVtYWlsIGV4dGVuZHMgTm90aWZpY2F0aW9uRW1haWwgewogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoQ2hhbmdlRW1haWwuY2xhc3MpOwogCiAgIHByb3RlY3RlZCBmaW5hbCBDaGFuZ2UgY2hhbmdlOwpAQCAtNzEsMTEgKzY1LDEwIEBACiAgIHByb3RlY3RlZCBTZXQ8QWNjb3VudC5JZD4gYXV0aG9yczsKICAgcHJvdGVjdGVkIGJvb2xlYW4gZW1haWxPbmx5QXV0aG9yczsKIAotICBwcm90ZWN0ZWQgQ2hhbmdlRW1haWwoRW1haWxBcmd1bWVudHMgZWEsIGZpbmFsIFN0cmluZyBhbm9ueW1vdXNDb3dhcmROYW1lLAotICAgICAgZmluYWwgQ2hhbmdlIGMsIGZpbmFsIFN0cmluZyBtYykgewotICAgIHN1cGVyKGVhLCBhbm9ueW1vdXNDb3dhcmROYW1lLCBtYyk7CisgIHByb3RlY3RlZCBDaGFuZ2VFbWFpbChFbWFpbEFyZ3VtZW50cyBlYSwgQ2hhbmdlIGMsIFN0cmluZyBtYykgeworICAgIHN1cGVyKGVhLCBtYywgYy5nZXRQcm9qZWN0KCksIGMuZ2V0RGVzdCgpKTsKICAgICBjaGFuZ2UgPSBjOwotICAgIGNoYW5nZURhdGEgPSBjaGFuZ2UgIT0gbnVsbCA/IG5ldyBDaGFuZ2VEYXRhKGNoYW5nZSkgOiBudWxsOworICAgIGNoYW5nZURhdGEgPSBuZXcgQ2hhbmdlRGF0YShjaGFuZ2UpOwogICAgIGVtYWlsT25seUF1dGhvcnMgPSBmYWxzZTsKICAgfQogCkBAIC0xMjEsMTEgKzExNCwxNiBAQAogICAgICAgfQogICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CiAgICAgfQorICAgIGZvcm1hdEZvb3RlcigpOwogICB9CiAKICAgLyoqIEZvcm1hdCB0aGUgbWVzc2FnZSBib2R5IGJ5IGNhbGxpbmcge0BsaW5rICNhcHBlbmRUZXh0KFN0cmluZyl9LiAqLwogICBwcm90ZWN0ZWQgYWJzdHJhY3Qgdm9pZCBmb3JtYXRDaGFuZ2UoKSB0aHJvd3MgRW1haWxFeGNlcHRpb247CiAKKyAgLyoqIEZvcm1hdCB0aGUgbWVzc2FnZSBmb290ZXIgYnkgY2FsbGluZyB7QGxpbmsgI2FwcGVuZFRleHQoU3RyaW5nKX0uICovCisgIHByb3RlY3RlZCB2b2lkIGZvcm1hdEZvb3RlcigpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiB7CisgIH0KKwogICAvKiogU2V0dXAgdGhlIG1lc3NhZ2UgaGVhZGVycyBhbmQgZW52ZWxvcGUgKFRPLCBDQywgQkNDKS4gKi8KICAgcHJvdGVjdGVkIHZvaWQgaW5pdCgpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiB7CiAgICAgaWYgKGFyZ3MucHJvamVjdENhY2hlICE9IG51bGwpIHsKQEAgLTE1OCwyMyArMTU2LDEwIEBACiAgICAgfQogICAgIHNldENoYW5nZVN1YmplY3RIZWFkZXIoKTsKICAgICBzZXRIZWFkZXIoIlgtR2Vycml0LUNoYW5nZS1JZCIsICIiICsgY2hhbmdlLmdldEtleSgpLmdldCgpKTsKLSAgICBzZXRMaXN0SWRIZWFkZXIoKTsKICAgICBzZXRDaGFuZ2VVcmxIZWFkZXIoKTsKICAgICBzZXRDb21taXRJZEhlYWRlcigpOwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIHNldExpc3RJZEhlYWRlcigpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiB7Ci0gICAgLy8gU2V0IGEgcmVhc29uYWJsZSBsaXN0IGlkIHNvIHRoYXQgZmlsdGVycyBjYW4gYmUgdXNlZCB0byBzb3J0IG1lc3NhZ2VzCi0gICAgc2V0VkhlYWRlcigiTGlzdC1JZCIsICI8JGVtYWlsLmxpc3RJZC5yZXBsYWNlKCdAJywgJy4nKT4iKTsKLSAgICBpZiAoZ2V0U2V0dGluZ3NVcmwoKSAhPSBudWxsKSB7Ci0gICAgICBzZXRWSGVhZGVyKCJMaXN0LVVuc3Vic2NyaWJlIiwgIjwkZW1haWwuc2V0dGluZ3NVcmw+Iik7Ci0gICAgfQotICB9Ci0KLSAgcHVibGljIFN0cmluZyBnZXRMaXN0SWQoKSB0aHJvd3MgRW1haWxFeGNlcHRpb24gewotICAgIHJldHVybiB2ZWxvY2lmeSgiZ2Vycml0LSRwcm9qZWN0TmFtZS5yZXBsYWNlKCcvJywgJy0nKUAkZW1haWwuZ2Vycml0SG9zdCIpOwotICB9Ci0KICAgcHJpdmF0ZSB2b2lkIHNldENoYW5nZVVybEhlYWRlcigpIHsKICAgICBmaW5hbCBTdHJpbmcgdSA9IGdldENoYW5nZVVybCgpOwogICAgIGlmICh1ICE9IG51bGwpIHsKQEAgLTE5Niw3ICsxODEsNyBAQAogCiAgIC8qKiBHZXQgYSBsaW5rIHRvIHRoZSBjaGFuZ2U7IG51bGwgaWYgdGhlIHNlcnZlciBkb2Vzbid0IGtub3cgaXRzIG93biBhZGRyZXNzLiAqLwogICBwdWJsaWMgU3RyaW5nIGdldENoYW5nZVVybCgpIHsKLSAgICBpZiAoY2hhbmdlICE9IG51bGwgJiYgZ2V0R2Vycml0VXJsKCkgIT0gbnVsbCkgeworICAgIGlmIChnZXRHZXJyaXRVcmwoKSAhPSBudWxsKSB7CiAgICAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIHIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwogICAgICAgci5hcHBlbmQoZ2V0R2Vycml0VXJsKCkpOwogICAgICAgci5hcHBlbmQoY2hhbmdlLmdldENoYW5nZUlkKCkpOwpAQCAtMzE2LDE2NCArMzAxLDEwIEBACiAgICAgfQogICB9CiAKLSAgLyoqIEJDQyB1c2VycyBhbmQgZ3JvdXBzIHRoYXQgd2FudCBub3RpZmljYXRpb24gb2YgZXZlbnRzLiAqLwotICBwcm90ZWN0ZWQgdm9pZCBiY2NXYXRjaGVzKE5vdGlmeVR5cGUgdHlwZSkgewotICAgIHRyeSB7Ci0gICAgICBXYXRjaGVycyBtYXRjaGluZyA9IGdldFdhdGNoZXModHlwZSk7Ci0gICAgICBmb3IgKEFjY291bnQuSWQgdXNlciA6IG1hdGNoaW5nLmFjY291bnRzKSB7Ci0gICAgICAgIGFkZChSZWNpcGllbnRUeXBlLkJDQywgdXNlcik7Ci0gICAgICB9Ci0gICAgICBmb3IgKEFkZHJlc3MgYWRkciA6IG1hdGNoaW5nLmVtYWlscykgewotICAgICAgICBhZGQoUmVjaXBpZW50VHlwZS5CQ0MsIGFkZHIpOwotICAgICAgfQotICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgIC8vIEp1c3QgZG9uJ3QgQ0MgZXZlcnlvbmUuIEJldHRlciB0byBzZW5kIGEgcGFydGlhbCBtZXNzYWdlIHRvIHRob3NlCi0gICAgICAvLyB3ZSBhbHJlYWR5IGhhdmUgcXVldWVkIHVwIHRoZW4gdG8gZmFpbCBkZWxpdmVyIGVudGlyZWx5IHRvIHBlb3BsZQotICAgICAgLy8gd2hvIGhhdmUgYSBsb3dlciBpbnRlcmVzdCBpbiB0aGUgY2hhbmdlLgotICAgICAgbG9nLndhcm4oIkNhbm5vdCBCQ0Mgd2F0Y2hlcnMgZm9yICIgKyB0eXBlLCBlcnIpOwotICAgIH0KLSAgfQotCi0gIC8qKiBSZXR1cm5zIGFsbCB3YXRjaGVzIHRoYXQgYXJlIHJlbGV2YW50ICovCi0gIHByb3RlY3RlZCBmaW5hbCBXYXRjaGVycyBnZXRXYXRjaGVzKE5vdGlmeVR5cGUgdHlwZSkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7Ci0gICAgV2F0Y2hlcnMgbWF0Y2hpbmcgPSBuZXcgV2F0Y2hlcnMoKTsKLSAgICBpZiAoY2hhbmdlRGF0YSA9PSBudWxsKSB7Ci0gICAgICByZXR1cm4gbWF0Y2hpbmc7Ci0gICAgfQotCi0gICAgU2V0PEFjY291bnQuSWQ+IHByb2plY3RXYXRjaGVycyA9IG5ldyBIYXNoU2V0PEFjY291bnQuSWQ+KCk7Ci0KLSAgICBmb3IgKEFjY291bnRQcm9qZWN0V2F0Y2ggdyA6IGFyZ3MuZGIuZ2V0KCkuYWNjb3VudFByb2plY3RXYXRjaGVzKCkKLSAgICAgICAgLmJ5UHJvamVjdChjaGFuZ2UuZ2V0UHJvamVjdCgpKSkgewotICAgICAgcHJvamVjdFdhdGNoZXJzLmFkZCh3LmdldEFjY291bnRJZCgpKTsKLSAgICAgIGlmICh3LmlzTm90aWZ5KHR5cGUpKSB7Ci0gICAgICAgIGFkZChtYXRjaGluZywgdyk7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgZm9yIChBY2NvdW50UHJvamVjdFdhdGNoIHcgOiBhcmdzLmRiLmdldCgpLmFjY291bnRQcm9qZWN0V2F0Y2hlcygpCi0gICAgICAgIC5ieVByb2plY3QoYXJncy5hbGxQcm9qZWN0c05hbWUpKSB7Ci0gICAgICBpZiAoIXByb2plY3RXYXRjaGVycy5jb250YWlucyh3LmdldEFjY291bnRJZCgpKSAmJiB3LmlzTm90aWZ5KHR5cGUpKSB7Ci0gICAgICAgIGFkZChtYXRjaGluZywgdyk7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgUHJvamVjdFN0YXRlIHN0YXRlID0gcHJvamVjdFN0YXRlOwotICAgIHdoaWxlIChzdGF0ZSAhPSBudWxsKSB7Ci0gICAgICBmb3IgKE5vdGlmeUNvbmZpZyBuYyA6IHN0YXRlLmdldENvbmZpZygpLmdldE5vdGlmeUNvbmZpZ3MoKSkgewotICAgICAgICBpZiAobmMuaXNOb3RpZnkodHlwZSkpIHsKLSAgICAgICAgICB0cnkgewotICAgICAgICAgICAgYWRkKG1hdGNoaW5nLCBuYywgc3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSk7Ci0gICAgICAgICAgfSBjYXRjaCAoUXVlcnlQYXJzZUV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgICBsb2cud2FybihTdHJpbmcuZm9ybWF0KAotICAgICAgICAgICAgICAgICJQcm9qZWN0ICVzIGhhcyBpbnZhbGlkIG5vdGlmeSAlcyBmaWx0ZXIgXCIlc1wiOiAlcyIsCi0gICAgICAgICAgICAgICAgc3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWUoKSwgbmMuZ2V0TmFtZSgpLAotICAgICAgICAgICAgICAgIG5jLmdldEZpbHRlcigpLCBlLmdldE1lc3NhZ2UoKSkpOwotICAgICAgICAgIH0KLSAgICAgICAgfQotICAgICAgfQotICAgICAgc3RhdGUgPSBzdGF0ZS5nZXRQYXJlbnRTdGF0ZSgpOwotICAgIH0KLQotICAgIHJldHVybiBtYXRjaGluZzsKLSAgfQotCi0gIHByb3RlY3RlZCBzdGF0aWMgY2xhc3MgV2F0Y2hlcnMgewotICAgIHByb3RlY3RlZCBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gYWNjb3VudHMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKLSAgICBwcm90ZWN0ZWQgZmluYWwgU2V0PEFkZHJlc3M+IGVtYWlscyA9IFNldHMubmV3SGFzaFNldCgpOwotICB9Ci0KLSAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCi0gIHByaXZhdGUgdm9pZCBhZGQoV2F0Y2hlcnMgbWF0Y2hpbmcsIE5vdGlmeUNvbmZpZyBuYywgUHJvamVjdC5OYW1lS2V5IHByb2plY3QpCi0gICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uLCBRdWVyeVBhcnNlRXhjZXB0aW9uIHsKLSAgICBmb3IgKEdyb3VwUmVmZXJlbmNlIHJlZiA6IG5jLmdldEdyb3VwcygpKSB7Ci0gICAgICBBY2NvdW50R3JvdXAgZ3JvdXAgPQotICAgICAgICAgIEdyb3VwRGVzY3JpcHRpb25zLnRvQWNjb3VudEdyb3VwKGFyZ3MuZ3JvdXBCYWNrZW5kLmdldChyZWYuZ2V0VVVJRCgpKSk7Ci0gICAgICBpZiAoZ3JvdXAgPT0gbnVsbCkgewotICAgICAgICBsb2cud2FybihTdHJpbmcuZm9ybWF0KAotICAgICAgICAgICAgIlByb2plY3QgJXMgaGFzIGludmFsaWQgZ3JvdXAgJXMgaW4gbm90aWZ5IHNlY3Rpb24gJXMiLAotICAgICAgICAgICAgcHJvamVjdC5nZXQoKSwgcmVmLmdldE5hbWUoKSwgbmMuZ2V0TmFtZSgpKSk7Ci0gICAgICAgIGNvbnRpbnVlOwotICAgICAgfQotCi0gICAgICBpZiAoZ3JvdXAuZ2V0VHlwZSgpICE9IEFjY291bnRHcm91cC5UeXBlLklOVEVSTkFMKSB7Ci0gICAgICAgIGxvZy53YXJuKFN0cmluZy5mb3JtYXQoCi0gICAgICAgICAgICAiUHJvamVjdCAlcyBjYW5ub3QgdXNlIGdyb3VwICVzIG9mIHR5cGUgJXMgaW4gbm90aWZ5IHNlY3Rpb24gJXMiLAotICAgICAgICAgICAgcHJvamVjdC5nZXQoKSwgcmVmLmdldE5hbWUoKSwgZ3JvdXAuZ2V0VHlwZSgpLCBuYy5nZXROYW1lKCkpKTsKLSAgICAgICAgY29udGludWU7Ci0gICAgICB9Ci0KLSAgICAgIENoYW5nZVF1ZXJ5QnVpbGRlciBxYiA9IGFyZ3MucXVlcnlCdWlsZGVyLmNyZWF0ZShuZXcgU2luZ2xlR3JvdXBVc2VyKAotICAgICAgICAgIGFyZ3MuY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5LAotICAgICAgICAgIHJlZi5nZXRVVUlEKCkpKTsKLSAgICAgIHFiLnNldEFsbG93RmlsZSh0cnVlKTsKLSAgICAgIFByZWRpY2F0ZTxDaGFuZ2VEYXRhPiBwID0gcWIuaXNfdmlzaWJsZSgpOwotICAgICAgaWYgKG5jLmdldEZpbHRlcigpICE9IG51bGwpIHsKLSAgICAgICAgcCA9IFByZWRpY2F0ZS5hbmQocWIucGFyc2UobmMuZ2V0RmlsdGVyKCkpLCBwKTsKLSAgICAgICAgcCA9IGFyZ3MucXVlcnlSZXdyaXRlci5nZXQoKS5yZXdyaXRlKHApOwotICAgICAgfQotICAgICAgaWYgKHAubWF0Y2goY2hhbmdlRGF0YSkpIHsKLSAgICAgICAgcmVjdXJzaXZlbHlBZGRBbGxBY2NvdW50cyhtYXRjaGluZywgZ3JvdXApOwotICAgICAgfQotICAgIH0KLQotICAgIGlmICghbmMuZ2V0QWRkcmVzc2VzKCkuaXNFbXB0eSgpKSB7Ci0gICAgICBpZiAobmMuZ2V0RmlsdGVyKCkgIT0gbnVsbCkgewotICAgICAgICBDaGFuZ2VRdWVyeUJ1aWxkZXIgcWIgPSBhcmdzLnF1ZXJ5QnVpbGRlci5jcmVhdGUoYXJncy5hbm9ueW1vdXNVc2VyKTsKLSAgICAgICAgcWIuc2V0QWxsb3dGaWxlKHRydWUpOwotICAgICAgICBQcmVkaWNhdGU8Q2hhbmdlRGF0YT4gcCA9IHFiLnBhcnNlKG5jLmdldEZpbHRlcigpKTsKLSAgICAgICAgcCA9IGFyZ3MucXVlcnlSZXdyaXRlci5nZXQoKS5yZXdyaXRlKHApOwotICAgICAgICBpZiAocC5tYXRjaChjaGFuZ2VEYXRhKSkgewotICAgICAgICAgIG1hdGNoaW5nLmVtYWlscy5hZGRBbGwobmMuZ2V0QWRkcmVzc2VzKCkpOwotICAgICAgICB9Ci0gICAgICB9IGVsc2UgewotICAgICAgICBtYXRjaGluZy5lbWFpbHMuYWRkQWxsKG5jLmdldEFkZHJlc3NlcygpKTsKLSAgICAgIH0KLSAgICB9Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgcmVjdXJzaXZlbHlBZGRBbGxBY2NvdW50cyhXYXRjaGVycyBtYXRjaGluZywgQWNjb3VudEdyb3VwIGdyb3VwKQotICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7Ci0gICAgU2V0PEFjY291bnRHcm91cC5JZD4gc2VlbiA9IFNldHMubmV3SGFzaFNldCgpOwotICAgIFF1ZXVlPEFjY291bnRHcm91cC5JZD4gc2NhbiA9IExpc3RzLm5ld0xpbmtlZExpc3QoKTsKLSAgICBzY2FuLmFkZChncm91cC5nZXRJZCgpKTsKLSAgICBzZWVuLmFkZChncm91cC5nZXRJZCgpKTsKLSAgICB3aGlsZSAoIXNjYW4uaXNFbXB0eSgpKSB7Ci0gICAgICBBY2NvdW50R3JvdXAuSWQgbmV4dCA9IHNjYW4ucmVtb3ZlKCk7Ci0gICAgICBmb3IgKEFjY291bnRHcm91cE1lbWJlciBtIDogYXJncy5kYi5nZXQoKS5hY2NvdW50R3JvdXBNZW1iZXJzKCkKLSAgICAgICAgICAuYnlHcm91cChuZXh0KSkgewotICAgICAgICBtYXRjaGluZy5hY2NvdW50cy5hZGQobS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgICB9Ci0gICAgICBmb3IgKEFjY291bnRHcm91cEluY2x1ZGUgbSA6IGFyZ3MuZGIuZ2V0KCkuYWNjb3VudEdyb3VwSW5jbHVkZXMoKQotICAgICAgICAgIC5ieUdyb3VwKG5leHQpKSB7Ci0gICAgICAgIGlmIChzZWVuLmFkZChtLmdldEluY2x1ZGVJZCgpKSkgewotICAgICAgICAgIHNjYW4uYWRkKG0uZ2V0SW5jbHVkZUlkKCkpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfQotICB9Ci0KLSAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCi0gIHByaXZhdGUgdm9pZCBhZGQoV2F0Y2hlcnMgbWF0Y2hpbmcsIEFjY291bnRQcm9qZWN0V2F0Y2ggdykKLSAgICAgIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIElkZW50aWZpZWRVc2VyIHVzZXIgPQotICAgICAgICBhcmdzLmlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUoYXJncy5kYiwgdy5nZXRBY2NvdW50SWQoKSk7Ci0gICAgQ2hhbmdlUXVlcnlCdWlsZGVyIHFiID0gYXJncy5xdWVyeUJ1aWxkZXIuY3JlYXRlKHVzZXIpOwotICAgIFByZWRpY2F0ZTxDaGFuZ2VEYXRhPiBwID0gcWIuaXNfdmlzaWJsZSgpOwotICAgIGlmICh3LmdldEZpbHRlcigpICE9IG51bGwpIHsKLSAgICAgIHRyeSB7Ci0gICAgICAgIHFiLnNldEFsbG93RmlsZSh0cnVlKTsKLSAgICAgICAgcCA9IFByZWRpY2F0ZS5hbmQocWIucGFyc2Uody5nZXRGaWx0ZXIoKSksIHApOwotICAgICAgICBwID0gYXJncy5xdWVyeVJld3JpdGVyLmdldCgpLnJld3JpdGUocCk7Ci0gICAgICAgIGlmIChwLm1hdGNoKGNoYW5nZURhdGEpKSB7Ci0gICAgICAgICAgbWF0Y2hpbmcuYWNjb3VudHMuYWRkKHcuZ2V0QWNjb3VudElkKCkpOwotICAgICAgICB9Ci0gICAgICB9IGNhdGNoIChRdWVyeVBhcnNlRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgLy8gSWdub3JlIGJyb2tlbiBmaWx0ZXIgZXhwcmVzc2lvbnMuCi0gICAgICB9Ci0gICAgfSBlbHNlIGlmIChwLm1hdGNoKGNoYW5nZURhdGEpKSB7Ci0gICAgICBtYXRjaGluZy5hY2NvdW50cy5hZGQody5nZXRBY2NvdW50SWQoKSk7Ci0gICAgfQorICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIGZpbmFsIFdhdGNoZXJzIGdldFdhdGNoZXJzKE5vdGlmeVR5cGUgdHlwZSkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgUHJvamVjdFdhdGNoIHdhdGNoID0gbmV3IFByb2plY3RXYXRjaChhcmdzLCBwcm9qZWN0LCBwcm9qZWN0U3RhdGUsIGNoYW5nZURhdGEpOworICAgIHJldHVybiB3YXRjaC5nZXRXYXRjaGVycyh0eXBlKTsKICAgfQogCiAgIC8qKiBBbnkgdXNlciB3aG8gaGFzIHB1Ymxpc2hlZCBjb21tZW50cyBvbiB0aGlzIGNoYW5nZS4gKi8KQEAgLTUwOSw3ICszNDAsNiBAQAogCiAgIHByb3RlY3RlZCBib29sZWFuIGlzVmlzaWJsZVRvKGZpbmFsIEFjY291bnQuSWQgdG8pIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgIHJldHVybiBwcm9qZWN0U3RhdGUgPT0gbnVsbAotICAgICAgICB8fCBjaGFuZ2UgPT0gbnVsbAogICAgICAgICB8fCBwcm9qZWN0U3RhdGUuY29udHJvbEZvcihhcmdzLmlkZW50aWZpZWRVc2VyRmFjdG9yeS5jcmVhdGUodG8pKQogICAgICAgICAgICAgLmNvbnRyb2xGb3IoY2hhbmdlKS5pc1Zpc2libGUoYXJncy5kYi5nZXQoKSk7CiAgIH0KQEAgLTUzOSwxMSArMzY5LDU0IEBACiAgICAgdmVsb2NpdHlDb250ZXh0LnB1dCgiY2hhbmdlIiwgY2hhbmdlKTsKICAgICB2ZWxvY2l0eUNvbnRleHQucHV0KCJjaGFuZ2VJZCIsIGNoYW5nZS5nZXRLZXkoKSk7CiAgICAgdmVsb2NpdHlDb250ZXh0LnB1dCgiY292ZXJMZXR0ZXIiLCBnZXRDb3ZlckxldHRlcigpKTsKLSAgICB2ZWxvY2l0eUNvbnRleHQucHV0KCJicmFuY2giLCBjaGFuZ2UuZ2V0RGVzdCgpKTsKICAgICB2ZWxvY2l0eUNvbnRleHQucHV0KCJmcm9tTmFtZSIsIGdldE5hbWVGb3IoZnJvbUlkKSk7Ci0gICAgdmVsb2NpdHlDb250ZXh0LnB1dCgicHJvamVjdE5hbWUiLCAvLwotICAgICAgICBwcm9qZWN0U3RhdGUgIT0gbnVsbCA/IHByb2plY3RTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpIDogbnVsbCk7CiAgICAgdmVsb2NpdHlDb250ZXh0LnB1dCgicGF0Y2hTZXQiLCBwYXRjaFNldCk7CiAgICAgdmVsb2NpdHlDb250ZXh0LnB1dCgicGF0Y2hTZXRJbmZvIiwgcGF0Y2hTZXRJbmZvKTsKICAgfQorCisgIHB1YmxpYyBib29sZWFuIGdldEluY2x1ZGVEaWZmKCkgeworICAgIHJldHVybiBhcmdzLnNldHRpbmdzLmluY2x1ZGVEaWZmOworICB9CisKKyAgLyoqIFNob3cgcGF0Y2ggc2V0IGFzIHVuaWZpZWQgZGlmZmVyZW5jZS4gKi8KKyAgcHVibGljIFN0cmluZyBnZXRVbmlmaWVkRGlmZigpIHsKKyAgICBQYXRjaExpc3QgcGF0Y2hMaXN0OworICAgIHRyeSB7CisgICAgICBwYXRjaExpc3QgPSBnZXRQYXRjaExpc3QoKTsKKyAgICAgIGlmIChwYXRjaExpc3QuZ2V0T2xkSWQoKSA9PSBudWxsKSB7CisgICAgICAgIC8vIE9jdG9wdXMgbWVyZ2VzIGFyZSBub3Qgd2VsbCBzdXBwb3J0ZWQgZm9yIGRpZmYgb3V0cHV0IGJ5IEdlcnJpdC4KKyAgICAgICAgLy8gQ3VycmVudGx5IHRoZXNlIGFsd2F5cyBoYXZlIGEgbnVsbCBvbGRJZCBpbiB0aGUgUGF0Y2hMaXN0LgorICAgICAgICByZXR1cm4gIltPY3RvcHVzIG1lcmdlOyBjYW5ub3QgYmUgZm9ybWF0dGVkIGFzIGEgZGlmZi5dXG4iOworICAgICAgfQorICAgIH0gY2F0Y2ggKFBhdGNoTGlzdE5vdEF2YWlsYWJsZUV4Y2VwdGlvbiBlKSB7CisgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBmb3JtYXQgcGF0Y2giLCBlKTsKKyAgICAgIHJldHVybiAiIjsKKyAgICB9CisKKyAgICBUZW1wb3JhcnlCdWZmZXIuSGVhcCBidWYgPQorICAgICAgICBuZXcgVGVtcG9yYXJ5QnVmZmVyLkhlYXAoYXJncy5zZXR0aW5ncy5tYXhpbXVtRGlmZlNpemUpOworICAgIERpZmZGb3JtYXR0ZXIgZm10ID0gbmV3IERpZmZGb3JtYXR0ZXIoYnVmKTsKKyAgICBSZXBvc2l0b3J5IGdpdDsKKyAgICB0cnkgeworICAgICAgZ2l0ID0gYXJncy5zZXJ2ZXIub3BlblJlcG9zaXRvcnkoY2hhbmdlLmdldFByb2plY3QoKSk7CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgbG9nLmVycm9yKCJDYW5ub3Qgb3BlbiByZXBvc2l0b3J5IHRvIGZvcm1hdCBwYXRjaCIsIGUpOworICAgICAgcmV0dXJuICIiOworICAgIH0KKyAgICB0cnkgeworICAgICAgZm10LnNldFJlcG9zaXRvcnkoZ2l0KTsKKyAgICAgIGZtdC5zZXREZXRlY3RSZW5hbWVzKHRydWUpOworICAgICAgZm10LmZvcm1hdChwYXRjaExpc3QuZ2V0T2xkSWQoKSwgcGF0Y2hMaXN0LmdldE5ld0lkKCkpOworICAgICAgcmV0dXJuIFJhd1BhcnNlVXRpbHMuZGVjb2RlKGJ1Zi50b0J5dGVBcnJheSgpKTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICBpZiAoSkdpdFRleHQuZ2V0KCkuaW5NZW1vcnlCdWZmZXJMaW1pdEV4Y2VlZGVkLmVxdWFscyhlLmdldE1lc3NhZ2UoKSkpIHsKKyAgICAgICAgcmV0dXJuICIiOworICAgICAgfQorICAgICAgbG9nLmVycm9yKCJDYW5ub3QgZm9ybWF0IHBhdGNoIiwgZSk7CisgICAgICByZXR1cm4gIiI7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGZtdC5yZWxlYXNlKCk7CisgICAgICBnaXQuY2xvc2UoKTsKKyAgICB9CisgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50U2VuZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ29tbWVudFNlbmRlci5qYXZhCmluZGV4IGU3Y2MxZmYuLmIxNmFiMmEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50U2VuZGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1lbnRTZW5kZXIuamF2YQpAQCAtMTQsMTEgKzE0LDEyIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWw7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkVtYWlsRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50UHJvamVjdFdhdGNoLk5vdGlmeVR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoTGluZUNvbW1lbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRQcm9qZWN0V2F0Y2guTm90aWZ5VHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5Qb3N0UmV2aWV3Lk5vdGlmeUhhbmRsaW5nOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaEZpbGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoTGlzdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hMaXN0Tm90QXZhaWxhYmxlRXhjZXB0aW9uOwpAQCAtMzcsMTUgKzM4LDE4IEBACiAvKiogU2VuZCBjb21tZW50cywgYWZ0ZXIgdGhlIGF1dGhvciBvZiB0aGVtIGhpdCB1c2VkIFB1Ymxpc2ggQ29tbWVudHMgaW4gdGhlIFVJLiAqLwogcHVibGljIGNsYXNzIENvbW1lbnRTZW5kZXIgZXh0ZW5kcyBSZXBseVRvQ2hhbmdlU2VuZGVyIHsKICAgcHVibGljIHN0YXRpYyBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgcHVibGljIENvbW1lbnRTZW5kZXIgY3JlYXRlKENoYW5nZSBjaGFuZ2UpOworICAgIHB1YmxpYyBDb21tZW50U2VuZGVyIGNyZWF0ZShOb3RpZnlIYW5kbGluZyBub3RpZnksIENoYW5nZSBjaGFuZ2UpOwogICB9CiAKKyAgcHJpdmF0ZSBmaW5hbCBOb3RpZnlIYW5kbGluZyBub3RpZnk7CiAgIHByaXZhdGUgTGlzdDxQYXRjaExpbmVDb21tZW50PiBpbmxpbmVDb21tZW50cyA9IENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwogCiAgIEBJbmplY3QKICAgcHVibGljIENvbW1lbnRTZW5kZXIoRW1haWxBcmd1bWVudHMgZWEsCi0gICAgICBAQW5vbnltb3VzQ293YXJkTmFtZSBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwgQEFzc2lzdGVkIENoYW5nZSBjKSB7Ci0gICAgc3VwZXIoZWEsIGFub255bW91c0Nvd2FyZE5hbWUsIGMsICJjb21tZW50Iik7CisgICAgICBAQXNzaXN0ZWQgTm90aWZ5SGFuZGxpbmcgbm90aWZ5LAorICAgICAgQEFzc2lzdGVkIENoYW5nZSBjKSB7CisgICAgc3VwZXIoZWEsIGMsICJjb21tZW50Iik7CisgICAgdGhpcy5ub3RpZnkgPSBub3RpZnk7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBzZXRQYXRjaExpbmVDb21tZW50cyhmaW5hbCBMaXN0PFBhdGNoTGluZUNvbW1lbnQ+IHBsYykgewpAQCAtNjcsOSArNzEsMTMgQEAKICAgcHJvdGVjdGVkIHZvaWQgaW5pdCgpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiB7CiAgICAgc3VwZXIuaW5pdCgpOwogCi0gICAgY2NBbGxBcHByb3ZhbHMoKTsKLSAgICBiY2NTdGFycmVkQnkoKTsKLSAgICBiY2NXYXRjaGVzKE5vdGlmeVR5cGUuQUxMX0NPTU1FTlRTKTsKKyAgICBpZiAobm90aWZ5LmNvbXBhcmVUbyhOb3RpZnlIYW5kbGluZy5PV05FUl9SRVZJRVdFUlMpID49IDApIHsKKyAgICAgIGNjQWxsQXBwcm92YWxzKCk7CisgICAgfQorICAgIGlmIChub3RpZnkuY29tcGFyZVRvKE5vdGlmeUhhbmRsaW5nLkFMTCkgPj0gMCkgeworICAgICAgYmNjU3RhcnJlZEJ5KCk7CisgICAgICBpbmNsdWRlV2F0Y2hlcnMoTm90aWZ5VHlwZS5BTExfQ09NTUVOVFMpOworICAgIH0KICAgfQogCiAgIEBPdmVycmlkZQpAQCAtNzcsNiArODUsMTUgQEAKICAgICBhcHBlbmRUZXh0KHZlbG9jaWZ5RmlsZSgiQ29tbWVudC52bSIpKTsKICAgfQogCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCBmb3JtYXRGb290ZXIoKSB0aHJvd3MgRW1haWxFeGNlcHRpb24geworICAgIGFwcGVuZFRleHQodmVsb2NpZnlGaWxlKCJDb21tZW50Rm9vdGVyLnZtIikpOworICB9CisKKyAgcHVibGljIGJvb2xlYW4gaGFzSW5saW5lQ29tbWVudHMoKSB7CisgICAgcmV0dXJuICFpbmxpbmVDb21tZW50cy5pc0VtcHR5KCk7CisgIH0KKwogICBwdWJsaWMgU3RyaW5nIGdldElubGluZUNvbW1lbnRzKCkgewogICAgIHJldHVybiBnZXRJbmxpbmVDb21tZW50cygxKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1pdE1lc3NhZ2VFZGl0ZWRTZW5kZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21taXRNZXNzYWdlRWRpdGVkU2VuZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTM4OGYxNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21taXRNZXNzYWdlRWRpdGVkU2VuZGVyLmphdmEKQEAgLTAsMCArMSwzNiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKKworcHVibGljIGNsYXNzIENvbW1pdE1lc3NhZ2VFZGl0ZWRTZW5kZXIgZXh0ZW5kcyBSZXBsYWNlUGF0Y2hTZXRTZW5kZXIgeworICBwdWJsaWMgc3RhdGljIGludGVyZmFjZSBGYWN0b3J5IHsKKyAgICBDb21taXRNZXNzYWdlRWRpdGVkU2VuZGVyIGNyZWF0ZShDaGFuZ2UgY2hhbmdlKTsKKyAgfQorCisgIEBJbmplY3QKKyAgcHVibGljIENvbW1pdE1lc3NhZ2VFZGl0ZWRTZW5kZXIoRW1haWxBcmd1bWVudHMgZWEsIEBBc3Npc3RlZCBDaGFuZ2UgYykgeworICAgIHN1cGVyKGVhLCBjKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBmb3JtYXRDaGFuZ2UoKSB0aHJvd3MgRW1haWxFeGNlcHRpb24geworICAgIGFwcGVuZFRleHQodmVsb2NpZnlGaWxlKCJDb21taXRNZXNzYWdlRWRpdGVkLnZtIikpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ3JlYXRlQ2hhbmdlU2VuZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ3JlYXRlQ2hhbmdlU2VuZGVyLmphdmEKaW5kZXggOWI4MmM3MS4uM2M5ZjM5YyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NyZWF0ZUNoYW5nZVNlbmRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9DcmVhdGVDaGFuZ2VTZW5kZXIuamF2YQpAQCAtMTQsMTEgKzE0LDEyIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWw7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkVtYWlsRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50UHJvamVjdFdhdGNoLk5vdGlmeVR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlByb2plY3RXYXRjaC5XYXRjaGVyczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKQEAgLTM2LDEwICszNyw4IEBACiAgIH0KIAogICBASW5qZWN0Ci0gIHB1YmxpYyBDcmVhdGVDaGFuZ2VTZW5kZXIoRW1haWxBcmd1bWVudHMgZWEsCi0gICAgICBAQW5vbnltb3VzQ293YXJkTmFtZSBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwgU3NoSW5mbyBzc2hJbmZvLAotICAgICAgQEFzc2lzdGVkIENoYW5nZSBjKSB7Ci0gICAgc3VwZXIoZWEsIGFub255bW91c0Nvd2FyZE5hbWUsIHNzaEluZm8sIGMpOworICBwdWJsaWMgQ3JlYXRlQ2hhbmdlU2VuZGVyKEVtYWlsQXJndW1lbnRzIGVhLCBAQXNzaXN0ZWQgQ2hhbmdlIGMpIHsKKyAgICBzdXBlcihlYSwgYyk7CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTQ3LDMxICs0NiwzMyBAQAogICAgIHN1cGVyLmluaXQoKTsKIAogICAgIHRyeSB7Ci0gICAgICAvLyBCQ0MgYW55b25lIHdobyBoYXMgaW50ZXJlc3QgaW4gdGhpcyBwcm9qZWN0J3MgY2hhbmdlcwotICAgICAgLy8gVHJ5IHRvIG1hcmsgaW50ZXJlc3RlZCBvd25lcnMgd2l0aCBhIFRPIGFuZCBub3QgYSBCQ0MgbGluZS4KLSAgICAgIC8vCi0gICAgICBXYXRjaGVycyBtYXRjaGluZyA9IGdldFdhdGNoZXMoTm90aWZ5VHlwZS5ORVdfQ0hBTkdFUyk7Ci0gICAgICBmb3IgKEFjY291bnQuSWQgdXNlciA6IG1hdGNoaW5nLmFjY291bnRzKSB7CisgICAgICAvLyBUcnkgdG8gbWFyayBpbnRlcmVzdGVkIG93bmVycyB3aXRoIFRPIGFuZCBDQyBvciBCQ0MgbGluZS4KKyAgICAgIFdhdGNoZXJzIG1hdGNoaW5nID0gZ2V0V2F0Y2hlcnMoTm90aWZ5VHlwZS5ORVdfQ0hBTkdFUyk7CisgICAgICBmb3IgKEFjY291bnQuSWQgdXNlciA6IEl0ZXJhYmxlcy5jb25jYXQoCisgICAgICAgICAgbWF0Y2hpbmcudG8uYWNjb3VudHMsCisgICAgICAgICAgbWF0Y2hpbmcuY2MuYWNjb3VudHMsCisgICAgICAgICAgbWF0Y2hpbmcuYmNjLmFjY291bnRzKSkgewogICAgICAgICBpZiAoaXNPd25lck9mUHJvamVjdE9yQnJhbmNoKHVzZXIpKSB7CiAgICAgICAgICAgYWRkKFJlY2lwaWVudFR5cGUuVE8sIHVzZXIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgIGFkZChSZWNpcGllbnRUeXBlLkJDQywgdXNlcik7CiAgICAgICAgIH0KICAgICAgIH0KLSAgICAgIGZvciAoQWRkcmVzcyBhZGRyIDogbWF0Y2hpbmcuZW1haWxzKSB7Ci0gICAgICAgIGFkZChSZWNpcGllbnRUeXBlLkJDQywgYWRkcik7Ci0gICAgICB9CisKKyAgICAgIC8vIEFkZCBldmVyeW9uZSBlbHNlLiBPd25lcnMgYWRkZWQgYWJvdmUgd2lsbCBub3QgYmUgZHVwbGljYXRlZC4KKyAgICAgIGFkZChSZWNpcGllbnRUeXBlLlRPLCBtYXRjaGluZy50byk7CisgICAgICBhZGQoUmVjaXBpZW50VHlwZS5DQywgbWF0Y2hpbmcuY2MpOworICAgICAgYWRkKFJlY2lwaWVudFR5cGUuQkNDLCBtYXRjaGluZy5iY2MpOwogICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlcnIpIHsKICAgICAgIC8vIEp1c3QgZG9uJ3QgQ0MgZXZlcnlvbmUuIEJldHRlciB0byBzZW5kIGEgcGFydGlhbCBtZXNzYWdlIHRvIHRob3NlCiAgICAgICAvLyB3ZSBhbHJlYWR5IGhhdmUgcXVldWVkIHVwIHRoZW4gdG8gZmFpbCBkZWxpdmVyIGVudGlyZWx5IHRvIHBlb3BsZQogICAgICAgLy8gd2hvIGhhdmUgYSBsb3dlciBpbnRlcmVzdCBpbiB0aGUgY2hhbmdlLgotICAgICAgbG9nLndhcm4oIkNhbm5vdCBCQ0Mgd2F0Y2hlcnMgZm9yIG5ldyBjaGFuZ2UiLCBlcnIpOworICAgICAgbG9nLndhcm4oIkNhbm5vdCBub3RpZnkgd2F0Y2hlcnMgZm9yIG5ldyBjaGFuZ2UiLCBlcnIpOwogICAgIH0KKworICAgIGluY2x1ZGVXYXRjaGVycyhOb3RpZnlUeXBlLk5FV19QQVRDSFNFVFMpOwogICB9CiAKICAgcHJpdmF0ZSBib29sZWFuIGlzT3duZXJPZlByb2plY3RPckJyYW5jaChBY2NvdW50LklkIHVzZXIpIHsKICAgICByZXR1cm4gcHJvamVjdFN0YXRlICE9IG51bGwKLSAgICAgICAgJiYgY2hhbmdlICE9IG51bGwKICAgICAgICAgJiYgcHJvamVjdFN0YXRlLmNvbnRyb2xGb3IoYXJncy5pZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKHVzZXIpKQogICAgICAgICAgIC5jb250cm9sRm9yUmVmKGNoYW5nZS5nZXREZXN0KCkpCiAgICAgICAgICAgLmlzT3duZXIoKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9FbWFpbEFyZ3VtZW50cy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0VtYWlsQXJndW1lbnRzLmphdmEKaW5kZXggZTZlZGE4Mi4uM2U1MDI4MyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0VtYWlsQXJndW1lbnRzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0VtYWlsQXJndW1lbnRzLmphdmEKQEAgLTIxLDcgKzIxLDkgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50Q2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2FwYWJpbGl0eUNvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBCYWNrZW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwSW5jbHVkZUNhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQWxsUHJvamVjdHNOYW1lOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQW5vbnltb3VzQ293YXJkTmFtZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3RDYWNoZTsKQEAgLTI5LDE3ICszMSwyMSBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZVF1ZXJ5QnVpbGRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZVF1ZXJ5UmV3cml0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hBZHZlcnRpc2VkQWRkcmVzc2VzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIAogaW1wb3J0IG9yZy5hcGFjaGUudmVsb2NpdHkucnVudGltZS5SdW50aW1lSW5zdGFuY2U7CiAKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKwogaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CiAKIGNsYXNzIEVtYWlsQXJndW1lbnRzIHsKICAgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgc2VydmVyOwogICBmaW5hbCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlOwogICBmaW5hbCBHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kOworICBmaW5hbCBHcm91cEluY2x1ZGVDYWNoZSBncm91cEluY2x1ZGVzOwogICBmaW5hbCBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlOwogICBmaW5hbCBQYXRjaExpc3RDYWNoZSBwYXRjaExpc3RDYWNoZTsKICAgZmluYWwgRnJvbUFkZHJlc3NHZW5lcmF0b3IgZnJvbUFkZHJlc3NHZW5lcmF0b3I7CkBAIC00OCw4ICs1NCwxMCBAQAogICBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3Rvcnk7CiAgIGZpbmFsIENhcGFiaWxpdHlDb250cm9sLkZhY3RvcnkgY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5OwogICBmaW5hbCBBbm9ueW1vdXNVc2VyIGFub255bW91c1VzZXI7CisgIGZpbmFsIFN0cmluZyBhbm9ueW1vdXNDb3dhcmROYW1lOwogICBmaW5hbCBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyOwogICBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lOworICBmaW5hbCBMaXN0PFN0cmluZz4gc3NoQWRkcmVzc2VzOwogCiAgIGZpbmFsIENoYW5nZVF1ZXJ5QnVpbGRlci5GYWN0b3J5IHF1ZXJ5QnVpbGRlcjsKICAgZmluYWwgUHJvdmlkZXI8Q2hhbmdlUXVlcnlSZXdyaXRlcj4gcXVlcnlSZXdyaXRlcjsKQEAgLTU5LDIxICs2NywyNSBAQAogCiAgIEBJbmplY3QKICAgRW1haWxBcmd1bWVudHMoR2l0UmVwb3NpdG9yeU1hbmFnZXIgc2VydmVyLCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlLAotICAgICAgR3JvdXBCYWNrZW5kIGdyb3VwQmFja2VuZCwgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZSwKKyAgICAgIEdyb3VwQmFja2VuZCBncm91cEJhY2tlbmQsIEdyb3VwSW5jbHVkZUNhY2hlIGdyb3VwSW5jbHVkZXMsCisgICAgICBBY2NvdW50Q2FjaGUgYWNjb3VudENhY2hlLAogICAgICAgUGF0Y2hMaXN0Q2FjaGUgcGF0Y2hMaXN0Q2FjaGUsIEZyb21BZGRyZXNzR2VuZXJhdG9yIGZyb21BZGRyZXNzR2VuZXJhdG9yLAogICAgICAgRW1haWxTZW5kZXIgZW1haWxTZW5kZXIsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKICAgICAgIEdlbmVyaWNGYWN0b3J5IGlkZW50aWZpZWRVc2VyRmFjdG9yeSwKICAgICAgIENhcGFiaWxpdHlDb250cm9sLkZhY3RvcnkgY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5LAogICAgICAgQW5vbnltb3VzVXNlciBhbm9ueW1vdXNVc2VyLAorICAgICAgQEFub255bW91c0Nvd2FyZE5hbWUgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWUsCiAgICAgICBAQ2Fub25pY2FsV2ViVXJsIEBOdWxsYWJsZSBQcm92aWRlcjxTdHJpbmc+IHVybFByb3ZpZGVyLAogICAgICAgQWxsUHJvamVjdHNOYW1lIGFsbFByb2plY3RzTmFtZSwKICAgICAgIENoYW5nZVF1ZXJ5QnVpbGRlci5GYWN0b3J5IHF1ZXJ5QnVpbGRlciwKICAgICAgIFByb3ZpZGVyPENoYW5nZVF1ZXJ5UmV3cml0ZXI+IHF1ZXJ5UmV3cml0ZXIsIFByb3ZpZGVyPFJldmlld0RiPiBkYiwKICAgICAgIFJ1bnRpbWVJbnN0YW5jZSB2ZWxvY2l0eVJ1bnRpbWUsCi0gICAgICBFbWFpbFNldHRpbmdzIHNldHRpbmdzKSB7CisgICAgICBFbWFpbFNldHRpbmdzIHNldHRpbmdzLAorICAgICAgQFNzaEFkdmVydGlzZWRBZGRyZXNzZXMgTGlzdDxTdHJpbmc+IHNzaEFkZHJlc3NlcykgewogICAgIHRoaXMuc2VydmVyID0gc2VydmVyOwogICAgIHRoaXMucHJvamVjdENhY2hlID0gcHJvamVjdENhY2hlOwogICAgIHRoaXMuZ3JvdXBCYWNrZW5kID0gZ3JvdXBCYWNrZW5kOworICAgIHRoaXMuZ3JvdXBJbmNsdWRlcyA9IGdyb3VwSW5jbHVkZXM7CiAgICAgdGhpcy5hY2NvdW50Q2FjaGUgPSBhY2NvdW50Q2FjaGU7CiAgICAgdGhpcy5wYXRjaExpc3RDYWNoZSA9IHBhdGNoTGlzdENhY2hlOwogICAgIHRoaXMuZnJvbUFkZHJlc3NHZW5lcmF0b3IgPSBmcm9tQWRkcmVzc0dlbmVyYXRvcjsKQEAgLTgyLDYgKzk0LDcgQEAKICAgICB0aGlzLmlkZW50aWZpZWRVc2VyRmFjdG9yeSA9IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKICAgICB0aGlzLmNhcGFiaWxpdHlDb250cm9sRmFjdG9yeSA9IGNhcGFiaWxpdHlDb250cm9sRmFjdG9yeTsKICAgICB0aGlzLmFub255bW91c1VzZXIgPSBhbm9ueW1vdXNVc2VyOworICAgIHRoaXMuYW5vbnltb3VzQ293YXJkTmFtZSA9IGFub255bW91c0Nvd2FyZE5hbWU7CiAgICAgdGhpcy51cmxQcm92aWRlciA9IHVybFByb3ZpZGVyOwogICAgIHRoaXMuYWxsUHJvamVjdHNOYW1lID0gYWxsUHJvamVjdHNOYW1lOwogICAgIHRoaXMucXVlcnlCdWlsZGVyID0gcXVlcnlCdWlsZGVyOwpAQCAtODksNSArMTAyLDYgQEAKICAgICB0aGlzLmRiID0gZGI7CiAgICAgdGhpcy52ZWxvY2l0eVJ1bnRpbWUgPSB2ZWxvY2l0eVJ1bnRpbWU7CiAgICAgdGhpcy5zZXR0aW5ncyA9IHNldHRpbmdzOworICAgIHRoaXMuc3NoQWRkcmVzc2VzID0gc3NoQWRkcmVzc2VzOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvRW1haWxFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9FbWFpbEV4Y2VwdGlvbi5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBhMzNjYjYzLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9FbWFpbEV4Y2VwdGlvbi5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMjcgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOwotCi1wdWJsaWMgY2xhc3MgRW1haWxFeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24gewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsKLQotICBwdWJsaWMgRW1haWxFeGNlcHRpb24oU3RyaW5nIG1zZykgewotICAgIHN1cGVyKG1zZyk7Ci0gIH0KLQotICBwdWJsaWMgRW1haWxFeGNlcHRpb24oU3RyaW5nIG1zZywgVGhyb3dhYmxlIHdoeSkgewotICAgIHN1cGVyKG1zZywgd2h5KTsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0VtYWlsTW9kdWxlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvRW1haWxNb2R1bGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNTBmNTM4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0VtYWlsTW9kdWxlLmphdmEKQEAgLTAsMCArMSwyNyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5GYWN0b3J5TW9kdWxlOworCitwdWJsaWMgY2xhc3MgRW1haWxNb2R1bGUgZXh0ZW5kcyBGYWN0b3J5TW9kdWxlIHsKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICBmYWN0b3J5KEFiYW5kb25lZFNlbmRlci5GYWN0b3J5LmNsYXNzKTsKKyAgICBmYWN0b3J5KENvbW1lbnRTZW5kZXIuRmFjdG9yeS5jbGFzcyk7CisgICAgZmFjdG9yeShSZXZlcnRlZFNlbmRlci5GYWN0b3J5LmNsYXNzKTsKKyAgICBmYWN0b3J5KFJlc3RvcmVkU2VuZGVyLkZhY3RvcnkuY2xhc3MpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvRW1haWxTZW5kZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9FbWFpbFNlbmRlci5qYXZhCmluZGV4IDljNGY0YzQuLmE3YTEwMjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9FbWFpbFNlbmRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9FbWFpbFNlbmRlci5qYXZhCkBAIC0xNCw2ICsxNCw4IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWw7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkVtYWlsRXhjZXB0aW9uOworCiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL01haWxVdGlsLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvTWFpbFV0aWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mMjJjNmU0Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL01haWxVdGlsLmphdmEKQEAgLTAsMCArMSwxMzEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm9TdWNoQWNjb3VudEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudFJlc29sdmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnJldndhbGsuRm9vdGVyS2V5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5Gb290ZXJMaW5lOworCitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKK3B1YmxpYyBjbGFzcyBNYWlsVXRpbCB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIEZvb3RlcktleSBSRVZJRVdFRF9CWSA9IG5ldyBGb290ZXJLZXkoIlJldmlld2VkLWJ5Iik7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIEZvb3RlcktleSBURVNURURfQlkgPSBuZXcgRm9vdGVyS2V5KCJUZXN0ZWQtYnkiKTsKKworICBwdWJsaWMgc3RhdGljIE1haWxSZWNpcGllbnRzIGdldFJlY2lwaWVudHNGcm9tRm9vdGVycygKKyAgICAgIGZpbmFsIEFjY291bnRSZXNvbHZlciBhY2NvdW50UmVzb2x2ZXIsIGZpbmFsIFBhdGNoU2V0IHBzLAorICAgICAgZmluYWwgTGlzdDxGb290ZXJMaW5lPiBmb290ZXJMaW5lcykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgZmluYWwgTWFpbFJlY2lwaWVudHMgcmVjaXBpZW50cyA9IG5ldyBNYWlsUmVjaXBpZW50cygpOworICAgIGlmICghcHMuaXNEcmFmdCgpKSB7CisgICAgICBmb3IgKGZpbmFsIEZvb3RlckxpbmUgZm9vdGVyTGluZSA6IGZvb3RlckxpbmVzKSB7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgaWYgKGlzUmV2aWV3ZXIoZm9vdGVyTGluZSkpIHsKKyAgICAgICAgICAgIHJlY2lwaWVudHMucmV2aWV3ZXJzLmFkZCh0b0FjY291bnRJZChhY2NvdW50UmVzb2x2ZXIsIGZvb3RlckxpbmUKKyAgICAgICAgICAgICAgICAuZ2V0VmFsdWUoKS50cmltKCkpKTsKKyAgICAgICAgICB9IGVsc2UgaWYgKGZvb3RlckxpbmUubWF0Y2hlcyhGb290ZXJLZXkuQ0MpKSB7CisgICAgICAgICAgICByZWNpcGllbnRzLmNjLmFkZCh0b0FjY291bnRJZChhY2NvdW50UmVzb2x2ZXIsIGZvb3RlckxpbmUKKyAgICAgICAgICAgICAgICAuZ2V0VmFsdWUoKS50cmltKCkpKTsKKyAgICAgICAgICB9CisgICAgICAgIH0gY2F0Y2ggKE5vU3VjaEFjY291bnRFeGNlcHRpb24gZSkgeworICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIHJldHVybiByZWNpcGllbnRzOworICB9CisKKyAgcHVibGljIHN0YXRpYyBNYWlsUmVjaXBpZW50cyBnZXRSZWNpcGllbnRzRnJvbUFwcHJvdmFscygKKyAgICAgIGZpbmFsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzKSB7CisgICAgZmluYWwgTWFpbFJlY2lwaWVudHMgcmVjaXBpZW50cyA9IG5ldyBNYWlsUmVjaXBpZW50cygpOworICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogYXBwcm92YWxzKSB7CisgICAgICBpZiAoYS5nZXRWYWx1ZSgpICE9IDApIHsKKyAgICAgICAgcmVjaXBpZW50cy5yZXZpZXdlcnMuYWRkKGEuZ2V0QWNjb3VudElkKCkpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgcmVjaXBpZW50cy5jYy5hZGQoYS5nZXRBY2NvdW50SWQoKSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiByZWNpcGllbnRzOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgQWNjb3VudC5JZCB0b0FjY291bnRJZChmaW5hbCBBY2NvdW50UmVzb2x2ZXIgYWNjb3VudFJlc29sdmVyLAorICAgICAgZmluYWwgU3RyaW5nIG5hbWVPckVtYWlsKSB0aHJvd3MgT3JtRXhjZXB0aW9uLCBOb1N1Y2hBY2NvdW50RXhjZXB0aW9uIHsKKyAgICBmaW5hbCBBY2NvdW50IGEgPSBhY2NvdW50UmVzb2x2ZXIuZmluZEJ5TmFtZU9yRW1haWwobmFtZU9yRW1haWwpOworICAgIGlmIChhID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBOb1N1Y2hBY2NvdW50RXhjZXB0aW9uKCJcIiIgKyBuYW1lT3JFbWFpbAorICAgICAgICAgICsgIlwiIGlzIG5vdCByZWdpc3RlcmVkIik7CisgICAgfQorICAgIHJldHVybiBhLmdldElkKCk7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBib29sZWFuIGlzUmV2aWV3ZXIoZmluYWwgRm9vdGVyTGluZSBjYW5kaWRhdGVGb290ZXJMaW5lKSB7CisgICAgcmV0dXJuIGNhbmRpZGF0ZUZvb3RlckxpbmUubWF0Y2hlcyhGb290ZXJLZXkuU0lHTkVEX09GRl9CWSkKKyAgICAgICAgfHwgY2FuZGlkYXRlRm9vdGVyTGluZS5tYXRjaGVzKEZvb3RlcktleS5BQ0tFRF9CWSkKKyAgICAgICAgfHwgY2FuZGlkYXRlRm9vdGVyTGluZS5tYXRjaGVzKFJFVklFV0VEX0JZKQorICAgICAgICB8fCBjYW5kaWRhdGVGb290ZXJMaW5lLm1hdGNoZXMoVEVTVEVEX0JZKTsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgTWFpbFJlY2lwaWVudHMgeworICAgIHByaXZhdGUgZmluYWwgU2V0PEFjY291bnQuSWQ+IHJldmlld2VyczsKKyAgICBwcml2YXRlIGZpbmFsIFNldDxBY2NvdW50LklkPiBjYzsKKworICAgIHB1YmxpYyBNYWlsUmVjaXBpZW50cygpIHsKKyAgICAgIHRoaXMucmV2aWV3ZXJzID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4oKTsKKyAgICAgIHRoaXMuY2MgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPigpOworICAgIH0KKworICAgIHB1YmxpYyBNYWlsUmVjaXBpZW50cyhmaW5hbCBTZXQ8QWNjb3VudC5JZD4gcmV2aWV3ZXJzLAorICAgICAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gY2MpIHsKKyAgICAgIHRoaXMucmV2aWV3ZXJzID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4ocmV2aWV3ZXJzKTsKKyAgICAgIHRoaXMuY2MgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPihjYyk7CisgICAgfQorCisgICAgcHVibGljIHZvaWQgYWRkKGZpbmFsIE1haWxSZWNpcGllbnRzIHJlY2lwaWVudHMpIHsKKyAgICAgIHJldmlld2Vycy5hZGRBbGwocmVjaXBpZW50cy5yZXZpZXdlcnMpOworICAgICAgY2MuYWRkQWxsKHJlY2lwaWVudHMuY2MpOworICAgIH0KKworICAgIHB1YmxpYyB2b2lkIHJlbW92ZShmaW5hbCBBY2NvdW50LklkIHRvUmVtb3ZlKSB7CisgICAgICByZXZpZXdlcnMucmVtb3ZlKHRvUmVtb3ZlKTsKKyAgICAgIGNjLnJlbW92ZSh0b1JlbW92ZSk7CisgICAgfQorCisgICAgcHVibGljIFNldDxBY2NvdW50LklkPiBnZXRSZXZpZXdlcnMoKSB7CisgICAgICByZXR1cm4gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlU2V0KHJldmlld2Vycyk7CisgICAgfQorCisgICAgcHVibGljIFNldDxBY2NvdW50LklkPiBnZXRDY09ubHkoKSB7CisgICAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gY2MgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPih0aGlzLmNjKTsKKyAgICAgIGNjLnJlbW92ZUFsbChyZXZpZXdlcnMpOworICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZVNldChjYyk7CisgICAgfQorCisgICAgcHVibGljIFNldDxBY2NvdW50LklkPiBnZXRBbGwoKSB7CisgICAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gYWxsID0KKyAgICAgICAgICBuZXcgSGFzaFNldDxBY2NvdW50LklkPihyZXZpZXdlcnMuc2l6ZSgpICsgY2Muc2l6ZSgpKTsKKyAgICAgIGFsbC5hZGRBbGwocmV2aWV3ZXJzKTsKKyAgICAgIGFsbC5hZGRBbGwoY2MpOworICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLnVubW9kaWZpYWJsZVNldChhbGwpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL01lcmdlRmFpbFNlbmRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL01lcmdlRmFpbFNlbmRlci5qYXZhCmluZGV4IGI2OTVmYjQuLjNhNWY3ZWIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9NZXJnZUZhaWxTZW5kZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvTWVyZ2VGYWlsU2VuZGVyLmphdmEKQEAgLTE0LDggKzE0LDggQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbDsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuRW1haWxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwogCkBAIC0yNiw5ICsyNiw4IEBACiAgIH0KIAogICBASW5qZWN0Ci0gIHB1YmxpYyBNZXJnZUZhaWxTZW5kZXIoRW1haWxBcmd1bWVudHMgZWEsCi0gICAgICBAQW5vbnltb3VzQ293YXJkTmFtZSBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwgQEFzc2lzdGVkIENoYW5nZSBjKSB7Ci0gICAgc3VwZXIoZWEsIGFub255bW91c0Nvd2FyZE5hbWUsIGMsICJtZXJnZS1mYWlsZWQiKTsKKyAgcHVibGljIE1lcmdlRmFpbFNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwgQEFzc2lzdGVkIENoYW5nZSBjKSB7CisgICAgc3VwZXIoZWEsIGMsICJtZXJnZS1mYWlsZWQiKTsKICAgfQogCiAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL01lcmdlZFNlbmRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL01lcmdlZFNlbmRlci5qYXZhCmluZGV4IDcwYjJkN2YuLjM3ZDgwMGQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9NZXJnZWRTZW5kZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvTWVyZ2VkU2VuZGVyLmphdmEKQEAgLTE0LDM2ICsxNCwzMiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOwogCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5IYXNoQmFzZWRUYWJsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlRhYmxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVmFsdWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeVZhbHVlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRQcm9qZWN0V2F0Y2guTm90aWZ5VHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKIAotaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwotaW1wb3J0IGphdmEudXRpbC5NYXA7Ci0KIC8qKiBTZW5kIG5vdGljZSBhYm91dCBhIGNoYW5nZSBzdWNjZXNzZnVsbHkgbWVyZ2VkLiAqLwogcHVibGljIGNsYXNzIE1lcmdlZFNlbmRlciBleHRlbmRzIFJlcGx5VG9DaGFuZ2VTZW5kZXIgewogICBwdWJsaWMgc3RhdGljIGludGVyZmFjZSBGYWN0b3J5IHsKLSAgICBwdWJsaWMgTWVyZ2VkU2VuZGVyIGNyZWF0ZShDaGFuZ2UgY2hhbmdlKTsKKyAgICBwdWJsaWMgTWVyZ2VkU2VuZGVyIGNyZWF0ZShDaGFuZ2VDb250cm9sIGNoYW5nZSk7CiAgIH0KIAotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKKyAgcHJpdmF0ZSBmaW5hbCBMYWJlbFR5cGVzIGxhYmVsVHlwZXM7CiAKICAgQEluamVjdAotICBwdWJsaWMgTWVyZ2VkU2VuZGVyKEVtYWlsQXJndW1lbnRzIGVhLAotICAgICAgQEFub255bW91c0Nvd2FyZE5hbWUgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWUsIEFwcHJvdmFsVHlwZXMgYXQsCi0gICAgICBAQXNzaXN0ZWQgQ2hhbmdlIGMpIHsKLSAgICBzdXBlcihlYSwgYW5vbnltb3VzQ293YXJkTmFtZSwgYywgIm1lcmdlZCIpOwotICAgIGFwcHJvdmFsVHlwZXMgPSBhdDsKKyAgcHVibGljIE1lcmdlZFNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwgQEFzc2lzdGVkIENoYW5nZUNvbnRyb2wgYykgeworICAgIHN1cGVyKGVhLCBjLmdldENoYW5nZSgpLCAibWVyZ2VkIik7CisgICAgbGFiZWxUeXBlcyA9IGMuZ2V0TGFiZWxUeXBlcygpOwogICB9CiAKICAgQE92ZXJyaWRlCkBAIC01Miw4ICs0OCw4IEBACiAKICAgICBjY0FsbEFwcHJvdmFscygpOwogICAgIGJjY1N0YXJyZWRCeSgpOwotICAgIGJjY1dhdGNoZXMoTm90aWZ5VHlwZS5BTExfQ09NTUVOVFMpOwotICAgIGJjY1dhdGNoZXMoTm90aWZ5VHlwZS5TVUJNSVRURURfQ0hBTkdFUyk7CisgICAgaW5jbHVkZVdhdGNoZXJzKE5vdGlmeVR5cGUuQUxMX0NPTU1FTlRTKTsKKyAgICBpbmNsdWRlV2F0Y2hlcnMoTm90aWZ5VHlwZS5TVUJNSVRURURfQ0hBTkdFUyk7CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTYzLDE4ICs1OSwxOCBAQAogCiAgIHB1YmxpYyBTdHJpbmcgZ2V0QXBwcm92YWxzKCkgewogICAgIHRyeSB7Ci0gICAgICBmaW5hbCBNYXA8QWNjb3VudC5JZCwgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIFBhdGNoU2V0QXBwcm92YWw+PiBwb3MgPQotICAgICAgICAgIG5ldyBIYXNoTWFwPEFjY291bnQuSWQsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBQYXRjaFNldEFwcHJvdmFsPj4oKTsKLQotICAgICAgZmluYWwgTWFwPEFjY291bnQuSWQsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBQYXRjaFNldEFwcHJvdmFsPj4gbmVnID0KLSAgICAgICAgICBuZXcgSGFzaE1hcDxBY2NvdW50LklkLCBNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4+KCk7Ci0KKyAgICAgIFRhYmxlPEFjY291bnQuSWQsIFN0cmluZywgUGF0Y2hTZXRBcHByb3ZhbD4gcG9zID0gSGFzaEJhc2VkVGFibGUuY3JlYXRlKCk7CisgICAgICBUYWJsZTxBY2NvdW50LklkLCBTdHJpbmcsIFBhdGNoU2V0QXBwcm92YWw+IG5lZyA9IEhhc2hCYXNlZFRhYmxlLmNyZWF0ZSgpOwogICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGNhIDogYXJncy5kYi5nZXQoKS5wYXRjaFNldEFwcHJvdmFscygpCiAgICAgICAgICAgLmJ5UGF0Y2hTZXQocGF0Y2hTZXQuZ2V0SWQoKSkpIHsKKyAgICAgICAgTGFiZWxUeXBlIGx0ID0gbGFiZWxUeXBlcy5ieUxhYmVsKGNhLmdldExhYmVsSWQoKSk7CisgICAgICAgIGlmIChsdCA9PSBudWxsKSB7CisgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KICAgICAgICAgaWYgKGNhLmdldFZhbHVlKCkgPiAwKSB7Ci0gICAgICAgICAgaW5zZXJ0KHBvcywgY2EpOworICAgICAgICAgIHBvcy5wdXQoY2EuZ2V0QWNjb3VudElkKCksIGx0LmdldE5hbWUoKSwgY2EpOwogICAgICAgICB9IGVsc2UgaWYgKGNhLmdldFZhbHVlKCkgPCAwKSB7Ci0gICAgICAgICAgaW5zZXJ0KG5lZywgY2EpOworICAgICAgICAgIG5lZy5wdXQoY2EuZ2V0QWNjb3VudElkKCksIGx0LmdldE5hbWUoKSwgY2EpOwogICAgICAgICB9CiAgICAgICB9CiAKQEAgLTg1LDIyICs4MSwyMCBAQAogICAgIHJldHVybiAiIjsKICAgfQogCi0gIHByaXZhdGUgU3RyaW5nIGZvcm1hdChmaW5hbCBTdHJpbmcgdHlwZSwKLSAgICAgIGZpbmFsIE1hcDxBY2NvdW50LklkLCBNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4+IGxpc3QpIHsKKyAgcHJpdmF0ZSBTdHJpbmcgZm9ybWF0KFN0cmluZyB0eXBlLAorICAgICAgVGFibGU8QWNjb3VudC5JZCwgU3RyaW5nLCBQYXRjaFNldEFwcHJvdmFsPiBhcHByb3ZhbHMpIHsKICAgICBTdHJpbmdCdWlsZGVyIHR4dCA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgaWYgKGxpc3QuaXNFbXB0eSgpKSB7CisgICAgaWYgKGFwcHJvdmFscy5pc0VtcHR5KCkpIHsKICAgICAgIHJldHVybiAiIjsKICAgICB9Ci0gICAgdHh0LmFwcGVuZCh0eXBlICsgIjpcbiIpOwotICAgIGZvciAoZmluYWwgTWFwLkVudHJ5PEFjY291bnQuSWQsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBQYXRjaFNldEFwcHJvdmFsPj4gZW50IDogbGlzdAotICAgICAgICAuZW50cnlTZXQoKSkgewotICAgICAgZmluYWwgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIFBhdGNoU2V0QXBwcm92YWw+IGwgPSBlbnQuZ2V0VmFsdWUoKTsKKyAgICB0eHQuYXBwZW5kKHR5cGUpLmFwcGVuZCgiOlxuIik7CisgICAgZm9yIChBY2NvdW50LklkIGlkIDogYXBwcm92YWxzLnJvd0tleVNldCgpKSB7CiAgICAgICB0eHQuYXBwZW5kKCIgICIpOwotICAgICAgdHh0LmFwcGVuZChnZXROYW1lRm9yKGVudC5nZXRLZXkoKSkpOworICAgICAgdHh0LmFwcGVuZChnZXROYW1lRm9yKGlkKSk7CiAgICAgICB0eHQuYXBwZW5kKCI6ICIpOwogICAgICAgYm9vbGVhbiBmaXJzdCA9IHRydWU7Ci0gICAgICBmb3IgKEFwcHJvdmFsVHlwZSBhdCA6IGFwcHJvdmFsVHlwZXMuZ2V0QXBwcm92YWxUeXBlcygpKSB7Ci0gICAgICAgIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgY2EgPSBsLmdldChhdC5nZXRDYXRlZ29yeSgpLmdldElkKCkpOworICAgICAgZm9yIChMYWJlbFR5cGUgbHQgOiBsYWJlbFR5cGVzLmdldExhYmVsVHlwZXMoKSkgeworICAgICAgICBQYXRjaFNldEFwcHJvdmFsIGNhID0gYXBwcm92YWxzLmdldChpZCwgbHQuZ2V0TmFtZSgpKTsKICAgICAgICAgaWYgKGNhID09IG51bGwpIHsKICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpAQCAtMTExLDMyICsxMDUsMTggQEAKICAgICAgICAgICB0eHQuYXBwZW5kKCI7ICIpOwogICAgICAgICB9CiAKLSAgICAgICAgZmluYWwgQXBwcm92YWxDYXRlZ29yeVZhbHVlIHYgPSBhdC5nZXRWYWx1ZShjYSk7CisgICAgICAgIExhYmVsVmFsdWUgdiA9IGx0LmdldFZhbHVlKGNhKTsKICAgICAgICAgaWYgKHYgIT0gbnVsbCkgewotICAgICAgICAgIHR4dC5hcHBlbmQodi5nZXROYW1lKCkpOworICAgICAgICAgIHR4dC5hcHBlbmQodi5nZXRUZXh0KCkpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgIHR4dC5hcHBlbmQoYXQuZ2V0Q2F0ZWdvcnkoKS5nZXROYW1lKCkpOwotICAgICAgICAgIHR4dC5hcHBlbmQoIj0iKTsKLSAgICAgICAgICBpZiAoY2EuZ2V0VmFsdWUoKSA+IDApIHsKLSAgICAgICAgICAgIHR4dC5hcHBlbmQoIisiKTsKLSAgICAgICAgICB9Ci0gICAgICAgICAgdHh0LmFwcGVuZCgiIiArIGNhLmdldFZhbHVlKCkpOworICAgICAgICAgIHR4dC5hcHBlbmQobHQuZ2V0TmFtZSgpKTsKKyAgICAgICAgICB0eHQuYXBwZW5kKCc9Jyk7CisgICAgICAgICAgdHh0LmFwcGVuZChMYWJlbFZhbHVlLmZvcm1hdFZhbHVlKGNhLmdldFZhbHVlKCkpKTsKICAgICAgICAgfQogICAgICAgfQotICAgICAgdHh0LmFwcGVuZCgiXG4iKTsKKyAgICAgIHR4dC5hcHBlbmQoJ1xuJyk7CiAgICAgfQotICAgIHR4dC5hcHBlbmQoIlxuIik7CisgICAgdHh0LmFwcGVuZCgnXG4nKTsKICAgICByZXR1cm4gdHh0LnRvU3RyaW5nKCk7CiAgIH0KLQotICBwcml2YXRlIHZvaWQgaW5zZXJ0KAotICAgICAgZmluYWwgTWFwPEFjY291bnQuSWQsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBQYXRjaFNldEFwcHJvdmFsPj4gbGlzdCwKLSAgICAgIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgY2EpIHsKLSAgICBNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4gbSA9IGxpc3QuZ2V0KGNhLmdldEFjY291bnRJZCgpKTsKLSAgICBpZiAobSA9PSBudWxsKSB7Ci0gICAgICBtID0gbmV3IEhhc2hNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4oKTsKLSAgICAgIGxpc3QucHV0KGNhLmdldEFjY291bnRJZCgpLCBtKTsKLSAgICB9Ci0gICAgbS5wdXQoY2EuZ2V0Q2F0ZWdvcnlJZCgpLCBjYSk7Ci0gIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9OZXdDaGFuZ2VTZW5kZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9OZXdDaGFuZ2VTZW5kZXIuamF2YQppbmRleCA4MmMxNDA1Li45ZmYwZGJkIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvTmV3Q2hhbmdlU2VuZGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL05ld0NoYW5nZVNlbmRlci5qYXZhCkBAIC0xNCwyMyArMTQsMTAgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbDsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuRW1haWxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hMaXN0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3ROb3RBdmFpbGFibGVFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOwogCi1pbXBvcnQgY29tLmpjcmFmdC5qc2NoLkhvc3RLZXk7Ci0KLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmRpZmYuRGlmZkZvcm1hdHRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmludGVybmFsLkpHaXRUZXh0OwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLlJhd1BhcnNlVXRpbHM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLlRlbXBvcmFyeUJ1ZmZlcjsKLWltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOwotaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwotCi1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwpAQCAtMzksMTcgKzI2LDExIEBACiAKIC8qKiBTZW5kcyBhbiBlbWFpbCBhbGVydGluZyBhIHVzZXIgdG8gYSBuZXcgY2hhbmdlIGZvciB0aGVtIHRvIHJldmlldy4gKi8KIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBOZXdDaGFuZ2VTZW5kZXIgZXh0ZW5kcyBDaGFuZ2VFbWFpbCB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPQotICAgICAgTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoTmV3Q2hhbmdlU2VuZGVyLmNsYXNzKTsKLQotICBwcml2YXRlIGZpbmFsIFNzaEluZm8gc3NoSW5mbzsKICAgcHJpdmF0ZSBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gcmV2aWV3ZXJzID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4oKTsKICAgcHJpdmF0ZSBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gZXh0cmFDQyA9IG5ldyBIYXNoU2V0PEFjY291bnQuSWQ+KCk7CiAKLSAgcHJvdGVjdGVkIE5ld0NoYW5nZVNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWUsCi0gICAgICBTc2hJbmZvIHNzaEluZm8sIENoYW5nZSBjKSB7Ci0gICAgc3VwZXIoZWEsIGFub255bW91c0Nvd2FyZE5hbWUsIGMsICJuZXdjaGFuZ2UiKTsKLSAgICB0aGlzLnNzaEluZm8gPSBzc2hJbmZvOworICBwcm90ZWN0ZWQgTmV3Q2hhbmdlU2VuZGVyKEVtYWlsQXJndW1lbnRzIGVhLCBDaGFuZ2UgYykgeworICAgIHN1cGVyKGVhLCBjLCAibmV3Y2hhbmdlIik7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBhZGRSZXZpZXdlcnMoZmluYWwgQ29sbGVjdGlvbjxBY2NvdW50LklkPiBjYykgewpAQCAtODYsNjMgKzY3LDQgQEAKICAgICB9CiAgICAgcmV0dXJuIG5hbWVzOwogICB9Ci0KLSAgcHVibGljIFN0cmluZyBnZXRTc2hIb3N0KCkgewotICAgIGZpbmFsIExpc3Q8SG9zdEtleT4gaG9zdEtleXMgPSBzc2hJbmZvLmdldEhvc3RLZXlzKCk7Ci0gICAgaWYgKGhvc3RLZXlzLmlzRW1wdHkoKSkgewotICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfQotCi0gICAgZmluYWwgU3RyaW5nIGhvc3QgPSBob3N0S2V5cy5nZXQoMCkuZ2V0SG9zdCgpOwotICAgIGlmIChob3N0LnN0YXJ0c1dpdGgoIio6IikpIHsKLSAgICAgIHJldHVybiBnZXRHZXJyaXRIb3N0KCkgKyBob3N0LnN1YnN0cmluZygxKTsKLSAgICB9Ci0gICAgcmV0dXJuIGhvc3Q7Ci0gIH0KLQotICBwdWJsaWMgYm9vbGVhbiBnZXRJbmNsdWRlRGlmZigpIHsKLSAgICByZXR1cm4gYXJncy5zZXR0aW5ncy5pbmNsdWRlRGlmZjsKLSAgfQotCi0gIC8qKiBTaG93IHBhdGNoIHNldCBhcyB1bmlmaWVkIGRpZmZlcmVuY2UuICAqLwotICBwdWJsaWMgU3RyaW5nIGdldFVuaWZpZWREaWZmKCkgewotICAgIFBhdGNoTGlzdCBwYXRjaExpc3Q7Ci0gICAgdHJ5IHsKLSAgICAgIHBhdGNoTGlzdCA9IGdldFBhdGNoTGlzdCgpOwotICAgICAgaWYgKHBhdGNoTGlzdC5nZXRPbGRJZCgpID09IG51bGwpIHsKLSAgICAgICAgLy8gT2N0b3B1cyBtZXJnZXMgYXJlIG5vdCB3ZWxsIHN1cHBvcnRlZCBmb3IgZGlmZiBvdXRwdXQgYnkgR2Vycml0LgotICAgICAgICAvLyBDdXJyZW50bHkgdGhlc2UgYWx3YXlzIGhhdmUgYSBudWxsIG9sZElkIGluIHRoZSBQYXRjaExpc3QuCi0gICAgICAgIHJldHVybiAiIjsKLSAgICAgIH0KLSAgICB9IGNhdGNoIChQYXRjaExpc3ROb3RBdmFpbGFibGVFeGNlcHRpb24gZSkgewotICAgICAgbG9nLmVycm9yKCJDYW5ub3QgZm9ybWF0IHBhdGNoIiwgZSk7Ci0gICAgICByZXR1cm4gIiI7Ci0gICAgfQotCi0gICAgVGVtcG9yYXJ5QnVmZmVyLkhlYXAgYnVmID0KLSAgICAgICAgbmV3IFRlbXBvcmFyeUJ1ZmZlci5IZWFwKGFyZ3Muc2V0dGluZ3MubWF4aW11bURpZmZTaXplKTsKLSAgICBEaWZmRm9ybWF0dGVyIGZtdCA9IG5ldyBEaWZmRm9ybWF0dGVyKGJ1Zik7Ci0gICAgUmVwb3NpdG9yeSBnaXQ7Ci0gICAgdHJ5IHsKLSAgICAgIGdpdCA9IGFyZ3Muc2VydmVyLm9wZW5SZXBvc2l0b3J5KGNoYW5nZS5nZXRQcm9qZWN0KCkpOwotICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKLSAgICAgIGxvZy5lcnJvcigiQ2Fubm90IG9wZW4gcmVwb3NpdG9yeSB0byBmb3JtYXQgcGF0Y2giLCBlKTsKLSAgICAgIHJldHVybiAiIjsKLSAgICB9Ci0gICAgdHJ5IHsKLSAgICAgIGZtdC5zZXRSZXBvc2l0b3J5KGdpdCk7Ci0gICAgICBmbXQuc2V0RGV0ZWN0UmVuYW1lcyh0cnVlKTsKLSAgICAgIGZtdC5mb3JtYXQocGF0Y2hMaXN0LmdldE9sZElkKCksIHBhdGNoTGlzdC5nZXROZXdJZCgpKTsKLSAgICAgIHJldHVybiBSYXdQYXJzZVV0aWxzLmRlY29kZShidWYudG9CeXRlQXJyYXkoKSk7Ci0gICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgewotICAgICAgaWYgKEpHaXRUZXh0LmdldCgpLmluTWVtb3J5QnVmZmVyTGltaXRFeGNlZWRlZC5lcXVhbHMoZS5nZXRNZXNzYWdlKCkpKSB7Ci0gICAgICAgIHJldHVybiAiIjsKLSAgICAgIH0KLSAgICAgIGxvZy5lcnJvcigiQ2Fubm90IGZvcm1hdCBwYXRjaCIsIGUpOwotICAgICAgcmV0dXJuICIiOwotICAgIH0gZmluYWxseSB7Ci0gICAgICBmbXQucmVsZWFzZSgpOwotICAgICAgZ2l0LmNsb3NlKCk7Ci0gICAgfQotICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvTm90aWZpY2F0aW9uRW1haWwuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Ob3RpZmljYXRpb25FbWFpbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmYwYzQzZDMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvTm90aWZpY2F0aW9uRW1haWwuamF2YQpAQCAtMCwwICsxLDExMCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JdGVyYWJsZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudFByb2plY3RXYXRjaC5Ob3RpZnlUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5CcmFuY2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWwuUHJvamVjdFdhdGNoLldhdGNoZXJzOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CisKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCisvKioKKyAqIENvbW1vbiBjbGFzcyBmb3Igbm90aWZpY2F0aW9ucyB0aGF0IGFyZSByZWxhdGVkIHRvIGEgcHJvamVjdCBhbmQgYnJhbmNoCisgKi8KK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBOb3RpZmljYXRpb25FbWFpbCBleHRlbmRzIE91dGdvaW5nRW1haWwgeworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0KKyAgICAgIExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKE5vdGlmaWNhdGlvbkVtYWlsLmNsYXNzKTsKKworICBwcm90ZWN0ZWQgUHJvamVjdC5OYW1lS2V5IHByb2plY3Q7CisgIHByb3RlY3RlZCBCcmFuY2guTmFtZUtleSBicmFuY2g7CisKKyAgcHJvdGVjdGVkIE5vdGlmaWNhdGlvbkVtYWlsKEVtYWlsQXJndW1lbnRzIGVhLAorICAgICAgU3RyaW5nIG1jLCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgQnJhbmNoLk5hbWVLZXkgYnJhbmNoKSB7CisgICAgc3VwZXIoZWEsIG1jKTsKKworICAgIHRoaXMucHJvamVjdCA9IHByb2plY3Q7CisgICAgdGhpcy5icmFuY2ggPSBicmFuY2g7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgaW5pdCgpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiB7CisgICAgc3VwZXIuaW5pdCgpOworICAgIHNldExpc3RJZEhlYWRlcigpOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHNldExpc3RJZEhlYWRlcigpIHRocm93cyBFbWFpbEV4Y2VwdGlvbiB7CisgICAgLy8gU2V0IGEgcmVhc29uYWJsZSBsaXN0IGlkIHNvIHRoYXQgZmlsdGVycyBjYW4gYmUgdXNlZCB0byBzb3J0IG1lc3NhZ2VzCisgICAgc2V0VkhlYWRlcigiTGlzdC1JZCIsICI8JGVtYWlsLmxpc3RJZC5yZXBsYWNlKCdAJywgJy4nKT4iKTsKKyAgICBpZiAoZ2V0U2V0dGluZ3NVcmwoKSAhPSBudWxsKSB7CisgICAgICBzZXRWSGVhZGVyKCJMaXN0LVVuc3Vic2NyaWJlIiwgIjwkZW1haWwuc2V0dGluZ3NVcmw+Iik7CisgICAgfQorICB9CisKKyAgcHVibGljIFN0cmluZyBnZXRMaXN0SWQoKSB0aHJvd3MgRW1haWxFeGNlcHRpb24geworICAgIHJldHVybiB2ZWxvY2lmeSgiZ2Vycml0LSRwcm9qZWN0TmFtZS5yZXBsYWNlKCcvJywgJy0nKUAkZW1haWwuZ2Vycml0SG9zdCIpOworICB9CisKKyAgLyoqIEluY2x1ZGUgdXNlcnMgYW5kIGdyb3VwcyB0aGF0IHdhbnQgbm90aWZpY2F0aW9uIG9mIGV2ZW50cy4gKi8KKyAgcHJvdGVjdGVkIHZvaWQgaW5jbHVkZVdhdGNoZXJzKE5vdGlmeVR5cGUgdHlwZSkgeworICAgIHRyeSB7CisgICAgICBXYXRjaGVycyBtYXRjaGluZyA9IGdldFdhdGNoZXJzKHR5cGUpOworICAgICAgYWRkKFJlY2lwaWVudFR5cGUuVE8sIG1hdGNoaW5nLnRvKTsKKyAgICAgIGFkZChSZWNpcGllbnRUeXBlLkNDLCBtYXRjaGluZy5jYyk7CisgICAgICBhZGQoUmVjaXBpZW50VHlwZS5CQ0MsIG1hdGNoaW5nLmJjYyk7CisgICAgfSBjYXRjaCAoT3JtRXhjZXB0aW9uIGVycikgeworICAgICAgLy8gSnVzdCBkb24ndCBDQyBldmVyeW9uZS4gQmV0dGVyIHRvIHNlbmQgYSBwYXJ0aWFsIG1lc3NhZ2UgdG8gdGhvc2UKKyAgICAgIC8vIHdlIGFscmVhZHkgaGF2ZSBxdWV1ZWQgdXAgdGhlbiB0byBmYWlsIGRlbGl2ZXIgZW50aXJlbHkgdG8gcGVvcGxlCisgICAgICAvLyB3aG8gaGF2ZSBhIGxvd2VyIGludGVyZXN0IGluIHRoZSBjaGFuZ2UuCisgICAgICBsb2cud2FybigiQ2Fubm90IEJDQyB3YXRjaGVycyBmb3IgIiArIHR5cGUsIGVycik7CisgICAgfQorICB9CisKKyAgLyoqIFJldHVybnMgYWxsIHdhdGNoZXJzIHRoYXQgYXJlIHJlbGV2YW50ICovCisgIHByb3RlY3RlZCBhYnN0cmFjdCBXYXRjaGVycyBnZXRXYXRjaGVycyhOb3RpZnlUeXBlIHR5cGUpIHRocm93cyBPcm1FeGNlcHRpb247CisKKyAgLyoqIEFkZCB1c2VycyBvciBlbWFpbCBhZGRyZXNzZXMgdG8gdGhlIFRPLCBDQywgb3IgQkNDIGxpc3QuICovCisgIHByb3RlY3RlZCB2b2lkIGFkZChSZWNpcGllbnRUeXBlIHR5cGUsIFdhdGNoZXJzLkxpc3QgbGlzdCkgeworICAgIGZvciAoQWNjb3VudC5JZCB1c2VyIDogbGlzdC5hY2NvdW50cykgeworICAgICAgYWRkKHR5cGUsIHVzZXIpOworICAgIH0KKyAgICBmb3IgKEFkZHJlc3MgYWRkciA6IGxpc3QuZW1haWxzKSB7CisgICAgICBhZGQodHlwZSwgYWRkcik7CisgICAgfQorICB9CisKKyAgcHVibGljIFN0cmluZyBnZXRTc2hIb3N0KCkgeworICAgIFN0cmluZyBob3N0ID0gSXRlcmFibGVzLmdldEZpcnN0KGFyZ3Muc3NoQWRkcmVzc2VzLCBudWxsKTsKKyAgICBpZiAoaG9zdCA9PSBudWxsKSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisgICAgaWYgKGhvc3Quc3RhcnRzV2l0aCgiKjoiKSkgeworICAgICAgcmV0dXJuIGdldEdlcnJpdEhvc3QoKSArIGhvc3Quc3Vic3RyaW5nKDEpOworICAgIH0KKyAgICByZXR1cm4gaG9zdDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBzZXR1cFZlbG9jaXR5Q29udGV4dCgpIHsKKyAgICBzdXBlci5zZXR1cFZlbG9jaXR5Q29udGV4dCgpOworICAgIHZlbG9jaXR5Q29udGV4dC5wdXQoInByb2plY3ROYW1lIiwgcHJvamVjdC5nZXQoKSk7CisgICAgdmVsb2NpdHlDb250ZXh0LnB1dCgiYnJhbmNoIiwgYnJhbmNoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL091dGdvaW5nRW1haWwuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9PdXRnb2luZ0VtYWlsLmphdmEKaW5kZXggY2FhNDQxZC4uOTk3YmMwMyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL091dGdvaW5nRW1haWwuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvT3V0Z29pbmdFbWFpbC5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOwogCiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuRW1haWxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlVzZXJJZGVudGl0eTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50U3RhdGU7CkBAIC01OSwxNCArNjAsMTEgQEAKICAgcHJvdGVjdGVkIFZlbG9jaXR5Q29udGV4dCB2ZWxvY2l0eUNvbnRleHQ7CiAKICAgcHJvdGVjdGVkIGZpbmFsIEVtYWlsQXJndW1lbnRzIGFyZ3M7Ci0gIHByaXZhdGUgZmluYWwgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWU7CiAgIHByb3RlY3RlZCBBY2NvdW50LklkIGZyb21JZDsKIAogCi0gIHByb3RlY3RlZCBPdXRnb2luZ0VtYWlsKEVtYWlsQXJndW1lbnRzIGVhLCBmaW5hbCBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwKLSAgICAgIGZpbmFsIFN0cmluZyBtYykgeworICBwcm90ZWN0ZWQgT3V0Z29pbmdFbWFpbChFbWFpbEFyZ3VtZW50cyBlYSwgU3RyaW5nIG1jKSB7CiAgICAgYXJncyA9IGVhOwotICAgIHRoaXMuYW5vbnltb3VzQ293YXJkTmFtZSA9IGFub255bW91c0Nvd2FyZE5hbWU7CiAgICAgbWVzc2FnZUNsYXNzID0gbWM7CiAgICAgaGVhZGVycyA9IG5ldyBMaW5rZWRIYXNoTWFwPFN0cmluZywgRW1haWxIZWFkZXI+KCk7CiAgIH0KQEAgLTIzNSw3ICsyMzMsNyBAQAogICAvKiogTG9va3VwIGEgaHVtYW4gcmVhZGFibGUgbmFtZSBmb3IgYW4gYWNjb3VudCwgdXN1YWxseSB0aGUgImZ1bGwgbmFtZSIuICovCiAgIHByb3RlY3RlZCBTdHJpbmcgZ2V0TmFtZUZvcihmaW5hbCBBY2NvdW50LklkIGFjY291bnRJZCkgewogICAgIGlmIChhY2NvdW50SWQgPT0gbnVsbCkgewotICAgICAgcmV0dXJuIGFub255bW91c0Nvd2FyZE5hbWU7CisgICAgICByZXR1cm4gYXJncy5hbm9ueW1vdXNDb3dhcmROYW1lOwogICAgIH0KIAogICAgIGZpbmFsIEFjY291bnQgdXNlckFjY291bnQgPSBhcmdzLmFjY291bnRDYWNoZS5nZXQoYWNjb3VudElkKS5nZXRBY2NvdW50KCk7CkBAIC0yNDQsNyArMjQyLDcgQEAKICAgICAgIG5hbWUgPSB1c2VyQWNjb3VudC5nZXRQcmVmZXJyZWRFbWFpbCgpOwogICAgIH0KICAgICBpZiAobmFtZSA9PSBudWxsKSB7Ci0gICAgICBuYW1lID0gYW5vbnltb3VzQ293YXJkTmFtZSArICIgIyIgKyBhY2NvdW50SWQ7CisgICAgICBuYW1lID0gYXJncy5hbm9ueW1vdXNDb3dhcmROYW1lICsgIiAjIiArIGFjY291bnRJZDsKICAgICB9CiAgICAgcmV0dXJuIG5hbWU7CiAgIH0KQEAgLTI2Myw3ICsyNjEsNyBAQAogICAgICAgcmV0dXJuIGVtYWlsOwogCiAgICAgfSBlbHNlIC8qIChuYW1lID09IG51bGwgJiYgZW1haWwgPT0gbnVsbCkgKi97Ci0gICAgICByZXR1cm4gYW5vbnltb3VzQ293YXJkTmFtZSArICIgIyIgKyBhY2NvdW50SWQ7CisgICAgICByZXR1cm4gYXJncy5hbm9ueW1vdXNDb3dhcmROYW1lICsgIiAjIiArIGFjY291bnRJZDsKICAgICB9CiAgIH0KIApAQCAtMzMyLDYgKzMzMCw4IEBACiAgICAgICAgICAgICBjYXNlIENDOgogICAgICAgICAgICAgICAoKEVtYWlsSGVhZGVyLkFkZHJlc3NMaXN0KSBoZWFkZXJzLmdldChIRFJfQ0MpKS5hZGQoYWRkcik7CiAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBCQ0M6CisgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Qcm9qZWN0V2F0Y2guamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Qcm9qZWN0V2F0Y2guamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi44NDMwNGI4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1Byb2plY3RXYXRjaC5qYXZhCkBAIC0wLDAgKzEsMjE2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXNjcmlwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cERlc2NyaXB0aW9uczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cFJlZmVyZW5jZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBNZW1iZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRQcm9qZWN0V2F0Y2g7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRQcm9qZWN0V2F0Y2guTm90aWZ5VHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk5vdGlmeUNvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0U3RhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LlByZWRpY2F0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuUXVlcnlQYXJzZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZURhdGE7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LmNoYW5nZS5DaGFuZ2VRdWVyeUJ1aWxkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LmNoYW5nZS5TaW5nbGVHcm91cFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKKworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CisKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCitwdWJsaWMgY2xhc3MgUHJvamVjdFdhdGNoIHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKFByb2plY3RXYXRjaC5jbGFzcyk7CisKKyAgcHJvdGVjdGVkIGZpbmFsIEVtYWlsQXJndW1lbnRzIGFyZ3M7CisgIHByb3RlY3RlZCBmaW5hbCBQcm9qZWN0U3RhdGUgcHJvamVjdFN0YXRlOworICBwcm90ZWN0ZWQgZmluYWwgUHJvamVjdC5OYW1lS2V5IHByb2plY3Q7CisgIHByb3RlY3RlZCBmaW5hbCBDaGFuZ2VEYXRhIGNoYW5nZURhdGE7CisKKyAgcHVibGljIFByb2plY3RXYXRjaChFbWFpbEFyZ3VtZW50cyBhcmdzLCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwKKyAgICBQcm9qZWN0U3RhdGUgcHJvamVjdFN0YXRlLCBDaGFuZ2VEYXRhIGNoYW5nZURhdGEpIHsKKyAgICB0aGlzLmFyZ3MgPSBhcmdzOworICAgIHRoaXMucHJvamVjdCA9IHByb2plY3Q7CisgICAgdGhpcy5wcm9qZWN0U3RhdGUgPSBwcm9qZWN0U3RhdGU7CisgICAgdGhpcy5jaGFuZ2VEYXRhID0gY2hhbmdlRGF0YTsKKyAgfQorCisgIC8qKiBSZXR1cm5zIGFsbCB3YXRjaGVycyB0aGF0IGFyZSByZWxldmFudCAqLworICBwdWJsaWMgZmluYWwgV2F0Y2hlcnMgZ2V0V2F0Y2hlcnMoTm90aWZ5VHlwZSB0eXBlKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBXYXRjaGVycyBtYXRjaGluZyA9IG5ldyBXYXRjaGVycygpOworICAgIFNldDxBY2NvdW50LklkPiBwcm9qZWN0V2F0Y2hlcnMgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPigpOworCisgICAgZm9yIChBY2NvdW50UHJvamVjdFdhdGNoIHcgOiBhcmdzLmRiLmdldCgpLmFjY291bnRQcm9qZWN0V2F0Y2hlcygpCisgICAgICAgIC5ieVByb2plY3QocHJvamVjdCkpIHsKKyAgICAgIGlmICh3LmlzTm90aWZ5KHR5cGUpKSB7CisgICAgICAgIHByb2plY3RXYXRjaGVycy5hZGQody5nZXRBY2NvdW50SWQoKSk7CisgICAgICAgIGFkZChtYXRjaGluZywgdyk7CisgICAgICB9CisgICAgfQorCisgICAgZm9yIChBY2NvdW50UHJvamVjdFdhdGNoIHcgOiBhcmdzLmRiLmdldCgpLmFjY291bnRQcm9qZWN0V2F0Y2hlcygpCisgICAgICAgIC5ieVByb2plY3QoYXJncy5hbGxQcm9qZWN0c05hbWUpKSB7CisgICAgICBpZiAoIXByb2plY3RXYXRjaGVycy5jb250YWlucyh3LmdldEFjY291bnRJZCgpKSAmJiB3LmlzTm90aWZ5KHR5cGUpKSB7CisgICAgICAgIGFkZChtYXRjaGluZywgdyk7CisgICAgICB9CisgICAgfQorCisgICAgZm9yIChQcm9qZWN0U3RhdGUgc3RhdGUgOiBwcm9qZWN0U3RhdGUudHJlZSgpKSB7CisgICAgICBmb3IgKE5vdGlmeUNvbmZpZyBuYyA6IHN0YXRlLmdldENvbmZpZygpLmdldE5vdGlmeUNvbmZpZ3MoKSkgeworICAgICAgICBpZiAobmMuaXNOb3RpZnkodHlwZSkpIHsKKyAgICAgICAgICB0cnkgeworICAgICAgICAgICAgYWRkKG1hdGNoaW5nLCBuYywgc3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSk7CisgICAgICAgICAgfSBjYXRjaCAoUXVlcnlQYXJzZUV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICBsb2cud2FybihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgICAgICJQcm9qZWN0ICVzIGhhcyBpbnZhbGlkIG5vdGlmeSAlcyBmaWx0ZXIgXCIlc1wiOiAlcyIsCisgICAgICAgICAgICAgICAgc3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWUoKSwgbmMuZ2V0TmFtZSgpLAorICAgICAgICAgICAgICAgIG5jLmdldEZpbHRlcigpLCBlLmdldE1lc3NhZ2UoKSkpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBtYXRjaGluZzsKKyAgfQorCisgIHB1YmxpYyBzdGF0aWMgY2xhc3MgV2F0Y2hlcnMgeworICAgIHN0YXRpYyBjbGFzcyBMaXN0IHsKKyAgICAgIHByb3RlY3RlZCBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gYWNjb3VudHMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICAgIHByb3RlY3RlZCBmaW5hbCBTZXQ8QWRkcmVzcz4gZW1haWxzID0gU2V0cy5uZXdIYXNoU2V0KCk7CisgICAgfQorICAgIHByb3RlY3RlZCBmaW5hbCBMaXN0IHRvID0gbmV3IExpc3QoKTsKKyAgICBwcm90ZWN0ZWQgZmluYWwgTGlzdCBjYyA9IG5ldyBMaXN0KCk7CisgICAgcHJvdGVjdGVkIGZpbmFsIExpc3QgYmNjID0gbmV3IExpc3QoKTsKKworICAgIExpc3QgbGlzdChOb3RpZnlDb25maWcuSGVhZGVyIGhlYWRlcikgeworICAgICAgc3dpdGNoIChoZWFkZXIpIHsKKyAgICAgICAgY2FzZSBUTzoKKyAgICAgICAgICByZXR1cm4gdG87CisgICAgICAgIGNhc2UgQ0M6CisgICAgICAgICAgcmV0dXJuIGNjOworICAgICAgICBkZWZhdWx0OgorICAgICAgICBjYXNlIEJDQzoKKyAgICAgICAgICByZXR1cm4gYmNjOworICAgICAgfQorICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBhZGQoV2F0Y2hlcnMgbWF0Y2hpbmcsIE5vdGlmeUNvbmZpZyBuYywgUHJvamVjdC5OYW1lS2V5IHByb2plY3QpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uLCBRdWVyeVBhcnNlRXhjZXB0aW9uIHsKKyAgICBmb3IgKEdyb3VwUmVmZXJlbmNlIHJlZiA6IG5jLmdldEdyb3VwcygpKSB7CisgICAgICBDdXJyZW50VXNlciB1c2VyID0gbmV3IFNpbmdsZUdyb3VwVXNlcihhcmdzLmNhcGFiaWxpdHlDb250cm9sRmFjdG9yeSwKKyAgICAgICAgICByZWYuZ2V0VVVJRCgpKTsKKyAgICAgIGlmIChmaWx0ZXJNYXRjaCh1c2VyLCBuYy5nZXRGaWx0ZXIoKSkpIHsKKyAgICAgICAgZGVsaXZlclRvTWVtYmVycyhtYXRjaGluZy5saXN0KG5jLmdldEhlYWRlcigpKSwgcmVmLmdldFVVSUQoKSk7CisgICAgICB9CisgICAgfQorCisgICAgaWYgKCFuYy5nZXRBZGRyZXNzZXMoKS5pc0VtcHR5KCkpIHsKKyAgICAgIGlmIChmaWx0ZXJNYXRjaChudWxsLCBuYy5nZXRGaWx0ZXIoKSkpIHsKKyAgICAgICAgbWF0Y2hpbmcubGlzdChuYy5nZXRIZWFkZXIoKSkuZW1haWxzLmFkZEFsbChuYy5nZXRBZGRyZXNzZXMoKSk7CisgICAgICB9CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSB2b2lkIGRlbGl2ZXJUb01lbWJlcnMoCisgICAgICBXYXRjaGVycy5MaXN0IG1hdGNoaW5nLAorICAgICAgQWNjb3VudEdyb3VwLlVVSUQgc3RhcnRVVUlEKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBSZXZpZXdEYiBkYiA9IGFyZ3MuZGIuZ2V0KCk7CisgICAgU2V0PEFjY291bnRHcm91cC5VVUlEPiBzZWVuID0gU2V0cy5uZXdIYXNoU2V0KCk7CisgICAgTGlzdDxBY2NvdW50R3JvdXAuVVVJRD4gcSA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworCisgICAgc2Vlbi5hZGQoc3RhcnRVVUlEKTsKKyAgICBxLmFkZChzdGFydFVVSUQpOworCisgICAgd2hpbGUgKCFxLmlzRW1wdHkoKSkgeworICAgICAgQWNjb3VudEdyb3VwLlVVSUQgdXVpZCA9IHEucmVtb3ZlKHEuc2l6ZSgpIC0gMSk7CisgICAgICBHcm91cERlc2NyaXB0aW9uLkJhc2ljIGdyb3VwID0gYXJncy5ncm91cEJhY2tlbmQuZ2V0KHV1aWQpOworICAgICAgaWYgKCFTdHJpbmdzLmlzTnVsbE9yRW1wdHkoZ3JvdXAuZ2V0RW1haWxBZGRyZXNzKCkpKSB7CisgICAgICAgIC8vIElmIHRoZSBncm91cCBoYXMgYW4gZW1haWwgYWRkcmVzcywgZG8gbm90IGV4cGFuZCBtZW1iZXJzaGlwLgorICAgICAgICBtYXRjaGluZy5lbWFpbHMuYWRkKG5ldyBBZGRyZXNzKGdyb3VwLmdldEVtYWlsQWRkcmVzcygpKSk7CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICBBY2NvdW50R3JvdXAgaWcgPSBHcm91cERlc2NyaXB0aW9ucy50b0FjY291bnRHcm91cChncm91cCk7CisgICAgICBpZiAoaWcgPT0gbnVsbCkgeworICAgICAgICAvLyBOb24taW50ZXJuYWwgZ3JvdXBzIGNhbm5vdCBiZSBleHBhbmRlZCBieSB0aGUgc2VydmVyLgorICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKworICAgICAgZm9yIChBY2NvdW50R3JvdXBNZW1iZXIgbSA6IGRiLmFjY291bnRHcm91cE1lbWJlcnMoKS5ieUdyb3VwKGlnLmdldElkKCkpKSB7CisgICAgICAgIG1hdGNoaW5nLmFjY291bnRzLmFkZChtLmdldEFjY291bnRJZCgpKTsKKyAgICAgIH0KKyAgICAgIGZvciAoQWNjb3VudEdyb3VwLlVVSUQgbSA6IGFyZ3MuZ3JvdXBJbmNsdWRlcy5tZW1iZXJzT2YodXVpZCkpIHsKKyAgICAgICAgaWYgKHNlZW4uYWRkKG0pKSB7CisgICAgICAgICAgcS5hZGQobSk7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgYWRkKFdhdGNoZXJzIG1hdGNoaW5nLCBBY2NvdW50UHJvamVjdFdhdGNoIHcpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBJZGVudGlmaWVkVXNlciB1c2VyID0KKyAgICAgICAgYXJncy5pZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGFyZ3MuZGIsIHcuZ2V0QWNjb3VudElkKCkpOworCisgICAgdHJ5IHsKKyAgICAgIGlmIChmaWx0ZXJNYXRjaCh1c2VyLCB3LmdldEZpbHRlcigpKSkgeworICAgICAgICBtYXRjaGluZy5iY2MuYWNjb3VudHMuYWRkKHcuZ2V0QWNjb3VudElkKCkpOworICAgICAgfQorICAgIH0gY2F0Y2ggKFF1ZXJ5UGFyc2VFeGNlcHRpb24gZSkgeworICAgICAgLy8gSWdub3JlIGJyb2tlbiBmaWx0ZXIgZXhwcmVzc2lvbnMuCisgICAgfQorICB9CisKKyAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgIHByaXZhdGUgYm9vbGVhbiBmaWx0ZXJNYXRjaChDdXJyZW50VXNlciB1c2VyLCBTdHJpbmcgZmlsdGVyKQorICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgUXVlcnlQYXJzZUV4Y2VwdGlvbiB7CisgICAgQ2hhbmdlUXVlcnlCdWlsZGVyIHFiOworICAgIFByZWRpY2F0ZTxDaGFuZ2VEYXRhPiBwID0gbnVsbDsKKworICAgIGlmICh1c2VyID09IG51bGwpIHsKKyAgICAgIHFiID0gYXJncy5xdWVyeUJ1aWxkZXIuY3JlYXRlKGFyZ3MuYW5vbnltb3VzVXNlcik7CisgICAgfSBlbHNlIHsKKyAgICAgIHFiID0gYXJncy5xdWVyeUJ1aWxkZXIuY3JlYXRlKHVzZXIpOworICAgICAgcCA9IHFiLmlzX3Zpc2libGUoKTsKKyAgICB9CisKKyAgICBpZiAoZmlsdGVyICE9IG51bGwpIHsKKyAgICAgIHFiLnNldEFsbG93RmlsZSh0cnVlKTsKKyAgICAgIFByZWRpY2F0ZTxDaGFuZ2VEYXRhPiBmaWx0ZXJQcmVkaWNhdGUgPSBxYi5wYXJzZShmaWx0ZXIpOworICAgICAgaWYgKHAgPT0gbnVsbCkgeworICAgICAgICBwID0gZmlsdGVyUHJlZGljYXRlOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgcCA9IFByZWRpY2F0ZS5hbmQoZmlsdGVyUHJlZGljYXRlLCBwKTsKKyAgICAgIH0KKyAgICAgIHAgPSBhcmdzLnF1ZXJ5UmV3cml0ZXIuZ2V0KCkucmV3cml0ZShwKTsKKyAgICB9CisgICAgcmV0dXJuIHAgPT0gbnVsbCA/IHRydWUgOiBwLm1hdGNoKGNoYW5nZURhdGEpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmViYXNlZFBhdGNoU2V0U2VuZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmViYXNlZFBhdGNoU2V0U2VuZGVyLmphdmEKaW5kZXggOGZjODIzOC4uZjlhODViOSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1JlYmFzZWRQYXRjaFNldFNlbmRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9SZWJhc2VkUGF0Y2hTZXRTZW5kZXIuamF2YQpAQCAtMTQsOSArMTQsOCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQW5vbnltb3VzQ293YXJkTmFtZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc3NoLlNzaEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwogCkBAIC0yNywxMCArMjYsOCBAQAogICB9CiAKICAgQEluamVjdAotICBwdWJsaWMgUmViYXNlZFBhdGNoU2V0U2VuZGVyKEVtYWlsQXJndW1lbnRzIGVhLAotICAgICAgQEFub255bW91c0Nvd2FyZE5hbWUgU3RyaW5nIGFub255bW91c0Nvd2FyZE5hbWUsIFNzaEluZm8gc2ksCi0gICAgICBAQXNzaXN0ZWQgQ2hhbmdlIGMpIHsKLSAgICBzdXBlcihlYSwgYW5vbnltb3VzQ293YXJkTmFtZSwgc2ksIGMpOworICBwdWJsaWMgUmViYXNlZFBhdGNoU2V0U2VuZGVyKEVtYWlsQXJndW1lbnRzIGVhLCBAQXNzaXN0ZWQgQ2hhbmdlIGMpIHsKKyAgICBzdXBlcihlYSwgYyk7CiAgIH0KIAogICBAT3ZlcnJpZGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9SZWdpc3Rlck5ld0VtYWlsU2VuZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmVnaXN0ZXJOZXdFbWFpbFNlbmRlci5qYXZhCmluZGV4IDE3ZmU5YzYuLmViMzI3MDAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9SZWdpc3Rlck5ld0VtYWlsU2VuZGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1JlZ2lzdGVyTmV3RW1haWxTZW5kZXIuamF2YQpAQCAtMTQsOCArMTQsOCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Bbm9ueW1vdXNDb3dhcmROYW1lOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKIApAQCAtMzIsMTAgKzMyLDkgQEAKICAgQEluamVjdAogICBwdWJsaWMgUmVnaXN0ZXJOZXdFbWFpbFNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwKICAgICAgIEVtYWlsVG9rZW5WZXJpZmllciBldHYsCi0gICAgICBAQW5vbnltb3VzQ293YXJkTmFtZSBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwKICAgICAgIElkZW50aWZpZWRVc2VyIGNhbGxpbmdVc2VyLAogICAgICAgQEFzc2lzdGVkIGZpbmFsIFN0cmluZyBhZGRyZXNzKSB7Ci0gICAgc3VwZXIoZWEsIGFub255bW91c0Nvd2FyZE5hbWUsICJyZWdpc3Rlcm5ld2VtYWlsIik7CisgICAgc3VwZXIoZWEsICJyZWdpc3Rlcm5ld2VtYWlsIik7CiAgICAgdG9rZW5WZXJpZmllciA9IGV0djsKICAgICB1c2VyID0gY2FsbGluZ1VzZXI7CiAgICAgYWRkciA9IGFkZHJlc3M7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmVwbGFjZVBhdGNoU2V0U2VuZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmVwbGFjZVBhdGNoU2V0U2VuZGVyLmphdmEKaW5kZXggOTcwNWI4YS4uZDgwZmI1MCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1JlcGxhY2VQYXRjaFNldFNlbmRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9SZXBsYWNlUGF0Y2hTZXRTZW5kZXIuamF2YQpAQCAtMTQsMTUgKzE0LDEzIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWw7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkVtYWlsRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50UHJvamVjdFdhdGNoLk5vdGlmeVR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKIAotaW1wb3J0IGNvbS5qY3JhZnQuanNjaC5Ib3N0S2V5OwotCiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKQEAgLTM3LDE0ICszNSwxMCBAQAogCiAgIHByaXZhdGUgZmluYWwgU2V0PEFjY291bnQuSWQ+IHJldmlld2VycyA9IG5ldyBIYXNoU2V0PEFjY291bnQuSWQ+KCk7CiAgIHByaXZhdGUgZmluYWwgU2V0PEFjY291bnQuSWQ+IGV4dHJhQ0MgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPigpOwotICBwcml2YXRlIGZpbmFsIFNzaEluZm8gc3NoSW5mbzsKIAogICBASW5qZWN0Ci0gIHB1YmxpYyBSZXBsYWNlUGF0Y2hTZXRTZW5kZXIoRW1haWxBcmd1bWVudHMgZWEsCi0gICAgICBAQW5vbnltb3VzQ293YXJkTmFtZSBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwgU3NoSW5mbyBzaSwKLSAgICAgIEBBc3Npc3RlZCBDaGFuZ2UgYykgewotICAgIHN1cGVyKGVhLCBhbm9ueW1vdXNDb3dhcmROYW1lLCBjLCAibmV3cGF0Y2hzZXQiKTsKLSAgICBzc2hJbmZvID0gc2k7CisgIHB1YmxpYyBSZXBsYWNlUGF0Y2hTZXRTZW5kZXIoRW1haWxBcmd1bWVudHMgZWEsIEBBc3Npc3RlZCBDaGFuZ2UgYykgeworICAgIHN1cGVyKGVhLCBjLCAibmV3cGF0Y2hzZXQiKTsKICAgfQogCiAgIHB1YmxpYyB2b2lkIGFkZFJldmlld2VycyhmaW5hbCBDb2xsZWN0aW9uPEFjY291bnQuSWQ+IGNjKSB7CkBAIC02OCw2ICs2Miw3IEBACiAgICAgYWRkKFJlY2lwaWVudFR5cGUuQ0MsIGV4dHJhQ0MpOwogICAgIHJjcHRUb0F1dGhvcnMoUmVjaXBpZW50VHlwZS5DQyk7CiAgICAgYmNjU3RhcnJlZEJ5KCk7CisgICAgaW5jbHVkZVdhdGNoZXJzKE5vdGlmeVR5cGUuTkVXX1BBVENIU0VUUyk7CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTg1LDE3ICs4MCw0IEBACiAgICAgfQogICAgIHJldHVybiBuYW1lczsKICAgfQotCi0gIHB1YmxpYyBTdHJpbmcgZ2V0U3NoSG9zdCgpIHsKLSAgICBmaW5hbCBMaXN0PEhvc3RLZXk+IGhvc3RLZXlzID0gc3NoSW5mby5nZXRIb3N0S2V5cygpOwotICAgIGlmIChob3N0S2V5cy5pc0VtcHR5KCkpIHsKLSAgICAgIHJldHVybiBudWxsOwotICAgIH0KLQotICAgIGZpbmFsIFN0cmluZyBob3N0ID0gaG9zdEtleXMuZ2V0KDApLmdldEhvc3QoKTsKLSAgICBpZiAoaG9zdC5zdGFydHNXaXRoKCIqOiIpKSB7Ci0gICAgICByZXR1cm4gZ2V0R2Vycml0SG9zdCgpICsgaG9zdC5zdWJzdHJpbmcoMSk7Ci0gICAgfQotICAgIHJldHVybiBob3N0OwotICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmVwbHlUb0NoYW5nZVNlbmRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1JlcGx5VG9DaGFuZ2VTZW5kZXIuamF2YQppbmRleCAyYTc3ZDM5Li40MmFjOTE3IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmVwbHlUb0NoYW5nZVNlbmRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9SZXBseVRvQ2hhbmdlU2VuZGVyLmphdmEKQEAgLTE0LDYgKzE0LDcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbDsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuRW1haWxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKIAogLyoqIEFsZXJ0IGEgdXNlciB0byBhIHJlcGx5IHRvIGEgY2hhbmdlLCB1c3VhbGx5IGNvbW1lbnRhcnkgbWFkZSBkdXJpbmcgcmV2aWV3LiAqLwpAQCAtMjIsOSArMjMsOCBAQAogICAgIHB1YmxpYyBUIGNyZWF0ZShDaGFuZ2UgY2hhbmdlKTsKICAgfQogCi0gIHByb3RlY3RlZCBSZXBseVRvQ2hhbmdlU2VuZGVyKEVtYWlsQXJndW1lbnRzIGVhLCBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwKLSAgICAgIENoYW5nZSBjLCBTdHJpbmcgbWMpIHsKLSAgICBzdXBlcihlYSwgYW5vbnltb3VzQ293YXJkTmFtZSwgYywgbWMpOworICBwcm90ZWN0ZWQgUmVwbHlUb0NoYW5nZVNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwgQ2hhbmdlIGMsIFN0cmluZyBtYykgeworICAgIHN1cGVyKGVhLCBjLCBtYyk7CiAgIH0KIAogICBAT3ZlcnJpZGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9SZXN0b3JlZFNlbmRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1Jlc3RvcmVkU2VuZGVyLmphdmEKaW5kZXggOTQ2YzI5Zi4uN2Y0NjRmNyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1Jlc3RvcmVkU2VuZGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1Jlc3RvcmVkU2VuZGVyLmphdmEKQEAgLTE0LDkgKzE0LDkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbDsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5FbWFpbEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudFByb2plY3RXYXRjaC5Ob3RpZnlUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQW5vbnltb3VzQ293YXJkTmFtZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKIApAQCAtMjgsOSArMjgsOCBAQAogICB9CiAKICAgQEluamVjdAotICBwdWJsaWMgUmVzdG9yZWRTZW5kZXIoRW1haWxBcmd1bWVudHMgZWEsCi0gICAgICBAQW5vbnltb3VzQ293YXJkTmFtZSBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZSwgQEFzc2lzdGVkIENoYW5nZSBjKSB7Ci0gICAgc3VwZXIoZWEsIGFub255bW91c0Nvd2FyZE5hbWUsIGMsICJyZXN0b3JlIik7CisgIHB1YmxpYyBSZXN0b3JlZFNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwgQEFzc2lzdGVkIENoYW5nZSBjKSB7CisgICAgc3VwZXIoZWEsIGMsICJyZXN0b3JlIik7CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTM5LDcgKzM4LDcgQEAKIAogICAgIGNjQWxsQXBwcm92YWxzKCk7CiAgICAgYmNjU3RhcnJlZEJ5KCk7Ci0gICAgYmNjV2F0Y2hlcyhOb3RpZnlUeXBlLkFMTF9DT01NRU5UUyk7CisgICAgaW5jbHVkZVdhdGNoZXJzKE5vdGlmeVR5cGUuQUxMX0NPTU1FTlRTKTsKICAgfQogCiAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1JldmVydGVkU2VuZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmV2ZXJ0ZWRTZW5kZXIuamF2YQppbmRleCAwMzNiZDU2Li5kMTM4OWZiIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmV2ZXJ0ZWRTZW5kZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvUmV2ZXJ0ZWRTZW5kZXIuamF2YQpAQCAtMTQsOSArMTQsOSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsOwogCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkVtYWlsRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50UHJvamVjdFdhdGNoLk5vdGlmeVR5cGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Bbm9ueW1vdXNDb3dhcmROYW1lOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwogCkBAIC0yNyw5ICsyNyw4IEBACiAgIH0KIAogICBASW5qZWN0Ci0gIHB1YmxpYyBSZXZlcnRlZFNlbmRlcihFbWFpbEFyZ3VtZW50cyBlYSwKLSAgICAgIEBBbm9ueW1vdXNDb3dhcmROYW1lIFN0cmluZyBhbm9ueW1vdXNDb3dhcmROYW1lLCBAQXNzaXN0ZWQgQ2hhbmdlIGMpIHsKLSAgICBzdXBlcihlYSwgYW5vbnltb3VzQ293YXJkTmFtZSwgYywgInJldmVydCIpOworICBwdWJsaWMgUmV2ZXJ0ZWRTZW5kZXIoRW1haWxBcmd1bWVudHMgZWEsIEBBc3Npc3RlZCBDaGFuZ2UgYykgeworICAgIHN1cGVyKGVhLCBjLCAicmV2ZXJ0Iik7CiAgIH0KIAogICBAT3ZlcnJpZGUKQEAgLTM4LDcgKzM3LDcgQEAKIAogICAgIGNjQWxsQXBwcm92YWxzKCk7CiAgICAgYmNjU3RhcnJlZEJ5KCk7Ci0gICAgYmNjV2F0Y2hlcyhOb3RpZnlUeXBlLkFMTF9DT01NRU5UUyk7CisgICAgaW5jbHVkZVdhdGNoZXJzKE5vdGlmeVR5cGUuQUxMX0NPTU1FTlRTKTsKICAgfQogCiAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1NtdHBFbWFpbFNlbmRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL1NtdHBFbWFpbFNlbmRlci5qYXZhCmluZGV4IGNlNDVmZmUuLjcyZGY1NjAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9TbXRwRW1haWxTZW5kZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvU210cEVtYWlsU2VuZGVyLmphdmEKQEAgLTE1LDYgKzE1LDcgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLm1haWw7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uVmVyc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLkVtYWlsRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ29uZmlnVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGF0Y2gvQWRkUmV2aWV3ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGF0Y2gvQWRkUmV2aWV3ZXIuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZGY5Mzg1Mi4uMDAwMDAwMAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BhdGNoL0FkZFJldmlld2VyLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwyNTYgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUmV2aWV3ZXJSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRSZXNvbHZlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENhY2hlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwTWVtYmVyczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIubWFpbC5BZGRSZXZpZXdlclNlbmRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwotCi1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOwotCi1pbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuU2V0OwotaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkNhbGxhYmxlOwotCi1wdWJsaWMgY2xhc3MgQWRkUmV2aWV3ZXIgaW1wbGVtZW50cyBDYWxsYWJsZTxSZXZpZXdlclJlc3VsdD4gewotICBwdWJsaWMgZmluYWwgc3RhdGljIGludCBERUZBVUxUX01BWF9SRVZJRVdFUlNfV0lUSE9VVF9DSEVDSyA9IDEwOwotICBwdWJsaWMgZmluYWwgc3RhdGljIGludCBERUZBVUxUX01BWF9SRVZJRVdFUlMgPSAyMDsKLQotICBwdWJsaWMgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIEFkZFJldmlld2VyIGNyZWF0ZShDaGFuZ2UuSWQgY2hhbmdlSWQsCi0gICAgICAgIENvbGxlY3Rpb248U3RyaW5nPiB1c2VyTmFtZU9yRW1haWxPckdyb3VwTmFtZXMsIGJvb2xlYW4gY29uZmlybWVkKTsKLSAgfQotCi0gIHByaXZhdGUgZmluYWwgQWRkUmV2aWV3ZXJTZW5kZXIuRmFjdG9yeSBhZGRSZXZpZXdlclNlbmRlckZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgQWNjb3VudFJlc29sdmVyIGFjY291bnRSZXNvbHZlcjsKLSAgcHJpdmF0ZSBmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGU7Ci0gIHByaXZhdGUgZmluYWwgR3JvdXBNZW1iZXJzLkZhY3RvcnkgZ3JvdXBNZW1iZXJzRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7Ci0gIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXI7Ci0gIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgaWRlbnRpZmllZFVzZXJGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgYWRkUmV2aWV3ZXJDYXRlZ29yeUlkOwotICBwcml2YXRlIGZpbmFsIENvbmZpZyBjZmc7Ci0KLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2UuSWQgY2hhbmdlSWQ7Ci0gIHByaXZhdGUgZmluYWwgQ29sbGVjdGlvbjxTdHJpbmc+IHJldmlld2VyczsKLSAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIGNvbmZpcm1lZDsKLQotICBASW5qZWN0Ci0gIEFkZFJldmlld2VyKGZpbmFsIEFkZFJldmlld2VyU2VuZGVyLkZhY3RvcnkgYWRkUmV2aWV3ZXJTZW5kZXJGYWN0b3J5LAotICAgICAgZmluYWwgQWNjb3VudFJlc29sdmVyIGFjY291bnRSZXNvbHZlciwgZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlLAotICAgICAgZmluYWwgR3JvdXBNZW1iZXJzLkZhY3RvcnkgZ3JvdXBNZW1iZXJzRmFjdG9yeSwKLSAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwgZmluYWwgUmV2aWV3RGIgZGIsCi0gICAgICBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSBpZGVudGlmaWVkVXNlckZhY3RvcnksCi0gICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlciwgZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzLAotICAgICAgZmluYWwgQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgY2ZnLCBAQXNzaXN0ZWQgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkLAotICAgICAgQEFzc2lzdGVkIGZpbmFsIENvbGxlY3Rpb248U3RyaW5nPiByZXZpZXdlcnMsCi0gICAgICBAQXNzaXN0ZWQgZmluYWwgYm9vbGVhbiBjb25maXJtZWQpIHsKLSAgICB0aGlzLmFkZFJldmlld2VyU2VuZGVyRmFjdG9yeSA9IGFkZFJldmlld2VyU2VuZGVyRmFjdG9yeTsKLSAgICB0aGlzLmFjY291bnRSZXNvbHZlciA9IGFjY291bnRSZXNvbHZlcjsKLSAgICB0aGlzLmdyb3VwQ2FjaGUgPSBncm91cENhY2hlOwotICAgIHRoaXMuZ3JvdXBNZW1iZXJzRmFjdG9yeSA9IGdyb3VwTWVtYmVyc0ZhY3Rvcnk7Ci0gICAgdGhpcy5kYiA9IGRiOwotICAgIHRoaXMuY2hhbmdlQ29udHJvbEZhY3RvcnkgPSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKLSAgICB0aGlzLmlkZW50aWZpZWRVc2VyRmFjdG9yeSA9IGlkZW50aWZpZWRVc2VyRmFjdG9yeTsKLSAgICB0aGlzLmN1cnJlbnRVc2VyID0gY3VycmVudFVzZXI7Ci0gICAgdGhpcy5jZmcgPSBjZmc7Ci0KLSAgICBmaW5hbCBMaXN0PEFwcHJvdmFsVHlwZT4gYWxsVHlwZXMgPSBhcHByb3ZhbFR5cGVzLmdldEFwcHJvdmFsVHlwZXMoKTsKLSAgICBhZGRSZXZpZXdlckNhdGVnb3J5SWQgPQotICAgICAgICBhbGxUeXBlcy5nZXQoYWxsVHlwZXMuc2l6ZSgpIC0gMSkuZ2V0Q2F0ZWdvcnkoKS5nZXRJZCgpOwotCi0gICAgdGhpcy5jaGFuZ2VJZCA9IGNoYW5nZUlkOwotICAgIHRoaXMucmV2aWV3ZXJzID0gcmV2aWV3ZXJzOwotICAgIHRoaXMuY29uZmlybWVkID0gY29uZmlybWVkOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBSZXZpZXdlclJlc3VsdCBjYWxsKCkgdGhyb3dzIEV4Y2VwdGlvbiB7Ci0gICAgZmluYWwgU2V0PEFjY291bnQuSWQ+IHJldmlld2VySWRzID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4oKTsKLSAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSBjaGFuZ2VDb250cm9sRmFjdG9yeS52YWxpZGF0ZUZvcihjaGFuZ2VJZCk7Ci0KLSAgICBmaW5hbCBSZXZpZXdlclJlc3VsdCByZXN1bHQgPSBuZXcgUmV2aWV3ZXJSZXN1bHQoKTsKLSAgICBmb3IgKGZpbmFsIFN0cmluZyByZXZpZXdlciA6IHJldmlld2VycykgewotICAgICAgZmluYWwgQWNjb3VudCBhY2NvdW50ID0gYWNjb3VudFJlc29sdmVyLmZpbmQocmV2aWV3ZXIpOwotICAgICAgaWYgKGFjY291bnQgPT0gbnVsbCkgewotICAgICAgICBBY2NvdW50R3JvdXAgZ3JvdXAgPSBncm91cENhY2hlLmdldChuZXcgQWNjb3VudEdyb3VwLk5hbWVLZXkocmV2aWV3ZXIpKTsKLQotICAgICAgICBpZiAoZ3JvdXAgPT0gbnVsbCkgewotICAgICAgICAgIHJlc3VsdC5hZGRFcnJvcihuZXcgUmV2aWV3ZXJSZXN1bHQuRXJyb3IoCi0gICAgICAgICAgICAgIFJldmlld2VyUmVzdWx0LkVycm9yLlR5cGUuUkVWSUVXRVJfTk9UX0ZPVU5ELCByZXZpZXdlcikpOwotICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKCFpc0xlZ2FsUmV2aWV3ZXJHcm91cChncm91cC5nZXRHcm91cFVVSUQoKSkpIHsKLSAgICAgICAgICByZXN1bHQuYWRkRXJyb3IobmV3IFJldmlld2VyUmVzdWx0LkVycm9yKAotICAgICAgICAgICAgICBSZXZpZXdlclJlc3VsdC5FcnJvci5UeXBlLkdST1VQX05PVF9BTExPV0VELCByZXZpZXdlcikpOwotICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgZmluYWwgU2V0PEFjY291bnQ+IG1lbWJlcnMgPQotICAgICAgICAgICAgZ3JvdXBNZW1iZXJzRmFjdG9yeS5jcmVhdGUoKS5saXN0QWNjb3VudHMoZ3JvdXAuZ2V0R3JvdXBVVUlEKCksCi0gICAgICAgICAgICAgICAgY29udHJvbC5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpKTsKLSAgICAgICAgaWYgKG1lbWJlcnMgPT0gbnVsbCB8fCBtZW1iZXJzLnNpemUoKSA9PSAwKSB7Ci0gICAgICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdlclJlc3VsdC5FcnJvcigKLSAgICAgICAgICAgICAgUmV2aWV3ZXJSZXN1bHQuRXJyb3IuVHlwZS5HUk9VUF9FTVBUWSwgcmV2aWV3ZXIpKTsKLSAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotCi0gICAgICAgIC8vIGlmIG1heEFsbG93ZWQgaXMgc2V0IHRvIDAsIGl0IGlzIGFsbG93ZWQgdG8gYWRkIGFueSBudW1iZXIgb2YKLSAgICAgICAgLy8gcmV2aWV3ZXJzCi0gICAgICAgIGZpbmFsIGludCBtYXhBbGxvd2VkID0KLSAgICAgICAgICAgIGNmZy5nZXRJbnQoImFkZHJldmlld2VyIiwgIm1heEFsbG93ZWQiLCBERUZBVUxUX01BWF9SRVZJRVdFUlMpOwotICAgICAgICBpZiAobWF4QWxsb3dlZCA+IDAgJiYgbWVtYmVycy5zaXplKCkgPiBtYXhBbGxvd2VkKSB7Ci0gICAgICAgICAgcmVzdWx0LnNldE1lbWJlckNvdW50KG1lbWJlcnMuc2l6ZSgpKTsKLSAgICAgICAgICByZXN1bHQuc2V0QXNrRm9yQ29uZmlybWF0aW9uKGZhbHNlKTsKLSAgICAgICAgICByZXN1bHQuYWRkRXJyb3IobmV3IFJldmlld2VyUmVzdWx0LkVycm9yKAotICAgICAgICAgICAgICBSZXZpZXdlclJlc3VsdC5FcnJvci5UeXBlLkdST1VQX0hBU19UT09fTUFOWV9NRU1CRVJTLCByZXZpZXdlcikpOwotICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8gaWYgbWF4V2l0aG91dENoZWNrIGlzIHNldCB0byAwLCB3ZSBuZXZlciBhc2sgZm9yIGNvbmZpcm1hdGlvbgotICAgICAgICBmaW5hbCBpbnQgbWF4V2l0aG91dENvbmZpcm1hdGlvbiA9Ci0gICAgICAgICAgICBjZmcuZ2V0SW50KCJhZGRyZXZpZXdlciIsICJtYXhXaXRob3V0Q29uZmlybWF0aW9uIiwKLSAgICAgICAgICAgICAgICBERUZBVUxUX01BWF9SRVZJRVdFUlNfV0lUSE9VVF9DSEVDSyk7Ci0gICAgICAgIGlmICghY29uZmlybWVkICYmIG1heFdpdGhvdXRDb25maXJtYXRpb24gPiAwCi0gICAgICAgICAgICAmJiBtZW1iZXJzLnNpemUoKSA+IG1heFdpdGhvdXRDb25maXJtYXRpb24pIHsKLSAgICAgICAgICByZXN1bHQuc2V0TWVtYmVyQ291bnQobWVtYmVycy5zaXplKCkpOwotICAgICAgICAgIHJlc3VsdC5zZXRBc2tGb3JDb25maXJtYXRpb24odHJ1ZSk7Ci0gICAgICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdlclJlc3VsdC5FcnJvcigKLSAgICAgICAgICAgICAgUmV2aWV3ZXJSZXN1bHQuRXJyb3IuVHlwZS5HUk9VUF9IQVNfVE9PX01BTllfTUVNQkVSUywgcmV2aWV3ZXIpKTsKLSAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotCi0gICAgICAgIGZvciAoZmluYWwgQWNjb3VudCBtZW1iZXIgOiBtZW1iZXJzKSB7Ci0gICAgICAgICAgaWYgKG1lbWJlci5pc0FjdGl2ZSgpKSB7Ci0gICAgICAgICAgICBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyID0KLSAgICAgICAgICAgICAgICBpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKG1lbWJlci5nZXRJZCgpKTsKLSAgICAgICAgICAgIC8vIERvZXMgbm90IGFjY291bnQgZm9yIGRyYWZ0IHN0YXR1cyBhcyBhIHVzZXIgbWlnaHQgd2FudCB0byBsZXQgYQotICAgICAgICAgICAgLy8gcmV2aWV3ZXIgc2VlIGEgZHJhZnQuCi0gICAgICAgICAgICBpZiAoY29udHJvbC5mb3JVc2VyKHVzZXIpLmlzUmVmVmlzaWJsZSgpKSB7Ci0gICAgICAgICAgICAgIHJldmlld2VySWRzLmFkZChtZW1iZXIuZ2V0SWQoKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIGNvbnRpbnVlOwotICAgICAgfQotCi0gICAgICBpZiAoIWFjY291bnQuaXNBY3RpdmUoKSkgewotICAgICAgICByZXN1bHQuYWRkRXJyb3IobmV3IFJldmlld2VyUmVzdWx0LkVycm9yKAotICAgICAgICAgICAgUmV2aWV3ZXJSZXN1bHQuRXJyb3IuVHlwZS5BQ0NPVU5UX0lOQUNUSVZFLAotICAgICAgICAgICAgZm9ybWF0VXNlcihhY2NvdW50LCByZXZpZXdlcikpKTsKLSAgICAgICAgY29udGludWU7Ci0gICAgICB9Ci0KLSAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyIHVzZXIgPSBpZGVudGlmaWVkVXNlckZhY3RvcnkuY3JlYXRlKGFjY291bnQuZ2V0SWQoKSk7Ci0gICAgICAvLyBEb2VzIG5vdCBhY2NvdW50IGZvciBkcmFmdCBzdGF0dXMgYXMgYSB1c2VyIG1pZ2h0IHdhbnQgdG8gbGV0IGEKLSAgICAgIC8vIHJldmlld2VyIHNlZSBhIGRyYWZ0LgotICAgICAgaWYgKCFjb250cm9sLmZvclVzZXIodXNlcikuaXNSZWZWaXNpYmxlKCkpIHsKLSAgICAgICAgcmVzdWx0LmFkZEVycm9yKG5ldyBSZXZpZXdlclJlc3VsdC5FcnJvcigKLSAgICAgICAgICAgIFJldmlld2VyUmVzdWx0LkVycm9yLlR5cGUuQ0hBTkdFX05PVF9WSVNJQkxFLAotICAgICAgICAgICAgZm9ybWF0VXNlcihhY2NvdW50LCByZXZpZXdlcikpKTsKLSAgICAgICAgY29udGludWU7Ci0gICAgICB9Ci0KLSAgICAgIHJldmlld2VySWRzLmFkZChhY2NvdW50LmdldElkKCkpOwotICAgIH0KLQotICAgIGlmIChyZXZpZXdlcklkcy5pc0VtcHR5KCkpIHsKLSAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgfQotCi0gICAgLy8gQWRkIHRoZSByZXZpZXdlcnMgdG8gdGhlIGRhdGFiYXNlCi0gICAgLy8KLSAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gYWRkZWQgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPigpOwotICAgIGZpbmFsIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gdG9JbnNlcnQgPSBuZXcgQXJyYXlMaXN0PFBhdGNoU2V0QXBwcm92YWw+KCk7Ci0gICAgZmluYWwgUGF0Y2hTZXQuSWQgcHNpZCA9IGNvbnRyb2wuZ2V0Q2hhbmdlKCkuY3VycmVudFBhdGNoU2V0SWQoKTsKLSAgICBmb3IgKGZpbmFsIEFjY291bnQuSWQgcmV2aWV3ZXIgOiByZXZpZXdlcklkcykgewotICAgICAgaWYgKCFleGlzdHMocHNpZCwgcmV2aWV3ZXIpKSB7Ci0gICAgICAgIC8vIFRoaXMgcmV2aWV3ZXIgaGFzIG5vdCBlbnRlcmVkIGFuIGFwcHJvdmFsIGZvciB0aGlzIGNoYW5nZSB5ZXQuCi0gICAgICAgIC8vCi0gICAgICAgIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgbXljYSA9Ci0gICAgICAgICAgICBkdW1teUFwcHJvdmFsKGNvbnRyb2wuZ2V0Q2hhbmdlKCksIHBzaWQsIHJldmlld2VyKTsKLSAgICAgICAgdG9JbnNlcnQuYWRkKG15Y2EpOwotICAgICAgICBhZGRlZC5hZGQocmV2aWV3ZXIpOwotICAgICAgfQotICAgIH0KLSAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLmluc2VydCh0b0luc2VydCk7Ci0KLSAgICAvLyBFbWFpbCB0aGUgcmV2aWV3ZXJzCi0gICAgLy8KLSAgICAvLyBUaGUgdXNlciBrbm93cyB0aGV5IGFkZGVkIHRoZW1zZWx2ZXMsIGRvbid0IGJvdGhlciBlbWFpbGluZyB0aGVtLgotICAgIGFkZGVkLnJlbW92ZShjdXJyZW50VXNlci5nZXRBY2NvdW50SWQoKSk7Ci0gICAgaWYgKCFhZGRlZC5pc0VtcHR5KCkpIHsKLSAgICAgIGZpbmFsIEFkZFJldmlld2VyU2VuZGVyIGNtOwotCi0gICAgICBjbSA9IGFkZFJldmlld2VyU2VuZGVyRmFjdG9yeS5jcmVhdGUoY29udHJvbC5nZXRDaGFuZ2UoKSk7Ci0gICAgICBjbS5zZXRGcm9tKGN1cnJlbnRVc2VyLmdldEFjY291bnRJZCgpKTsKLSAgICAgIGNtLmFkZFJldmlld2VycyhhZGRlZCk7Ci0gICAgICBjbS5zZW5kKCk7Ci0gICAgfQotCi0gICAgcmV0dXJuIHJlc3VsdDsKLSAgfQotCi0gIHByaXZhdGUgU3RyaW5nIGZvcm1hdFVzZXIoQWNjb3VudCBhY2NvdW50LCBTdHJpbmcgbmFtZU9yRW1haWwpIHsKLSAgICBpZiAobmFtZU9yRW1haWwubWF0Y2hlcygiXlsxLTldWzAtOV0qJCIpKSB7Ci0gICAgICByZXR1cm4gUmVtb3ZlUmV2aWV3ZXIuZm9ybWF0VXNlcihhY2NvdW50LCBuYW1lT3JFbWFpbCk7Ci0gICAgfSBlbHNlIHsKLSAgICAgIHJldHVybiBuYW1lT3JFbWFpbDsKLSAgICB9Ci0gIH0KLQotICBwcml2YXRlIGJvb2xlYW4gZXhpc3RzKGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsCi0gICAgICBmaW5hbCBBY2NvdW50LklkIHJldmlld2VySWQpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIHJldHVybiBkYi5wYXRjaFNldEFwcHJvdmFscygpLmJ5UGF0Y2hTZXRVc2VyKHBhdGNoU2V0SWQsIHJldmlld2VySWQpCi0gICAgICAgIC5pdGVyYXRvcigpLmhhc05leHQoKTsKLSAgfQotCi0gIHByaXZhdGUgUGF0Y2hTZXRBcHByb3ZhbCBkdW1teUFwcHJvdmFsKGZpbmFsIENoYW5nZSBjaGFuZ2UsCi0gICAgICBmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkLCBmaW5hbCBBY2NvdW50LklkIHJldmlld2VySWQpIHsKLSAgICBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGR1bW15QXBwcm92YWwgPQotICAgICAgICBuZXcgUGF0Y2hTZXRBcHByb3ZhbChuZXcgUGF0Y2hTZXRBcHByb3ZhbC5LZXkocGF0Y2hTZXRJZCwgcmV2aWV3ZXJJZCwKLSAgICAgICAgICAgIGFkZFJldmlld2VyQ2F0ZWdvcnlJZCksIChzaG9ydCkgMCk7Ci0gICAgZHVtbXlBcHByb3ZhbC5jYWNoZShjaGFuZ2UpOwotICAgIHJldHVybiBkdW1teUFwcHJvdmFsOwotICB9Ci0KLSAgcHVibGljIHN0YXRpYyBib29sZWFuIGlzTGVnYWxSZXZpZXdlckdyb3VwKGZpbmFsIEFjY291bnRHcm91cC5VVUlEIGdyb3VwVVVJRCkgewotICAgIHJldHVybiAhKEFjY291bnRHcm91cC5BTk9OWU1PVVNfVVNFUlMuZXF1YWxzKGdyb3VwVVVJRCkKLSAgICAgICAgICAgICB8fCBBY2NvdW50R3JvdXAuUkVHSVNURVJFRF9VU0VSUy5lcXVhbHMoZ3JvdXBVVUlEKSk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGF0Y2gvSW50cmFMaW5lRGlmZktleS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9JbnRyYUxpbmVEaWZmS2V5LmphdmEKaW5kZXggNjJlZDVlNC4uNWIzN2I5MiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9JbnRyYUxpbmVEaWZmS2V5LmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9JbnRyYUxpbmVEaWZmS2V5LmphdmEKQEAgLTgyLDYgKzgyLDEwIEBACiAgICAgcmV0dXJuIGJJZDsKICAgfQogCisgIHB1YmxpYyBib29sZWFuIGlzSWdub3JlV2hpdGVzcGFjZSgpIHsKKyAgICByZXR1cm4gaWdub3JlV2hpdGVzcGFjZTsKKyAgfQorCiAgIFByb2plY3QuTmFtZUtleSBnZXRQcm9qZWN0KCkgewogICAgIHJldHVybiBwcm9qZWN0S2V5OwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BhdGNoL0ludHJhTGluZUxvYWRlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9JbnRyYUxpbmVMb2FkZXIuamF2YQppbmRleCA1YjY1OTIwLi5iOTU5OTRmIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BhdGNoL0ludHJhTGluZUxvYWRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGF0Y2gvSW50cmFMaW5lTG9hZGVyLmphdmEKQEAgLTI5LDEwICsyOSw3IEBACiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwotaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkFycmF5QmxvY2tpbmdRdWV1ZTsKLWltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5CbG9ja2luZ1F1ZXVlOwogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0OwotaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LmF0b21pYy5BdG9taWNJbnRlZ2VyOwogaW1wb3J0IGphdmEudXRpbC5yZWdleC5QYXR0ZXJuOwogCiBjbGFzcyBJbnRyYUxpbmVMb2FkZXIgZXh0ZW5kcyBDYWNoZUxvYWRlcjxJbnRyYUxpbmVEaWZmS2V5LCBJbnRyYUxpbmVEaWZmPiB7CkBAIC00NCwxNiArNDEsMTIgQEAKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgUGF0dGVybiBDT05UUk9MX0JMT0NLX1NUQVJUX1JFID0gUGF0dGVybgogICAgICAgLmNvbXBpbGUoIlt7Ol1bIFxcdF0qJCIpOwogCi0gIHByaXZhdGUgZmluYWwgQmxvY2tpbmdRdWV1ZTxXb3JrZXI+IHdvcmtlclBvb2w7CisgIHByaXZhdGUgZmluYWwgSW50cmFMaW5lV29ya2VyUG9vbCB3b3JrZXJQb29sOwogICBwcml2YXRlIGZpbmFsIGxvbmcgdGltZW91dE1pbGxpczsKIAogICBASW5qZWN0Ci0gIEludHJhTGluZUxvYWRlcihmaW5hbCBAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBjZmcpIHsKLSAgICBmaW5hbCBpbnQgd29ya2VycyA9Ci0gICAgICAgIGNmZy5nZXRJbnQoImNhY2hlIiwgUGF0Y2hMaXN0Q2FjaGVJbXBsLklOVFJBX05BTUUsICJtYXhJZGxlV29ya2VycyIsCi0gICAgICAgICAgICBSdW50aW1lLmdldFJ1bnRpbWUoKS5hdmFpbGFibGVQcm9jZXNzb3JzKCkgKiAzIC8gMik7Ci0gICAgd29ya2VyUG9vbCA9IG5ldyBBcnJheUJsb2NraW5nUXVldWU8V29ya2VyPih3b3JrZXJzLCB0cnVlIC8qIGZhaXIgKi8pOwotCisgIEludHJhTGluZUxvYWRlcihJbnRyYUxpbmVXb3JrZXJQb29sIHBvb2wsIEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNmZykgeworICAgIHdvcmtlclBvb2wgPSBwb29sOwogICAgIHRpbWVvdXRNaWxsaXMgPQogICAgICAgICBDb25maWdVdGlsLmdldFRpbWVVbml0KGNmZywgImNhY2hlIiwgUGF0Y2hMaXN0Q2FjaGVJbXBsLklOVFJBX05BTUUsCiAgICAgICAgICAgICAidGltZW91dCIsIFRpbWVVbml0Lk1JTExJU0VDT05EUy5jb252ZXJ0KDUsIFRpbWVVbml0LlNFQ09ORFMpLApAQCAtNjIsMjYgKzU1LDE3IEBACiAKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyBJbnRyYUxpbmVEaWZmIGxvYWQoSW50cmFMaW5lRGlmZktleSBrZXkpIHRocm93cyBFeGNlcHRpb24gewotICAgIFdvcmtlciB3ID0gd29ya2VyUG9vbC5wb2xsKCk7Ci0gICAgaWYgKHcgPT0gbnVsbCkgewotICAgICAgdyA9IG5ldyBXb3JrZXIoKTsKLSAgICB9CisgICAgSW50cmFMaW5lV29ya2VyUG9vbC5Xb3JrZXIgdyA9IHdvcmtlclBvb2wuYWNxdWlyZSgpOworICAgIEludHJhTGluZVdvcmtlclBvb2wuV29ya2VyLlJlc3VsdCByID0gdy5jb21wdXRlV2l0aFRpbWVvdXQoa2V5LCB0aW1lb3V0TWlsbGlzKTsKIAotICAgIFdvcmtlci5SZXN1bHQgciA9IHcuY29tcHV0ZVdpdGhUaW1lb3V0KGtleSwgdGltZW91dE1pbGxpcyk7Ci0KLSAgICBpZiAociA9PSBXb3JrZXIuUmVzdWx0LlRJTUVPVVQpIHsKKyAgICBpZiAociA9PSBJbnRyYUxpbmVXb3JrZXJQb29sLldvcmtlci5SZXN1bHQuVElNRU9VVCkgewogICAgICAgLy8gRG9uJ3Qga2VlcCB0aGlzIHRocmVhZC4gV2UgaGF2ZSB0byBtdXJkZXIgaXQgdW5zYWZlbHksIHdoaWNoCiAgICAgICAvLyBtZWFucyBpdHMgdW5hYmxlIHRvIGJlIHJldXNlZCBpbiB0aGUgZnV0dXJlLiBSZXR1cm4gYmFjayBhCiAgICAgICAvLyBudWxsIHJlc3VsdCwgaW5kaWNhdGluZyB0aGUgY2FjaGUgY2Fubm90IGxvYWQgdGhpcyBrZXkuCiAgICAgICAvLwogICAgICAgcmV0dXJuIG5ldyBJbnRyYUxpbmVEaWZmKEludHJhTGluZURpZmYuU3RhdHVzLlRJTUVPVVQpOwogICAgIH0KLQotICAgIGlmICghd29ya2VyUG9vbC5vZmZlcih3KSkgewotICAgICAgLy8gSWYgdGhlIGlkbGUgd29ya2VyIHBvb2wgaXMgZnVsbCwgdGVybWluYXRlIHRoaXMgdGhyZWFkLgotICAgICAgLy8KLSAgICAgIHcuZW5kKCk7Ci0gICAgfQorICAgIHdvcmtlclBvb2wucmVsZWFzZSh3KTsKIAogICAgIGlmIChyLmVycm9yICE9IG51bGwpIHsKICAgICAgIC8vIElmIHRoZXJlIHdhcyBhbiBlcnJvciBjb21wdXRpbmcgdGhlIHJlc3VsdCwgY2FycnkgaXQKQEAgLTkzLDEyNyArNzcsNyBAQAogICAgIHJldHVybiByLmRpZmY7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBjbGFzcyBXb3JrZXIgewotICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIEF0b21pY0ludGVnZXIgY291bnQgPSBuZXcgQXRvbWljSW50ZWdlcigxKTsKLQotICAgIHByaXZhdGUgZmluYWwgQXJyYXlCbG9ja2luZ1F1ZXVlPElucHV0PiBpbnB1dDsKLSAgICBwcml2YXRlIGZpbmFsIEFycmF5QmxvY2tpbmdRdWV1ZTxSZXN1bHQ+IHJlc3VsdDsKLSAgICBwcml2YXRlIGZpbmFsIFRocmVhZCB0aHJlYWQ7Ci0KLSAgICBXb3JrZXIoKSB7Ci0gICAgICBpbnB1dCA9IG5ldyBBcnJheUJsb2NraW5nUXVldWU8SW5wdXQ+KDEpOwotICAgICAgcmVzdWx0ID0gbmV3IEFycmF5QmxvY2tpbmdRdWV1ZTxSZXN1bHQ+KDEpOwotCi0gICAgICB0aHJlYWQgPSBuZXcgVGhyZWFkKG5ldyBSdW5uYWJsZSgpIHsKLSAgICAgICAgcHVibGljIHZvaWQgcnVuKCkgewotICAgICAgICAgIHdvcmtlckxvb3AoKTsKLSAgICAgICAgfQotICAgICAgfSk7Ci0gICAgICB0aHJlYWQuc2V0TmFtZSgiSW50cmFMaW5lRGlmZi0iICsgY291bnQuZ2V0QW5kSW5jcmVtZW50KCkpOwotICAgICAgdGhyZWFkLnNldERhZW1vbih0cnVlKTsKLSAgICAgIHRocmVhZC5zdGFydCgpOwotICAgIH0KLQotICAgIFJlc3VsdCBjb21wdXRlV2l0aFRpbWVvdXQoSW50cmFMaW5lRGlmZktleSBrZXksIGxvbmcgdGltZW91dE1pbGxpcykKLSAgICAgICAgdGhyb3dzIEV4Y2VwdGlvbiB7Ci0gICAgICBpZiAoIWlucHV0Lm9mZmVyKG5ldyBJbnB1dChrZXkpKSkgewotICAgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBlbnF1ZXVlIHRhc2sgdG8gdGhyZWFkICIgKyB0aHJlYWQuZ2V0TmFtZSgpKTsKLSAgICAgICAgcmV0dXJuIFJlc3VsdC5USU1FT1VUOwotICAgICAgfQotCi0gICAgICBSZXN1bHQgciA9IHJlc3VsdC5wb2xsKHRpbWVvdXRNaWxsaXMsIFRpbWVVbml0Lk1JTExJU0VDT05EUyk7Ci0gICAgICBpZiAociAhPSBudWxsKSB7Ci0gICAgICAgIHJldHVybiByOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgbG9nLndhcm4odGltZW91dE1pbGxpcyArICIgbXMgdGltZW91dCByZWFjaGVkIGZvciBJbnRyYUxpbmVEaWZmIgotICAgICAgICAgICAgKyAiIGluIHByb2plY3QgIiArIGtleS5nZXRQcm9qZWN0KCkuZ2V0KCkgLy8KLSAgICAgICAgICAgICsgIiBvbiBjb21taXQgIiArIGtleS5nZXRDb21taXQoKS5uYW1lKCkgLy8KLSAgICAgICAgICAgICsgIiBmb3IgcGF0aCAiICsga2V5LmdldFBhdGgoKSAvLwotICAgICAgICAgICAgKyAiIGNvbXBhcmluZyAiICsga2V5LmdldEJsb2JBKCkubmFtZSgpIC8vCi0gICAgICAgICAgICArICIuLiIgKyBrZXkuZ2V0QmxvYkIoKS5uYW1lKCkgLy8KLSAgICAgICAgICAgICsgIi4gIEtpbGxpbmcgIiArIHRocmVhZC5nZXROYW1lKCkpOwotICAgICAgICBmb3JjZWZ1bGx5S2lsbFRocmVhZEluQW5VZ2x5V2F5KCk7Ci0gICAgICAgIHJldHVybiBSZXN1bHQuVElNRU9VVDsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBAU3VwcHJlc3NXYXJuaW5ncygiZGVwcmVjYXRpb24iKQotICAgIHByaXZhdGUgdm9pZCBmb3JjZWZ1bGx5S2lsbFRocmVhZEluQW5VZ2x5V2F5KCkgewotICAgICAgdHJ5IHsKLSAgICAgICAgdGhyZWFkLnN0b3AoKTsKLSAgICAgIH0gY2F0Y2ggKFRocm93YWJsZSBlcnJvcikgewotICAgICAgICAvLyBJZ25vcmUgYW55IHJlYXNvbiB0aGUgdGhyZWFkIHdvbid0IHN0b3AuCi0gICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHN0b3AgcnVuYXdheSB0aHJlYWQgIiArIHRocmVhZC5nZXROYW1lKCksIGVycm9yKTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICB2b2lkIGVuZCgpIHsKLSAgICAgIGlmICghaW5wdXQub2ZmZXIoSW5wdXQuRU5EX1RIUkVBRCkpIHsKLSAgICAgICAgbG9nLmVycm9yKCJDYW5ub3QgZ3JhY2VmdWxseSBzdG9wIHRocmVhZCAiICsgdGhyZWFkLmdldE5hbWUoKSk7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgcHJpdmF0ZSB2b2lkIHdvcmtlckxvb3AoKSB7Ci0gICAgICB0cnkgewotICAgICAgICBmb3IgKDs7KSB7Ci0gICAgICAgICAgSW5wdXQgaW47Ci0gICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgIGluID0gaW5wdXQudGFrZSgpOwotICAgICAgICAgIH0gY2F0Y2ggKEludGVycnVwdGVkRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgICAgIGxvZy5lcnJvcigiVW5leHBlY3RlZCBpbnRlcnJ1cHQgb24gIiArIHRocmVhZC5nZXROYW1lKCkpOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgaWYgKGluID09IElucHV0LkVORF9USFJFQUQpIHsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICB9Ci0KLSAgICAgICAgICBSZXN1bHQgcjsKLSAgICAgICAgICB0cnkgewotICAgICAgICAgICAgciA9IG5ldyBSZXN1bHQoSW50cmFMaW5lTG9hZGVyLmNvbXB1dGUoaW4ua2V5KSk7Ci0gICAgICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGVycm9yKSB7Ci0gICAgICAgICAgICByID0gbmV3IFJlc3VsdChlcnJvcik7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgaWYgKCFyZXN1bHQub2ZmZXIocikpIHsKLSAgICAgICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IHJldHVybiByZXN1bHQgZnJvbSAiICsgdGhyZWFkLmdldE5hbWUoKSk7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICB9IGNhdGNoIChUaHJlYWREZWF0aCBpSGF2ZUJlZW5TaG90KSB7Ci0gICAgICAgIC8vIEhhbmRsZSB0aHJlYWQgZGVhdGggYnkgZ3JhY2VmdWxseSByZXR1cm5pbmcgdG8gdGhlIGNhbGxlciwKLSAgICAgICAgLy8gYWxsb3dpbmcgdGhlIHRocmVhZCB0byBiZSBkZXN0cm95ZWQuCi0gICAgICB9Ci0gICAgfQotCi0gICAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgSW5wdXQgewotICAgICAgc3RhdGljIGZpbmFsIElucHV0IEVORF9USFJFQUQgPSBuZXcgSW5wdXQobnVsbCk7Ci0KLSAgICAgIGZpbmFsIEludHJhTGluZURpZmZLZXkga2V5OwotCi0gICAgICBJbnB1dChJbnRyYUxpbmVEaWZmS2V5IGtleSkgewotICAgICAgICB0aGlzLmtleSA9IGtleTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBzdGF0aWMgY2xhc3MgUmVzdWx0IHsKLSAgICAgIHN0YXRpYyBmaW5hbCBSZXN1bHQgVElNRU9VVCA9IG5ldyBSZXN1bHQoKEludHJhTGluZURpZmYpIG51bGwpOwotCi0gICAgICBmaW5hbCBJbnRyYUxpbmVEaWZmIGRpZmY7Ci0gICAgICBmaW5hbCBFeGNlcHRpb24gZXJyb3I7Ci0KLSAgICAgIFJlc3VsdChJbnRyYUxpbmVEaWZmIGRpZmYpIHsKLSAgICAgICAgdGhpcy5kaWZmID0gZGlmZjsKLSAgICAgICAgdGhpcy5lcnJvciA9IG51bGw7Ci0gICAgICB9Ci0KLSAgICAgIFJlc3VsdChFeGNlcHRpb24gZXJyb3IpIHsKLSAgICAgICAgdGhpcy5kaWZmID0gbnVsbDsKLSAgICAgICAgdGhpcy5lcnJvciA9IGVycm9yOwotICAgICAgfQotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIEludHJhTGluZURpZmYgY29tcHV0ZShJbnRyYUxpbmVEaWZmS2V5IGtleSkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgIHN0YXRpYyBJbnRyYUxpbmVEaWZmIGNvbXB1dGUoSW50cmFMaW5lRGlmZktleSBrZXkpIHRocm93cyBFeGNlcHRpb24gewogICAgIExpc3Q8RWRpdD4gZWRpdHMgPSBuZXcgQXJyYXlMaXN0PEVkaXQ+KGtleS5nZXRFZGl0cygpKTsKICAgICBUZXh0IGFDb250ZW50ID0ga2V5LmdldFRleHRBKCk7CiAgICAgVGV4dCBiQ29udGVudCA9IGtleS5nZXRUZXh0QigpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9JbnRyYUxpbmVXb3JrZXJQb29sLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BhdGNoL0ludHJhTGluZVdvcmtlclBvb2wuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41YzYzMzhmZQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGF0Y2gvSW50cmFMaW5lV29ya2VyUG9vbC5qYXZhCkBAIC0wLDAgKzEsMTgyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisvLworCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guSW50cmFMaW5lTG9hZGVyLmxvZzsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkFic3RyYWN0TW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CisKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5BcnJheUJsb2NraW5nUXVldWU7CitpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuQmxvY2tpbmdRdWV1ZTsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdDsKK2ltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5hdG9taWMuQXRvbWljSW50ZWdlcjsKKworQFNpbmdsZXRvbgorcHVibGljIGNsYXNzIEludHJhTGluZVdvcmtlclBvb2wgeworICBwdWJsaWMgc3RhdGljIGNsYXNzIE1vZHVsZSBleHRlbmRzIEFic3RyYWN0TW9kdWxlIHsKKyAgICBAT3ZlcnJpZGUKKyAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CisgICAgICBiaW5kKEludHJhTGluZVdvcmtlclBvb2wuY2xhc3MpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgZmluYWwgQmxvY2tpbmdRdWV1ZTxXb3JrZXI+IHdvcmtlclBvb2w7CisKKyAgQEluamVjdAorICBwdWJsaWMgSW50cmFMaW5lV29ya2VyUG9vbChAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBjZmcpIHsKKyAgICBpbnQgd29ya2VycyA9IGNmZy5nZXRJbnQoCisgICAgICAgICJjYWNoZSIsIFBhdGNoTGlzdENhY2hlSW1wbC5JTlRSQV9OQU1FLCAibWF4SWRsZVdvcmtlcnMiLAorICAgICAgICBSdW50aW1lLmdldFJ1bnRpbWUoKS5hdmFpbGFibGVQcm9jZXNzb3JzKCkgKiAzIC8gMik7CisgICAgd29ya2VyUG9vbCA9IG5ldyBBcnJheUJsb2NraW5nUXVldWU8V29ya2VyPih3b3JrZXJzLCB0cnVlIC8qIGZhaXIgKi8pOworICB9CisKKyAgV29ya2VyIGFjcXVpcmUoKSB7CisgICAgV29ya2VyIHcgPSB3b3JrZXJQb29sLnBvbGwoKTsKKyAgICBpZiAodyA9PSBudWxsKSB7CisgICAgICAvLyBJZiBubyB3b3JrZXIgaXMgaW1tZWRpYXRlbHkgYXZhaWxhYmxlLCBzdGFydCBhIG5ldyBvbmUuCisgICAgICAvLyBNYXhpbXVtIHBhcmFsbGVsaXNtIGlzIGNvbnRyb2xsZWQgYnkgdGhlIHdlYiBzZXJ2ZXIuCisgICAgICB3ID0gbmV3IFdvcmtlcigpOworICAgICAgdy5zdGFydCgpOworICAgIH0KKyAgICByZXR1cm4gdzsKKyAgfQorCisgIHZvaWQgcmVsZWFzZShXb3JrZXIgdykgeworICAgIGlmICghd29ya2VyUG9vbC5vZmZlcih3KSkgeworICAgICAgLy8gSWYgdGhlIGlkbGUgd29ya2VyIHBvb2wgaXMgZnVsbCwgdGVybWluYXRlIHRoZSB3b3JrZXIuCisgICAgICB3LnNodXRkb3duR3JhY2VmdWxseSgpOworICAgIH0KKyAgfQorCisgIHN0YXRpYyBjbGFzcyBXb3JrZXIgZXh0ZW5kcyBUaHJlYWQgeworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIEF0b21pY0ludGVnZXIgY291bnQgPSBuZXcgQXRvbWljSW50ZWdlcigxKTsKKworICAgIHByaXZhdGUgZmluYWwgQXJyYXlCbG9ja2luZ1F1ZXVlPElucHV0PiBpbnB1dDsKKyAgICBwcml2YXRlIGZpbmFsIEFycmF5QmxvY2tpbmdRdWV1ZTxSZXN1bHQ+IHJlc3VsdDsKKworICAgIFdvcmtlcigpIHsKKyAgICAgIGlucHV0ID0gbmV3IEFycmF5QmxvY2tpbmdRdWV1ZTxJbnB1dD4oMSk7CisgICAgICByZXN1bHQgPSBuZXcgQXJyYXlCbG9ja2luZ1F1ZXVlPFJlc3VsdD4oMSk7CisKKyAgICAgIHNldE5hbWUoIkludHJhTGluZURpZmYtIiArIGNvdW50LmdldEFuZEluY3JlbWVudCgpKTsKKyAgICAgIHNldERhZW1vbih0cnVlKTsKKyAgICB9CisKKyAgICBSZXN1bHQgY29tcHV0ZVdpdGhUaW1lb3V0KEludHJhTGluZURpZmZLZXkga2V5LCBsb25nIHRpbWVvdXRNaWxsaXMpCisgICAgICAgIHRocm93cyBFeGNlcHRpb24geworICAgICAgaWYgKCFpbnB1dC5vZmZlcihuZXcgSW5wdXQoa2V5KSkpIHsKKyAgICAgICAgbG9nLmVycm9yKCJDYW5ub3QgZW5xdWV1ZSB0YXNrIHRvIHRocmVhZCAiICsgZ2V0TmFtZSgpKTsKKyAgICAgICAgcmV0dXJuIFJlc3VsdC5USU1FT1VUOworICAgICAgfQorCisgICAgICBSZXN1bHQgciA9IHJlc3VsdC5wb2xsKHRpbWVvdXRNaWxsaXMsIFRpbWVVbml0Lk1JTExJU0VDT05EUyk7CisgICAgICBpZiAociAhPSBudWxsKSB7CisgICAgICAgIHJldHVybiByOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgbG9nLndhcm4odGltZW91dE1pbGxpcyArICIgbXMgdGltZW91dCByZWFjaGVkIGZvciBJbnRyYUxpbmVEaWZmIgorICAgICAgICAgICAgKyAiIGluIHByb2plY3QgIiArIGtleS5nZXRQcm9qZWN0KCkuZ2V0KCkKKyAgICAgICAgICAgICsgIiBvbiBjb21taXQgIiArIGtleS5nZXRDb21taXQoKS5uYW1lKCkKKyAgICAgICAgICAgICsgIiBmb3IgcGF0aCAiICsga2V5LmdldFBhdGgoKQorICAgICAgICAgICAgKyAiIGNvbXBhcmluZyAiICsga2V5LmdldEJsb2JBKCkubmFtZSgpCisgICAgICAgICAgICArICIuLiIgKyBrZXkuZ2V0QmxvYkIoKS5uYW1lKCkKKyAgICAgICAgICAgICsgIi4gIEtpbGxpbmcgIiArIGdldE5hbWUoKSk7CisgICAgICAgIGZvcmNlZnVsbHlLaWxsVGhyZWFkSW5BblVnbHlXYXkoKTsKKyAgICAgICAgcmV0dXJuIFJlc3VsdC5USU1FT1VUOworICAgICAgfQorICAgIH0KKworICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJkZXByZWNhdGlvbiIpCisgICAgcHJpdmF0ZSB2b2lkIGZvcmNlZnVsbHlLaWxsVGhyZWFkSW5BblVnbHlXYXkoKSB7CisgICAgICB0cnkgeworICAgICAgICBzdG9wKCk7CisgICAgICB9IGNhdGNoIChUaHJvd2FibGUgZXJyb3IpIHsKKyAgICAgICAgLy8gSWdub3JlIGFueSByZWFzb24gdGhlIHRocmVhZCB3b24ndCBzdG9wLgorICAgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBzdG9wIHJ1bmF3YXkgdGhyZWFkICIgKyBnZXROYW1lKCksIGVycm9yKTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBwcml2YXRlIHZvaWQgc2h1dGRvd25HcmFjZWZ1bGx5KCkgeworICAgICAgaWYgKCFpbnB1dC5vZmZlcihJbnB1dC5FTkRfVEhSRUFEKSkgeworICAgICAgICBsb2cuZXJyb3IoIkNhbm5vdCBncmFjZWZ1bGx5IHN0b3AgdGhyZWFkICIgKyBnZXROYW1lKCkpOworICAgICAgfQorICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIGZvciAoOzspIHsKKyAgICAgICAgICBJbnB1dCBpbjsKKyAgICAgICAgICB0cnkgeworICAgICAgICAgICAgaW4gPSBpbnB1dC50YWtlKCk7CisgICAgICAgICAgfSBjYXRjaCAoSW50ZXJydXB0ZWRFeGNlcHRpb24gZSkgeworICAgICAgICAgICAgbG9nLmVycm9yKCJVbmV4cGVjdGVkIGludGVycnVwdCBvbiAiICsgZ2V0TmFtZSgpKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgIH0KKworICAgICAgICAgIGlmIChpbiA9PSBJbnB1dC5FTkRfVEhSRUFEKSB7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgfQorCisgICAgICAgICAgUmVzdWx0IHI7CisgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIHIgPSBuZXcgUmVzdWx0KEludHJhTGluZUxvYWRlci5jb21wdXRlKGluLmtleSkpOworICAgICAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlcnJvcikgeworICAgICAgICAgICAgciA9IG5ldyBSZXN1bHQoZXJyb3IpOworICAgICAgICAgIH0KKworICAgICAgICAgIGlmICghcmVzdWx0Lm9mZmVyKHIpKSB7CisgICAgICAgICAgICBsb2cuZXJyb3IoIkNhbm5vdCByZXR1cm4gcmVzdWx0IGZyb20gIiArIGdldE5hbWUoKSk7CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICB9IGNhdGNoIChUaHJlYWREZWF0aCBpSGF2ZUJlZW5TaG90KSB7CisgICAgICAgIC8vIEhhbmRsZSB0aHJlYWQgZGVhdGggYnkgZ3JhY2VmdWxseSByZXR1cm5pbmcgdG8gdGhlIGNhbGxlciwKKyAgICAgICAgLy8gYWxsb3dpbmcgdGhlIHRocmVhZCB0byBiZSBkZXN0cm95ZWQuCisgICAgICB9CisgICAgfQorCisgICAgcHJpdmF0ZSBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgICAgc3RhdGljIGZpbmFsIElucHV0IEVORF9USFJFQUQgPSBuZXcgSW5wdXQobnVsbCk7CisKKyAgICAgIGZpbmFsIEludHJhTGluZURpZmZLZXkga2V5OworCisgICAgICBJbnB1dChJbnRyYUxpbmVEaWZmS2V5IGtleSkgeworICAgICAgICB0aGlzLmtleSA9IGtleTsKKyAgICAgIH0KKyAgICB9CisKKyAgICBzdGF0aWMgY2xhc3MgUmVzdWx0IHsKKyAgICAgIHN0YXRpYyBmaW5hbCBSZXN1bHQgVElNRU9VVCA9IG5ldyBSZXN1bHQoKEludHJhTGluZURpZmYpIG51bGwpOworCisgICAgICBmaW5hbCBJbnRyYUxpbmVEaWZmIGRpZmY7CisgICAgICBmaW5hbCBFeGNlcHRpb24gZXJyb3I7CisKKyAgICAgIFJlc3VsdChJbnRyYUxpbmVEaWZmIGRpZmYpIHsKKyAgICAgICAgdGhpcy5kaWZmID0gZGlmZjsKKyAgICAgICAgdGhpcy5lcnJvciA9IG51bGw7CisgICAgICB9CisKKyAgICAgIFJlc3VsdChFeGNlcHRpb24gZXJyb3IpIHsKKyAgICAgICAgdGhpcy5kaWZmID0gbnVsbDsKKyAgICAgICAgdGhpcy5lcnJvciA9IGVycm9yOworICAgICAgfQorICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9QdWJsaXNoQ29tbWVudHMuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGF0Y2gvUHVibGlzaENvbW1lbnRzLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGZkYWJjYWEuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wYXRjaC9QdWJsaXNoQ29tbWVudHMuamF2YQorKysgL2Rldi9udWxsCkBAIC0xLDM4MCArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDkgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoOwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5VmFsdWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlTWVzc2FnZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hMaW5lQ29tbWVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0SW5mbzsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkNoYW5nZVV0aWw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuV29ya1F1ZXVlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkNvbW1lbnRTZW5kZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5JbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5SZXF1ZXN0U2NvcGVQcm9wYWdhdG9yOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci53b3JrZmxvdy5GdW5jdGlvblN0YXRlOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0anNvbnJwYy5jb21tb24uVm9pZFJlc3VsdDsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5hc3Npc3RlZGluamVjdC5Bc3Npc3RlZDsKLQotaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7Ci1pbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7Ci0KLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuTWFwOwotaW1wb3J0IGphdmEudXRpbC5TZXQ7Ci1pbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuQ2FsbGFibGU7Ci0KLXB1YmxpYyBjbGFzcyBQdWJsaXNoQ29tbWVudHMgaW1wbGVtZW50cyBDYWxsYWJsZTxWb2lkUmVzdWx0PiB7Ci0gIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPQotICAgICAgTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoUHVibGlzaENvbW1lbnRzLmNsYXNzKTsKLQotICBwdWJsaWMgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIFB1Ymxpc2hDb21tZW50cyBjcmVhdGUoUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZCwgU3RyaW5nIG1lc3NhZ2VUZXh0LAotICAgICAgICBTZXQ8QXBwcm92YWxDYXRlZ29yeVZhbHVlLklkPiBhcHByb3ZhbHMsIGJvb2xlYW4gZm9yY2VNZXNzYWdlKTsKLSAgfQotCi0gIHByaXZhdGUgZmluYWwgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2NoZW1hRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBSZXZpZXdEYiBkYjsKLSAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlciB1c2VyOwotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgdHlwZXM7Ci0gIHByaXZhdGUgZmluYWwgQ29tbWVudFNlbmRlci5GYWN0b3J5IGNvbW1lbnRTZW5kZXJGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgRnVuY3Rpb25TdGF0ZS5GYWN0b3J5IGZ1bmN0aW9uU3RhdGVGYWN0b3J5OwotICBwcml2YXRlIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzOwotICBwcml2YXRlIGZpbmFsIFdvcmtRdWV1ZSB3b3JrUXVldWU7Ci0gIHByaXZhdGUgZmluYWwgUmVxdWVzdFNjb3BlUHJvcGFnYXRvciByZXF1ZXN0U2NvcGVQcm9wYWdhdG9yOwotCi0gIHByaXZhdGUgZmluYWwgUGF0Y2hTZXQuSWQgcGF0Y2hTZXRJZDsKLSAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbWVzc2FnZVRleHQ7Ci0gIHByaXZhdGUgZmluYWwgU2V0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZD4gYXBwcm92YWxzOwotICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gZm9yY2VNZXNzYWdlOwotCi0gIHByaXZhdGUgQ2hhbmdlIGNoYW5nZTsKLSAgcHJpdmF0ZSBQYXRjaFNldCBwYXRjaFNldDsKLSAgcHJpdmF0ZSBDaGFuZ2VNZXNzYWdlIG1lc3NhZ2U7Ci0gIHByaXZhdGUgTGlzdDxQYXRjaExpbmVDb21tZW50PiBkcmFmdHM7Ci0KLSAgQEluamVjdAotICBQdWJsaXNoQ29tbWVudHMoZmluYWwgU2NoZW1hRmFjdG9yeTxSZXZpZXdEYj4gc2YsIGZpbmFsIFJldmlld0RiIGRiLAotICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIgdXNlciwKLSAgICAgIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlcywKLSAgICAgIGZpbmFsIENvbW1lbnRTZW5kZXIuRmFjdG9yeSBjb21tZW50U2VuZGVyRmFjdG9yeSwKLSAgICAgIGZpbmFsIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcGF0Y2hTZXRJbmZvRmFjdG9yeSwKLSAgICAgIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSwKLSAgICAgIGZpbmFsIEZ1bmN0aW9uU3RhdGUuRmFjdG9yeSBmdW5jdGlvblN0YXRlRmFjdG9yeSwKLSAgICAgIGZpbmFsIENoYW5nZUhvb2tzIGhvb2tzLAotICAgICAgZmluYWwgV29ya1F1ZXVlIHdvcmtRdWV1ZSwKLSAgICAgIGZpbmFsIFJlcXVlc3RTY29wZVByb3BhZ2F0b3IgcmVxdWVzdFNjb3BlUHJvcGFnYXRvciwKLQotICAgICAgQEFzc2lzdGVkIGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQsCi0gICAgICBAQXNzaXN0ZWQgZmluYWwgU3RyaW5nIG1lc3NhZ2VUZXh0LAotICAgICAgQEFzc2lzdGVkIGZpbmFsIFNldDxBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQ+IGFwcHJvdmFscywKLSAgICAgIEBBc3Npc3RlZCBmaW5hbCBib29sZWFuIGZvcmNlTWVzc2FnZSkgewotICAgIHRoaXMuc2NoZW1hRmFjdG9yeSA9IHNmOwotICAgIHRoaXMuZGIgPSBkYjsKLSAgICB0aGlzLnVzZXIgPSB1c2VyOwotICAgIHRoaXMudHlwZXMgPSBhcHByb3ZhbFR5cGVzOwotICAgIHRoaXMucGF0Y2hTZXRJbmZvRmFjdG9yeSA9IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7Ci0gICAgdGhpcy5jb21tZW50U2VuZGVyRmFjdG9yeSA9IGNvbW1lbnRTZW5kZXJGYWN0b3J5OwotICAgIHRoaXMuY2hhbmdlQ29udHJvbEZhY3RvcnkgPSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKLSAgICB0aGlzLmZ1bmN0aW9uU3RhdGVGYWN0b3J5ID0gZnVuY3Rpb25TdGF0ZUZhY3Rvcnk7Ci0gICAgdGhpcy5ob29rcyA9IGhvb2tzOwotICAgIHRoaXMud29ya1F1ZXVlID0gd29ya1F1ZXVlOwotICAgIHRoaXMucmVxdWVzdFNjb3BlUHJvcGFnYXRvciA9IHJlcXVlc3RTY29wZVByb3BhZ2F0b3I7Ci0KLSAgICB0aGlzLnBhdGNoU2V0SWQgPSBwYXRjaFNldElkOwotICAgIHRoaXMubWVzc2FnZVRleHQgPSBtZXNzYWdlVGV4dDsKLSAgICB0aGlzLmFwcHJvdmFscyA9IGFwcHJvdmFsczsKLSAgICB0aGlzLmZvcmNlTWVzc2FnZSA9IGZvcmNlTWVzc2FnZTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgVm9pZFJlc3VsdCBjYWxsKCkgdGhyb3dzIE5vU3VjaENoYW5nZUV4Y2VwdGlvbiwKLSAgICAgIEludmFsaWRDaGFuZ2VPcGVyYXRpb25FeGNlcHRpb24sIE9ybUV4Y2VwdGlvbiB7Ci0gICAgZmluYWwgQ2hhbmdlLklkIGNoYW5nZUlkID0gcGF0Y2hTZXRJZC5nZXRQYXJlbnRLZXkoKTsKLSAgICBmaW5hbCBDaGFuZ2VDb250cm9sIGN0bCA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5LnZhbGlkYXRlRm9yKGNoYW5nZUlkKTsKLSAgICBjaGFuZ2UgPSBjdGwuZ2V0Q2hhbmdlKCk7Ci0gICAgcGF0Y2hTZXQgPSBkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCk7Ci0gICAgaWYgKHBhdGNoU2V0ID09IG51bGwpIHsKLSAgICAgIHRocm93IG5ldyBOb1N1Y2hDaGFuZ2VFeGNlcHRpb24oY2hhbmdlSWQpOwotICAgIH0KLSAgICBkcmFmdHMgPSBkcmFmdHMoKTsKLQotICAgIGRiLmNoYW5nZXMoKS5iZWdpblRyYW5zYWN0aW9uKGNoYW5nZUlkKTsKLSAgICB0cnkgewotICAgICAgcHVibGlzaERyYWZ0cygpOwotCi0gICAgICBmaW5hbCBib29sZWFuIGlzQ3VycmVudCA9IHBhdGNoU2V0SWQuZXF1YWxzKGNoYW5nZS5jdXJyZW50UGF0Y2hTZXRJZCgpKTsKLSAgICAgIGlmIChpc0N1cnJlbnQgJiYgY2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7Ci0gICAgICAgIHB1Ymxpc2hBcHByb3ZhbHMoY3RsKTsKLSAgICAgIH0gZWxzZSBpZiAoYXBwcm92YWxzLmlzRW1wdHkoKSB8fCBmb3JjZU1lc3NhZ2UpIHsKLSAgICAgICAgcHVibGlzaE1lc3NhZ2VPbmx5KCk7Ci0gICAgICB9IGVsc2UgewotICAgICAgICB0aHJvdyBuZXcgSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbigiQ2hhbmdlIGlzIGNsb3NlZCIpOwotICAgICAgfQotCi0gICAgICB0b3VjaENoYW5nZSgpOwotICAgICAgZGIuY29tbWl0KCk7Ci0gICAgfSBmaW5hbGx5IHsKLSAgICAgIGRiLnJvbGxiYWNrKCk7Ci0gICAgfQotCi0gICAgZW1haWwoKTsKLSAgICBmaXJlSG9vaygpOwotICAgIHJldHVybiBWb2lkUmVzdWx0LklOU1RBTkNFOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHB1Ymxpc2hEcmFmdHMoKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBmb3IgKGZpbmFsIFBhdGNoTGluZUNvbW1lbnQgYyA6IGRyYWZ0cykgewotICAgICAgYy5zZXRTdGF0dXMoUGF0Y2hMaW5lQ29tbWVudC5TdGF0dXMuUFVCTElTSEVEKTsKLSAgICAgIGMudXBkYXRlZCgpOwotICAgIH0KLSAgICBkYi5wYXRjaENvbW1lbnRzKCkudXBkYXRlKGRyYWZ0cyk7Ci0gIH0KLQotICBwcml2YXRlIHZvaWQgcHVibGlzaEFwcHJvdmFscyhDaGFuZ2VDb250cm9sIGN0bCkKLSAgICAgIHRocm93cyBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24gewotICAgIENoYW5nZVV0aWwudXBkYXRlZChjaGFuZ2UpOwotCi0gICAgZmluYWwgU2V0PEFwcHJvdmFsQ2F0ZWdvcnkuSWQ+IGRpcnR5ID0gbmV3IEhhc2hTZXQ8QXBwcm92YWxDYXRlZ29yeS5JZD4oKTsKLSAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IGlucyA9IG5ldyBBcnJheUxpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4oKTsKLSAgICBmaW5hbCBMaXN0PFBhdGNoU2V0QXBwcm92YWw+IHVwZCA9IG5ldyBBcnJheUxpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4oKTsKLSAgICBmaW5hbCBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+IGFsbCA9Ci0gICAgICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuYnlQYXRjaFNldChwYXRjaFNldElkKS50b0xpc3QoKTsKLSAgICBmaW5hbCBNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4gbWluZSA9IG1pbmUoYWxsKTsKLQotICAgIC8vIEVuc3VyZSBhbnkgbmV3IGFwcHJvdmFscyBhcmUgc3RvcmVkIHByb3Blcmx5LgotICAgIC8vCi0gICAgZm9yIChmaW5hbCBBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQgd2FudCA6IGFwcHJvdmFscykgewotICAgICAgUGF0Y2hTZXRBcHByb3ZhbCBhID0gbWluZS5nZXQod2FudC5nZXRQYXJlbnRLZXkoKSk7Ci0gICAgICBpZiAoYSA9PSBudWxsKSB7Ci0gICAgICAgIGEgPSBuZXcgUGF0Y2hTZXRBcHByb3ZhbChuZXcgUGF0Y2hTZXRBcHByb3ZhbC5LZXkoLy8KLSAgICAgICAgICAgIHBhdGNoU2V0SWQsIHVzZXIuZ2V0QWNjb3VudElkKCksIHdhbnQuZ2V0UGFyZW50S2V5KCkpLCB3YW50LmdldCgpKTsKLSAgICAgICAgYS5jYWNoZShjaGFuZ2UpOwotICAgICAgICBpbnMuYWRkKGEpOwotICAgICAgICBhbGwuYWRkKGEpOwotICAgICAgICBtaW5lLnB1dChhLmdldENhdGVnb3J5SWQoKSwgYSk7Ci0gICAgICAgIGRpcnR5LmFkZChhLmdldENhdGVnb3J5SWQoKSk7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgLy8gTm9ybWFsaXplIGFsbCBvZiB0aGUgaXRlbXMgdGhlIHVzZXIgaXMgY2hhbmdpbmcuCi0gICAgLy8KLSAgICBmaW5hbCBGdW5jdGlvblN0YXRlIGZ1bmN0aW9uU3RhdGUgPQotICAgICAgICBmdW5jdGlvblN0YXRlRmFjdG9yeS5jcmVhdGUoY3RsLCBwYXRjaFNldElkLCBhbGwpOwotICAgIGZvciAoZmluYWwgQXBwcm92YWxDYXRlZ29yeVZhbHVlLklkIHdhbnQgOiBhcHByb3ZhbHMpIHsKLSAgICAgIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgYSA9IG1pbmUuZ2V0KHdhbnQuZ2V0UGFyZW50S2V5KCkpOwotICAgICAgZmluYWwgc2hvcnQgbyA9IGEuZ2V0VmFsdWUoKTsKLSAgICAgIGEuc2V0VmFsdWUod2FudC5nZXQoKSk7Ci0gICAgICBhLmNhY2hlKGNoYW5nZSk7Ci0gICAgICBpZiAoIUFwcHJvdmFsQ2F0ZWdvcnkuU1VCTUlULmVxdWFscyhhLmdldENhdGVnb3J5SWQoKSkpIHsKLSAgICAgICAgZnVuY3Rpb25TdGF0ZS5ub3JtYWxpemUodHlwZXMuYnlJZChhLmdldENhdGVnb3J5SWQoKSksIGEpOwotICAgICAgfQotICAgICAgaWYgKHdhbnQuZ2V0KCkgIT0gYS5nZXRWYWx1ZSgpKSB7Ci0gICAgICAgIHRocm93IG5ldyBJbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uKAotICAgICAgICAgICAgdHlwZXMuYnlJZChhLmdldENhdGVnb3J5SWQoKSkuZ2V0Q2F0ZWdvcnkoKS5nZXRMYWJlbE5hbWUoKQotICAgICAgICAgICAgKyAiPSIgKyB3YW50LmdldCgpICsgIiBub3QgcGVybWl0dGVkIik7Ci0gICAgICB9Ci0gICAgICBpZiAobyAhPSBhLmdldFZhbHVlKCkpIHsKLSAgICAgICAgLy8gVmFsdWUgY2hhbmdlZCwgZW5zdXJlIHdlIHVwZGF0ZSB0aGUgZGF0YWJhc2UuCi0gICAgICAgIC8vCi0gICAgICAgIGEuc2V0R3JhbnRlZCgpOwotICAgICAgICBkaXJ0eS5hZGQoYS5nZXRDYXRlZ29yeUlkKCkpOwotICAgICAgfQotICAgICAgaWYgKCFpbnMuY29udGFpbnMoYSkpIHsKLSAgICAgICAgdXBkLmFkZChhKTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICAvLyBGb3JtYXQgYSBtZXNzYWdlIGV4cGxhaW5pbmcgdGhlIGFjdGlvbnMgdGFrZW4uCi0gICAgLy8KLSAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIG1zZ2J1ZiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7Ci0gICAgZm9yIChmaW5hbCBBcHByb3ZhbFR5cGUgYXQgOiB0eXBlcy5nZXRBcHByb3ZhbFR5cGVzKCkpIHsKLSAgICAgIGlmIChkaXJ0eS5jb250YWlucyhhdC5nZXRDYXRlZ29yeSgpLmdldElkKCkpKSB7Ci0gICAgICAgIGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgYSA9IG1pbmUuZ2V0KGF0LmdldENhdGVnb3J5KCkuZ2V0SWQoKSk7Ci0gICAgICAgIGlmIChhLmdldFZhbHVlKCkgPT0gMCAmJiBpbnMuY29udGFpbnMoYSkpIHsKLSAgICAgICAgICAvLyBEb24ndCBzYXkgIm5vIHNjb3JlIiBmb3IgYW4gaW5pdGlhbCBlbnRyeS4KLSAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotCi0gICAgICAgIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSB2YWwgPSBhdC5nZXRWYWx1ZShhKTsKLSAgICAgICAgaWYgKG1zZ2J1Zi5sZW5ndGgoKSA+IDApIHsKLSAgICAgICAgICBtc2didWYuYXBwZW5kKCI7ICIpOwotICAgICAgICB9Ci0gICAgICAgIGlmICh2YWwgIT0gbnVsbCAmJiB2YWwuZ2V0TmFtZSgpICE9IG51bGwgJiYgIXZhbC5nZXROYW1lKCkuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgbXNnYnVmLmFwcGVuZCh2YWwuZ2V0TmFtZSgpKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICBtc2didWYuYXBwZW5kKGF0LmdldENhdGVnb3J5KCkuZ2V0TmFtZSgpKTsKLSAgICAgICAgICBtc2didWYuYXBwZW5kKCIgIik7Ci0gICAgICAgICAgaWYgKGEuZ2V0VmFsdWUoKSA+IDApIG1zZ2J1Zi5hcHBlbmQoJysnKTsKLSAgICAgICAgICBtc2didWYuYXBwZW5kKGEuZ2V0VmFsdWUoKSk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9Ci0KLSAgICAvLyBVcGRhdGUgZGFzaGJvYXJkcyBmb3IgZXZlcnlvbmUgZWxzZS4KLSAgICAvLwotICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBhIDogYWxsKSB7Ci0gICAgICBpZiAoIXVzZXIuZ2V0QWNjb3VudElkKCkuZXF1YWxzKGEuZ2V0QWNjb3VudElkKCkpKSB7Ci0gICAgICAgIGEuY2FjaGUoY2hhbmdlKTsKLSAgICAgICAgdXBkLmFkZChhKTsKLSAgICAgIH0KLSAgICB9Ci0KLSAgICBkYi5wYXRjaFNldEFwcHJvdmFscygpLnVwZGF0ZSh1cGQpOwotICAgIGRiLnBhdGNoU2V0QXBwcm92YWxzKCkuaW5zZXJ0KGlucyk7Ci0KLSAgICBzdW1tYXJpemVJbmxpbmVDb21tZW50cyhtc2didWYpOwotICAgIG1lc3NhZ2UobXNnYnVmLnRvU3RyaW5nKCkpOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHB1Ymxpc2hNZXNzYWdlT25seSgpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIFN0cmluZ0J1aWxkZXIgbXNnYnVmID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICBzdW1tYXJpemVJbmxpbmVDb21tZW50cyhtc2didWYpOwotICAgIG1lc3NhZ2UobXNnYnVmLnRvU3RyaW5nKCkpOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIG1lc3NhZ2UoU3RyaW5nIGFjdGlvbnMpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIGlmICgoYWN0aW9ucyA9PSBudWxsIHx8IGFjdGlvbnMuaXNFbXB0eSgpKQotICAgICAgICAmJiAobWVzc2FnZVRleHQgPT0gbnVsbCB8fCBtZXNzYWdlVGV4dC5pc0VtcHR5KCkpKSB7Ci0gICAgICAvLyBUaGV5IGhhZCBub3RoaW5nIHRvIHNheT8KLSAgICAgIC8vCi0gICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgZmluYWwgU3RyaW5nQnVpbGRlciBtc2didWYgPSBuZXcgU3RyaW5nQnVpbGRlcigpOwotICAgIG1zZ2J1Zi5hcHBlbmQoIlBhdGNoIFNldCAiICsgcGF0Y2hTZXRJZC5nZXQoKSArICI6Iik7Ci0gICAgaWYgKGFjdGlvbnMgIT0gbnVsbCAmJiAhYWN0aW9ucy5pc0VtcHR5KCkpIHsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoIiAiKTsKLSAgICAgIG1zZ2J1Zi5hcHBlbmQoYWN0aW9ucyk7Ci0gICAgfQotICAgIG1zZ2J1Zi5hcHBlbmQoIlxuXG4iKTsKLSAgICBtc2didWYuYXBwZW5kKG1lc3NhZ2VUZXh0ICE9IG51bGwgPyBtZXNzYWdlVGV4dCA6ICIiKTsKLQotICAgIG1lc3NhZ2UgPSBuZXcgQ2hhbmdlTWVzc2FnZShuZXcgQ2hhbmdlTWVzc2FnZS5LZXkoY2hhbmdlLmdldElkKCksLy8KLSAgICAgICAgQ2hhbmdlVXRpbC5tZXNzYWdlVVVJRChkYikpLCB1c2VyLmdldEFjY291bnRJZCgpLCBwYXRjaFNldElkKTsKLSAgICBtZXNzYWdlLnNldE1lc3NhZ2UobXNnYnVmLnRvU3RyaW5nKCkpOwotICAgIGRiLmNoYW5nZU1lc3NhZ2VzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihtZXNzYWdlKSk7Ci0gIH0KLQotICBwcml2YXRlIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBQYXRjaFNldEFwcHJvdmFsPiBtaW5lKAotICAgICAgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPiBhbGwpIHsKLSAgICBNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4gciA9Ci0gICAgICAgIG5ldyBIYXNoTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIFBhdGNoU2V0QXBwcm92YWw+KCk7Ci0gICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIGEgOiBhbGwpIHsKLSAgICAgIGlmICh1c2VyLmdldEFjY291bnRJZCgpLmVxdWFscyhhLmdldEFjY291bnRJZCgpKSkgewotICAgICAgICByLnB1dChhLmdldENhdGVnb3J5SWQoKSwgYSk7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiByOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHRvdWNoQ2hhbmdlKCkgewotICAgIHRyeSB7Ci0gICAgICBDaGFuZ2VVdGlsLnRvdWNoKGNoYW5nZSwgZGIpOwotICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSBMaXN0PFBhdGNoTGluZUNvbW1lbnQ+IGRyYWZ0cygpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIHJldHVybiBkYi5wYXRjaENvbW1lbnRzKCkuZHJhZnRCeVBhdGNoU2V0QXV0aG9yKHBhdGNoU2V0SWQsIHVzZXIuZ2V0QWNjb3VudElkKCkpLnRvTGlzdCgpOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIGVtYWlsKCkgewotICAgIGlmIChtZXNzYWdlID09IG51bGwpIHsKLSAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICB3b3JrUXVldWUuZ2V0RGVmYXVsdFF1ZXVlKCkKLSAgICAgICAgLnN1Ym1pdChyZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLndyYXAobmV3IFJ1bm5hYmxlKCkgewotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgdm9pZCBydW4oKSB7Ci0gICAgICAgIFBhdGNoU2V0SW5mbyBwYXRjaFNldEluZm87Ci0gICAgICAgIHRyeSB7Ci0gICAgICAgICAgUmV2aWV3RGIgcmV2aWV3RGIgPSBzY2hlbWFGYWN0b3J5Lm9wZW4oKTsKLSAgICAgICAgICB0cnkgewotICAgICAgICAgICAgcGF0Y2hTZXRJbmZvID0gcGF0Y2hTZXRJbmZvRmFjdG9yeS5nZXQocmV2aWV3RGIsIHBhdGNoU2V0SWQpOwotICAgICAgICAgIH0gZmluYWxseSB7Ci0gICAgICAgICAgICByZXZpZXdEYi5jbG9zZSgpOwotICAgICAgICAgIH0KLSAgICAgICAgfSBjYXRjaCAoUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgICBsb2cuZXJyb3IoIkNhbm5vdCByZWFkIFBhdGNoU2V0SW5mbyBvZiAiICsgcGF0Y2hTZXRJZCwgZSk7Ci0gICAgICAgICAgcmV0dXJuOwotICAgICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgewotICAgICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IGVtYWlsIGNvbW1lbnRzIGZvciAiICsgcGF0Y2hTZXRJZCwgZSk7Ci0gICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICBmaW5hbCBDb21tZW50U2VuZGVyIGNtID0gY29tbWVudFNlbmRlckZhY3RvcnkuY3JlYXRlKGNoYW5nZSk7Ci0gICAgICAgICAgY20uc2V0RnJvbSh1c2VyLmdldEFjY291bnRJZCgpKTsKLSAgICAgICAgICBjbS5zZXRQYXRjaFNldChwYXRjaFNldCwgcGF0Y2hTZXRJbmZvKTsKLSAgICAgICAgICBjbS5zZXRDaGFuZ2VNZXNzYWdlKG1lc3NhZ2UpOwotICAgICAgICAgIGNtLnNldFBhdGNoTGluZUNvbW1lbnRzKGRyYWZ0cyk7Ci0gICAgICAgICAgY20uc2VuZCgpOwotICAgICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgewotICAgICAgICAgIGxvZy5lcnJvcigiQ2Fubm90IGVtYWlsIGNvbW1lbnRzIGZvciAiICsgcGF0Y2hTZXRJZCwgZSk7Ci0gICAgICAgIH0KLSAgICAgIH0KLQotICAgICAgQE92ZXJyaWRlCi0gICAgICBwdWJsaWMgU3RyaW5nIHRvU3RyaW5nKCkgewotICAgICAgICByZXR1cm4gInNlbmQtZW1haWwgY29tbWVudHMiOwotICAgICAgfQotICAgIH0pKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBmaXJlSG9vaygpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIGZpbmFsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQ+IGNoYW5nZWQgPQotICAgICAgICBuZXcgSGFzaE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQ+KCk7Ci0gICAgZm9yIChBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQgdiA6IGFwcHJvdmFscykgewotICAgICAgY2hhbmdlZC5wdXQodi5nZXRQYXJlbnRLZXkoKSwgdik7Ci0gICAgfQotCi0gICAgaG9va3MuZG9Db21tZW50QWRkZWRIb29rKGNoYW5nZSwgdXNlci5nZXRBY2NvdW50KCksIHBhdGNoU2V0LCBtZXNzYWdlVGV4dCwgY2hhbmdlZCwgZGIpOwotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIHN1bW1hcml6ZUlubGluZUNvbW1lbnRzKFN0cmluZ0J1aWxkZXIgaW4pIHsKLSAgICBpZiAoIWRyYWZ0cy5pc0VtcHR5KCkpIHsKLSAgICAgIGlmIChpbi5sZW5ndGgoKSAhPSAwKSB7Ci0gICAgICAgIGluLmFwcGVuZCgiXG5cbiIpOwotICAgICAgfQotICAgICAgaWYgKGRyYWZ0cy5zaXplKCkgPT0gMSkgewotICAgICAgICBpbi5hcHBlbmQoIigxIGlubGluZSBjb21tZW50KSIpOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgaW4uYXBwZW5kKCIoIiArIGRyYWZ0cy5zaXplKCkgKyAiIGlubGluZSBjb21tZW50cykiKTsKLSAgICAgIH0KLSAgICB9Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9BdXRvUmVnaXN0ZXJNb2R1bGVzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvQXV0b1JlZ2lzdGVyTW9kdWxlcy5qYXZhCmluZGV4IGU4YWYwNjAuLjYwNjJhZTkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9BdXRvUmVnaXN0ZXJNb2R1bGVzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0F1dG9SZWdpc3Rlck1vZHVsZXMuamF2YQpAQCAtMTQsNiArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zOwogCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLkF1dG9SZWdpc3RlclV0aWwuY2FsY3VsYXRlQmluZEFubm90YXRpb247CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlBsdWdpbkd1aWNlRW52aXJvbm1lbnQuaXM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkxpbmtlZExpc3RNdWx0aW1hcDsKQEAgLTI2LDcgKzI3LDYgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Nb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2NvcGVzOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmludGVybmFsLlVuaXF1ZUFubm90YXRpb25zOwogCiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC51dGlsLklPOwogaW1wb3J0IG9yZy5vYmplY3R3ZWIuYXNtLkFubm90YXRpb25WaXNpdG9yOwpAQCAtMTE2LDE2ICsxMTYsNyBAQAogICAgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQogICAgICAgICAgIENsYXNzPE9iamVjdD4gaW1wbCA9IChDbGFzczxPYmplY3Q+KSBlLmdldFZhbHVlKCk7CiAKLSAgICAgICAgICBBbm5vdGF0aW9uIG4gPSBpbXBsLmdldEFubm90YXRpb24oRXhwb3J0LmNsYXNzKTsKLSAgICAgICAgICBpZiAobiA9PSBudWxsKSB7Ci0gICAgICAgICAgICBuID0gaW1wbC5nZXRBbm5vdGF0aW9uKGphdmF4LmluamVjdC5OYW1lZC5jbGFzcyk7Ci0gICAgICAgICAgfQotICAgICAgICAgIGlmIChuID09IG51bGwpIHsKLSAgICAgICAgICAgIG4gPSBpbXBsLmdldEFubm90YXRpb24oY29tLmdvb2dsZS5pbmplY3QubmFtZS5OYW1lZC5jbGFzcyk7Ci0gICAgICAgICAgfQotICAgICAgICAgIGlmIChuID09IG51bGwpIHsKLSAgICAgICAgICAgIG4gPSBVbmlxdWVBbm5vdGF0aW9ucy5jcmVhdGUoKTsKLSAgICAgICAgICB9CisgICAgICAgICAgQW5ub3RhdGlvbiBuID0gY2FsY3VsYXRlQmluZEFubm90YXRpb24oaW1wbCk7CiAgICAgICAgICAgYmluZCh0eXBlKS5hbm5vdGF0ZWRXaXRoKG4pLnRvKGltcGwpOwogICAgICAgICB9CiAgICAgICB9CkBAIC0yNDUsOSArMjM2LDE2IEBACiAKICAgICAgIGlmIChyYXdUeXBlLmdldEFubm90YXRpb24oRXh0ZW5zaW9uUG9pbnQuY2xhc3MpICE9IG51bGwpIHsKICAgICAgICAgVHlwZUxpdGVyYWw8Pz4gdGwgPSBUeXBlTGl0ZXJhbC5nZXQodHlwZSk7Ci0gICAgICAgIGlmIChlbnYuaGFzRHluYW1pY1NldCh0bCkpIHsKKyAgICAgICAgaWYgKGVudi5oYXNEeW5hbWljSXRlbSh0bCkpIHsKICAgICAgICAgICBzeXNTaW5nbGV0b25zLmFkZChjbGF6eik7CiAgICAgICAgICAgc3lzTGlzdGVuLnB1dCh0bCwgY2xhenopOworICAgICAgICAgIGh0dHBHZW4ubGlzdGVuKHRsLCBjbGF6eik7CisgICAgICAgICAgc3NoR2VuLmxpc3Rlbih0bCwgY2xhenopOworICAgICAgICB9IGVsc2UgaWYgKGVudi5oYXNEeW5hbWljU2V0KHRsKSkgeworICAgICAgICAgIHN5c1NpbmdsZXRvbnMuYWRkKGNsYXp6KTsKKyAgICAgICAgICBzeXNMaXN0ZW4ucHV0KHRsLCBjbGF6eik7CisgICAgICAgICAgaHR0cEdlbi5saXN0ZW4odGwsIGNsYXp6KTsKKyAgICAgICAgICBzc2hHZW4ubGlzdGVuKHRsLCBjbGF6eik7CiAgICAgICAgIH0gZWxzZSBpZiAoZW52Lmhhc0R5bmFtaWNNYXAodGwpKSB7CiAgICAgICAgICAgaWYgKGNsYXp6LmdldEFubm90YXRpb24oRXhwb3J0LmNsYXNzKSA9PSBudWxsKSB7CiAgICAgICAgICAgICB0aHJvdyBuZXcgSW52YWxpZFBsdWdpbkV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KApAQCAtMjU2LDYgKzI1NCw4IEBACiAgICAgICAgICAgfQogICAgICAgICAgIHN5c1NpbmdsZXRvbnMuYWRkKGNsYXp6KTsKICAgICAgICAgICBzeXNMaXN0ZW4ucHV0KHRsLCBjbGF6eik7CisgICAgICAgICAgaHR0cEdlbi5saXN0ZW4odGwsIGNsYXp6KTsKKyAgICAgICAgICBzc2hHZW4ubGlzdGVuKHRsLCBjbGF6eik7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgdGhyb3cgbmV3IEludmFsaWRQbHVnaW5FeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKICAgICAgICAgICAgICAgIkNhbm5vdCByZWdpc3RlciAlcywgc2VydmVyIGRvZXMgbm90IGFjY2VwdCAlcyIsCkBAIC0yOTksNyArMjk5LDcgQEAKICAgICByZXR1cm4gZGF0YTsKICAgfQogCi0gIHByaXZhdGUgc3RhdGljIGNsYXNzIENsYXNzRGF0YSBpbXBsZW1lbnRzIENsYXNzVmlzaXRvciB7CisgIHByaXZhdGUgc3RhdGljIGNsYXNzIENsYXNzRGF0YSBleHRlbmRzIENsYXNzVmlzaXRvciB7CiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIEVYUE9SVCA9IFR5cGUuZ2V0VHlwZShFeHBvcnQuY2xhc3MpLmdldERlc2NyaXB0b3IoKTsKICAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgTElTVEVOID0gVHlwZS5nZXRUeXBlKExpc3Rlbi5jbGFzcykuZ2V0RGVzY3JpcHRvcigpOwogCkBAIC0zMDgsNiArMzA4LDEwIEBACiAgICAgU3RyaW5nIGV4cG9ydGVkQXNOYW1lOwogICAgIGJvb2xlYW4gbGlzdGVuOwogCisgICAgQ2xhc3NEYXRhKCkgeworICAgICAgc3VwZXIoT3Bjb2Rlcy5BU000KTsKKyAgICB9CisKICAgICBib29sZWFuIGlzQ29uY3JldGUoKSB7CiAgICAgICByZXR1cm4gKGFjY2VzcyAmIE9wY29kZXMuQUNDX0FCU1RSQUNUKSA9PSAwCiAgICAgICAgICAgJiYgKGFjY2VzcyAmIE9wY29kZXMuQUNDX0lOVEVSRkFDRSkgPT0gMDsKQEAgLTM3MCw4ICszNzQsMTIgQEAKICAgICB9CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdEFubm90YXRpb25WaXNpdG9yIGltcGxlbWVudHMKKyAgcHJpdmF0ZSBzdGF0aWMgYWJzdHJhY3QgY2xhc3MgQWJzdHJhY3RBbm5vdGF0aW9uVmlzaXRvciBleHRlbmRzCiAgICAgICBBbm5vdGF0aW9uVmlzaXRvciB7CisgICAgQWJzdHJhY3RBbm5vdGF0aW9uVmlzaXRvcigpIHsKKyAgICAgIHN1cGVyKE9wY29kZXMuQVNNNCk7CisgICAgfQorCiAgICAgQE92ZXJyaWRlCiAgICAgcHVibGljIEFubm90YXRpb25WaXNpdG9yIHZpc2l0QW5ub3RhdGlvbihTdHJpbmcgYXJnMCwgU3RyaW5nIGFyZzEpIHsKICAgICAgIHJldHVybiBudWxsOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0F1dG9SZWdpc3RlclV0aWwuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9BdXRvUmVnaXN0ZXJVdGlsLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzI1NmQ3ZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9BdXRvUmVnaXN0ZXJVdGlsLmphdmEKQEAgLTAsMCArMSw0MSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5FeHBvcnQ7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuaW50ZXJuYWwuVW5pcXVlQW5ub3RhdGlvbnM7CisKK2ltcG9ydCBqYXZhLmxhbmcuYW5ub3RhdGlvbi5Bbm5vdGF0aW9uOworCitwdWJsaWMgZmluYWwgY2xhc3MgQXV0b1JlZ2lzdGVyVXRpbCB7CisKKyAgcHVibGljIHN0YXRpYyBBbm5vdGF0aW9uIGNhbGN1bGF0ZUJpbmRBbm5vdGF0aW9uKENsYXNzPE9iamVjdD4gaW1wbCkgeworICAgIEFubm90YXRpb24gbiA9IGltcGwuZ2V0QW5ub3RhdGlvbihFeHBvcnQuY2xhc3MpOworICAgIGlmIChuID09IG51bGwpIHsKKyAgICAgIG4gPSBpbXBsLmdldEFubm90YXRpb24oamF2YXguaW5qZWN0Lk5hbWVkLmNsYXNzKTsKKyAgICB9CisgICAgaWYgKG4gPT0gbnVsbCkgeworICAgICAgbiA9IGltcGwuZ2V0QW5ub3RhdGlvbihjb20uZ29vZ2xlLmluamVjdC5uYW1lLk5hbWVkLmNsYXNzKTsKKyAgICB9CisgICAgaWYgKG4gPT0gbnVsbCkgeworICAgICAgbiA9IFVuaXF1ZUFubm90YXRpb25zLmNyZWF0ZSgpOworICAgIH0KKyAgICByZXR1cm4gbjsKKyAgfQorCisgIHByaXZhdGUgQXV0b1JlZ2lzdGVyVXRpbCgpIHsKKyAgICAvLyBoaWRlIGRlZmF1bHQgY29uc3RydWN0b3IKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0NsZWFudXBIYW5kbGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9DbGVhbnVwSGFuZGxlLmphdmEKaW5kZXggNzAxOGEzYi4uYjA0ZjMzNyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0NsZWFudXBIYW5kbGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvQ2xlYW51cEhhbmRsZS5qYXZhCkBAIC0xNiwxOSArMTYsMTQgQEAKIAogaW1wb3J0IGphdmEuaW8uRmlsZTsKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEubGFuZy5yZWYuUmVmZXJlbmNlUXVldWU7Ci1pbXBvcnQgamF2YS5sYW5nLnJlZi5XZWFrUmVmZXJlbmNlOwogaW1wb3J0IGphdmEudXRpbC5qYXIuSmFyRmlsZTsKIAotY2xhc3MgQ2xlYW51cEhhbmRsZSBleHRlbmRzIFdlYWtSZWZlcmVuY2U8Q2xhc3NMb2FkZXI+IHsKK2NsYXNzIENsZWFudXBIYW5kbGUgewogICBwcml2YXRlIGZpbmFsIEZpbGUgdG1wRmlsZTsKICAgcHJpdmF0ZSBmaW5hbCBKYXJGaWxlIGphckZpbGU7CiAKICAgQ2xlYW51cEhhbmRsZShGaWxlIHRtcEZpbGUsCi0gICAgICBKYXJGaWxlIGphckZpbGUsCi0gICAgICBDbGFzc0xvYWRlciByZWYsCi0gICAgICBSZWZlcmVuY2VRdWV1ZTxDbGFzc0xvYWRlcj4gcXVldWUpIHsKLSAgICBzdXBlcihyZWYsIHF1ZXVlKTsKKyAgICAgIEphckZpbGUgamFyRmlsZSkgewogICAgIHRoaXMudG1wRmlsZSA9IHRtcEZpbGU7CiAgICAgdGhpcy5qYXJGaWxlID0gamFyRmlsZTsKICAgfQpAQCAtMzksNyArMzQsOSBAQAogICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGVycikgewogICAgIH0KICAgICBpZiAoIXRtcEZpbGUuZGVsZXRlKCkgJiYgdG1wRmlsZS5leGlzdHMoKSkgewotICAgICAgUGx1Z2luTG9hZGVyLmxvZy53YXJuKCJDYW5ub3QgZGVsZXRlICIgKyB0bXBGaWxlLmdldEFic29sdXRlUGF0aCgpKTsKKyAgICAgIFBsdWdpbkxvYWRlci5sb2cud2FybigiQ2Fubm90IGRlbGV0ZSAiICsgdG1wRmlsZS5nZXRBYnNvbHV0ZVBhdGgoKQorICAgICAgICAgICsgIiwgcmV0cnlpbmcgdG8gZGVsZXRlIGl0IG9uIHRlcm1pbmF0aW9uIG9mIHRoZSB2aXJ0dWFsIG1hY2hpbmUiKTsKKyAgICAgIHRtcEZpbGUuZGVsZXRlT25FeGl0KCk7CiAgICAgfSBlbHNlIHsKICAgICAgIFBsdWdpbkxvYWRlci5sb2cuaW5mbygiQ2xlYW5lZCBwbHVnaW4gIiArIHRtcEZpbGUuZ2V0TmFtZSgpKTsKICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvQ29weUNvbmZpZ01vZHVsZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0NvcHlDb25maWdNb2R1bGUuamF2YQppbmRleCBmMzQ4MjZkLi42N2VlN2I0IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvQ29weUNvbmZpZ01vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9Db3B5Q29uZmlnTW9kdWxlLmphdmEKQEAgLTE1LDYgKzE1LDkgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudFByb3ZpZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQW5vbnltb3VzQ293YXJkTmFtZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOwpAQCAtMjcsNiArMzAsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlNpbmdsZXRvbjsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKIAogaW1wb3J0IGphdmEuaW8uRmlsZTsKIApAQCAtOTMsNiArOTcsMjUgQEAKICAgfQogCiAgIEBJbmplY3QKKyAgQEFub255bW91c0Nvd2FyZE5hbWUKKyAgcHJpdmF0ZSBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZTsKKworICBAUHJvdmlkZXMKKyAgQEFub255bW91c0Nvd2FyZE5hbWUKKyAgU3RyaW5nIGdldEFub255bW91c0Nvd2FyZE5hbWUoKSB7CisgICAgcmV0dXJuIGFub255bW91c0Nvd2FyZE5hbWU7CisgIH0KKworICBASW5qZWN0CisgIHByaXZhdGUgR2Vycml0UGVyc29uSWRlbnRQcm92aWRlciBzZXJ2ZXJJZGVudFByb3ZpZGVyOworCisgIEBQcm92aWRlcworICBAR2Vycml0UGVyc29uSWRlbnQKKyAgUGVyc29uSWRlbnQgZ2V0U2VydmVySWRlbnQoKSB7CisgICAgcmV0dXJuIHNlcnZlcklkZW50UHJvdmlkZXIuZ2V0KCk7CisgIH0KKworICBASW5qZWN0CiAgIENvcHlDb25maWdNb2R1bGUoKSB7CiAgIH0KIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0Rpc2FibGVQbHVnaW4uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9EaXNhYmxlUGx1Z2luLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uY2FlNWNlNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9EaXNhYmxlUGx1Z2luLmphdmEKQEAgLTAsMCArMSw0MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlJlcXVpcmVzQ2FwYWJpbGl0eTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuRGlzYWJsZVBsdWdpbi5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK0BSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorY2xhc3MgRGlzYWJsZVBsdWdpbiBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFBsdWdpblJlc291cmNlLCBJbnB1dD4geworICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQbHVnaW5Mb2FkZXIgbG9hZGVyOworCisgIEBJbmplY3QKKyAgRGlzYWJsZVBsdWdpbihQbHVnaW5Mb2FkZXIgbG9hZGVyKSB7CisgICAgdGhpcy5sb2FkZXIgPSBsb2FkZXI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShQbHVnaW5SZXNvdXJjZSByZXNvdXJjZSwgSW5wdXQgaW5wdXQpIHsKKyAgICBTdHJpbmcgbmFtZSA9IHJlc291cmNlLmdldE5hbWUoKTsKKyAgICBsb2FkZXIuZGlzYWJsZVBsdWdpbnMoSW1tdXRhYmxlU2V0Lm9mKG5hbWUpKTsKKyAgICByZXR1cm4gbmV3IExpc3RQbHVnaW5zLlBsdWdpbkluZm8obG9hZGVyLmdldChuYW1lKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9FbmFibGVQbHVnaW4uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9FbmFibGVQbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mMzNkODE0Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0VuYWJsZVBsdWdpbi5qYXZhCkBAIC0wLDAgKzEsNTYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2luczsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlU2V0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLkVuYWJsZVBsdWdpbi5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBqYXZhLmlvLlByaW50V3JpdGVyOworaW1wb3J0IGphdmEuaW8uU3RyaW5nV3JpdGVyOworCitAUmVxdWlyZXNDYXBhYmlsaXR5KEdsb2JhbENhcGFiaWxpdHkuQURNSU5JU1RSQVRFX1NFUlZFUikKK2NsYXNzIEVuYWJsZVBsdWdpbiBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFBsdWdpblJlc291cmNlLCBJbnB1dD4geworICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQbHVnaW5Mb2FkZXIgbG9hZGVyOworCisgIEBJbmplY3QKKyAgRW5hYmxlUGx1Z2luKFBsdWdpbkxvYWRlciBsb2FkZXIpIHsKKyAgICB0aGlzLmxvYWRlciA9IGxvYWRlcjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KFBsdWdpblJlc291cmNlIHJlc291cmNlLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uIHsKKyAgICBTdHJpbmcgbmFtZSA9IHJlc291cmNlLmdldE5hbWUoKTsKKyAgICB0cnkgeworICAgICAgbG9hZGVyLmVuYWJsZVBsdWdpbnMoSW1tdXRhYmxlU2V0Lm9mKG5hbWUpKTsKKyAgICB9IGNhdGNoIChQbHVnaW5JbnN0YWxsRXhjZXB0aW9uIGUpIHsKKyAgICAgIFN0cmluZ1dyaXRlciBidWYgPSBuZXcgU3RyaW5nV3JpdGVyKCk7CisgICAgICBidWYud3JpdGUoU3RyaW5nLmZvcm1hdCgiY2Fubm90IGVuYWJsZSAlc1xuIiwgbmFtZSkpOworICAgICAgUHJpbnRXcml0ZXIgcHcgPSBuZXcgUHJpbnRXcml0ZXIoYnVmKTsKKyAgICAgIGUucHJpbnRTdGFja1RyYWNlKHB3KTsKKyAgICAgIHB3LmZsdXNoKCk7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihidWYudG9TdHJpbmcoKSk7CisgICAgfQorICAgIHJldHVybiBuZXcgTGlzdFBsdWdpbnMuUGx1Z2luSW5mbyhsb2FkZXIuZ2V0KG5hbWUpKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0dldFN0YXR1cy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0dldFN0YXR1cy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjIyMDdkMzQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvR2V0U3RhdHVzLmphdmEKQEAgLTAsMCArMSwyNCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKKworY2xhc3MgR2V0U3RhdHVzIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PFBsdWdpblJlc291cmNlPiB7CisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KFBsdWdpblJlc291cmNlIHJlc291cmNlKSB7CisgICAgcmV0dXJuIG5ldyBMaXN0UGx1Z2lucy5QbHVnaW5JbmZvKHJlc291cmNlLmdldFBsdWdpbigpKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0luc3RhbGxQbHVnaW4uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9JbnN0YWxsUGx1Z2luLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTJjYWM2ZQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9JbnN0YWxsUGx1Z2luLmphdmEKQEAgLTAsMCArMSwxMTAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2luczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkRlZmF1bHRJbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUHV0SW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVG9wTGV2ZWxSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2lucy5JbnN0YWxsUGx1Z2luLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLmlvLlByaW50V3JpdGVyOworaW1wb3J0IGphdmEuaW8uU3RyaW5nV3JpdGVyOworaW1wb3J0IGphdmEubmV0Lk1hbGZvcm1lZFVSTEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLm5ldC5VUkw7CitpbXBvcnQgamF2YS51dGlsLnppcC5aaXBFeGNlcHRpb247CisKK0BSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorY2xhc3MgSW5zdGFsbFBsdWdpbiBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFRvcExldmVsUmVzb3VyY2UsIElucHV0PiB7CisgIHN0YXRpYyBjbGFzcyBJbnB1dCB7CisgICAgQERlZmF1bHRJbnB1dAorICAgIFN0cmluZyB1cmw7CisgICAgUHV0SW5wdXQgcmF3OworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQbHVnaW5Mb2FkZXIgbG9hZGVyOworICBwcml2YXRlIGZpbmFsIFN0cmluZyBuYW1lOworICBwcml2YXRlIGZpbmFsIGJvb2xlYW4gY3JlYXRlZDsKKworICBJbnN0YWxsUGx1Z2luKFBsdWdpbkxvYWRlciBsb2FkZXIsIFN0cmluZyBuYW1lLCBib29sZWFuIGNyZWF0ZWQpIHsKKyAgICB0aGlzLmxvYWRlciA9IGxvYWRlcjsKKyAgICB0aGlzLm5hbWUgPSBuYW1lOworICAgIHRoaXMuY3JlYXRlZCA9IGNyZWF0ZWQ7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFJlc3BvbnNlPExpc3RQbHVnaW5zLlBsdWdpbkluZm8+IGFwcGx5KFRvcExldmVsUmVzb3VyY2UgcmVzb3VyY2UsCisgICAgICBJbnB1dCBpbnB1dCkgdGhyb3dzIEJhZFJlcXVlc3RFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKyAgICB0cnkgeworICAgICAgSW5wdXRTdHJlYW0gaW47CisgICAgICBpZiAoaW5wdXQucmF3ICE9IG51bGwpIHsKKyAgICAgICAgaW4gPSBpbnB1dC5yYXcuZ2V0SW5wdXRTdHJlYW0oKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgaW4gPSBuZXcgVVJMKGlucHV0LnVybCkub3BlblN0cmVhbSgpOworICAgICAgICB9IGNhdGNoIChNYWxmb3JtZWRVUkxFeGNlcHRpb24gZSkgeworICAgICAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKGUuZ2V0TWVzc2FnZSgpKTsKKyAgICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKGUuZ2V0TWVzc2FnZSgpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgICAgdHJ5IHsKKyAgICAgICAgbG9hZGVyLmluc3RhbGxQbHVnaW5Gcm9tU3RyZWFtKG5hbWUsIGluKTsKKyAgICAgIH0gZmluYWxseSB7CisgICAgICAgIGluLmNsb3NlKCk7CisgICAgICB9CisgICAgfSBjYXRjaCAoUGx1Z2luSW5zdGFsbEV4Y2VwdGlvbiBlKSB7CisgICAgICBTdHJpbmdXcml0ZXIgYnVmID0gbmV3IFN0cmluZ1dyaXRlcigpOworICAgICAgYnVmLndyaXRlKFN0cmluZy5mb3JtYXQoImNhbm5vdCBpbnN0YWxsICVzIiwgbmFtZSkpOworICAgICAgaWYgKGUuZ2V0Q2F1c2UoKSBpbnN0YW5jZW9mIFppcEV4Y2VwdGlvbikgeworICAgICAgICBidWYud3JpdGUoIjogIik7CisgICAgICAgIGJ1Zi53cml0ZShlLmdldENhdXNlKCkuZ2V0TWVzc2FnZSgpKTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIGJ1Zi53cml0ZSgiOlxuIik7CisgICAgICAgIFByaW50V3JpdGVyIHB3ID0gbmV3IFByaW50V3JpdGVyKGJ1Zik7CisgICAgICAgIGUucHJpbnRTdGFja1RyYWNlKHB3KTsKKyAgICAgICAgcHcuZmx1c2goKTsKKyAgICAgIH0KKyAgICAgIHRocm93IG5ldyBCYWRSZXF1ZXN0RXhjZXB0aW9uKGJ1Zi50b1N0cmluZygpKTsKKyAgICB9CisKKyAgICBMaXN0UGx1Z2lucy5QbHVnaW5JbmZvIGluZm8gPSBuZXcgTGlzdFBsdWdpbnMuUGx1Z2luSW5mbyhsb2FkZXIuZ2V0KG5hbWUpKTsKKyAgICByZXR1cm4gY3JlYXRlZCA/IFJlc3BvbnNlLmNyZWF0ZWQoaW5mbykgOiBSZXNwb25zZS5vayhpbmZvKTsKKyAgfQorCisgIEBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorICBzdGF0aWMgY2xhc3MgT3ZlcndyaXRlIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8UGx1Z2luUmVzb3VyY2UsIElucHV0PiB7CisgICAgcHJpdmF0ZSBmaW5hbCBQbHVnaW5Mb2FkZXIgbG9hZGVyOworCisgICAgQEluamVjdAorICAgIE92ZXJ3cml0ZShQbHVnaW5Mb2FkZXIgbG9hZGVyKSB7CisgICAgICB0aGlzLmxvYWRlciA9IGxvYWRlcjsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgUmVzcG9uc2U8TGlzdFBsdWdpbnMuUGx1Z2luSW5mbz4gYXBwbHkoUGx1Z2luUmVzb3VyY2UgcmVzb3VyY2UsCisgICAgICAgIElucHV0IGlucHV0KSB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgICAgcmV0dXJuIG5ldyBJbnN0YWxsUGx1Z2luKGxvYWRlciwgcmVzb3VyY2UuZ2V0TmFtZSgpLCBmYWxzZSkKKyAgICAgICAgLmFwcGx5KFRvcExldmVsUmVzb3VyY2UuSU5TVEFOQ0UsIGlucHV0KTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9MaXN0UGx1Z2lucy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0xpc3RQbHVnaW5zLmphdmEKaW5kZXggM2Y3YmM5Ny4uY2I2NWU4YyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0xpc3RQbHVnaW5zLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL0xpc3RQbHVnaW5zLmphdmEKQEAgLTE3LDcgKzE3LDE2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVG9wTGV2ZWxSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVXJsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5PdXRwdXRGb3JtYXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLkpzb25FbGVtZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5yZWZsZWN0LlR5cGVUb2tlbjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiAKQEAgLTM0LDEwICs0MywxMiBAQAogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKIC8qKiBMaXN0IHRoZSBpbnN0YWxsZWQgcGx1Z2lucy4gKi8KLXB1YmxpYyBjbGFzcyBMaXN0UGx1Z2lucyB7CitAUmVxdWlyZXNDYXBhYmlsaXR5KEdsb2JhbENhcGFiaWxpdHkuQURNSU5JU1RSQVRFX1NFUlZFUikKK3B1YmxpYyBjbGFzcyBMaXN0UGx1Z2lucyBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxUb3BMZXZlbFJlc291cmNlPiB7CiAgIHByaXZhdGUgZmluYWwgUGx1Z2luTG9hZGVyIHBsdWdpbkxvYWRlcjsKIAotICBAT3B0aW9uKG5hbWUgPSAiLS1mb3JtYXQiLCBtZXRhVmFyID0gIkZNVCIsIHVzYWdlID0gIk91dHB1dCBkaXNwbGF5IGZvcm1hdCIpCisgIEBEZXByZWNhdGVkCisgIEBPcHRpb24obmFtZSA9ICItLWZvcm1hdCIsIHVzYWdlID0gIihkZXByZWNhdGVkKSBvdXRwdXQgZm9ybWF0IikKICAgcHJpdmF0ZSBPdXRwdXRGb3JtYXQgZm9ybWF0ID0gT3V0cHV0Rm9ybWF0LlRFWFQ7CiAKICAgQE9wdGlvbihuYW1lID0gIi0tYWxsIiwgYWxpYXNlcyA9IHsiLWEifSwgdXNhZ2UgPSAiTGlzdCBhbGwgcGx1Z2lucywgaW5jbHVkaW5nIGRpc2FibGVkIHBsdWdpbnMiKQpAQCAtNTcsMTkgKzY4LDI2IEBACiAgICAgcmV0dXJuIHRoaXM7CiAgIH0KIAotICBwdWJsaWMgdm9pZCBkaXNwbGF5KE91dHB1dFN0cmVhbSBvdXQpIHsKLSAgICBmaW5hbCBQcmludFdyaXRlciBzdGRvdXQ7Ci0gICAgdHJ5IHsKLSAgICAgIHN0ZG91dCA9Ci0gICAgICAgICAgbmV3IFByaW50V3JpdGVyKG5ldyBCdWZmZXJlZFdyaXRlcihuZXcgT3V0cHV0U3RyZWFtV3JpdGVyKG91dCwKLSAgICAgICAgICAgICAgIlVURi04IikpKTsKLSAgICB9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIGUpIHsKLSAgICAgIC8vIE91ciBlbmNvZGluZyBpcyByZXF1aXJlZCBieSB0aGUgc3BlY2lmaWNhdGlvbnMgZm9yIHRoZSBydW50aW1lLgotICAgICAgdGhyb3cgbmV3IFJ1bnRpbWVFeGNlcHRpb24oIkpWTSBsYWNrcyBVVEYtOCBlbmNvZGluZyIsIGUpOworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShUb3BMZXZlbFJlc291cmNlIHJlc291cmNlKSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwKKyAgICAgIEJhZFJlcXVlc3RFeGNlcHRpb24sIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24sIEV4Y2VwdGlvbiB7CisgICAgZm9ybWF0ID0gT3V0cHV0Rm9ybWF0LkpTT047CisgICAgcmV0dXJuIGRpc3BsYXkobnVsbCk7CisgIH0KKworICBwdWJsaWMgSnNvbkVsZW1lbnQgZGlzcGxheShPdXRwdXRTdHJlYW0gZGlzcGxheU91dHB1dFN0cmVhbSkKKyAgICAgIHRocm93cyBVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHsKKyAgICBQcmludFdyaXRlciBzdGRvdXQgPSBudWxsOworICAgIGlmIChkaXNwbGF5T3V0cHV0U3RyZWFtICE9IG51bGwpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIHN0ZG91dCA9IG5ldyBQcmludFdyaXRlcihuZXcgQnVmZmVyZWRXcml0ZXIoCisgICAgICAgICAgICBuZXcgT3V0cHV0U3RyZWFtV3JpdGVyKGRpc3BsYXlPdXRwdXRTdHJlYW0sICJVVEYtOCIpKSk7CisgICAgICB9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgdGhyb3cgbmV3IFJ1bnRpbWVFeGNlcHRpb24oIkpWTSBsYWNrcyBVVEYtOCBlbmNvZGluZyIsIGUpOworICAgICAgfQogICAgIH0KIAogICAgIE1hcDxTdHJpbmcsIFBsdWdpbkluZm8+IG91dHB1dCA9IE1hcHMubmV3VHJlZU1hcCgpOwotCiAgICAgTGlzdDxQbHVnaW4+IHBsdWdpbnMgPSBMaXN0cy5uZXdBcnJheUxpc3QocGx1Z2luTG9hZGVyLmdldFBsdWdpbnMoYWxsKSk7CiAgICAgQ29sbGVjdGlvbnMuc29ydChwbHVnaW5zLCBuZXcgQ29tcGFyYXRvcjxQbHVnaW4+KCkgewogICAgICAgQE92ZXJyaWRlCkBAIC04MCwxNSArOTgsMTEgQEAKIAogICAgIGlmICghZm9ybWF0LmlzSnNvbigpKSB7CiAgICAgICBzdGRvdXQuZm9ybWF0KCIlLTMwcyAlLTEwcyAlLThzXG4iLCAiTmFtZSIsICJWZXJzaW9uIiwgIlN0YXR1cyIpOwotICAgICAgc3Rkb3V0Ci0gICAgICAgICAgLnByaW50KCItLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG4iKTsKKyAgICAgIHN0ZG91dC5wcmludCgiLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIik7CiAgICAgfQogCiAgICAgZm9yIChQbHVnaW4gcCA6IHBsdWdpbnMpIHsKLSAgICAgIFBsdWdpbkluZm8gaW5mbyA9IG5ldyBQbHVnaW5JbmZvKCk7Ci0gICAgICBpbmZvLnZlcnNpb24gPSBwLmdldFZlcnNpb24oKTsKLSAgICAgIGluZm8uZGlzYWJsZWQgPSBwLmlzRGlzYWJsZWQoKSA/IHRydWUgOiBudWxsOwotCisgICAgICBQbHVnaW5JbmZvIGluZm8gPSBuZXcgUGx1Z2luSW5mbyhwKTsKICAgICAgIGlmIChmb3JtYXQuaXNKc29uKCkpIHsKICAgICAgICAgb3V0cHV0LnB1dChwLmdldE5hbWUoKSwgaW5mbyk7CiAgICAgICB9IGVsc2UgewpAQCAtOTgsMTkgKzExMiwyOSBAQAogICAgICAgfQogICAgIH0KIAotICAgIGlmIChmb3JtYXQuaXNKc29uKCkpIHsKKyAgICBpZiAoc3Rkb3V0ID09IG51bGwpIHsKKyAgICAgIHJldHVybiBPdXRwdXRGb3JtYXQuSlNPTi5uZXdHc29uKCkudG9Kc29uVHJlZSgKKyAgICAgICAgICBvdXRwdXQsCisgICAgICAgICAgbmV3IFR5cGVUb2tlbjxNYXA8U3RyaW5nLCBPYmplY3Q+PigpIHt9LmdldFR5cGUoKSk7CisgICAgfSBlbHNlIGlmIChmb3JtYXQuaXNKc29uKCkpIHsKICAgICAgIGZvcm1hdC5uZXdHc29uKCkudG9Kc29uKG91dHB1dCwKICAgICAgICAgICBuZXcgVHlwZVRva2VuPE1hcDxTdHJpbmcsIFBsdWdpbkluZm8+PigpIHt9LmdldFR5cGUoKSwgc3Rkb3V0KTsKICAgICAgIHN0ZG91dC5wcmludCgnXG4nKTsKICAgICB9CiAgICAgc3Rkb3V0LmZsdXNoKCk7CisgICAgcmV0dXJuIG51bGw7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBjbGFzcyBQbHVnaW5JbmZvIHsKKyAgc3RhdGljIGNsYXNzIFBsdWdpbkluZm8geworICAgIGZpbmFsIFN0cmluZyBraW5kID0gImdlcnJpdGNvZGVyZXZpZXcjcGx1Z2luIjsKKyAgICBTdHJpbmcgaWQ7CiAgICAgU3RyaW5nIHZlcnNpb247Ci0gICAgLy8gZGlzYWJsZWQgaXMgb25seSByZWFkIHZpYSByZWZsZWN0aW9uIHdoZW4gYnVpbGRpbmcgdGhlIGpzb24gb3V0cHV0LiAgV2UKLSAgICAvLyBkbyBub3Qgd2FudCB0byBzaG93IGEgY29tcGlsZXIgZXJyb3IgdGhhdCBpdCBpc24ndCB1c2VkLgotICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bnVzZWQiKQogICAgIEJvb2xlYW4gZGlzYWJsZWQ7CisKKyAgICBQbHVnaW5JbmZvKFBsdWdpbiBwKSB7CisgICAgICBpZCA9IFVybC5lbmNvZGUocC5nZXROYW1lKCkpOworICAgICAgdmVyc2lvbiA9IHAuZ2V0VmVyc2lvbigpOworICAgICAgZGlzYWJsZWQgPSBwLmlzRGlzYWJsZWQoKSA/IHRydWUgOiBudWxsOworICAgIH0KICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL01vZHVsZUdlbmVyYXRvci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL01vZHVsZUdlbmVyYXRvci5qYXZhCmluZGV4IDkyZTNiMWQuLjIwMTFlOWQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9Nb2R1bGVHZW5lcmF0b3IuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvTW9kdWxlR2VuZXJhdG9yLmphdmEKQEAgLTE2LDExICsxNiwxNCBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5FeHBvcnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOwogCiBwdWJsaWMgaW50ZXJmYWNlIE1vZHVsZUdlbmVyYXRvciB7CiAgIHZvaWQgc2V0UGx1Z2luTmFtZShTdHJpbmcgbmFtZSk7CiAKICAgdm9pZCBleHBvcnQoRXhwb3J0IGV4cG9ydCwgQ2xhc3M8Pz4gdHlwZSkgdGhyb3dzIEludmFsaWRQbHVnaW5FeGNlcHRpb247CiAKKyAgdm9pZCBsaXN0ZW4oVHlwZUxpdGVyYWw8Pz4gdGwsIENsYXNzPD8+IGNsYXp6KTsKKwogICBNb2R1bGUgY3JlYXRlKCkgdGhyb3dzIEludmFsaWRQbHVnaW5FeGNlcHRpb247CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvUGx1Z2luLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvUGx1Z2luLmphdmEKaW5kZXggOTFmZmJiYS4uOGU3MTkyZSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL1BsdWdpbi5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9QbHVnaW4uamF2YQpAQCAtMjAsOCArMjAsOSBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUGx1Z2luTmFtZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5SZWdpc3RyYXRpb25IYW5kbGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uUmVsb2FkYWJsZVJlZ2lzdHJhdGlvbkhhbmRsZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnN5c3RlbXN0YXR1cy5TZXJ2ZXJJbmZvcm1hdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5saWZlY3ljbGUuTGlmZWN5Y2xlTWFuYWdlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuUGx1Z2luVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5SZXF1ZXN0Q29udGV4dDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5HdWljZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3RvcjsKQEAgLTI5LDcgKzMwLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aXNpb25FeGNlcHRpb247CiAKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnN0b3JhZ2UuZmlsZS5GaWxlU25hcHNob3Q7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5pbnRlcm5hbC5zdG9yYWdlLmZpbGUuRmlsZVNuYXBzaG90OwogCiBpbXBvcnQgamF2YS5pby5GaWxlOwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKQEAgLTQyLDcgKzQzLDcgQEAKIAogcHVibGljIGNsYXNzIFBsdWdpbiB7CiAgIHB1YmxpYyBzdGF0aWMgZW51bSBBcGlUeXBlIHsKLSAgICBFWFRFTlNJT04sIFBMVUdJTjsKKyAgICBFWFRFTlNJT04sIFBMVUdJTiwgSlM7CiAgIH0KIAogICAvKiogVW5pcXVlIGtleSB0aGF0IGNoYW5nZXMgd2hlbmV2ZXIgYSBwbHVnaW4gcmVsb2Fkcy4gKi8KQEAgLTc1LDYgKzc2LDggQEAKICAgICAgIHJldHVybiBBcGlUeXBlLkVYVEVOU0lPTjsKICAgICB9IGVsc2UgaWYgKEFwaVR5cGUuUExVR0lOLm5hbWUoKS5lcXVhbHNJZ25vcmVDYXNlKHYpKSB7CiAgICAgICByZXR1cm4gQXBpVHlwZS5QTFVHSU47CisgICAgfSBlbHNlIGlmIChBcGlUeXBlLkpTLm5hbWUoKS5lcXVhbHNJZ25vcmVDYXNlKHYpKSB7CisgICAgICByZXR1cm4gQXBpVHlwZS5KUzsKICAgICB9IGVsc2UgewogICAgICAgdGhyb3cgbmV3IEludmFsaWRQbHVnaW5FeGNlcHRpb24oIkludmFsaWQgR2Vycml0LUFwaVR5cGU6ICIgKyB2KTsKICAgICB9CkBAIC04Miw2ICs4NSw3IEBACiAKICAgcHJpdmF0ZSBmaW5hbCBDYWNoZUtleSBjYWNoZUtleTsKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbmFtZTsKKyAgcHJpdmF0ZSBmaW5hbCBQbHVnaW5Vc2VyIHBsdWdpblVzZXI7CiAgIHByaXZhdGUgZmluYWwgRmlsZSBzcmNKYXI7CiAgIHByaXZhdGUgZmluYWwgRmlsZVNuYXBzaG90IHNuYXBzaG90OwogICBwcml2YXRlIGZpbmFsIEphckZpbGUgamFyRmlsZTsKQEAgLTEwMSw2ICsxMDUsNyBAQAogICBwcml2YXRlIExpc3Q8UmVsb2FkYWJsZVJlZ2lzdHJhdGlvbkhhbmRsZTw/Pj4gcmVsb2FkYWJsZUhhbmRsZXM7CiAKICAgcHVibGljIFBsdWdpbihTdHJpbmcgbmFtZSwKKyAgICAgIFBsdWdpblVzZXIgcGx1Z2luVXNlciwKICAgICAgIEZpbGUgc3JjSmFyLAogICAgICAgRmlsZVNuYXBzaG90IHNuYXBzaG90LAogICAgICAgSmFyRmlsZSBqYXJGaWxlLApAQCAtMTEyLDYgKzExNyw3IEBACiAgICAgICBATnVsbGFibGUgQ2xhc3M8PyBleHRlbmRzIE1vZHVsZT4gc3NoTW9kdWxlLAogICAgICAgQE51bGxhYmxlIENsYXNzPD8gZXh0ZW5kcyBNb2R1bGU+IGh0dHBNb2R1bGUpIHsKICAgICB0aGlzLmNhY2hlS2V5ID0gbmV3IENhY2hlS2V5KG5hbWUpOworICAgIHRoaXMucGx1Z2luVXNlciA9IHBsdWdpblVzZXI7CiAgICAgdGhpcy5uYW1lID0gbmFtZTsKICAgICB0aGlzLnNyY0phciA9IHNyY0phcjsKICAgICB0aGlzLnNuYXBzaG90ID0gc25hcHNob3Q7CkBAIC0xMzAsNiArMTM2LDEwIEBACiAgICAgcmV0dXJuIHNyY0phcjsKICAgfQogCisgIFBsdWdpblVzZXIgZ2V0UGx1Z2luVXNlcigpIHsKKyAgICByZXR1cm4gcGx1Z2luVXNlcjsKKyAgfQorCiAgIHB1YmxpYyBDYWNoZUtleSBnZXRDYWNoZUtleSgpIHsKICAgICByZXR1cm4gY2FjaGVLZXk7CiAgIH0KQEAgLTE3MSw3ICsxODEsMTYgQEAKICAgICByZXR1cm4gZGlzYWJsZWQ7CiAgIH0KIAotICBwdWJsaWMgdm9pZCBzdGFydChQbHVnaW5HdWljZUVudmlyb25tZW50IGVudikgdGhyb3dzIEV4Y2VwdGlvbiB7CisgIHZvaWQgc3RhcnQoUGx1Z2luR3VpY2VFbnZpcm9ubWVudCBlbnYpIHRocm93cyBFeGNlcHRpb24geworICAgIFJlcXVlc3RDb250ZXh0IG9sZENvbnRleHQgPSBlbnYuZW50ZXIodGhpcyk7CisgICAgdHJ5IHsKKyAgICAgIHN0YXJ0UGx1Z2luKGVudik7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGVudi5leGl0KG9sZENvbnRleHQpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBzdGFydFBsdWdpbihQbHVnaW5HdWljZUVudmlyb25tZW50IGVudikgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgSW5qZWN0b3Igcm9vdCA9IG5ld1Jvb3RJbmplY3RvcihlbnYpOwogICAgIG1hbmFnZXIgPSBuZXcgTGlmZWN5Y2xlTWFuYWdlcigpOwogCkBAIC0yMjgsMjAgKzI0NywxMyBAQAogCiAgIHByaXZhdGUgSW5qZWN0b3IgbmV3Um9vdEluamVjdG9yKGZpbmFsIFBsdWdpbkd1aWNlRW52aXJvbm1lbnQgZW52KSB7CiAgICAgTGlzdDxNb2R1bGU+IG1vZHVsZXMgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoNCk7Ci0gICAgbW9kdWxlcy5hZGQoZW52LmdldFN5c01vZHVsZSgpKTsKICAgICBpZiAoYXBpVHlwZSA9PSBBcGlUeXBlLlBMVUdJTikgewogICAgICAgbW9kdWxlcy5hZGQoZW52LmdldFN5c01vZHVsZSgpKTsKLSAgICB9IGVsc2UgewotICAgICAgbW9kdWxlcy5hZGQobmV3IEFic3RyYWN0TW9kdWxlKCkgewotICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgewotICAgICAgICAgIGJpbmQoU2VydmVySW5mb3JtYXRpb24uY2xhc3MpLnRvSW5zdGFuY2UoZW52LmdldFNlcnZlckluZm9ybWF0aW9uKCkpOwotICAgICAgICB9Ci0gICAgICB9KTsKICAgICB9CiAgICAgbW9kdWxlcy5hZGQobmV3IEFic3RyYWN0TW9kdWxlKCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CisgICAgICAgIGJpbmQoUGx1Z2luVXNlci5jbGFzcykudG9JbnN0YW5jZShwbHVnaW5Vc2VyKTsKICAgICAgICAgYmluZChTdHJpbmcuY2xhc3MpCiAgICAgICAgICAgLmFubm90YXRlZFdpdGgoUGx1Z2luTmFtZS5jbGFzcykKICAgICAgICAgICAudG9JbnN0YW5jZShuYW1lKTsKQEAgLTI3MSw5ICsyODMsMTQgQEAKICAgICByZXR1cm4gR3VpY2UuY3JlYXRlSW5qZWN0b3IobW9kdWxlcyk7CiAgIH0KIAotICBwdWJsaWMgdm9pZCBzdG9wKCkgeworICB2b2lkIHN0b3AoUGx1Z2luR3VpY2VFbnZpcm9ubWVudCBlbnYpIHsKICAgICBpZiAobWFuYWdlciAhPSBudWxsKSB7Ci0gICAgICBtYW5hZ2VyLnN0b3AoKTsKKyAgICAgIFJlcXVlc3RDb250ZXh0IG9sZENvbnRleHQgPSBlbnYuZW50ZXIodGhpcyk7CisgICAgICB0cnkgeworICAgICAgICBtYW5hZ2VyLnN0b3AoKTsKKyAgICAgIH0gZmluYWxseSB7CisgICAgICAgIGVudi5leGl0KG9sZENvbnRleHQpOworICAgICAgfQogICAgICAgbWFuYWdlciA9IG51bGw7CiAgICAgICBzeXNJbmplY3RvciA9IG51bGw7CiAgICAgICBzc2hJbmplY3RvciA9IG51bGw7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvUGx1Z2luR3VpY2VFbnZpcm9ubWVudC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL1BsdWdpbkd1aWNlRW52aXJvbm1lbnQuamF2YQppbmRleCAxODQ2MGZmLi4zODdmZmE0IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvUGx1Z2luR3VpY2VFbnZpcm9ubWVudC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9QbHVnaW5HdWljZUVudmlyb25tZW50LmphdmEKQEAgLTEzLDYgKzEzLDggQEAKIC8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zOworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLlByaXZhdGVJbnRlcm5hbHNfRHluYW1pY1R5cGVzLmR5bmFtaWNJdGVtc09mOwogaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5Qcml2YXRlSW50ZXJuYWxzX0R5bmFtaWNUeXBlcy5keW5hbWljTWFwc09mOwogaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5Qcml2YXRlSW50ZXJuYWxzX0R5bmFtaWNUeXBlcy5keW5hbWljU2V0c09mOwogCkBAIC0yMiw2ICsyNCw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5MaWZlY3ljbGVMaXN0ZW5lcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljSXRlbTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5EeW5hbWljTWFwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLkR5bmFtaWNTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uUHJpdmF0ZUludGVybmFsc19EeW5hbWljTWFwSW1wbDsKQEAgLTI5LDYgKzMyLDkgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlZ2lzdHJhdGlvbi5SZWdpc3RyYXRpb25IYW5kbGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uUmVsb2FkYWJsZVJlZ2lzdHJhdGlvbkhhbmRsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnN5c3RlbXN0YXR1cy5TZXJ2ZXJJbmZvcm1hdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5QbHVnaW5SZXF1ZXN0Q29udGV4dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5SZXF1ZXN0Q29udGV4dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIudXRpbC5UaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkFic3RyYWN0TW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkJpbmRpbmc7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuR3VpY2U7CkBAIC02Miw2ICs2OCw3IEBACiBwdWJsaWMgY2xhc3MgUGx1Z2luR3VpY2VFbnZpcm9ubWVudCB7CiAgIHByaXZhdGUgZmluYWwgSW5qZWN0b3Igc3lzSW5qZWN0b3I7CiAgIHByaXZhdGUgZmluYWwgU2VydmVySW5mb3JtYXRpb24gc3J2SW5mbzsKKyAgcHJpdmF0ZSBmaW5hbCBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsOwogICBwcml2YXRlIGZpbmFsIENvcHlDb25maWdNb2R1bGUgY29weUNvbmZpZ01vZHVsZTsKICAgcHJpdmF0ZSBmaW5hbCBTZXQ8S2V5PD8+PiBjb3B5Q29uZmlnS2V5czsKICAgcHJpdmF0ZSBmaW5hbCBMaXN0PFN0YXJ0UGx1Z2luTGlzdGVuZXI+IG9uU3RhcnQ7CkBAIC03NCw2ICs4MSw4IEBACiAgIHByaXZhdGUgUHJvdmlkZXI8TW9kdWxlR2VuZXJhdG9yPiBzc2hHZW47CiAgIHByaXZhdGUgUHJvdmlkZXI8TW9kdWxlR2VuZXJhdG9yPiBodHRwR2VuOwogCisgIHByaXZhdGUgTWFwPFR5cGVMaXRlcmFsPD8+LCBEeW5hbWljSXRlbTw/Pj4gc3lzSXRlbXM7CisKICAgcHJpdmF0ZSBNYXA8VHlwZUxpdGVyYWw8Pz4sIER5bmFtaWNTZXQ8Pz4+IHN5c1NldHM7CiAgIHByaXZhdGUgTWFwPFR5cGVMaXRlcmFsPD8+LCBEeW5hbWljU2V0PD8+PiBzc2hTZXRzOwogICBwcml2YXRlIE1hcDxUeXBlTGl0ZXJhbDw/PiwgRHluYW1pY1NldDw/Pj4gaHR0cFNldHM7CkBAIC04NSwxMCArOTQsMTIgQEAKICAgQEluamVjdAogICBQbHVnaW5HdWljZUVudmlyb25tZW50KAogICAgICAgSW5qZWN0b3Igc3lzSW5qZWN0b3IsCisgICAgICBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsLAogICAgICAgU2VydmVySW5mb3JtYXRpb24gc3J2SW5mbywKICAgICAgIENvcHlDb25maWdNb2R1bGUgY2NtKSB7CiAgICAgdGhpcy5zeXNJbmplY3RvciA9IHN5c0luamVjdG9yOwogICAgIHRoaXMuc3J2SW5mbyA9IHNydkluZm87CisgICAgdGhpcy5sb2NhbCA9IGxvY2FsOwogICAgIHRoaXMuY29weUNvbmZpZ01vZHVsZSA9IGNjbTsKICAgICB0aGlzLmNvcHlDb25maWdLZXlzID0gR3VpY2UuY3JlYXRlSW5qZWN0b3IoY2NtKS5nZXRBbGxCaW5kaW5ncygpLmtleVNldCgpOwogCkBAIC05OCw2ICsxMDksNyBAQAogICAgIG9uUmVsb2FkID0gbmV3IENvcHlPbldyaXRlQXJyYXlMaXN0PFJlbG9hZFBsdWdpbkxpc3RlbmVyPigpOwogICAgIG9uUmVsb2FkLmFkZEFsbChsaXN0ZW5lcnMoc3lzSW5qZWN0b3IsIFJlbG9hZFBsdWdpbkxpc3RlbmVyLmNsYXNzKSk7CiAKKyAgICBzeXNJdGVtcyA9IGR5bmFtaWNJdGVtc09mKHN5c0luamVjdG9yKTsKICAgICBzeXNTZXRzID0gZHluYW1pY1NldHNPZihzeXNJbmplY3Rvcik7CiAgICAgc3lzTWFwcyA9IGR5bmFtaWNNYXBzT2Yoc3lzSW5qZWN0b3IpOwogICB9CkBAIC0xMDYsNiArMTE4LDEwIEBACiAgICAgcmV0dXJuIHNydkluZm87CiAgIH0KIAorICBib29sZWFuIGhhc0R5bmFtaWNJdGVtKFR5cGVMaXRlcmFsPD8+IHR5cGUpIHsKKyAgICByZXR1cm4gc3lzSXRlbXMuY29udGFpbnNLZXkodHlwZSk7CisgIH0KKwogICBib29sZWFuIGhhc0R5bmFtaWNTZXQoVHlwZUxpdGVyYWw8Pz4gdHlwZSkgewogICAgIHJldHVybiBzeXNTZXRzLmNvbnRhaW5zS2V5KHR5cGUpCiAgICAgICAgIHx8IChzc2hTZXRzICE9IG51bGwgJiYgc3NoU2V0cy5jb250YWluc0tleSh0eXBlKSkKQEAgLTE3NywxOCArMTkzLDQyIEBACiAgICAgcmV0dXJuIGh0dHBHZW4uZ2V0KCk7CiAgIH0KIAorICBSZXF1ZXN0Q29udGV4dCBlbnRlcihQbHVnaW4gcGx1Z2luKSB7CisgICAgcmV0dXJuIGxvY2FsLnNldENvbnRleHQobmV3IFBsdWdpblJlcXVlc3RDb250ZXh0KHBsdWdpbi5nZXRQbHVnaW5Vc2VyKCkpKTsKKyAgfQorCisgIHZvaWQgZXhpdChSZXF1ZXN0Q29udGV4dCBvbGQpIHsKKyAgICBsb2NhbC5zZXRDb250ZXh0KG9sZCk7CisgIH0KKwogICB2b2lkIG9uU3RhcnRQbHVnaW4oUGx1Z2luIHBsdWdpbikgewogICAgIGZvciAoU3RhcnRQbHVnaW5MaXN0ZW5lciBsIDogb25TdGFydCkgewogICAgICAgbC5vblN0YXJ0UGx1Z2luKHBsdWdpbik7CiAgICAgfQogCi0gICAgYXR0YWNoU2V0KHN5c1NldHMsIHBsdWdpbi5nZXRTeXNJbmplY3RvcigpLCBwbHVnaW4pOwotICAgIGF0dGFjaFNldChzc2hTZXRzLCBwbHVnaW4uZ2V0U3NoSW5qZWN0b3IoKSwgcGx1Z2luKTsKLSAgICBhdHRhY2hTZXQoaHR0cFNldHMsIHBsdWdpbi5nZXRIdHRwSW5qZWN0b3IoKSwgcGx1Z2luKTsKKyAgICBSZXF1ZXN0Q29udGV4dCBvbGRDb250ZXh0ID0gZW50ZXIocGx1Z2luKTsKKyAgICB0cnkgeworICAgICAgYXR0YWNoSXRlbShzeXNJdGVtcywgcGx1Z2luLmdldFN5c0luamVjdG9yKCksIHBsdWdpbik7CiAKLSAgICBhdHRhY2hNYXAoc3lzTWFwcywgcGx1Z2luLmdldFN5c0luamVjdG9yKCksIHBsdWdpbik7Ci0gICAgYXR0YWNoTWFwKHNzaE1hcHMsIHBsdWdpbi5nZXRTc2hJbmplY3RvcigpLCBwbHVnaW4pOwotICAgIGF0dGFjaE1hcChodHRwTWFwcywgcGx1Z2luLmdldEh0dHBJbmplY3RvcigpLCBwbHVnaW4pOworICAgICAgYXR0YWNoU2V0KHN5c1NldHMsIHBsdWdpbi5nZXRTeXNJbmplY3RvcigpLCBwbHVnaW4pOworICAgICAgYXR0YWNoU2V0KHNzaFNldHMsIHBsdWdpbi5nZXRTc2hJbmplY3RvcigpLCBwbHVnaW4pOworICAgICAgYXR0YWNoU2V0KGh0dHBTZXRzLCBwbHVnaW4uZ2V0SHR0cEluamVjdG9yKCksIHBsdWdpbik7CisKKyAgICAgIGF0dGFjaE1hcChzeXNNYXBzLCBwbHVnaW4uZ2V0U3lzSW5qZWN0b3IoKSwgcGx1Z2luKTsKKyAgICAgIGF0dGFjaE1hcChzc2hNYXBzLCBwbHVnaW4uZ2V0U3NoSW5qZWN0b3IoKSwgcGx1Z2luKTsKKyAgICAgIGF0dGFjaE1hcChodHRwTWFwcywgcGx1Z2luLmdldEh0dHBJbmplY3RvcigpLCBwbHVnaW4pOworICAgIH0gZmluYWxseSB7CisgICAgICBleGl0KG9sZENvbnRleHQpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBhdHRhY2hJdGVtKE1hcDxUeXBlTGl0ZXJhbDw/PiwgRHluYW1pY0l0ZW08Pz4+IGl0ZW1zLAorICAgICAgQE51bGxhYmxlIEluamVjdG9yIHNyYywKKyAgICAgIFBsdWdpbiBwbHVnaW4pIHsKKyAgICBmb3IgKFJlZ2lzdHJhdGlvbkhhbmRsZSBoIDogUHJpdmF0ZUludGVybmFsc19EeW5hbWljVHlwZXMKKyAgICAgICAgLmF0dGFjaEl0ZW1zKHNyYywgaXRlbXMsIHBsdWdpbi5nZXROYW1lKCkpKSB7CisgICAgICBwbHVnaW4uYWRkKGgpOworICAgIH0KICAgfQogCiAgIHByaXZhdGUgdm9pZCBhdHRhY2hTZXQoTWFwPFR5cGVMaXRlcmFsPD8+LCBEeW5hbWljU2V0PD8+PiBzZXRzLApAQCAtMjIzLDEzICsyNjMsMjAgQEAKICAgICAgIG9sZC5wdXQoaC5nZXRLZXkoKS5nZXRUeXBlTGl0ZXJhbCgpLCBoKTsKICAgICB9CiAKLSAgICByZWF0dGFjaE1hcChvbGQsIHN5c01hcHMsIG5ld1BsdWdpbi5nZXRTeXNJbmplY3RvcigpLCBuZXdQbHVnaW4pOwotICAgIHJlYXR0YWNoTWFwKG9sZCwgc3NoTWFwcywgbmV3UGx1Z2luLmdldFNzaEluamVjdG9yKCksIG5ld1BsdWdpbik7Ci0gICAgcmVhdHRhY2hNYXAob2xkLCBodHRwTWFwcywgbmV3UGx1Z2luLmdldEh0dHBJbmplY3RvcigpLCBuZXdQbHVnaW4pOworICAgIFJlcXVlc3RDb250ZXh0IG9sZENvbnRleHQgPSBlbnRlcihuZXdQbHVnaW4pOworICAgIHRyeSB7CisgICAgICByZWF0dGFjaE1hcChvbGQsIHN5c01hcHMsIG5ld1BsdWdpbi5nZXRTeXNJbmplY3RvcigpLCBuZXdQbHVnaW4pOworICAgICAgcmVhdHRhY2hNYXAob2xkLCBzc2hNYXBzLCBuZXdQbHVnaW4uZ2V0U3NoSW5qZWN0b3IoKSwgbmV3UGx1Z2luKTsKKyAgICAgIHJlYXR0YWNoTWFwKG9sZCwgaHR0cE1hcHMsIG5ld1BsdWdpbi5nZXRIdHRwSW5qZWN0b3IoKSwgbmV3UGx1Z2luKTsKIAotICAgIHJlYXR0YWNoU2V0KG9sZCwgc3lzU2V0cywgbmV3UGx1Z2luLmdldFN5c0luamVjdG9yKCksIG5ld1BsdWdpbik7Ci0gICAgcmVhdHRhY2hTZXQob2xkLCBzc2hTZXRzLCBuZXdQbHVnaW4uZ2V0U3NoSW5qZWN0b3IoKSwgbmV3UGx1Z2luKTsKLSAgICByZWF0dGFjaFNldChvbGQsIGh0dHBTZXRzLCBuZXdQbHVnaW4uZ2V0SHR0cEluamVjdG9yKCksIG5ld1BsdWdpbik7CisgICAgICByZWF0dGFjaFNldChvbGQsIHN5c1NldHMsIG5ld1BsdWdpbi5nZXRTeXNJbmplY3RvcigpLCBuZXdQbHVnaW4pOworICAgICAgcmVhdHRhY2hTZXQob2xkLCBzc2hTZXRzLCBuZXdQbHVnaW4uZ2V0U3NoSW5qZWN0b3IoKSwgbmV3UGx1Z2luKTsKKyAgICAgIHJlYXR0YWNoU2V0KG9sZCwgaHR0cFNldHMsIG5ld1BsdWdpbi5nZXRIdHRwSW5qZWN0b3IoKSwgbmV3UGx1Z2luKTsKKworICAgICAgcmVhdHRhY2hJdGVtKG9sZCwgc3lzSXRlbXMsIG5ld1BsdWdpbi5nZXRTeXNJbmplY3RvcigpLCBuZXdQbHVnaW4pOworICAgIH0gZmluYWxseSB7CisgICAgICBleGl0KG9sZENvbnRleHQpOworICAgIH0KICAgfQogCiAgIHByaXZhdGUgdm9pZCByZWF0dGFjaE1hcCgKQEAgLTM1MCw2ICszOTcsNDEgQEAKICAgICAgIH0KICAgICB9CiAgIH0KKyAgcHJpdmF0ZSB2b2lkIHJlYXR0YWNoSXRlbSgKKyAgICAgIExpc3RNdWx0aW1hcDxUeXBlTGl0ZXJhbDw/PiwgUmVsb2FkYWJsZVJlZ2lzdHJhdGlvbkhhbmRsZTw/Pj4gb2xkSGFuZGxlcywKKyAgICAgIE1hcDxUeXBlTGl0ZXJhbDw/PiwgRHluYW1pY0l0ZW08Pz4+IGl0ZW1zLAorICAgICAgQE51bGxhYmxlIEluamVjdG9yIHNyYywKKyAgICAgIFBsdWdpbiBuZXdQbHVnaW4pIHsKKyAgICBpZiAoc3JjID09IG51bGwgfHwgaXRlbXMgPT0gbnVsbCB8fCBpdGVtcy5pc0VtcHR5KCkpIHsKKyAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBmb3IgKE1hcC5FbnRyeTxUeXBlTGl0ZXJhbDw/PiwgRHluYW1pY0l0ZW08Pz4+IGUgOiBpdGVtcy5lbnRyeVNldCgpKSB7CisgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgIFR5cGVMaXRlcmFsPE9iamVjdD4gdHlwZSA9IChUeXBlTGl0ZXJhbDxPYmplY3Q+KSBlLmdldEtleSgpOworCisgICAgICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgICAgIER5bmFtaWNJdGVtPE9iamVjdD4gaXRlbSA9IChEeW5hbWljSXRlbTxPYmplY3Q+KSBlLmdldFZhbHVlKCk7CisKKyAgICAgIEl0ZXJhdG9yPFJlbG9hZGFibGVSZWdpc3RyYXRpb25IYW5kbGU8Pz4+IG9pID0KKyAgICAgICAgICBvbGRIYW5kbGVzLmdldCh0eXBlKS5pdGVyYXRvcigpOworCisgICAgICBmb3IgKEJpbmRpbmc8Pz4gYmluZGluZyA6IGJpbmRpbmdzKHNyYywgdHlwZSkpIHsKKyAgICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgICAgICAgIEJpbmRpbmc8T2JqZWN0PiBiID0gKEJpbmRpbmc8T2JqZWN0PikgYmluZGluZzsKKyAgICAgICAgaWYgKG9pLmhhc05leHQoKSkgeworICAgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICAgICAgICAgIFJlbG9hZGFibGVSZWdpc3RyYXRpb25IYW5kbGU8T2JqZWN0PiBoID0KKyAgICAgICAgICAgIChSZWxvYWRhYmxlUmVnaXN0cmF0aW9uSGFuZGxlPE9iamVjdD4pIG9pLm5leHQoKTsKKyAgICAgICAgICBvaS5yZW1vdmUoKTsKKyAgICAgICAgICByZXBsYWNlKG5ld1BsdWdpbiwgaCwgYik7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgbmV3UGx1Z2luLmFkZChpdGVtLnNldChiLmdldEtleSgpLCBiLmdldFByb3ZpZGVyKCksCisgICAgICAgICAgICAgIG5ld1BsdWdpbi5nZXROYW1lKCkpKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgfQogCiAgIHByaXZhdGUgc3RhdGljIDxUPiB2b2lkIHJlcGxhY2UoUGx1Z2luIG5ld1BsdWdpbiwKICAgICAgIFJlbG9hZGFibGVSZWdpc3RyYXRpb25IYW5kbGU8VD4gaCwgQmluZGluZzxUPiBiKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvUGx1Z2luTG9hZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvUGx1Z2luTG9hZGVyLmphdmEKaW5kZXggZDFjMmFhNC4uMDM1NTkyYyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL1BsdWdpbkxvYWRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9QbHVnaW5Mb2FkZXIuamF2YQpAQCAtMTgsMTAgKzE4LDEzIEBACiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuUXVldWVzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlBsdWdpbk5hbWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5ldmVudHMuTGlmZWN5Y2xlTGlzdGVuZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5zeXN0ZW1zdGF0dXMuU2VydmVySW5mb3JtYXRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy53ZWJ1aS5KYXZhU2NyaXB0UGx1Z2luOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5QbHVnaW5Vc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ29uZmlnVXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKQEAgLTMwLDggKzMzLDggQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmludGVybmFsLnN0b3JhZ2UuZmlsZS5GaWxlU25hcHNob3Q7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuc3RvcmFnZS5maWxlLkZpbGVTbmFwc2hvdDsKIGltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOwogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwogCkBAIC00MSw3ICs0NCw2IEBACiBpbXBvcnQgamF2YS5pby5GaWxlT3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiBpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKLWltcG9ydCBqYXZhLmxhbmcucmVmLlJlZmVyZW5jZVF1ZXVlOwogaW1wb3J0IGphdmEubmV0LlVSTDsKIGltcG9ydCBqYXZhLm5ldC5VUkxDbGFzc0xvYWRlcjsKIGltcG9ydCBqYXZhLnRleHQuU2ltcGxlRGF0ZUZvcm1hdDsKQEAgLTQ5LDggKzUxLDEwIEBACiBpbXBvcnQgamF2YS51dGlsLkFycmF5czsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkRhdGU7CitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlF1ZXVlOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiBpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuQ29uY3VycmVudE1hcDsKIGltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdDsKQEAgLTYwLDYgKzY0LDcgQEAKIAogQFNpbmdsZXRvbgogcHVibGljIGNsYXNzIFBsdWdpbkxvYWRlciBpbXBsZW1lbnRzIExpZmVjeWNsZUxpc3RlbmVyIHsKKyAgc3RhdGljIGZpbmFsIFN0cmluZyBQTFVHSU5fVE1QX1BSRUZJWCA9ICJwbHVnaW5fIjsKICAgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihQbHVnaW5Mb2FkZXIuY2xhc3MpOwogCiAgIHByaXZhdGUgZmluYWwgRmlsZSBwbHVnaW5zRGlyOwpAQCAtNjcsMTEgKzcyLDEyIEBACiAgIHByaXZhdGUgZmluYWwgRmlsZSB0bXBEaXI7CiAgIHByaXZhdGUgZmluYWwgUGx1Z2luR3VpY2VFbnZpcm9ubWVudCBlbnY7CiAgIHByaXZhdGUgZmluYWwgU2VydmVySW5mb3JtYXRpb25JbXBsIHNydkluZm9JbXBsOworICBwcml2YXRlIGZpbmFsIFBsdWdpblVzZXIuRmFjdG9yeSBwbHVnaW5Vc2VyRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBDb25jdXJyZW50TWFwPFN0cmluZywgUGx1Z2luPiBydW5uaW5nOwogICBwcml2YXRlIGZpbmFsIENvbmN1cnJlbnRNYXA8U3RyaW5nLCBQbHVnaW4+IGRpc2FibGVkOwogICBwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsIEZpbGVTbmFwc2hvdD4gYnJva2VuOwotICBwcml2YXRlIGZpbmFsIFJlZmVyZW5jZVF1ZXVlPENsYXNzTG9hZGVyPiBjbGVhbnVwUXVldWU7Ci0gIHByaXZhdGUgZmluYWwgQ29uY3VycmVudE1hcDxDbGVhbnVwSGFuZGxlLCBCb29sZWFuPiBjbGVhbnVwSGFuZGxlczsKKyAgcHJpdmF0ZSBmaW5hbCBNYXA8UGx1Z2luLCBDbGVhbnVwSGFuZGxlPiBjbGVhbnVwSGFuZGxlczsKKyAgcHJpdmF0ZSBmaW5hbCBRdWV1ZTxQbHVnaW4+IHRvQ2xlYW51cDsKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxQbHVnaW5DbGVhbmVyVGFzaz4gY2xlYW5lcjsKICAgcHJpdmF0ZSBmaW5hbCBQbHVnaW5TY2FubmVyVGhyZWFkIHNjYW5uZXI7CiAKQEAgLTc5LDYgKzg1LDcgQEAKICAgcHVibGljIFBsdWdpbkxvYWRlcihTaXRlUGF0aHMgc2l0ZVBhdGhzLAogICAgICAgUGx1Z2luR3VpY2VFbnZpcm9ubWVudCBwZSwKICAgICAgIFNlcnZlckluZm9ybWF0aW9uSW1wbCBzaWksCisgICAgICBQbHVnaW5Vc2VyLkZhY3RvcnkgcHVmLAogICAgICAgUHJvdmlkZXI8UGx1Z2luQ2xlYW5lclRhc2s+IHBjdCwKICAgICAgIEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNmZykgewogICAgIHBsdWdpbnNEaXIgPSBzaXRlUGF0aHMucGx1Z2luc19kaXI7CkBAIC04NiwxMCArOTMsMTEgQEAKICAgICB0bXBEaXIgPSBzaXRlUGF0aHMudG1wX2RpcjsKICAgICBlbnYgPSBwZTsKICAgICBzcnZJbmZvSW1wbCA9IHNpaTsKKyAgICBwbHVnaW5Vc2VyRmFjdG9yeSA9IHB1ZjsKICAgICBydW5uaW5nID0gTWFwcy5uZXdDb25jdXJyZW50TWFwKCk7CiAgICAgZGlzYWJsZWQgPSBNYXBzLm5ld0NvbmN1cnJlbnRNYXAoKTsKICAgICBicm9rZW4gPSBNYXBzLm5ld0hhc2hNYXAoKTsKLSAgICBjbGVhbnVwUXVldWUgPSBuZXcgUmVmZXJlbmNlUXVldWU8Q2xhc3NMb2FkZXI+KCk7CisgICAgdG9DbGVhbnVwID0gUXVldWVzLm5ld0FycmF5RGVxdWUoKTsKICAgICBjbGVhbnVwSGFuZGxlcyA9IE1hcHMubmV3Q29uY3VycmVudE1hcCgpOwogICAgIGNsZWFuZXIgPSBwY3Q7CiAKQEAgLTEwMyw2ICsxMTEsMTQgQEAKICAgICB9CiAgIH0KIAorICBwdWJsaWMgUGx1Z2luIGdldChTdHJpbmcgbmFtZSkgeworICAgIFBsdWdpbiBwID0gcnVubmluZy5nZXQobmFtZSk7CisgICAgaWYgKHAgIT0gbnVsbCkgeworICAgICAgcmV0dXJuIHA7CisgICAgfQorICAgIHJldHVybiBkaXNhYmxlZC5nZXQobmFtZSk7CisgIH0KKwogICBwdWJsaWMgSXRlcmFibGU8UGx1Z2luPiBnZXRQbHVnaW5zKGJvb2xlYW4gYWxsKSB7CiAgICAgaWYgKCFhbGwpIHsKICAgICAgIHJldHVybiBydW5uaW5nLnZhbHVlcygpOwpAQCAtMTc4LDYgKzE5NCwxNSBAQAogICAgIH0KICAgfQogCisgIHN5bmNocm9uaXplZCBwcml2YXRlIHZvaWQgdW5sb2FkUGx1Z2luKFBsdWdpbiBwbHVnaW4pIHsKKyAgICBTdHJpbmcgbmFtZSA9IHBsdWdpbi5nZXROYW1lKCk7CisgICAgbG9nLmluZm8oU3RyaW5nLmZvcm1hdCgiVW5sb2FkaW5nIHBsdWdpbiAlcyIsIG5hbWUpKTsKKyAgICBwbHVnaW4uc3RvcChlbnYpOworICAgIHJ1bm5pbmcucmVtb3ZlKG5hbWUpOworICAgIGRpc2FibGVkLnJlbW92ZShuYW1lKTsKKyAgICB0b0NsZWFudXAuYWRkKHBsdWdpbik7CisgIH0KKwogICBwdWJsaWMgdm9pZCBkaXNhYmxlUGx1Z2lucyhTZXQ8U3RyaW5nPiBuYW1lcykgewogICAgIHN5bmNocm9uaXplZCAodGhpcykgewogICAgICAgZm9yIChTdHJpbmcgbmFtZSA6IG5hbWVzKSB7CkBAIC0xOTAsOCArMjE1LDcgQEAKICAgICAgICAgRmlsZSBvZmYgPSBuZXcgRmlsZShwbHVnaW5zRGlyLCBhY3RpdmUuZ2V0TmFtZSgpICsgIi5qYXIuZGlzYWJsZWQiKTsKICAgICAgICAgYWN0aXZlLmdldFNyY0phcigpLnJlbmFtZVRvKG9mZik7CiAKLSAgICAgICAgYWN0aXZlLnN0b3AoKTsKLSAgICAgICAgcnVubmluZy5yZW1vdmUobmFtZSk7CisgICAgICAgIHVubG9hZFBsdWdpbihhY3RpdmUpOwogICAgICAgICB0cnkgewogICAgICAgICAgIEZpbGVTbmFwc2hvdCBzbmFwc2hvdCA9IEZpbGVTbmFwc2hvdC5zYXZlKG9mZik7CiAgICAgICAgICAgUGx1Z2luIG9mZlBsdWdpbiA9IGxvYWRQbHVnaW4obmFtZSwgb2ZmLCBzbmFwc2hvdCk7CkBAIC0yNDQsMTIgKzI2OCwxMiBAQAogICAgIHNydkluZm9JbXBsLnN0YXRlID0gU2VydmVySW5mb3JtYXRpb24uU3RhdGUuU0hVVERPV047CiAgICAgc3luY2hyb25pemVkICh0aGlzKSB7CiAgICAgICBmb3IgKFBsdWdpbiBwIDogcnVubmluZy52YWx1ZXMoKSkgewotICAgICAgICBwLnN0b3AoKTsKKyAgICAgICAgdW5sb2FkUGx1Z2luKHApOwogICAgICAgfQogICAgICAgcnVubmluZy5jbGVhcigpOwogICAgICAgZGlzYWJsZWQuY2xlYXIoKTsKICAgICAgIGJyb2tlbi5jbGVhcigpOwotICAgICAgaWYgKGNsZWFudXBIYW5kbGVzLnNpemUoKSA+IHJ1bm5pbmcuc2l6ZSgpKSB7CisgICAgICBpZiAoIXRvQ2xlYW51cC5pc0VtcHR5KCkpIHsKICAgICAgICAgU3lzdGVtLmdjKCk7CiAgICAgICAgIHByb2Nlc3NQZW5kaW5nQ2xlYW51cHMoKTsKICAgICAgIH0KQEAgLTI5Niw2ICszMjAsMTAgQEAKICAgICBkcm9wUmVtb3ZlZERpc2FibGVkUGx1Z2lucyhqYXJzKTsKIAogICAgIGZvciAoRmlsZSBqYXIgOiBqYXJzKSB7CisgICAgICBpZiAoamFyLmdldE5hbWUoKS5lbmRzV2l0aCgiLmRpc2FibGVkIikpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisKICAgICAgIFN0cmluZyBuYW1lID0gbmFtZU9mKGphcik7CiAgICAgICBGaWxlU25hcHNob3QgYnJva2VuVGltZSA9IGJyb2tlbi5nZXQobmFtZSk7CiAgICAgICBpZiAoYnJva2VuVGltZSAhPSBudWxsICYmICFicm9rZW5UaW1lLmlzTW9kaWZpZWQoamFyKSkgewpAQCAtMzMzLDE1ICszNjEsMTQgQEAKICAgICAgICAgICAmJiBvbGRQbHVnaW4uY2FuUmVsb2FkKCkKICAgICAgICAgICAmJiBuZXdQbHVnaW4uY2FuUmVsb2FkKCk7CiAgICAgICBpZiAoIXJlbG9hZCAmJiBvbGRQbHVnaW4gIT0gbnVsbCkgewotICAgICAgICBvbGRQbHVnaW4uc3RvcCgpOwotICAgICAgICBydW5uaW5nLnJlbW92ZShuYW1lKTsKKyAgICAgICAgdW5sb2FkUGx1Z2luKG9sZFBsdWdpbik7CiAgICAgICB9CiAgICAgICBpZiAoIW5ld1BsdWdpbi5pc0Rpc2FibGVkKCkpIHsKICAgICAgICAgbmV3UGx1Z2luLnN0YXJ0KGVudik7CiAgICAgICB9CiAgICAgICBpZiAocmVsb2FkKSB7CiAgICAgICAgIGVudi5vblJlbG9hZFBsdWdpbihvbGRQbHVnaW4sIG5ld1BsdWdpbik7Ci0gICAgICAgIG9sZFBsdWdpbi5zdG9wKCk7CisgICAgICAgIHVubG9hZFBsdWdpbihvbGRQbHVnaW4pOwogICAgICAgfSBlbHNlIGlmICghbmV3UGx1Z2luLmlzRGlzYWJsZWQoKSkgewogICAgICAgICBlbnYub25TdGFydFBsdWdpbihuZXdQbHVnaW4pOwogICAgICAgfQpAQCAtMzY2LDggKzM5Myw3IEBACiAgICAgICB9CiAgICAgfQogICAgIGZvciAoU3RyaW5nIG5hbWUgOiB1bmxvYWQpewotICAgICAgbG9nLmluZm8oU3RyaW5nLmZvcm1hdCgiVW5sb2FkaW5nIHBsdWdpbiAlcyIsIG5hbWUpKTsKLSAgICAgIHJ1bm5pbmcucmVtb3ZlKG5hbWUpLnN0b3AoKTsKKyAgICAgIHVubG9hZFBsdWdpbihydW5uaW5nLmdldChuYW1lKSk7CiAgICAgfQogICB9CiAKQEAgLTM4NCwxNiArNDEwLDE5IEBACiAgIH0KIAogICBzeW5jaHJvbml6ZWQgaW50IHByb2Nlc3NQZW5kaW5nQ2xlYW51cHMoKSB7Ci0gICAgQ2xlYW51cEhhbmRsZSBoOwotICAgIHdoaWxlICgoaCA9IChDbGVhbnVwSGFuZGxlKSBjbGVhbnVwUXVldWUucG9sbCgpKSAhPSBudWxsKSB7Ci0gICAgICBoLmNsZWFudXAoKTsKLSAgICAgIGNsZWFudXBIYW5kbGVzLnJlbW92ZShoKTsKKyAgICBJdGVyYXRvcjxQbHVnaW4+IGl0ZXJhdG9yID0gdG9DbGVhbnVwLml0ZXJhdG9yKCk7CisgICAgd2hpbGUgKGl0ZXJhdG9yLmhhc05leHQoKSkgeworICAgICAgUGx1Z2luIHBsdWdpbiA9IGl0ZXJhdG9yLm5leHQoKTsKKyAgICAgIGl0ZXJhdG9yLnJlbW92ZSgpOworCisgICAgICBDbGVhbnVwSGFuZGxlIGNsZWFudXBIYW5kbGUgPSBjbGVhbnVwSGFuZGxlcy5yZW1vdmUocGx1Z2luKTsKKyAgICAgIGNsZWFudXBIYW5kbGUuY2xlYW51cCgpOwogICAgIH0KLSAgICByZXR1cm4gTWF0aC5tYXgoMCwgY2xlYW51cEhhbmRsZXMuc2l6ZSgpIC0gcnVubmluZy5zaXplKCkpOworICAgIHJldHVybiB0b0NsZWFudXAuc2l6ZSgpOwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGNsZWFuSW5CYWNrZ3JvdW5kKCkgewotICAgIGludCBjbnQgPSBNYXRoLm1heCgwLCBjbGVhbnVwSGFuZGxlcy5zaXplKCkgLSBydW5uaW5nLnNpemUoKSk7CisgICAgaW50IGNudCA9IHRvQ2xlYW51cC5zaXplKCk7CiAgICAgaWYgKDAgPCBjbnQpIHsKICAgICAgIGNsZWFuZXIuZ2V0KCkuY2xlYW4oY250KTsKICAgICB9CkBAIC00MzcsMTkgKzQ2NiwxNyBAQAogICAgICAgVVJMW10gdXJscyA9IHt0bXAudG9VUkkoKS50b1VSTCgpfTsKICAgICAgIENsYXNzTG9hZGVyIHBhcmVudExvYWRlciA9IHBhcmVudEZvcih0eXBlKTsKICAgICAgIENsYXNzTG9hZGVyIHBsdWdpbkxvYWRlciA9IG5ldyBVUkxDbGFzc0xvYWRlcih1cmxzLCBwYXJlbnRMb2FkZXIpOwotICAgICAgY2xlYW51cEhhbmRsZXMucHV0KAotICAgICAgICAgIG5ldyBDbGVhbnVwSGFuZGxlKHRtcCwgamFyRmlsZSwgcGx1Z2luTG9hZGVyLCBjbGVhbnVwUXVldWUpLAotICAgICAgICAgIEJvb2xlYW4uVFJVRSk7Ci0KICAgICAgIENsYXNzPD8gZXh0ZW5kcyBNb2R1bGU+IHN5c01vZHVsZSA9IGxvYWQoc3lzTmFtZSwgcGx1Z2luTG9hZGVyKTsKICAgICAgIENsYXNzPD8gZXh0ZW5kcyBNb2R1bGU+IHNzaE1vZHVsZSA9IGxvYWQoc3NoTmFtZSwgcGx1Z2luTG9hZGVyKTsKICAgICAgIENsYXNzPD8gZXh0ZW5kcyBNb2R1bGU+IGh0dHBNb2R1bGUgPSBsb2FkKGh0dHBOYW1lLCBwbHVnaW5Mb2FkZXIpOwotICAgICAga2VlcCA9IHRydWU7Ci0gICAgICByZXR1cm4gbmV3IFBsdWdpbihuYW1lLAorICAgICAgUGx1Z2luIHBsdWdpbiA9IG5ldyBQbHVnaW4obmFtZSwgcGx1Z2luVXNlckZhY3RvcnkuY3JlYXRlKG5hbWUpLAogICAgICAgICAgIHNyY0phciwgc25hcHNob3QsCiAgICAgICAgICAgamFyRmlsZSwgbWFuaWZlc3QsCiAgICAgICAgICAgbmV3IEZpbGUoZGF0YURpciwgbmFtZSksIHR5cGUsIHBsdWdpbkxvYWRlciwKICAgICAgICAgICBzeXNNb2R1bGUsIHNzaE1vZHVsZSwgaHR0cE1vZHVsZSk7CisgICAgICBjbGVhbnVwSGFuZGxlcy5wdXQocGx1Z2luLCBuZXcgQ2xlYW51cEhhbmRsZSh0bXAsIGphckZpbGUpKTsKKyAgICAgIGtlZXAgPSB0cnVlOworICAgICAgcmV0dXJuIHBsdWdpbjsKICAgICB9IGZpbmFsbHkgewogICAgICAgaWYgKCFrZWVwKSB7CiAgICAgICAgIGphckZpbGUuY2xvc2UoKTsKQEAgLTQ2NCw2ICs0OTEsOCBAQAogICAgICAgICByZXR1cm4gUGx1Z2luTmFtZS5jbGFzcy5nZXRDbGFzc0xvYWRlcigpOwogICAgICAgY2FzZSBQTFVHSU46CiAgICAgICAgIHJldHVybiBQbHVnaW5Mb2FkZXIuY2xhc3MuZ2V0Q2xhc3NMb2FkZXIoKTsKKyAgICAgIGNhc2UgSlM6CisgICAgICAgIHJldHVybiBKYXZhU2NyaXB0UGx1Z2luLmNsYXNzLmdldENsYXNzTG9hZGVyKCk7CiAgICAgICBkZWZhdWx0OgogICAgICAgICB0aHJvdyBuZXcgSW52YWxpZFBsdWdpbkV4Y2VwdGlvbigiVW5zdXBwb3J0ZWQgQXBpVHlwZSAiICsgdHlwZSk7CiAgICAgfQpAQCAtNDcxLDcgKzUwMCw3IEBACiAKICAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIHRlbXBOYW1lRm9yKFN0cmluZyBuYW1lKSB7CiAgICAgU2ltcGxlRGF0ZUZvcm1hdCBmbXQgPSBuZXcgU2ltcGxlRGF0ZUZvcm1hdCgieXlNTWRkX0hIbW0iKTsKLSAgICByZXR1cm4gInBsdWdpbl8iICsgbmFtZSArICJfIiArIGZtdC5mb3JtYXQobmV3IERhdGUoKSkgKyAiXyI7CisgICAgcmV0dXJuIFBMVUdJTl9UTVBfUFJFRklYICsgbmFtZSArICJfIiArIGZtdC5mb3JtYXQobmV3IERhdGUoKSkgKyAiXyI7CiAgIH0KIAogICBwcml2YXRlIENsYXNzPD8gZXh0ZW5kcyBNb2R1bGU+IGxvYWQoU3RyaW5nIG5hbWUsIENsYXNzTG9hZGVyIHBsdWdpbkxvYWRlcikKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9QbHVnaW5Nb2R1bGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9QbHVnaW5Nb2R1bGUuamF2YQppbmRleCBhYjdkYzNjLi40Y2RhZmIzIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvUGx1Z2luTW9kdWxlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL1BsdWdpbk1vZHVsZS5qYXZhCkBAIC0xNCwyMCArMTQsMzcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2luczsKIAoraW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2lucy5QbHVnaW5SZXNvdXJjZS5QTFVHSU5fS0lORDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLkR5bmFtaWNNYXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RBcGlNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5zeXN0ZW1zdGF0dXMuU2VydmVySW5mb3JtYXRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQubGlmZWN5Y2xlLkxpZmVjeWNsZU1vZHVsZTsKIAotcHVibGljIGNsYXNzIFBsdWdpbk1vZHVsZSBleHRlbmRzIExpZmVjeWNsZU1vZHVsZSB7CitwdWJsaWMgY2xhc3MgUGx1Z2luTW9kdWxlIGV4dGVuZHMgUmVzdEFwaU1vZHVsZSB7CiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CiAgICAgYmluZChTZXJ2ZXJJbmZvcm1hdGlvbkltcGwuY2xhc3MpOwogICAgIGJpbmQoU2VydmVySW5mb3JtYXRpb24uY2xhc3MpLnRvKFNlcnZlckluZm9ybWF0aW9uSW1wbC5jbGFzcyk7CiAKICAgICBiaW5kKFBsdWdpbkNsZWFuZXJUYXNrLmNsYXNzKTsKKyAgICBiaW5kKFBsdWdpbnNDb2xsZWN0aW9uLmNsYXNzKTsKICAgICBiaW5kKFBsdWdpbkd1aWNlRW52aXJvbm1lbnQuY2xhc3MpOwogICAgIGJpbmQoUGx1Z2luTG9hZGVyLmNsYXNzKTsKLQogICAgIGJpbmQoQ29weUNvbmZpZ01vZHVsZS5jbGFzcyk7Ci0gICAgbGlzdGVuZXIoKS50byhQbHVnaW5Mb2FkZXIuY2xhc3MpOworICAgIGluc3RhbGwobmV3IExpZmVjeWNsZU1vZHVsZSgpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgICAgICBsaXN0ZW5lcigpLnRvKFBsdWdpbkxvYWRlci5jbGFzcyk7CisgICAgICB9CisgICAgfSk7CisKKyAgICBEeW5hbWljTWFwLm1hcE9mKGJpbmRlcigpLCBQTFVHSU5fS0lORCk7CisgICAgcHV0KFBMVUdJTl9LSU5EKS50byhJbnN0YWxsUGx1Z2luLk92ZXJ3cml0ZS5jbGFzcyk7CisgICAgZGVsZXRlKFBMVUdJTl9LSU5EKS50byhEaXNhYmxlUGx1Z2luLmNsYXNzKTsKKyAgICBnZXQoUExVR0lOX0tJTkQsICJzdGF0dXMiKS50byhHZXRTdGF0dXMuY2xhc3MpOworICAgIHBvc3QoUExVR0lOX0tJTkQsICJkaXNhYmxlIikudG8oRGlzYWJsZVBsdWdpbi5jbGFzcyk7CisgICAgcG9zdChQTFVHSU5fS0lORCwgImVuYWJsZSIpLnRvKEVuYWJsZVBsdWdpbi5jbGFzcyk7CisgICAgcG9zdChQTFVHSU5fS0lORCwgInJlbG9hZCIpLnRvKFJlbG9hZFBsdWdpbi5jbGFzcyk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9QbHVnaW5SZXNvdXJjZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL1BsdWdpblJlc291cmNlLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOTU3MjI3MQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9QbHVnaW5SZXNvdXJjZS5qYXZhCkBAIC0wLDAgKzEsNDUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2luczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVzb3VyY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworCitwdWJsaWMgY2xhc3MgUGx1Z2luUmVzb3VyY2UgaW1wbGVtZW50cyBSZXN0UmVzb3VyY2UgeworICBwdWJsaWMgc3RhdGljIGZpbmFsIFR5cGVMaXRlcmFsPFJlc3RWaWV3PFBsdWdpblJlc291cmNlPj4gUExVR0lOX0tJTkQgPQorICAgICAgbmV3IFR5cGVMaXRlcmFsPFJlc3RWaWV3PFBsdWdpblJlc291cmNlPj4oKSB7fTsKKworICBwcml2YXRlIGZpbmFsIFBsdWdpbiBwbHVnaW47CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIG5hbWU7CisKKyAgUGx1Z2luUmVzb3VyY2UoUGx1Z2luIHBsdWdpbikgeworICAgIHRoaXMucGx1Z2luID0gcGx1Z2luOworICAgIHRoaXMubmFtZSA9IHBsdWdpbi5nZXROYW1lKCk7CisgIH0KKworICBQbHVnaW5SZXNvdXJjZShTdHJpbmcgbmFtZSkgeworICAgIHRoaXMucGx1Z2luID0gbnVsbDsKKyAgICB0aGlzLm5hbWUgPSBuYW1lOworICB9CisKKyAgcHVibGljIFN0cmluZyBnZXROYW1lKCkgeworICAgIHJldHVybiBuYW1lOworICB9CisKKyAgcHVibGljIFBsdWdpbiBnZXRQbHVnaW4oKSB7CisgICAgcmV0dXJuIHBsdWdpbjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL1BsdWdpbnNDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3BsdWdpbnMvUGx1Z2luc0NvbGxlY3Rpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42ZDMwYjQyCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wbHVnaW5zL1BsdWdpbnNDb2xsZWN0aW9uLmphdmEKQEAgLTAsMCArMSw2OSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQWNjZXB0c0NyZWF0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuSWRTdHJpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVG9wTGV2ZWxSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK3B1YmxpYyBjbGFzcyBQbHVnaW5zQ29sbGVjdGlvbiBpbXBsZW1lbnRzCisgICAgUmVzdENvbGxlY3Rpb248VG9wTGV2ZWxSZXNvdXJjZSwgUGx1Z2luUmVzb3VyY2U+LAorICAgIEFjY2VwdHNDcmVhdGU8VG9wTGV2ZWxSZXNvdXJjZT4geworCisgIHByaXZhdGUgZmluYWwgRHluYW1pY01hcDxSZXN0VmlldzxQbHVnaW5SZXNvdXJjZT4+IHZpZXdzOworICBwcml2YXRlIGZpbmFsIFBsdWdpbkxvYWRlciBsb2FkZXI7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8TGlzdFBsdWdpbnM+IGxpc3Q7CisKKyAgQEluamVjdAorICBQbHVnaW5zQ29sbGVjdGlvbihEeW5hbWljTWFwPFJlc3RWaWV3PFBsdWdpblJlc291cmNlPj4gdmlld3MsCisgICAgICBQbHVnaW5Mb2FkZXIgbG9hZGVyLCBQcm92aWRlcjxMaXN0UGx1Z2lucz4gbGlzdCkgeworICAgIHRoaXMudmlld3MgPSB2aWV3czsKKyAgICB0aGlzLmxvYWRlciA9IGxvYWRlcjsKKyAgICB0aGlzLmxpc3QgPSBsaXN0OworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBSZXN0VmlldzxUb3BMZXZlbFJlc291cmNlPiBsaXN0KCkgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24geworICAgIHJldHVybiBsaXN0LmdldCgpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBQbHVnaW5SZXNvdXJjZSBwYXJzZShUb3BMZXZlbFJlc291cmNlIHBhcmVudCwgSWRTdHJpbmcgaWQpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiB7CisgICAgUGx1Z2luIHAgPSBsb2FkZXIuZ2V0KGlkLmdldCgpKTsKKyAgICBpZiAocCA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgICAgfQorICAgIHJldHVybiBuZXcgUGx1Z2luUmVzb3VyY2UocCk7CisgIH0KKworICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBJbnN0YWxsUGx1Z2luIGNyZWF0ZShUb3BMZXZlbFJlc291cmNlIHBhcmVudCwgSWRTdHJpbmcgaWQpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIG5ldyBJbnN0YWxsUGx1Z2luKGxvYWRlciwgaWQuZ2V0KCksIHRydWUgLyogY3JlYXRlZCAqLyk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIER5bmFtaWNNYXA8UmVzdFZpZXc8UGx1Z2luUmVzb3VyY2U+PiB2aWV3cygpIHsKKyAgICByZXR1cm4gdmlld3M7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9SZWxvYWRQbHVnaW4uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9SZWxvYWRQbHVnaW4uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45ZjllZjJkYgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcGx1Z2lucy9SZWxvYWRQbHVnaW4uamF2YQpAQCAtMCwwICsxLDU3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZUxpc3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR2xvYmFsQ2FwYWJpbGl0eTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlJlcXVpcmVzQ2FwYWJpbGl0eTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuUmVsb2FkUGx1Z2luLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGphdmEuaW8uUHJpbnRXcml0ZXI7CitpbXBvcnQgamF2YS5pby5TdHJpbmdXcml0ZXI7CisKK0BSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorY2xhc3MgUmVsb2FkUGx1Z2luIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8UGx1Z2luUmVzb3VyY2UsIElucHV0PiB7CisgIHN0YXRpYyBjbGFzcyBJbnB1dCB7CisgIH0KKworICBwcml2YXRlIGZpbmFsIFBsdWdpbkxvYWRlciBsb2FkZXI7CisKKyAgQEluamVjdAorICBSZWxvYWRQbHVnaW4oUGx1Z2luTG9hZGVyIGxvYWRlcikgeworICAgIHRoaXMubG9hZGVyID0gbG9hZGVyOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoUGx1Z2luUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KSB0aHJvd3MgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbiB7CisgICAgU3RyaW5nIG5hbWUgPSByZXNvdXJjZS5nZXROYW1lKCk7CisgICAgdHJ5IHsKKyAgICAgIGxvYWRlci5yZWxvYWQoSW1tdXRhYmxlTGlzdC5vZihuYW1lKSk7CisgICAgfSBjYXRjaCAoSW52YWxpZFBsdWdpbkV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgfSBjYXRjaCAoUGx1Z2luSW5zdGFsbEV4Y2VwdGlvbiBlKSB7CisgICAgICBTdHJpbmdXcml0ZXIgYnVmID0gbmV3IFN0cmluZ1dyaXRlcigpOworICAgICAgYnVmLndyaXRlKFN0cmluZy5mb3JtYXQoImNhbm5vdCByZWxvYWQgJXNcbiIsIG5hbWUpKTsKKyAgICAgIFByaW50V3JpdGVyIHB3ID0gbmV3IFByaW50V3JpdGVyKGJ1Zik7CisgICAgICBlLnByaW50U3RhY2tUcmFjZShwdyk7CisgICAgICBwdy5mbHVzaCgpOworICAgICAgdGhyb3cgbmV3IFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oYnVmLnRvU3RyaW5nKCkpOworICAgIH0KKyAgICByZXR1cm4gbmV3IExpc3RQbHVnaW5zLlBsdWdpbkluZm8obG9hZGVyLmdldChuYW1lKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DaGFuZ2VDb250cm9sLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvQ2hhbmdlQ29udHJvbC5qYXZhCmluZGV4IGRiNGIwMjEuLjYzOTdiOTYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DaGFuZ2VDb250cm9sLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0NoYW5nZUNvbnRyb2wuamF2YQpAQCAtMTQsMTYgKzE0LDE2IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb25SYW5nZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5TdWJtaXRSZWNvcmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0VHlwZVJlY29yZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucnVsZXMuUHJvbG9nRW52aXJvbm1lbnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucnVsZXMuU3RvcmVkVmFsdWVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LmNoYW5nZS5DaGFuZ2VEYXRhOwpAQCAtMzIsMjMgKzMyLDE5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QudXRpbC5Qcm92aWRlcnM7CiAKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5jb21waWxlci5Db21waWxlRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuSW50ZWdlclRlcm07CiBpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5MaXN0VGVybTsKIGltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZzsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZ0V4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlN0cnVjdHVyZVRlcm07CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5TeW1ib2xUZXJtOwogaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuVGVybTsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlZhcmlhYmxlVGVybTsKIAogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CiBpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaFNldDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiBpbXBvcnQgamF2YXguYW5ub3RhdGlvbi5OdWxsYWJsZTsKIApAQCAtMTk1LDEyICsxOTEsMTQgQEAKIAogICAvKiogQ2FuIHRoaXMgdXNlciBwdWJsaXNoIHRoaXMgZHJhZnQgY2hhbmdlIG9yIGFueSBkcmFmdCBwYXRjaCBzZXQgb2YgdGhpcyBjaGFuZ2U/ICovCiAgIHB1YmxpYyBib29sZWFuIGNhblB1Ymxpc2goZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIHJldHVybiBpc093bmVyKCkgJiYgaXNWaXNpYmxlKGRiKTsKKyAgICByZXR1cm4gKGlzT3duZXIoKSB8fCBnZXRSZWZDb250cm9sKCkuY2FuUHVibGlzaERyYWZ0cygpKQorICAgICAgICAmJiBpc1Zpc2libGUoZGIpOwogICB9CiAKICAgLyoqIENhbiB0aGlzIHVzZXIgZGVsZXRlIHRoaXMgZHJhZnQgY2hhbmdlIG9yIGFueSBkcmFmdCBwYXRjaCBzZXQgb2YgdGhpcyBjaGFuZ2U/ICovCiAgIHB1YmxpYyBib29sZWFuIGNhbkRlbGV0ZURyYWZ0KGZpbmFsIFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICByZXR1cm4gaXNPd25lcigpICYmIGlzVmlzaWJsZShkYik7CisgICAgcmV0dXJuIChpc093bmVyKCkgfHwgZ2V0UmVmQ29udHJvbCgpLmNhbkRlbGV0ZURyYWZ0cygpKQorICAgICAgICAmJiBpc1Zpc2libGUoZGIpOwogICB9CiAKICAgLyoqIENhbiB0aGlzIHVzZXIgcmViYXNlIHRoaXMgY2hhbmdlPyAqLwpAQCAtMjE1LDYgKzIxMywxMSBAQAogICAgICAgICAmJiBnZXRSZWZDb250cm9sKCkuY2FuVXBsb2FkKCk7IC8vIGFzIGxvbmcgYXMgeW91IGNhbiB1cGxvYWQgdG9vCiAgIH0KIAorICAvKiogQWxsIGF2YWlsYWJsZSBsYWJlbCB0eXBlcyBmb3IgdGhpcyBwcm9qZWN0LiAqLworICBwdWJsaWMgTGFiZWxUeXBlcyBnZXRMYWJlbFR5cGVzKCkgeworICAgIHJldHVybiBnZXRQcm9qZWN0Q29udHJvbCgpLmdldExhYmVsVHlwZXMoKTsKKyAgfQorCiAgIC8qKiBBbGwgdmFsdWUgcmFuZ2VzIG9mIGFueSBhbGxvd2VkIGxhYmVsIHBlcm1pc3Npb24uICovCiAgIHB1YmxpYyBMaXN0PFBlcm1pc3Npb25SYW5nZT4gZ2V0TGFiZWxSYW5nZXMoKSB7CiAgICAgcmV0dXJuIGdldFJlZkNvbnRyb2woKS5nZXRMYWJlbFJhbmdlcygpOwpAQCAtMjY2LDI1ICsyNjksMzAgQEAKIAogICAvKiogQHJldHVybiB0cnVlIGlmIHRoZSB1c2VyIGlzIGFsbG93ZWQgdG8gcmVtb3ZlIHRoaXMgcmV2aWV3ZXIuICovCiAgIHB1YmxpYyBib29sZWFuIGNhblJlbW92ZVJldmlld2VyKFBhdGNoU2V0QXBwcm92YWwgYXBwcm92YWwpIHsKKyAgICByZXR1cm4gY2FuUmVtb3ZlUmV2aWV3ZXIoYXBwcm92YWwuZ2V0QWNjb3VudElkKCksIGFwcHJvdmFsLmdldFZhbHVlKCkpOworICB9CisKKyAgcHVibGljIGJvb2xlYW4gY2FuUmVtb3ZlUmV2aWV3ZXIoQWNjb3VudC5JZCByZXZpZXdlciwgaW50IHZhbHVlKSB7CiAgICAgaWYgKGdldENoYW5nZSgpLmdldFN0YXR1cygpLmlzT3BlbigpKSB7CiAgICAgICAvLyBBIHVzZXIgY2FuIGFsd2F5cyByZW1vdmUgdGhlbXNlbHZlcy4KICAgICAgIC8vCiAgICAgICBpZiAoZ2V0Q3VycmVudFVzZXIoKSBpbnN0YW5jZW9mIElkZW50aWZpZWRVc2VyKSB7CiAgICAgICAgIGZpbmFsIElkZW50aWZpZWRVc2VyIGkgPSAoSWRlbnRpZmllZFVzZXIpIGdldEN1cnJlbnRVc2VyKCk7Ci0gICAgICAgIGlmIChpLmdldEFjY291bnRJZCgpLmVxdWFscyhhcHByb3ZhbC5nZXRBY2NvdW50SWQoKSkpIHsKKyAgICAgICAgaWYgKGkuZ2V0QWNjb3VudElkKCkuZXF1YWxzKHJldmlld2VyKSkgewogICAgICAgICAgIHJldHVybiB0cnVlOyAvLyBjYW4gcmVtb3ZlIHNlbGYKICAgICAgICAgfQogICAgICAgfQogCiAgICAgICAvLyBUaGUgY2hhbmdlIG93bmVyIG1heSByZW1vdmUgYW55IHplcm8gb3IgcG9zaXRpdmUgc2NvcmUuCiAgICAgICAvLwotICAgICAgaWYgKGlzT3duZXIoKSAmJiAwIDw9IGFwcHJvdmFsLmdldFZhbHVlKCkpIHsKKyAgICAgIGlmIChpc093bmVyKCkgJiYgMCA8PSB2YWx1ZSkgewogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgIH0KIAotICAgICAgLy8gVGhlIGJyYW5jaCBvd25lciwgcHJvamVjdCBvd25lciwgc2l0ZSBhZG1pbiBjYW4gcmVtb3ZlIGFueW9uZS4KLSAgICAgIC8vCi0gICAgICBpZiAoZ2V0UmVmQ29udHJvbCgpLmlzT3duZXIoKSAvLyBicmFuY2ggb3duZXIKKyAgICAgIC8vIFVzZXJzIHdpdGggdGhlIHJlbW92ZSByZXZpZXdlciBwZXJtaXNzaW9uLCB0aGUgYnJhbmNoIG93bmVyLCBwcm9qZWN0CisgICAgICAvLyBvd25lciBhbmQgc2l0ZSBhZG1pbiBjYW4gcmVtb3ZlIGFueW9uZQorICAgICAgaWYgKGdldFJlZkNvbnRyb2woKS5jYW5SZW1vdmVSZXZpZXdlcigpIC8vIGhhcyByZW1vdmFsIHBlcm1pc3Npb25zCisgICAgICAgICAgfHwgZ2V0UmVmQ29udHJvbCgpLmlzT3duZXIoKSAvLyBicmFuY2ggb3duZXIKICAgICAgICAgICB8fCBnZXRQcm9qZWN0Q29udHJvbCgpLmlzT3duZXIoKSAvLyBwcm9qZWN0IG93bmVyCiAgICAgICAgICAgfHwgZ2V0Q3VycmVudFVzZXIoKS5nZXRDYXBhYmlsaXRpZXMoKS5jYW5BZG1pbmlzdHJhdGVTZXJ2ZXIoKSkgewogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTI5NCwxNiArMzAyLDM1IEBACiAgICAgcmV0dXJuIGZhbHNlOwogICB9CiAKKyAgLyoqIENhbiB0aGlzIHVzZXIgZWRpdCB0aGUgdG9waWMgbmFtZT8gKi8KKyAgcHVibGljIGJvb2xlYW4gY2FuRWRpdFRvcGljTmFtZSgpIHsKKyAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpLmlzT3BlbigpKSB7CisgICAgICByZXR1cm4gaXNPd25lcigpIC8vIG93bmVyIChha2EgY3JlYXRvcikgb2YgdGhlIGNoYW5nZSBjYW4gZWRpdCB0b3BpYworICAgICAgICAgIHx8IGdldFJlZkNvbnRyb2woKS5pc093bmVyKCkgLy8gYnJhbmNoIG93bmVyIGNhbiBlZGl0IHRvcGljCisgICAgICAgICAgfHwgZ2V0UHJvamVjdENvbnRyb2woKS5pc093bmVyKCkgLy8gcHJvamVjdCBvd25lciBjYW4gZWRpdCB0b3BpYworICAgICAgICAgIHx8IGdldEN1cnJlbnRVc2VyKCkuZ2V0Q2FwYWJpbGl0aWVzKCkuY2FuQWRtaW5pc3RyYXRlU2VydmVyKCkgLy8gc2l0ZSBhZG1pbmlzdGVycyBhcmUgZ29kCisgICAgICAgICAgfHwgZ2V0UmVmQ29udHJvbCgpLmNhbkVkaXRUb3BpY05hbWUoKSAvLyB1c2VyIGNhbiBlZGl0IHRvcGljIG9uIGEgc3BlY2lmaWMgcmVmCisgICAgICA7CisgICAgfSBlbHNlIHsKKyAgICAgIHJldHVybiBnZXRSZWZDb250cm9sKCkuY2FuRm9yY2VFZGl0VG9waWNOYW1lKCk7CisgICAgfQorICB9CisKICAgcHVibGljIExpc3Q8U3VibWl0UmVjb3JkPiBnZXRTdWJtaXRSZWNvcmRzKFJldmlld0RiIGRiLCBQYXRjaFNldCBwYXRjaFNldCkgewotICAgIHJldHVybiBjYW5TdWJtaXQoZGIsIHBhdGNoU2V0LCBudWxsLCBmYWxzZSwgdHJ1ZSk7CisgICAgcmV0dXJuIGNhblN1Ym1pdChkYiwgcGF0Y2hTZXQsIG51bGwsIGZhbHNlLCB0cnVlLCBmYWxzZSk7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBjYW5TdWJtaXQoKSB7CisgICAgcmV0dXJuIGdldFJlZkNvbnRyb2woKS5jYW5TdWJtaXQoKTsKICAgfQogCiAgIHB1YmxpYyBMaXN0PFN1Ym1pdFJlY29yZD4gY2FuU3VibWl0KFJldmlld0RiIGRiLCBQYXRjaFNldCBwYXRjaFNldCkgewotICAgIHJldHVybiBjYW5TdWJtaXQoZGIsIHBhdGNoU2V0LCBudWxsLCBmYWxzZSwgZmFsc2UpOworICAgIHJldHVybiBjYW5TdWJtaXQoZGIsIHBhdGNoU2V0LCBudWxsLCBmYWxzZSwgZmFsc2UsIGZhbHNlKTsKICAgfQogCiAgIHB1YmxpYyBMaXN0PFN1Ym1pdFJlY29yZD4gY2FuU3VibWl0KFJldmlld0RiIGRiLCBQYXRjaFNldCBwYXRjaFNldCwKLSAgICAgIEBOdWxsYWJsZSBDaGFuZ2VEYXRhIGNkLCBib29sZWFuIGZhc3RFdmFsTGFiZWxzLCBib29sZWFuIGFsbG93Q2xvc2VkKSB7CisgICAgICBATnVsbGFibGUgQ2hhbmdlRGF0YSBjZCwgYm9vbGVhbiBmYXN0RXZhbExhYmVscywgYm9vbGVhbiBhbGxvd0Nsb3NlZCwKKyAgICAgIGJvb2xlYW4gYWxsb3dEcmFmdCkgewogICAgIGlmICghYWxsb3dDbG9zZWQgJiYgY2hhbmdlLmdldFN0YXR1cygpLmlzQ2xvc2VkKCkpIHsKICAgICAgIFN1Ym1pdFJlY29yZCByZWMgPSBuZXcgU3VibWl0UmVjb3JkKCk7CiAgICAgICByZWMuc3RhdHVzID0gU3VibWl0UmVjb3JkLlN0YXR1cy5DTE9TRUQ7CkBAIC0zMTQsMTIyICszNDEsMjMgQEAKICAgICAgIHJldHVybiBydWxlRXJyb3IoIlBhdGNoIHNldCAiICsgcGF0Y2hTZXQuZ2V0UGF0Y2hTZXRJZCgpICsgIiBpcyBub3QgY3VycmVudCIpOwogICAgIH0KIAotICAgIHRyeSB7Ci0gICAgICBpZiAoY2hhbmdlLmdldFN0YXR1cygpID09IENoYW5nZS5TdGF0dXMuRFJBRlQpIHsKLSAgICAgICAgaWYgKCFpc0RyYWZ0VmlzaWJsZShkYiwgY2QpKSB7Ci0gICAgICAgICAgcmV0dXJuIHJ1bGVFcnJvcigiUGF0Y2ggc2V0ICIgKyBwYXRjaFNldC5nZXRQYXRjaFNldElkKCkgKyAiIG5vdCBmb3VuZCIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgIHJldHVybiBydWxlRXJyb3IoIkNhbm5vdCBzdWJtaXQgZHJhZnQgY2hhbmdlcyIpOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgICBpZiAocGF0Y2hTZXQuaXNEcmFmdCgpKSB7Ci0gICAgICAgIGlmICghaXNEcmFmdFZpc2libGUoZGIsIGNkKSkgewotICAgICAgICAgIHJldHVybiBydWxlRXJyb3IoIlBhdGNoIHNldCAiICsgcGF0Y2hTZXQuZ2V0UGF0Y2hTZXRJZCgpICsgIiBub3QgZm91bmQiKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICByZXR1cm4gcnVsZUVycm9yKCJDYW5ub3Qgc3VibWl0IGRyYWZ0IHBhdGNoIHNldHMiKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIkNhbm5vdCByZWFkIHBhdGNoIHNldCAiICsgcGF0Y2hTZXQuZ2V0SWQoKSwgZXJyKTsKKyAgICBpZiAoKGNoYW5nZS5nZXRTdGF0dXMoKSA9PSBDaGFuZ2UuU3RhdHVzLkRSQUZUIHx8IHBhdGNoU2V0LmlzRHJhZnQoKSkKKyAgICAgICAgJiYgIWFsbG93RHJhZnQpIHsKKyAgICAgIHJldHVybiBjYW5ub3RTdWJtaXREcmFmdChkYiwgcGF0Y2hTZXQsIGNkKTsKICAgICB9CiAKLSAgICBMaXN0PFRlcm0+IHJlc3VsdHMgPSBuZXcgQXJyYXlMaXN0PFRlcm0+KCk7Ci0gICAgVGVybSBzdWJtaXRSdWxlOwotICAgIFByb2plY3RTdGF0ZSBwcm9qZWN0U3RhdGUgPSBnZXRQcm9qZWN0Q29udHJvbCgpLmdldFByb2plY3RTdGF0ZSgpOwotICAgIFByb2xvZ0Vudmlyb25tZW50IGVudjsKLQorICAgIExpc3Q8VGVybT4gcmVzdWx0czsKKyAgICBTdWJtaXRSdWxlRXZhbHVhdG9yIGV2YWx1YXRvcjsKICAgICB0cnkgewotICAgICAgZW52ID0gcHJvamVjdFN0YXRlLm5ld1Byb2xvZ0Vudmlyb25tZW50KCk7Ci0gICAgfSBjYXRjaCAoQ29tcGlsZUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIkNhbm5vdCBjb25zdWx0IHJ1bGVzLnBsIGZvciAiCi0gICAgICAgICAgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOwotICAgIH0KLQotICAgIHRyeSB7Ci0gICAgICBlbnYuc2V0KFN0b3JlZFZhbHVlcy5SRVZJRVdfREIsIGRiKTsKLSAgICAgIGVudi5zZXQoU3RvcmVkVmFsdWVzLkNIQU5HRSwgY2hhbmdlKTsKLSAgICAgIGVudi5zZXQoU3RvcmVkVmFsdWVzLkNIQU5HRV9EQVRBLCBjZCk7Ci0gICAgICBlbnYuc2V0KFN0b3JlZFZhbHVlcy5QQVRDSF9TRVQsIHBhdGNoU2V0KTsKLSAgICAgIGVudi5zZXQoU3RvcmVkVmFsdWVzLkNIQU5HRV9DT05UUk9MLCB0aGlzKTsKLQotICAgICAgc3VibWl0UnVsZSA9IGVudi5vbmNlKAotICAgICAgICAiZ2Vycml0IiwgImxvY2F0ZV9zdWJtaXRfcnVsZSIsCi0gICAgICAgIG5ldyBWYXJpYWJsZVRlcm0oKSk7Ci0gICAgICBpZiAoc3VibWl0UnVsZSA9PSBudWxsKSB7Ci0gICAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIk5vIHVzZXI6c3VibWl0X3J1bGUgZm91bmQgZm9yICIKLSAgICAgICAgICAgICsgZ2V0UHJvamVjdCgpLmdldE5hbWUoKSk7Ci0gICAgICB9Ci0KLSAgICAgIGlmIChmYXN0RXZhbExhYmVscykgewotICAgICAgICBlbnYub25jZSgiZ2Vycml0IiwgImFzc3VtZV9yYW5nZV9mcm9tX2xhYmVsIik7Ci0gICAgICB9Ci0KLSAgICAgIHRyeSB7Ci0gICAgICAgIGZvciAoVGVybVtdIHRlbXBsYXRlIDogZW52LmFsbCgKLSAgICAgICAgICAgICJnZXJyaXQiLCAiY2FuX3N1Ym1pdCIsCi0gICAgICAgICAgICBzdWJtaXRSdWxlLAotICAgICAgICAgICAgbmV3IFZhcmlhYmxlVGVybSgpKSkgewotICAgICAgICAgIHJlc3VsdHMuYWRkKHRlbXBsYXRlWzFdKTsKLSAgICAgICAgfQotICAgICAgfSBjYXRjaCAoUHJvbG9nRXhjZXB0aW9uIGVycikgewotICAgICAgICByZXR1cm4gbG9nUnVsZUVycm9yKCJFeGNlcHRpb24gY2FsbGluZyAiICsgc3VibWl0UnVsZSArICIgb24gY2hhbmdlICIKLSAgICAgICAgICAgICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOwotICAgICAgfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgICAgcmV0dXJuIGxvZ1J1bGVFcnJvcigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIHN1Ym1pdFJ1bGUgKyAiIG9uIGNoYW5nZSAiCi0gICAgICAgICAgICArIGNoYW5nZS5nZXRJZCgpICsgIiBvZiAiICsgZ2V0UHJvamVjdCgpLmdldE5hbWUoKSwgZXJyKTsKLSAgICAgIH0KLQotICAgICAgUHJvamVjdFN0YXRlIHBhcmVudFN0YXRlID0gcHJvamVjdFN0YXRlLmdldFBhcmVudFN0YXRlKCk7Ci0gICAgICBQcm9sb2dFbnZpcm9ubWVudCBjaGlsZEVudiA9IGVudjsKLSAgICAgIFNldDxQcm9qZWN0Lk5hbWVLZXk+IHByb2plY3RzU2VlbiA9IG5ldyBIYXNoU2V0PFByb2plY3QuTmFtZUtleT4oKTsKLSAgICAgIHByb2plY3RzU2Vlbi5hZGQoZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSk7Ci0KLSAgICAgIHdoaWxlIChwYXJlbnRTdGF0ZSAhPSBudWxsKSB7Ci0gICAgICAgIGlmICghcHJvamVjdHNTZWVuLmFkZChwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpKSkgewotICAgICAgICAgIC8vcGFyZW50IGhhcyBiZWVuIHNlZW4gYmVmb3JlLCBzdG9wIHdhbGsgdXAgaW5oZXJpdGFuY2UgdHJlZQotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgIFByb2xvZ0Vudmlyb25tZW50IHBhcmVudEVudjsKLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICBwYXJlbnRFbnYgPSBwYXJlbnRTdGF0ZS5uZXdQcm9sb2dFbnZpcm9ubWVudCgpOwotICAgICAgICB9IGNhdGNoIChDb21waWxlRXhjZXB0aW9uIGVycikgewotICAgICAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIkNhbm5vdCBjb25zdWx0IHJ1bGVzLnBsIGZvciAiCi0gICAgICAgICAgICAgICsgcGFyZW50U3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWUoKSwgZXJyKTsKLSAgICAgICAgfQotCi0gICAgICAgIHBhcmVudEVudi5jb3B5U3RvcmVkVmFsdWVzKGNoaWxkRW52KTsKLSAgICAgICAgVGVybSBmaWx0ZXJSdWxlID0KLSAgICAgICAgICAgIHBhcmVudEVudi5vbmNlKCJnZXJyaXQiLCAibG9jYXRlX3N1Ym1pdF9maWx0ZXIiLCBuZXcgVmFyaWFibGVUZXJtKCkpOwotICAgICAgICBpZiAoZmlsdGVyUnVsZSAhPSBudWxsKSB7Ci0gICAgICAgICAgdHJ5IHsKLSAgICAgICAgICAgIGlmIChmYXN0RXZhbExhYmVscykgewotICAgICAgICAgICAgICBlbnYub25jZSgiZ2Vycml0IiwgImFzc3VtZV9yYW5nZV9mcm9tX2xhYmVsIik7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIFRlcm0gcmVzdWx0c1Rlcm0gPSB0b0xpc3RUZXJtKHJlc3VsdHMpOwotICAgICAgICAgICAgcmVzdWx0cy5jbGVhcigpOwotICAgICAgICAgICAgVGVybVtdIHRlbXBsYXRlID0gcGFyZW50RW52Lm9uY2UoCi0gICAgICAgICAgICAgICAgImdlcnJpdCIsICJmaWx0ZXJfc3VibWl0X3Jlc3VsdHMiLAotICAgICAgICAgICAgICAgIGZpbHRlclJ1bGUsCi0gICAgICAgICAgICAgICAgcmVzdWx0c1Rlcm0sCi0gICAgICAgICAgICAgICAgbmV3IFZhcmlhYmxlVGVybSgpKTsKLSAgICAgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQotICAgICAgICAgICAgZmluYWwgTGlzdDw/IGV4dGVuZHMgVGVybT4gdGVybUxpc3QgPSAoKExpc3RUZXJtKSB0ZW1wbGF0ZVsyXSkudG9KYXZhKCk7Ci0gICAgICAgICAgICByZXN1bHRzLmFkZEFsbCh0ZXJtTGlzdCk7Ci0gICAgICAgICAgfSBjYXRjaCAoUHJvbG9nRXhjZXB0aW9uIGVycikgewotICAgICAgICAgICAgcmV0dXJuIGxvZ1J1bGVFcnJvcigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIGZpbHRlclJ1bGUgKyAiIG9uIGNoYW5nZSAiCi0gICAgICAgICAgICAgICAgKyBjaGFuZ2UuZ2V0SWQoKSArICIgb2YgIiArIHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXROYW1lKCksIGVycik7Ci0gICAgICAgICAgfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiBlcnIpIHsKLSAgICAgICAgICAgIHJldHVybiBsb2dSdWxlRXJyb3IoIkV4Y2VwdGlvbiBjYWxsaW5nICIgKyBmaWx0ZXJSdWxlICsgIiBvbiBjaGFuZ2UgIgotICAgICAgICAgICAgICAgICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIgKyBwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpLCBlcnIpOwotICAgICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIHBhcmVudFN0YXRlID0gcGFyZW50U3RhdGUuZ2V0UGFyZW50U3RhdGUoKTsKLSAgICAgICAgY2hpbGRFbnYgPSBwYXJlbnRFbnY7Ci0gICAgICB9Ci0gICAgfSBmaW5hbGx5IHsKLSAgICAgIGVudi5jbG9zZSgpOworICAgICAgZXZhbHVhdG9yID0gbmV3IFN1Ym1pdFJ1bGVFdmFsdWF0b3IoZGIsIHBhdGNoU2V0LAorICAgICAgICAgIGdldFByb2plY3RDb250cm9sKCksCisgICAgICAgICAgdGhpcywgY2hhbmdlLCBjZCwKKyAgICAgICAgICBmYXN0RXZhbExhYmVscywKKyAgICAgICAgICAibG9jYXRlX3N1Ym1pdF9ydWxlIiwgImNhbl9zdWJtaXQiLAorICAgICAgICAgICJsb2NhdGVfc3VibWl0X2ZpbHRlciIsICJmaWx0ZXJfc3VibWl0X3Jlc3VsdHMiKTsKKyAgICAgIHJlc3VsdHMgPSBldmFsdWF0b3IuZXZhbHVhdGUoKTsKKyAgICB9IGNhdGNoIChSdWxlRXZhbEV4Y2VwdGlvbiBlKSB7CisgICAgICByZXR1cm4gbG9nUnVsZUVycm9yKGUuZ2V0TWVzc2FnZSgpLCBlKTsKICAgICB9CiAKICAgICBpZiAocmVzdWx0cy5pc0VtcHR5KCkpIHsKQEAgLTQzNywxMiArMzY1LDI4IEBACiAgICAgICAvLyBhdCBsZWFzdCBvbmUgcmVzdWx0IGluZm9ybWluZyB0aGUgY2FsbGVyIG9mIHRoZSBsYWJlbHMgdGhhdCBhcmUKICAgICAgIC8vIHJlcXVpcmVkIGZvciB0aGlzIGNoYW5nZSB0byBiZSBzdWJtaXR0YWJsZS4gRWFjaCBsYWJlbCB3aWxsIGluZGljYXRlCiAgICAgICAvLyB3aGV0aGVyIG9yIG5vdCB0aGF0IGlzIGFjdHVhbGx5IHBvc3NpYmxlIGdpdmVuIHRoZSBwZXJtaXNzaW9ucy4KLSAgICAgIGxvZy5lcnJvcigiU3VibWl0IHJ1bGUgIiArIHN1Ym1pdFJ1bGUgKyAiIGZvciBjaGFuZ2UgIiArIGNoYW5nZS5nZXRJZCgpCi0gICAgICAgICAgKyAiIG9mICIgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpICsgIiBoYXMgbm8gc29sdXRpb24uIik7CisgICAgICBsb2cuZXJyb3IoIlN1Ym1pdCBydWxlICciICsgZXZhbHVhdG9yLmdldFN1Ym1pdFJ1bGUoKSArICInIGZvciBjaGFuZ2UgIgorICAgICAgICAgICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpCisgICAgICAgICAgKyAiIGhhcyBubyBzb2x1dGlvbi4iKTsKICAgICAgIHJldHVybiBydWxlRXJyb3IoIlByb2plY3Qgc3VibWl0IHJ1bGUgaGFzIG5vIHNvbHV0aW9uIik7CiAgICAgfQogCi0gICAgcmV0dXJuIHJlc3VsdHNUb1N1Ym1pdFJlY29yZChzdWJtaXRSdWxlLCByZXN1bHRzKTsKKyAgICByZXR1cm4gcmVzdWx0c1RvU3VibWl0UmVjb3JkKGV2YWx1YXRvci5nZXRTdWJtaXRSdWxlKCksIHJlc3VsdHMpOworICB9CisKKyAgcHJpdmF0ZSBMaXN0PFN1Ym1pdFJlY29yZD4gY2Fubm90U3VibWl0RHJhZnQoUmV2aWV3RGIgZGIsIFBhdGNoU2V0IHBhdGNoU2V0LAorICAgICAgQ2hhbmdlRGF0YSBjZCkgeworICAgIHRyeSB7CisgICAgICBpZiAoIWlzRHJhZnRWaXNpYmxlKGRiLCBjZCkpIHsKKyAgICAgICAgcmV0dXJuIHJ1bGVFcnJvcigiUGF0Y2ggc2V0ICIgKyBwYXRjaFNldC5nZXRQYXRjaFNldElkKCkgKyAiIG5vdCBmb3VuZCIpOworICAgICAgfSBlbHNlIGlmIChwYXRjaFNldC5pc0RyYWZ0KCkpIHsKKyAgICAgICAgcmV0dXJuIHJ1bGVFcnJvcigiQ2Fubm90IHN1Ym1pdCBkcmFmdCBwYXRjaCBzZXRzIik7CisgICAgICB9IGVsc2UgeworICAgICAgICByZXR1cm4gcnVsZUVycm9yKCJDYW5ub3Qgc3VibWl0IGRyYWZ0IGNoYW5nZXMiKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXJyKSB7CisgICAgICByZXR1cm4gbG9nUnVsZUVycm9yKCJDYW5ub3QgcmVhZCBwYXRjaCBzZXQgIiArIHBhdGNoU2V0LmdldElkKCksIGVycik7CisgICAgfQogICB9CiAKICAgLyoqCkBAIC01MjcsNiArNDcxLDY0IEBACiAgICAgcmV0dXJuIG91dDsKICAgfQogCisgIHB1YmxpYyBTdWJtaXRUeXBlUmVjb3JkIGdldFN1Ym1pdFR5cGVSZWNvcmQoUmV2aWV3RGIgZGIsIFBhdGNoU2V0IHBhdGNoU2V0KSB7CisgICAgcmV0dXJuIGdldFN1Ym1pdFR5cGVSZWNvcmQoZGIsIHBhdGNoU2V0LCBudWxsKTsKKyAgfQorCisgIHB1YmxpYyBTdWJtaXRUeXBlUmVjb3JkIGdldFN1Ym1pdFR5cGVSZWNvcmQoUmV2aWV3RGIgZGIsIFBhdGNoU2V0IHBhdGNoU2V0LAorICAgICAgQE51bGxhYmxlIENoYW5nZURhdGEgY2QpIHsKKyAgICB0cnkgeworICAgICAgaWYgKGNoYW5nZS5nZXRTdGF0dXMoKSA9PSBDaGFuZ2UuU3RhdHVzLkRSQUZUICYmICFpc0RyYWZ0VmlzaWJsZShkYiwgY2QpKSB7CisgICAgICAgIHJldHVybiB0eXBlUnVsZUVycm9yKCJQYXRjaCBzZXQgIiArIHBhdGNoU2V0LmdldFBhdGNoU2V0SWQoKQorICAgICAgICAgICAgKyAiIG5vdCBmb3VuZCIpOworICAgICAgfQorICAgICAgaWYgKHBhdGNoU2V0LmlzRHJhZnQoKSAmJiAhaXNEcmFmdFZpc2libGUoZGIsIGNkKSkgeworICAgICAgICByZXR1cm4gdHlwZVJ1bGVFcnJvcigiUGF0Y2ggc2V0ICIgKyBwYXRjaFNldC5nZXRQYXRjaFNldElkKCkKKyAgICAgICAgICAgICsgIiBub3QgZm91bmQiKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZXJyKSB7CisgICAgICByZXR1cm4gbG9nVHlwZVJ1bGVFcnJvcigiQ2Fubm90IHJlYWQgcGF0Y2ggc2V0ICIgKyBwYXRjaFNldC5nZXRJZCgpLAorICAgICAgICAgIGVycik7CisgICAgfQorCisgICAgTGlzdDxUZXJtPiByZXN1bHRzOworICAgIFN1Ym1pdFJ1bGVFdmFsdWF0b3IgZXZhbHVhdG9yOworICAgIHRyeSB7CisgICAgICBldmFsdWF0b3IgPSBuZXcgU3VibWl0UnVsZUV2YWx1YXRvcihkYiwgcGF0Y2hTZXQsCisgICAgICAgICAgZ2V0UHJvamVjdENvbnRyb2woKSwgdGhpcywgY2hhbmdlLCBjZCwKKyAgICAgICAgICBmYWxzZSwKKyAgICAgICAgICAibG9jYXRlX3N1Ym1pdF90eXBlIiwgImdldF9zdWJtaXRfdHlwZSIsCisgICAgICAgICAgImxvY2F0ZV9zdWJtaXRfdHlwZV9maWx0ZXIiLCAiZmlsdGVyX3N1Ym1pdF90eXBlX3Jlc3VsdHMiKTsKKyAgICAgIHJlc3VsdHMgPSBldmFsdWF0b3IuZXZhbHVhdGUoKTsKKyAgICB9IGNhdGNoIChSdWxlRXZhbEV4Y2VwdGlvbiBlKSB7CisgICAgICByZXR1cm4gbG9nVHlwZVJ1bGVFcnJvcihlLmdldE1lc3NhZ2UoKSwgZSk7CisgICAgfQorCisgICAgaWYgKHJlc3VsdHMuaXNFbXB0eSgpKSB7CisgICAgICAvLyBTaG91bGQgbmV2ZXIgb2NjdXIgZm9yIGEgd2VsbCB3cml0dGVuIHJ1bGUKKyAgICAgIGxvZy5lcnJvcigiU3VibWl0IHJ1bGUgJyIgKyBldmFsdWF0b3IuZ2V0U3VibWl0UnVsZSgpICsgIicgZm9yIGNoYW5nZSAiCisgICAgICAgICAgKyBjaGFuZ2UuZ2V0SWQoKSArICIgb2YgIiArIGdldFByb2plY3QoKS5nZXROYW1lKCkKKyAgICAgICAgICArICIgaGFzIG5vIHNvbHV0aW9uLiIpOworICAgICAgcmV0dXJuIHR5cGVSdWxlRXJyb3IoIlByb2plY3Qgc3VibWl0IHJ1bGUgaGFzIG5vIHNvbHV0aW9uIik7CisgICAgfQorCisgICAgVGVybSB0eXBlVGVybSA9IHJlc3VsdHMuZ2V0KDApOworICAgIGlmICghdHlwZVRlcm0uaXNTeW1ib2woKSkgeworICAgICAgbG9nLmVycm9yKCJTdWJtaXQgcnVsZSAnIiArIGV2YWx1YXRvci5nZXRTdWJtaXRSdWxlKCkgKyAiJyBmb3IgY2hhbmdlICIKKyAgICAgICAgICArIGNoYW5nZS5nZXRJZCgpICsgIiBvZiAiICsgZ2V0UHJvamVjdCgpLmdldE5hbWUoKQorICAgICAgICAgICsgIiBkaWQgbm90IHJldHVybiBhIHN5bWJvbC4iKTsKKyAgICAgIHJldHVybiB0eXBlUnVsZUVycm9yKCJQcm9qZWN0IHN1Ym1pdCBydWxlIGhhcyBpbnZhbGlkIHNvbHV0aW9uIik7CisgICAgfQorCisgICAgU3RyaW5nIHR5cGVOYW1lID0gKChTeW1ib2xUZXJtKXR5cGVUZXJtKS5uYW1lKCk7CisgICAgdHJ5IHsKKyAgICAgIHJldHVybiBTdWJtaXRUeXBlUmVjb3JkLk9LKAorICAgICAgICAgIFByb2plY3QuU3VibWl0VHlwZS52YWx1ZU9mKHR5cGVOYW1lLnRvVXBwZXJDYXNlKCkpKTsKKyAgICB9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gZSkgeworICAgICAgcmV0dXJuIGxvZ0ludmFsaWRUeXBlKGV2YWx1YXRvci5nZXRTdWJtaXRSdWxlKCksIHR5cGVOYW1lKTsKKyAgICB9CisgIH0KKwogICBwcml2YXRlIExpc3Q8U3VibWl0UmVjb3JkPiBsb2dJbnZhbGlkUmVzdWx0KFRlcm0gcnVsZSwgVGVybSByZWNvcmQpIHsKICAgICByZXR1cm4gbG9nUnVsZUVycm9yKCJTdWJtaXQgcnVsZSAiICsgcnVsZSArICIgZm9yIGNoYW5nZSAiICsgY2hhbmdlLmdldElkKCkKICAgICAgICAgKyAiIG9mICIgKyBnZXRQcm9qZWN0KCkuZ2V0TmFtZSgpICsgIiBvdXRwdXQgaW52YWxpZCByZXN1bHQ6ICIgKyByZWNvcmQpOwpAQCAtNTQ5LDYgKzU1MSwyOSBAQAogICAgIHJldHVybiBDb2xsZWN0aW9ucy5zaW5nbGV0b25MaXN0KHJlYyk7CiAgIH0KIAorICBwcml2YXRlIFN1Ym1pdFR5cGVSZWNvcmQgbG9nSW52YWxpZFR5cGUoVGVybSBydWxlLCBTdHJpbmcgcmVjb3JkKSB7CisgICAgcmV0dXJuIGxvZ1R5cGVSdWxlRXJyb3IoIlN1Ym1pdCB0eXBlIHJ1bGUgIiArIHJ1bGUgKyAiIGZvciBjaGFuZ2UgIgorICAgICAgICArIGNoYW5nZS5nZXRJZCgpICsgIiBvZiAiICsgZ2V0UHJvamVjdCgpLmdldE5hbWUoKQorICAgICAgICArICIgb3V0cHV0IGludmFsaWQgcmVzdWx0OiAiICsgcmVjb3JkKTsKKyAgfQorCisgIHByaXZhdGUgU3VibWl0VHlwZVJlY29yZCBsb2dUeXBlUnVsZUVycm9yKFN0cmluZyBlcnIsIEV4Y2VwdGlvbiBlKSB7CisgICAgbG9nLmVycm9yKGVyciwgZSk7CisgICAgcmV0dXJuIHR5cGVSdWxlRXJyb3IoIkVycm9yIGV2YWx1YXRpbmcgcHJvamVjdCB0eXBlIHJ1bGVzLCBjaGVjayBzZXJ2ZXIgbG9nIik7CisgIH0KKworICBwcml2YXRlIFN1Ym1pdFR5cGVSZWNvcmQgbG9nVHlwZVJ1bGVFcnJvcihTdHJpbmcgZXJyKSB7CisgICAgbG9nLmVycm9yKGVycik7CisgICAgcmV0dXJuIHR5cGVSdWxlRXJyb3IoIkVycm9yIGV2YWx1YXRpbmcgcHJvamVjdCB0eXBlIHJ1bGVzLCBjaGVjayBzZXJ2ZXIgbG9nIik7CisgIH0KKworICBwcml2YXRlIFN1Ym1pdFR5cGVSZWNvcmQgdHlwZVJ1bGVFcnJvcihTdHJpbmcgZXJyKSB7CisgICAgU3VibWl0VHlwZVJlY29yZCByZWMgPSBuZXcgU3VibWl0VHlwZVJlY29yZCgpOworICAgIHJlYy5zdGF0dXMgPSBTdWJtaXRUeXBlUmVjb3JkLlN0YXR1cy5SVUxFX0VSUk9SOworICAgIHJlYy5lcnJvck1lc3NhZ2UgPSBlcnI7CisgICAgcmV0dXJuIHJlYzsKKyAgfQorCiAgIHByaXZhdGUgdm9pZCBhcHBsaWVkQnkoU3VibWl0UmVjb3JkLkxhYmVsIGxhYmVsLCBUZXJtIHN0YXR1cykgewogICAgIGlmIChzdGF0dXMuaXNTdHJ1Y3R1cmUoKSAmJiBzdGF0dXMuYXJpdHkoKSA9PSAxKSB7CiAgICAgICBUZXJtIHdobyA9IHN0YXR1cy5hcmcoMCk7CkBAIC01NjAsNyArNTg1LDcgQEAKIAogICBwcml2YXRlIGJvb2xlYW4gaXNEcmFmdFZpc2libGUoUmV2aWV3RGIgZGIsIENoYW5nZURhdGEgY2QpCiAgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICByZXR1cm4gaXNPd25lcigpIHx8IGlzUmV2aWV3ZXIoZGIsIGNkKTsKKyAgICByZXR1cm4gaXNPd25lcigpIHx8IGlzUmV2aWV3ZXIoZGIsIGNkKSB8fCBnZXRSZWZDb250cm9sKCkuY2FuVmlld0RyYWZ0cygpOwogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc1VzZXIoVGVybSB3aG8pIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DcmVhdGVQcm9qZWN0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvQ3JlYXRlUHJvamVjdC5qYXZhCmluZGV4IDNkYmQ3YjcuLjU0OTQxNDYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DcmVhdGVQcm9qZWN0LmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0NyZWF0ZVByb2plY3QuamF2YQpAQCAtMSw0ICsxLDQgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMSBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAogLy8KIC8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwogLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgpAQCAtMTAsMjg5ICsxMCwxMTUgQEAKIC8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCiAvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KIC8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY2Vzc1NlY3Rpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBEZXNjcmlwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cFJlZmVyZW5jZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb25SdWxlOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuZXZlbnRzLk5ld1Byb2plY3RDcmVhdGVkTGlzdGVuZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY1NldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlJlcXVpcmVzQ2FwYWJpbGl0eTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Ub3BMZXZlbFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5VbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBCYWNrZW5kOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuUHJvamVjdE93bmVyR3JvdXBzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5leHRlbnNpb25zLmV2ZW50cy5HaXRSZWZlcmVuY2VVcGRhdGVkOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXRhRGF0YVVwZGF0ZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlByb2plY3RDb25maWc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5SZXBvc2l0b3J5Q2FzZU1pc21hdGNoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ncm91cC5Hcm91cHNDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNyZWF0ZVByb2plY3QuSW5wdXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkFzc2lzdGVkOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuQ29uZmlnSW52YWxpZEV4Y2VwdGlvbjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5SZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb247Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29tbWl0QnVpbGRlcjsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SW5zZXJ0ZXI7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUGVyc29uSWRlbnQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOwotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlZlVwZGF0ZS5SZXN1bHQ7Ci1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKLWltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOwotaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwotCi1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuU2V0OwogCi0KLS8qKiBDb21tb24gY2xhc3MgdGhhdCBob2xkcyB0aGUgY29kZSB0byBjcmVhdGUgcHJvamVjdHMgKi8KLXB1YmxpYyBjbGFzcyBDcmVhdGVQcm9qZWN0IHsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkKLSAgICAgIC5nZXRMb2dnZXIoQ3JlYXRlUHJvamVjdC5jbGFzcyk7Ci0KLSAgcHVibGljIGludGVyZmFjZSBGYWN0b3J5IHsKLSAgICBDcmVhdGVQcm9qZWN0IGNyZWF0ZShDcmVhdGVQcm9qZWN0QXJncyBjcmVhdGVQcm9qZWN0QXJncyk7CitAUmVxdWlyZXNDYXBhYmlsaXR5KEdsb2JhbENhcGFiaWxpdHkuQ1JFQVRFX1BST0pFQ1QpCitjbGFzcyBDcmVhdGVQcm9qZWN0IGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8VG9wTGV2ZWxSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBTdHJpbmcgbmFtZTsKKyAgICBTdHJpbmcgcGFyZW50OworICAgIFN0cmluZyBkZXNjcmlwdGlvbjsKKyAgICBib29sZWFuIHBlcm1pc3Npb25zT25seTsKKyAgICBib29sZWFuIGNyZWF0ZUVtcHR5Q29tbWl0OworICAgIFN1Ym1pdFR5cGUgc3VibWl0VHlwZTsKKyAgICBMaXN0PFN0cmluZz4gYnJhbmNoZXM7CisgICAgTGlzdDxTdHJpbmc+IG93bmVyczsKKyAgICBJbmhlcml0YWJsZUJvb2xlYW4gdXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzOworICAgIEluaGVyaXRhYmxlQm9vbGVhbiB1c2VTaWduZWRPZmZCeTsKKyAgICBJbmhlcml0YWJsZUJvb2xlYW4gdXNlQ29udGVudE1lcmdlOworICAgIEluaGVyaXRhYmxlQm9vbGVhbiByZXF1aXJlQ2hhbmdlSWQ7CiAgIH0KIAotICBwcml2YXRlIGZpbmFsIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gcHJvamVjdE93bmVyR3JvdXBzOwotICBwcml2YXRlIGZpbmFsIElkZW50aWZpZWRVc2VyIGN1cnJlbnRVc2VyOwotICBwcml2YXRlIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyOwotICBwcml2YXRlIGZpbmFsIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVmZXJlbmNlVXBkYXRlZDsKLSAgcHJpdmF0ZSBmaW5hbCBEeW5hbWljU2V0PE5ld1Byb2plY3RDcmVhdGVkTGlzdGVuZXI+IGNyZWF0ZWRMaXN0ZW5lcjsKLSAgcHJpdmF0ZSBmaW5hbCBQZXJzb25JZGVudCBzZXJ2ZXJJZGVudDsKLSAgcHJpdmF0ZSBDcmVhdGVQcm9qZWN0QXJncyBjcmVhdGVQcm9qZWN0QXJnczsKLSAgcHJpdmF0ZSBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlOwotICBwcml2YXRlIEdyb3VwQmFja2VuZCBncm91cEJhY2tlbmQ7Ci0gIHByaXZhdGUgTWV0YURhdGFVcGRhdGUuVXNlciBtZXRhRGF0YVVwZGF0ZUZhY3Rvcnk7CisgIHN0YXRpYyBpbnRlcmZhY2UgRmFjdG9yeSB7CisgICAgQ3JlYXRlUHJvamVjdCBjcmVhdGUoU3RyaW5nIG5hbWUpOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQZXJmb3JtQ3JlYXRlUHJvamVjdC5GYWN0b3J5IGNyZWF0ZVByb2plY3RGYWN0b3J5OworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFByb2plY3RzQ29sbGVjdGlvbj4gcHJvamVjdHNDb2xsZWN0aW9uOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPEdyb3Vwc0NvbGxlY3Rpb24+IGdyb3Vwc0NvbGxlY3Rpb247CisgIHByaXZhdGUgZmluYWwgUHJvamVjdEpzb24ganNvbjsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbmFtZTsKIAogICBASW5qZWN0Ci0gIENyZWF0ZVByb2plY3QoQFByb2plY3RPd25lckdyb3VwcyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IHBPd25lckdyb3VwcywKLSAgICAgIElkZW50aWZpZWRVc2VyIGlkZW50aWZpZWRVc2VyLCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRSZXBvTWFuYWdlciwKLSAgICAgIEdpdFJlZmVyZW5jZVVwZGF0ZWQgcmVmZXJlbmNlVXBkYXRlZCwKLSAgICAgIER5bmFtaWNTZXQ8TmV3UHJvamVjdENyZWF0ZWRMaXN0ZW5lcj4gY3JlYXRlZExpc3RlbmVyLAotICAgICAgUmV2aWV3RGIgZGIsCi0gICAgICBAR2Vycml0UGVyc29uSWRlbnQgUGVyc29uSWRlbnQgcGVyc29uSWRlbnQsIEdyb3VwQmFja2VuZCBncm91cEJhY2tlbmQsCi0gICAgICBNZXRhRGF0YVVwZGF0ZS5Vc2VyIG1ldGFEYXRhVXBkYXRlRmFjdG9yeSwKLSAgICAgIEBBc3Npc3RlZCBDcmVhdGVQcm9qZWN0QXJncyBjcmVhdGVQQXJncywgUHJvamVjdENhY2hlIHBDYWNoZSkgewotICAgIHRoaXMucHJvamVjdE93bmVyR3JvdXBzID0gcE93bmVyR3JvdXBzOwotICAgIHRoaXMuY3VycmVudFVzZXIgPSBpZGVudGlmaWVkVXNlcjsKLSAgICB0aGlzLnJlcG9NYW5hZ2VyID0gZ2l0UmVwb01hbmFnZXI7Ci0gICAgdGhpcy5yZWZlcmVuY2VVcGRhdGVkID0gcmVmZXJlbmNlVXBkYXRlZDsKLSAgICB0aGlzLmNyZWF0ZWRMaXN0ZW5lciA9IGNyZWF0ZWRMaXN0ZW5lcjsKLSAgICB0aGlzLnNlcnZlcklkZW50ID0gcGVyc29uSWRlbnQ7Ci0gICAgdGhpcy5jcmVhdGVQcm9qZWN0QXJncyA9IGNyZWF0ZVBBcmdzOwotICAgIHRoaXMucHJvamVjdENhY2hlID0gcENhY2hlOwotICAgIHRoaXMuZ3JvdXBCYWNrZW5kID0gZ3JvdXBCYWNrZW5kOwotICAgIHRoaXMubWV0YURhdGFVcGRhdGVGYWN0b3J5ID0gbWV0YURhdGFVcGRhdGVGYWN0b3J5OworICBDcmVhdGVQcm9qZWN0KFBlcmZvcm1DcmVhdGVQcm9qZWN0LkZhY3RvcnkgcGVyZm9ybUNyZWF0ZVByb2plY3RGYWN0b3J5LAorICAgICAgUHJvdmlkZXI8UHJvamVjdHNDb2xsZWN0aW9uPiBwcm9qZWN0c0NvbGxlY3Rpb24sCisgICAgICBQcm92aWRlcjxHcm91cHNDb2xsZWN0aW9uPiBncm91cHNDb2xsZWN0aW9uLCBQcm9qZWN0SnNvbiBqc29uLAorICAgICAgQEFzc2lzdGVkIFN0cmluZyBuYW1lKSB7CisgICAgdGhpcy5jcmVhdGVQcm9qZWN0RmFjdG9yeSA9IHBlcmZvcm1DcmVhdGVQcm9qZWN0RmFjdG9yeTsKKyAgICB0aGlzLnByb2plY3RzQ29sbGVjdGlvbiA9IHByb2plY3RzQ29sbGVjdGlvbjsKKyAgICB0aGlzLmdyb3Vwc0NvbGxlY3Rpb24gPSBncm91cHNDb2xsZWN0aW9uOworICAgIHRoaXMuanNvbiA9IGpzb247CisgICAgdGhpcy5uYW1lID0gbmFtZTsKICAgfQogCi0gIHB1YmxpYyB2b2lkIGNyZWF0ZVByb2plY3QoKSB0aHJvd3MgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uIHsKLSAgICB2YWxpZGF0ZVBhcmFtZXRlcnMoKTsKLSAgICBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgbmFtZUtleSA9IGNyZWF0ZVByb2plY3RBcmdzLmdldFByb2plY3QoKTsKLSAgICB0cnkgewotICAgICAgZmluYWwgU3RyaW5nIGhlYWQgPQotICAgICAgICAgIGNyZWF0ZVByb2plY3RBcmdzLnBlcm1pc3Npb25zT25seSA/IEdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRl9DT05GSUcKLSAgICAgICAgICAgICAgOiBjcmVhdGVQcm9qZWN0QXJncy5icmFuY2guZ2V0KDApOwotICAgICAgZmluYWwgUmVwb3NpdG9yeSByZXBvID0gcmVwb01hbmFnZXIuY3JlYXRlUmVwb3NpdG9yeShuYW1lS2V5KTsKLSAgICAgIHRyeSB7Ci0gICAgICAgIE5ld1Byb2plY3RDcmVhdGVkTGlzdGVuZXIuRXZlbnQgZXZlbnQgPSBuZXcgTmV3UHJvamVjdENyZWF0ZWRMaXN0ZW5lci5FdmVudCgpIHsKLSAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwdWJsaWMgU3RyaW5nIGdldFByb2plY3ROYW1lKCkgewotICAgICAgICAgICAgcmV0dXJuIG5hbWVLZXkuZ2V0KCk7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHVibGljIFN0cmluZyBnZXRIZWFkTmFtZSgpIHsKLSAgICAgICAgICAgIHJldHVybiBoZWFkOwotICAgICAgICAgIH0KLSAgICAgICAgfTsKLSAgICAgICAgZm9yIChOZXdQcm9qZWN0Q3JlYXRlZExpc3RlbmVyIGwgOiBjcmVhdGVkTGlzdGVuZXIpIHsKLSAgICAgICAgICBsLm9uTmV3UHJvamVjdENyZWF0ZWQoZXZlbnQpOwotICAgICAgICB9Ci0KLSAgICAgICAgZmluYWwgUmVmVXBkYXRlIHUgPSByZXBvLnVwZGF0ZVJlZihDb25zdGFudHMuSEVBRCk7Ci0gICAgICAgIHUuZGlzYWJsZVJlZkxvZygpOwotICAgICAgICB1LmxpbmsoaGVhZCk7Ci0KLSAgICAgICAgY3JlYXRlUHJvamVjdENvbmZpZygpOwotCi0gICAgICAgIGlmICghY3JlYXRlUHJvamVjdEFyZ3MucGVybWlzc2lvbnNPbmx5Ci0gICAgICAgICAgICAmJiBjcmVhdGVQcm9qZWN0QXJncy5jcmVhdGVFbXB0eUNvbW1pdCkgewotICAgICAgICAgIGNyZWF0ZUVtcHR5Q29tbWl0cyhyZXBvLCBuYW1lS2V5LCBjcmVhdGVQcm9qZWN0QXJncy5icmFuY2gpOwotICAgICAgICB9Ci0gICAgICB9IGZpbmFsbHkgewotICAgICAgICByZXBvLmNsb3NlKCk7Ci0gICAgICB9Ci0gICAgfSBjYXRjaCAoUmVwb3NpdG9yeUNhc2VNaXNtYXRjaEV4Y2VwdGlvbiBlKSB7Ci0gICAgICB0aHJvdyBuZXcgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uKCJDYW5ub3QgY3JlYXRlICIgKyBuYW1lS2V5LmdldCgpCi0gICAgICAgICAgKyAiIGJlY2F1c2UgdGhlIG5hbWUgaXMgYWxyZWFkeSBvY2N1cGllZCBieSBhbm90aGVyIHByb2plY3QuIgotICAgICAgICAgICsgIiBUaGUgb3RoZXIgcHJvamVjdCBoYXMgdGhlIHNhbWUgbmFtZSwgb25seSBzcGVsbGVkIGluIGEiCi0gICAgICAgICAgKyAiIGRpZmZlcmVudCBjYXNlLiIsIGUpOwotICAgIH0gY2F0Y2ggKFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiBiYWROYW1lKSB7Ci0gICAgICB0aHJvdyBuZXcgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uKCJDYW5ub3QgY3JlYXRlICIgKyBuYW1lS2V5LCBiYWROYW1lKTsKLSAgICB9IGNhdGNoIChJbGxlZ2FsU3RhdGVFeGNlcHRpb24gZXJyKSB7Ci0gICAgICB0cnkgewotICAgICAgICBmaW5hbCBSZXBvc2l0b3J5IHJlcG8gPSByZXBvTWFuYWdlci5vcGVuUmVwb3NpdG9yeShuYW1lS2V5KTsKLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICBpZiAocmVwby5nZXRPYmplY3REYXRhYmFzZSgpLmV4aXN0cygpKSB7Ci0gICAgICAgICAgICB0aHJvdyBuZXcgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uKCJwcm9qZWN0IFwiIiArIG5hbWVLZXkgKyAiXCIgZXhpc3RzIik7Ci0gICAgICAgICAgfQotICAgICAgICB9IGZpbmFsbHkgewotICAgICAgICAgIHJlcG8uY2xvc2UoKTsKLSAgICAgICAgfQotICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gaW9FcnIpIHsKLSAgICAgICAgZmluYWwgU3RyaW5nIG1zZyA9ICJDYW5ub3QgY3JlYXRlICIgKyBuYW1lS2V5OwotICAgICAgICBsb2cuZXJyb3IobXNnLCBlcnIpOwotICAgICAgICB0aHJvdyBuZXcgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uKG1zZywgaW9FcnIpOwotICAgICAgfQotICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7Ci0gICAgICBmaW5hbCBTdHJpbmcgbXNnID0gIkNhbm5vdCBjcmVhdGUgIiArIG5hbWVLZXk7Ci0gICAgICBsb2cuZXJyb3IobXNnLCBlKTsKLSAgICAgIHRocm93IG5ldyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24obXNnLCBlKTsKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoVG9wTGV2ZWxSZXNvdXJjZSByZXNvdXJjZSwgSW5wdXQgaW5wdXQpCisgICAgICB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiwgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiwKKyAgICAgIFByb2plY3RDcmVhdGlvbkZhaWxlZEV4Y2VwdGlvbiB7CisgICAgaWYgKGlucHV0ID09IG51bGwpIHsKKyAgICAgIGlucHV0ID0gbmV3IElucHV0KCk7CiAgICAgfQotICB9Ci0KLSAgcHJpdmF0ZSB2b2lkIGNyZWF0ZVByb2plY3RDb25maWcoKSB0aHJvd3MgSU9FeGNlcHRpb24sIENvbmZpZ0ludmFsaWRFeGNlcHRpb24gewotICAgIGZpbmFsIE1ldGFEYXRhVXBkYXRlIG1kID0KLSAgICAgICAgbWV0YURhdGFVcGRhdGVGYWN0b3J5LmNyZWF0ZShjcmVhdGVQcm9qZWN0QXJncy5nZXRQcm9qZWN0KCkpOwotICAgIHRyeSB7Ci0gICAgICBmaW5hbCBQcm9qZWN0Q29uZmlnIGNvbmZpZyA9IFByb2plY3RDb25maWcucmVhZChtZCk7Ci0gICAgICBjb25maWcubG9hZChtZCk7Ci0KLSAgICAgIFByb2plY3QgbmV3UHJvamVjdCA9IGNvbmZpZy5nZXRQcm9qZWN0KCk7Ci0gICAgICBuZXdQcm9qZWN0LnNldERlc2NyaXB0aW9uKGNyZWF0ZVByb2plY3RBcmdzLnByb2plY3REZXNjcmlwdGlvbik7Ci0gICAgICBuZXdQcm9qZWN0LnNldFN1Ym1pdFR5cGUoY3JlYXRlUHJvamVjdEFyZ3Muc3VibWl0VHlwZSk7Ci0gICAgICBuZXdQcm9qZWN0Ci0gICAgICAgICAgLnNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyhjcmVhdGVQcm9qZWN0QXJncy5jb250cmlidXRvckFncmVlbWVudHMpOwotICAgICAgbmV3UHJvamVjdC5zZXRVc2VTaWduZWRPZmZCeShjcmVhdGVQcm9qZWN0QXJncy5zaWduZWRPZmZCeSk7Ci0gICAgICBuZXdQcm9qZWN0LnNldFVzZUNvbnRlbnRNZXJnZShjcmVhdGVQcm9qZWN0QXJncy5jb250ZW50TWVyZ2UpOwotICAgICAgbmV3UHJvamVjdC5zZXRSZXF1aXJlQ2hhbmdlSUQoY3JlYXRlUHJvamVjdEFyZ3MuY2hhbmdlSWRSZXF1aXJlZCk7Ci0gICAgICBpZiAoY3JlYXRlUHJvamVjdEFyZ3MubmV3UGFyZW50ICE9IG51bGwpIHsKLSAgICAgICAgbmV3UHJvamVjdC5zZXRQYXJlbnROYW1lKGNyZWF0ZVByb2plY3RBcmdzLm5ld1BhcmVudC5nZXRQcm9qZWN0KCkKLSAgICAgICAgICAgIC5nZXROYW1lS2V5KCkpOwotICAgICAgfQotCi0gICAgICBpZiAoIWNyZWF0ZVByb2plY3RBcmdzLm93bmVySWRzLmlzRW1wdHkoKSkgewotICAgICAgICBmaW5hbCBBY2Nlc3NTZWN0aW9uIGFsbCA9Ci0gICAgICAgICAgICBjb25maWcuZ2V0QWNjZXNzU2VjdGlvbihBY2Nlc3NTZWN0aW9uLkFMTCwgdHJ1ZSk7Ci0gICAgICAgIGZvciAoQWNjb3VudEdyb3VwLlVVSUQgb3duZXJJZCA6IGNyZWF0ZVByb2plY3RBcmdzLm93bmVySWRzKSB7Ci0gICAgICAgICAgR3JvdXBEZXNjcmlwdGlvbi5CYXNpYyBnID0gZ3JvdXBCYWNrZW5kLmdldChvd25lcklkKTsKLSAgICAgICAgICBpZiAoZyAhPSBudWxsKSB7Ci0gICAgICAgICAgICBHcm91cFJlZmVyZW5jZSBncm91cCA9IGNvbmZpZy5yZXNvbHZlKEdyb3VwUmVmZXJlbmNlLmZvckdyb3VwKGcpKTsKLSAgICAgICAgICAgIGFsbC5nZXRQZXJtaXNzaW9uKFBlcm1pc3Npb24uT1dORVIsIHRydWUpLmFkZCgKLSAgICAgICAgICAgICAgICBuZXcgUGVybWlzc2lvblJ1bGUoZ3JvdXApKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0KLQotICAgICAgbWQuc2V0TWVzc2FnZSgiQ3JlYXRlZCBwcm9qZWN0XG4iKTsKLSAgICAgIGNvbmZpZy5jb21taXQobWQpOwotICAgIH0gZmluYWxseSB7Ci0gICAgICBtZC5jbG9zZSgpOwotICAgIH0KLSAgICBwcm9qZWN0Q2FjaGUub25DcmVhdGVQcm9qZWN0KGNyZWF0ZVByb2plY3RBcmdzLmdldFByb2plY3QoKSk7Ci0gICAgcmVwb01hbmFnZXIuc2V0UHJvamVjdERlc2NyaXB0aW9uKGNyZWF0ZVByb2plY3RBcmdzLmdldFByb2plY3QoKSwKLSAgICAgICAgY3JlYXRlUHJvamVjdEFyZ3MucHJvamVjdERlc2NyaXB0aW9uKTsKLSAgICByZWZlcmVuY2VVcGRhdGVkLmZpcmUoY3JlYXRlUHJvamVjdEFyZ3MuZ2V0UHJvamVjdCgpLAotICAgICAgICBHaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZfQ09ORklHKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCB2YWxpZGF0ZVBhcmFtZXRlcnMoKSB0aHJvd3MgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uIHsKLSAgICBpZiAoY3JlYXRlUHJvamVjdEFyZ3MuZ2V0UHJvamVjdE5hbWUoKSA9PSBudWxsCi0gICAgICAgIHx8IGNyZWF0ZVByb2plY3RBcmdzLmdldFByb2plY3ROYW1lKCkuaXNFbXB0eSgpKSB7Ci0gICAgICB0aHJvdyBuZXcgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uKCJQcm9qZWN0IG5hbWUgaXMgcmVxdWlyZWQiKTsKKyAgICBpZiAoaW5wdXQubmFtZSAhPSBudWxsICYmICFuYW1lLmVxdWFscyhpbnB1dC5uYW1lKSkgeworICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oIm5hbWUgbXVzdCBtYXRjaCBVUkwiKTsKICAgICB9CiAKLSAgICBpZiAoY3JlYXRlUHJvamVjdEFyZ3MuZ2V0UHJvamVjdE5hbWUoKS5lbmRzV2l0aChDb25zdGFudHMuRE9UX0dJVF9FWFQpKSB7Ci0gICAgICBjcmVhdGVQcm9qZWN0QXJncy5zZXRQcm9qZWN0TmFtZShjcmVhdGVQcm9qZWN0QXJncy5nZXRQcm9qZWN0TmFtZSgpCi0gICAgICAgICAgLnN1YnN0cmluZygKLSAgICAgICAgICAgICAgMCwKLSAgICAgICAgICAgICAgY3JlYXRlUHJvamVjdEFyZ3MuZ2V0UHJvamVjdE5hbWUoKS5sZW5ndGgoKQotICAgICAgICAgICAgICAgICAgLSBDb25zdGFudHMuRE9UX0dJVF9FWFQubGVuZ3RoKCkpKTsKKyAgICBmaW5hbCBDcmVhdGVQcm9qZWN0QXJncyBhcmdzID0gbmV3IENyZWF0ZVByb2plY3RBcmdzKCk7CisgICAgYXJncy5zZXRQcm9qZWN0TmFtZShuYW1lKTsKKyAgICBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShpbnB1dC5wYXJlbnQpKSB7CisgICAgICBhcmdzLm5ld1BhcmVudCA9IHByb2plY3RzQ29sbGVjdGlvbi5nZXQoKS5wYXJzZShpbnB1dC5wYXJlbnQpLmdldENvbnRyb2woKTsKICAgICB9Ci0KLSAgICBpZiAoIWN1cnJlbnRVc2VyLmdldENhcGFiaWxpdGllcygpLmNhbkNyZWF0ZVByb2plY3QoKSkgewotICAgICAgdGhyb3cgbmV3IFByb2plY3RDcmVhdGlvbkZhaWxlZEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAotICAgICAgICAgICIlcyBkb2VzIG5vdCBoYXZlIFwiQ3JlYXRlIFByb2plY3RcIiBjYXBhYmlsaXR5LiIsCi0gICAgICAgICAgY3VycmVudFVzZXIuZ2V0VXNlck5hbWUoKSkpOwotICAgIH0KLQotICAgIGlmIChjcmVhdGVQcm9qZWN0QXJncy5vd25lcklkcyA9PSBudWxsCi0gICAgICAgIHx8IGNyZWF0ZVByb2plY3RBcmdzLm93bmVySWRzLmlzRW1wdHkoKSkgewotICAgICAgY3JlYXRlUHJvamVjdEFyZ3Mub3duZXJJZHMgPQotICAgICAgICAgIG5ldyBBcnJheUxpc3Q8QWNjb3VudEdyb3VwLlVVSUQ+KHByb2plY3RPd25lckdyb3Vwcyk7Ci0gICAgfQotCi0gICAgTGlzdDxTdHJpbmc+IHRyYW5zZm9ybWVkQnJhbmNoZXMgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKLSAgICBpZiAoY3JlYXRlUHJvamVjdEFyZ3MuYnJhbmNoID09IG51bGwgfHwKLSAgICAgICAgY3JlYXRlUHJvamVjdEFyZ3MuYnJhbmNoLmlzRW1wdHkoKSkgewotICAgICAgY3JlYXRlUHJvamVjdEFyZ3MuYnJhbmNoID0gQ29sbGVjdGlvbnMuc2luZ2xldG9uTGlzdChDb25zdGFudHMuTUFTVEVSKTsKLSAgICB9Ci0gICAgZm9yIChTdHJpbmcgYnJhbmNoIDogY3JlYXRlUHJvamVjdEFyZ3MuYnJhbmNoKSB7Ci0gICAgICB3aGlsZSAoYnJhbmNoLnN0YXJ0c1dpdGgoIi8iKSkgewotICAgICAgICBicmFuY2ggPSBicmFuY2guc3Vic3RyaW5nKDEpOworICAgIGFyZ3MuY3JlYXRlRW1wdHlDb21taXQgPSBpbnB1dC5jcmVhdGVFbXB0eUNvbW1pdDsKKyAgICBhcmdzLnBlcm1pc3Npb25zT25seSA9IGlucHV0LnBlcm1pc3Npb25zT25seTsKKyAgICBhcmdzLnByb2plY3REZXNjcmlwdGlvbiA9IFN0cmluZ3MuZW1wdHlUb051bGwoaW5wdXQuZGVzY3JpcHRpb24pOworICAgIGFyZ3Muc3VibWl0VHlwZSA9CisgICAgICAgIE9iamVjdHMuZmlyc3ROb25OdWxsKGlucHV0LnN1Ym1pdFR5cGUsIFN1Ym1pdFR5cGUuTUVSR0VfSUZfTkVDRVNTQVJZKTsKKyAgICBhcmdzLmJyYW5jaCA9IGlucHV0LmJyYW5jaGVzOworICAgIGlmIChpbnB1dC5vd25lcnMgIT0gbnVsbCkgeworICAgICAgTGlzdDxBY2NvdW50R3JvdXAuVVVJRD4gb3duZXJJZHMgPQorICAgICAgICAgIExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShpbnB1dC5vd25lcnMuc2l6ZSgpKTsKKyAgICAgIGZvciAoU3RyaW5nIG93bmVyIDogaW5wdXQub3duZXJzKSB7CisgICAgICAgIG93bmVySWRzLmFkZChncm91cHNDb2xsZWN0aW9uLmdldCgpLnBhcnNlKG93bmVyKS5nZXRHcm91cFVVSUQoKSk7CiAgICAgICB9Ci0gICAgICBpZiAoIWJyYW5jaC5zdGFydHNXaXRoKENvbnN0YW50cy5SX0hFQURTKSkgewotICAgICAgICBicmFuY2ggPSBDb25zdGFudHMuUl9IRUFEUyArIGJyYW5jaDsKLSAgICAgIH0KLSAgICAgIGlmICghUmVwb3NpdG9yeS5pc1ZhbGlkUmVmTmFtZShicmFuY2gpKSB7Ci0gICAgICAgIHRocm93IG5ldyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKLSAgICAgICAgICAgICJCcmFuY2ggXCIlc1wiIGlzIG5vdCBhIHZhbGlkIG5hbWUuIiwgYnJhbmNoKSk7Ci0gICAgICB9Ci0gICAgICBpZiAoIXRyYW5zZm9ybWVkQnJhbmNoZXMuY29udGFpbnMoYnJhbmNoKSkgewotICAgICAgICB0cmFuc2Zvcm1lZEJyYW5jaGVzLmFkZChicmFuY2gpOwotICAgICAgfQorICAgICAgYXJncy5vd25lcklkcyA9IG93bmVySWRzOwogICAgIH0KLSAgICBjcmVhdGVQcm9qZWN0QXJncy5icmFuY2ggPSB0cmFuc2Zvcm1lZEJyYW5jaGVzOwotICB9CisgICAgYXJncy5jb250cmlidXRvckFncmVlbWVudHMgPQorICAgICAgICBPYmplY3RzLmZpcnN0Tm9uTnVsbChpbnB1dC51c2VDb250cmlidXRvckFncmVlbWVudHMsCisgICAgICAgICAgICBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVCk7CisgICAgYXJncy5zaWduZWRPZmZCeSA9CisgICAgICAgIE9iamVjdHMuZmlyc3ROb25OdWxsKGlucHV0LnVzZVNpZ25lZE9mZkJ5LCBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVCk7CisgICAgYXJncy5jb250ZW50TWVyZ2UgPQorICAgICAgICBpbnB1dC5zdWJtaXRUeXBlID09IFN1Ym1pdFR5cGUuRkFTVF9GT1JXQVJEX09OTFkKKyAgICAgICAgICAgID8gSW5oZXJpdGFibGVCb29sZWFuLkZBTFNFIDogT2JqZWN0cy5maXJzdE5vbk51bGwoCisgICAgICAgICAgICAgICAgaW5wdXQudXNlQ29udGVudE1lcmdlLCBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVCk7CisgICAgYXJncy5jaGFuZ2VJZFJlcXVpcmVkID0KKyAgICAgICAgT2JqZWN0cy5maXJzdE5vbk51bGwoaW5wdXQucmVxdWlyZUNoYW5nZUlkLCBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVCk7CiAKLSAgcHJpdmF0ZSB2b2lkIGNyZWF0ZUVtcHR5Q29tbWl0cyhmaW5hbCBSZXBvc2l0b3J5IHJlcG8sCi0gICAgICBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgZmluYWwgTGlzdDxTdHJpbmc+IHJlZnMpCi0gICAgICB0aHJvd3MgSU9FeGNlcHRpb24gewotICAgIE9iamVjdEluc2VydGVyIG9pID0gcmVwby5uZXdPYmplY3RJbnNlcnRlcigpOwotICAgIHRyeSB7Ci0gICAgICBDb21taXRCdWlsZGVyIGNiID0gbmV3IENvbW1pdEJ1aWxkZXIoKTsKLSAgICAgIGNiLnNldFRyZWVJZChvaS5pbnNlcnQoQ29uc3RhbnRzLk9CSl9UUkVFLCBuZXcgYnl0ZVtdIHt9KSk7Ci0gICAgICBjYi5zZXRBdXRob3IobWV0YURhdGFVcGRhdGVGYWN0b3J5LmdldFVzZXJQZXJzb25JZGVudCgpKTsKLSAgICAgIGNiLnNldENvbW1pdHRlcihzZXJ2ZXJJZGVudCk7Ci0gICAgICBjYi5zZXRNZXNzYWdlKCJJbml0aWFsIGVtcHR5IHJlcG9zaXRvcnlcbiIpOwotCi0gICAgICBPYmplY3RJZCBpZCA9IG9pLmluc2VydChjYik7Ci0gICAgICBvaS5mbHVzaCgpOwotCi0gICAgICBmb3IgKFN0cmluZyByZWYgOiByZWZzKSB7Ci0gICAgICAgIFJlZlVwZGF0ZSBydSA9IHJlcG8udXBkYXRlUmVmKHJlZik7Ci0gICAgICAgIHJ1LnNldE5ld09iamVjdElkKGlkKTsKLSAgICAgICAgZmluYWwgUmVzdWx0IHJlc3VsdCA9IHJ1LnVwZGF0ZSgpOwotICAgICAgICBzd2l0Y2ggKHJlc3VsdCkgewotICAgICAgICAgIGNhc2UgTkVXOgotICAgICAgICAgICAgcmVmZXJlbmNlVXBkYXRlZC5maXJlKHByb2plY3QsIHJlZik7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgICBkZWZhdWx0OiB7Ci0gICAgICAgICAgICB0aHJvdyBuZXcgSU9FeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKLSAgICAgICAgICAgICAgIkZhaWxlZCB0byBjcmVhdGUgcmVmIFwiJXNcIjogJXMiLCByZWYsIHJlc3VsdC5uYW1lKCkpKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICBsb2cuZXJyb3IoCi0gICAgICAgICAgIkNhbm5vdCBjcmVhdGUgZW1wdHkgY29tbWl0IGZvciAiCi0gICAgICAgICAgICAgICsgY3JlYXRlUHJvamVjdEFyZ3MuZ2V0UHJvamVjdE5hbWUoKSwgZSk7Ci0gICAgICB0aHJvdyBlOwotICAgIH0gZmluYWxseSB7Ci0gICAgICBvaS5yZWxlYXNlKCk7Ci0gICAgfQorICAgIFByb2plY3QgcCA9IGNyZWF0ZVByb2plY3RGYWN0b3J5LmNyZWF0ZShhcmdzKS5jcmVhdGVQcm9qZWN0KCk7CisgICAgcmV0dXJuIFJlc3BvbnNlLmNyZWF0ZWQoanNvbi5mb3JtYXQocCkpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvQ3JlYXRlUHJvamVjdEFyZ3MuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DcmVhdGVQcm9qZWN0QXJncy5qYXZhCmluZGV4IDJkZWU0ZjQuLjdiYmQyZTcgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DcmVhdGVQcm9qZWN0QXJncy5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9DcmVhdGVQcm9qZWN0QXJncy5qYXZhCkBAIC0xNiw2ICsxNiw3IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOwogCiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CkBAIC0yNywxNSArMjgsMjAgQEAKICAgcHVibGljIFByb2plY3RDb250cm9sIG5ld1BhcmVudDsKICAgcHVibGljIFN0cmluZyBwcm9qZWN0RGVzY3JpcHRpb247CiAgIHB1YmxpYyBTdWJtaXRUeXBlIHN1Ym1pdFR5cGU7Ci0gIHB1YmxpYyBib29sZWFuIGNvbnRyaWJ1dG9yQWdyZWVtZW50czsKLSAgcHVibGljIGJvb2xlYW4gc2lnbmVkT2ZmQnk7CisgIHB1YmxpYyBJbmhlcml0YWJsZUJvb2xlYW4gY29udHJpYnV0b3JBZ3JlZW1lbnRzOworICBwdWJsaWMgSW5oZXJpdGFibGVCb29sZWFuIHNpZ25lZE9mZkJ5OwogICBwdWJsaWMgYm9vbGVhbiBwZXJtaXNzaW9uc09ubHk7CiAgIHB1YmxpYyBMaXN0PFN0cmluZz4gYnJhbmNoOwotICBwdWJsaWMgYm9vbGVhbiBjb250ZW50TWVyZ2U7Ci0gIHB1YmxpYyBib29sZWFuIGNoYW5nZUlkUmVxdWlyZWQ7CisgIHB1YmxpYyBJbmhlcml0YWJsZUJvb2xlYW4gY29udGVudE1lcmdlOworICBwdWJsaWMgSW5oZXJpdGFibGVCb29sZWFuIGNoYW5nZUlkUmVxdWlyZWQ7CiAgIHB1YmxpYyBib29sZWFuIGNyZWF0ZUVtcHR5Q29tbWl0OwogCiAgIHB1YmxpYyBDcmVhdGVQcm9qZWN0QXJncygpIHsKKyAgICBjb250cmlidXRvckFncmVlbWVudHMgPSBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKyAgICBzaWduZWRPZmZCeSA9IEluaGVyaXRhYmxlQm9vbGVhbi5JTkhFUklUOworICAgIGNvbnRlbnRNZXJnZSA9IEluaGVyaXRhYmxlQm9vbGVhbi5JTkhFUklUOworICAgIGNoYW5nZUlkUmVxdWlyZWQgPSBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKyAgICBzdWJtaXRUeXBlID0gU3VibWl0VHlwZS5NRVJHRV9JRl9ORUNFU1NBUlk7CiAgIH0KIAogICBwdWJsaWMgUHJvamVjdC5OYW1lS2V5IGdldFByb2plY3QoKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvRGFzaGJvYXJkUmVzb3VyY2UuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9EYXNoYm9hcmRSZXNvdXJjZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBlMmRiNDgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvRGFzaGJvYXJkUmVzb3VyY2UuamF2YQpAQCAtMCwwICsxLDY4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5UeXBlTGl0ZXJhbDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKKworcHVibGljIGNsYXNzIERhc2hib2FyZFJlc291cmNlIGltcGxlbWVudHMgUmVzdFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxEYXNoYm9hcmRSZXNvdXJjZT4+IERBU0hCT0FSRF9LSU5EID0KKyAgICAgIG5ldyBUeXBlTGl0ZXJhbDxSZXN0VmlldzxEYXNoYm9hcmRSZXNvdXJjZT4+KCkge307CisKKyAgc3RhdGljIERhc2hib2FyZFJlc291cmNlIHByb2plY3REZWZhdWx0KFByb2plY3RDb250cm9sIGN0bCkgeworICAgIHJldHVybiBuZXcgRGFzaGJvYXJkUmVzb3VyY2UoY3RsLCBudWxsLCBudWxsLCBudWxsLCB0cnVlKTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgUHJvamVjdENvbnRyb2wgY29udHJvbDsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcmVmTmFtZTsKKyAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcGF0aE5hbWU7CisgIHByaXZhdGUgZmluYWwgQ29uZmlnIGNvbmZpZzsKKyAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIHByb2plY3REZWZhdWx0OworCisgIERhc2hib2FyZFJlc291cmNlKFByb2plY3RDb250cm9sIGNvbnRyb2wsCisgICAgICBTdHJpbmcgcmVmTmFtZSwKKyAgICAgIFN0cmluZyBwYXRoTmFtZSwKKyAgICAgIENvbmZpZyBjb25maWcsCisgICAgICBib29sZWFuIHByb2plY3REZWZhdWx0KSB7CisgICAgdGhpcy5jb250cm9sID0gY29udHJvbDsKKyAgICB0aGlzLnJlZk5hbWUgPSByZWZOYW1lOworICAgIHRoaXMucGF0aE5hbWUgPSBwYXRoTmFtZTsKKyAgICB0aGlzLmNvbmZpZyA9IGNvbmZpZzsKKyAgICB0aGlzLnByb2plY3REZWZhdWx0ID0gcHJvamVjdERlZmF1bHQ7CisgIH0KKworICBwdWJsaWMgUHJvamVjdENvbnRyb2wgZ2V0Q29udHJvbCgpIHsKKyAgICByZXR1cm4gY29udHJvbDsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgZ2V0UmVmTmFtZSgpIHsKKyAgICByZXR1cm4gcmVmTmFtZTsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgZ2V0UGF0aE5hbWUoKSB7CisgICAgcmV0dXJuIHBhdGhOYW1lOworICB9CisKKyAgcHVibGljIENvbmZpZyBnZXRDb25maWcoKSB7CisgICAgcmV0dXJuIGNvbmZpZzsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGlzUHJvamVjdERlZmF1bHQoKSB7CisgICAgcmV0dXJuIHByb2plY3REZWZhdWx0OworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvRGFzaGJvYXJkc0NvbGxlY3Rpb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9EYXNoYm9hcmRzQ29sbGVjdGlvbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE1MGU3MWMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvRGFzaGJvYXJkc0NvbGxlY3Rpb24uamF2YQpAQCAtMCwwICsxLDIzMyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXIuUkVGU19EQVNIQk9BUkRTOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5Kb2luZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3BsaXR0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQWNjZXB0c0NyZWF0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQ2hpbGRDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5JZFN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdEFwaUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5VcmxFbmNvZGVkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nc29uLmFubm90YXRpb25zLlNlcmlhbGl6ZWROYW1lOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLkFtYmlndW91c09iamVjdEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5Db25maWdJbnZhbGlkRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLkluY29ycmVjdE9iamVjdFR5cGVFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkJsb2JCYXNlZENvbmZpZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuT2JqZWN0SWQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5pby5VbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCitjbGFzcyBEYXNoYm9hcmRzQ29sbGVjdGlvbiBpbXBsZW1lbnRzCisgICAgQ2hpbGRDb2xsZWN0aW9uPFByb2plY3RSZXNvdXJjZSwgRGFzaGJvYXJkUmVzb3VyY2U+LAorICAgIEFjY2VwdHNDcmVhdGU8UHJvamVjdFJlc291cmNlPnsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyOworICBwcml2YXRlIGZpbmFsIER5bmFtaWNNYXA8UmVzdFZpZXc8RGFzaGJvYXJkUmVzb3VyY2U+PiB2aWV3czsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxMaXN0RGFzaGJvYXJkcz4gbGlzdDsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTZXREZWZhdWx0RGFzaGJvYXJkLkNyZWF0ZURlZmF1bHQ+IGNyZWF0ZURlZmF1bHQ7CisKKyAgQEluamVjdAorICBEYXNoYm9hcmRzQ29sbGVjdGlvbihHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyLAorICAgICAgRHluYW1pY01hcDxSZXN0VmlldzxEYXNoYm9hcmRSZXNvdXJjZT4+IHZpZXdzLAorICAgICAgUHJvdmlkZXI8TGlzdERhc2hib2FyZHM+IGxpc3QsCisgICAgICBQcm92aWRlcjxTZXREZWZhdWx0RGFzaGJvYXJkLkNyZWF0ZURlZmF1bHQ+IGNyZWF0ZURlZmF1bHQpIHsKKyAgICB0aGlzLmdpdE1hbmFnZXIgPSBnaXRNYW5hZ2VyOworICAgIHRoaXMudmlld3MgPSB2aWV3czsKKyAgICB0aGlzLmxpc3QgPSBsaXN0OworICAgIHRoaXMuY3JlYXRlRGVmYXVsdCA9IGNyZWF0ZURlZmF1bHQ7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFJlc3RWaWV3PFByb2plY3RSZXNvdXJjZT4gbGlzdCgpIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gbGlzdC5nZXQoKTsKKyAgfQorCisgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQorICBAT3ZlcnJpZGUKKyAgcHVibGljIFJlc3RNb2RpZnlWaWV3PFByb2plY3RSZXNvdXJjZSwgPz4gY3JlYXRlKFByb2plY3RSZXNvdXJjZSBwYXJlbnQsCisgICAgICBJZFN0cmluZyBpZCkgdGhyb3dzIFJlc3RBcGlFeGNlcHRpb24geworICAgIGlmIChpZC5lcXVhbHMoImRlZmF1bHQiKSkgeworICAgICAgcmV0dXJuIGNyZWF0ZURlZmF1bHQuZ2V0KCk7CisgICAgfQorICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGlkKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgRGFzaGJvYXJkUmVzb3VyY2UgcGFyc2UoUHJvamVjdFJlc291cmNlIHBhcmVudCwgSWRTdHJpbmcgaWQpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sIENvbmZpZ0ludmFsaWRFeGNlcHRpb24geworICAgIFByb2plY3RDb250cm9sIG15Q3RsID0gcGFyZW50LmdldENvbnRyb2woKTsKKyAgICBpZiAoaWQuZXF1YWxzKCJkZWZhdWx0IikpIHsKKyAgICAgIHJldHVybiBEYXNoYm9hcmRSZXNvdXJjZS5wcm9qZWN0RGVmYXVsdChteUN0bCk7CisgICAgfQorCisgICAgTGlzdDxTdHJpbmc+IHBhcnRzID0gTGlzdHMubmV3QXJyYXlMaXN0KAorICAgICAgICBTcGxpdHRlci5vbignOicpLmxpbWl0KDIpLnNwbGl0KGlkLmdldCgpKSk7CisgICAgaWYgKHBhcnRzLnNpemUoKSAhPSAyKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgICAgfQorCisgICAgQ3VycmVudFVzZXIgdXNlciA9IG15Q3RsLmdldEN1cnJlbnRVc2VyKCk7CisgICAgU3RyaW5nIHJlZiA9IHBhcnRzLmdldCgwKTsKKyAgICBTdHJpbmcgcGF0aCA9IHBhcnRzLmdldCgxKTsKKyAgICBmb3IgKFByb2plY3RTdGF0ZSBwcyA6IG15Q3RsLmdldFByb2plY3RTdGF0ZSgpLnRyZWUoKSkgeworICAgICAgdHJ5IHsKKyAgICAgICAgcmV0dXJuIHBhcnNlKHBzLmNvbnRyb2xGb3IodXNlciksIHJlZiwgcGF0aCwgbXlDdGwpOworICAgICAgfSBjYXRjaCAoQW1iaWd1b3VzT2JqZWN0RXhjZXB0aW9uIGUpIHsKKyAgICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQpOworICAgICAgfSBjYXRjaCAoSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiBlKSB7CisgICAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGlkKTsKKyAgICAgIH0gY2F0Y2ggKENvbmZpZ0ludmFsaWRFeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgICAgICB9IGNhdGNoIChSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgfQorICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGlkKTsKKyAgfQorCisgIHByaXZhdGUgRGFzaGJvYXJkUmVzb3VyY2UgcGFyc2UoUHJvamVjdENvbnRyb2wgY3RsLCBTdHJpbmcgcmVmLCBTdHJpbmcgcGF0aCwKKyAgICAgIFByb2plY3RDb250cm9sIG15Q3RsKQorICAgICAgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIElPRXhjZXB0aW9uLCBBbWJpZ3VvdXNPYmplY3RFeGNlcHRpb24sCisgICAgICAgICAgSW5jb3JyZWN0T2JqZWN0VHlwZUV4Y2VwdGlvbiwgQ29uZmlnSW52YWxpZEV4Y2VwdGlvbiB7CisgICAgU3RyaW5nIGlkID0gcmVmICsgIjoiICsgcGF0aDsKKyAgICBpZiAoIXJlZi5zdGFydHNXaXRoKFJFRlNfREFTSEJPQVJEUykpIHsKKyAgICAgIHJlZiA9IFJFRlNfREFTSEJPQVJEUyArIHJlZjsKKyAgICB9CisgICAgaWYgKCFSZXBvc2l0b3J5LmlzVmFsaWRSZWZOYW1lKHJlZikKKyAgICAgICAgfHwgIWN0bC5jb250cm9sRm9yUmVmKHJlZikuY2FuUmVhZCgpKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgICAgfQorCisgICAgUmVwb3NpdG9yeSBnaXQ7CisgICAgdHJ5IHsKKyAgICAgIGdpdCA9IGdpdE1hbmFnZXIub3BlblJlcG9zaXRvcnkoY3RsLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpOworICAgIH0gY2F0Y2ggKFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihpZCk7CisgICAgfQorICAgIHRyeSB7CisgICAgICBPYmplY3RJZCBvYmpJZCA9IGdpdC5yZXNvbHZlKHJlZiArICI6IiArIHBhdGgpOworICAgICAgaWYgKG9iaklkID09IG51bGwpIHsKKyAgICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oaWQpOworICAgICAgfQorICAgICAgQmxvYkJhc2VkQ29uZmlnIGNmZyA9IG5ldyBCbG9iQmFzZWRDb25maWcobnVsbCwgZ2l0LCBvYmpJZCk7CisgICAgICByZXR1cm4gbmV3IERhc2hib2FyZFJlc291cmNlKG15Q3RsLCByZWYsIHBhdGgsIGNmZywgZmFsc2UpOworICAgIH0gZmluYWxseSB7CisgICAgICBnaXQuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIER5bmFtaWNNYXA8UmVzdFZpZXc8RGFzaGJvYXJkUmVzb3VyY2U+PiB2aWV3cygpIHsKKyAgICByZXR1cm4gdmlld3M7CisgIH0KKworICBzdGF0aWMgRGFzaGJvYXJkSW5mbyBwYXJzZShQcm9qZWN0IGRlZmluaW5nUHJvamVjdCwgU3RyaW5nIHJlZk5hbWUsCisgICAgICBTdHJpbmcgcGF0aCwgQ29uZmlnIGNvbmZpZywgU3RyaW5nIHByb2plY3QsIGJvb2xlYW4gc2V0RGVmYXVsdCkKKyAgICAgIHRocm93cyBVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHsKKyAgICBEYXNoYm9hcmRJbmZvIGluZm8gPSBuZXcgRGFzaGJvYXJkSW5mbyhyZWZOYW1lLCBwYXRoKTsKKyAgICBpbmZvLnByb2plY3QgPSBwcm9qZWN0OworICAgIGluZm8uZGVmaW5pbmdQcm9qZWN0ID0gZGVmaW5pbmdQcm9qZWN0LmdldE5hbWUoKTsKKyAgICBpbmZvLnRpdGxlID0gcmVwbGFjZShwcm9qZWN0LCBjb25maWcuZ2V0U3RyaW5nKCJkYXNoYm9hcmQiLCBudWxsLCAidGl0bGUiKSk7CisgICAgaW5mby5kZXNjcmlwdGlvbiA9IHJlcGxhY2UocHJvamVjdCwgY29uZmlnLmdldFN0cmluZygiZGFzaGJvYXJkIiwgbnVsbCwgImRlc2NyaXB0aW9uIikpOworICAgIGluZm8uZm9yZWFjaCA9IGNvbmZpZy5nZXRTdHJpbmcoImRhc2hib2FyZCIsIG51bGwsICJmb3JlYWNoIik7CisKKyAgICBpZiAoc2V0RGVmYXVsdCkgeworICAgICAgU3RyaW5nIGlkID0gcmVmTmFtZSArICI6IiArIHBhdGg7CisgICAgICBpbmZvLmlzRGVmYXVsdCA9IGlkLmVxdWFscyhkZWZhdWx0T2YoZGVmaW5pbmdQcm9qZWN0KSkgPyB0cnVlIDogbnVsbDsKKyAgICB9CisKKyAgICBVcmxFbmNvZGVkIHUgPSBuZXcgVXJsRW5jb2RlZCgiL2Rhc2hib2FyZC8iKTsKKyAgICB1LnB1dCgidGl0bGUiLCBPYmplY3RzLmZpcnN0Tm9uTnVsbChpbmZvLnRpdGxlLCBpbmZvLnBhdGgpKTsKKyAgICBpZiAoaW5mby5mb3JlYWNoICE9IG51bGwpIHsKKyAgICAgIHUucHV0KCJmb3JlYWNoIiwgcmVwbGFjZShwcm9qZWN0LCBpbmZvLmZvcmVhY2gpKTsKKyAgICB9CisgICAgZm9yIChTdHJpbmcgbmFtZSA6IGNvbmZpZy5nZXRTdWJzZWN0aW9ucygic2VjdGlvbiIpKSB7CisgICAgICBTZWN0aW9uIHMgPSBuZXcgU2VjdGlvbigpOworICAgICAgcy5uYW1lID0gbmFtZTsKKyAgICAgIHMucXVlcnkgPSBjb25maWcuZ2V0U3RyaW5nKCJzZWN0aW9uIiwgbmFtZSwgInF1ZXJ5Iik7CisgICAgICB1LnB1dChzLm5hbWUsIHJlcGxhY2UocHJvamVjdCwgcy5xdWVyeSkpOworICAgICAgaW5mby5zZWN0aW9ucy5hZGQocyk7CisgICAgfQorICAgIGluZm8udXJsID0gdS50b1N0cmluZygpLnJlcGxhY2UoIiUzQSIsICI6Iik7CisKKyAgICByZXR1cm4gaW5mbzsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyByZXBsYWNlKFN0cmluZyBwcm9qZWN0LCBTdHJpbmcgcXVlcnkpIHsKKyAgICByZXR1cm4gcXVlcnkucmVwbGFjZSgiJHtwcm9qZWN0fSIsIHByb2plY3QpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGRlZmF1bHRPZihQcm9qZWN0IHByb2opIHsKKyAgICBmaW5hbCBTdHJpbmcgZGVmYXVsdElkID0gT2JqZWN0cy5maXJzdE5vbk51bGwoCisgICAgICAgIHByb2ouZ2V0TG9jYWxEZWZhdWx0RGFzaGJvYXJkKCksCisgICAgICAgIFN0cmluZ3MubnVsbFRvRW1wdHkocHJvai5nZXREZWZhdWx0RGFzaGJvYXJkKCkpKTsKKyAgICBpZiAoZGVmYXVsdElkLnN0YXJ0c1dpdGgoUkVGU19EQVNIQk9BUkRTKSkgeworICAgICAgcmV0dXJuIGRlZmF1bHRJZC5zdWJzdHJpbmcoUkVGU19EQVNIQk9BUkRTLmxlbmd0aCgpKTsKKyAgICB9IGVsc2UgeworICAgICAgcmV0dXJuIGRlZmF1bHRJZDsKKyAgICB9CisgIH0KKworICBzdGF0aWMgY2xhc3MgRGFzaGJvYXJkSW5mbyB7CisgICAgZmluYWwgU3RyaW5nIGtpbmQgPSAiZ2Vycml0Y29kZXJldmlldyNkYXNoYm9hcmQiOworICAgIFN0cmluZyBpZDsKKyAgICBTdHJpbmcgcHJvamVjdDsKKyAgICBTdHJpbmcgZGVmaW5pbmdQcm9qZWN0OworICAgIFN0cmluZyByZWY7CisgICAgU3RyaW5nIHBhdGg7CisgICAgU3RyaW5nIGRlc2NyaXB0aW9uOworICAgIFN0cmluZyBmb3JlYWNoOworICAgIFN0cmluZyB1cmw7CisKKyAgICBAU2VyaWFsaXplZE5hbWUoImRlZmF1bHQiKQorICAgIEJvb2xlYW4gaXNEZWZhdWx0OworCisgICAgU3RyaW5nIHRpdGxlOworICAgIExpc3Q8U2VjdGlvbj4gc2VjdGlvbnMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKworICAgIERhc2hib2FyZEluZm8oU3RyaW5nIHJlZiwgU3RyaW5nIG5hbWUpCisgICAgICAgIHRocm93cyBVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHsKKyAgICAgIHRoaXMucmVmID0gcmVmOworICAgICAgdGhpcy5wYXRoID0gbmFtZTsKKyAgICAgIHRoaXMuaWQgPSBKb2luZXIub24oJzonKS5qb2luKFVybC5lbmNvZGUocmVmKSwgVXJsLmVuY29kZShwYXRoKSk7CisgICAgfQorICB9CisKKyAgc3RhdGljIGNsYXNzIFNlY3Rpb24geworICAgIFN0cmluZyBuYW1lOworICAgIFN0cmluZyBxdWVyeTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0RlbGV0ZURhc2hib2FyZC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0RlbGV0ZURhc2hib2FyZC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRhMWU0NmIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvRGVsZXRlRGFzaGJvYXJkLmphdmEKQEAgLTAsMCArMSw1MSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLk1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkRlbGV0ZURhc2hib2FyZC5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK2NsYXNzIERlbGV0ZURhc2hib2FyZCBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PERhc2hib2FyZFJlc291cmNlLCBJbnB1dD4geworICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIFN0cmluZyBjb21taXRNZXNzYWdlOworICB9CisKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTZXREZWZhdWx0RGFzaGJvYXJkPiBkZWZhdWx0U2V0dGVyOworCisgIEBJbmplY3QKKyAgRGVsZXRlRGFzaGJvYXJkKFByb3ZpZGVyPFNldERlZmF1bHREYXNoYm9hcmQ+IGRlZmF1bHRTZXR0ZXIpIHsKKyAgICB0aGlzLmRlZmF1bHRTZXR0ZXIgPSBkZWZhdWx0U2V0dGVyOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoRGFzaGJvYXJkUmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgdGhyb3dzIEF1dGhFeGNlcHRpb24sIEJhZFJlcXVlc3RFeGNlcHRpb24sIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24sCisgICAgICBFeGNlcHRpb24geworICAgIGlmIChyZXNvdXJjZS5pc1Byb2plY3REZWZhdWx0KCkpIHsKKyAgICAgIFNldERhc2hib2FyZC5JbnB1dCBpbiA9IG5ldyBTZXREYXNoYm9hcmQuSW5wdXQoKTsKKyAgICAgIGluLmNvbW1pdE1lc3NhZ2UgPSBpbnB1dCAhPSBudWxsID8gaW5wdXQuY29tbWl0TWVzc2FnZSA6IG51bGw7CisgICAgICByZXR1cm4gZGVmYXVsdFNldHRlci5nZXQoKS5hcHBseShyZXNvdXJjZSwgaW4pOworICAgIH0KKworICAgIC8vIFRPRE86IEltcGxlbWVudCBkZWxldGUgb2YgZGFzaGJvYXJkcyBieSBBUEkuCisgICAgdGhyb3cgbmV3IE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24oKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dhcmJhZ2VDb2xsZWN0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvR2FyYmFnZUNvbGxlY3QuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kNGQ5MjNlCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dhcmJhZ2VDb2xsZWN0LmphdmEKQEAgLTAsMCArMSw5MyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5DaGFyc2V0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HYXJiYWdlQ29sbGVjdGlvblJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUmVxdWlyZXNDYXBhYmlsaXR5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuU3RyZWFtaW5nUmVzcG9uc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HYXJiYWdlQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5HYXJiYWdlQ29sbGVjdC5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtOworaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtV3JpdGVyOworaW1wb3J0IGphdmEuaW8uUHJpbnRXcml0ZXI7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworCitAUmVxdWlyZXNDYXBhYmlsaXR5KEdsb2JhbENhcGFiaWxpdHkuUlVOX0dDKQorcHVibGljIGNsYXNzIEdhcmJhZ2VDb2xsZWN0IGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8UHJvamVjdFJlc291cmNlLCBJbnB1dD4geworICBwdWJsaWMgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgfQorCisgIHByaXZhdGUgR2FyYmFnZUNvbGxlY3Rpb24uRmFjdG9yeSBnYXJiYWdlQ29sbGVjdGlvbkZhY3Rvcnk7CisKKyAgQEluamVjdAorICBHYXJiYWdlQ29sbGVjdChHYXJiYWdlQ29sbGVjdGlvbi5GYWN0b3J5IGdhcmJhZ2VDb2xsZWN0aW9uRmFjdG9yeSkgeworICAgIHRoaXMuZ2FyYmFnZUNvbGxlY3Rpb25GYWN0b3J5ID0gZ2FyYmFnZUNvbGxlY3Rpb25GYWN0b3J5OworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJlYW1pbmdSZXNwb25zZSBhcHBseShmaW5hbCBQcm9qZWN0UmVzb3VyY2UgcnNyYywgSW5wdXQgaW5wdXQpIHsKKyAgICByZXR1cm4gbmV3IFN0cmVhbWluZ1Jlc3BvbnNlKCkgeworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgU3RyaW5nIGdldENvbnRlbnRUeXBlKCkgeworICAgICAgICByZXR1cm4gInRleHQvcGxhaW47Y2hhcnNldD1VVEYtOCI7CisgICAgICB9CisKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgc3RyZWFtKE91dHB1dFN0cmVhbSBvdXQpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgICAgIFByaW50V3JpdGVyIHdyaXRlciA9IG5ldyBQcmludFdyaXRlcigKKyAgICAgICAgICAgIG5ldyBPdXRwdXRTdHJlYW1Xcml0ZXIob3V0LCBDaGFyc2V0cy5VVEZfOCkpIHsKKyAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICBwdWJsaWMgdm9pZCBwcmludGxuKCkgeworICAgICAgICAgICAgd3JpdGUoJ1xuJyk7CisgICAgICAgICAgfQorICAgICAgICB9OworICAgICAgICB0cnkgeworICAgICAgICAgIEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0IHJlc3VsdCA9IGdhcmJhZ2VDb2xsZWN0aW9uRmFjdG9yeS5jcmVhdGUoKS5ydW4oCisgICAgICAgICAgICAgIENvbGxlY3Rpb25zLnNpbmdsZXRvbkxpc3QocnNyYy5nZXROYW1lS2V5KCkpLCB3cml0ZXIpOworICAgICAgICAgIGlmIChyZXN1bHQuaGFzRXJyb3JzKCkpIHsKKyAgICAgICAgICAgIGZvciAoR2FyYmFnZUNvbGxlY3Rpb25SZXN1bHQuRXJyb3IgZSA6IHJlc3VsdC5nZXRFcnJvcnMoKSkgeworICAgICAgICAgICAgICBTdHJpbmcgbXNnOworICAgICAgICAgICAgICBzd2l0Y2ggKGUuZ2V0VHlwZSgpKSB7CisgICAgICAgICAgICAgICAgY2FzZSBSRVBPU0lUT1JZX05PVF9GT1VORDoKKyAgICAgICAgICAgICAgICAgIG1zZyA9ICJlcnJvcjogcHJvamVjdCBcIiIgKyBlLmdldFByb2plY3ROYW1lKCkgKyAiXCIgbm90IGZvdW5kIjsKKyAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGNhc2UgR0NfQUxSRUFEWV9TQ0hFRFVMRUQ6CisgICAgICAgICAgICAgICAgICBtc2cgPSAiZXJyb3I6IGdhcmJhZ2UgY29sbGVjdGlvbiBmb3IgcHJvamVjdCBcIiIKKyAgICAgICAgICAgICAgICAgICAgICArIGUuZ2V0UHJvamVjdE5hbWUoKSArICJcIiB3YXMgYWxyZWFkeSBzY2hlZHVsZWQiOworICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgY2FzZSBHQ19GQUlMRUQ6CisgICAgICAgICAgICAgICAgICBtc2cgPSAiZXJyb3I6IGdhcmJhZ2UgY29sbGVjdGlvbiBmb3IgcHJvamVjdCBcIiIgKyBlLmdldFByb2plY3ROYW1lKCkKKyAgICAgICAgICAgICAgICAgICAgICArICJcIiBmYWlsZWQiOworICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgIG1zZyA9ICJlcnJvcjogZ2FyYmFnZSBjb2xsZWN0aW9uIGZvciBwcm9qZWN0IFwiIiArIGUuZ2V0UHJvamVjdE5hbWUoKQorICAgICAgICAgICAgICAgICAgICAgICsgIlwiIGZhaWxlZDogIiArIGUuZ2V0VHlwZSgpOworICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIHdyaXRlci5wcmludGxuKG1zZyk7CisgICAgICAgICAgICB9CisgICAgICAgICAgfQorICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAgIHdyaXRlci5mbHVzaCgpOworICAgICAgICB9CisgICAgICB9CisgICAgfTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dldERhc2hib2FyZC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dldERhc2hib2FyZC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUxZDYxOTEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvR2V0RGFzaGJvYXJkLmphdmEKQEAgLTAsMCArMSwxMDQgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRlNfREFTSEJPQVJEUzsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3BsaXR0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLklkU3RyaW5nOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5EYXNoYm9hcmRzQ29sbGVjdGlvbi5EYXNoYm9hcmRJbmZvOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLkNvbmZpZ0ludmFsaWRFeGNlcHRpb247CitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK2NsYXNzIEdldERhc2hib2FyZCBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxEYXNoYm9hcmRSZXNvdXJjZT4geworICBwcml2YXRlIGZpbmFsIERhc2hib2FyZHNDb2xsZWN0aW9uIGRhc2hib2FyZHM7CisKKyAgQE9wdGlvbihuYW1lID0gIi0taW5oZXJpdGVkIiwgdXNhZ2UgPSAiaW5jbHVkZSBpbmhlcml0ZWQgZGFzaGJvYXJkcyIpCisgIHByaXZhdGUgYm9vbGVhbiBpbmhlcml0ZWQ7CisKKyAgQEluamVjdAorICBHZXREYXNoYm9hcmQoRGFzaGJvYXJkc0NvbGxlY3Rpb24gZGFzaGJvYXJkcykgeworICAgIHRoaXMuZGFzaGJvYXJkcyA9IGRhc2hib2FyZHM7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIERhc2hib2FyZEluZm8gYXBwbHkoRGFzaGJvYXJkUmVzb3VyY2UgcmVzb3VyY2UpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sIENvbmZpZ0ludmFsaWRFeGNlcHRpb24geworICAgIGlmIChpbmhlcml0ZWQgJiYgIXJlc291cmNlLmlzUHJvamVjdERlZmF1bHQoKSkgeworICAgICAgLy8gaW5oZXJpdGVkIGZsYWcgY2FuIG9ubHkgYmUgdXNlZCB3aXRoIGRlZmF1bHQuCisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbigiaW5oZXJpdGVkIik7CisgICAgfQorCisgICAgU3RyaW5nIHByb2plY3QgPSByZXNvdXJjZS5nZXRDb250cm9sKCkuZ2V0UHJvamVjdCgpLmdldE5hbWUoKTsKKyAgICBpZiAocmVzb3VyY2UuaXNQcm9qZWN0RGVmYXVsdCgpKSB7CisgICAgICAvLyBUaGUgZGVmYXVsdCBpcyBub3QgcmVzb2x2ZWQgdG8gYSBkZWZpbml0aW9uIHlldC4KKyAgICAgIHJlc291cmNlID0gZGVmYXVsdE9mKHJlc291cmNlLmdldENvbnRyb2woKSk7CisgICAgfQorCisgICAgcmV0dXJuIERhc2hib2FyZHNDb2xsZWN0aW9uLnBhcnNlKAorICAgICAgICByZXNvdXJjZS5nZXRDb250cm9sKCkuZ2V0UHJvamVjdCgpLAorICAgICAgICByZXNvdXJjZS5nZXRSZWZOYW1lKCkuc3Vic3RyaW5nKFJFRlNfREFTSEJPQVJEUy5sZW5ndGgoKSksCisgICAgICAgIHJlc291cmNlLmdldFBhdGhOYW1lKCksCisgICAgICAgIHJlc291cmNlLmdldENvbmZpZygpLAorICAgICAgICBwcm9qZWN0LAorICAgICAgICB0cnVlKTsKKyAgfQorCisgIHByaXZhdGUgRGFzaGJvYXJkUmVzb3VyY2UgZGVmYXVsdE9mKFByb2plY3RDb250cm9sIGN0bCkKKyAgICAgIHRocm93cyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiwgQ29uZmlnSW52YWxpZEV4Y2VwdGlvbiB7CisgICAgU3RyaW5nIGlkID0gY3RsLmdldFByb2plY3QoKS5nZXRMb2NhbERlZmF1bHREYXNoYm9hcmQoKTsKKyAgICBpZiAoU3RyaW5ncy5pc051bGxPckVtcHR5KGlkKSkgeworICAgICAgaWQgPSBjdGwuZ2V0UHJvamVjdCgpLmdldERlZmF1bHREYXNoYm9hcmQoKTsKKyAgICB9CisgICAgaWYgKCJkZWZhdWx0Ii5lcXVhbHMoaWQpKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbigpOworICAgIH0gZWxzZSBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShpZCkpIHsKKyAgICAgIHJldHVybiBwYXJzZShjdGwsIGlkKTsKKyAgICB9IGVsc2UgaWYgKCFpbmhlcml0ZWQpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKCk7CisgICAgfQorCisgICAgZm9yIChQcm9qZWN0U3RhdGUgcHMgOiBjdGwuZ2V0UHJvamVjdFN0YXRlKCkudHJlZSgpKSB7CisgICAgICBpZCA9IHBzLmdldFByb2plY3QoKS5nZXREZWZhdWx0RGFzaGJvYXJkKCk7CisgICAgICBpZiAoImRlZmF1bHQiLmVxdWFscyhpZCkpIHsKKyAgICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oKTsKKyAgICAgIH0gZWxzZSBpZiAoIVN0cmluZ3MuaXNOdWxsT3JFbXB0eShpZCkpIHsKKyAgICAgICAgY3RsID0gcHMuY29udHJvbEZvcihjdGwuZ2V0Q3VycmVudFVzZXIoKSk7CisgICAgICAgIHJldHVybiBwYXJzZShjdGwsIGlkKTsKKyAgICAgIH0KKyAgICB9CisgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oKTsKKyAgfQorCisgIHByaXZhdGUgRGFzaGJvYXJkUmVzb3VyY2UgcGFyc2UoUHJvamVjdENvbnRyb2wgY3RsLCBTdHJpbmcgaWQpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24sIENvbmZpZ0ludmFsaWRFeGNlcHRpb24geworICAgIExpc3Q8U3RyaW5nPiBwID0gTGlzdHMubmV3QXJyYXlMaXN0KFNwbGl0dGVyLm9uKCc6JykubGltaXQoMikuc3BsaXQoaWQpKTsKKyAgICBTdHJpbmcgcmVmID0gVXJsLmVuY29kZShwLmdldCgwKSk7CisgICAgU3RyaW5nIHBhdGggPSBVcmwuZW5jb2RlKHAuZ2V0KDEpKTsKKyAgICByZXR1cm4gZGFzaGJvYXJkcy5wYXJzZSgKKyAgICAgICAgbmV3IFByb2plY3RSZXNvdXJjZShjdGwpLAorICAgICAgICBJZFN0cmluZy5mcm9tVXJsKHJlZiArICc6JyArIHBhdGgpKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dldERlc2NyaXB0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvR2V0RGVzY3JpcHRpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kOGZhYmFiCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dldERlc2NyaXB0aW9uLmphdmEKQEAgLTAsMCArMSwyNyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CisKK2NsYXNzIEdldERlc2NyaXB0aW9uIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PFByb2plY3RSZXNvdXJjZT4geworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShQcm9qZWN0UmVzb3VyY2UgcmVzb3VyY2UpIHsKKyAgICBQcm9qZWN0IHByb2plY3QgPSByZXNvdXJjZS5nZXRDb250cm9sKCkuZ2V0UHJvamVjdCgpOworICAgIHJldHVybiBTdHJpbmdzLm51bGxUb0VtcHR5KHByb2plY3QuZ2V0RGVzY3JpcHRpb24oKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9HZXRIZWFkLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvR2V0SGVhZC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmVhMzlmNzMKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvR2V0SGVhZC5qYXZhCkBAIC0wLDAgKzEsNjkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmF1dGguQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitwdWJsaWMgY2xhc3MgR2V0SGVhZCBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxQcm9qZWN0UmVzb3VyY2U+IHsKKworICBwcml2YXRlIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyOworCisgIEBJbmplY3QKKyAgR2V0SGVhZChHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcikgeworICAgIHRoaXMucmVwb01hbmFnZXIgPSByZXBvTWFuYWdlcjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGFwcGx5KFByb2plY3RSZXNvdXJjZSByc3JjKSB0aHJvd3MgQXV0aEV4Y2VwdGlvbiwKKyAgICAgIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKyAgICBSZXBvc2l0b3J5IHJlcG8gPSBudWxsOworICAgIHRyeSB7CisgICAgICByZXBvID0gcmVwb01hbmFnZXIub3BlblJlcG9zaXRvcnkocnNyYy5nZXROYW1lS2V5KCkpOworICAgICAgUmVmIGhlYWQgPSByZXBvLmdldFJlZihDb25zdGFudHMuSEVBRCk7CisgICAgICBpZiAoaGVhZCA9PSBudWxsKSB7CisgICAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKENvbnN0YW50cy5IRUFEKTsKKyAgICAgIH0gZWxzZSBpZiAoaGVhZC5pc1N5bWJvbGljKCkpIHsKKyAgICAgICAgU3RyaW5nIG4gPSBoZWFkLmdldFRhcmdldCgpLmdldE5hbWUoKTsKKyAgICAgICAgaWYgKHJzcmMuZ2V0Q29udHJvbCgpLmNvbnRyb2xGb3JSZWYobikuaXNWaXNpYmxlKCkpIHsKKyAgICAgICAgICByZXR1cm4gbjsKKyAgICAgICAgfQorICAgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbigpOworICAgICAgfSBlbHNlIGlmIChoZWFkLmdldE9iamVjdElkKCkgIT0gbnVsbCkgeworICAgICAgICBpZiAocnNyYy5nZXRDb250cm9sKCkuaXNPd25lcigpKSB7CisgICAgICAgICAgcmV0dXJuIGhlYWQuZ2V0T2JqZWN0SWQoKS5uYW1lKCk7CisgICAgICAgIH0KKyAgICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oKTsKKyAgICAgIH0KKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKENvbnN0YW50cy5IRUFEKTsKKyAgICB9IGNhdGNoIChSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24ocnNyYy5nZXROYW1lKCkpOworICAgIH0gZmluYWxseSB7CisgICAgICBpZiAocmVwbyAhPSBudWxsKSB7CisgICAgICAgIHJlcG8uY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9HZXRQYXJlbnQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9HZXRQYXJlbnQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xY2ViZDg3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dldFBhcmVudC5qYXZhCkBAIC0wLDAgKzEsMzYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BbGxQcm9qZWN0c05hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitjbGFzcyBHZXRQYXJlbnQgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8UHJvamVjdFJlc291cmNlPiB7CisgIHByaXZhdGUgZmluYWwgQWxsUHJvamVjdHNOYW1lIGFsbFByb2plY3RzTmFtZTsKKworICBASW5qZWN0CisgIEdldFBhcmVudChBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lKSB7CisgICAgdGhpcy5hbGxQcm9qZWN0c05hbWUgPSBhbGxQcm9qZWN0c05hbWU7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShQcm9qZWN0UmVzb3VyY2UgcmVzb3VyY2UpIHsKKyAgICBQcm9qZWN0IHByb2plY3QgPSByZXNvdXJjZS5nZXRDb250cm9sKCkuZ2V0UHJvamVjdCgpOworICAgIFByb2plY3QuTmFtZUtleSBwYXJlbnROYW1lID0gcHJvamVjdC5nZXRQYXJlbnQoYWxsUHJvamVjdHNOYW1lKTsKKyAgICByZXR1cm4gcGFyZW50TmFtZSAhPSBudWxsID8gcGFyZW50TmFtZS5nZXQoKSA6ICIiOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvR2V0UHJvamVjdC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dldFByb2plY3QuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hNDgyMjc4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0dldFByb2plY3QuamF2YQpAQCAtMCwwICsxLDMzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdFJlYWRWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworY2xhc3MgR2V0UHJvamVjdCBpbXBsZW1lbnRzIFJlc3RSZWFkVmlldzxQcm9qZWN0UmVzb3VyY2U+IHsKKworICBwcml2YXRlIGZpbmFsIFByb2plY3RKc29uIGpzb247CisKKyAgQEluamVjdAorICBHZXRQcm9qZWN0KFByb2plY3RKc29uIGpzb24pIHsKKyAgICB0aGlzLmpzb24gPSBqc29uOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoUHJvamVjdFJlc291cmNlIHJzcmMpIHsKKyAgICByZXR1cm4ganNvbi5mb3JtYXQocnNyYyk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9HZXRTdGF0aXN0aWNzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvR2V0U3RhdGlzdGljcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU0OGI4NWEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvR2V0U3RhdGlzdGljcy5qYXZhCkBAIC0wLDAgKzEsNjIgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuYXBpLkdhcmJhZ2VDb2xsZWN0Q29tbWFuZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmFwaS5HaXQ7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5hcGkuZXJyb3JzLkdpdEFQSUV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmFwaS5lcnJvcnMuSkdpdEludGVybmFsRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitAUmVxdWlyZXNDYXBhYmlsaXR5KEdsb2JhbENhcGFiaWxpdHkuUlVOX0dDKQorcHVibGljIGNsYXNzIEdldFN0YXRpc3RpY3MgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8UHJvamVjdFJlc291cmNlPiB7CisKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcjsKKworICBASW5qZWN0CisgIEdldFN0YXRpc3RpY3MoR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXIpIHsKKyAgICB0aGlzLnJlcG9NYW5hZ2VyID0gcmVwb01hbmFnZXI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFJlcG9zaXRvcnlTdGF0aXN0aWNzIGFwcGx5KFByb2plY3RSZXNvdXJjZSByc3JjKQorICAgICAgdGhyb3dzIFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24sIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24geworICAgIHRyeSB7CisgICAgICBSZXBvc2l0b3J5IHJlcG8gPSByZXBvTWFuYWdlci5vcGVuUmVwb3NpdG9yeShyc3JjLmdldE5hbWVLZXkoKSk7CisgICAgICB0cnkgeworICAgICAgICBHYXJiYWdlQ29sbGVjdENvbW1hbmQgZ2MgPSBHaXQud3JhcChyZXBvKS5nYygpOworICAgICAgICByZXR1cm4gbmV3IFJlcG9zaXRvcnlTdGF0aXN0aWNzKGdjLmdldFN0YXRpc3RpY3MoKSk7CisgICAgICB9IGNhdGNoIChHaXRBUElFeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgICB9IGNhdGNoIChKR2l0SW50ZXJuYWxFeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgICB9IGZpbmFsbHkgeworICAgICAgICByZXBvLmNsb3NlKCk7CisgICAgICB9CisgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24ocnNyYy5nZXROYW1lKCkpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0xpc3REYXNoYm9hcmRzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvTGlzdERhc2hib2FyZHMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMDYzNjE4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0xpc3REYXNoYm9hcmRzLmphdmEKQEAgLTAsMCArMSwxNDEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRlNfREFTSEJPQVJEUzsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkRhc2hib2FyZHNDb2xsZWN0aW9uLkRhc2hib2FyZEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuQ29uZmlnSW52YWxpZEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5SZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQmxvYkJhc2VkQ29uZmlnOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkZpbGVNb2RlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlZjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZXYWxrOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudHJlZXdhbGsuVHJlZVdhbGs7CitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworY2xhc3MgTGlzdERhc2hib2FyZHMgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8UHJvamVjdFJlc291cmNlPiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPSBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihEYXNoYm9hcmRzQ29sbGVjdGlvbi5jbGFzcyk7CisKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNYW5hZ2VyOworCisgIEBPcHRpb24obmFtZSA9ICItLWluaGVyaXRlZCIsIHVzYWdlID0gImluY2x1ZGUgaW5oZXJpdGVkIGRhc2hib2FyZHMiKQorICBwcml2YXRlIGJvb2xlYW4gaW5oZXJpdGVkOworCisgIEBJbmplY3QKKyAgTGlzdERhc2hib2FyZHMoR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWFuYWdlcikgeworICAgIHRoaXMuZ2l0TWFuYWdlciA9IGdpdE1hbmFnZXI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShQcm9qZWN0UmVzb3VyY2UgcmVzb3VyY2UpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIFByb2plY3RDb250cm9sIGN0bCA9IHJlc291cmNlLmdldENvbnRyb2woKTsKKyAgICBTdHJpbmcgcHJvamVjdCA9IGN0bC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworICAgIGlmICghaW5oZXJpdGVkKSB7CisgICAgICByZXR1cm4gc2NhbihyZXNvdXJjZS5nZXRDb250cm9sKCksIHByb2plY3QsIHRydWUpOworICAgIH0KKworICAgIExpc3Q8TGlzdDxEYXNoYm9hcmRJbmZvPj4gYWxsID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgYm9vbGVhbiBzZXREZWZhdWx0ID0gdHJ1ZTsKKyAgICBmb3IgKFByb2plY3RTdGF0ZSBwcyA6IGN0bC5nZXRQcm9qZWN0U3RhdGUoKS50cmVlKCkpIHsKKyAgICAgIGN0bCA9IHBzLmNvbnRyb2xGb3IoY3RsLmdldEN1cnJlbnRVc2VyKCkpOworICAgICAgaWYgKGN0bC5pc1Zpc2libGUoKSkgeworICAgICAgICBMaXN0PERhc2hib2FyZEluZm8+IGxpc3QgPSBzY2FuKGN0bCwgcHJvamVjdCwgc2V0RGVmYXVsdCk7CisgICAgICAgIGZvciAoRGFzaGJvYXJkSW5mbyBkIDogbGlzdCkgeworICAgICAgICAgIGlmIChkLmlzRGVmYXVsdCAhPSBudWxsICYmIEJvb2xlYW4uVFJVRS5lcXVhbHMoZC5pc0RlZmF1bHQpKSB7CisgICAgICAgICAgICBzZXREZWZhdWx0ID0gZmFsc2U7CisgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGlmICghbGlzdC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICBhbGwuYWRkKGxpc3QpOworICAgICAgICB9CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBhbGw7CisgIH0KKworICBwcml2YXRlIExpc3Q8RGFzaGJvYXJkSW5mbz4gc2NhbihQcm9qZWN0Q29udHJvbCBjdGwsIFN0cmluZyBwcm9qZWN0LAorICAgICAgYm9vbGVhbiBzZXREZWZhdWx0KSB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIFJlcG9zaXRvcnkgZ2l0OworICAgIHRyeSB7CisgICAgICBnaXQgPSBnaXRNYW5hZ2VyLm9wZW5SZXBvc2l0b3J5KGN0bC5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpKTsKKyAgICB9IGNhdGNoIChSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24oKTsKKyAgICB9CisgICAgdHJ5IHsKKyAgICAgIFJldldhbGsgcncgPSBuZXcgUmV2V2FsayhnaXQpOworICAgICAgdHJ5IHsKKyAgICAgICAgTGlzdDxEYXNoYm9hcmRJbmZvPiBhbGwgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgICAgICAgZm9yIChSZWYgcmVmIDogZ2l0LmdldFJlZkRhdGFiYXNlKCkuZ2V0UmVmcyhSRUZTX0RBU0hCT0FSRFMpLnZhbHVlcygpKSB7CisgICAgICAgICAgaWYgKGN0bC5jb250cm9sRm9yUmVmKHJlZi5nZXROYW1lKCkpLmNhblJlYWQoKSkgeworICAgICAgICAgICAgYWxsLmFkZEFsbChzY2FuRGFzaGJvYXJkcyhjdGwuZ2V0UHJvamVjdCgpLCBnaXQsIHJ3LCByZWYsCisgICAgICAgICAgICAgICAgcHJvamVjdCwgc2V0RGVmYXVsdCkpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICByZXR1cm4gYWxsOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgcncucmVsZWFzZSgpOworICAgICAgfQorICAgIH0gZmluYWxseSB7CisgICAgICBnaXQuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIExpc3Q8RGFzaGJvYXJkSW5mbz4gc2NhbkRhc2hib2FyZHMoUHJvamVjdCBkZWZpbmluZ1Byb2plY3QsCisgICAgICBSZXBvc2l0b3J5IGdpdCwgUmV2V2FsayBydywgUmVmIHJlZiwgU3RyaW5nIHByb2plY3QsIGJvb2xlYW4gc2V0RGVmYXVsdCkKKyAgICAgIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgTGlzdDxEYXNoYm9hcmRJbmZvPiBsaXN0ID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgVHJlZVdhbGsgdHcgPSBuZXcgVHJlZVdhbGsocncuZ2V0T2JqZWN0UmVhZGVyKCkpOworICAgIHRyeSB7CisgICAgICB0dy5hZGRUcmVlKHJ3LnBhcnNlVHJlZShyZWYuZ2V0T2JqZWN0SWQoKSkpOworICAgICAgdHcuc2V0UmVjdXJzaXZlKHRydWUpOworICAgICAgd2hpbGUgKHR3Lm5leHQoKSkgeworICAgICAgICBpZiAodHcuZ2V0RmlsZU1vZGUoMCkgPT0gRmlsZU1vZGUuUkVHVUxBUl9GSUxFKSB7CisgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIGxpc3QuYWRkKERhc2hib2FyZHNDb2xsZWN0aW9uLnBhcnNlKAorICAgICAgICAgICAgICAgIGRlZmluaW5nUHJvamVjdCwKKyAgICAgICAgICAgICAgICByZWYuZ2V0TmFtZSgpLnN1YnN0cmluZyhSRUZTX0RBU0hCT0FSRFMubGVuZ3RoKCkpLAorICAgICAgICAgICAgICAgIHR3LmdldFBhdGhTdHJpbmcoKSwKKyAgICAgICAgICAgICAgICBuZXcgQmxvYkJhc2VkQ29uZmlnKG51bGwsIGdpdCwgdHcuZ2V0T2JqZWN0SWQoMCkpLAorICAgICAgICAgICAgICAgIHByb2plY3QsCisgICAgICAgICAgICAgICAgc2V0RGVmYXVsdCkpOworICAgICAgICAgIH0gY2F0Y2ggKENvbmZpZ0ludmFsaWRFeGNlcHRpb24gZSkgeworICAgICAgICAgICAgbG9nLndhcm4oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAiQ2Fubm90IHBhcnNlIGRhc2hib2FyZCAlczolczolczogJXMiLAorICAgICAgICAgICAgICAgIGRlZmluaW5nUHJvamVjdC5nZXROYW1lKCksIHJlZi5nZXROYW1lKCksIHR3LmdldFBhdGhTdHJpbmcoKSwKKyAgICAgICAgICAgICAgICBlLmdldE1lc3NhZ2UoKSkpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorICAgIH0gZmluYWxseSB7CisgICAgICB0dy5yZWxlYXNlKCk7CisgICAgfQorICAgIHJldHVybiBsaXN0OworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvTGlzdFByb2plY3RzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvTGlzdFByb2plY3RzLmphdmEKaW5kZXggZTVhMTFjYS4uNTliNTQ0YSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L0xpc3RQcm9qZWN0cy5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9MaXN0UHJvamVjdHMuamF2YQpAQCAtMTQsMTMgKzE0LDI1IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlByZWRpY2F0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JdGVyYWJsZXM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBSZWZlcmVuY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmluYXJ5UmVzdWx0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVhZFZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlRvcExldmVsUmVzb3VyY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5OYW1lS2V5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuT3V0cHV0Rm9ybWF0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5TdHJpbmdVdGlsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdEpzb24uUHJvamVjdEluZm87CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuVHJlZUZvcm1hdHRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdzb24ucmVmbGVjdC5UeXBlVG9rZW47CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwpAQCAtMzQsNiArNDYsNyBAQAogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwogCiBpbXBvcnQgamF2YS5pby5CdWZmZXJlZFdyaXRlcjsKK2ltcG9ydCBqYXZhLmlvLkJ5dGVBcnJheU91dHB1dFN0cmVhbTsKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uT3V0cHV0U3RyZWFtV3JpdGVyOwpAQCAtNDIsNiArNTUsNyBAQAogaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkxvY2FsZTsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiBpbXBvcnQgamF2YS51dGlsLlNvcnRlZFNldDsKQEAgLTQ5LDcgKzYzLDcgQEAKIGltcG9ydCBqYXZhLnV0aWwuVHJlZVNldDsKIAogLyoqIExpc3QgcHJvamVjdHMgdmlzaWJsZSB0byB0aGUgY2FsbGluZyB1c2VyLiAqLwotcHVibGljIGNsYXNzIExpc3RQcm9qZWN0cyB7CitwdWJsaWMgY2xhc3MgTGlzdFByb2plY3RzIGltcGxlbWVudHMgUmVzdFJlYWRWaWV3PFRvcExldmVsUmVzb3VyY2U+IHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKExpc3RQcm9qZWN0cy5jbGFzcyk7CiAKICAgcHVibGljIHN0YXRpYyBlbnVtIEZpbHRlclR5cGUgewpAQCAtODYsNDEgKzEwMCw4MiBAQAogCiAgIHByaXZhdGUgZmluYWwgQ3VycmVudFVzZXIgY3VycmVudFVzZXI7CiAgIHByaXZhdGUgZmluYWwgUHJvamVjdENhY2hlIHByb2plY3RDYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBHcm91cENhY2hlIGdyb3VwQ2FjaGU7CisgIHByaXZhdGUgZmluYWwgR3JvdXBDb250cm9sLkZhY3RvcnkgZ3JvdXBDb250cm9sRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcjsKICAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Tm9kZS5GYWN0b3J5IHByb2plY3ROb2RlRmFjdG9yeTsKIAotICBAT3B0aW9uKG5hbWUgPSAiLS1mb3JtYXQiLCBtZXRhVmFyID0gIkZNVCIsIHVzYWdlID0gIk91dHB1dCBkaXNwbGF5IGZvcm1hdCIpCisgIEBEZXByZWNhdGVkCisgIEBPcHRpb24obmFtZSA9ICItLWZvcm1hdCIsIHVzYWdlID0gIihkZXByZWNhdGVkKSBvdXRwdXQgZm9ybWF0IikKICAgcHJpdmF0ZSBPdXRwdXRGb3JtYXQgZm9ybWF0ID0gT3V0cHV0Rm9ybWF0LlRFWFQ7CiAKICAgQE9wdGlvbihuYW1lID0gIi0tc2hvdy1icmFuY2giLCBhbGlhc2VzID0geyItYiJ9LCBtdWx0aVZhbHVlZCA9IHRydWUsCiAgICAgICB1c2FnZSA9ICJkaXNwbGF5cyB0aGUgc2hhIG9mIGVhY2ggcHJvamVjdCBpbiB0aGUgc3BlY2lmaWVkIGJyYW5jaCIpCi0gIHByaXZhdGUgTGlzdDxTdHJpbmc+IHNob3dCcmFuY2g7CisgIHB1YmxpYyB2b2lkIGFkZFNob3dCcmFuY2goU3RyaW5nIGJyYW5jaCkgeworICAgIHNob3dCcmFuY2guYWRkKGJyYW5jaCk7CisgIH0KIAogICBAT3B0aW9uKG5hbWUgPSAiLS10cmVlIiwgYWxpYXNlcyA9IHsiLXQifSwgdXNhZ2UgPQogICAgICAgImRpc3BsYXlzIHByb2plY3QgaW5oZXJpdGFuY2UgaW4gYSB0cmVlLWxpa2UgZm9ybWF0XG4iCiAgICAgICArICJ0aGlzIG9wdGlvbiBkb2VzIG5vdCB3b3JrIHRvZ2V0aGVyIHdpdGggdGhlIHNob3ctYnJhbmNoIG9wdGlvbiIpCi0gIHByaXZhdGUgYm9vbGVhbiBzaG93VHJlZTsKKyAgcHVibGljIHZvaWQgc2V0U2hvd1RyZWUoYm9vbGVhbiBzaG93VHJlZSkgeworICAgIHRoaXMuc2hvd1RyZWUgPSBzaG93VHJlZTsKKyAgfQogCiAgIEBPcHRpb24obmFtZSA9ICItLXR5cGUiLCB1c2FnZSA9ICJ0eXBlIG9mIHByb2plY3QiKQotICBwcml2YXRlIEZpbHRlclR5cGUgdHlwZSA9IEZpbHRlclR5cGUuQ09ERTsKKyAgcHVibGljIHZvaWQgc2V0RmlsdGVyVHlwZShGaWx0ZXJUeXBlIHR5cGUpIHsKKyAgICB0aGlzLnR5cGUgPSB0eXBlOworICB9CiAKICAgQE9wdGlvbihuYW1lID0gIi0tZGVzY3JpcHRpb24iLCBhbGlhc2VzID0geyItZCJ9LCB1c2FnZSA9ICJpbmNsdWRlIGRlc2NyaXB0aW9uIG9mIHByb2plY3QgaW4gbGlzdCIpCi0gIHByaXZhdGUgYm9vbGVhbiBzaG93RGVzY3JpcHRpb247CisgIHB1YmxpYyB2b2lkIHNldFNob3dEZXNjcmlwdGlvbihib29sZWFuIHNob3dEZXNjcmlwdGlvbikgeworICAgIHRoaXMuc2hvd0Rlc2NyaXB0aW9uID0gc2hvd0Rlc2NyaXB0aW9uOworICB9CiAKICAgQE9wdGlvbihuYW1lID0gIi0tYWxsIiwgdXNhZ2UgPSAiZGlzcGxheSBhbGwgcHJvamVjdHMgdGhhdCBhcmUgYWNjZXNzaWJsZSBieSB0aGUgY2FsbGluZyB1c2VyIikKLSAgcHJpdmF0ZSBib29sZWFuIGFsbDsKKyAgcHVibGljIHZvaWQgc2V0QWxsKGJvb2xlYW4gYWxsKSB7CisgICAgdGhpcy5hbGwgPSBhbGw7CisgIH0KIAogICBAT3B0aW9uKG5hbWUgPSAiLS1saW1pdCIsIGFsaWFzZXMgPSB7Ii1uIn0sIG1ldGFWYXIgPSAiQ05UIiwgdXNhZ2UgPSAibWF4aW11bSBudW1iZXIgb2YgcHJvamVjdHMgdG8gbGlzdCIpCi0gIHByaXZhdGUgaW50IGxpbWl0OworICBwdWJsaWMgdm9pZCBzZXRMaW1pdChpbnQgbGltaXQpIHsKKyAgICB0aGlzLmxpbWl0ID0gbGltaXQ7CisgIH0KIAorICBAT3B0aW9uKG5hbWUgPSAiLXAiLCBtZXRhVmFyID0gIlBSRUZJWCIsIHVzYWdlID0gIm1hdGNoIHByb2plY3QgcHJlZml4IikKKyAgcHVibGljIHZvaWQgc2V0TWF0Y2hQcmVmaXgoU3RyaW5nIG1hdGNoUHJlZml4KSB7CisgICAgdGhpcy5tYXRjaFByZWZpeCA9IG1hdGNoUHJlZml4OworICB9CisKKyAgQE9wdGlvbihuYW1lID0gIi1tIiwgbWV0YVZhciA9ICJNQVRDSCIsIHVzYWdlID0gIm1hdGNoIHByb2plY3Qgc3Vic3RyaW5nIikKKyAgcHVibGljIHZvaWQgc2V0TWF0Y2hTdWJzdHJpbmcoU3RyaW5nIG1hdGNoU3Vic3RyaW5nKSB7CisgICAgdGhpcy5tYXRjaFN1YnN0cmluZyA9IG1hdGNoU3Vic3RyaW5nOworICB9CisKKyAgQE9wdGlvbihuYW1lID0gIi0taGFzLWFjbC1mb3IiLCBtZXRhVmFyID0gIkdST1VQIiwgdXNhZ2UgPQorICAgICAgImRpc3BsYXlzIG9ubHkgcHJvamVjdHMgb24gd2hpY2ggYWNjZXNzIHJpZ2h0cyBmb3IgdGhpcyBncm91cCBhcmUgZGlyZWN0bHkgYXNzaWduZWQiKQorICBwdWJsaWMgdm9pZCBzZXRHcm91cFV1aWQoQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBVdWlkKSB7CisgICAgdGhpcy5ncm91cFV1aWQgPSBncm91cFV1aWQ7CisgIH0KKworICBwcml2YXRlIGZpbmFsIExpc3Q8U3RyaW5nPiBzaG93QnJhbmNoID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgIHByaXZhdGUgYm9vbGVhbiBzaG93VHJlZTsKKyAgcHJpdmF0ZSBGaWx0ZXJUeXBlIHR5cGUgPSBGaWx0ZXJUeXBlLkNPREU7CisgIHByaXZhdGUgYm9vbGVhbiBzaG93RGVzY3JpcHRpb247CisgIHByaXZhdGUgYm9vbGVhbiBhbGw7CisgIHByaXZhdGUgaW50IGxpbWl0OwogICBwcml2YXRlIFN0cmluZyBtYXRjaFByZWZpeDsKKyAgcHJpdmF0ZSBTdHJpbmcgbWF0Y2hTdWJzdHJpbmc7CisgIHByaXZhdGUgQWNjb3VudEdyb3VwLlVVSUQgZ3JvdXBVdWlkOwogCiAgIEBJbmplY3QKICAgcHJvdGVjdGVkIExpc3RQcm9qZWN0cyhDdXJyZW50VXNlciBjdXJyZW50VXNlciwgUHJvamVjdENhY2hlIHByb2plY3RDYWNoZSwKLSAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLAotICAgICAgUHJvamVjdE5vZGUuRmFjdG9yeSBwcm9qZWN0Tm9kZUZhY3RvcnkpIHsKKyAgICAgIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZSwgR3JvdXBDb250cm9sLkZhY3RvcnkgZ3JvdXBDb250cm9sRmFjdG9yeSwKKyAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLCBQcm9qZWN0Tm9kZS5GYWN0b3J5IHByb2plY3ROb2RlRmFjdG9yeSkgewogICAgIHRoaXMuY3VycmVudFVzZXIgPSBjdXJyZW50VXNlcjsKICAgICB0aGlzLnByb2plY3RDYWNoZSA9IHByb2plY3RDYWNoZTsKKyAgICB0aGlzLmdyb3VwQ2FjaGUgPSBncm91cENhY2hlOworICAgIHRoaXMuZ3JvdXBDb250cm9sRmFjdG9yeSA9IGdyb3VwQ29udHJvbEZhY3Rvcnk7CiAgICAgdGhpcy5yZXBvTWFuYWdlciA9IHJlcG9NYW5hZ2VyOwogICAgIHRoaXMucHJvamVjdE5vZGVGYWN0b3J5ID0gcHJvamVjdE5vZGVGYWN0b3J5OwogICB9CkBAIC0xNDIsMjIgKzE5NywzNiBAQAogICB9CiAKICAgcHVibGljIExpc3RQcm9qZWN0cyBzZXRGb3JtYXQoT3V0cHV0Rm9ybWF0IGZtdCkgewotICAgIHRoaXMuZm9ybWF0ID0gZm10OworICAgIGZvcm1hdCA9IGZtdDsKICAgICByZXR1cm4gdGhpczsKICAgfQogCi0gIHB1YmxpYyBMaXN0UHJvamVjdHMgc2V0TWF0Y2hQcmVmaXgoU3RyaW5nIHByZWZpeCkgewotICAgIHRoaXMubWF0Y2hQcmVmaXggPSBwcmVmaXg7Ci0gICAgcmV0dXJuIHRoaXM7CisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KFRvcExldmVsUmVzb3VyY2UgcmVzb3VyY2UpIHsKKyAgICBpZiAoZm9ybWF0ID09IE91dHB1dEZvcm1hdC5URVhUKSB7CisgICAgICBCeXRlQXJyYXlPdXRwdXRTdHJlYW0gYnVmID0gbmV3IEJ5dGVBcnJheU91dHB1dFN0cmVhbSgpOworICAgICAgZGlzcGxheShidWYpOworICAgICAgcmV0dXJuIEJpbmFyeVJlc3VsdC5jcmVhdGUoYnVmLnRvQnl0ZUFycmF5KCkpCisgICAgICAgICAgLnNldENvbnRlbnRUeXBlKCJ0ZXh0L3BsYWluIikKKyAgICAgICAgICAuc2V0Q2hhcmFjdGVyRW5jb2RpbmcoIlVURi04Iik7CisgICAgfQorICAgIHJldHVybiBhcHBseSgpOwogICB9CiAKLSAgcHVibGljIHZvaWQgZGlzcGxheShPdXRwdXRTdHJlYW0gb3V0KSB7Ci0gICAgZmluYWwgUHJpbnRXcml0ZXIgc3Rkb3V0OwotICAgIHRyeSB7Ci0gICAgICBzdGRvdXQgPSBuZXcgUHJpbnRXcml0ZXIobmV3IEJ1ZmZlcmVkV3JpdGVyKG5ldyBPdXRwdXRTdHJlYW1Xcml0ZXIob3V0LCAiVVRGLTgiKSkpOwotICAgIH0gY2F0Y2ggKFVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb24gZSkgewotICAgICAgLy8gT3VyIGVuY29kaW5nIGlzIHJlcXVpcmVkIGJ5IHRoZSBzcGVjaWZpY2F0aW9ucyBmb3IgdGhlIHJ1bnRpbWUuCi0gICAgICB0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbigiSlZNIGxhY2tzIFVURi04IGVuY29kaW5nIiwgZSk7CisgIHB1YmxpYyBNYXA8U3RyaW5nLCBQcm9qZWN0SW5mbz4gYXBwbHkoKSB7CisgICAgZm9ybWF0ID0gT3V0cHV0Rm9ybWF0LkpTT047CisgICAgcmV0dXJuIGRpc3BsYXkobnVsbCk7CisgIH0KKworICBwdWJsaWMgTWFwPFN0cmluZywgUHJvamVjdEluZm8+IGRpc3BsYXkoT3V0cHV0U3RyZWFtIGRpc3BsYXlPdXRwdXRTdHJlYW0pIHsKKyAgICBQcmludFdyaXRlciBzdGRvdXQgPSBudWxsOworICAgIGlmIChkaXNwbGF5T3V0cHV0U3RyZWFtICE9IG51bGwpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIHN0ZG91dCA9IG5ldyBQcmludFdyaXRlcihuZXcgQnVmZmVyZWRXcml0ZXIoCisgICAgICAgICAgICBuZXcgT3V0cHV0U3RyZWFtV3JpdGVyKGRpc3BsYXlPdXRwdXRTdHJlYW0sICJVVEYtOCIpKSk7CisgICAgICB9IGNhdGNoIChVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgdGhyb3cgbmV3IFJ1bnRpbWVFeGNlcHRpb24oIkpWTSBsYWNrcyBVVEYtOCBlbmNvZGluZyIsIGUpOworICAgICAgfQogICAgIH0KIAogICAgIGludCBmb3VuZCA9IDA7CkBAIC0xNzUsMTYgKzI0NCwzMyBAQAogICAgICAgICAgIC8vCiAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KKworICAgICAgICBmaW5hbCBQcm9qZWN0Q29udHJvbCBwY3RsID0gZS5jb250cm9sRm9yKGN1cnJlbnRVc2VyKTsKKyAgICAgICAgaWYgKGdyb3VwVXVpZCAhPSBudWxsKSB7CisgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIGlmICghZ3JvdXBDb250cm9sRmFjdG9yeS5jb250cm9sRm9yKGdyb3VwVXVpZCkuaXNWaXNpYmxlKCkpIHsKKyAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgICAgfSBjYXRjaCAoTm9TdWNoR3JvdXBFeGNlcHRpb24gZXgpIHsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgIH0KKyAgICAgICAgICBpZiAoIXBjdGwuZ2V0TG9jYWxHcm91cHMoKS5jb250YWlucygKKyAgICAgICAgICAgICAgR3JvdXBSZWZlcmVuY2UuZm9yR3JvdXAoZ3JvdXBDYWNoZS5nZXQoZ3JvdXBVdWlkKSkpKSB7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAgICBQcm9qZWN0SW5mbyBpbmZvID0gbmV3IFByb2plY3RJbmZvKCk7CiAgICAgICAgIGlmICh0eXBlID09IEZpbHRlclR5cGUuUEFSRU5UX0NBTkRJREFURVMpIHsKLSAgICAgICAgICBQcm9qZWN0U3RhdGUgcGFyZW50U3RhdGUgPSBlLmdldFBhcmVudFN0YXRlKCk7CisgICAgICAgICAgUHJvamVjdFN0YXRlIHBhcmVudFN0YXRlID0gSXRlcmFibGVzLmdldEZpcnN0KGUucGFyZW50cygpLCBudWxsKTsKICAgICAgICAgICBpZiAocGFyZW50U3RhdGUgIT0gbnVsbAogICAgICAgICAgICAgICAmJiAhb3V0cHV0LmtleVNldCgpLmNvbnRhaW5zKHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXROYW1lKCkpCiAgICAgICAgICAgICAgICYmICFyZWplY3RlZC5jb250YWlucyhwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpKSkgewogICAgICAgICAgICAgUHJvamVjdENvbnRyb2wgcGFyZW50Q3RybCA9IHBhcmVudFN0YXRlLmNvbnRyb2xGb3IoY3VycmVudFVzZXIpOwogICAgICAgICAgICAgaWYgKHBhcmVudEN0cmwuaXNWaXNpYmxlKCkgfHwgcGFyZW50Q3RybC5pc093bmVyKCkpIHsKICAgICAgICAgICAgICAgaW5mby5uYW1lID0gcGFyZW50U3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWUoKTsKLSAgICAgICAgICAgICAgaW5mby5kZXNjcmlwdGlvbiA9IHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXREZXNjcmlwdGlvbigpOworICAgICAgICAgICAgICBpbmZvLmRlc2NyaXB0aW9uID0gU3RyaW5ncy5lbXB0eVRvTnVsbCgKKyAgICAgICAgICAgICAgICAgIHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXREZXNjcmlwdGlvbigpKTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgIHJlamVjdGVkLmFkZChwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpKTsKICAgICAgICAgICAgICAgY29udGludWU7CkBAIC0xOTQsNyArMjgwLDYgQEAKICAgICAgICAgICB9CiAKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICBmaW5hbCBQcm9qZWN0Q29udHJvbCBwY3RsID0gZS5jb250cm9sRm9yKGN1cnJlbnRVc2VyKTsKICAgICAgICAgICBmaW5hbCBib29sZWFuIGlzVmlzaWJsZSA9IHBjdGwuaXNWaXNpYmxlKCkgfHwgKGFsbCAmJiBwY3RsLmlzT3duZXIoKSk7CiAgICAgICAgICAgaWYgKHNob3dUcmVlICYmICFmb3JtYXQuaXNKc29uKCkpIHsKICAgICAgICAgICAgIHRyZWVNYXAucHV0KHByb2plY3ROYW1lLApAQCAtMjEwLDcgKzI5NSw3IEBACiAKICAgICAgICAgICBpbmZvLm5hbWUgPSBwcm9qZWN0TmFtZS5nZXQoKTsKICAgICAgICAgICBpZiAoc2hvd1RyZWUgJiYgZm9ybWF0LmlzSnNvbigpKSB7Ci0gICAgICAgICAgICBQcm9qZWN0U3RhdGUgcGFyZW50ID0gZS5nZXRQYXJlbnRTdGF0ZSgpOworICAgICAgICAgICAgUHJvamVjdFN0YXRlIHBhcmVudCA9IEl0ZXJhYmxlcy5nZXRGaXJzdChlLnBhcmVudHMoKSwgbnVsbCk7CiAgICAgICAgICAgICBpZiAocGFyZW50ICE9IG51bGwpIHsKICAgICAgICAgICAgICAgUHJvamVjdENvbnRyb2wgcGFyZW50Q3RybCA9IHBhcmVudC5jb250cm9sRm9yKGN1cnJlbnRVc2VyKTsKICAgICAgICAgICAgICAgaWYgKHBhcmVudEN0cmwuaXNWaXNpYmxlKCkgfHwgcGFyZW50Q3RybC5pc093bmVyKCkpIHsKQEAgLTIyNCwxMiArMzA5LDEyIEBACiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICB9Ci0gICAgICAgICAgaWYgKHNob3dEZXNjcmlwdGlvbiAmJiAhZS5nZXRQcm9qZWN0KCkuZ2V0RGVzY3JpcHRpb24oKS5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgIGluZm8uZGVzY3JpcHRpb24gPSBlLmdldFByb2plY3QoKS5nZXREZXNjcmlwdGlvbigpOworICAgICAgICAgIGlmIChzaG93RGVzY3JpcHRpb24pIHsKKyAgICAgICAgICAgIGluZm8uZGVzY3JpcHRpb24gPSBTdHJpbmdzLmVtcHR5VG9OdWxsKGUuZ2V0UHJvamVjdCgpLmdldERlc2NyaXB0aW9uKCkpOwogICAgICAgICAgIH0KIAogICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICBpZiAoc2hvd0JyYW5jaCAhPSBudWxsKSB7CisgICAgICAgICAgICBpZiAoIXNob3dCcmFuY2guaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICAgIFJlcG9zaXRvcnkgZ2l0ID0gcmVwb01hbmFnZXIub3BlblJlcG9zaXRvcnkocHJvamVjdE5hbWUpOwogICAgICAgICAgICAgICB0cnkgewogICAgICAgICAgICAgICAgIGlmICghdHlwZS5tYXRjaGVzKGdpdCkpIHsKQEAgLTI3NywxMiArMzYyLDEyIEBACiAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoZm9ybWF0LmlzSnNvbigpKSB7CisgICAgICAgIGlmIChzdGRvdXQgPT0gbnVsbCB8fCBmb3JtYXQuaXNKc29uKCkpIHsKICAgICAgICAgICBvdXRwdXQucHV0KGluZm8ubmFtZSwgaW5mbyk7CiAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoc2hvd0JyYW5jaCAhPSBudWxsKSB7CisgICAgICAgIGlmICghc2hvd0JyYW5jaC5pc0VtcHR5KCkpIHsKICAgICAgICAgICBmb3IgKFN0cmluZyBuYW1lIDogc2hvd0JyYW5jaCkgewogICAgICAgICAgICAgU3RyaW5nIHJlZiA9IGluZm8uYnJhbmNoZXMgIT0gbnVsbCA/IGluZm8uYnJhbmNoZXMuZ2V0KG5hbWUpIDogbnVsbDsKICAgICAgICAgICAgIGlmIChyZWYgPT0gbnVsbCkgewpAQCAtMzAyLDIxICszODcsMzggQEAKICAgICAgICAgc3Rkb3V0LnByaW50KCdcbicpOwogICAgICAgfQogCi0gICAgICBpZiAoZm9ybWF0LmlzSnNvbigpKSB7CisgICAgICBmb3IgKFByb2plY3RJbmZvIGluZm8gOiBvdXRwdXQudmFsdWVzKCkpIHsKKyAgICAgICAgaW5mby5maW5pc2goKTsKKyAgICAgICAgaW5mby5uYW1lID0gbnVsbDsKKyAgICAgIH0KKyAgICAgIGlmIChzdGRvdXQgPT0gbnVsbCkgeworICAgICAgICByZXR1cm4gb3V0cHV0OworICAgICAgfSBlbHNlIGlmIChmb3JtYXQuaXNKc29uKCkpIHsKICAgICAgICAgZm9ybWF0Lm5ld0dzb24oKS50b0pzb24oCiAgICAgICAgICAgICBvdXRwdXQsIG5ldyBUeXBlVG9rZW48TWFwPFN0cmluZywgUHJvamVjdEluZm8+PigpIHt9LmdldFR5cGUoKSwgc3Rkb3V0KTsKICAgICAgICAgc3Rkb3V0LnByaW50KCdcbicpOwogICAgICAgfSBlbHNlIGlmIChzaG93VHJlZSAmJiB0cmVlTWFwLnNpemUoKSA+IDApIHsKICAgICAgICAgcHJpbnRQcm9qZWN0VHJlZShzdGRvdXQsIHRyZWVNYXApOwogICAgICAgfQorICAgICAgcmV0dXJuIG51bGw7CiAgICAgfSBmaW5hbGx5IHsKLSAgICAgIHN0ZG91dC5mbHVzaCgpOworICAgICAgaWYgKHN0ZG91dCAhPSBudWxsKSB7CisgICAgICAgIHN0ZG91dC5mbHVzaCgpOworICAgICAgfQogICAgIH0KICAgfQogCi0gIHByaXZhdGUgSXRlcmFibGU8TmFtZUtleT4gc2NhbigpIHsKKyAgcHJpdmF0ZSBJdGVyYWJsZTxQcm9qZWN0Lk5hbWVLZXk+IHNjYW4oKSB7CiAgICAgaWYgKG1hdGNoUHJlZml4ICE9IG51bGwpIHsKICAgICAgIHJldHVybiBwcm9qZWN0Q2FjaGUuYnlOYW1lKG1hdGNoUHJlZml4KTsKKyAgICB9IGVsc2UgaWYgKG1hdGNoU3Vic3RyaW5nICE9IG51bGwpIHsKKyAgICAgIHJldHVybiBJdGVyYWJsZXMuZmlsdGVyKHByb2plY3RDYWNoZS5hbGwoKSwKKyAgICAgICAgICBuZXcgUHJlZGljYXRlPFByb2plY3QuTmFtZUtleT4oKSB7CisgICAgICAgICAgICBwdWJsaWMgYm9vbGVhbiBhcHBseShQcm9qZWN0Lk5hbWVLZXkgaW4pIHsKKyAgICAgICAgICAgICAgcmV0dXJuIGluLmdldCgpLnRvTG93ZXJDYXNlKExvY2FsZS5VUykKKyAgICAgICAgICAgICAgICAgIC5jb250YWlucyhtYXRjaFN1YnN0cmluZy50b0xvd2VyQ2FzZShMb2NhbGUuVVMpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKICAgICB9IGVsc2UgewogICAgICAgcmV0dXJuIHByb2plY3RDYWNoZS5hbGwoKTsKICAgICB9CkBAIC0zNzksMTEgKzQ4MSw0IEBACiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKICAgfQotCi0gIHByaXZhdGUgc3RhdGljIGNsYXNzIFByb2plY3RJbmZvIHsKLSAgICB0cmFuc2llbnQgU3RyaW5nIG5hbWU7Ci0gICAgU3RyaW5nIHBhcmVudDsKLSAgICBTdHJpbmcgZGVzY3JpcHRpb247Ci0gICAgTWFwPFN0cmluZywgU3RyaW5nPiBicmFuY2hlczsKLSAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L01vZHVsZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L01vZHVsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjk0ZTMxNjIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvTW9kdWxlLmphdmEKQEAgLTAsMCArMSw1NSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkRhc2hib2FyZFJlc291cmNlLkRBU0hCT0FSRF9LSU5EOworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0UmVzb3VyY2UuUFJPSkVDVF9LSU5EOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdEFwaU1vZHVsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DcmVhdGVQcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LmFzc2lzdGVkaW5qZWN0LkZhY3RvcnlNb2R1bGVCdWlsZGVyOworCitwdWJsaWMgY2xhc3MgTW9kdWxlIGV4dGVuZHMgUmVzdEFwaU1vZHVsZSB7CisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CisgICAgYmluZChQcm9qZWN0c0NvbGxlY3Rpb24uY2xhc3MpOworICAgIGJpbmQoRGFzaGJvYXJkc0NvbGxlY3Rpb24uY2xhc3MpOworCisgICAgRHluYW1pY01hcC5tYXBPZihiaW5kZXIoKSwgUFJPSkVDVF9LSU5EKTsKKyAgICBEeW5hbWljTWFwLm1hcE9mKGJpbmRlcigpLCBEQVNIQk9BUkRfS0lORCk7CisKKyAgICBwdXQoUFJPSkVDVF9LSU5EKS50byhQdXRQcm9qZWN0LmNsYXNzKTsKKyAgICBnZXQoUFJPSkVDVF9LSU5EKS50byhHZXRQcm9qZWN0LmNsYXNzKTsKKyAgICBnZXQoUFJPSkVDVF9LSU5ELCAiZGVzY3JpcHRpb24iKS50byhHZXREZXNjcmlwdGlvbi5jbGFzcyk7CisgICAgcHV0KFBST0pFQ1RfS0lORCwgImRlc2NyaXB0aW9uIikudG8oUHV0RGVzY3JpcHRpb24uY2xhc3MpOworICAgIGRlbGV0ZShQUk9KRUNUX0tJTkQsICJkZXNjcmlwdGlvbiIpLnRvKFB1dERlc2NyaXB0aW9uLmNsYXNzKTsKKworICAgIGdldChQUk9KRUNUX0tJTkQsICJwYXJlbnQiKS50byhHZXRQYXJlbnQuY2xhc3MpOworICAgIHB1dChQUk9KRUNUX0tJTkQsICJwYXJlbnQiKS50byhTZXRQYXJlbnQuY2xhc3MpOworCisgICAgZ2V0KFBST0pFQ1RfS0lORCwgIkhFQUQiKS50byhHZXRIZWFkLmNsYXNzKTsKKyAgICBwdXQoUFJPSkVDVF9LSU5ELCAiSEVBRCIpLnRvKFNldEhlYWQuY2xhc3MpOworCisgICAgZ2V0KFBST0pFQ1RfS0lORCwgInN0YXRpc3RpY3MuZ2l0IikudG8oR2V0U3RhdGlzdGljcy5jbGFzcyk7CisgICAgcG9zdChQUk9KRUNUX0tJTkQsICJnYyIpLnRvKEdhcmJhZ2VDb2xsZWN0LmNsYXNzKTsKKworICAgIGNoaWxkKFBST0pFQ1RfS0lORCwgImRhc2hib2FyZHMiKS50byhEYXNoYm9hcmRzQ29sbGVjdGlvbi5jbGFzcyk7CisgICAgZ2V0KERBU0hCT0FSRF9LSU5EKS50byhHZXREYXNoYm9hcmQuY2xhc3MpOworICAgIHB1dChEQVNIQk9BUkRfS0lORCkudG8oU2V0RGFzaGJvYXJkLmNsYXNzKTsKKyAgICBkZWxldGUoREFTSEJPQVJEX0tJTkQpLnRvKERlbGV0ZURhc2hib2FyZC5jbGFzcyk7CisgICAgaW5zdGFsbChuZXcgRmFjdG9yeU1vZHVsZUJ1aWxkZXIoKS5idWlsZChDcmVhdGVQcm9qZWN0LkZhY3RvcnkuY2xhc3MpKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L05vU3VjaFByb2plY3RFeGNlcHRpb24uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Ob1N1Y2hQcm9qZWN0RXhjZXB0aW9uLmphdmEKaW5kZXggMmFjNDk0ZC4uYWE2ZmIxNiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L05vU3VjaFByb2plY3RFeGNlcHRpb24uamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvTm9TdWNoUHJvamVjdEV4Y2VwdGlvbi5qYXZhCkBAIC0yMCwxMSArMjAsMTMgQEAKIHB1YmxpYyBjbGFzcyBOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uIGV4dGVuZHMgRXhjZXB0aW9uIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9uZyBzZXJpYWxWZXJzaW9uVUlEID0gMUw7CiAKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIE1FU1NBR0UgPSAiUHJvamVjdCBub3QgZm91bmQ6ICI7CisKICAgcHVibGljIE5vU3VjaFByb2plY3RFeGNlcHRpb24oZmluYWwgUHJvamVjdC5OYW1lS2V5IGtleSkgewogICAgIHRoaXMoa2V5LCBudWxsKTsKICAgfQogCiAgIHB1YmxpYyBOb1N1Y2hQcm9qZWN0RXhjZXB0aW9uKGZpbmFsIFByb2plY3QuTmFtZUtleSBrZXksIGZpbmFsIFRocm93YWJsZSB3aHkpIHsKLSAgICBzdXBlcihrZXkudG9TdHJpbmcoKSwgd2h5KTsKKyAgICBzdXBlcihNRVNTQUdFICsga2V5LnRvU3RyaW5nKCksIHdoeSk7CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9QZXJmb3JtQ3JlYXRlUHJvamVjdC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1BlcmZvcm1DcmVhdGVQcm9qZWN0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDY4NzI1ZgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9QZXJmb3JtQ3JlYXRlUHJvamVjdC5qYXZhCkBAIC0wLDAgKzEsMjkzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTEgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UKKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5Qcm9qZWN0VXRpbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BY2Nlc3NTZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwRGVzY3JpcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBSZWZlcmVuY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUnVsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZXJyb3JzLlByb2plY3RDcmVhdGlvbkZhaWxlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5OZXdQcm9qZWN0Q3JlYXRlZExpc3RlbmVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVnaXN0cmF0aW9uLkR5bmFtaWNTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuR2Vycml0UGVyc29uSWRlbnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQmFja2VuZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlByb2plY3RPd25lckdyb3VwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWV0YURhdGFVcGRhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Qcm9qZWN0Q29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUmVwb3NpdG9yeUNhc2VNaXNtYXRjaEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5Db25maWdJbnZhbGlkRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db21taXRCdWlsZGVyOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbnN0YW50czsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJZDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5PYmplY3RJbnNlcnRlcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5QZXJzb25JZGVudDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZWZVcGRhdGU7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlLlJlc3VsdDsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKKworLyoqIENvbW1vbiBjbGFzcyB0aGF0IGhvbGRzIHRoZSBjb2RlIHRvIGNyZWF0ZSBwcm9qZWN0cyAqLworcHVibGljIGNsYXNzIFBlcmZvcm1DcmVhdGVQcm9qZWN0IHsKKyAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkKKyAgICAgIC5nZXRMb2dnZXIoUGVyZm9ybUNyZWF0ZVByb2plY3QuY2xhc3MpOworCisgIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7CisgICAgUGVyZm9ybUNyZWF0ZVByb2plY3QgY3JlYXRlKENyZWF0ZVByb2plY3RBcmdzIGNyZWF0ZVByb2plY3RBcmdzKTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgU2V0PEFjY291bnRHcm91cC5VVUlEPiBwcm9qZWN0T3duZXJHcm91cHM7CisgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIgY3VycmVudFVzZXI7CisgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXI7CisgIHByaXZhdGUgZmluYWwgR2l0UmVmZXJlbmNlVXBkYXRlZCByZWZlcmVuY2VVcGRhdGVkOworICBwcml2YXRlIGZpbmFsIER5bmFtaWNTZXQ8TmV3UHJvamVjdENyZWF0ZWRMaXN0ZW5lcj4gY3JlYXRlZExpc3RlbmVyOworICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IHNlcnZlcklkZW50OworICBwcml2YXRlIGZpbmFsIENyZWF0ZVByb2plY3RBcmdzIGNyZWF0ZVByb2plY3RBcmdzOworICBwcml2YXRlIGZpbmFsIFByb2plY3RDYWNoZSBwcm9qZWN0Q2FjaGU7CisgIHByaXZhdGUgZmluYWwgR3JvdXBCYWNrZW5kIGdyb3VwQmFja2VuZDsKKyAgcHJpdmF0ZSBmaW5hbCBNZXRhRGF0YVVwZGF0ZS5Vc2VyIG1ldGFEYXRhVXBkYXRlRmFjdG9yeTsKKworICBASW5qZWN0CisgIFBlcmZvcm1DcmVhdGVQcm9qZWN0KEBQcm9qZWN0T3duZXJHcm91cHMgU2V0PEFjY291bnRHcm91cC5VVUlEPiBwT3duZXJHcm91cHMsCisgICAgICBJZGVudGlmaWVkVXNlciBpZGVudGlmaWVkVXNlciwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0UmVwb01hbmFnZXIsCisgICAgICBHaXRSZWZlcmVuY2VVcGRhdGVkIHJlZmVyZW5jZVVwZGF0ZWQsCisgICAgICBEeW5hbWljU2V0PE5ld1Byb2plY3RDcmVhdGVkTGlzdGVuZXI+IGNyZWF0ZWRMaXN0ZW5lciwKKyAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBQZXJzb25JZGVudCBwZXJzb25JZGVudCwgR3JvdXBCYWNrZW5kIGdyb3VwQmFja2VuZCwKKyAgICAgIE1ldGFEYXRhVXBkYXRlLlVzZXIgbWV0YURhdGFVcGRhdGVGYWN0b3J5LAorICAgICAgQEFzc2lzdGVkIENyZWF0ZVByb2plY3RBcmdzIGNyZWF0ZVBBcmdzLCBQcm9qZWN0Q2FjaGUgcENhY2hlKSB7CisgICAgdGhpcy5wcm9qZWN0T3duZXJHcm91cHMgPSBwT3duZXJHcm91cHM7CisgICAgdGhpcy5jdXJyZW50VXNlciA9IGlkZW50aWZpZWRVc2VyOworICAgIHRoaXMucmVwb01hbmFnZXIgPSBnaXRSZXBvTWFuYWdlcjsKKyAgICB0aGlzLnJlZmVyZW5jZVVwZGF0ZWQgPSByZWZlcmVuY2VVcGRhdGVkOworICAgIHRoaXMuY3JlYXRlZExpc3RlbmVyID0gY3JlYXRlZExpc3RlbmVyOworICAgIHRoaXMuc2VydmVySWRlbnQgPSBwZXJzb25JZGVudDsKKyAgICB0aGlzLmNyZWF0ZVByb2plY3RBcmdzID0gY3JlYXRlUEFyZ3M7CisgICAgdGhpcy5wcm9qZWN0Q2FjaGUgPSBwQ2FjaGU7CisgICAgdGhpcy5ncm91cEJhY2tlbmQgPSBncm91cEJhY2tlbmQ7CisgICAgdGhpcy5tZXRhRGF0YVVwZGF0ZUZhY3RvcnkgPSBtZXRhRGF0YVVwZGF0ZUZhY3Rvcnk7CisgIH0KKworICBwdWJsaWMgUHJvamVjdCBjcmVhdGVQcm9qZWN0KCkgdGhyb3dzIFByb2plY3RDcmVhdGlvbkZhaWxlZEV4Y2VwdGlvbiB7CisgICAgdmFsaWRhdGVQYXJhbWV0ZXJzKCk7CisgICAgZmluYWwgUHJvamVjdC5OYW1lS2V5IG5hbWVLZXkgPSBjcmVhdGVQcm9qZWN0QXJncy5nZXRQcm9qZWN0KCk7CisgICAgdHJ5IHsKKyAgICAgIGZpbmFsIFN0cmluZyBoZWFkID0KKyAgICAgICAgICBjcmVhdGVQcm9qZWN0QXJncy5wZXJtaXNzaW9uc09ubHkgPyBHaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZfQ09ORklHCisgICAgICAgICAgICAgIDogY3JlYXRlUHJvamVjdEFyZ3MuYnJhbmNoLmdldCgwKTsKKyAgICAgIGZpbmFsIFJlcG9zaXRvcnkgcmVwbyA9IHJlcG9NYW5hZ2VyLmNyZWF0ZVJlcG9zaXRvcnkobmFtZUtleSk7CisgICAgICB0cnkgeworICAgICAgICBOZXdQcm9qZWN0Q3JlYXRlZExpc3RlbmVyLkV2ZW50IGV2ZW50ID0gbmV3IE5ld1Byb2plY3RDcmVhdGVkTGlzdGVuZXIuRXZlbnQoKSB7CisgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgcHVibGljIFN0cmluZyBnZXRQcm9qZWN0TmFtZSgpIHsKKyAgICAgICAgICAgIHJldHVybiBuYW1lS2V5LmdldCgpOworICAgICAgICAgIH0KKworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyBTdHJpbmcgZ2V0SGVhZE5hbWUoKSB7CisgICAgICAgICAgICByZXR1cm4gaGVhZDsKKyAgICAgICAgICB9CisgICAgICAgIH07CisgICAgICAgIGZvciAoTmV3UHJvamVjdENyZWF0ZWRMaXN0ZW5lciBsIDogY3JlYXRlZExpc3RlbmVyKSB7CisgICAgICAgICAgbC5vbk5ld1Byb2plY3RDcmVhdGVkKGV2ZW50KTsKKyAgICAgICAgfQorCisgICAgICAgIGZpbmFsIFJlZlVwZGF0ZSB1ID0gcmVwby51cGRhdGVSZWYoQ29uc3RhbnRzLkhFQUQpOworICAgICAgICB1LmRpc2FibGVSZWZMb2coKTsKKyAgICAgICAgdS5saW5rKGhlYWQpOworCisgICAgICAgIGNyZWF0ZVByb2plY3RDb25maWcoKTsKKworICAgICAgICBpZiAoIWNyZWF0ZVByb2plY3RBcmdzLnBlcm1pc3Npb25zT25seQorICAgICAgICAgICAgJiYgY3JlYXRlUHJvamVjdEFyZ3MuY3JlYXRlRW1wdHlDb21taXQpIHsKKyAgICAgICAgICBjcmVhdGVFbXB0eUNvbW1pdHMocmVwbywgbmFtZUtleSwgY3JlYXRlUHJvamVjdEFyZ3MuYnJhbmNoKTsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBwcm9qZWN0Q2FjaGUuZ2V0KG5hbWVLZXkpLmdldFByb2plY3QoKTsKKyAgICAgIH0gZmluYWxseSB7CisgICAgICAgIHJlcG8uY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChSZXBvc2l0b3J5Q2FzZU1pc21hdGNoRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24oIkNhbm5vdCBjcmVhdGUgIiArIG5hbWVLZXkuZ2V0KCkKKyAgICAgICAgICArICIgYmVjYXVzZSB0aGUgbmFtZSBpcyBhbHJlYWR5IG9jY3VwaWVkIGJ5IGFub3RoZXIgcHJvamVjdC4iCisgICAgICAgICAgKyAiIFRoZSBvdGhlciBwcm9qZWN0IGhhcyB0aGUgc2FtZSBuYW1lLCBvbmx5IHNwZWxsZWQgaW4gYSIKKyAgICAgICAgICArICIgZGlmZmVyZW50IGNhc2UuIiwgZSk7CisgICAgfSBjYXRjaCAoUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uIGJhZE5hbWUpIHsKKyAgICAgIHRocm93IG5ldyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24oIkNhbm5vdCBjcmVhdGUgIiArIG5hbWVLZXksIGJhZE5hbWUpOworICAgIH0gY2F0Y2ggKElsbGVnYWxTdGF0ZUV4Y2VwdGlvbiBlcnIpIHsKKyAgICAgIHRyeSB7CisgICAgICAgIGZpbmFsIFJlcG9zaXRvcnkgcmVwbyA9IHJlcG9NYW5hZ2VyLm9wZW5SZXBvc2l0b3J5KG5hbWVLZXkpOworICAgICAgICB0cnkgeworICAgICAgICAgIGlmIChyZXBvLmdldE9iamVjdERhdGFiYXNlKCkuZXhpc3RzKCkpIHsKKyAgICAgICAgICAgIHRocm93IG5ldyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24oInByb2plY3QgXCIiICsgbmFtZUtleSArICJcIiBleGlzdHMiKTsKKyAgICAgICAgICB9CisgICAgICAgICAgdGhyb3cgZXJyOworICAgICAgICB9IGZpbmFsbHkgeworICAgICAgICAgIHJlcG8uY2xvc2UoKTsKKyAgICAgICAgfQorICAgICAgfSBjYXRjaCAoSU9FeGNlcHRpb24gaW9FcnIpIHsKKyAgICAgICAgZmluYWwgU3RyaW5nIG1zZyA9ICJDYW5ub3QgY3JlYXRlICIgKyBuYW1lS2V5OworICAgICAgICBsb2cuZXJyb3IobXNnLCBlcnIpOworICAgICAgICB0aHJvdyBuZXcgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uKG1zZywgaW9FcnIpOworICAgICAgfQorICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICBmaW5hbCBTdHJpbmcgbXNnID0gIkNhbm5vdCBjcmVhdGUgIiArIG5hbWVLZXk7CisgICAgICBsb2cuZXJyb3IobXNnLCBlKTsKKyAgICAgIHRocm93IG5ldyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24obXNnLCBlKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgY3JlYXRlUHJvamVjdENvbmZpZygpIHRocm93cyBJT0V4Y2VwdGlvbiwgQ29uZmlnSW52YWxpZEV4Y2VwdGlvbiB7CisgICAgZmluYWwgTWV0YURhdGFVcGRhdGUgbWQgPQorICAgICAgICBtZXRhRGF0YVVwZGF0ZUZhY3RvcnkuY3JlYXRlKGNyZWF0ZVByb2plY3RBcmdzLmdldFByb2plY3QoKSk7CisgICAgdHJ5IHsKKyAgICAgIGZpbmFsIFByb2plY3RDb25maWcgY29uZmlnID0gUHJvamVjdENvbmZpZy5yZWFkKG1kKTsKKyAgICAgIGNvbmZpZy5sb2FkKG1kKTsKKworICAgICAgUHJvamVjdCBuZXdQcm9qZWN0ID0gY29uZmlnLmdldFByb2plY3QoKTsKKyAgICAgIG5ld1Byb2plY3Quc2V0RGVzY3JpcHRpb24oY3JlYXRlUHJvamVjdEFyZ3MucHJvamVjdERlc2NyaXB0aW9uKTsKKyAgICAgIG5ld1Byb2plY3Quc2V0U3VibWl0VHlwZShjcmVhdGVQcm9qZWN0QXJncy5zdWJtaXRUeXBlKTsKKyAgICAgIG5ld1Byb2plY3QKKyAgICAgICAgICAuc2V0VXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzKGNyZWF0ZVByb2plY3RBcmdzLmNvbnRyaWJ1dG9yQWdyZWVtZW50cyk7CisgICAgICBuZXdQcm9qZWN0LnNldFVzZVNpZ25lZE9mZkJ5KGNyZWF0ZVByb2plY3RBcmdzLnNpZ25lZE9mZkJ5KTsKKyAgICAgIG5ld1Byb2plY3Quc2V0VXNlQ29udGVudE1lcmdlKGNyZWF0ZVByb2plY3RBcmdzLmNvbnRlbnRNZXJnZSk7CisgICAgICBuZXdQcm9qZWN0LnNldFJlcXVpcmVDaGFuZ2VJRChjcmVhdGVQcm9qZWN0QXJncy5jaGFuZ2VJZFJlcXVpcmVkKTsKKyAgICAgIGlmIChjcmVhdGVQcm9qZWN0QXJncy5uZXdQYXJlbnQgIT0gbnVsbCkgeworICAgICAgICBuZXdQcm9qZWN0LnNldFBhcmVudE5hbWUoY3JlYXRlUHJvamVjdEFyZ3MubmV3UGFyZW50LmdldFByb2plY3QoKQorICAgICAgICAgICAgLmdldE5hbWVLZXkoKSk7CisgICAgICB9CisKKyAgICAgIGlmICghY3JlYXRlUHJvamVjdEFyZ3Mub3duZXJJZHMuaXNFbXB0eSgpKSB7CisgICAgICAgIGZpbmFsIEFjY2Vzc1NlY3Rpb24gYWxsID0KKyAgICAgICAgICAgIGNvbmZpZy5nZXRBY2Nlc3NTZWN0aW9uKEFjY2Vzc1NlY3Rpb24uQUxMLCB0cnVlKTsKKyAgICAgICAgZm9yIChBY2NvdW50R3JvdXAuVVVJRCBvd25lcklkIDogY3JlYXRlUHJvamVjdEFyZ3Mub3duZXJJZHMpIHsKKyAgICAgICAgICBHcm91cERlc2NyaXB0aW9uLkJhc2ljIGcgPSBncm91cEJhY2tlbmQuZ2V0KG93bmVySWQpOworICAgICAgICAgIGlmIChnICE9IG51bGwpIHsKKyAgICAgICAgICAgIEdyb3VwUmVmZXJlbmNlIGdyb3VwID0gY29uZmlnLnJlc29sdmUoR3JvdXBSZWZlcmVuY2UuZm9yR3JvdXAoZykpOworICAgICAgICAgICAgYWxsLmdldFBlcm1pc3Npb24oUGVybWlzc2lvbi5PV05FUiwgdHJ1ZSkuYWRkKAorICAgICAgICAgICAgICAgIG5ldyBQZXJtaXNzaW9uUnVsZShncm91cCkpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorCisgICAgICBtZC5zZXRNZXNzYWdlKCJDcmVhdGVkIHByb2plY3RcbiIpOworICAgICAgY29uZmlnLmNvbW1pdChtZCk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIG1kLmNsb3NlKCk7CisgICAgfQorICAgIHByb2plY3RDYWNoZS5vbkNyZWF0ZVByb2plY3QoY3JlYXRlUHJvamVjdEFyZ3MuZ2V0UHJvamVjdCgpKTsKKyAgICByZXBvTWFuYWdlci5zZXRQcm9qZWN0RGVzY3JpcHRpb24oY3JlYXRlUHJvamVjdEFyZ3MuZ2V0UHJvamVjdCgpLAorICAgICAgICBjcmVhdGVQcm9qZWN0QXJncy5wcm9qZWN0RGVzY3JpcHRpb24pOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHZhbGlkYXRlUGFyYW1ldGVycygpIHRocm93cyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24geworICAgIGlmIChjcmVhdGVQcm9qZWN0QXJncy5nZXRQcm9qZWN0TmFtZSgpID09IG51bGwKKyAgICAgICAgfHwgY3JlYXRlUHJvamVjdEFyZ3MuZ2V0UHJvamVjdE5hbWUoKS5pc0VtcHR5KCkpIHsKKyAgICAgIHRocm93IG5ldyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24oIlByb2plY3QgbmFtZSBpcyByZXF1aXJlZCIpOworICAgIH0KKworICAgIFN0cmluZyBuYW1lV2l0aG91dFN1ZmZpeCA9IFByb2plY3RVdGlsLnN0cmlwR2l0U3VmZml4KGNyZWF0ZVByb2plY3RBcmdzLmdldFByb2plY3ROYW1lKCkpOworICAgIGNyZWF0ZVByb2plY3RBcmdzLnNldFByb2plY3ROYW1lKG5hbWVXaXRob3V0U3VmZml4KTsKKworICAgIGlmICghY3VycmVudFVzZXIuZ2V0Q2FwYWJpbGl0aWVzKCkuY2FuQ3JlYXRlUHJvamVjdCgpKSB7CisgICAgICB0aHJvdyBuZXcgUHJvamVjdENyZWF0aW9uRmFpbGVkRXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgIiVzIGRvZXMgbm90IGhhdmUgXCJDcmVhdGUgUHJvamVjdFwiIGNhcGFiaWxpdHkuIiwKKyAgICAgICAgICBjdXJyZW50VXNlci5nZXRVc2VyTmFtZSgpKSk7CisgICAgfQorCisgICAgaWYgKGNyZWF0ZVByb2plY3RBcmdzLm93bmVySWRzID09IG51bGwKKyAgICAgICAgfHwgY3JlYXRlUHJvamVjdEFyZ3Mub3duZXJJZHMuaXNFbXB0eSgpKSB7CisgICAgICBjcmVhdGVQcm9qZWN0QXJncy5vd25lcklkcyA9CisgICAgICAgICAgbmV3IEFycmF5TGlzdDxBY2NvdW50R3JvdXAuVVVJRD4ocHJvamVjdE93bmVyR3JvdXBzKTsKKyAgICB9CisKKyAgICBMaXN0PFN0cmluZz4gdHJhbnNmb3JtZWRCcmFuY2hlcyA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPigpOworICAgIGlmIChjcmVhdGVQcm9qZWN0QXJncy5icmFuY2ggPT0gbnVsbCB8fAorICAgICAgICBjcmVhdGVQcm9qZWN0QXJncy5icmFuY2guaXNFbXB0eSgpKSB7CisgICAgICBjcmVhdGVQcm9qZWN0QXJncy5icmFuY2ggPSBDb2xsZWN0aW9ucy5zaW5nbGV0b25MaXN0KENvbnN0YW50cy5NQVNURVIpOworICAgIH0KKyAgICBmb3IgKFN0cmluZyBicmFuY2ggOiBjcmVhdGVQcm9qZWN0QXJncy5icmFuY2gpIHsKKyAgICAgIHdoaWxlIChicmFuY2guc3RhcnRzV2l0aCgiLyIpKSB7CisgICAgICAgIGJyYW5jaCA9IGJyYW5jaC5zdWJzdHJpbmcoMSk7CisgICAgICB9CisgICAgICBpZiAoIWJyYW5jaC5zdGFydHNXaXRoKENvbnN0YW50cy5SX0hFQURTKSkgeworICAgICAgICBicmFuY2ggPSBDb25zdGFudHMuUl9IRUFEUyArIGJyYW5jaDsKKyAgICAgIH0KKyAgICAgIGlmICghUmVwb3NpdG9yeS5pc1ZhbGlkUmVmTmFtZShicmFuY2gpKSB7CisgICAgICAgIHRocm93IG5ldyBQcm9qZWN0Q3JlYXRpb25GYWlsZWRFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAgICJCcmFuY2ggXCIlc1wiIGlzIG5vdCBhIHZhbGlkIG5hbWUuIiwgYnJhbmNoKSk7CisgICAgICB9CisgICAgICBpZiAoIXRyYW5zZm9ybWVkQnJhbmNoZXMuY29udGFpbnMoYnJhbmNoKSkgeworICAgICAgICB0cmFuc2Zvcm1lZEJyYW5jaGVzLmFkZChicmFuY2gpOworICAgICAgfQorICAgIH0KKyAgICBjcmVhdGVQcm9qZWN0QXJncy5icmFuY2ggPSB0cmFuc2Zvcm1lZEJyYW5jaGVzOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIGNyZWF0ZUVtcHR5Q29tbWl0cyhmaW5hbCBSZXBvc2l0b3J5IHJlcG8sCisgICAgICBmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgZmluYWwgTGlzdDxTdHJpbmc+IHJlZnMpCisgICAgICB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIE9iamVjdEluc2VydGVyIG9pID0gcmVwby5uZXdPYmplY3RJbnNlcnRlcigpOworICAgIHRyeSB7CisgICAgICBDb21taXRCdWlsZGVyIGNiID0gbmV3IENvbW1pdEJ1aWxkZXIoKTsKKyAgICAgIGNiLnNldFRyZWVJZChvaS5pbnNlcnQoQ29uc3RhbnRzLk9CSl9UUkVFLCBuZXcgYnl0ZVtdIHt9KSk7CisgICAgICBjYi5zZXRBdXRob3IobWV0YURhdGFVcGRhdGVGYWN0b3J5LmdldFVzZXJQZXJzb25JZGVudCgpKTsKKyAgICAgIGNiLnNldENvbW1pdHRlcihzZXJ2ZXJJZGVudCk7CisgICAgICBjYi5zZXRNZXNzYWdlKCJJbml0aWFsIGVtcHR5IHJlcG9zaXRvcnlcbiIpOworCisgICAgICBPYmplY3RJZCBpZCA9IG9pLmluc2VydChjYik7CisgICAgICBvaS5mbHVzaCgpOworCisgICAgICBmb3IgKFN0cmluZyByZWYgOiByZWZzKSB7CisgICAgICAgIFJlZlVwZGF0ZSBydSA9IHJlcG8udXBkYXRlUmVmKHJlZik7CisgICAgICAgIHJ1LnNldE5ld09iamVjdElkKGlkKTsKKyAgICAgICAgZmluYWwgUmVzdWx0IHJlc3VsdCA9IHJ1LnVwZGF0ZSgpOworICAgICAgICBzd2l0Y2ggKHJlc3VsdCkgeworICAgICAgICAgIGNhc2UgTkVXOgorICAgICAgICAgICAgcmVmZXJlbmNlVXBkYXRlZC5maXJlKHByb2plY3QsIHJ1KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgIGRlZmF1bHQ6IHsKKyAgICAgICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgICAiRmFpbGVkIHRvIGNyZWF0ZSByZWYgXCIlc1wiOiAlcyIsIHJlZiwgcmVzdWx0Lm5hbWUoKSkpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfQorICAgIH0gY2F0Y2ggKElPRXhjZXB0aW9uIGUpIHsKKyAgICAgIGxvZy5lcnJvcigKKyAgICAgICAgICAiQ2Fubm90IGNyZWF0ZSBlbXB0eSBjb21taXQgZm9yICIKKyAgICAgICAgICAgICAgKyBjcmVhdGVQcm9qZWN0QXJncy5nZXRQcm9qZWN0TmFtZSgpLCBlKTsKKyAgICAgIHRocm93IGU7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIG9pLnJlbGVhc2UoKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9QZXJtaXNzaW9uQ29sbGVjdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Blcm1pc3Npb25Db2xsZWN0aW9uLmphdmEKaW5kZXggZTQxNmVkNy4uNDgzZWNhZiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Blcm1pc3Npb25Db2xsZWN0aW9uLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Blcm1pc3Npb25Db2xsZWN0aW9uLmphdmEKQEAgLTE2LDEwICsxNiwxMyBAQAogCiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlJlZkNvbnRyb2wuaXNSRTsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY2Vzc1NlY3Rpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUnVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKQEAgLTczLDcgKzc2LDcgQEAKICAgICAgIH0KIAogICAgICAgYm9vbGVhbiBwZXJVc2VyID0gZmFsc2U7Ci0gICAgICBMaXN0PEFjY2Vzc1NlY3Rpb24+IHNlY3Rpb25zID0gbmV3IEFycmF5TGlzdDxBY2Nlc3NTZWN0aW9uPigpOworICAgICAgTWFwPEFjY2Vzc1NlY3Rpb24sIFByb2plY3QuTmFtZUtleT4gc2VjdGlvblRvUHJvamVjdCA9IE1hcHMubmV3TGlua2VkSGFzaE1hcCgpOwogICAgICAgZm9yIChTZWN0aW9uTWF0Y2hlciBtYXRjaGVyIDogbWF0Y2hlckxpc3QpIHsKICAgICAgICAgLy8gSWYgdGhlIG1hdGNoZXIgaGFzIHRvIGV4cGFuZCBwYXJhbWV0ZXJzIGFuZCBpdHMgcHJlZml4IG1hdGNoZXMgdGhlCiAgICAgICAgIC8vIHJlZmVyZW5jZSB0aGVyZSBpcyBhIHZlcnkgZ29vZCBjaGFuY2UgdGhlIHJlZmVyZW5jZSBpcyBhY3R1YWxseSB1c2VyCkBAIC05Myw5ICs5NiwxMCBAQAogICAgICAgICB9CiAKICAgICAgICAgaWYgKG1hdGNoZXIubWF0Y2gocmVmLCB1c2VybmFtZSkpIHsKLSAgICAgICAgICBzZWN0aW9ucy5hZGQobWF0Y2hlci5zZWN0aW9uKTsKKyAgICAgICAgICBzZWN0aW9uVG9Qcm9qZWN0LnB1dChtYXRjaGVyLnNlY3Rpb24sIG1hdGNoZXIucHJvamVjdCk7CiAgICAgICAgIH0KICAgICAgIH0KKyAgICAgIExpc3Q8QWNjZXNzU2VjdGlvbj4gc2VjdGlvbnMgPSBMaXN0cy5uZXdBcnJheUxpc3Qoc2VjdGlvblRvUHJvamVjdC5rZXlTZXQoKSk7CiAgICAgICBzb3J0ZXIuc29ydChyZWYsIHNlY3Rpb25zKTsKIAogICAgICAgU2V0PFNlZW5SdWxlPiBzZWVuID0gbmV3IEhhc2hTZXQ8U2VlblJ1bGU+KCk7CkBAIC0xMDQsNyArMTA4LDkgQEAKIAogICAgICAgSGFzaE1hcDxTdHJpbmcsIExpc3Q8UGVybWlzc2lvblJ1bGU+PiBwZXJtaXNzaW9ucyA9CiAgICAgICAgICAgbmV3IEhhc2hNYXA8U3RyaW5nLCBMaXN0PFBlcm1pc3Npb25SdWxlPj4oKTsKKyAgICAgIE1hcDxQZXJtaXNzaW9uUnVsZSwgUHJvamVjdFJlZj4gcnVsZVByb3BzID0gTWFwcy5uZXdJZGVudGl0eUhhc2hNYXAoKTsKICAgICAgIGZvciAoQWNjZXNzU2VjdGlvbiBzZWN0aW9uIDogc2VjdGlvbnMpIHsKKyAgICAgICAgUHJvamVjdC5OYW1lS2V5IHByb2plY3QgPSBzZWN0aW9uVG9Qcm9qZWN0LmdldChzZWN0aW9uKTsKICAgICAgICAgZm9yIChQZXJtaXNzaW9uIHBlcm1pc3Npb24gOiBzZWN0aW9uLmdldFBlcm1pc3Npb25zKCkpIHsKICAgICAgICAgICBib29sZWFuIGV4Y2x1c2l2ZVBlcm1pc3Npb25FeGlzdHMgPQogICAgICAgICAgICAgICBleGNsdXNpdmVHcm91cFBlcm1pc3Npb25zLmNvbnRhaW5zKHBlcm1pc3Npb24uZ2V0TmFtZSgpKTsKQEAgLTEyNCw2ICsxMzAsNyBAQAogICAgICAgICAgICAgICAgIHBlcm1pc3Npb25zLnB1dChwZXJtaXNzaW9uLmdldE5hbWUoKSwgcik7CiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgci5hZGQocnVsZSk7CisgICAgICAgICAgICAgIHJ1bGVQcm9wcy5wdXQocnVsZSwgbmV3IFByb2plY3RSZWYocHJvamVjdCwgc2VjdGlvbi5nZXROYW1lKCkpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICB9CiAKQEAgLTEzMywxNiArMTQwLDIwIEBACiAgICAgICAgIH0KICAgICAgIH0KIAotICAgICAgcmV0dXJuIG5ldyBQZXJtaXNzaW9uQ29sbGVjdGlvbihwZXJtaXNzaW9ucywgcGVyVXNlciA/IHVzZXJuYW1lIDogbnVsbCk7CisgICAgICByZXR1cm4gbmV3IFBlcm1pc3Npb25Db2xsZWN0aW9uKHBlcm1pc3Npb25zLCBydWxlUHJvcHMsCisgICAgICAgICAgcGVyVXNlciA/IHVzZXJuYW1lIDogbnVsbCk7CiAgICAgfQogICB9CiAKICAgcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBMaXN0PFBlcm1pc3Npb25SdWxlPj4gcnVsZXM7CisgIHByaXZhdGUgZmluYWwgTWFwPFBlcm1pc3Npb25SdWxlLCBQcm9qZWN0UmVmPiBydWxlUHJvcHM7CiAgIHByaXZhdGUgZmluYWwgU3RyaW5nIHVzZXJuYW1lOwogCiAgIHByaXZhdGUgUGVybWlzc2lvbkNvbGxlY3Rpb24oTWFwPFN0cmluZywgTGlzdDxQZXJtaXNzaW9uUnVsZT4+IHJ1bGVzLAorICAgICAgTWFwPFBlcm1pc3Npb25SdWxlLCBQcm9qZWN0UmVmPiBydWxlUHJvcHMsCiAgICAgICBTdHJpbmcgdXNlcm5hbWUpIHsKICAgICB0aGlzLnJ1bGVzID0gcnVsZXM7CisgICAgdGhpcy5ydWxlUHJvcHMgPSBydWxlUHJvcHM7CiAgICAgdGhpcy51c2VybmFtZSA9IHVzZXJuYW1lOwogICB9CiAKQEAgLTE2Nyw2ICsxNzgsMTAgQEAKICAgICByZXR1cm4gciAhPSBudWxsID8gciA6IENvbGxlY3Rpb25zLjxQZXJtaXNzaW9uUnVsZT4gZW1wdHlMaXN0KCk7CiAgIH0KIAorICBQcm9qZWN0UmVmIGdldFJ1bGVQcm9wcyhQZXJtaXNzaW9uUnVsZSBydWxlKSB7CisgICAgcmV0dXJuIHJ1bGVQcm9wcy5nZXQocnVsZSk7CisgIH0KKwogICAvKioKICAgICogT2J0YWluIGFsbCBkZWNsYXJlZCBwZXJtaXNzaW9uIHJ1bGVzIHRoYXQgbWF0Y2ggdGhlIHJlZmVyZW5jZS4KICAgICoKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q2FjaGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q2FjaGUuamF2YQppbmRleCA3YTExMTMxMS4uNjk3YjgzOCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RDYWNoZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q2FjaGUuamF2YQpAQCAtMTQsOCArMTQsMTEgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKIAoraW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CiAKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OworCiAvKiogQ2FjaGUgb2YgcHJvamVjdCBpbmZvcm1hdGlvbiwgaW5jbHVkaW5nIGFjY2VzcyByaWdodHMuICovCiBwdWJsaWMgaW50ZXJmYWNlIFByb2plY3RDYWNoZSB7CiAgIC8qKiBAcmV0dXJuIHRoZSBwYXJlbnQgc3RhdGUgZm9yIGFsbCBwcm9qZWN0cyBvbiB0aGlzIHNlcnZlci4gKi8KQEAgLTQyLDYgKzQ1LDEzIEBACiAgIHB1YmxpYyBhYnN0cmFjdCBJdGVyYWJsZTxQcm9qZWN0Lk5hbWVLZXk+IGFsbCgpOwogCiAgIC8qKgorICAgKiBAcmV0dXJuIGVzdGltYXRlZCBzZXQgb2YgcmVsZXZhbnQgZ3JvdXBzIGV4dHJhY3RlZCBmcm9tIGhvdCBwcm9qZWN0IGFjY2VzcworICAgKiAgICAgICAgIHJ1bGVzLiBJZiB0aGUgY2FjaGUgaXMgY29sZCBvciB0b28gc21hbGwgZm9yIHRoZSBlbnRpcmUgcHJvamVjdCBzZXQKKyAgICogICAgICAgICBvZiB0aGUgc2VydmVyLCB0aGlzIHNldCBtYXkgYmUgaW5jb21wbGV0ZS4KKyAgICovCisgIHB1YmxpYyBhYnN0cmFjdCBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGd1ZXNzUmVsZXZhbnRHcm91cFVVSURzKCk7CisKKyAgLyoqCiAgICAqIEZpbHRlciB0aGUgc2V0IG9mIHJlZ2lzdGVyZWQgcHJvamVjdCBuYW1lcyBieSBjb21tb24gcHJlZml4LgogICAgKgogICAgKiBAcGFyYW0gcHJlZml4IGNvbW1vbiBwcmVmaXguCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdENhY2hlQ2xvY2suamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q2FjaGVDbG9jay5qYXZhCmluZGV4IGY4NjU2MmMuLmM5NmViZGYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q2FjaGVDbG9jay5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q2FjaGVDbG9jay5qYXZhCkBAIC0xNCw2ICsxNCw3IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi51dGlsLmNvbmN1cnJlbnQuVGhyZWFkRmFjdG9yeUJ1aWxkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Db25maWdVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTIzLDkgKzI0LDcgQEAKIAogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkV4ZWN1dG9yczsKIGltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5TY2hlZHVsZWRFeGVjdXRvclNlcnZpY2U7Ci1pbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuVGhyZWFkRmFjdG9yeTsKIGltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdDsKLWltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5hdG9taWMuQXRvbWljSW50ZWdlcjsKIAogLyoqIFRpY2tzIHBlcmlvZGljYWxseSB0byBmb3JjZSByZWZyZXNoIGV2ZW50cyBmb3Ige0BsaW5rIFByb2plY3RDYWNoZUltcGx9LiAqLwogQFNpbmdsZXRvbgpAQCAtMzQsMjkgKzMzLDI0IEBACiAKICAgQEluamVjdAogICBwdWJsaWMgUHJvamVjdENhY2hlQ2xvY2soQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgc2VydmVyQ29uZmlnKSB7Ci0gICAgdGhpcyhUaW1lVW5pdC5NSUxMSVNFQ09ORFMuY29udmVydCgKLSAgICAgICAgQ29uZmlnVXRpbC5nZXRUaW1lVW5pdChzZXJ2ZXJDb25maWcsCi0gICAgICAgICAgICAiY2FjaGUiLCAicHJvamVjdHMiLCAiY2hlY2tGcmVxdWVuY3kiLAotICAgICAgICAgICAgNSwgVGltZVVuaXQuTUlOVVRFUyksIFRpbWVVbml0Lk1JTlVURVMpKTsKKyAgICB0aGlzKGNoZWNrRnJlcXVlbmN5KHNlcnZlckNvbmZpZykpOwogICB9CiAKICAgcHVibGljIFByb2plY3RDYWNoZUNsb2NrKGxvbmcgY2hlY2tGcmVxdWVuY3lNaWxsaXMpIHsKLSAgICBpZiAoMTAgPCBjaGVja0ZyZXF1ZW5jeU1pbGxpcykgeworICAgIGlmIChjaGVja0ZyZXF1ZW5jeU1pbGxpcyA9PSBMb25nLk1BWF9WQUxVRSkgeworICAgICAgLy8gU3RhcnQgd2l0aCBnZW5lcmF0aW9uIDEgKHRvIGF2b2lkIG1hZ2ljIDAgYmVsb3cpLgorICAgICAgLy8gRG8gbm90IGJlZ2luIGJhY2tncm91bmQgdGhyZWFkLCBkaXNhYmxpbmcgdGhlIGNsb2NrLgorICAgICAgZ2VuZXJhdGlvbiA9IDE7CisgICAgfSBlbHNlIGlmICgxMCA8IGNoZWNrRnJlcXVlbmN5TWlsbGlzKSB7CiAgICAgICAvLyBTdGFydCB3aXRoIGdlbmVyYXRpb24gMSAodG8gYXZvaWQgbWFnaWMgMCBiZWxvdykuCiAgICAgICBnZW5lcmF0aW9uID0gMTsKLSAgICAgIFRocmVhZEZhY3RvcnkgZmFjdG9yeSA9IG5ldyBUaHJlYWRGYWN0b3J5KCkgewotICAgICAgICBwcml2YXRlIGZpbmFsIEF0b21pY0ludGVnZXIgaWQgPSBuZXcgQXRvbWljSW50ZWdlcigpOwotCi0gICAgICAgIEBPdmVycmlkZQotICAgICAgICBwdWJsaWMgVGhyZWFkIG5ld1RocmVhZChSdW5uYWJsZSBydW5uYWJsZSkgewotICAgICAgICAgIFRocmVhZCB0aHJlYWQgPSBFeGVjdXRvcnMuZGVmYXVsdFRocmVhZEZhY3RvcnkoKS5uZXdUaHJlYWQocnVubmFibGUpOwotICAgICAgICAgIHRocmVhZC5zZXROYW1lKFN0cmluZy5mb3JtYXQoIlByb2plY3RDYWNoZUNsb2NrLSVkIiwgaWQuaW5jcmVtZW50QW5kR2V0KCkpKTsKLSAgICAgICAgICB0aHJlYWQuc2V0RGFlbW9uKHRydWUpOwotICAgICAgICAgIHRocmVhZC5zZXRQcmlvcml0eShUaHJlYWQuTUlOX1BSSU9SSVRZKTsKLSAgICAgICAgICByZXR1cm4gdGhyZWFkOwotICAgICAgICB9Ci0gICAgICB9OwotICAgICAgU2NoZWR1bGVkRXhlY3V0b3JTZXJ2aWNlIGV4ZWN1dG9yID0gRXhlY3V0b3JzLm5ld1NjaGVkdWxlZFRocmVhZFBvb2woMSwgZmFjdG9yeSk7CisgICAgICBTY2hlZHVsZWRFeGVjdXRvclNlcnZpY2UgZXhlY3V0b3IgPSBFeGVjdXRvcnMubmV3U2NoZWR1bGVkVGhyZWFkUG9vbCgKKyAgICAgICAgICAxLAorICAgICAgICAgIG5ldyBUaHJlYWRGYWN0b3J5QnVpbGRlcigpCisgICAgICAgICAgICAuc2V0TmFtZUZvcm1hdCgiUHJvamVjdENhY2hlQ2xvY2stJWQiKQorICAgICAgICAgICAgLnNldERhZW1vbih0cnVlKQorICAgICAgICAgICAgLnNldFByaW9yaXR5KFRocmVhZC5NSU5fUFJJT1JJVFkpCisgICAgICAgICAgICAuYnVpbGQoKSk7CiAgICAgICBleGVjdXRvci5zY2hlZHVsZUF0Rml4ZWRSYXRlKG5ldyBSdW5uYWJsZSgpIHsKICAgICAgICAgQE92ZXJyaWRlCiAgICAgICAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKQEAgLTc1LDQgKzY5LDE2IEBACiAgIGxvbmcgcmVhZCgpIHsKICAgICByZXR1cm4gZ2VuZXJhdGlvbjsKICAgfQorCisgIHByaXZhdGUgc3RhdGljIGxvbmcgY2hlY2tGcmVxdWVuY3koQ29uZmlnIHNlcnZlckNvbmZpZykgeworICAgIFN0cmluZyBmcmVxID0gc2VydmVyQ29uZmlnLmdldFN0cmluZygiY2FjaGUiLCAicHJvamVjdHMiLCAiY2hlY2tGcmVxdWVuY3kiKTsKKyAgICBpZiAoZnJlcSAhPSBudWxsCisgICAgICAgICYmICgiZGlzYWJsZWQiLmVxdWFsc0lnbm9yZUNhc2UoZnJlcSkgfHwgIm9mZiIuZXF1YWxzSWdub3JlQ2FzZShmcmVxKSkpIHsKKyAgICAgIHJldHVybiBMb25nLk1BWF9WQUxVRTsKKyAgICB9CisgICAgcmV0dXJuIFRpbWVVbml0Lk1JTExJU0VDT05EUy5jb252ZXJ0KAorICAgICAgICBDb25maWdVdGlsLmdldFRpbWVVbml0KHNlcnZlckNvbmZpZywKKyAgICAgICAgICAgICJjYWNoZSIsICJwcm9qZWN0cyIsICJjaGVja0ZyZXF1ZW5jeSIsCisgICAgICAgICAgICA1LCBUaW1lVW5pdC5NSU5VVEVTKSwgVGltZVVuaXQuTUlOVVRFUyk7CisgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q2FjaGVJbXBsLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdENhY2hlSW1wbC5qYXZhCmluZGV4IGE3ZmRiNGUuLjI3MmMxMjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0Q2FjaGVJbXBsLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RDYWNoZUltcGwuamF2YQpAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkNhY2hlTG9hZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNhY2hlLkxvYWRpbmdDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2FjaGUuQ2FjaGVNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BbGxQcm9qZWN0c05hbWU7CkBAIC0zNiw2ICszNyw3IEBACiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTm9TdWNoRWxlbWVudEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OwogaW1wb3J0IGphdmEudXRpbC5Tb3J0ZWRTZXQ7CiBpbXBvcnQgamF2YS51dGlsLmNvbmN1cnJlbnQuRXhlY3V0aW9uRXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LmxvY2tzLkxvY2s7CkBAIC0xNzEsNiArMTczLDE4IEBACiAgIH0KIAogICBAT3ZlcnJpZGUKKyAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZ3Vlc3NSZWxldmFudEdyb3VwVVVJRHMoKSB7CisgICAgU2V0PEFjY291bnRHcm91cC5VVUlEPiBncm91cHMgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICBmb3IgKFByb2plY3QuTmFtZUtleSBuIDogYWxsKCkpIHsKKyAgICAgIFByb2plY3RTdGF0ZSBwID0gYnlOYW1lLmdldElmUHJlc2VudChuLmdldCgpKTsKKyAgICAgIGlmIChwICE9IG51bGwpIHsKKyAgICAgICAgZ3JvdXBzLmFkZEFsbChwLmdldENvbmZpZygpLmdldEFsbEdyb3VwVVVJRHMoKSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBncm91cHM7CisgIH0KKworICBAT3ZlcnJpZGUKICAgcHVibGljIEl0ZXJhYmxlPFByb2plY3QuTmFtZUtleT4gYnlOYW1lKGZpbmFsIFN0cmluZyBwZngpIHsKICAgICBmaW5hbCBJdGVyYWJsZTxQcm9qZWN0Lk5hbWVLZXk+IHNyYzsKICAgICB0cnkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RDb250cm9sLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdENvbnRyb2wuamF2YQppbmRleCA1MTNmMWIxLi41NmQ0YmUzIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdENvbnRyb2wuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdENvbnRyb2wuamF2YQpAQCAtMjAsNiArMjAsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkNhcGFibGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQ29udHJpYnV0b3JBZ3JlZW1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBSZWZlcmVuY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb25SdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb25SdWxlLkFjdGlvbjsKQEAgLTEyMCwxMCArMTIxLDExIEBACiAgIHByaXZhdGUgZmluYWwgQ29sbGVjdGlvbjxDb250cmlidXRvckFncmVlbWVudD4gY29udHJpYnV0b3JBZ3JlZW1lbnRzOwogCiAgIHByaXZhdGUgTGlzdDxTZWN0aW9uTWF0Y2hlcj4gYWxsU2VjdGlvbnM7CisgIHByaXZhdGUgTGlzdDxTZWN0aW9uTWF0Y2hlcj4gbG9jYWxTZWN0aW9uczsKKyAgcHJpdmF0ZSBMYWJlbFR5cGVzIGxhYmVsVHlwZXM7CiAgIHByaXZhdGUgTWFwPFN0cmluZywgUmVmQ29udHJvbD4gcmVmQ29udHJvbHM7CiAgIHByaXZhdGUgQm9vbGVhbiBkZWNsYXJlZE93bmVyOwogCi0KICAgQEluamVjdAogICBQcm9qZWN0Q29udHJvbChAR2l0VXBsb2FkUGFja0dyb3VwcyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IHVwbG9hZEdyb3VwcywKICAgICAgIEBHaXRSZWNlaXZlUGFja0dyb3VwcyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IHJlY2VpdmVHcm91cHMsCkBAIC0xODAsNiArMTgyLDEzIEBACiAgICAgcmV0dXJuIHN0YXRlLmdldFByb2plY3QoKTsKICAgfQogCisgIHB1YmxpYyBMYWJlbFR5cGVzIGdldExhYmVsVHlwZXMoKSB7CisgICAgaWYgKGxhYmVsVHlwZXMgPT0gbnVsbCkgeworICAgICAgbGFiZWxUeXBlcyA9IHN0YXRlLmdldExhYmVsVHlwZXMoKTsKKyAgICB9CisgICAgcmV0dXJuIGxhYmVsVHlwZXM7CisgIH0KKwogICBwcml2YXRlIGJvb2xlYW4gaXNIaWRkZW4oKSB7CiAgICAgcmV0dXJuIGdldFByb2plY3QoKS5nZXRTdGF0ZSgpLmVxdWFscyhQcm9qZWN0LlN0YXRlLkhJRERFTik7CiAgIH0KQEAgLTIzMSwxNiArMjQwLDI0IEBACiAgICAgICBTdHJpbmcgcE5hbWUgPSBzdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOwogICAgICAgcmV0dXJuIG5ldyBDYXBhYmxlKCJVcGxvYWQgZGVuaWVkIGZvciBwcm9qZWN0ICciICsgcE5hbWUgKyAiJyIpOwogICAgIH0KLSAgICBQcm9qZWN0IHByb2plY3QgPSBzdGF0ZS5nZXRQcm9qZWN0KCk7Ci0gICAgaWYgKHByb2plY3QuaXNVc2VDb250cmlidXRvckFncmVlbWVudHMoKSkgeworICAgIGlmIChzdGF0ZS5pc1VzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cygpKSB7CiAgICAgICByZXR1cm4gdmVyaWZ5QWN0aXZlQ29udHJpYnV0b3JBZ3JlZW1lbnQoKTsKICAgICB9CiAgICAgcmV0dXJuIENhcGFibGUuT0s7CiAgIH0KIAogICBwdWJsaWMgU2V0PEdyb3VwUmVmZXJlbmNlPiBnZXRBbGxHcm91cHMoKSB7CisgICAgcmV0dXJuIGdldEdyb3VwcyhhY2Nlc3MoKSk7CisgIH0KKworICBwdWJsaWMgU2V0PEdyb3VwUmVmZXJlbmNlPiBnZXRMb2NhbEdyb3VwcygpIHsKKyAgICByZXR1cm4gZ2V0R3JvdXBzKGxvY2FsQWNjZXNzKCkpOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgU2V0PEdyb3VwUmVmZXJlbmNlPiBnZXRHcm91cHMoCisgICAgICBmaW5hbCBMaXN0PFNlY3Rpb25NYXRjaGVyPiBzZWN0aW9uTWF0Y2hlckxpc3QpIHsKICAgICBmaW5hbCBTZXQ8R3JvdXBSZWZlcmVuY2U+IGFsbCA9IG5ldyBIYXNoU2V0PEdyb3VwUmVmZXJlbmNlPigpOwotICAgIGZvciAoZmluYWwgU2VjdGlvbk1hdGNoZXIgbWF0Y2hlciA6IGFjY2VzcygpKSB7CisgICAgZm9yIChmaW5hbCBTZWN0aW9uTWF0Y2hlciBtYXRjaGVyIDogc2VjdGlvbk1hdGNoZXJMaXN0KSB7CiAgICAgICBmaW5hbCBBY2Nlc3NTZWN0aW9uIHNlY3Rpb24gPSBtYXRjaGVyLnNlY3Rpb247CiAgICAgICBmb3IgKGZpbmFsIFBlcm1pc3Npb24gcGVybWlzc2lvbiA6IHNlY3Rpb24uZ2V0UGVybWlzc2lvbnMoKSkgewogICAgICAgICBmb3IgKGZpbmFsIFBlcm1pc3Npb25SdWxlIHJ1bGUgOiBwZXJtaXNzaW9uLmdldFJ1bGVzKCkpIHsKQEAgLTM5Miw2ICs0MDksMTMgQEAKICAgICByZXR1cm4gYWxsU2VjdGlvbnM7CiAgIH0KIAorICBwcml2YXRlIExpc3Q8U2VjdGlvbk1hdGNoZXI+IGxvY2FsQWNjZXNzKCkgeworICAgIGlmIChsb2NhbFNlY3Rpb25zID09IG51bGwpIHsKKyAgICAgIGxvY2FsU2VjdGlvbnMgPSBzdGF0ZS5nZXRMb2NhbEFjY2Vzc1NlY3Rpb25zKCk7CisgICAgfQorICAgIHJldHVybiBsb2NhbFNlY3Rpb25zOworICB9CisKICAgYm9vbGVhbiBtYXRjaChQZXJtaXNzaW9uUnVsZSBydWxlKSB7CiAgICAgcmV0dXJuIG1hdGNoKHJ1bGUuZ2V0R3JvdXAoKS5nZXRVVUlEKCkpOwogICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdEhpZXJhcmNoeUl0ZXJhdG9yLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdEhpZXJhcmNoeUl0ZXJhdG9yLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMDcyNGNlOQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0SGllcmFyY2h5SXRlcmF0b3IuamF2YQpAQCAtMCwwICsxLDEwNyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5Kb2luZXI7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LlNldHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BbGxQcm9qZWN0c05hbWU7CisKK2ltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OworCitpbXBvcnQgamF2YS51dGlsLkl0ZXJhdG9yOworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5Ob1N1Y2hFbGVtZW50RXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5TZXQ7CisKKy8qKgorICogSXRlcmF0ZXMgZnJvbSBhIHByb2plY3QgdXAgdGhyb3VnaCBpdHMgcGFyZW50cyB0byBBbGwtUHJvamVjdHMuCisgKiA8cD4KKyAqIElmIGEgY3ljbGUgaXMgZGV0ZWN0ZWQgdGhlIGN5Y2xlIGlzIGJyb2tlbiBhbmQgQWxsLVByb2plY3RzIGlzIHZpc2l0ZWQuCisgKi8KK2NsYXNzIFByb2plY3RIaWVyYXJjaHlJdGVyYXRvciBpbXBsZW1lbnRzIEl0ZXJhdG9yPFByb2plY3RTdGF0ZT4geworICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoUHJvamVjdEhpZXJhcmNoeUl0ZXJhdG9yLmNsYXNzKTsKKworICBwcml2YXRlIGZpbmFsIFByb2plY3RDYWNoZSBjYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lOworICBwcml2YXRlIGZpbmFsIFNldDxQcm9qZWN0Lk5hbWVLZXk+IHNlZW47CisgIHByaXZhdGUgUHJvamVjdFN0YXRlIG5leHQ7CisKKyAgUHJvamVjdEhpZXJhcmNoeUl0ZXJhdG9yKFByb2plY3RDYWNoZSBjLAorICAgICAgQWxsUHJvamVjdHNOYW1lIGFsbCwKKyAgICAgIFByb2plY3RTdGF0ZSBmaXJzdFJlc3VsdCkgeworICAgIGNhY2hlID0gYzsKKyAgICBhbGxQcm9qZWN0c05hbWUgPSBhbGw7CisKKyAgICBzZWVuID0gU2V0cy5uZXdMaW5rZWRIYXNoU2V0KCk7CisgICAgc2Vlbi5hZGQoZmlyc3RSZXN1bHQuZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSk7CisgICAgbmV4dCA9IGZpcnN0UmVzdWx0OworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBib29sZWFuIGhhc05leHQoKSB7CisgICAgcmV0dXJuIG5leHQgIT0gbnVsbDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUHJvamVjdFN0YXRlIG5leHQoKSB7CisgICAgUHJvamVjdFN0YXRlIG4gPSBuZXh0OworICAgIGlmIChuID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBOb1N1Y2hFbGVtZW50RXhjZXB0aW9uKCk7CisgICAgfQorICAgIG5leHQgPSBjb21wdXRlTmV4dChuKTsKKyAgICByZXR1cm4gbjsKKyAgfQorCisgIHByaXZhdGUgUHJvamVjdFN0YXRlIGNvbXB1dGVOZXh0KFByb2plY3RTdGF0ZSBuKSB7CisgICAgUHJvamVjdC5OYW1lS2V5IHBhcmVudE5hbWUgPSBuLmdldFByb2plY3QoKS5nZXRQYXJlbnQoKTsKKyAgICBpZiAocGFyZW50TmFtZSAhPSBudWxsICYmIHZpc2l0KHBhcmVudE5hbWUpKSB7CisgICAgICBQcm9qZWN0U3RhdGUgcCA9IGNhY2hlLmdldChwYXJlbnROYW1lKTsKKyAgICAgIGlmIChwICE9IG51bGwpIHsKKyAgICAgICAgcmV0dXJuIHA7CisgICAgICB9CisgICAgfQorCisgICAgLy8gUGFyZW50IGRvZXMgbm90IGV4aXN0IG9yIHdhcyBhbHJlYWR5IHZpc2l0ZWQuCisgICAgLy8gRmFsbCBiYWNrIHRvIHZpc2l0IEFsbC1Qcm9qZWN0cyBleGFjdGx5IG9uY2UuCisgICAgaWYgKHNlZW4uYWRkKGFsbFByb2plY3RzTmFtZSkpIHsKKyAgICAgIHJldHVybiBjYWNoZS5nZXQoYWxsUHJvamVjdHNOYW1lKTsKKyAgICB9CisgICAgcmV0dXJuIG51bGw7CisgIH0KKworICBwcml2YXRlIGJvb2xlYW4gdmlzaXQoUHJvamVjdC5OYW1lS2V5IHBhcmVudE5hbWUpIHsKKyAgICBpZiAoc2Vlbi5hZGQocGFyZW50TmFtZSkpIHsKKyAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIExpc3Q8U3RyaW5nPiBvcmRlciA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShzZWVuLnNpemUoKSArIDEpOworICAgIGZvciAoUHJvamVjdC5OYW1lS2V5IHAgOiBzZWVuKSB7CisgICAgICBvcmRlci5hZGQocC5nZXQoKSk7CisgICAgfQorICAgIGludCBpZHggPSBvcmRlci5sYXN0SW5kZXhPZihwYXJlbnROYW1lLmdldCgpKTsKKyAgICBvcmRlci5hZGQocGFyZW50TmFtZS5nZXQoKSk7CisgICAgbG9nLndhcm4oIkN5Y2xlIGRldGVjdGVkIGluIHByb2plY3RzOiAiCisgICAgICAgICsgSm9pbmVyLm9uKCIgLT4gIikuam9pbihvcmRlci5zdWJMaXN0KGlkeCwgb3JkZXIuc2l6ZSgpKSkpOworICAgIHJldHVybiBmYWxzZTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgdm9pZCByZW1vdmUoKSB7CisgICAgdGhyb3cgbmV3IFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uKCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0SnNvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RKc29uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOGRiNWNiYgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0SnNvbi5qYXZhCkBAIC0wLDAgKzEsNjAgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVXJsOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQWxsUHJvamVjdHNOYW1lOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK3B1YmxpYyBjbGFzcyBQcm9qZWN0SnNvbiB7CisKKyAgcHJpdmF0ZSBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHM7CisKKyAgQEluamVjdAorICBQcm9qZWN0SnNvbihBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHMpIHsKKyAgICB0aGlzLmFsbFByb2plY3RzID0gYWxsUHJvamVjdHM7CisgIH0KKworICBwdWJsaWMgUHJvamVjdEluZm8gZm9ybWF0KFByb2plY3RSZXNvdXJjZSByc3JjKSB7CisgICAgcmV0dXJuIGZvcm1hdChyc3JjLmdldENvbnRyb2woKS5nZXRQcm9qZWN0KCkpOworICB9CisKKyAgcHVibGljIFByb2plY3RJbmZvIGZvcm1hdChQcm9qZWN0IHApIHsKKyAgICBQcm9qZWN0SW5mbyBpbmZvID0gbmV3IFByb2plY3RJbmZvKCk7CisgICAgaW5mby5uYW1lID0gcC5nZXROYW1lKCk7CisgICAgUHJvamVjdC5OYW1lS2V5IHBhcmVudE5hbWUgPSBwLmdldFBhcmVudChhbGxQcm9qZWN0cyk7CisgICAgaW5mby5wYXJlbnQgPSBwYXJlbnROYW1lICE9IG51bGwgPyBwYXJlbnROYW1lLmdldCgpIDogbnVsbDsKKyAgICBpbmZvLmRlc2NyaXB0aW9uID0gU3RyaW5ncy5lbXB0eVRvTnVsbChwLmdldERlc2NyaXB0aW9uKCkpOworICAgIGluZm8uZmluaXNoKCk7CisgICAgcmV0dXJuIGluZm87CisgIH0KKworICBwdWJsaWMgc3RhdGljIGNsYXNzIFByb2plY3RJbmZvIHsKKyAgICBwdWJsaWMgZmluYWwgU3RyaW5nIGtpbmQgPSAiZ2Vycml0Y29kZXJldmlldyNwcm9qZWN0IjsKKyAgICBwdWJsaWMgU3RyaW5nIGlkOworICAgIHB1YmxpYyBTdHJpbmcgbmFtZTsKKyAgICBwdWJsaWMgU3RyaW5nIHBhcmVudDsKKyAgICBwdWJsaWMgU3RyaW5nIGRlc2NyaXB0aW9uOworICAgIHB1YmxpYyBNYXA8U3RyaW5nLCBTdHJpbmc+IGJyYW5jaGVzOworCisgICAgdm9pZCBmaW5pc2goKSB7CisgICAgICBpZCA9IFVybC5lbmNvZGUobmFtZSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdFJlZi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RSZWYuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wMzE1ZmFkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RSZWYuamF2YQpAQCAtMCwwICsxLDQ1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKKworY2xhc3MgUHJvamVjdFJlZiB7CisKKyAgZmluYWwgUHJvamVjdC5OYW1lS2V5IHByb2plY3Q7CisgIGZpbmFsIFN0cmluZyByZWY7CisKKyAgUHJvamVjdFJlZihQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdCwgU3RyaW5nIHJlZikgeworICAgIHRoaXMucHJvamVjdCA9IHByb2plY3Q7CisgICAgdGhpcy5yZWYgPSByZWY7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIGJvb2xlYW4gZXF1YWxzKE9iamVjdCBvdGhlcikgeworICAgIHJldHVybiBvdGhlciBpbnN0YW5jZW9mIFByb2plY3RSZWYKKyAgICAgICAgJiYgcHJvamVjdC5lcXVhbHMoKChQcm9qZWN0UmVmKSBvdGhlcikucHJvamVjdCkKKyAgICAgICAgJiYgcmVmLmVxdWFscygoKFByb2plY3RSZWYpIG90aGVyKS5yZWYpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBpbnQgaGFzaENvZGUoKSB7CisgICAgcmV0dXJuIHByb2plY3QuaGFzaENvZGUoKSAqIDMxICsgcmVmLmhhc2hDb2RlKCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyB0b1N0cmluZygpIHsKKyAgICByZXR1cm4gcHJvamVjdCArICIsICIgKyByZWY7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0UmVzb3VyY2UuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0UmVzb3VyY2UuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hZWNhMGU4Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RSZXNvdXJjZS5qYXZhCkBAIC0wLDAgKzEsNDMgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0UmVzb3VyY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOworCitwdWJsaWMgY2xhc3MgUHJvamVjdFJlc291cmNlIGltcGxlbWVudHMgUmVzdFJlc291cmNlIHsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBUeXBlTGl0ZXJhbDxSZXN0VmlldzxQcm9qZWN0UmVzb3VyY2U+PiBQUk9KRUNUX0tJTkQgPQorICAgICAgbmV3IFR5cGVMaXRlcmFsPFJlc3RWaWV3PFByb2plY3RSZXNvdXJjZT4+KCkge307CisKKyAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Q29udHJvbCBjb250cm9sOworCisgIFByb2plY3RSZXNvdXJjZShQcm9qZWN0Q29udHJvbCBjb250cm9sKSB7CisgICAgdGhpcy5jb250cm9sID0gY29udHJvbDsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgZ2V0TmFtZSgpIHsKKyAgICByZXR1cm4gY29udHJvbC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpOworICB9CisKKyAgcHVibGljIFByb2plY3QuTmFtZUtleSBnZXROYW1lS2V5KCkgeworICAgIHJldHVybiBjb250cm9sLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCk7CisgIH0KKworICBwdWJsaWMgUHJvamVjdENvbnRyb2wgZ2V0Q29udHJvbCgpIHsKKyAgICByZXR1cm4gY29udHJvbDsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RTdGF0ZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1Byb2plY3RTdGF0ZS5qYXZhCmluZGV4IGUwNmM5NDguLjYxNTBhM2YgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0U3RhdGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdFN0YXRlLmphdmEKQEAgLTE0LDEzICsxNCwyMCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5GdW5jdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlByZWRpY2F0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BY2Nlc3NTZWN0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdyb3VwUmVmZXJlbmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvblJ1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5Jbmhlcml0YWJsZUJvb2xlYW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucnVsZXMuUHJvbG9nRW52aXJvbm1lbnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucnVsZXMuUnVsZXNDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CkBAIC0zOSwxMSArNDYsMTQgQEAKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OwogCiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OworaW1wb3J0IGphdmEudXRpbC5JdGVyYXRvcjsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIC8qKiBDYWNoZWQgaW5mb3JtYXRpb24gb24gYSBwcm9qZWN0LiAqLwpAQCAtNzYsNyArODYsNyBAQAogICBwcml2YXRlIGZpbmFsIENhcGFiaWxpdHlDb2xsZWN0aW9uIGNhcGFiaWxpdGllczsKIAogICBASW5qZWN0Ci0gIHByb3RlY3RlZCBQcm9qZWN0U3RhdGUoCisgIHB1YmxpYyBQcm9qZWN0U3RhdGUoCiAgICAgICBmaW5hbCBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlLAogICAgICAgZmluYWwgQWxsUHJvamVjdHNOYW1lIGFsbFByb2plY3RzTmFtZSwKICAgICAgIGZpbmFsIFByb2plY3RDb250cm9sLkFzc2lzdGVkRmFjdG9yeSBwcm9qZWN0Q29udHJvbEZhY3RvcnksCkBAIC0xNjUsNiArMTc1LDIwIEBACiAgICAgcmV0dXJuIGVudkZhY3RvcnkuY3JlYXRlKHBtYyk7CiAgIH0KIAorICAvKioKKyAgICogTGlrZSB7QGxpbmsgI25ld1Byb2xvZ0Vudmlyb25tZW50KCl9IGJ1dCBpbnN0ZWFkIG9mIHJlYWRpbmcgdGhlIHJ1bGVzLnBsCisgICAqIHJlYWQgdGhlIHByb3ZpZGVkIGlucHV0IHN0cmVhbS4KKyAgICoKKyAgICogQHBhcmFtIG5hbWUgYSBuYW1lIG9mIHRoZSBpbnB1dCBzdHJlYW0uIENvdWxkIGJlIGFueSBuYW1lLgorICAgKiBAcGFyYW0gaW4gSW5wdXRTdHJlYW0gdG8gcmVhZCBwcm9sb2cgcnVsZXMgZnJvbQorICAgKiBAdGhyb3dzIENvbXBpbGVFeGNlcHRpb24KKyAgICovCisgIHB1YmxpYyBQcm9sb2dFbnZpcm9ubWVudCBuZXdQcm9sb2dFbnZpcm9ubWVudChTdHJpbmcgbmFtZSwgSW5wdXRTdHJlYW0gaW4pCisgICAgICB0aHJvd3MgQ29tcGlsZUV4Y2VwdGlvbiB7CisgICAgUHJvbG9nTWFjaGluZUNvcHkgcG1jID0gcnVsZXNDYWNoZS5sb2FkTWFjaGluZShuYW1lLCBpbik7CisgICAgcmV0dXJuIGVudkZhY3RvcnkuY3JlYXRlKHBtYyk7CisgIH0KKwogICBwdWJsaWMgUHJvamVjdCBnZXRQcm9qZWN0KCkgewogICAgIHJldHVybiBjb25maWcuZ2V0UHJvamVjdCgpOwogICB9CkBAIC0xNzQsNyArMTk4LDcgQEAKICAgfQogCiAgIC8qKiBHZXQgdGhlIHNlY3Rpb25zIHRoYXQgcGVydGFpbiBvbmx5IHRvIHRoaXMgcHJvamVjdC4gKi8KLSAgcHJpdmF0ZSBMaXN0PFNlY3Rpb25NYXRjaGVyPiBnZXRMb2NhbEFjY2Vzc1NlY3Rpb25zKCkgeworICBMaXN0PFNlY3Rpb25NYXRjaGVyPiBnZXRMb2NhbEFjY2Vzc1NlY3Rpb25zKCkgewogICAgIExpc3Q8U2VjdGlvbk1hdGNoZXI+IHNtID0gbG9jYWxBY2Nlc3NTZWN0aW9uczsKICAgICBpZiAoc20gPT0gbnVsbCkgewogICAgICAgQ29sbGVjdGlvbjxBY2Nlc3NTZWN0aW9uPiBmcm9tQ29uZmlnID0gY29uZmlnLmdldEFjY2Vzc1NlY3Rpb25zKCk7CkBAIC0xOTIsNyArMjE2LDggQEAKICAgICAgICAgICBzZWN0aW9uLnNldFBlcm1pc3Npb25zKGNvcHkpOwogICAgICAgICB9CiAKLSAgICAgICAgU2VjdGlvbk1hdGNoZXIgbWF0Y2hlciA9IFNlY3Rpb25NYXRjaGVyLndyYXAoc2VjdGlvbik7CisgICAgICAgIFNlY3Rpb25NYXRjaGVyIG1hdGNoZXIgPSBTZWN0aW9uTWF0Y2hlci53cmFwKGdldFByb2plY3QoKS5nZXROYW1lS2V5KCksCisgICAgICAgICAgICBzZWN0aW9uKTsKICAgICAgICAgaWYgKG1hdGNoZXIgIT0gbnVsbCkgewogICAgICAgICAgIHNtLmFkZChtYXRjaGVyKTsKICAgICAgICAgfQpAQCAtMjEyLDIzICsyMzcsOSBAQAogICAgICAgcmV0dXJuIGdldExvY2FsQWNjZXNzU2VjdGlvbnMoKTsKICAgICB9CiAKLSAgICBMaXN0PFNlY3Rpb25NYXRjaGVyPiBhbGwgPSBuZXcgQXJyYXlMaXN0PFNlY3Rpb25NYXRjaGVyPigpOwotICAgIFNldDxQcm9qZWN0Lk5hbWVLZXk+IHNlZW4gPSBuZXcgSGFzaFNldDxQcm9qZWN0Lk5hbWVLZXk+KCk7Ci0gICAgUHJvamVjdFN0YXRlIGFsbFByb2plY3RzID0gcHJvamVjdENhY2hlLmdldEFsbFByb2plY3RzKCk7Ci0gICAgc2Vlbi5hZGQoZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKSk7Ci0KLSAgICBQcm9qZWN0U3RhdGUgcyA9IHRoaXM7Ci0gICAgZG8geworICAgIExpc3Q8U2VjdGlvbk1hdGNoZXI+IGFsbCA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIGZvciAoUHJvamVjdFN0YXRlIHMgOiB0cmVlKCkpIHsKICAgICAgIGFsbC5hZGRBbGwocy5nZXRMb2NhbEFjY2Vzc1NlY3Rpb25zKCkpOwotCi0gICAgICBQcm9qZWN0Lk5hbWVLZXkgcGFyZW50ID0gcy5nZXRQcm9qZWN0KCkuZ2V0UGFyZW50KCk7Ci0gICAgICBpZiAocGFyZW50ID09IG51bGwgfHwgIXNlZW4uYWRkKHBhcmVudCkpIHsKLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0gICAgICBzID0gcHJvamVjdENhY2hlLmdldChwYXJlbnQpOwotICAgIH0gd2hpbGUgKHMgIT0gbnVsbCk7Ci0gICAgaWYgKHNlZW4uYWRkKGFsbFByb2plY3RzLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpKSB7Ci0gICAgICBhbGwuYWRkQWxsKGFsbFByb2plY3RzLmdldExvY2FsQWNjZXNzU2VjdGlvbnMoKSk7CiAgICAgfQogICAgIHJldHVybiBhbGw7CiAgIH0KQEAgLTI0MCwxNiArMjUxLDExIEBACiAgICAqICAgICAgICAgdGhhdCBoYXMgbG9jYWwgb3duZXJzIGFyZSByZXR1cm5lZAogICAgKi8KICAgcHVibGljIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gZ2V0T3duZXJzKCkgewotICAgIFByb2plY3QuTmFtZUtleSBwYXJlbnROYW1lID0gZ2V0UHJvamVjdCgpLmdldFBhcmVudCgpOwotICAgIGlmICghbG9jYWxPd25lcnMuaXNFbXB0eSgpIHx8IHBhcmVudE5hbWUgPT0gbnVsbCB8fCBpc0FsbFByb2plY3RzKSB7Ci0gICAgICByZXR1cm4gbG9jYWxPd25lcnM7CisgICAgZm9yIChQcm9qZWN0U3RhdGUgcCA6IHRyZWUoKSkgeworICAgICAgaWYgKCFwLmxvY2FsT3duZXJzLmlzRW1wdHkoKSkgeworICAgICAgICByZXR1cm4gcC5sb2NhbE93bmVyczsKKyAgICAgIH0KICAgICB9Ci0KLSAgICBQcm9qZWN0U3RhdGUgcGFyZW50ID0gcHJvamVjdENhY2hlLmdldChwYXJlbnROYW1lKTsKLSAgICBpZiAocGFyZW50ICE9IG51bGwpIHsKLSAgICAgIHJldHVybiBwYXJlbnQuZ2V0T3duZXJzKCk7Ci0gICAgfQotCiAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5U2V0KCk7CiAgIH0KIApAQCAtMjU3LDIzICsyNjMsMTMgQEAKICAgICogQHJldHVybiB0cnVlIGlmIGFueSBvZiB0aGUgZ3JvdXBzIGxpc3RlZCBpbiB7QGNvZGUgZ3JvdXBzfSB3YXMgZGVjbGFyZWQgdG8KICAgICogICAgICAgICBiZSBhbiBvd25lciBvZiB0aGlzIHByb2plY3QsIG9yIG9uZSBvZiBpdHMgcGFyZW50IHByb2plY3RzLi4KICAgICovCi0gIGJvb2xlYW4gaXNPd25lcihHcm91cE1lbWJlcnNoaXAgZ3JvdXBzKSB7Ci0gICAgU2V0PFByb2plY3QuTmFtZUtleT4gc2VlbiA9IG5ldyBIYXNoU2V0PFByb2plY3QuTmFtZUtleT4oKTsKLSAgICBzZWVuLmFkZChnZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpKTsKLQotICAgIFByb2plY3RTdGF0ZSBzID0gdGhpczsKLSAgICBkbyB7Ci0gICAgICBpZiAoZ3JvdXBzLmNvbnRhaW5zQW55T2Yocy5sb2NhbE93bmVycykpIHsKLSAgICAgICAgcmV0dXJuIHRydWU7CisgIGJvb2xlYW4gaXNPd25lcihmaW5hbCBHcm91cE1lbWJlcnNoaXAgZ3JvdXBzKSB7CisgICAgcmV0dXJuIEl0ZXJhYmxlcy5hbnkodHJlZSgpLCBuZXcgUHJlZGljYXRlPFByb2plY3RTdGF0ZT4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBib29sZWFuIGFwcGx5KFByb2plY3RTdGF0ZSBpbikgeworICAgICAgICByZXR1cm4gZ3JvdXBzLmNvbnRhaW5zQW55T2YoaW4ubG9jYWxPd25lcnMpOwogICAgICAgfQotCi0gICAgICBQcm9qZWN0Lk5hbWVLZXkgcGFyZW50ID0gcy5nZXRQcm9qZWN0KCkuZ2V0UGFyZW50KCk7Ci0gICAgICBpZiAocGFyZW50ID09IG51bGwgfHwgIXNlZW4uYWRkKHBhcmVudCkpIHsKLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0gICAgICBzID0gcHJvamVjdENhY2hlLmdldChwYXJlbnQpOwotICAgIH0gd2hpbGUgKHMgIT0gbnVsbCk7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIH0pOwogICB9CiAKICAgcHVibGljIFByb2plY3RDb250cm9sIGNvbnRyb2xGb3IoZmluYWwgQ3VycmVudFVzZXIgdXNlcikgewpAQCAtMjgxLDE4ICsyNzcsMTA0IEBACiAgIH0KIAogICAvKioKLSAgICogQHJldHVybiBQcm9qZWN0U3RhdGUgb2YgcHJvamVjdCdzIHBhcmVudC4gSWYgdGhlIHByb2plY3QgZG9lcyBub3QgaGF2ZSBhCi0gICAqICAgICAgICAgcGFyZW50LCByZXR1cm4gc3RhdGUgb2YgdGhlIHRvcCBsZXZlbCBwcm9qZWN0LCBBbGwtUHJvamVjdHMuIElmCi0gICAqICAgICAgICAgdGhpcyBwcm9qZWN0IGlzIEFsbC1Qcm9qZWN0cywgcmV0dXJuIG51bGwuCisgICAqIEByZXR1cm4gYW4gaXRlcmFibGUgdGhhdCB3YWxrcyB0aHJvdWdoIHRoaXMgcHJvamVjdCBhbmQgdGhlbiB0aGUgcGFyZW50cyBvZgorICAgKiAgICAgICAgIHRoaXMgcHJvamVjdC4gU3RhcnRzIGZyb20gdGhpcyBwcm9qZWN0IGFuZCBwcm9ncmVzc2VzIHVwIHRoZQorICAgKiAgICAgICAgIGhpZXJhcmNoeSB0byBBbGwtUHJvamVjdHMuCiAgICAqLwotICBwdWJsaWMgUHJvamVjdFN0YXRlIGdldFBhcmVudFN0YXRlKCkgewotICAgIGlmIChpc0FsbFByb2plY3RzKSB7Ci0gICAgICByZXR1cm4gbnVsbDsKLSAgICB9Ci0gICAgcmV0dXJuIHByb2plY3RDYWNoZS5nZXQoZ2V0UHJvamVjdCgpLmdldFBhcmVudChhbGxQcm9qZWN0c05hbWUpKTsKKyAgcHVibGljIEl0ZXJhYmxlPFByb2plY3RTdGF0ZT4gdHJlZSgpIHsKKyAgICByZXR1cm4gbmV3IEl0ZXJhYmxlPFByb2plY3RTdGF0ZT4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBJdGVyYXRvcjxQcm9qZWN0U3RhdGU+IGl0ZXJhdG9yKCkgeworICAgICAgICByZXR1cm4gbmV3IFByb2plY3RIaWVyYXJjaHlJdGVyYXRvcigKKyAgICAgICAgICAgIHByb2plY3RDYWNoZSwgYWxsUHJvamVjdHNOYW1lLAorICAgICAgICAgICAgUHJvamVjdFN0YXRlLnRoaXMpOworICAgICAgfQorICAgIH07CisgIH0KKworICAvKioKKyAgICogQHJldHVybiBhbiBpdGVyYWJsZSB0aGF0IHdhbGtzIHRocm91Z2ggdGhlIHBhcmVudHMgb2YgdGhpcyBwcm9qZWN0LiBTdGFydHMKKyAgICogICAgICAgICBmcm9tIHRoZSBpbW1lZGlhdGUgcGFyZW50IG9mIHRoaXMgcHJvamVjdCBhbmQgcHJvZ3Jlc3NlcyB1cCB0aGUKKyAgICogICAgICAgICBoaWVyYXJjaHkgdG8gQWxsLVByb2plY3RzLgorICAgKi8KKyAgcHVibGljIEl0ZXJhYmxlPFByb2plY3RTdGF0ZT4gcGFyZW50cygpIHsKKyAgICByZXR1cm4gSXRlcmFibGVzLnNraXAodHJlZSgpLCAxKTsKICAgfQogCiAgIHB1YmxpYyBib29sZWFuIGlzQWxsUHJvamVjdHMoKSB7CiAgICAgcmV0dXJuIGlzQWxsUHJvamVjdHM7CiAgIH0KLX0KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCisKKyAgcHVibGljIGJvb2xlYW4gaXNVc2VDb250cmlidXRvckFncmVlbWVudHMoKSB7CisgICAgcmV0dXJuIGdldEluaGVyaXRhYmxlQm9vbGVhbihuZXcgRnVuY3Rpb248UHJvamVjdCwgSW5oZXJpdGFibGVCb29sZWFuPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIEluaGVyaXRhYmxlQm9vbGVhbiBhcHBseShQcm9qZWN0IGlucHV0KSB7CisgICAgICAgIHJldHVybiBpbnB1dC5nZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGlzVXNlQ29udGVudE1lcmdlKCkgeworICAgIHJldHVybiBnZXRJbmhlcml0YWJsZUJvb2xlYW4obmV3IEZ1bmN0aW9uPFByb2plY3QsIEluaGVyaXRhYmxlQm9vbGVhbj4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBJbmhlcml0YWJsZUJvb2xlYW4gYXBwbHkoUHJvamVjdCBpbnB1dCkgeworICAgICAgICByZXR1cm4gaW5wdXQuZ2V0VXNlQ29udGVudE1lcmdlKCk7CisgICAgICB9CisgICAgfSk7CisgIH0KKworICBwdWJsaWMgYm9vbGVhbiBpc1VzZVNpZ25lZE9mZkJ5KCkgeworICAgIHJldHVybiBnZXRJbmhlcml0YWJsZUJvb2xlYW4obmV3IEZ1bmN0aW9uPFByb2plY3QsIEluaGVyaXRhYmxlQm9vbGVhbj4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBJbmhlcml0YWJsZUJvb2xlYW4gYXBwbHkoUHJvamVjdCBpbnB1dCkgeworICAgICAgICByZXR1cm4gaW5wdXQuZ2V0VXNlU2lnbmVkT2ZmQnkoKTsKKyAgICAgIH0KKyAgICB9KTsKKyAgfQorCisgIHB1YmxpYyBib29sZWFuIGlzUmVxdWlyZUNoYW5nZUlEKCkgeworICAgIHJldHVybiBnZXRJbmhlcml0YWJsZUJvb2xlYW4obmV3IEZ1bmN0aW9uPFByb2plY3QsIEluaGVyaXRhYmxlQm9vbGVhbj4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBJbmhlcml0YWJsZUJvb2xlYW4gYXBwbHkoUHJvamVjdCBpbnB1dCkgeworICAgICAgICByZXR1cm4gaW5wdXQuZ2V0UmVxdWlyZUNoYW5nZUlEKCk7CisgICAgICB9CisgICAgfSk7CisgIH0KKworICBwdWJsaWMgTGFiZWxUeXBlcyBnZXRMYWJlbFR5cGVzKCkgeworICAgIE1hcDxTdHJpbmcsIExhYmVsVHlwZT4gdHlwZXMgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKKyAgICBMaXN0PFByb2plY3RTdGF0ZT4gcHJvamVjdHMgPSBMaXN0cy5uZXdBcnJheUxpc3QodHJlZSgpKTsKKyAgICBDb2xsZWN0aW9ucy5yZXZlcnNlKHByb2plY3RzKTsKKyAgICBmb3IgKFByb2plY3RTdGF0ZSBzIDogcHJvamVjdHMpIHsKKyAgICAgIGZvciAoTGFiZWxUeXBlIHR5cGUgOiBzLmdldENvbmZpZygpLmdldExhYmVsU2VjdGlvbnMoKS52YWx1ZXMoKSkgeworICAgICAgICBTdHJpbmcgbG93ZXIgPSB0eXBlLmdldE5hbWUoKS50b0xvd2VyQ2FzZSgpOworICAgICAgICBMYWJlbFR5cGUgb2xkID0gdHlwZXMuZ2V0KGxvd2VyKTsKKyAgICAgICAgaWYgKG9sZCA9PSBudWxsIHx8IG9sZC5jYW5PdmVycmlkZSgpKSB7CisgICAgICAgICAgdHlwZXMucHV0KGxvd2VyLCB0eXBlKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgICBMaXN0PExhYmVsVHlwZT4gYWxsID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KHR5cGVzLnNpemUoKSk7CisgICAgZm9yIChMYWJlbFR5cGUgdHlwZSA6IHR5cGVzLnZhbHVlcygpKSB7CisgICAgICBpZiAoIXR5cGUuZ2V0VmFsdWVzKCkuaXNFbXB0eSgpKSB7CisgICAgICAgIGFsbC5hZGQodHlwZSk7CisgICAgICB9CisgICAgfQorICAgIHJldHVybiBuZXcgTGFiZWxUeXBlcyhDb2xsZWN0aW9ucy51bm1vZGlmaWFibGVMaXN0KGFsbCkpOworICB9CisKKyAgcHJpdmF0ZSBib29sZWFuIGdldEluaGVyaXRhYmxlQm9vbGVhbihGdW5jdGlvbjxQcm9qZWN0LCBJbmhlcml0YWJsZUJvb2xlYW4+IGZ1bmMpIHsKKyAgICBmb3IgKFByb2plY3RTdGF0ZSBzIDogdHJlZSgpKSB7CisgICAgICBzd2l0Y2ggKGZ1bmMuYXBwbHkocy5nZXRQcm9qZWN0KCkpKSB7CisgICAgICAgIGNhc2UgVFJVRToKKyAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgY2FzZSBGQUxTRToKKyAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGNhc2UgSU5IRVJJVDoKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICBjb250aW51ZTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdHNDb2xsZWN0aW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUHJvamVjdHNDb2xsZWN0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGMwMDQzOQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9Qcm9qZWN0c0NvbGxlY3Rpb24uamF2YQpAQCAtMCwwICsxLDEwOSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZWdpc3RyYXRpb24uRHluYW1pY01hcDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQWNjZXB0c0NyZWF0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuSWRTdHJpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVG9wTGV2ZWxSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLk91dHB1dEZvcm1hdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CisKK3B1YmxpYyBjbGFzcyBQcm9qZWN0c0NvbGxlY3Rpb24gaW1wbGVtZW50cworICAgIFJlc3RDb2xsZWN0aW9uPFRvcExldmVsUmVzb3VyY2UsIFByb2plY3RSZXNvdXJjZT4sCisgICAgQWNjZXB0c0NyZWF0ZTxUb3BMZXZlbFJlc291cmNlPiB7CisgIHByaXZhdGUgZmluYWwgRHluYW1pY01hcDxSZXN0VmlldzxQcm9qZWN0UmVzb3VyY2U+PiB2aWV3czsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxMaXN0UHJvamVjdHM+IGxpc3Q7CisgIHByaXZhdGUgZmluYWwgUHJvamVjdENvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgY29udHJvbEZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IHVzZXI7CisgIHByaXZhdGUgZmluYWwgQ3JlYXRlUHJvamVjdC5GYWN0b3J5IGNyZWF0ZVByb2plY3RGYWN0b3J5OworCisgIEBJbmplY3QKKyAgUHJvamVjdHNDb2xsZWN0aW9uKER5bmFtaWNNYXA8UmVzdFZpZXc8UHJvamVjdFJlc291cmNlPj4gdmlld3MsCisgICAgICBQcm92aWRlcjxMaXN0UHJvamVjdHM+IGxpc3QsCisgICAgICBQcm9qZWN0Q29udHJvbC5HZW5lcmljRmFjdG9yeSBjb250cm9sRmFjdG9yeSwKKyAgICAgIENyZWF0ZVByb2plY3QuRmFjdG9yeSBmYWN0b3J5LCBQcm92aWRlcjxDdXJyZW50VXNlcj4gdXNlcikgeworICAgIHRoaXMudmlld3MgPSB2aWV3czsKKyAgICB0aGlzLmxpc3QgPSBsaXN0OworICAgIHRoaXMuY29udHJvbEZhY3RvcnkgPSBjb250cm9sRmFjdG9yeTsKKyAgICB0aGlzLnVzZXIgPSB1c2VyOworICAgIHRoaXMuY3JlYXRlUHJvamVjdEZhY3RvcnkgPSBmYWN0b3J5OworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBSZXN0VmlldzxUb3BMZXZlbFJlc291cmNlPiBsaXN0KCkgeworICAgIHJldHVybiBsaXN0LmdldCgpLnNldEZvcm1hdChPdXRwdXRGb3JtYXQuSlNPTik7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFByb2plY3RSZXNvdXJjZSBwYXJzZShUb3BMZXZlbFJlc291cmNlIHBhcmVudCwgSWRTdHJpbmcgaWQpCisgICAgICB0aHJvd3MgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiB7CisgICAgUHJvamVjdFJlc291cmNlIHJzcmMgPSBfcGFyc2UoaWQuZ2V0KCkpOworICAgIGlmIChyc3JjID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGlkKTsKKyAgICB9CisgICAgcmV0dXJuIHJzcmM7CisgIH0KKworICAvKioKKyAgICogUGFyc2VzIGEgcHJvamVjdCBJRCBmcm9tIGEgcmVxdWVzdCBib2R5IGFuZCByZXR1cm5zIHRoZSBwcm9qZWN0LgorICAgKgorICAgKiBAcGFyYW0gaWQgSUQgb2YgdGhlIHByb2plY3QsIGNhbiBiZSBhIHByb2plY3QgbmFtZQorICAgKiBAcmV0dXJuIHRoZSBwcm9qZWN0CisgICAqIEB0aHJvd3MgVW5wcm9jZXNzYWJsZUVudGl0eUV4Y2VwdGlvbiB0aHJvd24gaWYgdGhlIHByb2plY3QgSUQgY2Fubm90IGJlCisgICAqICAgICAgICAgcmVzb2x2ZWQgb3IgaWYgdGhlIHByb2plY3QgaXMgbm90IHZpc2libGUgdG8gdGhlIGNhbGxpbmcgdXNlcgorICAgKi8KKyAgcHVibGljIFByb2plY3RSZXNvdXJjZSBwYXJzZShTdHJpbmcgaWQpIHRocm93cyBVbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uIHsKKyAgICBQcm9qZWN0UmVzb3VyY2UgcnNyYyA9IF9wYXJzZShpZCk7CisgICAgaWYgKHJzcmMgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAiUHJvamVjdCBOb3QgRm91bmQ6ICVzIiwgaWQpKTsKKyAgICB9CisgICAgcmV0dXJuIHJzcmM7CisgIH0KKworICBwcml2YXRlIFByb2plY3RSZXNvdXJjZSBfcGFyc2UoU3RyaW5nIGlkKSB7CisgICAgUHJvamVjdENvbnRyb2wgY3RsOworICAgIHRyeSB7CisgICAgICBjdGwgPSBjb250cm9sRmFjdG9yeS5jb250cm9sRm9yKAorICAgICAgICAgIG5ldyBQcm9qZWN0Lk5hbWVLZXkoaWQpLAorICAgICAgICAgIHVzZXIuZ2V0KCkpOworICAgIH0gY2F0Y2ggKE5vU3VjaFByb2plY3RFeGNlcHRpb24gZSkgeworICAgICAgcmV0dXJuIG51bGw7CisgICAgfQorICAgIGlmICghY3RsLmlzVmlzaWJsZSgpICYmICFjdGwuaXNPd25lcigpKSB7CisgICAgICByZXR1cm4gbnVsbDsKKyAgICB9CisgICAgcmV0dXJuIG5ldyBQcm9qZWN0UmVzb3VyY2UoY3RsKTsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgRHluYW1pY01hcDxSZXN0VmlldzxQcm9qZWN0UmVzb3VyY2U+PiB2aWV3cygpIHsKKyAgICByZXR1cm4gdmlld3M7CisgIH0KKworICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBDcmVhdGVQcm9qZWN0IGNyZWF0ZShUb3BMZXZlbFJlc291cmNlIHBhcmVudCwgSWRTdHJpbmcgbmFtZSkgeworICAgIHJldHVybiBjcmVhdGVQcm9qZWN0RmFjdG9yeS5jcmVhdGUobmFtZS5nZXQoKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9QdXREZXNjcmlwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1B1dERlc2NyaXB0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjdkZDNjYgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9QdXREZXNjcmlwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMTA3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLk9iamVjdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5BdXRoRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5CYWRSZXF1ZXN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5EZWZhdWx0SW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlTm90Rm91bmRFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3BvbnNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0Lk1ldGFEYXRhVXBkYXRlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUHJvamVjdENvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5QdXREZXNjcmlwdGlvbi5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmVycm9ycy5Db25maWdJbnZhbGlkRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CisKK2NsYXNzIFB1dERlc2NyaXB0aW9uIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8UHJvamVjdFJlc291cmNlLCBJbnB1dD4geworICBzdGF0aWMgY2xhc3MgSW5wdXQgeworICAgIEBEZWZhdWx0SW5wdXQKKyAgICBTdHJpbmcgZGVzY3JpcHRpb247CisgICAgU3RyaW5nIGNvbW1pdE1lc3NhZ2U7CisgIH0KKworICBwcml2YXRlIGZpbmFsIFByb2plY3RDYWNoZSBjYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBNZXRhRGF0YVVwZGF0ZS5TZXJ2ZXIgdXBkYXRlRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBnaXRNZ3I7CisKKyAgQEluamVjdAorICBQdXREZXNjcmlwdGlvbihQcm9qZWN0Q2FjaGUgY2FjaGUsCisgICAgICBNZXRhRGF0YVVwZGF0ZS5TZXJ2ZXIgdXBkYXRlRmFjdG9yeSwKKyAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIGdpdE1ncikgeworICAgIHRoaXMuY2FjaGUgPSBjYWNoZTsKKyAgICB0aGlzLnVwZGF0ZUZhY3RvcnkgPSB1cGRhdGVGYWN0b3J5OworICAgIHRoaXMuZ2l0TWdyID0gZ2l0TWdyOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPYmplY3QgYXBwbHkoUHJvamVjdFJlc291cmNlIHJlc291cmNlLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgSU9FeGNlcHRpb24geworICAgIGlmIChpbnB1dCA9PSBudWxsKSB7CisgICAgICBpbnB1dCA9IG5ldyBJbnB1dCgpOyAvLyBEZWxldGUgd291bGQgc2V0IGRlc2NyaXB0aW9uIHRvIG51bGwuCisgICAgfQorCisgICAgUHJvamVjdENvbnRyb2wgY3RsID0gcmVzb3VyY2UuZ2V0Q29udHJvbCgpOworICAgIElkZW50aWZpZWRVc2VyIHVzZXIgPSAoSWRlbnRpZmllZFVzZXIpIGN0bC5nZXRDdXJyZW50VXNlcigpOworICAgIGlmICghY3RsLmlzT3duZXIoKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oIm5vdCBwcm9qZWN0IG93bmVyIik7CisgICAgfQorCisgICAgdHJ5IHsKKyAgICAgIE1ldGFEYXRhVXBkYXRlIG1kID0gdXBkYXRlRmFjdG9yeS5jcmVhdGUocmVzb3VyY2UuZ2V0TmFtZUtleSgpKTsKKyAgICAgIHRyeSB7CisgICAgICAgIFByb2plY3RDb25maWcgY29uZmlnID0gUHJvamVjdENvbmZpZy5yZWFkKG1kKTsKKyAgICAgICAgUHJvamVjdCBwcm9qZWN0ID0gY29uZmlnLmdldFByb2plY3QoKTsKKyAgICAgICAgcHJvamVjdC5zZXREZXNjcmlwdGlvbihTdHJpbmdzLmVtcHR5VG9OdWxsKGlucHV0LmRlc2NyaXB0aW9uKSk7CisKKyAgICAgICAgU3RyaW5nIG1zZyA9IE9iamVjdHMuZmlyc3ROb25OdWxsKAorICAgICAgICAgIFN0cmluZ3MuZW1wdHlUb051bGwoaW5wdXQuY29tbWl0TWVzc2FnZSksCisgICAgICAgICAgIlVwZGF0ZWQgZGVzY3JpcHRpb24uXG4iKTsKKyAgICAgICAgaWYgKCFtc2cuZW5kc1dpdGgoIlxuIikpIHsKKyAgICAgICAgICBtc2cgKz0gIlxuIjsKKyAgICAgICAgfQorICAgICAgICBtZC5zZXRBdXRob3IodXNlcik7CisgICAgICAgIG1kLnNldE1lc3NhZ2UobXNnKTsKKyAgICAgICAgY29uZmlnLmNvbW1pdChtZCk7CisgICAgICAgIGNhY2hlLmV2aWN0KGN0bC5nZXRQcm9qZWN0KCkpOworICAgICAgICBnaXRNZ3Iuc2V0UHJvamVjdERlc2NyaXB0aW9uKAorICAgICAgICAgICAgcmVzb3VyY2UuZ2V0TmFtZUtleSgpLAorICAgICAgICAgICAgcHJvamVjdC5nZXREZXNjcmlwdGlvbigpKTsKKworICAgICAgICByZXR1cm4gU3RyaW5ncy5pc051bGxPckVtcHR5KHByb2plY3QuZ2V0RGVzY3JpcHRpb24oKSkKKyAgICAgICAgICAgID8gUmVzcG9uc2Uubm9uZSgpCisgICAgICAgICAgICA6IHByb2plY3QuZ2V0RGVzY3JpcHRpb24oKTsKKyAgICAgIH0gZmluYWxseSB7CisgICAgICAgIG1kLmNsb3NlKCk7CisgICAgICB9CisgICAgfSBjYXRjaCAoUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uIG5vdEZvdW5kKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihyZXNvdXJjZS5nZXROYW1lKCkpOworICAgIH0gY2F0Y2ggKENvbmZpZ0ludmFsaWRFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAiaW52YWxpZCBwcm9qZWN0LmNvbmZpZzogJXMiLCBlLmdldE1lc3NhZ2UoKSkpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1B1dFByb2plY3QuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9QdXRQcm9qZWN0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGE5NmNiNQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9QdXRQcm9qZWN0LmphdmEKQEAgLTAsMCArMSwyOCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc291cmNlQ29uZmxpY3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNyZWF0ZVByb2plY3QuSW5wdXQ7CisKK3B1YmxpYyBjbGFzcyBQdXRQcm9qZWN0IGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8UHJvamVjdFJlc291cmNlLCBJbnB1dD4geworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShQcm9qZWN0UmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgdGhyb3dzIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24geworICAgIHRocm93IG5ldyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uKCJQcm9qZWN0IFwiIiArIHJlc291cmNlLmdldE5hbWUoKQorICAgICAgICArICJcIiBhbHJlYWR5IGV4aXN0cyIpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1JlZkNvbnRyb2wuamF2YQppbmRleCBhNjE4MmQxLi41OWI3NjcwIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SZWZDb250cm9sLmphdmEKQEAgLTE0LDEyICsxNCwxNSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuU2V0czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BY2Nlc3NTZWN0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvblJhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb25SdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlJlZkNvbmZpZ1NlY3Rpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5JbnZhbGlkTmFtZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CkBAIC00MSw2ICs0NCw3IEBACiBpbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiAKIC8qKiBNYW5hZ2VzIGFjY2VzcyBjb250cm9sIGZvciBHaXQgcmVmZXJlbmNlcyAoYWthIGJyYW5jaGVzLCB0YWdzKS4gKi8KQEAgLTU3LDYgKzYxLDcgQEAKICAgcHJpdmF0ZSBCb29sZWFuIG93bmVyOwogICBwcml2YXRlIEJvb2xlYW4gY2FuRm9yZ2VBdXRob3I7CiAgIHByaXZhdGUgQm9vbGVhbiBjYW5Gb3JnZUNvbW1pdHRlcjsKKyAgcHJpdmF0ZSBCb29sZWFuIGlzVmlzaWJsZTsKIAogICBSZWZDb250cm9sKFByb2plY3RDb250cm9sIHByb2plY3RDb250cm9sLCBTdHJpbmcgcmVmLAogICAgICAgUGVybWlzc2lvbkNvbGxlY3Rpb24gcmVsZXZhbnQpIHsKQEAgLTEwMiw4ICsxMDcsMzEgQEAKIAogICAvKiogQ2FuIHRoaXMgdXNlciBzZWUgdGhpcyByZWZlcmVuY2UgZXhpc3RzPyAqLwogICBwdWJsaWMgYm9vbGVhbiBpc1Zpc2libGUoKSB7Ci0gICAgcmV0dXJuIChnZXRDdXJyZW50VXNlcigpIGluc3RhbmNlb2YgSW50ZXJuYWxVc2VyIHx8IGNhblBlcmZvcm0oUGVybWlzc2lvbi5SRUFEKSkKLSAgICAgICAgJiYgY2FuUmVhZCgpOworICAgIGlmIChpc1Zpc2libGUgPT0gbnVsbCkgeworICAgICAgaXNWaXNpYmxlID0KKyAgICAgICAgICAoZ2V0Q3VycmVudFVzZXIoKSBpbnN0YW5jZW9mIEludGVybmFsVXNlciB8fCBjYW5QZXJmb3JtKFBlcm1pc3Npb24uUkVBRCkpCisgICAgICAgICAgICAgICYmIGNhblJlYWQoKTsKKyAgICB9CisgICAgcmV0dXJuIGlzVmlzaWJsZTsKKyAgfQorCisgIC8qKgorICAgKiBUcnVlIGlmIHRoaXMgcmVmZXJlbmNlIGlzIHZpc2libGUgYnkgYWxsIFJFR0lTVEVSRURfVVNFUlMKKyAgICovCisgIHB1YmxpYyBib29sZWFuIGlzVmlzaWJsZUJ5UmVnaXN0ZXJlZFVzZXJzKCkgeworICAgIExpc3Q8UGVybWlzc2lvblJ1bGU+IGFjY2VzcyA9IHJlbGV2YW50LmdldFBlcm1pc3Npb24oUGVybWlzc2lvbi5SRUFEKTsKKyAgICBTZXQ8UHJvamVjdFJlZj4gYWxsb3dzID0gU2V0cy5uZXdIYXNoU2V0KCk7CisgICAgU2V0PFByb2plY3RSZWY+IGJsb2NrcyA9IFNldHMubmV3SGFzaFNldCgpOworICAgIGZvciAoUGVybWlzc2lvblJ1bGUgcnVsZSA6IGFjY2VzcykgeworICAgICAgaWYgKHJ1bGUuaXNCbG9jaygpKSB7CisgICAgICAgIGJsb2Nrcy5hZGQocmVsZXZhbnQuZ2V0UnVsZVByb3BzKHJ1bGUpKTsKKyAgICAgIH0gZWxzZSBpZiAocnVsZS5nZXRHcm91cCgpLmdldFVVSUQoKS5lcXVhbHMoQWNjb3VudEdyb3VwLkFOT05ZTU9VU19VU0VSUykKKyAgICAgICAgICB8fCBydWxlLmdldEdyb3VwKCkuZ2V0VVVJRCgpLmVxdWFscyhBY2NvdW50R3JvdXAuUkVHSVNURVJFRF9VU0VSUykpIHsKKyAgICAgICAgYWxsb3dzLmFkZChyZWxldmFudC5nZXRSdWxlUHJvcHMocnVsZSkpOworICAgICAgfQorICAgIH0KKyAgICBibG9ja3MucmVtb3ZlQWxsKGFsbG93cyk7CisgICAgcmV0dXJuIGJsb2Nrcy5pc0VtcHR5KCkgJiYgIWFsbG93cy5pc0VtcHR5KCk7CiAgIH0KIAogICAvKioKQEAgLTE5MywxNiArMjIxLDcgQEAKICAgICAgIC8vIGdyYW50aW5nIG9mIHBvd2VycyBiZXlvbmQgcHVzaGluZyB0byB0aGUgY29uZmlndXJhdGlvbi4KICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0gICAgYm9vbGVhbiByZXN1bHQgPSBmYWxzZTsKLSAgICBmb3IgKFBlcm1pc3Npb25SdWxlIHJ1bGUgOiBhY2Nlc3MoUGVybWlzc2lvbi5QVVNIKSkgewotICAgICAgaWYgKHJ1bGUuaXNCbG9jaygpKSB7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgIH0KLSAgICAgIGlmIChydWxlLmdldEZvcmNlKCkpIHsKLSAgICAgICAgcmVzdWx0ID0gdHJ1ZTsKLSAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gY2FuRm9yY2VQZXJmb3JtKFBlcm1pc3Npb24uUFVTSCk7CiAgIH0KIAogICAvKioKQEAgLTIxOCw3ICsyMzcsOCBAQAogICAgIH0KICAgICBib29sZWFuIG93bmVyOwogICAgIHN3aXRjaCAoZ2V0Q3VycmVudFVzZXIoKS5nZXRBY2Nlc3NQYXRoKCkpIHsKLSAgICAgIGNhc2UgV0VCX1VJOgorICAgICAgY2FzZSBSRVNUX0FQSToKKyAgICAgIGNhc2UgSlNPTl9SUEM6CiAgICAgICAgIG93bmVyID0gaXNPd25lcigpOwogICAgICAgICBicmVhazsKIApAQCAtMjU4LDExICsyNzgsMTAgQEAKICAgICAgIC8vIHRoYW4gaWYgaXQgZG9lc24ndCBoYXZlIGEgUEdQIHNpZ25hdHVyZS4KICAgICAgIC8vCiAgICAgICBpZiAodGFnLmdldEZ1bGxNZXNzYWdlKCkuY29udGFpbnMoIi0tLS0tQkVHSU4gUEdQIFNJR05BVFVSRS0tLS0tXG4iKSkgewotICAgICAgICByZXR1cm4gb3duZXIgfHwgY2FuUGVyZm9ybShQZXJtaXNzaW9uLlBVU0hfVEFHKTsKKyAgICAgICAgcmV0dXJuIG93bmVyIHx8IGNhblBlcmZvcm0oUGVybWlzc2lvbi5QVVNIX1NJR05FRF9UQUcpOwogICAgICAgfSBlbHNlIHsKICAgICAgICAgcmV0dXJuIG93bmVyIHx8IGNhblBlcmZvcm0oUGVybWlzc2lvbi5QVVNIX1RBRyk7CiAgICAgICB9Ci0KICAgICB9IGVsc2UgewogICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTI4NSw3ICszMDQsOCBAQAogICAgIH0KIAogICAgIHN3aXRjaCAoZ2V0Q3VycmVudFVzZXIoKS5nZXRBY2Nlc3NQYXRoKCkpIHsKLSAgICAgIGNhc2UgV0VCX1VJOgorICAgICAgY2FzZSBSRVNUX0FQSToKKyAgICAgIGNhc2UgSlNPTl9SUEM6CiAgICAgICAgIHJldHVybiBpc093bmVyKCkgfHwgY2FuUHVzaFdpdGhGb3JjZSgpOwogCiAgICAgICBjYXNlIEdJVDoKQEAgLTMyMiw2ICszNDIsMzYgQEAKICAgICByZXR1cm4gY2FuUGVyZm9ybShQZXJtaXNzaW9uLkFCQU5ET04pOwogICB9CiAKKyAgLyoqIEByZXR1cm4gdHJ1ZSBpZiB0aGlzIHVzZXIgY2FuIHJlbW92ZSBhIHJldmlld2VyIGZvciBhIGNoYW5nZS4gKi8KKyAgcHVibGljIGJvb2xlYW4gY2FuUmVtb3ZlUmV2aWV3ZXIoKSB7CisgICAgcmV0dXJuIGNhblBlcmZvcm0oUGVybWlzc2lvbi5SRU1PVkVfUkVWSUVXRVIpOworICB9CisKKyAgLyoqIEByZXR1cm4gdHJ1ZSBpZiB0aGlzIHVzZXIgY2FuIHZpZXcgZHJhZnQgY2hhbmdlcy4gKi8KKyAgcHVibGljIGJvb2xlYW4gY2FuVmlld0RyYWZ0cygpIHsKKyAgICByZXR1cm4gY2FuUGVyZm9ybShQZXJtaXNzaW9uLlZJRVdfRFJBRlRTKTsKKyAgfQorCisgIC8qKiBAcmV0dXJuIHRydWUgaWYgdGhpcyB1c2VyIGNhbiBwdWJsaXNoIGRyYWZ0IGNoYW5nZXMuICovCisgIHB1YmxpYyBib29sZWFuIGNhblB1Ymxpc2hEcmFmdHMoKSB7CisgICAgcmV0dXJuIGNhblBlcmZvcm0oUGVybWlzc2lvbi5QVUJMSVNIX0RSQUZUUyk7CisgIH0KKworICAvKiogQHJldHVybiB0cnVlIGlmIHRoaXMgdXNlciBjYW4gZGVsZXRlIGRyYWZ0IGNoYW5nZXMuICovCisgIHB1YmxpYyBib29sZWFuIGNhbkRlbGV0ZURyYWZ0cygpIHsKKyAgICByZXR1cm4gY2FuUGVyZm9ybShQZXJtaXNzaW9uLkRFTEVURV9EUkFGVFMpOworICB9CisKKyAgLyoqIEByZXR1cm4gdHJ1ZSBpZiB0aGlzIHVzZXIgY2FuIGVkaXQgdG9waWMgbmFtZXMuICovCisgIHB1YmxpYyBib29sZWFuIGNhbkVkaXRUb3BpY05hbWUoKSB7CisgICAgcmV0dXJuIGNhblBlcmZvcm0oUGVybWlzc2lvbi5FRElUX1RPUElDX05BTUUpOworICB9CisKKyAgLyoqIEByZXR1cm4gdHJ1ZSBpZiB0aGlzIHVzZXIgY2FuIGZvcmNlIGVkaXQgdG9waWMgbmFtZXMuICovCisgIHB1YmxpYyBib29sZWFuIGNhbkZvcmNlRWRpdFRvcGljTmFtZSgpIHsKKyAgICByZXR1cm4gY2FuRm9yY2VQZXJmb3JtKFBlcm1pc3Npb24uRURJVF9UT1BJQ19OQU1FKTsKKyAgfQorCiAgIC8qKiBBbGwgdmFsdWUgcmFuZ2VzIG9mIGFueSBhbGxvd2VkIGxhYmVsIHBlcm1pc3Npb24uICovCiAgIHB1YmxpYyBMaXN0PFBlcm1pc3Npb25SYW5nZT4gZ2V0TGFiZWxSYW5nZXMoKSB7CiAgICAgTGlzdDxQZXJtaXNzaW9uUmFuZ2U+IHIgPSBuZXcgQXJyYXlMaXN0PFBlcm1pc3Npb25SYW5nZT4oKTsKQEAgLTM1MSwzOSArNDAxLDk3IEBACiAgICAgcmV0dXJuIG51bGw7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBQZXJtaXNzaW9uUmFuZ2UgdG9SYW5nZShTdHJpbmcgcGVybWlzc2lvbk5hbWUsCi0gICAgICBMaXN0PFBlcm1pc3Npb25SdWxlPiBydWxlTGlzdCkgewotICAgIGludCBtaW4gPSAwOwotICAgIGludCBtYXggPSAwOwotICAgIGludCBibG9ja01pbiA9IEludGVnZXIuTUlOX1ZBTFVFOwotICAgIGludCBibG9ja01heCA9IEludGVnZXIuTUFYX1ZBTFVFOwotICAgIGZvciAoUGVybWlzc2lvblJ1bGUgcnVsZSA6IHJ1bGVMaXN0KSB7CisgIHByaXZhdGUgc3RhdGljIGNsYXNzIEFsbG93ZWRSYW5nZSB7CisgICAgcHJpdmF0ZSBpbnQgYWxsb3dNaW4gPSAwOworICAgIHByaXZhdGUgaW50IGFsbG93TWF4ID0gMDsKKyAgICBwcml2YXRlIGludCBibG9ja01pbiA9IEludGVnZXIuTUlOX1ZBTFVFOworICAgIHByaXZhdGUgaW50IGJsb2NrTWF4ID0gSW50ZWdlci5NQVhfVkFMVUU7CisKKyAgICB2b2lkIHVwZGF0ZShQZXJtaXNzaW9uUnVsZSBydWxlKSB7CiAgICAgICBpZiAocnVsZS5pc0Jsb2NrKCkpIHsKICAgICAgICAgYmxvY2tNaW4gPSBNYXRoLm1heChibG9ja01pbiwgcnVsZS5nZXRNaW4oKSk7CiAgICAgICAgIGJsb2NrTWF4ID0gTWF0aC5taW4oYmxvY2tNYXgsIHJ1bGUuZ2V0TWF4KCkpOwogICAgICAgfSBlbHNlIHsKLSAgICAgICAgbWluID0gTWF0aC5taW4obWluLCBydWxlLmdldE1pbigpKTsKLSAgICAgICAgbWF4ID0gTWF0aC5tYXgobWF4LCBydWxlLmdldE1heCgpKTsKKyAgICAgICAgYWxsb3dNaW4gPSBNYXRoLm1pbihhbGxvd01pbiwgcnVsZS5nZXRNaW4oKSk7CisgICAgICAgIGFsbG93TWF4ID0gTWF0aC5tYXgoYWxsb3dNYXgsIHJ1bGUuZ2V0TWF4KCkpOwogICAgICAgfQogICAgIH0KLSAgICBpZiAoYmxvY2tNaW4gPiBJbnRlZ2VyLk1JTl9WQUxVRSkgewotICAgICAgbWluID0gTWF0aC5tYXgobWluLCBibG9ja01pbiArIDEpOworCisgICAgaW50IGdldEFsbG93TWluKCkgeworICAgICAgcmV0dXJuIGFsbG93TWluOwogICAgIH0KLSAgICBpZiAoYmxvY2tNYXggPCBJbnRlZ2VyLk1BWF9WQUxVRSkgewotICAgICAgbWF4ID0gTWF0aC5taW4obWF4LCBibG9ja01heCAtIDEpOworICAgIGludCBnZXRBbGxvd01heCgpIHsKKyAgICAgIHJldHVybiBhbGxvd01heDsKICAgICB9CisgICAgaW50IGdldEJsb2NrTWluKCkgeworICAgICAgLy8gQUxMT1cgd2lucyBvdmVyIEJMT0NLIG9uIHRoZSBzYW1lIHByb2plY3QKKyAgICAgIHJldHVybiBNYXRoLm1pbihibG9ja01pbiwgYWxsb3dNaW4gLSAxKTsKKyAgICB9CisgICAgaW50IGdldEJsb2NrTWF4KCkgeworICAgICAgLy8gQUxMT1cgd2lucyBvdmVyIEJMT0NLIG9uIHRoZSBzYW1lIHByb2plY3QKKyAgICAgIHJldHVybiBNYXRoLm1heChibG9ja01heCwgYWxsb3dNYXggKyAxKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIFBlcm1pc3Npb25SYW5nZSB0b1JhbmdlKFN0cmluZyBwZXJtaXNzaW9uTmFtZSwKKyAgICAgIExpc3Q8UGVybWlzc2lvblJ1bGU+IHJ1bGVMaXN0KSB7CisgICAgTWFwPFByb2plY3RSZWYsIEFsbG93ZWRSYW5nZT4gcmFuZ2VzID0gTWFwcy5uZXdIYXNoTWFwKCk7CisgICAgZm9yIChQZXJtaXNzaW9uUnVsZSBydWxlIDogcnVsZUxpc3QpIHsKKyAgICAgIFByb2plY3RSZWYgcCA9IHJlbGV2YW50LmdldFJ1bGVQcm9wcyhydWxlKTsKKyAgICAgIEFsbG93ZWRSYW5nZSByID0gcmFuZ2VzLmdldChwKTsKKyAgICAgIGlmIChyID09IG51bGwpIHsKKyAgICAgICAgciA9IG5ldyBBbGxvd2VkUmFuZ2UoKTsKKyAgICAgICAgcmFuZ2VzLnB1dChwLCByKTsKKyAgICAgIH0KKyAgICAgIHIudXBkYXRlKHJ1bGUpOworICAgIH0KKyAgICBpbnQgYWxsb3dNaW4gPSAwOworICAgIGludCBhbGxvd01heCA9IDA7CisgICAgaW50IGJsb2NrTWluID0gSW50ZWdlci5NSU5fVkFMVUU7CisgICAgaW50IGJsb2NrTWF4ID0gSW50ZWdlci5NQVhfVkFMVUU7CisgICAgZm9yIChBbGxvd2VkUmFuZ2UgciA6IHJhbmdlcy52YWx1ZXMoKSkgeworICAgICAgYWxsb3dNaW4gPSBNYXRoLm1pbihhbGxvd01pbiwgci5nZXRBbGxvd01pbigpKTsKKyAgICAgIGFsbG93TWF4ID0gTWF0aC5tYXgoYWxsb3dNYXgsIHIuZ2V0QWxsb3dNYXgoKSk7CisgICAgICBibG9ja01pbiA9IE1hdGgubWF4KGJsb2NrTWluLCByLmdldEJsb2NrTWluKCkpOworICAgICAgYmxvY2tNYXggPSBNYXRoLm1pbihibG9ja01heCwgci5nZXRCbG9ja01heCgpKTsKKyAgICB9CisKKyAgICAvLyBCTE9DSyB3aW5zIG92ZXIgQUxMT1cgYWNyb3NzIHByb2plY3RzCisgICAgaW50IG1pbiA9IE1hdGgubWF4KGFsbG93TWluLCBibG9ja01pbiArIDEpOworICAgIGludCBtYXggPSBNYXRoLm1pbihhbGxvd01heCwgYmxvY2tNYXggLSAxKTsKICAgICByZXR1cm4gbmV3IFBlcm1pc3Npb25SYW5nZShwZXJtaXNzaW9uTmFtZSwgbWluLCBtYXgpOwogICB9CiAKICAgLyoqIFRydWUgaWYgdGhlIHVzZXIgaGFzIHRoaXMgcGVybWlzc2lvbi4gV29ya3Mgb25seSBmb3Igbm9uIGxhYmVscy4gKi8KICAgYm9vbGVhbiBjYW5QZXJmb3JtKFN0cmluZyBwZXJtaXNzaW9uTmFtZSkgewogICAgIExpc3Q8UGVybWlzc2lvblJ1bGU+IGFjY2VzcyA9IGFjY2VzcyhwZXJtaXNzaW9uTmFtZSk7CisgICAgU2V0PFByb2plY3RSZWY+IGFsbG93cyA9IFNldHMubmV3SGFzaFNldCgpOworICAgIFNldDxQcm9qZWN0UmVmPiBibG9ja3MgPSBTZXRzLm5ld0hhc2hTZXQoKTsKICAgICBmb3IgKFBlcm1pc3Npb25SdWxlIHJ1bGUgOiBhY2Nlc3MpIHsKICAgICAgIGlmIChydWxlLmlzQmxvY2soKSAmJiAhcnVsZS5nZXRGb3JjZSgpKSB7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgYmxvY2tzLmFkZChyZWxldmFudC5nZXRSdWxlUHJvcHMocnVsZSkpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgYWxsb3dzLmFkZChyZWxldmFudC5nZXRSdWxlUHJvcHMocnVsZSkpOwogICAgICAgfQogICAgIH0KLSAgICByZXR1cm4gIWFjY2Vzcy5pc0VtcHR5KCk7CisgICAgYmxvY2tzLnJlbW92ZUFsbChhbGxvd3MpOworICAgIHJldHVybiBibG9ja3MuaXNFbXB0eSgpICYmICFhbGxvd3MuaXNFbXB0eSgpOworICB9CisKKyAgLyoqIFRydWUgaWYgdGhlIHVzZXIgaGFzIGZvcmNlIHRoaXMgcGVybWlzc2lvbi4gV29ya3Mgb25seSBmb3Igbm9uIGxhYmVscy4gKi8KKyAgcHJpdmF0ZSBib29sZWFuIGNhbkZvcmNlUGVyZm9ybShTdHJpbmcgcGVybWlzc2lvbk5hbWUpIHsKKyAgICBMaXN0PFBlcm1pc3Npb25SdWxlPiBhY2Nlc3MgPSBhY2Nlc3MocGVybWlzc2lvbk5hbWUpOworICAgIFNldDxQcm9qZWN0UmVmPiBhbGxvd3MgPSBTZXRzLm5ld0hhc2hTZXQoKTsKKyAgICBTZXQ8UHJvamVjdFJlZj4gYmxvY2tzID0gU2V0cy5uZXdIYXNoU2V0KCk7CisgICAgZm9yIChQZXJtaXNzaW9uUnVsZSBydWxlIDogYWNjZXNzKSB7CisgICAgICBpZiAocnVsZS5pc0Jsb2NrKCkpIHsKKyAgICAgICAgYmxvY2tzLmFkZChyZWxldmFudC5nZXRSdWxlUHJvcHMocnVsZSkpOworICAgICAgfSBlbHNlIGlmIChydWxlLmdldEZvcmNlKCkpIHsKKyAgICAgICAgYWxsb3dzLmFkZChyZWxldmFudC5nZXRSdWxlUHJvcHMocnVsZSkpOworICAgICAgfQorICAgIH0KKyAgICBibG9ja3MucmVtb3ZlQWxsKGFsbG93cyk7CisgICAgcmV0dXJuIGJsb2Nrcy5pc0VtcHR5KCkgJiYgIWFsbG93cy5pc0VtcHR5KCk7CiAgIH0KIAogICAvKiogUnVsZXMgZm9yIHRoZSBnaXZlbiBwZXJtaXNzaW9uLCBvciB0aGUgZW1wdHkgbGlzdC4gKi8KQEAgLTQyOCw3ICs1MzYsMTIgQEAKIAogICBwdWJsaWMgc3RhdGljIFN0cmluZyBzaG9ydGVzdEV4YW1wbGUoU3RyaW5nIHBhdHRlcm4pIHsKICAgICBpZiAoaXNSRShwYXR0ZXJuKSkgewotICAgICAgcmV0dXJuIHRvUmVnRXhwKHBhdHRlcm4pLnRvQXV0b21hdG9uKCkuZ2V0U2hvcnRlc3RFeGFtcGxlKHRydWUpOworICAgICAgLy8gU2luY2UgQnJpY3Mgd2lsbCBzdWJzdGl0dXRlIGRvdCBbLl0gd2l0aCBcMCB3aGVuIGdlbmVyYXRpbmcKKyAgICAgIC8vIHNob3J0ZXN0IGV4YW1wbGUsIGFueSB1c2FnZSBvZiBkb3Qgd2lsbCBmYWlsIGluCisgICAgICAvLyBSZXBvc2l0b3J5LmlzVmFsaWRSZWZOYW1lKCkgaWYgbm90IGNvbWJpbmVkIHdpdGggc3RhciBbKl0uCisgICAgICAvLyBUbyBnZXQgYXJvdW5kIHRoaXMsIHdlIHN1YnN0aXR1dGUgdGhlIFwwIHdpdGggYW4gYXJiaXRyYXJ5CisgICAgICAvLyBhY2NlcHRlZCBjaGFyYWN0ZXIuCisgICAgICByZXR1cm4gdG9SZWdFeHAocGF0dGVybikudG9BdXRvbWF0b24oKS5nZXRTaG9ydGVzdEV4YW1wbGUodHJ1ZSkucmVwbGFjZSgnXDAnLCAnLScpOwogICAgIH0gZWxzZSBpZiAocGF0dGVybi5lbmRzV2l0aCgiLyoiKSkgewogICAgICAgcmV0dXJuIHBhdHRlcm4uc3Vic3RyaW5nKDAsIHBhdHRlcm4ubGVuZ3RoKCkgLSAxKSArICcxJzsKICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1JlcG9zaXRvcnlTdGF0aXN0aWNzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVwb3NpdG9yeVN0YXRpc3RpY3MuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kODI5NGMwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1JlcG9zaXRvcnlTdGF0aXN0aWNzLmphdmEKQEAgLTAsMCArMSwzMiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5DYXNlRm9ybWF0OworCitpbXBvcnQgamF2YS51dGlsLk1hcC5FbnRyeTsKK2ltcG9ydCBqYXZhLnV0aWwuUHJvcGVydGllczsKK2ltcG9ydCBqYXZhLnV0aWwuVHJlZU1hcDsKKworY2xhc3MgUmVwb3NpdG9yeVN0YXRpc3RpY3MgZXh0ZW5kcyBUcmVlTWFwPFN0cmluZywgT2JqZWN0PiB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDFMOworCisgIHB1YmxpYyBSZXBvc2l0b3J5U3RhdGlzdGljcyhQcm9wZXJ0aWVzIHApIHsKKyAgICBmb3IgKEVudHJ5PE9iamVjdCwgT2JqZWN0PiBlIDogcC5lbnRyeVNldCgpKSB7CisgICAgICBwdXQoQ2FzZUZvcm1hdC5MT1dFUl9DQU1FTC50byhDYXNlRm9ybWF0LkxPV0VSX1VOREVSU0NPUkUsCisgICAgICAgICAgZS5nZXRLZXkoKS50b1N0cmluZygpKSwgZS5nZXRWYWx1ZSgpKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SdWxlRXZhbEV4Y2VwdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1J1bGVFdmFsRXhjZXB0aW9uLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWRhZTExYwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SdWxlRXZhbEV4Y2VwdGlvbi5qYXZhCkBAIC0wLDAgKzEsMjYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworQFN1cHByZXNzV2FybmluZ3MoInNlcmlhbCIpCitwdWJsaWMgY2xhc3MgUnVsZUV2YWxFeGNlcHRpb24gZXh0ZW5kcyBFeGNlcHRpb24geworICBwdWJsaWMgUnVsZUV2YWxFeGNlcHRpb24oU3RyaW5nIG1lc3NhZ2UpIHsKKyAgICBzdXBlcihtZXNzYWdlKTsKKyAgfQorCisgIFJ1bGVFdmFsRXhjZXB0aW9uKFN0cmluZyBtZXNzYWdlLCBUaHJvd2FibGUgY2F1c2UpIHsKKyAgICBzdXBlcihtZXNzYWdlLCBjYXVzZSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9TZWN0aW9uTWF0Y2hlci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NlY3Rpb25NYXRjaGVyLmphdmEKaW5kZXggMWM3MGIwNC4uNmY4YWY4MCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NlY3Rpb25NYXRjaGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NlY3Rpb25NYXRjaGVyLmphdmEKQEAgLTE4LDYgKzE4LDcgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFjY2Vzc1NlY3Rpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGFyYW1ldGVyaXplZFN0cmluZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIAogaW1wb3J0IGRrLmJyaWNzLmF1dG9tYXRvbi5BdXRvbWF0b247CiAKQEAgLTMxLDMzICszMiwzNyBAQAogICogZmFzdGVyIHNlbGVjdGlvbiBvZiB3aGljaCBzZWN0aW9ucyBhcmUgcmVsZXZhbnQgdG8gYW55IGdpdmVuIGlucHV0IHJlZmVyZW5jZS4KICAqLwogYWJzdHJhY3QgY2xhc3MgU2VjdGlvbk1hdGNoZXIgewotICBzdGF0aWMgU2VjdGlvbk1hdGNoZXIgd3JhcChBY2Nlc3NTZWN0aW9uIHNlY3Rpb24pIHsKKyAgc3RhdGljIFNlY3Rpb25NYXRjaGVyIHdyYXAoUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbikgewogICAgIFN0cmluZyByZWYgPSBzZWN0aW9uLmdldE5hbWUoKTsKICAgICBpZiAoQWNjZXNzU2VjdGlvbi5pc1ZhbGlkKHJlZikpIHsKLSAgICAgIHJldHVybiB3cmFwKHJlZiwgc2VjdGlvbik7CisgICAgICByZXR1cm4gd3JhcChwcm9qZWN0LCByZWYsIHNlY3Rpb24pOwogICAgIH0gZWxzZSB7CiAgICAgICByZXR1cm4gbnVsbDsKICAgICB9CiAgIH0KIAotICBzdGF0aWMgU2VjdGlvbk1hdGNoZXIgd3JhcChTdHJpbmcgcGF0dGVybiwgQWNjZXNzU2VjdGlvbiBzZWN0aW9uKSB7CisgIHN0YXRpYyBTZWN0aW9uTWF0Y2hlciB3cmFwKFByb2plY3QuTmFtZUtleSBwcm9qZWN0LCBTdHJpbmcgcGF0dGVybiwKKyAgICAgIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbikgewogICAgIGlmIChwYXR0ZXJuLmNvbnRhaW5zKCIkeyIpKSB7Ci0gICAgICByZXR1cm4gbmV3IEV4cGFuZFBhcmFtZXRlcnMocGF0dGVybiwgc2VjdGlvbik7CisgICAgICByZXR1cm4gbmV3IEV4cGFuZFBhcmFtZXRlcnMocHJvamVjdCwgcGF0dGVybiwgc2VjdGlvbik7CiAKICAgICB9IGVsc2UgaWYgKGlzUkUocGF0dGVybikpIHsKLSAgICAgIHJldHVybiBuZXcgUmVnZXhwKHBhdHRlcm4sIHNlY3Rpb24pOworICAgICAgcmV0dXJuIG5ldyBSZWdleHAocHJvamVjdCwgcGF0dGVybiwgc2VjdGlvbik7CiAKICAgICB9IGVsc2UgaWYgKHBhdHRlcm4uZW5kc1dpdGgoIi8qIikpIHsKLSAgICAgIHJldHVybiBuZXcgUHJlZml4KHBhdHRlcm4uc3Vic3RyaW5nKDAsIHBhdHRlcm4ubGVuZ3RoKCkgLSAxKSwgc2VjdGlvbik7CisgICAgICByZXR1cm4gbmV3IFByZWZpeChwcm9qZWN0LCBwYXR0ZXJuLnN1YnN0cmluZygwLCBwYXR0ZXJuLmxlbmd0aCgpIC0gMSksCisgICAgICAgICAgc2VjdGlvbik7CiAKICAgICB9IGVsc2UgewotICAgICAgcmV0dXJuIG5ldyBFeGFjdChwYXR0ZXJuLCBzZWN0aW9uKTsKKyAgICAgIHJldHVybiBuZXcgRXhhY3QocHJvamVjdCwgcGF0dGVybiwgc2VjdGlvbik7CiAgICAgfQogICB9CiAKKyAgZmluYWwgUHJvamVjdC5OYW1lS2V5IHByb2plY3Q7CiAgIGZpbmFsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbjsKIAotICBTZWN0aW9uTWF0Y2hlcihBY2Nlc3NTZWN0aW9uIHNlY3Rpb24pIHsKKyAgU2VjdGlvbk1hdGNoZXIoUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbikgeworICAgIHRoaXMucHJvamVjdCA9IHByb2plY3Q7CiAgICAgdGhpcy5zZWN0aW9uID0gc2VjdGlvbjsKICAgfQogCkBAIC02Niw4ICs3MSw4IEBACiAgIHByaXZhdGUgc3RhdGljIGNsYXNzIEV4YWN0IGV4dGVuZHMgU2VjdGlvbk1hdGNoZXIgewogICAgIHByaXZhdGUgZmluYWwgU3RyaW5nIGV4cGVjdDsKIAotICAgIEV4YWN0KFN0cmluZyBuYW1lLCBBY2Nlc3NTZWN0aW9uIHNlY3Rpb24pIHsKLSAgICAgIHN1cGVyKHNlY3Rpb24pOworICAgIEV4YWN0KFByb2plY3QuTmFtZUtleSBwcm9qZWN0LCBTdHJpbmcgbmFtZSwgQWNjZXNzU2VjdGlvbiBzZWN0aW9uKSB7CisgICAgICBzdXBlcihwcm9qZWN0LCBzZWN0aW9uKTsKICAgICAgIGV4cGVjdCA9IG5hbWU7CiAgICAgfQogCkBAIC04MCw4ICs4NSw4IEBACiAgIHByaXZhdGUgc3RhdGljIGNsYXNzIFByZWZpeCBleHRlbmRzIFNlY3Rpb25NYXRjaGVyIHsKICAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBwcmVmaXg7CiAKLSAgICBQcmVmaXgoU3RyaW5nIHBmeCwgQWNjZXNzU2VjdGlvbiBzZWN0aW9uKSB7Ci0gICAgICBzdXBlcihzZWN0aW9uKTsKKyAgICBQcmVmaXgoUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIFN0cmluZyBwZngsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbikgeworICAgICAgc3VwZXIocHJvamVjdCwgc2VjdGlvbik7CiAgICAgICBwcmVmaXggPSBwZng7CiAgICAgfQogCkBAIC05NCw4ICs5OSw4IEBACiAgIHByaXZhdGUgc3RhdGljIGNsYXNzIFJlZ2V4cCBleHRlbmRzIFNlY3Rpb25NYXRjaGVyIHsKICAgICBwcml2YXRlIGZpbmFsIFBhdHRlcm4gcGF0dGVybjsKIAotICAgIFJlZ2V4cChTdHJpbmcgcmUsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbikgewotICAgICAgc3VwZXIoc2VjdGlvbik7CisgICAgUmVnZXhwKFByb2plY3QuTmFtZUtleSBwcm9qZWN0LCBTdHJpbmcgcmUsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbikgeworICAgICAgc3VwZXIocHJvamVjdCwgc2VjdGlvbik7CiAgICAgICBwYXR0ZXJuID0gUGF0dGVybi5jb21waWxlKHJlKTsKICAgICB9CiAKQEAgLTEwOSw4ICsxMTQsOSBAQAogICAgIHByaXZhdGUgZmluYWwgUGFyYW1ldGVyaXplZFN0cmluZyB0ZW1wbGF0ZTsKICAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBwcmVmaXg7CiAKLSAgICBFeHBhbmRQYXJhbWV0ZXJzKFN0cmluZyBwYXR0ZXJuLCBBY2Nlc3NTZWN0aW9uIHNlY3Rpb24pIHsKLSAgICAgIHN1cGVyKHNlY3Rpb24pOworICAgIEV4cGFuZFBhcmFtZXRlcnMoUHJvamVjdC5OYW1lS2V5IHByb2plY3QsIFN0cmluZyBwYXR0ZXJuLAorICAgICAgICBBY2Nlc3NTZWN0aW9uIHNlY3Rpb24pIHsKKyAgICAgIHN1cGVyKHByb2plY3QsIHNlY3Rpb24pOwogICAgICAgdGVtcGxhdGUgPSBuZXcgUGFyYW1ldGVyaXplZFN0cmluZyhwYXR0ZXJuKTsKIAogICAgICAgaWYgKGlzUkUocGF0dGVybikpIHsKQEAgLTE0MSw3ICsxNDcsNyBAQAogICAgICAgICB1ID0gdXNlcm5hbWU7CiAgICAgICB9CiAKLSAgICAgIFNlY3Rpb25NYXRjaGVyIG5leHQgPSB3cmFwKAorICAgICAgU2VjdGlvbk1hdGNoZXIgbmV4dCA9IHdyYXAocHJvamVjdCwKICAgICAgICAgICB0ZW1wbGF0ZS5yZXBsYWNlKENvbGxlY3Rpb25zLnNpbmdsZXRvbk1hcCgidXNlcm5hbWUiLCB1KSksCiAgICAgICAgICAgc2VjdGlvbik7CiAgICAgICByZXR1cm4gbmV4dCAhPSBudWxsID8gbmV4dC5tYXRjaChyZWYsIHVzZXJuYW1lKSA6IGZhbHNlOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NldERhc2hib2FyZC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NldERhc2hib2FyZC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkzMGRhMTIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvU2V0RGFzaGJvYXJkLmphdmEKQEAgLTAsMCArMSw1MiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkRlZmF1bHRJbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuTWV0aG9kTm90QWxsb3dlZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuU2V0RGFzaGJvYXJkLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworY2xhc3MgU2V0RGFzaGJvYXJkIGltcGxlbWVudHMgUmVzdE1vZGlmeVZpZXc8RGFzaGJvYXJkUmVzb3VyY2UsIElucHV0PiB7CisgIHN0YXRpYyBjbGFzcyBJbnB1dCB7CisgICAgQERlZmF1bHRJbnB1dAorICAgIFN0cmluZyBpZDsKKyAgICBTdHJpbmcgY29tbWl0TWVzc2FnZTsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8U2V0RGVmYXVsdERhc2hib2FyZD4gZGVmYXVsdFNldHRlcjsKKworICBASW5qZWN0CisgIFNldERhc2hib2FyZChQcm92aWRlcjxTZXREZWZhdWx0RGFzaGJvYXJkPiBkZWZhdWx0U2V0dGVyKSB7CisgICAgdGhpcy5kZWZhdWx0U2V0dGVyID0gZGVmYXVsdFNldHRlcjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KERhc2hib2FyZFJlc291cmNlIHJlc291cmNlLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLAorICAgICAgRXhjZXB0aW9uIHsKKyAgICBpZiAocmVzb3VyY2UuaXNQcm9qZWN0RGVmYXVsdCgpKSB7CisgICAgICByZXR1cm4gZGVmYXVsdFNldHRlci5nZXQoKS5hcHBseShyZXNvdXJjZSwgaW5wdXQpOworICAgIH0KKworICAgIC8vIFRPRE86IEltcGxlbWVudCBjcmVhdGlvbi91cGRhdGUgb2YgZGFzaGJvYXJkcyBieSBBUEkuCisgICAgdGhyb3cgbmV3IE1ldGhvZE5vdEFsbG93ZWRFeGNlcHRpb24oKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NldERlZmF1bHREYXNoYm9hcmQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9TZXREZWZhdWx0RGFzaGJvYXJkLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uM2Y3MGJjMgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9TZXREZWZhdWx0RGFzaGJvYXJkLmphdmEKQEAgLTAsMCArMSwxNDkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuT2JqZWN0czsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLklkU3RyaW5nOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNwb25zZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWV0YURhdGFVcGRhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Qcm9qZWN0Q29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkRhc2hib2FyZHNDb2xsZWN0aW9uLkRhc2hib2FyZEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuU2V0RGFzaGJvYXJkLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLkNvbmZpZ0ludmFsaWRFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5PcHRpb247CisKK2NsYXNzIFNldERlZmF1bHREYXNoYm9hcmQgaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxEYXNoYm9hcmRSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgcHJpdmF0ZSBmaW5hbCBQcm9qZWN0Q2FjaGUgY2FjaGU7CisgIHByaXZhdGUgZmluYWwgTWV0YURhdGFVcGRhdGUuU2VydmVyIHVwZGF0ZUZhY3Rvcnk7CisgIHByaXZhdGUgZmluYWwgRGFzaGJvYXJkc0NvbGxlY3Rpb24gZGFzaGJvYXJkczsKKyAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxHZXREYXNoYm9hcmQ+IGdldDsKKworICBAT3B0aW9uKG5hbWUgPSAiLS1pbmhlcml0ZWQiLCB1c2FnZSA9ICJzZXQgZGFzaGJvYXJkIGluaGVyaXRlZCBieSBjaGlsZHJlbiIpCisgIHByaXZhdGUgYm9vbGVhbiBpbmhlcml0ZWQ7CisKKyAgQEluamVjdAorICBTZXREZWZhdWx0RGFzaGJvYXJkKFByb2plY3RDYWNoZSBjYWNoZSwKKyAgICAgIE1ldGFEYXRhVXBkYXRlLlNlcnZlciB1cGRhdGVGYWN0b3J5LAorICAgICAgRGFzaGJvYXJkc0NvbGxlY3Rpb24gZGFzaGJvYXJkcywKKyAgICAgIFByb3ZpZGVyPEdldERhc2hib2FyZD4gZ2V0KSB7CisgICAgdGhpcy5jYWNoZSA9IGNhY2hlOworICAgIHRoaXMudXBkYXRlRmFjdG9yeSA9IHVwZGF0ZUZhY3Rvcnk7CisgICAgdGhpcy5kYXNoYm9hcmRzID0gZGFzaGJvYXJkczsKKyAgICB0aGlzLmdldCA9IGdldDsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgT2JqZWN0IGFwcGx5KERhc2hib2FyZFJlc291cmNlIHJlc291cmNlLCBJbnB1dCBpbnB1dCkKKyAgICAgIHRocm93cyBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLAorICAgICAgRXhjZXB0aW9uIHsKKyAgICBpZiAoaW5wdXQgPT0gbnVsbCkgeworICAgICAgaW5wdXQgPSBuZXcgSW5wdXQoKTsgLy8gRGVsZXRlIHdvdWxkIHNldCBpbnB1dCB0byBudWxsLgorICAgIH0KKyAgICBpbnB1dC5pZCA9IFN0cmluZ3MuZW1wdHlUb051bGwoaW5wdXQuaWQpOworCisgICAgUHJvamVjdENvbnRyb2wgY3RsID0gcmVzb3VyY2UuZ2V0Q29udHJvbCgpOworICAgIElkZW50aWZpZWRVc2VyIHVzZXIgPSAoSWRlbnRpZmllZFVzZXIpIGN0bC5nZXRDdXJyZW50VXNlcigpOworICAgIGlmICghY3RsLmlzT3duZXIoKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oIm5vdCBwcm9qZWN0IG93bmVyIik7CisgICAgfQorCisgICAgRGFzaGJvYXJkUmVzb3VyY2UgdGFyZ2V0ID0gbnVsbDsKKyAgICBpZiAoaW5wdXQuaWQgIT0gbnVsbCkgeworICAgICAgdHJ5IHsKKyAgICAgICAgdGFyZ2V0ID0gZGFzaGJvYXJkcy5wYXJzZSgKKyAgICAgICAgICAgIG5ldyBQcm9qZWN0UmVzb3VyY2UoY3RsKSwKKyAgICAgICAgICAgIElkU3RyaW5nLmZyb21VcmwoaW5wdXQuaWQpKTsKKyAgICAgIH0gY2F0Y2ggKFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbigiZGFzaGJvYXJkICIgKyBpbnB1dC5pZCArICIgbm90IGZvdW5kIik7CisgICAgICB9CisgICAgfQorCisgICAgdHJ5IHsKKyAgICAgIE1ldGFEYXRhVXBkYXRlIG1kID0gdXBkYXRlRmFjdG9yeS5jcmVhdGUoY3RsLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpOworICAgICAgdHJ5IHsKKyAgICAgICAgUHJvamVjdENvbmZpZyBjb25maWcgPSBQcm9qZWN0Q29uZmlnLnJlYWQobWQpOworICAgICAgICBQcm9qZWN0IHByb2plY3QgPSBjb25maWcuZ2V0UHJvamVjdCgpOworICAgICAgICBpZiAoaW5oZXJpdGVkKSB7CisgICAgICAgICAgcHJvamVjdC5zZXREZWZhdWx0RGFzaGJvYXJkKGlucHV0LmlkKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBwcm9qZWN0LnNldExvY2FsRGVmYXVsdERhc2hib2FyZChpbnB1dC5pZCk7CisgICAgICAgIH0KKworICAgICAgICBTdHJpbmcgbXNnID0gT2JqZWN0cy5maXJzdE5vbk51bGwoCisgICAgICAgICAgU3RyaW5ncy5lbXB0eVRvTnVsbChpbnB1dC5jb21taXRNZXNzYWdlKSwKKyAgICAgICAgICBpbnB1dC5pZCA9PSBudWxsCisgICAgICAgICAgICA/ICJSZW1vdmVkIGRlZmF1bHQgZGFzaGJvYXJkLlxuIgorICAgICAgICAgICAgOiBTdHJpbmcuZm9ybWF0KCJDaGFuZ2VkIGRlZmF1bHQgZGFzaGJvYXJkIHRvICVzLlxuIiwgaW5wdXQuaWQpKTsKKyAgICAgICAgaWYgKCFtc2cuZW5kc1dpdGgoIlxuIikpIHsKKyAgICAgICAgICBtc2cgKz0gIlxuIjsKKyAgICAgICAgfQorICAgICAgICBtZC5zZXRBdXRob3IodXNlcik7CisgICAgICAgIG1kLnNldE1lc3NhZ2UobXNnKTsKKyAgICAgICAgY29uZmlnLmNvbW1pdChtZCk7CisgICAgICAgIGNhY2hlLmV2aWN0KGN0bC5nZXRQcm9qZWN0KCkpOworCisgICAgICAgIGlmICh0YXJnZXQgIT0gbnVsbCkgeworICAgICAgICAgIERhc2hib2FyZEluZm8gaW5mbyA9IGdldC5nZXQoKS5hcHBseSh0YXJnZXQpOworICAgICAgICAgIGluZm8uaXNEZWZhdWx0ID0gdHJ1ZTsKKyAgICAgICAgICByZXR1cm4gaW5mbzsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gUmVzcG9uc2Uubm9uZSgpOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgbWQuY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24gbm90Rm91bmQpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uKGN0bC5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpKTsKKyAgICB9IGNhdGNoIChDb25maWdJbnZhbGlkRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgImludmFsaWQgcHJvamVjdC5jb25maWc6ICVzIiwgZS5nZXRNZXNzYWdlKCkpKTsKKyAgICB9CisgIH0KKworICBzdGF0aWMgY2xhc3MgQ3JlYXRlRGVmYXVsdCBpbXBsZW1lbnRzCisgICAgICBSZXN0TW9kaWZ5VmlldzxQcm9qZWN0UmVzb3VyY2UsIFNldERhc2hib2FyZC5JbnB1dD4geworICAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8U2V0RGVmYXVsdERhc2hib2FyZD4gc2V0RGVmYXVsdDsKKworICAgIEBPcHRpb24obmFtZSA9ICItLWluaGVyaXRlZCIsIHVzYWdlID0gInNldCBkYXNoYm9hcmQgaW5oZXJpdGVkIGJ5IGNoaWxkcmVuIikKKyAgICBwcml2YXRlIGJvb2xlYW4gaW5oZXJpdGVkOworCisgICAgQEluamVjdAorICAgIENyZWF0ZURlZmF1bHQoUHJvdmlkZXI8U2V0RGVmYXVsdERhc2hib2FyZD4gc2V0RGVmYXVsdCkgeworICAgICAgdGhpcy5zZXREZWZhdWx0ID0gc2V0RGVmYXVsdDsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgT2JqZWN0IGFwcGx5KFByb2plY3RSZXNvdXJjZSByZXNvdXJjZSwgSW5wdXQgaW5wdXQpCisgICAgICAgIHRocm93cyBBdXRoRXhjZXB0aW9uLCBCYWRSZXF1ZXN0RXhjZXB0aW9uLCBSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uLAorICAgICAgICBFeGNlcHRpb24geworICAgICAgU2V0RGVmYXVsdERhc2hib2FyZCBzZXQgPSBzZXREZWZhdWx0LmdldCgpOworICAgICAgc2V0LmluaGVyaXRlZCA9IGluaGVyaXRlZDsKKyAgICAgIHJldHVybiBSZXNwb25zZS5jcmVhdGVkKHNldC5hcHBseSgKKyAgICAgICAgICBEYXNoYm9hcmRSZXNvdXJjZS5wcm9qZWN0RGVmYXVsdChyZXNvdXJjZS5nZXRDb250cm9sKCkpLAorICAgICAgICAgIGlucHV0KSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvU2V0SGVhZC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NldEhlYWQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zZTdhNDJmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NldEhlYWQuamF2YQpAQCAtMCwwICsxLDk3IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkRlZmF1bHRJbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzdE1vZGlmeVZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hdXRoLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5TZXRIZWFkLklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVmVXBkYXRlOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitwdWJsaWMgY2xhc3MgU2V0SGVhZCBpbXBsZW1lbnRzIFJlc3RNb2RpZnlWaWV3PFByb2plY3RSZXNvdXJjZSwgSW5wdXQ+IHsKKyAgc3RhdGljIGNsYXNzIElucHV0IHsKKyAgICBARGVmYXVsdElucHV0CisgICAgU3RyaW5nIHJlZjsKKyAgfQorCisgIHByaXZhdGUgZmluYWwgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXI7CisgIHByaXZhdGUgZmluYWwgSWRlbnRpZmllZFVzZXIgaWRlbnRpZmllZFVzZXI7CisKKyAgQEluamVjdAorICBTZXRIZWFkKEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyLCBJZGVudGlmaWVkVXNlciBpZGVudGlmaWVkVXNlcikgeworICAgIHRoaXMucmVwb01hbmFnZXIgPSByZXBvTWFuYWdlcjsKKyAgICB0aGlzLmlkZW50aWZpZWRVc2VyID0gaWRlbnRpZmllZFVzZXI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBhcHBseShQcm9qZWN0UmVzb3VyY2UgcnNyYywgSW5wdXQgaW5wdXQpIHRocm93cyBBdXRoRXhjZXB0aW9uLAorICAgICAgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbiwgQmFkUmVxdWVzdEV4Y2VwdGlvbiwKKyAgICAgIFVucHJvY2Vzc2FibGVFbnRpdHlFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKKyAgICBpZiAoIXJzcmMuZ2V0Q29udHJvbCgpLmlzT3duZXIoKSkgeworICAgICAgdGhyb3cgbmV3IEF1dGhFeGNlcHRpb24oInJlc3RyaWN0ZWQgdG8gcHJvamVjdCBvd25lciIpOworICAgIH0KKyAgICBpZiAoaW5wdXQgPT0gbnVsbCB8fCBTdHJpbmdzLmlzTnVsbE9yRW1wdHkoaW5wdXQucmVmKSkgeworICAgICAgdGhyb3cgbmV3IEJhZFJlcXVlc3RFeGNlcHRpb24oInJlZiByZXF1aXJlZCIpOworICAgIH0KKyAgICBTdHJpbmcgcmVmID0gaW5wdXQucmVmOworICAgIGlmICghcmVmLnN0YXJ0c1dpdGgoQ29uc3RhbnRzLlJfUkVGUykpIHsKKyAgICAgIHJlZiA9IENvbnN0YW50cy5SX0hFQURTICsgcmVmOworICAgIH0KKworICAgIFJlcG9zaXRvcnkgcmVwbyA9IG51bGw7CisgICAgdHJ5IHsKKyAgICAgIHJlcG8gPSByZXBvTWFuYWdlci5vcGVuUmVwb3NpdG9yeShyc3JjLmdldE5hbWVLZXkoKSk7CisgICAgICBpZiAocmVwby5nZXRSZWYocmVmKSA9PSBudWxsKSB7CisgICAgICAgIHRocm93IG5ldyBVbnByb2Nlc3NhYmxlRW50aXR5RXhjZXB0aW9uKFN0cmluZy5mb3JtYXQoCisgICAgICAgICAgICAiUmVmIE5vdCBGb3VuZDogJXMiLCByZWYpKTsKKyAgICAgIH0KKworICAgICAgaWYgKCFyZXBvLmdldFJlZihDb25zdGFudHMuSEVBRCkuZ2V0VGFyZ2V0KCkuZ2V0TmFtZSgpLmVxdWFscyhyZWYpKSB7CisgICAgICAgIGZpbmFsIFJlZlVwZGF0ZSB1ID0gcmVwby51cGRhdGVSZWYoQ29uc3RhbnRzLkhFQUQsIHRydWUpOworICAgICAgICB1LnNldFJlZkxvZ0lkZW50KGlkZW50aWZpZWRVc2VyLm5ld1JlZkxvZ0lkZW50KCkpOworICAgICAgICBSZWZVcGRhdGUuUmVzdWx0IHJlcyA9IHUubGluayhyZWYpOworICAgICAgICBzd2l0Y2gocmVzKSB7CisgICAgICAgICAgY2FzZSBOT19DSEFOR0U6CisgICAgICAgICAgY2FzZSBSRU5BTUVEOgorICAgICAgICAgIGNhc2UgRk9SQ0VEOgorICAgICAgICAgIGNhc2UgTkVXOgorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiU2V0dGluZyBIRUFEIGZhaWxlZCB3aXRoICIgKyByZXMpOworICAgICAgICB9CisgICAgICB9CisgICAgICByZXR1cm4gcmVmOworICAgIH0gY2F0Y2ggKFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihyc3JjLmdldE5hbWUoKSk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGlmIChyZXBvICE9IG51bGwpIHsKKyAgICAgICAgcmVwby5jbG9zZSgpOworICAgICAgfQorICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NldFBhcmVudC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1NldFBhcmVudC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmMxZmI1ZGUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvU2V0UGFyZW50LmphdmEKQEAgLTAsMCArMSw5OCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0OworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuRGVmYXVsdElucHV0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BbGxQcm9qZWN0c05hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXRhRGF0YVVwZGF0ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlByb2plY3RDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuU2V0UGFyZW50LklucHV0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLkNvbmZpZ0ludmFsaWRFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOworCitjbGFzcyBTZXRQYXJlbnQgaW1wbGVtZW50cyBSZXN0TW9kaWZ5VmlldzxQcm9qZWN0UmVzb3VyY2UsIElucHV0PiB7CisgIHN0YXRpYyBjbGFzcyBJbnB1dCB7CisgICAgQERlZmF1bHRJbnB1dAorICAgIFN0cmluZyBwYXJlbnQ7CisgICAgU3RyaW5nIGNvbW1pdE1lc3NhZ2U7CisgIH0KKworICBwcml2YXRlIGZpbmFsIFByb2plY3RDYWNoZSBjYWNoZTsKKyAgcHJpdmF0ZSBmaW5hbCBNZXRhRGF0YVVwZGF0ZS5TZXJ2ZXIgdXBkYXRlRmFjdG9yeTsKKyAgcHJpdmF0ZSBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHM7CisKKyAgQEluamVjdAorICBTZXRQYXJlbnQoUHJvamVjdENhY2hlIGNhY2hlLAorICAgICAgTWV0YURhdGFVcGRhdGUuU2VydmVyIHVwZGF0ZUZhY3RvcnksCisgICAgICBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHMpIHsKKyAgICB0aGlzLmNhY2hlID0gY2FjaGU7CisgICAgdGhpcy51cGRhdGVGYWN0b3J5ID0gdXBkYXRlRmFjdG9yeTsKKyAgICB0aGlzLmFsbFByb2plY3RzID0gYWxsUHJvamVjdHM7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBhcHBseShQcm9qZWN0UmVzb3VyY2UgcmVzb3VyY2UsIElucHV0IGlucHV0KQorICAgICAgdGhyb3dzIEF1dGhFeGNlcHRpb24sIEJhZFJlcXVlc3RFeGNlcHRpb24sIFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24sCisgICAgICBFeGNlcHRpb24geworICAgIFByb2plY3RDb250cm9sIGN0bCA9IHJlc291cmNlLmdldENvbnRyb2woKTsKKyAgICBJZGVudGlmaWVkVXNlciB1c2VyID0gKElkZW50aWZpZWRVc2VyKSBjdGwuZ2V0Q3VycmVudFVzZXIoKTsKKyAgICBpZiAoIXVzZXIuZ2V0Q2FwYWJpbGl0aWVzKCkuY2FuQWRtaW5pc3RyYXRlU2VydmVyKCkpIHsKKyAgICAgIHRocm93IG5ldyBBdXRoRXhjZXB0aW9uKCJub3QgYWRtaW5pc3RyYXRvciIpOworICAgIH0KKworICAgIHRyeSB7CisgICAgICBNZXRhRGF0YVVwZGF0ZSBtZCA9IHVwZGF0ZUZhY3RvcnkuY3JlYXRlKHJlc291cmNlLmdldE5hbWVLZXkoKSk7CisgICAgICB0cnkgeworICAgICAgICBQcm9qZWN0Q29uZmlnIGNvbmZpZyA9IFByb2plY3RDb25maWcucmVhZChtZCk7CisgICAgICAgIFByb2plY3QgcHJvamVjdCA9IGNvbmZpZy5nZXRQcm9qZWN0KCk7CisgICAgICAgIHByb2plY3Quc2V0UGFyZW50TmFtZShTdHJpbmdzLmVtcHR5VG9OdWxsKGlucHV0LnBhcmVudCkpOworCisgICAgICAgIFN0cmluZyBtc2cgPSBTdHJpbmdzLmVtcHR5VG9OdWxsKGlucHV0LmNvbW1pdE1lc3NhZ2UpOworICAgICAgICBpZiAobXNnID09IG51bGwpIHsKKyAgICAgICAgICBtc2cgPSBTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgICAiQ2hhbmdlZCBwYXJlbnQgdG8gJXMuXG4iLAorICAgICAgICAgICAgICBPYmplY3RzLmZpcnN0Tm9uTnVsbChwcm9qZWN0LmdldFBhcmVudE5hbWUoKSwgYWxsUHJvamVjdHMuZ2V0KCkpKTsKKyAgICAgICAgfSBlbHNlIGlmICghbXNnLmVuZHNXaXRoKCJcbiIpKSB7CisgICAgICAgICAgbXNnICs9ICJcbiI7CisgICAgICAgIH0KKyAgICAgICAgbWQuc2V0QXV0aG9yKHVzZXIpOworICAgICAgICBtZC5zZXRNZXNzYWdlKG1zZyk7CisgICAgICAgIGNvbmZpZy5jb21taXQobWQpOworICAgICAgICBjYWNoZS5ldmljdChjdGwuZ2V0UHJvamVjdCgpKTsKKworICAgICAgICBQcm9qZWN0Lk5hbWVLZXkgcGFyZW50TmFtZSA9IHByb2plY3QuZ2V0UGFyZW50KGFsbFByb2plY3RzKTsKKyAgICAgICAgcmV0dXJuIHBhcmVudE5hbWUgIT0gbnVsbCA/IHBhcmVudE5hbWUuZ2V0KCkgOiAiIjsKKyAgICAgIH0gZmluYWxseSB7CisgICAgICAgIG1kLmNsb3NlKCk7CisgICAgICB9CisgICAgfSBjYXRjaCAoUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uIG5vdEZvdW5kKSB7CisgICAgICB0aHJvdyBuZXcgUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbihyZXNvdXJjZS5nZXROYW1lKCkpOworICAgIH0gY2F0Y2ggKENvbmZpZ0ludmFsaWRFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24oU3RyaW5nLmZvcm1hdCgKKyAgICAgICAgICAiaW52YWxpZCBwcm9qZWN0LmNvbmZpZzogJXMiLCBlLmdldE1lc3NhZ2UoKSkpOworICAgIH0KKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9wcm9qZWN0L1N1Ym1pdFJ1bGVFdmFsdWF0b3IuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9TdWJtaXRSdWxlRXZhbHVhdG9yLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzQ5NTY3YwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9TdWJtaXRSdWxlRXZhbHVhdG9yLmphdmEKQEAgLTAsMCArMSwyNDkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdDsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlByb2xvZ0Vudmlyb25tZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlN0b3JlZFZhbHVlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZURhdGE7CisKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5jb21waWxlci5Db21waWxlRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuTGlzdFRlcm07CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2c7CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2dFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5UZXJtOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuVmFyaWFibGVUZXJtOworCitpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OworaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworaW1wb3J0IGphdmF4LmFubm90YXRpb24uTnVsbGFibGU7CisKKy8qKgorICogRXZhbHVhdGVzIGEgc3VibWl0LWxpa2UgUHJvbG9nIHJ1bGUgZm91bmQgaW4gdGhlIHJ1bGVzLnBsIGZpbGUgb2YgdGhlIGN1cnJlbnQKKyAqIHByb2plY3QgYW5kIGZpbHRlcnMgdGhlIHJlc3VsdHMgdGhyb3VnaCBydWxlcyBmb3VuZCBpbiB0aGUgcGFyZW50IHByb2plY3RzLAorICogYWxsIHRoZSB3YXkgdXAgdG8gQWxsLVByb2plY3RzLgorICovCitwdWJsaWMgY2xhc3MgU3VibWl0UnVsZUV2YWx1YXRvciB7CisgIHByaXZhdGUgZmluYWwgUmV2aWV3RGIgZGI7CisgIHByaXZhdGUgZmluYWwgUGF0Y2hTZXQgcGF0Y2hTZXQ7CisgIHByaXZhdGUgZmluYWwgUHJvamVjdENvbnRyb2wgcHJvamVjdENvbnRyb2w7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlQ29udHJvbCBjaGFuZ2VDb250cm9sOworICBwcml2YXRlIGZpbmFsIENoYW5nZSBjaGFuZ2U7CisgIHByaXZhdGUgZmluYWwgQ2hhbmdlRGF0YSBjZDsKKyAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIGZhc3RFdmFsTGFiZWxzOworICBwcml2YXRlIGZpbmFsIFN0cmluZyB1c2VyUnVsZUxvY2F0b3JOYW1lOworICBwcml2YXRlIGZpbmFsIFN0cmluZyB1c2VyUnVsZVdyYXBwZXJOYW1lOworICBwcml2YXRlIGZpbmFsIFN0cmluZyBmaWx0ZXJSdWxlTG9jYXRvck5hbWU7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIGZpbHRlclJ1bGVXcmFwcGVyTmFtZTsKKyAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIHNraXBGaWx0ZXJzOworICBwcml2YXRlIGZpbmFsIElucHV0U3RyZWFtIHJ1bGVzSW5wdXRTdHJlYW07CisKKyAgcHJpdmF0ZSBUZXJtIHN1Ym1pdFJ1bGU7CisgIHByaXZhdGUgU3RyaW5nIHByb2plY3ROYW1lOworCisgIC8qKgorICAgKiBAcGFyYW0gdXNlclJ1bGVMb2NhdG9yTmFtZSBUaGUgbmFtZSBvZiB0aGUgcnVsZSB1c2VkIHRvIGxvY2F0ZSB0aGUKKyAgICogICAgICAgIHVzZXItc3VwcGxpZWQgcnVsZS4KKyAgICogQHBhcmFtIHVzZXJSdWxlV3JhcHBlck5hbWUgVGhlIG5hbWUgb2YgdGhlIHdyYXBwZXIgcnVsZSB1c2VkIHRvIGV2YWx1YXRlCisgICAqICAgICAgICB0aGUgdXNlci1zdXBwbGllZCBydWxlLgorICAgKiBAcGFyYW0gZmlsdGVyUnVsZUxvY2F0b3JOYW1lIFRoZSBuYW1lIG9mIHRoZSBydWxlIHVzZWQgdG8gbG9jYXRlIHRoZSBmaWx0ZXIKKyAgICogICAgICAgIHJ1bGUuCisgICAqIEBwYXJhbSBmaWx0ZXJSdWxlV3JhcHBlck5hbWUgVGhlIG5hbWUgb2YgdGhlIHJ1bGUgdXNlZCB0byBldmFsdWF0ZSB0aGUKKyAgICogICAgICAgIGZpbHRlciBydWxlLgorICAgKi8KKyAgcHVibGljIFN1Ym1pdFJ1bGVFdmFsdWF0b3IoUmV2aWV3RGIgZGIsIFBhdGNoU2V0IHBhdGNoU2V0LAorICAgICAgUHJvamVjdENvbnRyb2wgcHJvamVjdENvbnRyb2wsCisgICAgICBDaGFuZ2VDb250cm9sIGNoYW5nZUNvbnRyb2wsIENoYW5nZSBjaGFuZ2UsIEBOdWxsYWJsZSBDaGFuZ2VEYXRhIGNkLAorICAgICAgYm9vbGVhbiBmYXN0RXZhbExhYmVscywKKyAgICAgIFN0cmluZyB1c2VyUnVsZUxvY2F0b3JOYW1lLCBTdHJpbmcgdXNlclJ1bGVXcmFwcGVyTmFtZSwKKyAgICAgIFN0cmluZyBmaWx0ZXJSdWxlTG9jYXRvck5hbWUsIFN0cmluZyBmaWx0ZXJSdWxlV3JhcHBlck5hbWUpIHsKKyAgICB0aGlzKGRiLCBwYXRjaFNldCwgcHJvamVjdENvbnRyb2wsIGNoYW5nZUNvbnRyb2wsIGNoYW5nZSwgY2QsCisgICAgICAgIGZhc3RFdmFsTGFiZWxzLCB1c2VyUnVsZUxvY2F0b3JOYW1lLCB1c2VyUnVsZVdyYXBwZXJOYW1lLAorICAgICAgICBmaWx0ZXJSdWxlTG9jYXRvck5hbWUsIGZpbHRlclJ1bGVXcmFwcGVyTmFtZSwgZmFsc2UsIG51bGwpOworICB9CisKKyAgLyoqCisgICAqIEBwYXJhbSB1c2VyUnVsZUxvY2F0b3JOYW1lIFRoZSBuYW1lIG9mIHRoZSBydWxlIHVzZWQgdG8gbG9jYXRlIHRoZQorICAgKiAgICAgICAgdXNlci1zdXBwbGllZCBydWxlLgorICAgKiBAcGFyYW0gdXNlclJ1bGVXcmFwcGVyTmFtZSBUaGUgbmFtZSBvZiB0aGUgd3JhcHBlciBydWxlIHVzZWQgdG8gZXZhbHVhdGUKKyAgICogICAgICAgIHRoZSB1c2VyLXN1cHBsaWVkIHJ1bGUuCisgICAqIEBwYXJhbSBmaWx0ZXJSdWxlTG9jYXRvck5hbWUgVGhlIG5hbWUgb2YgdGhlIHJ1bGUgdXNlZCB0byBsb2NhdGUgdGhlIGZpbHRlcgorICAgKiAgICAgICAgcnVsZS4KKyAgICogQHBhcmFtIGZpbHRlclJ1bGVXcmFwcGVyTmFtZSBUaGUgbmFtZSBvZiB0aGUgcnVsZSB1c2VkIHRvIGV2YWx1YXRlIHRoZQorICAgKiAgICAgICAgZmlsdGVyIHJ1bGUuCisgICAqIEBwYXJhbSBza2lwU3VibWl0RmlsdGVycyBpZiA8Y29kZT50cnVlPC9jb2RlPiBzdWJtaXQgZmlsdGVyIHdpbGwgbm90IGJlCisgICAqICAgICAgICBhcHBsaWVkCisgICAqIEBwYXJhbSBydWxlcyB3aGVuIG5vbi1udWxsIHRoZSBydWxlcyB3aWxsIGJlIHJlYWQgZnJvbSB0aGlzIGlucHV0IHN0cmVhbQorICAgKiAgICAgICAgaW5zdGVhZCBvZiByZWZzL21ldGEvY29uZmlnOnJ1bGVzLnBsIGZpbGUKKyAgICovCisgIHB1YmxpYyBTdWJtaXRSdWxlRXZhbHVhdG9yKFJldmlld0RiIGRiLCBQYXRjaFNldCBwYXRjaFNldCwKKyAgICAgIFByb2plY3RDb250cm9sIHByb2plY3RDb250cm9sLAorICAgICAgQ2hhbmdlQ29udHJvbCBjaGFuZ2VDb250cm9sLCBDaGFuZ2UgY2hhbmdlLCBATnVsbGFibGUgQ2hhbmdlRGF0YSBjZCwKKyAgICAgIGJvb2xlYW4gZmFzdEV2YWxMYWJlbHMsCisgICAgICBTdHJpbmcgdXNlclJ1bGVMb2NhdG9yTmFtZSwgU3RyaW5nIHVzZXJSdWxlV3JhcHBlck5hbWUsCisgICAgICBTdHJpbmcgZmlsdGVyUnVsZUxvY2F0b3JOYW1lLCBTdHJpbmcgZmlsdGVyUnVsZVdyYXBwZXJOYW1lLAorICAgICAgYm9vbGVhbiBza2lwU3VibWl0RmlsdGVycywgSW5wdXRTdHJlYW0gcnVsZXMpIHsKKyAgICB0aGlzLmRiID0gZGI7CisgICAgdGhpcy5wYXRjaFNldCA9IHBhdGNoU2V0OworICAgIHRoaXMucHJvamVjdENvbnRyb2wgPSBwcm9qZWN0Q29udHJvbDsKKyAgICB0aGlzLmNoYW5nZUNvbnRyb2wgPSBjaGFuZ2VDb250cm9sOworICAgIHRoaXMuY2hhbmdlID0gY2hhbmdlOworICAgIHRoaXMuY2QgPSBjZDsKKyAgICB0aGlzLmZhc3RFdmFsTGFiZWxzID0gZmFzdEV2YWxMYWJlbHM7CisgICAgdGhpcy51c2VyUnVsZUxvY2F0b3JOYW1lID0gdXNlclJ1bGVMb2NhdG9yTmFtZTsKKyAgICB0aGlzLnVzZXJSdWxlV3JhcHBlck5hbWUgPSB1c2VyUnVsZVdyYXBwZXJOYW1lOworICAgIHRoaXMuZmlsdGVyUnVsZUxvY2F0b3JOYW1lID0gZmlsdGVyUnVsZUxvY2F0b3JOYW1lOworICAgIHRoaXMuZmlsdGVyUnVsZVdyYXBwZXJOYW1lID0gZmlsdGVyUnVsZVdyYXBwZXJOYW1lOworICAgIHRoaXMuc2tpcEZpbHRlcnMgPSBza2lwU3VibWl0RmlsdGVyczsKKyAgICB0aGlzLnJ1bGVzSW5wdXRTdHJlYW0gPSBydWxlczsKKyAgfQorCisgIC8qKgorICAgKiBFdmFsdWF0ZXMgdGhlIGdpdmVuIHJ1bGUgYW5kIGZpbHRlcnMuCisgICAqCisgICAqIFNldHMgdGhlIHtAbGluayAjc3VibWl0UnVsZX0gdG8gdGhlIFRlcm0gZm91bmQgYnkgdGhlCisgICAqIHtAbGluayAjdXNlclJ1bGVMb2NhdG9yTmFtZX0uIFRoaXMgY2FuIGJlIHVzZWQgd2hlbiByZXBvcnRpbmcgZXJyb3Iocykgb24KKyAgICogdW5leHBlY3RlZCByZXR1cm4gdmFsdWUgb2YgdGhpcyBtZXRob2QuCisgICAqCisgICAqIEByZXR1cm4gTGlzdCBvZiB7QGxpbmsgVGVybX0gb2JqZWN0cyByZXR1cm5lZCBmcm9tIHRoZSBldmFsdWF0ZWQgcnVsZXMuCisgICAqIEB0aHJvd3MgUnVsZUV2YWxFeGNlcHRpb24KKyAgICovCisgIHB1YmxpYyBMaXN0PFRlcm0+IGV2YWx1YXRlKCkgdGhyb3dzIFJ1bGVFdmFsRXhjZXB0aW9uIHsKKyAgICBQcm9sb2dFbnZpcm9ubWVudCBlbnYgPSBnZXRQcm9sb2dFbnZpcm9ubWVudCgpOworICAgIHRyeSB7CisgICAgICBzdWJtaXRSdWxlID0gZW52Lm9uY2UoImdlcnJpdCIsIHVzZXJSdWxlTG9jYXRvck5hbWUsIG5ldyBWYXJpYWJsZVRlcm0oKSk7CisgICAgICBpZiAoZmFzdEV2YWxMYWJlbHMpIHsKKyAgICAgICAgZW52Lm9uY2UoImdlcnJpdCIsICJhc3N1bWVfcmFuZ2VfZnJvbV9sYWJlbCIpOworICAgICAgfQorCisgICAgICBMaXN0PFRlcm0+IHJlc3VsdHMgPSBuZXcgQXJyYXlMaXN0PFRlcm0+KCk7CisgICAgICB0cnkgeworICAgICAgICBmb3IgKFRlcm1bXSB0ZW1wbGF0ZSA6IGVudi5hbGwoImdlcnJpdCIsIHVzZXJSdWxlV3JhcHBlck5hbWUsCisgICAgICAgICAgICBzdWJtaXRSdWxlLCBuZXcgVmFyaWFibGVUZXJtKCkpKSB7CisgICAgICAgICAgcmVzdWx0cy5hZGQodGVtcGxhdGVbMV0pOworICAgICAgICB9CisgICAgICB9IGNhdGNoIChQcm9sb2dFeGNlcHRpb24gZXJyKSB7CisgICAgICAgIHRocm93IG5ldyBSdWxlRXZhbEV4Y2VwdGlvbigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIHN1Ym1pdFJ1bGUKKyAgICAgICAgICAgICsgIiBvbiBjaGFuZ2UgIiArIGNoYW5nZS5nZXRJZCgpICsgIiBvZiAiICsgZ2V0UHJvamVjdE5hbWUoKSwKKyAgICAgICAgICAgIGVycik7CisgICAgICB9IGNhdGNoIChSdW50aW1lRXhjZXB0aW9uIGVycikgeworICAgICAgICB0aHJvdyBuZXcgUnVsZUV2YWxFeGNlcHRpb24oIkV4Y2VwdGlvbiBjYWxsaW5nICIgKyBzdWJtaXRSdWxlCisgICAgICAgICAgICArICIgb24gY2hhbmdlICIgKyBjaGFuZ2UuZ2V0SWQoKSArICIgb2YgIiArIGdldFByb2plY3ROYW1lKCksCisgICAgICAgICAgICBlcnIpOworICAgICAgfQorCisgICAgICBUZXJtIHJlc3VsdHNUZXJtID0gdG9MaXN0VGVybShyZXN1bHRzKTsKKyAgICAgIGlmICghc2tpcEZpbHRlcnMpIHsKKyAgICAgICAgcmVzdWx0c1Rlcm0gPSBydW5TdWJtaXRGaWx0ZXJzKHJlc3VsdHNUZXJtLCBlbnYpOworICAgICAgfQorICAgICAgaWYgKHJlc3VsdHNUZXJtLmlzTGlzdCgpKSB7CisgICAgICAgIExpc3Q8VGVybT4gciA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgICAgICBmb3IgKFRlcm0gdCA9IHJlc3VsdHNUZXJtOyB0LmlzTGlzdCgpOykgeworICAgICAgICAgIExpc3RUZXJtIGwgPSAoTGlzdFRlcm0pIHQ7CisgICAgICAgICAgci5hZGQobC5jYXIoKS5kZXJlZmVyZW5jZSgpKTsKKyAgICAgICAgICB0ID0gbC5jZHIoKS5kZXJlZmVyZW5jZSgpOworICAgICAgICB9CisgICAgICAgIHJldHVybiByOworICAgICAgfQorICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOworICAgIH0gZmluYWxseSB7CisgICAgICBlbnYuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIFByb2xvZ0Vudmlyb25tZW50IGdldFByb2xvZ0Vudmlyb25tZW50KCkgdGhyb3dzIFJ1bGVFdmFsRXhjZXB0aW9uIHsKKyAgICBQcm9qZWN0U3RhdGUgcHJvamVjdFN0YXRlID0gcHJvamVjdENvbnRyb2wuZ2V0UHJvamVjdFN0YXRlKCk7CisgICAgUHJvbG9nRW52aXJvbm1lbnQgZW52OworICAgIHRyeSB7CisgICAgICBpZiAocnVsZXNJbnB1dFN0cmVhbSA9PSBudWxsKSB7CisgICAgICAgIGVudiA9IHByb2plY3RTdGF0ZS5uZXdQcm9sb2dFbnZpcm9ubWVudCgpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgZW52ID0gcHJvamVjdFN0YXRlLm5ld1Byb2xvZ0Vudmlyb25tZW50KCJzdGRpbiIsIHJ1bGVzSW5wdXRTdHJlYW0pOworICAgICAgfQorICAgIH0gY2F0Y2ggKENvbXBpbGVFeGNlcHRpb24gZXJyKSB7CisgICAgICB0aHJvdyBuZXcgUnVsZUV2YWxFeGNlcHRpb24oIkNhbm5vdCBjb25zdWx0IHJ1bGVzLnBsIGZvciAiCisgICAgICAgICAgKyBnZXRQcm9qZWN0TmFtZSgpLCBlcnIpOworICAgIH0KKyAgICBlbnYuc2V0KFN0b3JlZFZhbHVlcy5SRVZJRVdfREIsIGRiKTsKKyAgICBlbnYuc2V0KFN0b3JlZFZhbHVlcy5DSEFOR0UsIGNoYW5nZSk7CisgICAgZW52LnNldChTdG9yZWRWYWx1ZXMuQ0hBTkdFX0RBVEEsIGNkKTsKKyAgICBlbnYuc2V0KFN0b3JlZFZhbHVlcy5QQVRDSF9TRVQsIHBhdGNoU2V0KTsKKyAgICBlbnYuc2V0KFN0b3JlZFZhbHVlcy5DSEFOR0VfQ09OVFJPTCwgY2hhbmdlQ29udHJvbCk7CisgICAgcmV0dXJuIGVudjsKKyAgfQorCisgIHByaXZhdGUgVGVybSBydW5TdWJtaXRGaWx0ZXJzKFRlcm0gcmVzdWx0cywgUHJvbG9nRW52aXJvbm1lbnQgZW52KSB0aHJvd3MgUnVsZUV2YWxFeGNlcHRpb24geworICAgIFByb2plY3RTdGF0ZSBwcm9qZWN0U3RhdGUgPSBwcm9qZWN0Q29udHJvbC5nZXRQcm9qZWN0U3RhdGUoKTsKKyAgICBQcm9sb2dFbnZpcm9ubWVudCBjaGlsZEVudiA9IGVudjsKKyAgICBmb3IgKFByb2plY3RTdGF0ZSBwYXJlbnRTdGF0ZSA6IHByb2plY3RTdGF0ZS5wYXJlbnRzKCkpIHsKKyAgICAgIFByb2xvZ0Vudmlyb25tZW50IHBhcmVudEVudjsKKyAgICAgIHRyeSB7CisgICAgICAgIHBhcmVudEVudiA9IHBhcmVudFN0YXRlLm5ld1Byb2xvZ0Vudmlyb25tZW50KCk7CisgICAgICB9IGNhdGNoIChDb21waWxlRXhjZXB0aW9uIGVycikgeworICAgICAgICB0aHJvdyBuZXcgUnVsZUV2YWxFeGNlcHRpb24oIkNhbm5vdCBjb25zdWx0IHJ1bGVzLnBsIGZvciAiCisgICAgICAgICAgICArIHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXROYW1lKCksIGVycik7CisgICAgICB9CisKKyAgICAgIHBhcmVudEVudi5jb3B5U3RvcmVkVmFsdWVzKGNoaWxkRW52KTsKKyAgICAgIFRlcm0gZmlsdGVyUnVsZSA9CisgICAgICAgICAgcGFyZW50RW52Lm9uY2UoImdlcnJpdCIsIGZpbHRlclJ1bGVMb2NhdG9yTmFtZSwgbmV3IFZhcmlhYmxlVGVybSgpKTsKKyAgICAgIHRyeSB7CisgICAgICAgIGlmIChmYXN0RXZhbExhYmVscykgeworICAgICAgICAgIGVudi5vbmNlKCJnZXJyaXQiLCAiYXNzdW1lX3JhbmdlX2Zyb21fbGFiZWwiKTsKKyAgICAgICAgfQorCisgICAgICAgIFRlcm1bXSB0ZW1wbGF0ZSA9CisgICAgICAgICAgICBwYXJlbnRFbnYub25jZSgiZ2Vycml0IiwgZmlsdGVyUnVsZVdyYXBwZXJOYW1lLCBmaWx0ZXJSdWxlLAorICAgICAgICAgICAgICAgIHJlc3VsdHMsIG5ldyBWYXJpYWJsZVRlcm0oKSk7CisgICAgICAgIHJlc3VsdHMgPSB0ZW1wbGF0ZVsyXTsKKyAgICAgIH0gY2F0Y2ggKFByb2xvZ0V4Y2VwdGlvbiBlcnIpIHsKKyAgICAgICAgdGhyb3cgbmV3IFJ1bGVFdmFsRXhjZXB0aW9uKCJFeGNlcHRpb24gY2FsbGluZyAiICsgZmlsdGVyUnVsZQorICAgICAgICAgICAgKyAiIG9uIGNoYW5nZSAiICsgY2hhbmdlLmdldElkKCkgKyAiIG9mICIKKyAgICAgICAgICAgICsgcGFyZW50U3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWUoKSwgZXJyKTsKKyAgICAgIH0gY2F0Y2ggKFJ1bnRpbWVFeGNlcHRpb24gZXJyKSB7CisgICAgICAgIHRocm93IG5ldyBSdWxlRXZhbEV4Y2VwdGlvbigiRXhjZXB0aW9uIGNhbGxpbmcgIiArIGZpbHRlclJ1bGUKKyAgICAgICAgICAgICsgIiBvbiBjaGFuZ2UgIiArIGNoYW5nZS5nZXRJZCgpICsgIiBvZiAiCisgICAgICAgICAgICArIHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXROYW1lKCksIGVycik7CisgICAgICB9CisgICAgICBjaGlsZEVudiA9IHBhcmVudEVudjsKKyAgICB9CisgICAgcmV0dXJuIHJlc3VsdHM7CisgIH0KKworICBwcml2YXRlIHN0YXRpYyBUZXJtIHRvTGlzdFRlcm0oTGlzdDxUZXJtPiB0ZXJtcykgeworICAgIFRlcm0gbGlzdCA9IFByb2xvZy5OaWw7CisgICAgZm9yIChpbnQgaSA9IHRlcm1zLnNpemUoKSAtIDE7IGkgPj0gMDsgaS0tKSB7CisgICAgICBsaXN0ID0gbmV3IExpc3RUZXJtKHRlcm1zLmdldChpKSwgbGlzdCk7CisgICAgfQorICAgIHJldHVybiBsaXN0OworICB9CisKKyAgcHVibGljIFRlcm0gZ2V0U3VibWl0UnVsZSgpIHsKKyAgICByZXR1cm4gc3VibWl0UnVsZTsKKyAgfQorCisgIHByaXZhdGUgU3RyaW5nIGdldFByb2plY3ROYW1lKCkgeworICAgIGlmIChwcm9qZWN0TmFtZSA9PSBudWxsKSB7CisgICAgICBwcm9qZWN0TmFtZSA9IHByb2plY3RDb250cm9sLmdldFByb2plY3RTdGF0ZSgpLmdldFByb2plY3QoKS5nZXROYW1lKCk7CisgICAgfQorICAgIHJldHVybiBwcm9qZWN0TmFtZTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9RdWVyeVJld3JpdGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L1F1ZXJ5UmV3cml0ZXIuamF2YQppbmRleCBiM2MxMGVmLi4yYTZiYWUwIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L1F1ZXJ5UmV3cml0ZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L1F1ZXJ5UmV3cml0ZXIuamF2YQpAQCAtNDc4LDI4ICs0NzgsNiBAQAogICAgIHJldHVybiByOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgPFQ+IHZvaWQgZXhwYW5kKGZpbmFsIExpc3Q8UHJlZGljYXRlPFQ+PiBvdXQsCi0gICAgICBmaW5hbCBMaXN0PFByZWRpY2F0ZTxUPj4gYWxsT1IsIGZpbmFsIExpc3Q8UHJlZGljYXRlPFQ+PiB0bXAsCi0gICAgICBmaW5hbCBMaXN0PFByZWRpY2F0ZTxUPj4gbm9uT1IpIHsKLSAgICBpZiAodG1wLnNpemUoKSA9PSBhbGxPUi5zaXplKCkpIHsKLSAgICAgIGZpbmFsIGludCBzeiA9IG5vbk9SLnNpemUoKSArIHRtcC5zaXplKCk7Ci0gICAgICBmaW5hbCBMaXN0PFByZWRpY2F0ZTxUPj4gbmV3TGlzdCA9IG5ldyBBcnJheUxpc3Q8UHJlZGljYXRlPFQ+Pihzeik7Ci0gICAgICBuZXdMaXN0LmFkZEFsbChub25PUik7Ci0gICAgICBuZXdMaXN0LmFkZEFsbCh0bXApOwotICAgICAgb3V0LmFkZChQcmVkaWNhdGUuYW5kKG5ld0xpc3QpKTsKLQotICAgIH0gZWxzZSB7Ci0gICAgICBmb3IgKGZpbmFsIFByZWRpY2F0ZTxUPiBjIDogYWxsT1IuZ2V0KHRtcC5zaXplKCkpLmdldENoaWxkcmVuKCkpIHsKLSAgICAgICAgdHJ5IHsKLSAgICAgICAgICB0bXAuYWRkKGMpOwotICAgICAgICAgIGV4cGFuZChvdXQsIGFsbE9SLCB0bXAsIG5vbk9SKTsKLSAgICAgICAgfSBmaW5hbGx5IHsKLSAgICAgICAgICB0bXAucmVtb3ZlKHRtcC5zaXplKCkgLSAxKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLSAgfQotCiAgIHByaXZhdGUgc3RhdGljIDxUPiBib29sZWFuIGlzQU5EKGZpbmFsIFByZWRpY2F0ZTxUPiBwKSB7CiAgICAgcmV0dXJuIHAgaW5zdGFuY2VvZiBBbmRQcmVkaWNhdGU7CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL0FuZFNvdXJjZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvQW5kU291cmNlLmphdmEKaW5kZXggM2EwYmZhMy4uN2Y3MjZhNyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvQW5kU291cmNlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvQW5kU291cmNlLmphdmEKQEAgLTE0LDExICsxNCwxOSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2U7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLkZ1bmN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuVGhyb3dhYmxlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkZsdWVudEl0ZXJhYmxlOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSXRlcmFibGVzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5BbmRQcmVkaWNhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LlByZWRpY2F0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuTGlzdFJlc3VsdFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1SdW50aW1lRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5SZXN1bHRTZXQ7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiAKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwpAQCAtMzUsMTQgKzQzLDYgQEAKICAgICAgICAgICBpbnQgYmkgPSBiIGluc3RhbmNlb2YgQ2hhbmdlRGF0YVNvdXJjZSA/IDAgOiAxOwogICAgICAgICAgIGludCBjbXAgPSBhaSAtIGJpOwogCi0gICAgICAgICAgaWYgKGNtcCA9PSAwIC8vCi0gICAgICAgICAgICAgICYmIGEgaW5zdGFuY2VvZiBDaGFuZ2VEYXRhU291cmNlIC8vCi0gICAgICAgICAgICAgICYmIGIgaW5zdGFuY2VvZiBDaGFuZ2VEYXRhU291cmNlKSB7Ci0gICAgICAgICAgICBhaSA9ICgoQ2hhbmdlRGF0YVNvdXJjZSkgYSkuaGFzQ2hhbmdlKCkgPyAwIDogMTsKLSAgICAgICAgICAgIGJpID0gKChDaGFuZ2VEYXRhU291cmNlKSBiKS5oYXNDaGFuZ2UoKSA/IDAgOiAxOwotICAgICAgICAgICAgY21wID0gYWkgLSBiaTsKLSAgICAgICAgICB9Ci0KICAgICAgICAgICBpZiAoY21wID09IDApIHsKICAgICAgICAgICAgIGNtcCA9IGEuZ2V0Q29zdCgpIC0gYi5nZXRDb3N0KCk7CiAgICAgICAgICAgfQpAQCAtNTMsNiArNTMsMTEgQEAKICAgICAgICAgICAgIENoYW5nZURhdGFTb3VyY2UgYXMgPSAoQ2hhbmdlRGF0YVNvdXJjZSkgYTsKICAgICAgICAgICAgIENoYW5nZURhdGFTb3VyY2UgYnMgPSAoQ2hhbmdlRGF0YVNvdXJjZSkgYjsKICAgICAgICAgICAgIGNtcCA9IGFzLmdldENhcmRpbmFsaXR5KCkgLSBicy5nZXRDYXJkaW5hbGl0eSgpOworCisgICAgICAgICAgICBpZiAoY21wID09IDApIHsKKyAgICAgICAgICAgICAgY21wID0gKGFzLmhhc0NoYW5nZSgpID8gMCA6IDEpCisgICAgICAgICAgICAgICAgICAtIChicy5oYXNDaGFuZ2UoKSA/IDAgOiAxKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICB9CiAKICAgICAgICAgICByZXR1cm4gY21wOwpAQCAtNjcsMTAgKzcyLDEyIEBACiAgICAgcmV0dXJuIHI7CiAgIH0KIAorICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYjsKICAgcHJpdmF0ZSBpbnQgY2FyZGluYWxpdHkgPSAtMTsKIAotICBBbmRTb3VyY2UoZmluYWwgQ29sbGVjdGlvbjw/IGV4dGVuZHMgUHJlZGljYXRlPENoYW5nZURhdGE+PiB0aGF0KSB7CisgIEFuZFNvdXJjZShQcm92aWRlcjxSZXZpZXdEYj4gZGIsIENvbGxlY3Rpb248PyBleHRlbmRzIFByZWRpY2F0ZTxDaGFuZ2VEYXRhPj4gdGhhdCkgewogICAgIHN1cGVyKHNvcnQodGhhdCkpOworICAgIHRoaXMuZGIgPSBkYjsKICAgfQogCiAgIEBPdmVycmlkZQpAQCAtODEsMTcgKzg4LDI0IEBACiAKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyBSZXN1bHRTZXQ8Q2hhbmdlRGF0YT4gcmVhZCgpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHRyeSB7CisgICAgICByZXR1cm4gcmVhZEltcGwoKTsKKyAgICB9IGNhdGNoIChPcm1SdW50aW1lRXhjZXB0aW9uIGVycikgeworICAgICAgVGhyb3dhYmxlcy5wcm9wYWdhdGVJZkluc3RhbmNlT2YoZXJyLmdldENhdXNlKCksIE9ybUV4Y2VwdGlvbi5jbGFzcyk7CisgICAgICB0aHJvdyBuZXcgT3JtRXhjZXB0aW9uKGVycik7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBSZXN1bHRTZXQ8Q2hhbmdlRGF0YT4gcmVhZEltcGwoKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKICAgICBDaGFuZ2VEYXRhU291cmNlIHNvdXJjZSA9IHNvdXJjZSgpOwogICAgIGlmIChzb3VyY2UgPT0gbnVsbCkgewogICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbigiTm8gQ2hhbmdlRGF0YVNvdXJjZTogIiArIHRoaXMpOwogICAgIH0KIAotICAgIC8vIFRPRE8oc3BlYXJjZSkgVGhpcyBwcm9iYWJseSBzaG91bGQgYmUgbW9yZSBsYXp5LgotICAgIC8vCi0gICAgQXJyYXlMaXN0PENoYW5nZURhdGE+IHIgPSBuZXcgQXJyYXlMaXN0PENoYW5nZURhdGE+KCk7CisgICAgTGlzdDxDaGFuZ2VEYXRhPiByID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CiAgICAgQ2hhbmdlRGF0YSBsYXN0ID0gbnVsbDsKICAgICBib29sZWFuIHNraXBwZWQgPSBmYWxzZTsKLSAgICBmb3IgKENoYW5nZURhdGEgZGF0YSA6IHNvdXJjZS5yZWFkKCkpIHsKKyAgICBmb3IgKENoYW5nZURhdGEgZGF0YSA6IGJ1ZmZlcihzb3VyY2UsIHNvdXJjZS5yZWFkKCkpKSB7CiAgICAgICBpZiAobWF0Y2goZGF0YSkpIHsKICAgICAgICAgci5hZGQoZGF0YSk7CiAgICAgICB9IGVsc2UgewpAQCAtMTAxLDcgKzExNSw3IEBACiAgICAgfQogCiAgICAgaWYgKHNraXBwZWQgJiYgbGFzdCAhPSBudWxsICYmIHNvdXJjZSBpbnN0YW5jZW9mIFBhZ2luYXRlZCkgewotICAgICAgLy8gSWYgd2Ugb3VyIHNvdXJjZSBpcyBhIHBhZ2luYXRlZCBzb3VyY2UgYW5kIHdlIHNraXBwZWQgYXQKKyAgICAgIC8vIElmIG91ciBzb3VyY2UgaXMgYSBwYWdpbmF0ZWQgc291cmNlIGFuZCB3ZSBza2lwcGVkIGF0CiAgICAgICAvLyBsZWFzdCBvbmUgb2YgaXRzIHJlc3VsdHMsIHdlIG1heSBub3QgaGF2ZSBmaWxsZWQgdGhlIGZ1bGwKICAgICAgIC8vIGxpbWl0IHRoZSBjYWxsZXIgd2FudHMuICBSZXN0YXJ0IHRoZSBzb3VyY2UgYW5kIGNvbnRpbnVlLgogICAgICAgLy8KQEAgLTExMCw3ICsxMjQsNyBAQAogICAgICAgICBDaGFuZ2VEYXRhIGxhc3RCZWZvcmVSZXN0YXJ0ID0gbGFzdDsKICAgICAgICAgc2tpcHBlZCA9IGZhbHNlOwogICAgICAgICBsYXN0ID0gbnVsbDsKLSAgICAgICAgZm9yIChDaGFuZ2VEYXRhIGRhdGEgOiBwLnJlc3RhcnQobGFzdEJlZm9yZVJlc3RhcnQpKSB7CisgICAgICAgIGZvciAoQ2hhbmdlRGF0YSBkYXRhIDogYnVmZmVyKHNvdXJjZSwgcC5yZXN0YXJ0KGxhc3RCZWZvcmVSZXN0YXJ0KSkpIHsKICAgICAgICAgICBpZiAobWF0Y2goZGF0YSkpIHsKICAgICAgICAgICAgIHIuYWRkKGRhdGEpOwogICAgICAgICAgIH0gZWxzZSB7CkBAIC0xMjQsNiArMTM4LDI3IEBACiAgICAgcmV0dXJuIG5ldyBMaXN0UmVzdWx0U2V0PENoYW5nZURhdGE+KHIpOwogICB9CiAKKyAgcHJpdmF0ZSBJdGVyYWJsZTxDaGFuZ2VEYXRhPiBidWZmZXIoCisgICAgICBDaGFuZ2VEYXRhU291cmNlIHNvdXJjZSwKKyAgICAgIFJlc3VsdFNldDxDaGFuZ2VEYXRhPiBzY2FubmVyKSB7CisgICAgZmluYWwgYm9vbGVhbiBsb2FkQ2hhbmdlID0gIXNvdXJjZS5oYXNDaGFuZ2UoKTsKKyAgICByZXR1cm4gRmx1ZW50SXRlcmFibGUKKyAgICAgIC5mcm9tKEl0ZXJhYmxlcy5wYXJ0aXRpb24oc2Nhbm5lciwgNTApKQorICAgICAgLnRyYW5zZm9ybUFuZENvbmNhdChuZXcgRnVuY3Rpb248TGlzdDxDaGFuZ2VEYXRhPiwgTGlzdDxDaGFuZ2VEYXRhPj4oKSB7CisgICAgICAgIEBPdmVycmlkZQorICAgICAgICBwdWJsaWMgTGlzdDxDaGFuZ2VEYXRhPiBhcHBseShMaXN0PENoYW5nZURhdGE+IGJ1ZmZlcikgeworICAgICAgICAgIGlmIChsb2FkQ2hhbmdlKSB7CisgICAgICAgICAgICB0cnkgeworICAgICAgICAgICAgICBDaGFuZ2VEYXRhLmVuc3VyZUNoYW5nZUxvYWRlZChkYiwgYnVmZmVyKTsKKyAgICAgICAgICAgIH0gY2F0Y2ggKE9ybUV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICAgIHRocm93IG5ldyBPcm1SdW50aW1lRXhjZXB0aW9uKGUpOworICAgICAgICAgICAgfQorICAgICAgICAgIH0KKyAgICAgICAgICByZXR1cm4gYnVmZmVyOworICAgICAgICB9CisgICAgICB9KTsKKyAgfQorCiAgIHByaXZhdGUgQ2hhbmdlRGF0YVNvdXJjZSBzb3VyY2UoKSB7CiAgICAgZm9yIChQcmVkaWNhdGU8Q2hhbmdlRGF0YT4gcCA6IGdldENoaWxkcmVuKCkpIHsKICAgICAgIGlmIChwIGluc3RhbmNlb2YgQ2hhbmdlRGF0YVNvdXJjZSkgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvQ2hhbmdlRGF0YS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvQ2hhbmdlRGF0YS5qYXZhCmluZGV4IGQ2NzYyZGIuLjUwNmZhYmMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL0NoYW5nZURhdGEuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9DaGFuZ2VEYXRhLmphdmEKQEAgLTE0LDE0ICsxNCwyMCBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2U7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLkZ1bmN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuQXJyYXlMaXN0TXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVMaXN0OworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdE11bHRpbWFwOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuT3JkZXJpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlN1Ym1pdFJlY29yZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2VNZXNzYWdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hMaW5lQ29tbWVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0LklkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5UcmFja2luZ0lkOwpAQCAtNDMsMTUgKzQ5LDI5IEBACiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb247CiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwotaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5NYXA7CitpbXBvcnQgamF2YS51dGlsLlNldDsKIAogcHVibGljIGNsYXNzIENoYW5nZURhdGEgeworICBwcml2YXRlIHN0YXRpYyBPcmRlcmluZzxQYXRjaFNldEFwcHJvdmFsPiBTT1JUX0FQUFJPVkFMUyA9IE9yZGVyaW5nLm5hdHVyYWwoKQorICAgICAgLm9uUmVzdWx0T2YobmV3IEZ1bmN0aW9uPFBhdGNoU2V0QXBwcm92YWwsIFRpbWVzdGFtcD4oKSB7CisgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgIHB1YmxpYyBUaW1lc3RhbXAgYXBwbHkoUGF0Y2hTZXRBcHByb3ZhbCBhKSB7CisgICAgICAgICAgICAgIHJldHVybiBhLmdldEdyYW50ZWQoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICB9KTsKKworICBwdWJsaWMgc3RhdGljIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gc29ydEFwcHJvdmFscygKKyAgICAgIEl0ZXJhYmxlPFBhdGNoU2V0QXBwcm92YWw+IGFwcHJvdmFscykgeworICAgIHJldHVybiBTT1JUX0FQUFJPVkFMUy5zb3J0ZWRDb3B5KGFwcHJvdmFscyk7CisgIH0KKwogICBwdWJsaWMgc3RhdGljIHZvaWQgZW5zdXJlQ2hhbmdlTG9hZGVkKAogICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiLCBMaXN0PENoYW5nZURhdGE+IGNoYW5nZXMpIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgIE1hcDxDaGFuZ2UuSWQsIENoYW5nZURhdGE+IG1pc3NpbmcgPSBNYXBzLm5ld0hhc2hNYXAoKTsKQEAgLTc5LDcgKzk5LDkgQEAKICAgICAgIGZvciAoUGF0Y2hTZXQgcHMgOiBkYi5nZXQoKS5wYXRjaFNldHMoKS5nZXQobWlzc2luZy5rZXlTZXQoKSkpIHsKICAgICAgICAgQ2hhbmdlRGF0YSBjZCA9IG1pc3NpbmcuZ2V0KHBzLmdldElkKCkpOwogICAgICAgICBjZC5jdXJyZW50UGF0Y2hTZXQgPSBwczsKLSAgICAgICAgY2QucGF0Y2hlcyA9IExpc3RzLm5ld0FycmF5TGlzdChwcyk7CisgICAgICAgIGlmIChjZC5saW1pdGVkSWRzID09IG51bGwpIHsKKyAgICAgICAgICBjZC5wYXRjaGVzID0gTGlzdHMubmV3QXJyYXlMaXN0KHBzKTsKKyAgICAgICAgfQogICAgICAgfQogICAgIH0KICAgfQpAQCAtODgsNyArMTEwLDcgQEAKICAgICAgIFByb3ZpZGVyPFJldmlld0RiPiBkYiwgTGlzdDxDaGFuZ2VEYXRhPiBjaGFuZ2VzKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKICAgICBMaXN0PFJlc3VsdFNldDxQYXRjaFNldEFwcHJvdmFsPj4gcGVuZGluZyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOwogICAgIGZvciAoQ2hhbmdlRGF0YSBjZCA6IGNoYW5nZXMpIHsKLSAgICAgIGlmIChjZC5jdXJyZW50QXBwcm92YWxzID09IG51bGwgJiYgY2QuYXBwcm92YWxzID09IG51bGwpIHsKKyAgICAgIGlmIChjZC5jdXJyZW50QXBwcm92YWxzID09IG51bGwgJiYgY2QubGltaXRlZEFwcHJvdmFscyA9PSBudWxsKSB7CiAgICAgICAgIHBlbmRpbmcuYWRkKGRiLmdldCgpLnBhdGNoU2V0QXBwcm92YWxzKCkKICAgICAgICAgICAgIC5ieVBhdGNoU2V0KGNkLmNoYW5nZShkYikuY3VycmVudFBhdGNoU2V0SWQoKSkpOwogICAgICAgfQpAQCAtOTYsOCArMTE4LDggQEAKICAgICBpZiAoIXBlbmRpbmcuaXNFbXB0eSgpKSB7CiAgICAgICBpbnQgaWR4ID0gMDsKICAgICAgIGZvciAoQ2hhbmdlRGF0YSBjZCA6IGNoYW5nZXMpIHsKLSAgICAgICAgaWYgKGNkLmN1cnJlbnRBcHByb3ZhbHMgPT0gbnVsbCAmJiBjZC5hcHByb3ZhbHMgPT0gbnVsbCkgewotICAgICAgICAgIGNkLmN1cnJlbnRBcHByb3ZhbHMgPSBwZW5kaW5nLmdldChpZHgrKykudG9MaXN0KCk7CisgICAgICAgIGlmIChjZC5jdXJyZW50QXBwcm92YWxzID09IG51bGwgJiYgY2QubGltaXRlZEFwcHJvdmFscyA9PSBudWxsKSB7CisgICAgICAgICAgY2QuY3VycmVudEFwcHJvdmFscyA9IHNvcnRBcHByb3ZhbHMocGVuZGluZy5nZXQoaWR4KyspKTsKICAgICAgICAgfQogICAgICAgfQogICAgIH0KQEAgLTEwNywxNiArMTI5LDE4IEBACiAgIHByaXZhdGUgQ2hhbmdlIGNoYW5nZTsKICAgcHJpdmF0ZSBTdHJpbmcgY29tbWl0TWVzc2FnZTsKICAgcHJpdmF0ZSBQYXRjaFNldCBjdXJyZW50UGF0Y2hTZXQ7CisgIHByaXZhdGUgU2V0PFBhdGNoU2V0LklkPiBsaW1pdGVkSWRzOwogICBwcml2YXRlIENvbGxlY3Rpb248UGF0Y2hTZXQ+IHBhdGNoZXM7Ci0gIHByaXZhdGUgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPiBhcHByb3ZhbHM7Ci0gIHByaXZhdGUgTWFwPFBhdGNoU2V0LklkLENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4+IGFwcHJvdmFsc01hcDsKLSAgcHJpdmF0ZSBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+IGN1cnJlbnRBcHByb3ZhbHM7CisgIHByaXZhdGUgTGlzdE11bHRpbWFwPFBhdGNoU2V0LklkLCBQYXRjaFNldEFwcHJvdmFsPiBsaW1pdGVkQXBwcm92YWxzOworICBwcml2YXRlIExpc3RNdWx0aW1hcDxQYXRjaFNldC5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4gYWxsQXBwcm92YWxzOworICBwcml2YXRlIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gY3VycmVudEFwcHJvdmFsczsKICAgcHJpdmF0ZSBTdHJpbmdbXSBjdXJyZW50RmlsZXM7CiAgIHByaXZhdGUgQ29sbGVjdGlvbjxQYXRjaExpbmVDb21tZW50PiBjb21tZW50czsKICAgcHJpdmF0ZSBDb2xsZWN0aW9uPFRyYWNraW5nSWQ+IHRyYWNraW5nSWRzOwogICBwcml2YXRlIEN1cnJlbnRVc2VyIHZpc2libGVUbzsKICAgcHJpdmF0ZSBDaGFuZ2VDb250cm9sIGNoYW5nZUNvbnRyb2w7CiAgIHByaXZhdGUgTGlzdDxDaGFuZ2VNZXNzYWdlPiBtZXNzYWdlczsKKyAgcHJpdmF0ZSBMaXN0PFN1Ym1pdFJlY29yZD4gc3VibWl0UmVjb3JkczsKIAogICBwdWJsaWMgQ2hhbmdlRGF0YShmaW5hbCBDaGFuZ2UuSWQgaWQpIHsKICAgICBsZWdhY3lJZCA9IGlkOwpAQCAtMTI3LDYgKzE1MSwyNyBAQAogICAgIGNoYW5nZSA9IGM7CiAgIH0KIAorICBwdWJsaWMgQ2hhbmdlRGF0YShmaW5hbCBDaGFuZ2VDb250cm9sIGMpIHsKKyAgICBsZWdhY3lJZCA9IGMuZ2V0Q2hhbmdlKCkuZ2V0SWQoKTsKKyAgICBjaGFuZ2UgPSBjLmdldENoYW5nZSgpOworICAgIGNoYW5nZUNvbnRyb2wgPSBjOworICB9CisKKyAgcHVibGljIHZvaWQgbGltaXRUb1BhdGNoU2V0cyhDb2xsZWN0aW9uPFBhdGNoU2V0LklkPiBpZHMpIHsKKyAgICBsaW1pdGVkSWRzID0gU2V0cy5uZXdMaW5rZWRIYXNoU2V0V2l0aEV4cGVjdGVkU2l6ZShpZHMuc2l6ZSgpKTsKKyAgICBmb3IgKFBhdGNoU2V0LklkIGlkIDogaWRzKSB7CisgICAgICBpZiAoIWlkLmdldFBhcmVudEtleSgpLmVxdWFscyhsZWdhY3lJZCkpIHsKKyAgICAgICAgdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICAgImludmFsaWQgcGF0Y2ggc2V0ICVzIGZvciBjaGFuZ2UgJXMiLCBpZCwgbGVnYWN5SWQpKTsKKyAgICAgIH0KKyAgICAgIGxpbWl0ZWRJZHMuYWRkKGlkKTsKKyAgICB9CisgIH0KKworICBwdWJsaWMgQ29sbGVjdGlvbjxQYXRjaFNldC5JZD4gZ2V0TGltaXRlZFBhdGNoU2V0cygpIHsKKyAgICByZXR1cm4gbGltaXRlZElkczsKKyAgfQorCiAgIHB1YmxpYyB2b2lkIHNldEN1cnJlbnRGaWxlUGF0aHMoU3RyaW5nW10gZmlsZVBhdGhzKSB7CiAgICAgY3VycmVudEZpbGVzID0gZmlsZVBhdGhzOwogICB9CkBAIC0xNjMsMTAgKzIwOCwxNCBAQAogICAgICAgICAgIGNhc2UgQ09QSUVEOgogICAgICAgICAgICAgci5hZGQoZS5nZXROZXdOYW1lKCkpOwogICAgICAgICAgICAgYnJlYWs7CisKICAgICAgICAgICBjYXNlIFJFTkFNRUQ6CiAgICAgICAgICAgICByLmFkZChlLmdldE9sZE5hbWUoKSk7CiAgICAgICAgICAgICByLmFkZChlLmdldE5ld05hbWUoKSk7CiAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgIGNhc2UgUkVXUklURToKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICB9CiAgICAgICBjdXJyZW50RmlsZXMgPSByLnRvQXJyYXkobmV3IFN0cmluZ1tyLnNpemUoKV0pOwpAQCAtMTkxLDcgKzI0MCw3IEBACiAgICAgcmV0dXJuIHZpc2libGVUbyA9PSB1c2VyOwogICB9CiAKLSAgQ2hhbmdlQ29udHJvbCBjaGFuZ2VDb250cm9sKCkgeworICBwdWJsaWMgQ2hhbmdlQ29udHJvbCBjaGFuZ2VDb250cm9sKCkgewogICAgIHJldHVybiBjaGFuZ2VDb250cm9sOwogICB9CiAKQEAgLTIyMywyMiArMjcyLDIwIEBACiAgICAgcmV0dXJuIGN1cnJlbnRQYXRjaFNldDsKICAgfQogCi0gIHB1YmxpYyBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+IGN1cnJlbnRBcHByb3ZhbHMoUHJvdmlkZXI8UmV2aWV3RGI+IGRiKQorICBwdWJsaWMgTGlzdDxQYXRjaFNldEFwcHJvdmFsPiBjdXJyZW50QXBwcm92YWxzKFByb3ZpZGVyPFJldmlld0RiPiBkYikKICAgICAgIHRocm93cyBPcm1FeGNlcHRpb24gewogICAgIGlmIChjdXJyZW50QXBwcm92YWxzID09IG51bGwpIHsKICAgICAgIENoYW5nZSBjID0gY2hhbmdlKGRiKTsKICAgICAgIGlmIChjID09IG51bGwpIHsKICAgICAgICAgY3VycmVudEFwcHJvdmFscyA9IENvbGxlY3Rpb25zLmVtcHR5TGlzdCgpOwotICAgICAgfSBlbHNlIGlmIChhcHByb3ZhbHMgIT0gbnVsbCkgewotICAgICAgICBNYXA8SWQsIENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4+IG1hcCA9IGFwcHJvdmFsc01hcChkYik7Ci0gICAgICAgIGN1cnJlbnRBcHByb3ZhbHMgPSBtYXAuZ2V0KGMuY3VycmVudFBhdGNoU2V0SWQoKSk7Ci0gICAgICAgIGlmIChjdXJyZW50QXBwcm92YWxzID09IG51bGwpIHsKLSAgICAgICAgICBjdXJyZW50QXBwcm92YWxzID0gQ29sbGVjdGlvbnMuZW1wdHlMaXN0KCk7Ci0gICAgICAgICAgbWFwLnB1dChjLmN1cnJlbnRQYXRjaFNldElkKCksIGN1cnJlbnRBcHByb3ZhbHMpOwotICAgICAgICB9CisgICAgICB9IGVsc2UgaWYgKGFsbEFwcHJvdmFscyAhPSBudWxsKSB7CisgICAgICAgIHJldHVybiBhbGxBcHByb3ZhbHMuZ2V0KGMuY3VycmVudFBhdGNoU2V0SWQoKSk7CisgICAgICB9IGVsc2UgaWYgKGxpbWl0ZWRBcHByb3ZhbHMgIT0gbnVsbCAmJgorICAgICAgICAgIChsaW1pdGVkSWRzID09IG51bGwgfHwgbGltaXRlZElkcy5jb250YWlucyhjLmN1cnJlbnRQYXRjaFNldElkKCkpKSkgeworICAgICAgICByZXR1cm4gbGltaXRlZEFwcHJvdmFscy5nZXQoYy5jdXJyZW50UGF0Y2hTZXRJZCgpKTsKICAgICAgIH0gZWxzZSB7Ci0gICAgICAgIGN1cnJlbnRBcHByb3ZhbHMgPSBkYi5nZXQoKS5wYXRjaFNldEFwcHJvdmFscygpCi0gICAgICAgICAgICAuYnlQYXRjaFNldChjLmN1cnJlbnRQYXRjaFNldElkKCkpLnRvTGlzdCgpOworICAgICAgICBjdXJyZW50QXBwcm92YWxzID0gc29ydEFwcHJvdmFscyhkYi5nZXQoKS5wYXRjaFNldEFwcHJvdmFscygpCisgICAgICAgICAgICAuYnlQYXRjaFNldChjLmN1cnJlbnRQYXRjaFNldElkKCkpKTsKICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIGN1cnJlbnRBcHByb3ZhbHM7CkBAIC0yNjYsMzcgKzMxMyw5OCBAQAogICAgIHJldHVybiBjb21taXRNZXNzYWdlOwogICB9CiAKKyAgLyoqCisgICAqIEBwYXJhbSBkYiByZXZpZXcgZGF0YWJhc2UuCisgICAqIEByZXR1cm4gcGF0Y2hlcyBmb3IgdGhlIGNoYW5nZS4gSWYge0BsaW5rICNsaW1pdFRvUGF0Y2hTZXRzKENvbGxlY3Rpb24pfQorICAgKiAgICAgd2FzIHByZXZpb3VzbHkgY2FsbGVkLCBvbmx5IGNvbnRhaW5zIHBhdGNoZXMgd2l0aCB0aGUgc3BlY2lmaWVkIElEcy4KKyAgICogQHRocm93cyBPcm1FeGNlcHRpb24gYW4gZXJyb3Igb2NjdXJyZWQgcmVhZGluZyB0aGUgZGF0YWJhc2UuCisgICAqLwogICBwdWJsaWMgQ29sbGVjdGlvbjxQYXRjaFNldD4gcGF0Y2hlcyhQcm92aWRlcjxSZXZpZXdEYj4gZGIpCiAgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKICAgICBpZiAocGF0Y2hlcyA9PSBudWxsKSB7Ci0gICAgICBwYXRjaGVzID0gZGIuZ2V0KCkucGF0Y2hTZXRzKCkuYnlDaGFuZ2UobGVnYWN5SWQpLnRvTGlzdCgpOworICAgICAgaWYgKGxpbWl0ZWRJZHMgIT0gbnVsbCkgeworICAgICAgICBwYXRjaGVzID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisgICAgICAgIGZvciAoUGF0Y2hTZXQgcHMgOiBkYi5nZXQoKS5wYXRjaFNldHMoKS5ieUNoYW5nZShsZWdhY3lJZCkpIHsKKyAgICAgICAgICBpZiAobGltaXRlZElkcy5jb250YWlucyhwcy5nZXRJZCgpKSkgeworICAgICAgICAgICAgcGF0Y2hlcy5hZGQocHMpOworICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgfSBlbHNlIHsKKyAgICAgICAgcGF0Y2hlcyA9IGRiLmdldCgpLnBhdGNoU2V0cygpLmJ5Q2hhbmdlKGxlZ2FjeUlkKS50b0xpc3QoKTsKKyAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIHBhdGNoZXM7CiAgIH0KIAotICBwdWJsaWMgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPiBhcHByb3ZhbHMoUHJvdmlkZXI8UmV2aWV3RGI+IGRiKQorICAvKioKKyAgICogQHBhcmFtIGRiIHJldmlldyBkYXRhYmFzZS4KKyAgICogQHJldHVybiBwYXRjaCBzZXQgYXBwcm92YWxzIGZvciB0aGUgY2hhbmdlIGluIHRpbWVzdGFtcCBvcmRlci4gSWYKKyAgICogICAgIHtAbGluayAjbGltaXRUb1BhdGNoU2V0cyhDb2xsZWN0aW9uKX0gd2FzIHByZXZpb3VzbHkgY2FsbGVkLCBvbmx5IGNvbnRhaW5zCisgICAqICAgICBhcHByb3ZhbHMgZm9yIHRoZSBwYXRjaGVzIHdpdGggdGhlIHNwZWNpZmllZCBJRHMuCisgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uIGFuIGVycm9yIG9jY3VycmVkIHJlYWRpbmcgdGhlIGRhdGFiYXNlLgorICAgKi8KKyAgcHVibGljIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzKFByb3ZpZGVyPFJldmlld0RiPiBkYikKICAgICAgIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIGlmIChhcHByb3ZhbHMgPT0gbnVsbCkgewotICAgICAgYXBwcm92YWxzID0gZGIuZ2V0KCkucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieUNoYW5nZShsZWdhY3lJZCkudG9MaXN0KCk7Ci0gICAgfQotICAgIHJldHVybiBhcHByb3ZhbHM7CisgICAgcmV0dXJuIEltbXV0YWJsZUxpc3QuY29weU9mKGFwcHJvdmFsc01hcChkYikudmFsdWVzKCkpOwogICB9CiAKLSAgcHVibGljIE1hcDxQYXRjaFNldC5JZCxDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+PiBhcHByb3ZhbHNNYXAoUHJvdmlkZXI8UmV2aWV3RGI+IGRiKQotICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7Ci0gICAgaWYgKGFwcHJvdmFsc01hcCA9PSBudWxsKSB7Ci0gICAgICBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+IGFsbCA9IGFwcHJvdmFscyhkYik7Ci0gICAgICBhcHByb3ZhbHNNYXAgPSBuZXcgSGFzaE1hcDxQYXRjaFNldC5JZCxDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+PihhbGwuc2l6ZSgpKTsKLSAgICAgIGZvciAoUGF0Y2hTZXRBcHByb3ZhbCBwc2EgOiBhbGwpIHsKLSAgICAgICAgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPiBjID0gYXBwcm92YWxzTWFwLmdldChwc2EuZ2V0UGF0Y2hTZXRJZCgpKTsKLSAgICAgICAgaWYgKGMgPT0gbnVsbCkgewotICAgICAgICAgIGMgPSBuZXcgQXJyYXlMaXN0PFBhdGNoU2V0QXBwcm92YWw+KCk7Ci0gICAgICAgICAgYXBwcm92YWxzTWFwLnB1dChwc2EuZ2V0UGF0Y2hTZXRJZCgpLCBjKTsKKyAgLyoqCisgICAqIEBwYXJhbSBkYiByZXZpZXcgZGF0YWJhc2UuCisgICAqIEByZXR1cm4gcGF0Y2ggc2V0IGFwcHJvdmFscyBmb3IgdGhlIGNoYW5nZSwga2V5ZWQgYnkgSUQsIG9yZGVyZWQgYnkKKyAgICogICAgIHRpbWVzdGFtcCB3aXRoaW4gZWFjaCBwYXRjaCBzZXQuIElmCisgICAqICAgICB7QGxpbmsgI2xpbWl0VG9QYXRjaFNldHMoQ29sbGVjdGlvbil9IHdhcyBwcmV2aW91c2x5IGNhbGxlZCwgb25seQorICAgKiAgICAgY29udGFpbnMgYXBwcm92YWxzIGZvciB0aGUgcGF0Y2hlcyB3aXRoIHRoZSBzcGVjaWZpZWQgSURzLgorICAgKiBAdGhyb3dzIE9ybUV4Y2VwdGlvbiBhbiBlcnJvciBvY2N1cnJlZCByZWFkaW5nIHRoZSBkYXRhYmFzZS4KKyAgICovCisgIHB1YmxpYyBMaXN0TXVsdGltYXA8UGF0Y2hTZXQuSWQsIFBhdGNoU2V0QXBwcm92YWw+IGFwcHJvdmFsc01hcCgKKyAgICAgIFByb3ZpZGVyPFJldmlld0RiPiBkYikgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgaWYgKGxpbWl0ZWRBcHByb3ZhbHMgPT0gbnVsbCkgeworICAgICAgbGltaXRlZEFwcHJvdmFscyA9IEFycmF5TGlzdE11bHRpbWFwLmNyZWF0ZSgpOworICAgICAgaWYgKGFsbEFwcHJvdmFscyAhPSBudWxsKSB7CisgICAgICAgIGZvciAoUGF0Y2hTZXQuSWQgaWQgOiBsaW1pdGVkSWRzKSB7CisgICAgICAgICAgbGltaXRlZEFwcHJvdmFscy5wdXRBbGwoaWQsIGFsbEFwcHJvdmFscy5nZXQoaWQpKTsKICAgICAgICAgfQotICAgICAgICBjLmFkZChwc2EpOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIHBzYSA6IHNvcnRBcHByb3ZhbHMoCisgICAgICAgICAgICBkYi5nZXQoKS5wYXRjaFNldEFwcHJvdmFscygpLmJ5Q2hhbmdlKGxlZ2FjeUlkKSkpIHsKKyAgICAgICAgICBpZiAobGltaXRlZElkcyA9PSBudWxsIHx8IGxpbWl0ZWRJZHMuY29udGFpbnMobGVnYWN5SWQpKSB7CisgICAgICAgICAgICBsaW1pdGVkQXBwcm92YWxzLnB1dChwc2EuZ2V0UGF0Y2hTZXRJZCgpLCBwc2EpOworICAgICAgICAgIH0KKyAgICAgICAgfQogICAgICAgfQogICAgIH0KLSAgICByZXR1cm4gYXBwcm92YWxzTWFwOworICAgIHJldHVybiBsaW1pdGVkQXBwcm92YWxzOworICB9CisKKyAgLyoqCisgICAqIEBwYXJhbSBkYiByZXZpZXcgZGF0YWJhc2UuCisgICAqIEByZXR1cm4gYWxsIHBhdGNoIHNldCBhcHByb3ZhbHMgZm9yIHRoZSBjaGFuZ2UgaW4gdGltZXN0YW1wIG9yZGVyCisgICAqICAgICAocmVnYXJkbGVzcyBvZiB3aGV0aGVyIHtAbGluayAjbGltaXRUb1BhdGNoU2V0cyhDb2xsZWN0aW9uKX0gd2FzCisgICAqICAgICBwcmV2aW91c2x5IGNhbGxlZCkuCisgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uIGFuIGVycm9yIG9jY3VycmVkIHJlYWRpbmcgdGhlIGRhdGFiYXNlLgorICAgKi8KKyAgcHVibGljIExpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4gYWxsQXBwcm92YWxzKFByb3ZpZGVyPFJldmlld0RiPiBkYikKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHJldHVybiBJbW11dGFibGVMaXN0LmNvcHlPZihhbGxBcHByb3ZhbHNNYXAoZGIpLnZhbHVlcygpKTsKKyAgfQorCisgIC8qKgorICAgKiBAcGFyYW0gZGIgcmV2aWV3IGRhdGFiYXNlLgorICAgKiBAcmV0dXJuIGFsbCBwYXRjaCBzZXQgYXBwcm92YWxzIGZvciB0aGUgY2hhbmdlIChyZWdhcmRsZXNzIG9mIHdoZXRoZXIKKyAgICogICAgIHtAbGluayAjbGltaXRUb1BhdGNoU2V0cyhDb2xsZWN0aW9uKX0gd2FzIHByZXZpb3VzbHkgY2FsbGVkKSwga2V5ZWQgYnkKKyAgICogICAgIElELCBvcmRlcmVkIGJ5IHRpbWVzdGFtcCB3aXRoaW4gZWFjaCBwYXRjaCBzZXQuCisgICAqIEB0aHJvd3MgT3JtRXhjZXB0aW9uIGFuIGVycm9yIG9jY3VycmVkIHJlYWRpbmcgdGhlIGRhdGFiYXNlLgorICAgKi8KKyAgcHVibGljIExpc3RNdWx0aW1hcDxQYXRjaFNldC5JZCwgUGF0Y2hTZXRBcHByb3ZhbD4gYWxsQXBwcm92YWxzTWFwKAorICAgICAgUHJvdmlkZXI8UmV2aWV3RGI+IGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBpZiAoYWxsQXBwcm92YWxzID09IG51bGwpIHsKKyAgICAgIGFsbEFwcHJvdmFscyA9IEFycmF5TGlzdE11bHRpbWFwLmNyZWF0ZSgpOworICAgICAgZm9yIChQYXRjaFNldEFwcHJvdmFsIHBzYSA6IHNvcnRBcHByb3ZhbHMoCisgICAgICAgICAgZGIuZ2V0KCkucGF0Y2hTZXRBcHByb3ZhbHMoKS5ieUNoYW5nZShsZWdhY3lJZCkpKSB7CisgICAgICAgIGFsbEFwcHJvdmFscy5wdXQocHNhLmdldFBhdGNoU2V0SWQoKSwgcHNhKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGFsbEFwcHJvdmFsczsKICAgfQogCiAgIHB1YmxpYyBDb2xsZWN0aW9uPFBhdGNoTGluZUNvbW1lbnQ+IGNvbW1lbnRzKFByb3ZpZGVyPFJldmlld0RiPiBkYikKQEAgLTMyMiw0ICs0MzAsMTIgQEAKICAgICB9CiAgICAgcmV0dXJuIG1lc3NhZ2VzOwogICB9CisKKyAgcHVibGljIHZvaWQgc2V0U3VibWl0UmVjb3JkcyhMaXN0PFN1Ym1pdFJlY29yZD4gcmVjb3JkcykgeworICAgIHN1Ym1pdFJlY29yZHMgPSByZWNvcmRzOworICB9CisKKyAgcHVibGljIExpc3Q8U3VibWl0UmVjb3JkPiBnZXRTdWJtaXRSZWNvcmRzKCkgeworICAgIHJldHVybiBzdWJtaXRSZWNvcmRzOworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9DaGFuZ2VRdWVyeUJ1aWxkZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL0NoYW5nZVF1ZXJ5QnVpbGRlci5qYXZhCmluZGV4IGU4MGFkNjcuLjdiYmIwNzMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL0NoYW5nZVF1ZXJ5QnVpbGRlci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL0NoYW5nZVF1ZXJ5QnVpbGRlci5qYXZhCkBAIC0xNSw3ICsxNSw2IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2U7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuR3JvdXBSZWZlcmVuY2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKQEAgLTEwNywxMSArMTA2LDkgQEAKICAgICBmaW5hbCBQcm92aWRlcjxDaGFuZ2VRdWVyeVJld3JpdGVyPiByZXdyaXRlcjsKICAgICBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeTsKICAgICBmaW5hbCBDYXBhYmlsaXR5Q29udHJvbC5GYWN0b3J5IGNhcGFiaWxpdHlDb250cm9sRmFjdG9yeTsKLSAgICBmaW5hbCBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CiAgICAgZmluYWwgQ2hhbmdlQ29udHJvbC5HZW5lcmljRmFjdG9yeSBjaGFuZ2VDb250cm9sR2VuZXJpY0ZhY3Rvcnk7CiAgICAgZmluYWwgQWNjb3VudFJlc29sdmVyIGFjY291bnRSZXNvbHZlcjsKICAgICBmaW5hbCBHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kOwotICAgIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKICAgICBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lOwogICAgIGZpbmFsIFBhdGNoTGlzdENhY2hlIHBhdGNoTGlzdENhY2hlOwogICAgIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyOwpAQCAtMTIyLDExICsxMTksOSBAQAogICAgICAgICBQcm92aWRlcjxDaGFuZ2VRdWVyeVJld3JpdGVyPiByZXdyaXRlciwKICAgICAgICAgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdXNlckZhY3RvcnksCiAgICAgICAgIENhcGFiaWxpdHlDb250cm9sLkZhY3RvcnkgY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5LAotICAgICAgICBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3RvcnksCiAgICAgICAgIENoYW5nZUNvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgY2hhbmdlQ29udHJvbEdlbmVyaWNGYWN0b3J5LAogICAgICAgICBBY2NvdW50UmVzb2x2ZXIgYWNjb3VudFJlc29sdmVyLAogICAgICAgICBHcm91cEJhY2tlbmQgZ3JvdXBCYWNrZW5kLAotICAgICAgICBBcHByb3ZhbFR5cGVzIGFwcHJvdmFsVHlwZXMsCiAgICAgICAgIEFsbFByb2plY3RzTmFtZSBhbGxQcm9qZWN0c05hbWUsCiAgICAgICAgIFBhdGNoTGlzdENhY2hlIHBhdGNoTGlzdENhY2hlLAogICAgICAgICBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlciwKQEAgLTEzNSwxMSArMTMwLDkgQEAKICAgICAgIHRoaXMucmV3cml0ZXIgPSByZXdyaXRlcjsKICAgICAgIHRoaXMudXNlckZhY3RvcnkgPSB1c2VyRmFjdG9yeTsKICAgICAgIHRoaXMuY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5ID0gY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5OwotICAgICAgdGhpcy5jaGFuZ2VDb250cm9sRmFjdG9yeSA9IGNoYW5nZUNvbnRyb2xGYWN0b3J5OwogICAgICAgdGhpcy5jaGFuZ2VDb250cm9sR2VuZXJpY0ZhY3RvcnkgPSBjaGFuZ2VDb250cm9sR2VuZXJpY0ZhY3Rvcnk7CiAgICAgICB0aGlzLmFjY291bnRSZXNvbHZlciA9IGFjY291bnRSZXNvbHZlcjsKICAgICAgIHRoaXMuZ3JvdXBCYWNrZW5kID0gZ3JvdXBCYWNrZW5kOwotICAgICAgdGhpcy5hcHByb3ZhbFR5cGVzID0gYXBwcm92YWxUeXBlczsKICAgICAgIHRoaXMuYWxsUHJvamVjdHNOYW1lID0gYWxsUHJvamVjdHNOYW1lOwogICAgICAgdGhpcy5wYXRjaExpc3RDYWNoZSA9IHBhdGNoTGlzdENhY2hlOwogICAgICAgdGhpcy5yZXBvTWFuYWdlciA9IHJlcG9NYW5hZ2VyOwpAQCAtMzA0LDggKzI5Nyw5IEBACiAKICAgQE9wZXJhdG9yCiAgIHB1YmxpYyBQcmVkaWNhdGU8Q2hhbmdlRGF0YT4gbGFiZWwoU3RyaW5nIG5hbWUpIHsKLSAgICByZXR1cm4gbmV3IExhYmVsUHJlZGljYXRlKGFyZ3MuY2hhbmdlQ29udHJvbEdlbmVyaWNGYWN0b3J5LAotICAgICAgICBhcmdzLnVzZXJGYWN0b3J5LCBhcmdzLmRiUHJvdmlkZXIsIGFyZ3MuYXBwcm92YWxUeXBlcywgbmFtZSk7CisgICAgcmV0dXJuIG5ldyBMYWJlbFByZWRpY2F0ZShhcmdzLnByb2plY3RDYWNoZSwKKyAgICAgICAgYXJncy5jaGFuZ2VDb250cm9sR2VuZXJpY0ZhY3RvcnksIGFyZ3MudXNlckZhY3RvcnksIGFyZ3MuZGJQcm92aWRlciwKKyAgICAgICAgbmFtZSk7CiAgIH0KIAogICBAT3BlcmF0b3IKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL0NoYW5nZVF1ZXJ5UmV3cml0ZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL0NoYW5nZVF1ZXJ5UmV3cml0ZXIuamF2YQppbmRleCAzNGVjMmY0Li5lNjI1MWJjIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9DaGFuZ2VRdWVyeVJld3JpdGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvQ2hhbmdlUXVlcnlSZXdyaXRlci5qYXZhCkBAIC0zOSw3ICszOSw3IEBACiAgICAgICAgICAgICAgIG5ldyBDaGFuZ2VRdWVyeUJ1aWxkZXIuQXJndW1lbnRzKCAvLwogICAgICAgICAgICAgICAgICAgbmV3IEludmFsaWRQcm92aWRlcjxSZXZpZXdEYj4oKSwgLy8KICAgICAgICAgICAgICAgICAgIG5ldyBJbnZhbGlkUHJvdmlkZXI8Q2hhbmdlUXVlcnlSZXdyaXRlcj4oKSwgLy8KLSAgICAgICAgICAgICAgICAgIG51bGwsIG51bGwsIG51bGwsIG51bGwsIG51bGwsIG51bGwsIG51bGwsIC8vCisgICAgICAgICAgICAgICAgICBudWxsLCBudWxsLCBudWxsLCBudWxsLCBudWxsLCAvLwogICAgICAgICAgICAgICAgICAgbnVsbCwgbnVsbCwgbnVsbCwgbnVsbCksIG51bGwpKTsKIAogICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyOwpAQCAtNTIsNyArNTIsNyBAQAogCiAgIEBPdmVycmlkZQogICBwdWJsaWMgUHJlZGljYXRlPENoYW5nZURhdGE+IGFuZChDb2xsZWN0aW9uPD8gZXh0ZW5kcyBQcmVkaWNhdGU8Q2hhbmdlRGF0YT4+IGwpIHsKLSAgICByZXR1cm4gaGFzU291cmNlKGwpID8gbmV3IEFuZFNvdXJjZShsKSA6IHN1cGVyLmFuZChsKTsKKyAgICByZXR1cm4gaGFzU291cmNlKGwpID8gbmV3IEFuZFNvdXJjZShkYlByb3ZpZGVyLCBsKSA6IHN1cGVyLmFuZChsKTsKICAgfQogCiAgIEBPdmVycmlkZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvTGFiZWxQcmVkaWNhdGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL0xhYmVsUHJlZGljYXRlLmphdmEKaW5kZXggYmYyMTI2MS4uOTM2YTQ3ZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvTGFiZWxQcmVkaWNhdGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9MYWJlbFByZWRpY2F0ZS5qYXZhCkBAIC0xNCwxOSArMTQsMjQgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlOwogCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RTdGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuT3BlcmF0b3JQcmVkaWNhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIAoraW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OworaW1wb3J0IGphdmEudXRpbC5TZXQ7CiBpbXBvcnQgamF2YS51dGlsLnJlZ2V4Lk1hdGNoZXI7CiBpbXBvcnQgamF2YS51dGlsLnJlZ2V4LlBhdHRlcm47CiAKQEAgLTU0LDM0ICs1OSwyNCBAQAogICAgIGFic3RyYWN0IGJvb2xlYW4gbWF0Y2goaW50IHBzVmFsdWUsIGludCBleHBWYWx1ZSk7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBBcHByb3ZhbENhdGVnb3J5IGNhdGVnb3J5KEFwcHJvdmFsVHlwZXMgdHlwZXMsIFN0cmluZyB0b0ZpbmQpIHsKKyAgcHJpdmF0ZSBzdGF0aWMgTGFiZWxUeXBlIHR5cGUoTGFiZWxUeXBlcyB0eXBlcywgU3RyaW5nIHRvRmluZCkgewogICAgIGlmICh0eXBlcy5ieUxhYmVsKHRvRmluZCkgIT0gbnVsbCkgewotICAgICAgcmV0dXJuIHR5cGVzLmJ5TGFiZWwodG9GaW5kKS5nZXRDYXRlZ29yeSgpOworICAgICAgcmV0dXJuIHR5cGVzLmJ5TGFiZWwodG9GaW5kKTsKICAgICB9CiAKLSAgICBpZiAodHlwZXMuYnlJZChuZXcgQXBwcm92YWxDYXRlZ29yeS5JZCh0b0ZpbmQpKSAhPSBudWxsKSB7Ci0gICAgICByZXR1cm4gdHlwZXMuYnlJZChuZXcgQXBwcm92YWxDYXRlZ29yeS5JZCh0b0ZpbmQpKS5nZXRDYXRlZ29yeSgpOwotICAgIH0KLQotICAgIGZvciAoQXBwcm92YWxUeXBlIGF0IDogdHlwZXMuZ2V0QXBwcm92YWxUeXBlcygpKSB7Ci0gICAgICBBcHByb3ZhbENhdGVnb3J5IGNhdGVnb3J5ID0gYXQuZ2V0Q2F0ZWdvcnkoKTsKLQotICAgICAgaWYgKHRvRmluZC5lcXVhbHNJZ25vcmVDYXNlKGNhdGVnb3J5LmdldE5hbWUoKSkpIHsKLSAgICAgICAgcmV0dXJuIGNhdGVnb3J5OwotCi0gICAgICB9IGVsc2UgaWYgKHRvRmluZC5lcXVhbHNJZ25vcmVDYXNlKGNhdGVnb3J5LmdldE5hbWUoKS5yZXBsYWNlKCIgIiwgIiIpKSkgewotICAgICAgICByZXR1cm4gY2F0ZWdvcnk7CisgICAgZm9yIChMYWJlbFR5cGUgbHQgOiB0eXBlcy5nZXRMYWJlbFR5cGVzKCkpIHsKKyAgICAgIGlmICh0b0ZpbmQuZXF1YWxzSWdub3JlQ2FzZShsdC5nZXROYW1lKCkpKSB7CisgICAgICAgIHJldHVybiBsdDsKICAgICAgIH0KICAgICB9CiAKLSAgICBmb3IgKEFwcHJvdmFsVHlwZSBhdCA6IHR5cGVzLmdldEFwcHJvdmFsVHlwZXMoKSkgewotICAgICAgQXBwcm92YWxDYXRlZ29yeSBjYXRlZ29yeSA9IGF0LmdldENhdGVnb3J5KCk7Ci0gICAgICBpZiAodG9GaW5kLmVxdWFsc0lnbm9yZUNhc2UoY2F0ZWdvcnkuZ2V0QWJicmV2aWF0ZWROYW1lKCkpKSB7Ci0gICAgICAgIHJldHVybiBjYXRlZ29yeTsKKyAgICBmb3IgKExhYmVsVHlwZSBsdCA6IHR5cGVzLmdldExhYmVsVHlwZXMoKSkgeworICAgICAgaWYgKHRvRmluZC5lcXVhbHNJZ25vcmVDYXNlKGx0LmdldEFiYnJldmlhdGVkTmFtZSgpKSkgeworICAgICAgICByZXR1cm4gbHQ7CiAgICAgICB9CiAgICAgfQogCi0gICAgcmV0dXJuIG5ldyBBcHByb3ZhbENhdGVnb3J5KG5ldyBBcHByb3ZhbENhdGVnb3J5LklkKHRvRmluZCksIHRvRmluZCk7CisgICAgcmV0dXJuIExhYmVsVHlwZS53aXRoRGVmYXVsdFZhbHVlcyh0b0ZpbmQpOwogICB9CiAKICAgcHJpdmF0ZSBzdGF0aWMgVGVzdCBvcChTdHJpbmcgb3ApIHsKQEAgLTEwNiw3MiArMTAxLDEwOCBAQAogICAgIHJldHVybiBJbnRlZ2VyLnBhcnNlSW50KHZhbHVlKTsKICAgfQogCisgIHByaXZhdGUgZmluYWwgUHJvamVjdENhY2hlIHByb2plY3RDYWNoZTsKICAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNjRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlcjsKICAgcHJpdmF0ZSBmaW5hbCBUZXN0IHRlc3Q7Ci0gIHByaXZhdGUgZmluYWwgQXBwcm92YWxDYXRlZ29yeSBjYXRlZ29yeTsKLSAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgcGVybWlzc2lvbk5hbWU7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIHR5cGU7CiAgIHByaXZhdGUgZmluYWwgaW50IGV4cFZhbDsKIAotICBMYWJlbFByZWRpY2F0ZShDaGFuZ2VDb250cm9sLkdlbmVyaWNGYWN0b3J5IGNjRmFjdG9yeSwKLSAgICAgIElkZW50aWZpZWRVc2VyLkdlbmVyaWNGYWN0b3J5IHVzZXJGYWN0b3J5LCBQcm92aWRlcjxSZXZpZXdEYj4gZGJQcm92aWRlciwKLSAgICAgIEFwcHJvdmFsVHlwZXMgdHlwZXMsIFN0cmluZyB2YWx1ZSkgeworICBMYWJlbFByZWRpY2F0ZShQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlLAorICAgICAgQ2hhbmdlQ29udHJvbC5HZW5lcmljRmFjdG9yeSBjY0ZhY3RvcnksCisgICAgICBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeSwKKyAgICAgIFByb3ZpZGVyPFJldmlld0RiPiBkYlByb3ZpZGVyLAorICAgICAgU3RyaW5nIHZhbHVlKSB7CiAgICAgc3VwZXIoQ2hhbmdlUXVlcnlCdWlsZGVyLkZJRUxEX0xBQkVMLCB2YWx1ZSk7CiAgICAgdGhpcy5jY0ZhY3RvcnkgPSBjY0ZhY3Rvcnk7CisgICAgdGhpcy5wcm9qZWN0Q2FjaGUgPSBwcm9qZWN0Q2FjaGU7CiAgICAgdGhpcy51c2VyRmFjdG9yeSA9IHVzZXJGYWN0b3J5OwogICAgIHRoaXMuZGJQcm92aWRlciA9IGRiUHJvdmlkZXI7CiAKICAgICBNYXRjaGVyIG0xID0gUGF0dGVybi5jb21waWxlKCIoPXw+PXw8PSkoWystXT9cXGQrKSQiKS5tYXRjaGVyKHZhbHVlKTsKICAgICBNYXRjaGVyIG0yID0gUGF0dGVybi5jb21waWxlKCIoWystXVxcZCspJCIpLm1hdGNoZXIodmFsdWUpOwogICAgIGlmIChtMS5maW5kKCkpIHsKLSAgICAgIGNhdGVnb3J5ID0gY2F0ZWdvcnkodHlwZXMsIHZhbHVlLnN1YnN0cmluZygwLCBtMS5zdGFydCgpKSk7CisgICAgICB0eXBlID0gdmFsdWUuc3Vic3RyaW5nKDAsIG0xLnN0YXJ0KCkpOwogICAgICAgdGVzdCA9IG9wKG0xLmdyb3VwKDEpKTsKICAgICAgIGV4cFZhbCA9IHZhbHVlKG0xLmdyb3VwKDIpKTsKIAogICAgIH0gZWxzZSBpZiAobTIuZmluZCgpKSB7Ci0gICAgICBjYXRlZ29yeSA9IGNhdGVnb3J5KHR5cGVzLCB2YWx1ZS5zdWJzdHJpbmcoMCwgbTIuc3RhcnQoKSkpOworICAgICAgdHlwZSA9IHZhbHVlLnN1YnN0cmluZygwLCBtMi5zdGFydCgpKTsKICAgICAgIHRlc3QgPSBUZXN0LkVROwogICAgICAgZXhwVmFsID0gdmFsdWUobTIuZ3JvdXAoMSkpOwogCiAgICAgfSBlbHNlIHsKLSAgICAgIGNhdGVnb3J5ID0gY2F0ZWdvcnkodHlwZXMsIHZhbHVlKTsKKyAgICAgIHR5cGUgPSB2YWx1ZTsKICAgICAgIHRlc3QgPSBUZXN0LkVROwogICAgICAgZXhwVmFsID0gMTsKICAgICB9Ci0KLSAgICB0aGlzLnBlcm1pc3Npb25OYW1lID0gUGVybWlzc2lvbi5mb3JMYWJlbChjYXRlZ29yeS5nZXRMYWJlbE5hbWUoKSk7CiAgIH0KIAogICBAT3ZlcnJpZGUKICAgcHVibGljIGJvb2xlYW4gbWF0Y2goZmluYWwgQ2hhbmdlRGF0YSBvYmplY3QpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIGZpbmFsIENoYW5nZSBjID0gb2JqZWN0LmNoYW5nZShkYlByb3ZpZGVyKTsKKyAgICBpZiAoYyA9PSBudWxsKSB7CisgICAgICAvLyBUaGUgY2hhbmdlIGhhcyBkaXNhcHBlYXJlZC4KKyAgICAgIC8vCisgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIGZpbmFsIFByb2plY3RTdGF0ZSBwcm9qZWN0ID0gcHJvamVjdENhY2hlLmdldChjLmdldERlc3QoKS5nZXRQYXJlbnRLZXkoKSk7CisgICAgaWYgKHByb2plY3QgPT0gbnVsbCkgeworICAgICAgLy8gVGhlIHByb2plY3QgaGFzIGRpc2FwcGVhcmVkLgorICAgICAgLy8KKyAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgZmluYWwgTGFiZWxUeXBlIGxhYmVsVHlwZSA9IHR5cGUocHJvamVjdC5nZXRMYWJlbFR5cGVzKCksIHR5cGUpOworICAgIGZpbmFsIFNldDxBY2NvdW50LklkPiBhbGxBcHByb3ZlcnMgPSBuZXcgSGFzaFNldDxBY2NvdW50LklkPigpOworICAgIGZpbmFsIFNldDxBY2NvdW50LklkPiBhcHByb3ZlcnNUaGF0Vm90ZWRJbkNhdGVnb3J5ID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4oKTsKICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgcCA6IG9iamVjdC5jdXJyZW50QXBwcm92YWxzKGRiUHJvdmlkZXIpKSB7Ci0gICAgICBpZiAocC5nZXRDYXRlZ29yeUlkKCkuZXF1YWxzKGNhdGVnb3J5LmdldElkKCkpKSB7Ci0gICAgICAgIGludCBwc1ZhbCA9IHAuZ2V0VmFsdWUoKTsKLSAgICAgICAgaWYgKHRlc3QubWF0Y2gocHNWYWwsIGV4cFZhbCkpIHsKLSAgICAgICAgICAvLyBEb3VibGUgY2hlY2sgdGhlIHZhbHVlIGlzIHN0aWxsIHBlcm1pdHRlZCBmb3IgdGhlIHVzZXIuCi0gICAgICAgICAgLy8KLSAgICAgICAgICB0cnkgewotICAgICAgICAgICAgQ2hhbmdlQ29udHJvbCBjYyA9IGNjRmFjdG9yeS5jb250cm9sRm9yKG9iamVjdC5jaGFuZ2UoZGJQcm92aWRlciksIC8vCi0gICAgICAgICAgICAgICAgdXNlckZhY3RvcnkuY3JlYXRlKGRiUHJvdmlkZXIsIHAuZ2V0QWNjb3VudElkKCkpKTsKLSAgICAgICAgICAgIGlmICghY2MuaXNWaXNpYmxlKGRiUHJvdmlkZXIuZ2V0KCkpKSB7Ci0gICAgICAgICAgICAgIC8vIFRoZSB1c2VyIGNhbid0IHNlZSB0aGUgY2hhbmdlIGFueW1vcmUuCi0gICAgICAgICAgICAgIC8vCi0gICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgcHNWYWwgPSBjYy5nZXRSYW5nZShwZXJtaXNzaW9uTmFtZSkuc3F1YXNoKHBzVmFsKTsKLSAgICAgICAgICB9IGNhdGNoIChOb1N1Y2hDaGFuZ2VFeGNlcHRpb24gZSkgewotICAgICAgICAgICAgLy8gVGhlIHByb2plY3QgaGFzIGRpc2FwcGVhcmVkLgotICAgICAgICAgICAgLy8KLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgIH0KLQotICAgICAgICAgIGlmICh0ZXN0Lm1hdGNoKHBzVmFsLCBleHBWYWwpKSB7Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICB9CisgICAgICBhbGxBcHByb3ZlcnMuYWRkKHAuZ2V0QWNjb3VudElkKCkpOworICAgICAgaWYgKGxhYmVsVHlwZS5tYXRjaGVzKHApKSB7CisgICAgICAgIGFwcHJvdmVyc1RoYXRWb3RlZEluQ2F0ZWdvcnkuYWRkKHAuZ2V0QWNjb3VudElkKCkpOworICAgICAgICBpZiAobWF0Y2goYywgcC5nZXRWYWx1ZSgpLCBwLmdldEFjY291bnRJZCgpLCBsYWJlbFR5cGUpKSB7CisgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICAgIH0KICAgICB9CisKKyAgICBmaW5hbCBTZXQ8QWNjb3VudC5JZD4gYXBwcm92ZXJzVGhhdERpZE5vdFZvdGVJbkNhdGVnb3J5ID0gbmV3IEhhc2hTZXQ8QWNjb3VudC5JZD4oYWxsQXBwcm92ZXJzKTsKKyAgICBhcHByb3ZlcnNUaGF0RGlkTm90Vm90ZUluQ2F0ZWdvcnkucmVtb3ZlQWxsKGFwcHJvdmVyc1RoYXRWb3RlZEluQ2F0ZWdvcnkpOworICAgIGZvciAoQWNjb3VudC5JZCBhIDogYXBwcm92ZXJzVGhhdERpZE5vdFZvdGVJbkNhdGVnb3J5KSB7CisgICAgICBpZiAobWF0Y2goYywgMCwgYSwgbGFiZWxUeXBlKSkgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gZmFsc2U7CisgIH0KKworICBwcml2YXRlIGJvb2xlYW4gbWF0Y2goZmluYWwgQ2hhbmdlIGNoYW5nZSwgZmluYWwgaW50IHZhbHVlLAorICAgICAgZmluYWwgQWNjb3VudC5JZCBhcHByb3ZlciwgZmluYWwgTGFiZWxUeXBlIHR5cGUpCisgICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKKyAgICBpbnQgcHNWYWwgPSB2YWx1ZTsKKyAgICBpZiAodGVzdC5tYXRjaChwc1ZhbCwgZXhwVmFsKSkgeworICAgICAgLy8gRG91YmxlIGNoZWNrIHRoZSB2YWx1ZSBpcyBzdGlsbCBwZXJtaXR0ZWQgZm9yIHRoZSB1c2VyLgorICAgICAgLy8KKyAgICAgIHRyeSB7CisgICAgICAgIENoYW5nZUNvbnRyb2wgY2MgPSBjY0ZhY3RvcnkuY29udHJvbEZvcihjaGFuZ2UsIC8vCisgICAgICAgICAgICB1c2VyRmFjdG9yeS5jcmVhdGUoZGJQcm92aWRlciwgYXBwcm92ZXIpKTsKKyAgICAgICAgaWYgKCFjYy5pc1Zpc2libGUoZGJQcm92aWRlci5nZXQoKSkpIHsKKyAgICAgICAgICAvLyBUaGUgdXNlciBjYW4ndCBzZWUgdGhlIGNoYW5nZSBhbnltb3JlLgorICAgICAgICAgIC8vCisgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgICAgIHBzVmFsID0gY2MuZ2V0UmFuZ2UoUGVybWlzc2lvbi5mb3JMYWJlbCh0eXBlLmdldE5hbWUoKSkpLnNxdWFzaChwc1ZhbCk7CisgICAgICB9IGNhdGNoIChOb1N1Y2hDaGFuZ2VFeGNlcHRpb24gZSkgeworICAgICAgICAvLyBUaGUgcHJvamVjdCBoYXMgZGlzYXBwZWFyZWQuCisgICAgICAgIC8vCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgIH0KKworICAgICAgaWYgKHRlc3QubWF0Y2gocHNWYWwsIGV4cFZhbCkpIHsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICB9CisgICAgfQogICAgIHJldHVybiBmYWxzZTsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9MaXN0Q2hhbmdlcy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvTGlzdENoYW5nZXMuamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZjBlZDY2YS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9MaXN0Q2hhbmdlcy5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNjcyICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlOwotCi1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5jaGFuZ2VzLkxpc3RDaGFuZ2VzT3B0aW9uLkFMTF9DT01NSVRTOwotaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbi5BTExfRklMRVM7Ci1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5jaGFuZ2VzLkxpc3RDaGFuZ2VzT3B0aW9uLkFMTF9SRVZJU0lPTlM7Ci1pbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5jaGFuZ2VzLkxpc3RDaGFuZ2VzT3B0aW9uLkNVUlJFTlRfQ09NTUlUOwotaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbi5DVVJSRU5UX0ZJTEVTOwotaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbi5DVVJSRU5UX1JFVklTSU9OOwotaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uY2hhbmdlcy5MaXN0Q2hhbmdlc09wdGlvbi5MQUJFTFM7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7Ci1pbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaXN0czsKLWltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmNoYW5nZXMuTGlzdENoYW5nZXNPcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0UmVjb3JkOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZU1lc3NhZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRJbmZvOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEluZm8uUGFyZW50SW5mbzsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuVXNlcklkZW50aXR5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQW5vbnltb3VzVXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5PdXRwdXRGb3JtYXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5DYW5vbmljYWxXZWJVcmw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50cy5BY2NvdW50QXR0cmlidXRlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoTGlzdENhY2hlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaExpc3RFbnRyeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUGF0Y2hMaXN0Tm90QXZhaWxhYmxlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9GYWN0b3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QYXRjaFNldEluZm9Ob3RBdmFpbGFibGVFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LlF1ZXJ5UGFyc2VFeGNlcHRpb247Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hJbmZvOwotaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5yZWZsZWN0LlR5cGVUb2tlbjsKLWltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247Ci0KLWltcG9ydCBjb20uamNyYWZ0LmpzY2guSG9zdEtleTsKLQotaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKLWltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouT3B0aW9uOwotaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7Ci1pbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7Ci0KLWltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEuaW8uV3JpdGVyOwotaW1wb3J0IGphdmEuc3FsLlRpbWVzdGFtcDsKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7Ci1pbXBvcnQgamF2YS51dGlsLkNvbXBhcmF0b3I7Ci1pbXBvcnQgamF2YS51dGlsLkVudW1TZXQ7Ci1pbXBvcnQgamF2YS51dGlsLkxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLk1hcDsKLQotcHVibGljIGNsYXNzIExpc3RDaGFuZ2VzIHsKLSAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKExpc3RDaGFuZ2VzLmNsYXNzKTsKLQotICBAU2luZ2xldG9uCi0gIHN0YXRpYyBjbGFzcyBVcmxzIHsKLSAgICBmaW5hbCBTdHJpbmcgZ2l0OwotICAgIGZpbmFsIFN0cmluZyBodHRwOwotCi0gICAgQEluamVjdAotICAgIFVybHMoQEdlcnJpdFNlcnZlckNvbmZpZyBDb25maWcgY2ZnKSB7Ci0gICAgICB0aGlzLmdpdCA9IGVuc3VyZVNsYXNoKGNmZy5nZXRTdHJpbmcoImdlcnJpdCIsIG51bGwsICJjYW5vbmljYWxHaXRVcmwiKSk7Ci0gICAgICB0aGlzLmh0dHAgPSBlbnN1cmVTbGFzaChjZmcuZ2V0U3RyaW5nKCJnZXJyaXQiLCBudWxsLCAiZ2l0SHR0cFVybCIpKTsKLSAgICB9Ci0KLSAgICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgZW5zdXJlU2xhc2goU3RyaW5nIGluKSB7Ci0gICAgICBpZiAoaW4gIT0gbnVsbCAmJiAhaW4uZW5kc1dpdGgoIi8iKSkgewotICAgICAgICByZXR1cm4gaW4gKyAiLyI7Ci0gICAgICB9Ci0gICAgICByZXR1cm4gaW47Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSBmaW5hbCBRdWVyeVByb2Nlc3NvciBpbXA7Ci0gIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmV2aWV3RGI+IGRiOwotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKLSAgcHJpdmF0ZSBmaW5hbCBDdXJyZW50VXNlciB1c2VyOwotICBwcml2YXRlIGZpbmFsIEFub255bW91c1VzZXIgYW5vbnltb3VzOwotICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKLSAgcHJpdmF0ZSBmaW5hbCBQYXRjaFNldEluZm9GYWN0b3J5IHBhdGNoU2V0SW5mb0ZhY3Rvcnk7Ci0gIHByaXZhdGUgZmluYWwgUGF0Y2hMaXN0Q2FjaGUgcGF0Y2hMaXN0Q2FjaGU7Ci0gIHByaXZhdGUgZmluYWwgU3NoSW5mbyBzc2hJbmZvOwotICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXI7Ci0gIHByaXZhdGUgZmluYWwgVXJscyB1cmxzOwotICBwcml2YXRlIGJvb2xlYW4gcmV2ZXJzZTsKLSAgcHJpdmF0ZSBNYXA8QWNjb3VudC5JZCwgQWNjb3VudEF0dHJpYnV0ZT4gYWNjb3VudHM7Ci0gIHByaXZhdGUgTWFwPENoYW5nZS5JZCwgQ2hhbmdlQ29udHJvbD4gY29udHJvbHM7Ci0gIHByaXZhdGUgRW51bVNldDxMaXN0Q2hhbmdlc09wdGlvbj4gb3B0aW9uczsKLQotICBAT3B0aW9uKG5hbWUgPSAiLS1mb3JtYXQiLCBtZXRhVmFyID0gIkZNVCIsIHVzYWdlID0gIk91dHB1dCBkaXNwbGF5IGZvcm1hdCIpCi0gIHByaXZhdGUgT3V0cHV0Rm9ybWF0IGZvcm1hdCA9IE91dHB1dEZvcm1hdC5URVhUOwotCi0gIEBPcHRpb24obmFtZSA9ICItLXF1ZXJ5IiwgYWxpYXNlcyA9IHsiLXEifSwgbWV0YVZhciA9ICJRVUVSWSIsIG11bHRpVmFsdWVkID0gdHJ1ZSwgdXNhZ2UgPSAiUXVlcnkgc3RyaW5nIikKLSAgcHJpdmF0ZSBMaXN0PFN0cmluZz4gcXVlcmllczsKLQotICBAT3B0aW9uKG5hbWUgPSAiLS1saW1pdCIsIGFsaWFzZXMgPSB7Ii1uIn0sIG1ldGFWYXIgPSAiQ05UIiwgdXNhZ2UgPSAiTWF4aW11bSBudW1iZXIgb2YgcmVzdWx0cyB0byByZXR1cm4iKQotICBwdWJsaWMgdm9pZCBzZXRMaW1pdChpbnQgbGltaXQpIHsKLSAgICBpbXAuc2V0TGltaXQobGltaXQpOwotICB9Ci0KLSAgQE9wdGlvbihuYW1lID0gIi1vIiwgbXVsdGlWYWx1ZWQgPSB0cnVlLCB1c2FnZSA9ICJPdXRwdXQgb3B0aW9ucyBwZXIgY2hhbmdlIikKLSAgcHVibGljIHZvaWQgYWRkT3B0aW9uKExpc3RDaGFuZ2VzT3B0aW9uIG8pIHsKLSAgICBvcHRpb25zLmFkZChvKTsKLSAgfQotCi0gIEBPcHRpb24obmFtZSA9ICItTyIsIHVzYWdlID0gIk91dHB1dCBvcHRpb24gZmxhZ3MsIGluIGhleCIpCi0gIHZvaWQgc2V0T3B0aW9uRmxhZ3NIZXgoU3RyaW5nIGhleCkgewotICAgIG9wdGlvbnMuYWRkQWxsKExpc3RDaGFuZ2VzT3B0aW9uLmZyb21CaXRzKEludGVnZXIucGFyc2VJbnQoaGV4LCAxNikpKTsKLSAgfQotCi0gIEBPcHRpb24obmFtZSA9ICItUCIsIG1ldGFWYXIgPSAiU09SVEtFWSIsIHVzYWdlID0gIlByZXZpb3VzIGNoYW5nZXMgYmVmb3JlIFNPUlRLRVkiKQotICBwdWJsaWMgdm9pZCBzZXRTb3J0S2V5QWZ0ZXIoU3RyaW5nIGtleSkgewotICAgIC8vIFF1ZXJ5aW5nIGZvciB0aGUgcHJpb3IgcGFnZSBvZiBjaGFuZ2VzIHJlcXVpcmVzIHNvcnRrZXlfYWZ0ZXIgcHJlZGljYXRlLgotICAgIC8vIENoYW5nZXMgYXJlIHNob3duIG1vc3QgcmVjZW50LT5sZWFzdCByZWNlbnQuIFRoZSBwcmV2aW91cyBwYWdlIG9mCi0gICAgLy8gcmVzdWx0cyBjb250YWlucyBjaGFuZ2VzIHRoYXQgd2VyZSB1cGRhdGVkIGFmdGVyIHRoZSBnaXZlbiBrZXkuCi0gICAgaW1wLnNldFNvcnRrZXlBZnRlcihrZXkpOwotICAgIHJldmVyc2UgPSB0cnVlOwotICB9Ci0KLSAgQE9wdGlvbihuYW1lID0gIi1OIiwgbWV0YVZhciA9ICJTT1JUS0VZIiwgdXNhZ2UgPSAiTmV4dCBjaGFuZ2VzIGFmdGVyIFNPUlRLRVkiKQotICBwdWJsaWMgdm9pZCBzZXRTb3J0S2V5QmVmb3JlKFN0cmluZyBrZXkpIHsKLSAgICAvLyBRdWVyeWluZyBmb3IgdGhlIG5leHQgcGFnZSBvZiBjaGFuZ2VzIHJlcXVpcmVzIHNvcnRrZXlfYmVmb3JlIHByZWRpY2F0ZS4KLSAgICAvLyBDaGFuZ2VzIGFyZSBzaG93biBtb3N0IHJlY2VudC0+bGVhc3QgcmVjZW50LiBUaGUgbmV4dCBwYWdlIGNvbnRhaW5zCi0gICAgLy8gY2hhbmdlcyB0aGF0IHdlcmUgdXBkYXRlZCBiZWZvcmUgdGhlIGdpdmVuIGtleS4KLSAgICBpbXAuc2V0U29ydGtleUJlZm9yZShrZXkpOwotICB9Ci0KLSAgQEluamVjdAotICBMaXN0Q2hhbmdlcyhRdWVyeVByb2Nlc3NvciBxcCwKLSAgICAgIFByb3ZpZGVyPFJldmlld0RiPiBkYiwKLSAgICAgIEFwcHJvdmFsVHlwZXMgYXQsCi0gICAgICBDdXJyZW50VXNlciB1LAotICAgICAgQW5vbnltb3VzVXNlciBhdSwKLSAgICAgIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjZiwKLSAgICAgIFBhdGNoU2V0SW5mb0ZhY3RvcnkgcHNpLAotICAgICAgUGF0Y2hMaXN0Q2FjaGUgcGxjLAotICAgICAgU3NoSW5mbyBzc2hJbmZvLAotICAgICAgQENhbm9uaWNhbFdlYlVybCBQcm92aWRlcjxTdHJpbmc+IGN1cmwsCi0gICAgICBVcmxzIHVybHMpIHsKLSAgICB0aGlzLmltcCA9IHFwOwotICAgIHRoaXMuZGIgPSBkYjsKLSAgICB0aGlzLmFwcHJvdmFsVHlwZXMgPSBhdDsKLSAgICB0aGlzLnVzZXIgPSB1OwotICAgIHRoaXMuYW5vbnltb3VzID0gYXU7Ci0gICAgdGhpcy5jaGFuZ2VDb250cm9sRmFjdG9yeSA9IGNmOwotICAgIHRoaXMucGF0Y2hTZXRJbmZvRmFjdG9yeSA9IHBzaTsKLSAgICB0aGlzLnBhdGNoTGlzdENhY2hlID0gcGxjOwotICAgIHRoaXMuc3NoSW5mbyA9IHNzaEluZm87Ci0gICAgdGhpcy51cmxQcm92aWRlciA9IGN1cmw7Ci0gICAgdGhpcy51cmxzID0gdXJsczsKLQotICAgIGFjY291bnRzID0gTWFwcy5uZXdIYXNoTWFwKCk7Ci0gICAgY29udHJvbHMgPSBNYXBzLm5ld0hhc2hNYXAoKTsKLSAgICBvcHRpb25zID0gRW51bVNldC5ub25lT2YoTGlzdENoYW5nZXNPcHRpb24uY2xhc3MpOwotICB9Ci0KLSAgcHVibGljIE91dHB1dEZvcm1hdCBnZXRGb3JtYXQoKSB7Ci0gICAgcmV0dXJuIGZvcm1hdDsKLSAgfQotCi0gIHB1YmxpYyBMaXN0Q2hhbmdlcyBzZXRGb3JtYXQoT3V0cHV0Rm9ybWF0IGZtdCkgewotICAgIHRoaXMuZm9ybWF0ID0gZm10OwotICAgIHJldHVybiB0aGlzOwotICB9Ci0KLSAgcHVibGljIExpc3RDaGFuZ2VzIGFkZFF1ZXJ5KFN0cmluZyBxdWVyeSkgewotICAgIGlmIChxdWVyaWVzID09IG51bGwpIHsKLSAgICAgIHF1ZXJpZXMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKLSAgICB9Ci0gICAgcXVlcmllcy5hZGQocXVlcnkpOwotICAgIHJldHVybiB0aGlzOwotICB9Ci0KLSAgcHVibGljIHZvaWQgcXVlcnkoV3JpdGVyIG91dCkKLSAgICAgIHRocm93cyBPcm1FeGNlcHRpb24sIFF1ZXJ5UGFyc2VFeGNlcHRpb24sIElPRXhjZXB0aW9uIHsKLSAgICBpZiAoaW1wLmlzRGlzYWJsZWQoKSkgewotICAgICAgdGhyb3cgbmV3IFF1ZXJ5UGFyc2VFeGNlcHRpb24oInF1ZXJ5IGRpc2FibGVkIik7Ci0gICAgfQotICAgIGlmIChxdWVyaWVzID09IG51bGwgfHwgcXVlcmllcy5pc0VtcHR5KCkpIHsKLSAgICAgIHF1ZXJpZXMgPSBDb2xsZWN0aW9ucy5zaW5nbGV0b25MaXN0KCJzdGF0dXM6b3BlbiIpOwotICAgIH0gZWxzZSBpZiAocXVlcmllcy5zaXplKCkgPiAxMCkgewotICAgICAgLy8gSGFyZC1jb2RlIGEgZGVmYXVsdCBtYXhpbXVtIG51bWJlciBvZiBxdWVyaWVzIHRvIHByZXZlbnQKLSAgICAgIC8vIHVzZXJzIGZyb20gc3VibWl0dGluZyB0b28gbXVjaCB0byB0aGUgc2VydmVyIGluIGEgc2luZ2xlIGNhbGwuCi0gICAgICB0aHJvdyBuZXcgUXVlcnlQYXJzZUV4Y2VwdGlvbigibGltaXQgb2YgMTAgcXVlcmllcyIpOwotICAgIH0KLQotICAgIExpc3Q8TGlzdDxDaGFuZ2VJbmZvPj4gcmVzID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KHF1ZXJpZXMuc2l6ZSgpKTsKLSAgICBmb3IgKFN0cmluZyBxdWVyeSA6IHF1ZXJpZXMpIHsKLSAgICAgIExpc3Q8Q2hhbmdlRGF0YT4gY2hhbmdlcyA9IGltcC5xdWVyeUNoYW5nZXMocXVlcnkpOwotICAgICAgYm9vbGVhbiBtb3JlQ2hhbmdlcyA9IGltcC5nZXRMaW1pdCgpID4gMCAmJiBjaGFuZ2VzLnNpemUoKSA+IGltcC5nZXRMaW1pdCgpOwotICAgICAgaWYgKG1vcmVDaGFuZ2VzKSB7Ci0gICAgICAgIGlmIChyZXZlcnNlKSB7Ci0gICAgICAgICAgY2hhbmdlcyA9IGNoYW5nZXMuc3ViTGlzdCgxLCBjaGFuZ2VzLnNpemUoKSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgY2hhbmdlcyA9IGNoYW5nZXMuc3ViTGlzdCgwLCBpbXAuZ2V0TGltaXQoKSk7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICAgIENoYW5nZURhdGEuZW5zdXJlQ2hhbmdlTG9hZGVkKGRiLCBjaGFuZ2VzKTsKLSAgICAgIENoYW5nZURhdGEuZW5zdXJlQ3VycmVudFBhdGNoU2V0TG9hZGVkKGRiLCBjaGFuZ2VzKTsKLSAgICAgIENoYW5nZURhdGEuZW5zdXJlQ3VycmVudEFwcHJvdmFsc0xvYWRlZChkYiwgY2hhbmdlcyk7Ci0KLSAgICAgIExpc3Q8Q2hhbmdlSW5mbz4gaW5mbyA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShjaGFuZ2VzLnNpemUoKSk7Ci0gICAgICBmb3IgKENoYW5nZURhdGEgY2QgOiBjaGFuZ2VzKSB7Ci0gICAgICAgIGluZm8uYWRkKHRvQ2hhbmdlSW5mbyhjZCkpOwotICAgICAgfQotICAgICAgaWYgKG1vcmVDaGFuZ2VzICYmICFpbmZvLmlzRW1wdHkoKSkgewotICAgICAgICBpZiAocmV2ZXJzZSkgewotICAgICAgICAgIGluZm8uZ2V0KDApLl9tb3JlQ2hhbmdlcyA9IHRydWU7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgaW5mby5nZXQoaW5mby5zaXplKCkgLSAxKS5fbW9yZUNoYW5nZXMgPSB0cnVlOwotICAgICAgICB9Ci0gICAgICB9Ci0gICAgICByZXMuYWRkKGluZm8pOwotICAgIH0KLQotICAgIGlmICghYWNjb3VudHMuaXNFbXB0eSgpKSB7Ci0gICAgICBmb3IgKEFjY291bnQgYWNjb3VudCA6IGRiLmdldCgpLmFjY291bnRzKCkuZ2V0KGFjY291bnRzLmtleVNldCgpKSkgewotICAgICAgICBBY2NvdW50QXR0cmlidXRlIGEgPSBhY2NvdW50cy5nZXQoYWNjb3VudC5nZXRJZCgpKTsKLSAgICAgICAgYS5uYW1lID0gU3RyaW5ncy5lbXB0eVRvTnVsbChhY2NvdW50LmdldEZ1bGxOYW1lKCkpOwotICAgICAgfQotICAgIH0KLQotICAgIGlmIChmb3JtYXQuaXNKc29uKCkpIHsKLSAgICAgIGZvcm1hdC5uZXdHc29uKCkudG9Kc29uKAotICAgICAgICAgIHJlcy5zaXplKCkgPT0gMSA/IHJlcy5nZXQoMCkgOiByZXMsCi0gICAgICAgICAgbmV3IFR5cGVUb2tlbjxMaXN0PENoYW5nZUluZm8+PigpIHt9LmdldFR5cGUoKSwKLSAgICAgICAgICBvdXQpOwotICAgICAgb3V0LndyaXRlKCdcbicpOwotICAgIH0gZWxzZSB7Ci0gICAgICBib29sZWFuIGZpcnN0UXVlcnkgPSB0cnVlOwotICAgICAgZm9yIChMaXN0PENoYW5nZUluZm8+IGluZm8gOiByZXMpIHsKLSAgICAgICAgaWYgKGZpcnN0UXVlcnkpIHsKLSAgICAgICAgICBmaXJzdFF1ZXJ5ID0gZmFsc2U7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgb3V0LndyaXRlKCdcbicpOwotICAgICAgICB9Ci0gICAgICAgIGZvciAoQ2hhbmdlSW5mbyBjIDogaW5mbykgewotICAgICAgICAgIFN0cmluZyBpZCA9IG5ldyBDaGFuZ2UuS2V5KGMuaWQpLmFiYnJldmlhdGUoKTsKLSAgICAgICAgICBTdHJpbmcgc3ViamVjdCA9IGMuc3ViamVjdDsKLSAgICAgICAgICBpZiAoc3ViamVjdC5sZW5ndGgoKSArIGlkLmxlbmd0aCgpID4gODApIHsKLSAgICAgICAgICAgIHN1YmplY3QgPSBzdWJqZWN0LnN1YnN0cmluZygwLCA4MCAtIGlkLmxlbmd0aCgpKTsKLSAgICAgICAgICB9Ci0gICAgICAgICAgb3V0LndyaXRlKGlkKTsKLSAgICAgICAgICBvdXQud3JpdGUoJyAnKTsKLSAgICAgICAgICBvdXQud3JpdGUoc3ViamVjdC5yZXBsYWNlKCdcbicsICcgJykpOwotICAgICAgICAgIG91dC53cml0ZSgnXG4nKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgQ2hhbmdlSW5mbyB0b0NoYW5nZUluZm8oQ2hhbmdlRGF0YSBjZCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7Ci0gICAgQ2hhbmdlSW5mbyBvdXQgPSBuZXcgQ2hhbmdlSW5mbygpOwotICAgIENoYW5nZSBpbiA9IGNkLmNoYW5nZShkYik7Ci0gICAgb3V0LnByb2plY3QgPSBpbi5nZXRQcm9qZWN0KCkuZ2V0KCk7Ci0gICAgb3V0LmJyYW5jaCA9IGluLmdldERlc3QoKS5nZXRTaG9ydE5hbWUoKTsKLSAgICBvdXQudG9waWMgPSBpbi5nZXRUb3BpYygpOwotICAgIG91dC5pZCA9IGluLmdldEtleSgpLmdldCgpOwotICAgIG91dC5zdWJqZWN0ID0gaW4uZ2V0U3ViamVjdCgpOwotICAgIG91dC5zdGF0dXMgPSBpbi5nZXRTdGF0dXMoKTsKLSAgICBvdXQub3duZXIgPSBhc0FjY291bnRBdHRyaWJ1dGUoaW4uZ2V0T3duZXIoKSk7Ci0gICAgb3V0LmNyZWF0ZWQgPSBpbi5nZXRDcmVhdGVkT24oKTsKLSAgICBvdXQudXBkYXRlZCA9IGluLmdldExhc3RVcGRhdGVkT24oKTsKLSAgICBvdXQuX251bWJlciA9IGluLmdldElkKCkuZ2V0KCk7Ci0gICAgb3V0Ll9zb3J0a2V5ID0gaW4uZ2V0U29ydEtleSgpOwotICAgIG91dC5zdGFycmVkID0gdXNlci5nZXRTdGFycmVkQ2hhbmdlcygpLmNvbnRhaW5zKGluLmdldElkKCkpID8gdHJ1ZSA6IG51bGw7Ci0gICAgb3V0LnJldmlld2VkID0gaW4uZ2V0U3RhdHVzKCkuaXNPcGVuKCkgJiYgaXNDaGFuZ2VSZXZpZXdlZChjZCkgPyB0cnVlIDogbnVsbDsKLSAgICBvdXQubGFiZWxzID0gb3B0aW9ucy5jb250YWlucyhMQUJFTFMpID8gbGFiZWxzRm9yKGNkKSA6IG51bGw7Ci0KLSAgICBpZiAob3B0aW9ucy5jb250YWlucyhBTExfUkVWSVNJT05TKSB8fCBvcHRpb25zLmNvbnRhaW5zKENVUlJFTlRfUkVWSVNJT04pKSB7Ci0gICAgICBvdXQucmV2aXNpb25zID0gcmV2aXNpb25zKGNkKTsKLSAgICAgIGZvciAoU3RyaW5nIGNvbW1pdCA6IG91dC5yZXZpc2lvbnMua2V5U2V0KCkpIHsKLSAgICAgICAgaWYgKG91dC5yZXZpc2lvbnMuZ2V0KGNvbW1pdCkuaXNDdXJyZW50KSB7Ci0gICAgICAgICAgb3V0LmN1cnJlbnRfcmV2aXNpb24gPSBjb21taXQ7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9Ci0KLSAgICByZXR1cm4gb3V0OwotICB9Ci0KLSAgcHJpdmF0ZSBBY2NvdW50QXR0cmlidXRlIGFzQWNjb3VudEF0dHJpYnV0ZShBY2NvdW50LklkIHVzZXIpIHsKLSAgICBpZiAodXNlciA9PSBudWxsKSB7Ci0gICAgICByZXR1cm4gbnVsbDsKLSAgICB9Ci0gICAgQWNjb3VudEF0dHJpYnV0ZSBhID0gYWNjb3VudHMuZ2V0KHVzZXIpOwotICAgIGlmIChhID09IG51bGwpIHsKLSAgICAgIGEgPSBuZXcgQWNjb3VudEF0dHJpYnV0ZSgpOwotICAgICAgYWNjb3VudHMucHV0KHVzZXIsIGEpOwotICAgIH0KLSAgICByZXR1cm4gYTsKLSAgfQotCi0gIHByaXZhdGUgQ2hhbmdlQ29udHJvbCBjb250cm9sKENoYW5nZURhdGEgY2QpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIENoYW5nZUNvbnRyb2wgY3RybCA9IGNkLmNoYW5nZUNvbnRyb2woKTsKLSAgICBpZiAoY3RybCAhPSBudWxsICYmIGN0cmwuZ2V0Q3VycmVudFVzZXIoKSA9PSB1c2VyKSB7Ci0gICAgICByZXR1cm4gY3RybDsKLSAgICB9Ci0KLSAgICBjdHJsID0gY29udHJvbHMuZ2V0KGNkLmdldElkKCkpOwotICAgIGlmIChjdHJsICE9IG51bGwpIHsKLSAgICAgIHJldHVybiBjdHJsOwotICAgIH0KLQotICAgIHRyeSB7Ci0gICAgICBjdHJsID0gY2hhbmdlQ29udHJvbEZhY3RvcnkuY29udHJvbEZvcihjZC5jaGFuZ2UoZGIpKTsKLSAgICB9IGNhdGNoIChOb1N1Y2hDaGFuZ2VFeGNlcHRpb24gZSkgewotICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfQotICAgIGNvbnRyb2xzLnB1dChjZC5nZXRJZCgpLCBjdHJsKTsKLSAgICByZXR1cm4gY3RybDsKLSAgfQotCi0gIHByaXZhdGUgTWFwPFN0cmluZywgTGFiZWxJbmZvPiBsYWJlbHNGb3IoQ2hhbmdlRGF0YSBjZCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7Ci0gICAgQ2hhbmdlQ29udHJvbCBjdGwgPSBjb250cm9sKGNkKTsKLSAgICBpZiAoY3RsID09IG51bGwpIHsKLSAgICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eU1hcCgpOwotICAgIH0KLQotICAgIFBhdGNoU2V0IHBzID0gY2QuY3VycmVudFBhdGNoU2V0KGRiKTsKLSAgICBpZiAocHMgPT0gbnVsbCkgewotICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5TWFwKCk7Ci0gICAgfQotCi0gICAgTWFwPFN0cmluZywgTGFiZWxJbmZvPiBsYWJlbHMgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKLSAgICBmb3IgKFN1Ym1pdFJlY29yZCByZWMgOiBjdGwuY2FuU3VibWl0KGRiLmdldCgpLCBwcywgY2QsIHRydWUsIGZhbHNlKSkgewotICAgICAgaWYgKHJlYy5sYWJlbHMgPT0gbnVsbCkgewotICAgICAgICBjb250aW51ZTsKLSAgICAgIH0KLSAgICAgIGZvciAoU3VibWl0UmVjb3JkLkxhYmVsIHIgOiByZWMubGFiZWxzKSB7Ci0gICAgICAgIExhYmVsSW5mbyBwID0gbGFiZWxzLmdldChyLmxhYmVsKTsKLSAgICAgICAgaWYgKHAgPT0gbnVsbCB8fCBwLl9zdGF0dXMuY29tcGFyZVRvKHIuc3RhdHVzKSA8IDApIHsKLSAgICAgICAgICBMYWJlbEluZm8gbiA9IG5ldyBMYWJlbEluZm8oKTsKLSAgICAgICAgICBuLl9zdGF0dXMgPSByLnN0YXR1czsKLSAgICAgICAgICBzd2l0Y2ggKHIuc3RhdHVzKSB7Ci0gICAgICAgICAgICBjYXNlIE9LOgotICAgICAgICAgICAgICBuLmFwcHJvdmVkID0gYXNBY2NvdW50QXR0cmlidXRlKHIuYXBwbGllZEJ5KTsKLSAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFJFSkVDVDoKLSAgICAgICAgICAgICAgbi5yZWplY3RlZCA9IGFzQWNjb3VudEF0dHJpYnV0ZShyLmFwcGxpZWRCeSk7Ci0gICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgIH0KLSAgICAgICAgICBuLm9wdGlvbmFsID0gbi5fc3RhdHVzID09IFN1Ym1pdFJlY29yZC5MYWJlbC5TdGF0dXMuTUFZID8gdHJ1ZSA6IG51bGw7Ci0gICAgICAgICAgbGFiZWxzLnB1dChyLmxhYmVsLCBuKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLQotICAgIENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzID0gbnVsbDsKLSAgICBmb3IgKE1hcC5FbnRyeTxTdHJpbmcsIExhYmVsSW5mbz4gZSA6IGxhYmVscy5lbnRyeVNldCgpKSB7Ci0gICAgICBpZiAoZS5nZXRWYWx1ZSgpLmFwcHJvdmVkICE9IG51bGwgfHwgZS5nZXRWYWx1ZSgpLnJlamVjdGVkICE9IG51bGwpIHsKLSAgICAgICAgY29udGludWU7Ci0gICAgICB9Ci0KLSAgICAgIEFwcHJvdmFsVHlwZSB0eXBlID0gYXBwcm92YWxUeXBlcy5ieUxhYmVsKGUuZ2V0S2V5KCkpOwotICAgICAgaWYgKHR5cGUgPT0gbnVsbCB8fCB0eXBlLmdldE1pbigpID09IG51bGwgfHwgdHlwZS5nZXRNYXgoKSA9PSBudWxsKSB7Ci0gICAgICAgIC8vIFVua25vd24gb3IgbWlzY29uZmlndXJlZCB0eXBlIGNhbid0IGhhdmUgaW50ZXJtZWRpYXRlIHNjb3Jlcy4KLSAgICAgICAgY29udGludWU7Ci0gICAgICB9Ci0KLSAgICAgIHNob3J0IG1pbiA9IHR5cGUuZ2V0TWluKCkuZ2V0VmFsdWUoKTsKLSAgICAgIHNob3J0IG1heCA9IHR5cGUuZ2V0TWF4KCkuZ2V0VmFsdWUoKTsKLSAgICAgIGlmICgtMSA8PSBtaW4gJiYgbWF4IDw9IDEpIHsKLSAgICAgICAgLy8gVHlwZXMgd2l0aCBhIHJhbmdlIG9mIC0xLi4rMSBjYW4ndCBoYXZlIGludGVybWVkaWF0ZSBzY29yZXMuCi0gICAgICAgIGNvbnRpbnVlOwotICAgICAgfQotCi0gICAgICBpZiAoYXBwcm92YWxzID09IG51bGwpIHsKLSAgICAgICAgYXBwcm92YWxzID0gY2QuY3VycmVudEFwcHJvdmFscyhkYik7Ci0gICAgICB9Ci0gICAgICBmb3IgKFBhdGNoU2V0QXBwcm92YWwgcHNhIDogYXBwcm92YWxzKSB7Ci0gICAgICAgIHNob3J0IHZhbCA9IHBzYS5nZXRWYWx1ZSgpOwotICAgICAgICBpZiAodmFsICE9IDAgJiYgbWluIDwgdmFsICYmIHZhbCA8IG1heAotICAgICAgICAgICAgJiYgcHNhLmdldENhdGVnb3J5SWQoKS5lcXVhbHModHlwZS5nZXRDYXRlZ29yeSgpLmdldElkKCkpKSB7Ci0gICAgICAgICAgaWYgKDAgPCB2YWwpIHsKLSAgICAgICAgICAgIGUuZ2V0VmFsdWUoKS5yZWNvbW1lbmRlZCA9IGFzQWNjb3VudEF0dHJpYnV0ZShwc2EuZ2V0QWNjb3VudElkKCkpOwotICAgICAgICAgICAgZS5nZXRWYWx1ZSgpLnZhbHVlID0gdmFsICE9IDEgPyB2YWwgOiBudWxsOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBlLmdldFZhbHVlKCkuZGlzbGlrZWQgPSBhc0FjY291bnRBdHRyaWJ1dGUocHNhLmdldEFjY291bnRJZCgpKTsKLSAgICAgICAgICAgIGUuZ2V0VmFsdWUoKS52YWx1ZSA9IHZhbCAhPSAtMSA/IHZhbCA6IG51bGw7Ci0gICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBsYWJlbHM7Ci0gIH0KLQotICBwcml2YXRlIGJvb2xlYW4gaXNDaGFuZ2VSZXZpZXdlZChDaGFuZ2VEYXRhIGNkKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBpZiAodXNlciBpbnN0YW5jZW9mIElkZW50aWZpZWRVc2VyKSB7Ci0gICAgICBQYXRjaFNldCBjdXJyZW50UGF0Y2hTZXQgPSBjZC5jdXJyZW50UGF0Y2hTZXQoZGIpOwotICAgICAgaWYgKGN1cnJlbnRQYXRjaFNldCA9PSBudWxsKSB7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgIH0KLQotICAgICAgTGlzdDxDaGFuZ2VNZXNzYWdlPiBtZXNzYWdlcyA9Ci0gICAgICAgICAgZGIuZ2V0KCkuY2hhbmdlTWVzc2FnZXMoKS5ieVBhdGNoU2V0KGN1cnJlbnRQYXRjaFNldC5nZXRJZCgpKS50b0xpc3QoKTsKLQotICAgICAgaWYgKG1lc3NhZ2VzLmlzRW1wdHkoKSkgewotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICB9Ci0KLSAgICAgIC8vIFNvcnQgbWVzc2FnZXMgdG8gbGV0IHRoZSBtb3N0IHJlY2VudCBvbmVzIGF0IHRoZSBiZWdpbm5pbmcuCi0gICAgICBDb2xsZWN0aW9ucy5zb3J0KG1lc3NhZ2VzLCBuZXcgQ29tcGFyYXRvcjxDaGFuZ2VNZXNzYWdlPigpIHsKLSAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgIHB1YmxpYyBpbnQgY29tcGFyZShDaGFuZ2VNZXNzYWdlIGEsIENoYW5nZU1lc3NhZ2UgYikgewotICAgICAgICAgIHJldHVybiBiLmdldFdyaXR0ZW5PbigpLmNvbXBhcmVUbyhhLmdldFdyaXR0ZW5PbigpKTsKLSAgICAgICAgfQotICAgICAgfSk7Ci0KLSAgICAgIEFjY291bnQuSWQgY3VycmVudFVzZXJJZCA9ICgoSWRlbnRpZmllZFVzZXIpIHVzZXIpLmdldEFjY291bnRJZCgpOwotICAgICAgQWNjb3VudC5JZCBjaGFuZ2VPd25lcklkID0gY2QuY2hhbmdlKGRiKS5nZXRPd25lcigpOwotICAgICAgZm9yIChDaGFuZ2VNZXNzYWdlIGNtIDogbWVzc2FnZXMpIHsKLSAgICAgICAgaWYgKGN1cnJlbnRVc2VySWQuZXF1YWxzKGNtLmdldEF1dGhvcigpKSkgewotICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICB9IGVsc2UgaWYgKGNoYW5nZU93bmVySWQuZXF1YWxzKGNtLmdldEF1dGhvcigpKSkgewotICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci0gIH0KLQotICBwcml2YXRlIE1hcDxTdHJpbmcsIFJldmlzaW9uSW5mbz4gcmV2aXNpb25zKENoYW5nZURhdGEgY2QpIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIENoYW5nZUNvbnRyb2wgY3RsID0gY29udHJvbChjZCk7Ci0gICAgaWYgKGN0bCA9PSBudWxsKSB7Ci0gICAgICByZXR1cm4gQ29sbGVjdGlvbnMuZW1wdHlNYXAoKTsKLSAgICB9Ci0KLSAgICBDb2xsZWN0aW9uPFBhdGNoU2V0PiBzcmM7Ci0gICAgaWYgKG9wdGlvbnMuY29udGFpbnMoQUxMX1JFVklTSU9OUykpIHsKLSAgICAgIHNyYyA9IGNkLnBhdGNoZXMoZGIpOwotICAgIH0gZWxzZSB7Ci0gICAgICBzcmMgPSBDb2xsZWN0aW9ucy5zaW5nbGV0b25MaXN0KGNkLmN1cnJlbnRQYXRjaFNldChkYikpOwotICAgIH0KLSAgICBNYXA8U3RyaW5nLCBSZXZpc2lvbkluZm8+IHJlcyA9IE1hcHMubmV3TGlua2VkSGFzaE1hcCgpOwotICAgIGZvciAoUGF0Y2hTZXQgaW4gOiBzcmMpIHsKLSAgICAgIGlmIChjdGwuaXNQYXRjaFZpc2libGUoaW4sIGRiLmdldCgpKSkgewotICAgICAgICByZXMucHV0KGluLmdldFJldmlzaW9uKCkuZ2V0KCksIHRvUmV2aXNpb25JbmZvKGNkLCBpbikpOwotICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gcmVzOwotICB9Ci0KLSAgcHJpdmF0ZSBSZXZpc2lvbkluZm8gdG9SZXZpc2lvbkluZm8oQ2hhbmdlRGF0YSBjZCwgUGF0Y2hTZXQgaW4pCi0gICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBSZXZpc2lvbkluZm8gb3V0ID0gbmV3IFJldmlzaW9uSW5mbygpOwotICAgIG91dC5pc0N1cnJlbnQgPSBpbi5nZXRJZCgpLmVxdWFscyhjZC5jaGFuZ2UoZGIpLmN1cnJlbnRQYXRjaFNldElkKCkpOwotICAgIG91dC5fbnVtYmVyID0gaW4uZ2V0SWQoKS5nZXQoKTsKLSAgICBvdXQuZHJhZnQgPSBpbi5pc0RyYWZ0KCkgPyB0cnVlIDogbnVsbDsKLSAgICBvdXQuZmV0Y2ggPSBtYWtlRmV0Y2hNYXAoY2QsIGluKTsKLQotICAgIGlmIChvcHRpb25zLmNvbnRhaW5zKEFMTF9DT01NSVRTKQotICAgICAgICB8fCAob3V0LmlzQ3VycmVudCAmJiBvcHRpb25zLmNvbnRhaW5zKENVUlJFTlRfQ09NTUlUKSkpIHsKLSAgICAgIHRyeSB7Ci0gICAgICAgIFBhdGNoU2V0SW5mbyBpbmZvID0gcGF0Y2hTZXRJbmZvRmFjdG9yeS5nZXQoZGIuZ2V0KCksIGluLmdldElkKCkpOwotICAgICAgICBvdXQuY29tbWl0ID0gbmV3IENvbW1pdEluZm8oKTsKLSAgICAgICAgb3V0LmNvbW1pdC5wYXJlbnRzID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KGluZm8uZ2V0UGFyZW50cygpLnNpemUoKSk7Ci0gICAgICAgIG91dC5jb21taXQuYXV0aG9yID0gdG9HaXRQZXJzb24oaW5mby5nZXRBdXRob3IoKSk7Ci0gICAgICAgIG91dC5jb21taXQuY29tbWl0dGVyID0gdG9HaXRQZXJzb24oaW5mby5nZXRDb21taXR0ZXIoKSk7Ci0gICAgICAgIG91dC5jb21taXQuc3ViamVjdCA9IGluZm8uZ2V0U3ViamVjdCgpOwotICAgICAgICBvdXQuY29tbWl0Lm1lc3NhZ2UgPSBpbmZvLmdldE1lc3NhZ2UoKTsKLQotICAgICAgICBmb3IgKFBhcmVudEluZm8gcGFyZW50IDogaW5mby5nZXRQYXJlbnRzKCkpIHsKLSAgICAgICAgICBDb21taXRJbmZvIGkgPSBuZXcgQ29tbWl0SW5mbygpOwotICAgICAgICAgIGkuY29tbWl0ID0gcGFyZW50LmlkLmdldCgpOwotICAgICAgICAgIGkuc3ViamVjdCA9IHBhcmVudC5zaG9ydE1lc3NhZ2U7Ci0gICAgICAgICAgb3V0LmNvbW1pdC5wYXJlbnRzLmFkZChpKTsKLSAgICAgICAgfQotICAgICAgfSBjYXRjaCAoUGF0Y2hTZXRJbmZvTm90QXZhaWxhYmxlRXhjZXB0aW9uIGUpIHsKLSAgICAgICAgbG9nLndhcm4oIkNhbm5vdCBsb2FkIFBhdGNoU2V0SW5mbyAiICsgaW4uZ2V0SWQoKSwgZSk7Ci0gICAgICB9Ci0gICAgfQotCi0gICAgaWYgKG9wdGlvbnMuY29udGFpbnMoQUxMX0ZJTEVTKQotICAgICAgICB8fCAob3V0LmlzQ3VycmVudCAmJiBvcHRpb25zLmNvbnRhaW5zKENVUlJFTlRfRklMRVMpKSkgewotICAgICAgUGF0Y2hMaXN0IGxpc3Q7Ci0gICAgICB0cnkgewotICAgICAgICBsaXN0ID0gcGF0Y2hMaXN0Q2FjaGUuZ2V0KGNkLmNoYW5nZShkYiksIGluKTsKLSAgICAgIH0gY2F0Y2ggKFBhdGNoTGlzdE5vdEF2YWlsYWJsZUV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgIGxvZy53YXJuKCJDYW5ub3QgbG9hZCBQYXRjaExpc3QgIiArIGluLmdldElkKCksIGUpOwotICAgICAgICBsaXN0ID0gbnVsbDsKLSAgICAgIH0KLSAgICAgIGlmIChsaXN0ICE9IG51bGwpIHsKLSAgICAgICAgb3V0LmZpbGVzID0gTWFwcy5uZXdUcmVlTWFwKCk7Ci0gICAgICAgIGZvciAoUGF0Y2hMaXN0RW50cnkgZSA6IGxpc3QuZ2V0UGF0Y2hlcygpKSB7Ci0gICAgICAgICAgaWYgKFBhdGNoLkNPTU1JVF9NU0cuZXF1YWxzKGUuZ2V0TmV3TmFtZSgpKSkgewotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgRmlsZUluZm8gZCA9IG5ldyBGaWxlSW5mbygpOwotICAgICAgICAgIGQuc3RhdHVzID0gZS5nZXRDaGFuZ2VUeXBlKCkgIT0gUGF0Y2guQ2hhbmdlVHlwZS5NT0RJRklFRAotICAgICAgICAgICAgICA/IGUuZ2V0Q2hhbmdlVHlwZSgpLmdldENvZGUoKQotICAgICAgICAgICAgICA6IG51bGw7Ci0gICAgICAgICAgZC5vbGRQYXRoID0gZS5nZXRPbGROYW1lKCk7Ci0gICAgICAgICAgaWYgKGUuZ2V0UGF0Y2hUeXBlKCkgPT0gUGF0Y2guUGF0Y2hUeXBlLkJJTkFSWSkgewotICAgICAgICAgICAgZC5iaW5hcnkgPSB0cnVlOwotICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBkLmxpbmVzSW5zZXJ0ZWQgPSBlLmdldEluc2VydGlvbnMoKSA+IDAgPyBlLmdldEluc2VydGlvbnMoKSA6IG51bGw7Ci0gICAgICAgICAgICBkLmxpbmVzRGVsZXRlZCA9IGUuZ2V0RGVsZXRpb25zKCkgPiAwID8gZS5nZXREZWxldGlvbnMoKSA6IG51bGw7Ci0gICAgICAgICAgfQotCi0gICAgICAgICAgRmlsZUluZm8gbyA9IG91dC5maWxlcy5wdXQoZS5nZXROZXdOYW1lKCksIGQpOwotICAgICAgICAgIGlmIChvICE9IG51bGwpIHsKLSAgICAgICAgICAgIC8vIFRoaXMgc2hvdWxkIG9ubHkgaGFwcGVuIG9uIGEgZGVsZXRlLWFkZCBicmVhayBjcmVhdGVkIGJ5IEpHaXQKLSAgICAgICAgICAgIC8vIHdoZW4gdGhlIGZpbGUgd2FzIHJld3JpdHRlbiBhbmQgdG9vIGxpdHRsZSBjb250ZW50IHN1cnZpdmVkLiBXcml0ZQotICAgICAgICAgICAgLy8gYSBzaW5nbGUgcmVjb3JkIHdpdGggZGF0YSBmcm9tIGJvdGggc2lkZXMuCi0gICAgICAgICAgICBkLnN0YXR1cyA9IFBhdGNoLkNoYW5nZVR5cGUuUkVXUklURS5nZXRDb2RlKCk7Ci0gICAgICAgICAgICBpZiAoby5iaW5hcnkgIT0gbnVsbCAmJiBvLmJpbmFyeSkgewotICAgICAgICAgICAgICBkLmJpbmFyeSA9IHRydWU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoby5saW5lc0luc2VydGVkICE9IG51bGwpIHsKLSAgICAgICAgICAgICAgZC5saW5lc0luc2VydGVkID0gby5saW5lc0luc2VydGVkOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKG8ubGluZXNEZWxldGVkICE9IG51bGwpIHsKLSAgICAgICAgICAgICAgZC5saW5lc0RlbGV0ZWQgPSBvLmxpbmVzRGVsZXRlZDsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIG91dDsKLSAgfQotCi0gIHByaXZhdGUgTWFwPFN0cmluZywgRmV0Y2hJbmZvPiBtYWtlRmV0Y2hNYXAoQ2hhbmdlRGF0YSBjZCwgUGF0Y2hTZXQgaW4pCi0gICAgICB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBNYXA8U3RyaW5nLCBGZXRjaEluZm8+IHIgPSBNYXBzLm5ld0xpbmtlZEhhc2hNYXAoKTsKLSAgICBTdHJpbmcgcmVmTmFtZSA9IGluLmdldFJlZk5hbWUoKTsKLSAgICBDaGFuZ2VDb250cm9sIGN0bCA9IGNvbnRyb2woY2QpOwotICAgIGlmIChjdGwgIT0gbnVsbCAmJiBjdGwuZm9yVXNlcihhbm9ueW1vdXMpLmlzUGF0Y2hWaXNpYmxlKGluLCBkYi5nZXQoKSkpIHsKLSAgICAgIGlmICh1cmxzLmdpdCAhPSBudWxsKSB7Ci0gICAgICAgIHIucHV0KCJnaXQiLCBuZXcgRmV0Y2hJbmZvKHVybHMuZ2l0Ci0gICAgICAgICAgICArIGNkLmNoYW5nZShkYikuZ2V0UHJvamVjdCgpLmdldCgpLCByZWZOYW1lKSk7Ci0gICAgICB9Ci0gICAgfQotICAgIGlmICh1cmxzLmh0dHAgIT0gbnVsbCkgewotICAgICAgci5wdXQoImh0dHAiLCBuZXcgRmV0Y2hJbmZvKHVybHMuaHR0cAotICAgICAgICAgICsgY2QuY2hhbmdlKGRiKS5nZXRQcm9qZWN0KCkuZ2V0KCksIHJlZk5hbWUpKTsKLSAgICB9IGVsc2UgewotICAgICAgU3RyaW5nIGh0dHAgPSB1cmxQcm92aWRlci5nZXQoKTsKLSAgICAgIGlmICghU3RyaW5ncy5pc051bGxPckVtcHR5KGh0dHApKSB7Ci0gICAgICAgIHIucHV0KCJodHRwIiwgbmV3IEZldGNoSW5mbyhodHRwCi0gICAgICAgICAgICArIGNkLmNoYW5nZShkYikuZ2V0UHJvamVjdCgpLmdldCgpLCByZWZOYW1lKSk7Ci0gICAgICB9Ci0gICAgfQotICAgIGlmICghc3NoSW5mby5nZXRIb3N0S2V5cygpLmlzRW1wdHkoKSkgewotICAgICAgSG9zdEtleSBob3N0ID0gc3NoSW5mby5nZXRIb3N0S2V5cygpLmdldCgwKTsKLSAgICAgIHIucHV0KCJzc2giLCBuZXcgRmV0Y2hJbmZvKFN0cmluZy5mb3JtYXQoCi0gICAgICAgICAgInNzaDovLyVzLyVzIiwKLSAgICAgICAgICBob3N0LmdldEhvc3QoKSwgY2QuY2hhbmdlKGRiKS5nZXRQcm9qZWN0KCkuZ2V0KCkpLAotICAgICAgICAgIHJlZk5hbWUpKTsKLSAgICB9Ci0KLSAgICByZXR1cm4gcjsKLSAgfQotCi0gIHByaXZhdGUgc3RhdGljIEdpdFBlcnNvbiB0b0dpdFBlcnNvbihVc2VySWRlbnRpdHkgY29tbWl0dGVyKSB7Ci0gICAgR2l0UGVyc29uIHAgPSBuZXcgR2l0UGVyc29uKCk7Ci0gICAgcC5uYW1lID0gY29tbWl0dGVyLmdldE5hbWUoKTsKLSAgICBwLmVtYWlsID0gY29tbWl0dGVyLmdldEVtYWlsKCk7Ci0gICAgcC5kYXRlID0gY29tbWl0dGVyLmdldERhdGUoKTsKLSAgICBwLnR6ID0gY29tbWl0dGVyLmdldFRpbWVab25lKCk7Ci0gICAgcmV0dXJuIHA7Ci0gIH0KLQotICBzdGF0aWMgY2xhc3MgQ2hhbmdlSW5mbyB7Ci0gICAgU3RyaW5nIHByb2plY3Q7Ci0gICAgU3RyaW5nIGJyYW5jaDsKLSAgICBTdHJpbmcgdG9waWM7Ci0gICAgU3RyaW5nIGlkOwotICAgIFN0cmluZyBzdWJqZWN0OwotICAgIENoYW5nZS5TdGF0dXMgc3RhdHVzOwotICAgIFRpbWVzdGFtcCBjcmVhdGVkOwotICAgIFRpbWVzdGFtcCB1cGRhdGVkOwotICAgIEJvb2xlYW4gc3RhcnJlZDsKLSAgICBCb29sZWFuIHJldmlld2VkOwotCi0gICAgU3RyaW5nIF9zb3J0a2V5OwotICAgIGludCBfbnVtYmVyOwotCi0gICAgQWNjb3VudEF0dHJpYnV0ZSBvd25lcjsKLSAgICBNYXA8U3RyaW5nLCBMYWJlbEluZm8+IGxhYmVsczsKLSAgICBTdHJpbmcgY3VycmVudF9yZXZpc2lvbjsKLSAgICBNYXA8U3RyaW5nLCBSZXZpc2lvbkluZm8+IHJldmlzaW9uczsKLQotICAgIEJvb2xlYW4gX21vcmVDaGFuZ2VzOwotICB9Ci0KLSAgc3RhdGljIGNsYXNzIFJldmlzaW9uSW5mbyB7Ci0gICAgcHJpdmF0ZSB0cmFuc2llbnQgYm9vbGVhbiBpc0N1cnJlbnQ7Ci0gICAgQm9vbGVhbiBkcmFmdDsKLSAgICBpbnQgX251bWJlcjsKLSAgICBNYXA8U3RyaW5nLCBGZXRjaEluZm8+IGZldGNoOwotICAgIENvbW1pdEluZm8gY29tbWl0OwotICAgIE1hcDxTdHJpbmcsIEZpbGVJbmZvPiBmaWxlczsKLSAgfQotCi0gIHN0YXRpYyBjbGFzcyBGZXRjaEluZm8gewotICAgIFN0cmluZyB1cmw7Ci0gICAgU3RyaW5nIHJlZjsKLQotICAgIEZldGNoSW5mbyhTdHJpbmcgdXJsLCBTdHJpbmcgcmVmKSB7Ci0gICAgICB0aGlzLnVybCA9IHVybDsKLSAgICAgIHRoaXMucmVmID0gcmVmOwotICAgIH0KLSAgfQotCi0gIHN0YXRpYyBjbGFzcyBHaXRQZXJzb24gewotICAgIFN0cmluZyBuYW1lOwotICAgIFN0cmluZyBlbWFpbDsKLSAgICBUaW1lc3RhbXAgZGF0ZTsKLSAgICBpbnQgdHo7Ci0gIH0KLQotICBzdGF0aWMgY2xhc3MgQ29tbWl0SW5mbyB7Ci0gICAgU3RyaW5nIGNvbW1pdDsKLSAgICBMaXN0PENvbW1pdEluZm8+IHBhcmVudHM7Ci0gICAgR2l0UGVyc29uIGF1dGhvcjsKLSAgICBHaXRQZXJzb24gY29tbWl0dGVyOwotICAgIFN0cmluZyBzdWJqZWN0OwotICAgIFN0cmluZyBtZXNzYWdlOwotICB9Ci0KLSAgc3RhdGljIGNsYXNzIEZpbGVJbmZvIHsKLSAgICBDaGFyYWN0ZXIgc3RhdHVzOwotICAgIEJvb2xlYW4gYmluYXJ5OwotICAgIFN0cmluZyBvbGRQYXRoOwotICAgIEludGVnZXIgbGluZXNJbnNlcnRlZDsKLSAgICBJbnRlZ2VyIGxpbmVzRGVsZXRlZDsKLSAgfQotCi0gIHN0YXRpYyBjbGFzcyBMYWJlbEluZm8gewotICAgIHRyYW5zaWVudCBTdWJtaXRSZWNvcmQuTGFiZWwuU3RhdHVzIF9zdGF0dXM7Ci0gICAgQWNjb3VudEF0dHJpYnV0ZSBhcHByb3ZlZDsKLSAgICBBY2NvdW50QXR0cmlidXRlIHJlamVjdGVkOwotCi0gICAgQWNjb3VudEF0dHJpYnV0ZSByZWNvbW1lbmRlZDsKLSAgICBBY2NvdW50QXR0cmlidXRlIGRpc2xpa2VkOwotICAgIFNob3J0IHZhbHVlOwotICAgIEJvb2xlYW4gb3B0aW9uYWw7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL1F1ZXJ5Q2hhbmdlcy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvUXVlcnlDaGFuZ2VzLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTAwNTk0MAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL1F1ZXJ5Q2hhbmdlcy5qYXZhCkBAIC0wLDAgKzEsMTYzIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LmNoYW5nZTsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmNoYW5nZXMuTGlzdENoYW5nZXNPcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkF1dGhFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLkJhZFJlcXVlc3RFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RSZWFkVmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuVG9wTGV2ZWxSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkNoYW5nZUpzb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5DaGFuZ2VKc29uLkNoYW5nZUluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuUXVlcnlQYXJzZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc3NoLlNzaEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouT3B0aW9uOworCitpbXBvcnQgamF2YS51dGlsLkJpdFNldDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CitpbXBvcnQgamF2YS51dGlsLkVudW1TZXQ7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLnJlZ2V4Lk1hdGNoZXI7CitpbXBvcnQgamF2YS51dGlsLnJlZ2V4LlBhdHRlcm47CisKK3B1YmxpYyBjbGFzcyBRdWVyeUNoYW5nZXMgaW1wbGVtZW50cyBSZXN0UmVhZFZpZXc8VG9wTGV2ZWxSZXNvdXJjZT4geworICBwcml2YXRlIGZpbmFsIENoYW5nZUpzb24ganNvbjsKKyAgcHJpdmF0ZSBmaW5hbCBRdWVyeVByb2Nlc3NvciBpbXA7CisgIHByaXZhdGUgYm9vbGVhbiByZXZlcnNlOworICBwcml2YXRlIEVudW1TZXQ8TGlzdENoYW5nZXNPcHRpb24+IG9wdGlvbnM7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tcXVlcnkiLCBhbGlhc2VzID0geyItcSJ9LCBtZXRhVmFyID0gIlFVRVJZIiwgbXVsdGlWYWx1ZWQgPSB0cnVlLCB1c2FnZSA9ICJRdWVyeSBzdHJpbmciKQorICBwcml2YXRlIExpc3Q8U3RyaW5nPiBxdWVyaWVzOworCisgIEBPcHRpb24obmFtZSA9ICItLWxpbWl0IiwgYWxpYXNlcyA9IHsiLW4ifSwgbWV0YVZhciA9ICJDTlQiLCB1c2FnZSA9ICJNYXhpbXVtIG51bWJlciBvZiByZXN1bHRzIHRvIHJldHVybiIpCisgIHB1YmxpYyB2b2lkIHNldExpbWl0KGludCBsaW1pdCkgeworICAgIGltcC5zZXRMaW1pdChsaW1pdCk7CisgIH0KKworICBAT3B0aW9uKG5hbWUgPSAiLW8iLCBtdWx0aVZhbHVlZCA9IHRydWUsIHVzYWdlID0gIk91dHB1dCBvcHRpb25zIHBlciBjaGFuZ2UiKQorICBwdWJsaWMgdm9pZCBhZGRPcHRpb24oTGlzdENoYW5nZXNPcHRpb24gbykgeworICAgIG9wdGlvbnMuYWRkKG8pOworICB9CisKKyAgQE9wdGlvbihuYW1lID0gIi1PIiwgdXNhZ2UgPSAiT3V0cHV0IG9wdGlvbiBmbGFncywgaW4gaGV4IikKKyAgdm9pZCBzZXRPcHRpb25GbGFnc0hleChTdHJpbmcgaGV4KSB7CisgICAgb3B0aW9ucy5hZGRBbGwoTGlzdENoYW5nZXNPcHRpb24uZnJvbUJpdHMoSW50ZWdlci5wYXJzZUludChoZXgsIDE2KSkpOworICB9CisKKyAgQE9wdGlvbihuYW1lID0gIi1QIiwgbWV0YVZhciA9ICJTT1JUS0VZIiwgdXNhZ2UgPSAiUHJldmlvdXMgY2hhbmdlcyBiZWZvcmUgU09SVEtFWSIpCisgIHB1YmxpYyB2b2lkIHNldFNvcnRLZXlBZnRlcihTdHJpbmcga2V5KSB7CisgICAgLy8gUXVlcnlpbmcgZm9yIHRoZSBwcmlvciBwYWdlIG9mIGNoYW5nZXMgcmVxdWlyZXMgc29ydGtleV9hZnRlciBwcmVkaWNhdGUuCisgICAgLy8gQ2hhbmdlcyBhcmUgc2hvd24gbW9zdCByZWNlbnQtPmxlYXN0IHJlY2VudC4gVGhlIHByZXZpb3VzIHBhZ2Ugb2YKKyAgICAvLyByZXN1bHRzIGNvbnRhaW5zIGNoYW5nZXMgdGhhdCB3ZXJlIHVwZGF0ZWQgYWZ0ZXIgdGhlIGdpdmVuIGtleS4KKyAgICBpbXAuc2V0U29ydGtleUFmdGVyKGtleSk7CisgICAgcmV2ZXJzZSA9IHRydWU7CisgIH0KKworICBAT3B0aW9uKG5hbWUgPSAiLU4iLCBtZXRhVmFyID0gIlNPUlRLRVkiLCB1c2FnZSA9ICJOZXh0IGNoYW5nZXMgYWZ0ZXIgU09SVEtFWSIpCisgIHB1YmxpYyB2b2lkIHNldFNvcnRLZXlCZWZvcmUoU3RyaW5nIGtleSkgeworICAgIC8vIFF1ZXJ5aW5nIGZvciB0aGUgbmV4dCBwYWdlIG9mIGNoYW5nZXMgcmVxdWlyZXMgc29ydGtleV9iZWZvcmUgcHJlZGljYXRlLgorICAgIC8vIENoYW5nZXMgYXJlIHNob3duIG1vc3QgcmVjZW50LT5sZWFzdCByZWNlbnQuIFRoZSBuZXh0IHBhZ2UgY29udGFpbnMKKyAgICAvLyBjaGFuZ2VzIHRoYXQgd2VyZSB1cGRhdGVkIGJlZm9yZSB0aGUgZ2l2ZW4ga2V5LgorICAgIGltcC5zZXRTb3J0a2V5QmVmb3JlKGtleSk7CisgIH0KKworICBASW5qZWN0CisgIFF1ZXJ5Q2hhbmdlcyhDaGFuZ2VKc29uIGpzb24sCisgICAgICBRdWVyeVByb2Nlc3NvciBxcCwKKyAgICAgIFNzaEluZm8gc3NoSW5mbywKKyAgICAgIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjZikgeworICAgIHRoaXMuanNvbiA9IGpzb247CisgICAgdGhpcy5pbXAgPSBxcDsKKworICAgIG9wdGlvbnMgPSBFbnVtU2V0Lm5vbmVPZihMaXN0Q2hhbmdlc09wdGlvbi5jbGFzcyk7CisgICAganNvbi5zZXRTc2hJbmZvKHNzaEluZm8pOworICAgIGpzb24uc2V0Q2hhbmdlQ29udHJvbEZhY3RvcnkoY2YpOworICB9CisKKyAgcHVibGljIHZvaWQgYWRkUXVlcnkoU3RyaW5nIHF1ZXJ5KSB7CisgICAgaWYgKHF1ZXJpZXMgPT0gbnVsbCkgeworICAgICAgcXVlcmllcyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIH0KKyAgICBxdWVyaWVzLmFkZChxdWVyeSk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9iamVjdCBhcHBseShUb3BMZXZlbFJlc291cmNlIHJzcmMpCisgICAgICB0aHJvd3MgQmFkUmVxdWVzdEV4Y2VwdGlvbiwgQXV0aEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICBMaXN0PExpc3Q8Q2hhbmdlSW5mbz4+IG91dDsKKyAgICB0cnkgeworICAgICAgb3V0ID0gcXVlcnkoKTsKKyAgICB9IGNhdGNoIChRdWVyeVBhcnNlRXhjZXB0aW9uIGUpIHsKKyAgICAgIC8vIFRoaXMgaXMgYSBoYWNrIHRvIGRldGVjdCBhbiBvcGVyYXRvciB0aGF0IHJlcXVpcmVzIGF1dGhlbnRpY2F0aW9uLgorICAgICAgUGF0dGVybiBwID0gUGF0dGVybi5jb21waWxlKCJeRXJyb3IgaW4gb3BlcmF0b3IgKC4qOnNlbGYpJCIpOworICAgICAgTWF0Y2hlciBtID0gcC5tYXRjaGVyKGUuZ2V0TWVzc2FnZSgpKTsKKyAgICAgIGlmIChtLm1hdGNoZXMoKSkgeworICAgICAgICBTdHJpbmcgb3AgPSBtLmdyb3VwKDEpOworICAgICAgICB0aHJvdyBuZXcgQXV0aEV4Y2VwdGlvbigiTXVzdCBiZSBzaWduZWQtaW4gdG8gdXNlICIgKyBvcCk7CisgICAgICB9CisgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbihlLmdldE1lc3NhZ2UoKSk7CisgICAgfQorICAgIHJldHVybiBvdXQuc2l6ZSgpID09IDEgPyBvdXQuZ2V0KDApIDogb3V0OworICB9CisKKyAgcHJpdmF0ZSBMaXN0PExpc3Q8Q2hhbmdlSW5mbz4+IHF1ZXJ5KCkKKyAgICAgIHRocm93cyBPcm1FeGNlcHRpb24sIFF1ZXJ5UGFyc2VFeGNlcHRpb24geworICAgIGlmIChpbXAuaXNEaXNhYmxlZCgpKSB7CisgICAgICB0aHJvdyBuZXcgUXVlcnlQYXJzZUV4Y2VwdGlvbigicXVlcnkgZGlzYWJsZWQiKTsKKyAgICB9CisgICAgaWYgKHF1ZXJpZXMgPT0gbnVsbCB8fCBxdWVyaWVzLmlzRW1wdHkoKSkgeworICAgICAgcXVlcmllcyA9IENvbGxlY3Rpb25zLnNpbmdsZXRvbkxpc3QoInN0YXR1czpvcGVuIik7CisgICAgfSBlbHNlIGlmIChxdWVyaWVzLnNpemUoKSA+IDEwKSB7CisgICAgICAvLyBIYXJkLWNvZGUgYSBkZWZhdWx0IG1heGltdW0gbnVtYmVyIG9mIHF1ZXJpZXMgdG8gcHJldmVudAorICAgICAgLy8gdXNlcnMgZnJvbSBzdWJtaXR0aW5nIHRvbyBtdWNoIHRvIHRoZSBzZXJ2ZXIgaW4gYSBzaW5nbGUgY2FsbC4KKyAgICAgIHRocm93IG5ldyBRdWVyeVBhcnNlRXhjZXB0aW9uKCJsaW1pdCBvZiAxMCBxdWVyaWVzIik7CisgICAgfQorCisgICAgaW50IGNudCA9IHF1ZXJpZXMuc2l6ZSgpOworICAgIEJpdFNldCBtb3JlID0gbmV3IEJpdFNldChjbnQpOworICAgIExpc3Q8TGlzdDxDaGFuZ2VEYXRhPj4gZGF0YSA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShjbnQpOworICAgIGZvciAoaW50IG4gPSAwOyBuIDwgY250OyBuKyspIHsKKyAgICAgIFN0cmluZyBxdWVyeSA9IHF1ZXJpZXMuZ2V0KG4pOworICAgICAgTGlzdDxDaGFuZ2VEYXRhPiBjaGFuZ2VzID0gaW1wLnF1ZXJ5Q2hhbmdlcyhxdWVyeSk7CisgICAgICBpZiAoaW1wLmdldExpbWl0KCkgPiAwICYmIGNoYW5nZXMuc2l6ZSgpID4gaW1wLmdldExpbWl0KCkpIHsKKyAgICAgICAgaWYgKHJldmVyc2UpIHsKKyAgICAgICAgICBjaGFuZ2VzID0gY2hhbmdlcy5zdWJMaXN0KDEsIGNoYW5nZXMuc2l6ZSgpKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBjaGFuZ2VzID0gY2hhbmdlcy5zdWJMaXN0KDAsIGltcC5nZXRMaW1pdCgpKTsKKyAgICAgICAgfQorICAgICAgICBtb3JlLnNldChuLCB0cnVlKTsKKyAgICAgIH0KKyAgICAgIGRhdGEuYWRkKGNoYW5nZXMpOworICAgIH0KKworICAgIExpc3Q8TGlzdDxDaGFuZ2VJbmZvPj4gcmVzID0ganNvbi5hZGRPcHRpb25zKG9wdGlvbnMpLmZvcm1hdExpc3QyKGRhdGEpOworICAgIGZvciAoaW50IG4gPSAwOyBuIDwgY250OyBuKyspIHsKKyAgICAgIExpc3Q8Q2hhbmdlSW5mbz4gaW5mbyA9IHJlcy5nZXQobik7CisgICAgICBpZiAobW9yZS5nZXQobikgJiYgIWluZm8uaXNFbXB0eSgpKSB7CisgICAgICAgIGlmIChyZXZlcnNlKSB7CisgICAgICAgICAgaW5mby5nZXQoMCkuX21vcmVDaGFuZ2VzID0gdHJ1ZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBpbmZvLmdldChpbmZvLnNpemUoKSAtIDEpLl9tb3JlQ2hhbmdlcyA9IHRydWU7CisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIHJlczsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvUXVlcnlQcm9jZXNzb3IuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcXVlcnkvY2hhbmdlL1F1ZXJ5UHJvY2Vzc29yLmphdmEKaW5kZXggZjQ0MjgyYS4uZmMzNWRmMyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvUXVlcnlQcm9jZXNzb3IuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9RdWVyeVByb2Nlc3Nvci5qYXZhCkBAIC0xNSw2ICsxNSw3IEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2U7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuU3VibWl0UmVjb3JkOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwpAQCAtMjUsNiArMjYsOCBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuUGF0Y2hTZXRBdHRyaWJ1dGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50cy5RdWVyeVN0YXRzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnF1ZXJ5LlByZWRpY2F0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuUXVlcnlQYXJzZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdzb24uR3NvbjsKQEAgLTkzLDYgKzk2LDcgQEAKICAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VRdWVyeVJld3JpdGVyIHF1ZXJ5UmV3cml0ZXI7CiAgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8UmV2aWV3RGI+IGRiOwogICBwcml2YXRlIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyOworICBwcml2YXRlIGZpbmFsIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKICAgcHJpdmF0ZSBmaW5hbCBpbnQgbWF4TGltaXQ7CiAKICAgcHJpdmF0ZSBPdXRwdXRGb3JtYXQgb3V0cHV0Rm9ybWF0ID0gT3V0cHV0Rm9ybWF0LlRFWFQ7CkBAIC0xMTAsMjAgKzExNCwyNCBAQAogCiAgIHByaXZhdGUgT3V0cHV0U3RyZWFtIG91dHB1dFN0cmVhbSA9IERpc2FibGVkT3V0cHV0U3RyZWFtLklOU1RBTkNFOwogICBwcml2YXRlIFByaW50V3JpdGVyIG91dDsKKyAgcHJpdmF0ZSBib29sZWFuIG1vcmVSZXN1bHRzOwogCiAgIEBJbmplY3QKICAgUXVlcnlQcm9jZXNzb3IoRXZlbnRGYWN0b3J5IGV2ZW50RmFjdG9yeSwKICAgICAgIENoYW5nZVF1ZXJ5QnVpbGRlci5GYWN0b3J5IHF1ZXJ5QnVpbGRlciwgQ3VycmVudFVzZXIgY3VycmVudFVzZXIsCiAgICAgICBDaGFuZ2VRdWVyeVJld3JpdGVyIHF1ZXJ5UmV3cml0ZXIsIFByb3ZpZGVyPFJldmlld0RiPiBkYiwKLSAgICAgIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIHJlcG9NYW5hZ2VyKSB7CisgICAgICBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlciwKKyAgICAgIENoYW5nZUNvbnRyb2wuRmFjdG9yeSBjaGFuZ2VDb250cm9sRmFjdG9yeSkgewogICAgIHRoaXMuZXZlbnRGYWN0b3J5ID0gZXZlbnRGYWN0b3J5OwogICAgIHRoaXMucXVlcnlCdWlsZGVyID0gcXVlcnlCdWlsZGVyLmNyZWF0ZShjdXJyZW50VXNlcik7CiAgICAgdGhpcy5xdWVyeVJld3JpdGVyID0gcXVlcnlSZXdyaXRlcjsKICAgICB0aGlzLmRiID0gZGI7CiAgICAgdGhpcy5yZXBvTWFuYWdlciA9IHJlcG9NYW5hZ2VyOworICAgIHRoaXMuY2hhbmdlQ29udHJvbEZhY3RvcnkgPSBjaGFuZ2VDb250cm9sRmFjdG9yeTsKICAgICB0aGlzLm1heExpbWl0ID0gY3VycmVudFVzZXIuZ2V0Q2FwYWJpbGl0aWVzKCkKICAgICAgIC5nZXRSYW5nZShHbG9iYWxDYXBhYmlsaXR5LlFVRVJZX0xJTUlUKQogICAgICAgLmdldE1heCgpOworICAgIHRoaXMubW9yZVJlc3VsdHMgPSBmYWxzZTsKICAgfQogCiAgIGludCBnZXRMaW1pdCgpIHsKQEAgLTIzNCw2ICsyNDIsOSBAQAogCiAgICAgQ29sbGVjdGlvbnMuc29ydChyZXN1bHRzLCBzb3J0a2V5QWZ0ZXIgIT0gbnVsbCA/IGNtcEFmdGVyIDogY21wQmVmb3JlKTsKICAgICBpbnQgbGltaXQgPSBsaW1pdChzKTsKKyAgICBpZiAocmVzdWx0cy5zaXplKCkgPiBtYXhMaW1pdCkgeworICAgICAgbW9yZVJlc3VsdHMgPSB0cnVlOworICAgIH0KICAgICBpZiAobGltaXQgPCByZXN1bHRzLnNpemUoKSkgewogICAgICAgcmVzdWx0cyA9IHJlc3VsdHMuc3ViTGlzdCgwLCBsaW1pdCk7CiAgICAgfQpAQCAtMjYwLDE3ICsyNzEsMTkgQEAKICAgICAgICAgc3RhdHMucnVuVGltZU1pbGxpc2Vjb25kcyA9IFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpOwogCiAgICAgICAgIExpc3Q8Q2hhbmdlRGF0YT4gcmVzdWx0cyA9IHF1ZXJ5Q2hhbmdlcyhxdWVyeVN0cmluZyk7CisgICAgICAgIENoYW5nZUF0dHJpYnV0ZSBjID0gbnVsbDsKICAgICAgICAgZm9yIChDaGFuZ2VEYXRhIGQgOiByZXN1bHRzKSB7Ci0gICAgICAgICAgQ2hhbmdlQXR0cmlidXRlIGMgPSBldmVudEZhY3RvcnkuYXNDaGFuZ2VBdHRyaWJ1dGUoZC5nZXRDaGFuZ2UoKSk7CisgICAgICAgICAgTGFiZWxUeXBlcyBsYWJlbFR5cGVzID0gY2hhbmdlQ29udHJvbEZhY3RvcnkuY29udHJvbEZvcihkLmdldENoYW5nZSgpKQorICAgICAgICAgICAgICAuZ2V0TGFiZWxUeXBlcygpOworICAgICAgICAgIGMgPSBldmVudEZhY3RvcnkuYXNDaGFuZ2VBdHRyaWJ1dGUoZC5nZXRDaGFuZ2UoKSk7CiAgICAgICAgICAgZXZlbnRGYWN0b3J5LmV4dGVuZChjLCBkLmdldENoYW5nZSgpKTsKICAgICAgICAgICBldmVudEZhY3RvcnkuYWRkVHJhY2tpbmdJZHMoYywgZC50cmFja2luZ0lkcyhkYikpOwogCiAgICAgICAgICAgaWYgKGluY2x1ZGVTdWJtaXRSZWNvcmRzKSB7CiAgICAgICAgICAgICBQYXRjaFNldC5JZCBwc0lkID0gZC5nZXRDaGFuZ2UoKS5jdXJyZW50UGF0Y2hTZXRJZCgpOwogICAgICAgICAgICAgUGF0Y2hTZXQgcGF0Y2hTZXQgPSBkYi5nZXQoKS5wYXRjaFNldHMoKS5nZXQocHNJZCk7Ci0gICAgICAgICAgICBDaGFuZ2UuSWQgY2hhbmdlSWQgPSBwc0lkLmdldFBhcmVudEtleSgpOwogICAgICAgICAgICAgTGlzdDxTdWJtaXRSZWNvcmQ+IHN1Ym1pdFJlc3VsdCA9IGQuY2hhbmdlQ29udHJvbCgpLmNhblN1Ym1pdCggLy8KLSAgICAgICAgICAgICAgICBkYi5nZXQoKSwgcGF0Y2hTZXQsIG51bGwsIGZhbHNlLCB0cnVlKTsKKyAgICAgICAgICAgICAgICBkYi5nZXQoKSwgcGF0Y2hTZXQsIG51bGwsIGZhbHNlLCB0cnVlLCB0cnVlKTsKICAgICAgICAgICAgIGV2ZW50RmFjdG9yeS5hZGRTdWJtaXRSZWNvcmRzKGMsIHN1Ym1pdFJlc3VsdCk7CiAgICAgICAgICAgfQogCkBAIC0yODEsMTEgKzI5NCwxMiBAQAogICAgICAgICAgIGlmIChpbmNsdWRlUGF0Y2hTZXRzKSB7CiAgICAgICAgICAgICBpZiAoaW5jbHVkZUZpbGVzKSB7CiAgICAgICAgICAgICAgIGV2ZW50RmFjdG9yeS5hZGRQYXRjaFNldHMoYywgZC5wYXRjaGVzKGRiKSwKLSAgICAgICAgICAgICAgICBpbmNsdWRlQXBwcm92YWxzID8gZC5hcHByb3ZhbHNNYXAoZGIpIDogbnVsbCwKLSAgICAgICAgICAgICAgICBpbmNsdWRlRmlsZXMsIGQuY2hhbmdlKGRiKSk7CisgICAgICAgICAgICAgICAgaW5jbHVkZUFwcHJvdmFscyA/IGQuYXBwcm92YWxzTWFwKGRiKS5hc01hcCgpIDogbnVsbCwKKyAgICAgICAgICAgICAgICBpbmNsdWRlRmlsZXMsIGQuY2hhbmdlKGRiKSwgbGFiZWxUeXBlcyk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICBldmVudEZhY3RvcnkuYWRkUGF0Y2hTZXRzKGMsIGQucGF0Y2hlcyhkYiksCi0gICAgICAgICAgICAgICAgICBpbmNsdWRlQXBwcm92YWxzID8gZC5hcHByb3ZhbHNNYXAoZGIpIDogbnVsbCk7CisgICAgICAgICAgICAgICAgICBpbmNsdWRlQXBwcm92YWxzID8gZC5hcHByb3ZhbHNNYXAoZGIpLmFzTWFwKCkgOiBudWxsLAorICAgICAgICAgICAgICAgICAgbGFiZWxUeXBlcyk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgfQogCkBAIC0yOTMsOCArMzA3LDggQEAKICAgICAgICAgICAgIFBhdGNoU2V0IGN1cnJlbnQgPSBkLmN1cnJlbnRQYXRjaFNldChkYik7CiAgICAgICAgICAgICBpZiAoY3VycmVudCAhPSBudWxsKSB7CiAgICAgICAgICAgICAgIGMuY3VycmVudFBhdGNoU2V0ID0gZXZlbnRGYWN0b3J5LmFzUGF0Y2hTZXRBdHRyaWJ1dGUoY3VycmVudCk7Ci0gICAgICAgICAgICAgIGV2ZW50RmFjdG9yeS5hZGRBcHByb3ZhbHMoYy5jdXJyZW50UGF0Y2hTZXQsIC8vCi0gICAgICAgICAgICAgICAgICBkLmN1cnJlbnRBcHByb3ZhbHMoZGIpKTsKKyAgICAgICAgICAgICAgZXZlbnRGYWN0b3J5LmFkZEFwcHJvdmFscyhjLmN1cnJlbnRQYXRjaFNldCwKKyAgICAgICAgICAgICAgICAgIGQuY3VycmVudEFwcHJvdmFscyhkYiksIGxhYmVsVHlwZXMpOwogCiAgICAgICAgICAgICAgIGlmIChpbmNsdWRlRmlsZXMpIHsKICAgICAgICAgICAgICAgICBldmVudEZhY3RvcnkuYWRkUGF0Y2hTZXRGaWxlTmFtZXMoYy5jdXJyZW50UGF0Y2hTZXQsCkBAIC0zMjAsNiArMzM0LDkgQEAKICAgICAgICAgfQogCiAgICAgICAgIHN0YXRzLnJvd0NvdW50ID0gcmVzdWx0cy5zaXplKCk7CisgICAgICAgIGlmIChtb3JlUmVzdWx0cykgeworICAgICAgICAgIHN0YXRzLnJlc3VtZVNvcnRLZXkgPSBjLnNvcnRLZXk7CisgICAgICAgIH0KICAgICAgICAgc3RhdHMucnVuVGltZU1pbGxpc2Vjb25kcyA9CiAgICAgICAgICAgICBTeXN0ZW0uY3VycmVudFRpbWVNaWxsaXMoKSAtIHN0YXRzLnJ1blRpbWVNaWxsaXNlY29uZHM7CiAgICAgICAgIHNob3coc3RhdHMpOwpAQCAtMzM0LDYgKzM1MSwxMSBAQAogICAgICAgICBFcnJvck1lc3NhZ2UgbSA9IG5ldyBFcnJvck1lc3NhZ2UoKTsKICAgICAgICAgbS5tZXNzYWdlID0gZS5nZXRNZXNzYWdlKCk7CiAgICAgICAgIHNob3cobSk7CisgICAgICB9IGNhdGNoIChOb1N1Y2hDaGFuZ2VFeGNlcHRpb24gZSkgeworICAgICAgICBsb2cuZXJyb3IoIk1pc3NpbmcgY2hhbmdlOiAiICsgZS5nZXRNZXNzYWdlKCksIGUpOworICAgICAgICBFcnJvck1lc3NhZ2UgbSA9IG5ldyBFcnJvck1lc3NhZ2UoKTsKKyAgICAgICAgbS5tZXNzYWdlID0gIm1pc3NpbmcgY2hhbmdlICIgKyBlLmdldE1lc3NhZ2UoKTsKKyAgICAgICAgc2hvdyhtKTsKICAgICAgIH0KICAgICB9IGZpbmFsbHkgewogICAgICAgdHJ5IHsKQEAgLTM1MCw3ICszNzIsNyBAQAogCiAgIHByaXZhdGUgaW50IGxpbWl0KFByZWRpY2F0ZTxDaGFuZ2VEYXRhPiBzKSB7CiAgICAgaW50IG4gPSBxdWVyeUJ1aWxkZXIuaGFzTGltaXQocykgPyBxdWVyeUJ1aWxkZXIuZ2V0TGltaXQocykgOiBtYXhMaW1pdDsKLSAgICByZXR1cm4gbGltaXQgPiAwID8gTWF0aC5taW4obiwgbGltaXQpICsgMSA6IG47CisgICAgcmV0dXJuIGxpbWl0ID4gMCA/IE1hdGgubWluKG4sIGxpbWl0KSArIDEgOiBuICsgMTsKICAgfQogCiAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9xdWVyeS9jaGFuZ2UvU2luZ2xlR3JvdXBVc2VyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9TaW5nbGVHcm91cFVzZXIuamF2YQppbmRleCAyNzBiMmU3Li40YjcxNzE5IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9TaW5nbGVHcm91cFVzZXIuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3F1ZXJ5L2NoYW5nZS9TaW5nbGVHcm91cFVzZXIuamF2YQpAQCAtMTcsNyArMTcsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRQcm9qZWN0V2F0Y2g7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQWNjZXNzUGF0aDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2FwYWJpbGl0eUNvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR3JvdXBNZW1iZXJzaGlwOwpAQCAtMzcsNyArMzYsNyBAQAogCiAgIHB1YmxpYyBTaW5nbGVHcm91cFVzZXIoQ2FwYWJpbGl0eUNvbnRyb2wuRmFjdG9yeSBjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnksCiAgICAgICBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGdyb3VwcykgewotICAgIHN1cGVyKGNhcGFiaWxpdHlDb250cm9sRmFjdG9yeSwgQWNjZXNzUGF0aC5VTktOT1dOKTsKKyAgICBzdXBlcihjYXBhYmlsaXR5Q29udHJvbEZhY3RvcnkpOwogICAgIHRoaXMuZ3JvdXBzID0gbmV3IExpc3RHcm91cE1lbWJlcnNoaXAoZ3JvdXBzKTsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9CYXNlRGF0YVNvdXJjZVR5cGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0Jhc2VEYXRhU291cmNlVHlwZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU3MmMzZTkKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9CYXNlRGF0YVNvdXJjZVR5cGUuamF2YQpAQCAtMCwwICsxLDYxIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKKworcHVibGljIGFic3RyYWN0IGNsYXNzIEJhc2VEYXRhU291cmNlVHlwZSBpbXBsZW1lbnRzIERhdGFTb3VyY2VUeXBlIHsKKworICBwcml2YXRlIGZpbmFsIFN0cmluZyBkcml2ZXI7CisKKyAgcHJvdGVjdGVkIEJhc2VEYXRhU291cmNlVHlwZShTdHJpbmcgZHJpdmVyKSB7CisgICAgdGhpcy5kcml2ZXIgPSBkcml2ZXI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIGZpbmFsIFN0cmluZyBnZXREcml2ZXIoKSB7CisgICAgcmV0dXJuIGRyaXZlcjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgYm9vbGVhbiB1c2VQb29sKCkgeworICAgIHJldHVybiB0cnVlOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTY3JpcHRSdW5uZXIgZ2V0SW5kZXhTY3JpcHQoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHJldHVybiBnZXRTY3JpcHRSdW5uZXIoImluZGV4X2dlbmVyaWMuc3FsIik7CisgIH0KKworICBwcm90ZWN0ZWQgc3RhdGljIGZpbmFsIFNjcmlwdFJ1bm5lciBnZXRTY3JpcHRSdW5uZXIoU3RyaW5nIHBhdGgpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgaWYgKHBhdGggPT0gbnVsbCkgeworICAgICAgcmV0dXJuIFNjcmlwdFJ1bm5lci5OT09QOworICAgIH0KKyAgICBJbnB1dFN0cmVhbSBpbiA9ICBSZXZpZXdEYi5jbGFzcy5nZXRSZXNvdXJjZUFzU3RyZWFtKHBhdGgpOworICAgIGlmIChpbiA9PSBudWxsKSB7CisgICAgICB0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKCJTUUwgc2NyaXB0ICIgKyBwYXRoICsgIiBub3QgZm91bmQiKTsKKyAgICB9CisgICAgU2NyaXB0UnVubmVyIHJ1bm5lcjsKKyAgICB0cnkgeworICAgICAgcnVubmVyID0gbmV3IFNjcmlwdFJ1bm5lcihwYXRoLCBpbik7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGluLmNsb3NlKCk7CisgICAgfQorICAgIHJldHVybiBydW5uZXI7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0RhdGFTb3VyY2VNb2R1bGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL0RhdGFTb3VyY2VNb2R1bGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40MDY2YWQzCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZU1vZHVsZS5qYXZhCkBAIC0wLDAgKzEsMjkgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hOworCitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QubmFtZS5OYW1lczsKKworcHVibGljIGNsYXNzIERhdGFTb3VyY2VNb2R1bGUgZXh0ZW5kcyBBYnN0cmFjdE1vZHVsZSB7CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKS5hbm5vdGF0ZWRXaXRoKE5hbWVzLm5hbWVkKCJoMiIpKS50byhIMi5jbGFzcyk7CisgICAgYmluZChEYXRhU291cmNlVHlwZS5jbGFzcykuYW5ub3RhdGVkV2l0aChOYW1lcy5uYW1lZCgiamRiYyIpKS50byhKREJDLmNsYXNzKTsKKyAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKS5hbm5vdGF0ZWRXaXRoKE5hbWVzLm5hbWVkKCJteXNxbCIpKS50byhNeVNxbC5jbGFzcyk7CisgICAgYmluZChEYXRhU291cmNlVHlwZS5jbGFzcykuYW5ub3RhdGVkV2l0aChOYW1lcy5uYW1lZCgicG9zdGdyZXNxbCIpKS50byhQb3N0Z3JlU1FMLmNsYXNzKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZVByb3ZpZGVyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9EYXRhU291cmNlUHJvdmlkZXIuamF2YQppbmRleCBjYzQ4MDE5Li42YzljYTU5ZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZVByb3ZpZGVyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZVByb3ZpZGVyLmphdmEKQEAgLTE0LDExICsxNCwxMiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CiAKLWltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Db25maWdVdGlsLmdldEVudW07CiBpbXBvcnQgc3RhdGljIGphdmEudXRpbC5jb25jdXJyZW50LlRpbWVVbml0Lk1JTExJU0VDT05EUzsKIGltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuU0VDT05EUzsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmJhc2UuU3RyaW5nczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5MaWZlY3ljbGVMaXN0ZW5lcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNvbmZpZ1NlY3Rpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Db25maWdVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOwpAQCAtMzEsOCArMzIsNiBAQAogaW1wb3J0IG9yZy5hcGFjaGUuY29tbW9ucy5kYmNwLkJhc2ljRGF0YVNvdXJjZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CiAKLWltcG9ydCBqYXZhLmlvLkZpbGU7Ci1pbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnNxbC5TUUxFeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLlByb3BlcnRpZXM7CiAKQEAgLTQwLDE4ICszOSwzMCBAQAogCiAvKiogUHJvdmlkZXMgYWNjZXNzIHRvIHRoZSBEYXRhU291cmNlLiAqLwogQFNpbmdsZXRvbgotcHVibGljIGZpbmFsIGNsYXNzIERhdGFTb3VyY2VQcm92aWRlciBpbXBsZW1lbnRzIFByb3ZpZGVyPERhdGFTb3VyY2U+LAorcHVibGljIGNsYXNzIERhdGFTb3VyY2VQcm92aWRlciBpbXBsZW1lbnRzIFByb3ZpZGVyPERhdGFTb3VyY2U+LAogICAgIExpZmVjeWNsZUxpc3RlbmVyIHsKLSAgcHJpdmF0ZSBmaW5hbCBEYXRhU291cmNlIGRzOworICBwcml2YXRlIGZpbmFsIFNpdGVQYXRocyBzaXRlOworICBwcml2YXRlIGZpbmFsIENvbmZpZyBjZmc7CisgIHByaXZhdGUgZmluYWwgQ29udGV4dCBjdHg7CisgIHByaXZhdGUgZmluYWwgRGF0YVNvdXJjZVR5cGUgZHN0OworICBwcml2YXRlIERhdGFTb3VyY2UgZHM7CiAKICAgQEluamVjdAotICBEYXRhU291cmNlUHJvdmlkZXIoZmluYWwgU2l0ZVBhdGhzIHNpdGUsCi0gICAgICBAR2Vycml0U2VydmVyQ29uZmlnIGZpbmFsIENvbmZpZyBjZmcsIENvbnRleHQgY3R4KSB7Ci0gICAgZHMgPSBvcGVuKHNpdGUsIGNmZywgY3R4KTsKKyAgcHJvdGVjdGVkIERhdGFTb3VyY2VQcm92aWRlcihTaXRlUGF0aHMgc2l0ZSwKKyAgICAgIEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNmZywKKyAgICAgIENvbnRleHQgY3R4LAorICAgICAgRGF0YVNvdXJjZVR5cGUgZHN0KSB7CisgICAgdGhpcy5zaXRlID0gc2l0ZTsKKyAgICB0aGlzLmNmZyA9IGNmZzsKKyAgICB0aGlzLmN0eCA9IGN0eDsKKyAgICB0aGlzLmRzdCA9IGRzdDsKICAgfQogCiAgIEBPdmVycmlkZQogICBwdWJsaWMgc3luY2hyb25pemVkIERhdGFTb3VyY2UgZ2V0KCkgeworICAgIGlmIChkcyA9PSBudWxsKSB7CisgICAgICBkcyA9IG9wZW4oc2l0ZSwgY2ZnLCBjdHgsIGRzdCk7CisgICAgfQogICAgIHJldHVybiBkczsKICAgfQogCkBAIC03NCwxMDAgKzg1LDI3IEBACiAgICAgU0lOR0xFX1VTRVIsIE1VTFRJX1VTRVI7CiAgIH0KIAotICBwdWJsaWMgc3RhdGljIGVudW0gVHlwZSB7Ci0gICAgSDIsIFBPU1RHUkVTUUwsIE1ZU1FMLCBKREJDOwotICB9Ci0KICAgcHJpdmF0ZSBEYXRhU291cmNlIG9wZW4oZmluYWwgU2l0ZVBhdGhzIHNpdGUsIGZpbmFsIENvbmZpZyBjZmcsCi0gICAgICBmaW5hbCBDb250ZXh0IGNvbnRleHQpIHsKLSAgICBUeXBlIHR5cGUgPSBnZXRFbnVtKGNmZywgImRhdGFiYXNlIiwgbnVsbCwgInR5cGUiLCBUeXBlLnZhbHVlcygpLCBudWxsKTsKLSAgICBTdHJpbmcgZHJpdmVyID0gb3B0aW9uYWwoY2ZnLCAiZHJpdmVyIik7Ci0gICAgU3RyaW5nIHVybCA9IG9wdGlvbmFsKGNmZywgInVybCIpOwotICAgIFN0cmluZyB1c2VybmFtZSA9IG9wdGlvbmFsKGNmZywgInVzZXJuYW1lIik7Ci0gICAgU3RyaW5nIHBhc3N3b3JkID0gb3B0aW9uYWwoY2ZnLCAicGFzc3dvcmQiKTsKLQotICAgIGlmICh1cmwgPT0gbnVsbCB8fCB1cmwuaXNFbXB0eSgpKSB7Ci0gICAgICBpZiAodHlwZSA9PSBudWxsKSB7Ci0gICAgICAgIHR5cGUgPSBUeXBlLkgyOwotICAgICAgfQotCi0gICAgICBzd2l0Y2ggKHR5cGUpIHsKLSAgICAgICAgY2FzZSBIMjogewotICAgICAgICAgIFN0cmluZyBkYXRhYmFzZSA9IG9wdGlvbmFsKGNmZywgImRhdGFiYXNlIik7Ci0gICAgICAgICAgaWYgKGRhdGFiYXNlID09IG51bGwgfHwgZGF0YWJhc2UuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBkYXRhYmFzZSA9ICJkYi9SZXZpZXdEQiI7Ci0gICAgICAgICAgfQotICAgICAgICAgIEZpbGUgZGIgPSBzaXRlLnJlc29sdmUoZGF0YWJhc2UpOwotICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICBkYiA9IGRiLmdldENhbm9uaWNhbEZpbGUoKTsKLSAgICAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgICBkYiA9IGRiLmdldEFic29sdXRlRmlsZSgpOwotICAgICAgICAgIH0KLSAgICAgICAgICB1cmwgPSAiamRiYzpoMjoiICsgZGIudG9VUkkoKS50b1N0cmluZygpOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0KLSAgICAgICAgY2FzZSBQT1NUR1JFU1FMOiB7Ci0gICAgICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciBiID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgICAgICBiLmFwcGVuZCgiamRiYzpwb3N0Z3Jlc3FsOi8vIik7Ci0gICAgICAgICAgYi5hcHBlbmQoaG9zdG5hbWUob3B0aW9uYWwoY2ZnLCAiaG9zdG5hbWUiKSkpOwotICAgICAgICAgIGIuYXBwZW5kKHBvcnQob3B0aW9uYWwoY2ZnLCAicG9ydCIpKSk7Ci0gICAgICAgICAgYi5hcHBlbmQoIi8iKTsKLSAgICAgICAgICBiLmFwcGVuZChyZXF1aXJlZChjZmcsICJkYXRhYmFzZSIpKTsKLSAgICAgICAgICB1cmwgPSBiLnRvU3RyaW5nKCk7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLQotICAgICAgICBjYXNlIE1ZU1FMOiB7Ci0gICAgICAgICAgZmluYWwgU3RyaW5nQnVpbGRlciBiID0gbmV3IFN0cmluZ0J1aWxkZXIoKTsKLSAgICAgICAgICBiLmFwcGVuZCgiamRiYzpteXNxbDovLyIpOwotICAgICAgICAgIGIuYXBwZW5kKGhvc3RuYW1lKG9wdGlvbmFsKGNmZywgImhvc3RuYW1lIikpKTsKLSAgICAgICAgICBiLmFwcGVuZChwb3J0KG9wdGlvbmFsKGNmZywgInBvcnQiKSkpOwotICAgICAgICAgIGIuYXBwZW5kKCIvIik7Ci0gICAgICAgICAgYi5hcHBlbmQocmVxdWlyZWQoY2ZnLCAiZGF0YWJhc2UiKSk7Ci0gICAgICAgICAgdXJsID0gYi50b1N0cmluZygpOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0KLSAgICAgICAgY2FzZSBKREJDOgotICAgICAgICAgIGRyaXZlciA9IHJlcXVpcmVkKGNmZywgImRyaXZlciIpOwotICAgICAgICAgIHVybCA9IHJlcXVpcmVkKGNmZywgInVybCIpOwotICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbih0eXBlICsgIiBub3Qgc3VwcG9ydGVkIik7Ci0gICAgICB9CisgICAgICBmaW5hbCBDb250ZXh0IGNvbnRleHQsIGZpbmFsIERhdGFTb3VyY2VUeXBlIGRzdCkgeworICAgIENvbmZpZ1NlY3Rpb24gZGJzID0gbmV3IENvbmZpZ1NlY3Rpb24oY2ZnLCAiZGF0YWJhc2UiKTsKKyAgICBTdHJpbmcgZHJpdmVyID0gZGJzLm9wdGlvbmFsKCJkcml2ZXIiKTsKKyAgICBpZiAoU3RyaW5ncy5pc051bGxPckVtcHR5KGRyaXZlcikpIHsKKyAgICAgIGRyaXZlciA9IGRzdC5nZXREcml2ZXIoKTsKICAgICB9CiAKLSAgICBpZiAoZHJpdmVyID09IG51bGwgfHwgZHJpdmVyLmlzRW1wdHkoKSkgewotICAgICAgaWYgKHVybC5zdGFydHNXaXRoKCJqZGJjOmgyOiIpKSB7Ci0gICAgICAgIGRyaXZlciA9ICJvcmcuaDIuRHJpdmVyIjsKLQotICAgICAgfSBlbHNlIGlmICh1cmwuc3RhcnRzV2l0aCgiamRiYzpwb3N0Z3Jlc3FsOiIpKSB7Ci0gICAgICAgIGRyaXZlciA9ICJvcmcucG9zdGdyZXNxbC5Ecml2ZXIiOwotCi0gICAgICB9IGVsc2UgaWYgKHVybC5zdGFydHNXaXRoKCJqZGJjOm15c3FsOiIpKSB7Ci0gICAgICAgIGRyaXZlciA9ICJjb20ubXlzcWwuamRiYy5Ecml2ZXIiOwotCi0gICAgICB9IGVsc2UgewotICAgICAgICB0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCJkYXRhYmFzZS5kcml2ZXIgbXVzdCBiZSBzZXQiKTsKLSAgICAgIH0KKyAgICBTdHJpbmcgdXJsID0gZGJzLm9wdGlvbmFsKCJ1cmwiKTsKKyAgICBpZiAoU3RyaW5ncy5pc051bGxPckVtcHR5KHVybCkpIHsKKyAgICAgIHVybCA9IGRzdC5nZXRVcmwoKTsKICAgICB9CiAKKyAgICBTdHJpbmcgdXNlcm5hbWUgPSBkYnMub3B0aW9uYWwoInVzZXJuYW1lIik7CisgICAgU3RyaW5nIHBhc3N3b3JkID0gZGJzLm9wdGlvbmFsKCJwYXNzd29yZCIpOworCiAgICAgYm9vbGVhbiB1c2VQb29sOwotICAgIGlmICh1cmwuc3RhcnRzV2l0aCgiamRiYzpteXNxbDoiKSkgewotICAgICAgLy8gTXlTUUwgaGFzIGdpdmVuIHVzIHRyb3VibGUgd2l0aCB0aGUgY29ubmVjdGlvbiBwb29sLAotICAgICAgLy8gc29tZXRpbWVzIHRoZSBiYWNrZW5kIGRpc2Nvbm5lY3RzIGFuZCB0aGUgcG9vbCB3aW5kcwotICAgICAgLy8gdXAgd2l0aCBhIHN0YWxlIGNvbm5lY3Rpb24uIEZvcnR1bmF0ZWx5IG9wZW5pbmcgdXAKLSAgICAgIC8vIGEgbmV3IE15U1FMIGNvbm5lY3Rpb24gaXMgdXN1YWxseSB2ZXJ5IGZhc3QuCi0gICAgICAvLwotICAgICAgdXNlUG9vbCA9IGZhbHNlOwotICAgIH0gZWxzZSB7Ci0gICAgICB1c2VQb29sID0gdHJ1ZTsKLSAgICB9Ci0gICAgdXNlUG9vbCA9IGNmZy5nZXRCb29sZWFuKCJkYXRhYmFzZSIsICJjb25uZWN0aW9ucG9vbCIsIHVzZVBvb2wpOwogICAgIGlmIChjb250ZXh0ID09IENvbnRleHQuU0lOR0xFX1VTRVIpIHsKICAgICAgIHVzZVBvb2wgPSBmYWxzZTsKKyAgICB9IGVsc2UgeworICAgICAgdXNlUG9vbCA9IGNmZy5nZXRCb29sZWFuKCJkYXRhYmFzZSIsICJjb25uZWN0aW9ucG9vbCIsIGRzdC51c2VQb29sKCkpOwogICAgIH0KIAogICAgIGlmICh1c2VQb29sKSB7CkBAIC0yMDcsMzMgKzE0NSw0IEBACiAgICAgICB9CiAgICAgfQogICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIGhvc3RuYW1lKFN0cmluZyBob3N0bmFtZSkgewotICAgIGlmIChob3N0bmFtZSA9PSBudWxsIHx8IGhvc3RuYW1lLmlzRW1wdHkoKSkgewotICAgICAgaG9zdG5hbWUgPSAibG9jYWxob3N0IjsKLQotICAgIH0gZWxzZSBpZiAoaG9zdG5hbWUuY29udGFpbnMoIjoiKSAmJiAhaG9zdG5hbWUuc3RhcnRzV2l0aCgiWyIpKSB7Ci0gICAgICBob3N0bmFtZSA9ICJbIiArIGhvc3RuYW1lICsgIl0iOwotICAgIH0KLSAgICByZXR1cm4gaG9zdG5hbWU7Ci0gIH0KLQotICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgcG9ydChTdHJpbmcgcG9ydCkgewotICAgIGlmIChwb3J0ICE9IG51bGwgJiYgIXBvcnQuaXNFbXB0eSgpKSB7Ci0gICAgICByZXR1cm4gIjoiICsgcG9ydDsKLSAgICB9Ci0gICAgcmV0dXJuICIiOwotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgU3RyaW5nIG9wdGlvbmFsKGZpbmFsIENvbmZpZyBjb25maWcsIGZpbmFsIFN0cmluZyBuYW1lKSB7Ci0gICAgcmV0dXJuIGNvbmZpZy5nZXRTdHJpbmcoImRhdGFiYXNlIiwgbnVsbCwgbmFtZSk7Ci0gIH0KLQotICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgcmVxdWlyZWQoZmluYWwgQ29uZmlnIGNvbmZpZywgZmluYWwgU3RyaW5nIG5hbWUpIHsKLSAgICBmaW5hbCBTdHJpbmcgdiA9IG9wdGlvbmFsKGNvbmZpZywgbmFtZSk7Ci0gICAgaWYgKHYgPT0gbnVsbCB8fCAiIi5lcXVhbHModikpIHsKLSAgICAgIHRocm93IG5ldyBJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24oIk5vIGRhdGFiYXNlLiIgKyBuYW1lICsgIiBjb25maWd1cmVkIik7Ci0gICAgfQotICAgIHJldHVybiB2OwotICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9EYXRhU291cmNlVHlwZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZVR5cGUuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xNGNiNzgwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvRGF0YVNvdXJjZVR5cGUuamF2YQpAQCAtMCwwICsxLDM2IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYTsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CisKKworLyoqIEFic3RyYWN0aW9uIG9mIGEgc3VwcG9ydGVkIGRhdGFiYXNlIHBsYXRmb3JtICovCitwdWJsaWMgaW50ZXJmYWNlIERhdGFTb3VyY2VUeXBlIHsKKworICBwdWJsaWMgU3RyaW5nIGdldERyaXZlcigpOworCisgIHB1YmxpYyBTdHJpbmcgZ2V0VXJsKCk7CisKKyAgcHVibGljIGJvb2xlYW4gdXNlUG9vbCgpOworCisgIC8qKgorICAgKiBSZXR1cm4gYSBTY3JpcHRSdW5uZXIgdGhhdCBydW5zIHRoZSBpbmRleCBzY3JpcHQuIE11c3Qgbm90IHJldHVybgorICAgKiA8Y29kZT5udWxsPC9jb2RlPiwgYnV0IG1heSByZXR1cm4gYSBTY3JpcHRSdW5uZXIgdGhhdCBkb2VzIG5vdGhpbmcuCisgICAqCisgICAqIEB0aHJvd3MgSU9FeGNlcHRpb24KKyAgICovCisgIHB1YmxpYyBTY3JpcHRSdW5uZXIgZ2V0SW5kZXhTY3JpcHQoKSB0aHJvd3MgSU9FeGNlcHRpb247Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9IMi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSDIuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mNDM1MzBmCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSDIuamF2YQpAQCAtMCwwICsxLDUyIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYTsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGhzOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKKworaW1wb3J0IGphdmEuaW8uRmlsZTsKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworCitjbGFzcyBIMiBleHRlbmRzIEJhc2VEYXRhU291cmNlVHlwZSB7CisKKyAgcHJvdGVjdGVkIGZpbmFsIENvbmZpZyBjZmc7CisgIHByaXZhdGUgZmluYWwgU2l0ZVBhdGhzIHNpdGU7CisKKyAgQEluamVjdAorICBIMihmaW5hbCBTaXRlUGF0aHMgc2l0ZSwgQEdlcnJpdFNlcnZlckNvbmZpZyBmaW5hbCBDb25maWcgY2ZnKSB7CisgICAgc3VwZXIoIm9yZy5oMi5Ecml2ZXIiKTsKKyAgICB0aGlzLmNmZyA9IGNmZzsKKyAgICB0aGlzLnNpdGUgPSBzaXRlOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0VXJsKCkgeworICAgIFN0cmluZyBkYXRhYmFzZSA9IGNmZy5nZXRTdHJpbmcoImRhdGFiYXNlIiwgbnVsbCwgImRhdGFiYXNlIik7CisgICAgaWYgKGRhdGFiYXNlID09IG51bGwgfHwgZGF0YWJhc2UuaXNFbXB0eSgpKSB7CisgICAgICBkYXRhYmFzZSA9ICJkYi9SZXZpZXdEQiI7CisgICAgfQorICAgIEZpbGUgZGIgPSBzaXRlLnJlc29sdmUoZGF0YWJhc2UpOworICAgIHRyeSB7CisgICAgICBkYiA9IGRiLmdldENhbm9uaWNhbEZpbGUoKTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICBkYiA9IGRiLmdldEFic29sdXRlRmlsZSgpOworICAgIH0KKyAgICByZXR1cm4gImpkYmM6aDI6IiArIGRiLnRvVVJJKCkudG9TdHJpbmcoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSkRCQy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSkRCQy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJjMjA1MWQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9KREJDLmphdmEKQEAgLTAsMCArMSwzNyBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNvbmZpZ1V0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOworCitjbGFzcyBKREJDIGV4dGVuZHMgQmFzZURhdGFTb3VyY2VUeXBlIHsKKworICBwcm90ZWN0ZWQgZmluYWwgQ29uZmlnIGNmZzsKKworICBASW5qZWN0CisgIEpEQkMoQEdlcnJpdFNlcnZlckNvbmZpZyBmaW5hbCBDb25maWcgY2ZnKSB7CisgICAgc3VwZXIoQ29uZmlnVXRpbC5nZXRSZXF1aXJlZChjZmcsICJkYXRhYmFzZSIsICJkcml2ZXIiKSk7CisgICAgdGhpcy5jZmcgPSBjZmc7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRVcmwoKSB7CisgICAgcmV0dXJuIENvbmZpZ1V0aWwuZ2V0UmVxdWlyZWQoY2ZnLCAiZGF0YWJhc2UiLCAidXJsIik7CisgIH0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9KZGJjVXRpbC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSmRiY1V0aWwuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45MGNhNDNkCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvSmRiY1V0aWwuamF2YQpAQCAtMCwwICsxLDM1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYTsKKworcHVibGljIGNsYXNzIEpkYmNVdGlsIHsKKworICBwdWJsaWMgc3RhdGljIFN0cmluZyBob3N0bmFtZShTdHJpbmcgaG9zdG5hbWUpIHsKKyAgICBpZiAoaG9zdG5hbWUgPT0gbnVsbCB8fCBob3N0bmFtZS5pc0VtcHR5KCkpIHsKKyAgICAgIGhvc3RuYW1lID0gImxvY2FsaG9zdCI7CisKKyAgICB9IGVsc2UgaWYgKGhvc3RuYW1lLmNvbnRhaW5zKCI6IikgJiYgIWhvc3RuYW1lLnN0YXJ0c1dpdGgoIlsiKSkgeworICAgICAgaG9zdG5hbWUgPSAiWyIgKyBob3N0bmFtZSArICJdIjsKKyAgICB9CisgICAgcmV0dXJuIGhvc3RuYW1lOworICB9CisKKyAgc3RhdGljIFN0cmluZyBwb3J0KFN0cmluZyBwb3J0KSB7CisgICAgaWYgKHBvcnQgIT0gbnVsbCAmJiAhcG9ydC5pc0VtcHR5KCkpIHsKKyAgICAgIHJldHVybiAiOiIgKyBwb3J0OworICAgIH0KKyAgICByZXR1cm4gIiI7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL015U3FsLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9NeVNxbC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjMwOGNlYzgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9NeVNxbC5qYXZhCkBAIC0wLDAgKzEsNTYgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hOworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuSmRiY1V0aWwuaG9zdG5hbWU7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuSmRiY1V0aWwucG9ydDsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ29uZmlnU2VjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CisKK2NsYXNzIE15U3FsIGV4dGVuZHMgQmFzZURhdGFTb3VyY2VUeXBlIHsKKworICBwcml2YXRlIENvbmZpZyBjZmc7CisKKyAgQEluamVjdAorICBwdWJsaWMgTXlTcWwoQEdlcnJpdFNlcnZlckNvbmZpZyBmaW5hbCBDb25maWcgY2ZnKSB7CisgICAgc3VwZXIoImNvbS5teXNxbC5qZGJjLkRyaXZlciIpOworICAgIHRoaXMuY2ZnID0gY2ZnOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0VXJsKCkgeworICAgIGZpbmFsIFN0cmluZ0J1aWxkZXIgYiA9IG5ldyBTdHJpbmdCdWlsZGVyKCk7CisgICAgZmluYWwgQ29uZmlnU2VjdGlvbiBkYnMgPSBuZXcgQ29uZmlnU2VjdGlvbihjZmcsICJkYXRhYmFzZSIpOworICAgIGIuYXBwZW5kKCJqZGJjOm15c3FsOi8vIik7CisgICAgYi5hcHBlbmQoaG9zdG5hbWUoZGJzLm9wdGlvbmFsKCJob3N0bmFtZSIpKSk7CisgICAgYi5hcHBlbmQocG9ydChkYnMub3B0aW9uYWwoInBvcnQiKSkpOworICAgIGIuYXBwZW5kKCIvIik7CisgICAgYi5hcHBlbmQoZGJzLnJlcXVpcmVkKCJkYXRhYmFzZSIpKTsKKyAgICByZXR1cm4gYi50b1N0cmluZygpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBib29sZWFuIHVzZVBvb2woKSB7CisgICAgLy8gTXlTUUwgaGFzIGdpdmVuIHVzIHRyb3VibGUgd2l0aCB0aGUgY29ubmVjdGlvbiBwb29sLAorICAgIC8vIHNvbWV0aW1lcyB0aGUgYmFja2VuZCBkaXNjb25uZWN0cyBhbmQgdGhlIHBvb2wgd2luZHMKKyAgICAvLyB1cCB3aXRoIGEgc3RhbGUgY29ubmVjdGlvbi4gRm9ydHVuYXRlbHkgb3BlbmluZyB1cAorICAgIC8vIGEgbmV3IE15U1FMIGNvbm5lY3Rpb24gaXMgdXN1YWxseSB2ZXJ5IGZhc3QuCisgICAgcmV0dXJuIGZhbHNlOworICB9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvUG9zdGdyZVNRTC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvUG9zdGdyZVNRTC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM1OGQwYzIKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9Qb3N0Z3JlU1FMLmphdmEKQEAgLTAsMCArMSw1NCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5KZGJjVXRpbC5ob3N0bmFtZTsKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5KZGJjVXRpbC5wb3J0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Db25maWdTZWN0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKKworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CisKK2NsYXNzIFBvc3RncmVTUUwgZXh0ZW5kcyBCYXNlRGF0YVNvdXJjZVR5cGUgeworCisgIHByaXZhdGUgQ29uZmlnIGNmZzsKKworICBASW5qZWN0CisgIHB1YmxpYyBQb3N0Z3JlU1FMKEBHZXJyaXRTZXJ2ZXJDb25maWcgZmluYWwgQ29uZmlnIGNmZykgeworICAgIHN1cGVyKCJvcmcucG9zdGdyZXNxbC5Ecml2ZXIiKTsKKyAgICB0aGlzLmNmZyA9IGNmZzsKKyAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgU3RyaW5nIGdldFVybCgpIHsKKyAgICBmaW5hbCBTdHJpbmdCdWlsZGVyIGIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIGZpbmFsIENvbmZpZ1NlY3Rpb24gZGJjID0gbmV3IENvbmZpZ1NlY3Rpb24oY2ZnLCAiZGF0YWJhc2UiKTsKKyAgICBiLmFwcGVuZCgiamRiYzpwb3N0Z3Jlc3FsOi8vIik7CisgICAgYi5hcHBlbmQoaG9zdG5hbWUoZGJjLm9wdGlvbmFsKCJob3N0bmFtZSIpKSk7CisgICAgYi5hcHBlbmQocG9ydChkYmMub3B0aW9uYWwoInBvcnQiKSkpOworICAgIGIuYXBwZW5kKCIvIik7CisgICAgYi5hcHBlbmQoZGJjLnJlcXVpcmVkKCJkYXRhYmFzZSIpKTsKKyAgICByZXR1cm4gYi50b1N0cmluZygpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTY3JpcHRSdW5uZXIgZ2V0SW5kZXhTY3JpcHQoKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHJldHVybiBnZXRTY3JpcHRSdW5uZXIoImluZGV4X3Bvc3RncmVzLnNxbCIpOworICB9Cit9ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hQ3JlYXRvci5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hQ3JlYXRvci5qYXZhCmluZGV4IGZkMzc5YjIuLjUwMjQ3YjkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYUNyZWF0b3IuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFDcmVhdG9yLmphdmEKQEAgLTE0LDE3ICsxNCwxOSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZUxpc3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLlZlcnNpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjZXNzU2VjdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFZhbHVlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvblJ1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwTmFtZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeVZhbHVlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DdXJyZW50U2NoZW1hVmVyc2lvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5Jbmhlcml0YWJsZUJvb2xlYW47CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlN5c3RlbUNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OwpAQCAtMzgsMTAgKzQwLDYgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlByb2plY3RDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uamRiYy5KZGJjRXhlY3V0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uamRiYy5KZGJjU2NoZW1hOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNjaGVtYS5zcWwuRGlhbGVjdEgyOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNjaGVtYS5zcWwuRGlhbGVjdE15U1FMOwotaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNjaGVtYS5zcWwuRGlhbGVjdFBvc3RncmVTUUw7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2NoZW1hLnNxbC5TcWxEaWFsZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogCkBAIC01NCw3ICs1Miw2IEBACiAKIGltcG9ydCBqYXZhLmlvLkZpbGU7CiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIAogLyoqIENyZWF0ZXMgdGhlIGN1cnJlbnQgZGF0YWJhc2Ugc2NoZW1hIGFuZCBwb3B1bGF0ZXMgaW5pdGlhbCBjb2RlIHJvd3MuICovCkBAIC02NSwxMSArNjIsOSBAQAogICBwcml2YXRlIGZpbmFsIEdpdFJlcG9zaXRvcnlNYW5hZ2VyIG1ncjsKICAgcHJpdmF0ZSBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lOwogICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IHNlcnZlclVzZXI7CisgIHByaXZhdGUgZmluYWwgRGF0YVNvdXJjZVR5cGUgZGF0YVNvdXJjZVR5cGU7CiAKICAgcHJpdmF0ZSBmaW5hbCBpbnQgdmVyc2lvbk5icjsKLSAgcHJpdmF0ZSBmaW5hbCBTY3JpcHRSdW5uZXIgaW5kZXhfZ2VuZXJpYzsKLSAgcHJpdmF0ZSBmaW5hbCBTY3JpcHRSdW5uZXIgaW5kZXhfcG9zdGdyZXM7Ci0gIHByaXZhdGUgZmluYWwgU2NyaXB0UnVubmVyIG15c3FsX25leHR2YWw7CiAKICAgcHJpdmF0ZSBBY2NvdW50R3JvdXAgYWRtaW47CiAgIHByaXZhdGUgQWNjb3VudEdyb3VwIGFub255bW91czsKQEAgLTgxLDIzICs3NiwyMyBAQAogICAgICAgQEN1cnJlbnQgU2NoZW1hVmVyc2lvbiB2ZXJzaW9uLAogICAgICAgR2l0UmVwb3NpdG9yeU1hbmFnZXIgbWdyLAogICAgICAgQWxsUHJvamVjdHNOYW1lIGFsbFByb2plY3RzTmFtZSwKLSAgICAgIEBHZXJyaXRQZXJzb25JZGVudCBQZXJzb25JZGVudCBhdSkgewotICAgIHRoaXMoc2l0ZS5zaXRlX3BhdGgsIHZlcnNpb24sIG1nciwgYWxsUHJvamVjdHNOYW1lLCBhdSk7CisgICAgICBAR2Vycml0UGVyc29uSWRlbnQgUGVyc29uSWRlbnQgYXUsCisgICAgICBEYXRhU291cmNlVHlwZSBkc3QpIHsKKyAgICB0aGlzKHNpdGUuc2l0ZV9wYXRoLCB2ZXJzaW9uLCBtZ3IsIGFsbFByb2plY3RzTmFtZSwgYXUsIGRzdCk7CiAgIH0KIAogICBwdWJsaWMgU2NoZW1hQ3JlYXRvcihAU2l0ZVBhdGggRmlsZSBzaXRlLAogICAgICAgQEN1cnJlbnQgU2NoZW1hVmVyc2lvbiB2ZXJzaW9uLAogICAgICAgR2l0UmVwb3NpdG9yeU1hbmFnZXIgZ2l0TWdyLAogICAgICAgQWxsUHJvamVjdHNOYW1lIGFwLAotICAgICAgQEdlcnJpdFBlcnNvbklkZW50IFBlcnNvbklkZW50IGF1KSB7CisgICAgICBAR2Vycml0UGVyc29uSWRlbnQgUGVyc29uSWRlbnQgYXUsCisgICAgICBEYXRhU291cmNlVHlwZSBkc3QpIHsKICAgICBzaXRlX3BhdGggPSBzaXRlOwogICAgIG1nciA9IGdpdE1ncjsKICAgICBhbGxQcm9qZWN0c05hbWUgPSBhcDsKICAgICBzZXJ2ZXJVc2VyID0gYXU7CisgICAgZGF0YVNvdXJjZVR5cGUgPSBkc3Q7CiAgICAgdmVyc2lvbk5iciA9IHZlcnNpb24uZ2V0VmVyc2lvbk5icigpOwotICAgIGluZGV4X2dlbmVyaWMgPSBuZXcgU2NyaXB0UnVubmVyKCJpbmRleF9nZW5lcmljLnNxbCIpOwotICAgIGluZGV4X3Bvc3RncmVzID0gbmV3IFNjcmlwdFJ1bm5lcigiaW5kZXhfcG9zdGdyZXMuc3FsIik7Ci0gICAgbXlzcWxfbmV4dHZhbCA9IG5ldyBTY3JpcHRSdW5uZXIoIm15c3FsX25leHR2YWwuc3FsIik7CiAgIH0KIAogICBwdWJsaWMgdm9pZCBjcmVhdGUoZmluYWwgUmV2aWV3RGIgZGIpIHRocm93cyBPcm1FeGNlcHRpb24sIElPRXhjZXB0aW9uLApAQCAtMTE0LDI5ICsxMDksOSBAQAogICAgIHNWZXIudmVyc2lvbk5iciA9IHZlcnNpb25OYnI7CiAgICAgZGIuc2NoZW1hVmVyc2lvbigpLmluc2VydChDb2xsZWN0aW9ucy5zaW5nbGV0b24oc1ZlcikpOwogCi0gICAgZmluYWwgU3lzdGVtQ29uZmlnIHNDb25maWcgPSBpbml0U3lzdGVtQ29uZmlnKGRiKTsKLSAgICBpbml0VmVyaWZpZWRDYXRlZ29yeShkYik7Ci0gICAgaW5pdENvZGVSZXZpZXdDYXRlZ29yeShkYiwgc0NvbmZpZyk7Ci0KLSAgICBpZiAobWdyICE9IG51bGwpIHsKLSAgICAgIC8vIFRPRE8gVGhpcyBzaG91bGQgbmV2ZXIgYmUgbnVsbCB3aGVuIGluaXRpYWxpemluZyBhIHNpdGUuCi0gICAgICBpbml0V2lsZENhcmRQcm9qZWN0KCk7Ci0gICAgfQotCi0gICAgZmluYWwgU3FsRGlhbGVjdCBkID0gamRiYy5nZXREaWFsZWN0KCk7Ci0gICAgaWYgKGQgaW5zdGFuY2VvZiBEaWFsZWN0SDIpIHsKLSAgICAgIGluZGV4X2dlbmVyaWMucnVuKGRiKTsKLQotICAgIH0gZWxzZSBpZiAoZCBpbnN0YW5jZW9mIERpYWxlY3RNeVNRTCkgewotICAgICAgaW5kZXhfZ2VuZXJpYy5ydW4oZGIpOwotICAgICAgbXlzcWxfbmV4dHZhbC5ydW4oZGIpOwotCi0gICAgfSBlbHNlIGlmIChkIGluc3RhbmNlb2YgRGlhbGVjdFBvc3RncmVTUUwpIHsKLSAgICAgIGluZGV4X3Bvc3RncmVzLnJ1bihkYik7Ci0KLSAgICB9IGVsc2UgewotICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbigiVW5zdXBwb3J0ZWQgZGF0YWJhc2UgIiArIGQuZ2V0Q2xhc3MoKS5nZXROYW1lKCkpOwotICAgIH0KKyAgICBpbml0U3lzdGVtQ29uZmlnKGRiKTsKKyAgICBpbml0QWxsUHJvamVjdHMoKTsKKyAgICBkYXRhU291cmNlVHlwZS5nZXRJbmRleFNjcmlwdCgpLnJ1bihkYik7CiAgIH0KIAogICBwcml2YXRlIEFjY291bnRHcm91cCBuZXdHcm91cChSZXZpZXdEYiBjLCBTdHJpbmcgbmFtZSwgQWNjb3VudEdyb3VwLlVVSUQgdXVpZCkKQEAgLTIwMiwyMyArMTc3LDMyIEBACiAgICAgcmV0dXJuIHM7CiAgIH0KIAotICBwcml2YXRlIHZvaWQgaW5pdFdpbGRDYXJkUHJvamVjdCgpIHRocm93cyBJT0V4Y2VwdGlvbiwgQ29uZmlnSW52YWxpZEV4Y2VwdGlvbiB7Ci0gICAgUmVwb3NpdG9yeSBnaXQ7CisgIHByaXZhdGUgdm9pZCBpbml0QWxsUHJvamVjdHMoKSB0aHJvd3MgSU9FeGNlcHRpb24sIENvbmZpZ0ludmFsaWRFeGNlcHRpb24geworICAgIFJlcG9zaXRvcnkgZ2l0ID0gbnVsbDsKICAgICB0cnkgewogICAgICAgZ2l0ID0gbWdyLm9wZW5SZXBvc2l0b3J5KGFsbFByb2plY3RzTmFtZSk7CisgICAgICBpbml0QWxsUHJvamVjdHMoZ2l0KTsKICAgICB9IGNhdGNoIChSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24gbm90Rm91bmQpIHsKICAgICAgIC8vIEEgcmVwb3NpdG9yeSBtYXkgYmUgbWlzc2luZyBpZiB0aGlzIHByb2plY3QgZXhpc3RlZCBvbmx5IHRvIHN0b3JlCiAgICAgICAvLyBpbmhlcml0YWJsZSBwZXJtaXNzaW9ucy4gRm9yIGV4YW1wbGUgJ0FsbC1Qcm9qZWN0cycuCiAgICAgICB0cnkgewogICAgICAgICBnaXQgPSBtZ3IuY3JlYXRlUmVwb3NpdG9yeShhbGxQcm9qZWN0c05hbWUpOworICAgICAgICBpbml0QWxsUHJvamVjdHMoZ2l0KTsKICAgICAgICAgZmluYWwgUmVmVXBkYXRlIHUgPSBnaXQudXBkYXRlUmVmKENvbnN0YW50cy5IRUFEKTsKICAgICAgICAgdS5saW5rKEdpdFJlcG9zaXRvcnlNYW5hZ2VyLlJFRl9DT05GSUcpOwogICAgICAgfSBjYXRjaCAoUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uIGVycikgewogICAgICAgICBmaW5hbCBTdHJpbmcgbmFtZSA9IGFsbFByb2plY3RzTmFtZS5nZXQoKTsKICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKCJDYW5ub3QgY3JlYXRlIHJlcG9zaXRvcnkgIiArIG5hbWUsIGVycik7CiAgICAgICB9CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIGlmIChnaXQgIT0gbnVsbCkgeworICAgICAgICBnaXQuY2xvc2UoKTsKKyAgICAgIH0KICAgICB9Ci0gICAgdHJ5IHsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBpbml0QWxsUHJvamVjdHMoUmVwb3NpdG9yeSBnaXQpIHRocm93cyBJT0V4Y2VwdGlvbiwKKyAgICAgIENvbmZpZ0ludmFsaWRFeGNlcHRpb24gewogICAgICAgTWV0YURhdGFVcGRhdGUgbWQgPQogICAgICAgICAgIG5ldyBNZXRhRGF0YVVwZGF0ZShHaXRSZWZlcmVuY2VVcGRhdGVkLkRJU0FCTEVELCBhbGxQcm9qZWN0c05hbWUsIGdpdCk7CiAgICAgICBtZC5nZXRDb21taXRCdWlsZGVyKCkuc2V0QXV0aG9yKHNlcnZlclVzZXIpOwpAQCAtMjI2LDQwICsyMTAsNzcgQEAKIAogICAgICAgUHJvamVjdENvbmZpZyBjb25maWcgPSBQcm9qZWN0Q29uZmlnLnJlYWQobWQpOwogICAgICAgUHJvamVjdCBwID0gY29uZmlnLmdldFByb2plY3QoKTsKLSAgICAgIHAuc2V0RGVzY3JpcHRpb24oIlJpZ2h0cyBpbmhlcml0ZWQgYnkgYWxsIG90aGVyIHByb2plY3RzIik7Ci0gICAgICBwLnNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyhmYWxzZSk7CisgICAgICBwLnNldERlc2NyaXB0aW9uKCJBY2Nlc3MgaW5oZXJpdGVkIGJ5IGFsbCBvdGhlciBwcm9qZWN0cy4iKTsKKyAgICAgIHAuc2V0UmVxdWlyZUNoYW5nZUlEKEluaGVyaXRhYmxlQm9vbGVhbi5UUlVFKTsKKyAgICAgIHAuc2V0VXNlQ29udGVudE1lcmdlKEluaGVyaXRhYmxlQm9vbGVhbi5UUlVFKTsKKyAgICAgIHAuc2V0VXNlQ29udHJpYnV0b3JBZ3JlZW1lbnRzKEluaGVyaXRhYmxlQm9vbGVhbi5GQUxTRSk7CisgICAgICBwLnNldFVzZVNpZ25lZE9mZkJ5KEluaGVyaXRhYmxlQm9vbGVhbi5GQUxTRSk7CiAKICAgICAgIEFjY2Vzc1NlY3Rpb24gY2FwID0gY29uZmlnLmdldEFjY2Vzc1NlY3Rpb24oQWNjZXNzU2VjdGlvbi5HTE9CQUxfQ0FQQUJJTElUSUVTLCB0cnVlKTsKICAgICAgIEFjY2Vzc1NlY3Rpb24gYWxsID0gY29uZmlnLmdldEFjY2Vzc1NlY3Rpb24oQWNjZXNzU2VjdGlvbi5BTEwsIHRydWUpOwogICAgICAgQWNjZXNzU2VjdGlvbiBoZWFkcyA9IGNvbmZpZy5nZXRBY2Nlc3NTZWN0aW9uKEFjY2Vzc1NlY3Rpb24uSEVBRFMsIHRydWUpOworICAgICAgQWNjZXNzU2VjdGlvbiB0YWdzID0gY29uZmlnLmdldEFjY2Vzc1NlY3Rpb24oInJlZnMvdGFncy8qIiwgdHJ1ZSk7CiAgICAgICBBY2Nlc3NTZWN0aW9uIG1ldGEgPSBjb25maWcuZ2V0QWNjZXNzU2VjdGlvbihHaXRSZXBvc2l0b3J5TWFuYWdlci5SRUZfQ09ORklHLCB0cnVlKTsKKyAgICAgIEFjY2Vzc1NlY3Rpb24gbWFnaWMgPSBjb25maWcuZ2V0QWNjZXNzU2VjdGlvbigicmVmcy9mb3IvIiArIEFjY2Vzc1NlY3Rpb24uQUxMLCB0cnVlKTsKIAotICAgICAgY2FwLmdldFBlcm1pc3Npb24oR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSLCB0cnVlKQotICAgICAgICAuYWRkKHJ1bGUoY29uZmlnLCBhZG1pbikpOworICAgICAgZ3JhbnQoY29uZmlnLCBjYXAsIEdsb2JhbENhcGFiaWxpdHkuQURNSU5JU1RSQVRFX1NFUlZFUiwgYWRtaW4pOworICAgICAgZ3JhbnQoY29uZmlnLCBhbGwsIFBlcm1pc3Npb24uUkVBRCwgYWRtaW4sIGFub255bW91cyk7CiAKLSAgICAgIFBlcm1pc3Npb25SdWxlIHJldmlldyA9IHJ1bGUoY29uZmlnLCByZWdpc3RlcmVkKTsKLSAgICAgIHJldmlldy5zZXRSYW5nZSgtMSwgMSk7Ci0gICAgICBoZWFkcy5nZXRQZXJtaXNzaW9uKFBlcm1pc3Npb24uTEFCRUwgKyAiQ29kZS1SZXZpZXciLCB0cnVlKS5hZGQocmV2aWV3KTsKKyAgICAgIExhYmVsVHlwZSBjciA9IGluaXRDb2RlUmV2aWV3TGFiZWwoY29uZmlnKTsKKyAgICAgIGdyYW50KGNvbmZpZywgaGVhZHMsIGNyLCAtMSwgMSwgcmVnaXN0ZXJlZCk7CisgICAgICBncmFudChjb25maWcsIGhlYWRzLCBjciwgLTIsIDIsIGFkbWluLCBvd25lcnMpOworICAgICAgZ3JhbnQoY29uZmlnLCBoZWFkcywgUGVybWlzc2lvbi5DUkVBVEUsIGFkbWluLCBvd25lcnMpOworICAgICAgZ3JhbnQoY29uZmlnLCBoZWFkcywgUGVybWlzc2lvbi5QVVNILCBhZG1pbiwgb3duZXJzKTsKKyAgICAgIGdyYW50KGNvbmZpZywgaGVhZHMsIFBlcm1pc3Npb24uU1VCTUlULCBhZG1pbiwgb3duZXJzKTsKKyAgICAgIGdyYW50KGNvbmZpZywgaGVhZHMsIFBlcm1pc3Npb24uRk9SR0VfQVVUSE9SLCByZWdpc3RlcmVkKTsKKyAgICAgIGdyYW50KGNvbmZpZywgaGVhZHMsIFBlcm1pc3Npb24uRk9SR0VfQ09NTUlUVEVSLCBhZG1pbiwgb3duZXJzKTsKKyAgICAgIGdyYW50KGNvbmZpZywgaGVhZHMsIFBlcm1pc3Npb24uRURJVF9UT1BJQ19OQU1FLCB0cnVlLCBhZG1pbiwgb3duZXJzKTsKIAotICAgICAgYWxsLmdldFBlcm1pc3Npb24oUGVybWlzc2lvbi5SRUFELCB0cnVlKSAvLwotICAgICAgICAgIC5hZGQocnVsZShjb25maWcsIGFkbWluKSk7Ci0gICAgICBhbGwuZ2V0UGVybWlzc2lvbihQZXJtaXNzaW9uLlJFQUQsIHRydWUpIC8vCi0gICAgICAgICAgLmFkZChydWxlKGNvbmZpZywgYW5vbnltb3VzKSk7CisgICAgICBncmFudChjb25maWcsIHRhZ3MsIFBlcm1pc3Npb24uUFVTSF9UQUcsIGFkbWluLCBvd25lcnMpOworICAgICAgZ3JhbnQoY29uZmlnLCB0YWdzLCBQZXJtaXNzaW9uLlBVU0hfU0lHTkVEX1RBRywgYWRtaW4sIG93bmVycyk7CiAKLSAgICAgIGNvbmZpZy5nZXRBY2Nlc3NTZWN0aW9uKCJyZWZzL2Zvci8iICsgQWNjZXNzU2VjdGlvbi5BTEwsIHRydWUpIC8vCi0gICAgICAgICAgLmdldFBlcm1pc3Npb24oUGVybWlzc2lvbi5QVVNILCB0cnVlKSAvLwotICAgICAgICAgIC5hZGQocnVsZShjb25maWcsIHJlZ2lzdGVyZWQpKTsKLSAgICAgIGFsbC5nZXRQZXJtaXNzaW9uKFBlcm1pc3Npb24uRk9SR0VfQVVUSE9SLCB0cnVlKSAvLwotICAgICAgICAgIC5hZGQocnVsZShjb25maWcsIHJlZ2lzdGVyZWQpKTsKKyAgICAgIGdyYW50KGNvbmZpZywgbWFnaWMsIFBlcm1pc3Npb24uUFVTSCwgcmVnaXN0ZXJlZCk7CisgICAgICBncmFudChjb25maWcsIG1hZ2ljLCBQZXJtaXNzaW9uLlBVU0hfTUVSR0UsIHJlZ2lzdGVyZWQpOwogCi0gICAgICBQZXJtaXNzaW9uIG1ldGFSZWFkUGVybWlzc2lvbiA9IG1ldGEuZ2V0UGVybWlzc2lvbihQZXJtaXNzaW9uLlJFQUQsIHRydWUpOwotICAgICAgbWV0YVJlYWRQZXJtaXNzaW9uLnNldEV4Y2x1c2l2ZUdyb3VwKHRydWUpOwotICAgICAgbWV0YVJlYWRQZXJtaXNzaW9uLmFkZChydWxlKGNvbmZpZywgb3duZXJzKSk7CisgICAgICBtZXRhLmdldFBlcm1pc3Npb24oUGVybWlzc2lvbi5SRUFELCB0cnVlKS5zZXRFeGNsdXNpdmVHcm91cCh0cnVlKTsKKyAgICAgIGdyYW50KGNvbmZpZywgbWV0YSwgUGVybWlzc2lvbi5SRUFELCBhZG1pbiwgb3duZXJzKTsKKyAgICAgIGdyYW50KGNvbmZpZywgbWV0YSwgY3IsIC0yLCAyLCBhZG1pbiwgb3duZXJzKTsKKyAgICAgIGdyYW50KGNvbmZpZywgbWV0YSwgUGVybWlzc2lvbi5QVVNILCBhZG1pbiwgb3duZXJzKTsKKyAgICAgIGdyYW50KGNvbmZpZywgbWV0YSwgUGVybWlzc2lvbi5TVUJNSVQsIGFkbWluLCBvd25lcnMpOwogCiAgICAgICBtZC5zZXRNZXNzYWdlKCJJbml0aWFsaXplZCBHZXJyaXQgQ29kZSBSZXZpZXcgIiArIFZlcnNpb24uZ2V0VmVyc2lvbigpKTsKICAgICAgIGNvbmZpZy5jb21taXQobWQpOwotICAgIH0gZmluYWxseSB7Ci0gICAgICBnaXQuY2xvc2UoKTsKKyAgfQorCisgIHByaXZhdGUgUGVybWlzc2lvblJ1bGUgZ3JhbnQoUHJvamVjdENvbmZpZyBjb25maWcsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbiwKKyAgICAgIFN0cmluZyBwZXJtaXNzaW9uLCBBY2NvdW50R3JvdXAgZ3JvdXAxLCBBY2NvdW50R3JvdXAuLi4gZ3JvdXBMaXN0KSB7CisgICAgcmV0dXJuIGdyYW50KGNvbmZpZywgc2VjdGlvbiwgcGVybWlzc2lvbiwgZmFsc2UsIGdyb3VwMSwgZ3JvdXBMaXN0KTsKKyAgfQorCisgIHByaXZhdGUgUGVybWlzc2lvblJ1bGUgZ3JhbnQoUHJvamVjdENvbmZpZyBjb25maWcsIEFjY2Vzc1NlY3Rpb24gc2VjdGlvbiwKKyAgICAgIFN0cmluZyBwZXJtaXNzaW9uLCBib29sZWFuIGZvcmNlLCBBY2NvdW50R3JvdXAgZ3JvdXAxLAorICAgICAgQWNjb3VudEdyb3VwLi4uIGdyb3VwTGlzdCkgeworICAgIFBlcm1pc3Npb24gcCA9IHNlY3Rpb24uZ2V0UGVybWlzc2lvbihwZXJtaXNzaW9uLCB0cnVlKTsKKyAgICBQZXJtaXNzaW9uUnVsZSBydWxlID0gcnVsZShjb25maWcsIGdyb3VwMSk7CisgICAgcnVsZS5zZXRGb3JjZShmb3JjZSk7CisgICAgcC5hZGQocnVsZSk7CisgICAgZm9yIChBY2NvdW50R3JvdXAgZ3JvdXAgOiBncm91cExpc3QpIHsKKyAgICAgIHJ1bGUgPSBydWxlKGNvbmZpZywgZ3JvdXApOworICAgICAgcnVsZS5zZXRGb3JjZShmb3JjZSk7CisgICAgICBwLmFkZChydWxlKTsKKyAgICB9CisgICAgcmV0dXJuIHJ1bGU7CisgIH0KKworICBwcml2YXRlIHZvaWQgZ3JhbnQoUHJvamVjdENvbmZpZyBjb25maWcsCisgICAgICBBY2Nlc3NTZWN0aW9uIHNlY3Rpb24sIExhYmVsVHlwZSB0eXBlLAorICAgICAgaW50IG1pbiwgaW50IG1heCwgQWNjb3VudEdyb3VwLi4uIGdyb3VwTGlzdCkgeworICAgIFN0cmluZyBuYW1lID0gUGVybWlzc2lvbi5MQUJFTCArIHR5cGUuZ2V0TmFtZSgpOworICAgIFBlcm1pc3Npb24gcCA9IHNlY3Rpb24uZ2V0UGVybWlzc2lvbihuYW1lLCB0cnVlKTsKKyAgICBmb3IgKEFjY291bnRHcm91cCBncm91cCA6IGdyb3VwTGlzdCkgeworICAgICAgUGVybWlzc2lvblJ1bGUgciA9IHJ1bGUoY29uZmlnLCBncm91cCk7CisgICAgICByLnNldFJhbmdlKG1pbiwgbWF4KTsKKyAgICAgIHAuYWRkKHIpOwogICAgIH0KICAgfQogCkBAIC0yNjcsNDMgKzI4OCwxNiBAQAogICAgIHJldHVybiBuZXcgUGVybWlzc2lvblJ1bGUoY29uZmlnLnJlc29sdmUoZ3JvdXApKTsKICAgfQogCi0gIHByaXZhdGUgdm9pZCBpbml0VmVyaWZpZWRDYXRlZ29yeShmaW5hbCBSZXZpZXdEYiBjKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBmaW5hbCBBcHByb3ZhbENhdGVnb3J5IGNhdDsKLSAgICBmaW5hbCBBcnJheUxpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPiB2YWxzOwotCi0gICAgY2F0ID0gbmV3IEFwcHJvdmFsQ2F0ZWdvcnkobmV3IEFwcHJvdmFsQ2F0ZWdvcnkuSWQoIlZSSUYiKSwgIlZlcmlmaWVkIik7Ci0gICAgY2F0LnNldFBvc2l0aW9uKChzaG9ydCkgMCk7Ci0gICAgY2F0LnNldEFiYnJldmlhdGVkTmFtZSgiViIpOwotICAgIHZhbHMgPSBuZXcgQXJyYXlMaXN0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZT4oKTsKLSAgICB2YWxzLmFkZCh2YWx1ZShjYXQsIDEsICJWZXJpZmllZCIpKTsKLSAgICB2YWxzLmFkZCh2YWx1ZShjYXQsIDAsICJObyBzY29yZSIpKTsKLSAgICB2YWxzLmFkZCh2YWx1ZShjYXQsIC0xLCAiRmFpbHMiKSk7Ci0gICAgYy5hcHByb3ZhbENhdGVnb3JpZXMoKS5pbnNlcnQoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGNhdCkpOwotICAgIGMuYXBwcm92YWxDYXRlZ29yeVZhbHVlcygpLmluc2VydCh2YWxzKTsKLSAgfQotCi0gIHByaXZhdGUgdm9pZCBpbml0Q29kZVJldmlld0NhdGVnb3J5KGZpbmFsIFJldmlld0RiIGMsCi0gICAgICBmaW5hbCBTeXN0ZW1Db25maWcgc0NvbmZpZykgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7Ci0gICAgZmluYWwgQXBwcm92YWxDYXRlZ29yeSBjYXQ7Ci0gICAgZmluYWwgQXJyYXlMaXN0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZT4gdmFsczsKLQotICAgIGNhdCA9IG5ldyBBcHByb3ZhbENhdGVnb3J5KG5ldyBBcHByb3ZhbENhdGVnb3J5LklkKCJDUlZXIiksICJDb2RlIFJldmlldyIpOwotICAgIGNhdC5zZXRQb3NpdGlvbigoc2hvcnQpIDEpOwotICAgIGNhdC5zZXRBYmJyZXZpYXRlZE5hbWUoIlIiKTsKLSAgICBjYXQuc2V0Q29weU1pblNjb3JlKHRydWUpOwotICAgIHZhbHMgPSBuZXcgQXJyYXlMaXN0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZT4oKTsKLSAgICB2YWxzLmFkZCh2YWx1ZShjYXQsIDIsICJMb29rcyBnb29kIHRvIG1lLCBhcHByb3ZlZCIpKTsKLSAgICB2YWxzLmFkZCh2YWx1ZShjYXQsIDEsICJMb29rcyBnb29kIHRvIG1lLCBidXQgc29tZW9uZSBlbHNlIG11c3QgYXBwcm92ZSIpKTsKLSAgICB2YWxzLmFkZCh2YWx1ZShjYXQsIDAsICJObyBzY29yZSIpKTsKLSAgICB2YWxzLmFkZCh2YWx1ZShjYXQsIC0xLCAiSSB3b3VsZCBwcmVmZXIgdGhhdCB5b3UgZGlkbid0IHN1Ym1pdCB0aGlzIikpOwotICAgIHZhbHMuYWRkKHZhbHVlKGNhdCwgLTIsICJEbyBub3Qgc3VibWl0IikpOwotICAgIGMuYXBwcm92YWxDYXRlZ29yaWVzKCkuaW5zZXJ0KENvbGxlY3Rpb25zLnNpbmdsZXRvbihjYXQpKTsKLSAgICBjLmFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZXMoKS5pbnNlcnQodmFscyk7Ci0gIH0KLQotICBwcml2YXRlIHN0YXRpYyBBcHByb3ZhbENhdGVnb3J5VmFsdWUgdmFsdWUoZmluYWwgQXBwcm92YWxDYXRlZ29yeSBjYXQsCi0gICAgICBmaW5hbCBpbnQgdmFsdWUsIGZpbmFsIFN0cmluZyBuYW1lKSB7Ci0gICAgcmV0dXJuIG5ldyBBcHByb3ZhbENhdGVnb3J5VmFsdWUobmV3IEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZChjYXQuZ2V0SWQoKSwKLSAgICAgICAgKHNob3J0KSB2YWx1ZSksIG5hbWUpOworICBwdWJsaWMgc3RhdGljIExhYmVsVHlwZSBpbml0Q29kZVJldmlld0xhYmVsKFByb2plY3RDb25maWcgYykgeworICAgIExhYmVsVHlwZSB0eXBlID0gbmV3IExhYmVsVHlwZSgiQ29kZS1SZXZpZXciLCBJbW11dGFibGVMaXN0Lm9mKAorICAgICAgICBuZXcgTGFiZWxWYWx1ZSgoc2hvcnQpIDIsICJMb29rcyBnb29kIHRvIG1lLCBhcHByb3ZlZCIpLAorICAgICAgICBuZXcgTGFiZWxWYWx1ZSgoc2hvcnQpIDEsICJMb29rcyBnb29kIHRvIG1lLCBidXQgc29tZW9uZSBlbHNlIG11c3QgYXBwcm92ZSIpLAorICAgICAgICBuZXcgTGFiZWxWYWx1ZSgoc2hvcnQpIDAsICJObyBzY29yZSIpLAorICAgICAgICBuZXcgTGFiZWxWYWx1ZSgoc2hvcnQpIC0xLCAiSSB3b3VsZCBwcmVmZXIgdGhhdCB5b3UgZGlkbid0IHN1Ym1pdCB0aGlzIiksCisgICAgICAgIG5ldyBMYWJlbFZhbHVlKChzaG9ydCkgLTIsICJEbyBub3Qgc3VibWl0IikpKTsKKyAgICB0eXBlLnNldEFiYnJldmlhdGVkTmFtZSgiQ1IiKTsKKyAgICB0eXBlLnNldENvcHlNaW5TY29yZSh0cnVlKTsKKyAgICBjLmdldExhYmVsU2VjdGlvbnMoKS5wdXQodHlwZS5nZXROYW1lKCksIHR5cGUpOworICAgIHJldHVybiB0eXBlOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uLmphdmEKaW5kZXggZjEyN2EyMS4uNGRlMzg4OCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hVmVyc2lvbi5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYVZlcnNpb24uamF2YQpAQCAtMzIsNyArMzIsNyBAQAogLyoqIEEgdmVyc2lvbiBvZiB0aGUgZGF0YWJhc2Ugc2NoZW1hLiAqLwogcHVibGljIGFic3RyYWN0IGNsYXNzIFNjaGVtYVZlcnNpb24gewogICAvKiogVGhlIGN1cnJlbnQgc2NoZW1hIHZlcnNpb24uICovCi0gIHB1YmxpYyBzdGF0aWMgZmluYWwgQ2xhc3M8U2NoZW1hXzczPiBDID0gU2NoZW1hXzczLmNsYXNzOworICBwdWJsaWMgc3RhdGljIGZpbmFsIENsYXNzPFNjaGVtYV83Nz4gQyA9IFNjaGVtYV83Ny5jbGFzczsKIAogICBwdWJsaWMgc3RhdGljIGNsYXNzIE1vZHVsZSBleHRlbmRzIEFic3RyYWN0TW9kdWxlIHsKICAgICBAT3ZlcnJpZGUKQEAgLTQ5LDcgKzQ5LDcgQEAKICAgICB0aGlzLnZlcnNpb25OYnIgPSBndWVzc1ZlcnNpb24oZ2V0Q2xhc3MoKSk7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBpbnQgZ3Vlc3NWZXJzaW9uKENsYXNzPD8+IGMpIHsKKyAgcHVibGljIHN0YXRpYyBpbnQgZ3Vlc3NWZXJzaW9uKENsYXNzPD8+IGMpIHsKICAgICBTdHJpbmcgbiA9IGMuZ2V0TmFtZSgpOwogICAgIG4gPSBuLnN1YnN0cmluZyhuLmxhc3RJbmRleE9mKCdfJykgKyAxKTsKICAgICB3aGlsZSAobi5zdGFydHNXaXRoKCIwIikpCkBAIC04Myw2ICs4MywxMSBAQAogICAgICAgdGhyb3dzIE9ybUV4Y2VwdGlvbiwgU1FMRXhjZXB0aW9uIHsKICAgICBmaW5hbCBKZGJjU2NoZW1hIHMgPSAoSmRiY1NjaGVtYSkgZGI7CiAKKyAgICBpZiAoY3Vyci52ZXJzaW9uTmJyID4gdmVyc2lvbk5icikgeworICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbigiQ2Fubm90IGRvd25ncmFkZSBkYXRhYmFzZSBzY2hlbWEgZnJvbSB2ZXJzaW9uICIgKyBjdXJyLnZlcnNpb25OYnIKKyAgICAgICAgICArICIgdG8gIiArIHZlcnNpb25OYnIgKyAiLiIpOworICAgIH0KKwogICAgIHByaW9yLmdldCgpLmNoZWNrKHVpLCBjdXJyLCBkYiwgZmFsc2UpOwogCiAgICAgdWkubWVzc2FnZSgiVXBncmFkaW5nIGRhdGFiYXNlIHNjaGVtYSBmcm9tIHZlcnNpb24gIiArIGN1cnIudmVyc2lvbk5icgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hVmVyc2lvbkNoZWNrLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uQ2hlY2suamF2YQppbmRleCAxMzNiODU2Li4yZTEyZjVjIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uQ2hlY2suamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFWZXJzaW9uQ2hlY2suamF2YQpAQCAtMTgsNiArMTgsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmxpZmVjeWNsZS5MaWZlY3ljbGVNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkN1cnJlbnRTY2hlbWFWZXJzaW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlNpdGVQYXRoczsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTM3LDE0ICszOCwxNyBAQAogICB9CiAKICAgcHJpdmF0ZSBmaW5hbCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzY2hlbWE7CisgIHByaXZhdGUgZmluYWwgU2l0ZVBhdGhzIHNpdGU7CiAKICAgQEN1cnJlbnQKICAgcHJpdmF0ZSBmaW5hbCBQcm92aWRlcjxTY2hlbWFWZXJzaW9uPiB2ZXJzaW9uOwogCiAgIEBJbmplY3QKICAgcHVibGljIFNjaGVtYVZlcnNpb25DaGVjayhTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzY2hlbWFGYWN0b3J5LAorICAgICAgZmluYWwgU2l0ZVBhdGhzIHNpdGUsCiAgICAgICBAQ3VycmVudCBQcm92aWRlcjxTY2hlbWFWZXJzaW9uPiB2ZXJzaW9uKSB7CiAgICAgdGhpcy5zY2hlbWEgPSBzY2hlbWFGYWN0b3J5OworICAgIHRoaXMuc2l0ZSA9IHNpdGU7CiAgICAgdGhpcy52ZXJzaW9uID0gdmVyc2lvbjsKICAgfQogCkBAIC01MiwxNyArNTYsMjUgQEAKICAgICB0cnkgewogICAgICAgZmluYWwgUmV2aWV3RGIgZGIgPSBzY2hlbWEub3BlbigpOwogICAgICAgdHJ5IHsKLSAgICAgICAgZmluYWwgQ3VycmVudFNjaGVtYVZlcnNpb24gc1ZlciA9IGdldFNjaGVtYVZlcnNpb24oZGIpOwotICAgICAgICBmaW5hbCBpbnQgZVZlciA9IHZlcnNpb24uZ2V0KCkuZ2V0VmVyc2lvbk5icigpOworICAgICAgICBmaW5hbCBDdXJyZW50U2NoZW1hVmVyc2lvbiBjdXJyZW50VmVyID0gZ2V0U2NoZW1hVmVyc2lvbihkYik7CisgICAgICAgIGZpbmFsIGludCBleHBlY3RlZFZlciA9IHZlcnNpb24uZ2V0KCkuZ2V0VmVyc2lvbk5icigpOwogCi0gICAgICAgIGlmIChzVmVyID09IG51bGwpIHsKKyAgICAgICAgaWYgKGN1cnJlbnRWZXIgPT0gbnVsbCkgewogICAgICAgICAgIHRocm93IG5ldyBQcm92aXNpb25FeGNlcHRpb24oIlNjaGVtYSBub3QgeWV0IGluaXRpYWxpemVkLiIKLSAgICAgICAgICAgICAgKyAiICBSdW4gaW5pdCB0byBpbml0aWFsaXplIHRoZSBzY2hlbWEuIik7CisgICAgICAgICAgICAgICsgIiAgUnVuIGluaXQgdG8gaW5pdGlhbGl6ZSB0aGUgc2NoZW1hOlxuIgorICAgICAgICAgICAgICArICIkIGphdmEgLWphciBnZXJyaXQud2FyIGluaXQgLWQgIgorICAgICAgICAgICAgICArIHNpdGUuc2l0ZV9wYXRoLmdldEFic29sdXRlUGF0aCgpKTsKICAgICAgICAgfQotICAgICAgICBpZiAoc1Zlci52ZXJzaW9uTmJyICE9IGVWZXIpIHsKKyAgICAgICAgaWYgKGN1cnJlbnRWZXIudmVyc2lvbk5iciA8IGV4cGVjdGVkVmVyKSB7CiAgICAgICAgICAgdGhyb3cgbmV3IFByb3Zpc2lvbkV4Y2VwdGlvbigiVW5zdXBwb3J0ZWQgc2NoZW1hIHZlcnNpb24gIgotICAgICAgICAgICAgICArIHNWZXIudmVyc2lvbk5iciArICI7IGV4cGVjdGVkIHNjaGVtYSB2ZXJzaW9uICIgKyBlVmVyCi0gICAgICAgICAgICAgICsgIi4gIFJ1biBpbml0IHRvIHVwZ3JhZGUuIik7CisgICAgICAgICAgICAgICsgY3VycmVudFZlci52ZXJzaW9uTmJyICsgIjsgZXhwZWN0ZWQgc2NoZW1hIHZlcnNpb24gIiArIGV4cGVjdGVkVmVyCisgICAgICAgICAgICAgICsgIi4gIFJ1biBpbml0IHRvIHVwZ3JhZGU6XG4iCisgICAgICAgICAgICAgICsgIiQgamF2YSAtamFyICIgKyBzaXRlLmdlcnJpdF93YXIuZ2V0QWJzb2x1dGVQYXRoKCkgKyAiIGluaXQgLWQgIgorICAgICAgICAgICAgICArIHNpdGUuc2l0ZV9wYXRoLmdldEFic29sdXRlUGF0aCgpKTsKKyAgICAgICAgfSBlbHNlIGlmIChjdXJyZW50VmVyLnZlcnNpb25OYnIgPiBleHBlY3RlZFZlcikgeworICAgICAgICAgIHRocm93IG5ldyBQcm92aXNpb25FeGNlcHRpb24oIlVuc3VwcG9ydGVkIHNjaGVtYSB2ZXJzaW9uICIKKyAgICAgICAgICAgICAgKyBjdXJyZW50VmVyLnZlcnNpb25OYnIgKyAiOyBleHBlY3RlZCBzY2hlbWEgdmVyc2lvbiAiICsgZXhwZWN0ZWRWZXIKKyAgICAgICAgICAgICAgKyAiLiBEb3duZ3JhZGUgaXMgbm90IHN1cHBvcnRlZC4iKTsKICAgICAgICAgfQogICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgZGIuY2xvc2UoKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYV81My5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hXzUzLmphdmEKaW5kZXggODIwN2MzMS4uZTRhYWUyYyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hXzUzLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hXzUzLmphdmEKQEAgLTI4LDExICsyOCwxMyBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQWNjZXNzU2VjdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cFJlZmVyZW5jZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uUnVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsLkxhYmVsSWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3QuSW5oZXJpdGFibGVCb29sZWFuOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5TeXN0ZW1Db25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudDsKQEAgLTQxLDYgKzQzLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWV0YURhdGFVcGRhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Qcm9qZWN0Q29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuU2NoZW1hXzc3LkxlZ2FjeUxhYmVsVHlwZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uamRiYy5KZGJjU2NoZW1hOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwpAQCAtNjcsNyArNzAsNyBAQAogCiAgIHByaXZhdGUgU3lzdGVtQ29uZmlnIHN5c3RlbUNvbmZpZzsKICAgcHJpdmF0ZSBNYXA8QWNjb3VudEdyb3VwLklkLCBHcm91cFJlZmVyZW5jZT4gZ3JvdXBNYXA7Ci0gIHByaXZhdGUgTWFwPEFwcHJvdmFsQ2F0ZWdvcnkuSWQsIEFwcHJvdmFsQ2F0ZWdvcnk+IGNhdGVnb3J5TWFwOworICBwcml2YXRlIExlZ2FjeUxhYmVsVHlwZXMgbGFiZWxUeXBlczsKICAgcHJpdmF0ZSBHcm91cFJlZmVyZW5jZSBwcm9qZWN0T3duZXJzOwogCiAgIHByaXZhdGUgTWFwPFByb2plY3QuTmFtZUtleSwgUHJvamVjdC5OYW1lS2V5PiBwYXJlbnRzQnlQcm9qZWN0OwpAQCAtOTIsNyArOTUsNyBAQAogICBwcm90ZWN0ZWQgdm9pZCBtaWdyYXRlRGF0YShSZXZpZXdEYiBkYiwgVXBkYXRlVUkgdWkpIHRocm93cyBPcm1FeGNlcHRpb24sCiAgICAgICBTUUxFeGNlcHRpb24gewogICAgIHN5c3RlbUNvbmZpZyA9IGRiLnN5c3RlbUNvbmZpZygpLmdldChuZXcgU3lzdGVtQ29uZmlnLktleSgpKTsKLSAgICBjYXRlZ29yeU1hcCA9IGRiLmFwcHJvdmFsQ2F0ZWdvcmllcygpLnRvTWFwKGRiLmFwcHJvdmFsQ2F0ZWdvcmllcygpLmFsbCgpKTsKKyAgICBsYWJlbFR5cGVzID0gU2NoZW1hXzc3LmdldExlZ2FjeVR5cGVzKGRiKTsKIAogICAgIGFzc2lnbkdyb3VwVVVJRHMoZGIpOwogICAgIHJlYWRPbGRSZWZSaWdodHMoZGIpOwpAQCAtMTAzLDEzICsxMDYsMTcgQEAKICAgfQogCiAgIHByaXZhdGUgdm9pZCBkZWxldGVBY3Rpb25DYXRlZ29yaWVzKFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKLSAgICBMaXN0PEFwcHJvdmFsQ2F0ZWdvcnk+IGRlbGV0ZSA9IG5ldyBBcnJheUxpc3Q8QXBwcm92YWxDYXRlZ29yeT4oKTsKLSAgICBmb3IgKEFwcHJvdmFsQ2F0ZWdvcnkgY2F0ZWdvcnkgOiBjYXRlZ29yeU1hcC52YWx1ZXMoKSkgewotICAgICAgaWYgKGNhdGVnb3J5LmdldFBvc2l0aW9uKCkgPCAwKSB7Ci0gICAgICAgIGRlbGV0ZS5hZGQoY2F0ZWdvcnkpOworICAgIHRyeSB7CisgICAgICBTdGF0ZW1lbnQgc3RtdCA9ICgoSmRiY1NjaGVtYSkgZGIpLmdldENvbm5lY3Rpb24oKS5jcmVhdGVTdGF0ZW1lbnQoKTsKKyAgICAgIHRyeSB7CisgICAgICAgIHN0bXQuZXhlY3V0ZVVwZGF0ZSgKKyAgICAgICAgICAgICJERUxFVEUgRlJPTSBhcHByb3ZhbF9jYXRlZ29yaWVzIFdIRVJFIHBvc2l0aW9uIDwgMCIpOworICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgc3RtdC5jbG9zZSgpOwogICAgICAgfQorICAgIH0gY2F0Y2ggKFNRTEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgT3JtRXhjZXB0aW9uKGUpOwogICAgIH0KLSAgICBkYi5hcHByb3ZhbENhdGVnb3JpZXMoKS5kZWxldGUoZGVsZXRlKTsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBhc3NpZ25Hcm91cFVVSURzKFJldmlld0RiIGRiKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKQEAgLTIwMCw4ICsyMDcsNyBAQAogICBwcml2YXRlIHZvaWQgbG9hZFByb2plY3QoUmVzdWx0U2V0IHJzLCBQcm9qZWN0IHByb2plY3QpIHRocm93cyBTUUxFeGNlcHRpb24sCiAgICAgICBPcm1FeGNlcHRpb24gewogICAgIHByb2plY3Quc2V0RGVzY3JpcHRpb24ocnMuZ2V0U3RyaW5nKCJkZXNjcmlwdGlvbiIpKTsKLSAgICBwcm9qZWN0LnNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cygiWSIuZXF1YWxzKHJzCi0gICAgICAgIC5nZXRTdHJpbmcoInVzZV9jb250cmlidXRvcl9hZ3JlZW1lbnRzIikpKTsKKyAgICBwcm9qZWN0LnNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyhhc0luaGVyaXRhYmxlQm9vbGVhbihycywgInVzZV9jb250cmlidXRvcl9hZ3JlZW1lbnRzIikpOwogCiAgICAgc3dpdGNoIChycy5nZXRTdHJpbmcoInN1Ym1pdF90eXBlIikuY2hhckF0KDApKSB7CiAgICAgICBjYXNlICdGJzoKQEAgLTIyMSwxMiArMjI3LDE5IEBACiAgICAgICAgICAgICArIHJzLmdldFN0cmluZygic3VibWl0X3R5cGUiKSArICIgb24gcHJvamVjdCAiICsgcHJvamVjdC5nZXROYW1lKCkpOwogICAgIH0KIAotICAgIHByb2plY3Quc2V0VXNlU2lnbmVkT2ZmQnkoIlkiLmVxdWFscyhycy5nZXRTdHJpbmcoInVzZV9zaWduZWRfb2ZmX2J5IikpKTsKLSAgICBwcm9qZWN0LnNldFJlcXVpcmVDaGFuZ2VJRCgiWSIuZXF1YWxzKHJzLmdldFN0cmluZygicmVxdWlyZV9jaGFuZ2VfaWQiKSkpOwotICAgIHByb2plY3Quc2V0VXNlQ29udGVudE1lcmdlKCJZIi5lcXVhbHMocnMuZ2V0U3RyaW5nKCJ1c2VfY29udGVudF9tZXJnZSIpKSk7CisgICAgcHJvamVjdC5zZXRVc2VTaWduZWRPZmZCeShhc0luaGVyaXRhYmxlQm9vbGVhbihycywgInVzZV9zaWduZWRfb2ZmX2J5IikpOworICAgIHByb2plY3Quc2V0UmVxdWlyZUNoYW5nZUlEKGFzSW5oZXJpdGFibGVCb29sZWFuKHJzLCAicmVxdWlyZV9jaGFuZ2VfaWQiKSk7CisgICAgcHJvamVjdC5zZXRVc2VDb250ZW50TWVyZ2UoYXNJbmhlcml0YWJsZUJvb2xlYW4ocnMsICJ1c2VfY29udGVudF9tZXJnZSIpKTsKICAgICBwcm9qZWN0LnNldFBhcmVudE5hbWUocnMuZ2V0U3RyaW5nKCJwYXJlbnRfbmFtZSIpKTsKICAgfQogCisgIHByaXZhdGUgc3RhdGljIEluaGVyaXRhYmxlQm9vbGVhbiBhc0luaGVyaXRhYmxlQm9vbGVhbihSZXN1bHRTZXQgcnMsIFN0cmluZyBjb2wpCisgICAgICB0aHJvd3MgU1FMRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gIlkiLmVxdWFscyhycy5nZXRTdHJpbmcoY29sKSkKKyAgICAgICAgPyBQcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbi5UUlVFCisgICAgICAgIDogUHJvamVjdC5Jbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKyAgfQorCiAgIHByaXZhdGUgdm9pZCByZWFkT2xkUmVmUmlnaHRzKFJldmlld0RiIGRiKSB0aHJvd3MgU1FMRXhjZXB0aW9uIHsKICAgICByaWdodHNCeVByb2plY3QgPSBuZXcgSGFzaE1hcDxQcm9qZWN0Lk5hbWVLZXksIExpc3Q8T2xkUmVmUmlnaHQ+PigpOwogCkBAIC0zNTgsOCArMzcxLDcgQEAKIAogICAgICAgICBpZiAoMyA8PSBvbGQubWF4X3ZhbHVlKSB7CiAgICAgICAgICAgYWRkKHNlY3Rpb24sIEZPUkdFX1NFUlZFUiwgb2xkLmV4Y2x1c2l2ZSwgcnVsZShncm91cCkpOwotICAgICAgICB9IGVsc2UgaWYgKDMgPD0gaW5oZXJpdGVkTWF4KGNvbmZpZywgb2xkKSkgewotICAgICAgICAgIGFkZChzZWN0aW9uLCBGT1JHRV9TRVJWRVIsIG9sZC5leGNsdXNpdmUsIGRlbnkoZ3JvdXApKTsKKyAgICAgICAgfSBlbHNlIGlmICgzIDw9IGluaGVyaXRlZE1heChjb25maWcsIG9sZCkpIHsgYWRkKHNlY3Rpb24sIEZPUkdFX1NFUlZFUiwgb2xkLmV4Y2x1c2l2ZSwgZGVueShncm91cCkpOwogICAgICAgICB9CiAKICAgICAgIH0gZWxzZSB7CkBAIC0zNjgsNyArMzgwLDkgQEAKICAgICAgICAgaWYgKG9sZC5taW5fdmFsdWUgPT0gMCAmJiBvbGQubWF4X3ZhbHVlID09IDApIHsKICAgICAgICAgICBydWxlLnNldERlbnkoKTsKICAgICAgICAgfQotICAgICAgICBhZGQoc2VjdGlvbiwgTEFCRUwgKyB2YXJOYW1lT2Yob2xkLmNhdGVnb3J5KSwgb2xkLmV4Y2x1c2l2ZSwgcnVsZSk7CisgICAgICAgIExhYmVsVHlwZSB0eXBlID0gbGFiZWxUeXBlcy5ieUxhYmVsKG5ldyBMYWJlbElkKG9sZC5jYXRlZ29yeSkpOworICAgICAgICBTdHJpbmcgbmFtZSA9IHR5cGUgIT0gbnVsbCA/IHR5cGUuZ2V0TmFtZSgpIDogb2xkLmNhdGVnb3J5OworICAgICAgICBhZGQoc2VjdGlvbiwgTEFCRUwgKyBuYW1lLCBvbGQuZXhjbHVzaXZlLCBydWxlKTsKICAgICAgIH0KICAgICB9CiAgIH0KQEAgLTQzNiwxNCArNDUwLDYgQEAKICAgICByZXR1cm4gbWF4OwogICB9CiAKLSAgcHJpdmF0ZSBTdHJpbmcgdmFyTmFtZU9mKFN0cmluZyBpZCkgewotICAgIEFwcHJvdmFsQ2F0ZWdvcnkgY2F0ZWdvcnkgPSBjYXRlZ29yeU1hcC5nZXQobmV3IEFwcHJvdmFsQ2F0ZWdvcnkuSWQoaWQpKTsKLSAgICBpZiAoY2F0ZWdvcnkgPT0gbnVsbCkgewotICAgICAgY2F0ZWdvcnkgPSBuZXcgQXBwcm92YWxDYXRlZ29yeShuZXcgQXBwcm92YWxDYXRlZ29yeS5JZChpZCksIGlkKTsKLSAgICB9Ci0gICAgcmV0dXJuIGNhdGVnb3J5LmdldExhYmVsTmFtZSgpOwotICB9Ci0KICAgcHJpdmF0ZSBzdGF0aWMgdm9pZCBhZGQoQWNjZXNzU2VjdGlvbiBzZWN0aW9uLCBTdHJpbmcgbmFtZSwKICAgICAgIGJvb2xlYW4gZXhjbHVzaXZlLCBQZXJtaXNzaW9uUnVsZSBydWxlKSB7CiAgICAgUGVybWlzc2lvbiBwID0gc2VjdGlvbi5nZXRQZXJtaXNzaW9uKG5hbWUsIHRydWUpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hXzU3LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNTcuamF2YQppbmRleCAzYTI4OGUyLi5iZjQ4OGUzIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNTcuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNTcuamF2YQpAQCAtMzAsNiArMzAsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTG9jYWxEaXNrUmVwb3NpdG9yeU1hbmFnZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5NZXRhRGF0YVVwZGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlByb2plY3RDb25maWc7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uamRiYy5KZGJjU2NoZW1hOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwpAQCAtNDEsNiArNDIsOCBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudXRpbC5GUzsKIAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5zcWwuUHJlcGFyZWRTdGF0ZW1lbnQ7CitpbXBvcnQgamF2YS5zcWwuU1FMRXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIAogcHVibGljIGNsYXNzIFNjaGVtYV81NyBleHRlbmRzIFNjaGVtYVZlcnNpb24gewpAQCAtOTUsNiArOTgsMTEgQEAKIAogICAgICAgICAvLyBNb3ZlIHRoZSByZXBvc2l0b3J5LiouY3JlYXRlR3JvdXAgdG8gQ3JlYXRlIFByb2plY3QuCiAgICAgICAgIFN0cmluZ1tdIGNyZWF0ZUdyb3VwTGlzdCA9IGNmZy5nZXRTdHJpbmdMaXN0KCJyZXBvc2l0b3J5IiwgIioiLCAiY3JlYXRlR3JvdXAiKTsKKworICAgICAgICAvLyBQcmVwYXJlIHRoZSBhY2NvdW50X2dyb3VwX2luY2x1ZGVzIHF1ZXJ5CisgICAgICAgIFByZXBhcmVkU3RhdGVtZW50IHN0bXQgPSAoKEpkYmNTY2hlbWEpIGRiKS5nZXRDb25uZWN0aW9uKCkuCisgICAgICAgICAgICBwcmVwYXJlU3RhdGVtZW50KCJTRUxFQ1QgKiBGUk9NIGFjY291bnRfZ3JvdXBfaW5jbHVkZXMgV0hFUkUgZ3JvdXBfaWQgPSA/Iik7CisKICAgICAgICAgZm9yIChTdHJpbmcgbmFtZSA6IGNyZWF0ZUdyb3VwTGlzdCkgewogICAgICAgICAgIEFjY291bnRHcm91cC5OYW1lS2V5IGtleSA9IG5ldyBBY2NvdW50R3JvdXAuTmFtZUtleShuYW1lKTsKICAgICAgICAgICBBY2NvdW50R3JvdXBOYW1lIGdyb3VwTmFtZSA9IGRiLmFjY291bnRHcm91cE5hbWVzKCkuZ2V0KGtleSk7CkBAIC0xMTcsOSArMTI1LDEwIEBACiAgICAgICAgIH0KIAogICAgICAgICBBY2NvdW50R3JvdXAgYmF0Y2ggPSBkYi5hY2NvdW50R3JvdXBzKCkuZ2V0KHNjLmJhdGNoVXNlcnNHcm91cElkKTsKKyAgICAgICAgc3RtdC5zZXRJbnQoMSwgc2MuYmF0Y2hVc2Vyc0dyb3VwSWQuZ2V0KCkpOwogICAgICAgICBpZiAoYmF0Y2ggIT0gbnVsbAogICAgICAgICAgICAgJiYgZGIuYWNjb3VudEdyb3VwTWVtYmVycygpLmJ5R3JvdXAoc2MuYmF0Y2hVc2Vyc0dyb3VwSWQpLnRvTGlzdCgpLmlzRW1wdHkoKQotICAgICAgICAgICAgJiYgIGRiLmFjY291bnRHcm91cEluY2x1ZGVzKCkuYnlHcm91cChzYy5iYXRjaFVzZXJzR3JvdXBJZCkudG9MaXN0KCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAmJiAgc3RtdC5leGVjdXRlUXVlcnkoKS5maXJzdCgpICE9IGZhbHNlKSB7CiAgICAgICAgICAgLy8gSWYgdGhlIGJhdGNoIHVzZXIgZ3JvdXAgaXMgbm90IHVzZWQsIGRlbGV0ZSBpdC4KICAgICAgICAgICAvLwogICAgICAgICAgIGRiLmFjY291bnRHcm91cHMoKS5kZWxldGUoQ29sbGVjdGlvbnMuc2luZ2xldG9uKGJhdGNoKSk7CkBAIC0xMzYsNiArMTQ1LDggQEAKIAogICAgICAgICBtZC5zZXRNZXNzYWdlKCJVcGdyYWRlIHRvIEdlcnJpdCBDb2RlIFJldmlldyBzY2hlbWEgNTdcbiIpOwogICAgICAgICBjb25maWcuY29tbWl0KG1kKTsKKyAgICAgIH0gY2F0Y2ggKFNRTEV4Y2VwdGlvbiBlcnIpIHsKKyAgICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbiggIkNhbm5vdCByZWFkIGFjY291bnRfZ3JvdXBfaW5jbHVkZXMiLCBlcnIpOwogICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgZ2l0LmNsb3NlKCk7CiAgICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNzQuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYV83NC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNhMDEyZDEKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNzQuamF2YQpAQCAtMCwwICsxLDExNCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmpkYmMuSmRiY1NjaGVtYTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IGphdmEuc3FsLkNvbm5lY3Rpb247CitpbXBvcnQgamF2YS5zcWwuUHJlcGFyZWRTdGF0ZW1lbnQ7CitpbXBvcnQgamF2YS5zcWwuUmVzdWx0U2V0OworaW1wb3J0IGphdmEuc3FsLlNRTEV4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLnNxbC5TdGF0ZW1lbnQ7CitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKKworLyogSGFuZGxlcyBjb3B5aW5nIGFsbCBlbnRyaWVzIGZyb20gQWNjb3VudEdyb3VwSW5jbHVkZXMoQXVkaXQpIHRvIHRoZSBuZXcgdGFibGVzICovCitwdWJsaWMgY2xhc3MgU2NoZW1hXzc0IGV4dGVuZHMgU2NoZW1hVmVyc2lvbiB7CisgIEBJbmplY3QKKyAgU2NoZW1hXzc0KFByb3ZpZGVyPFNjaGVtYV83Mz4gcHJpb3IpIHsKKyAgICBzdXBlcihwcmlvcik7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgbWlncmF0ZURhdGEoZmluYWwgUmV2aWV3RGIgZGIsIGZpbmFsIFVwZGF0ZVVJIHVpKQorICAgICAgdGhyb3dzIFNRTEV4Y2VwdGlvbiwgT3JtRXhjZXB0aW9uIHsKKyAgICAvLyBHcmFiIGFsbCB0aGUgZ3JvdXBzIHNpbmNlIHdlIGRvbid0IGhhdmUgdGhlIGNhY2hlIGF2YWlsYWJsZQorICAgIEhhc2hNYXA8QWNjb3VudEdyb3VwLklkLCBBY2NvdW50R3JvdXAuVVVJRD4gYWxsR3JvdXBzID0KKyAgICAgICAgbmV3IEhhc2hNYXA8QWNjb3VudEdyb3VwLklkLCBBY2NvdW50R3JvdXAuVVVJRD4oKTsKKyAgICBmb3IoIEFjY291bnRHcm91cCBhZyA6IGRiLmFjY291bnRHcm91cHMoKS5hbGwoKSApIHsKKyAgICAgIGFsbEdyb3Vwcy5wdXQoYWcuZ2V0SWQoKSwgYWcuZ2V0R3JvdXBVVUlEKCkpOworICAgIH0KKworICAgIC8vIEluaXRpYWxpemUgc29tZSB2YXJpYWJsZXMKKyAgICBDb25uZWN0aW9uIGNvbm4gPSAoKEpkYmNTY2hlbWEpIGRiKS5nZXRDb25uZWN0aW9uKCk7CisgICAgQXJyYXlMaXN0PEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWQ+IG5ld0luY2x1ZGVzID0KKyAgICAgICAgbmV3IEFycmF5TGlzdDxBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkPigpOworICAgIEFycmF5TGlzdDxBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkQXVkaXQ+IG5ld0luY2x1ZGVBdWRpdHMgPQorICAgICAgICBuZXcgQXJyYXlMaXN0PEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdD4oKTsKKworICAgIC8vIEl0ZXJhdGUgb3ZlciBhbGwgZW50cmllcyBpbiBhY2NvdW50X2dyb3VwX2luY2x1ZGVzCisgICAgU3RhdGVtZW50IG9sZEdyb3VwSW5jbHVkZXNTdG10ID0gY29ubi5jcmVhdGVTdGF0ZW1lbnQoKTsKKyAgICBSZXN1bHRTZXQgb2xkR3JvdXBJbmNsdWRlcyA9IG9sZEdyb3VwSW5jbHVkZXNTdG10LgorICAgICAgICBleGVjdXRlUXVlcnkoIlNFTEVDVCAqIEZST00gYWNjb3VudF9ncm91cF9pbmNsdWRlcyIpOworICAgIHdoaWxlIChvbGRHcm91cEluY2x1ZGVzLm5leHQoKSkgeworICAgICAgQWNjb3VudEdyb3VwLklkIG9sZEdyb3VwSWQgPQorICAgICAgICAgIG5ldyBBY2NvdW50R3JvdXAuSWQob2xkR3JvdXBJbmNsdWRlcy5nZXRJbnQoImdyb3VwX2lkIikpOworICAgICAgQWNjb3VudEdyb3VwLklkIG9sZEluY2x1ZGVJZCA9CisgICAgICAgICAgbmV3IEFjY291bnRHcm91cC5JZChvbGRHcm91cEluY2x1ZGVzLmdldEludCgiaW5jbHVkZV9pZCIpKTsKKyAgICAgIEFjY291bnRHcm91cC5VVUlEIHV1aWRGcm9tSW5jbHVkZUlkID0gYWxsR3JvdXBzLmdldChvbGRJbmNsdWRlSWQpOworCisgICAgICAvLyBJZiB3ZSd2ZSBnb3QgYW4gaW5jbHVkZSwgYnV0IHRoZSBncm91cCBubyBsb25nZXIgZXhpc3RzLCBkb24ndCBib3RoZXIgY29udmVydGluZworICAgICAgaWYgKHV1aWRGcm9tSW5jbHVkZUlkID09IG51bGwpIHsKKyAgICAgICAgdWkubWVzc2FnZSgiU2tpcHBpbmcgZ3JvdXBfaWQgPSBcIiIgKyBvbGRJbmNsdWRlSWQuZ2V0KCkgKworICAgICAgICAgICAgIlwiLCBub3QgYSBjdXJyZW50IGdyb3VwIik7CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorCisgICAgICAvLyBDcmVhdGUgdGhlIG5ldyBpbmNsdWRlIGVudHJ5CisgICAgICBBY2NvdW50R3JvdXBJbmNsdWRlQnlVdWlkIGRlc3RJbmNsdWRlRW50cnkgPSBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZCgKKyAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZC5LZXkob2xkR3JvdXBJZCwgdXVpZEZyb21JbmNsdWRlSWQpKTsKKworICAgICAgLy8gSXRlcmF0ZSBvdmVyIGFsbCB0aGUgYXVkaXRzIChmb3IgdGhpcyBncm91cCkKKyAgICAgIFByZXBhcmVkU3RhdGVtZW50IG9sZEF1ZGl0c1F1ZXJ5ID0gY29ubi5wcmVwYXJlU3RhdGVtZW50KAorICAgICAgICAgICJTRUxFQ1QgKiBGUk9NIGFjY291bnRfZ3JvdXBfaW5jbHVkZXNfYXVkaXQgV0hFUkUgZ3JvdXBfaWQ9PyBBTkQgaW5jbHVkZV9pZD0/Iik7CisgICAgICBvbGRBdWRpdHNRdWVyeS5zZXRJbnQoMSwgb2xkR3JvdXBJZC5nZXQoKSk7CisgICAgICBvbGRBdWRpdHNRdWVyeS5zZXRJbnQoMiwgb2xkSW5jbHVkZUlkLmdldCgpKTsKKyAgICAgIFJlc3VsdFNldCBvbGRHcm91cEluY2x1ZGVBdWRpdHMgPSBvbGRBdWRpdHNRdWVyeS5leGVjdXRlUXVlcnkoKTsKKyAgICAgIHdoaWxlIChvbGRHcm91cEluY2x1ZGVBdWRpdHMubmV4dCgpKSB7CisgICAgICAgIEFjY291bnQuSWQgYWRkZWRCeSA9IG5ldyBBY2NvdW50LklkKG9sZEdyb3VwSW5jbHVkZUF1ZGl0cy5nZXRJbnQoImFkZGVkX2J5IikpOworICAgICAgICBpbnQgcmVtb3ZlZEJ5ID0gb2xkR3JvdXBJbmNsdWRlQXVkaXRzLmdldEludCgicmVtb3ZlZF9ieSIpOworCisgICAgICAgIC8vIENyZWF0ZSB0aGUgbmV3IGF1ZGl0IGVudHJ5CisgICAgICAgIEFjY291bnRHcm91cEluY2x1ZGVCeVV1aWRBdWRpdCBkZXN0QXVkaXRFbnRyeSA9CisgICAgICAgICAgICBuZXcgQWNjb3VudEdyb3VwSW5jbHVkZUJ5VXVpZEF1ZGl0KGRlc3RJbmNsdWRlRW50cnksIGFkZGVkQnksCisgICAgICAgICAgICAgICAgb2xkR3JvdXBJbmNsdWRlQXVkaXRzLmdldFRpbWVzdGFtcCgiYWRkZWRfb24iKSk7CisKKyAgICAgICAgLy8gSWYgdGhpcyB3YXMgYSAicmVtb3ZlZCBvbiIgZW50cnksIG5vdGUgdGhhdAorICAgICAgICBpZiAocmVtb3ZlZEJ5ID4gMCkgeworICAgICAgICAgIGRlc3RBdWRpdEVudHJ5LnJlbW92ZWQobmV3IEFjY291bnQuSWQocmVtb3ZlZEJ5KSwKKyAgICAgICAgICAgICAgb2xkR3JvdXBJbmNsdWRlQXVkaXRzLmdldFRpbWVzdGFtcCgicmVtb3ZlZF9vbiIpKTsKKyAgICAgICAgfQorICAgICAgICBuZXdJbmNsdWRlQXVkaXRzLmFkZChkZXN0QXVkaXRFbnRyeSk7CisgICAgICB9CisgICAgICBuZXdJbmNsdWRlcy5hZGQoZGVzdEluY2x1ZGVFbnRyeSk7CisgICAgICBvbGRBdWRpdHNRdWVyeS5jbG9zZSgpOworICAgICAgb2xkR3JvdXBJbmNsdWRlQXVkaXRzLmNsb3NlKCk7CisgICAgfQorICAgIG9sZEdyb3VwSW5jbHVkZXMuY2xvc2UoKTsKKyAgICBvbGRHcm91cEluY2x1ZGVzU3RtdC5jbG9zZSgpOworCisgICAgLy8gTm93IGluc2VydCBhbGwgb2YgdGhlIG5ldyBlbnRyaWVzIHRvIHRoZSBkYXRhYmFzZQorICAgIGRiLmFjY291bnRHcm91cEluY2x1ZGVzQnlVdWlkKCkuaW5zZXJ0KG5ld0luY2x1ZGVzKTsKKyAgICBkYi5hY2NvdW50R3JvdXBJbmNsdWRlc0J5VXVpZEF1ZGl0KCkuaW5zZXJ0KG5ld0luY2x1ZGVBdWRpdHMpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNzUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYV83NS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE4NDdmMjUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNzUuamF2YQpAQCAtMCwwICsxLDI1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYTsKKworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworcHVibGljIGNsYXNzIFNjaGVtYV83NSBleHRlbmRzIFNjaGVtYVZlcnNpb24geworICBASW5qZWN0CisgIFNjaGVtYV83NShQcm92aWRlcjxTY2hlbWFfNzQ+IHByaW9yKSB7CisgICAgc3VwZXIocHJpb3IpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNzYuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYV83Ni5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjhiMGI1NTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNzYuamF2YQpAQCAtMCwwICsxLDI1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYTsKKworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworcHVibGljIGNsYXNzIFNjaGVtYV83NiBleHRlbmRzIFNjaGVtYVZlcnNpb24geworICBASW5qZWN0CisgIFNjaGVtYV83NihQcm92aWRlcjxTY2hlbWFfNzU+IHByaW9yKSB7CisgICAgc3VwZXIocHJpb3IpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNzcuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYV83Ny5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmI4NmU1YTcKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFfNzcuamF2YQpAQCAtMCwwICsxLDI2NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CisKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5jb21tb24uYmFzZS5QcmVjb25kaXRpb25zLmNoZWNrQXJndW1lbnQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFZhbHVlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsLkxhYmVsSWQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFsbFByb2plY3RzTmFtZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZXh0ZW5zaW9ucy5ldmVudHMuR2l0UmVmZXJlbmNlVXBkYXRlZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWV0YURhdGFVcGRhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Qcm9qZWN0Q29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmpkYmMuSmRiY1NjaGVtYTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zY2hlbWEuc3FsLkRpYWxlY3RIMjsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zY2hlbWEuc3FsLkRpYWxlY3RNeVNRTDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zY2hlbWEuc3FsLkRpYWxlY3RQb3N0Z3JlU1FMOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNjaGVtYS5zcWwuU3FsRGlhbGVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLkNvbmZpZ0ludmFsaWRFeGNlcHRpb247CitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlBlcnNvbklkZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlcG9zaXRvcnk7CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEuc3FsLlByZXBhcmVkU3RhdGVtZW50OworaW1wb3J0IGphdmEuc3FsLlJlc3VsdFNldDsKK2ltcG9ydCBqYXZhLnNxbC5TUUxFeGNlcHRpb247CitpbXBvcnQgamF2YS5zcWwuU3RhdGVtZW50OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK3B1YmxpYyBjbGFzcyBTY2hlbWFfNzcgZXh0ZW5kcyBTY2hlbWFWZXJzaW9uIHsKKyAgcHJpdmF0ZSBmaW5hbCBHaXRSZXBvc2l0b3J5TWFuYWdlciBtZ3I7CisgIHByaXZhdGUgZmluYWwgQWxsUHJvamVjdHNOYW1lIGFsbFByb2plY3RzOworICBwcml2YXRlIGZpbmFsIFBlcnNvbklkZW50IHNlcnZlclVzZXI7CisKKyAgQEluamVjdAorICBTY2hlbWFfNzcoUHJvdmlkZXI8U2NoZW1hXzc2PiBwcmlvciwgQWxsUHJvamVjdHNOYW1lIGFsbFByb2plY3RzLAorICAgICAgR2l0UmVwb3NpdG9yeU1hbmFnZXIgbWdyLCBAR2Vycml0UGVyc29uSWRlbnQgUGVyc29uSWRlbnQgc2VydmVyVXNlcikgeworICAgIHN1cGVyKHByaW9yKTsKKyAgICB0aGlzLmFsbFByb2plY3RzID0gYWxsUHJvamVjdHM7CisgICAgdGhpcy5tZ3IgPSBtZ3I7CisgICAgdGhpcy5zZXJ2ZXJVc2VyID0gc2VydmVyVXNlcjsKKyAgfQorCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBtaWdyYXRlRGF0YShSZXZpZXdEYiBkYiwgVXBkYXRlVUkgdWkpIHRocm93cyBPcm1FeGNlcHRpb24geworICAgIHRyeSB7CisgICAgICBMZWdhY3lMYWJlbFR5cGVzIGxhYmVsVHlwZXMgPSBnZXRMZWdhY3lUeXBlcyhkYik7CisgICAgICBTcWxEaWFsZWN0IGRpYWxlY3QgPSAoKEpkYmNTY2hlbWEpIGRiKS5nZXREaWFsZWN0KCk7CisgICAgICBpZiAoZGlhbGVjdCBpbnN0YW5jZW9mIERpYWxlY3RIMikgeworICAgICAgICBhbHRlclRhYmxlKGRiLCAiQUxURVIgVEFCTEUgJXMgQUxURVIgQ09MVU1OICVzIHZhcmNoYXIoMjU1KSIpOworICAgICAgfSBlbHNlIGlmIChkaWFsZWN0IGluc3RhbmNlb2YgRGlhbGVjdFBvc3RncmVTUUwpIHsKKyAgICAgICAgYWx0ZXJUYWJsZShkYiwgIkFMVEVSIFRBQkxFICVzIEFMVEVSICVzIFRZUEUgdmFyY2hhcigyNTUpIik7CisgICAgICB9IGVsc2UgaWYgKGRpYWxlY3QgaW5zdGFuY2VvZiBEaWFsZWN0TXlTUUwpIHsKKyAgICAgICAgYWx0ZXJUYWJsZShkYiwgIkFMVEVSIFRBQkxFICVzIE1PRElGWSAlcyB2YXJjaGFyKDI1NSkgQklOQVJZIik7CisgICAgICB9IGVsc2UgeworICAgICAgICBhbHRlclRhYmxlKGRiLCAiQUxURVIgVEFCTEUgJXMgTU9ESUZZICVzIHZhcmNoYXIoMjU1KSIpOworICAgICAgfQorICAgICAgbWlncmF0ZVBhdGNoU2V0QXBwcm92YWxzKGRiLCBsYWJlbFR5cGVzKTsKKyAgICAgIG1pZ3JhdGVMYWJlbHNUb0FsbFByb2plY3RzKGRiLCBsYWJlbFR5cGVzKTsKKyAgICB9IGNhdGNoIChSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbihlKTsKKyAgICB9IGNhdGNoIChTUUxFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbihlKTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgT3JtRXhjZXB0aW9uKGUpOworICAgIH0gY2F0Y2ggKENvbmZpZ0ludmFsaWRFeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbihlKTsKKyAgICB9CisgICAgdWkubWVzc2FnZSgKKyAgICAgICAgIk1pZ3JhdGVkIGxhYmVsIHR5cGVzIGZyb20gZGF0YWJhc2UgdG8gQWxsLVByb2plY3RzIHByb2plY3QuY29uZmlnIik7CisgIH0KKworICBwcml2YXRlIHZvaWQgYWx0ZXJUYWJsZShSZXZpZXdEYiBkYiwgU3RyaW5nIHNxbEZvcm1hdCkgdGhyb3dzIFNRTEV4Y2VwdGlvbiB7CisgICAgU3RhdGVtZW50IHN0bXQgPSAoKEpkYmNTY2hlbWEpIGRiKS5nZXRDb25uZWN0aW9uKCkuY3JlYXRlU3RhdGVtZW50KCk7CisgICAgdHJ5IHsKKyAgICAgIHN0bXQuZXhlY3V0ZVVwZGF0ZSgKKyAgICAgICAgICBTdHJpbmcuZm9ybWF0KHNxbEZvcm1hdCwgInBhdGNoX3NldF9hcHByb3ZhbHMiLCAiY2F0ZWdvcnlfaWQiKSk7CisgICAgfSBmaW5hbGx5IHsKKyAgICAgIHN0bXQuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgbWlncmF0ZUxhYmVsc1RvQWxsUHJvamVjdHMoUmV2aWV3RGIgZGIsCisgICAgICBMZWdhY3lMYWJlbFR5cGVzIGxhYmVsVHlwZXMpIHRocm93cyBTUUxFeGNlcHRpb24sCisgICAgICBSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24sIElPRXhjZXB0aW9uLCBDb25maWdJbnZhbGlkRXhjZXB0aW9uIHsKKyAgICBSZXBvc2l0b3J5IGdpdCA9IG1nci5vcGVuUmVwb3NpdG9yeShhbGxQcm9qZWN0cyk7CisKKyAgICB0cnkgeworICAgICAgTWV0YURhdGFVcGRhdGUgbWQgPQorICAgICAgICAgIG5ldyBNZXRhRGF0YVVwZGF0ZShHaXRSZWZlcmVuY2VVcGRhdGVkLkRJU0FCTEVELCBhbGxQcm9qZWN0cywgZ2l0KTsKKyAgICAgIG1kLmdldENvbW1pdEJ1aWxkZXIoKS5zZXRBdXRob3Ioc2VydmVyVXNlcik7CisgICAgICBtZC5nZXRDb21taXRCdWlsZGVyKCkuc2V0Q29tbWl0dGVyKHNlcnZlclVzZXIpOworCisgICAgICBQcm9qZWN0Q29uZmlnIGNvbmZpZyA9IFByb2plY3RDb25maWcucmVhZChtZCk7CisgICAgICBNYXA8U3RyaW5nLCBMYWJlbFR5cGU+IGNvbmZpZ1R5cGVzID0gY29uZmlnLmdldExhYmVsU2VjdGlvbnMoKTsKKyAgICAgIExpc3Q8TGFiZWxUeXBlPiBuZXdUeXBlcyA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgICAgZm9yIChMZWdhY3lMYWJlbFR5cGUgdHlwZSA6IGxhYmVsVHlwZXMuZ2V0TGVnYWN5TGFiZWxUeXBlcygpKSB7CisgICAgICAgIGlmICghY29uZmlnVHlwZXMuY29udGFpbnNLZXkodHlwZS5nZXROYW1lKCkpKSB7CisgICAgICAgICAgbmV3VHlwZXMuYWRkKHR5cGUpOworICAgICAgICB9CisgICAgICB9CisgICAgICBuZXdUeXBlcy5hZGRBbGwoY29uZmlnVHlwZXMudmFsdWVzKCkpOworICAgICAgY29uZmlnVHlwZXMuY2xlYXIoKTsKKyAgICAgIGZvciAoTGFiZWxUeXBlIHR5cGUgOiBuZXdUeXBlcykgeworICAgICAgICBjb25maWdUeXBlcy5wdXQodHlwZS5nZXROYW1lKCksIHR5cGUpOworICAgICAgfQorICAgICAgbWQuc2V0TWVzc2FnZSgiVXBncmFkZSB0byBHZXJyaXQgQ29kZSBSZXZpZXcgc2NoZW1hIDc3XG4iKTsKKyAgICAgIGNvbmZpZy5jb21taXQobWQpOworICAgIH0gZmluYWxseSB7CisgICAgICBnaXQuY2xvc2UoKTsKKyAgICB9CisgIH0KKworICBwcml2YXRlIHZvaWQgbWlncmF0ZVBhdGNoU2V0QXBwcm92YWxzKFJldmlld0RiIGRiLAorICAgICAgTGVnYWN5TGFiZWxUeXBlcyBsYWJlbFR5cGVzKSB0aHJvd3MgU1FMRXhjZXB0aW9uIHsKKyAgICBQcmVwYXJlZFN0YXRlbWVudCBzdG10ID0gKChKZGJjU2NoZW1hKSBkYikuZ2V0Q29ubmVjdGlvbigpLnByZXBhcmVTdGF0ZW1lbnQoCisgICAgICAgICJVUERBVEUgcGF0Y2hfc2V0X2FwcHJvdmFscyBTRVQgY2F0ZWdvcnlfaWQgPSA/IFdIRVJFIGNhdGVnb3J5X2lkID0gPyIpOworICAgIHRyeSB7CisgICAgICBmb3IgKExlZ2FjeUxhYmVsVHlwZSB0eXBlIDogbGFiZWxUeXBlcy5nZXRMZWdhY3lMYWJlbFR5cGVzKCkpIHsKKyAgICAgICAgc3RtdC5zZXRTdHJpbmcoMSwgdHlwZS5nZXROYW1lKCkpOworICAgICAgICBzdG10LnNldFN0cmluZygyLCB0eXBlLmdldElkKCkpOworICAgICAgICBzdG10LmFkZEJhdGNoKCk7CisgICAgICB9CisgICAgICBzdG10LmV4ZWN1dGVCYXRjaCgpOworICAgIH0gZmluYWxseSB7CisgICAgICBzdG10LmNsb3NlKCk7CisgICAgfQorICB9CisKKyAgc3RhdGljIGNsYXNzIExlZ2FjeUxhYmVsVHlwZSBleHRlbmRzIExhYmVsVHlwZSB7CisgICAgcHJpdmF0ZSBTdHJpbmcgaWQ7CisKKyAgICBwcml2YXRlIExlZ2FjeUxhYmVsVHlwZShTdHJpbmcgbmFtZSwgTGlzdDxMYWJlbFZhbHVlPiB2YWx1ZXMpIHsKKyAgICAgIHN1cGVyKG5hbWUsIHZhbHVlcyk7CisgICAgfQorCisgICAgU3RyaW5nIGdldElkKCkgeworICAgICAgcmV0dXJuIGlkOworICAgIH0KKworICAgIHByaXZhdGUgdm9pZCBzZXRJZChTdHJpbmcgaWQpIHsKKyAgICAgIGNoZWNrQXJndW1lbnQoaWQubGVuZ3RoKCkgPD0gNCwgIkludmFsaWQgbGVnYWN5IGxhYmVsIElEOiBcIiVzXCIiLCBpZCk7CisgICAgICB0aGlzLmlkID0gaWQ7CisgICAgfQorICB9CisKKyAgc3RhdGljIGNsYXNzIExlZ2FjeUxhYmVsVHlwZXMgZXh0ZW5kcyBMYWJlbFR5cGVzIHsKKyAgICBwcml2YXRlIGZpbmFsIExpc3Q8TGVnYWN5TGFiZWxUeXBlPiBsZWdhY3lUeXBlczsKKworICAgIHByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgTGVnYWN5TGFiZWxUeXBlPiBieUlkOworCisgICAgcHJpdmF0ZSBMZWdhY3lMYWJlbFR5cGVzKExpc3Q8TGVnYWN5TGFiZWxUeXBlPiB0eXBlcykgeworICAgICAgc3VwZXIodHlwZXMpOworICAgICAgbGVnYWN5VHlwZXMgPSB0eXBlczsKKyAgICAgIGJ5SWQgPSBNYXBzLm5ld0hhc2hNYXAoKTsKKyAgICAgIGZvciAoTGVnYWN5TGFiZWxUeXBlIHR5cGUgOiB0eXBlcykgeworICAgICAgICBieUlkLnB1dCh0eXBlLmdldElkKCksIHR5cGUpOworICAgICAgfQorICAgIH0KKworICAgIExpc3Q8TGVnYWN5TGFiZWxUeXBlPiBnZXRMZWdhY3lMYWJlbFR5cGVzKCkgeworICAgICAgcmV0dXJuIGxlZ2FjeVR5cGVzOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBMZWdhY3lMYWJlbFR5cGUgYnlMYWJlbChMYWJlbElkIGxhYmVsSWQpIHsKKyAgICAgIExlZ2FjeUxhYmVsVHlwZSB0ID0gYnlJZC5nZXQobGFiZWxJZC5nZXQoKSk7CisgICAgICByZXR1cm4gdCAhPSBudWxsID8gdCA6IChMZWdhY3lMYWJlbFR5cGUpIHN1cGVyLmJ5TGFiZWwobGFiZWxJZCk7CisgICAgfQorCisgICAgTGVnYWN5TGFiZWxUeXBlIGJ5SWQoTGFiZWxJZCBpZCkgeworICAgICAgcmV0dXJuIGJ5SWQuZ2V0KGlkLmdldCgpKTsKKyAgICB9CisgIH0KKworICBzdGF0aWMgTGVnYWN5TGFiZWxUeXBlcyBnZXRMZWdhY3lUeXBlcyhSZXZpZXdEYiBkYikgdGhyb3dzIFNRTEV4Y2VwdGlvbiB7CisgICAgTGlzdDxMZWdhY3lMYWJlbFR5cGU+IHR5cGVzID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aENhcGFjaXR5KDIpOworICAgIFN0YXRlbWVudCBjYXRTdG10ID0gbnVsbDsKKyAgICBQcmVwYXJlZFN0YXRlbWVudCB2YWxTdG10ID0gbnVsbDsKKyAgICBSZXN1bHRTZXQgY2F0UnMgPSBudWxsOworICAgIHRyeSB7CisgICAgICBjYXRTdG10ID0gKChKZGJjU2NoZW1hKSBkYikuZ2V0Q29ubmVjdGlvbigpLmNyZWF0ZVN0YXRlbWVudCgpOworICAgICAgY2F0UnMgPSBjYXRTdG10LmV4ZWN1dGVRdWVyeSgKKyAgICAgICAgICAiU0VMRUNUIGNhdGVnb3J5X2lkLCBuYW1lLCBhYmJyZXZpYXRlZF9uYW1lLCBmdW5jdGlvbl9uYW1lLCAiCisgICAgICAgICAgKyAiIGNvcHlfbWluX3Njb3JlIgorICAgICAgICAgICsgIiBGUk9NIGFwcHJvdmFsX2NhdGVnb3JpZXMiCisgICAgICAgICAgKyAiIE9SREVSIEJZIHBvc2l0aW9uLCBuYW1lIik7CisgICAgICB2YWxTdG10ID0gKChKZGJjU2NoZW1hKSBkYikuZ2V0Q29ubmVjdGlvbigpLnByZXBhcmVTdGF0ZW1lbnQoCisgICAgICAgICAgIlNFTEVDVCB2YWx1ZSwgbmFtZSIKKyAgICAgICAgICArICIgRlJPTSBhcHByb3ZhbF9jYXRlZ29yeV92YWx1ZXMiCisgICAgICAgICAgKyAiIFdIRVJFIGNhdGVnb3J5X2lkID0gPyIpOworICAgICAgd2hpbGUgKGNhdFJzLm5leHQoKSkgeworICAgICAgICBTdHJpbmcgaWQgPSBjYXRScy5nZXRTdHJpbmcoImNhdGVnb3J5X2lkIik7CisgICAgICAgIHZhbFN0bXQuc2V0U3RyaW5nKDEsIGlkKTsKKyAgICAgICAgTGlzdDxMYWJlbFZhbHVlPiB2YWx1ZXMgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkoNSk7CisgICAgICAgIFJlc3VsdFNldCB2YWxScyA9IHZhbFN0bXQuZXhlY3V0ZVF1ZXJ5KCk7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgd2hpbGUgKHZhbFJzLm5leHQoKSkgeworICAgICAgICAgICAgdmFsdWVzLmFkZChuZXcgTGFiZWxWYWx1ZSgKKyAgICAgICAgICAgICAgICB2YWxScy5nZXRTaG9ydCgidmFsdWUiKSwgdmFsUnMuZ2V0U3RyaW5nKCJuYW1lIikpKTsKKyAgICAgICAgICB9CisgICAgICAgIH0gZmluYWxseSB7CisgICAgICAgICAgdmFsUnMuY2xvc2UoKTsKKyAgICAgICAgfQorICAgICAgICBMZWdhY3lMYWJlbFR5cGUgdHlwZSA9CisgICAgICAgICAgICBuZXcgTGVnYWN5TGFiZWxUeXBlKGdldExhYmVsTmFtZShjYXRScy5nZXRTdHJpbmcoIm5hbWUiKSksIHZhbHVlcyk7CisgICAgICAgIHR5cGUuc2V0SWQoaWQpOworICAgICAgICB0eXBlLnNldEFiYnJldmlhdGVkTmFtZShjYXRScy5nZXRTdHJpbmcoImFiYnJldmlhdGVkX25hbWUiKSk7CisgICAgICAgIHR5cGUuc2V0RnVuY3Rpb25OYW1lKGNhdFJzLmdldFN0cmluZygiZnVuY3Rpb25fbmFtZSIpKTsKKyAgICAgICAgdHlwZS5zZXRDb3B5TWluU2NvcmUoIlkiLmVxdWFscyhjYXRScy5nZXRTdHJpbmcoImNvcHlfbWluX3Njb3JlIikpKTsKKyAgICAgICAgdHlwZXMuYWRkKHR5cGUpOworICAgICAgfQorICAgIH0gZmluYWxseSB7CisgICAgICBpZiAodmFsU3RtdCAhPSBudWxsKSB7CisgICAgICAgIHZhbFN0bXQuY2xvc2UoKTsKKyAgICAgIH0KKyAgICAgIGlmIChjYXRScyAhPSBudWxsKSB7CisgICAgICAgIGNhdFJzLmNsb3NlKCk7CisgICAgICB9CisgICAgICBpZiAoY2F0U3RtdCAhPSBudWxsKSB7CisgICAgICAgIGNhdFN0bXQuY2xvc2UoKTsKKyAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIG5ldyBMZWdhY3lMYWJlbFR5cGVzKHR5cGVzKTsKKyAgfQorCisgIHByaXZhdGUgc3RhdGljIFN0cmluZyBnZXRMYWJlbE5hbWUoU3RyaW5nIG5hbWUpIHsKKyAgICBTdHJpbmdCdWlsZGVyIHIgPSBuZXcgU3RyaW5nQnVpbGRlcigpOworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbmFtZS5sZW5ndGgoKTsgaSsrKSB7CisgICAgICBjaGFyIGMgPSBuYW1lLmNoYXJBdChpKTsKKyAgICAgIGlmICgoJzAnIDw9IGMgJiYgYyA8PSAnOScpIC8vCisgICAgICAgICAgfHwgKCdhJyA8PSBjICYmIGMgPD0gJ3onKSAvLworICAgICAgICAgIHx8ICgnQScgPD0gYyAmJiBjIDw9ICdaJykgLy8KKyAgICAgICAgICB8fCAoYyA9PSAnLScpKSB7CisgICAgICAgIHIuYXBwZW5kKGMpOworICAgICAgfSBlbHNlIGlmIChjID09ICcgJykgeworICAgICAgICByLmFwcGVuZCgnLScpOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gci50b1N0cmluZygpOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY3JpcHRSdW5uZXIuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjcmlwdFJ1bm5lci5qYXZhCmluZGV4IDhjZjJmMjYuLmI1YWVhZDggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjcmlwdFJ1bm5lci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjcmlwdFJ1bm5lci5qYXZhCkBAIC0xOSw3ICsxOSw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIAogaW1wb3J0IGphdmEuaW8uQnVmZmVyZWRSZWFkZXI7Ci1pbXBvcnQgamF2YS5pby5GaWxlTm90Rm91bmRFeGNlcHRpb247CiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOwogaW1wb3J0IGphdmEuaW8uSW5wdXRTdHJlYW1SZWFkZXI7CkBAIC0zNCwxMCArMzMsMTUgQEAKICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbmFtZTsKICAgcHJpdmF0ZSBmaW5hbCBMaXN0PFN0cmluZz4gY29tbWFuZHM7CiAKLSAgU2NyaXB0UnVubmVyKGZpbmFsIFN0cmluZyBuYW1lKSB7CisgIHN0YXRpYyBmaW5hbCBTY3JpcHRSdW5uZXIgTk9PUCA9IG5ldyBTY3JpcHRSdW5uZXIobnVsbCwgbnVsbCkgeworICAgIHZvaWQgcnVuKGZpbmFsIFJldmlld0RiIGRiKSB7CisgICAgfTsKKyAgfTsKKworICBTY3JpcHRSdW5uZXIoZmluYWwgU3RyaW5nIHNjcmlwdE5hbWUsIGZpbmFsIElucHV0U3RyZWFtIHNjcmlwdCkgeworICAgIHRoaXMubmFtZSA9IHNjcmlwdE5hbWU7CiAgICAgdHJ5IHsKLSAgICAgIHRoaXMubmFtZSA9IG5hbWU7Ci0gICAgICB0aGlzLmNvbW1hbmRzID0gcGFyc2UobmFtZSk7CisgICAgICB0aGlzLmNvbW1hbmRzID0gc2NyaXB0ICE9IG51bGwgPyBwYXJzZShzY3JpcHQpIDogbnVsbDsKICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CiAgICAgICB0aHJvdyBuZXcgSWxsZWdhbFN0YXRlRXhjZXB0aW9uKCJDYW5ub3QgcGFyc2UgIiArIG5hbWUsIGUpOwogICAgIH0KQEAgLTYzLDEyICs2Nyw3IEBACiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSBMaXN0PFN0cmluZz4gcGFyc2UoZmluYWwgU3RyaW5nIG5hbWUpIHRocm93cyBJT0V4Y2VwdGlvbiB7Ci0gICAgSW5wdXRTdHJlYW0gaW4gPSBSZXZpZXdEYi5jbGFzcy5nZXRSZXNvdXJjZUFzU3RyZWFtKG5hbWUpOwotICAgIGlmIChpbiA9PSBudWxsKSB7Ci0gICAgICB0aHJvdyBuZXcgRmlsZU5vdEZvdW5kRXhjZXB0aW9uKCJTUUwgc2NyaXB0ICIgKyBuYW1lICsgIiBub3QgZm91bmQiKTsKLSAgICB9Ci0KKyAgcHJpdmF0ZSBMaXN0PFN0cmluZz4gcGFyc2UoZmluYWwgSW5wdXRTdHJlYW0gaW4pIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAgICAgQnVmZmVyZWRSZWFkZXIgYnIgPSBuZXcgQnVmZmVyZWRSZWFkZXIobmV3IElucHV0U3RyZWFtUmVhZGVyKGluLCAiVVRGLTgiKSk7CiAgICAgdHJ5IHsKICAgICAgIFN0cmluZyBkZWxpbWl0ZXIgPSAiOyI7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NzaC9Ob1NzaEluZm8uamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc3NoL05vU3NoSW5mby5qYXZhCmluZGV4IDUxOWI5MjIuLjZjZWVjMmQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc3NoL05vU3NoSW5mby5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc3NoL05vU3NoSW5mby5qYXZhCkBAIC0xOSw3ICsxOSw3IEBACiBpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogCi1jbGFzcyBOb1NzaEluZm8gaW1wbGVtZW50cyBTc2hJbmZvIHsKK3B1YmxpYyBjbGFzcyBOb1NzaEluZm8gaW1wbGVtZW50cyBTc2hJbmZvIHsKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyBMaXN0PEhvc3RLZXk+IGdldEhvc3RLZXlzKCkgewogICAgIHJldHVybiBDb2xsZWN0aW9ucy5lbXB0eUxpc3QoKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc3NoL05vU3NoS2V5Q2FjaGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc3NoL05vU3NoS2V5Q2FjaGUuamF2YQppbmRleCA2YTA3Y2E3Li4wOTU3NTk0IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NzaC9Ob1NzaEtleUNhY2hlLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zc2gvTm9Tc2hLZXlDYWNoZS5qYXZhCkBAIC0xNiw4ICsxNiwyMSBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5JbnZhbGlkU3NoS2V5RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50U3NoS2V5OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkFic3RyYWN0TW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lk1vZHVsZTsKIAotY2xhc3MgTm9Tc2hLZXlDYWNoZSBpbXBsZW1lbnRzIFNzaEtleUNhY2hlIHsKKworcHVibGljIGNsYXNzIE5vU3NoS2V5Q2FjaGUgaW1wbGVtZW50cyBTc2hLZXlDYWNoZSB7CisKKyAgcHVibGljIHN0YXRpYyBNb2R1bGUgbW9kdWxlKCkgeworICAgIHJldHVybiBuZXcgQWJzdHJhY3RNb2R1bGUoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICAgICAgYmluZChTc2hLZXlDYWNoZS5jbGFzcykudG8oTm9Tc2hLZXlDYWNoZS5jbGFzcyk7CisgICAgICB9CisgICAgfTsKKyAgfQorCiAgIEBPdmVycmlkZQogICBwdWJsaWMgdm9pZCBldmljdChTdHJpbmcgdXNlcm5hbWUpIHsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zc2gvTm9Tc2hNb2R1bGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc3NoL05vU3NoTW9kdWxlLmphdmEKaW5kZXggMjFiMWE1NC4uODc4MWQ0NiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zc2gvTm9Tc2hNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NzaC9Ob1NzaE1vZHVsZS5qYXZhCkBAIC0yMyw2ICsyMyw1IEBACiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CiAgICAgYmluZChTc2hJbmZvLmNsYXNzKS50byhOb1NzaEluZm8uY2xhc3MpOwotICAgIGJpbmQoU3NoS2V5Q2FjaGUuY2xhc3MpLnRvKE5vU3NoS2V5Q2FjaGUuY2xhc3MpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NzaC9Tc2hBZGRyZXNzZXNNb2R1bGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc3NoL1NzaEFkZHJlc3Nlc01vZHVsZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRjMTI4M2EKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NzaC9Tc2hBZGRyZXNzZXNNb2R1bGUuamF2YQpAQCAtMCwwICsxLDEwNiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2g7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLlNvY2tldFV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXM7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuQ29uZmlnOworaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CitpbXBvcnQgb3JnLnNsZjRqLkxvZ2dlckZhY3Rvcnk7CisKK2ltcG9ydCBqYXZhLm5ldC5JbmV0U29ja2V0QWRkcmVzczsKK2ltcG9ydCBqYXZhLm5ldC5Tb2NrZXRBZGRyZXNzOworaW1wb3J0IGphdmEudXRpbC5BcnJheXM7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKK3B1YmxpYyBjbGFzcyBTc2hBZGRyZXNzZXNNb2R1bGUgZXh0ZW5kcyBBYnN0cmFjdE1vZHVsZSB7CisgIHByaXZhdGUgc3RhdGljIGZpbmFsIExvZ2dlciBsb2cgPQorICAgICAgTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoU3NoQWRkcmVzc2VzTW9kdWxlLmNsYXNzKTsKKworICBwdWJsaWMgc3RhdGljIGZpbmFsIGludCBERUZBVUxUX1BPUlQgPSAyOTQxODsKKyAgcHVibGljIHN0YXRpYyBmaW5hbCBpbnQgSUFOQV9TU0hfUE9SVCA9IDIyOworCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7CisgIH0KKworICBAUHJvdmlkZXMKKyAgQFNpbmdsZXRvbgorICBAU3NoTGlzdGVuQWRkcmVzc2VzCisgIExpc3Q8U29ja2V0QWRkcmVzcz4gZ2V0TGlzdGVuQWRkcmVzc2VzKEBHZXJyaXRTZXJ2ZXJDb25maWcgQ29uZmlnIGNmZykgeworICAgIExpc3Q8U29ja2V0QWRkcmVzcz4gbGlzdGVuID0gTGlzdHMubmV3QXJyYXlMaXN0V2l0aEV4cGVjdGVkU2l6ZSgyKTsKKyAgICBTdHJpbmdbXSB3YW50ID0gY2ZnLmdldFN0cmluZ0xpc3QoInNzaGQiLCBudWxsLCAibGlzdGVuYWRkcmVzcyIpOworICAgIGlmICh3YW50ID09IG51bGwgfHwgd2FudC5sZW5ndGggPT0gMCkgeworICAgICAgbGlzdGVuLmFkZChuZXcgSW5ldFNvY2tldEFkZHJlc3MoREVGQVVMVF9QT1JUKSk7CisgICAgICByZXR1cm4gbGlzdGVuOworICAgIH0KKworICAgIGlmICh3YW50Lmxlbmd0aCA9PSAxICYmIGlzT2ZmKHdhbnRbMF0pKSB7CisgICAgICByZXR1cm4gbGlzdGVuOworICAgIH0KKworICAgIGZvciAoZmluYWwgU3RyaW5nIGRlc2MgOiB3YW50KSB7CisgICAgICB0cnkgeworICAgICAgICBsaXN0ZW4uYWRkKFNvY2tldFV0aWwucmVzb2x2ZShkZXNjLCBERUZBVUxUX1BPUlQpKTsKKyAgICAgIH0gY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBlKSB7CisgICAgICAgIGxvZy5lcnJvcigiQmFkIHNzaGQubGlzdGVuYWRkcmVzczogIiArIGRlc2MgKyAiOiAiICsgZS5nZXRNZXNzYWdlKCkpOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbGlzdGVuOworICB9CisKKyAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc09mZihTdHJpbmcgbGlzdGVuSG9zdG5hbWUpIHsKKyAgICByZXR1cm4gIm9mZiIuZXF1YWxzSWdub3JlQ2FzZShsaXN0ZW5Ib3N0bmFtZSkKKyAgICAgICAgfHwgIm5vbmUiLmVxdWFsc0lnbm9yZUNhc2UobGlzdGVuSG9zdG5hbWUpCisgICAgICAgIHx8ICJubyIuZXF1YWxzSWdub3JlQ2FzZShsaXN0ZW5Ib3N0bmFtZSk7CisgIH0KKworICBAUHJvdmlkZXMKKyAgQFNpbmdsZXRvbgorICBAU3NoQWR2ZXJ0aXNlZEFkZHJlc3NlcworICBMaXN0PFN0cmluZz4gZ2V0QWR2ZXJ0aXNlZEFkZHJlc3NlcyhAR2Vycml0U2VydmVyQ29uZmlnIENvbmZpZyBjZmcsCisgICAgICBAU3NoTGlzdGVuQWRkcmVzc2VzIExpc3Q8U29ja2V0QWRkcmVzcz4gbGlzdGVuKSB7CisgICAgU3RyaW5nW10gd2FudCA9IGNmZy5nZXRTdHJpbmdMaXN0KCJzc2hkIiwgbnVsbCwgImFkdmVydGlzZWRhZGRyZXNzIik7CisgICAgaWYgKHdhbnQubGVuZ3RoID4gMCkgeworICAgICAgcmV0dXJuIEFycmF5cy5hc0xpc3Qod2FudCk7CisgICAgfQorICAgIExpc3Q8SW5ldFNvY2tldEFkZHJlc3M+IHB1YiA9IExpc3RzLm5ld0FycmF5TGlzdCgpOworICAgIExpc3Q8SW5ldFNvY2tldEFkZHJlc3M+IGxvY2FsID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CisKKyAgICBmb3IgKFNvY2tldEFkZHJlc3MgYWRkciA6IGxpc3RlbikgeworICAgICAgaWYgKGFkZHIgaW5zdGFuY2VvZiBJbmV0U29ja2V0QWRkcmVzcykgeworICAgICAgICBJbmV0U29ja2V0QWRkcmVzcyBpbmV0QWRkciA9IChJbmV0U29ja2V0QWRkcmVzcykgYWRkcjsKKyAgICAgICAgaWYgKGluZXRBZGRyLmdldEFkZHJlc3MoKS5pc0xvb3BiYWNrQWRkcmVzcygpKSB7CisgICAgICAgICAgbG9jYWwuYWRkKGluZXRBZGRyKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICBwdWIuYWRkKGluZXRBZGRyKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgICBpZiAocHViLmlzRW1wdHkoKSkgeworICAgICAgcHViID0gbG9jYWw7CisgICAgfQorICAgIExpc3Q8U3RyaW5nPiBhZHYgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkocHViLnNpemUoKSk7CisgICAgZm9yIChJbmV0U29ja2V0QWRkcmVzcyBhZGRyIDogcHViKSB7CisgICAgICBhZHYuYWRkKFNvY2tldFV0aWwuZm9ybWF0KGFkZHIsIElBTkFfU1NIX1BPUlQpKTsKKyAgICB9CisgICAgcmV0dXJuIGFkdjsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zc2gvU3NoQWR2ZXJ0aXNlZEFkZHJlc3Nlcy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zc2gvU3NoQWR2ZXJ0aXNlZEFkZHJlc3Nlcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjIyMTkyOTgKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NzaC9Tc2hBZHZlcnRpc2VkQWRkcmVzc2VzLmphdmEKQEAgLTAsMCArMSwzMCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2g7CisKK2ltcG9ydCBzdGF0aWMgamF2YS5sYW5nLmFubm90YXRpb24uUmV0ZW50aW9uUG9saWN5LlJVTlRJTUU7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5CaW5kaW5nQW5ub3RhdGlvbjsKKworaW1wb3J0IGphdmEubGFuZy5hbm5vdGF0aW9uLlJldGVudGlvbjsKKworLyoqCisgKiBNYXJrZXIgb24gdGhlIGxpc3Qgb2Yge0BsaW5rIFNvY2tldEFkZHJlc3N9ZXMgY29uZmlndXJlZCB0byBiZSBhZHZlcnRpc2VkIGJ5CisgKiB0aGUgc2VydmVyLgorICovCitAUmV0ZW50aW9uKFJVTlRJTUUpCitAQmluZGluZ0Fubm90YXRpb24KK3B1YmxpYyBAaW50ZXJmYWNlIFNzaEFkdmVydGlzZWRBZGRyZXNzZXMgeworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zc2gvU3NoTGlzdGVuQWRkcmVzc2VzLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NzaC9Tc2hMaXN0ZW5BZGRyZXNzZXMuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iZTQwNTY3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zc2gvU3NoTGlzdGVuQWRkcmVzc2VzLmphdmEKQEAgLTAsMCArMSwzMCBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2g7CisKK2ltcG9ydCBzdGF0aWMgamF2YS5sYW5nLmFubm90YXRpb24uUmV0ZW50aW9uUG9saWN5LlJVTlRJTUU7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5CaW5kaW5nQW5ub3RhdGlvbjsKKworaW1wb3J0IGphdmEubGFuZy5hbm5vdGF0aW9uLlJldGVudGlvbjsKKworLyoqCisgKiBNYXJrZXIgb24gdGhlIGxpc3Qgb2Yge0BsaW5rIFNvY2tldEFkZHJlc3N9ZXMgb24gd2hpY2ggdGhlIFNTSCBkYWVtb24gaXMKKyAqIGNvbmZpZ3VyZWQgdG8gbGlzdGVuLgorICovCitAUmV0ZW50aW9uKFJVTlRJTUUpCitAQmluZGluZ0Fubm90YXRpb24KK3B1YmxpYyBAaW50ZXJmYWNlIFNzaExpc3RlbkFkZHJlc3NlcyB7Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvRmFsbGJhY2tSZXF1ZXN0Q29udGV4dC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL0ZhbGxiYWNrUmVxdWVzdENvbnRleHQuamF2YQppbmRleCA2ODZhMTA4Li41NTE0ZWY1IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvRmFsbGJhY2tSZXF1ZXN0Q29udGV4dC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9GYWxsYmFja1JlcXVlc3RDb250ZXh0LmphdmEKQEAgLTE0LDkgKzE0LDEyIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWw7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFub255bW91c1VzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aXNpb25FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2luZ2xldG9uOwogCiAvKioKQEAgLTM3LDQgKzQwLDE1IEBACiAgIHB1YmxpYyBDdXJyZW50VXNlciBnZXRDdXJyZW50VXNlcigpIHsKICAgICByZXR1cm4gdXNlcjsKICAgfQorCisgIEBPdmVycmlkZQorICBwdWJsaWMgUHJvdmlkZXI8UmV2aWV3RGI+IGdldFJldmlld0RiUHJvdmlkZXIoKSB7CisgICAgcmV0dXJuIG5ldyBQcm92aWRlcjxSZXZpZXdEYj4oKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyBSZXZpZXdEYiBnZXQoKSB7CisgICAgICAgIHRocm93IG5ldyBQcm92aXNpb25FeGNlcHRpb24oCisgICAgICAgICAgICAiQXV0b21hdGljIFJldmlld0RiIG9ubHkgYXZhaWxhYmxlIGluIHJlcXVlc3Qgc2NvcGUiKTsKKyAgICAgIH0KKyAgICB9OworICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvR3VpY2VSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvR3VpY2VSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLmphdmEKaW5kZXggZmEwNzE3Ni4uNGI1ZDczNiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL0d1aWNlUmVxdWVzdFNjb3BlUHJvcGFnYXRvci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9HdWljZVJlcXVlc3RTY29wZVByb3BhZ2F0b3IuamF2YQpAQCAtMTcsNiArMTcsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuUmVtb3RlUGVlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkNhbm9uaWNhbFdlYlVybDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5LZXk7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CkBAIC00Miw4ICs0Myw5IEBACiAgIEd1aWNlUmVxdWVzdFNjb3BlUHJvcGFnYXRvcigKICAgICAgIEBDYW5vbmljYWxXZWJVcmwgQE51bGxhYmxlIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXIsCiAgICAgICBAUmVtb3RlUGVlciBQcm92aWRlcjxTb2NrZXRBZGRyZXNzPiByZW1vdGVQZWVyUHJvdmlkZXIsCi0gICAgICBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsKSB7Ci0gICAgc3VwZXIoU2VydmxldFNjb3Blcy5SRVFVRVNULCBsb2NhbCk7CisgICAgICBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsLAorICAgICAgUHJvdmlkZXI8UmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXI+IGRiUHJvdmlkZXJQcm92aWRlcikgeworICAgIHN1cGVyKFNlcnZsZXRTY29wZXMuUkVRVUVTVCwgbG9jYWwsIGRiUHJvdmlkZXJQcm92aWRlcik7CiAgICAgdGhpcy51cmwgPSB1cmxQcm92aWRlciAhPSBudWxsID8gdXJsUHJvdmlkZXIuZ2V0KCkgOiBudWxsOwogICAgIHRoaXMucGVlciA9IHJlbW90ZVBlZXJQcm92aWRlci5nZXQoKTsKICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL0lkR2VuZXJhdG9yLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvSWRHZW5lcmF0b3IuamF2YQppbmRleCBiMjBiYmY2Li43OGViNjU3IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvSWRHZW5lcmF0b3IuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvSWRHZW5lcmF0b3IuamF2YQpAQCAtNDgsOCArNDgsMTIgQEAKIAogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgc2FsdCA9IDB4OWUzNzc5Yjk7CiAKKyAgc3RhdGljIGludCBtaXgoaW50IGluKSB7CisgICAgcmV0dXJuIG1peChzYWx0LCBpbik7CisgIH0KKwogICAvKiogQSB2ZXJ5IHNpbXBsZSBiaXQgcGVybXV0YXRpb24gdG8gbWFzayBhIHNpbXBsZSBpbmNyZW1lbnRlci4gKi8KLSAgc3RhdGljIGludCBtaXgoZmluYWwgaW50IGluKSB7CisgIHB1YmxpYyBzdGF0aWMgaW50IG1peChmaW5hbCBpbnQgc2FsdCwgZmluYWwgaW50IGluKSB7CiAgICAgc2hvcnQgdjAgPSBoaTE2KGluKTsKICAgICBzaG9ydCB2MSA9IGxvMTYoaW4pOwogICAgIHYwICs9ICgodjEgPDwgMikgKyAwIF4gdjEpICsgKHNhbHQgXiAodjEgPj4+IDMpKSArIDE7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvTWFnaWNCcmFuY2guamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9NYWdpY0JyYW5jaC5qYXZhCmluZGV4IDUxMGRlYWEwMi4uNjA4NDRlZSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL01hZ2ljQnJhbmNoLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL01hZ2ljQnJhbmNoLmphdmEKQEAgLTQ2LDEyICs0NiwyMyBAQAogCiAgIC8qKiBDaGVja3MgaWYgdGhlIHN1cHBsaWVkIHJlZiBuYW1lIGlzIGEgbWFnaWMgYnJhbmNoICovCiAgIHB1YmxpYyBzdGF0aWMgYm9vbGVhbiBpc01hZ2ljQnJhbmNoKFN0cmluZyByZWZOYW1lKSB7Ci0gICAgaWYgKHJlZk5hbWUuc3RhcnRzV2l0aChORVdfRFJBRlRfQ0hBTkdFKSB8fAotICAgICAgICByZWZOYW1lLnN0YXJ0c1dpdGgoTkVXX1BVQkxJU0hfQ0hBTkdFKSB8fAotICAgICAgICByZWZOYW1lLnN0YXJ0c1dpdGgoTkVXX0NIQU5HRSkpIHsKLSAgICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiByZWZOYW1lLnN0YXJ0c1dpdGgoTkVXX0RSQUZUX0NIQU5HRSkKKyAgICAgICAgfHwgcmVmTmFtZS5zdGFydHNXaXRoKE5FV19QVUJMSVNIX0NIQU5HRSkKKyAgICAgICAgfHwgcmVmTmFtZS5zdGFydHNXaXRoKE5FV19DSEFOR0UpOworICB9CisKKyAgLyoqIFJldHVybnMgdGhlIHJlZiBuYW1lIHByZWZpeCBmb3IgYSBtYWdpYyBicmFuY2gsIDxjb2RlPm51bGw8L2NvZGU+IGlmIHRoZSBicmFuY2ggaXMgbm90IG1hZ2ljICovCisgIHB1YmxpYyBzdGF0aWMgU3RyaW5nIGdldE1hZ2ljUmVmTmFtZVByZWZpeChTdHJpbmcgcmVmTmFtZSkgeworICAgIGlmIChyZWZOYW1lLnN0YXJ0c1dpdGgoTkVXX0RSQUZUX0NIQU5HRSkpIHsKKyAgICAgIHJldHVybiBORVdfRFJBRlRfQ0hBTkdFOwogICAgIH0KLSAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKHJlZk5hbWUuc3RhcnRzV2l0aChORVdfUFVCTElTSF9DSEFOR0UpKSB7CisgICAgICByZXR1cm4gTkVXX1BVQkxJU0hfQ0hBTkdFOworICAgIH0KKyAgICBpZiAocmVmTmFtZS5zdGFydHNXaXRoKE5FV19DSEFOR0UpKSB7CisgICAgICByZXR1cm4gTkVXX0NIQU5HRTsKKyAgICB9CisgICAgcmV0dXJuIG51bGw7CiAgIH0KIAogICAvKioKQEAgLTgwLDExICs5MSw2IEBACiAgICAgcmV0dXJuIENhcGFibGUuT0s7CiAgIH0KIAotICAvKiogQ2hlY2tzIGlmIHJlZiBuYW1lIG1hdGNoZXMgdGhlIGRyYWZ0IG1hZ2ljIGJyYW5jaCAqLwotICBwdWJsaWMgc3RhdGljIGJvb2xlYW4gaXNEcmFmdChTdHJpbmcgcmVmTmFtZSkgewotICAgIHJldHVybiByZWZOYW1lLnN0YXJ0c1dpdGgoTWFnaWNCcmFuY2guTkVXX0RSQUZUX0NIQU5HRSk7Ci0gIH0KLQogICBwcml2YXRlIHN0YXRpYyBDYXBhYmxlIGNoZWNrTWFnaWNCcmFuY2hSZWYoU3RyaW5nIGJyYW5jaE5hbWUsIFJlcG9zaXRvcnkgcmVwbywKICAgICAgIFByb2plY3QgcHJvamVjdCkgewogICAgIE1hcDxTdHJpbmcsIFJlZj4gYmxvY2tpbmdGb3JzOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1BsdWdpblJlcXVlc3RDb250ZXh0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvUGx1Z2luUmVxdWVzdENvbnRleHQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hODM2ZmQ3Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1BsdWdpblJlcXVlc3RDb250ZXh0LmphdmEKQEAgLTAsMCArMSw0NiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEzIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuUGx1Z2luVXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aXNpb25FeGNlcHRpb247CisKKy8qKiBSZXF1ZXN0Q29udGV4dCBhY3RpdmUgd2hpbGUgcGx1Z2lucyBsb2FkIG9yIHVubG9hZC4gKi8KK3B1YmxpYyBjbGFzcyBQbHVnaW5SZXF1ZXN0Q29udGV4dCBpbXBsZW1lbnRzIFJlcXVlc3RDb250ZXh0IHsKKyAgcHJpdmF0ZSBmaW5hbCBQbHVnaW5Vc2VyIHVzZXI7CisKKyAgcHVibGljIFBsdWdpblJlcXVlc3RDb250ZXh0KFBsdWdpblVzZXIgdXNlcikgeworICAgIHRoaXMudXNlciA9IHVzZXI7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIEN1cnJlbnRVc2VyIGdldEN1cnJlbnRVc2VyKCkgeworICAgIHJldHVybiB1c2VyOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBQcm92aWRlcjxSZXZpZXdEYj4gZ2V0UmV2aWV3RGJQcm92aWRlcigpIHsKKyAgICByZXR1cm4gbmV3IFByb3ZpZGVyPFJldmlld0RiPigpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIFJldmlld0RiIGdldCgpIHsKKyAgICAgICAgdGhyb3cgbmV3IFByb3Zpc2lvbkV4Y2VwdGlvbigKKyAgICAgICAgICAgICJBdXRvbWF0aWMgUmV2aWV3RGIgb25seSBhdmFpbGFibGUgaW4gcmVxdWVzdCBzY29wZSIpOworICAgICAgfQorICAgIH07CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9SZXF1ZXN0Q29udGV4dC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1JlcXVlc3RDb250ZXh0LmphdmEKaW5kZXggY2E4NTczZi4uODZjNzRlMCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1JlcXVlc3RDb250ZXh0LmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1JlcXVlc3RDb250ZXh0LmphdmEKQEAgLTE0LDEzICsxNCwxNSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIAogLyoqCiAgKiBUaGUgUmVxdWVzdENvbnRleHQgaXMgYW4gaW50ZXJmYWNlIGV4cG9zaW5nIHRoZSBmaWVsZHMgdGhhdCBhcmUgbmVlZGVkCiAgKiBieSB0aGUgR2Vycml0R2xvYmFsTW9kdWxlIHNjb3BlLgogICovCiBwdWJsaWMgaW50ZXJmYWNlIFJlcXVlc3RDb250ZXh0IHsKLQogICBDdXJyZW50VXNlciBnZXRDdXJyZW50VXNlcigpOworICBQcm92aWRlcjxSZXZpZXdEYj4gZ2V0UmV2aWV3RGJQcm92aWRlcigpOwogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1JlcXVlc3RTY29wZVByb3BhZ2F0b3IuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9SZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLmphdmEKaW5kZXggODRjNjFlOS4uZjYzZGE1NDM5IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvUmVxdWVzdFNjb3BlUHJvcGFnYXRvci5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9SZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLmphdmEKQEAgLTE0LDggKzE0LDE0IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWw7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5OYW1lS2V5OworaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlByZWNvbmRpdGlvbnMuY2hlY2tOb3ROdWxsOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5UaHJvd2FibGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLlJlcXVlc3RDbGVhbnVwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuUmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Qcm9qZWN0UnVubmFibGU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuS2V5OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwpAQCAtNDMsMTkgKzQ5LDI2IEBACiAKICAgcHJpdmF0ZSBmaW5hbCBTY29wZSBzY29wZTsKICAgcHJpdmF0ZSBmaW5hbCBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsOworICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPFJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyPiBkYlByb3ZpZGVyUHJvdmlkZXI7CiAKICAgcHJvdGVjdGVkIFJlcXVlc3RTY29wZVByb3BhZ2F0b3IoU2NvcGUgc2NvcGUsCi0gICAgICBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsKSB7CisgICAgICBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsLAorICAgICAgUHJvdmlkZXI8UmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXI+IGRiUHJvdmlkZXJQcm92aWRlcikgewogICAgIHRoaXMuc2NvcGUgPSBzY29wZTsKICAgICB0aGlzLmxvY2FsID0gbG9jYWw7CisgICAgdGhpcy5kYlByb3ZpZGVyUHJvdmlkZXIgPSBkYlByb3ZpZGVyUHJvdmlkZXI7CiAgIH0KIAogICAvKioKLSAgICogV3JhcHMgY2FsbGFibGUgaW4gYSBuZXcge0BsaW5rIENhbGxhYmxlfSB0aGF0IHByb3BhZ2F0ZXMgdGhlIGN1cnJlbnQKLSAgICogcmVxdWVzdCBzdGF0ZSB3aGVuIHRoZSBjYWxsYWJsZSBpcyBpbnZva2VkLiBUaGUgbWV0aG9kIG11c3QgYmUgY2FsbGVkIGluIGEKLSAgICogcmVxdWVzdCBzY29wZSBhbmQgdGhlIHJldHVybmVkIENhbGxhYmxlIG1heSBvbmx5IGJlIGludm9rZWQgaW4gYSB0aHJlYWQKLSAgICogdGhhdCBpcyBub3QgYWxyZWFkeSBpbiBhIHJlcXVlc3Qgc2NvcGUuIFRoZSByZXR1cm5lZCBDYWxsYWJsZSB3aWxsIGluaGVyaXQKLSAgICogdG9TdHJpbmcoKSBmcm9tIHRoZSBwYXNzZWQgaW4gQ2FsbGFibGUuIEEKKyAgICogRW5zdXJlcyB0aGF0IHRoZSBjdXJyZW50IHJlcXVlc3Qgc3RhdGUgaXMgYXZhaWxhYmxlIHdoZW4gdGhlIHBhc3NlZCBpbgorICAgKiBDYWxsYWJsZSBpcyBpbnZva2VkLgorICAgKgorICAgKiBJZiBuZWVkZWQgd3JhcHMgdGhlIHBhc3NlZCBpbiBDYWxsYWJsZSBpbiBhIG5ldyB7QGxpbmsgQ2FsbGFibGV9IHRoYXQKKyAgICogcHJvcGFnYXRlcyB0aGUgY3VycmVudCByZXF1ZXN0IHN0YXRlIHdoZW4gdGhlIHJldHVybmVkIENhbGxhYmxlIGlzIGludm9rZWQuCisgICAqIFRoZSBtZXRob2QgbXVzdCBiZSBjYWxsZWQgaW4gYSByZXF1ZXN0IHNjb3BlIGFuZCB0aGUgcmV0dXJuZWQgQ2FsbGFibGUgbWF5CisgICAqIG9ubHkgYmUgaW52b2tlZCBpbiBhIHRocmVhZCB0aGF0IGlzIG5vdCBhbHJlYWR5IGluIGEgcmVxdWVzdCBzY29wZSBvciBpcyBpbgorICAgKiB0aGUgc2FtZSByZXF1ZXN0IHNjb3BlLiBUaGUgcmV0dXJuZWQgQ2FsbGFibGUgd2lsbCBpbmhlcml0IHRvU3RyaW5nKCkgZnJvbQorICAgKiB0aGUgcGFzc2VkIGluIENhbGxhYmxlLiBBCiAgICAqIHtAbGluayBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LldvcmtRdWV1ZS5FeGVjdXRvcn0gZG9lcyBub3QgYWNjZXB0IGEKICAgICogQ2FsbGFibGUsIHNvIHRoZXJlIGlzIG5vIFByb2plY3RDYWxsYWJsZSBpbXBsZW1lbnRhdGlvbi4gSW1wbGVtZW50YXRpb25zIG9mCiAgICAqIHRoaXMgbWV0aG9kIG11c3QgYmUgY29uc2lzdGVudCB3aXRoIEd1aWNlJ3MKQEAgLTczLDEyICs4NiwxNyBAQAogICAgKiBAcmV0dXJuIGEgbmV3IENhbGxhYmxlIHdoaWNoIHdpbGwgZXhlY3V0ZSBpbiB0aGUgY3VycmVudCByZXF1ZXN0IHNjb3BlLgogICAgKi8KICAgcHVibGljIGZpbmFsIDxUPiBDYWxsYWJsZTxUPiB3cmFwKGZpbmFsIENhbGxhYmxlPFQ+IGNhbGxhYmxlKSB7CisgICAgZmluYWwgUmVxdWVzdENvbnRleHQgY2FsbGVyQ29udGV4dCA9IGNoZWNrTm90TnVsbChsb2NhbC5nZXRDb250ZXh0KCkpOwogICAgIGZpbmFsIENhbGxhYmxlPFQ+IHdyYXBwZWQgPQotICAgICAgICB3cmFwSW1wbChjb250ZXh0KGxvY2FsLmdldENvbnRleHQoKSwgY2xlYW51cChjYWxsYWJsZSkpKTsKKyAgICAgICAgd3JhcEltcGwoY29udGV4dChjYWxsZXJDb250ZXh0LCBjbGVhbnVwKGNhbGxhYmxlKSkpOwogICAgIHJldHVybiBuZXcgQ2FsbGFibGU8VD4oKSB7CiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHB1YmxpYyBUIGNhbGwoKSB0aHJvd3MgRXhjZXB0aW9uIHsKLSAgICAgICAgcmV0dXJuIHdyYXBwZWQuY2FsbCgpOworICAgICAgICBpZiAoY2FsbGVyQ29udGV4dCA9PSBsb2NhbC5nZXRDb250ZXh0KCkpIHsKKyAgICAgICAgICByZXR1cm4gY2FsbGFibGUuY2FsbCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIHJldHVybiB3cmFwcGVkLmNhbGwoKTsKKyAgICAgICAgfQogICAgICAgfQogCiAgICAgICBAT3ZlcnJpZGUKQEAgLTExMSwxNSArMTI5LDE0IEBACiAgICAgICAgIHB1YmxpYyB2b2lkIHJ1bigpIHsKICAgICAgICAgICB0cnkgewogICAgICAgICAgICAgd3JhcHBlZC5jYWxsKCk7Ci0gICAgICAgICAgfSBjYXRjaCAoUnVudGltZUV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgICB0aHJvdyBlOwogICAgICAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICBUaHJvd2FibGVzLnByb3BhZ2F0ZUlmUG9zc2libGUoZSk7CiAgICAgICAgICAgICB0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbihlKTsgLy8gTm90IHBvc3NpYmxlLgogICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIEBPdmVycmlkZQotICAgICAgICBwdWJsaWMgTmFtZUtleSBnZXRQcm9qZWN0TmFtZUtleSgpIHsKKyAgICAgICAgcHVibGljIFByb2plY3QuTmFtZUtleSBnZXRQcm9qZWN0TmFtZUtleSgpIHsKICAgICAgICAgICByZXR1cm4gKChQcm9qZWN0UnVubmFibGUpIHJ1bm5hYmxlKS5nZXRQcm9qZWN0TmFtZUtleSgpOwogICAgICAgICB9CiAKQEAgLTE2OSw3ICsxODYsMTcgQEAKICAgICByZXR1cm4gbmV3IENhbGxhYmxlPFQ+KCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwdWJsaWMgVCBjYWxsKCkgdGhyb3dzIEV4Y2VwdGlvbiB7Ci0gICAgICAgIFJlcXVlc3RDb250ZXh0IG9sZCA9IGxvY2FsLnNldENvbnRleHQoY29udGV4dCk7CisgICAgICAgIFJlcXVlc3RDb250ZXh0IG9sZCA9IGxvY2FsLnNldENvbnRleHQobmV3IFJlcXVlc3RDb250ZXh0KCkgeworICAgICAgICAgIEBPdmVycmlkZQorICAgICAgICAgIHB1YmxpYyBDdXJyZW50VXNlciBnZXRDdXJyZW50VXNlcigpIHsKKyAgICAgICAgICAgIHJldHVybiBjb250ZXh0LmdldEN1cnJlbnRVc2VyKCk7CisgICAgICAgICAgfQorCisgICAgICAgICAgQE92ZXJyaWRlCisgICAgICAgICAgcHVibGljIFByb3ZpZGVyPFJldmlld0RiPiBnZXRSZXZpZXdEYlByb3ZpZGVyKCkgeworICAgICAgICAgICAgcmV0dXJuIGRiUHJvdmlkZXJQcm92aWRlci5nZXQoKTsKKyAgICAgICAgICB9CisgICAgICAgIH0pOwogICAgICAgICB0cnkgewogICAgICAgICAgIHJldHVybiBjYWxsYWJsZS5jYWxsKCk7CiAgICAgICAgIH0gZmluYWxseSB7CkBAIC0xOTEsNyArMjE4LDYgQEAKICAgICAgICAgICAgICAgICByZXR1cm4gbmV3IFJlcXVlc3RDbGVhbnVwKCk7CiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0pLmdldCgpOwotCiAgICAgICAgIHRyeSB7CiAgICAgICAgICAgcmV0dXJuIGNhbGxhYmxlLmNhbGwoKTsKICAgICAgICAgfSBmaW5hbGx5IHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9TdWJtb2R1bGVTZWN0aW9uUGFyc2VyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvU3VibW9kdWxlU2VjdGlvblBhcnNlci5qYXZhCmluZGV4IDczMTA3MDMuLmZiZDgyMzYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9TdWJtb2R1bGVTZWN0aW9uUGFyc2VyLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1N1Ym1vZHVsZVNlY3Rpb25QYXJzZXIuamF2YQpAQCAtODEsNyArODEsNyBAQAogICAgICAgICAgICYmIGJyYW5jaCAhPSBudWxsICYmIGJyYW5jaC5sZW5ndGgoKSA+IDApIHsKICAgICAgICAgLy8gQWxsIHJlcXVpcmVkIGZpZWxkcyBmaWxsZWQuCiAKLSAgICAgICAgYm9vbGVhbiB1cmxJc1JlbGF0aXZlID0gdXJsLnN0YXJ0c1dpdGgoIi8iKTsKKyAgICAgICAgYm9vbGVhbiB1cmxJc1JlbGF0aXZlID0gdXJsLnN0YXJ0c1dpdGgoIi4uLyIpOwogICAgICAgICBTdHJpbmcgc2VydmVyID0gbnVsbDsKICAgICAgICAgaWYgKCF1cmxJc1JlbGF0aXZlKSB7CiAgICAgICAgICAgLy8gSXQgaXMgYWN0dWFsbHkgYW4gVVJJLiBJdCBjb3VsZCBiZSBzc2g6Ly9sb2NhbGhvc3QvcHJvamVjdC1hLgpAQCAtMTAzLDggKzEwMyw5IEBACiAgICAgICAgICAgICBmcm9tSW5kZXggPSB1cmxFeHRyYWN0ZWRQYXRoLmxhc3RJbmRleE9mKCcvJywgZnJvbUluZGV4IC0gMSk7CiAgICAgICAgICAgICBwcm9qZWN0TmFtZSA9IHVybEV4dHJhY3RlZFBhdGguc3Vic3RyaW5nKGZyb21JbmRleCArIDEpOwogCi0gICAgICAgICAgICBpZiAocHJvamVjdE5hbWUuZW5kc1dpdGgoIi5naXQiKSkgewotICAgICAgICAgICAgICBwcm9qZWN0TmFtZSA9IHByb2plY3ROYW1lLnN1YnN0cmluZygwLCBwcm9qZWN0TmFtZS5sZW5ndGgoKSAtIDQpOworICAgICAgICAgICAgaWYgKHByb2plY3ROYW1lLmVuZHNXaXRoKENvbnN0YW50cy5ET1RfR0lUX0VYVCkpIHsKKyAgICAgICAgICAgICAgcHJvamVjdE5hbWUgPSBwcm9qZWN0TmFtZS5zdWJzdHJpbmcoMCwgLy8KKyAgICAgICAgICAgICAgICAgIHByb2plY3ROYW1lLmxlbmd0aCgpIC0gQ29uc3RhbnRzLkRPVF9HSVRfRVhULmxlbmd0aCgpKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKHJlcG9NYW5hZ2VyLmxpc3QoKS5jb250YWlucyhuZXcgUHJvamVjdC5OYW1lS2V5KHByb2plY3ROYW1lKSkpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9UaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvVGhyZWFkTG9jYWxSZXF1ZXN0Q29udGV4dC5qYXZhCmluZGV4IGI0MTE1MTIuLmJkNDNlOWQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9UaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0LmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1RocmVhZExvY2FsUmVxdWVzdENvbnRleHQuamF2YQpAQCAtMTYsNiArMTYsNyBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5PYmplY3RzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuTm90U2lnbmVkSW5FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CkBAIC02NCw2ICs2NSwxMSBAQAogICAgICAgICB0aHJvdyBuZXcgUHJvdmlzaW9uRXhjZXB0aW9uKE5vdFNpZ25lZEluRXhjZXB0aW9uLk1FU1NBR0UsCiAgICAgICAgICAgICBuZXcgTm90U2lnbmVkSW5FeGNlcHRpb24oKSk7CiAgICAgICB9CisKKyAgICAgIEBQcm92aWRlcworICAgICAgUmV2aWV3RGIgcHJvdmlkZVJldmlld0RiKFJlcXVlc3RDb250ZXh0IGN0eCkgeworICAgICAgICByZXR1cm4gY3R4LmdldFJldmlld0RiUHJvdmlkZXIoKS5nZXQoKTsKKyAgICAgIH0KICAgICB9OwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9UaHJlYWRMb2NhbFJlcXVlc3RTY29wZVByb3BhZ2F0b3IuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9UaHJlYWRMb2NhbFJlcXVlc3RTY29wZVByb3BhZ2F0b3IuamF2YQppbmRleCA3NzI4ZDZmLi5hMzFjN2M3IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3V0aWwvVGhyZWFkTG9jYWxSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1RocmVhZExvY2FsUmVxdWVzdFNjb3BlUHJvcGFnYXRvci5qYXZhCkBAIC0xNCw3ICsxNCw5IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWw7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0Lk91dE9mU2NvcGVFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuU2NvcGU7CiAKIGltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5DYWxsYWJsZTsKQEAgLTMxLDggKzMzLDEwIEBACiAgIHByaXZhdGUgZmluYWwgVGhyZWFkTG9jYWw8Qz4gdGhyZWFkTG9jYWw7CiAKICAgcHJvdGVjdGVkIFRocmVhZExvY2FsUmVxdWVzdFNjb3BlUHJvcGFnYXRvcihTY29wZSBzY29wZSwKLSAgICAgIFRocmVhZExvY2FsPEM+IHRocmVhZExvY2FsLCBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsKSB7Ci0gICAgc3VwZXIoc2NvcGUsIGxvY2FsKTsKKyAgICAgIFRocmVhZExvY2FsPEM+IHRocmVhZExvY2FsLAorICAgICAgVGhyZWFkTG9jYWxSZXF1ZXN0Q29udGV4dCBsb2NhbCwKKyAgICAgIFByb3ZpZGVyPFJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyPiBkYlByb3ZpZGVyUHJvdmlkZXIpIHsKKyAgICBzdXBlcihzY29wZSwgbG9jYWwsIGRiUHJvdmlkZXJQcm92aWRlcik7CiAgICAgdGhpcy50aHJlYWRMb2NhbCA9IHRocmVhZExvY2FsOwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvQ2F0ZWdvcnlGdW5jdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci93b3JrZmxvdy9DYXRlZ29yeUZ1bmN0aW9uLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGY2ZjFiZmIuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci93b3JrZmxvdy9DYXRlZ29yeUZ1bmN0aW9uLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw3NyArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDggVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLndvcmtmbG93OwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwotCi1pbXBvcnQgamF2YS51dGlsLkhhc2hNYXA7Ci1pbXBvcnQgamF2YS51dGlsLk1hcDsKLQotLyoqIEZ1bmN0aW9uIHRvIGNvbnRyb2wge0BsaW5rIFBhdGNoU2V0QXBwcm92YWx9cyBpbiBhbiB7QGxpbmsgQXBwcm92YWxDYXRlZ29yeX0uICovCi1wdWJsaWMgYWJzdHJhY3QgY2xhc3MgQ2F0ZWdvcnlGdW5jdGlvbiB7Ci0gIHByaXZhdGUgc3RhdGljIE1hcDxTdHJpbmcsIENhdGVnb3J5RnVuY3Rpb24+IGFsbCA9Ci0gICAgICBuZXcgSGFzaE1hcDxTdHJpbmcsIENhdGVnb3J5RnVuY3Rpb24+KCk7Ci0gIHN0YXRpYyB7Ci0gICAgYWxsLnB1dChNYXhXaXRoQmxvY2suTkFNRSwgbmV3IE1heFdpdGhCbG9jaygpKTsKLSAgICBhbGwucHV0KE1heE5vQmxvY2suTkFNRSwgbmV3IE1heE5vQmxvY2soKSk7Ci0gICAgYWxsLnB1dChOb09wRnVuY3Rpb24uTkFNRSwgbmV3IE5vT3BGdW5jdGlvbigpKTsKLSAgICBhbGwucHV0KE5vQmxvY2suTkFNRSwgbmV3IE5vQmxvY2soKSk7Ci0gIH0KLQotICAvKioKLSAgICogTG9jYXRlIGEgZnVuY3Rpb24gYnkgY2F0ZWdvcnkuCi0gICAqCi0gICAqIEBwYXJhbSBjYXRlZ29yeSB0aGUgY2F0ZWdvcnkgdGhlIGZ1bmN0aW9uIGlzIGZvci4KLSAgICogQHJldHVybiB0aGUgZnVuY3Rpb24gaW1wbGVtZW50YXRpb247IHtAbGluayBOb09wRnVuY3Rpb259IGlmIHRoZSBmdW5jdGlvbgotICAgKiAgICAgICAgIGlzIG5vdCBrbm93biB0byBHZXJyaXQgYW5kIHRodXMgY2Fubm90IGJlIGV4ZWN1dGVkLgotICAgKi8KLSAgcHVibGljIHN0YXRpYyBDYXRlZ29yeUZ1bmN0aW9uIGZvckNhdGVnb3J5KGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkgY2F0ZWdvcnkpIHsKLSAgICBmaW5hbCBDYXRlZ29yeUZ1bmN0aW9uIHIgPSBhbGwuZ2V0KGNhdGVnb3J5LmdldEZ1bmN0aW9uTmFtZSgpKTsKLSAgICByZXR1cm4gciAhPSBudWxsID8gciA6IG5ldyBOb09wRnVuY3Rpb24oKTsKLSAgfQotCi0gIC8qKgotICAgKiBOb3JtYWxpemUgQ2hhbmdlQXBwcm92YWxzIGFuZCBzZXQgdGhlIHZhbGlkIGZsYWcgZm9yIHRoaXMgY2F0ZWdvcnkuCi0gICAqIDxwPgotICAgKiBJbXBsZW1lbnRvcnMgc2hvdWxkIGludm9rZToKLSAgICoKLSAgICogPHByZT4KLSAgICogc3RhdGUudmFsaWQoYXQsIHRydWUpOwotICAgKiA8L3ByZT4KLSAgICogPHA+Ci0gICAqIElmIHRoZSBzZXQgb2YgYXBwcm92YWxzIGZyb20gPGNvZGU+c3RhdGUuZ2V0QXBwcm92YWxzKGF0KTwvY29kZT4gY292ZXJzIHRoZQotICAgKiByZXF1aXJlbWVudHMgZm9yIHRoZSBmdW5jdGlvbiwgaW5kaWNhdGluZyB0aGUgY2F0ZWdvcnkgaGFzIGJlZW4gY29tcGxldGVkLgotICAgKiA8cD4KLSAgICogQW4gZXhhbXBsZSBpbXBsZW1lbnRhdGlvbiB3aGljaCByZXF1aXJlcyBhdCBsZWFzdCBvbmUgcG9zaXRpdmUgYW5kIG5vCi0gICAqIG5lZ2F0aXZlcyBtaWdodCBiZToKLSAgICoKLSAgICogPHByZT4KLSAgICogYm9vbGVhbiBuZWcgPSBmYWxzZSwgcG9zID0gZmFsc2U7Ci0gICAqIGZvciAoZmluYWwgQ2hhbmdlQXBwcm92YWwgY2EgOiBzdGF0ZS5nZXRBcHByb3ZhbHMoYXQpKSB7Ci0gICAqICAgc3RhdGUubm9ybWFsaXplKGNhKTsKLSAgICogICBuZWcgfD0gY2EuZ2V0VmFsdWUoKSAmbHQ7IDA7Ci0gICAqICAgcG9zIHw9IGNhLmdldFZhbHVlKCkgJmd0OyAwOwotICAgKiB9Ci0gICAqIHN0YXRlLnZhbGlkKGF0LCAhbmVnICZhbXA7JmFtcDsgcG9zKTsKLSAgICogPC9wcmU+Ci0gICAqCi0gICAqIEBwYXJhbSBhdCB0aGUgY2FjaGVkIGNhdGVnb3J5IGRlc2NyaXB0aW9uIHRvIHByb2Nlc3MuCi0gICAqIEBwYXJhbSBzdGF0ZSBzdGF0ZSB0byByZWFkIGFwcHJvdmFscyBhbmQgcHJvamVjdCByaWdodHMgZnJvbSwgYW5kIHRvIHVwZGF0ZQotICAgKiAgICAgICAgdGhlIHZhbGlkIHN0YXR1cyBpbnRvLgotICAgKi8KLSAgcHVibGljIGFic3RyYWN0IHZvaWQgcnVuKEFwcHJvdmFsVHlwZSBhdCwgRnVuY3Rpb25TdGF0ZSBzdGF0ZSk7Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3dvcmtmbG93L0Z1bmN0aW9uU3RhdGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvRnVuY3Rpb25TdGF0ZS5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA3NGM5N2YzLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvRnVuY3Rpb25TdGF0ZS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMTU4ICswLDAgQEAKLS8vIENvcHlyaWdodCAoQykgMjAwOCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0Ci0vLwotLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7Ci0vLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCi0vLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKLS8vCi0vLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKLS8vCi0vLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCi0vLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAotLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCi0vLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCi0vLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KLQotcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIud29ya2Zsb3c7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5QZXJtaXNzaW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb25SYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeVZhbHVlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5LklkOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuYXNzaXN0ZWRpbmplY3QuQXNzaXN0ZWQ7Ci0KLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uOwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKLWltcG9ydCBqYXZhLnV0aWwuSGFzaE1hcDsKLWltcG9ydCBqYXZhLnV0aWwuTGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuTWFwOwotCi0vKiogU3RhdGUgcGFzc2VkIHRocm91Z2ggdG8gYSB7QGxpbmsgQ2F0ZWdvcnlGdW5jdGlvbn0uICovCi1wdWJsaWMgY2xhc3MgRnVuY3Rpb25TdGF0ZSB7Ci0gIHB1YmxpYyBpbnRlcmZhY2UgRmFjdG9yeSB7Ci0gICAgRnVuY3Rpb25TdGF0ZSBjcmVhdGUoQ2hhbmdlQ29udHJvbCBjLCBQYXRjaFNldC5JZCBwc0lkLAotICAgICAgICBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+IGFsbCk7Ci0gIH0KLQotICBwcml2YXRlIGZpbmFsIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKLSAgcHJpdmF0ZSBmaW5hbCBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeTsKLQotICBwcml2YXRlIGZpbmFsIE1hcDxBcHByb3ZhbENhdGVnb3J5LklkLCBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+PiBhcHByb3ZhbHMgPQotICAgICAgbmV3IEhhc2hNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPj4oKTsKLSAgcHJpdmF0ZSBmaW5hbCBNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgQm9vbGVhbj4gdmFsaWQgPQotICAgICAgbmV3IEhhc2hNYXA8QXBwcm92YWxDYXRlZ29yeS5JZCwgQm9vbGVhbj4oKTsKLSAgcHJpdmF0ZSBmaW5hbCBDaGFuZ2VDb250cm9sIGNhbGxlckNoYW5nZUNvbnRyb2w7Ci0gIHByaXZhdGUgZmluYWwgQ2hhbmdlIGNoYW5nZTsKLQotICBASW5qZWN0Ci0gIEZ1bmN0aW9uU3RhdGUoZmluYWwgQXBwcm92YWxUeXBlcyBhcHByb3ZhbFR5cGVzLAotICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdXNlckZhY3RvcnksCi0gICAgICBAQXNzaXN0ZWQgZmluYWwgQ2hhbmdlQ29udHJvbCBjLCBAQXNzaXN0ZWQgZmluYWwgUGF0Y2hTZXQuSWQgcHNJZCwKLSAgICAgIEBBc3Npc3RlZCBmaW5hbCBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+IGFsbCkgewotICAgIHRoaXMuYXBwcm92YWxUeXBlcyA9IGFwcHJvdmFsVHlwZXM7Ci0gICAgdGhpcy51c2VyRmFjdG9yeSA9IHVzZXJGYWN0b3J5OwotCi0gICAgY2FsbGVyQ2hhbmdlQ29udHJvbCA9IGM7Ci0gICAgY2hhbmdlID0gYy5nZXRDaGFuZ2UoKTsKLQotICAgIGZvciAoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBjYSA6IGFsbCkgewotICAgICAgaWYgKHBzSWQuZXF1YWxzKGNhLmdldFBhdGNoU2V0SWQoKSkpIHsKLSAgICAgICAgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPiBsID0gYXBwcm92YWxzLmdldChjYS5nZXRDYXRlZ29yeUlkKCkpOwotICAgICAgICBpZiAobCA9PSBudWxsKSB7Ci0gICAgICAgICAgbCA9IG5ldyBBcnJheUxpc3Q8UGF0Y2hTZXRBcHByb3ZhbD4oKTsKLSAgICAgICAgICBhcHByb3ZhbHMucHV0KGNhLmdldENhdGVnb3J5SWQoKSwgbCk7Ci0gICAgICAgIH0KLSAgICAgICAgbC5hZGQoY2EpOwotICAgICAgfQotICAgIH0KLSAgfQotCi0gIExpc3Q8QXBwcm92YWxUeXBlPiBnZXRBcHByb3ZhbFR5cGVzKCkgewotICAgIHJldHVybiBhcHByb3ZhbFR5cGVzLmdldEFwcHJvdmFsVHlwZXMoKTsKLSAgfQotCi0gIENoYW5nZSBnZXRDaGFuZ2UoKSB7Ci0gICAgcmV0dXJuIGNoYW5nZTsKLSAgfQotCi0gIHB1YmxpYyB2b2lkIHZhbGlkKGZpbmFsIEFwcHJvdmFsVHlwZSBhdCwgZmluYWwgYm9vbGVhbiB2KSB7Ci0gICAgdmFsaWQucHV0KGlkKGF0KSwgdik7Ci0gIH0KLQotICBwdWJsaWMgYm9vbGVhbiBpc1ZhbGlkKGZpbmFsIEFwcHJvdmFsVHlwZSBhdCkgewotICAgIHJldHVybiBpc1ZhbGlkKGlkKGF0KSk7Ci0gIH0KLQotICBwdWJsaWMgYm9vbGVhbiBpc1ZhbGlkKGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgaWQpIHsKLSAgICBmaW5hbCBCb29sZWFuIGIgPSB2YWxpZC5nZXQoaWQpOwotICAgIHJldHVybiBiICE9IG51bGwgJiYgYjsKLSAgfQotCi0gIHB1YmxpYyBDb2xsZWN0aW9uPFBhdGNoU2V0QXBwcm92YWw+IGdldEFwcHJvdmFscyhmaW5hbCBBcHByb3ZhbFR5cGUgYXQpIHsKLSAgICByZXR1cm4gZ2V0QXBwcm92YWxzKGlkKGF0KSk7Ci0gIH0KLQotICBwdWJsaWMgQ29sbGVjdGlvbjxQYXRjaFNldEFwcHJvdmFsPiBnZXRBcHByb3ZhbHMoZmluYWwgQXBwcm92YWxDYXRlZ29yeS5JZCBpZCkgewotICAgIGZpbmFsIENvbGxlY3Rpb248UGF0Y2hTZXRBcHByb3ZhbD4gbCA9IGFwcHJvdmFscy5nZXQoaWQpOwotICAgIHJldHVybiBsICE9IG51bGwgPyBsIDogQ29sbGVjdGlvbnMuPFBhdGNoU2V0QXBwcm92YWw+IGVtcHR5U2V0KCk7Ci0gIH0KLQotICAvKioKLSAgICogTm9ybWFsaXplIHRoZSBhcHByb3ZhbCByZWNvcmQgZG93biB0byB0aGUgcmFuZ2UgcGVybWl0dGVkIGJ5IHRoZSB0eXBlLCBpbgotICAgKiBjYXNlIHRoZSB0eXBlIHdhcyBtb2RpZmllZCBzaW5jZSB0aGUgYXBwcm92YWwgd2FzIG9yaWdpbmFsbHkgZ3JhbnRlZC4KLSAgICogPHA+Ci0gICAqLwotICBwcml2YXRlIHZvaWQgYXBwbHlUeXBlRmxvb3IoZmluYWwgQXBwcm92YWxUeXBlIGF0LCBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGEpIHsKLSAgICBmaW5hbCBBcHByb3ZhbENhdGVnb3J5VmFsdWUgYXRNaW4gPSBhdC5nZXRNaW4oKTsKLQotICAgIGlmIChhdE1pbiAhPSBudWxsICYmIGEuZ2V0VmFsdWUoKSA8IGF0TWluLmdldFZhbHVlKCkpIHsKLSAgICAgIGEuc2V0VmFsdWUoYXRNaW4uZ2V0VmFsdWUoKSk7Ci0gICAgfQotCi0gICAgZmluYWwgQXBwcm92YWxDYXRlZ29yeVZhbHVlIGF0TWF4ID0gYXQuZ2V0TWF4KCk7Ci0gICAgaWYgKGF0TWF4ICE9IG51bGwgJiYgYS5nZXRWYWx1ZSgpID4gYXRNYXguZ2V0VmFsdWUoKSkgewotICAgICAgYS5zZXRWYWx1ZShhdE1heC5nZXRWYWx1ZSgpKTsKLSAgICB9Ci0gIH0KLQotICAvKioKLSAgICogTm9ybWFsaXplIHRoZSBhcHByb3ZhbCByZWNvcmQgdG8gYmUgaW5zaWRlIHRoZSBtYXhpbXVtIHJhbmdlIHBlcm1pdHRlZCBieQotICAgKiB0aGUgUmVmUmlnaHRzIGdyYW50ZWQgdG8gZ3JvdXBzIHRoZSBhY2NvdW50IGlzIGEgbWVtYmVyIG9mLgotICAgKiA8cD4KLSAgICogSWYgbXVsdGlwbGUgUmVmUmlnaHRzIGFyZSBtYXRjaGVkIChhc3NpZ25lZCB0byBkaWZmZXJlbnQgZ3JvdXBzIHRoZSBhY2NvdW50Ci0gICAqIGlzIGEgbWVtYmVyIG9mKSB0aGUgbG93ZXN0IG1pblZhbHVlIGFuZCB0aGUgaGlnaGVzdCBtYXhWYWx1ZSBvZiB0aGUgdW5pb24KLSAgICogb2YgdGhlbSBpcyB1c2VkLgotICAgKiA8cD4KLSAgICovCi0gIHByaXZhdGUgdm9pZCBhcHBseVJpZ2h0Rmxvb3IoZmluYWwgQXBwcm92YWxUeXBlIGF0LCBmaW5hbCBQYXRjaFNldEFwcHJvdmFsIGEpIHsKLSAgICBmaW5hbCBBcHByb3ZhbENhdGVnb3J5IGNhdGVnb3J5ID0gYXQuZ2V0Q2F0ZWdvcnkoKTsKLSAgICBmaW5hbCBTdHJpbmcgcGVybWlzc2lvbiA9IFBlcm1pc3Npb24uZm9yTGFiZWwoY2F0ZWdvcnkuZ2V0TGFiZWxOYW1lKCkpOwotICAgIGZpbmFsIElkZW50aWZpZWRVc2VyIHVzZXIgPSB1c2VyRmFjdG9yeS5jcmVhdGUoYS5nZXRBY2NvdW50SWQoKSk7Ci0gICAgZmluYWwgUGVybWlzc2lvblJhbmdlIHJhbmdlID0gY29udHJvbEZvcih1c2VyKS5nZXRSYW5nZShwZXJtaXNzaW9uKTsKLSAgICBhLnNldFZhbHVlKChzaG9ydCkgcmFuZ2Uuc3F1YXNoKGEuZ2V0VmFsdWUoKSkpOwotICB9Ci0KLSAgcHJpdmF0ZSBDaGFuZ2VDb250cm9sIGNvbnRyb2xGb3IoQ3VycmVudFVzZXIgdXNlcikgewotICAgIHJldHVybiBjYWxsZXJDaGFuZ2VDb250cm9sLmZvclVzZXIodXNlcik7Ci0gIH0KLQotICAvKiogUnVuIDxjb2RlPmFwcGx5VHlwZUZsb29yPC9jb2RlPiwgPGNvZGU+YXBwbHlSaWdodEZsb29yPC9jb2RlPi4gKi8KLSAgcHVibGljIHZvaWQgbm9ybWFsaXplKGZpbmFsIEFwcHJvdmFsVHlwZSBhdCwgZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBjYSkgewotICAgIGFwcGx5VHlwZUZsb29yKGF0LCBjYSk7Ci0gICAgYXBwbHlSaWdodEZsb29yKGF0LCBjYSk7Ci0gIH0KLQotICBwcml2YXRlIHN0YXRpYyBJZCBpZChmaW5hbCBBcHByb3ZhbFR5cGUgYXQpIHsKLSAgICByZXR1cm4gYXQuZ2V0Q2F0ZWdvcnkoKS5nZXRJZCgpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3dvcmtmbG93L01heE5vQmxvY2suamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvTWF4Tm9CbG9jay5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAzMjcyZjhhLi4wMDAwMDAwCi0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvTWF4Tm9CbG9jay5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsNDggKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci53b3JrZmxvdzsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXRBcHByb3ZhbDsKLQotLyoqCi0gKiBDb21wdXRlcyBhbiB7QGxpbmsgQXBwcm92YWxDYXRlZ29yeX0gYnkgbG9va2luZyBhdCBtYXhpbXVtIHZhbHVlcy4KLSAqIDxwPgotICogSW4gb3JkZXIgdG8gYmUgY29uc2lkZXJlZCAiYXBwcm92ZWQiIHRoaXMgZnVuY3Rpb24gcmVxdWlyZXMgdGhhdDoKLSAqIDx1bD4KLSAqIDxsaT5UaGUgbWF4aW11bSBwb3NpdGl2ZSB2YWx1ZSBpcyB1c2VkIGF0IGxlYXN0IG9uY2U7PC9saT4KLSAqIDxsaT5UaGUgdXNlciBhcHByb3ZpbmcgdGhlIG1heGltdW0gcG9zaXRpdmUgaGFzIGJlZW4gZ3JhbnRlZCB0aGF0LjwvbGk+Ci0gKiA8L3VsPgotICogPHA+Ci0gKiBUaGlzIGZ1bmN0aW9uIGlzIHByaW1hcmlseSB1c2VmdWwgZm9yIGFkdmlzb3J5IHJldmlldyBmaWVsZHMuCi0gKi8KLXB1YmxpYyBjbGFzcyBNYXhOb0Jsb2NrIGV4dGVuZHMgQ2F0ZWdvcnlGdW5jdGlvbiB7Ci0gIHB1YmxpYyBzdGF0aWMgU3RyaW5nIE5BTUUgPSAiTWF4Tm9CbG9jayI7Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIHJ1bihmaW5hbCBBcHByb3ZhbFR5cGUgYXQsIGZpbmFsIEZ1bmN0aW9uU3RhdGUgc3RhdGUpIHsKLSAgICBib29sZWFuIHBhc3NlZCA9IGZhbHNlOwotICAgIGZvciAoZmluYWwgUGF0Y2hTZXRBcHByb3ZhbCBhIDogc3RhdGUuZ2V0QXBwcm92YWxzKGF0KSkgewotICAgICAgc3RhdGUubm9ybWFsaXplKGF0LCBhKTsKLQotICAgICAgcGFzc2VkIHw9IGF0LmlzTWF4UG9zaXRpdmUoYSk7Ci0gICAgfQotCi0gICAgLy8gVGhlIHR5cGUgbXVzdCBoYXZlIGF0IGxlYXN0IG9uZSBtYXggcG9zaXRpdmUgKGEgZnVsbCBhY2NlcHQpLgotICAgIC8vCi0gICAgc3RhdGUudmFsaWQoYXQsIHBhc3NlZCk7Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvTWF4V2l0aEJsb2NrLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3dvcmtmbG93L01heFdpdGhCbG9jay5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBjZTg0NDk5Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvTWF4V2l0aEJsb2NrLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSw2MyArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMDggVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAotLy8KLS8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOwotLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgotLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0Ci0vLwotLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCi0vLwotLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQotLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKLS8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgotLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAotLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCi0KLXBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLndvcmtmbG93OwotCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BcHByb3ZhbENhdGVnb3J5OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldEFwcHJvdmFsOwotCi0vKioKLSAqIENvbXB1dGVzIGFuIHtAbGluayBBcHByb3ZhbENhdGVnb3J5fSBieSBsb29raW5nIGF0IG1heGltdW0gdmFsdWVzLgotICogPHA+Ci0gKiBJbiBvcmRlciB0byBiZSBjb25zaWRlcmVkICJhcHByb3ZlZCIgdGhpcyBmdW5jdGlvbiByZXF1aXJlcyB0aGF0OgotICogPHVsPgotICogPGxpPlRoZSBtYXhpbXVtIG5lZ2F0aXZlIHZhbHVlIGlzIG5ldmVyIHVzZWQ7PC9saT4KLSAqIDxsaT5UaGUgbWF4aW11bSBwb3NpdGl2ZSB2YWx1ZSBpcyB1c2VkIGF0IGxlYXN0IG9uY2U7PC9saT4KLSAqIDxsaT5UaGUgdXNlciBhcHByb3ZpbmcgdGhlIG1heGltdW0gcG9zaXRpdmUgaGFzIGJlZW4gZ3JhbnRlZCB0aGF0LjwvbGk+Ci0gKiA8L3VsPgotICogPHA+Ci0gKiBUaGlzIGZ1bmN0aW9uIGlzIHByaW1hcmlseSB1c2VmdWwgZm9yIHJldmlldyBmaWVsZHMsIHdpdGggdmFsdWVzIHN1Y2ggYXM6Ci0gKiA8dWw+Ci0gKiA8bGk+KzI6IEFwcHJvdmVkIGNoYW5nZS48L2xpPgotICogPGxpPisxOiBMb29rcyBvaywgYnV0IGdldCBhbm90aGVyIGFwcHJvdmFsIGZyb20gc29tZW9uZSB3aXRoIG1vcmUgZGVwdGguPC9saT4KLSAqIDxsaT4tMTogU29mdCByZWplY3QsIGl0IGlzbid0IGEgZ3JlYXQgY2hhbmdlIGJ1dCBpdHMgT0sgaWYgYXBwcm92ZWQuPC9saT4KLSAqIDxsaT4tMjogUmVqZWN0ZWQsIG11c3Qgbm90IGJlIHN1Ym1pdHRlZC4KLSAqIDwvdWw+Ci0gKiA8cD4KLSAqIE5vdGUgdGhhdCBwcm9qZWN0cyB1c2luZyB0aGlzIGZ1bmN0aW9uIHdvdWxkIHR5cGljYWxseSB3YW50IHRvIGFzc2lnbiBvdXQgdGhlCi0gKiBtaWRkbGUgcmFuZ2UgKC0xIC4uICsxKSB0byBhbG1vc3QgZXZlcnlvbmUsIHNvIHBlb3BsZSBjYW4gaW5kaWNhdGUgaG93IHRoZXkKLSAqIGZlZWwgYWJvdXQgYSBjaGFuZ2UsIGJ1dCB0aGUgZXh0cmVtZXMgb2YgLTIgYW5kICsyIHNob3VsZCBiZSByZXNlcnZlZCBmb3IgdGhlCi0gKiBwcm9qZWN0J3MgbG9uZy10ZXJtIG1haW50YWluZXJzLCB0aG9zZSB3aG8gYXJlIG1vc3QgZmFtaWxpYXIgd2l0aCBpdHMgY29kZS4KLSAqLwotcHVibGljIGNsYXNzIE1heFdpdGhCbG9jayBleHRlbmRzIENhdGVnb3J5RnVuY3Rpb24gewotICBwdWJsaWMgc3RhdGljIFN0cmluZyBOQU1FID0gIk1heFdpdGhCbG9jayI7Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIHJ1bihmaW5hbCBBcHByb3ZhbFR5cGUgYXQsIGZpbmFsIEZ1bmN0aW9uU3RhdGUgc3RhdGUpIHsKLSAgICBib29sZWFuIHJlamVjdGVkID0gZmFsc2U7Ci0gICAgYm9vbGVhbiBwYXNzZWQgPSBmYWxzZTsKLSAgICBmb3IgKGZpbmFsIFBhdGNoU2V0QXBwcm92YWwgYSA6IHN0YXRlLmdldEFwcHJvdmFscyhhdCkpIHsKLSAgICAgIHN0YXRlLm5vcm1hbGl6ZShhdCwgYSk7Ci0KLSAgICAgIHJlamVjdGVkIHw9IGF0LmlzTWF4TmVnYXRpdmUoYSk7Ci0gICAgICBwYXNzZWQgfD0gYXQuaXNNYXhQb3NpdGl2ZShhKTsKLSAgICB9Ci0KLSAgICAvLyBUaGUgdHlwZSBtdXN0IG5vdCBoYXZlIGhhZCBpdHMgbWF4IG5lZ2F0aXZlIChhIGZvcmNlZnVsIHJlamVjdCkKLSAgICAvLyBhbmQgbXVzdCBoYXZlIGF0IGxlYXN0IG9uZSBtYXggcG9zaXRpdmUgKGEgZnVsbCBhY2NlcHQpLgotICAgIC8vCi0gICAgc3RhdGUudmFsaWQoYXQsICFyZWplY3RlZCAmJiBwYXNzZWQpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3dvcmtmbG93L05vQmxvY2suamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvTm9CbG9jay5qYXZhCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwOGQwNzA1Li4wMDAwMDAwCi0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvd29ya2Zsb3cvTm9CbG9jay5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMjcgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEwIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci53b3JrZmxvdzsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLQotLyoqIEEgZnVuY3Rpb24gdGhhdCBkb2VzIG5vdGhpbmcuICovCi1wdWJsaWMgY2xhc3MgTm9CbG9jayBleHRlbmRzIENhdGVnb3J5RnVuY3Rpb24gewotICBwdWJsaWMgc3RhdGljIFN0cmluZyBOQU1FID0gIk5vQmxvY2siOwotCi0gIEBPdmVycmlkZQotICBwdWJsaWMgdm9pZCBydW4oZmluYWwgQXBwcm92YWxUeXBlIGF0LCBmaW5hbCBGdW5jdGlvblN0YXRlIHN0YXRlKSB7Ci0gICAgc3RhdGUudmFsaWQoYXQsIHRydWUpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3dvcmtmbG93L05vT3BGdW5jdGlvbi5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci93b3JrZmxvdy9Ob09wRnVuY3Rpb24uamF2YQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOGM3NmNjNS4uMDAwMDAwMAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3dvcmtmbG93L05vT3BGdW5jdGlvbi5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsMjYgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA4IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci53b3JrZmxvdzsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLQotLyoqIEEgZnVuY3Rpb24gdGhhdCBkb2VzIG5vdGhpbmcuICovCi1wdWJsaWMgY2xhc3MgTm9PcEZ1bmN0aW9uIGV4dGVuZHMgQ2F0ZWdvcnlGdW5jdGlvbiB7Ci0gIHB1YmxpYyBzdGF0aWMgU3RyaW5nIE5BTUUgPSAiTm9PcCI7Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyB2b2lkIHJ1bihmaW5hbCBBcHByb3ZhbFR5cGUgYXQsIGZpbmFsIEZ1bmN0aW9uU3RhdGUgc3RhdGUpIHsKLSAgfQotfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX19sb2FkX2NvbW1pdF9sYWJlbHNfMS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX19sb2FkX2NvbW1pdF9sYWJlbHNfMS5qYXZhCmluZGV4IGEyNmE0OTIuLmJlZTA0NmMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9nZXJyaXQvUFJFRF9fbG9hZF9jb21taXRfbGFiZWxzXzEuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfX2xvYWRfY29tbWl0X2xhYmVsc18xLmphdmEKQEAgLTIsMTIgKzIsMTEgQEAKIAogcGFja2FnZSBnZXJyaXQ7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlBhdGNoU2V0QXBwcm92YWw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlByb2xvZ0Vudmlyb25tZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlN0b3JlZFZhbHVlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucXVlcnkuY2hhbmdlLkNoYW5nZURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKQEAgLTQyLDExICs0MSwxMSBAQAogCiAgICAgVGVybSBsaXN0SGVhZCA9IFByb2xvZy5OaWw7CiAgICAgdHJ5IHsKLSAgICAgIFByb2xvZ0Vudmlyb25tZW50IGVudiA9IChQcm9sb2dFbnZpcm9ubWVudCkgZW5naW5lLmNvbnRyb2w7CiAgICAgICBSZXZpZXdEYiBkYiA9IFN0b3JlZFZhbHVlcy5SRVZJRVdfREIuZ2V0KGVuZ2luZSk7CiAgICAgICBQYXRjaFNldCBwYXRjaFNldCA9IFN0b3JlZFZhbHVlcy5QQVRDSF9TRVQuZ2V0KGVuZ2luZSk7CiAgICAgICBDaGFuZ2VEYXRhIGNkID0gU3RvcmVkVmFsdWVzLkNIQU5HRV9EQVRBLmdldE9yTnVsbChlbmdpbmUpOwotICAgICAgQXBwcm92YWxUeXBlcyB0eXBlcyA9IGVudi5nZXRJbmplY3RvcigpLmdldEluc3RhbmNlKEFwcHJvdmFsVHlwZXMuY2xhc3MpOworICAgICAgTGFiZWxUeXBlcyB0eXBlcyA9CisgICAgICAgICAgU3RvcmVkVmFsdWVzLkNIQU5HRV9DT05UUk9MLmdldChlbmdpbmUpLmdldExhYmVsVHlwZXMoKTsKIAogICAgICAgSXRlcmFibGU8UGF0Y2hTZXRBcHByb3ZhbD4gYXBwcm92YWxzOwogICAgICAgaWYgKGNkICE9IG51bGwpIHsKQEAgLTYwLDE0ICs1OSwxNCBAQAogICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgICAgQXBwcm92YWxUeXBlIHQgPSB0eXBlcy5ieUlkKGEuZ2V0Q2F0ZWdvcnlJZCgpKTsKKyAgICAgICAgTGFiZWxUeXBlIHQgPSB0eXBlcy5ieUxhYmVsKGEuZ2V0TGFiZWxJZCgpKTsKICAgICAgICAgaWYgKHQgPT0gbnVsbCkgewogICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKICAgICAgICAgU3RydWN0dXJlVGVybSBsYWJlbFRlcm0gPSBuZXcgU3RydWN0dXJlVGVybSgKICAgICAgICAgICAgIHN5bV9sYWJlbCwKLSAgICAgICAgICAgIFN5bWJvbFRlcm0uaW50ZXJuKHQuZ2V0Q2F0ZWdvcnkoKS5nZXRMYWJlbE5hbWUoKSksCisgICAgICAgICAgICBTeW1ib2xUZXJtLmludGVybih0LmdldE5hbWUoKSksCiAgICAgICAgICAgICBuZXcgSW50ZWdlclRlcm0oYS5nZXRWYWx1ZSgpKSk7CiAKICAgICAgICAgU3RydWN0dXJlVGVybSB1c2VyVGVybSA9IG5ldyBTdHJ1Y3R1cmVUZXJtKApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX2NvbW1pdF9kZWx0YV80LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfY29tbWl0X2RlbHRhXzQuamF2YQppbmRleCA5Y2U3MDk4Li41MWE4NzFjIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfY29tbWl0X2RlbHRhXzQuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfY29tbWl0X2RlbHRhXzQuamF2YQpAQCAtMTY5LDYgKzE2OSw4IEBACiAgICAgICAgIHJldHVybiByZW5hbWU7CiAgICAgICBjYXNlIENPUElFRDoKICAgICAgICAgcmV0dXJuIGNvcHk7CisgICAgICBjYXNlIFJFV1JJVEU6CisgICAgICAgIGJyZWFrOwogICAgIH0KICAgICB0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCJDaGFuZ2VUeXBlIG5vdCByZWNvZ25pemVkIik7CiAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9nZXJyaXQvUFJFRF9jb21taXRfc3RhdHNfMy5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX2NvbW1pdF9zdGF0c18zLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGFmOTk0OAotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9nZXJyaXQvUFJFRF9jb21taXRfc3RhdHNfMy5qYXZhCkBAIC0wLDAgKzEsNjEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBnZXJyaXQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5ydWxlcy5TdG9yZWRWYWx1ZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBhdGNoLlBhdGNoTGlzdDsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLkludGVnZXJUZXJtOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuT3BlcmF0aW9uOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJlZGljYXRlOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJvbG9nOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJvbG9nRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuVGVybTsKKworLyoqCisgKiBFeHBvcnRzIGJhc2ljIGNvbW1pdCBzdGF0aXN0aWNzLgorICoKKyAqIDxwcmU+CisgKiAgICdjb21taXRfc3RhdHMnKC1GaWxlcywgLUluc2VydGlvbnMsIC1EZWxldGlvbnMpCisgKiA8L3ByZT4KKyAqLworcHVibGljIGNsYXNzIFBSRURfY29tbWl0X3N0YXRzXzMgZXh0ZW5kcyBQcmVkaWNhdGUuUDMgeworICBwdWJsaWMgUFJFRF9jb21taXRfc3RhdHNfMyhUZXJtIGExLCBUZXJtIGEyLCBUZXJtIGEzLCBPcGVyYXRpb24gbikgeworICAgIGFyZzEgPSBhMTsKKyAgICBhcmcyID0gYTI7CisgICAgYXJnMyA9IGEzOworICAgIGNvbnQgPSBuOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBPcGVyYXRpb24gZXhlYyhQcm9sb2cgZW5naW5lKSB0aHJvd3MgUHJvbG9nRXhjZXB0aW9uIHsKKyAgICBlbmdpbmUuc2V0QjAoKTsKKworICAgIFRlcm0gYTEgPSBhcmcxLmRlcmVmZXJlbmNlKCk7CisgICAgVGVybSBhMiA9IGFyZzIuZGVyZWZlcmVuY2UoKTsKKyAgICBUZXJtIGEzID0gYXJnMy5kZXJlZmVyZW5jZSgpOworCisgICAgUGF0Y2hMaXN0IHBsID0gU3RvcmVkVmFsdWVzLlBBVENIX0xJU1QuZ2V0KGVuZ2luZSk7CisgICAgaWYoIWExLnVuaWZ5KG5ldyBJbnRlZ2VyVGVybShwbC5nZXRQYXRjaGVzKCkuc2l6ZSgpIC0xKSxlbmdpbmUudHJhaWwpKSB7IC8vQWNjb3VudCBmb3IgL0NPTU1JVF9NU0cuCisgICAgICByZXR1cm4gZW5naW5lLmZhaWwoKTsKKyAgICB9CisgICAgaWYoIWEyLnVuaWZ5KG5ldyBJbnRlZ2VyVGVybShwbC5nZXRJbnNlcnRpb25zKCkpLGVuZ2luZS50cmFpbCkpIHsKKyAgICAgIHJldHVybiBlbmdpbmUuZmFpbCgpOworICAgIH0KKyAgICBpZighYTMudW5pZnkobmV3IEludGVnZXJUZXJtKHBsLmdldERlbGV0aW9ucygpKSxlbmdpbmUudHJhaWwpKSB7CisgICAgICByZXR1cm4gZW5naW5lLmZhaWwoKTsKKyAgICB9CisgICAgcmV0dXJuIGNvbnQ7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9nZXJyaXQvUFJFRF9jdXJyZW50X3VzZXJfMS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX2N1cnJlbnRfdXNlcl8xLmphdmEKaW5kZXggMDlhNDZmNy4uMTE5MTFiZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX2N1cnJlbnRfdXNlcl8xLmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX2N1cnJlbnRfdXNlcl8xLmphdmEKQEAgLTM2LDcgKzM2LDYgQEAKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3ltYm9sVGVybSB1c2VyID0gU3ltYm9sVGVybS5pbnRlcm4oInVzZXIiLCAxKTsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3ltYm9sVGVybSBhbm9ueW1vdXMgPSBTeW1ib2xUZXJtLmludGVybigiYW5vbnltb3VzIik7CiAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN5bWJvbFRlcm0gcGVlckRhZW1vbiA9IFN5bWJvbFRlcm0uaW50ZXJuKCJwZWVyX2RhZW1vbiIpOwotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTeW1ib2xUZXJtIHJlcGxpY2F0aW9uID0gU3ltYm9sVGVybS5pbnRlcm4oInJlcGxpY2F0aW9uIik7CiAKICAgcHVibGljIFBSRURfY3VycmVudF91c2VyXzEoVGVybSBhMSwgT3BlcmF0aW9uIG4pIHsKICAgICBhcmcxID0gYTE7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfZ2V0X2xlZ2FjeV9hcHByb3ZhbF90eXBlc18xLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfZ2V0X2xlZ2FjeV9hcHByb3ZhbF90eXBlc18xLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGNiZTBmZDguLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX2dldF9sZWdhY3lfYXBwcm92YWxfdHlwZXNfMS5qYXZhCisrKyAvZGV2L251bGwKQEAgLTEsODIgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDExIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGdlcnJpdDsKLQotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGVzOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlByb2xvZ0Vudmlyb25tZW50OwotCi1pbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5JbnRlZ2VyVGVybTsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLkxpc3RUZXJtOwotaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuT3BlcmF0aW9uOwotaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJlZGljYXRlOwotaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJvbG9nOwotaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJvbG9nRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuU3RydWN0dXJlVGVybTsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlN5bWJvbFRlcm07Ci1pbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5UZXJtOwotCi1pbXBvcnQgamF2YS51dGlsLkxpc3Q7Ci0KLS8qKgotICogT2J0YWluIGEgbGlzdCBvZiBhcHByb3ZhbCB0eXBlcyBmcm9tIHRoZSBzZXJ2ZXIgY29uZmlndXJhdGlvbi4KLSAqIDxwPgotICogVW5pZmllcyB0byBhIFByb2xvZyBsaXN0IG9mOiB7QGNvZGUgYXBwcm92YWxfdHlwZShMYWJlbCwgSWQsIEZ1biwgTWluLCBNYXgpfQotICogd2hlcmU6Ci0gKiA8dWw+Ci0gKiA8bGk+e0Bjb2RlIExhYmVsfSAtIHRoZSBuZXdlciBzdHlsZSBsYWJlbCBuYW1lPC9saT4KLSAqIDxsaT57QGNvZGUgSWR9IC0gdGhlIGxlZ2FjeSBBcHByb3ZhbENhdGVnb3J5LklkIGZyb20gdGhlIGRhdGFiYXNlPC9saT4KLSAqIDxsaT57QGNvZGUgRnVufSAtIGxlZ2FjeSBmdW5jdGlvbiBuYW1lPC9saT4KLSAqIDxsaT57QGNvZGUgTWluLCBNYXh9IC0gdGhlIHNtYWxsZXN0IGFuZCBsYXJnZXN0IGNvbmZpZ3VyZWQgdmFsdWVzLjwvbGk+Ci0gKiA8L3VsPgotICovCi1jbGFzcyBQUkVEX2dldF9sZWdhY3lfYXBwcm92YWxfdHlwZXNfMSBleHRlbmRzIFByZWRpY2F0ZS5QMSB7Ci0gIFBSRURfZ2V0X2xlZ2FjeV9hcHByb3ZhbF90eXBlc18xKFRlcm0gYTEsIE9wZXJhdGlvbiBuKSB7Ci0gICAgYXJnMSA9IGExOwotICAgIGNvbnQgPSBuOwotICB9Ci0KLSAgQE92ZXJyaWRlCi0gIHB1YmxpYyBPcGVyYXRpb24gZXhlYyhQcm9sb2cgZW5naW5lKSB0aHJvd3MgUHJvbG9nRXhjZXB0aW9uIHsKLSAgICBlbmdpbmUuc2V0QjAoKTsKLSAgICBUZXJtIGExID0gYXJnMS5kZXJlZmVyZW5jZSgpOwotCi0gICAgUHJvbG9nRW52aXJvbm1lbnQgZW52ID0gKFByb2xvZ0Vudmlyb25tZW50KSBlbmdpbmUuY29udHJvbDsKLSAgICBBcHByb3ZhbFR5cGVzIHR5cGVzID0gZW52LmdldEluamVjdG9yKCkuZ2V0SW5zdGFuY2UoQXBwcm92YWxUeXBlcy5jbGFzcyk7Ci0KLSAgICBMaXN0PEFwcHJvdmFsVHlwZT4gbGlzdCA9IHR5cGVzLmdldEFwcHJvdmFsVHlwZXMoKTsKLSAgICBUZXJtIGhlYWQgPSBQcm9sb2cuTmlsOwotICAgIGZvciAoaW50IGlkeCA9IGxpc3Quc2l6ZSgpIC0gMTsgMCA8PSBpZHg7IGlkeC0tKSB7Ci0gICAgICBoZWFkID0gbmV3IExpc3RUZXJtKGV4cG9ydChsaXN0LmdldChpZHgpKSwgaGVhZCk7Ci0gICAgfQotCi0gICAgaWYgKCFhMS51bmlmeShoZWFkLCBlbmdpbmUudHJhaWwpKSB7Ci0gICAgICByZXR1cm4gZW5naW5lLmZhaWwoKTsKLSAgICB9Ci0gICAgcmV0dXJuIGNvbnQ7Ci0gIH0KLQotICBzdGF0aWMgZmluYWwgU3ltYm9sVGVybSBzeW1BcHByb3ZhbFR5cGUgPSBTeW1ib2xUZXJtLmludGVybigKLSAgICAgICJhcHByb3ZhbF90eXBlIiwgNSk7Ci0KLSAgc3RhdGljIFRlcm0gZXhwb3J0KEFwcHJvdmFsVHlwZSB0eXBlKSB7Ci0gICAgcmV0dXJuIG5ldyBTdHJ1Y3R1cmVUZXJtKHN5bUFwcHJvdmFsVHlwZSwKLSAgICAgICAgU3ltYm9sVGVybS5pbnRlcm4odHlwZS5nZXRDYXRlZ29yeSgpLmdldExhYmVsTmFtZSgpKSwKLSAgICAgICAgU3ltYm9sVGVybS5pbnRlcm4odHlwZS5nZXRDYXRlZ29yeSgpLmdldElkKCkuZ2V0KCkpLAotICAgICAgICBTeW1ib2xUZXJtLmludGVybih0eXBlLmdldENhdGVnb3J5KCkuZ2V0RnVuY3Rpb25OYW1lKCkpLAotICAgICAgICBuZXcgSW50ZWdlclRlcm0odHlwZS5nZXRNaW4oKS5nZXRWYWx1ZSgpKSwKLSAgICAgICAgbmV3IEludGVnZXJUZXJtKHR5cGUuZ2V0TWF4KCkuZ2V0VmFsdWUoKSkpOwotICB9Ci19CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfZ2V0X2xlZ2FjeV9sYWJlbF90eXBlc18xLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL2phdmEvZ2Vycml0L1BSRURfZ2V0X2xlZ2FjeV9sYWJlbF90eXBlc18xLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTYxZGE3OQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9nZXJyaXQvUFJFRF9nZXRfbGVnYWN5X2xhYmVsX3R5cGVzXzEuamF2YQpAQCAtMCwwICsxLDg1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTEgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgZ2Vycml0OworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlByb2xvZ0Vudmlyb25tZW50OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlN0b3JlZFZhbHVlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdFN0YXRlOworCitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5JbnRlZ2VyVGVybTsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLkxpc3RUZXJtOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuT3BlcmF0aW9uOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJlZGljYXRlOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJvbG9nOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuUHJvbG9nRXhjZXB0aW9uOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuU3RydWN0dXJlVGVybTsKK2ltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlN5bWJvbFRlcm07CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5UZXJtOworCitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKKy8qKgorICogT2J0YWluIGEgbGlzdCBvZiBsYWJlbCB0eXBlcyBmcm9tIHRoZSBzZXJ2ZXIgY29uZmlndXJhdGlvbi4KKyAqIDxwPgorICogVW5pZmllcyB0byBhIFByb2xvZyBsaXN0IG9mOiB7QGNvZGUgbGFiZWxfdHlwZShMYWJlbCwgRnVuLCBNaW4sIE1heCl9CisgKiB3aGVyZToKKyAqIDx1bD4KKyAqIDxsaT57QGNvZGUgTGFiZWx9IC0gdGhlIG5ld2VyIHN0eWxlIGxhYmVsIG5hbWU8L2xpPgorICogPGxpPntAY29kZSBGdW59IC0gbGVnYWN5IGZ1bmN0aW9uIG5hbWU8L2xpPgorICogPGxpPntAY29kZSBNaW4sIE1heH0gLSB0aGUgc21hbGxlc3QgYW5kIGxhcmdlc3QgY29uZmlndXJlZCB2YWx1ZXMuPC9saT4KKyAqIDwvdWw+CisgKi8KK2NsYXNzIFBSRURfZ2V0X2xlZ2FjeV9sYWJlbF90eXBlc18xIGV4dGVuZHMgUHJlZGljYXRlLlAxIHsKKyAgUFJFRF9nZXRfbGVnYWN5X2xhYmVsX3R5cGVzXzEoVGVybSBhMSwgT3BlcmF0aW9uIG4pIHsKKyAgICBhcmcxID0gYTE7CisgICAgY29udCA9IG47CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9wZXJhdGlvbiBleGVjKFByb2xvZyBlbmdpbmUpIHRocm93cyBQcm9sb2dFeGNlcHRpb24geworICAgIGVuZ2luZS5zZXRCMCgpOworICAgIFRlcm0gYTEgPSBhcmcxLmRlcmVmZXJlbmNlKCk7CisKKyAgICBQcm9sb2dFbnZpcm9ubWVudCBlbnYgPSAoUHJvbG9nRW52aXJvbm1lbnQpIGVuZ2luZS5jb250cm9sOworICAgIFByb2plY3RTdGF0ZSBzdGF0ZSA9IGVudi5nZXRJbmplY3RvcigpLmdldEluc3RhbmNlKFByb2plY3RDYWNoZS5jbGFzcykKKyAgICAgICAgLmdldChTdG9yZWRWYWx1ZXMuQ0hBTkdFLmdldChlbmdpbmUpLmdldERlc3QoKS5nZXRQYXJlbnRLZXkoKSk7CisgICAgaWYgKHN0YXRlID09IG51bGwpIHsKKyAgICAgIHJldHVybiBlbmdpbmUuZmFpbCgpOworICAgIH0KKyAgICBMaXN0PExhYmVsVHlwZT4gbGlzdCA9IHN0YXRlLmdldExhYmVsVHlwZXMoKS5nZXRMYWJlbFR5cGVzKCk7CisgICAgVGVybSBoZWFkID0gUHJvbG9nLk5pbDsKKyAgICBmb3IgKGludCBpZHggPSBsaXN0LnNpemUoKSAtIDE7IDAgPD0gaWR4OyBpZHgtLSkgeworICAgICAgaGVhZCA9IG5ldyBMaXN0VGVybShleHBvcnQobGlzdC5nZXQoaWR4KSksIGhlYWQpOworICAgIH0KKworICAgIGlmICghYTEudW5pZnkoaGVhZCwgZW5naW5lLnRyYWlsKSkgeworICAgICAgcmV0dXJuIGVuZ2luZS5mYWlsKCk7CisgICAgfQorICAgIHJldHVybiBjb250OworICB9CisKKyAgc3RhdGljIGZpbmFsIFN5bWJvbFRlcm0gc3ltTGFiZWxUeXBlID0gU3ltYm9sVGVybS5pbnRlcm4oCisgICAgICAibGFiZWxfdHlwZSIsIDQpOworCisgIHN0YXRpYyBUZXJtIGV4cG9ydChMYWJlbFR5cGUgdHlwZSkgeworICAgIHJldHVybiBuZXcgU3RydWN0dXJlVGVybShzeW1MYWJlbFR5cGUsCisgICAgICAgIFN5bWJvbFRlcm0uaW50ZXJuKHR5cGUuZ2V0TmFtZSgpKSwKKyAgICAgICAgU3ltYm9sVGVybS5pbnRlcm4odHlwZS5nZXRGdW5jdGlvbk5hbWUoKSksCisgICAgICAgIG5ldyBJbnRlZ2VyVGVybSh0eXBlLmdldE1pbigpLmdldFZhbHVlKCkpLAorICAgICAgICBuZXcgSW50ZWdlclRlcm0odHlwZS5nZXRNYXgoKS5nZXRWYWx1ZSgpKSk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9nZXJyaXQvUFJFRF9wcm9qZWN0X2RlZmF1bHRfc3VibWl0X3R5cGVfMS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9qYXZhL2dlcnJpdC9QUkVEX3Byb2plY3RfZGVmYXVsdF9zdWJtaXRfdHlwZV8xLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGYxNzNjNwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vamF2YS9nZXJyaXQvUFJFRF9wcm9qZWN0X2RlZmF1bHRfc3VibWl0X3R5cGVfMS5qYXZhCkBAIC0wLDAgKzEsNTggQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBnZXJyaXQ7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlN0b3JlZFZhbHVlczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5DaGFuZ2VDb250cm9sOworCitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5PcGVyYXRpb247CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5QcmVkaWNhdGU7CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2c7CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2dFeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5TeW1ib2xUZXJtOworaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuVGVybTsKKworcHVibGljIGNsYXNzIFBSRURfcHJvamVjdF9kZWZhdWx0X3N1Ym1pdF90eXBlXzEgZXh0ZW5kcyBQcmVkaWNhdGUuUDEgeworCisgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN5bWJvbFRlcm1bXSB0ZXJtOworCisgIHN0YXRpYyB7CisgICAgU3VibWl0VHlwZVtdIHZhbCA9IFN1Ym1pdFR5cGUudmFsdWVzKCk7CisgICAgdGVybSA9IG5ldyBTeW1ib2xUZXJtW3ZhbC5sZW5ndGhdOworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgdmFsLmxlbmd0aDsgaSsrKSB7CisgICAgICB0ZXJtW2ldID0gU3ltYm9sVGVybS5jcmVhdGUodmFsW2ldLm5hbWUoKSk7CisgICAgfQorICB9CisKKyAgcHVibGljIFBSRURfcHJvamVjdF9kZWZhdWx0X3N1Ym1pdF90eXBlXzEoVGVybSBhMSwgT3BlcmF0aW9uIG4pIHsKKyAgICBhcmcxID0gYTE7CisgICAgY29udCA9IG47CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIE9wZXJhdGlvbiBleGVjKFByb2xvZyBlbmdpbmUpIHRocm93cyBQcm9sb2dFeGNlcHRpb24geworICAgIGVuZ2luZS5zZXRCMCgpOworICAgIFRlcm0gYTEgPSBhcmcxLmRlcmVmZXJlbmNlKCk7CisKKyAgICBDaGFuZ2VDb250cm9sIGNvbnRyb2wgPSBTdG9yZWRWYWx1ZXMuQ0hBTkdFX0NPTlRST0wuZ2V0KGVuZ2luZSk7CisgICAgU3VibWl0VHlwZSBzdWJtaXRUeXBlID0gY29udHJvbC5nZXRQcm9qZWN0KCkuZ2V0U3VibWl0VHlwZSgpOworCisgICAgaWYgKCFhMS51bmlmeSh0ZXJtW3N1Ym1pdFR5cGUub3JkaW5hbCgpXSwgZW5naW5lLnRyYWlsKSkgeworICAgICAgcmV0dXJuIGVuZ2luZS5mYWlsKCk7CisgICAgfQorICAgIHJldHVybiBjb250OworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Byb2xvZy9nZXJyaXRfY29tbW9uLnBsIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9wcm9sb2cvZ2Vycml0X2NvbW1vbi5wbAppbmRleCBhNzVhY2MwLi43MWU3MzgzIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Byb2xvZy9nZXJyaXRfY29tbW9uLnBsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcHJvbG9nL2dlcnJpdF9jb21tb24ucGwKQEAgLTE0MCwxMiArMTQwLDEyIEBACiA6LSBwdWJsaWMgY2FuX3N1Ym1pdC8yLgogJSUKIGNhbl9zdWJtaXQoU3VibWl0UnVsZSwgUykgOi0KLSAgY2FsbF9zdWJtaXRfcnVsZShTdWJtaXRSdWxlLCBUbXApLAorICBjYWxsX3J1bGUoU3VibWl0UnVsZSwgVG1wKSwKICAgVG1wID0uLiBbc3VibWl0IHwgTHNdLAogICAoIGlzX2FsbF9vayhMcykgLT4gUyA9IG9rKFRtcCksICEgOyBTID0gbm90X3JlYWR5KFRtcCkgKS4KIAotY2FsbF9zdWJtaXRfcnVsZShQOlgsIEFyZykgOi0gISwgRiA9Li4gW1gsIEFyZ10sIFA6Ri4KLWNhbGxfc3VibWl0X3J1bGUoWCwgQXJnKSA6LSAhLCBGID0uLiBbWCwgQXJnXSwgRi4KK2NhbGxfcnVsZShQOlgsIEFyZykgOi0gISwgRiA9Li4gW1gsIEFyZ10sIFA6Ri4KK2NhbGxfcnVsZShYLCBBcmcpIDotICEsIEYgPS4uIFtYLCBBcmddLCBGLgogCiBpc19hbGxfb2soW10pLgogaXNfYWxsX29rKFtsYWJlbChfLCBvayhfXykpIHwgTHNdKSA6LSBpc19hbGxfb2soTHMpLgpAQCAtMTU1LDYgKzE1NSwyMSBAQAogCiAlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlCiAlJQorJSUgbG9jYXRlX2hlbHBlcgorJSUKKyUlICAgUmV0dXJucyB1c2VyOkZ1bmMgaWYgaXQgZXhpc3RzIG90aGVyd2lzZSByZXR1cm5zIGdlcnJpdDpEZWZhdWx0CisKK2xvY2F0ZV9oZWxwZXIoRnVuYywgRGVmYXVsdCwgQXJpdHksIHVzZXI6RnVuYykgOi0KKyAgICAnJGNvbXBpbGVkX3ByZWRpY2F0ZScodXNlciwgRnVuYywgQXJpdHkpLCAhLgorbG9jYXRlX2hlbHBlcihGdW5jLCBEZWZhdWx0LCBBcml0eSwgdXNlcjpGdW5jKSA6LQorICAgIGxpc3ROKEFyaXR5LCBQKSwgQyA9Li4gW0Z1bmMgfCBQXSwgY2xhdXNlKHVzZXI6QywgXyksICEuCitsb2NhdGVfaGVscGVyKEZ1bmMsIERlZmF1bHQsIF8sIGdlcnJpdDpEZWZhdWx0KS4KKworbGlzdE4oMCwgW10pLgorbGlzdE4oTiwgW198VF0pIDotIE4gPiAwLCBOMSBpcyBOIC0gMSwgbGlzdE4oTjEsIFQpLgorCislJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlCislJQogJSUgbG9jYXRlX3N1Ym1pdF9ydWxlLzE6CiAlJQogJSUgICBGaW5kcyBhIHN1Ym1pdF9ydWxlIGRlcGVuZGluZyBvbiB3aGF0IHJ1bGVzIGFyZSBhdmFpbGFibGUuCkBAIC0xNjQsMTcgKzE3OSwzMiBAQAogJSUKIAogbG9jYXRlX3N1Ym1pdF9ydWxlKFJ1bGVOYW1lKSA6LQotICAnJGNvbXBpbGVkX3ByZWRpY2F0ZScodXNlciwgc3VibWl0X3J1bGUsIDEpLAotICAhLAotICBSdWxlTmFtZSA9IHVzZXI6c3VibWl0X3J1bGUKLSAgLgotbG9jYXRlX3N1Ym1pdF9ydWxlKFJ1bGVOYW1lKSA6LQotICBjbGF1c2UodXNlcjpzdWJtaXRfcnVsZShfKSwgXyksCi0gICEsCi0gIFJ1bGVOYW1lID0gdXNlcjpzdWJtaXRfcnVsZQotICAuCi1sb2NhdGVfc3VibWl0X3J1bGUoUnVsZU5hbWUpIDotCi0gIFJ1bGVOYW1lID0gZ2Vycml0OmRlZmF1bHRfc3VibWl0LgorICBsb2NhdGVfaGVscGVyKHN1Ym1pdF9ydWxlLCBkZWZhdWx0X3N1Ym1pdCwgMSwgUnVsZU5hbWUpLgorCisKKyUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKKyUlCislJSBnZXRfc3VibWl0X3R5cGUvMjoKKyUlCislJSAgIEV4ZWN1dGVzIHRoZSBTdWJtaXRUeXBlUnVsZSBhbmQgcmV0dXJuIHRoZSBmaXJzdCBzb2x1dGlvbgorJSUKKzotIHB1YmxpYyBnZXRfc3VibWl0X3R5cGUvMi4KKyUlCitnZXRfc3VibWl0X3R5cGUoU3VibWl0VHlwZVJ1bGUsIEEpIDotCisgIGNhbGxfcnVsZShTdWJtaXRUeXBlUnVsZSwgQSksICEuCisKKworJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJQorJSUKKyUlIGxvY2F0ZV9zdWJtaXRfdHlwZS8xOgorJSUKKyUlICAgRmluZHMgYSBzdWJtaXRfdHlwZV9ydWxlIGRlcGVuZGluZyBvbiB3aGF0IHJ1bGVzIGFyZSBhdmFpbGFibGUuCislJSAgIElmIG5vbmUgYXJlIGF2YWlsYWJsZSwgdXNlIHByb2plY3RfZGVmYXVsdF9zdWJtaXRfdHlwZS8xLgorJSUKKzotIHB1YmxpYyBsb2NhdGVfc3VibWl0X3R5cGUvMS4KKyUlCitsb2NhdGVfc3VibWl0X3R5cGUoUnVsZU5hbWUpIDotCisgIGxvY2F0ZV9oZWxwZXIoc3VibWl0X3R5cGUsIHByb2plY3RfZGVmYXVsdF9zdWJtaXRfdHlwZSwgMSwgUnVsZU5hbWUpLgogCiAKICUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKQEAgLTE4NCwyMiArMjE0LDIyIEBACiA6LSBwdWJsaWMgZGVmYXVsdF9zdWJtaXQvMS4KICUlCiBkZWZhdWx0X3N1Ym1pdChQKSA6LQotICBnZXRfbGVnYWN5X2FwcHJvdmFsX3R5cGVzKEFwcHJvdmFsVHlwZXMpLAotICBkZWZhdWx0X3N1Ym1pdChBcHByb3ZhbFR5cGVzLCBQKS4KKyAgZ2V0X2xlZ2FjeV9sYWJlbF90eXBlcyhMYWJlbFR5cGVzKSwKKyAgZGVmYXVsdF9zdWJtaXQoTGFiZWxUeXBlcywgUCkuCiAKICUgQXBwbHkgdGhlIG9sZCAiYWxsIGFwcHJvdmFsIGNhdGVnb3JpZXMgbXVzdCBiZSBzYXRpc2ZpZWQiCi0lIGxvb3AgYnkgc2Nhbm5pbmcgb3ZlciBhbGwgb2YgdGhlIGFwcHJvdmFsIHR5cGVzIHRvIGJ1aWxkCi0lIHVwIHRoZSBzdWJtaXQgcmVjb3JkLgorJSBsb29wIGJ5IHNjYW5uaW5nIG92ZXIgYWxsIG9mIHRoZSBsYWJlbCB0eXBlcyB0byBidWlsZCB1cCB0aGUKKyUgc3VibWl0IHJlY29yZC4KICUKLWRlZmF1bHRfc3VibWl0KEFwcHJvdmFsVHlwZXMsIFApIDotCi0gIGRlZmF1bHRfc3VibWl0KEFwcHJvdmFsVHlwZXMsIFtdLCBUbXApLAorZGVmYXVsdF9zdWJtaXQoTGFiZWxUeXBlcywgUCkgOi0KKyAgZGVmYXVsdF9zdWJtaXQoTGFiZWxUeXBlcywgW10sIFRtcCksCiAgIHJldmVyc2UoVG1wLCBMcyksCiAgIFAgPS4uIFsgc3VibWl0IHwgTHNdLgogCiBkZWZhdWx0X3N1Ym1pdChbXSwgT3V0LCBPdXQpLgogZGVmYXVsdF9zdWJtaXQoW1R5cGUgfCBUeXBlc10sIFRtcCwgT3V0KSA6LQotICBhcHByb3ZhbF90eXBlKExhYmVsLCBJZCwgRnVuLCBNaW4sIE1heCkgPSBUeXBlLAotICBsZWdhY3lfc3VibWl0X3J1bGUoRnVuLCBMYWJlbCwgSWQsIE1pbiwgTWF4LCBTdGF0dXMpLAorICBsYWJlbF90eXBlKExhYmVsLCBGdW4sIE1pbiwgTWF4KSA9IFR5cGUsCisgIGxlZ2FjeV9zdWJtaXRfcnVsZShGdW4sIExhYmVsLCBNaW4sIE1heCwgU3RhdHVzKSwKICAgUiA9IGxhYmVsKExhYmVsLCBTdGF0dXMpLAogICBkZWZhdWx0X3N1Ym1pdChUeXBlcywgW1IgfCBUbXBdLCBPdXQpLgogCkBAIC0yMDgsMTIgKzIzOCwxMSBAQAogJSUKICUlIEFwcGx5IHRoZSBvbGQgLTIuLisyIHN0eWxlIGxvZ2ljLgogJSUKLWxlZ2FjeV9zdWJtaXRfcnVsZSgnTWF4V2l0aEJsb2NrJywgTGFiZWwsIElkLCBNaW4sIE1heCwgVCkgOi0gISwgbWF4X3dpdGhfYmxvY2soTGFiZWwsIE1pbiwgTWF4LCBUKS4KLWxlZ2FjeV9zdWJtaXRfcnVsZSgnTWF4Tm9CbG9jaycsIExhYmVsLCBJZCwgTWluLCBNYXgsIFQpIDotICEsIG1heF9ub19ibG9jayhMYWJlbCwgTWF4LCBUKS4KLWxlZ2FjeV9zdWJtaXRfcnVsZSgnTm9CbG9jaycsIExhYmVsLCBJZCwgTWluLCBNYXgsIFQpIDotICEsIFQgPSBtYXkoXykuCi1sZWdhY3lfc3VibWl0X3J1bGUoJ05vT3AnLCBMYWJlbCwgSWQsIE1pbiwgTWF4LCBUKSA6LSAhLCBUID0gbWF5KF8pLgotbGVnYWN5X3N1Ym1pdF9ydWxlKEZ1biwgTGFiZWwsIElkLCBNaW4sIE1heCwgVCkgOi0gVCA9IGltcG9zc2libGUodW5zdXBwb3J0ZWQoRnVuKSkuCi0KK2xlZ2FjeV9zdWJtaXRfcnVsZSgnTWF4V2l0aEJsb2NrJywgTGFiZWwsIE1pbiwgTWF4LCBUKSA6LSAhLCBtYXhfd2l0aF9ibG9jayhMYWJlbCwgTWluLCBNYXgsIFQpLgorbGVnYWN5X3N1Ym1pdF9ydWxlKCdNYXhOb0Jsb2NrJywgTGFiZWwsIE1pbiwgTWF4LCBUKSA6LSAhLCBtYXhfbm9fYmxvY2soTGFiZWwsIE1heCwgVCkuCitsZWdhY3lfc3VibWl0X3J1bGUoJ05vQmxvY2snLCBMYWJlbCwgTWluLCBNYXgsIFQpIDotICEsIFQgPSBtYXkoXykuCitsZWdhY3lfc3VibWl0X3J1bGUoJ05vT3AnLCBMYWJlbCwgTWluLCBNYXgsIFQpIDotICEsIFQgPSBtYXkoXykuCitsZWdhY3lfc3VibWl0X3J1bGUoRnVuLCBMYWJlbCwgTWluLCBNYXgsIFQpIDotIFQgPSBpbXBvc3NpYmxlKHVuc3VwcG9ydGVkKEZ1bikpLgogCiAlJSBtYXhfd2l0aF9ibG9jazoKICUlCkBAIC0yMjIsNiArMjUxLDEwIEBACiAlJQogOi0gcHVibGljIG1heF93aXRoX2Jsb2NrLzQuCiAlJQorbWF4X3dpdGhfYmxvY2soTWluLCBNYXgsIExhYmVsLCBsYWJlbChMYWJlbCwgUykpIDotCisgIG51bWJlcihNaW4pLCBudW1iZXIoTWF4KSwgYXRvbShMYWJlbCksCisgICEsCisgIG1heF93aXRoX2Jsb2NrKExhYmVsLCBNaW4sIE1heCwgUykuCiBtYXhfd2l0aF9ibG9jayhMYWJlbCwgTWluLCBNYXgsIHJlamVjdChXaG8pKSA6LQogICBjaGVja19sYWJlbF9yYW5nZV9wZXJtaXNzaW9uKExhYmVsLCBNaW4sIG9rKFdobykpLAogICAhCkBAIC0zMDYsNiArMzM5LDE3IEBACiBjYWxsX3N1Ym1pdF9maWx0ZXIoUDpYLCBSLCBTKSA6LSAhLCBGID0uLiBbWCwgUiwgU10sIFA6Ri4KIGNhbGxfc3VibWl0X2ZpbHRlcihYLCBSLCBTKSA6LSBGID0uLiBbWCwgUiwgU10sIEYuCiAKKyUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKKyUlCislJSBmaWx0ZXJfc3VibWl0X3R5cGVfcmVzdWx0cy8zOgorJSUKKyUlICAgRXhlY3V0ZXMgdGhlIHN1Ym1pdF90eXBlX2ZpbHRlciBhZ2FpbnN0IHRoZSByZXN1bHQsCislJSAgIHJldHVybnMgdGhlIGZpbHRlcmVkIHJlc3VsdC4KKyUlCis6LSBwdWJsaWMgZmlsdGVyX3N1Ym1pdF90eXBlX3Jlc3VsdHMvMy4KKyUlCitmaWx0ZXJfc3VibWl0X3R5cGVfcmVzdWx0cyhGaWx0ZXIsIEluLCBPdXQpIDotIGNhbGxfc3VibWl0X2ZpbHRlcihGaWx0ZXIsIEluLCBPdXQpLgorCiAKICUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUKICUlCkBAIC0zMTYsMTUgKzM2MCwyNiBAQAogOi0gcHVibGljIGxvY2F0ZV9zdWJtaXRfZmlsdGVyLzEuCiAlJQogbG9jYXRlX3N1Ym1pdF9maWx0ZXIoRmlsdGVyTmFtZSkgOi0KLSAgJyRjb21waWxlZF9wcmVkaWNhdGUnKHVzZXIsIHN1Ym1pdF9maWx0ZXIsIDIpLAotICAhLAotICBGaWx0ZXJOYW1lID0gdXNlcjpzdWJtaXRfZmlsdGVyCi0gIC4KLWxvY2F0ZV9zdWJtaXRfZmlsdGVyKEZpbHRlck5hbWUpIDotCi0gIGNsYXVzZSh1c2VyOnN1Ym1pdF9maWx0ZXIoXyxfKSwgXyksCi0gIEZpbHRlck5hbWUgPSB1c2VyOnN1Ym1pdF9maWx0ZXIKLSAgLgorICBsb2NhdGVfaGVscGVyKHN1Ym1pdF9maWx0ZXIsIG5vb3BfZmlsdGVyLCAyLCBGaWx0ZXJOYW1lKS4KIAorJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJQorJSUKKyUlIG5vb3BfZmlsdGVyLzI6CislJQorOi0gcHVibGljIG5vb3BfZmlsdGVyLzIuCislJQorbm9vcF9maWx0ZXIoSW4sIEluKS4KKworJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJQorJSUKKyUlIGxvY2F0ZV9zdWJtaXRfdHlwZV9maWx0ZXIvMToKKyUlCislJSAgIEZpbmRzIGEgc3VibWl0X3R5cGVfZmlsdGVyIGlmIGF2YWlsYWJsZS4KKyUlCis6LSBwdWJsaWMgbG9jYXRlX3N1Ym1pdF90eXBlX2ZpbHRlci8xLgorJSUKK2xvY2F0ZV9zdWJtaXRfdHlwZV9maWx0ZXIoRmlsdGVyTmFtZSkgOi0KKyAgbG9jYXRlX2hlbHBlcihzdWJtaXRfdHlwZV9maWx0ZXIsIG5vb3BfZmlsdGVyLCAyLCBGaWx0ZXJOYW1lKS4KIAogJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJSUlJQogJSUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvQ2hhbmdlTWVzc2FnZXMucHJvcGVydGllcyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9jaGFuZ2UvQ2hhbmdlTWVzc2FnZXMucHJvcGVydGllcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xMTM4NGExCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2NoYW5nZS9DaGFuZ2VNZXNzYWdlcy5wcm9wZXJ0aWVzCkBAIC0wLDAgKzEsOCBAQAorIyBDaGFuZ2VzIHRvIHRoaXMgZmlsZSBzaG91bGQgYWxzbyBiZSBtYWRlIGluCisjIGdlcnJpdC1nd3R1aS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2NsaWVudC9jaGFuZ2VzL0NoYW5nZU1lc3NhZ2VzLnByb3BlcnRpZXMKK3JldmVydENoYW5nZURlZmF1bHRNZXNzYWdlID0gUmV2ZXJ0IFwiezB9XCJcblxuVGhpcyByZXZlcnRzIGNvbW1pdCB7MX0KK3Jldmlld2VyTm90Rm91bmQgPSB7MH0gZG9lcyBub3QgaWRlbnRpZnkgYSByZWdpc3RlcmVkIHVzZXIgb3IgZ3JvdXAKKworZ3JvdXBJc05vdEFsbG93ZWQgPSAgVGhlIGdyb3VwIHswfSBjYW5ub3QgYmUgYWRkZWQgYXMgcmV2aWV3ZXIuCitncm91cEhhc1Rvb01hbnlNZW1iZXJzID0gVGhlIGdyb3VwIHswfSBoYXMgdG9vIG1hbnkgbWVtYmVycyB0byBhZGQgdGhlbSBhbGwgYXMgcmV2aWV3ZXJzLgorZ3JvdXBNYW55TWVtYmVyc0NvbmZpcm1hdGlvbiA9IFRoZSBncm91cCB7MH0gaGFzIHsxfSBtZW1iZXJzLiBEbyB5b3Ugd2FudCB0byBhZGQgdGhlbSBhbGwgYXMgcmV2aWV3ZXJzPwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ2hhbmdlU3ViamVjdC52bSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NoYW5nZVN1YmplY3Qudm0KaW5kZXggYTY3YzM4Yy4uYWNlYzFkMSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ2hhbmdlU3ViamVjdC52bQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9DaGFuZ2VTdWJqZWN0LnZtCkBAIC0zMSw3ICszMSw3IEBACiAjIyBUaGUgQ2hhbmdlU3ViamVjdC52bSB0ZW1wbGF0ZSB3aWxsIGRldGVybWluZSB0aGUgY29udGVudHMgb2YgdGhlIGVtYWlsCiAjIyBzdWJqZWN0IGxpbmUgZm9yIEFMTCBlbWFpbHMgcmVsYXRlZCB0byBjaGFuZ2VzLgogIyMKLSNtYWNybyhlbGlwc2VzICRsZW5ndGggJHN0cikKLSNpZigkc3RyLmxlbmd0aCgpID4gJGxlbmd0aCkke3N0ci5zdWJzdHJpbmcoMCwkbGVuZ3RoKX0uLi4jZWxzZSRzdHIjZW5kCisjbWFjcm8oZWxsaXBzaXMgJGxlbmd0aCAkc3RyKQorI2lmKCRzdHIubGVuZ3RoKCkgPiAkbGVuZ3RoKSNzZXQoJGxlbmd0aCA9ICRsZW5ndGggLSAzKSR7c3RyLnN1YnN0cmluZygwLCRsZW5ndGgpfS4uLiNlbHNlJHN0ciNlbmQKICNlbmQKLUNoYW5nZSBpbiAkcHJvamVjdE5hbWUucmVwbGFjZUFsbCgnLy4qLycsICcuLi4nKVskYnJhbmNoLnNob3J0TmFtZV06ICNlbGlwc2VzKDYwLCAkY2hhbmdlLnN1YmplY3QpCitDaGFuZ2UgaW4gJHByb2plY3ROYW1lLnJlcGxhY2VBbGwoJy8uKi8nLCAnLi4uJylbJGJyYW5jaC5zaG9ydE5hbWVdOiAjZWxsaXBzaXMoNjMsICRjaGFuZ2Uuc3ViamVjdCkKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1lbnQudm0gYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9Db21tZW50LnZtCmluZGV4IDlhZjk4YTYuLmU2NDY3N2QgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1lbnQudm0KKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ29tbWVudC52bQpAQCAtMzAsOSArMzAsOSBAQAogIyMgLS0tLS0tLS0tLS0tLS0KICMjIFRoZSBDb21tZW50LnZtIHRlbXBsYXRlIHdpbGwgZGV0ZXJtaW5lIHRoZSBjb250ZW50cyBvZiB0aGUgZW1haWwgcmVsYXRlZCB0bwogIyMgYSB1c2VyIHN1Ym1pdHRpbmcgY29tbWVudHMgb24gY2hhbmdlcy4gIEl0IGlzIGEgQ2hhbmdlRW1haWw6IHNlZQotIyMgQ2hhbmdlU3ViamVjdC52bSBhbmQgQ2hhbmdlRm9vdGVyLnZtLgorIyMgQ2hhbmdlU3ViamVjdC52bSwgQ2hhbmdlRm9vdGVyLnZtIGFuZCBDb21tZW50Rm9vdGVyLnZtLgogIyMKLSNpZiAoJGVtYWlsLmNvdmVyTGV0dGVyIHx8ICRlbWFpbC5pbmxpbmVDb21tZW50cykKKyNpZiAoJGVtYWlsLmNvdmVyTGV0dGVyIHx8ICRlbWFpbC5oYXNJbmxpbmVDb21tZW50cygpKQogJGZyb21OYW1lIGhhcyBwb3N0ZWQgY29tbWVudHMgb24gdGhpcyBjaGFuZ2UuCiAKIENoYW5nZSBzdWJqZWN0OiAkY2hhbmdlLnN1YmplY3QKQEAgLTQ1LDkgKzQ1LDkgQEAKICNlbmQKICMjCiAjIyBJdCBpcyBwb3NzaWJsZSB0byBpbmNyZWFzZSB0aGUgc3BhbiBvZiB0aGUgcXVvdGVkIGxpbmVzIGJ5IHVzaW5nIHRoZSBsaW5lCi0jIyBjb3VudCBwYXJhbWV0ZXIgd2hlbiBjYWxsaW5nICRlbWFpbC5pbmxpbmVDb21tZW50cyBhcyBhIGZ1bmN0aW9uLgorIyMgY291bnQgcGFyYW1ldGVyIHdoZW4gY2FsbGluZyAkZW1haWwuZ2V0SW5saW5lQ29tbWVudHMgYXMgYSBmdW5jdGlvbi4KICMjCi0jIyBFeGFtcGxlOiAjaWYoJGVtYWlsLmlubGluZUNvbW1lbnRzKSRlbWFpbC5nZXRJbmxpbmVDb21tZW50cyg1KSNlbmQKKyMjIEV4YW1wbGU6ICNpZigkZW1haWwuaGFzSW5saW5lQ29tbWVudHMoKSkkZW1haWwuZ2V0SW5saW5lQ29tbWVudHMoNSkjZW5kCiAjIwotI2lmKCRlbWFpbC5pbmxpbmVDb21tZW50cykkZW1haWwuaW5saW5lQ29tbWVudHMjZW5kCisjaWYoJGVtYWlsLmhhc0lubGluZUNvbW1lbnRzKCkpJGVtYWlsLmlubGluZUNvbW1lbnRzI2VuZAogI2VuZApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ29tbWVudEZvb3Rlci52bSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1lbnRGb290ZXIudm0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTA4MzJlNgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1lbnRGb290ZXIudm0KQEAgLTAsMCArMSw0MCBAQAorIyMgQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyMjCisjIyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKyMjIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyMjIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorIyMKKyMjIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorIyMKKyMjIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKyMjIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisjIyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKyMjIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKyMjIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorIyMKKyMjCisjIyBUZW1wbGF0ZSBUeXBlOgorIyMgLS0tLS0tLS0tLS0tLQorIyMgVGhpcyBpcyBhIHZlbG9jaXR5IG1haWwgdGVtcGxhdGUsIHNlZTogaHR0cDovL3ZlbG9jaXR5LmFwYWNoZS5vcmcgYW5kIHRoZQorIyMgZ2Vycml0LWRvY3M6Y29uZmlnLW1haWwudHh0IGZvciBtb3JlIGluZm8gb24gbW9kaWZ5aW5nIGdlcnJpdCBtYWlsIHRlbXBsYXRlcy4KKyMjCisjIyBUZW1wbGF0ZSBGaWxlIE5hbWVzIGFuZCBleHRlbnNpb25zOgorIyMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorIyMgR2Vycml0IHdpbGwgdXNlIHRlbXBsYXRlcyBlbmRpbmcgaW4gIi52bSIgYnV0IHdpbGwgaWdub3JlIHRlbXBsYXRlcyBlbmRpbmcKKyMjIGluICIudm0uZXhhbXBsZSIuICBJZiBhIC52bSB0ZW1wbGF0ZSBkb2VzIG5vdCBleGlzdCwgdGhlIGRlZmF1bHQgaW50ZXJuYWwKKyMjIGdlcnJpdCB0ZW1wbGF0ZSB3aGljaCBpcyB0aGUgc2FtZSBhcyB0aGUgLnZtLmV4YW1wbGUgd2lsbCBiZSB1c2VkLiAgSWYgeW91CisjIyB3YW50IHRvIG92ZXJyaWRlIHRoZSBkZWZhdWx0IHRlbXBsYXRlLCBjb3B5IHRoZSAudm0uZXhhbXBsZSBmaWxlIHRvIGEgLnZtCisjIyBmaWxlIGFuZCBlZGl0IGl0IGFwcHJvcHJpYXRlbHkuCisjIworIyMgVGhpcyBUZW1wbGF0ZToKKyMjIC0tLS0tLS0tLS0tLS0tCisjIyBUaGUgQ29tbWVudEZvb3Rlci52bSB0ZW1wbGF0ZSB3aWxsIGRldGVybWluZSB0aGUgY29udGVudHMgb2YgdGhlIGZvb3RlcgorIyMgdGV4dCB0aGF0IHdpbGwgYmUgYXBwZW5kZWQgdG8gZW1haWxzIHJlbGF0ZWQgdG8gYSB1c2VyIHN1Ym1pdHRpbmcgY29tbWVudHMKKyMjIG9uIGNoYW5nZXMuCisjIworIyMgU2VlIENoYW5nZVN1YmplY3Qudm0gYW5kIENoYW5nZUZvb3Rlci52bS4KKyNpZigkZW1haWwuaGFzSW5saW5lQ29tbWVudHMoKSkKK0dlcnJpdC1IYXNDb21tZW50czogWWVzCisjZWxzZQorR2Vycml0LUhhc0NvbW1lbnRzOiBObworI2VuZApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvQ29tbWl0TWVzc2FnZUVkaXRlZC52bSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1pdE1lc3NhZ2VFZGl0ZWQudm0KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjU4MzEwMQotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL0NvbW1pdE1lc3NhZ2VFZGl0ZWQudm0KQEAgLTAsMCArMSw1NCBAQAorIyMgQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyMjCisjIyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKyMjIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyMjIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorIyMKKyMjIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorIyMKKyMjIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKyMjIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisjIyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKyMjIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKyMjIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorIyMKKyMjCisjIyBUZW1wbGF0ZSBUeXBlOgorIyMgLS0tLS0tLS0tLS0tLQorIyMgVGhpcyBpcyBhIHZlbG9jaXR5IG1haWwgdGVtcGxhdGUsIHNlZTogaHR0cDovL3ZlbG9jaXR5LmFwYWNoZS5vcmcgYW5kIHRoZQorIyMgZ2Vycml0LWRvY3M6Y29uZmlnLW1haWwudHh0IGZvciBtb3JlIGluZm8gb24gbW9kaWZ5aW5nIGdlcnJpdCBtYWlsIHRlbXBsYXRlcy4KKyMjCisjIyBUZW1wbGF0ZSBGaWxlIE5hbWVzIGFuZCBleHRlbnNpb25zOgorIyMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorIyMgR2Vycml0IHdpbGwgdXNlIHRlbXBsYXRlcyBlbmRpbmcgaW4gIi52bSIgYnV0IHdpbGwgaWdub3JlIHRlbXBsYXRlcyBlbmRpbmcKKyMjIGluICIudm0uZXhhbXBsZSIuICBJZiBhIC52bSB0ZW1wbGF0ZSBkb2VzIG5vdCBleGlzdCwgdGhlIGRlZmF1bHQgaW50ZXJuYWwKKyMjIGdlcnJpdCB0ZW1wbGF0ZSB3aGljaCBpcyB0aGUgc2FtZSBhcyB0aGUgLnZtLmV4YW1wbGUgd2lsbCBiZSB1c2VkLiAgSWYgeW91CisjIyB3YW50IHRvIG92ZXJyaWRlIHRoZSBkZWZhdWx0IHRlbXBsYXRlLCBjb3B5IHRoZSAudm0uZXhhbXBsZSBmaWxlIHRvIGEgLnZtCisjIyBmaWxlIGFuZCBlZGl0IGl0IGFwcHJvcHJpYXRlbHkuCisjIworIyMgVGhpcyBUZW1wbGF0ZToKKyMjIC0tLS0tLS0tLS0tLS0tCisjIyBUaGUgQ29tbWl0TWVzc2FnZVVwZGF0ZWQudm0gdGVtcGxhdGUgd2lsbCBkZXRlcm1pbmUgdGhlIGNvbnRlbnRzIG9mIHRoZSBlbWFpbAorIyMgcmVsYXRlZCB0byBhIHVzZXIgZWRpdGluZyB0aGUgY29tbWl0IG1lc3NhZ2UgZm9yIGEgY2hhbmdlIHRocm91Z2ggdGhlIEdlcnJpdCBVSS4KKyMjIEl0IGlzIGEgQ2hhbmdlRW1haWw6IHNlZSBDaGFuZ2VTdWJqZWN0LnZtIGFuZCBDaGFuZ2VGb290ZXIudm0uCisjIworI2lmKCRlbWFpbC5yZXZpZXdlck5hbWVzKQorSGVsbG8gJGVtYWlsLmpvaW5TdHJpbmdzKCRlbWFpbC5yZXZpZXdlck5hbWVzLCAnLCAnKSwKKworSSdkIGxpa2UgeW91IHRvIHJlZXhhbWluZSBhIGNoYW5nZS4jaWYoJGVtYWlsLmNoYW5nZVVybCkgIFBsZWFzZSB2aXNpdAorCisgICAgJGVtYWlsLmNoYW5nZVVybAorCit0byBsb29rIGF0IHRoZSBuZXcgcGF0Y2ggc2V0IHdpdGggZWRpdGVkIGNvbW1pdCBtZXNzYWdlICgjJHBhdGNoU2V0LnBhdGNoU2V0SWQpLgorI2VuZAorI2Vsc2UKKyRmcm9tTmFtZSBoYXMgY3JlYXRlZCBhIG5ldyBwYXRjaCBzZXQgYnkgZWRpdGluZyB0aGUgY29tbWl0IG1lc3NhZ2UgaW4gR2Vycml0ICgjJHBhdGNoU2V0LnBhdGNoU2V0SWQpLgorI2VuZAorCitDaGFuZ2Ugc3ViamVjdDogJGNoYW5nZS5zdWJqZWN0CisuLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uCisKKyRlbWFpbC5jaGFuZ2VEZXRhaWwKKyNpZigkZW1haWwuc3NoSG9zdCkKKyAgZ2l0IHB1bGwgc3NoOi8vJGVtYWlsLnNzaEhvc3QvJHByb2plY3ROYW1lICRwYXRjaFNldC5yZWZOYW1lCisjZW5kCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9NZXJnZWQudm0gYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvbWFpbC9NZXJnZWQudm0KaW5kZXggYmNiYzdiZC4uMjJlMjllOCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL21haWwvTWVyZ2VkLnZtCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9tYWlsL01lcmdlZC52bQpAQCAtMzIsOSArMzIsNiBAQAogIyMgYSBjaGFuZ2Ugc3VjY2Vzc2Z1bGx5IG1lcmdlZCB0byB0aGUgaGVhZC4gIEl0IGlzIGEgQ2hhbmdlRW1haWw6IHNlZQogIyMgQ2hhbmdlU3ViamVjdC52bSBhbmQgQ2hhbmdlRm9vdGVyLnZtLgogIyMKLSNtYWNybyhlbGlwc2VzICRsZW5ndGggJHN0cikKLSNpZigkc3RyLmxlbmd0aCgpID4gJGxlbmd0aCkke3N0ci5zdWJzdHJpbmcoMCwkbGVuZ3RoKX0uLi4jZWxzZSRzdHIjZW5kCi0jZW5kCiAkZnJvbU5hbWUgaGFzIHN1Ym1pdHRlZCB0aGlzIGNoYW5nZSBhbmQgaXQgd2FzIG1lcmdlZC4KIAogQ2hhbmdlIHN1YmplY3Q6ICRjaGFuZ2Uuc3ViamVjdApAQCAtNDIsMyArMzksNyBAQAogCiAKICRlbWFpbC5jaGFuZ2VEZXRhaWwkZW1haWwuYXBwcm92YWxzCisKKyNpZigkZW1haWwuaW5jbHVkZURpZmYpCiskZW1haWwuVW5pZmllZERpZmYKKyNlbmQKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci90b29scy9yb290L2hvb2tzL2NvbW1pdC1tc2cgYi9nZXJyaXQtc2VydmVyL3NyYy9tYWluL3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdG9vbHMvcm9vdC9ob29rcy9jb21taXQtbXNnCmluZGV4IDA2OTI2ZGYuLmIyOWUyNWMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL21haW4vcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci90b29scy9yb290L2hvb2tzL2NvbW1pdC1tc2cKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvbWFpbi9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Rvb2xzL3Jvb3QvaG9va3MvY29tbWl0LW1zZwpAQCAtMTUzLDcgKzE1Myw3IEBACiAJCWlmICh1bnByaW50ZWQpIHsKIAkJCXByaW50ICJDaGFuZ2UtSWQ6IEknIiRpZCInIgogCQl9Ci0JfScgIiRNU0ciID4gJFQgJiYgbXYgJFQgIiRNU0ciIHx8IHJtIC1mICRUCisJfScgIiRNU0ciID4gIiRUIiAmJiBtdiAiJFQiICIkTVNHIiB8fCBybSAtZiAiJFQiCiB9CiBfZ2VuX0NoYW5nZUlkSW5wdXQoKSB7CiAJZWNobyAidHJlZSBgZ2l0IHdyaXRlLXRyZWVgIgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL0dlcnJpdENvbW1vblRlc3QuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9HZXJyaXRDb21tb25UZXN0LmphdmEKaW5kZXggOWYyY2NiZi4uOThiMGI0YSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL0dlcnJpdENvbW1vblRlc3QuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvR2Vycml0Q29tbW9uVGVzdC5qYXZhCkBAIC0xNCw2OCArMTQsMTE1IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQucnVsZXM7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BcHByb3ZhbFR5cGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeVZhbHVlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGVzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVmFsdWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5DaGFuZ2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BbGxQcm9qZWN0c05hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Qcm9qZWN0Q29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0U3RhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CiAKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5BcnJheXM7Ci1pbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLlNldDsKIAogcHVibGljIGNsYXNzIEdlcnJpdENvbW1vblRlc3QgZXh0ZW5kcyBQcm9sb2dUZXN0Q2FzZSB7CisgIHByaXZhdGUgUHJvamVjdHMgcHJvamVjdHM7CisKICAgQE92ZXJyaWRlCiAgIHB1YmxpYyB2b2lkIHNldFVwKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgc3VwZXIuc2V0VXAoKTsKLQotICAgIGZpbmFsIEFwcHJvdmFsVHlwZXMgdHlwZXMgPSBuZXcgQXBwcm92YWxUeXBlcyhBcnJheXMuYXNMaXN0KAotICAgICAgICBjb2RlUmV2aWV3Q2F0ZWdvcnkoKSwKLSAgICAgICAgdmVyaWZpZWRDYXRlZ29yeSgpCi0gICAgKSk7Ci0KKyAgICBwcm9qZWN0cyA9IG5ldyBQcm9qZWN0cyhuZXcgTGFiZWxUeXBlcyhBcnJheXMuYXNMaXN0KAorICAgICAgICBjYXRlZ29yeSgiQ29kZS1SZXZpZXciLAorICAgICAgICAgICAgdmFsdWUoMiwgIkxvb2tzIGdvb2QgdG8gbWUsIGFwcHJvdmVkIiksCisgICAgICAgICAgICB2YWx1ZSgxLCAiTG9va3MgZ29vZCB0byBtZSwgYnV0IHNvbWVvbmUgZWxzZSBtdXN0IGFwcHJvdmUiKSwKKyAgICAgICAgICAgIHZhbHVlKDAsICJObyBzY29yZSIpLAorICAgICAgICAgICAgdmFsdWUoLTEsICJJIHdvdWxkIHByZWZlciB0aGF0IHlvdSBkaWRuJ3Qgc3VibWl0IHRoaXMiKSwKKyAgICAgICAgICAgIHZhbHVlKC0yLCAiRG8gbm90IHN1Ym1pdCIpKSwKKyAgICAgICAgY2F0ZWdvcnkoIlZlcmlmaWVkIiwgdmFsdWUoMSwgIlZlcmlmaWVkIiksCisgICAgICAgICAgICB2YWx1ZSgwLCAiTm8gc2NvcmUiKSwgdmFsdWUoLTEsICJGYWlscyIpKSkpKTsKICAgICBsb2FkKCJnZXJyaXQiLCAiZ2Vycml0X2NvbW1vbl90ZXN0LnBsIiwgbmV3IEFic3RyYWN0TW9kdWxlKCkgewogICAgICAgQE92ZXJyaWRlCiAgICAgICBwcm90ZWN0ZWQgdm9pZCBjb25maWd1cmUoKSB7Ci0gICAgICAgIGJpbmQoQXBwcm92YWxUeXBlcy5jbGFzcykudG9JbnN0YW5jZSh0eXBlcyk7CisgICAgICAgIGJpbmQoUHJvamVjdENhY2hlLmNsYXNzKS50b0luc3RhbmNlKHByb2plY3RzKTsKICAgICAgIH0KICAgICB9KTsKICAgfQogCi0gIHByaXZhdGUgc3RhdGljIEFwcHJvdmFsVHlwZSBjb2RlUmV2aWV3Q2F0ZWdvcnkoKSB7Ci0gICAgQXBwcm92YWxDYXRlZ29yeSBjYXQgPSBjYXRlZ29yeSgwLCAiQ1JWVyIsICJDb2RlIFJldmlldyIpOwotICAgIExpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPiB2YWxzID0gbmV3TGlzdCgpOwotICAgIHZhbHMuYWRkKHZhbHVlKGNhdCwgMiwgIkxvb2tzIGdvb2QgdG8gbWUsIGFwcHJvdmVkIikpOwotICAgIHZhbHMuYWRkKHZhbHVlKGNhdCwgMSwgIkxvb2tzIGdvb2QgdG8gbWUsIGJ1dCBzb21lb25lIGVsc2UgbXVzdCBhcHByb3ZlIikpOwotICAgIHZhbHMuYWRkKHZhbHVlKGNhdCwgMCwgIk5vIHNjb3JlIikpOwotICAgIHZhbHMuYWRkKHZhbHVlKGNhdCwgLTEsICJJIHdvdWxkIHByZWZlciB0aGF0IHlvdSBkaWRuJ3Qgc3VibWl0IHRoaXMiKSk7Ci0gICAgdmFscy5hZGQodmFsdWUoY2F0LCAtMiwgIkRvIG5vdCBzdWJtaXQiKSk7Ci0gICAgcmV0dXJuIG5ldyBBcHByb3ZhbFR5cGUoY2F0LCB2YWxzKTsKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCB2b2lkIHNldFVwRW52aXJvbm1lbnQoUHJvbG9nRW52aXJvbm1lbnQgZW52KSB7CisgICAgZW52LnNldChTdG9yZWRWYWx1ZXMuQ0hBTkdFLCBuZXcgQ2hhbmdlKAorICAgICAgICBuZXcgQ2hhbmdlLktleSgiSWJlZWYiKSwgbmV3IENoYW5nZS5JZCgxKSwgbmV3IEFjY291bnQuSWQoMiksCisgICAgICAgIG5ldyBCcmFuY2guTmFtZUtleShwcm9qZWN0cy5hbGxQcm9qZWN0c05hbWUsICJtYXN0ZXIiKSkpOwogICB9CiAKLSAgcHJpdmF0ZSBzdGF0aWMgQXBwcm92YWxUeXBlIHZlcmlmaWVkQ2F0ZWdvcnkoKSB7Ci0gICAgQXBwcm92YWxDYXRlZ29yeSBjYXQgPSBjYXRlZ29yeSgxLCAiVlJJRiIsICJWZXJpZmllZCIpOwotICAgIExpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPiB2YWxzID0gbmV3TGlzdCgpOwotICAgIHZhbHMuYWRkKHZhbHVlKGNhdCwgMSwgIlZlcmlmaWVkIikpOwotICAgIHZhbHMuYWRkKHZhbHVlKGNhdCwgMCwgIk5vIHNjb3JlIikpOwotICAgIHZhbHMuYWRkKHZhbHVlKGNhdCwgLTEsICJGYWlscyIpKTsKLSAgICByZXR1cm4gbmV3IEFwcHJvdmFsVHlwZShjYXQsIHZhbHMpOworICBwcml2YXRlIHN0YXRpYyBMYWJlbFZhbHVlIHZhbHVlKGludCB2YWx1ZSwgU3RyaW5nIHRleHQpIHsKKyAgICByZXR1cm4gbmV3IExhYmVsVmFsdWUoKHNob3J0KSB2YWx1ZSwgdGV4dCk7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBBcHByb3ZhbENhdGVnb3J5IGNhdGVnb3J5KGludCBwb3MsIFN0cmluZyBpZCwgU3RyaW5nIG5hbWUpIHsKLSAgICBBcHByb3ZhbENhdGVnb3J5IGNhdDsKLSAgICBjYXQgPSBuZXcgQXBwcm92YWxDYXRlZ29yeShuZXcgQXBwcm92YWxDYXRlZ29yeS5JZChpZCksIG5hbWUpOwotICAgIGNhdC5zZXRQb3NpdGlvbigoc2hvcnQpIHBvcyk7Ci0gICAgcmV0dXJuIGNhdDsKKyAgcHJpdmF0ZSBzdGF0aWMgTGFiZWxUeXBlIGNhdGVnb3J5KFN0cmluZyBuYW1lLCBMYWJlbFZhbHVlLi4uIHZhbHVlcykgeworICAgIHJldHVybiBuZXcgTGFiZWxUeXBlKG5hbWUsIEFycmF5cy5hc0xpc3QodmFsdWVzKSk7CiAgIH0KIAotICBwcml2YXRlIHN0YXRpYyBBcnJheUxpc3Q8QXBwcm92YWxDYXRlZ29yeVZhbHVlPiBuZXdMaXN0KCkgewotICAgIHJldHVybiBuZXcgQXJyYXlMaXN0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZT4oKTsKLSAgfQorICBwcml2YXRlIHN0YXRpYyBjbGFzcyBQcm9qZWN0cyBpbXBsZW1lbnRzIFByb2plY3RDYWNoZSB7CisgICAgcHJpdmF0ZSBmaW5hbCBBbGxQcm9qZWN0c05hbWUgYWxsUHJvamVjdHNOYW1lOworICAgIHByaXZhdGUgZmluYWwgUHJvamVjdFN0YXRlIGFsbFByb2plY3RzOwogCi0gIHByaXZhdGUgc3RhdGljIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSB2YWx1ZShBcHByb3ZhbENhdGVnb3J5IGMsIGludCB2LCBTdHJpbmcgbikgewotICAgIHJldHVybiBuZXcgQXBwcm92YWxDYXRlZ29yeVZhbHVlKAotICAgICAgICBuZXcgQXBwcm92YWxDYXRlZ29yeVZhbHVlLklkKGMuZ2V0SWQoKSwgKHNob3J0KSB2KSwKLSAgICAgICAgbik7CisgICAgcHJpdmF0ZSBQcm9qZWN0cyhMYWJlbFR5cGVzIGxhYmVsVHlwZXMpIHsKKyAgICAgIGFsbFByb2plY3RzTmFtZSA9IG5ldyBBbGxQcm9qZWN0c05hbWUoIkFsbC1Qcm9qZWN0cyIpOworICAgICAgUHJvamVjdENvbmZpZyBjb25maWcgPSBuZXcgUHJvamVjdENvbmZpZyhhbGxQcm9qZWN0c05hbWUpOworICAgICAgY29uZmlnLmNyZWF0ZUluTWVtb3J5KCk7CisgICAgICBmb3IgKExhYmVsVHlwZSBsYWJlbCA6IGxhYmVsVHlwZXMuZ2V0TGFiZWxUeXBlcygpKSB7CisgICAgICAgIGNvbmZpZy5nZXRMYWJlbFNlY3Rpb25zKCkucHV0KGxhYmVsLmdldE5hbWUoKSwgbGFiZWwpOworICAgICAgfQorICAgICAgYWxsUHJvamVjdHMgPSBuZXcgUHJvamVjdFN0YXRlKHRoaXMsIGFsbFByb2plY3RzTmFtZSwgbnVsbCwKKyAgICAgICAgICBudWxsLCBudWxsLCBudWxsLCBjb25maWcpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBQcm9qZWN0U3RhdGUgZ2V0QWxsUHJvamVjdHMoKSB7CisgICAgICB0aHJvdyBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24oKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgUHJvamVjdFN0YXRlIGdldChQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUpIHsKKyAgICAgIGFzc2VydEVxdWFscyhhbGxQcm9qZWN0c05hbWUsIHByb2plY3ROYW1lKTsKKyAgICAgIHJldHVybiBhbGxQcm9qZWN0czsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgdm9pZCBldmljdChQcm9qZWN0IHApIHsKKyAgICAgIHRocm93IG5ldyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbigpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIHJlbW92ZShQcm9qZWN0IHApIHsKKyAgICAgIHRocm93IG5ldyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbigpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBJdGVyYWJsZTxQcm9qZWN0Lk5hbWVLZXk+IGFsbCgpIHsKKyAgICAgIHRocm93IG5ldyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbigpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyBTZXQ8QWNjb3VudEdyb3VwLlVVSUQ+IGd1ZXNzUmVsZXZhbnRHcm91cFVVSURzKCkgeworICAgICAgdGhyb3cgbmV3IFVuc3VwcG9ydGVkT3BlcmF0aW9uRXhjZXB0aW9uKCk7CisgICAgfQorCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIEl0ZXJhYmxlPFByb2plY3QuTmFtZUtleT4gYnlOYW1lKFN0cmluZyBwcmVmaXgpIHsKKyAgICAgIHRocm93IG5ldyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbigpOworICAgIH0KKworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIG9uQ3JlYXRlUHJvamVjdChQcm9qZWN0Lk5hbWVLZXkgbmV3UHJvamVjdE5hbWUpIHsKKyAgICAgIHRocm93IG5ldyBVbnN1cHBvcnRlZE9wZXJhdGlvbkV4Y2VwdGlvbigpOworICAgIH0KICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL1Byb2xvZ1Rlc3RDYXNlLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJvbG9nVGVzdENhc2UuamF2YQppbmRleCBjYzlkNDBmLi44MzgwOWE0IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJvbG9nVGVzdENhc2UuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvUHJvbG9nVGVzdENhc2UuamF2YQpAQCAtNzksNiArNzksOSBAQAogICAgIG1hY2hpbmUgPSBQcm9sb2dNYWNoaW5lQ29weS5zYXZlKGVudik7CiAgIH0KIAorICBwcm90ZWN0ZWQgdm9pZCBzZXRVcEVudmlyb25tZW50KFByb2xvZ0Vudmlyb25tZW50IGVudikgeworICB9CisKICAgcHJpdmF0ZSBQcm9sb2dNYWNoaW5lQ29weSBuZXdNYWNoaW5lKCkgewogICAgIEJ1ZmZlcmluZ1Byb2xvZ0NvbnRyb2wgY3RsID0gbmV3IEJ1ZmZlcmluZ1Byb2xvZ0NvbnRyb2woKTsKICAgICBjdGwuc2V0TWF4RGF0YWJhc2VTaXplKDE2ICogMTAyNCk7CkBAIC0xMTcsNiArMTIwLDcgQEAKIAogICAgIGZvciAoVGVybSB0ZXN0IDogdGVzdHMpIHsKICAgICAgIFByb2xvZ0Vudmlyb25tZW50IGVudiA9IGVudkZhY3RvcnkuY3JlYXRlKG1hY2hpbmUpOworICAgICAgc2V0VXBFbnZpcm9ubWVudChlbnYpOwogICAgICAgZW52LnNldEVuYWJsZWQoUHJvbG9nLkZlYXR1cmUuSU8sIHRydWUpOwogCiAgICAgICBTeXN0ZW0ub3V0LmZvcm1hdCgiUHJvbG9nICUtNjBzIC4uLiIsIHJlbW92ZVBhY2thZ2UodGVzdCkpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9naXQvU3VibW9kdWxlT3BUZXN0LmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtb2R1bGVPcFRlc3QuamF2YQppbmRleCA4ZDA2MWViLi4zMjJmZmUyIDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtb2R1bGVPcFRlc3QuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL2dpdC9TdWJtb2R1bGVPcFRlc3QuamF2YQpAQCAtMTQsMTAgKzE0LDEzIEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdDsKIAoraW1wb3J0IHN0YXRpYyBvcmcuZWFzeW1vY2suRWFzeU1vY2suY2FwdHVyZTsKIGltcG9ydCBzdGF0aWMgb3JnLmVhc3ltb2NrLkVhc3lNb2NrLmNyZWF0ZVN0cmljdE1vY2s7CitpbXBvcnQgc3RhdGljIG9yZy5lYXN5bW9jay5FYXN5TW9jay5lcTsKIGltcG9ydCBzdGF0aWMgb3JnLmVhc3ltb2NrLkVhc3lNb2NrLmV4cGVjdDsKIGltcG9ydCBzdGF0aWMgb3JnLmVhc3ltb2NrLkVhc3lNb2NrLnJlcGxheTsKIGltcG9ydCBzdGF0aWMgb3JnLmVhc3ltb2NrLkVhc3lNb2NrLnZlcmlmeTsKK2ltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRFcXVhbHM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQnJhbmNoOwpAQCAtMzQsNiArMzcsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TdGFuZGFyZEtleUVuY29kZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiAKK2ltcG9ydCBvcmcuZWFzeW1vY2suQ2FwdHVyZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmFwaS5HaXQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5kaXJjYWNoZS5EaXJDYWNoZUJ1aWxkZXI7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5kaXJjYWNoZS5EaXJDYWNoZUVudHJ5OwpAQCAtNDMsNiArNDcsNyBAQAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkZpbGVNb2RlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLk9iamVjdEluc2VydGVyOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlBlcnNvbklkZW50OworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlZlVwZGF0ZTsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQucmV2d2Fsay5SZXZDb21taXQ7CiBpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5yZXZ3YWxrLlJldldhbGs7CkBAIC03Miw3ICs3Nyw3IEBACiAgIHByaXZhdGUgUmV2aWV3RGIgc2NoZW1hOwogICBwcml2YXRlIFByb3ZpZGVyPFN0cmluZz4gdXJsUHJvdmlkZXI7CiAgIHByaXZhdGUgR2l0UmVwb3NpdG9yeU1hbmFnZXIgcmVwb01hbmFnZXI7Ci0gIHByaXZhdGUgR2l0UmVmZXJlbmNlVXBkYXRlZCByZXBsaWNhdGlvbjsKKyAgcHJpdmF0ZSBHaXRSZWZlcmVuY2VVcGRhdGVkIGdpdFJlZlVwZGF0ZWQ7CiAKICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCiAgIEBPdmVycmlkZQpAQCAtODUsMjIgKzkwLDIyIEBACiAgICAgc3Vic2NyaXB0aW9ucyA9IGNyZWF0ZVN0cmljdE1vY2soU3VibW9kdWxlU3Vic2NyaXB0aW9uQWNjZXNzLmNsYXNzKTsKICAgICB1cmxQcm92aWRlciA9IGNyZWF0ZVN0cmljdE1vY2soUHJvdmlkZXIuY2xhc3MpOwogICAgIHJlcG9NYW5hZ2VyID0gY3JlYXRlU3RyaWN0TW9jayhHaXRSZXBvc2l0b3J5TWFuYWdlci5jbGFzcyk7Ci0gICAgcmVwbGljYXRpb24gPSBjcmVhdGVTdHJpY3RNb2NrKEdpdFJlZmVyZW5jZVVwZGF0ZWQuY2xhc3MpOworICAgIGdpdFJlZlVwZGF0ZWQgPSBjcmVhdGVTdHJpY3RNb2NrKEdpdFJlZmVyZW5jZVVwZGF0ZWQuY2xhc3MpOwogICB9CiAKICAgcHJpdmF0ZSB2b2lkIGRvUmVwbGF5KCkgewogICAgIHJlcGxheShzY2hlbWFGYWN0b3J5LCBzY2hlbWEsIHN1YnNjcmlwdGlvbnMsIHVybFByb3ZpZGVyLCByZXBvTWFuYWdlciwKLSAgICAgICAgcmVwbGljYXRpb24pOworICAgICAgICBnaXRSZWZVcGRhdGVkKTsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBkb1ZlcmlmeSgpIHsKICAgICB2ZXJpZnkoc2NoZW1hRmFjdG9yeSwgc2NoZW1hLCBzdWJzY3JpcHRpb25zLCB1cmxQcm92aWRlciwgcmVwb01hbmFnZXIsCi0gICAgICAgIHJlcGxpY2F0aW9uKTsKKyAgICAgICAgZ2l0UmVmVXBkYXRlZCk7CiAgIH0KIAogICAvKioKICAgICogSXQgdGVzdHMgU3VibW9kdWxlLnVwZGF0ZSBpbiB0aGUgc2NlbmFyaW8gYSBtZXJnZWQgY29tbWl0IGlzIGFuIGVtcHR5IG9uZQotICAgKiAoaXQgZG9lcyBub3QgaGF2ZSBhIC5naXRtb2R1bGUgZmlsZSkgYW5kIHRoZSBwcm9qZWN0IHRoZSBjb21taXQgd2FzIG1lcmdlZAorICAgKiAoaXQgZG9lcyBub3QgaGF2ZSBhIC5naXRtb2R1bGVzIGZpbGUpIGFuZCB0aGUgcHJvamVjdCB0aGUgY29tbWl0IHdhcyBtZXJnZWQKICAgICogaXMgbm90IGEgc3VibW9kdWxlIG9mIG90aGVyIHByb2plY3QuCiAgICAqCiAgICAqIEB0aHJvd3MgRXhjZXB0aW9uIElmIGFuIGV4Y2VwdGlvbiBvY2N1cnMuCkBAIC02MDMsMTcgKzYwOCwxNyBAQAogCiAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBjb2RlUmV2aWV3Q29tbWl0ID0KICAgICAgICAgbmV3IENvZGVSZXZpZXdDb21taXQoc291cmNlTWVyZ2VUaXAudG9PYmplY3RJZCgpKTsKLSAgICBmaW5hbCBDaGFuZ2Ugc3VibWl0ZWRDaGFuZ2UgPQorICAgIGZpbmFsIENoYW5nZSBzdWJtaXR0ZWRDaGFuZ2UgPQogICAgICAgICBuZXcgQ2hhbmdlKG5ldyBDaGFuZ2UuS2V5KHNvdXJjZU1lcmdlVGlwLnRvT2JqZWN0SWQoKS5nZXROYW1lKCkpLAogICAgICAgICAgICAgbmV3IENoYW5nZS5JZCgxKSwgbmV3IEFjY291bnQuSWQoMSksIHNvdXJjZUJyYW5jaE5hbWVLZXkpOwotICAgIGNvZGVSZXZpZXdDb21taXQuY2hhbmdlID0gc3VibWl0ZWRDaGFuZ2U7CisgICAgY29kZVJldmlld0NvbW1pdC5jaGFuZ2UgPSBzdWJtaXR0ZWRDaGFuZ2U7CiAKICAgICBmaW5hbCBNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PiBtZXJnZWRDb21taXRzID0KICAgICAgICAgbmV3IEhhc2hNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PigpOwogICAgIG1lcmdlZENvbW1pdHMucHV0KGNvZGVSZXZpZXdDb21taXQuY2hhbmdlLmdldElkKCksIGNvZGVSZXZpZXdDb21taXQpOwogCi0gICAgZmluYWwgTGlzdDxDaGFuZ2U+IHN1Ym1pdGVkID0gbmV3IEFycmF5TGlzdDxDaGFuZ2U+KCk7Ci0gICAgc3VibWl0ZWQuYWRkKHN1Ym1pdGVkQ2hhbmdlKTsKKyAgICBmaW5hbCBMaXN0PENoYW5nZT4gc3VibWl0dGVkID0gbmV3IEFycmF5TGlzdDxDaGFuZ2U+KCk7CisgICAgc3VibWl0dGVkLmFkZChzdWJtaXR0ZWRDaGFuZ2UpOwogCiAgICAgZmluYWwgUmVwb3NpdG9yeSB0YXJnZXRSZXBvc2l0b3J5ID0gY3JlYXRlV29ya1JlcG9zaXRvcnkoKTsKICAgICBmaW5hbCBHaXQgdGFyZ2V0R2l0ID0gbmV3IEdpdCh0YXJnZXRSZXBvc2l0b3J5KTsKQEAgLTYzOSw4ICs2NDQsOSBAQAogICAgIGV4cGVjdChyZXBvTWFuYWdlci5vcGVuUmVwb3NpdG9yeSh0YXJnZXRCcmFuY2hOYW1lS2V5LmdldFBhcmVudEtleSgpKSkKICAgICAgICAgLmFuZFJldHVybih0YXJnZXRSZXBvc2l0b3J5KTsKIAotICAgIHJlcGxpY2F0aW9uLmZpcmUodGFyZ2V0QnJhbmNoTmFtZUtleS5nZXRQYXJlbnRLZXkoKSwKLSAgICAgICAgdGFyZ2V0QnJhbmNoTmFtZUtleS5nZXQoKSk7CisgICAgQ2FwdHVyZTxSZWZVcGRhdGU+IHJ1Q2FwdHVyZSA9IG5ldyBDYXB0dXJlPFJlZlVwZGF0ZT4oKTsKKyAgICBnaXRSZWZVcGRhdGVkLmZpcmUoZXEodGFyZ2V0QnJhbmNoTmFtZUtleS5nZXRQYXJlbnRLZXkoKSksCisgICAgICAgIGNhcHR1cmUocnVDYXB0dXJlKSk7CiAKICAgICBleHBlY3Qoc2NoZW1hLnN1Ym1vZHVsZVN1YnNjcmlwdGlvbnMoKSkuYW5kUmV0dXJuKHN1YnNjcmlwdGlvbnMpOwogICAgIGZpbmFsIFJlc3VsdFNldDxTdWJtb2R1bGVTdWJzY3JpcHRpb24+IGVtcHR5U3Vic2NyaXB0aW9ucyA9CkBAIC02NTgsMTIgKzY2NCwxNCBAQAogICAgIGZpbmFsIFN1Ym1vZHVsZU9wIHN1Ym1vZHVsZU9wID0KICAgICAgICAgbmV3IFN1Ym1vZHVsZU9wKHNvdXJjZUJyYW5jaE5hbWVLZXksIHNvdXJjZU1lcmdlVGlwLCBuZXcgUmV2V2FsaygKICAgICAgICAgICAgIHNvdXJjZVJlcG9zaXRvcnkpLCB1cmxQcm92aWRlciwgc2NoZW1hRmFjdG9yeSwgc291cmNlUmVwb3NpdG9yeSwKLSAgICAgICAgICAgIG5ldyBQcm9qZWN0KHNvdXJjZUJyYW5jaE5hbWVLZXkuZ2V0UGFyZW50S2V5KCkpLCBzdWJtaXRlZCwKLSAgICAgICAgICAgIG1lcmdlZENvbW1pdHMsIG15SWRlbnQsIHJlcG9NYW5hZ2VyLCByZXBsaWNhdGlvbik7CisgICAgICAgICAgICBuZXcgUHJvamVjdChzb3VyY2VCcmFuY2hOYW1lS2V5LmdldFBhcmVudEtleSgpKSwgc3VibWl0dGVkLAorICAgICAgICAgICAgbWVyZ2VkQ29tbWl0cywgbXlJZGVudCwgcmVwb01hbmFnZXIsIGdpdFJlZlVwZGF0ZWQpOwogCiAgICAgc3VibW9kdWxlT3AudXBkYXRlKCk7CiAKICAgICBkb1ZlcmlmeSgpOworICAgIFJlZlVwZGF0ZSBydSA9IHJ1Q2FwdHVyZS5nZXRWYWx1ZSgpOworICAgIGFzc2VydEVxdWFscyhydS5nZXROYW1lKCksIHRhcmdldEJyYW5jaE5hbWVLZXkuZ2V0KCkpOwogICB9CiAKICAgLyoqCkBAIC03MDQsMTcgKzcxMiwxNyBAQAogCiAgICAgZmluYWwgQ29kZVJldmlld0NvbW1pdCBjb2RlUmV2aWV3Q29tbWl0ID0KICAgICAgICAgbmV3IENvZGVSZXZpZXdDb21taXQoc291cmNlTWVyZ2VUaXAudG9PYmplY3RJZCgpKTsKLSAgICBmaW5hbCBDaGFuZ2Ugc3VibWl0ZWRDaGFuZ2UgPQorICAgIGZpbmFsIENoYW5nZSBzdWJtaXR0ZWRDaGFuZ2UgPQogICAgICAgICBuZXcgQ2hhbmdlKG5ldyBDaGFuZ2UuS2V5KHNvdXJjZU1lcmdlVGlwLnRvT2JqZWN0SWQoKS5nZXROYW1lKCkpLAogICAgICAgICAgICAgbmV3IENoYW5nZS5JZCgxKSwgbmV3IEFjY291bnQuSWQoMSksIHNvdXJjZUJyYW5jaE5hbWVLZXkpOwotICAgIGNvZGVSZXZpZXdDb21taXQuY2hhbmdlID0gc3VibWl0ZWRDaGFuZ2U7CisgICAgY29kZVJldmlld0NvbW1pdC5jaGFuZ2UgPSBzdWJtaXR0ZWRDaGFuZ2U7CiAKICAgICBmaW5hbCBNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PiBtZXJnZWRDb21taXRzID0KICAgICAgICAgbmV3IEhhc2hNYXA8Q2hhbmdlLklkLCBDb2RlUmV2aWV3Q29tbWl0PigpOwogICAgIG1lcmdlZENvbW1pdHMucHV0KGNvZGVSZXZpZXdDb21taXQuY2hhbmdlLmdldElkKCksIGNvZGVSZXZpZXdDb21taXQpOwogCi0gICAgZmluYWwgTGlzdDxDaGFuZ2U+IHN1Ym1pdGVkID0gbmV3IEFycmF5TGlzdDxDaGFuZ2U+KCk7Ci0gICAgc3VibWl0ZWQuYWRkKHN1Ym1pdGVkQ2hhbmdlKTsKKyAgICBmaW5hbCBMaXN0PENoYW5nZT4gc3VibWl0dGVkID0gbmV3IEFycmF5TGlzdDxDaGFuZ2U+KCk7CisgICAgc3VibWl0dGVkLmFkZChzdWJtaXR0ZWRDaGFuZ2UpOwogCiAgICAgZmluYWwgUmVwb3NpdG9yeSB0YXJnZXRSZXBvc2l0b3J5ID0gY3JlYXRlV29ya1JlcG9zaXRvcnkoKTsKICAgICBmaW5hbCBHaXQgdGFyZ2V0R2l0ID0gbmV3IEdpdCh0YXJnZXRSZXBvc2l0b3J5KTsKQEAgLTc0MCw4ICs3NDgsOSBAQAogICAgIGV4cGVjdChyZXBvTWFuYWdlci5vcGVuUmVwb3NpdG9yeSh0YXJnZXRCcmFuY2hOYW1lS2V5LmdldFBhcmVudEtleSgpKSkKICAgICAgICAgLmFuZFJldHVybih0YXJnZXRSZXBvc2l0b3J5KTsKIAotICAgIHJlcGxpY2F0aW9uLmZpcmUodGFyZ2V0QnJhbmNoTmFtZUtleS5nZXRQYXJlbnRLZXkoKSwKLSAgICAgICAgdGFyZ2V0QnJhbmNoTmFtZUtleS5nZXQoKSk7CisgICAgQ2FwdHVyZTxSZWZVcGRhdGU+IHJ1Q2FwdHVyZSA9IG5ldyBDYXB0dXJlPFJlZlVwZGF0ZT4oKTsKKyAgICBnaXRSZWZVcGRhdGVkLmZpcmUoZXEodGFyZ2V0QnJhbmNoTmFtZUtleS5nZXRQYXJlbnRLZXkoKSksCisgICAgICAgIGNhcHR1cmUocnVDYXB0dXJlKSk7CiAKICAgICBleHBlY3Qoc2NoZW1hLnN1Ym1vZHVsZVN1YnNjcmlwdGlvbnMoKSkuYW5kUmV0dXJuKHN1YnNjcmlwdGlvbnMpOwogICAgIGZpbmFsIFJlc3VsdFNldDxTdWJtb2R1bGVTdWJzY3JpcHRpb24+IGluY29ycmVjdFN1YnNjcmlwdGlvbnMgPQpAQCAtNzYxLDEyICs3NzAsMTQgQEAKICAgICBmaW5hbCBTdWJtb2R1bGVPcCBzdWJtb2R1bGVPcCA9CiAgICAgICAgIG5ldyBTdWJtb2R1bGVPcChzb3VyY2VCcmFuY2hOYW1lS2V5LCBzb3VyY2VNZXJnZVRpcCwgbmV3IFJldldhbGsoCiAgICAgICAgICAgICBzb3VyY2VSZXBvc2l0b3J5KSwgdXJsUHJvdmlkZXIsIHNjaGVtYUZhY3RvcnksIHNvdXJjZVJlcG9zaXRvcnksCi0gICAgICAgICAgICBuZXcgUHJvamVjdChzb3VyY2VCcmFuY2hOYW1lS2V5LmdldFBhcmVudEtleSgpKSwgc3VibWl0ZWQsCi0gICAgICAgICAgICBtZXJnZWRDb21taXRzLCBteUlkZW50LCByZXBvTWFuYWdlciwgcmVwbGljYXRpb24pOworICAgICAgICAgICAgbmV3IFByb2plY3Qoc291cmNlQnJhbmNoTmFtZUtleS5nZXRQYXJlbnRLZXkoKSksIHN1Ym1pdHRlZCwKKyAgICAgICAgICAgIG1lcmdlZENvbW1pdHMsIG15SWRlbnQsIHJlcG9NYW5hZ2VyLCBnaXRSZWZVcGRhdGVkKTsKIAogICAgIHN1Ym1vZHVsZU9wLnVwZGF0ZSgpOwogCiAgICAgZG9WZXJpZnkoKTsKKyAgICBSZWZVcGRhdGUgcnUgPSBydUNhcHR1cmUuZ2V0VmFsdWUoKTsKKyAgICBhc3NlcnRFcXVhbHMocnUuZ2V0TmFtZSgpLCB0YXJnZXRCcmFuY2hOYW1lS2V5LmdldCgpKTsKICAgfQogCiAgIC8qKgpAQCAtNzg0LDcgKzc5NSw3IEBACiAgICAqIEBwYXJhbSBnaXRNb2R1bGVzRmlsZUNvbnRlbnQgVGhlIC5naXRtb2R1bGVzIGZpbGUgY29udGVudC4gRHVyaW5nIHRoZSB0ZXN0CiAgICAqICAgICAgICB0aGlzIGZpbGUgaXMgY3JlYXRlZCwgc28gdGhlIGNvbW1pdCBjb250YWluaW5nIGl0LgogICAgKiBAcGFyYW0gc291cmNlQnJhbmNoTmFtZSBUaGUgYnJhbmNoIG5hbWUgb2Ygc291cmNlIHByb2plY3QgInBvaW50ZWQgYnkiCi0gICAqICAgICAgICAuZ2l0bW9kdWxlIGZpbGUuCisgICAqICAgICAgICAuZ2l0bW9kdWxlcyBmaWxlLgogICAgKiBAdGhyb3dzIEV4Y2VwdGlvbiBJZiBhbiBleGNlcHRpb24gb2NjdXJzLgogICAgKi8KICAgcHJpdmF0ZSB2b2lkIGRvT25lU3Vic2NyaXB0aW9uSW5zZXJ0KGZpbmFsIFN0cmluZyBnaXRNb2R1bGVzRmlsZUNvbnRlbnQsCkBAIC04MTUsNyArODI2LDcgQEAKICAgICogc291cmNlIG9mIGFub3RoZXIgcHJvamVjdCAobm8gc3Vic2NyaWJlcnMgZm91bmQgdG8gdGhpcyBwcm9qZWN0KS4KICAgICogPC9wPgogICAgKgotICAgKiBAcGFyYW0gZ2l0TW9kdWxlc0ZpbGVDb250ZW50IFRoZSAuZ2l0bW9kdWxlIGZpbGUgY29udGVudC4KKyAgICogQHBhcmFtIGdpdE1vZHVsZXNGaWxlQ29udGVudCBUaGUgLmdpdG1vZHVsZXMgZmlsZSBjb250ZW50LgogICAgKiBAcGFyYW0gbWVyZ2VkQnJhbmNoIFRoZSB7QGxpbmsgQnJhbmNoLk5hbWVLZXl9IGluc3RhbmNlIHJlcHJlc2VudGluZyB0aGUKICAgICogICAgICAgIHByb2plY3QvYnJhbmNoIHRoZSBjb21taXQgd2FzIG1lcmdlZC4KICAgICogQHBhcmFtIGV4dHJhY3RlZFN1YnNjcmlwdGlvbnMgVGhlIHN1YnNjcmlwdGlvbiByb3dzIGV4dHJhY3RlZCBmcm9tCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3Byb2plY3QvUmVmQ29udHJvbFRlc3QuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SZWZDb250cm9sVGVzdC5qYXZhCmluZGV4IGQ0YjA3YWUuLjUxZWE1YTIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SZWZDb250cm9sVGVzdC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvcHJvamVjdC9SZWZDb250cm9sVGVzdC5qYXZhCkBAIC0xNCw2ICsxNCw3IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3Q7CiAKK2ltcG9ydCBzdGF0aWMgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuUGVybWlzc2lvbi5FRElUX1RPUElDX05BTUU7CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb24uTEFCRUw7CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb24uT1dORVI7CiBpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLlBlcm1pc3Npb24uUFVTSDsKQEAgLTMzLDcgKzM0LDYgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5ydWxlcy5Qcm9sb2dFbnZpcm9ubWVudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5ydWxlcy5SdWxlc0NhY2hlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5BY2Nlc3NQYXRoOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5DdXJyZW50VXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5DYXBhYmlsaXR5Q29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cE1lbWJlcnNoaXA7CkBAIC0yNTQsNiArMjU0LDEzOSBAQAogICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHZvdGUgLTIiLCByYW5nZS5jb250YWlucygtMikpOwogICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHZvdGUgMiIsIHJhbmdlLmNvbnRhaW5zKDIpKTsKICAgfQorCisgIHB1YmxpYyB2b2lkIHRlc3RVbmJsb2NrTm9Gb3JjZSgpIHsKKyAgICBncmFudChsb2NhbCwgUFVTSCwgYW5vbnltb3VzLCAicmVmcy9oZWFkcy8qIikuc2V0QmxvY2soKTsKKyAgICBncmFudChsb2NhbCwgUFVTSCwgZGV2cywgInJlZnMvaGVhZHMvKiIpOworCisgICAgUHJvamVjdENvbnRyb2wgdSA9IHVzZXIoZGV2cyk7CisgICAgYXNzZXJ0VHJ1ZSgidSBjYW4gcHVzaCIsIHUuY29udHJvbEZvclJlZigicmVmcy9oZWFkcy9tYXN0ZXIiKS5jYW5VcGRhdGUoKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCB0ZXN0VW5ibG9ja0ZvcmNlKCkgeworICAgIFBlcm1pc3Npb25SdWxlIHIgPSBncmFudChsb2NhbCwgUFVTSCwgYW5vbnltb3VzLCAicmVmcy9oZWFkcy8qIik7CisgICAgci5zZXRCbG9jaygpOworICAgIHIuc2V0Rm9yY2UodHJ1ZSk7CisgICAgZ3JhbnQobG9jYWwsIFBVU0gsIGRldnMsICJyZWZzL2hlYWRzLyoiKS5zZXRGb3JjZSh0cnVlKTsKKworICAgIFByb2plY3RDb250cm9sIHUgPSB1c2VyKGRldnMpOworICAgIGFzc2VydFRydWUoInUgY2FuIGZvcmNlIHB1c2giLCB1LmNvbnRyb2xGb3JSZWYoInJlZnMvaGVhZHMvbWFzdGVyIikuY2FuRm9yY2VVcGRhdGUoKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCB0ZXN0VW5ibG9ja0ZvcmNlV2l0aEFsbG93Tm9Gb3JjZV9Ob3RQb3NzaWJsZSgpIHsKKyAgICBQZXJtaXNzaW9uUnVsZSByID0gZ3JhbnQobG9jYWwsIFBVU0gsIGFub255bW91cywgInJlZnMvaGVhZHMvKiIpOworICAgIHIuc2V0QmxvY2soKTsKKyAgICByLnNldEZvcmNlKHRydWUpOworICAgIGdyYW50KGxvY2FsLCBQVVNILCBkZXZzLCAicmVmcy9oZWFkcy8qIik7CisKKyAgICBQcm9qZWN0Q29udHJvbCB1ID0gdXNlcihkZXZzKTsKKyAgICBhc3NlcnRGYWxzZSgidSBjYW4ndCBmb3JjZSBwdXNoIiwgdS5jb250cm9sRm9yUmVmKCJyZWZzL2hlYWRzL21hc3RlciIpLmNhbkZvcmNlVXBkYXRlKCkpOworICB9CisKKyAgcHVibGljIHZvaWQgdGVzdFVuYmxvY2tNb3JlU3BlY2lmaWNSZWZfRmFpbHMoKSB7CisgICAgZ3JhbnQobG9jYWwsIFBVU0gsIGFub255bW91cywgInJlZnMvaGVhZHMvKiIpLnNldEJsb2NrKCk7CisgICAgZ3JhbnQobG9jYWwsIFBVU0gsIGRldnMsICJyZWZzL2hlYWRzL21hc3RlciIpOworCisgICAgUHJvamVjdENvbnRyb2wgdSA9IHVzZXIoZGV2cyk7CisgICAgYXNzZXJ0RmFsc2UoInUgY2FuJ3QgcHVzaCIsIHUuY29udHJvbEZvclJlZigicmVmcy9oZWFkcy9tYXN0ZXIiKS5jYW5VcGRhdGUoKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCB0ZXN0VW5ibG9ja0xhcmdlclNjb3BlX0ZhaWxzKCkgeworICAgIGdyYW50KGxvY2FsLCBQVVNILCBhbm9ueW1vdXMsICJyZWZzL2hlYWRzL21hc3RlciIpLnNldEJsb2NrKCk7CisgICAgZ3JhbnQobG9jYWwsIFBVU0gsIGRldnMsICJyZWZzL2hlYWRzLyoiKTsKKworICAgIFByb2plY3RDb250cm9sIHUgPSB1c2VyKGRldnMpOworICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHB1c2giLCB1LmNvbnRyb2xGb3JSZWYoInJlZnMvaGVhZHMvbWFzdGVyIikuY2FuVXBkYXRlKCkpOworICB9CisKKyAgcHVibGljIHZvaWQgdGVzdFVuYmxvY2tJbkxvY2FsX0ZhaWxzKCkgeworICAgIGdyYW50KHBhcmVudCwgUFVTSCwgYW5vbnltb3VzLCAicmVmcy9oZWFkcy8qIikuc2V0QmxvY2soKTsKKyAgICBncmFudChsb2NhbCwgUFVTSCwgZml4ZXJzLCAicmVmcy9oZWFkcy8qIik7CisKKyAgICBQcm9qZWN0Q29udHJvbCBmID0gdXNlcihmaXhlcnMpOworICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHB1c2giLCBmLmNvbnRyb2xGb3JSZWYoInJlZnMvaGVhZHMvbWFzdGVyIikuY2FuVXBkYXRlKCkpOworICB9CisKKyAgcHVibGljIHZvaWQgdGVzdFVuYmxvY2tJblBhcmVudEJsb2NrSW5Mb2NhbCgpIHsKKyAgICBncmFudChwYXJlbnQsIFBVU0gsIGFub255bW91cywgInJlZnMvaGVhZHMvKiIpLnNldEJsb2NrKCk7CisgICAgZ3JhbnQocGFyZW50LCBQVVNILCBkZXZzLCAicmVmcy9oZWFkcy8qIik7CisgICAgZ3JhbnQobG9jYWwsIFBVU0gsIGRldnMsICJyZWZzL2hlYWRzLyoiKS5zZXRCbG9jaygpOworCisgICAgUHJvamVjdENvbnRyb2wgZCA9IHVzZXIoZGV2cyk7CisgICAgYXNzZXJ0RmFsc2UoInUgY2FuJ3QgcHVzaCIsIGQuY29udHJvbEZvclJlZigicmVmcy9oZWFkcy9tYXN0ZXIiKS5jYW5VcGRhdGUoKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCB0ZXN0VW5ibG9ja1Zpc2liaWxpdHlCeVJlZ2lzdGVyZWRVc2VycygpIHsKKyAgICBncmFudChsb2NhbCwgUkVBRCwgYW5vbnltb3VzLCAicmVmcy9oZWFkcy8qIikuc2V0QmxvY2soKTsKKyAgICBncmFudChsb2NhbCwgUkVBRCwgcmVnaXN0ZXJlZCwgInJlZnMvaGVhZHMvKiIpOworCisgICAgUHJvamVjdENvbnRyb2wgdSA9IHVzZXIocmVnaXN0ZXJlZCk7CisgICAgYXNzZXJ0VHJ1ZSgidSBjYW4gcmVhZCIsIHUuY29udHJvbEZvclJlZigicmVmcy9oZWFkcy9tYXN0ZXIiKS5pc1Zpc2libGVCeVJlZ2lzdGVyZWRVc2VycygpKTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHRlc3RVbmJsb2NrSW5Mb2NhbFZpc2liaWxpdHlCeVJlZ2lzdGVyZWRVc2Vyc19GYWlscygpIHsKKyAgICBncmFudChwYXJlbnQsIFJFQUQsIGFub255bW91cywgInJlZnMvaGVhZHMvKiIpLnNldEJsb2NrKCk7CisgICAgZ3JhbnQobG9jYWwsIFJFQUQsIHJlZ2lzdGVyZWQsICJyZWZzL2hlYWRzLyoiKTsKKworICAgIFByb2plY3RDb250cm9sIHUgPSB1c2VyKHJlZ2lzdGVyZWQpOworICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHJlYWQiLCB1LmNvbnRyb2xGb3JSZWYoInJlZnMvaGVhZHMvbWFzdGVyIikuaXNWaXNpYmxlQnlSZWdpc3RlcmVkVXNlcnMoKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCB0ZXN0VW5ibG9ja0ZvcmNlRWRpdFRvcGljTmFtZSgpIHsKKyAgICBncmFudChsb2NhbCwgRURJVF9UT1BJQ19OQU1FLCBhbm9ueW1vdXMsICJyZWZzL2hlYWRzLyoiKS5zZXRCbG9jaygpOworICAgIGdyYW50KGxvY2FsLCBFRElUX1RPUElDX05BTUUsIGRldnMsICJyZWZzL2hlYWRzLyoiKS5zZXRGb3JjZSh0cnVlKTsKKworICAgIFByb2plY3RDb250cm9sIHUgPSB1c2VyKGRldnMpOworICAgIGFzc2VydFRydWUoInUgY2FuIGVkaXQgdG9waWMgbmFtZSIsIHUuY29udHJvbEZvclJlZigicmVmcy9oZWFkcy9tYXN0ZXIiKS5jYW5Gb3JjZUVkaXRUb3BpY05hbWUoKSk7CisgIH0KKworICBwdWJsaWMgdm9pZCB0ZXN0VW5ibG9ja0luTG9jYWxGb3JjZUVkaXRUb3BpY05hbWVfRmFpbHMoKSB7CisgICAgZ3JhbnQocGFyZW50LCBFRElUX1RPUElDX05BTUUsIGFub255bW91cywgInJlZnMvaGVhZHMvKiIpLnNldEJsb2NrKCk7CisgICAgZ3JhbnQobG9jYWwsIEVESVRfVE9QSUNfTkFNRSwgZGV2cywgInJlZnMvaGVhZHMvKiIpLnNldEZvcmNlKHRydWUpOworCisgICAgUHJvamVjdENvbnRyb2wgdSA9IHVzZXIocmVnaXN0ZXJlZCk7CisgICAgYXNzZXJ0RmFsc2UoInUgY2FuJ3QgZWRpdCB0b3BpYyBuYW1lIiwgdS5jb250cm9sRm9yUmVmKCJyZWZzL2hlYWRzL21hc3RlciIpLmNhbkZvcmNlRWRpdFRvcGljTmFtZSgpKTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHRlc3RVbmJsb2NrUmFuZ2UoKSB7CisgICAgZ3JhbnQobG9jYWwsIExBQkVMICsgIkNvZGUtUmV2aWV3IiwgLTEsICsxLCBhbm9ueW1vdXMsICJyZWZzL2hlYWRzLyoiKS5zZXRCbG9jaygpOworICAgIGdyYW50KGxvY2FsLCBMQUJFTCArICJDb2RlLVJldmlldyIsIC0yLCArMiwgZGV2cywgInJlZnMvaGVhZHMvKiIpOworCisgICAgUHJvamVjdENvbnRyb2wgdSA9IHVzZXIoZGV2cyk7CisgICAgUGVybWlzc2lvblJhbmdlIHJhbmdlID0gdS5jb250cm9sRm9yUmVmKCJyZWZzL2hlYWRzL21hc3RlciIpLmdldFJhbmdlKExBQkVMICsgIkNvZGUtUmV2aWV3Iik7CisgICAgYXNzZXJ0VHJ1ZSgidSBjYW4gdm90ZSAtMiIsIHJhbmdlLmNvbnRhaW5zKC0yKSk7CisgICAgYXNzZXJ0VHJ1ZSgidSBjYW4gdm90ZSArMiIsIHJhbmdlLmNvbnRhaW5zKDIpKTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHRlc3RVbmJsb2NrUmFuZ2VPbk1vcmVTcGVjaWZpY1JlZl9GYWlscygpIHsKKyAgICBncmFudChsb2NhbCwgTEFCRUwgKyAiQ29kZS1SZXZpZXciLCAtMSwgKzEsIGFub255bW91cywgInJlZnMvaGVhZHMvKiIpLnNldEJsb2NrKCk7CisgICAgZ3JhbnQobG9jYWwsIExBQkVMICsgIkNvZGUtUmV2aWV3IiwgLTIsICsyLCBkZXZzLCAicmVmcy9oZWFkcy9tYXN0ZXIiKTsKKworICAgIFByb2plY3RDb250cm9sIHUgPSB1c2VyKGRldnMpOworICAgIFBlcm1pc3Npb25SYW5nZSByYW5nZSA9IHUuY29udHJvbEZvclJlZigicmVmcy9oZWFkcy9tYXN0ZXIiKS5nZXRSYW5nZShMQUJFTCArICJDb2RlLVJldmlldyIpOworICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHZvdGUgLTIiLCByYW5nZS5jb250YWlucygtMikpOworICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHZvdGUgKzIiLCByYW5nZS5jb250YWlucygtMikpOworICB9CisKKyAgcHVibGljIHZvaWQgdGVzdFVuYmxvY2tSYW5nZU9uTGFyZ2VyU2NvcGVfRmFpbHMoKSB7CisgICAgZ3JhbnQobG9jYWwsIExBQkVMICsgIkNvZGUtUmV2aWV3IiwgLTEsICsxLCBhbm9ueW1vdXMsICJyZWZzL2hlYWRzL21hc3RlciIpLnNldEJsb2NrKCk7CisgICAgZ3JhbnQobG9jYWwsIExBQkVMICsgIkNvZGUtUmV2aWV3IiwgLTIsICsyLCBkZXZzLCAicmVmcy9oZWFkcy8qIik7CisKKyAgICBQcm9qZWN0Q29udHJvbCB1ID0gdXNlcihkZXZzKTsKKyAgICBQZXJtaXNzaW9uUmFuZ2UgcmFuZ2UgPSB1LmNvbnRyb2xGb3JSZWYoInJlZnMvaGVhZHMvbWFzdGVyIikuZ2V0UmFuZ2UoTEFCRUwgKyAiQ29kZS1SZXZpZXciKTsKKyAgICBhc3NlcnRGYWxzZSgidSBjYW4ndCB2b3RlIC0yIiwgcmFuZ2UuY29udGFpbnMoLTIpKTsKKyAgICBhc3NlcnRGYWxzZSgidSBjYW4ndCB2b3RlICsyIiwgcmFuZ2UuY29udGFpbnMoLTIpKTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHRlc3RVbmJsb2NrSW5Mb2NhbFJhbmdlX0ZhaWxzKCkgeworICAgIGdyYW50KHBhcmVudCwgTEFCRUwgKyAiQ29kZS1SZXZpZXciLCAtMSwgMSwgYW5vbnltb3VzLCAicmVmcy9oZWFkcy8qIikuc2V0QmxvY2soKTsKKyAgICBncmFudChsb2NhbCwgTEFCRUwgKyAiQ29kZS1SZXZpZXciLCAtMiwgKzIsIGRldnMsICJyZWZzL2hlYWRzLyoiKTsKKworICAgIFByb2plY3RDb250cm9sIHUgPSB1c2VyKGRldnMpOworICAgIFBlcm1pc3Npb25SYW5nZSByYW5nZSA9IHUuY29udHJvbEZvclJlZigicmVmcy9oZWFkcy9tYXN0ZXIiKS5nZXRSYW5nZShMQUJFTCArICJDb2RlLVJldmlldyIpOworICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHZvdGUgLTIiLCByYW5nZS5jb250YWlucygtMikpOworICAgIGFzc2VydEZhbHNlKCJ1IGNhbid0IHZvdGUgMiIsIHJhbmdlLmNvbnRhaW5zKDIpKTsKKyAgfQogICAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiAgIHByaXZhdGUgZmluYWwgTWFwPFByb2plY3QuTmFtZUtleSwgUHJvamVjdFN0YXRlPiBhbGw7CkBAIC0zMDcsNiArNDQwLDExIEBACiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHB1YmxpYyB2b2lkIG9uQ3JlYXRlUHJvamVjdChQcm9qZWN0Lk5hbWVLZXkgbmV3UHJvamVjdE5hbWUpIHsKICAgICAgIH0KKworICAgICAgQE92ZXJyaWRlCisgICAgICBwdWJsaWMgU2V0PEFjY291bnRHcm91cC5VVUlEPiBndWVzc1JlbGV2YW50R3JvdXBVVUlEcygpIHsKKyAgICAgICAgcmV0dXJuIENvbGxlY3Rpb25zLmVtcHR5U2V0KCk7CisgICAgICB9CiAgICAgfTsKIAogICAgIEluamVjdG9yIGluamVjdG9yID0gR3VpY2UuY3JlYXRlSW5qZWN0b3IobmV3IEZhY3RvcnlNb2R1bGUoKSB7CkBAIC00MTUsNyArNTUzLDcgQEAKICAgICBwcml2YXRlIGZpbmFsIEdyb3VwTWVtYmVyc2hpcCBncm91cHM7CiAKICAgICBNb2NrVXNlcihTdHJpbmcgbmFtZSwgQWNjb3VudEdyb3VwLlVVSURbXSBncm91cElkKSB7Ci0gICAgICBzdXBlcihSZWZDb250cm9sVGVzdC50aGlzLmNhcGFiaWxpdHlDb250cm9sRmFjdG9yeSwgQWNjZXNzUGF0aC5VTktOT1dOKTsKKyAgICAgIHN1cGVyKFJlZkNvbnRyb2xUZXN0LnRoaXMuY2FwYWJpbGl0eUNvbnRyb2xGYWN0b3J5KTsKICAgICAgIHVzZXJuYW1lID0gbmFtZTsKICAgICAgIEFycmF5TGlzdDxBY2NvdW50R3JvdXAuVVVJRD4gZ3JvdXBJZHMgPSBMaXN0cy5uZXdBcnJheUxpc3QoZ3JvdXBJZCk7CiAgICAgICBncm91cElkcy5hZGQocmVnaXN0ZXJlZCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFDcmVhdG9yVGVzdC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hQ3JlYXRvclRlc3QuamF2YQppbmRleCA4NzUwZWU0Li4xOGVkZGM5IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFDcmVhdG9yVGVzdC5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYUNyZWF0b3JUZXN0LmphdmEKQEAgLTE0LDIzICsxNCwzMSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWE7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeVZhbHVlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVMaXN0OworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxWYWx1ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFsbFByb2plY3RzTmFtZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkdpdFJlcG9zaXRvcnlNYW5hZ2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuUHJvamVjdENvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC50ZXN0dXRpbC5Jbk1lbW9yeURhdGFiYXNlOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLmpkYmMuSmRiY1NjaGVtYTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogCiBpbXBvcnQganVuaXQuZnJhbWV3b3JrLlRlc3RDYXNlOwogCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5saWIuUmVwb3NpdG9yeTsKKwogaW1wb3J0IGphdmEuaW8uRmlsZTsKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEuc3FsLlJlc3VsdFNldDsKIGltcG9ydCBqYXZhLnNxbC5TUUxFeGNlcHRpb247Ci1pbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogcHVibGljIGNsYXNzIFNjaGVtYUNyZWF0b3JUZXN0IGV4dGVuZHMgVGVzdENhc2UgewotICBwcml2YXRlIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgY29kZVJldmlldyA9IG5ldyBBcHByb3ZhbENhdGVnb3J5LklkKCJDUlZXIik7CiAgIHByaXZhdGUgSW5NZW1vcnlEYXRhYmFzZSBkYjsKIAogICBAT3ZlcnJpZGUKQEAgLTc5LDUzICs4Nyw0NiBAQAogICAgIGFzc2VydEVxdWFscyhzaXRlUGF0aC5nZXRDYW5vbmljYWxQYXRoKCksIGRiLmdldFN5c3RlbUNvbmZpZygpLnNpdGVQYXRoKTsKICAgfQogCi0gIHB1YmxpYyB2b2lkIHRlc3RDcmVhdGVTY2hlbWFfQXBwcm92YWxDYXRlZ29yeV9Db2RlUmV2aWV3KCkKLSAgICAgIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIGZpbmFsIFJldmlld0RiIGMgPSBkYi5jcmVhdGUoKS5vcGVuKCk7CisgIHByaXZhdGUgTGFiZWxUeXBlcyBnZXRMYWJlbFR5cGVzKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgZGIuY3JlYXRlKCk7CisgICAgQWxsUHJvamVjdHNOYW1lIGFsbFByb2plY3RzID0gZGIuZ2V0SW5zdGFuY2UoQWxsUHJvamVjdHNOYW1lLmNsYXNzKTsKKyAgICBQcm9qZWN0Q29uZmlnIGMgPSBuZXcgUHJvamVjdENvbmZpZyhhbGxQcm9qZWN0cyk7CisgICAgUmVwb3NpdG9yeSByZXBvID0gZGIuZ2V0SW5zdGFuY2UoR2l0UmVwb3NpdG9yeU1hbmFnZXIuY2xhc3MpCisgICAgICAgIC5vcGVuUmVwb3NpdG9yeShhbGxQcm9qZWN0cyk7CiAgICAgdHJ5IHsKLSAgICAgIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkgY2F0OwotCi0gICAgICBjYXQgPSBjLmFwcHJvdmFsQ2F0ZWdvcmllcygpLmdldChjb2RlUmV2aWV3KTsKLSAgICAgIGFzc2VydE5vdE51bGwoY2F0KTsKLSAgICAgIGFzc2VydEVxdWFscyhjb2RlUmV2aWV3LCBjYXQuZ2V0SWQoKSk7Ci0gICAgICBhc3NlcnRFcXVhbHMoIkNvZGUgUmV2aWV3IiwgY2F0LmdldE5hbWUoKSk7Ci0gICAgICBhc3NlcnRFcXVhbHMoIlIiLCBjYXQuZ2V0QWJicmV2aWF0ZWROYW1lKCkpOwotICAgICAgYXNzZXJ0RXF1YWxzKCJNYXhXaXRoQmxvY2siLCBjYXQuZ2V0RnVuY3Rpb25OYW1lKCkpOwotICAgICAgYXNzZXJ0VHJ1ZShjYXQuaXNDb3B5TWluU2NvcmUoKSk7Ci0gICAgICBhc3NlcnRUcnVlKDAgPD0gY2F0LmdldFBvc2l0aW9uKCkpOworICAgICAgYy5sb2FkKHJlcG8pOworICAgICAgcmV0dXJuIG5ldyBMYWJlbFR5cGVzKAorICAgICAgICAgIEltbXV0YWJsZUxpc3QuY29weU9mKGMuZ2V0TGFiZWxTZWN0aW9ucygpLnZhbHVlcygpKSk7CiAgICAgfSBmaW5hbGx5IHsKLSAgICAgIGMuY2xvc2UoKTsKKyAgICAgIHJlcG8uY2xvc2UoKTsKICAgICB9Ci0gICAgYXNzZXJ0VmFsdWVSYW5nZShjb2RlUmV2aWV3LCAtMiwgLTEsIDAsIDEsIDIpOwogICB9CiAKLSAgcHJpdmF0ZSB2b2lkIGFzc2VydFZhbHVlUmFuZ2UoQXBwcm92YWxDYXRlZ29yeS5JZCBjYXQsIGludC4uLiByYW5nZSkKLSAgICAgIHRocm93cyBPcm1FeGNlcHRpb24gewotICAgIGZpbmFsIEhhc2hTZXQ8QXBwcm92YWxDYXRlZ29yeVZhbHVlLklkPiBhY3QgPQotICAgICAgICBuZXcgSGFzaFNldDxBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQ+KCk7Ci0gICAgZmluYWwgUmV2aWV3RGIgYyA9IGRiLm9wZW4oKTsKLSAgICB0cnkgewotICAgICAgZm9yIChBcHByb3ZhbENhdGVnb3J5VmFsdWUgdiA6IGMuYXBwcm92YWxDYXRlZ29yeVZhbHVlcygpLmJ5Q2F0ZWdvcnkoY2F0KSkgewotICAgICAgICBhc3NlcnROb3ROdWxsKHYuZ2V0SWQoKSk7Ci0gICAgICAgIGFzc2VydE5vdE51bGwodi5nZXROYW1lKCkpOwotICAgICAgICBhc3NlcnRFcXVhbHMoY2F0LCB2LmdldENhdGVnb3J5SWQoKSk7Ci0gICAgICAgIGFzc2VydEZhbHNlKHYuZ2V0TmFtZSgpLmlzRW1wdHkoKSk7Ci0KLSAgICAgICAgYWN0LmFkZCh2LmdldElkKCkpOwotICAgICAgfQotICAgIH0gZmluYWxseSB7Ci0gICAgICBjLmNsb3NlKCk7CisgIHB1YmxpYyB2b2lkIHRlc3RDcmVhdGVTY2hlbWFfTGFiZWxUeXBlcygpIHRocm93cyBFeGNlcHRpb24geworICAgIExpc3Q8U3RyaW5nPiBsYWJlbHMgPSBMaXN0cy5uZXdBcnJheUxpc3QoKTsKKyAgICBmb3IgKExhYmVsVHlwZSBsYWJlbCA6IGdldExhYmVsVHlwZXMoKS5nZXRMYWJlbFR5cGVzKCkpIHsKKyAgICAgIGxhYmVscy5hZGQobGFiZWwuZ2V0TmFtZSgpKTsKICAgICB9CisgICAgYXNzZXJ0RXF1YWxzKEltbXV0YWJsZUxpc3Qub2YoIkNvZGUtUmV2aWV3IiksIGxhYmVscyk7CisgIH0KIAotICAgIGZvciAoaW50IHZhbHVlIDogcmFuZ2UpIHsKLSAgICAgIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZCBleHAgPQotICAgICAgICAgIG5ldyBBcHByb3ZhbENhdGVnb3J5VmFsdWUuSWQoY2F0LCAoc2hvcnQpIHZhbHVlKTsKLSAgICAgIGlmICghYWN0LnJlbW92ZShleHApKSB7Ci0gICAgICAgIGZhaWwoIkNhdGVnb3J5ICIgKyBjYXQgKyAiIGxhY2tzIHZhbHVlICIgKyB2YWx1ZSk7Ci0gICAgICB9Ci0gICAgfQotICAgIGlmICghYWN0LmlzRW1wdHkoKSkgewotICAgICAgZmFpbCgiQ2F0ZWdvcnkgIiArIGNhdCArICIgaGFzIGFkZGl0aW9uYWwgdmFsdWVzOiAiICsgYWN0KTsKKyAgcHVibGljIHZvaWQgdGVzdENyZWF0ZVNjaGVtYV9MYWJlbF9Db2RlUmV2aWV3KCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgTGFiZWxUeXBlIGNvZGVSZXZpZXcgPSBnZXRMYWJlbFR5cGVzKCkuYnlMYWJlbCgiQ29kZS1SZXZpZXciKTsKKyAgICBhc3NlcnROb3ROdWxsKGNvZGVSZXZpZXcpOworICAgIGFzc2VydEVxdWFscygiQ29kZS1SZXZpZXciLCBjb2RlUmV2aWV3LmdldE5hbWUoKSk7CisgICAgYXNzZXJ0RXF1YWxzKCJDUiIsIGNvZGVSZXZpZXcuZ2V0QWJicmV2aWF0ZWROYW1lKCkpOworICAgIGFzc2VydEVxdWFscygiTWF4V2l0aEJsb2NrIiwgY29kZVJldmlldy5nZXRGdW5jdGlvbk5hbWUoKSk7CisgICAgYXNzZXJ0VHJ1ZShjb2RlUmV2aWV3LmlzQ29weU1pblNjb3JlKCkpOworICAgIGFzc2VydFZhbHVlUmFuZ2UoY29kZVJldmlldywgMiwgMSwgMCwgLTEsIC0yKTsKKyAgfQorCisgIHByaXZhdGUgdm9pZCBhc3NlcnRWYWx1ZVJhbmdlKExhYmVsVHlwZSBsYWJlbCwgSW50ZWdlci4uLiByYW5nZSkgeworICAgIGFzc2VydEVxdWFscyhBcnJheXMuYXNMaXN0KHJhbmdlKSwgbGFiZWwuZ2V0VmFsdWVzQXNMaXN0KCkpOworICAgIGFzc2VydEVxdWFscyhyYW5nZVswXSwgSW50ZWdlci52YWx1ZU9mKGxhYmVsLmdldE1heCgpLmdldFZhbHVlKCkpKTsKKyAgICBhc3NlcnRFcXVhbHMocmFuZ2VbcmFuZ2UubGVuZ3RoIC0gMV0sCisgICAgICBJbnRlZ2VyLnZhbHVlT2YobGFiZWwuZ2V0TWluKCkuZ2V0VmFsdWUoKSkpOworICAgIGZvciAoTGFiZWxWYWx1ZSB2IDogbGFiZWwuZ2V0VmFsdWVzKCkpIHsKKyAgICAgIGFzc2VydEZhbHNlKFN0cmluZ3MuaXNOdWxsT3JFbXB0eSh2LmdldFRleHQoKSkpOwogICAgIH0KICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hVXBkYXRlclRlc3QuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvc2NoZW1hL1NjaGVtYVVwZGF0ZXJUZXN0LmphdmEKaW5kZXggY2M4ZDQ3ZC4uYmRkMjI1OCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci9zY2hlbWEvU2NoZW1hVXBkYXRlclRlc3QuamF2YQorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc2VydmVyL3NjaGVtYS9TY2hlbWFVcGRhdGVyVGVzdC5qYXZhCkBAIC0yNyw2ICsyNyw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkxvY2FsRGlza1JlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnRlc3R1dGlsLkluTWVtb3J5RGF0YWJhc2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQudGVzdHV0aWwuSW5NZW1vcnlIMlR5cGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLk9ybUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuU2NoZW1hRmFjdG9yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuU3RhdGVtZW50RXhlY3V0b3I7CkBAIC05NCw2ICs5NSw4IEBACiAgICAgICAgIGJpbmQoU3RyaW5nLmNsYXNzKSAvLwogICAgICAgICAgIC5hbm5vdGF0ZWRXaXRoKEFub255bW91c0Nvd2FyZE5hbWUuY2xhc3MpIC8vCiAgICAgICAgICAgLnRvUHJvdmlkZXIoQW5vbnltb3VzQ293YXJkTmFtZVByb3ZpZGVyLmNsYXNzKTsKKworICAgICAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKS50byhJbk1lbW9yeUgyVHlwZS5jbGFzcyk7CiAgICAgICB9CiAgICAgfSkuZ2V0SW5zdGFuY2UoU2NoZW1hVXBkYXRlci5jbGFzcyk7CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zZXJ2ZXIvdXRpbC9TdWJtb2R1bGVTZWN0aW9uUGFyc2VyVGVzdC5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1N1Ym1vZHVsZVNlY3Rpb25QYXJzZXJUZXN0LmphdmEKaW5kZXggOTNkODZlNS4uNzI5NGQ0YyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1N1Ym1vZHVsZVNlY3Rpb25QYXJzZXJUZXN0LmphdmEKKysrIGIvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NlcnZlci91dGlsL1N1Ym1vZHVsZVNlY3Rpb25QYXJzZXJUZXN0LmphdmEKQEAgLTI3LDYgKzI3LDcgQEAKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuanVuaXQuTG9jYWxEaXNrUmVwb3NpdG9yeVRlc3RDYXNlOwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkJsb2JCYXNlZENvbmZpZzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25zdGFudHM7CiBpbXBvcnQgb3JnLmp1bml0LkJlZm9yZTsKIGltcG9ydCBvcmcuanVuaXQuVGVzdDsKIApAQCAtMjE0LDggKzIxNSw5IEBACiAgICAgICAgIHdoaWxlIChmcm9tSW5kZXggPiAwKSB7CiAgICAgICAgICAgZnJvbUluZGV4ID0gdXJsRXh0cmFjdGVkUGF0aC5sYXN0SW5kZXhPZignLycsIGZyb21JbmRleCAtIDEpOwogICAgICAgICAgIHByb2plY3ROYW1lQ2FuZGlkYXRlID0gdXJsRXh0cmFjdGVkUGF0aC5zdWJzdHJpbmcoZnJvbUluZGV4ICsgMSk7Ci0gICAgICAgICAgaWYgKHByb2plY3ROYW1lQ2FuZGlkYXRlLmVuZHNXaXRoKCIuZ2l0IikpIHsKLSAgICAgICAgICAgIHByb2plY3ROYW1lQ2FuZGlkYXRlID0gcHJvamVjdE5hbWVDYW5kaWRhdGUuc3Vic3RyaW5nKDAsIHByb2plY3ROYW1lQ2FuZGlkYXRlLmxlbmd0aCgpIC0gNCk7CisgICAgICAgICAgaWYgKHByb2plY3ROYW1lQ2FuZGlkYXRlLmVuZHNXaXRoKENvbnN0YW50cy5ET1RfR0lUX0VYVCkpIHsKKyAgICAgICAgICAgIHByb2plY3ROYW1lQ2FuZGlkYXRlID0gcHJvamVjdE5hbWVDYW5kaWRhdGUuc3Vic3RyaW5nKDAsIC8vCisgICAgICAgICAgICAgICAgcHJvamVjdE5hbWVDYW5kaWRhdGUubGVuZ3RoKCkgLSBDb25zdGFudHMuRE9UX0dJVF9FWFQubGVuZ3RoKCkpOwogICAgICAgICAgIH0KICAgICAgICAgICBpZiAocHJvamVjdE5hbWVDYW5kaWRhdGUuZXF1YWxzKHJlcG9zVG9CZUZvdW5kLmdldChpZCkpKSB7CiAgICAgICAgICAgICBleHBlY3QocmVwb01hbmFnZXIubGlzdCgpKS5hbmRSZXR1cm4oCmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlEYXRhYmFzZS5qYXZhIGIvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3Rlc3R1dGlsL0luTWVtb3J5RGF0YWJhc2UuamF2YQppbmRleCBiMWY5NTZmLi4zMDNjNDk3IDEwMDY0NAotLS0gYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlEYXRhYmFzZS5qYXZhCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC90ZXN0dXRpbC9Jbk1lbW9yeURhdGFiYXNlLmphdmEKQEAgLTE0LDE5ICsxNCwyMiBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnRlc3R1dGlsOwogCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuaW5qZWN0LlNjb3Blcy5TSU5HTEVUT047CisKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ3VycmVudFNjaGVtYVZlcnNpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlN5c3RlbUNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkdlcnJpdFBlcnNvbklkZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5HZXJyaXRQZXJzb25JZGVudFByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQWxsUHJvamVjdHNOYW1lOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQWxsUHJvamVjdHNOYW1lUHJvdmlkZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Bbm9ueW1vdXNDb3dhcmROYW1lOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQW5vbnltb3VzQ293YXJkTmFtZVByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuU2l0ZVBhdGg7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HaXRSZXBvc2l0b3J5TWFuYWdlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkxvY2FsRGlza1JlcG9zaXRvcnlNYW5hZ2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuQ3VycmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFTb3VyY2VUeXBlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuU2NoZW1hQ3JlYXRvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLlNjaGVtYVZlcnNpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uamRiYy5EYXRhYmFzZTsKQEAgLTM1LDYgKzM4LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuU2NoZW1hRmFjdG9yeTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5HdWljZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3RvcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5LZXk7CiAKIGltcG9ydCBqdW5pdC5mcmFtZXdvcmsuVGVzdENhc2U7CkBAIC04MSw2ICs4NSw3IEBACiAgIHByaXZhdGUgRGF0YWJhc2U8UmV2aWV3RGI+IGRhdGFiYXNlOwogICBwcml2YXRlIGJvb2xlYW4gY3JlYXRlZDsKICAgcHJpdmF0ZSBTY2hlbWFWZXJzaW9uIHNjaGVtYVZlcnNpb247CisgIHByaXZhdGUgSW5qZWN0b3IgaW5qZWN0b3I7CiAKICAgcHVibGljIEluTWVtb3J5RGF0YWJhc2UoKSB0aHJvd3MgT3JtRXhjZXB0aW9uIHsKICAgICB0cnkgewpAQCAtOTYsNDYgKzEwMSw1NCBAQAogICAgICAgLy8KICAgICAgIGRhdGFiYXNlID0gbmV3IERhdGFiYXNlPFJldmlld0RiPihkYXRhU291cmNlLCBSZXZpZXdEYi5jbGFzcyk7CiAKLSAgICAgIHNjaGVtYVZlcnNpb24gPQotICAgICAgICAgIEd1aWNlLmNyZWF0ZUluamVjdG9yKG5ldyBBYnN0cmFjdE1vZHVsZSgpIHsKLSAgICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgewotICAgICAgICAgICAgICBpbnN0YWxsKG5ldyBTY2hlbWFWZXJzaW9uLk1vZHVsZSgpKTsKKyAgICAgIGluamVjdG9yID0gR3VpY2UuY3JlYXRlSW5qZWN0b3IobmV3IEFic3RyYWN0TW9kdWxlKCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgeworICAgICAgICAgIGluc3RhbGwobmV3IFNjaGVtYVZlcnNpb24uTW9kdWxlKCkpOwogCi0gICAgICAgICAgICAgIGJpbmQoRmlsZS5jbGFzcykgLy8KLSAgICAgICAgICAgICAgICAgIC5hbm5vdGF0ZWRXaXRoKFNpdGVQYXRoLmNsYXNzKSAvLwotICAgICAgICAgICAgICAgICAgLnRvSW5zdGFuY2UobmV3IEZpbGUoIi4iKSk7CisgICAgICAgICAgYmluZChGaWxlLmNsYXNzKSAvLworICAgICAgICAgICAgICAuYW5ub3RhdGVkV2l0aChTaXRlUGF0aC5jbGFzcykgLy8KKyAgICAgICAgICAgICAgLnRvSW5zdGFuY2UobmV3IEZpbGUoIi4iKSk7CiAKLSAgICAgICAgICAgICAgQ29uZmlnIGNmZyA9IG5ldyBDb25maWcoKTsKLSAgICAgICAgICAgICAgY2ZnLnNldFN0cmluZygiZ2Vycml0IiwgbnVsbCwgImJhc2VQYXRoIiwgImdpdCIpOwotICAgICAgICAgICAgICBjZmcuc2V0U3RyaW5nKCJ1c2VyIiwgbnVsbCwgIm5hbWUiLCAiR2Vycml0IENvZGUgUmV2aWV3Iik7Ci0gICAgICAgICAgICAgIGNmZy5zZXRTdHJpbmcoInVzZXIiLCBudWxsLCAiZW1haWwiLCAiZ2Vycml0QGxvY2FsaG9zdCIpOworICAgICAgICAgIENvbmZpZyBjZmcgPSBuZXcgQ29uZmlnKCk7CisgICAgICAgICAgY2ZnLnNldFN0cmluZygiZ2Vycml0IiwgbnVsbCwgImJhc2VQYXRoIiwgImdpdCIpOworICAgICAgICAgIGNmZy5zZXRTdHJpbmcoImdlcnJpdCIsIG51bGwsICJhbGxQcm9qZWN0cyIsICJUZXN0LVByb2plY3RzIik7CisgICAgICAgICAgY2ZnLnNldFN0cmluZygidXNlciIsIG51bGwsICJuYW1lIiwgIkdlcnJpdCBDb2RlIFJldmlldyIpOworICAgICAgICAgIGNmZy5zZXRTdHJpbmcoInVzZXIiLCBudWxsLCAiZW1haWwiLCAiZ2Vycml0QGxvY2FsaG9zdCIpOwogCi0gICAgICAgICAgICAgIGJpbmQoQ29uZmlnLmNsYXNzKSAvLwotICAgICAgICAgICAgICAgICAgLmFubm90YXRlZFdpdGgoR2Vycml0U2VydmVyQ29uZmlnLmNsYXNzKSAvLwotICAgICAgICAgICAgICAgICAgLnRvSW5zdGFuY2UoY2ZnKTsKKyAgICAgICAgICBiaW5kKENvbmZpZy5jbGFzcykgLy8KKyAgICAgICAgICAgICAgLmFubm90YXRlZFdpdGgoR2Vycml0U2VydmVyQ29uZmlnLmNsYXNzKSAvLworICAgICAgICAgICAgICAudG9JbnN0YW5jZShjZmcpOwogCi0gICAgICAgICAgICAgIGJpbmQoUGVyc29uSWRlbnQuY2xhc3MpIC8vCi0gICAgICAgICAgICAgICAgICAuYW5ub3RhdGVkV2l0aChHZXJyaXRQZXJzb25JZGVudC5jbGFzcykgLy8KLSAgICAgICAgICAgICAgICAgIC50b1Byb3ZpZGVyKEdlcnJpdFBlcnNvbklkZW50UHJvdmlkZXIuY2xhc3MpOworICAgICAgICAgIGJpbmQoUGVyc29uSWRlbnQuY2xhc3MpIC8vCisgICAgICAgICAgICAgIC5hbm5vdGF0ZWRXaXRoKEdlcnJpdFBlcnNvbklkZW50LmNsYXNzKSAvLworICAgICAgICAgICAgICAudG9Qcm92aWRlcihHZXJyaXRQZXJzb25JZGVudFByb3ZpZGVyLmNsYXNzKTsKIAotICAgICAgICAgICAgICBiaW5kKEFsbFByb2plY3RzTmFtZS5jbGFzcykKLSAgICAgICAgICAgICAgICAgIC50b0luc3RhbmNlKG5ldyBBbGxQcm9qZWN0c05hbWUoIkFsbC1Qcm9qZWN0cyIpKTsKKyAgICAgICAgICBiaW5kKEFsbFByb2plY3RzTmFtZS5jbGFzcykgLy8KKyAgICAgICAgICAgICAgLnRvUHJvdmlkZXIoQWxsUHJvamVjdHNOYW1lUHJvdmlkZXIuY2xhc3MpOwogCi0gICAgICAgICAgICAgIGJpbmQoR2l0UmVwb3NpdG9yeU1hbmFnZXIuY2xhc3MpIC8vCi0gICAgICAgICAgICAgICAgICAudG8oTG9jYWxEaXNrUmVwb3NpdG9yeU1hbmFnZXIuY2xhc3MpOworICAgICAgICAgIGJpbmQoR2l0UmVwb3NpdG9yeU1hbmFnZXIuY2xhc3MpIC8vCisgICAgICAgICAgICAgIC50byhJbk1lbW9yeVJlcG9zaXRvcnlNYW5hZ2VyLmNsYXNzKS5pbihTSU5HTEVUT04pOwogCi0gICAgICAgICAgICAgIGJpbmQoU3RyaW5nLmNsYXNzKSAvLwotICAgICAgICAgICAgICAgIC5hbm5vdGF0ZWRXaXRoKEFub255bW91c0Nvd2FyZE5hbWUuY2xhc3MpIC8vCi0gICAgICAgICAgICAgICAgLnRvUHJvdmlkZXIoQW5vbnltb3VzQ293YXJkTmFtZVByb3ZpZGVyLmNsYXNzKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9KS5nZXRCaW5kaW5nKEtleS5nZXQoU2NoZW1hVmVyc2lvbi5jbGFzcywgQ3VycmVudC5jbGFzcykpCi0gICAgICAgICAgICAgIC5nZXRQcm92aWRlcigpLmdldCgpOworICAgICAgICAgIGJpbmQoU3RyaW5nLmNsYXNzKSAvLworICAgICAgICAgICAgLmFubm90YXRlZFdpdGgoQW5vbnltb3VzQ293YXJkTmFtZS5jbGFzcykgLy8KKyAgICAgICAgICAgIC50b1Byb3ZpZGVyKEFub255bW91c0Nvd2FyZE5hbWVQcm92aWRlci5jbGFzcyk7CisKKyAgICAgICAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKSAvLworICAgICAgICAgICAgLnRvKEluTWVtb3J5SDJUeXBlLmNsYXNzKTsKKyAgICAgICAgfQorICAgICAgfSk7CisgICAgICBzY2hlbWFWZXJzaW9uID0gaW5qZWN0b3IuZ2V0SW5zdGFuY2UoCisgICAgICAgICAgS2V5LmdldChTY2hlbWFWZXJzaW9uLmNsYXNzLCBDdXJyZW50LmNsYXNzKSk7CiAgICAgfSBjYXRjaCAoU1FMRXhjZXB0aW9uIGUpIHsKICAgICAgIHRocm93IG5ldyBPcm1FeGNlcHRpb24oZSk7CiAgICAgfQogICB9CiAKKyAgcHVibGljIDxUPiBUIGdldEluc3RhbmNlKENsYXNzPFQ+IGNsYXp6KSB7CisgICAgcmV0dXJuIGluamVjdG9yLmdldEluc3RhbmNlKGNsYXp6KTsKKyAgfQorCiAgIHB1YmxpYyBEYXRhYmFzZTxSZXZpZXdEYj4gZ2V0RGF0YWJhc2UoKSB7CiAgICAgcmV0dXJuIGRhdGFiYXNlOwogICB9CkBAIC0xNTIsMTIgKzE2NSw3IEBACiAgICAgICBmaW5hbCBSZXZpZXdEYiBjID0gb3BlbigpOwogICAgICAgdHJ5IHsKICAgICAgICAgdHJ5IHsKLSAgICAgICAgICBuZXcgU2NoZW1hQ3JlYXRvcigKLSAgICAgICAgICAgICAgbmV3IEZpbGUoIi4iKSwKLSAgICAgICAgICAgICAgc2NoZW1hVmVyc2lvbiwKLSAgICAgICAgICAgICAgbnVsbCwKLSAgICAgICAgICAgICAgbmV3IEFsbFByb2plY3RzTmFtZSgiVGVzdC1Qcm9qZWN0cyIpLAotICAgICAgICAgICAgICBuZXcgUGVyc29uSWRlbnQoIm5hbWUiLCAiZW1haWxAc2l0ZSIpKS5jcmVhdGUoYyk7CisgICAgICAgICAgZ2V0SW5zdGFuY2UoU2NoZW1hQ3JlYXRvci5jbGFzcykuY3JlYXRlKGMpOwogICAgICAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CiAgICAgICAgICAgdGhyb3cgbmV3IE9ybUV4Y2VwdGlvbigiQ2Fubm90IGNyZWF0ZSBpbi1tZW1vcnkgZGF0YWJhc2UiLCBlKTsKICAgICAgICAgfSBjYXRjaCAoQ29uZmlnSW52YWxpZEV4Y2VwdGlvbiBlKSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlIMlR5cGUuamF2YSBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC90ZXN0dXRpbC9Jbk1lbW9yeUgyVHlwZS5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjI1YTY1MzQKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlIMlR5cGUuamF2YQpAQCAtMCwwICsxLDMwIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQudGVzdHV0aWw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkJhc2VEYXRhU291cmNlVHlwZTsKKworcHVibGljIGNsYXNzIEluTWVtb3J5SDJUeXBlIGV4dGVuZHMgQmFzZURhdGFTb3VyY2VUeXBlIHsKKworICBwcm90ZWN0ZWQgSW5NZW1vcnlIMlR5cGUoKSB7CisgICAgc3VwZXIobnVsbCk7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFN0cmluZyBnZXRVcmwoKSB7CisgICAgLy8gbm90IHVzZWQKKyAgICB0aHJvdyBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24oKTsKKyAgfQorfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvamF2YS9jb20vZ29vZ2xlL2dlcnJpdC90ZXN0dXRpbC9Jbk1lbW9yeVJlcG9zaXRvcnlNYW5hZ2VyLmphdmEgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlSZXBvc2l0b3J5TWFuYWdlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjhlMmJjZTYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdGVzdHV0aWwvSW5NZW1vcnlSZXBvc2l0b3J5TWFuYWdlci5qYXZhCkBAIC0wLDAgKzEsMTExIEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQudGVzdHV0aWw7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZVNvcnRlZFNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lk1hcHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5SZXBvc2l0b3J5Q2FzZU1pc21hdGNoRXhjZXB0aW9uOworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuaW50ZXJuYWwuc3RvcmFnZS5kZnMuRGZzUmVwb3NpdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmludGVybmFsLnN0b3JhZ2UuZGZzLkRmc1JlcG9zaXRvcnlEZXNjcmlwdGlvbjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmludGVybmFsLnN0b3JhZ2UuZGZzLkluTWVtb3J5UmVwb3NpdG9yeTsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworCitpbXBvcnQgamF2YS51dGlsLk1hcDsKK2ltcG9ydCBqYXZhLnV0aWwuU29ydGVkU2V0OworCisvKiogUmVwb3NpdG9yeSBtYW5hZ2VyIHRoYXQgdXNlcyBpbi1tZW1vcnkgcmVwb3NpdG9yaWVzLiAqLworcHVibGljIGNsYXNzIEluTWVtb3J5UmVwb3NpdG9yeU1hbmFnZXIgaW1wbGVtZW50cyBHaXRSZXBvc2l0b3J5TWFuYWdlciB7CisgIHByaXZhdGUgc3RhdGljIGNsYXNzIERlc2NyaXB0aW9uIGV4dGVuZHMgRGZzUmVwb3NpdG9yeURlc2NyaXB0aW9uIHsKKyAgICBwcml2YXRlIFN0cmluZyBkZXNjOworCisgICAgcHJpdmF0ZSBEZXNjcmlwdGlvbihQcm9qZWN0Lk5hbWVLZXkgbmFtZSkgeworICAgICAgc3VwZXIobmFtZS5nZXQoKSk7CisgICAgICBkZXNjID0gIkluLW1lbW9yeSByZXBvc2l0b3J5ICIgKyBuYW1lLmdldCgpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgc3RhdGljIGNsYXNzIFJlcG8gZXh0ZW5kcyBJbk1lbW9yeVJlcG9zaXRvcnkgeworICAgIHByaXZhdGUgUmVwbyhQcm9qZWN0Lk5hbWVLZXkgbmFtZSkgeworICAgICAgc3VwZXIobmV3IERlc2NyaXB0aW9uKG5hbWUpKTsKKyAgICB9CisKKyAgICBAT3ZlcnJpZGUKKyAgICBwdWJsaWMgRGVzY3JpcHRpb24gZ2V0RGVzY3JpcHRpb24oKSB7CisgICAgICByZXR1cm4gKERlc2NyaXB0aW9uKSBzdXBlci5nZXREZXNjcmlwdGlvbigpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgTWFwPFN0cmluZywgUmVwbz4gcmVwb3MgPSBNYXBzLm5ld0hhc2hNYXAoKTsKKworICBAT3ZlcnJpZGUKKyAgcHVibGljIFJlcG9zaXRvcnkgb3BlblJlcG9zaXRvcnkoUHJvamVjdC5OYW1lS2V5IG5hbWUpCisgICAgICB0aHJvd3MgUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uIHsKKyAgICByZXR1cm4gZ2V0KG5hbWUpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBSZXBvc2l0b3J5IGNyZWF0ZVJlcG9zaXRvcnkoUHJvamVjdC5OYW1lS2V5IG5hbWUpCisgICAgICB0aHJvd3MgUmVwb3NpdG9yeUNhc2VNaXNtYXRjaEV4Y2VwdGlvbiwgUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uIHsKKyAgICBSZXBvIHJlcG87CisgICAgdHJ5IHsKKyAgICAgIHJlcG8gPSBnZXQobmFtZSk7CisgICAgICBpZiAoIXJlcG8uZ2V0RGVzY3JpcHRpb24oKS5nZXRSZXBvc2l0b3J5TmFtZSgpLmVxdWFscyhuYW1lLmdldCgpKSkgeworICAgICAgICB0aHJvdyBuZXcgUmVwb3NpdG9yeUNhc2VNaXNtYXRjaEV4Y2VwdGlvbihuYW1lKTsKKyAgICAgIH0KKyAgICB9IGNhdGNoIChSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgcmVwbyA9IG5ldyBSZXBvKG5hbWUpOworICAgICAgcmVwb3MucHV0KG5hbWUuZ2V0KCkudG9Mb3dlckNhc2UoKSwgcmVwbyk7CisgICAgfQorICAgIHJldHVybiByZXBvOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTb3J0ZWRTZXQ8UHJvamVjdC5OYW1lS2V5PiBsaXN0KCkgeworICAgIFNvcnRlZFNldDxQcm9qZWN0Lk5hbWVLZXk+IG5hbWVzID0gU2V0cy5uZXdUcmVlU2V0KCk7CisgICAgZm9yIChEZnNSZXBvc2l0b3J5IHJlcG8gOiByZXBvcy52YWx1ZXMoKSkgeworICAgICAgbmFtZXMuYWRkKG5ldyBQcm9qZWN0Lk5hbWVLZXkocmVwby5nZXREZXNjcmlwdGlvbigpLmdldFJlcG9zaXRvcnlOYW1lKCkpKTsKKyAgICB9CisgICAgcmV0dXJuIEltbXV0YWJsZVNvcnRlZFNldC5jb3B5T2YobmFtZXMpOworICB9CisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyBTdHJpbmcgZ2V0UHJvamVjdERlc2NyaXB0aW9uKFByb2plY3QuTmFtZUtleSBuYW1lKQorICAgICAgdGhyb3dzIFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiB7CisgICAgcmV0dXJuIGdldChuYW1lKS5nZXREZXNjcmlwdGlvbigpLmRlc2M7CisgIH0KKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgc2V0UHJvamVjdERlc2NyaXB0aW9uKFByb2plY3QuTmFtZUtleSBuYW1lLCBTdHJpbmcgZGVzY3JpcHRpb24pIHsKKyAgICB0cnkgeworICAgICAgZ2V0KG5hbWUpLmdldERlc2NyaXB0aW9uKCkuZGVzYyA9IGRlc2NyaXB0aW9uOworICAgIH0gY2F0Y2ggKFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7CisgICAgICAvLyBJZ25vcmUuCisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBSZXBvIGdldChQcm9qZWN0Lk5hbWVLZXkgbmFtZSkgdGhyb3dzIFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiB7CisgICAgUmVwbyByZXBvID0gcmVwb3MuZ2V0KG5hbWUuZ2V0KCkudG9Mb3dlckNhc2UoKSk7CisgICAgaWYgKHJlcG8gIT0gbnVsbCkgeworICAgICAgcmV0dXJuIHJlcG87CisgICAgfSBlbHNlIHsKKyAgICAgIHRocm93IG5ldyBSZXBvc2l0b3J5Tm90Rm91bmRFeGNlcHRpb24obmFtZS5nZXQoKSk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9nZXJyaXRfY29tbW9uX3Rlc3QucGwgYi9nZXJyaXQtc2VydmVyL3NyYy90ZXN0L3Jlc291cmNlcy9jb20vZ29vZ2xlL2dlcnJpdC9ydWxlcy9nZXJyaXRfY29tbW9uX3Rlc3QucGwKaW5kZXggZGI4OTlhNy4uYzk5MzM5NCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNlcnZlci9zcmMvdGVzdC9yZXNvdXJjZXMvY29tL2dvb2dsZS9nZXJyaXQvcnVsZXMvZ2Vycml0X2NvbW1vbl90ZXN0LnBsCisrKyBiL2dlcnJpdC1zZXJ2ZXIvc3JjL3Rlc3QvcmVzb3VyY2VzL2NvbS9nb29nbGUvZ2Vycml0L3J1bGVzL2dlcnJpdF9jb21tb25fdGVzdC5wbApAQCAtMjIsMTMgKzIyLDEzIEBACiAgIG5vdF9zYW1lKGxhYmVsKGUsIG9rKGEpKSwgbGFiZWwoZSwgb2soYikpKS4KIAogCi0lJSBnZXRfbGVnYWN5X2FwcHJvdmFsX3R5cGVzCislJSBnZXRfbGVnYWN5X2xhYmVsX3R5cGVzCiAlJQotdGVzdChnZXRfbGVnYWN5X2FwcHJvdmFsX3R5cGVzKSA6LQotICBnZXRfbGVnYWN5X2FwcHJvdmFsX3R5cGVzKFQpLAordGVzdChnZXRfbGVnYWN5X2xhYmVsX3R5cGVzKSA6LQorICBnZXRfbGVnYWN5X2xhYmVsX3R5cGVzKFQpLAogICBUID0gW0MsIFZdLAotICBDID0gYXBwcm92YWxfdHlwZSgnQ29kZS1SZXZpZXcnLCAnQ1JWVycsICdNYXhXaXRoQmxvY2snLCAtMiwgMiksCi0gIFYgPSBhcHByb3ZhbF90eXBlKCdWZXJpZmllZCcsICdWUklGJywgJ01heFdpdGhCbG9jaycsIC0xLCAxKS4KKyAgQyA9IGxhYmVsX3R5cGUoJ0NvZGUtUmV2aWV3JywgJ01heFdpdGhCbG9jaycsIC0yLCAyKSwKKyAgViA9IGxhYmVsX3R5cGUoJ1ZlcmlmaWVkJywgJ01heFdpdGhCbG9jaycsIC0xLCAxKS4KIAogCiAlJSBjb21taXRfbGFiZWwKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcyBiL2dlcnJpdC1zc2hkLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwppbmRleCA0NzA5NDJkLi45NDFmYjMxIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKKysrIGIvZ2Vycml0LXNzaGQvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCkBAIC03LDYgKzcsNyBAQAogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubGluZU51bWJlcj1nZW5lcmF0ZQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcubG9jYWxWYXJpYWJsZT1nZW5lcmF0ZQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIuZGVidWcuc291cmNlRmlsZT1nZW5lcmF0ZQorb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hbm5vdGF0aW9uU3VwZXJJbnRlcmZhY2U9aWdub3JlCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmFzc2VydElkZW50aWZpZXI9ZXJyb3IKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZW51bUlkZW50aWZpZXI9ZXJyb3IKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uZm9yYmlkZGVuUmVmZXJlbmNlPXdhcm5pbmcKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3BvbS54bWwgYi9nZXJyaXQtc3NoZC9wb20ueG1sCmluZGV4IGEyNmIxYjIuLmU4ZmNjMTEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3BvbS54bWwKKysrIGIvZ2Vycml0LXNzaGQvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXNzaGQ8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQWJzdHJhY3RHaXRDb21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQWJzdHJhY3RHaXRDb21tYW5kLmphdmEKaW5kZXggYWY1ZGYyNS4uOTBmZmViZCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0Fic3RyYWN0R2l0Q29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9BYnN0cmFjdEdpdENvbW1hbmQuamF2YQpAQCAtMjEsNyArMjEsNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoU2NvcGUuQ29udGV4dDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiAKIGltcG9ydCBvcmcuYXBhY2hlLnNzaGQuc2VydmVyLkVudmlyb25tZW50OwogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbjsKQEAgLTI5LDcgKzI4LDYgQEAKIGltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouQXJndW1lbnQ7CiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwotaW1wb3J0IGphdmEubmV0LlNvY2tldEFkZHJlc3M7CiAKIHB1YmxpYyBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdEdpdENvbW1hbmQgZXh0ZW5kcyBCYXNlQ29tbWFuZCB7CiAgIEBBcmd1bWVudChpbmRleCA9IDAsIG1ldGFWYXIgPSAiUFJPSkVDVC5naXQiLCByZXF1aXJlZCA9IHRydWUsIHVzYWdlID0gInByb2plY3QgbmFtZSIpCkBAIC04NCwxMyArODIsMTAgQEAKICAgfQogCiAgIHByaXZhdGUgU3NoU2Vzc2lvbiBuZXdTZXNzaW9uKCkgewotICAgIHJldHVybiBuZXcgU3NoU2Vzc2lvbihzZXNzaW9uLCBzZXNzaW9uLmdldFJlbW90ZUFkZHJlc3MoKSwgdXNlckZhY3RvcnkKLSAgICAgICAgLmNyZWF0ZShBY2Nlc3NQYXRoLkdJVCwgbmV3IFByb3ZpZGVyPFNvY2tldEFkZHJlc3M+KCkgewotICAgICAgICAgIEBPdmVycmlkZQotICAgICAgICAgIHB1YmxpYyBTb2NrZXRBZGRyZXNzIGdldCgpIHsKLSAgICAgICAgICAgIHJldHVybiBzZXNzaW9uLmdldFJlbW90ZUFkZHJlc3MoKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0sIHVzZXIuZ2V0QWNjb3VudElkKCkpKTsKKyAgICBTc2hTZXNzaW9uIG4gPSBuZXcgU3NoU2Vzc2lvbihzZXNzaW9uLCBzZXNzaW9uLmdldFJlbW90ZUFkZHJlc3MoKSwKKyAgICAgICAgdXNlckZhY3RvcnkuY3JlYXRlKHNlc3Npb24uZ2V0UmVtb3RlQWRkcmVzcygpLCB1c2VyLmdldEFjY291bnRJZCgpKSk7CisgICAgbi5zZXRBY2Nlc3NQYXRoKEFjY2Vzc1BhdGguR0lUKTsKKyAgICByZXR1cm4gbjsKICAgfQogCiAgIHByaXZhdGUgdm9pZCBzZXJ2aWNlKCkgdGhyb3dzIElPRXhjZXB0aW9uLCBGYWlsdXJlIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9BbGlhc0NvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9BbGlhc0NvbW1hbmQuamF2YQppbmRleCA5NTgyYzkzLi5iNDZmY2VkIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQWxpYXNDb21tYW5kLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0FsaWFzQ29tbWFuZC5qYXZhCkBAIC02MCwyNiArNjAsMjYgQEAKICAgfQogCiAgIHByaXZhdGUgdm9pZCBiZWdpbihFbnZpcm9ubWVudCBlbnYpIHRocm93cyBVbmxvZ2dlZEZhaWx1cmUsIElPRXhjZXB0aW9uIHsKLSAgICBNYXA8U3RyaW5nLCBQcm92aWRlcjxDb21tYW5kPj4gbWFwID0gcm9vdC5nZXRNYXAoKTsKKyAgICBNYXA8U3RyaW5nLCBDb21tYW5kUHJvdmlkZXI+IG1hcCA9IHJvb3QuZ2V0TWFwKCk7CiAgICAgZm9yIChTdHJpbmcgbmFtZSA6IGNoYWluKGNvbW1hbmQpKSB7Ci0gICAgICBQcm92aWRlcjw/IGV4dGVuZHMgQ29tbWFuZD4gcCA9IG1hcC5nZXQobmFtZSk7CisgICAgICBDb21tYW5kUHJvdmlkZXIgcCA9IG1hcC5nZXQobmFtZSk7CiAgICAgICBpZiAocCA9PSBudWxsKSB7CiAgICAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoMSwgZ2V0TmFtZSgpICsgIjogbm90IGZvdW5kIik7CiAgICAgICB9CiAKLSAgICAgIENvbW1hbmQgY21kID0gcC5nZXQoKTsKKyAgICAgIENvbW1hbmQgY21kID0gcC5nZXRQcm92aWRlcigpLmdldCgpOwogICAgICAgaWYgKCEoY21kIGluc3RhbmNlb2YgRGlzcGF0Y2hDb21tYW5kKSkgewogICAgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKDEsIGdldE5hbWUoKSArICI6IG5vdCBmb3VuZCIpOwogICAgICAgfQogICAgICAgbWFwID0gKChEaXNwYXRjaENvbW1hbmQpIGNtZCkuZ2V0TWFwKCk7CiAgICAgfQogCi0gICAgUHJvdmlkZXI8PyBleHRlbmRzIENvbW1hbmQ+IHAgPSBtYXAuZ2V0KGNvbW1hbmQudmFsdWUoKSk7CisgICAgQ29tbWFuZFByb3ZpZGVyIHAgPSBtYXAuZ2V0KGNvbW1hbmQudmFsdWUoKSk7CiAgICAgaWYgKHAgPT0gbnVsbCkgewogICAgICAgdGhyb3cgbmV3IFVubG9nZ2VkRmFpbHVyZSgxLCBnZXROYW1lKCkgKyAiOiBub3QgZm91bmQiKTsKICAgICB9CiAKLSAgICBDb21tYW5kIGNtZCA9IHAuZ2V0KCk7CisgICAgQ29tbWFuZCBjbWQgPSBwLmdldFByb3ZpZGVyKCkuZ2V0KCk7CiAgICAgY2hlY2tSZXF1aXJlc0NhcGFiaWxpdHkoY21kKTsKICAgICBpZiAoY21kIGluc3RhbmNlb2YgQmFzZUNvbW1hbmQpIHsKICAgICAgIEJhc2VDb21tYW5kIGJjID0gKEJhc2VDb21tYW5kKWNtZDsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9CYXNlQ29tbWFuZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0Jhc2VDb21tYW5kLmphdmEKaW5kZXggOWUwNGYwNS4uOThiNzQwYyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0Jhc2VDb21tYW5kLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0Jhc2VDb21tYW5kLmphdmEKQEAgLTYyLDcgKzYyLDYgQEAKICAgc3RhdGljIGZpbmFsIGludCBTVEFUVVNfTk9UX0ZPVU5EID0gUFJJVkFURV9TVEFUVVMgfCAyOwogICBwdWJsaWMgc3RhdGljIGZpbmFsIGludCBTVEFUVVNfTk9UX0FETUlOID0gUFJJVkFURV9TVEFUVVMgfCAzOwogCi0gIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bnVzZWQiKQogICBAT3B0aW9uKG5hbWUgPSAiLS0iLCB1c2FnZSA9ICJlbmQgb2Ygb3B0aW9ucyIsIGhhbmRsZXIgPSBFbmRPZk9wdGlvbnNIYW5kbGVyLmNsYXNzKQogICBwcml2YXRlIGJvb2xlYW4gZW5kT2ZPcHRpb25zOwogCkBAIC00MjksNyArNDI4LDcgQEAKICAgICAgICAgICB0cnkgewogICAgICAgICAgICAgdGh1bmsucnVuKCk7CiAgICAgICAgICAgfSBjYXRjaCAoTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiBlKSB7Ci0gICAgICAgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKDEsIGUuZ2V0TWVzc2FnZSgpICsgIiBubyBzdWNoIHByb2plY3QiKTsKKyAgICAgICAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoMSwgZS5nZXRNZXNzYWdlKCkpOwogICAgICAgICAgIH0gY2F0Y2ggKE5vU3VjaENoYW5nZUV4Y2VwdGlvbiBlKSB7CiAgICAgICAgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKDEsIGUuZ2V0TWVzc2FnZSgpICsgIiBubyBzdWNoIGNoYW5nZSIpOwogICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kRmFjdG9yeVByb3ZpZGVyLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQ29tbWFuZEZhY3RvcnlQcm92aWRlci5qYXZhCmluZGV4IDdmMDhkNDkuLjkxMGY1ZjMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kRmFjdG9yeVByb3ZpZGVyLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0NvbW1hbmRGYWN0b3J5UHJvdmlkZXIuamF2YQpAQCAtMTYsOSArMTYsMTEgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLnV0aWwuY29uY3VycmVudC5BdG9taWNzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLnV0aWwuY29uY3VycmVudC5UaHJlYWRGYWN0b3J5QnVpbGRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5HZXJyaXRTZXJ2ZXJDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Xb3JrUXVldWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hTY29wZS5Db250ZXh0OworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIApAQCAtNTYsMTUgKzU4LDE3IEBACiAgIHByaXZhdGUgZmluYWwgU3NoU2NvcGUgc3NoU2NvcGU7CiAgIHByaXZhdGUgZmluYWwgU2NoZWR1bGVkRXhlY3V0b3JTZXJ2aWNlIHN0YXJ0RXhlY3V0b3I7CiAgIHByaXZhdGUgZmluYWwgRXhlY3V0b3IgZGVzdHJveUV4ZWN1dG9yOworICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYUZhY3Rvcnk7CiAKICAgQEluamVjdAogICBDb21tYW5kRmFjdG9yeVByb3ZpZGVyKAogICAgICAgQENvbW1hbmROYW1lKENvbW1hbmRzLlJPT1QpIGZpbmFsIERpc3BhdGNoQ29tbWFuZFByb3ZpZGVyIGQsCiAgICAgICBAR2Vycml0U2VydmVyQ29uZmlnIGZpbmFsIENvbmZpZyBjZmcsIGZpbmFsIFdvcmtRdWV1ZSB3b3JrUXVldWUsCi0gICAgICBmaW5hbCBTc2hMb2cgbCwgZmluYWwgU3NoU2NvcGUgcykgeworICAgICAgZmluYWwgU3NoTG9nIGwsIGZpbmFsIFNzaFNjb3BlIHMsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNmKSB7CiAgICAgZGlzcGF0Y2hlciA9IGQ7CiAgICAgbG9nID0gbDsKICAgICBzc2hTY29wZSA9IHM7CisgICAgc2NoZW1hRmFjdG9yeSA9IHNmOwogCiAgICAgaW50IHRocmVhZHMgPSBjZmcuZ2V0SW50KCJzc2hkIiwiY29tbWFuZFN0YXJ0VGhyZWFkcyIsIDIpOwogICAgIHN0YXJ0RXhlY3V0b3IgPSB3b3JrUXVldWUuY3JlYXRlUXVldWUodGhyZWFkcywgIlNzaENvbW1hbmRTdGFydCIpOwpAQCAtMTIyLDcgKzEyNiw3IEBACiAKICAgICBwdWJsaWMgdm9pZCBzZXRTZXNzaW9uKGZpbmFsIFNlcnZlclNlc3Npb24gc2Vzc2lvbikgewogICAgICAgZmluYWwgU3NoU2Vzc2lvbiBzID0gc2Vzc2lvbi5nZXRBdHRyaWJ1dGUoU3NoU2Vzc2lvbi5LRVkpOwotICAgICAgdGhpcy5jdHggPSBzc2hTY29wZS5uZXdDb250ZXh0KHMsIGNvbW1hbmRMaW5lKTsKKyAgICAgIHRoaXMuY3R4ID0gc3NoU2NvcGUubmV3Q29udGV4dChzY2hlbWFGYWN0b3J5LCBzLCBjb21tYW5kTGluZSk7CiAgICAgfQogCiAgICAgcHVibGljIHZvaWQgc3RhcnQoZmluYWwgRW52aXJvbm1lbnQgZW52KSB0aHJvd3MgSU9FeGNlcHRpb24gewpAQCAtMTkyLDcgKzE5Niw3IEBACiAKICAgICBwcml2YXRlIHZvaWQgbG9nKGZpbmFsIGludCByYykgewogICAgICAgaWYgKGxvZ2dlZC5jb21wYXJlQW5kU2V0KGZhbHNlLCB0cnVlKSkgewotICAgICAgICBsb2cub25FeGVjdXRlKHJjKTsKKyAgICAgICAgbG9nLm9uRXhlY3V0ZShjbWQsIHJjKTsKICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kTWV0YURhdGEuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kTWV0YURhdGEuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZmNlZTZhCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0NvbW1hbmRNZXRhRGF0YS5qYXZhCkBAIC0wLDAgKzEsMzEgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMyBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkOworCitpbXBvcnQgc3RhdGljIGphdmEubGFuZy5hbm5vdGF0aW9uLlJldGVudGlvblBvbGljeS5SVU5USU1FOworCitpbXBvcnQgamF2YS5sYW5nLmFubm90YXRpb24uRWxlbWVudFR5cGU7CitpbXBvcnQgamF2YS5sYW5nLmFubm90YXRpb24uUmV0ZW50aW9uOworaW1wb3J0IGphdmEubGFuZy5hbm5vdGF0aW9uLlRhcmdldDsKKworLyoqCisgKiBBbm5vdGF0aW9uIHRhZ2dlZCBvbiBhIGNvbmNyZXRlIENvbW1hbmQgdG8gZGVzY3JpYmUgd2hhdCBpdCBpcyBkb2luZworICovCitAVGFyZ2V0KCB7RWxlbWVudFR5cGUuVFlQRX0pCitAUmV0ZW50aW9uKFJVTlRJTUUpCitwdWJsaWMgQGludGVyZmFjZSBDb21tYW5kTWV0YURhdGEgeworICBTdHJpbmcgbmFtZSgpOworICBTdHJpbmcgZGVzY3IoKSBkZWZhdWx0ICIiOworfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0NvbW1hbmRNb2R1bGUuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kTW9kdWxlLmphdmEKaW5kZXggNzY5OWJkZC4uZTdlOGE0NCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0NvbW1hbmRNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQ29tbWFuZE1vZHVsZS5qYXZhCkBAIC00OCw3ICs0OCw3IEBACiAgIC8qKgogICAgKiBDb25maWd1cmUgYSBjb21tYW5kIHRvIGJlIGludm9rZWQgYnkgbmFtZS4KICAgICoKLSAgICpAcGFyYW0gcGFyZW50IGNvbnRleHQgb2YgdGhlIHBhcmVudCBjb21tYW5kLCB0aGF0IHRoaXMgY29tbWFuZCBpcyBhCisgICAqIEBwYXJhbSBwYXJlbnQgY29udGV4dCBvZiB0aGUgcGFyZW50IGNvbW1hbmQsIHRoYXQgdGhpcyBjb21tYW5kIGlzIGEKICAgICogICAgICAgIHN1YmNvbW1hbmQgb2YuCiAgICAqIEBwYXJhbSBuYW1lIHRoZSBuYW1lIG9mIHRoZSBjb21tYW5kIHRoZSBjbGllbnQgd2lsbCBwcm92aWRlIGluIG9yZGVyIHRvCiAgICAqICAgICAgICBjYWxsIHRoZSBjb21tYW5kLgpAQCAtNjEsNiArNjEsNDIgQEAKICAgfQogCiAgIC8qKgorICAgKiBDb25maWd1cmUgYSBjb21tYW5kIHRvIGJlIGludm9rZWQgYnkgbmFtZS4gVGhlIGNvbW1hbmQgaXMgYm91bmQgdG8gdGhlIHBhc3NlZCBjbGFzcy4KKyAgICoKKyAgICogQHBhcmFtIHBhcmVudCBjb250ZXh0IG9mIHRoZSBwYXJlbnQgY29tbWFuZCwgdGhhdCB0aGlzIGNvbW1hbmQgaXMgYQorICAgKiAgICAgICAgc3ViY29tbWFuZCBvZi4KKyAgICogQHBhcmFtIGNsYXp6IGNsYXNzIG9mIHRoZSBjb21tYW5kIHdpdGgge0BsaW5rIENvbW1hbmRNZXRhRGF0YX0gYW5ub3RhdGlvbgorICAgKiAgICAgICAgdG8gcmV0cmlldmUgdGhlIG5hbWUgYW5kIHRoZSBkZXNjcmlwdGlvbiBmcm9tCisgICAqLworICBwcm90ZWN0ZWQgdm9pZCBjb21tYW5kKGZpbmFsIENvbW1hbmROYW1lIHBhcmVudCwKKyAgICAgIGZpbmFsIENsYXNzPD8gZXh0ZW5kcyBCYXNlQ29tbWFuZD4gY2xhenopIHsKKyAgICBDb21tYW5kTWV0YURhdGEgbWV0YSA9IChDb21tYW5kTWV0YURhdGEpY2xhenouZ2V0QW5ub3RhdGlvbihDb21tYW5kTWV0YURhdGEuY2xhc3MpOworICAgIGlmIChtZXRhID09IG51bGwpIHsKKyAgICAgIHRocm93IG5ldyBJbGxlZ2FsU3RhdGVFeGNlcHRpb24oIm5vIENvbW1hbmRNZXRhRGF0YSBhbm5vdGF0aW9uIGZvdW5kIik7CisgICAgfQorICAgIGJpbmQoQ29tbWFuZHMua2V5KHBhcmVudCwgbWV0YS5uYW1lKCksIG1ldGEuZGVzY3IoKSkpLnRvKGNsYXp6KTsKKyAgfQorCisgIC8qKgorICAgKiBBbGlhcyBvbmUgY29tbWFuZCB0byBhbm90aGVyLiBUaGUgYWxpYXMgaXMgYm91bmQgdG8gdGhlIHBhc3NlZCBjbGFzcy4KKyAgICoKKyAgICogQHBhcmFtIHBhcmVudCBjb250ZXh0IG9mIHRoZSBwYXJlbnQgY29tbWFuZCwgdGhhdCB0aGlzIGNvbW1hbmQgaXMgYQorICAgKiAgICAgICAgc3ViY29tbWFuZCBvZi4KKyAgICogQHBhcmFtIG5hbWUgdGhlIG5hbWUgb2YgdGhlIGNvbW1hbmQgdGhlIGNsaWVudCB3aWxsIHByb3ZpZGUgaW4gb3JkZXIgdG8KKyAgICogICAgICAgIGNhbGwgdGhlIGNvbW1hbmQuCisgICAqIEBwYXJhbSBjbGF6eiBjbGFzcyBvZiB0aGUgY29tbWFuZCB3aXRoIHtAbGluayBDb21tYW5kTWV0YURhdGF9IGFubm90YXRpb24KKyAgICogICAgICAgIHRvIHJldHJpZXZlIHRoZSBkZXNjcmlwdGlvbiBmcm9tCisgICAqLworICBwcm90ZWN0ZWQgdm9pZCBhbGlhcyhmaW5hbCBDb21tYW5kTmFtZSBwYXJlbnQsIGZpbmFsIFN0cmluZyBuYW1lLAorICAgICAgZmluYWwgQ2xhc3M8PyBleHRlbmRzIEJhc2VDb21tYW5kPiBjbGF6eikgeworICAgIENvbW1hbmRNZXRhRGF0YSBtZXRhID0gKENvbW1hbmRNZXRhRGF0YSljbGF6ei5nZXRBbm5vdGF0aW9uKENvbW1hbmRNZXRhRGF0YS5jbGFzcyk7CisgICAgaWYgKG1ldGEgPT0gbnVsbCkgeworICAgICAgdGhyb3cgbmV3IElsbGVnYWxTdGF0ZUV4Y2VwdGlvbigibm8gQ29tbWFuZE1ldGFEYXRhIGFubm90YXRpb24gZm91bmQiKTsKKyAgICB9CisgICAgYmluZChDb21tYW5kcy5rZXkocGFyZW50LCBuYW1lLCBtZXRhLmRlc2NyKCkpKS50byhjbGF6eik7CisgIH0KKworICAvKioKICAgICogQWxpYXMgb25lIGNvbW1hbmQgdG8gYW5vdGhlci4KICAgICoKICAgICogQHBhcmFtIGZyb20gdGhlIG5ldyBjb21tYW5kIG5hbWUgdGhhdCB3aGVuIGNhbGxlZCB3aWxsIGFjdHVhbGx5IGRlbGVnYXRlIHRvCmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQ29tbWFuZFByb3ZpZGVyLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQ29tbWFuZFByb3ZpZGVyLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWE3Yzk3YgotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kUHJvdmlkZXIuamF2YQpAQCAtMCwwICsxLDM4IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTMgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc3NoZDsKKworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCitpbXBvcnQgb3JnLmFwYWNoZS5zc2hkLnNlcnZlci5Db21tYW5kOworCitmaW5hbCBjbGFzcyBDb21tYW5kUHJvdmlkZXIgeworCisgIHByaXZhdGUgZmluYWwgUHJvdmlkZXI8Q29tbWFuZD4gcHJvdmlkZXI7CisgIHByaXZhdGUgZmluYWwgU3RyaW5nIGRlc2NyaXB0aW9uOworCisgIENvbW1hbmRQcm92aWRlcihmaW5hbCBQcm92aWRlcjxDb21tYW5kPiBwLCBmaW5hbCBTdHJpbmcgZCkgeworICAgIHRoaXMucHJvdmlkZXIgPSBwOworICAgIHRoaXMuZGVzY3JpcHRpb24gPSBkOworICB9CisKKyAgcHVibGljIFByb3ZpZGVyPENvbW1hbmQ+IGdldFByb3ZpZGVyKCkgeworICAgIHJldHVybiBwcm92aWRlcjsKKyAgfQorCisgIHB1YmxpYyBTdHJpbmcgZ2V0RGVzY3JpcHRpb24oKSB7CisgICAgcmV0dXJuIGRlc2NyaXB0aW9uOworICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvQ29tbWFuZHMuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kcy5qYXZhCmluZGV4IDUzNDBkNmYuLjkyOWE4OTUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kcy5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Db21tYW5kcy5qYXZhCkBAIC0xNiw2ICsxNiw3IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5LZXk7CiAKK2ltcG9ydCBvcmcuYXBhY2hlLmNvbW1vbnMubGFuZy5TdHJpbmdVdGlsczsKIGltcG9ydCBvcmcuYXBhY2hlLnNzaGQuc2VydmVyLkNvbW1hbmQ7CiAKIGltcG9ydCBqYXZhLmxhbmcuYW5ub3RhdGlvbi5Bbm5vdGF0aW9uOwpAQCAtNDEsNiArNDIsMTEgQEAKICAgICByZXR1cm4gS2V5LmdldChDb21tYW5kLmNsYXNzLCBuYW1lZChwYXJlbnQsIG5hbWUpKTsKICAgfQogCisgIHB1YmxpYyBzdGF0aWMgS2V5PENvbW1hbmQ+IGtleShmaW5hbCBDb21tYW5kTmFtZSBwYXJlbnQsCisgICAgICBmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgU3RyaW5nIGRlc2NyKSB7CisgICAgcmV0dXJuIEtleS5nZXQoQ29tbWFuZC5jbGFzcywgbmFtZWQocGFyZW50LCBuYW1lLCBkZXNjcikpOworICB9CisKICAgLyoqIENyZWF0ZSBhIENvbW1hbmROYW1lIGFubm90YXRpb24gZm9yIHRoZSBzdXBwbGllZCBuYW1lLiAqLwogICBwdWJsaWMgc3RhdGljIENvbW1hbmROYW1lIG5hbWVkKGZpbmFsIFN0cmluZyBuYW1lKSB7CiAgICAgcmV0dXJuIG5ldyBDb21tYW5kTmFtZSgpIHsKQEAgLTc4LDYgKzg0LDEyIEBACiAgICAgcmV0dXJuIG5ldyBOZXN0ZWRDb21tYW5kTmFtZUltcGwocGFyZW50LCBuYW1lKTsKICAgfQogCisgIC8qKiBDcmVhdGUgYSBDb21tYW5kTmFtZSBhbm5vdGF0aW9uIGZvciB0aGUgc3VwcGxpZWQgbmFtZSBhbmQgZGVzY3JpcHRpb24uICovCisgIHB1YmxpYyBzdGF0aWMgQ29tbWFuZE5hbWUgbmFtZWQoZmluYWwgQ29tbWFuZE5hbWUgcGFyZW50LCBmaW5hbCBTdHJpbmcgbmFtZSwKKyAgICAgIGZpbmFsIFN0cmluZyBkZXNjcikgeworICAgIHJldHVybiBuZXcgTmVzdGVkQ29tbWFuZE5hbWVJbXBsKHBhcmVudCwgbmFtZSwgZGVzY3IpOworICB9CisKICAgLyoqIFJldHVybiB0aGUgbmFtZSBvZiB0aGlzIGNvbW1hbmQsIHBvc3NpYmx5IGluY2x1ZGluZyBhbnkgcGFyZW50cy4gKi8KICAgcHVibGljIHN0YXRpYyBTdHJpbmcgbmFtZU9mKGZpbmFsIENvbW1hbmROYW1lIG5hbWUpIHsKICAgICBpZiAobmFtZSBpbnN0YW5jZW9mIE5lc3RlZENvbW1hbmROYW1lSW1wbCkgewpAQCAtMTA0LDEzICsxMTYsMjIgQEAKICAgICByZXR1cm4gbnVsbDsKICAgfQogCi0gIHByaXZhdGUgc3RhdGljIGZpbmFsIGNsYXNzIE5lc3RlZENvbW1hbmROYW1lSW1wbCBpbXBsZW1lbnRzIENvbW1hbmROYW1lIHsKKyAgc3RhdGljIGZpbmFsIGNsYXNzIE5lc3RlZENvbW1hbmROYW1lSW1wbCBpbXBsZW1lbnRzIENvbW1hbmROYW1lIHsKICAgICBwcml2YXRlIGZpbmFsIENvbW1hbmROYW1lIHBhcmVudDsKICAgICBwcml2YXRlIGZpbmFsIFN0cmluZyBuYW1lOworICAgIHByaXZhdGUgZmluYWwgU3RyaW5nIGRlc2NyOwogCiAgICAgTmVzdGVkQ29tbWFuZE5hbWVJbXBsKGZpbmFsIENvbW1hbmROYW1lIHBhcmVudCwgZmluYWwgU3RyaW5nIG5hbWUpIHsKICAgICAgIHRoaXMucGFyZW50ID0gcGFyZW50OwogICAgICAgdGhpcy5uYW1lID0gbmFtZTsKKyAgICAgIHRoaXMuZGVzY3IgPSBTdHJpbmdVdGlscy5FTVBUWTsKKyAgICB9CisKKyAgICBOZXN0ZWRDb21tYW5kTmFtZUltcGwoZmluYWwgQ29tbWFuZE5hbWUgcGFyZW50LCBmaW5hbCBTdHJpbmcgbmFtZSwKKyAgICAgICAgZmluYWwgU3RyaW5nIGRlc2NyKSB7CisgICAgICB0aGlzLnBhcmVudCA9IHBhcmVudDsKKyAgICAgIHRoaXMubmFtZSA9IG5hbWU7CisgICAgICB0aGlzLmRlc2NyID0gZGVzY3I7CiAgICAgfQogCiAgICAgQE92ZXJyaWRlCkBAIC0xMTgsNiArMTM5LDEwIEBACiAgICAgICByZXR1cm4gbmFtZTsKICAgICB9CiAKKyAgICBwdWJsaWMgU3RyaW5nIGRlc2NyKCkgeworICAgICAgcmV0dXJuIGRlc2NyOworICAgIH0KKwogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyBDbGFzczw/IGV4dGVuZHMgQW5ub3RhdGlvbj4gYW5ub3RhdGlvblR5cGUoKSB7CiAgICAgICByZXR1cm4gQ29tbWFuZE5hbWUuY2xhc3M7CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvRGF0YWJhc2VQdWJLZXlBdXRoLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvRGF0YWJhc2VQdWJLZXlBdXRoLmphdmEKaW5kZXggYTY5YTJmMS4uODNiYzhhNSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0RhdGFiYXNlUHViS2V5QXV0aC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9EYXRhYmFzZVB1YktleUF1dGguamF2YQpAQCAtMTUsNyArMTUsNiBAQAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRTc2hLZXk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFjY2Vzc1BhdGg7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5JZGVudGlmaWVkVXNlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuUGVlckRhZW1vblVzZXI7CkBAIC0yMyw3ICsyMiw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hTY29wZS5Db250ZXh0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TaW5nbGV0b247CiAKIGltcG9ydCBvcmcuYXBhY2hlLmNvbW1vbnMuY29kZWMuYmluYXJ5LkJhc2U2NDsKQEAgLTQzLDcgKzQxLDYgQEAKIGltcG9ydCBqYXZhLmlvLkZpbGVOb3RGb3VuZEV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLmlvLkZpbGVSZWFkZXI7CiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLm5ldC5Tb2NrZXRBZGRyZXNzOwogaW1wb3J0IGphdmEuc2VjdXJpdHkuS2V5UGFpcjsKIGltcG9ydCBqYXZhLnNlY3VyaXR5LlB1YmxpY0tleTsKIGltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKQEAgLTE3Myw3ICsxNzAsNyBAQAogICAgICAgLy8gc2Vzc2lvbiwgcmVjb3JkIGEgbG9naW4gZXZlbnQgaW4gdGhlIGxvZyBhbmQgYWRkCiAgICAgICAvLyBhIGNsb3NlIGxpc3RlbmVyIHRvIHJlY29yZCBhIGxvZ291dCBldmVudC4KICAgICAgIC8vCi0gICAgICBDb250ZXh0IGN0eCA9IHNzaFNjb3BlLm5ld0NvbnRleHQoc2QsIG51bGwpOworICAgICAgQ29udGV4dCBjdHggPSBzc2hTY29wZS5uZXdDb250ZXh0KG51bGwsIHNkLCBudWxsKTsKICAgICAgIENvbnRleHQgb2xkID0gc3NoU2NvcGUuc2V0KGN0eCk7CiAgICAgICB0cnkgewogICAgICAgICBzc2hMb2cub25Mb2dpbigpOwpAQCAtMTg1LDcgKzE4Miw3IEBACiAgICAgICAgICAgbmV3IElvRnV0dXJlTGlzdGVuZXI8SW9GdXR1cmU+KCkgewogICAgICAgICAgICAgQE92ZXJyaWRlCiAgICAgICAgICAgICBwdWJsaWMgdm9pZCBvcGVyYXRpb25Db21wbGV0ZShJb0Z1dHVyZSBmdXR1cmUpIHsKLSAgICAgICAgICAgICAgZmluYWwgQ29udGV4dCBjdHggPSBzc2hTY29wZS5uZXdDb250ZXh0KHNkLCBudWxsKTsKKyAgICAgICAgICAgICAgZmluYWwgQ29udGV4dCBjdHggPSBzc2hTY29wZS5uZXdDb250ZXh0KG51bGwsIHNkLCBudWxsKTsKICAgICAgICAgICAgICAgZmluYWwgQ29udGV4dCBvbGQgPSBzc2hTY29wZS5zZXQoY3R4KTsKICAgICAgICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgICAgICBzc2hMb2cub25Mb2dvdXQoKTsKQEAgLTIwMSwxMyArMTk4LDcgQEAKIAogICBwcml2YXRlIElkZW50aWZpZWRVc2VyIGNyZWF0ZVVzZXIoZmluYWwgU3NoU2Vzc2lvbiBzZCwKICAgICAgIGZpbmFsIFNzaEtleUNhY2hlRW50cnkga2V5KSB7Ci0gICAgcmV0dXJuIHVzZXJGYWN0b3J5LmNyZWF0ZShBY2Nlc3NQYXRoLlNTSF9DT01NQU5ELAotICAgICAgICBuZXcgUHJvdmlkZXI8U29ja2V0QWRkcmVzcz4oKSB7Ci0gICAgICAgICAgQE92ZXJyaWRlCi0gICAgICAgICAgcHVibGljIFNvY2tldEFkZHJlc3MgZ2V0KCkgewotICAgICAgICAgICAgcmV0dXJuIHNkLmdldFJlbW90ZUFkZHJlc3MoKTsKLSAgICAgICAgICB9Ci0gICAgICAgIH0sIGtleS5nZXRBY2NvdW50KCkpOworICAgIHJldHVybiB1c2VyRmFjdG9yeS5jcmVhdGUoc2QuZ2V0UmVtb3RlQWRkcmVzcygpLCBrZXkuZ2V0QWNjb3VudCgpKTsKICAgfQogCiAgIHByaXZhdGUgU3NoS2V5Q2FjaGVFbnRyeSBmaW5kKGZpbmFsIEl0ZXJhYmxlPFNzaEtleUNhY2hlRW50cnk+IGtleUxpc3QsCmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvRGlzcGF0Y2hDb21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvRGlzcGF0Y2hDb21tYW5kLmphdmEKaW5kZXggNjkxZjNhMC4uNDU1YjczMiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0Rpc3BhdGNoQ29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9EaXNwYXRjaENvbW1hbmQuamF2YQpAQCAtMTQsNiArMTQsNyBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQ7CiAKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5TZXRzOwogaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLnV0aWwuY29uY3VycmVudC5BdG9taWNzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUmVxdWlyZXNDYXBhYmlsaXR5OwpAQCAtMjksNiArMzAsNyBAQAogaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5Bcmd1bWVudDsKIAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5pby5TdHJpbmdXcml0ZXI7CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwpAQCAtMzksMTQgKzQxLDE0IEBACiAgKi8KIGZpbmFsIGNsYXNzIERpc3BhdGNoQ29tbWFuZCBleHRlbmRzIEJhc2VDb21tYW5kIHsKICAgaW50ZXJmYWNlIEZhY3RvcnkgewotICAgIERpc3BhdGNoQ29tbWFuZCBjcmVhdGUoTWFwPFN0cmluZywgUHJvdmlkZXI8Q29tbWFuZD4+IG1hcCk7CisgICAgRGlzcGF0Y2hDb21tYW5kIGNyZWF0ZShNYXA8U3RyaW5nLCBDb21tYW5kUHJvdmlkZXI+IG1hcCk7CiAgIH0KIAogICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPEN1cnJlbnRVc2VyPiBjdXJyZW50VXNlcjsKLSAgcHJpdmF0ZSBmaW5hbCBNYXA8U3RyaW5nLCBQcm92aWRlcjxDb21tYW5kPj4gY29tbWFuZHM7CisgIHByaXZhdGUgZmluYWwgTWFwPFN0cmluZywgQ29tbWFuZFByb3ZpZGVyPiBjb21tYW5kczsKICAgcHJpdmF0ZSBmaW5hbCBBdG9taWNSZWZlcmVuY2U8Q29tbWFuZD4gYXRvbWljQ21kOwogCi0gIEBBcmd1bWVudChpbmRleCA9IDAsIHJlcXVpcmVkID0gdHJ1ZSwgbWV0YVZhciA9ICJDT01NQU5EIiwgaGFuZGxlciA9IFN1YmNvbW1hbmRIYW5kbGVyLmNsYXNzKQorICBAQXJndW1lbnQoaW5kZXggPSAwLCByZXF1aXJlZCA9IGZhbHNlLCBtZXRhVmFyID0gIkNPTU1BTkQiLCBoYW5kbGVyID0gU3ViY29tbWFuZEhhbmRsZXIuY2xhc3MpCiAgIHByaXZhdGUgU3RyaW5nIGNvbW1hbmROYW1lOwogCiAgIEBBcmd1bWVudChpbmRleCA9IDEsIG11bHRpVmFsdWVkID0gdHJ1ZSwgbWV0YVZhciA9ICJBUkciKQpAQCAtNTQsMTMgKzU2LDEzIEBACiAKICAgQEluamVjdAogICBEaXNwYXRjaENvbW1hbmQoZmluYWwgUHJvdmlkZXI8Q3VycmVudFVzZXI+IGN1LAotICAgICAgQEFzc2lzdGVkIGZpbmFsIE1hcDxTdHJpbmcsIFByb3ZpZGVyPENvbW1hbmQ+PiBhbGwpIHsKKyAgICAgIEBBc3Npc3RlZCBmaW5hbCBNYXA8U3RyaW5nLCBDb21tYW5kUHJvdmlkZXI+IGFsbCkgewogICAgIGN1cnJlbnRVc2VyID0gY3U7CiAgICAgY29tbWFuZHMgPSBhbGw7CiAgICAgYXRvbWljQ21kID0gQXRvbWljcy5uZXdSZWZlcmVuY2UoKTsKICAgfQogCi0gIE1hcDxTdHJpbmcsIFByb3ZpZGVyPENvbW1hbmQ+PiBnZXRNYXAoKSB7CisgIE1hcDxTdHJpbmcsIENvbW1hbmRQcm92aWRlcj4gZ2V0TWFwKCkgewogICAgIHJldHVybiBjb21tYW5kczsKICAgfQogCkBAIC02OCw4ICs3MCwxMyBAQAogICBwdWJsaWMgdm9pZCBzdGFydChmaW5hbCBFbnZpcm9ubWVudCBlbnYpIHRocm93cyBJT0V4Y2VwdGlvbiB7CiAgICAgdHJ5IHsKICAgICAgIHBhcnNlQ29tbWFuZExpbmUoKTsKKyAgICAgIGlmIChTdHJpbmdzLmlzTnVsbE9yRW1wdHkoY29tbWFuZE5hbWUpKSB7CisgICAgICAgIFN0cmluZ1dyaXRlciBtc2cgPSBuZXcgU3RyaW5nV3JpdGVyKCk7CisgICAgICAgIG1zZy53cml0ZSh1c2FnZSgpKTsKKyAgICAgICAgdGhyb3cgbmV3IFVubG9nZ2VkRmFpbHVyZSgxLCBtc2cudG9TdHJpbmcoKSk7CisgICAgICB9CiAKLSAgICAgIGZpbmFsIFByb3ZpZGVyPENvbW1hbmQ+IHAgPSBjb21tYW5kcy5nZXQoY29tbWFuZE5hbWUpOworICAgICAgZmluYWwgQ29tbWFuZFByb3ZpZGVyIHAgPSBjb21tYW5kcy5nZXQoY29tbWFuZE5hbWUpOwogICAgICAgaWYgKHAgPT0gbnVsbCkgewogICAgICAgICBTdHJpbmcgbXNnID0KICAgICAgICAgICAgIChnZXROYW1lKCkuaXNFbXB0eSgpID8gIkdlcnJpdCBDb2RlIFJldmlldyIgOiBnZXROYW1lKCkpICsgIjogIgpAQCAtNzcsNyArODQsNyBAQAogICAgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKDEsIG1zZyk7CiAgICAgICB9CiAKLSAgICAgIGZpbmFsIENvbW1hbmQgY21kID0gcC5nZXQoKTsKKyAgICAgIGZpbmFsIENvbW1hbmQgY21kID0gcC5nZXRQcm92aWRlcigpLmdldCgpOwogICAgICAgY2hlY2tSZXF1aXJlc0NhcGFiaWxpdHkoY21kKTsKICAgICAgIGlmIChjbWQgaW5zdGFuY2VvZiBCYXNlQ29tbWFuZCkgewogICAgICAgICBmaW5hbCBCYXNlQ29tbWFuZCBiYyA9IChCYXNlQ29tbWFuZCkgY21kOwpAQCAtMTM4LDkgKzE0NSwxNyBAQAogICAgIH0KICAgICB1c2FnZS5hcHBlbmQoIiBhcmU6XG4iKTsKICAgICB1c2FnZS5hcHBlbmQoIlxuIik7CisKKyAgICBpbnQgbWF4TGVuZ3RoID0gLTE7CisgICAgZm9yIChTdHJpbmcgbmFtZSA6IGNvbW1hbmRzLmtleVNldCgpKSB7CisgICAgICBtYXhMZW5ndGggPSBNYXRoLm1heChtYXhMZW5ndGgsIG5hbWUubGVuZ3RoKCkpOworICAgIH0KKyAgICBTdHJpbmcgZm9ybWF0ID0gIiUtIiArIG1heExlbmd0aCArICJzICAgJXMiOwogICAgIGZvciAoU3RyaW5nIG5hbWUgOiBTZXRzLm5ld1RyZWVTZXQoY29tbWFuZHMua2V5U2V0KCkpKSB7CisgICAgICBmaW5hbCBDb21tYW5kUHJvdmlkZXIgcCA9IGNvbW1hbmRzLmdldChuYW1lKTsKICAgICAgIHVzYWdlLmFwcGVuZCgiICAgIik7Ci0gICAgICB1c2FnZS5hcHBlbmQobmFtZSk7CisgICAgICB1c2FnZS5hcHBlbmQoU3RyaW5nLmZvcm1hdChmb3JtYXQsIG5hbWUsCisgICAgICAgICAgU3RyaW5ncy5udWxsVG9FbXB0eShwLmdldERlc2NyaXB0aW9uKCkpKSk7CiAgICAgICB1c2FnZS5hcHBlbmQoIlxuIik7CiAgICAgfQogICAgIHVzYWdlLmFwcGVuZCgiXG4iKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9EaXNwYXRjaENvbW1hbmRQcm92aWRlci5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0Rpc3BhdGNoQ29tbWFuZFByb3ZpZGVyLmphdmEKaW5kZXggYjc2ZmY3MS4uZTlhMzFjOSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0Rpc3BhdGNoQ29tbWFuZFByb3ZpZGVyLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL0Rpc3BhdGNoQ29tbWFuZFByb3ZpZGVyLmphdmEKQEAgLTM5LDcgKzM5LDcgQEAKICAgcHJpdmF0ZSBEaXNwYXRjaENvbW1hbmQuRmFjdG9yeSBmYWN0b3J5OwogCiAgIHByaXZhdGUgZmluYWwgQ29tbWFuZE5hbWUgcGFyZW50OwotICBwcml2YXRlIHZvbGF0aWxlIENvbmN1cnJlbnRNYXA8U3RyaW5nLCBQcm92aWRlcjxDb21tYW5kPj4gbWFwOworICBwcml2YXRlIHZvbGF0aWxlIENvbmN1cnJlbnRNYXA8U3RyaW5nLCBDb21tYW5kUHJvdmlkZXI+IG1hcDsKIAogICBwdWJsaWMgRGlzcGF0Y2hDb21tYW5kUHJvdmlkZXIoZmluYWwgQ29tbWFuZE5hbWUgY24pIHsKICAgICB0aGlzLnBhcmVudCA9IGNuOwpAQCAtNTIsOCArNTIsOCBAQAogCiAgIHB1YmxpYyBSZWdpc3RyYXRpb25IYW5kbGUgcmVnaXN0ZXIoZmluYWwgQ29tbWFuZE5hbWUgbmFtZSwKICAgICAgIGZpbmFsIFByb3ZpZGVyPENvbW1hbmQ+IGNtZCkgewotICAgIGZpbmFsIENvbmN1cnJlbnRNYXA8U3RyaW5nLCBQcm92aWRlcjxDb21tYW5kPj4gbSA9IGdldE1hcCgpOwotICAgIGlmIChtLnB1dElmQWJzZW50KG5hbWUudmFsdWUoKSwgY21kKSAhPSBudWxsKSB7CisgICAgZmluYWwgQ29uY3VycmVudE1hcDxTdHJpbmcsIENvbW1hbmRQcm92aWRlcj4gbSA9IGdldE1hcCgpOworICAgIGlmIChtLnB1dElmQWJzZW50KG5hbWUudmFsdWUoKSwgbmV3IENvbW1hbmRQcm92aWRlcihjbWQsIG51bGwpKSAhPSBudWxsKSB7CiAgICAgICB0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKG5hbWUudmFsdWUoKSArICIgZXhpc3RzIik7CiAgICAgfQogICAgIHJldHVybiBuZXcgUmVnaXN0cmF0aW9uSGFuZGxlKCkgewpAQCAtNjYsOCArNjYsOCBAQAogCiAgIHB1YmxpYyBSZWdpc3RyYXRpb25IYW5kbGUgcmVwbGFjZShmaW5hbCBDb21tYW5kTmFtZSBuYW1lLAogICAgICAgZmluYWwgUHJvdmlkZXI8Q29tbWFuZD4gY21kKSB7Ci0gICAgZmluYWwgQ29uY3VycmVudE1hcDxTdHJpbmcsIFByb3ZpZGVyPENvbW1hbmQ+PiBtID0gZ2V0TWFwKCk7Ci0gICAgbS5wdXQobmFtZS52YWx1ZSgpLCBjbWQpOworICAgIGZpbmFsIENvbmN1cnJlbnRNYXA8U3RyaW5nLCBDb21tYW5kUHJvdmlkZXI+IG0gPSBnZXRNYXAoKTsKKyAgICBtLnB1dChuYW1lLnZhbHVlKCksIG5ldyBDb21tYW5kUHJvdmlkZXIoY21kLCBudWxsKSk7CiAgICAgcmV0dXJuIG5ldyBSZWdpc3RyYXRpb25IYW5kbGUoKSB7CiAgICAgICBAT3ZlcnJpZGUKICAgICAgIHB1YmxpYyB2b2lkIHJlbW92ZSgpIHsKQEAgLTc2LDcgKzc2LDcgQEAKICAgICB9OwogICB9CiAKLSAgQ29uY3VycmVudE1hcDxTdHJpbmcsIFByb3ZpZGVyPENvbW1hbmQ+PiBnZXRNYXAoKSB7CisgIENvbmN1cnJlbnRNYXA8U3RyaW5nLCBDb21tYW5kUHJvdmlkZXI+IGdldE1hcCgpIHsKICAgICBpZiAobWFwID09IG51bGwpIHsKICAgICAgIHN5bmNocm9uaXplZCAodGhpcykgewogICAgICAgICBpZiAobWFwID09IG51bGwpIHsKQEAgLTg4LDE0ICs4OCwyMSBAQAogICB9CiAKICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCi0gIHByaXZhdGUgQ29uY3VycmVudE1hcDxTdHJpbmcsIFByb3ZpZGVyPENvbW1hbmQ+PiBjcmVhdGVNYXAoKSB7Ci0gICAgQ29uY3VycmVudE1hcDxTdHJpbmcsIFByb3ZpZGVyPENvbW1hbmQ+PiBtID0gTWFwcy5uZXdDb25jdXJyZW50TWFwKCk7CisgIHByaXZhdGUgQ29uY3VycmVudE1hcDxTdHJpbmcsIENvbW1hbmRQcm92aWRlcj4gY3JlYXRlTWFwKCkgeworICAgIENvbmN1cnJlbnRNYXA8U3RyaW5nLCBDb21tYW5kUHJvdmlkZXI+IG0gPSBNYXBzLm5ld0NvbmN1cnJlbnRNYXAoKTsKICAgICBmb3IgKGZpbmFsIEJpbmRpbmc8Pz4gYiA6IGFsbENvbW1hbmRzKCkpIHsKICAgICAgIGZpbmFsIEFubm90YXRpb24gYW5ub3RhdGlvbiA9IGIuZ2V0S2V5KCkuZ2V0QW5ub3RhdGlvbigpOwogICAgICAgaWYgKGFubm90YXRpb24gaW5zdGFuY2VvZiBDb21tYW5kTmFtZSkgewogICAgICAgICBmaW5hbCBDb21tYW5kTmFtZSBuID0gKENvbW1hbmROYW1lKSBhbm5vdGF0aW9uOwogICAgICAgICBpZiAoIUNvbW1hbmRzLkNNRF9ST09ULmVxdWFscyhuKSAmJiBDb21tYW5kcy5pc0NoaWxkKHBhcmVudCwgbikpIHsKLSAgICAgICAgICBtLnB1dChuLnZhbHVlKCksIChQcm92aWRlcjxDb21tYW5kPikgYi5nZXRQcm92aWRlcigpKTsKKyAgICAgICAgICBTdHJpbmcgZGVzY3IgPSBudWxsOworICAgICAgICAgIGlmIChhbm5vdGF0aW9uIGluc3RhbmNlb2YgQ29tbWFuZHMuTmVzdGVkQ29tbWFuZE5hbWVJbXBsKSB7CisgICAgICAgICAgICBDb21tYW5kcy5OZXN0ZWRDb21tYW5kTmFtZUltcGwgaW1wbCA9CisgICAgICAgICAgICAgICAgKChDb21tYW5kcy5OZXN0ZWRDb21tYW5kTmFtZUltcGwpIGFubm90YXRpb24pOworICAgICAgICAgICAgZGVzY3IgPSBpbXBsLmRlc2NyKCk7CisgICAgICAgICAgfQorICAgICAgICAgIG0ucHV0KG4udmFsdWUoKSwKKyAgICAgICAgICAgICAgbmV3IENvbW1hbmRQcm92aWRlcigoUHJvdmlkZXI8Q29tbWFuZD4pIGIuZ2V0UHJvdmlkZXIoKSwgZGVzY3IpKTsKICAgICAgICAgfQogICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Ob1NoZWxsLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvTm9TaGVsbC5qYXZhCmluZGV4IGQyZmRmNzguLmNkZTdhZTggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Ob1NoZWxsLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL05vU2hlbGwuamF2YQpAQCAtMTUsMTAgKzE1LDEyIEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQ7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ2Fub25pY2FsV2ViVXJsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guU3NoSW5mbzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLlNzaFNjb3BlLkNvbnRleHQ7CitpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlNjaGVtYUZhY3Rvcnk7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogCkBAIC01OCw2ICs2MCw3IEBACiAKICAgc3RhdGljIGNsYXNzIFNlbmRNZXNzYWdlIGltcGxlbWVudHMgQ29tbWFuZCwgU2Vzc2lvbkF3YXJlIHsKICAgICBwcml2YXRlIGZpbmFsIFByb3ZpZGVyPE1lc3NhZ2VGYWN0b3J5PiBtZXNzYWdlRmFjdG9yeTsKKyAgICBwcml2YXRlIGZpbmFsIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNjaGVtYUZhY3Rvcnk7CiAgICAgcHJpdmF0ZSBmaW5hbCBTc2hTY29wZSBzc2hTY29wZTsKIAogICAgIHByaXZhdGUgSW5wdXRTdHJlYW0gaW47CkBAIC02Nyw4ICs3MCwxMCBAQAogICAgIHByaXZhdGUgQ29udGV4dCBjb250ZXh0OwogCiAgICAgQEluamVjdAotICAgIFNlbmRNZXNzYWdlKFByb3ZpZGVyPE1lc3NhZ2VGYWN0b3J5PiBtZXNzYWdlRmFjdG9yeSwgU3NoU2NvcGUgc3NoU2NvcGUpIHsKKyAgICBTZW5kTWVzc2FnZShQcm92aWRlcjxNZXNzYWdlRmFjdG9yeT4gbWVzc2FnZUZhY3RvcnksCisgICAgICAgIFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNmLCBTc2hTY29wZSBzc2hTY29wZSkgewogICAgICAgdGhpcy5tZXNzYWdlRmFjdG9yeSA9IG1lc3NhZ2VGYWN0b3J5OworICAgICAgdGhpcy5zY2hlbWFGYWN0b3J5ID0gc2Y7CiAgICAgICB0aGlzLnNzaFNjb3BlID0gc3NoU2NvcGU7CiAgICAgfQogCkBAIC04OSw3ICs5NCw4IEBACiAgICAgfQogCiAgICAgcHVibGljIHZvaWQgc2V0U2Vzc2lvbihmaW5hbCBTZXJ2ZXJTZXNzaW9uIHNlc3Npb24pIHsKLSAgICAgIHRoaXMuY29udGV4dCA9IHNzaFNjb3BlLm5ld0NvbnRleHQoc2Vzc2lvbi5nZXRBdHRyaWJ1dGUoU3NoU2Vzc2lvbi5LRVkpLCAiIik7CisgICAgICBTc2hTZXNzaW9uIHMgPSBzZXNzaW9uLmdldEF0dHJpYnV0ZShTc2hTZXNzaW9uLktFWSk7CisgICAgICB0aGlzLmNvbnRleHQgPSBzc2hTY29wZS5uZXdDb250ZXh0KHNjaGVtYUZhY3RvcnksIHMsICIiKTsKICAgICB9CiAKICAgICBwdWJsaWMgdm9pZCBzdGFydChmaW5hbCBFbnZpcm9ubWVudCBlbnYpIHRocm93cyBJT0V4Y2VwdGlvbiB7CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvUGx1Z2luQ29tbWFuZE1vZHVsZS5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL1BsdWdpbkNvbW1hbmRNb2R1bGUuamF2YQppbmRleCA0ZGJiOGQ3Li4wMTNmMDcwIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvUGx1Z2luQ29tbWFuZE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9QbHVnaW5Db21tYW5kTW9kdWxlLmphdmEKQEAgLTE2LDIxICsxNiwxNyBAQAogCiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5QcmVjb25kaXRpb25zOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUGx1Z2luTmFtZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmROYW1lOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZHM7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5EaXNwYXRjaENvbW1hbmRQcm92aWRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5iaW5kZXIuTGlua2VkQmluZGluZ0J1aWxkZXI7CiAKIGltcG9ydCBvcmcuYXBhY2hlLnNzaGQuc2VydmVyLkNvbW1hbmQ7CiAKIGltcG9ydCBqYXZheC5pbmplY3QuSW5qZWN0OwogCi1wdWJsaWMgYWJzdHJhY3QgY2xhc3MgUGx1Z2luQ29tbWFuZE1vZHVsZSBleHRlbmRzIEFic3RyYWN0TW9kdWxlIHsKK3B1YmxpYyBhYnN0cmFjdCBjbGFzcyBQbHVnaW5Db21tYW5kTW9kdWxlIGV4dGVuZHMgQ29tbWFuZE1vZHVsZSB7CiAgIHByaXZhdGUgQ29tbWFuZE5hbWUgY29tbWFuZDsKIAogICBASW5qZWN0Ci0gIHZvaWQgc2V0UGx1Z2luTmFtZShAUGx1Z2luTmFtZSBTdHJpbmcgbmFtZSkgeworICB2b2lkIHNldFBsdWdpbk5hbWUoQFBsdWdpbk5hbWUgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyBkZXNjcikgewogICAgIHRoaXMuY29tbWFuZCA9IENvbW1hbmRzLm5hbWVkKG5hbWUpOwogICB9CiAKQEAgLTQ2LDQgKzQyLDEzIEBACiAgIHByb3RlY3RlZCBMaW5rZWRCaW5kaW5nQnVpbGRlcjxDb21tYW5kPiBjb21tYW5kKFN0cmluZyBzdWJDbWQpIHsKICAgICByZXR1cm4gYmluZChDb21tYW5kcy5rZXkoY29tbWFuZCwgc3ViQ21kKSk7CiAgIH0KKworICBwcm90ZWN0ZWQgdm9pZCBjb21tYW5kKENsYXNzPD8gZXh0ZW5kcyBCYXNlQ29tbWFuZD4gY2xhenopIHsKKyAgICBjb21tYW5kKGNvbW1hbmQsIGNsYXp6KTsKKyAgfQorCisgIHByb3RlY3RlZCB2b2lkIGFsaWFzKGZpbmFsIFN0cmluZyBuYW1lLCBDbGFzczw/IGV4dGVuZHMgQmFzZUNvbW1hbmQ+IGNsYXp6KSB7CisgICAgYWxpYXMoY29tbWFuZCwgbmFtZSwgY2xhenopOworICB9CisKIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hBdXRvUmVnaXN0ZXJNb2R1bGVHZW5lcmF0b3IuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hBdXRvUmVnaXN0ZXJNb2R1bGVHZW5lcmF0b3IuamF2YQppbmRleCAwMzQ4NWY3Li5hZmIyNTM3IDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvU3NoQXV0b1JlZ2lzdGVyTW9kdWxlR2VuZXJhdG9yLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL1NzaEF1dG9SZWdpc3Rlck1vZHVsZUdlbmVyYXRvci5qYXZhCkBAIC0xNCwyMiArMTQsMjkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkOwogCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLkF1dG9SZWdpc3RlclV0aWwuY2FsY3VsYXRlQmluZEFubm90YXRpb247CisKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlByZWNvbmRpdGlvbnM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5MaW5rZWRMaXN0TXVsdGltYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTXVsdGltYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5FeHBvcnQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuSW52YWxpZFBsdWdpbkV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2lucy5Nb2R1bGVHZW5lcmF0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuQWJzdHJhY3RNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlR5cGVMaXRlcmFsOwogCiBpbXBvcnQgb3JnLmFwYWNoZS5zc2hkLnNlcnZlci5Db21tYW5kOwogCitpbXBvcnQgamF2YS5sYW5nLmFubm90YXRpb24uQW5ub3RhdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogCiBjbGFzcyBTc2hBdXRvUmVnaXN0ZXJNb2R1bGVHZW5lcmF0b3IKICAgICBleHRlbmRzIEFic3RyYWN0TW9kdWxlCiAgICAgaW1wbGVtZW50cyBNb2R1bGVHZW5lcmF0b3IgewogICBwcml2YXRlIGZpbmFsIE1hcDxTdHJpbmcsIENsYXNzPENvbW1hbmQ+PiBjb21tYW5kcyA9IE1hcHMubmV3SGFzaE1hcCgpOworICBwcml2YXRlIGZpbmFsIE11bHRpbWFwPFR5cGVMaXRlcmFsPD8+LCBDbGFzczw/Pj4gbGlzdGVuZXJzID0gTGlua2VkTGlzdE11bHRpbWFwLmNyZWF0ZSgpOwogICBwcml2YXRlIENvbW1hbmROYW1lIGNvbW1hbmQ7CiAKICAgQE92ZXJyaWRlCkBAIC0zOSw2ICs0NiwxNiBAQAogICAgIGZvciAoTWFwLkVudHJ5PFN0cmluZywgQ2xhc3M8Q29tbWFuZD4+IGUgOiBjb21tYW5kcy5lbnRyeVNldCgpKSB7CiAgICAgICBiaW5kKENvbW1hbmRzLmtleShjb21tYW5kLCBlLmdldEtleSgpKSkudG8oZS5nZXRWYWx1ZSgpKTsKICAgICB9CisgICAgZm9yIChNYXAuRW50cnk8VHlwZUxpdGVyYWw8Pz4sIENsYXNzPD8+PiBlIDogbGlzdGVuZXJzLmVudHJpZXMoKSkgeworICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgICAgICBUeXBlTGl0ZXJhbDxPYmplY3Q+IHR5cGUgPSAoVHlwZUxpdGVyYWw8T2JqZWN0PikgZS5nZXRLZXkoKTsKKworICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCisgICAgICBDbGFzczxPYmplY3Q+IGltcGwgPSAoQ2xhc3M8T2JqZWN0PikgZS5nZXRWYWx1ZSgpOworCisgICAgICBBbm5vdGF0aW9uIG4gPSBjYWxjdWxhdGVCaW5kQW5ub3RhdGlvbihpbXBsKTsKKyAgICAgIGJpbmQodHlwZSkuYW5ub3RhdGVkV2l0aChuKS50byhpbXBsKTsKKyAgICB9CiAgIH0KIAogICBwdWJsaWMgdm9pZCBzZXRQbHVnaW5OYW1lKFN0cmluZyBuYW1lKSB7CkBAIC02Niw2ICs4MywxMiBAQAogICAgIH0KICAgfQogCisKKyAgQE92ZXJyaWRlCisgIHB1YmxpYyB2b2lkIGxpc3RlbihUeXBlTGl0ZXJhbDw/PiB0bCwgQ2xhc3M8Pz4gY2xhenopIHsKKyAgICBsaXN0ZW5lcnMucHV0KHRsLCBjbGF6eik7CisgIH0KKwogICBAT3ZlcnJpZGUKICAgcHVibGljIE1vZHVsZSBjcmVhdGUoKSB0aHJvd3MgSW52YWxpZFBsdWdpbkV4Y2VwdGlvbiB7CiAgICAgUHJlY29uZGl0aW9ucy5jaGVja1N0YXRlKGNvbW1hbmQgIT0gbnVsbCwgInBsdWdpbk5hbWUgbXVzdCBiZSBwcm92aWRlZCIpOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL1NzaERhZW1vbi5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL1NzaERhZW1vbi5qYXZhCmluZGV4IDY2NGNlNDUuLmM0M2RlNjAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hEYWVtb24uamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvU3NoRGFlbW9uLmphdmEKQEAgLTE0LDYgKzE0LDggQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkOwogCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guU3NoQWRkcmVzc2VzTW9kdWxlLklBTkFfU1NIX1BPUlQ7CisKIGltcG9ydCBzdGF0aWMgamF2YS51dGlsLmNvbmN1cnJlbnQuVGltZVVuaXQuTUlMTElTRUNPTkRTOwogaW1wb3J0IHN0YXRpYyBqYXZhLnV0aWwuY29uY3VycmVudC5UaW1lVW5pdC5TRUNPTkRTOwogCkBAIC0yMSw3ICsyMyw5IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5ldmVudHMuTGlmZWN5Y2xlTGlzdGVuZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5Db25maWdVdGlsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zc2guU3NoQWR2ZXJ0aXNlZEFkZHJlc3NlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc3NoLlNzaEluZm87CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hMaXN0ZW5BZGRyZXNzZXM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuSWRHZW5lcmF0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuU29ja2V0VXRpbDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CkBAIC0xMTQsMTMgKzExOCwxMCBAQAogICovCiBAU2luZ2xldG9uCiBwdWJsaWMgY2xhc3MgU3NoRGFlbW9uIGV4dGVuZHMgU3NoU2VydmVyIGltcGxlbWVudHMgU3NoSW5mbywgTGlmZWN5Y2xlTGlzdGVuZXIgewotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgSUFOQV9TU0hfUE9SVCA9IDIyOwotICBwdWJsaWMgc3RhdGljIGZpbmFsIGludCBERUZBVUxUX1BPUlQgPSAyOTQxODsKLQogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0gTG9nZ2VyRmFjdG9yeS5nZXRMb2dnZXIoU3NoRGFlbW9uLmNsYXNzKTsKIAogICBwcml2YXRlIGZpbmFsIExpc3Q8U29ja2V0QWRkcmVzcz4gbGlzdGVuOwotICBwcml2YXRlIGZpbmFsIExpc3Q8U3RyaW5nPiBhZHZlcnRpc2VkQWRkcmVzczsKKyAgcHJpdmF0ZSBmaW5hbCBMaXN0PFN0cmluZz4gYWR2ZXJ0aXNlZDsKICAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIGtlZXBBbGl2ZTsKICAgcHJpdmF0ZSBmaW5hbCBMaXN0PEhvc3RLZXk+IGhvc3RLZXlzOwogICBwcml2YXRlIHZvbGF0aWxlIElvQWNjZXB0b3IgYWNjZXB0b3I7CkBAIC0xMjksMTEgKzEzMCwxMyBAQAogICBTc2hEYWVtb24oZmluYWwgQ29tbWFuZEZhY3RvcnkgY29tbWFuZEZhY3RvcnksIGZpbmFsIE5vU2hlbGwgbm9TaGVsbCwKICAgICAgIGZpbmFsIFB1YmxpY2tleUF1dGhlbnRpY2F0b3IgdXNlckF1dGgsCiAgICAgICBmaW5hbCBLZXlQYWlyUHJvdmlkZXIgaG9zdEtleVByb3ZpZGVyLCBmaW5hbCBJZEdlbmVyYXRvciBpZEdlbmVyYXRvciwKLSAgICAgIEBHZXJyaXRTZXJ2ZXJDb25maWcgZmluYWwgQ29uZmlnIGNmZywgZmluYWwgU3NoTG9nIHNzaExvZykgeworICAgICAgQEdlcnJpdFNlcnZlckNvbmZpZyBmaW5hbCBDb25maWcgY2ZnLCBmaW5hbCBTc2hMb2cgc3NoTG9nLAorICAgICAgQFNzaExpc3RlbkFkZHJlc3NlcyBmaW5hbCBMaXN0PFNvY2tldEFkZHJlc3M+IGxpc3RlbiwKKyAgICAgIEBTc2hBZHZlcnRpc2VkQWRkcmVzc2VzIGZpbmFsIExpc3Q8U3RyaW5nPiBhZHZlcnRpc2VkKSB7CiAgICAgc2V0UG9ydChJQU5BX1NTSF9QT1JUIC8qIG5ldmVyIHVzZWQgKi8pOwogCi0gICAgbGlzdGVuID0gcGFyc2VMaXN0ZW4oY2ZnKTsKLSAgICBhZHZlcnRpc2VkQWRkcmVzcyA9IHBhcnNlQWR2ZXJ0aXNlZEFkZHJlc3MoY2ZnKTsKKyAgICB0aGlzLmxpc3RlbiA9IGxpc3RlbjsKKyAgICB0aGlzLmFkdmVydGlzZWQgPSBhZHZlcnRpc2VkOwogICAgIHJldXNlQWRkcmVzcyA9IGNmZy5nZXRCb29sZWFuKCJzc2hkIiwgInJldXNlYWRkcmVzcyIsIHRydWUpOwogICAgIGtlZXBBbGl2ZSA9IGNmZy5nZXRCb29sZWFuKCJzc2hkIiwgInRjcGtlZXBhbGl2ZSIsIHRydWUpOwogCkBAIC0xNDksNiArMTUyLDE4IEBACiAgICAgICAgIFN0cmluZy52YWx1ZU9mKE1JTExJU0VDT05EUy5jb252ZXJ0KENvbmZpZ1V0aWwuZ2V0VGltZVVuaXQoY2ZnLCAic3NoZCIsCiAgICAgICAgICAgICBudWxsLCAibG9naW5HcmFjZVRpbWUiLCAxMjAsIFNFQ09ORFMpLCBTRUNPTkRTKSkpOwogCisgICAgbG9uZyBpZGxlVGltZW91dFNlY29uZHMgPSBDb25maWdVdGlsLmdldFRpbWVVbml0KGNmZywgInNzaGQiLCBudWxsLAorICAgICAgICAiaWRsZVRpbWVvdXQiLCAwLCBTRUNPTkRTKTsKKyAgICBpZiAoaWRsZVRpbWVvdXRTZWNvbmRzID09IDApIHsKKyAgICAgIC8vIFNpbmNlIEFwYWNoZSBTU0hEIGRvZXMgbm90IGFsbG93IHRvIHR1cm4gb2ZmIGNsb3NpbmcgaWRsZSBjb25uZWN0aW9ucywKKyAgICAgIC8vIHdlIGZha2UgaXQgYnkgdXNpbmcgdGhlIGhpZ2hlc3QgdGltZW91dCBhbGxvd2VkIGJ5IEFwYWNoZSBTU0hELCB3aGljaAorICAgICAgLy8gYW1vdW50cyB0byB+MjQgZGF5cy4KKyAgICAgIGlkbGVUaW1lb3V0U2Vjb25kcyA9IE1JTExJU0VDT05EUy50b1NlY29uZHMoSW50ZWdlci5NQVhfVkFMVUUpOworICAgIH0KKyAgICBnZXRQcm9wZXJ0aWVzKCkucHV0KAorICAgICAgICBJRExFX1RJTUVPVVQsCisgICAgICAgIFN0cmluZy52YWx1ZU9mKFNFQ09ORFMudG9NaWxsaXMoaWRsZVRpbWVvdXRTZWNvbmRzKSkpOworCiAgICAgZmluYWwgaW50IG1heENvbm5lY3Rpb25zUGVyVXNlciA9CiAgICAgICAgIGNmZy5nZXRJbnQoInNzaGQiLCAibWF4Q29ubmVjdGlvbnNQZXJVc2VyIiwgNjQpOwogICAgIGlmICgwIDwgbWF4Q29ubmVjdGlvbnNQZXJVc2VyKSB7CkBAIC0yNjgsNyArMjgzLDcgQEAKICAgICAgIGJ1Zi5wdXRSYXdQdWJsaWNLZXkocHViKTsKICAgICAgIGZpbmFsIGJ5dGVbXSBrZXlCaW4gPSBidWYuZ2V0Q29tcGFjdERhdGEoKTsKIAotICAgICAgZm9yIChmaW5hbCBTdHJpbmcgYWRkciA6IG15QWR2ZXJ0aXNlZEFkZHJlc3NlcygpKSB7CisgICAgICBmb3IgKGZpbmFsIFN0cmluZyBhZGRyIDogYWR2ZXJ0aXNlZCkgewogICAgICAgICB0cnkgewogICAgICAgICAgIHIuYWRkKG5ldyBIb3N0S2V5KGFkZHIsIGtleUJpbikpOwogICAgICAgICB9IGNhdGNoIChKU2NoRXhjZXB0aW9uIGUpIHsKQEAgLTI3OSwzNiArMjk0LDYgQEAKICAgICByZXR1cm4gQ29sbGVjdGlvbnMudW5tb2RpZmlhYmxlTGlzdChyKTsKICAgfQogCi0gIHByaXZhdGUgTGlzdDxTdHJpbmc+IG15QWR2ZXJ0aXNlZEFkZHJlc3NlcygpIHsKLSAgICBpZiAoYWR2ZXJ0aXNlZEFkZHJlc3MgIT0gbnVsbCkgewotICAgICAgcmV0dXJuIGFkdmVydGlzZWRBZGRyZXNzOwotICAgIH0gZWxzZSB7Ci0gICAgICBMaXN0PEluZXRTb2NrZXRBZGRyZXNzPiBhZGRycyA9IG15QWRkcmVzc2VzKCk7Ci0gICAgICBMaXN0PFN0cmluZz4gc3RyQWRkcnMgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oYWRkcnMuc2l6ZSgpKTsKLSAgICAgIGZvciAoZmluYWwgSW5ldFNvY2tldEFkZHJlc3MgYWRkciA6IGFkZHJzKSB7Ci0gICAgICAgIHN0ckFkZHJzLmFkZChTb2NrZXRVdGlsLmZvcm1hdChhZGRyLCBJQU5BX1NTSF9QT1JUKSk7Ci0gICAgICB9Ci0gICAgICByZXR1cm4gc3RyQWRkcnM7Ci0gICAgfQotICB9Ci0KLSAgcHJpdmF0ZSBMaXN0PEluZXRTb2NrZXRBZGRyZXNzPiBteUFkZHJlc3NlcygpIHsKLSAgICBBcnJheUxpc3Q8SW5ldFNvY2tldEFkZHJlc3M+IHB1YiA9IG5ldyBBcnJheUxpc3Q8SW5ldFNvY2tldEFkZHJlc3M+KCk7Ci0gICAgQXJyYXlMaXN0PEluZXRTb2NrZXRBZGRyZXNzPiBsb2NhbCA9IG5ldyBBcnJheUxpc3Q8SW5ldFNvY2tldEFkZHJlc3M+KCk7Ci0KLSAgICBmb3IgKGZpbmFsIFNvY2tldEFkZHJlc3MgYWRkciA6IGxpc3RlbikgewotICAgICAgaWYgKGFkZHIgaW5zdGFuY2VvZiBJbmV0U29ja2V0QWRkcmVzcykgewotICAgICAgICBmaW5hbCBJbmV0U29ja2V0QWRkcmVzcyBpbmV0QWRkciA9IChJbmV0U29ja2V0QWRkcmVzcykgYWRkcjsKLSAgICAgICAgaWYgKGluZXRBZGRyLmdldEFkZHJlc3MoKS5pc0xvb3BiYWNrQWRkcmVzcygpKSB7Ci0gICAgICAgICAgbG9jYWwuYWRkKGluZXRBZGRyKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICBwdWIuYWRkKGluZXRBZGRyKTsKLSAgICAgICAgfQotICAgICAgfQotICAgIH0KLSAgICByZXR1cm4gcHViLmlzRW1wdHkoKSA/IGxvY2FsIDogcHViOwotICB9Ci0KICAgcHJpdmF0ZSBMaXN0PFB1YmxpY0tleT4gbXlIb3N0S2V5cygpIHsKICAgICBmaW5hbCBLZXlQYWlyUHJvdmlkZXIgcCA9IGdldEtleVBhaXJQcm92aWRlcigpOwogICAgIGZpbmFsIExpc3Q8UHVibGljS2V5PiBrZXlzID0gbmV3IEFycmF5TGlzdDxQdWJsaWNLZXk+KDIpOwpAQCAtMzM2LDQyICszMjEsNiBAQAogICAgIHJldHVybiByLnRvU3RyaW5nKCk7CiAgIH0KIAotICBwcml2YXRlIExpc3Q8U3RyaW5nPiBwYXJzZUFkdmVydGlzZWRBZGRyZXNzKGZpbmFsIENvbmZpZyBjZmcpIHsKLSAgICBmaW5hbCBTdHJpbmdbXSB3YW50ID0gY2ZnLmdldFN0cmluZ0xpc3QoInNzaGQiLCBudWxsLCAiYWR2ZXJ0aXNlZGFkZHJlc3MiKTsKLSAgICBpZiAod2FudC5sZW5ndGggPT0gMCkgewotICAgICAgcmV0dXJuIG51bGw7Ci0gICAgfQotICAgIHJldHVybiBBcnJheXMuYXNMaXN0KHdhbnQpOwotICB9Ci0KLSAgcHJpdmF0ZSBMaXN0PFNvY2tldEFkZHJlc3M+IHBhcnNlTGlzdGVuKGZpbmFsIENvbmZpZyBjZmcpIHsKLSAgICBmaW5hbCBBcnJheUxpc3Q8U29ja2V0QWRkcmVzcz4gYmluZCA9IG5ldyBBcnJheUxpc3Q8U29ja2V0QWRkcmVzcz4oMik7Ci0gICAgZmluYWwgU3RyaW5nW10gd2FudCA9IGNmZy5nZXRTdHJpbmdMaXN0KCJzc2hkIiwgbnVsbCwgImxpc3RlbmFkZHJlc3MiKTsKLSAgICBpZiAod2FudCA9PSBudWxsIHx8IHdhbnQubGVuZ3RoID09IDApIHsKLSAgICAgIGJpbmQuYWRkKG5ldyBJbmV0U29ja2V0QWRkcmVzcyhERUZBVUxUX1BPUlQpKTsKLSAgICAgIHJldHVybiBiaW5kOwotICAgIH0KLQotICAgIGlmICh3YW50Lmxlbmd0aCA9PSAxICYmIGlzT2ZmKHdhbnRbMF0pKSB7Ci0gICAgICByZXR1cm4gYmluZDsKLSAgICB9Ci0KLSAgICBmb3IgKGZpbmFsIFN0cmluZyBkZXNjIDogd2FudCkgewotICAgICAgdHJ5IHsKLSAgICAgICAgYmluZC5hZGQoU29ja2V0VXRpbC5yZXNvbHZlKGRlc2MsIERFRkFVTFRfUE9SVCkpOwotICAgICAgfSBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIGUpIHsKLSAgICAgICAgbG9nLmVycm9yKCJCYWQgc3NoZC5saXN0ZW5hZGRyZXNzOiAiICsgZGVzYyArICI6ICIgKyBlLmdldE1lc3NhZ2UoKSk7Ci0gICAgICB9Ci0gICAgfQotICAgIHJldHVybiBiaW5kOwotICB9Ci0KLSAgcHJpdmF0ZSBzdGF0aWMgYm9vbGVhbiBpc09mZihTdHJpbmcgbGlzdGVuSG9zdG5hbWUpIHsKLSAgICByZXR1cm4gIm9mZiIuZXF1YWxzSWdub3JlQ2FzZShsaXN0ZW5Ib3N0bmFtZSkKLSAgICAgICAgfHwgIm5vbmUiLmVxdWFsc0lnbm9yZUNhc2UobGlzdGVuSG9zdG5hbWUpCi0gICAgICAgIHx8ICJubyIuZXF1YWxzSWdub3JlQ2FzZShsaXN0ZW5Ib3N0bmFtZSk7Ci0gIH0KLQogICBAU3VwcHJlc3NXYXJuaW5ncygidW5jaGVja2VkIikKICAgcHJpdmF0ZSB2b2lkIGluaXRQcm92aWRlckJvdW5jeUNhc3RsZSgpIHsKICAgICBzZXRLZXlFeGNoYW5nZUZhY3RvcmllcyhBcnJheXMuPE5hbWVkRmFjdG9yeTxLZXlFeGNoYW5nZT4+IGFzTGlzdCgKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hMb2cuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hMb2cuamF2YQppbmRleCBjOWFjM2U3Li4zMzY0OTBjIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvU3NoTG9nLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL1NzaExvZy5qYXZhCkBAIC0xNCw5ICsxNCwxMSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQ7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5MaWZlY3ljbGVMaXN0ZW5lcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hdWRpdC5BdWRpdEV2ZW50OworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuQXJyYXlMaXN0TXVsdGltYXA7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NdWx0aW1hcDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5hdWRpdC5BdWRpdFNlcnZpY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuYXVkaXQuU3NoQXVkaXRFdmVudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmV2ZW50cy5MaWZlY3ljbGVMaXN0ZW5lcjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5QZWVyRGFlbW9uVXNlcjsKQEAgLTQyLDcgKzQ0LDYgQEAKIGltcG9ydCBqYXZhLmlvLkZpbGU7CiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLnRleHQuU2ltcGxlRGF0ZUZvcm1hdDsKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlzOwogaW1wb3J0IGphdmEudXRpbC5DYWxlbmRhcjsKIGltcG9ydCBqYXZhLnV0aWwuRGF0ZTsKIGltcG9ydCBqYXZhLnV0aWwuVGltZVpvbmU7CkBAIC0xMDEsNyArMTAyLDcgQEAKIAogICB2b2lkIG9uTG9naW4oKSB7CiAgICAgYXN5bmMuYXBwZW5kKGxvZygiTE9HSU4gRlJPTSAiICsgc2Vzc2lvbi5nZXQoKS5nZXRSZW1vdGVBZGRyZXNzQXNTdHJpbmcoKSkpOwotICAgIGF1ZGl0KGNvbnRleHQuZ2V0KCksICIwIiwgIkxPR0lOIiwgbmV3IFN0cmluZ1tdIHt9KTsKKyAgICBhdWRpdChjb250ZXh0LmdldCgpLCAiMCIsICJMT0dJTiIpOwogICB9CiAKICAgdm9pZCBvbkF1dGhGYWlsKGZpbmFsIFNzaFNlc3Npb24gc2QpIHsKQEAgLTEyNywxOCArMTI4LDE0IEBACiAgICAgfQogCiAgICAgYXN5bmMuYXBwZW5kKGV2ZW50KTsKLSAgICBhdWRpdChudWxsLCAiRkFJTCIsICJBVVRIIiwgbmV3IFN0cmluZ1tdIHtzZC5nZXRSZW1vdGVBZGRyZXNzQXNTdHJpbmcoKX0pOworICAgIGF1ZGl0KG51bGwsICJGQUlMIiwgIkFVVEgiKTsKICAgfQogCi0gIHZvaWQgb25FeGVjdXRlKGludCBleGl0VmFsdWUpIHsKKyAgdm9pZCBvbkV4ZWN1dGUoRGlzcGF0Y2hDb21tYW5kIGRjbWQsIGludCBleGl0VmFsdWUpIHsKICAgICBmaW5hbCBDb250ZXh0IGN0eCA9IGNvbnRleHQuZ2V0KCk7CiAgICAgY3R4LmZpbmlzaGVkID0gU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCk7CiAKLSAgICBmaW5hbCBTdHJpbmcgY29tbWFuZExpbmUgPSBjdHguZ2V0Q29tbWFuZExpbmUoKTsKLSAgICBTdHJpbmcgY21kID0gUXVvdGVkU3RyaW5nLkJPVVJORS5xdW90ZShjb21tYW5kTGluZSk7Ci0gICAgaWYgKGNtZCA9PSBjb21tYW5kTGluZSkgewotICAgICAgY21kID0gIiciICsgY29tbWFuZExpbmUgKyAiJyI7Ci0gICAgfQorICAgIFN0cmluZyBjbWQgPSBleHRyYWN0V2hhdChkY21kKTsKIAogICAgIGZpbmFsIExvZ2dpbmdFdmVudCBldmVudCA9IGxvZyhjbWQpOwogICAgIGV2ZW50LnNldFByb3BlcnR5KFBfV0FJVCwgKGN0eC5zdGFydGVkIC0gY3R4LmNyZWF0ZWQpICsgIm1zIik7CkBAIC0xNjUsMTkgKzE2Miw1NCBAQAogICAgIGV2ZW50LnNldFByb3BlcnR5KFBfU1RBVFVTLCBzdGF0dXMpOwogCiAgICAgYXN5bmMuYXBwZW5kKGV2ZW50KTsKLSAgICBhdWRpdChjb250ZXh0LmdldCgpLCBzdGF0dXMsIGdldENvbW1hbmQoY29tbWFuZExpbmUpLAotICAgICAgICBDb21tYW5kRmFjdG9yeVByb3ZpZGVyLnNwbGl0KGNvbW1hbmRMaW5lKSk7CisgICAgYXVkaXQoY29udGV4dC5nZXQoKSwgc3RhdHVzLCBkY21kKTsKICAgfQogCi0gIHByaXZhdGUgU3RyaW5nIGdldENvbW1hbmQoU3RyaW5nIGNvbW1hbmRMaW5lKSB7Ci0gICAgY29tbWFuZExpbmUgPSBjb21tYW5kTGluZS50cmltKCk7Ci0gICAgaW50IHNwYWNlUG9zID0gY29tbWFuZExpbmUuaW5kZXhPZignICcpOwotICAgIHJldHVybiAoc3BhY2VQb3MgPiAwID8gY29tbWFuZExpbmUuc3Vic3RyaW5nKDAsIHNwYWNlUG9zKTpjb21tYW5kTGluZSk7CisgIHByaXZhdGUgTXVsdGltYXA8U3RyaW5nLCA/PiBleHRyYWN0UGFyYW1ldGVycyhEaXNwYXRjaENvbW1hbmQgZGNtZCkgeworICAgIFN0cmluZ1tdIGNtZEFyZ3MgPSBkY21kLmdldEFyZ3VtZW50cygpOworICAgIFN0cmluZyBwYXJhbU5hbWUgPSBudWxsOworICAgIGludCBhcmdQb3MgPSAwOworICAgIE11bHRpbWFwPFN0cmluZywgU3RyaW5nPiBwYXJtcyA9IEFycmF5TGlzdE11bHRpbWFwLmNyZWF0ZSgpOworICAgIGZvciAoaW50IGkgPSAyOyBpIDwgY21kQXJncy5sZW5ndGg7IGkrKykgeworICAgICAgU3RyaW5nIGFyZyA9IGNtZEFyZ3NbaV07CisgICAgICAvLyAtLSBzdG9wIHBhcmFtZXRlcnMgcGFyc2luZworICAgICAgaWYgKGFyZy5lcXVhbHMoIi0tIikpIHsKKyAgICAgICAgZm9yIChpKys7IGkgPCBjbWRBcmdzLmxlbmd0aDsgaSsrKSB7CisgICAgICAgICAgcGFybXMucHV0KCIkIiArIGFyZ1BvcysrLCBjbWRBcmdzW2ldKTsKKyAgICAgICAgfQorICAgICAgICBicmVhazsKKyAgICAgIH0KKyAgICAgIC8vIC0tcGFyYW09dmFsdWUKKyAgICAgIGludCBlcVBvcyA9IGFyZy5pbmRleE9mKCc9Jyk7CisgICAgICBpZiAoYXJnLnN0YXJ0c1dpdGgoIi0tIikgJiYgZXFQb3MgPiAwKSB7CisgICAgICAgIHBhcm1zLnB1dChhcmcuc3Vic3RyaW5nKDAsIGVxUG9zKSwgYXJnLnN1YnN0cmluZyhlcVBvcyArIDEpKTsKKyAgICAgICAgY29udGludWU7CisgICAgICB9CisgICAgICAvLyAtcCB2YWx1ZSBvciAtLXBhcmFtIHZhbHVlCisgICAgICBpZiAoYXJnLnN0YXJ0c1dpdGgoIi0iKSkgeworICAgICAgICBpZiAocGFyYW1OYW1lICE9IG51bGwpIHsKKyAgICAgICAgICBwYXJtcy5wdXQocGFyYW1OYW1lLCBudWxsKTsKKyAgICAgICAgfQorICAgICAgICBwYXJhbU5hbWUgPSBhcmc7CisgICAgICAgIGNvbnRpbnVlOworICAgICAgfQorICAgICAgLy8gdmFsdWUKKyAgICAgIGlmIChwYXJhbU5hbWUgPT0gbnVsbCkgeworICAgICAgICBwYXJtcy5wdXQoIiQiICsgYXJnUG9zKyssIGFyZyk7CisgICAgICB9IGVsc2UgeworICAgICAgICBwYXJtcy5wdXQocGFyYW1OYW1lLCBhcmcpOworICAgICAgICBwYXJhbU5hbWUgPSBudWxsOworICAgICAgfQorICAgIH0KKyAgICBpZiAocGFyYW1OYW1lICE9IG51bGwpIHsKKyAgICAgIHBhcm1zLnB1dChwYXJhbU5hbWUsIG51bGwpOworICAgIH0KKyAgICByZXR1cm4gcGFybXM7CiAgIH0KIAogICB2b2lkIG9uTG9nb3V0KCkgewogICAgIGFzeW5jLmFwcGVuZChsb2coIkxPR09VVCIpKTsKLSAgICBhdWRpdChjb250ZXh0LmdldCgpLCAiMCIsICJMT0dPVVQiLCBuZXcgU3RyaW5nW10ge30pOworICAgIGF1ZGl0KGNvbnRleHQuZ2V0KCksICIwIiwgIkxPR09VVCIpOwogICB9CiAKICAgcHJpdmF0ZSBMb2dnaW5nRXZlbnQgbG9nKGZpbmFsIFN0cmluZyBtc2cpIHsKQEAgLTQxNiwyMSArNDQ4LDI4IEBACiAgICAgfQogICB9CiAKLSAgdm9pZCBhdWRpdChDb250ZXh0IGN0eCwgT2JqZWN0IHJlc3VsdCwgU3RyaW5nIGNvbW1hbmROYW1lLCBTdHJpbmdbXSBhcmdzKSB7CisgIHZvaWQgYXVkaXQoQ29udGV4dCBjdHgsIE9iamVjdCByZXN1bHQsIFN0cmluZyBjbWQpIHsKICAgICBmaW5hbCBTdHJpbmcgc2lkID0gZXh0cmFjdFNlc3Npb25JZChjdHgpOwogICAgIGZpbmFsIGxvbmcgY3JlYXRlZCA9IGV4dHJhY3RDcmVhdGVkKGN0eCk7Ci0gICAgZmluYWwgU3RyaW5nIHdoYXQgPSBleHRyYWN0V2hhdChjb21tYW5kTmFtZSwgYXJncyk7Ci0gICAgYXVkaXRTZXJ2aWNlLmRpc3BhdGNoKG5ldyBBdWRpdEV2ZW50KHNpZCwgZXh0cmFjdEN1cnJlbnRVc2VyKGN0eCksICJzc2g6IgotICAgICAgICArIHdoYXQsIGNyZWF0ZWQsIEFycmF5cy5hc0xpc3QoYXJncyksIHJlc3VsdCkpOworICAgIGF1ZGl0U2VydmljZS5kaXNwYXRjaChuZXcgU3NoQXVkaXRFdmVudChzaWQsIGV4dHJhY3RDdXJyZW50VXNlcihjdHgpLCBjbWQsCisgICAgICAgIGNyZWF0ZWQsIG51bGwsIHJlc3VsdCkpOwogICB9CiAKLSAgcHJpdmF0ZSBTdHJpbmcgZXh0cmFjdFdoYXQoU3RyaW5nIGNvbW1hbmROYW1lLCBTdHJpbmdbXSBhcmdzKSB7Ci0gICAgU3RyaW5nIHJlc3VsdCA9IGNvbW1hbmROYW1lOwotICAgIGlmICgiZ2Vycml0Ii5lcXVhbHMoY29tbWFuZE5hbWUpKSB7Ci0gICAgICBpZiAoYXJncy5sZW5ndGggPiAxKQotICAgICAgICByZXN1bHQgPSAiZ2Vycml0IisiLiIrYXJnc1sxXTsKKyAgdm9pZCBhdWRpdChDb250ZXh0IGN0eCwgT2JqZWN0IHJlc3VsdCwgRGlzcGF0Y2hDb21tYW5kIGNtZCkgeworICAgIGZpbmFsIFN0cmluZyBzaWQgPSBleHRyYWN0U2Vzc2lvbklkKGN0eCk7CisgICAgZmluYWwgbG9uZyBjcmVhdGVkID0gZXh0cmFjdENyZWF0ZWQoY3R4KTsKKyAgICBhdWRpdFNlcnZpY2UuZGlzcGF0Y2gobmV3IFNzaEF1ZGl0RXZlbnQoc2lkLCBleHRyYWN0Q3VycmVudFVzZXIoY3R4KSwKKyAgICAgICAgZXh0cmFjdFdoYXQoY21kKSwgY3JlYXRlZCwgZXh0cmFjdFBhcmFtZXRlcnMoY21kKSwgcmVzdWx0KSk7CisgIH0KKworICBwcml2YXRlIFN0cmluZyBleHRyYWN0V2hhdChEaXNwYXRjaENvbW1hbmQgZGNtZCkgeworICAgIFN0cmluZyBjb21tYW5kTmFtZSA9IGRjbWQuZ2V0Q29tbWFuZE5hbWUoKTsKKyAgICBTdHJpbmdbXSBhcmdzID0gZGNtZC5nZXRBcmd1bWVudHMoKTsKKyAgICBpZiAoYXJncy5sZW5ndGggPiAxKSB7CisgICAgICByZXR1cm4gY29tbWFuZE5hbWUgKyAiLiIgKyBhcmdzWzFdOworICAgIH0gZWxzZSB7CisgICAgICByZXR1cm4gY29tbWFuZE5hbWU7CiAgICAgfQotICAgIHJldHVybiByZXN1bHQ7CiAgIH0KIAogICBwcml2YXRlIGxvbmcgZXh0cmFjdENyZWF0ZWQoZmluYWwgQ29udGV4dCBjdHgpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hNb2R1bGUuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hNb2R1bGUuamF2YQppbmRleCA3ZjRhMWY3Li42ZmFkNDJiIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvU3NoTW9kdWxlLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL1NzaE1vZHVsZS5qYXZhCkBAIC0yMiwxMSArMjIsMTAgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ21kTGluZVBhcnNlck1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuUGVlckRhZW1vblVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLlJlbW90ZVBlZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQWNjb3VudE1hbmFnZXI7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuQ2hhbmdlVXNlck5hbWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5GYWN0b3J5TW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0UmVxdWVzdE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkdlcnJpdFNlcnZlckNvbmZpZzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkFzeW5jUmVjZWl2ZUNvbW1pdHM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5RdWV1ZVByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuV29ya1F1ZXVlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLk1vZHVsZUdlbmVyYXRvcjsKQEAgLTQ0LDYgKzQzLDcgQEAKIGltcG9ydCBvcmcuYXBhY2hlLnNzaGQuc2VydmVyLkNvbW1hbmRGYWN0b3J5OwogaW1wb3J0IG9yZy5hcGFjaGUuc3NoZC5zZXJ2ZXIuUHVibGlja2V5QXV0aGVudGljYXRvcjsKIGltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5Db25maWc7CisKIGltcG9ydCBqYXZhLm5ldC5Tb2NrZXRBZGRyZXNzOwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKQEAgLTY2LDEwICs2NiwxMCBAQAogICAgIGJpbmQoU3NoU2NvcGUuY2xhc3MpLmluKFNJTkdMRVRPTik7CiAKICAgICBjb25maWd1cmVSZXF1ZXN0U2NvcGUoKTsKKyAgICBpbnN0YWxsKG5ldyBBc3luY1JlY2VpdmVDb21taXRzLk1vZHVsZSgpKTsKICAgICBpbnN0YWxsKG5ldyBDbWRMaW5lUGFyc2VyTW9kdWxlKCkpOwogICAgIGNvbmZpZ3VyZUFsaWFzZXMoKTsKIAotICAgIGluc3RhbGwoU3NoS2V5Q2FjaGVJbXBsLm1vZHVsZSgpKTsKICAgICBiaW5kKFNzaExvZy5jbGFzcyk7CiAgICAgYmluZChTc2hJbmZvLmNsYXNzKS50byhTc2hEYWVtb24uY2xhc3MpLmluKFNJTkdMRVRPTik7CiAgICAgZmFjdG9yeShEaXNwYXRjaENvbW1hbmQuRmFjdG9yeS5jbGFzcyk7CkBAIC04Myw4ICs4Myw2IEBACiAgICAgYmluZChXb3JrUXVldWUuRXhlY3V0b3IuY2xhc3MpLmFubm90YXRlZFdpdGgoU3RyZWFtQ29tbWFuZEV4ZWN1dG9yLmNsYXNzKQogICAgICAgICAudG9Qcm92aWRlcihTdHJlYW1Db21tYW5kRXhlY3V0b3JQcm92aWRlci5jbGFzcykuaW4oU0lOR0xFVE9OKTsKICAgICBiaW5kKFF1ZXVlUHJvdmlkZXIuY2xhc3MpLnRvKENvbW1hbmRFeGVjdXRvclF1ZXVlUHJvdmlkZXIuY2xhc3MpLmluKFNJTkdMRVRPTik7Ci0gICAgYmluZChBY2NvdW50TWFuYWdlci5jbGFzcyk7Ci0gICAgZmFjdG9yeShDaGFuZ2VVc2VyTmFtZS5GYWN0b3J5LmNsYXNzKTsKIAogICAgIGJpbmQoUHVibGlja2V5QXV0aGVudGljYXRvci5jbGFzcykudG8oRGF0YWJhc2VQdWJLZXlBdXRoLmNsYXNzKTsKICAgICBiaW5kKEtleVBhaXJQcm92aWRlci5jbGFzcykudG9Qcm92aWRlcihIb3N0S2V5UHJvdmlkZXIuY2xhc3MpLmluKFNJTkdMRVRPTik7CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvU3NoU2NvcGUuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hTY29wZS5qYXZhCmluZGV4IGQ2ZjY2Y2EuLjY0YTFhNDIgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hTY29wZS5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hTY29wZS5qYXZhCkBAIC0xNCwxOSArMTQsMjMgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkOwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5SZXF1ZXN0Q2xlYW51cDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLlJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLlJlcXVlc3RDb250ZXh0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLlRocmVhZExvY2FsUmVxdWVzdENvbnRleHQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuVGhyZWFkTG9jYWxSZXF1ZXN0U2NvcGVQcm9wYWdhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5TY2hlbWFGYWN0b3J5OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5LZXk7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuT3V0T2ZTY29wZUV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5TY29wZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC51dGlsLlByb3ZpZGVyczsKIAotaW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOwogaW1wb3J0IGphdmEudXRpbC5NYXA7CiAKIC8qKiBHdWljZSBzY29wZXMgZm9yIHN0YXRlIGR1cmluZyBhbiBTU0ggY29ubmVjdGlvbi4gKi8KQEAgLTM0LDI5ICszOCwzNCBAQAogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBLZXk8UmVxdWVzdENsZWFudXA+IFJDX0tFWSA9CiAgICAgICBLZXkuZ2V0KFJlcXVlc3RDbGVhbnVwLmNsYXNzKTsKIAorICBwcml2YXRlIHN0YXRpYyBmaW5hbCBLZXk8UmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXI+IERCX0tFWSA9CisgICAgICBLZXkuZ2V0KFJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyLmNsYXNzKTsKKwogICBjbGFzcyBDb250ZXh0IGltcGxlbWVudHMgUmVxdWVzdENvbnRleHQgewotICAgIHByaXZhdGUgZmluYWwgUmVxdWVzdENsZWFudXAgY2xlYW51cDsKKyAgICBwcml2YXRlIGZpbmFsIFJlcXVlc3RDbGVhbnVwIGNsZWFudXAgPSBuZXcgUmVxdWVzdENsZWFudXAoKTsKKyAgICBwcml2YXRlIGZpbmFsIE1hcDxLZXk8Pz4sIE9iamVjdD4gbWFwID0gTWFwcy5uZXdIYXNoTWFwKCk7CisgICAgcHJpdmF0ZSBmaW5hbCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzY2hlbWFGYWN0b3J5OwogICAgIHByaXZhdGUgZmluYWwgU3NoU2Vzc2lvbiBzZXNzaW9uOwogICAgIHByaXZhdGUgZmluYWwgU3RyaW5nIGNvbW1hbmRMaW5lOwotICAgIHByaXZhdGUgZmluYWwgTWFwPEtleTw/PiwgT2JqZWN0PiBtYXA7CiAKICAgICBmaW5hbCBsb25nIGNyZWF0ZWQ7CiAgICAgdm9sYXRpbGUgbG9uZyBzdGFydGVkOwogICAgIHZvbGF0aWxlIGxvbmcgZmluaXNoZWQ7CiAKLSAgICBwcml2YXRlIENvbnRleHQoZmluYWwgU3NoU2Vzc2lvbiBzLCBmaW5hbCBTdHJpbmcgYywgZmluYWwgbG9uZyBhdCkgewotICAgICAgY2xlYW51cCA9IG5ldyBSZXF1ZXN0Q2xlYW51cCgpOworICAgIHByaXZhdGUgQ29udGV4dChTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBzZiwgZmluYWwgU3NoU2Vzc2lvbiBzLAorICAgICAgICBmaW5hbCBTdHJpbmcgYywgZmluYWwgbG9uZyBhdCkgeworICAgICAgc2NoZW1hRmFjdG9yeSA9IHNmOwogICAgICAgc2Vzc2lvbiA9IHM7CiAgICAgICBjb21tYW5kTGluZSA9IGM7Ci0KLSAgICAgIG1hcCA9IG5ldyBIYXNoTWFwPEtleTw/PiwgT2JqZWN0PigpOwotICAgICAgbWFwLnB1dChSQ19LRVksIGNsZWFudXApOwotCiAgICAgICBjcmVhdGVkID0gc3RhcnRlZCA9IGZpbmlzaGVkID0gYXQ7CisgICAgICBtYXAucHV0KFJDX0tFWSwgY2xlYW51cCk7CisgICAgICBtYXAucHV0KERCX0tFWSwgbmV3IFJlcXVlc3RTY29wZWRSZXZpZXdEYlByb3ZpZGVyKAorICAgICAgICAgIHNjaGVtYUZhY3RvcnksCisgICAgICAgICAgUHJvdmlkZXJzLm9mKGNsZWFudXApKSk7CiAgICAgfQogCiAgICAgcHJpdmF0ZSBDb250ZXh0KENvbnRleHQgcCwgU3NoU2Vzc2lvbiBzLCBTdHJpbmcgYykgewotICAgICAgdGhpcyhzLCBjLCBwLmNyZWF0ZWQpOworICAgICAgdGhpcyhwLnNjaGVtYUZhY3RvcnksIHMsIGMsIHAuY3JlYXRlZCk7CiAgICAgICBzdGFydGVkID0gcC5zdGFydGVkOwogICAgICAgZmluaXNoZWQgPSBwLmZpbmlzaGVkOwogICAgIH0KQEAgLTczLDEyICs4MiwxNiBAQAogICAgIHB1YmxpYyBDdXJyZW50VXNlciBnZXRDdXJyZW50VXNlcigpIHsKICAgICAgIGZpbmFsIEN1cnJlbnRVc2VyIHVzZXIgPSBzZXNzaW9uLmdldEN1cnJlbnRVc2VyKCk7CiAgICAgICBpZiAodXNlciBpbnN0YW5jZW9mIElkZW50aWZpZWRVc2VyKSB7Ci0gICAgICAgIHJldHVybiB1c2VyRmFjdG9yeS5jcmVhdGUodXNlci5nZXRBY2Nlc3NQYXRoKCksIC8vCi0gICAgICAgICAgICAoKElkZW50aWZpZWRVc2VyKSB1c2VyKS5nZXRBY2NvdW50SWQoKSk7CisgICAgICAgIHJldHVybiB1c2VyRmFjdG9yeS5jcmVhdGUoKChJZGVudGlmaWVkVXNlcikgdXNlcikuZ2V0QWNjb3VudElkKCkpOwogICAgICAgfQogICAgICAgcmV0dXJuIHVzZXI7CiAgICAgfQogCisgICAgQE92ZXJyaWRlCisgICAgcHVibGljIFByb3ZpZGVyPFJldmlld0RiPiBnZXRSZXZpZXdEYlByb3ZpZGVyKCkgeworICAgICAgcmV0dXJuIChSZXF1ZXN0U2NvcGVkUmV2aWV3RGJQcm92aWRlcikgbWFwLmdldChEQl9LRVkpOworICAgIH0KKwogICAgIHN5bmNocm9uaXplZCA8VD4gVCBnZXQoS2V5PFQ+IGtleSwgUHJvdmlkZXI8VD4gY3JlYXRvcikgewogICAgICAgQFN1cHByZXNzV2FybmluZ3MoInVuY2hlY2tlZCIpCiAgICAgICBUIHQgPSAoVCkgbWFwLmdldChrZXkpOwpAQCAtMTE0LDggKzEyNyw5IEBACiAgICAgcHJpdmF0ZSBmaW5hbCBTc2hTY29wZSBzc2hTY29wZTsKIAogICAgIEBJbmplY3QKLSAgICBQcm9wYWdhdG9yKFNzaFNjb3BlIHNzaFNjb3BlLCBUaHJlYWRMb2NhbFJlcXVlc3RDb250ZXh0IGxvY2FsKSB7Ci0gICAgICBzdXBlcihSRVFVRVNULCBjdXJyZW50LCBsb2NhbCk7CisgICAgUHJvcGFnYXRvcihTc2hTY29wZSBzc2hTY29wZSwgVGhyZWFkTG9jYWxSZXF1ZXN0Q29udGV4dCBsb2NhbCwKKyAgICAgICAgUHJvdmlkZXI8UmVxdWVzdFNjb3BlZFJldmlld0RiUHJvdmlkZXI+IGRiUHJvdmlkZXJQcm92aWRlcikgeworICAgICAgc3VwZXIoUkVRVUVTVCwgY3VycmVudCwgbG9jYWwsIGRiUHJvdmlkZXJQcm92aWRlcik7CiAgICAgICB0aGlzLnNzaFNjb3BlID0gc3NoU2NvcGU7CiAgICAgfQogCkBAIC0xNDgsOCArMTYyLDggQEAKICAgICB0aGlzLnVzZXJGYWN0b3J5ID0gdXNlckZhY3Rvcnk7CiAgIH0KIAotICBDb250ZXh0IG5ld0NvbnRleHQoU3NoU2Vzc2lvbiBzZXNzaW9uLCBTdHJpbmcgY29tbWFuZExpbmUpIHsKLSAgICByZXR1cm4gbmV3IENvbnRleHQoc2Vzc2lvbiwgY29tbWFuZExpbmUsIFN5c3RlbS5jdXJyZW50VGltZU1pbGxpcygpKTsKKyAgQ29udGV4dCBuZXdDb250ZXh0KFNjaGVtYUZhY3Rvcnk8UmV2aWV3RGI+IHNmLCBTc2hTZXNzaW9uIHMsIFN0cmluZyBjbWQpIHsKKyAgICByZXR1cm4gbmV3IENvbnRleHQoc2YsIHMsIGNtZCwgU3lzdGVtLmN1cnJlbnRUaW1lTWlsbGlzKCkpOwogICB9CiAKICAgcHJpdmF0ZSBDb250ZXh0IG5ld0NvbnRpbnVpbmdDb250ZXh0KENvbnRleHQgY3R4KSB7CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvU3NoU2Vzc2lvbi5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL1NzaFNlc3Npb24uamF2YQppbmRleCAzYzRkNGY4Li4yY2MxNmI1IDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvU3NoU2Vzc2lvbi5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9Tc2hTZXNzaW9uLmphdmEKQEAgLTE0LDYgKzE0LDcgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkOwogCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkFjY2Vzc1BhdGg7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLkN1cnJlbnRVc2VyOwogCiBpbXBvcnQgb3JnLmFwYWNoZS5zc2hkLmNvbW1vbi5TZXNzaW9uLkF0dHJpYnV0ZUtleTsKQEAgLTQzLDYgKzQ0LDcgQEAKICAgfQogCiAgIFNzaFNlc3Npb24oU3NoU2Vzc2lvbiBwYXJlbnQsIFNvY2tldEFkZHJlc3MgcGVlciwgQ3VycmVudFVzZXIgdXNlcikgeworICAgIHVzZXIuc2V0QWNjZXNzUGF0aChBY2Nlc3NQYXRoLlNTSF9DT01NQU5EKTsKICAgICB0aGlzLnNlc3Npb25JZCA9IHBhcmVudC5zZXNzaW9uSWQ7CiAgICAgdGhpcy5yZW1vdGVBZGRyZXNzID0gcGVlcjsKICAgICBpZiAocGFyZW50LnJlbW90ZUFkZHJlc3MgPT0gcGVlcikgewpAQCAtODMsNiArODUsMTAgQEAKICAgICBhdXRoRXJyb3IgPSBlcnJvcjsKICAgfQogCisgIHZvaWQgc2V0QWNjZXNzUGF0aChBY2Nlc3NQYXRoIHBhdGgpIHsKKyAgICBpZGVudGl0eS5zZXRBY2Nlc3NQYXRoKHBhdGgpOworICB9CisKICAgLyoqIEByZXR1cm4ge0Bjb2RlIHRydWV9IGlmIHRoZSBhdXRoZW50aWNhdGlvbiBkaWQgbm90IHN1Y2NlZWQuICovCiAgIGJvb2xlYW4gaXNBdXRoZW50aWNhdGlvbkVycm9yKCkgewogICAgIHJldHVybiBhdXRoRXJyb3IgIT0gbnVsbDsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9TdUV4ZWMuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9TdUV4ZWMuamF2YQppbmRleCAzMzQ1OWMyLi5jY2YyM2UxIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvU3VFeGVjLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL1N1RXhlYy5qYXZhCkBAIC0xNiw3ICsxNiw2IEBACiAKIGltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi51dGlsLmNvbmN1cnJlbnQuQXRvbWljczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQWNjZXNzUGF0aDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5QZWVyRGFlbW9uVXNlcjsKQEAgLTExNiwxNCArMTE1LDggQEAKICAgICB9IGVsc2UgewogICAgICAgcGVlciA9IHBlZXJBZGRyZXNzOwogICAgIH0KLQotICAgIHJldHVybiBuZXcgU3NoU2Vzc2lvbihzZXNzaW9uLmdldCgpLCBwZWVyLCB1c2VyRmFjdG9yeS5jcmVhdGUoCi0gICAgICAgIEFjY2Vzc1BhdGguU1NIX0NPTU1BTkQsIG5ldyBQcm92aWRlcjxTb2NrZXRBZGRyZXNzPigpIHsKLSAgICAgICAgICBAT3ZlcnJpZGUKLSAgICAgICAgICBwdWJsaWMgU29ja2V0QWRkcmVzcyBnZXQoKSB7Ci0gICAgICAgICAgICByZXR1cm4gcGVlcjsKLSAgICAgICAgICB9Ci0gICAgICAgIH0sIGFjY291bnRJZCkpOworICAgIHJldHVybiBuZXcgU3NoU2Vzc2lvbihzZXNzaW9uLmdldCgpLCBwZWVyLAorICAgICAgICB1c2VyRmFjdG9yeS5jcmVhdGUocGVlciwgYWNjb3VudElkKSk7CiAgIH0KIAogICBwcml2YXRlIHN0YXRpYyBTdHJpbmcgam9pbihMaXN0PFN0cmluZz4gYXJncykgewpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0FkbWluUXVlcnlTaGVsbC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0FkbWluUXVlcnlTaGVsbC5qYXZhCmluZGV4IDA4YzY1MGMuLjE1MjI5ZGMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9BZG1pblF1ZXJ5U2hlbGwuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvQWRtaW5RdWVyeVNoZWxsLmphdmEKQEAgLTE1LDggKzE1LDExIEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5lcnJvcnMuUGVybWlzc2lvbkRlbmllZEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlJlcXVpcmVzQ2FwYWJpbGl0eTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5BZG1pbkhpZ2hQcmlvcml0eUNvbW1hbmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIApAQCAtMjQsMTEgKzI3LDE1IEBACiAKIC8qKiBPcGVucyBhIHF1ZXJ5IHByb2Nlc3Nvci4gKi8KIEBBZG1pbkhpZ2hQcmlvcml0eUNvbW1hbmQKLUBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LkFDQ0VTU19EQVRBQkFTRSkKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJnc3FsIiwgZGVzY3IgPSAiQWRtaW5pc3RyYXRpdmUgaW50ZXJmYWNlIHRvIGFjdGl2ZSBkYXRhYmFzZSIpCiBmaW5hbCBjbGFzcyBBZG1pblF1ZXJ5U2hlbGwgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgQEluamVjdAogICBwcml2YXRlIFF1ZXJ5U2hlbGwuRmFjdG9yeSBmYWN0b3J5OwogCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBJZGVudGlmaWVkVXNlciBjdXJyZW50VXNlcjsKKwogICBAT3B0aW9uKG5hbWUgPSAiLS1mb3JtYXQiLCB1c2FnZSA9ICJTZXQgb3V0cHV0IGZvcm1hdCIpCiAgIHByaXZhdGUgUXVlcnlTaGVsbC5PdXRwdXRGb3JtYXQgZm9ybWF0ID0gUXVlcnlTaGVsbC5PdXRwdXRGb3JtYXQuUFJFVFRZOwogCkBAIC0zNiwxMyArNDMsMzcgQEAKICAgcHJpdmF0ZSBTdHJpbmcgcXVlcnk7CiAKICAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCB2b2lkIHJ1bigpIHsKLSAgICBmaW5hbCBRdWVyeVNoZWxsIHNoZWxsID0gZmFjdG9yeS5jcmVhdGUoaW4sIG91dCk7Ci0gICAgc2hlbGwuc2V0T3V0cHV0Rm9ybWF0KGZvcm1hdCk7Ci0gICAgaWYgKHF1ZXJ5ICE9IG51bGwpIHsKLSAgICAgIHNoZWxsLmV4ZWN1dGUocXVlcnkpOwotICAgIH0gZWxzZSB7Ci0gICAgICBzaGVsbC5ydW4oKTsKKyAgcHJvdGVjdGVkIHZvaWQgcnVuKCkgdGhyb3dzIEZhaWx1cmUgeworICAgIHRyeSB7CisgICAgICBjaGVja1Blcm1pc3Npb24oKTsKKworICAgICAgZmluYWwgUXVlcnlTaGVsbCBzaGVsbCA9IGZhY3RvcnkuY3JlYXRlKGluLCBvdXQpOworICAgICAgc2hlbGwuc2V0T3V0cHV0Rm9ybWF0KGZvcm1hdCk7CisgICAgICBpZiAocXVlcnkgIT0gbnVsbCkgeworICAgICAgICBzaGVsbC5leGVjdXRlKHF1ZXJ5KTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgIHNoZWxsLnJ1bigpOworICAgICAgfQorICAgIH0gY2F0Y2ggKFBlcm1pc3Npb25EZW5pZWRFeGNlcHRpb24gZXJyKSB7CisgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKCJmYXRhbDogIiArIGVyci5nZXRNZXNzYWdlKCkpOworICAgIH0KKyAgfQorCisgIC8qKgorICAgKiBBc3NlcnQgdGhhdCB0aGUgY3VycmVudCB1c2VyIGlzIHBlcm1pdHRlZCB0byBwZXJmb3JtIHJhdyBxdWVyaWVzLgorICAgKiA8cD4KKyAgICogQXMgdGhlIEBSZXF1aXJlQ2FwYWJpbGl0eSBndWFyZHMgYXQgdmFyaW91cyBlbnRyeSBwb2ludHMgb2YgaW50ZXJuYWwKKyAgICogY29tbWFuZHMgaW1wbGljaXRseSBhZGQgYWRtaW5pc3RyYXRvcnMgKHdoaWNoIHdlIHdhbnQgdG8gYXZvaWQpLCB3ZSBhbHNvCisgICAqIGNoZWNrIHBlcm1pc3Npb25zIHdpdGhpbiBRdWVyeVNoZWxsIGFuZCBncmFudCBhY2Nlc3Mgb25seSB0byB0aG9zZSB3aG8KKyAgICogY2FuUGVyZm9ybVJhd1F1ZXJ5LCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhleSBhcmUgYWRtaW5pc3RyYXRvcnMgb3Igbm90LgorICAgKgorICAgKiBAdGhyb3dzIFBlcm1pc3Npb25EZW5pZWRFeGNlcHRpb24KKyAgICovCisgIHByaXZhdGUgdm9pZCBjaGVja1Blcm1pc3Npb24oKSB0aHJvd3MgUGVybWlzc2lvbkRlbmllZEV4Y2VwdGlvbiB7CisgICAgaWYgKCFjdXJyZW50VXNlci5nZXRDYXBhYmlsaXRpZXMoKS5jYW5BY2Nlc3NEYXRhYmFzZSgpKSB7CisgICAgICB0aHJvdyBuZXcgUGVybWlzc2lvbkRlbmllZEV4Y2VwdGlvbihTdHJpbmcuZm9ybWF0KAorICAgICAgICAgICIlcyBkb2VzIG5vdCBoYXZlIFwiQWNjZXNzIERhdGFiYXNlXCIgY2FwYWJpbGl0eS4iLAorICAgICAgICAgIGN1cnJlbnRVc2VyLmdldFVzZXJOYW1lKCkpKTsKICAgICB9CiAgIH0KIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9BZG1pblNldFBhcmVudC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0FkbWluU2V0UGFyZW50LmphdmEKaW5kZXggNjQ4M2UyNC4uZmFmMjIyNCAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0FkbWluU2V0UGFyZW50LmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0FkbWluU2V0UGFyZW50LmphdmEKQEAgLTE0LDYgKzE0LDkgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLmNvbW1hbmRzOwogCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5GdW5jdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZVNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkl0ZXJhYmxlczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUmVxdWlyZXNDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OwpAQCAtMjMsNiArMjYsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0U3RhdGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIApAQCAtMzUsMTEgKzM5LDEzIEBACiAKIGltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOwogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkNvbGxlY3Rpb25zOwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIEBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gInNldC1wcm9qZWN0LXBhcmVudCIsIGRlc2NyID0gIkNoYW5nZSB0aGUgcHJvamVjdCBwZXJtaXNzaW9ucyBhcmUgaW5oZXJpdGVkIGZyb20iKQogZmluYWwgY2xhc3MgQWRtaW5TZXRQYXJlbnQgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKEFkbWluU2V0UGFyZW50LmNsYXNzKTsKIApAQCAtMTk3LDE3ICsyMDMsMTUgQEAKICAgfQogCiAgIHByaXZhdGUgU2V0PFByb2plY3QuTmFtZUtleT4gZ2V0QWxsUGFyZW50cyhmaW5hbCBQcm9qZWN0Lk5hbWVLZXkgcHJvamVjdE5hbWUpIHsKLSAgICBmaW5hbCBTZXQ8UHJvamVjdC5OYW1lS2V5PiBwYXJlbnRzID0gbmV3IEhhc2hTZXQ8UHJvamVjdC5OYW1lS2V5PigpOwotICAgIFByb2plY3QuTmFtZUtleSBwID0gcHJvamVjdE5hbWU7Ci0gICAgd2hpbGUgKHAgIT0gbnVsbCAmJiBwYXJlbnRzLmFkZChwKSkgewotICAgICAgZmluYWwgUHJvamVjdFN0YXRlIGUgPSBwcm9qZWN0Q2FjaGUuZ2V0KHApOwotICAgICAgaWYgKGUgPT0gbnVsbCkgewotICAgICAgICAvLyBJZiB3ZSBjYW4ndCBnZXQgaXQgZnJvbSB0aGUgY2FjaGUsIHByZXRlbmQgaXQncyBub3QgcHJlc2VudC4KLSAgICAgICAgYnJlYWs7Ci0gICAgICB9Ci0gICAgICBwID0gZS5nZXRQcm9qZWN0KCkuZ2V0UGFyZW50KGFsbFByb2plY3RzTmFtZSk7Ci0gICAgfQotICAgIHJldHVybiBwYXJlbnRzOworICAgIFByb2plY3RTdGF0ZSBwcyA9IHByb2plY3RDYWNoZS5nZXQocHJvamVjdE5hbWUpOworICAgIHJldHVybiBJbW11dGFibGVTZXQuY29weU9mKEl0ZXJhYmxlcy50cmFuc2Zvcm0oCisgICAgICBwcyAhPSBudWxsID8gcHMucGFyZW50cygpIDogQ29sbGVjdGlvbnMuPFByb2plY3RTdGF0ZT4gZW1wdHlTZXQoKSwKKyAgICAgIG5ldyBGdW5jdGlvbjxQcm9qZWN0U3RhdGUsIFByb2plY3QuTmFtZUtleT4gKCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIFByb2plY3QuTmFtZUtleSBhcHBseShQcm9qZWN0U3RhdGUgaW4pIHsKKyAgICAgICAgICByZXR1cm4gaW4uZ2V0UHJvamVjdCgpLmdldE5hbWVLZXkoKTsKKyAgICAgICAgfQorICAgICAgfSkpOwogICB9CiAKICAgcHJpdmF0ZSBMaXN0PFByb2plY3Q+IGdldENoaWxkcmVuKGZpbmFsIFByb2plY3QuTmFtZUtleSBwYXJlbnROYW1lKSB7CkBAIC0yMTksNyArMjIzLDcgQEAKICAgICAgICAgY29udGludWU7CiAgICAgICB9CiAKLSAgICAgIGlmIChwYXJlbnROYW1lLmVxdWFscyhlLmdldFByb2plY3QoKS5nZXRQYXJlbnQocHJvamVjdE5hbWUpKSkgeworICAgICAgaWYgKHBhcmVudE5hbWUuZXF1YWxzKGUuZ2V0UHJvamVjdCgpLmdldFBhcmVudChhbGxQcm9qZWN0c05hbWUpKSkgewogICAgICAgICBjaGlsZFByb2plY3RzLmFkZChlLmdldFByb2plY3QoKSk7CiAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0FwcHJvdmVPcHRpb24uamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9BcHByb3ZlT3B0aW9uLmphdmEKaW5kZXggYTFiODk4OC4uMjkyNTBkMyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0FwcHJvdmVPcHRpb24uamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvQXBwcm92ZU9wdGlvbi5qYXZhCkBAIC0xNCw5ICsxNCw4IEBACiAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5jb21tYW5kczsKIAotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQXBwcm92YWxDYXRlZ29yeVZhbHVlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkxhYmVsVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFZhbHVlOwogCiBpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLkNtZExpbmVFeGNlcHRpb247CiBpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLkNtZExpbmVQYXJzZXI7CkBAIC0zMSwxMSArMzAsMTEgQEAKIGZpbmFsIGNsYXNzIEFwcHJvdmVPcHRpb24gaW1wbGVtZW50cyBPcHRpb24sIFNldHRlcjxTaG9ydD4gewogICBwcml2YXRlIGZpbmFsIFN0cmluZyBuYW1lOwogICBwcml2YXRlIGZpbmFsIFN0cmluZyB1c2FnZTsKLSAgcHJpdmF0ZSBmaW5hbCBBcHByb3ZhbFR5cGUgdHlwZTsKKyAgcHJpdmF0ZSBmaW5hbCBMYWJlbFR5cGUgdHlwZTsKIAogICBwcml2YXRlIFNob3J0IHZhbHVlOwogCi0gIEFwcHJvdmVPcHRpb24oZmluYWwgU3RyaW5nIG5hbWUsIGZpbmFsIFN0cmluZyB1c2FnZSwgZmluYWwgQXBwcm92YWxUeXBlIHR5cGUpIHsKKyAgQXBwcm92ZU9wdGlvbihmaW5hbCBTdHJpbmcgbmFtZSwgZmluYWwgU3RyaW5nIHVzYWdlLCBmaW5hbCBMYWJlbFR5cGUgdHlwZSkgewogICAgIHRoaXMubmFtZSA9IG5hbWU7CiAgICAgdGhpcy51c2FnZSA9IHVzYWdlOwogICAgIHRoaXMudHlwZSA9IHR5cGU7CkBAIC0xMDAsOCArOTksOCBAQAogICAgIHJldHVybiBmYWxzZTsKICAgfQogCi0gIEFwcHJvdmFsQ2F0ZWdvcnkuSWQgZ2V0Q2F0ZWdvcnlJZCgpIHsKLSAgICByZXR1cm4gdHlwZS5nZXRDYXRlZ29yeSgpLmdldElkKCk7CisgIFN0cmluZyBnZXRMYWJlbE5hbWUoKSB7CisgICAgcmV0dXJuIHR5cGUuZ2V0TmFtZSgpOwogICB9CiAKICAgcHVibGljIHN0YXRpYyBjbGFzcyBIYW5kbGVyIGV4dGVuZHMgT25lQXJndW1lbnRPcHRpb25IYW5kbGVyPFNob3J0PiB7CkBAIC0xMjIsOCArMTIxLDggQEAKICAgICAgIH0KIAogICAgICAgZmluYWwgc2hvcnQgdmFsdWUgPSBTaG9ydC5wYXJzZVNob3J0KGFyZ3VtZW50KTsKLSAgICAgIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSBtaW4gPSBjbWRPcHRpb24udHlwZS5nZXRNaW4oKTsKLSAgICAgIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZSBtYXggPSBjbWRPcHRpb24udHlwZS5nZXRNYXgoKTsKKyAgICAgIGZpbmFsIExhYmVsVmFsdWUgbWluID0gY21kT3B0aW9uLnR5cGUuZ2V0TWluKCk7CisgICAgICBmaW5hbCBMYWJlbFZhbHVlIG1heCA9IGNtZE9wdGlvbi50eXBlLmdldE1heCgpOwogCiAgICAgICBpZiAodmFsdWUgPCBtaW4uZ2V0VmFsdWUoKSB8fCB2YWx1ZSA+IG1heC5nZXRWYWx1ZSgpKSB7CiAgICAgICAgIGZpbmFsIFN0cmluZyBuYW1lID0gY21kT3B0aW9uLm5hbWUoKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9CYW5Db21taXRDb21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvQmFuQ29tbWl0Q29tbWFuZC5qYXZhCmluZGV4IDkzOWQ2OGEuLjAyNjhiYzAgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9CYW5Db21taXRDb21tYW5kLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0JhbkNvbW1pdENvbW1hbmQuamF2YQpAQCAtMTksNiArMTksNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuQmFuQ29tbWl0UmVzdWx0OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWVyZ2VFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIApAQCAtMzIsNiArMzMsNyBAQAogaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJiYW4tY29tbWl0IiwgZGVzY3IgPSAiQmFuIGEgY29tbWl0IGZyb20gYSBwcm9qZWN0J3MgcmVwb3NpdG9yeSIpCiBwdWJsaWMgY2xhc3MgQmFuQ29tbWl0Q29tbWFuZCBleHRlbmRzIFNzaENvbW1hbmQgewogICBAT3B0aW9uKG5hbWUgPSAiLS1yZWFzb24iLCBhbGlhc2VzID0geyItciJ9LCBtZXRhVmFyID0gIlJFQVNPTiIsIHVzYWdlID0gInJlYXNvbiBmb3IgYmFubmluZyB0aGUgY29tbWl0IikKICAgcHJpdmF0ZSBTdHJpbmcgcmVhc29uOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0Jhc2VUZXN0UHJvbG9nQ29tbWFuZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0Jhc2VUZXN0UHJvbG9nQ29tbWFuZC5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBlMTNmZDYKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvQmFzZVRlc3RQcm9sb2dDb21tYW5kLmphdmEKQEAgLTAsMCArMSw4MSBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuSWRTdHJpbmc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Ub3BMZXZlbFJlc291cmNlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5PdXRwdXRGb3JtYXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5DaGFuZ2VzQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlJldmlzaW9uUmVzb3VyY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5SZXZpc2lvbnM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5UZXN0U3VibWl0UnVsZS5GaWx0ZXJzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuVGVzdFN1Ym1pdFJ1bGUuSW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKKworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQudXRpbC5JTzsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnV0aWwuUmF3UGFyc2VVdGlsczsKK2ltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouQXJndW1lbnQ7CitpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKKworaW1wb3J0IGphdmEubmlvLkJ5dGVCdWZmZXI7CisKK2Fic3RyYWN0IGNsYXNzIEJhc2VUZXN0UHJvbG9nQ29tbWFuZCBleHRlbmRzIFNzaENvbW1hbmQgeworICBwcml2YXRlIElucHV0IGlucHV0ID0gbmV3IElucHV0KCk7CisKKyAgQEluamVjdAorICBwcml2YXRlIENoYW5nZXNDb2xsZWN0aW9uIGNoYW5nZXM7CisKKyAgQEluamVjdAorICBwcml2YXRlIFJldmlzaW9ucyByZXZpc2lvbnM7CisKKyAgQEFyZ3VtZW50KGluZGV4ID0gMCwgcmVxdWlyZWQgPSB0cnVlLCB1c2FnZSA9ICJDaGFuZ2VJZCB0byBsb2FkIGluIHByb2xvZyBlbnZpcm9ubWVudCIpCisgIHByb3RlY3RlZCBTdHJpbmcgY2hhbmdlSWQ7CisKKyAgQE9wdGlvbihuYW1lID0gIi1zIiwKKyAgICAgIHVzYWdlID0gIlJlYWQgcHJvbG9nIHNjcmlwdCBmcm9tIHN0ZGluIGluc3RlYWQgb2YgcmVhZGluZyBydWxlcy5wbCBmcm9tIHRoZSByZWZzL21ldGEvY29uZmlnIGJyYW5jaCIpCisgIHByb3RlY3RlZCBib29sZWFuIHVzZVN0ZGluOworCisgIEBPcHRpb24obmFtZSA9ICItLW5vLWZpbHRlcnMiLCBhbGlhc2VzID0geyItbiJ9LAorICAgICAgdXNhZ2UgPSAiRG9uJ3QgcnVuIHRoZSBzdWJtaXRfZmlsdGVyLzIgZnJvbSB0aGUgcGFyZW50IHByb2plY3RzIikKKyAgdm9pZCBzZXROb0ZpbHRlcnMoYm9vbGVhbiBubykgeworICAgIGlucHV0LmZpbHRlcnMgPSBubyA/IEZpbHRlcnMuU0tJUCA6IEZpbHRlcnMuUlVOOworICB9CisKKyAgcHJvdGVjdGVkIGFic3RyYWN0IFJlc3RNb2RpZnlWaWV3PFJldmlzaW9uUmVzb3VyY2UsIElucHV0PiBjcmVhdGVWaWV3KCk7CisKKyAgcHJvdGVjdGVkIGZpbmFsIHZvaWQgcnVuKCkgdGhyb3dzIFVubG9nZ2VkRmFpbHVyZSB7CisgICAgdHJ5IHsKKyAgICAgIFJldmlzaW9uUmVzb3VyY2UgcmV2aXNpb24gPSByZXZpc2lvbnMucGFyc2UoCisgICAgICAgICAgY2hhbmdlcy5wYXJzZSgKKyAgICAgICAgICAgICAgVG9wTGV2ZWxSZXNvdXJjZS5JTlNUQU5DRSwKKyAgICAgICAgICAgICAgSWRTdHJpbmcuZnJvbVVybChjaGFuZ2VJZCkpLAorICAgICAgICAgIElkU3RyaW5nLmZyb21VcmwoImN1cnJlbnQiKSk7CisgICAgICBpZiAodXNlU3RkaW4pIHsKKyAgICAgICAgQnl0ZUJ1ZmZlciBidWYgPSBJTy5yZWFkV2hvbGVTdHJlYW0oaW4sIDQwOTYpOworICAgICAgICBpbnB1dC5ydWxlID0gUmF3UGFyc2VVdGlscy5kZWNvZGUoCisgICAgICAgICAgICBidWYuYXJyYXkoKSwKKyAgICAgICAgICAgIGJ1Zi5hcnJheU9mZnNldCgpLAorICAgICAgICAgICAgYnVmLmxpbWl0KCkpOworICAgICAgfQorICAgICAgT2JqZWN0IHJlc3VsdCA9IGNyZWF0ZVZpZXcoKS5hcHBseShyZXZpc2lvbiwgaW5wdXQpOworICAgICAgT3V0cHV0Rm9ybWF0LkpTT04ubmV3R3NvbigpLnRvSnNvbihyZXN1bHQsIHN0ZG91dCk7CisgICAgICBzdGRvdXQucHJpbnQoJ1xuJyk7CisgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoIlByb2Nlc3Npbmcgb2YgcHJvbG9nIHNjcmlwdCBmYWlsZWQ6ICIgKyBlKTsKKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9DcmVhdGVBY2NvdW50Q29tbWFuZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0NyZWF0ZUFjY291bnRDb21tYW5kLmphdmEKaW5kZXggZDZmZWNhYi4uYzIwOTI0OSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0NyZWF0ZUFjY291bnRDb21tYW5kLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0NyZWF0ZUFjY291bnRDb21tYW5kLmphdmEKQEAgLTI4LDYgKzI4LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5BY2NvdW50QnlFbWFpbENhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc3NoLlNzaEtleUNhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoQ29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRHVwbGljYXRlS2V5RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CkBAIC00Nyw2ICs0OCw3IEBACiAKIC8qKiBDcmVhdGUgYSBuZXcgdXNlciBhY2NvdW50LiAqKi8KIEBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5DUkVBVEVfQUNDT1VOVCkKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJjcmVhdGUtYWNjb3VudCIsIGRlc2NyID0gIkNyZWF0ZSBhIG5ldyBiYXRjaC9yb2xlIGFjY291bnQiKQogZmluYWwgY2xhc3MgQ3JlYXRlQWNjb3VudENvbW1hbmQgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgQE9wdGlvbihuYW1lID0gIi0tZ3JvdXAiLCBhbGlhc2VzID0geyItZyJ9LCBtZXRhVmFyID0gIkdST1VQIiwgdXNhZ2UgPSAiZ3JvdXBzIHRvIGFkZCBhY2NvdW50IHRvIikKICAgcHJpdmF0ZSBMaXN0PEFjY291bnRHcm91cC5JZD4gZ3JvdXBzID0gbmV3IEFycmF5TGlzdDxBY2NvdW50R3JvdXAuSWQ+KCk7CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvQ3JlYXRlR3JvdXBDb21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvQ3JlYXRlR3JvdXBDb21tYW5kLmphdmEKaW5kZXggNzI4YzIwYy4uNjYwNDYwYSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0NyZWF0ZUdyb3VwQ29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9DcmVhdGVHcm91cENvbW1hbmQuamF2YQpAQCAtMjEsNiArMjEsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5BY2NvdW50R3JvdXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuUGVyZm9ybUNyZWF0ZUdyb3VwOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoQ29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKQEAgLTM3LDYgKzM4LDcgQEAKICAqIE9wdGlvbmFsbHksIHB1dHMgYW4gaW5pdGlhbCBzZXQgb2YgdXNlciBpbiB0aGUgbmV3bHkgY3JlYXRlZCBncm91cC4KICAqLwogQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LkNSRUFURV9HUk9VUCkKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJjcmVhdGUtZ3JvdXAiLCBkZXNjciA9ICJDcmVhdGUgYSBuZXcgYWNjb3VudCBncm91cCIpCiBmaW5hbCBjbGFzcyBDcmVhdGVHcm91cENvbW1hbmQgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgQE9wdGlvbihuYW1lID0gIi0tb3duZXIiLCBhbGlhc2VzID0geyItbyJ9LCBtZXRhVmFyID0gIkdST1VQIiwgdXNhZ2UgPSAib3duaW5nIGdyb3VwLCBpZiBub3Qgc3BlY2lmaWVkIHRoZSBncm91cCB3aWxsIGJlIHNlbGYtb3duaW5nIikKICAgcHJpdmF0ZSBBY2NvdW50R3JvdXAuSWQgb3duZXJHcm91cElkOwpAQCAtNTcsMTAgKzU5LDEwIEBACiAgIEBPcHRpb24obmFtZSA9ICItLXZpc2libGUtdG8tYWxsIiwgdXNhZ2UgPSAidG8gbWFrZSB0aGUgZ3JvdXAgdmlzaWJsZSB0byBhbGwgcmVnaXN0ZXJlZCB1c2VycyIpCiAgIHByaXZhdGUgYm9vbGVhbiB2aXNpYmxlVG9BbGw7CiAKLSAgcHJpdmF0ZSBmaW5hbCBTZXQ8QWNjb3VudEdyb3VwLklkPiBpbml0aWFsR3JvdXBzID0gbmV3IEhhc2hTZXQ8QWNjb3VudEdyb3VwLklkPigpOworICBwcml2YXRlIGZpbmFsIFNldDxBY2NvdW50R3JvdXAuVVVJRD4gaW5pdGlhbEdyb3VwcyA9IG5ldyBIYXNoU2V0PEFjY291bnRHcm91cC5VVUlEPigpOwogCiAgIEBPcHRpb24obmFtZSA9ICItLWdyb3VwIiwgYWxpYXNlcyA9ICItZyIsIG1ldGFWYXIgPSAiR1JPVVAiLCB1c2FnZSA9ICJpbml0aWFsIHNldCBvZiBncm91cHMgdG8gYmUgaW5jbHVkZWQgaW4gdGhlIGdyb3VwIikKLSAgdm9pZCBhZGRHcm91cChmaW5hbCBBY2NvdW50R3JvdXAuSWQgaWQpIHsKKyAgdm9pZCBhZGRHcm91cChmaW5hbCBBY2NvdW50R3JvdXAuVVVJRCBpZCkgewogICAgIGluaXRpYWxHcm91cHMuYWRkKGlkKTsKICAgfQogCmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvQ3JlYXRlUHJvamVjdENvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9DcmVhdGVQcm9qZWN0Q29tbWFuZC5qYXZhCmluZGV4IDVmNWIxZTMuLmJkNjI0YWUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9DcmVhdGVQcm9qZWN0Q29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9DcmVhdGVQcm9qZWN0Q29tbWFuZC5qYXZhCkBAIC0xOSwxMSArMTksMTMgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlJlcXVpcmVzQ2FwYWJpbGl0eTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudEdyb3VwOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LkNyZWF0ZVByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUGVyZm9ybUNyZWF0ZVByb2plY3Q7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ3JlYXRlUHJvamVjdEFyZ3M7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuU3VnZ2VzdFBhcmVudENhbmRpZGF0ZXM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIApAQCAtMzQsNiArMzYsNyBAQAogCiAvKiogQ3JlYXRlIGEgbmV3IHByb2plY3QuICoqLwogQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LkNSRUFURV9QUk9KRUNUKQorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gImNyZWF0ZS1wcm9qZWN0IiwgZGVzY3IgPSAiQ3JlYXRlIGEgbmV3IHByb2plY3QgYW5kIGFzc29jaWF0ZWQgR2l0IHJlcG9zaXRvcnkiKQogZmluYWwgY2xhc3MgQ3JlYXRlUHJvamVjdENvbW1hbmQgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgQE9wdGlvbihuYW1lID0gIi0tbmFtZSIsIGFsaWFzZXMgPSB7Ii1uIn0sIG1ldGFWYXIgPSAiTkFNRSIsIHVzYWdlID0gIm5hbWUgb2YgcHJvamVjdCB0byBiZSBjcmVhdGVkIChkZXByZWNhdGVkIG9wdGlvbikiKQogICB2b2lkIHNldFByb2plY3ROYW1lRnJvbU9wdGlvbihTdHJpbmcgbmFtZSkgewpAQCAtNjQsMTcgKzY3LDM3IEBACiAgICAgICArICIoZGVmYXVsdDogTUVSR0VfSUZfTkVDRVNTQVJZKSIpCiAgIHByaXZhdGUgU3VibWl0VHlwZSBzdWJtaXRUeXBlID0gU3VibWl0VHlwZS5NRVJHRV9JRl9ORUNFU1NBUlk7CiAKKyAgQE9wdGlvbihuYW1lID0gIi0tY29udHJpYnV0b3ItYWdyZWVtZW50cyIsIHVzYWdlID0gImlmIGNvbnRyaWJ1dG9yIGFncmVlbWVudCBpcyByZXF1aXJlZCIpCisgIHByaXZhdGUgSW5oZXJpdGFibGVCb29sZWFuIGNvbnRyaWJ1dG9yQWdyZWVtZW50cyA9IEluaGVyaXRhYmxlQm9vbGVhbi5JTkhFUklUOworCisgIEBPcHRpb24obmFtZSA9ICItLXNpZ25lZC1vZmYtYnkiLCB1c2FnZSA9ICJpZiBzaWduZWQtb2ZmLWJ5IGlzIHJlcXVpcmVkIikKKyAgcHJpdmF0ZSBJbmhlcml0YWJsZUJvb2xlYW4gc2lnbmVkT2ZmQnkgPSBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKworICBAT3B0aW9uKG5hbWUgPSAiLS1jb250ZW50LW1lcmdlIiwgdXNhZ2UgPSAiYWxsb3cgYXV0b21hdGljIGNvbmZsaWN0IHJlc29sdmluZyB3aXRoaW4gZmlsZXMiKQorICBwcml2YXRlIEluaGVyaXRhYmxlQm9vbGVhbiBjb250ZW50TWVyZ2UgPSBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKworICBAT3B0aW9uKG5hbWUgPSAiLS1jaGFuZ2UtaWQiLCB1c2FnZSA9ICJpZiBjaGFuZ2UtaWQgaXMgcmVxdWlyZWQiKQorICBwcml2YXRlIEluaGVyaXRhYmxlQm9vbGVhbiByZXF1aXJlQ2hhbmdlSUQgPSBJbmhlcml0YWJsZUJvb2xlYW4uSU5IRVJJVDsKKwogICBAT3B0aW9uKG5hbWUgPSAiLS11c2UtY29udHJpYnV0b3ItYWdyZWVtZW50cyIsIGFsaWFzZXMgPSB7Ii0tY2EifSwgdXNhZ2UgPSAiaWYgY29udHJpYnV0b3IgYWdyZWVtZW50IGlzIHJlcXVpcmVkIikKLSAgcHJpdmF0ZSBib29sZWFuIGNvbnRyaWJ1dG9yQWdyZWVtZW50czsKKyAgdm9pZCBzZXRVc2VDb250cmlidXRvckFyZ3JlZW1lbnRzKGJvb2xlYW4gb24pIHsKKyAgICBjb250cmlidXRvckFncmVlbWVudHMgPSBJbmhlcml0YWJsZUJvb2xlYW4uVFJVRTsKKyAgfQogCiAgIEBPcHRpb24obmFtZSA9ICItLXVzZS1zaWduZWQtb2ZmLWJ5IiwgYWxpYXNlcyA9IHsiLS1zbyJ9LCB1c2FnZSA9ICJpZiBzaWduZWQtb2ZmLWJ5IGlzIHJlcXVpcmVkIikKLSAgcHJpdmF0ZSBib29sZWFuIHNpZ25lZE9mZkJ5OworICB2b2lkIHNldFVzZVNpZ25lZE9mZkJ5KGJvb2xlYW4gb24pIHsKKyAgICBzaWduZWRPZmZCeSA9IEluaGVyaXRhYmxlQm9vbGVhbi5UUlVFOworICB9CiAKICAgQE9wdGlvbihuYW1lID0gIi0tdXNlLWNvbnRlbnQtbWVyZ2UiLCB1c2FnZSA9ICJhbGxvdyBhdXRvbWF0aWMgY29uZmxpY3QgcmVzb2x2aW5nIHdpdGhpbiBmaWxlcyIpCi0gIHByaXZhdGUgYm9vbGVhbiBjb250ZW50TWVyZ2U7CisgIHZvaWQgc2V0VXNlQ29udGVudE1lcmdlKGJvb2xlYW4gb24pIHsKKyAgICBjb250ZW50TWVyZ2UgPSBJbmhlcml0YWJsZUJvb2xlYW4uVFJVRTsKKyAgfQogCiAgIEBPcHRpb24obmFtZSA9ICItLXJlcXVpcmUtY2hhbmdlLWlkIiwgYWxpYXNlcyA9IHsiLS1pZCJ9LCB1c2FnZSA9ICJpZiBjaGFuZ2UtaWQgaXMgcmVxdWlyZWQiKQotICBwcml2YXRlIGJvb2xlYW4gcmVxdWlyZUNoYW5nZUlEOworICB2b2lkIHNldFJlcXVpcmVDaGFuZ2VJZChib29sZWFuIG9uKSB7CisgICAgcmVxdWlyZUNoYW5nZUlEID0gSW5oZXJpdGFibGVCb29sZWFuLlRSVUU7CisgIH0KIAogICBAT3B0aW9uKG5hbWUgPSAiLS1icmFuY2giLCBhbGlhc2VzID0geyItYiJ9LCBtZXRhVmFyID0gIkJSQU5DSCIsIHVzYWdlID0gImluaXRpYWwgYnJhbmNoIG5hbWVcbiIKICAgICAgICsgIihkZWZhdWx0OiBtYXN0ZXIpIikKQEAgLTk1LDcgKzExOCw3IEBACiAgIH0KIAogICBASW5qZWN0Ci0gIHByaXZhdGUgQ3JlYXRlUHJvamVjdC5GYWN0b3J5IENyZWF0ZVByb2plY3RGYWN0b3J5OworICBwcml2YXRlIFBlcmZvcm1DcmVhdGVQcm9qZWN0LkZhY3RvcnkgZmFjdG9yeTsKIAogICBASW5qZWN0CiAgIHByaXZhdGUgU3VnZ2VzdFBhcmVudENhbmRpZGF0ZXMuRmFjdG9yeSBzdWdnZXN0UGFyZW50Q2FuZGlkYXRlc0ZhY3Rvcnk7CkBAIC0xMjEsOCArMTQ0LDcgQEAKICAgICAgICAgYXJncy5icmFuY2ggPSBicmFuY2g7CiAgICAgICAgIGFyZ3MuY3JlYXRlRW1wdHlDb21taXQgPSBjcmVhdGVFbXB0eUNvbW1pdDsKIAotICAgICAgICBmaW5hbCBDcmVhdGVQcm9qZWN0IGNyZWF0ZVByb2plY3QgPQotICAgICAgICAgICAgQ3JlYXRlUHJvamVjdEZhY3RvcnkuY3JlYXRlKGFyZ3MpOworICAgICAgICBmaW5hbCBQZXJmb3JtQ3JlYXRlUHJvamVjdCBjcmVhdGVQcm9qZWN0ID0gZmFjdG9yeS5jcmVhdGUoYXJncyk7CiAgICAgICAgIGNyZWF0ZVByb2plY3QuY3JlYXRlUHJvamVjdCgpOwogICAgICAgfSBlbHNlIHsKICAgICAgICAgTGlzdDxQcm9qZWN0Lk5hbWVLZXk+IHBhcmVudENhbmRpZGF0ZXMgPQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0RlZmF1bHRDb21tYW5kTW9kdWxlLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvRGVmYXVsdENvbW1hbmRNb2R1bGUuamF2YQppbmRleCAyYTRkZWRjLi4zNWE0ZTE0IDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvRGVmYXVsdENvbW1hbmRNb2R1bGUuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvRGVmYXVsdENvbW1hbmRNb2R1bGUuamF2YQpAQCAtMzYsMjUgKzM2LDI4IEBACiAgICAgLy8gU2xhdmVDb21tYW5kTW9kdWxlLgogCiAgICAgY29tbWFuZChnZXJyaXQpLnRvUHJvdmlkZXIobmV3IERpc3BhdGNoQ29tbWFuZFByb3ZpZGVyKGdlcnJpdCkpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAiYmFuLWNvbW1pdCIpLnRvKEJhbkNvbW1pdENvbW1hbmQuY2xhc3MpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAiZmx1c2gtY2FjaGVzIikudG8oRmx1c2hDYWNoZXMuY2xhc3MpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAibHMtcHJvamVjdHMiKS50byhMaXN0UHJvamVjdHNDb21tYW5kLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgImxzLWdyb3VwcyIpLnRvKExpc3RHcm91cHNDb21tYW5kLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgInF1ZXJ5IikudG8oUXVlcnkuY2xhc3MpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAic2hvdy1jYWNoZXMiKS50byhTaG93Q2FjaGVzLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgInNob3ctY29ubmVjdGlvbnMiKS50byhTaG93Q29ubmVjdGlvbnMuY2xhc3MpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAic2hvdy1xdWV1ZSIpLnRvKFNob3dRdWV1ZS5jbGFzcyk7Ci0gICAgY29tbWFuZChnZXJyaXQsICJzdHJlYW0tZXZlbnRzIikudG8oU3RyZWFtRXZlbnRzLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgInZlcnNpb24iKS50byhWZXJzaW9uQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIEJhbkNvbW1pdENvbW1hbmQuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBGbHVzaENhY2hlcy5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIExpc3RQcm9qZWN0c0NvbW1hbmQuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBMaXN0R3JvdXBzQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIExzVXNlclJlZnMuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBRdWVyeS5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIFNob3dDYWNoZXMuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBTaG93Q29ubmVjdGlvbnMuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBTaG93UXVldWUuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBTdHJlYW1FdmVudHMuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBWZXJzaW9uQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIEdhcmJhZ2VDb2xsZWN0aW9uQ29tbWFuZC5jbGFzcyk7CiAKICAgICBjb21tYW5kKGdlcnJpdCwgInBsdWdpbiIpLnRvUHJvdmlkZXIobmV3IERpc3BhdGNoQ29tbWFuZFByb3ZpZGVyKHBsdWdpbikpOwotICAgIGNvbW1hbmQocGx1Z2luLCAibHMiKS50byhQbHVnaW5Mc0NvbW1hbmQuY2xhc3MpOwotICAgIGNvbW1hbmQocGx1Z2luLCAiZW5hYmxlIikudG8oUGx1Z2luRW5hYmxlQ29tbWFuZC5jbGFzcyk7Ci0gICAgY29tbWFuZChwbHVnaW4sICJpbnN0YWxsIikudG8oUGx1Z2luSW5zdGFsbENvbW1hbmQuY2xhc3MpOwotICAgIGNvbW1hbmQocGx1Z2luLCAicmVsb2FkIikudG8oUGx1Z2luUmVsb2FkQ29tbWFuZC5jbGFzcyk7Ci0gICAgY29tbWFuZChwbHVnaW4sICJyZW1vdmUiKS50byhQbHVnaW5SZW1vdmVDb21tYW5kLmNsYXNzKTsKLSAgICBjb21tYW5kKHBsdWdpbiwgImFkZCIpLnRvKENvbW1hbmRzLmtleShwbHVnaW4sICJpbnN0YWxsIikpOwotICAgIGNvbW1hbmQocGx1Z2luLCAicm0iKS50byhDb21tYW5kcy5rZXkocGx1Z2luLCAicmVtb3ZlIikpOworCisgICAgY29tbWFuZChwbHVnaW4sIFBsdWdpbkxzQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChwbHVnaW4sIFBsdWdpbkVuYWJsZUNvbW1hbmQuY2xhc3MpOworICAgIGNvbW1hbmQocGx1Z2luLCBQbHVnaW5JbnN0YWxsQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChwbHVnaW4sIFBsdWdpblJlbG9hZENvbW1hbmQuY2xhc3MpOworICAgIGNvbW1hbmQocGx1Z2luLCBQbHVnaW5SZW1vdmVDb21tYW5kLmNsYXNzKTsKKyAgICBhbGlhcyhwbHVnaW4sICJhZGQiLCBQbHVnaW5JbnN0YWxsQ29tbWFuZC5jbGFzcyk7CisgICAgYWxpYXMocGx1Z2luLCAicm0iLCBQbHVnaW5SZW1vdmVDb21tYW5kLmNsYXNzKTsKIAogICAgIGNvbW1hbmQoZ2l0KS50b1Byb3ZpZGVyKG5ldyBEaXNwYXRjaENvbW1hbmRQcm92aWRlcihnaXQpKTsKICAgICBjb21tYW5kKGdpdCwgInJlY2VpdmUtcGFjayIpLnRvKENvbW1hbmRzLmtleShnZXJyaXQsICJyZWNlaXZlLXBhY2siKSk7CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvRmx1c2hDYWNoZXMuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9GbHVzaENhY2hlcy5qYXZhCmluZGV4IGZhNjMwNDEuLjEzYWJkZjQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9GbHVzaENhY2hlcy5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9GbHVzaENhY2hlcy5qYXZhCkBAIC0xOSw2ICsxOSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQmFzZUNvbW1hbmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogCkBAIC0zMSw2ICszMiw3IEBACiAKIC8qKiBDYXVzZXMgdGhlIGNhY2hlcyB0byBwdXJnZSBhbGwgZW50cmllcyBhbmQgcmVsb2FkLiAqLwogQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LkZMVVNIX0NBQ0hFUykKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJmbHVzaC1jYWNoZXMiLCBkZXNjciA9ICJGbHVzaCBzb21lL2FsbCBzZXJ2ZXIgY2FjaGVzIGZyb20gbWVtb3J5IikKIGZpbmFsIGNsYXNzIEZsdXNoQ2FjaGVzIGV4dGVuZHMgQ2FjaGVDb21tYW5kIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nIFdFQl9TRVNTSU9OUyA9ICJ3ZWJfc2Vzc2lvbnMiOwogCmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvR2FyYmFnZUNvbGxlY3Rpb25Db21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvR2FyYmFnZUNvbGxlY3Rpb25Db21tYW5kLmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzU2MTE1MwotLS0gL2Rldi9udWxsCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9HYXJiYWdlQ29sbGVjdGlvbkNvbW1hbmQuamF2YQpAQCAtMCwwICsxLDEyMiBAQAorLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKy8vCisvLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKy8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKy8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorLy8KKy8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0Lkxpc3RzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5HYXJiYWdlQ29sbGVjdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q2FjaGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5CYXNlQ29tbWFuZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRNZXRhRGF0YTsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CisKK2ltcG9ydCBvcmcuYXBhY2hlLnNzaGQuc2VydmVyLkVudmlyb25tZW50OworaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5Bcmd1bWVudDsKK2ltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouT3B0aW9uOworCitpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKK2ltcG9ydCBqYXZhLmlvLlByaW50V3JpdGVyOworaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7CitpbXBvcnQgamF2YS51dGlsLkxpc3Q7CisKKy8qKiBSdW5zIHRoZSBHaXQgZ2FyYmFnZSBjb2xsZWN0aW9uLiAqLworQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LlJVTl9HQykKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJnYyIsIGRlc2NyID0gIlJ1biBHaXQgZ2FyYmFnZSBjb2xsZWN0aW9uIikKK3B1YmxpYyBjbGFzcyBHYXJiYWdlQ29sbGVjdGlvbkNvbW1hbmQgZXh0ZW5kcyBCYXNlQ29tbWFuZCB7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tYWxsIiwgdXNhZ2UgPSAicnVucyB0aGUgR2l0IGdhcmJhZ2UgY29sbGVjdGlvbiBmb3IgYWxsIHByb2plY3RzIikKKyAgcHJpdmF0ZSBib29sZWFuIGFsbDsKKworICBAQXJndW1lbnQoaW5kZXggPSAwLCByZXF1aXJlZCA9IGZhbHNlLCBtdWx0aVZhbHVlZCA9IHRydWUsIG1ldGFWYXIgPSAiTkFNRSIsCisgICAgICB1c2FnZSA9ICJwcm9qZWN0cyBmb3Igd2hpY2ggdGhlIEdpdCBnYXJiYWdlIGNvbGxlY3Rpb24gc2hvdWxkIGJlIHJ1biIpCisgIHByaXZhdGUgTGlzdDxQcm9qZWN0Q29udHJvbD4gcHJvamVjdHMgPSBuZXcgQXJyYXlMaXN0PFByb2plY3RDb250cm9sPigpOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBQcm9qZWN0Q2FjaGUgcHJvamVjdENhY2hlOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBHYXJiYWdlQ29sbGVjdGlvbi5GYWN0b3J5IGdhcmJhZ2VDb2xsZWN0aW9uRmFjdG9yeTsKKworICBwcml2YXRlIFByaW50V3JpdGVyIHN0ZG91dDsKKworICBAT3ZlcnJpZGUKKyAgcHVibGljIHZvaWQgc3RhcnQoRW52aXJvbm1lbnQgZW52KSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgIHN0YXJ0VGhyZWFkKG5ldyBDb21tYW5kUnVubmFibGUoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHB1YmxpYyB2b2lkIHJ1bigpIHRocm93cyBFeGNlcHRpb24geworICAgICAgICBzdGRvdXQgPSB0b1ByaW50V3JpdGVyKG91dCk7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgcGFyc2VDb21tYW5kTGluZSgpOworICAgICAgICAgIHZlcmlmeUNvbW1hbmRMaW5lKCk7CisgICAgICAgICAgcnVuR0MoKTsKKyAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICBzdGRvdXQuZmx1c2goKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0pOworICB9CisKKyAgcHJpdmF0ZSB2b2lkIHZlcmlmeUNvbW1hbmRMaW5lKCkgdGhyb3dzIFVubG9nZ2VkRmFpbHVyZSB7CisgICAgaWYgKCFhbGwgJiYgcHJvamVjdHMuaXNFbXB0eSgpKSB7CisgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKDEsCisgICAgICAgICAgIm5lZWRzIHByb2plY3RzIGFzIGNvbW1hbmQgYXJndW1lbnRzIG9yIC0tYWxsIG9wdGlvbiIpOworICAgIH0KKyAgICBpZiAoYWxsICYmICFwcm9qZWN0cy5pc0VtcHR5KCkpIHsKKyAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoMSwKKyAgICAgICAgICAiZWl0aGVyIHNwZWNpZnkgcHJvamVjdHMgYXMgY29tbWFuZCBhcmd1bWVudHMgb3IgdXNlIC0tYWxsIG9wdGlvbiIpOworICAgIH0KKyAgfQorCisgIHByaXZhdGUgdm9pZCBydW5HQygpIHsKKyAgICBMaXN0PFByb2plY3QuTmFtZUtleT4gcHJvamVjdE5hbWVzOworICAgIGlmIChhbGwpIHsKKyAgICAgIHByb2plY3ROYW1lcyA9IExpc3RzLm5ld0FycmF5TGlzdChwcm9qZWN0Q2FjaGUuYWxsKCkpOworICAgIH0gZWxzZSB7CisgICAgICBwcm9qZWN0TmFtZXMgPSBMaXN0cy5uZXdBcnJheUxpc3RXaXRoQ2FwYWNpdHkocHJvamVjdHMuc2l6ZSgpKTsKKyAgICAgIGZvciAoUHJvamVjdENvbnRyb2wgcGMgOiBwcm9qZWN0cykgeworICAgICAgICBwcm9qZWN0TmFtZXMuYWRkKHBjLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpOworICAgICAgfQorICAgIH0KKworICAgIEdhcmJhZ2VDb2xsZWN0aW9uUmVzdWx0IHJlc3VsdCA9CisgICAgICAgIGdhcmJhZ2VDb2xsZWN0aW9uRmFjdG9yeS5jcmVhdGUoKS5ydW4ocHJvamVjdE5hbWVzLCBzdGRvdXQpOworICAgIGlmIChyZXN1bHQuaGFzRXJyb3JzKCkpIHsKKyAgICAgIGZvciAoR2FyYmFnZUNvbGxlY3Rpb25SZXN1bHQuRXJyb3IgZSA6IHJlc3VsdC5nZXRFcnJvcnMoKSkgeworICAgICAgICBTdHJpbmcgbXNnOworICAgICAgICBzd2l0Y2ggKGUuZ2V0VHlwZSgpKSB7CisgICAgICAgICAgY2FzZSBSRVBPU0lUT1JZX05PVF9GT1VORDoKKyAgICAgICAgICAgIG1zZyA9ICJlcnJvcjogcHJvamVjdCBcIiIgKyBlLmdldFByb2plY3ROYW1lKCkgKyAiXCIgbm90IGZvdW5kIjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgIGNhc2UgR0NfQUxSRUFEWV9TQ0hFRFVMRUQ6CisgICAgICAgICAgICBtc2cgPSAiZXJyb3I6IGdhcmJhZ2UgY29sbGVjdGlvbiBmb3IgcHJvamVjdCBcIiIKKyAgICAgICAgICAgICAgICArIGUuZ2V0UHJvamVjdE5hbWUoKSArICJcIiB3YXMgYWxyZWFkeSBzY2hlZHVsZWQiOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgY2FzZSBHQ19GQUlMRUQ6CisgICAgICAgICAgICBtc2cgPSAiZXJyb3I6IGdhcmJhZ2UgY29sbGVjdGlvbiBmb3IgcHJvamVjdCBcIiIgKyBlLmdldFByb2plY3ROYW1lKCkKKyAgICAgICAgICAgICAgICArICJcIiBmYWlsZWQiOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIG1zZyA9ICJlcnJvcjogZ2FyYmFnZSBjb2xsZWN0aW9uIGZvciBwcm9qZWN0IFwiIiArIGUuZ2V0UHJvamVjdE5hbWUoKQorICAgICAgICAgICAgICAgICsgIlwiIGZhaWxlZDogIiArIGUuZ2V0VHlwZSgpOworICAgICAgICB9CisgICAgICAgIHN0ZG91dC5wcmludChtc2cgKyAiXG4iKTsKKyAgICAgIH0KKyAgICB9CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9MaXN0R3JvdXBzQ29tbWFuZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0xpc3RHcm91cHNDb21tYW5kLmphdmEKaW5kZXggZjg4NTZmMi4uZTViNDIwMyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0xpc3RHcm91cHNDb21tYW5kLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0xpc3RHcm91cHNDb21tYW5kLmphdmEKQEAgLTE0LDkzICsxNCw5MSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHM7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5Hcm91cExpc3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLk9iamVjdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TdHJpbmdzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5Vcmw7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnRHcm91cDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuSWRlbnRpZmllZFVzZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuR2V0R3JvdXBzOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50Lkdyb3VwQ2FjaGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuVmlzaWJsZUdyb3VwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5Hcm91cENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdyb3VwLkdyb3VwSnNvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuR3JvdXBKc29uLkdyb3VwSW5mbzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ3JvdXAuTGlzdEdyb3VwczsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuaW91dGlsLkNvbHVtbkZvcm1hdHRlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLlNzaENvbW1hbmQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uY2xpZW50LktleVV0aWw7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5CYXNlQ29tbWFuZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRNZXRhRGF0YTsKK2ltcG9ydCBjb20uZ29vZ2xlLmd3dG9ybS5zZXJ2ZXIuT3JtRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKIAoraW1wb3J0IG9yZy5hcGFjaGUuc3NoZC5zZXJ2ZXIuRW52aXJvbm1lbnQ7CiBpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKIAotaW1wb3J0IGphdmEudXRpbC5BcnJheUxpc3Q7Ci1pbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS5pby5QcmludFdyaXRlcjsKIAotcHVibGljIGNsYXNzIExpc3RHcm91cHNDb21tYW5kIGV4dGVuZHMgU3NoQ29tbWFuZCB7CitAQ29tbWFuZE1ldGFEYXRhKG5hbWUgPSAibHMtZ3JvdXBzIiwgZGVzY3IgPSAiTGlzdCBncm91cHMgdmlzaWJsZSB0byB0aGUgY2FsbGVyIikKK3B1YmxpYyBjbGFzcyBMaXN0R3JvdXBzQ29tbWFuZCBleHRlbmRzIEJhc2VDb21tYW5kIHsKICAgQEluamVjdAotICBwcml2YXRlIEdyb3VwQ2FjaGUgZ3JvdXBDYWNoZTsKLQotICBASW5qZWN0Ci0gIHByaXZhdGUgVmlzaWJsZUdyb3Vwcy5GYWN0b3J5IHZpc2libGVHcm91cHNGYWN0b3J5OwotCi0gIEBJbmplY3QKLSAgcHJpdmF0ZSBJZGVudGlmaWVkVXNlci5HZW5lcmljRmFjdG9yeSB1c2VyRmFjdG9yeTsKLQotICBAT3B0aW9uKG5hbWUgPSAiLS1wcm9qZWN0IiwgYWxpYXNlcyA9IHsiLXAifSwKLSAgICAgIHVzYWdlID0gInByb2plY3RzIGZvciB3aGljaCB0aGUgZ3JvdXBzIHNob3VsZCBiZSBsaXN0ZWQiKQotICBwcml2YXRlIGZpbmFsIExpc3Q8UHJvamVjdENvbnRyb2w+IHByb2plY3RzID0gbmV3IEFycmF5TGlzdDxQcm9qZWN0Q29udHJvbD4oKTsKLQotICBAT3B0aW9uKG5hbWUgPSAiLS12aXNpYmxlLXRvLWFsbCIsIHVzYWdlID0gInRvIGxpc3Qgb25seSBncm91cHMgdGhhdCBhcmUgdmlzaWJsZSB0byBhbGwgcmVnaXN0ZXJlZCB1c2VycyIpCi0gIHByaXZhdGUgYm9vbGVhbiB2aXNpYmxlVG9BbGw7Ci0KLSAgQE9wdGlvbihuYW1lID0gIi0tdHlwZSIsIHVzYWdlID0gInR5cGUgb2YgZ3JvdXAiKQotICBwcml2YXRlIEFjY291bnRHcm91cC5UeXBlIGdyb3VwVHlwZTsKLQotICBAT3B0aW9uKG5hbWUgPSAiLS11c2VyIiwgYWxpYXNlcyA9IHsiLXUifSwKLSAgICAgIHVzYWdlID0gInVzZXIgZm9yIHdoaWNoIHRoZSBncm91cHMgc2hvdWxkIGJlIGxpc3RlZCIpCi0gIHByaXZhdGUgQWNjb3VudC5JZCB1c2VyOwotCi0gIEBPcHRpb24obmFtZSA9ICItLXZlcmJvc2UiLCBhbGlhc2VzID0geyItdiJ9LAotICAgICAgdXNhZ2UgPSAidmVyYm9zZSBvdXRwdXQgZm9ybWF0IHdpdGggdGFiLXNlcGFyYXRlZCBjb2x1bW5zIGZvciB0aGUgIiArCi0gICAgICAgICAgImdyb3VwIG5hbWUsIFVVSUQsIGRlc2NyaXB0aW9uLCB0eXBlLCBvd25lciBncm91cCBuYW1lLCAiICsKLSAgICAgICAgICAib3duZXIgZ3JvdXAgVVVJRCwgYW5kIHdoZXRoZXIgdGhlIGdyb3VwIGlzIHZpc2libGUgdG8gYWxsIikKLSAgcHJpdmF0ZSBib29sZWFuIHZlcmJvc2VPdXRwdXQ7CisgIHByaXZhdGUgTXlMaXN0R3JvdXBzIGltcGw7CiAKICAgQE92ZXJyaWRlCi0gIHByb3RlY3RlZCB2b2lkIHJ1bigpIHRocm93cyBGYWlsdXJlIHsKLSAgICB0cnkgewotICAgICAgaWYgKHVzZXIgIT0gbnVsbCAmJiAhcHJvamVjdHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoMSwgImZhdGFsOiAtLXVzZXIgYW5kIC0tcHJvamVjdCBvcHRpb25zIGFyZSBub3QgY29tcGF0aWJsZS4iKTsKKyAgcHVibGljIHZvaWQgc3RhcnQoZmluYWwgRW52aXJvbm1lbnQgZW52KSB7CisgICAgc3RhcnRUaHJlYWQobmV3IENvbW1hbmRSdW5uYWJsZSgpIHsKKyAgICAgIEBPdmVycmlkZQorICAgICAgcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICAgIHBhcnNlQ29tbWFuZExpbmUoaW1wbCk7CisgICAgICAgIGlmIChpbXBsLmdldFVzZXIoKSAhPSBudWxsICYmICFpbXBsLmdldFByb2plY3RzKCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgdGhyb3cgbmV3IFVubG9nZ2VkRmFpbHVyZSgxLCAiZmF0YWw6IC0tdXNlciBhbmQgLS1wcm9qZWN0IG9wdGlvbnMgYXJlIG5vdCBjb21wYXRpYmxlLiIpOworICAgICAgICB9CisgICAgICAgIGZpbmFsIFByaW50V3JpdGVyIHN0ZG91dCA9IHRvUHJpbnRXcml0ZXIob3V0KTsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICBpbXBsLmRpc3BsYXkoc3Rkb3V0KTsKKyAgICAgICAgfSBmaW5hbGx5IHsKKyAgICAgICAgICBzdGRvdXQuZmx1c2goKTsKKyAgICAgICAgfQogICAgICAgfQorICAgIH0pOworICB9CiAKLSAgICAgIGZpbmFsIFZpc2libGVHcm91cHMgdmlzaWJsZUdyb3VwcyA9IHZpc2libGVHcm91cHNGYWN0b3J5LmNyZWF0ZSgpOwotICAgICAgdmlzaWJsZUdyb3Vwcy5zZXRPbmx5VmlzaWJsZVRvQWxsKHZpc2libGVUb0FsbCk7Ci0gICAgICB2aXNpYmxlR3JvdXBzLnNldEdyb3VwVHlwZShncm91cFR5cGUpOwotICAgICAgZmluYWwgR3JvdXBMaXN0IGdyb3VwTGlzdDsKLSAgICAgIGlmICghcHJvamVjdHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGdyb3VwTGlzdCA9IHZpc2libGVHcm91cHMuZ2V0KHByb2plY3RzKTsKLSAgICAgIH0gZWxzZSBpZiAodXNlciAhPSBudWxsKSB7Ci0gICAgICAgIGdyb3VwTGlzdCA9IHZpc2libGVHcm91cHMuZ2V0KHVzZXJGYWN0b3J5LmNyZWF0ZSh1c2VyKSk7Ci0gICAgICB9IGVsc2UgewotICAgICAgICBncm91cExpc3QgPSB2aXNpYmxlR3JvdXBzLmdldCgpOwotICAgICAgfQorICBwcml2YXRlIHN0YXRpYyBjbGFzcyBNeUxpc3RHcm91cHMgZXh0ZW5kcyBMaXN0R3JvdXBzIHsKKyAgICBAT3B0aW9uKG5hbWUgPSAiLS12ZXJib3NlIiwgYWxpYXNlcyA9IHsiLXYifSwKKyAgICAgICAgdXNhZ2UgPSAidmVyYm9zZSBvdXRwdXQgZm9ybWF0IHdpdGggdGFiLXNlcGFyYXRlZCBjb2x1bW5zIGZvciB0aGUgIiArCisgICAgICAgICAgICAiZ3JvdXAgbmFtZSwgVVVJRCwgZGVzY3JpcHRpb24sIG93bmVyIGdyb3VwIG5hbWUsICIgKworICAgICAgICAgICAgIm93bmVyIGdyb3VwIFVVSUQsIGFuZCB3aGV0aGVyIHRoZSBncm91cCBpcyB2aXNpYmxlIHRvIGFsbCIpCisgICAgcHJpdmF0ZSBib29sZWFuIHZlcmJvc2VPdXRwdXQ7CiAKLSAgICAgIGZpbmFsIENvbHVtbkZvcm1hdHRlciBmb3JtYXR0ZXIgPSBuZXcgQ29sdW1uRm9ybWF0dGVyKHN0ZG91dCwgJ1x0Jyk7Ci0gICAgICBmb3IgKGZpbmFsIEFjY291bnRHcm91cCBnIDogZ3JvdXBMaXN0LmdldEdyb3VwcygpKSB7Ci0gICAgICAgIGZvcm1hdHRlci5hZGRDb2x1bW4oZy5nZXROYW1lKCkpOworICAgIEBJbmplY3QKKyAgICBNeUxpc3RHcm91cHMoZmluYWwgR3JvdXBDYWNoZSBncm91cENhY2hlLAorICAgICAgICBmaW5hbCBHcm91cENvbnRyb2wuRmFjdG9yeSBncm91cENvbnRyb2xGYWN0b3J5LAorICAgICAgICBmaW5hbCBHcm91cENvbnRyb2wuR2VuZXJpY0ZhY3RvcnkgZ2VuZXJpY0dyb3VwQ29udHJvbEZhY3RvcnksCisgICAgICAgIGZpbmFsIFByb3ZpZGVyPElkZW50aWZpZWRVc2VyPiBpZGVudGlmaWVkVXNlciwKKyAgICAgICAgZmluYWwgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdXNlckZhY3RvcnksCisgICAgICAgIGZpbmFsIFByb3ZpZGVyPEdldEdyb3Vwcz4gYWNjb3VudEdldEdyb3VwcywKKyAgICAgICAgZmluYWwgR3JvdXBKc29uIGpzb24pIHsKKyAgICAgIHN1cGVyKGdyb3VwQ2FjaGUsIGdyb3VwQ29udHJvbEZhY3RvcnksIGdlbmVyaWNHcm91cENvbnRyb2xGYWN0b3J5LAorICAgICAgICAgIGlkZW50aWZpZWRVc2VyLCB1c2VyRmFjdG9yeSwgYWNjb3VudEdldEdyb3VwcywganNvbik7CisgICAgfQorCisgICAgdm9pZCBkaXNwbGF5KGZpbmFsIFByaW50V3JpdGVyIG91dCkgdGhyb3dzIE9ybUV4Y2VwdGlvbiB7CisgICAgICBmaW5hbCBDb2x1bW5Gb3JtYXR0ZXIgZm9ybWF0dGVyID0gbmV3IENvbHVtbkZvcm1hdHRlcihvdXQsICdcdCcpOworICAgICAgZm9yIChmaW5hbCBHcm91cEluZm8gaW5mbyA6IGdldCgpKSB7CisgICAgICAgIGZvcm1hdHRlci5hZGRDb2x1bW4oT2JqZWN0cy5maXJzdE5vbk51bGwoaW5mby5uYW1lLCAibi9hIikpOwogICAgICAgICBpZiAodmVyYm9zZU91dHB1dCkgewotICAgICAgICAgIGZvcm1hdHRlci5hZGRDb2x1bW4oS2V5VXRpbC5kZWNvZGUoZy5nZXRHcm91cFVVSUQoKS50b1N0cmluZygpKSk7Ci0gICAgICAgICAgZm9ybWF0dGVyLmFkZENvbHVtbigKLSAgICAgICAgICAgICAgZy5nZXREZXNjcmlwdGlvbigpICE9IG51bGwgPyBnLmdldERlc2NyaXB0aW9uKCkgOiAiIik7Ci0gICAgICAgICAgZm9ybWF0dGVyLmFkZENvbHVtbihnLmdldFR5cGUoKS50b1N0cmluZygpKTsKLSAgICAgICAgICBmaW5hbCBBY2NvdW50R3JvdXAgb3duaW5nR3JvdXAgPQotICAgICAgICAgICAgICBncm91cENhY2hlLmdldChnLmdldE93bmVyR3JvdXBVVUlEKCkpOwotICAgICAgICAgIGZvcm1hdHRlci5hZGRDb2x1bW4oCi0gICAgICAgICAgICAgIG93bmluZ0dyb3VwICE9IG51bGwgPyBvd25pbmdHcm91cC5nZXROYW1lKCkgOiAibi9hIik7Ci0gICAgICAgICAgZm9ybWF0dGVyLmFkZENvbHVtbihLZXlVdGlsLmRlY29kZShnLmdldE93bmVyR3JvdXBVVUlEKCkudG9TdHJpbmcoKSkpOwotICAgICAgICAgIGZvcm1hdHRlci5hZGRDb2x1bW4oQm9vbGVhbi50b1N0cmluZyhnLmlzVmlzaWJsZVRvQWxsKCkpKTsKKyAgICAgICAgICBBY2NvdW50R3JvdXAgbyA9IGluZm8ub3duZXJJZCAhPSBudWxsCisgICAgICAgICAgICAgID8gZ3JvdXBDYWNoZS5nZXQobmV3IEFjY291bnRHcm91cC5VVUlEKFVybC5kZWNvZGUoaW5mby5vd25lcklkKSkpCisgICAgICAgICAgICAgIDogbnVsbDsKKworICAgICAgICAgIGZvcm1hdHRlci5hZGRDb2x1bW4oVXJsLmRlY29kZShpbmZvLmlkKSk7CisgICAgICAgICAgZm9ybWF0dGVyLmFkZENvbHVtbihTdHJpbmdzLm51bGxUb0VtcHR5KGluZm8uZGVzY3JpcHRpb24pKTsKKyAgICAgICAgICBmb3JtYXR0ZXIuYWRkQ29sdW1uKG8gIT0gbnVsbCA/IG8uZ2V0TmFtZSgpIDogIm4vYSIpOworICAgICAgICAgIGZvcm1hdHRlci5hZGRDb2x1bW4obyAhPSBudWxsID8gby5nZXRHcm91cFVVSUQoKS5nZXQoKSA6ICIiKTsKKyAgICAgICAgICBmb3JtYXR0ZXIuYWRkQ29sdW1uKEJvb2xlYW4udG9TdHJpbmcoT2JqZWN0cy5maXJzdE5vbk51bGwoCisgICAgICAgICAgICAgIGluZm8ub3B0aW9ucy52aXNpYmxlVG9BbGwsIEJvb2xlYW4uRkFMU0UpKSk7CiAgICAgICAgIH0KICAgICAgICAgZm9ybWF0dGVyLm5leHRMaW5lKCk7CiAgICAgICB9CiAgICAgICBmb3JtYXR0ZXIuZmluaXNoKCk7Ci0gICAgfSBjYXRjaCAoTm9TdWNoR3JvdXBFeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgZGllKGUpOwogICAgIH0KICAgfQogfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0xpc3RQcm9qZWN0c0NvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9MaXN0UHJvamVjdHNDb21tYW5kLmphdmEKaW5kZXggMTNlM2YxNy4uYWI3MDM5NSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL0xpc3RQcm9qZWN0c0NvbW1hbmQuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvTGlzdFByb2plY3RzQ29tbWFuZC5qYXZhCkBAIC0xNiwxMCArMTYsMTQgQEAKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lkxpc3RQcm9qZWN0czsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkJhc2VDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIAogaW1wb3J0IG9yZy5hcGFjaGUuc3NoZC5zZXJ2ZXIuRW52aXJvbm1lbnQ7CiAKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKKworQENvbW1hbmRNZXRhRGF0YShuYW1lID0gImxzLXByb2plY3RzIiwgZGVzY3IgPSAiTGlzdCBwcm9qZWN0cyB2aXNpYmxlIHRvIHRoZSBjYWxsZXIiKQogZmluYWwgY2xhc3MgTGlzdFByb2plY3RzQ29tbWFuZCBleHRlbmRzIEJhc2VDb21tYW5kIHsKICAgQEluamVjdAogICBwcml2YXRlIExpc3RQcm9qZWN0cyBpbXBsOwpAQCAtMzEsNyArMzUsOCBAQAogICAgICAgcHVibGljIHZvaWQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgICAgIHBhcnNlQ29tbWFuZExpbmUoaW1wbCk7CiAgICAgICAgIGlmICghaW1wbC5nZXRGb3JtYXQoKS5pc0pzb24oKSkgewotICAgICAgICAgIGlmIChpbXBsLmlzU2hvd1RyZWUoKSAmJiAoaW1wbC5nZXRTaG93QnJhbmNoKCkgIT0gbnVsbCkpIHsKKyAgICAgICAgICBMaXN0PFN0cmluZz4gc2hvd0JyYW5jaCA9IGltcGwuZ2V0U2hvd0JyYW5jaCgpOworICAgICAgICAgIGlmIChpbXBsLmlzU2hvd1RyZWUoKSAmJiAoc2hvd0JyYW5jaCAhPSBudWxsKSAmJiAhc2hvd0JyYW5jaC5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoMSwgImZhdGFsOiAtLXRyZWUgYW5kIC0tc2hvdy1icmFuY2ggb3B0aW9ucyBhcmUgbm90IGNvbXBhdGlibGUuIik7CiAgICAgICAgICAgfQogICAgICAgICAgIGlmIChpbXBsLmlzU2hvd1RyZWUoKSAmJiBpbXBsLmlzU2hvd0Rlc2NyaXB0aW9uKCkpIHsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9Mc1VzZXJSZWZzLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvTHNVc2VyUmVmcy5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU4YWJmOTUKLS0tIC9kZXYvbnVsbAorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvTHNVc2VyUmVmcy5qYXZhCkBAIC0wLDAgKzEsMTE1IEBACisvLyBDb3B5cmlnaHQgKEMpIDIwMTIgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5jb21tYW5kczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkdsb2JhbENhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkJyYW5jaDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5zZXJ2ZXIuUmV2aWV3RGI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRSZXNvbHZlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkNoYW5nZUNhY2hlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuR2l0UmVwb3NpdG9yeU1hbmFnZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5UYWdDYWNoZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlZpc2libGVSZWZGaWx0ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworCitpbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLlJlZjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmxpYi5SZXBvc2l0b3J5OworaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5PcHRpb247CisKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEudXRpbC5NYXA7CisKK0BSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gImxzLXVzZXItcmVmcyIsIGRlc2NyID0gIkxpc3QgcmVmcyB2aXNpYmxlIHRvIGEgc3BlY2lmaWMgdXNlciIpCitwdWJsaWMgY2xhc3MgTHNVc2VyUmVmcyBleHRlbmRzIFNzaENvbW1hbmQgeworICBASW5qZWN0CisgIHByaXZhdGUgQWNjb3VudFJlc29sdmVyIGFjY291bnRSZXNvbHZlcjsKKworICBASW5qZWN0CisgIHByaXZhdGUgSWRlbnRpZmllZFVzZXIuR2VuZXJpY0ZhY3RvcnkgdXNlckZhY3Rvcnk7CisKKyAgQEluamVjdAorICBwcml2YXRlIFJldmlld0RiIGRiOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBUYWdDYWNoZSB0YWdDYWNoZTsKKworICBASW5qZWN0CisgIHByaXZhdGUgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGU7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tcHJvamVjdCIsIGFsaWFzZXMgPSB7Ii1wIn0sIG1ldGFWYXIgPSAiUFJPSkVDVCIsCisgICAgICByZXF1aXJlZCA9IHRydWUsIHVzYWdlID0gInByb2plY3QgZm9yIHdoaWNoIHRoZSByZWZzIHNob3VsZCBiZSBsaXN0ZWQiKQorICBwcml2YXRlIFByb2plY3RDb250cm9sIHByb2plY3RDb250cm9sOworCisgIEBPcHRpb24obmFtZSA9ICItLXVzZXIiLCBhbGlhc2VzID0geyItdSJ9LCAgbWV0YVZhciA9ICJVU0VSIiwKKyAgICAgIHJlcXVpcmVkID0gdHJ1ZSwgdXNhZ2UgPSAidXNlciBmb3Igd2hpY2ggdGhlIGdyb3VwcyBzaG91bGQgYmUgbGlzdGVkIikKKyAgcHJpdmF0ZSBTdHJpbmcgdXNlck5hbWU7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tb25seS1yZWZzLWhlYWRzIiwgdXNhZ2UgPSAibGlzdCBvbmx5IHJlZnMgdW5kZXIgcmVmcy9oZWFkcyIpCisgIHByaXZhdGUgYm9vbGVhbiBvbmx5UmVmc0hlYWRzOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBHaXRSZXBvc2l0b3J5TWFuYWdlciByZXBvTWFuYWdlcjsKKworICBAT3ZlcnJpZGUKKyAgcHJvdGVjdGVkIHZvaWQgcnVuKCkgdGhyb3dzIEZhaWx1cmUgeworICAgIEFjY291bnQgdXNlckFjY291bnQgPSBudWxsOworICAgIHRyeSB7CisgICAgICB1c2VyQWNjb3VudCA9IGFjY291bnRSZXNvbHZlci5maW5kKHVzZXJOYW1lKTsKKyAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgeworICAgICAgdGhyb3cgZGllKGUpOworICAgIH0KKworICAgIGlmICh1c2VyQWNjb3VudCA9PSBudWxsKSB7CisgICAgICBzdGRvdXQucHJpbnQoIk5vIHNpbmdsZSB1c2VyIGNvdWxkIGJlIGZvdW5kIHdoZW4gc2VhcmNoaW5nIGZvcjogIiArIHVzZXJOYW1lICsgJ1xuJyk7CisgICAgICBzdGRvdXQuZmx1c2goKTsKKyAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBJZGVudGlmaWVkVXNlciB1c2VyID0gdXNlckZhY3RvcnkuY3JlYXRlKHVzZXJBY2NvdW50LmdldElkKCkpOworICAgIFByb2plY3RDb250cm9sIHVzZXJQcm9qZWN0Q29udHJvbCA9IHByb2plY3RDb250cm9sLmZvclVzZXIodXNlcik7CisgICAgUmVwb3NpdG9yeSByZXBvID0gbnVsbDsKKyAgICB0cnkgeworICAgICAgcmVwbyA9IHJlcG9NYW5hZ2VyLm9wZW5SZXBvc2l0b3J5KHVzZXJQcm9qZWN0Q29udHJvbC5nZXRQcm9qZWN0KCkKKyAgICAgICAgICAgICAgLmdldE5hbWVLZXkoKSk7CisKKyAgICAgIE1hcDxTdHJpbmcsIFJlZj4gcmVmc01hcCA9CisgICAgICAgICAgbmV3IFZpc2libGVSZWZGaWx0ZXIodGFnQ2FjaGUsIGNoYW5nZUNhY2hlLCByZXBvLCB1c2VyUHJvamVjdENvbnRyb2wsCisgICAgICAgICAgICAgIGRiLCB0cnVlKS5maWx0ZXIocmVwby5nZXRBbGxSZWZzKCksIGZhbHNlKTsKKworICAgICAgZm9yIChmaW5hbCBTdHJpbmcgcmVmIDogcmVmc01hcC5rZXlTZXQoKSkgeworICAgICAgICBpZiAoIW9ubHlSZWZzSGVhZHMgfHwgcmVmLnN0YXJ0c1dpdGgoQnJhbmNoLlJfSEVBRFMpKSB7CisgICAgICAgICAgc3Rkb3V0LnByaW50bG4ocmVmKTsKKyAgICAgICAgfQorICAgICAgfQorICAgIH0gY2F0Y2ggKFJlcG9zaXRvcnlOb3RGb3VuZEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKCJmYXRhbDogJyIKKyAgICAgICAgICArIHByb2plY3RDb250cm9sLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkgKyAiJzogbm90IGEgZ2l0IGFyY2hpdmUiKTsKKyAgICB9IGNhdGNoIChJT0V4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKCJmYXRhbDogRXJyb3Igb3BlbmluZzogJyIKKyAgICAgICAgICArIHByb2plY3RDb250cm9sLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpOworICAgIH0gZmluYWxseSB7CisgICAgICByZXBvLmNsb3NlKCk7CisgICAgfQorICB9Cit9CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvTWFzdGVyQ29tbWFuZE1vZHVsZS5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL01hc3RlckNvbW1hbmRNb2R1bGUuamF2YQppbmRleCA5MGJjMDdlLi4zMGYzYzk1IDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvTWFzdGVyQ29tbWFuZE1vZHVsZS5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9NYXN0ZXJDb21tYW5kTW9kdWxlLmphdmEKQEAgLTE3LDYgKzE3LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTmFtZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRzOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuRGlzcGF0Y2hDb21tYW5kUHJvdmlkZXI7CiAKIAogLyoqIFJlZ2lzdGVyIHRoZSBjb21tYW5kcyBhIEdlcnJpdCBzZXJ2ZXIgaW4gbWFzdGVyIG1vZGUgc3VwcG9ydHMuICovCkBAIC0yNCwxOSArMjUsMjQgQEAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKICAgICBmaW5hbCBDb21tYW5kTmFtZSBnZXJyaXQgPSBDb21tYW5kcy5uYW1lZCgiZ2Vycml0Iik7CisgICAgZmluYWwgQ29tbWFuZE5hbWUgdGVzdFN1Ym1pdCA9IENvbW1hbmRzLm5hbWVkKGdlcnJpdCwgInRlc3Qtc3VibWl0Iik7CiAKLSAgICBjb21tYW5kKGdlcnJpdCwgImFwcHJvdmUiKS50byhSZXZpZXdDb21tYW5kLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgImNyZWF0ZS1hY2NvdW50IikudG8oQ3JlYXRlQWNjb3VudENvbW1hbmQuY2xhc3MpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAiY3JlYXRlLWdyb3VwIikudG8oQ3JlYXRlR3JvdXBDb21tYW5kLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgInJlbmFtZS1ncm91cCIpLnRvKFJlbmFtZUdyb3VwQ29tbWFuZC5jbGFzcyk7Ci0gICAgY29tbWFuZChnZXJyaXQsICJjcmVhdGUtcHJvamVjdCIpLnRvKENyZWF0ZVByb2plY3RDb21tYW5kLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgImdzcWwiKS50byhBZG1pblF1ZXJ5U2hlbGwuY2xhc3MpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAidGVzdC1zdWJtaXQtcnVsZSIpLnRvKFRlc3RTdWJtaXRSdWxlLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgInNldC1yZXZpZXdlcnMiKS50byhTZXRSZXZpZXdlcnNDb21tYW5kLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgInJlY2VpdmUtcGFjayIpLnRvKFJlY2VpdmUuY2xhc3MpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAic2V0LXByb2plY3QtcGFyZW50IikudG8oQWRtaW5TZXRQYXJlbnQuY2xhc3MpOwotICAgIGNvbW1hbmQoZ2Vycml0LCAicmV2aWV3IikudG8oUmV2aWV3Q29tbWFuZC5jbGFzcyk7Ci0gICAgY29tbWFuZChnZXJyaXQsICJzZXQtYWNjb3VudCIpLnRvKFNldEFjY291bnRDb21tYW5kLmNsYXNzKTsKLSAgICBjb21tYW5kKGdlcnJpdCwgInNldC1wcm9qZWN0IikudG8oU2V0UHJvamVjdENvbW1hbmQuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBDcmVhdGVBY2NvdW50Q29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIENyZWF0ZUdyb3VwQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIFJlbmFtZUdyb3VwQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIENyZWF0ZVByb2plY3RDb21tYW5kLmNsYXNzKTsKKyAgICBjb21tYW5kKGdlcnJpdCwgQWRtaW5RdWVyeVNoZWxsLmNsYXNzKTsKKyAgICBjb21tYW5kKGdlcnJpdCwgU2V0UmV2aWV3ZXJzQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIFJlY2VpdmUuY2xhc3MpOworICAgIGNvbW1hbmQoZ2Vycml0LCBBZG1pblNldFBhcmVudC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIFJldmlld0NvbW1hbmQuY2xhc3MpOworICAgIC8vIGRlcHJlY2F0ZWQgYWxpYXMgdG8gcmV2aWV3IGNvbW1hbmQKKyAgICBhbGlhcyhnZXJyaXQsICJhcHByb3ZlIiwgUmV2aWV3Q29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZChnZXJyaXQsIFNldEFjY291bnRDb21tYW5kLmNsYXNzKTsKKyAgICBjb21tYW5kKGdlcnJpdCwgU2V0UHJvamVjdENvbW1hbmQuY2xhc3MpOworCisgICAgY29tbWFuZChnZXJyaXQsICJ0ZXN0LXN1Ym1pdCIpLnRvUHJvdmlkZXIobmV3IERpc3BhdGNoQ29tbWFuZFByb3ZpZGVyKHRlc3RTdWJtaXQpKTsKKyAgICBjb21tYW5kKHRlc3RTdWJtaXQsIFRlc3RTdWJtaXRSdWxlQ29tbWFuZC5jbGFzcyk7CisgICAgY29tbWFuZCh0ZXN0U3VibWl0LCBUZXN0U3VibWl0VHlwZUNvbW1hbmQuY2xhc3MpOwogICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luRW5hYmxlQ29tbWFuZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1BsdWdpbkVuYWJsZUNvbW1hbmQuamF2YQppbmRleCA0ZGYzYWVlLi43MDllMzM3IDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luRW5hYmxlQ29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9QbHVnaW5FbmFibGVDb21tYW5kLmphdmEKQEAgLTE5LDYgKzE5LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLmFubm90YXRpb25zLlJlcXVpcmVzQ2FwYWJpbGl0eTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2lucy5QbHVnaW5JbnN0YWxsRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlBsdWdpbkxvYWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRNZXRhRGF0YTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLlNzaENvbW1hbmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogCkBAIC0yNyw2ICsyOCw3IEBACiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIEBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gImVuYWJsZSIsIGRlc2NyID0gIkVuYWJsZSBwbHVnaW5zIikKIGZpbmFsIGNsYXNzIFBsdWdpbkVuYWJsZUNvbW1hbmQgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgQEFyZ3VtZW50KGluZGV4ID0gMCwgbWV0YVZhciA9ICJOQU1FIiwgcmVxdWlyZWQgPSB0cnVlLCB1c2FnZSA9ICJwbHVnaW4ocykgdG8gZW5hYmxlIikKICAgTGlzdDxTdHJpbmc+IG5hbWVzOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1BsdWdpbkluc3RhbGxDb21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luSW5zdGFsbENvbW1hbmQuamF2YQppbmRleCAxMjcyMmVjLi5mYzAzNmZlIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luSW5zdGFsbENvbW1hbmQuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luSW5zdGFsbENvbW1hbmQuamF2YQpAQCAtMTksNiArMTksNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUmVxdWlyZXNDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlBsdWdpbkluc3RhbGxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuUGx1Z2luTG9hZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoQ29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiAKQEAgLTM0LDYgKzM1LDcgQEAKIGltcG9ydCBqYXZhLm5ldC5VUkw7CiAKIEBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gImluc3RhbGwiLCBkZXNjciA9ICJJbnN0YWxsL0FkZCBhIHBsdWdpbiIpCiBmaW5hbCBjbGFzcyBQbHVnaW5JbnN0YWxsQ29tbWFuZCBleHRlbmRzIFNzaENvbW1hbmQgewogICBAT3B0aW9uKG5hbWUgPSAiLS1uYW1lIiwgYWxpYXNlcyA9IHsiLW4ifSwgdXNhZ2UgPSAiaW5zdGFsbCB1bmRlciBuYW1lIikKICAgcHJpdmF0ZSBTdHJpbmcgbmFtZTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9QbHVnaW5Mc0NvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9QbHVnaW5Mc0NvbW1hbmQuamF2YQppbmRleCA2ZDc0OTBmLi5hYjZjOTc4IDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luTHNDb21tYW5kLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1BsdWdpbkxzQ29tbWFuZC5qYXZhCkBAIC0xOCw2ICsxOCw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuTGlzdFBsdWdpbnM7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5CYXNlQ29tbWFuZDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRNZXRhRGF0YTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiAKIGltcG9ydCBvcmcuYXBhY2hlLnNzaGQuc2VydmVyLkVudmlyb25tZW50OwpAQCAtMjUsNiArMjYsNyBAQAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiAKIEBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gImxzIiwgZGVzY3IgPSAiTGlzdCB0aGUgaW5zdGFsbGVkIHBsdWdpbnMiKQogZmluYWwgY2xhc3MgUGx1Z2luTHNDb21tYW5kIGV4dGVuZHMgQmFzZUNvbW1hbmQgewogICBASW5qZWN0CiAgIHByaXZhdGUgTGlzdFBsdWdpbnMgaW1wbDsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9QbHVnaW5SZWxvYWRDb21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luUmVsb2FkQ29tbWFuZC5qYXZhCmluZGV4IGQyNDI5YTkuLjg1YWRlMDMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9QbHVnaW5SZWxvYWRDb21tYW5kLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1BsdWdpblJlbG9hZENvbW1hbmQuamF2YQpAQCAtMTksNiArMTksNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlBsdWdpbkluc3RhbGxFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5hbm5vdGF0aW9ucy5SZXF1aXJlc0NhcGFiaWxpdHk7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnBsdWdpbnMuUGx1Z2luTG9hZGVyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoQ29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CiAKQEAgLTI3LDYgKzI4LDcgQEAKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIAogQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LkFETUlOSVNUUkFURV9TRVJWRVIpCitAQ29tbWFuZE1ldGFEYXRhKG5hbWUgPSAicmVsb2FkIiwgZGVzY3IgPSAiUmVsb2FkL1Jlc3RhcnQgcGx1Z2lucyIpCiBmaW5hbCBjbGFzcyBQbHVnaW5SZWxvYWRDb21tYW5kIGV4dGVuZHMgU3NoQ29tbWFuZCB7CiAgIEBBcmd1bWVudChpbmRleCA9IDAsIG1ldGFWYXIgPSAiTkFNRSIsIHVzYWdlID0gInBsdWdpbnMgdG8gcmVsb2FkL3Jlc3RhcnQiKQogICBwcml2YXRlIExpc3Q8U3RyaW5nPiBuYW1lczsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9QbHVnaW5SZW1vdmVDb21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luUmVtb3ZlQ29tbWFuZC5qYXZhCmluZGV4IDhiYWFiNzcuLjk2YWRiOGZlIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUGx1Z2luUmVtb3ZlQ29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9QbHVnaW5SZW1vdmVDb21tYW5kLmphdmEKQEAgLTE4LDYgKzE4LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUmVxdWlyZXNDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlBsdWdpbkxvYWRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRNZXRhRGF0YTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLlNzaENvbW1hbmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogCkBAIC0yNiw2ICsyNyw3IEBACiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIEBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5BRE1JTklTVFJBVEVfU0VSVkVSKQorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gInJlbW92ZSIsIGRlc2NyID0gIkRpc2FibGUgcGx1Z2lucyIpCiBmaW5hbCBjbGFzcyBQbHVnaW5SZW1vdmVDb21tYW5kIGV4dGVuZHMgU3NoQ29tbWFuZCB7CiAgIEBBcmd1bWVudChpbmRleCA9IDAsIG1ldGFWYXIgPSAiTkFNRSIsIHJlcXVpcmVkID0gdHJ1ZSwgdXNhZ2UgPSAicGx1Z2luIHRvIHJlbW92ZSIpCiAgIExpc3Q8U3RyaW5nPiBuYW1lczsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9RdWVyeS5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1F1ZXJ5LmphdmEKaW5kZXggNjM2ODBmOC4uMmQxNzg3NiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1F1ZXJ5LmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1F1ZXJ5LmphdmEKQEAgLTE1LDYgKzE1LDcgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5jb21tYW5kczsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5xdWVyeS5jaGFuZ2UuUXVlcnlQcm9jZXNzb3I7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIApAQCAtMjMsNiArMjQsNyBAQAogCiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJxdWVyeSIsIGRlc2NyID0gIlF1ZXJ5IHRoZSBjaGFuZ2UgZGF0YWJhc2UiKQogY2xhc3MgUXVlcnkgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgQEluamVjdAogICBwcml2YXRlIFF1ZXJ5UHJvY2Vzc29yIHByb2Nlc3NvcjsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9RdWVyeVNoZWxsLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUXVlcnlTaGVsbC5qYXZhCmluZGV4IDE4Y2U3N2YuLjE2MzBkMTEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9RdWVyeVNoZWxsLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1F1ZXJ5U2hlbGwuamF2YQpAQCAtNjMsOSArNjMsOCBAQAogCiAgIEBJbmplY3QKICAgUXVlcnlTaGVsbChmaW5hbCBTY2hlbWFGYWN0b3J5PFJldmlld0RiPiBkYkZhY3RvcnksCi0KLSAgQEFzc2lzdGVkIGZpbmFsIElucHV0U3RyZWFtIGluLCBAQXNzaXN0ZWQgZmluYWwgT3V0cHV0U3RyZWFtIG91dCkKLSAgICAgIHRocm93cyBVbnN1cHBvcnRlZEVuY29kaW5nRXhjZXB0aW9uIHsKKyAgICAgIEBBc3Npc3RlZCBmaW5hbCBJbnB1dFN0cmVhbSBpbiwgQEFzc2lzdGVkIGZpbmFsIE91dHB1dFN0cmVhbSBvdXQpCisgICAgICAgICAgdGhyb3dzIFVuc3VwcG9ydGVkRW5jb2RpbmdFeGNlcHRpb24gewogICAgIHRoaXMuZGJGYWN0b3J5ID0gZGJGYWN0b3J5OwogICAgIHRoaXMuaW4gPSBuZXcgQnVmZmVyZWRSZWFkZXIobmV3IElucHV0U3RyZWFtUmVhZGVyKGluLCAiVVRGLTgiKSk7CiAgICAgdGhpcy5vdXQgPSBuZXcgUHJpbnRXcml0ZXIobmV3IE91dHB1dFN0cmVhbVdyaXRlcihvdXQsICJVVEYtOCIpKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9SZWNlaXZlLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUmVjZWl2ZS5qYXZhCmluZGV4IGI0ZGU3NWIuLmUwZGQzOGYgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9SZWNlaXZlLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1JlY2VpdmUuamF2YQpAQCAtMjIsNiArMjIsNyBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuVHJhbnNmZXJDb25maWc7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5WaXNpYmxlUmVmRmlsdGVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQWJzdHJhY3RHaXRDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIAogaW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQuZXJyb3JzLlRvb0xhcmdlT2JqZWN0SW5QYWNrRXhjZXB0aW9uOwpAQCAtNDEsNiArNDIsNyBAQAogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKIC8qKiBSZWNlaXZlcyBjaGFuZ2UgdXBsb2FkIG92ZXIgU1NIIHVzaW5nIHRoZSBHaXQgcmVjZWl2ZS1wYWNrIHByb3RvY29sLiAqLworQENvbW1hbmRNZXRhRGF0YShuYW1lID0gInJlY2VpdmUtcGFjayIsIGRlc2NyID0gIlN0YW5kYXJkIEdpdCBzZXJ2ZXIgc2lkZSBjb21tYW5kIGZvciBjbGllbnQgc2lkZSBnaXQgcHVzaCIpCiBmaW5hbCBjbGFzcyBSZWNlaXZlIGV4dGVuZHMgQWJzdHJhY3RHaXRDb21tYW5kIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKFJlY2VpdmUuY2xhc3MpOwogCmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUmVuYW1lR3JvdXBDb21tYW5kLmphdmEgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUmVuYW1lR3JvdXBDb21tYW5kLmphdmEKaW5kZXggYjlhYmM5Mi4uZjNjMWJiMyAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1JlbmFtZUdyb3VwQ29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9SZW5hbWVHcm91cENvbW1hbmQuamF2YQpAQCAtMTgsMTIgKzE4LDE0IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5OYW1lQWxyZWFkeVVzZWRFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmVycm9ycy5Ob1N1Y2hHcm91cEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuYWNjb3VudC5QZXJmb3JtUmVuYW1lR3JvdXA7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogCiBpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLkFyZ3VtZW50OwogCitAQ29tbWFuZE1ldGFEYXRhKG5hbWUgPSAicmVuYW1lLWdyb3VwIiwgZGVzY3IgPSAiUmVuYW1lIGFuIGFjY291bnQgZ3JvdXAiKQogcHVibGljIGNsYXNzIFJlbmFtZUdyb3VwQ29tbWFuZCBleHRlbmRzIFNzaENvbW1hbmQgewogICBAQXJndW1lbnQoaW5kZXggPSAwLCByZXF1aXJlZCA9IHRydWUsIG1ldGFWYXIgPSAiR1JPVVAiLCB1c2FnZSA9ICJuYW1lIG9mIHRoZSBncm91cCB0byBiZSByZW5hbWVkIikKICAgcHJpdmF0ZSBTdHJpbmcgZ3JvdXBOYW1lOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Jldmlld0NvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9SZXZpZXdDb21tYW5kLmphdmEKaW5kZXggNWViYjZjNy4uNTc2OWEyMiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Jldmlld0NvbW1hbmQuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvUmV2aWV3Q29tbWFuZC5qYXZhCkBAIC0xNCwyNSArMTQsMzYgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLmNvbW1hbmRzOwogCi1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuQXBwcm92YWxUeXBlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmNvbW1vbi5kYXRhLkFwcHJvdmFsVHlwZXM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uYmFzZS5TcGxpdHRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5iYXNlLlN0cmluZ3M7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVMaXN0OworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTWFwczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5MYWJlbFR5cGU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLmRhdGEuTGFiZWxWYWx1ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdSZXN1bHQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFwcHJvdmFsQ2F0ZWdvcnk7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdSZXN1bHQuRXJyb3IuVHlwZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQXV0aEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuQmFkUmVxdWVzdEV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VDb25mbGljdEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUmV2SWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuQWJhbmRvbkNoYW5nZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkFiYW5kb247CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5DaGFuZ2VSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlBvc3RSZXZpZXc7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5SZXN0b3JlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuUmV2aXNpb25SZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlN1Ym1pdDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlZGV0YWlsLkRlbGV0ZURyYWZ0UGF0Y2hTZXQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZWRldGFpbC5QdWJsaXNoRHJhZnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZWRldGFpbC5SZXN0b3JlQ2hhbmdlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2VkZXRhaWwuU3VibWl0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLkVtYWlsRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5QdWJsaXNoQ29tbWVudHM7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BbGxQcm9qZWN0c05hbWU7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5JbnZhbGlkQ2hhbmdlT3BlcmF0aW9uRXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0Lk5vU3VjaENoYW5nZUV4Y2VwdGlvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hQcm9qZWN0RXhjZXB0aW9uOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDb250cm9sOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoQ29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC51dGlsLmNsaS5DbWRMaW5lUGFyc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CkBAIC00MCw3ICs1MSw2IEBACiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOwogCi1pbXBvcnQgb3JnLmVjbGlwc2UuamdpdC5lcnJvcnMuUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uOwogaW1wb3J0IG9yZy5rb2hzdWtlLmFyZ3M0ai5Bcmd1bWVudDsKIGltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouT3B0aW9uOwogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXI7CkBAIC00OCwxMSArNTgsMTIgQEAKIAogaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CiBpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKLWltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbnM7CiBpbXBvcnQgamF2YS51dGlsLkhhc2hTZXQ7CiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CitpbXBvcnQgamF2YS51dGlsLk1hcDsKIGltcG9ydCBqYXZhLnV0aWwuU2V0OwogCitAQ29tbWFuZE1ldGFEYXRhKG5hbWUgPSAicmV2aWV3IiwgZGVzY3IgPSAiVmVyaWZ5LCBhcHByb3ZlIGFuZC9vciBzdWJtaXQgb25lIG9yIG1vcmUgcGF0Y2ggc2V0cyIpCiBwdWJsaWMgY2xhc3MgUmV2aWV3Q29tbWFuZCBleHRlbmRzIFNzaENvbW1hbmQgewogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMb2dnZXIgbG9nID0KICAgICAgIExvZ2dlckZhY3RvcnkuZ2V0TG9nZ2VyKFJldmlld0NvbW1hbmQuY2xhc3MpOwpAQCAtNjYsMTMgKzc3LDEyIEBACiAgICAgcmV0dXJuIHBhcnNlcjsKICAgfQogCi0gIHByaXZhdGUgZmluYWwgU2V0PFBhdGNoU2V0LklkPiBwYXRjaFNldElkcyA9IG5ldyBIYXNoU2V0PFBhdGNoU2V0LklkPigpOworICBwcml2YXRlIGZpbmFsIFNldDxQYXRjaFNldD4gcGF0Y2hTZXRzID0gbmV3IEhhc2hTZXQ8UGF0Y2hTZXQ+KCk7CiAKLSAgQEFyZ3VtZW50KGluZGV4ID0gMCwgcmVxdWlyZWQgPSB0cnVlLCBtdWx0aVZhbHVlZCA9IHRydWUsIG1ldGFWYXIgPSAie0NPTU1JVCB8IENIQU5HRSxQQVRDSFNFVH0iLAotICAgICAgdXNhZ2UgPSAibGlzdCBvZiBjb21taXRzIG9yIHBhdGNoIHNldHMgdG8gcmV2aWV3IikKKyAgQEFyZ3VtZW50KGluZGV4ID0gMCwgcmVxdWlyZWQgPSB0cnVlLCBtdWx0aVZhbHVlZCA9IHRydWUsIG1ldGFWYXIgPSAie0NPTU1JVCB8IENIQU5HRSxQQVRDSFNFVH0iLCB1c2FnZSA9ICJsaXN0IG9mIGNvbW1pdHMgb3IgcGF0Y2ggc2V0cyB0byByZXZpZXciKQogICB2b2lkIGFkZFBhdGNoU2V0SWQoZmluYWwgU3RyaW5nIHRva2VuKSB7CiAgICAgdHJ5IHsKLSAgICAgIHBhdGNoU2V0SWRzLmFkZEFsbChwYXJzZVBhdGNoU2V0SWQodG9rZW4pKTsKKyAgICAgIHBhdGNoU2V0cy5hZGQocGFyc2VQYXRjaFNldCh0b2tlbikpOwogICAgIH0gY2F0Y2ggKFVubG9nZ2VkRmFpbHVyZSBlKSB7CiAgICAgICB0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKGUuZ2V0TWVzc2FnZSgpLCBlKTsKICAgICB9IGNhdGNoIChPcm1FeGNlcHRpb24gZSkgewpAQCAtMTA1LDMxICsxMTUsNTQgQEAKICAgQE9wdGlvbihuYW1lID0gIi0tZGVsZXRlIiwgdXNhZ2UgPSAiZGVsZXRlIHRoZSBzcGVjaWZpZWQgZHJhZnQgcGF0Y2ggc2V0KHMpIikKICAgcHJpdmF0ZSBib29sZWFuIGRlbGV0ZURyYWZ0UGF0Y2hTZXQ7CiAKLSAgQEluamVjdAotICBwcml2YXRlIFJldmlld0RiIGRiOworICBAT3B0aW9uKG5hbWUgPSAiLS1sYWJlbCIsIGFsaWFzZXMgPSAiLWwiLCB1c2FnZSA9ICJjdXN0b20gbGFiZWwocykgdG8gYXNzaWduIiwgbWV0YVZhciA9ICJMQUJFTD1WQUxVRSIpCisgIHZvaWQgYWRkTGFiZWwoZmluYWwgU3RyaW5nIHRva2VuKSB7CisgICAgTGlzdDxTdHJpbmc+IHBhcnRzID0gSW1tdXRhYmxlTGlzdC5jb3B5T2YoU3BsaXR0ZXIub24oJz0nKS5zcGxpdCh0b2tlbikpOworICAgIGlmIChwYXJ0cy5zaXplKCkgIT0gMikgeworICAgICAgdGhyb3cgbmV3IElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbigiaW52YWxpZCBjdXN0b20gbGFiZWwgIiArIHRva2VuKTsKKyAgICB9CisgICAgc2hvcnQgdmFsdWU7CisgICAgdHJ5IHsKKyAgICAgIHZhbHVlID0gU2hvcnQucGFyc2VTaG9ydChwYXJ0cy5nZXQoMSkpOworICAgIH0gY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCJpbnZhbGlkIGN1c3RvbSBsYWJlbCB2YWx1ZSAiCisgICAgICAgICAgKyBwYXJ0cy5nZXQoMSkpOworICAgIH0KKyAgICBjdXN0b21MYWJlbHMucHV0KHBhcnRzLmdldCgwKSwgdmFsdWUpOworICB9CiAKICAgQEluamVjdAotICBwcml2YXRlIEFwcHJvdmFsVHlwZXMgYXBwcm92YWxUeXBlczsKKyAgcHJpdmF0ZSBSZXZpZXdEYiBkYjsKIAogICBASW5qZWN0CiAgIHByaXZhdGUgRGVsZXRlRHJhZnRQYXRjaFNldC5GYWN0b3J5IGRlbGV0ZURyYWZ0UGF0Y2hTZXRGYWN0b3J5OwogCiAgIEBJbmplY3QKLSAgcHJpdmF0ZSBQcm92aWRlcjxBYmFuZG9uQ2hhbmdlPiBhYmFuZG9uQ2hhbmdlUHJvdmlkZXI7CisgIHByaXZhdGUgUHJvamVjdENvbnRyb2wuRmFjdG9yeSBwcm9qZWN0Q29udHJvbEZhY3Rvcnk7CiAKICAgQEluamVjdAotICBwcml2YXRlIFB1Ymxpc2hDb21tZW50cy5GYWN0b3J5IHB1Ymxpc2hDb21tZW50c0ZhY3Rvcnk7CisgIHByaXZhdGUgQWxsUHJvamVjdHNOYW1lIGFsbFByb2plY3RzOworCisgIEBJbmplY3QKKyAgcHJpdmF0ZSBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CisKKyAgQEluamVjdAorICBwcml2YXRlIFByb3ZpZGVyPEFiYW5kb24+IGFiYW5kb25Qcm92aWRlcjsKKworICBASW5qZWN0CisgIHByaXZhdGUgUHJvdmlkZXI8UG9zdFJldmlldz4gcmV2aWV3UHJvdmlkZXI7CiAKICAgQEluamVjdAogICBwcml2YXRlIFB1Ymxpc2hEcmFmdC5GYWN0b3J5IHB1Ymxpc2hEcmFmdEZhY3Rvcnk7CiAKICAgQEluamVjdAotICBwcml2YXRlIFByb3ZpZGVyPFJlc3RvcmVDaGFuZ2U+IHJlc3RvcmVDaGFuZ2VQcm92aWRlcjsKKyAgcHJpdmF0ZSBQcm92aWRlcjxSZXN0b3JlPiByZXN0b3JlUHJvdmlkZXI7CiAKICAgQEluamVjdAotICBwcml2YXRlIFN1Ym1pdC5GYWN0b3J5IHN1Ym1pdEZhY3Rvcnk7CisgIHByaXZhdGUgUHJvdmlkZXI8U3VibWl0PiBzdWJtaXRQcm92aWRlcjsKIAogICBwcml2YXRlIExpc3Q8QXBwcm92ZU9wdGlvbj4gb3B0aW9uTGlzdDsKKyAgcHJpdmF0ZSBNYXA8U3RyaW5nLCBTaG9ydD4gY3VzdG9tTGFiZWxzOwogCiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBydW4oKSB0aHJvd3MgVW5sb2dnZWRGYWlsdXJlIHsKQEAgLTE2MCwyMCArMTkzLDIwIEBACiAgICAgfQogCiAgICAgYm9vbGVhbiBvayA9IHRydWU7Ci0gICAgZm9yIChmaW5hbCBQYXRjaFNldC5JZCBwYXRjaFNldElkIDogcGF0Y2hTZXRJZHMpIHsKKyAgICBmb3IgKGZpbmFsIFBhdGNoU2V0IHBhdGNoU2V0IDogcGF0Y2hTZXRzKSB7CiAgICAgICB0cnkgewotICAgICAgICBhcHByb3ZlT25lKHBhdGNoU2V0SWQpOworICAgICAgICBhcHByb3ZlT25lKHBhdGNoU2V0KTsKICAgICAgIH0gY2F0Y2ggKFVubG9nZ2VkRmFpbHVyZSBlKSB7CiAgICAgICAgIG9rID0gZmFsc2U7CiAgICAgICAgIHdyaXRlRXJyb3IoImVycm9yOiAiICsgZS5nZXRNZXNzYWdlKCkgKyAiXG4iKTsKICAgICAgIH0gY2F0Y2ggKE5vU3VjaENoYW5nZUV4Y2VwdGlvbiBlKSB7CiAgICAgICAgIG9rID0gZmFsc2U7Ci0gICAgICAgIHdyaXRlRXJyb3IoIm5vIHN1Y2ggY2hhbmdlICIgKyBwYXRjaFNldElkLmdldFBhcmVudEtleSgpLmdldCgpKTsKKyAgICAgICAgd3JpdGVFcnJvcigibm8gc3VjaCBjaGFuZ2UgIiArIHBhdGNoU2V0LmdldElkKCkuZ2V0UGFyZW50S2V5KCkuZ2V0KCkpOwogICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKICAgICAgICAgb2sgPSBmYWxzZTsKICAgICAgICAgd3JpdGVFcnJvcigiZmF0YWw6IGludGVybmFsIHNlcnZlciBlcnJvciB3aGlsZSBhcHByb3ZpbmcgIgotICAgICAgICAgICAgKyBwYXRjaFNldElkICsgIlxuIik7Ci0gICAgICAgIGxvZy5lcnJvcigiaW50ZXJuYWwgZXJyb3Igd2hpbGUgYXBwcm92aW5nICIgKyBwYXRjaFNldElkLCBlKTsKKyAgICAgICAgICAgICsgcGF0Y2hTZXQuZ2V0SWQoKSArICJcbiIpOworICAgICAgICBsb2cuZXJyb3IoImludGVybmFsIGVycm9yIHdoaWxlIGFwcHJvdmluZyAiICsgcGF0Y2hTZXQuZ2V0SWQoKSwgZSk7CiAgICAgICB9CiAgICAgfQogCkBAIC0xODMsNTQgKzIxNiw5NyBAQAogICAgIH0KICAgfQogCi0gIHByaXZhdGUgdm9pZCBhcHByb3ZlT25lKGZpbmFsIFBhdGNoU2V0LklkIHBhdGNoU2V0SWQpCi0gICAgICB0aHJvd3MgTm9TdWNoQ2hhbmdlRXhjZXB0aW9uLCBPcm1FeGNlcHRpb24sIEVtYWlsRXhjZXB0aW9uLCBGYWlsdXJlLAotICAgICAgUmVwb3NpdG9yeU5vdEZvdW5kRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbiB7CisgIHByaXZhdGUgdm9pZCBhcHBseVJldmlldyhmaW5hbCBDaGFuZ2VDb250cm9sIGN0bCwgZmluYWwgUGF0Y2hTZXQgcGF0Y2hTZXQsCisgICAgICBmaW5hbCBQb3N0UmV2aWV3LklucHV0IHJldmlldykgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgcmV2aWV3UHJvdmlkZXIuZ2V0KCkuYXBwbHkobmV3IFJldmlzaW9uUmVzb3VyY2UoCisgICAgICAgIG5ldyBDaGFuZ2VSZXNvdXJjZShjdGwpLCBwYXRjaFNldCksIHJldmlldyk7CisgIH0KKworICBwcml2YXRlIHZvaWQgYXBwcm92ZU9uZShmaW5hbCBQYXRjaFNldCBwYXRjaFNldCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAKICAgICBpZiAoY2hhbmdlQ29tbWVudCA9PSBudWxsKSB7CiAgICAgICBjaGFuZ2VDb21tZW50ID0gIiI7CiAgICAgfQogCi0gICAgU2V0PEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZD4gYXBzID0gbmV3IEhhc2hTZXQ8QXBwcm92YWxDYXRlZ29yeVZhbHVlLklkPigpOworICAgIFBvc3RSZXZpZXcuSW5wdXQgcmV2aWV3ID0gbmV3IFBvc3RSZXZpZXcuSW5wdXQoKTsKKyAgICByZXZpZXcubWVzc2FnZSA9IFN0cmluZ3MuZW1wdHlUb051bGwoY2hhbmdlQ29tbWVudCk7CisgICAgcmV2aWV3LmxhYmVscyA9IE1hcHMubmV3VHJlZU1hcCgpOworICAgIHJldmlldy5kcmFmdHMgPSBQb3N0UmV2aWV3LkRyYWZ0SGFuZGxpbmcuUFVCTElTSDsKKyAgICByZXZpZXcuc3RyaWN0TGFiZWxzID0gZmFsc2U7CiAgICAgZm9yIChBcHByb3ZlT3B0aW9uIGFvIDogb3B0aW9uTGlzdCkgewogICAgICAgU2hvcnQgdiA9IGFvLnZhbHVlKCk7CiAgICAgICBpZiAodiAhPSBudWxsKSB7Ci0gICAgICAgIGFwcy5hZGQobmV3IEFwcHJvdmFsQ2F0ZWdvcnlWYWx1ZS5JZChhby5nZXRDYXRlZ29yeUlkKCksIHYpKTsKKyAgICAgICAgcmV2aWV3LmxhYmVscy5wdXQoYW8uZ2V0TGFiZWxOYW1lKCksIHYpOwogICAgICAgfQogICAgIH0KKyAgICByZXZpZXcubGFiZWxzLnB1dEFsbChjdXN0b21MYWJlbHMpOworCisgICAgLy8gSWYgcmV2aWV3IGxhYmVscyBhcmUgYmVpbmcgYXBwbGllZCwgdGhlIGNvbW1lbnQgd2lsbCBiZSBpbmNsdWRlZAorICAgIC8vIG9uIHRoZSByZXZpZXcgbm90ZS4gV2UgZG9uJ3QgbmVlZCB0byBhZGQgaXQgYWdhaW4gb24gdGhlIGFiYW5kb24KKyAgICAvLyBvciByZXN0b3JlIGNvbW1lbnQuCisgICAgaWYgKCFyZXZpZXcubGFiZWxzLmlzRW1wdHkoKSAmJiAoYWJhbmRvbkNoYW5nZSB8fCByZXN0b3JlQ2hhbmdlKSkgeworICAgICAgY2hhbmdlQ29tbWVudCA9IG51bGw7CisgICAgfQogCiAgICAgdHJ5IHsKLSAgICAgIHB1Ymxpc2hDb21tZW50c0ZhY3RvcnkuY3JlYXRlKHBhdGNoU2V0SWQsIGNoYW5nZUNvbW1lbnQsIGFwcywgZm9yY2VNZXNzYWdlKS5jYWxsKCk7CisgICAgICBDaGFuZ2VDb250cm9sIGN0bCA9CisgICAgICAgICAgY2hhbmdlQ29udHJvbEZhY3RvcnkuY29udHJvbEZvcihwYXRjaFNldC5nZXRJZCgpLmdldFBhcmVudEtleSgpKTsKIAogICAgICAgaWYgKGFiYW5kb25DaGFuZ2UpIHsKLSAgICAgICAgZmluYWwgQWJhbmRvbkNoYW5nZSBhYmFuZG9uQ2hhbmdlID0gYWJhbmRvbkNoYW5nZVByb3ZpZGVyLmdldCgpOwotICAgICAgICBhYmFuZG9uQ2hhbmdlLnNldENoYW5nZUlkKHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCkpOwotICAgICAgICBhYmFuZG9uQ2hhbmdlLnNldE1lc3NhZ2UoY2hhbmdlQ29tbWVudCk7Ci0gICAgICAgIGZpbmFsIFJldmlld1Jlc3VsdCByZXN1bHQgPSBhYmFuZG9uQ2hhbmdlLmNhbGwoKTsKLSAgICAgICAgaGFuZGxlUmV2aWV3UmVzdWx0RXJyb3JzKHJlc3VsdCk7CisgICAgICAgIGZpbmFsIEFiYW5kb24gYWJhbmRvbiA9IGFiYW5kb25Qcm92aWRlci5nZXQoKTsKKyAgICAgICAgZmluYWwgQWJhbmRvbi5JbnB1dCBpbnB1dCA9IG5ldyBBYmFuZG9uLklucHV0KCk7CisgICAgICAgIGlucHV0Lm1lc3NhZ2UgPSBjaGFuZ2VDb21tZW50OworICAgICAgICBhcHBseVJldmlldyhjdGwsIHBhdGNoU2V0LCByZXZpZXcpOworICAgICAgICB0cnkgeworICAgICAgICAgIGFiYW5kb24uYXBwbHkobmV3IENoYW5nZVJlc291cmNlKGN0bCksIGlucHV0KTsKKyAgICAgICAgfSBjYXRjaCAoQXV0aEV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgd3JpdGVFcnJvcigiZXJyb3I6ICIgKyBwYXJzZUVycm9yKFR5cGUuQUJBTkRPTl9OT1RfUEVSTUlUVEVEKSArICJcbiIpOworICAgICAgICB9IGNhdGNoIChSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICB3cml0ZUVycm9yKCJlcnJvcjogIiArIHBhcnNlRXJyb3IoVHlwZS5DSEFOR0VfSVNfQ0xPU0VEKSArICJcbiIpOworICAgICAgICB9CiAgICAgICB9IGVsc2UgaWYgKHJlc3RvcmVDaGFuZ2UpIHsKLSAgICAgICAgZmluYWwgUmVzdG9yZUNoYW5nZSByZXN0b3JlQ2hhbmdlID0gcmVzdG9yZUNoYW5nZVByb3ZpZGVyLmdldCgpOwotICAgICAgICByZXN0b3JlQ2hhbmdlLnNldENoYW5nZUlkKHBhdGNoU2V0SWQuZ2V0UGFyZW50S2V5KCkpOwotICAgICAgICByZXN0b3JlQ2hhbmdlLnNldE1lc3NhZ2UoY2hhbmdlQ29tbWVudCk7Ci0gICAgICAgIGZpbmFsIFJldmlld1Jlc3VsdCByZXN1bHQgPSByZXN0b3JlQ2hhbmdlLmNhbGwoKTsKLSAgICAgICAgaGFuZGxlUmV2aWV3UmVzdWx0RXJyb3JzKHJlc3VsdCk7CisgICAgICAgIGZpbmFsIFJlc3RvcmUgcmVzdG9yZSA9IHJlc3RvcmVQcm92aWRlci5nZXQoKTsKKyAgICAgICAgZmluYWwgUmVzdG9yZS5JbnB1dCBpbnB1dCA9IG5ldyBSZXN0b3JlLklucHV0KCk7CisgICAgICAgIGlucHV0Lm1lc3NhZ2UgPSBjaGFuZ2VDb21tZW50OworICAgICAgICB0cnkgeworICAgICAgICAgIHJlc3RvcmUuYXBwbHkobmV3IENoYW5nZVJlc291cmNlKGN0bCksIGlucHV0KTsKKyAgICAgICAgICBhcHBseVJldmlldyhjdGwsIHBhdGNoU2V0LCByZXZpZXcpOworICAgICAgICB9IGNhdGNoIChBdXRoRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICB3cml0ZUVycm9yKCJlcnJvcjogIiArIHBhcnNlRXJyb3IoVHlwZS5SRVNUT1JFX05PVF9QRVJNSVRURUQpICsgIlxuIik7CisgICAgICAgIH0gY2F0Y2ggKFJlc291cmNlQ29uZmxpY3RFeGNlcHRpb24gZSkgeworICAgICAgICAgIHdyaXRlRXJyb3IoImVycm9yOiAiICsgcGFyc2VFcnJvcihUeXBlLkNIQU5HRV9OT1RfQUJBTkRPTkVEKSArICJcbiIpOworICAgICAgICB9CisgICAgICB9IGVsc2UgeworICAgICAgICBhcHBseVJldmlldyhjdGwsIHBhdGNoU2V0LCByZXZpZXcpOwogICAgICAgfQorCiAgICAgICBpZiAoc3VibWl0Q2hhbmdlKSB7Ci0gICAgICAgIGZpbmFsIFJldmlld1Jlc3VsdCByZXN1bHQgPSBzdWJtaXRGYWN0b3J5LmNyZWF0ZShwYXRjaFNldElkKS5jYWxsKCk7Ci0gICAgICAgIGhhbmRsZVJldmlld1Jlc3VsdEVycm9ycyhyZXN1bHQpOworICAgICAgICBTdWJtaXQgc3VibWl0ID0gc3VibWl0UHJvdmlkZXIuZ2V0KCk7CisgICAgICAgIFN1Ym1pdC5JbnB1dCBpbnB1dCA9IG5ldyBTdWJtaXQuSW5wdXQoKTsKKyAgICAgICAgaW5wdXQud2FpdEZvck1lcmdlID0gdHJ1ZTsKKyAgICAgICAgc3VibWl0LmFwcGx5KG5ldyBSZXZpc2lvblJlc291cmNlKAorICAgICAgICAgICAgbmV3IENoYW5nZVJlc291cmNlKGN0bCksIHBhdGNoU2V0KSwKKyAgICAgICAgICBpbnB1dCk7CiAgICAgICB9CiAgICAgfSBjYXRjaCAoSW52YWxpZENoYW5nZU9wZXJhdGlvbkV4Y2VwdGlvbiBlKSB7CiAgICAgICB0aHJvdyBlcnJvcihlLmdldE1lc3NhZ2UoKSk7CiAgICAgfSBjYXRjaCAoSWxsZWdhbFN0YXRlRXhjZXB0aW9uIGUpIHsKICAgICAgIHRocm93IGVycm9yKGUuZ2V0TWVzc2FnZSgpKTsKKyAgICB9IGNhdGNoIChBdXRoRXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IGVycm9yKGUuZ2V0TWVzc2FnZSgpKTsKKyAgICB9IGNhdGNoIChCYWRSZXF1ZXN0RXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IGVycm9yKGUuZ2V0TWVzc2FnZSgpKTsKKyAgICB9IGNhdGNoIChSZXNvdXJjZUNvbmZsaWN0RXhjZXB0aW9uIGUpIHsKKyAgICAgIHRocm93IGVycm9yKGUuZ2V0TWVzc2FnZSgpKTsKICAgICB9CiAKICAgICBpZiAocHVibGlzaFBhdGNoU2V0KSB7Ci0gICAgICBmaW5hbCBSZXZpZXdSZXN1bHQgcmVzdWx0ID0gcHVibGlzaERyYWZ0RmFjdG9yeS5jcmVhdGUocGF0Y2hTZXRJZCkuY2FsbCgpOworICAgICAgZmluYWwgUmV2aWV3UmVzdWx0IHJlc3VsdCA9CisgICAgICAgICAgcHVibGlzaERyYWZ0RmFjdG9yeS5jcmVhdGUocGF0Y2hTZXQuZ2V0SWQoKSkuY2FsbCgpOwogICAgICAgaGFuZGxlUmV2aWV3UmVzdWx0RXJyb3JzKHJlc3VsdCk7CiAgICAgfSBlbHNlIGlmIChkZWxldGVEcmFmdFBhdGNoU2V0KSB7CiAgICAgICBmaW5hbCBSZXZpZXdSZXN1bHQgcmVzdWx0ID0KLSAgICAgICAgICBkZWxldGVEcmFmdFBhdGNoU2V0RmFjdG9yeS5jcmVhdGUocGF0Y2hTZXRJZCkuY2FsbCgpOworICAgICAgICAgIGRlbGV0ZURyYWZ0UGF0Y2hTZXRGYWN0b3J5LmNyZWF0ZShwYXRjaFNldC5nZXRJZCgpKS5jYWxsKCk7CiAgICAgICBoYW5kbGVSZXZpZXdSZXN1bHRFcnJvcnMocmVzdWx0KTsKICAgICB9CiAgIH0KQEAgLTIzOCw0NiArMzE0LDcgQEAKICAgcHJpdmF0ZSB2b2lkIGhhbmRsZVJldmlld1Jlc3VsdEVycm9ycyhmaW5hbCBSZXZpZXdSZXN1bHQgcmVzdWx0KSB7CiAgICAgZm9yIChSZXZpZXdSZXN1bHQuRXJyb3IgcmVzdWx0RXJyb3IgOiByZXN1bHQuZ2V0RXJyb3JzKCkpIHsKICAgICAgIFN0cmluZyBlcnJNc2cgPSAiZXJyb3I6IChjaGFuZ2UgIiArIHJlc3VsdC5nZXRDaGFuZ2VJZCgpICsgIikgIjsKLSAgICAgIHN3aXRjaCAocmVzdWx0RXJyb3IuZ2V0VHlwZSgpKSB7Ci0gICAgICAgIGNhc2UgQUJBTkRPTl9OT1RfUEVSTUlUVEVEOgotICAgICAgICAgIGVyck1zZyArPSAibm90IHBlcm1pdHRlZCB0byBhYmFuZG9uIGNoYW5nZSI7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgUkVTVE9SRV9OT1RfUEVSTUlUVEVEOgotICAgICAgICAgIGVyck1zZyArPSAibm90IHBlcm1pdHRlZCB0byByZXN0b3JlIGNoYW5nZSI7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgU1VCTUlUX05PVF9QRVJNSVRURUQ6Ci0gICAgICAgICAgZXJyTXNnICs9ICJub3QgcGVybWl0dGVkIHRvIHN1Ym1pdCBjaGFuZ2UiOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNVQk1JVF9OT1RfUkVBRFk6Ci0gICAgICAgICAgZXJyTXNnICs9ICJhcHByb3ZhbHMgb3IgZGVwZW5kZW5jaWVzIGxhY2tpbmciOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIENIQU5HRV9JU19DTE9TRUQ6Ci0gICAgICAgICAgZXJyTXNnICs9ICJjaGFuZ2UgaXMgY2xvc2VkIjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBDSEFOR0VfTk9UX0FCQU5ET05FRDoKLSAgICAgICAgICBlcnJNc2cgKz0gImNoYW5nZSBpcyBub3QgYWJhbmRvbmVkIjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBQVUJMSVNIX05PVF9QRVJNSVRURUQ6Ci0gICAgICAgICAgZXJyTXNnICs9ICJub3QgcGVybWl0dGVkIHRvIHB1Ymxpc2ggY2hhbmdlIjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBERUxFVEVfTk9UX1BFUk1JVFRFRDoKLSAgICAgICAgICBlcnJNc2cgKz0gIm5vdCBwZXJtaXR0ZWQgdG8gZGVsZXRlIGNoYW5nZS9wYXRjaCBzZXQiOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFJVTEVfRVJST1I6Ci0gICAgICAgICAgZXJyTXNnICs9ICJydWxlIGVycm9yIjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBOT1RfQV9EUkFGVDoKLSAgICAgICAgICBlcnJNc2cgKz0gImNoYW5nZS9wYXRjaCBzZXQgaXMgbm90IGEgZHJhZnQiOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIEdJVF9FUlJPUjoKLSAgICAgICAgICBlcnJNc2cgKz0gImVycm9yIHdyaXRpbmcgY2hhbmdlIHRvIGdpdCByZXBvc2l0b3J5IjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBERVNUX0JSQU5DSF9OT1RfRk9VTkQ6Ci0gICAgICAgICAgZXJyTXNnICs9ICJkZXN0aW5hdGlvbiBicmFuY2ggbm90IGZvdW5kIjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICBlcnJNc2cgKz0gImZhaWx1cmUgaW4gcmV2aWV3IjsKLSAgICAgIH0KKyAgICAgIGVyck1zZyArPSBwYXJzZUVycm9yKHJlc3VsdEVycm9yLmdldFR5cGUoKSk7CiAgICAgICBpZiAocmVzdWx0RXJyb3IuZ2V0TWVzc2FnZSgpICE9IG51bGwpIHsKICAgICAgICAgZXJyTXNnICs9ICI6ICIgKyByZXN1bHRFcnJvci5nZXRNZXNzYWdlKCk7CiAgICAgICB9CkBAIC0yODUsNyArMzIyLDM4IEBACiAgICAgfQogICB9CiAKLSAgcHJpdmF0ZSBTZXQ8UGF0Y2hTZXQuSWQ+IHBhcnNlUGF0Y2hTZXRJZChmaW5hbCBTdHJpbmcgcGF0Y2hJZGVudGl0eSkKKyAgcHJpdmF0ZSBTdHJpbmcgcGFyc2VFcnJvcihUeXBlIHR5cGUpIHsKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICAgIGNhc2UgQUJBTkRPTl9OT1RfUEVSTUlUVEVEOgorICAgICAgICByZXR1cm4gIm5vdCBwZXJtaXR0ZWQgdG8gYWJhbmRvbiBjaGFuZ2UiOworICAgICAgY2FzZSBSRVNUT1JFX05PVF9QRVJNSVRURUQ6CisgICAgICAgIHJldHVybiAibm90IHBlcm1pdHRlZCB0byByZXN0b3JlIGNoYW5nZSI7CisgICAgICBjYXNlIFNVQk1JVF9OT1RfUEVSTUlUVEVEOgorICAgICAgICByZXR1cm4gIm5vdCBwZXJtaXR0ZWQgdG8gc3VibWl0IGNoYW5nZSI7CisgICAgICBjYXNlIFNVQk1JVF9OT1RfUkVBRFk6CisgICAgICAgIHJldHVybiAiYXBwcm92YWxzIG9yIGRlcGVuZGVuY2llcyBsYWNraW5nIjsKKyAgICAgIGNhc2UgQ0hBTkdFX0lTX0NMT1NFRDoKKyAgICAgICAgcmV0dXJuICJjaGFuZ2UgaXMgY2xvc2VkIjsKKyAgICAgIGNhc2UgQ0hBTkdFX05PVF9BQkFORE9ORUQ6CisgICAgICAgIHJldHVybiAiY2hhbmdlIGlzIG5vdCBhYmFuZG9uZWQiOworICAgICAgY2FzZSBQVUJMSVNIX05PVF9QRVJNSVRURUQ6CisgICAgICAgIHJldHVybiAibm90IHBlcm1pdHRlZCB0byBwdWJsaXNoIGNoYW5nZSI7CisgICAgICBjYXNlIERFTEVURV9OT1RfUEVSTUlUVEVEOgorICAgICAgICByZXR1cm4gIm5vdCBwZXJtaXR0ZWQgdG8gZGVsZXRlIGNoYW5nZS9wYXRjaCBzZXQiOworICAgICAgY2FzZSBSVUxFX0VSUk9SOgorICAgICAgICByZXR1cm4gInJ1bGUgZXJyb3IiOworICAgICAgY2FzZSBOT1RfQV9EUkFGVDoKKyAgICAgICAgcmV0dXJuICJjaGFuZ2UvcGF0Y2ggc2V0IGlzIG5vdCBhIGRyYWZ0IjsKKyAgICAgIGNhc2UgR0lUX0VSUk9SOgorICAgICAgICByZXR1cm4gImVycm9yIHdyaXRpbmcgY2hhbmdlIHRvIGdpdCByZXBvc2l0b3J5IjsKKyAgICAgIGNhc2UgREVTVF9CUkFOQ0hfTk9UX0ZPVU5EOgorICAgICAgICByZXR1cm4gImRlc3RpbmF0aW9uIGJyYW5jaCBub3QgZm91bmQiOworICAgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuICJmYWlsdXJlIGluIHJldmlldyI7CisgICAgfQorICB9CisKKyAgcHJpdmF0ZSBQYXRjaFNldCBwYXJzZVBhdGNoU2V0KGZpbmFsIFN0cmluZyBwYXRjaElkZW50aXR5KQogICAgICAgdGhyb3dzIFVubG9nZ2VkRmFpbHVyZSwgT3JtRXhjZXB0aW9uIHsKICAgICAvLyBCeSBjb21taXQ/CiAgICAgLy8KQEAgLTI5OCwxNyArMzY2LDE3IEBACiAgICAgICAgIHBhdGNoZXMgPSBkYi5wYXRjaFNldHMoKS5ieVJldmlzaW9uUmFuZ2UoaWQsIGlkLm1heCgpKTsKICAgICAgIH0KIAotICAgICAgZmluYWwgU2V0PFBhdGNoU2V0LklkPiBtYXRjaGVzID0gbmV3IEhhc2hTZXQ8UGF0Y2hTZXQuSWQ+KCk7CisgICAgICBmaW5hbCBTZXQ8UGF0Y2hTZXQ+IG1hdGNoZXMgPSBuZXcgSGFzaFNldDxQYXRjaFNldD4oKTsKICAgICAgIGZvciAoZmluYWwgUGF0Y2hTZXQgcHMgOiBwYXRjaGVzKSB7CiAgICAgICAgIGZpbmFsIENoYW5nZSBjaGFuZ2UgPSBkYi5jaGFuZ2VzKCkuZ2V0KHBzLmdldElkKCkuZ2V0UGFyZW50S2V5KCkpOwogICAgICAgICBpZiAoaW5Qcm9qZWN0KGNoYW5nZSkpIHsKLSAgICAgICAgICBtYXRjaGVzLmFkZChwcy5nZXRJZCgpKTsKKyAgICAgICAgICBtYXRjaGVzLmFkZChwcyk7CiAgICAgICAgIH0KICAgICAgIH0KIAogICAgICAgc3dpdGNoIChtYXRjaGVzLnNpemUoKSkgewogICAgICAgICBjYXNlIDE6Ci0gICAgICAgICAgcmV0dXJuIG1hdGNoZXM7CisgICAgICAgICAgcmV0dXJuIG1hdGNoZXMuaXRlcmF0b3IoKS5uZXh0KCk7CiAgICAgICAgIGNhc2UgMDoKICAgICAgICAgICB0aHJvdyBlcnJvcigiXCIiICsgcGF0Y2hJZGVudGl0eSArICJcIiBubyBzdWNoIHBhdGNoIHNldCIpOwogICAgICAgICBkZWZhdWx0OgpAQCAtMzI1LDcgKzM5Myw4IEBACiAgICAgICB9IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gZSkgewogICAgICAgICB0aHJvdyBlcnJvcigiXCIiICsgcGF0Y2hJZGVudGl0eSArICJcIiBpcyBub3QgYSB2YWxpZCBwYXRjaCBzZXQiKTsKICAgICAgIH0KLSAgICAgIGlmIChkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCkgPT0gbnVsbCkgeworICAgICAgZmluYWwgUGF0Y2hTZXQgcGF0Y2hTZXQgPSBkYi5wYXRjaFNldHMoKS5nZXQocGF0Y2hTZXRJZCk7CisgICAgICBpZiAocGF0Y2hTZXQgPT0gbnVsbCkgewogICAgICAgICB0aHJvdyBlcnJvcigiXCIiICsgcGF0Y2hJZGVudGl0eSArICJcIiBubyBzdWNoIHBhdGNoIHNldCIpOwogICAgICAgfQogICAgICAgaWYgKHByb2plY3RDb250cm9sICE9IG51bGwpIHsKQEAgLTMzNSw3ICs0MDQsNyBAQAogICAgICAgICAgICAgICArIHByb2plY3RDb250cm9sLmdldFByb2plY3QoKS5nZXROYW1lKCkpOwogICAgICAgICB9CiAgICAgICB9Ci0gICAgICByZXR1cm4gQ29sbGVjdGlvbnMuc2luZ2xldG9uKHBhdGNoU2V0SWQpOworICAgICAgcmV0dXJuIHBhdGNoU2V0OwogICAgIH0KIAogICAgIHRocm93IGVycm9yKCJcIiIgKyBwYXRjaElkZW50aXR5ICsgIlwiIGlzIG5vdCBhIHZhbGlkIHBhdGNoIHNldCIpOwpAQCAtMzUyLDE4ICs0MjEsMjQgQEAKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIHBhcnNlQ29tbWFuZExpbmUoKSB0aHJvd3MgVW5sb2dnZWRGYWlsdXJlIHsKICAgICBvcHRpb25MaXN0ID0gbmV3IEFycmF5TGlzdDxBcHByb3ZlT3B0aW9uPigpOworICAgIGN1c3RvbUxhYmVscyA9IE1hcHMubmV3SGFzaE1hcCgpOwogCi0gICAgZm9yIChBcHByb3ZhbFR5cGUgdHlwZSA6IGFwcHJvdmFsVHlwZXMuZ2V0QXBwcm92YWxUeXBlcygpKSB7CisgICAgUHJvamVjdENvbnRyb2wgYWxsUHJvamVjdHNDb250cm9sOworICAgIHRyeSB7CisgICAgICBhbGxQcm9qZWN0c0NvbnRyb2wgPSBwcm9qZWN0Q29udHJvbEZhY3RvcnkuY29udHJvbEZvcihhbGxQcm9qZWN0cyk7CisgICAgfSBjYXRjaCAoTm9TdWNoUHJvamVjdEV4Y2VwdGlvbiBlKSB7CisgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKCJtaXNzaW5nICIgKyBhbGxQcm9qZWN0cy5nZXQoKSk7CisgICAgfQorCisgICAgZm9yIChMYWJlbFR5cGUgdHlwZSA6IGFsbFByb2plY3RzQ29udHJvbC5nZXRMYWJlbFR5cGVzKCkuZ2V0TGFiZWxUeXBlcygpKSB7CiAgICAgICBTdHJpbmcgdXNhZ2UgPSAiIjsKLSAgICAgIGZpbmFsIEFwcHJvdmFsQ2F0ZWdvcnkgY2F0ZWdvcnkgPSB0eXBlLmdldENhdGVnb3J5KCk7Ci0gICAgICB1c2FnZSA9ICJzY29yZSBmb3IgIiArIGNhdGVnb3J5LmdldE5hbWUoKSArICJcbiI7CisgICAgICB1c2FnZSA9ICJzY29yZSBmb3IgIiArIHR5cGUuZ2V0TmFtZSgpICsgIlxuIjsKIAotICAgICAgZm9yIChBcHByb3ZhbENhdGVnb3J5VmFsdWUgdiA6IHR5cGUuZ2V0VmFsdWVzKCkpIHsKKyAgICAgIGZvciAoTGFiZWxWYWx1ZSB2IDogdHlwZS5nZXRWYWx1ZXMoKSkgewogICAgICAgICB1c2FnZSArPSB2LmZvcm1hdCgpICsgIlxuIjsKICAgICAgIH0KIAotICAgICAgZmluYWwgU3RyaW5nIG5hbWUgPQotICAgICAgICAgICItLSIgKyBjYXRlZ29yeS5nZXROYW1lKCkudG9Mb3dlckNhc2UoKS5yZXBsYWNlKCcgJywgJy0nKTsKKyAgICAgIGZpbmFsIFN0cmluZyBuYW1lID0gIi0tIiArIHR5cGUuZ2V0TmFtZSgpLnRvTG93ZXJDYXNlKCk7CiAgICAgICBvcHRpb25MaXN0LmFkZChuZXcgQXBwcm92ZU9wdGlvbihuYW1lLCB1c2FnZSwgdHlwZSkpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1NjcENvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TY3BDb21tYW5kLmphdmEKaW5kZXggMDljMjVmZi4uOTg3MzgwZiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1NjcENvbW1hbmQuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvU2NwQ29tbWFuZC5qYXZhCkBAIC05Miw2ICs5Miw3IEBACiAKICAgcHJpdmF0ZSB2b2lkIHJ1bkltcCgpIHsKICAgICB0cnkgeworICAgICAgcmVhZEFjaygpOwogICAgICAgaWYgKGVycm9yICE9IG51bGwpIHsKICAgICAgICAgdGhyb3cgZXJyb3I7CiAgICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvU2V0QWNjb3VudENvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TZXRBY2NvdW50Q29tbWFuZC5qYXZhCmluZGV4IDk5NDBmYzguLmEzZTlkNmUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TZXRBY2NvdW50Q29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TZXRBY2NvdW50Q29tbWFuZC5qYXZhCkBAIC0yOSw2ICsyOSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmFjY291bnQuUmVhbG07CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNzaC5Tc2hLZXlDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkJhc2VDb21tYW5kOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlJlc3VsdFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CkBAIC00Niw2ICs0Nyw3IEBACiBpbXBvcnQgamF2YS51dGlsLkxpc3Q7CiAKIC8qKiBTZXQgYSB1c2VyJ3MgYWNjb3VudCBzZXR0aW5ncy4gKiovCitAQ29tbWFuZE1ldGFEYXRhKG5hbWUgPSAic2V0LWFjY291bnQiLCBkZXNjciA9ICJDaGFuZ2UgYW4gYWNjb3VudCdzIHNldHRpbmdzIikKIGZpbmFsIGNsYXNzIFNldEFjY291bnRDb21tYW5kIGV4dGVuZHMgQmFzZUNvbW1hbmQgewogCiAgIEBBcmd1bWVudChpbmRleCA9IDAsIHJlcXVpcmVkID0gdHJ1ZSwgbWV0YVZhciA9ICJVU0VSIiwgdXNhZ2UgPSAiZnVsbCBuYW1lLCBlbWFpbC1hZGRyZXNzLCBzc2ggdXNlcm5hbWUgb3IgYWNjb3VudCBpZCIpCkBAIC0xNDUsNiArMTQ3LDcgQEAKICAgICBpZiAoZnVsbE5hbWUgIT0gbnVsbCkgewogICAgICAgaWYgKHJlYWxtLmFsbG93c0VkaXQoRmllbGROYW1lLkZVTExfTkFNRSkpIHsKICAgICAgICAgYWNjb3VudC5zZXRGdWxsTmFtZShmdWxsTmFtZSk7CisgICAgICAgIGFjY291bnRVcGRhdGVkID0gdHJ1ZTsKICAgICAgIH0gZWxzZSB7CiAgICAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoMSwgIlRoZSByZWFsbSBkb2Vzbid0IGFsbG93IGVkaXRpbmcgbmFtZXMiKTsKICAgICAgIH0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TZXRQcm9qZWN0Q29tbWFuZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1NldFByb2plY3RDb21tYW5kLmphdmEKaW5kZXggOTE0M2Y1Yi4uOGMwNmM5N2QgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TZXRQcm9qZWN0Q29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TZXRQcm9qZWN0Q29tbWFuZC5qYXZhCkBAIC0xNywxMiArMTcsMTQgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5HbG9iYWxDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMuYW5ub3RhdGlvbnMuUmVxdWlyZXNDYXBhYmlsaXR5OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5Qcm9qZWN0LkluaGVyaXRhYmxlQm9vbGVhbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdGF0ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUHJvamVjdC5TdWJtaXRUeXBlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuTWV0YURhdGFVcGRhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Qcm9qZWN0Q29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wcm9qZWN0LlByb2plY3RDYWNoZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0Q29udHJvbDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRNZXRhRGF0YTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLlNzaENvbW1hbmQ7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogCkBAIC0zNiw2ICszOCw3IEBACiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKIAogQFJlcXVpcmVzQ2FwYWJpbGl0eShHbG9iYWxDYXBhYmlsaXR5LkFETUlOSVNUUkFURV9TRVJWRVIpCitAQ29tbWFuZE1ldGFEYXRhKG5hbWUgPSAic2V0LXByb2plY3QiLCBkZXNjciA9ICJDaGFuZ2UgYSBwcm9qZWN0J3Mgc2V0dGluZ3MiKQogZmluYWwgY2xhc3MgU2V0UHJvamVjdENvbW1hbmQgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9IExvZ2dlckZhY3RvcnkKICAgICAgIC5nZXRMb2dnZXIoU2V0UHJvamVjdENvbW1hbmQuY2xhc3MpOwpAQCAtNTAsMjkgKzUzLDU3IEBACiAgICAgICArICIoZGVmYXVsdDogTUVSR0VfSUZfTkVDRVNTQVJZKSIpCiAgIHByaXZhdGUgU3VibWl0VHlwZSBzdWJtaXRUeXBlOwogCisgIEBPcHRpb24obmFtZSA9ICItLWNvbnRyaWJ1dG9yLWFncmVlbWVudHMiLCB1c2FnZSA9ICJpZiBjb250cmlidXRvciBhZ3JlZW1lbnQgaXMgcmVxdWlyZWQiKQorICBwcml2YXRlIEluaGVyaXRhYmxlQm9vbGVhbiBjb250cmlidXRvckFncmVlbWVudHM7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tc2lnbmVkLW9mZi1ieSIsIHVzYWdlID0gImlmIHNpZ25lZC1vZmYtYnkgaXMgcmVxdWlyZWQiKQorICBwcml2YXRlIEluaGVyaXRhYmxlQm9vbGVhbiBzaWduZWRPZmZCeTsKKworICBAT3B0aW9uKG5hbWUgPSAiLS1jb250ZW50LW1lcmdlIiwgdXNhZ2UgPSAiYWxsb3cgYXV0b21hdGljIGNvbmZsaWN0IHJlc29sdmluZyB3aXRoaW4gZmlsZXMiKQorICBwcml2YXRlIEluaGVyaXRhYmxlQm9vbGVhbiBjb250ZW50TWVyZ2U7CisKKyAgQE9wdGlvbihuYW1lID0gIi0tY2hhbmdlLWlkIiwgdXNhZ2UgPSAiaWYgY2hhbmdlLWlkIGlzIHJlcXVpcmVkIikKKyAgcHJpdmF0ZSBJbmhlcml0YWJsZUJvb2xlYW4gcmVxdWlyZUNoYW5nZUlEOworCiAgIEBPcHRpb24obmFtZSA9ICItLXVzZS1jb250cmlidXRvci1hZ3JlZW1lbnRzIiwgYWxpYXNlcyA9IHsiLS1jYSJ9LCB1c2FnZSA9ICJpZiBjb250cmlidXRvciBhZ3JlZW1lbnQgaXMgcmVxdWlyZWQiKQotICBwcml2YXRlIEJvb2xlYW4gY29udHJpYnV0b3JBZ3JlZW1lbnRzOworICB2b2lkIHNldFVzZUNvbnRyaWJ1dG9yQXJncmVlbWVudHMoYm9vbGVhbiBvbikgeworICAgIGNvbnRyaWJ1dG9yQWdyZWVtZW50cyA9IEluaGVyaXRhYmxlQm9vbGVhbi5UUlVFOworICB9CiAKICAgQE9wdGlvbihuYW1lID0gIi0tbm8tY29udHJpYnV0b3ItYWdyZWVtZW50cyIsIGFsaWFzZXMgPSB7Ii0tbmNhIn0sIHVzYWdlID0gImlmIGNvbnRyaWJ1dG9yIGFncmVlbWVudCBpcyBub3QgcmVxdWlyZWQiKQotICBwcml2YXRlIEJvb2xlYW4gbm9Db250cmlidXRvckFncmVlbWVudHM7CisgIHZvaWQgc2V0Tm9Db250cmlidXRvckFyZ3JlZW1lbnRzKGJvb2xlYW4gb24pIHsKKyAgICBjb250cmlidXRvckFncmVlbWVudHMgPSBJbmhlcml0YWJsZUJvb2xlYW4uRkFMU0U7CisgIH0KIAogICBAT3B0aW9uKG5hbWUgPSAiLS11c2Utc2lnbmVkLW9mZi1ieSIsIGFsaWFzZXMgPSB7Ii0tc28ifSwgdXNhZ2UgPSAiaWYgc2lnbmVkLW9mZi1ieSBpcyByZXF1aXJlZCIpCi0gIHByaXZhdGUgQm9vbGVhbiBzaWduZWRPZmZCeTsKKyAgdm9pZCBzZXRVc2VTaWduZWRPZmZCeShib29sZWFuIG9uKSB7CisgICAgc2lnbmVkT2ZmQnkgPSBJbmhlcml0YWJsZUJvb2xlYW4uVFJVRTsKKyAgfQogCiAgIEBPcHRpb24obmFtZSA9ICItLW5vLXNpZ25lZC1vZmYtYnkiLCBhbGlhc2VzID0geyItLW5zbyJ9LCB1c2FnZSA9ICJpZiBzaWduZWQtb2ZmLWJ5IGlzIG5vdCByZXF1aXJlZCIpCi0gIHByaXZhdGUgQm9vbGVhbiBub1NpZ25lZE9mZkJ5OworICB2b2lkIHNldE5vU2lnbmVkT2ZmQnkoYm9vbGVhbiBvbikgeworICAgIHNpZ25lZE9mZkJ5ID0gSW5oZXJpdGFibGVCb29sZWFuLkZBTFNFOworICB9CiAKICAgQE9wdGlvbihuYW1lID0gIi0tdXNlLWNvbnRlbnQtbWVyZ2UiLCB1c2FnZSA9ICJhbGxvdyBhdXRvbWF0aWMgY29uZmxpY3QgcmVzb2x2aW5nIHdpdGhpbiBmaWxlcyIpCi0gIHByaXZhdGUgQm9vbGVhbiBjb250ZW50TWVyZ2U7CisgIHZvaWQgc2V0VXNlQ29udGVudE1lcmdlKGJvb2xlYW4gb24pIHsKKyAgICBjb250ZW50TWVyZ2UgPSBJbmhlcml0YWJsZUJvb2xlYW4uVFJVRTsKKyAgfQogCiAgIEBPcHRpb24obmFtZSA9ICItLW5vLWNvbnRlbnQtbWVyZ2UiLCB1c2FnZSA9ICJkb24ndCBhbGxvdyBhdXRvbWF0aWMgY29uZmxpY3QgcmVzb2x2aW5nIHdpdGhpbiBmaWxlcyIpCi0gIHByaXZhdGUgQm9vbGVhbiBub0NvbnRlbnRNZXJnZTsKKyAgdm9pZCBzZXROb0NvbnRlbnRNZXJnZShib29sZWFuIG9uKSB7CisgICAgY29udGVudE1lcmdlID0gSW5oZXJpdGFibGVCb29sZWFuLkZBTFNFOworICB9CiAKICAgQE9wdGlvbihuYW1lID0gIi0tcmVxdWlyZS1jaGFuZ2UtaWQiLCBhbGlhc2VzID0geyItLWlkIn0sIHVzYWdlID0gImlmIGNoYW5nZS1pZCBpcyByZXF1aXJlZCIpCi0gIHByaXZhdGUgQm9vbGVhbiByZXF1aXJlQ2hhbmdlSUQ7CisgIHZvaWQgc2V0UmVxdWlyZUNoYW5nZUlkKGJvb2xlYW4gb24pIHsKKyAgICByZXF1aXJlQ2hhbmdlSUQgPSBJbmhlcml0YWJsZUJvb2xlYW4uVFJVRTsKKyAgfQogCiAgIEBPcHRpb24obmFtZSA9ICItLW5vLWNoYW5nZS1pZCIsIGFsaWFzZXMgPSB7Ii0tbmlkIn0sIHVzYWdlID0gImlmIGNoYW5nZS1pZCBpcyBub3QgcmVxdWlyZWQiKQotICBwcml2YXRlIEJvb2xlYW4gbm9SZXF1aXJlQ2hhbmdlSUQ7CisgIHZvaWQgc2V0Tm9DaGFuZ2VJZChib29sZWFuIG9uKSB7CisgICAgcmVxdWlyZUNoYW5nZUlEID0gSW5oZXJpdGFibGVCb29sZWFuLkZBTFNFOworICB9CiAKICAgQE9wdGlvbihuYW1lID0gIi0tcHJvamVjdC1zdGF0ZSIsIGFsaWFzZXMgPSB7Ii0tcHMifSwgdXNhZ2UgPSAicHJvamVjdCdzIHZpc2liaWxpdHkgc3RhdGUiKQogICBwcml2YXRlIFN0YXRlIHN0YXRlOwpAQCAtODUsNyArMTE2LDYgQEAKIAogICBAT3ZlcnJpZGUKICAgcHJvdGVjdGVkIHZvaWQgcnVuKCkgdGhyb3dzIEZhaWx1cmUgewotICAgIHZhbGlkYXRlKCk7CiAgICAgUHJvamVjdCBjdGxQcm9qZWN0ID0gcHJvamVjdENvbnRyb2wuZ2V0UHJvamVjdCgpOwogICAgIFByb2plY3QuTmFtZUtleSBuYW1lS2V5ID0gY3RsUHJvamVjdC5nZXROYW1lS2V5KCk7CiAgICAgU3RyaW5nIG5hbWUgPSBjdGxQcm9qZWN0LmdldE5hbWUoKTsKQEAgLTk3LDM4ICsxMjcsMjcgQEAKICAgICAgICAgUHJvamVjdENvbmZpZyBjb25maWcgPSBQcm9qZWN0Q29uZmlnLnJlYWQobWQpOwogICAgICAgICBQcm9qZWN0IHByb2plY3QgPSBjb25maWcuZ2V0UHJvamVjdCgpOwogCi0gICAgICAgIHByb2plY3Quc2V0UmVxdWlyZUNoYW5nZUlEKHJlcXVpcmVDaGFuZ2VJRCAhPSBudWxsID8gcmVxdWlyZUNoYW5nZUlECi0gICAgICAgICAgICA6IHByb2plY3QuaXNSZXF1aXJlQ2hhbmdlSUQoKSk7Ci0KLSAgICAgICAgcHJvamVjdC5zZXRSZXF1aXJlQ2hhbmdlSUQobm9SZXF1aXJlQ2hhbmdlSUQgIT0gbnVsbAotICAgICAgICAgICAgPyAhbm9SZXF1aXJlQ2hhbmdlSUQgOiBwcm9qZWN0LmlzUmVxdWlyZUNoYW5nZUlEKCkpOwotCi0gICAgICAgIHByb2plY3Quc2V0U3VibWl0VHlwZShzdWJtaXRUeXBlICE9IG51bGwgPyBzdWJtaXRUeXBlIDogcHJvamVjdAotICAgICAgICAgICAgLmdldFN1Ym1pdFR5cGUoKSk7Ci0KLSAgICAgICAgcHJvamVjdC5zZXRVc2VDb250ZW50TWVyZ2UoY29udGVudE1lcmdlICE9IG51bGwgPyBjb250ZW50TWVyZ2UKLSAgICAgICAgICAgIDogcHJvamVjdC5pc1VzZUNvbnRlbnRNZXJnZSgpKTsKLQotICAgICAgICBwcm9qZWN0LnNldFVzZUNvbnRlbnRNZXJnZShub0NvbnRlbnRNZXJnZSAhPSBudWxsID8gIW5vQ29udGVudE1lcmdlCi0gICAgICAgICAgICA6IHByb2plY3QuaXNVc2VDb250ZW50TWVyZ2UoKSk7Ci0KLSAgICAgICAgcHJvamVjdC5zZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoY29udHJpYnV0b3JBZ3JlZW1lbnRzICE9IG51bGwKLSAgICAgICAgICAgID8gY29udHJpYnV0b3JBZ3JlZW1lbnRzIDogcHJvamVjdC5pc1VzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cygpKTsKLQotICAgICAgICBwcm9qZWN0LnNldFVzZUNvbnRyaWJ1dG9yQWdyZWVtZW50cyhub0NvbnRyaWJ1dG9yQWdyZWVtZW50cyAhPSBudWxsCi0gICAgICAgICAgICA/ICFub0NvbnRyaWJ1dG9yQWdyZWVtZW50cyA6IHByb2plY3QuaXNVc2VDb250cmlidXRvckFncmVlbWVudHMoKSk7Ci0KLSAgICAgICAgcHJvamVjdC5zZXRVc2VTaWduZWRPZmZCeShzaWduZWRPZmZCeSAhPSBudWxsID8gc2lnbmVkT2ZmQnkgOiBwcm9qZWN0Ci0gICAgICAgICAgICAuaXNVc2VTaWduZWRPZmZCeSgpKTsKLQotICAgICAgICBwcm9qZWN0LnNldFVzZUNvbnRlbnRNZXJnZShub1NpZ25lZE9mZkJ5ICE9IG51bGwgPyAhbm9TaWduZWRPZmZCeQotICAgICAgICAgICAgOiBwcm9qZWN0LmlzVXNlQ29udGVudE1lcmdlKCkpOwotCi0gICAgICAgIHByb2plY3Quc2V0RGVzY3JpcHRpb24ocHJvamVjdERlc2NyaXB0aW9uICE9IG51bGwgPyBwcm9qZWN0RGVzY3JpcHRpb24KLSAgICAgICAgICAgIDogcHJvamVjdC5nZXREZXNjcmlwdGlvbigpKTsKLQotICAgICAgICBwcm9qZWN0LnNldFN0YXRlKHN0YXRlICE9IG51bGwgPyBzdGF0ZSA6IHByb2plY3QuZ2V0U3RhdGUoKSk7Ci0KKyAgICAgICAgaWYgKHJlcXVpcmVDaGFuZ2VJRCAhPSBudWxsKSB7CisgICAgICAgICAgcHJvamVjdC5zZXRSZXF1aXJlQ2hhbmdlSUQocmVxdWlyZUNoYW5nZUlEKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoc3VibWl0VHlwZSAhPSBudWxsKSB7CisgICAgICAgICAgcHJvamVjdC5zZXRTdWJtaXRUeXBlKHN1Ym1pdFR5cGUpOworICAgICAgICB9CisgICAgICAgIGlmIChjb250ZW50TWVyZ2UgIT0gbnVsbCkgeworICAgICAgICAgIHByb2plY3Quc2V0VXNlQ29udGVudE1lcmdlKGNvbnRlbnRNZXJnZSk7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGNvbnRyaWJ1dG9yQWdyZWVtZW50cyAhPSBudWxsKSB7CisgICAgICAgICAgcHJvamVjdC5zZXRVc2VDb250cmlidXRvckFncmVlbWVudHMoY29udHJpYnV0b3JBZ3JlZW1lbnRzKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoc2lnbmVkT2ZmQnkgIT0gbnVsbCkgeworICAgICAgICAgIHByb2plY3Quc2V0VXNlU2lnbmVkT2ZmQnkoc2lnbmVkT2ZmQnkpOworICAgICAgICB9CisgICAgICAgIGlmIChwcm9qZWN0RGVzY3JpcHRpb24gIT0gbnVsbCkgeworICAgICAgICAgIHByb2plY3Quc2V0RGVzY3JpcHRpb24ocHJvamVjdERlc2NyaXB0aW9uKTsKKyAgICAgICAgfQorICAgICAgICBpZiAoc3RhdGUgIT0gbnVsbCkgeworICAgICAgICAgIHByb2plY3Quc2V0U3RhdGUoc3RhdGUpOworICAgICAgICB9CiAgICAgICAgIG1kLnNldE1lc3NhZ2UoIlByb2plY3Qgc2V0dGluZ3MgdXBkYXRlZCIpOwogICAgICAgICBjb25maWcuY29tbWl0KG1kKTsKICAgICAgIH0gZmluYWxseSB7CkBAIC0xNTQsMTggKzE3Myw0IEBACiAgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKDEsIGVyci50b1N0cmluZygpKTsKICAgICB9CiAgIH0KLQotICBwcml2YXRlIHZvaWQgdmFsaWRhdGUoKSB0aHJvd3MgVW5sb2dnZWRGYWlsdXJlIHsKLSAgICBjaGVja0V4Y2x1c2l2aXR5KGNvbnRlbnRNZXJnZSwgIi0tdXNlLWNvbnRlbnQtbWVyZ2UiLAotICAgICAgICBub0NvbnRlbnRNZXJnZSwgIi0tbm8tY29udGVudC1tZXJnZSIpOwotCi0gICAgY2hlY2tFeGNsdXNpdml0eShjb250cmlidXRvckFncmVlbWVudHMsICItLXVzZS1jb250cmlidXRvci1hZ3JlZW1lbnRzIiwKLSAgICAgICAgbm9Db250cmlidXRvckFncmVlbWVudHMsICItLW5vLWNvbnRyaWJ1dG9yLWFncmVlbWVudHMiKTsKLQotICAgIGNoZWNrRXhjbHVzaXZpdHkoc2lnbmVkT2ZmQnksICItLXVzZS1zaWduZWQtb2ZmLWJ5IiwKLSAgICAgICAgbm9TaWduZWRPZmZCeSwgIi0tbm8tc2lnbmVkLW9mZi1ieSIpOwotCi0gICAgY2hlY2tFeGNsdXNpdml0eShyZXF1aXJlQ2hhbmdlSUQsICItLXJlcXVpcmUtY2hhbmdlLWlkIiwKLSAgICAgICAgbm9SZXF1aXJlQ2hhbmdlSUQsICItLW5vLWNoYW5nZS1pZCIpOwotICB9CiB9CmRpZmYgLS1naXQgYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvU2V0UmV2aWV3ZXJzQ29tbWFuZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1NldFJldmlld2Vyc0NvbW1hbmQuamF2YQppbmRleCBmODczODI0Li44ZTliY2FjIDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvU2V0UmV2aWV3ZXJzQ29tbWFuZC5qYXZhCisrKyBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TZXRSZXZpZXdlcnNDb21tYW5kLmphdmEKQEAgLTE0LDIxICsxNCwyNSBAQAogCiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHM7CiAKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5SZXZpZXdlclJlc3VsdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5leHRlbnNpb25zLnJlc3RhcGkuUmVzb3VyY2VOb3RGb3VuZEV4Y2VwdGlvbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQWNjb3VudDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuQ2hhbmdlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLmNsaWVudC5QYXRjaFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUmV2SWQ7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wYXRjaC5BZGRSZXZpZXdlcjsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guUmVtb3ZlUmV2aWV3ZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5DaGFuZ2VSZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLkRlbGV0ZVJldmlld2VyOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuUG9zdFJldmlld2VyczsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlJldmlld2VyUmVzb3VyY2U7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Ob1N1Y2hDaGFuZ2VFeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuUHJvamVjdENvbnRyb2w7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuZ3d0b3JtLnNlcnZlci5Pcm1FeGNlcHRpb247CiBpbXBvcnQgY29tLmdvb2dsZS5nd3Rvcm0uc2VydmVyLlJlc3VsdFNldDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuUHJvdmlkZXI7CiAKIGltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouQXJndW1lbnQ7CiBpbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKQEAgLTM2LDEyICs0MCwxMiBAQAogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwogCiBpbXBvcnQgamF2YS5pby5JT0V4Y2VwdGlvbjsKLWltcG9ydCBqYXZhLnRleHQuTWVzc2FnZUZvcm1hdDsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwogaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwogaW1wb3J0IGphdmEudXRpbC5MaXN0OwogaW1wb3J0IGphdmEudXRpbC5TZXQ7CiAKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJzZXQtcmV2aWV3ZXJzIiwgZGVzY3IgPSAiQWRkIG9yIHJlbW92ZSByZXZpZXdlcnMgb24gYSBjaGFuZ2UiKQogcHVibGljIGNsYXNzIFNldFJldmlld2Vyc0NvbW1hbmQgZXh0ZW5kcyBTc2hDb21tYW5kIHsKICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTG9nZ2VyIGxvZyA9CiAgICAgICBMb2dnZXJGYWN0b3J5LmdldExvZ2dlcihTZXRSZXZpZXdlcnNDb21tYW5kLmNsYXNzKTsKQEAgLTcyLDEwICs3NiwxMyBAQAogICBwcml2YXRlIFJldmlld0RiIGRiOwogCiAgIEBJbmplY3QKLSAgcHJpdmF0ZSBBZGRSZXZpZXdlci5GYWN0b3J5IGFkZFJldmlld2VyRmFjdG9yeTsKKyAgcHJpdmF0ZSBSZXZpZXdlclJlc291cmNlLkZhY3RvcnkgcmV2aWV3ZXJGYWN0b3J5OwogCiAgIEBJbmplY3QKLSAgcHJpdmF0ZSBSZW1vdmVSZXZpZXdlci5GYWN0b3J5IHJlbW92ZVJldmlld2VyRmFjdG9yeTsKKyAgcHJpdmF0ZSBQcm92aWRlcjxQb3N0UmV2aWV3ZXJzPiBwb3N0UmV2aWV3ZXJzUHJvdmlkZXI7CisKKyAgQEluamVjdAorICBwcml2YXRlIFByb3ZpZGVyPERlbGV0ZVJldmlld2VyPiBkZWxldGVSZXZpZXdlclByb3ZpZGVyOwogCiAgIEBJbmplY3QKICAgcHJpdmF0ZSBDaGFuZ2VDb250cm9sLkZhY3RvcnkgY2hhbmdlQ29udHJvbEZhY3Rvcnk7CkBAIC0xMDIsNjIgKzEwOSw0OCBAQAogICB9CiAKICAgcHJpdmF0ZSBib29sZWFuIG1vZGlmeU9uZShDaGFuZ2UuSWQgY2hhbmdlSWQpIHRocm93cyBFeGNlcHRpb24gewotICAgIGNoYW5nZUNvbnRyb2xGYWN0b3J5LnZhbGlkYXRlRm9yKGNoYW5nZUlkKTsKLQotICAgIFJldmlld2VyUmVzdWx0IHJlc3VsdDsKKyAgICBDaGFuZ2VSZXNvdXJjZSBjaGFuZ2VSc3JjID0KKyAgICAgICAgbmV3IENoYW5nZVJlc291cmNlKGNoYW5nZUNvbnRyb2xGYWN0b3J5LnZhbGlkYXRlRm9yKGNoYW5nZUlkKSk7CiAgICAgYm9vbGVhbiBvayA9IHRydWU7CiAKICAgICAvLyBSZW1vdmUgcmV2aWV3ZXJzCiAgICAgLy8KLSAgICByZXN1bHQgPSByZW1vdmVSZXZpZXdlckZhY3RvcnkuY3JlYXRlKGNoYW5nZUlkLCB0b1JlbW92ZSkuY2FsbCgpOwotICAgIG9rICY9IHJlc3VsdC5nZXRFcnJvcnMoKS5pc0VtcHR5KCk7Ci0gICAgZm9yIChSZXZpZXdlclJlc3VsdC5FcnJvciByZXN1bHRFcnJvciA6IHJlc3VsdC5nZXRFcnJvcnMoKSkgewotICAgICAgU3RyaW5nIG1lc3NhZ2U7Ci0gICAgICBzd2l0Y2ggKHJlc3VsdEVycm9yLmdldFR5cGUoKSkgewotICAgICAgICBjYXNlIFJFTU9WRV9OT1RfUEVSTUlUVEVEOgotICAgICAgICAgIG1lc3NhZ2UgPSAibm90IHBlcm1pdHRlZCB0byByZW1vdmUgezB9IGZyb20gezF9IjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBDT1VMRF9OT1RfUkVNT1ZFOgotICAgICAgICAgIG1lc3NhZ2UgPSAiY291bGQgbm90IHJlbW92ZSB7MH0gZnJvbSB7MX0iOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgIG1lc3NhZ2UgPSAiY291bGQgbm90IHJlbW92ZSB7MH06IHsyfSI7CisgICAgRGVsZXRlUmV2aWV3ZXIgZGVsZXRlID0gZGVsZXRlUmV2aWV3ZXJQcm92aWRlci5nZXQoKTsKKyAgICBmb3IgKEFjY291bnQuSWQgcmV2aWV3ZXIgOiB0b1JlbW92ZSkgeworICAgICAgUmV2aWV3ZXJSZXNvdXJjZSByc3JjID0gcmV2aWV3ZXJGYWN0b3J5LmNyZWF0ZShjaGFuZ2VSc3JjLCByZXZpZXdlcik7CisgICAgICBTdHJpbmcgZXJyb3IgPSBudWxsOzsKKyAgICAgIHRyeSB7CisgICAgICAgIGRlbGV0ZS5hcHBseShyc3JjLCBuZXcgRGVsZXRlUmV2aWV3ZXIuSW5wdXQoKSk7CisgICAgICB9IGNhdGNoIChSZXNvdXJjZU5vdEZvdW5kRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgZXJyb3IgPSBTdHJpbmcuZm9ybWF0KCJjb3VsZCBub3QgcmVtb3ZlICVzOiBub3QgZm91bmQiLCByZXZpZXdlcik7CisgICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgeworICAgICAgICBlcnJvciA9IFN0cmluZy5mb3JtYXQoImNvdWxkIG5vdCByZW1vdmUgJXM6ICVzIiwKKyAgICAgICAgICAgIHJldmlld2VyLCBlLmdldE1lc3NhZ2UoKSk7CiAgICAgICB9Ci0gICAgICB3cml0ZUVycm9yKCJlcnJvciIsIE1lc3NhZ2VGb3JtYXQuZm9ybWF0KG1lc3NhZ2UsCi0gICAgICAgICAgcmVzdWx0RXJyb3IuZ2V0TmFtZSgpLCBjaGFuZ2VJZCwgcmVzdWx0RXJyb3IuZ2V0VHlwZSgpKSk7CisgICAgICBpZiAoZXJyb3IgIT0gbnVsbCkgeworICAgICAgICBvayA9IGZhbHNlOworICAgICAgICB3cml0ZUVycm9yKCJlcnJvciIsIGVycm9yKTsKKyAgICAgIH0KICAgICB9CiAKICAgICAvLyBBZGQgcmV2aWV3ZXJzCiAgICAgLy8KLSAgICByZXN1bHQgPQotICAgICAgICBhZGRSZXZpZXdlckZhY3RvcnkuY3JlYXRlKGNoYW5nZUlkLCB0b0FkZCwgdHJ1ZSkuY2FsbCgpOwotICAgIG9rICY9IHJlc3VsdC5nZXRFcnJvcnMoKS5pc0VtcHR5KCk7Ci0gICAgZm9yIChSZXZpZXdlclJlc3VsdC5FcnJvciByZXN1bHRFcnJvciA6IHJlc3VsdC5nZXRFcnJvcnMoKSkgewotICAgICAgU3RyaW5nIG1lc3NhZ2U7Ci0gICAgICBzd2l0Y2ggKHJlc3VsdEVycm9yLmdldFR5cGUoKSkgewotICAgICAgICBjYXNlIFJFVklFV0VSX05PVF9GT1VORDoKLSAgICAgICAgICBtZXNzYWdlID0gImFjY291bnQgb3IgZ3JvdXAgezB9IG5vdCBmb3VuZCI7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgQUNDT1VOVF9JTkFDVElWRToKLSAgICAgICAgICBtZXNzYWdlID0gImFjY291bnQgezB9IGluYWN0aXZlIjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBDSEFOR0VfTk9UX1ZJU0lCTEU6Ci0gICAgICAgICAgbWVzc2FnZSA9ICJjaGFuZ2UgezF9IG5vdCB2aXNpYmxlIHRvIHswfSI7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgR1JPVVBfRU1QVFk6Ci0gICAgICAgICAgbWVzc2FnZSA9ICJncm91cCB7MH0gaXMgZW1wdHkiOwotICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIEdST1VQX0hBU19UT09fTUFOWV9NRU1CRVJTOgotICAgICAgICAgIG1lc3NhZ2UgPSAiZ3JvdXAgezB9IGhhcyB0b28gbWFueSBtZW1iZXJzIjsKLSAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBHUk9VUF9OT1RfQUxMT1dFRDoKLSAgICAgICAgICBtZXNzYWdlID0gImdyb3VwIHswfSBpcyBub3QgYWxsb3dlZCBhcyByZXZpZXdlciI7Ci0gICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgbWVzc2FnZSA9ICJjb3VsZCBub3QgYWRkIHswfTogezJ9IjsKKyAgICBQb3N0UmV2aWV3ZXJzIHBvc3QgPSBwb3N0UmV2aWV3ZXJzUHJvdmlkZXIuZ2V0KCk7CisgICAgZm9yIChTdHJpbmcgcmV2aWV3ZXIgOiB0b0FkZCkgeworICAgICAgUG9zdFJldmlld2Vycy5JbnB1dCBpbnB1dCA9IG5ldyBQb3N0UmV2aWV3ZXJzLklucHV0KCk7CisgICAgICBpbnB1dC5yZXZpZXdlciA9IHJldmlld2VyOworICAgICAgU3RyaW5nIGVycm9yOworICAgICAgdHJ5IHsKKyAgICAgICAgZXJyb3IgPSBwb3N0LmFwcGx5KGNoYW5nZVJzcmMsIGlucHV0KS5lcnJvcjsKKyAgICAgIH0gY2F0Y2ggKFJlc291cmNlTm90Rm91bmRFeGNlcHRpb24gZSkgeworICAgICAgICBlcnJvciA9IFN0cmluZy5mb3JtYXQoImNvdWxkIG5vdCBhZGQgJXM6IG5vdCBmb3VuZCIsIHJldmlld2VyKTsKKyAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICAgIGVycm9yID0gU3RyaW5nLmZvcm1hdCgiY291bGQgbm90IGFkZCAlczogJXMiLCByZXZpZXdlciwgZS5nZXRNZXNzYWdlKCkpOwogICAgICAgfQotICAgICAgd3JpdGVFcnJvcigiZXJyb3IiLCBNZXNzYWdlRm9ybWF0LmZvcm1hdChtZXNzYWdlLAotICAgICAgICAgIHJlc3VsdEVycm9yLmdldE5hbWUoKSwgY2hhbmdlSWQsIHJlc3VsdEVycm9yLmdldFR5cGUoKSkpOworICAgICAgaWYgKGVycm9yICE9IG51bGwpIHsKKyAgICAgICAgb2sgPSBmYWxzZTsKKyAgICAgICAgd3JpdGVFcnJvcigiZXJyb3IiLCBlcnJvcik7CisgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIG9rOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Nob3dDYWNoZXMuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TaG93Q2FjaGVzLmphdmEKaW5kZXggYmRjYjRmYi4uMzM2Njg0MSAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Nob3dDYWNoZXMuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvU2hvd0NhY2hlcy5qYXZhCkBAIC0yNSw2ICsyNSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LldvcmtRdWV1ZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LldvcmtRdWV1ZS5UYXNrOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoRGFlbW9uOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKQEAgLTMyLDcgKzMzLDcgQEAKIGltcG9ydCBvcmcuYXBhY2hlLm1pbmEuY29yZS5zZXJ2aWNlLklvQWNjZXB0b3I7CiBpbXBvcnQgb3JnLmFwYWNoZS5taW5hLmNvcmUuc2Vzc2lvbi5Jb1Nlc3Npb247CiBpbXBvcnQgb3JnLmFwYWNoZS5zc2hkLnNlcnZlci5FbnZpcm9ubWVudDsKLWltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LnN0b3JhZ2UuZmlsZS5XaW5kb3dDYWNoZVN0YXRBY2Nlc3NvcjsKK2ltcG9ydCBvcmcuZWNsaXBzZS5qZ2l0LmludGVybmFsLnN0b3JhZ2UuZmlsZS5XaW5kb3dDYWNoZVN0YXRBY2Nlc3NvcjsKIGltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouT3B0aW9uOwogCiBpbXBvcnQgamF2YS5pby5GaWxlOwpAQCAtNTAsNiArNTEsNyBAQAogCiAvKiogU2hvdyB0aGUgY3VycmVudCBjYWNoZSBzdGF0ZXMuICovCiBAUmVxdWlyZXNDYXBhYmlsaXR5KEdsb2JhbENhcGFiaWxpdHkuVklFV19DQUNIRVMpCitAQ29tbWFuZE1ldGFEYXRhKG5hbWUgPSAic2hvdy1jYWNoZXMiLCBkZXNjciA9ICJEaXNwbGF5IGN1cnJlbnQgY2FjaGUgc3RhdGlzdGljcyIpCiBmaW5hbCBjbGFzcyBTaG93Q2FjaGVzIGV4dGVuZHMgQ2FjaGVDb21tYW5kIHsKICAgcHJpdmF0ZSBzdGF0aWMgdm9sYXRpbGUgbG9uZyBzZXJ2ZXJTdGFydGVkOwogCkBAIC0yNTAsNiArMjUyLDEwIEBACiAgICAgICAgIGNhc2UgUlVOTklORzogdGFza3NSdW5uaW5nKys7IGJyZWFrOwogICAgICAgICBjYXNlIFJFQURZOiB0YXNrc1JlYWR5Kys7IGJyZWFrOwogICAgICAgICBjYXNlIFNMRUVQSU5HOiB0YXNrc1NsZWVwaW5nKys7IGJyZWFrOworICAgICAgICBjYXNlIENBTkNFTExFRDoKKyAgICAgICAgY2FzZSBET05FOgorICAgICAgICBjYXNlIE9USEVSOgorICAgICAgICAgIGJyZWFrOwogICAgICAgfQogICAgIH0KICAgICBzdGRvdXQuZm9ybWF0KApkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Nob3dDb25uZWN0aW9ucy5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Nob3dDb25uZWN0aW9ucy5qYXZhCmluZGV4IGExYTViOGYuLjFjM2Q4MjggMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TaG93Q29ubmVjdGlvbnMuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvU2hvd0Nvbm5lY3Rpb25zLmphdmEKQEAgLTE5LDYgKzE5LDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuQ3VycmVudFVzZXI7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLklkZW50aWZpZWRVc2VyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci51dGlsLklkR2VuZXJhdG9yOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoQ29tbWFuZDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLlNzaERhZW1vbjsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLlNzaFNlc3Npb247CkBAIC00MSw2ICs0Miw3IEBACiAKIC8qKiBTaG93IHRoZSBjdXJyZW50IFNTSCBjb25uZWN0aW9ucy4gKi8KIEBSZXF1aXJlc0NhcGFiaWxpdHkoR2xvYmFsQ2FwYWJpbGl0eS5WSUVXX0NPTk5FQ1RJT05TKQorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gInNob3ctY29ubmVjdGlvbnMiLCBkZXNjciA9ICJEaXNwbGF5IGFjdGl2ZSBjbGllbnQgU1NIIGNvbm5lY3Rpb25zIikKIGZpbmFsIGNsYXNzIFNob3dDb25uZWN0aW9ucyBleHRlbmRzIFNzaENvbW1hbmQgewogICBAT3B0aW9uKG5hbWUgPSAiLS1udW1lcmljIiwgYWxpYXNlcyA9IHsiLW4ifSwgdXNhZ2UgPSAiZG9uJ3QgcmVzb2x2ZSBuYW1lcyIpCiAgIHByaXZhdGUgYm9vbGVhbiBudW1lcmljOwpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Nob3dRdWV1ZS5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Nob3dRdWV1ZS5qYXZhCmluZGV4IGY4NjI0ODQuLmZlZTUyNzUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TaG93UXVldWUuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvU2hvd1F1ZXVlLmphdmEKQEAgLTIzLDYgKzIzLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0U3RhdGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnV0aWwuSWRHZW5lcmF0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5BZG1pbkhpZ2hQcmlvcml0eUNvbW1hbmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKIApAQCAtMzksNiArNDAsNyBAQAogCiAvKiogRGlzcGxheSB0aGUgY3VycmVudCB3b3JrIHF1ZXVlLiAqLwogQEFkbWluSGlnaFByaW9yaXR5Q29tbWFuZAorQENvbW1hbmRNZXRhRGF0YShuYW1lID0gInNob3ctcXVldWUiLCBkZXNjciA9ICJEaXNwbGF5IHRoZSBiYWNrZ3JvdW5kIHdvcmsgcXVldWVzLCBpbmNsdWRpbmcgcmVwbGljYXRpb24iKQogZmluYWwgY2xhc3MgU2hvd1F1ZXVlIGV4dGVuZHMgU3NoQ29tbWFuZCB7CiAgIEBPcHRpb24obmFtZSA9ICItdyIsIHVzYWdlID0gImRpc3BsYXkgd2l0aG91dCBsaW5lIHdpZHRoIHRydW5jYXRpb24iKQogICBwcml2YXRlIGJvb2xlYW4gd2lkZTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TdHJlYW1FdmVudHMuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9TdHJlYW1FdmVudHMuamF2YQppbmRleCBmZjZkZWE5Li4xYjgxYTQ3IDEwMDY0NAotLS0gYS9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvU3RyZWFtRXZlbnRzLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1N0cmVhbUV2ZW50cy5qYXZhCkBAIC0yMSw2ICsyMSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Xb3JrUXVldWU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5Xb3JrUXVldWUuQ2FuY2VsYWJsZVJ1bm5hYmxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQmFzZUNvbW1hbmQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5TdHJlYW1Db21tYW5kRXhlY3V0b3I7CiBpbXBvcnQgY29tLmdvb2dsZS5nc29uLkdzb247CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwpAQCAtMzIsNiArMzMsNyBAQAogaW1wb3J0IGphdmEudXRpbC5jb25jdXJyZW50LkZ1dHVyZTsKIGltcG9ydCBqYXZhLnV0aWwuY29uY3VycmVudC5MaW5rZWRCbG9ja2luZ1F1ZXVlOwogCitAQ29tbWFuZE1ldGFEYXRhKG5hbWUgPSAic3RyZWFtLWV2ZW50cyIsIGRlc2NyID0gIk1vbml0b3IgZXZlbnRzIG9jY3VycmluZyBpbiByZWFsIHRpbWUiKQogZmluYWwgY2xhc3MgU3RyZWFtRXZlbnRzIGV4dGVuZHMgQmFzZUNvbW1hbmQgewogICAvKiogTWF4aW11bSBudW1iZXIgb2YgZXZlbnRzIHRoYXQgbWF5IGJlIHF1ZXVlZCB1cCBmb3IgZWFjaCBjb25uZWN0aW9uLiAqLwogICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgTUFYX0VWRU5UUyA9IDEyODsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9UZXN0U3VibWl0UnVsZS5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Rlc3RTdWJtaXRSdWxlLmphdmEKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGM4NTQ0ZTQuLjAwMDAwMDAKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Rlc3RTdWJtaXRSdWxlLmphdmEKKysrIC9kZXYvbnVsbApAQCAtMSwyNDEgKzAsMCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDEyIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKLS8vCi0vLyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKLS8vIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KLS8vIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAotLy8KLS8vIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAotLy8KLS8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKLS8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCi0vLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KLS8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKLS8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgotCi1wYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHM7Ci0KLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5BY2NvdW50SW5mbzsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uZGF0YS5TdWJtaXRSZWNvcmQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkFjY291bnQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LkNoYW5nZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5yZXZpZXdkYi5jbGllbnQuUGF0Y2hTZXQ7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuY2xpZW50LlByb2plY3Q7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQucmV2aWV3ZGIuc2VydmVyLlJldmlld0RiOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlByb2xvZ0Vudmlyb25tZW50OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJ1bGVzLlN0b3JlZFZhbHVlczsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuT3V0cHV0Rm9ybWF0OwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5hY2NvdW50LkFjY291bnRDYWNoZTsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY29uZmlnLkFub255bW91c0Nvd2FyZE5hbWU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50cy5BY2NvdW50QXR0cmlidXRlOwotaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5ldmVudHMuU3VibWl0TGFiZWxBdHRyaWJ1dGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmV2ZW50cy5TdWJtaXRSZWNvcmRBdHRyaWJ1dGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnByb2plY3QuQ2hhbmdlQ29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucHJvamVjdC5Qcm9qZWN0U3RhdGU7Ci1pbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Tc2hDb21tYW5kOwotaW1wb3J0IGNvbS5nb29nbGUuZ3Nvbi5yZWZsZWN0LlR5cGVUb2tlbjsKLWltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5JbmplY3Q7Ci0KLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5jb21waWxlci5Db21waWxlRXhjZXB0aW9uOwotaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuQnVmZmVyaW5nUHJvbG9nQ29udHJvbDsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLkphdmFPYmplY3RUZXJtOwotaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuTGlzdFRlcm07Ci1pbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2c7Ci1pbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5Qcm9sb2dDbGFzc0xvYWRlcjsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZ0V4Y2VwdGlvbjsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlByb2xvZ01hY2hpbmVDb3B5OwotaW1wb3J0IGNvbS5nb29nbGVjb2RlLnByb2xvZ19jYWZlLmxhbmcuU3ltYm9sVGVybTsKLWltcG9ydCBjb20uZ29vZ2xlY29kZS5wcm9sb2dfY2FmZS5sYW5nLlRlcm07Ci1pbXBvcnQgY29tLmdvb2dsZWNvZGUucHJvbG9nX2NhZmUubGFuZy5WYXJpYWJsZVRlcm07Ci0KLWltcG9ydCBvcmcua29oc3VrZS5hcmdzNGouQXJndW1lbnQ7Ci1pbXBvcnQgb3JnLmtvaHN1a2UuYXJnczRqLk9wdGlvbjsKLQotaW1wb3J0IGphdmEuaW8uSW5wdXRTdHJlYW1SZWFkZXI7Ci1pbXBvcnQgamF2YS5pby5QdXNoYmFja1JlYWRlcjsKLWltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5IYXNoU2V0OwotaW1wb3J0IGphdmEudXRpbC5MaW5rZWRMaXN0OwotaW1wb3J0IGphdmEudXRpbC5MaXN0OwotaW1wb3J0IGphdmEudXRpbC5TZXQ7Ci0KLS8qKiBDb21tYW5kIHRoYXQgYWxsb3dzIHRlc3Rpbmcgb2YgcHJvbG9nIHN1Ym1pdC1ydWxlcyBpbiBhIGxpdmUgaW5zdGFuY2UuICovCi1maW5hbCBjbGFzcyBUZXN0U3VibWl0UnVsZSBleHRlbmRzIFNzaENvbW1hbmQgewotICBASW5qZWN0Ci0gIHByaXZhdGUgUmV2aWV3RGIgZGI7Ci0KLSAgQEluamVjdAotICBwcml2YXRlIFByb2xvZ0Vudmlyb25tZW50LkZhY3RvcnkgZW52RmFjdG9yeTsKLQotICBASW5qZWN0Ci0gIHByaXZhdGUgQ2hhbmdlQ29udHJvbC5GYWN0b3J5IGNjRmFjdG9yeTsKLQotICBASW5qZWN0Ci0gIHByaXZhdGUgQWNjb3VudENhY2hlIGFjY291bnRDYWNoZTsKLQotICBmaW5hbCBAQW5vbnltb3VzQ293YXJkTmFtZSBTdHJpbmcgYW5vbnltb3VzQ293YXJkTmFtZTsKLQotICBAQXJndW1lbnQoaW5kZXggPSAwLCByZXF1aXJlZCA9IHRydWUsIHVzYWdlID0gIkNoYW5nZUlkIHRvIGxvYWQgaW4gcHJvbG9nIGVudmlyb25tZW50IikKLSAgcHJpdmF0ZSBTdHJpbmcgY2hhbmdlSWQ7Ci0KLSAgQE9wdGlvbihuYW1lID0gIi1zIiwKLSAgICAgIHVzYWdlID0gIlJlYWQgcHJvbG9nIHNjcmlwdCBmcm9tIHN0ZGluIGluc3RlYWQgb2YgcmVhZGluZyBydWxlcy5wbCBmcm9tIHRoZSByZWZzL21ldGEvY29uZmlnIGJyYW5jaCIpCi0gIHByaXZhdGUgYm9vbGVhbiB1c2VTdGRpbjsKLQotICBAT3B0aW9uKG5hbWUgPSAiLS1mb3JtYXQiLCBtZXRhVmFyID0gIkZNVCIsIHVzYWdlID0gIk91dHB1dCBkaXNwbGF5IGZvcm1hdCIpCi0gIHByaXZhdGUgT3V0cHV0Rm9ybWF0IGZvcm1hdCA9IE91dHB1dEZvcm1hdC5URVhUOwotCi0gIEBPcHRpb24obmFtZSA9ICItLW5vLWZpbHRlcnMiLCBhbGlhc2VzID0geyItbiJ9LAotICAgICAgdXNhZ2UgPSAiRG9uJ3QgcnVuIHRoZSBzdWJtaXRfZmlsdGVyLzIgZnJvbSB0aGUgcGFyZW50IHByb2plY3RzIikKLSAgcHJpdmF0ZSBib29sZWFuIHNraXBTdWJtaXRGaWx0ZXJzOwotCi0gIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZ1tdIFBBQ0tBR0VfTElTVCA9IHtQcm9sb2cuQlVJTFRJTiwgImdlcnJpdCJ9OwotCi0gIEBJbmplY3QKLSAgcHVibGljIFRlc3RTdWJtaXRSdWxlKEBBbm9ueW1vdXNDb3dhcmROYW1lIFN0cmluZyBhbm9ueW1vdXMpIHsKLSAgICBhbm9ueW1vdXNDb3dhcmROYW1lID0gYW5vbnltb3VzOwotICB9Ci0gIHByaXZhdGUgUHJvbG9nTWFjaGluZUNvcHkgbmV3TWFjaGluZSgpIHsKLSAgICBCdWZmZXJpbmdQcm9sb2dDb250cm9sIGN0bCA9IG5ldyBCdWZmZXJpbmdQcm9sb2dDb250cm9sKCk7Ci0gICAgY3RsLnNldE1heERhdGFiYXNlU2l6ZSgxNiAqIDEwMjQpOwotICAgIGN0bC5zZXRQcm9sb2dDbGFzc0xvYWRlcihuZXcgUHJvbG9nQ2xhc3NMb2FkZXIoZ2V0Q2xhc3MoKS5nZXRDbGFzc0xvYWRlcigpKSk7Ci0gICAgcmV0dXJuIFByb2xvZ01hY2hpbmVDb3B5LnNhdmUoY3RsKTsKLSAgfQotCi0gIEBPdmVycmlkZQotICBwcm90ZWN0ZWQgdm9pZCBydW4oKSB0aHJvd3MgVW5sb2dnZWRGYWlsdXJlIHsKLSAgICBQdXNoYmFja1JlYWRlciBpblJlYWRlciA9IG5ldyBQdXNoYmFja1JlYWRlcihuZXcgSW5wdXRTdHJlYW1SZWFkZXIoaW4pKTsKLQotICAgIHRyeSB7Ci0gICAgICBQcm9sb2dFbnZpcm9ubWVudCBwY2w7Ci0KLSAgICAgIExpc3Q8Q2hhbmdlPiBjaGFuZ2VMaXN0ID0KLSAgICAgICAgICBkYi5jaGFuZ2VzKCkuYnlLZXkobmV3IENoYW5nZS5LZXkoY2hhbmdlSWQpKS50b0xpc3QoKTsKLSAgICAgIGlmIChjaGFuZ2VMaXN0LnNpemUoKSAhPSAxKQotICAgICAgICB0aHJvdyBuZXcgVW5sb2dnZWRGYWlsdXJlKDEsICJJbnZhbGlkIENoYW5nZUlkIik7Ci0KLSAgICAgIENoYW5nZSBjID0gY2hhbmdlTGlzdC5nZXQoMCk7Ci0gICAgICBQYXRjaFNldCBwcyA9IGRiLnBhdGNoU2V0cygpLmdldChjLmN1cnJlbnRQYXRjaFNldElkKCkpOwotICAgICAgLy8gV2lsbCB0aHJvdyBleGNlcHRpb24gaWYgY3VycmVudCB1c2VyIGNhbiBub3QgYWNjZXNzIHRoaXMgY2hhbmdlLCBhbmQKLSAgICAgIC8vIHRodXMgd2lsbCBsZWFrIGluZm9ybWF0aW9uIHRoYXQgYSBjaGFuZ2UtaWQgaXMgdmFsaWQgZXZlbiB0aG91Z2ggdGhlCi0gICAgICAvLyB1c2VyIGFyZSBub3QgYWxsb3dlZCB0byBzZWUgdGhlIGNoYW5nZS4KLSAgICAgIC8vIFNlZSBodHRwOi8vY29kZS5nb29nbGUuY29tL3AvZ2Vycml0L2lzc3Vlcy9kZXRhaWw/aWQ9MTU4NgotICAgICAgQ2hhbmdlQ29udHJvbCBjYyA9IGNjRmFjdG9yeS5jb250cm9sRm9yKGMpOwotICAgICAgUHJvamVjdFN0YXRlIHByb2plY3RTdGF0ZSA9IGNjLmdldFByb2plY3RDb250cm9sKCkuZ2V0UHJvamVjdFN0YXRlKCk7Ci0KLSAgICAgIGlmICh1c2VTdGRpbikgewotICAgICAgICBwY2wgPSBlbnZGYWN0b3J5LmNyZWF0ZShuZXdNYWNoaW5lKCkpOwotICAgICAgfSBlbHNlIHsKLSAgICAgICAgcGNsID0gcHJvamVjdFN0YXRlLm5ld1Byb2xvZ0Vudmlyb25tZW50KCk7Ci0gICAgICB9Ci0KLSAgICAgIHBjbC5zZXQoU3RvcmVkVmFsdWVzLlJFVklFV19EQiwgZGIpOwotICAgICAgcGNsLnNldChTdG9yZWRWYWx1ZXMuQ0hBTkdFLCBjKTsKLSAgICAgIHBjbC5zZXQoU3RvcmVkVmFsdWVzLlBBVENIX1NFVCwgcHMpOwotICAgICAgcGNsLnNldChTdG9yZWRWYWx1ZXMuQ0hBTkdFX0NPTlRST0wsIGNjKTsKLSAgICAgIGlmICh1c2VTdGRpbikgewotICAgICAgICBwY2wuaW5pdGlhbGl6ZShQQUNLQUdFX0xJU1QpOwotICAgICAgICBwY2wuZXhlY3V0ZShQcm9sb2cuQlVJTFRJTiwgImNvbnN1bHRfc3RyZWFtIiwKLSAgICAgICAgICAgIFN5bWJvbFRlcm0uaW50ZXJuKCJzdGRpbiIpLCBuZXcgSmF2YU9iamVjdFRlcm0oaW5SZWFkZXIpKTsKLSAgICAgIH0KLQotICAgICAgTGlzdDxUZXJtPiByZXN1bHRzID0gbmV3IEFycmF5TGlzdDxUZXJtPigpOwotICAgICAgVGVybSBzdWJtaXRSdWxlID0KLSAgICAgICAgICBwY2wub25jZSgiZ2Vycml0IiwgImxvY2F0ZV9zdWJtaXRfcnVsZSIsIG5ldyBWYXJpYWJsZVRlcm0oKSk7Ci0KLSAgICAgIGZvciAoVGVybVtdIHRlbXBsYXRlIDogcGNsLmFsbCgiZ2Vycml0IiwgImNhbl9zdWJtaXQiLCBzdWJtaXRSdWxlLAotICAgICAgICAgIG5ldyBWYXJpYWJsZVRlcm0oKSkpIHsKLSAgICAgICAgcmVzdWx0cy5hZGQodGVtcGxhdGVbMV0pOwotICAgICAgfQotCi0gICAgICBpZiAoIXNraXBTdWJtaXRGaWx0ZXJzKSB7Ci0gICAgICAgIHJ1blN1Ym1pdEZpbHRlcnMocHJvamVjdFN0YXRlLCByZXN1bHRzLCBwY2wpOwotICAgICAgfQotCi0gICAgICBMaXN0PFN1Ym1pdFJlY29yZD4gcmVzID0gY2MucmVzdWx0c1RvU3VibWl0UmVjb3JkKHN1Ym1pdFJ1bGUsIHJlc3VsdHMpOwotICAgICAgZm9yIChTdWJtaXRSZWNvcmQgciA6IHJlcykgewotICAgICAgICBpZiAoZm9ybWF0LmlzSnNvbigpKSB7Ci0gICAgICAgICAgU3VibWl0UmVjb3JkQXR0cmlidXRlIHN1Ym1pdFJlY29yZCA9IG5ldyBTdWJtaXRSZWNvcmRBdHRyaWJ1dGUoKTsKLSAgICAgICAgICBzdWJtaXRSZWNvcmQuc3RhdHVzID0gci5zdGF0dXMubmFtZSgpOwotCi0gICAgICAgICAgTGlzdDxTdWJtaXRMYWJlbEF0dHJpYnV0ZT4gc3VibWl0TGFiZWxzID0gbmV3IExpbmtlZExpc3Q8U3VibWl0TGFiZWxBdHRyaWJ1dGU+KCk7Ci0gICAgICAgICAgZm9yKFN1Ym1pdFJlY29yZC5MYWJlbCBsIDogci5sYWJlbHMpIHsKLSAgICAgICAgICAgIFN1Ym1pdExhYmVsQXR0cmlidXRlIGxhYmVsID0gbmV3IFN1Ym1pdExhYmVsQXR0cmlidXRlKCk7Ci0gICAgICAgICAgICBsYWJlbC5sYWJlbCA9IGwubGFiZWw7Ci0gICAgICAgICAgICBsYWJlbC5zdGF0dXM9IGwuc3RhdHVzLm5hbWUoKTsKLSAgICAgICAgICAgIGlmKGwuYXBwbGllZEJ5ICE9IG51bGwpIHsKLSAgICAgICAgICAgICAgQWNjb3VudCBhID0gYWNjb3VudENhY2hlLmdldChsLmFwcGxpZWRCeSkuZ2V0QWNjb3VudCgpOwotICAgICAgICAgICAgICBsYWJlbC5ieSA9IG5ldyBBY2NvdW50QXR0cmlidXRlKCk7Ci0gICAgICAgICAgICAgIGxhYmVsLmJ5LmVtYWlsID0gYS5nZXRQcmVmZXJyZWRFbWFpbCgpOwotICAgICAgICAgICAgICBsYWJlbC5ieS5uYW1lID0gYS5nZXRGdWxsTmFtZSgpOwotICAgICAgICAgICAgICBsYWJlbC5ieS51c2VybmFtZSA9IGEuZ2V0VXNlck5hbWUoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHN1Ym1pdExhYmVscy5hZGQobGFiZWwpOwotICAgICAgICAgIH0KLSAgICAgICAgICBzdWJtaXRSZWNvcmQubGFiZWxzID0gc3VibWl0TGFiZWxzOwotICAgICAgICAgIGZvcm1hdC5uZXdHc29uKCkudG9Kc29uKHN1Ym1pdFJlY29yZCwgbmV3IFR5cGVUb2tlbjxTdWJtaXRSZWNvcmRBdHRyaWJ1dGU+KCkge30uZ2V0VHlwZSgpLCBzdGRvdXQpOwotICAgICAgICAgIHN0ZG91dC5wcmludCgnXG4nKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICBmb3IoU3VibWl0UmVjb3JkLkxhYmVsIGwgOiByLmxhYmVscykgewotICAgICAgICAgICAgc3Rkb3V0LnByaW50KGwubGFiZWwgKyAiOiAiICsgbC5zdGF0dXMpOwotICAgICAgICAgICAgaWYobC5hcHBsaWVkQnkgIT0gbnVsbCkgewotICAgICAgICAgICAgICBBY2NvdW50SW5mbyBhID0gbmV3IEFjY291bnRJbmZvKGFjY291bnRDYWNoZS5nZXQobC5hcHBsaWVkQnkpLmdldEFjY291bnQoKSk7Ci0gICAgICAgICAgICAgIHN0ZG91dC5wcmludCgiIGJ5ICIgKyBhLmdldE5hbWVFbWFpbChhbm9ueW1vdXNDb3dhcmROYW1lKSk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBzdGRvdXQucHJpbnQoJ1xuJyk7Ci0gICAgICAgICAgfQotICAgICAgICAgIHN0ZG91dC5wcmludCgiXG4iICsgci5zdGF0dXMubmFtZSgpICsgIlxuIik7Ci0gICAgICAgIH0KLSAgICAgIH0KLSAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgewotICAgICAgdGhyb3cgbmV3IFVubG9nZ2VkRmFpbHVyZSgiUHJvY2Vzc2luZyBvZiBwcm9sb2cgc2NyaXB0IGZhaWxlZDogIiArIGUpOwotICAgIH0KLSAgfQotCi0gIHByaXZhdGUgdm9pZCBydW5TdWJtaXRGaWx0ZXJzKFByb2plY3RTdGF0ZSBwcm9qZWN0U3RhdGUsIExpc3Q8VGVybT4gcmVzdWx0cywKLSAgICAgIFByb2xvZ0Vudmlyb25tZW50IHBjbCkgdGhyb3dzIFVubG9nZ2VkRmFpbHVyZSB7Ci0gICAgUHJvamVjdFN0YXRlIHBhcmVudFN0YXRlID0gcHJvamVjdFN0YXRlLmdldFBhcmVudFN0YXRlKCk7Ci0gICAgUHJvbG9nRW52aXJvbm1lbnQgY2hpbGRFbnYgPSBwY2w7Ci0gICAgU2V0PFByb2plY3QuTmFtZUtleT4gcHJvamVjdHNTZWVuID0gbmV3IEhhc2hTZXQ8UHJvamVjdC5OYW1lS2V5PigpOwotICAgIHByb2plY3RzU2Vlbi5hZGQocHJvamVjdFN0YXRlLmdldFByb2plY3QoKS5nZXROYW1lS2V5KCkpOwotCi0gICAgd2hpbGUgKHBhcmVudFN0YXRlICE9IG51bGwpIHsKLSAgICAgIGlmICghcHJvamVjdHNTZWVuLmFkZChwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZUtleSgpKSkgewotICAgICAgICAvLyBwYXJlbnQgaGFzIGJlZW4gc2VlbiBiZWZvcmUsIHN0b3Agd2FsayB1cCBpbmhlcml0YW5jZSB0cmVlCi0gICAgICAgIGJyZWFrOwotICAgICAgfQotICAgICAgUHJvbG9nRW52aXJvbm1lbnQgcGFyZW50RW52OwotICAgICAgdHJ5IHsKLSAgICAgICAgcGFyZW50RW52ID0gcGFyZW50U3RhdGUubmV3UHJvbG9nRW52aXJvbm1lbnQoKTsKLSAgICAgIH0gY2F0Y2ggKENvbXBpbGVFeGNlcHRpb24gZXJyKSB7Ci0gICAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoIkNhbm5vdCBjb25zdWx0IHJ1bGVzLnBsIGZvciAiCi0gICAgICAgICAgICArIHBhcmVudFN0YXRlLmdldFByb2plY3QoKS5nZXROYW1lKCkgKyBlcnIpOwotICAgICAgfQotCi0gICAgICBwYXJlbnRFbnYuY29weVN0b3JlZFZhbHVlcyhjaGlsZEVudik7Ci0gICAgICBUZXJtIGZpbHRlclJ1bGUgPQotICAgICAgICAgIHBhcmVudEVudi5vbmNlKCJnZXJyaXQiLCAibG9jYXRlX3N1Ym1pdF9maWx0ZXIiLCBuZXcgVmFyaWFibGVUZXJtKCkpOwotICAgICAgaWYgKGZpbHRlclJ1bGUgIT0gbnVsbCkgewotICAgICAgICB0cnkgewotICAgICAgICAgIFRlcm0gcmVzdWx0c1Rlcm0gPSBDaGFuZ2VDb250cm9sLnRvTGlzdFRlcm0ocmVzdWx0cyk7Ci0gICAgICAgICAgcmVzdWx0cy5jbGVhcigpOwotICAgICAgICAgIFRlcm1bXSB0ZW1wbGF0ZSA9Ci0gICAgICAgICAgICAgIHBhcmVudEVudi5vbmNlKCJnZXJyaXQiLCAiZmlsdGVyX3N1Ym1pdF9yZXN1bHRzIiwgZmlsdGVyUnVsZSwKLSAgICAgICAgICAgICAgICAgIHJlc3VsdHNUZXJtLCBuZXcgVmFyaWFibGVUZXJtKCkpOwotICAgICAgICAgIEBTdXBwcmVzc1dhcm5pbmdzKCJ1bmNoZWNrZWQiKQotICAgICAgICAgIGZpbmFsIExpc3Q8PyBleHRlbmRzIFRlcm0+IHRlcm1MaXN0ID0KLSAgICAgICAgICAgICAgKChMaXN0VGVybSkgdGVtcGxhdGVbMl0pLnRvSmF2YSgpOwotICAgICAgICAgIHJlc3VsdHMuYWRkQWxsKHRlcm1MaXN0KTsKLSAgICAgICAgfSBjYXRjaCAoUHJvbG9nRXhjZXB0aW9uIGVycikgewotICAgICAgICAgIHRocm93IG5ldyBVbmxvZ2dlZEZhaWx1cmUoIkV4Y2VwdGlvbiBjYWxsaW5nICIgKyBmaWx0ZXJSdWxlICsgIiBvZiAiCi0gICAgICAgICAgICAgICsgcGFyZW50U3RhdGUuZ2V0UHJvamVjdCgpLmdldE5hbWUoKSArIGVycik7Ci0gICAgICAgIH0gY2F0Y2ggKFJ1bnRpbWVFeGNlcHRpb24gZXJyKSB7Ci0gICAgICAgICAgdGhyb3cgbmV3IFVubG9nZ2VkRmFpbHVyZSgiRXhjZXB0aW9uIGNhbGxpbmcgIiArIGZpbHRlclJ1bGUgKyAiIG9mICIKLSAgICAgICAgICAgICAgKyBwYXJlbnRTdGF0ZS5nZXRQcm9qZWN0KCkuZ2V0TmFtZSgpICsgZXJyKTsKLSAgICAgICAgfQotICAgICAgfQotCi0gICAgICBwYXJlbnRTdGF0ZSA9IHBhcmVudFN0YXRlLmdldFBhcmVudFN0YXRlKCk7Ci0gICAgICBjaGlsZEVudiA9IHBhcmVudEVudjsKLSAgICB9Ci0gIH0KLX0KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9UZXN0U3VibWl0UnVsZUNvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9UZXN0U3VibWl0UnVsZUNvbW1hbmQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42MzM1MTYwCi0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Rlc3RTdWJtaXRSdWxlQ29tbWFuZC5qYXZhCkBAIC0wLDAgKzEsMzUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLmNvbW1hbmRzOworCitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuZXh0ZW5zaW9ucy5yZXN0YXBpLlJlc3RNb2RpZnlWaWV3OworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuUmV2aXNpb25SZXNvdXJjZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlRlc3RTdWJtaXRSdWxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jaGFuZ2UuVGVzdFN1Ym1pdFJ1bGUuSW5wdXQ7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5Db21tYW5kTWV0YURhdGE7CitpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LlByb3ZpZGVyOworCisvKiogQ29tbWFuZCB0aGF0IGFsbG93cyB0ZXN0aW5nIG9mIHByb2xvZyBzdWJtaXQtcnVsZXMgaW4gYSBsaXZlIGluc3RhbmNlLiAqLworQENvbW1hbmRNZXRhRGF0YShuYW1lID0gInJ1bGUiLCBkZXNjciA9ICJUZXN0IHByb2xvZyBzdWJtaXQgcnVsZXMiKQorZmluYWwgY2xhc3MgVGVzdFN1Ym1pdFJ1bGVDb21tYW5kIGV4dGVuZHMgQmFzZVRlc3RQcm9sb2dDb21tYW5kIHsKKyAgQEluamVjdAorICBwcml2YXRlIFByb3ZpZGVyPFRlc3RTdWJtaXRSdWxlPiB2aWV3OworCisgIEBPdmVycmlkZQorICBwcm90ZWN0ZWQgUmVzdE1vZGlmeVZpZXc8UmV2aXNpb25SZXNvdXJjZSwgSW5wdXQ+IGNyZWF0ZVZpZXcoKSB7CisgICAgcmV0dXJuIHZpZXcuZ2V0KCk7CisgIH0KK30KZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9UZXN0U3VibWl0VHlwZUNvbW1hbmQuamF2YSBiL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9UZXN0U3VibWl0VHlwZUNvbW1hbmQuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zMjZmZjQ2Ci0tLSAvZGV2L251bGwKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1Rlc3RTdWJtaXRUeXBlQ29tbWFuZC5qYXZhCkBAIC0wLDAgKzEsMzUgQEAKKy8vIENvcHlyaWdodCAoQykgMjAxMiBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKy8vCisvLyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisvLyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorLy8gV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisvLyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisvLyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKy8vCisKK3BhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5jb21tYW5kczsKKworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LmV4dGVuc2lvbnMucmVzdGFwaS5SZXN0TW9kaWZ5VmlldzsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlJldmlzaW9uUmVzb3VyY2U7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNoYW5nZS5UZXN0U3VibWl0UnVsZS5JbnB1dDsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuY2hhbmdlLlRlc3RTdWJtaXRUeXBlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuQ29tbWFuZE1ldGFEYXRhOworaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdDsKK2ltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5Qcm92aWRlcjsKKworQENvbW1hbmRNZXRhRGF0YShuYW1lID0gInR5cGUiLCBkZXNjciA9ICJUZXN0IHByb2xvZyBzdWJtaXQgdHlwZSIpCitmaW5hbCBjbGFzcyBUZXN0U3VibWl0VHlwZUNvbW1hbmQgZXh0ZW5kcyBCYXNlVGVzdFByb2xvZ0NvbW1hbmQgeworICBASW5qZWN0CisgIHByaXZhdGUgUHJvdmlkZXI8VGVzdFN1Ym1pdFR5cGU+IHZpZXc7CisKKyAgQE92ZXJyaWRlCisgIHByb3RlY3RlZCBSZXN0TW9kaWZ5VmlldzxSZXZpc2lvblJlc291cmNlLCBJbnB1dD4gY3JlYXRlVmlldygpIHsKKyAgICByZXR1cm4gdmlldy5nZXQoKTsKKyAgfQorfQpkaWZmIC0tZ2l0IGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1VwbG9hZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1VwbG9hZC5qYXZhCmluZGV4IDQ2ZWI3ODguLmZjMTI3ZWMgMTAwNjQ0Ci0tLSBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9VcGxvYWQuamF2YQorKysgYi9nZXJyaXQtc3NoZC9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3NzaGQvY29tbWFuZHMvVXBsb2FkLmphdmEKQEAgLTE1LDYgKzE1LDcgQEAKIHBhY2thZ2UgY29tLmdvb2dsZS5nZXJyaXQuc3NoZC5jb21tYW5kczsKIAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnJldmlld2RiLnNlcnZlci5SZXZpZXdEYjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LkNoYW5nZUNhY2hlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuVGFnQ2FjaGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmdpdC5UcmFuc2ZlckNvbmZpZzsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuZ2l0LlZpc2libGVSZWZGaWx0ZXI7CkBAIC0zNyw2ICszOCw5IEBACiAgIEBJbmplY3QKICAgcHJpdmF0ZSBUYWdDYWNoZSB0YWdDYWNoZTsKIAorICBASW5qZWN0CisgIHByaXZhdGUgQ2hhbmdlQ2FjaGUgY2hhbmdlQ2FjaGU7CisKICAgQE92ZXJyaWRlCiAgIHByb3RlY3RlZCB2b2lkIHJ1bkltcGwoKSB0aHJvd3MgSU9FeGNlcHRpb24sIEZhaWx1cmUgewogICAgIGlmICghcHJvamVjdENvbnRyb2wuY2FuUnVuVXBsb2FkUGFjaygpKSB7CkBAIC00NSw3ICs0OSw3IEBACiAKICAgICBmaW5hbCBVcGxvYWRQYWNrIHVwID0gbmV3IFVwbG9hZFBhY2socmVwbyk7CiAgICAgaWYgKCFwcm9qZWN0Q29udHJvbC5hbGxSZWZzQXJlVmlzaWJsZSgpKSB7Ci0gICAgICB1cC5zZXRBZHZlcnRpc2VSZWZzSG9vayhuZXcgVmlzaWJsZVJlZkZpbHRlcih0YWdDYWNoZSwgcmVwbywKKyAgICAgIHVwLnNldEFkdmVydGlzZVJlZnNIb29rKG5ldyBWaXNpYmxlUmVmRmlsdGVyKHRhZ0NhY2hlLCBjaGFuZ2VDYWNoZSwgcmVwbywKICAgICAgICAgICBwcm9qZWN0Q29udHJvbCwgZGIuZ2V0KCksIHRydWUpKTsKICAgICB9CiAgICAgdXAuc2V0UGFja0NvbmZpZyhjb25maWcuZ2V0UGFja0NvbmZpZygpKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC1zc2hkL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvc3NoZC9jb21tYW5kcy9WZXJzaW9uQ29tbWFuZC5qYXZhIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1ZlcnNpb25Db21tYW5kLmphdmEKaW5kZXggYWRkYmI4NC4uMjA2NmNjMiAxMDA2NDQKLS0tIGEvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1ZlcnNpb25Db21tYW5kLmphdmEKKysrIGIvZ2Vycml0LXNzaGQvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC9zc2hkL2NvbW1hbmRzL1ZlcnNpb25Db21tYW5kLmphdmEKQEAgLTE1LDkgKzE1LDEyIEBACiBwYWNrYWdlIGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHM7CiAKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5jb21tb24uVmVyc2lvbjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLkNvbW1hbmRNZXRhRGF0YTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zc2hkLlNzaENvbW1hbmQ7CiAKK0BDb21tYW5kTWV0YURhdGEobmFtZSA9ICJ2ZXJzaW9uIiwgZGVzY3IgPSAiRGlzcGxheSBnZXJyaXQgdmVyc2lvbiIpCiBmaW5hbCBjbGFzcyBWZXJzaW9uQ29tbWFuZCBleHRlbmRzIFNzaENvbW1hbmQgeworCiAgIEBPdmVycmlkZQogICBwcm90ZWN0ZWQgdm9pZCBydW4oKSB0aHJvd3MgRmFpbHVyZSB7CiAgICAgU3RyaW5nIHYgPSBWZXJzaW9uLmdldFZlcnNpb24oKTsKZGlmZiAtLWdpdCBhL2dlcnJpdC11dGlsLWNsaS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMgYi9nZXJyaXQtdXRpbC1jbGkvLnNldHRpbmdzL29yZy5lY2xpcHNlLmpkdC5jb3JlLnByZWZzCmluZGV4IDQ3MDk0MmQuLjk0MWZiMzEgMTAwNjQ0Ci0tLSBhL2dlcnJpdC11dGlsLWNsaS8uc2V0dGluZ3Mvb3JnLmVjbGlwc2UuamR0LmNvcmUucHJlZnMKKysrIGIvZ2Vycml0LXV0aWwtY2xpLy5zZXR0aW5ncy9vcmcuZWNsaXBzZS5qZHQuY29yZS5wcmVmcwpAQCAtNyw2ICs3LDcgQEAKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxpbmVOdW1iZXI9Z2VuZXJhdGUKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLmxvY2FsVmFyaWFibGU9Z2VuZXJhdGUKIG9yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLmRlYnVnLnNvdXJjZUZpbGU9Z2VuZXJhdGUKK29yZy5lY2xpcHNlLmpkdC5jb3JlLmNvbXBpbGVyLnByb2JsZW0uYW5ub3RhdGlvblN1cGVySW50ZXJmYWNlPWlnbm9yZQogb3JnLmVjbGlwc2UuamR0LmNvcmUuY29tcGlsZXIucHJvYmxlbS5hc3NlcnRJZGVudGlmaWVyPWVycm9yCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmVudW1JZGVudGlmaWVyPWVycm9yCiBvcmcuZWNsaXBzZS5qZHQuY29yZS5jb21waWxlci5wcm9ibGVtLmZvcmJpZGRlblJlZmVyZW5jZT13YXJuaW5nCmRpZmYgLS1naXQgYS9nZXJyaXQtdXRpbC1jbGkvcG9tLnhtbCBiL2dlcnJpdC11dGlsLWNsaS9wb20ueG1sCmluZGV4IDQ4ODZkMDkuLjA0ZTNiMDkgMTAwNjQ0Ci0tLSBhL2dlcnJpdC11dGlsLWNsaS9wb20ueG1sCisrKyBiL2dlcnJpdC11dGlsLWNsaS9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtdXRpbC1jbGk8L2FydGlmYWN0SWQ+CkBAIC0zOSw2ICszOSwxMSBAQAogICAgIDwvZGVwZW5kZW5jeT4KIAogICAgIDxkZXBlbmRlbmN5PgorICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5ndWF2YTwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPmd1YXZhPC9hcnRpZmFjdElkPgorICAgIDwvZGVwZW5kZW5jeT4KKworICAgIDxkZXBlbmRlbmN5PgogICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5pbmplY3Q8L2dyb3VwSWQ+CiAgICAgICA8YXJ0aWZhY3RJZD5ndWljZTwvYXJ0aWZhY3RJZD4KICAgICA8L2RlcGVuZGVuY3k+CmRpZmYgLS1naXQgYS9nZXJyaXQtdXRpbC1jbGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC91dGlsL2NsaS9DbWRMaW5lUGFyc2VyLmphdmEgYi9nZXJyaXQtdXRpbC1jbGkvc3JjL21haW4vamF2YS9jb20vZ29vZ2xlL2dlcnJpdC91dGlsL2NsaS9DbWRMaW5lUGFyc2VyLmphdmEKaW5kZXggYTlmNTIyOS4uNjk1OThjZSAxMDA2NDQKLS0tIGEvZ2Vycml0LXV0aWwtY2xpL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvdXRpbC9jbGkvQ21kTGluZVBhcnNlci5qYXZhCisrKyBiL2dlcnJpdC11dGlsLWNsaS9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L3V0aWwvY2xpL0NtZExpbmVQYXJzZXIuamF2YQpAQCAtMzQsNiArMzQsMTAgQEAKIAogcGFja2FnZSBjb20uZ29vZ2xlLmdlcnJpdC51dGlsLmNsaTsKIAoraW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlua2VkSGFzaE11bHRpbWFwOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTGlzdHM7CitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5NYXBzOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuTXVsdGltYXA7CiBpbXBvcnQgY29tLmdvb2dsZS5pbmplY3QuSW5qZWN0OwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LkluamVjdG9yOwogaW1wb3J0IGNvbS5nb29nbGUuaW5qZWN0LktleTsKQEAgLTU0LDExICs1OCw5IEBACiBpbXBvcnQgamF2YS5pby5Xcml0ZXI7CiBpbXBvcnQgamF2YS5sYW5nLmFubm90YXRpb24uQW5ub3RhdGlvbjsKIGltcG9ydCBqYXZhLnV0aWwuQXJyYXlMaXN0OwotaW1wb3J0IGphdmEudXRpbC5Db2xsZWN0aW9uczsKIGltcG9ydCBqYXZhLnV0aWwuTGlzdDsKIGltcG9ydCBqYXZhLnV0aWwuTWFwOwogaW1wb3J0IGphdmEudXRpbC5SZXNvdXJjZUJ1bmRsZTsKLWltcG9ydCBqYXZhLnV0aWwuU2V0OwogCiAvKioKICAqIEV4dGVuZGVkIGNvbW1hbmQgbGluZSBwYXJzZXIgd2hpY2ggaGFuZGxlcyAtLWZvbz12YWx1ZSBhcmd1bWVudHMuCkBAIC03Niw2ICs3OCw5IEBACiAgIHByaXZhdGUgZmluYWwgSW5qZWN0b3IgaW5qZWN0b3I7CiAgIHByaXZhdGUgZmluYWwgTXlQYXJzZXIgcGFyc2VyOwogCisgIEBTdXBwcmVzc1dhcm5pbmdzKCJyYXd0eXBlcyIpCisgIHByaXZhdGUgTWFwPFN0cmluZywgT3B0aW9uSGFuZGxlcj4gb3B0aW9uczsKKwogICAvKioKICAgICogQ3JlYXRlcyBhIG5ldyBjb21tYW5kIGxpbmUgb3duZXIgdGhhdCBwYXJzZXMgYXJndW1lbnRzL29wdGlvbnMgYW5kIHNldCB0aGVtCiAgICAqIGludG8gdGhlIGdpdmVuIG9iamVjdC4KQEAgLTE4Niw3ICsxOTEsNyBAQAogICB9CiAKICAgcHVibGljIHZvaWQgcGFyc2VBcmd1bWVudChmaW5hbCBTdHJpbmcuLi4gYXJncykgdGhyb3dzIENtZExpbmVFeGNlcHRpb24gewotICAgIGZpbmFsIEFycmF5TGlzdDxTdHJpbmc+IHRtcCA9IG5ldyBBcnJheUxpc3Q8U3RyaW5nPihhcmdzLmxlbmd0aCk7CisgICAgTGlzdDxTdHJpbmc+IHRtcCA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eShhcmdzLmxlbmd0aCk7CiAgICAgZm9yIChpbnQgYXJnaSA9IDA7IGFyZ2kgPCBhcmdzLmxlbmd0aDsgYXJnaSsrKSB7CiAgICAgICBmaW5hbCBTdHJpbmcgc3RyID0gYXJnc1thcmdpXTsKICAgICAgIGlmIChzdHIuZXF1YWxzKCItLSIpKSB7CkBAIC0yMTEsMzYgKzIxNiwzMiBAQAogCiAgIHB1YmxpYyB2b2lkIHBhcnNlT3B0aW9uTWFwKE1hcDxTdHJpbmcsIFN0cmluZ1tdPiBwYXJhbWV0ZXJzKQogICAgICAgdGhyb3dzIENtZExpbmVFeGNlcHRpb24gewotICAgIHBhcnNlT3B0aW9uTWFwKHBhcmFtZXRlcnMsIENvbGxlY3Rpb25zLjxTdHJpbmc+ZW1wdHlTZXQoKSk7CisgICAgTXVsdGltYXA8U3RyaW5nLCBTdHJpbmc+IG1hcCA9IExpbmtlZEhhc2hNdWx0aW1hcC5jcmVhdGUoKTsKKyAgICBmb3IgKE1hcC5FbnRyeTxTdHJpbmcsIFN0cmluZ1tdPiBlbnQgOiBwYXJhbWV0ZXJzLmVudHJ5U2V0KCkpIHsKKyAgICAgIGZvciAoU3RyaW5nIHZhbCA6IGVudC5nZXRWYWx1ZSgpKSB7CisgICAgICAgIG1hcC5wdXQoZW50LmdldEtleSgpLCB2YWwpOworICAgICAgfQorICAgIH0KKyAgICBwYXJzZU9wdGlvbk1hcChtYXApOwogICB9CiAKLSAgcHVibGljIHZvaWQgcGFyc2VPcHRpb25NYXAoTWFwPFN0cmluZywgU3RyaW5nW10+IHBhcmFtZXRlcnMsCi0gICAgICBTZXQ8U3RyaW5nPiBhcmdOYW1lcykKKyAgcHVibGljIHZvaWQgcGFyc2VPcHRpb25NYXAoTXVsdGltYXA8U3RyaW5nLCBTdHJpbmc+IHBhcmFtcykKICAgICAgIHRocm93cyBDbWRMaW5lRXhjZXB0aW9uIHsKLSAgICBBcnJheUxpc3Q8U3RyaW5nPiB0bXAgPSBuZXcgQXJyYXlMaXN0PFN0cmluZz4oKTsKLSAgICBmb3IgKE1hcC5FbnRyeTxTdHJpbmcsIFN0cmluZ1tdPiBlbnQgOiBwYXJhbWV0ZXJzLmVudHJ5U2V0KCkpIHsKLSAgICAgIFN0cmluZyBuYW1lID0gZW50LmdldEtleSgpOwotICAgICAgaWYgKCFuYW1lLnN0YXJ0c1dpdGgoIi0iKSkgewotICAgICAgICBpZiAobmFtZS5sZW5ndGgoKSA9PSAxKSB7Ci0gICAgICAgICAgbmFtZSA9ICItIiArIG5hbWU7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgbmFtZSA9ICItLSIgKyBuYW1lOwotICAgICAgICB9Ci0gICAgICB9CisgICAgTGlzdDxTdHJpbmc+IHRtcCA9IExpc3RzLm5ld0FycmF5TGlzdFdpdGhDYXBhY2l0eSgyICogcGFyYW1zLnNpemUoKSk7CisgICAgZm9yIChmaW5hbCBTdHJpbmcga2V5IDogcGFyYW1zLmtleVNldCgpKSB7CisgICAgICBTdHJpbmcgbmFtZSA9IG1ha2VPcHRpb24oa2V5KTsKIAotICAgICAgaWYgKGZpbmRIYW5kbGVyKG5hbWUpIGluc3RhbmNlb2YgQm9vbGVhbk9wdGlvbkhhbmRsZXIpIHsKKyAgICAgIGlmIChpc0Jvb2xlYW4obmFtZSkpIHsKICAgICAgICAgYm9vbGVhbiBvbiA9IGZhbHNlOwotICAgICAgICBmb3IgKFN0cmluZyB2YWx1ZSA6IGVudC5nZXRWYWx1ZSgpKSB7Ci0gICAgICAgICAgb24gPSB0b0Jvb2xlYW4oZW50LmdldEtleSgpLCB2YWx1ZSk7CisgICAgICAgIGZvciAoU3RyaW5nIHZhbHVlIDogcGFyYW1zLmdldChrZXkpKSB7CisgICAgICAgICAgb24gPSB0b0Jvb2xlYW4oa2V5LCB2YWx1ZSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG9uKSB7CiAgICAgICAgICAgdG1wLmFkZChuYW1lKTsKICAgICAgICAgfQogICAgICAgfSBlbHNlIHsKLSAgICAgICAgZm9yIChTdHJpbmcgdmFsdWUgOiBlbnQuZ2V0VmFsdWUoKSkgewotICAgICAgICAgIGlmICghYXJnTmFtZXMuY29udGFpbnMoZW50LmdldEtleSgpKSkgewotICAgICAgICAgICAgdG1wLmFkZChuYW1lKTsKLSAgICAgICAgICB9CisgICAgICAgIGZvciAoU3RyaW5nIHZhbHVlIDogcGFyYW1zLmdldChrZXkpKSB7CisgICAgICAgICAgdG1wLmFkZChuYW1lKTsKICAgICAgICAgICB0bXAuYWRkKHZhbHVlKTsKICAgICAgICAgfQogICAgICAgfQpAQCAtMjQ4LDIyICsyNDksNDQgQEAKICAgICBwYXJzZXIucGFyc2VBcmd1bWVudCh0bXAudG9BcnJheShuZXcgU3RyaW5nW3RtcC5zaXplKCldKSk7CiAgIH0KIAorICBwdWJsaWMgYm9vbGVhbiBpc0Jvb2xlYW4oU3RyaW5nIG5hbWUpIHsKKyAgICByZXR1cm4gZmluZEhhbmRsZXIobWFrZU9wdGlvbihuYW1lKSkgaW5zdGFuY2VvZiBCb29sZWFuT3B0aW9uSGFuZGxlcjsKKyAgfQorCisgIHByaXZhdGUgU3RyaW5nIG1ha2VPcHRpb24oU3RyaW5nIG5hbWUpIHsKKyAgICBpZiAoIW5hbWUuc3RhcnRzV2l0aCgiLSIpKSB7CisgICAgICBpZiAobmFtZS5sZW5ndGgoKSA9PSAxKSB7CisgICAgICAgIG5hbWUgPSAiLSIgKyBuYW1lOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgbmFtZSA9ICItLSIgKyBuYW1lOworICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbmFtZTsKKyAgfQorCiAgIEBTdXBwcmVzc1dhcm5pbmdzKCJyYXd0eXBlcyIpCiAgIHByaXZhdGUgT3B0aW9uSGFuZGxlciBmaW5kSGFuZGxlcihTdHJpbmcgbmFtZSkgewotICAgIGZvciAoT3B0aW9uSGFuZGxlciBoYW5kbGVyIDogcGFyc2VyLm9wdGlvbnMpIHsKKyAgICBpZiAob3B0aW9ucyA9PSBudWxsKSB7CisgICAgICBvcHRpb25zID0gaW5kZXgocGFyc2VyLm9wdGlvbnMpOworICAgIH0KKyAgICByZXR1cm4gb3B0aW9ucy5nZXQobmFtZSk7CisgIH0KKworICBAU3VwcHJlc3NXYXJuaW5ncygicmF3dHlwZXMiKQorICBwcml2YXRlIHN0YXRpYyBNYXA8U3RyaW5nLCBPcHRpb25IYW5kbGVyPiBpbmRleChMaXN0PE9wdGlvbkhhbmRsZXI+IGluKSB7CisgICAgTWFwPFN0cmluZywgT3B0aW9uSGFuZGxlcj4gbSA9IE1hcHMubmV3SGFzaE1hcCgpOworICAgIGZvciAoT3B0aW9uSGFuZGxlciBoYW5kbGVyIDogaW4pIHsKICAgICAgIGlmIChoYW5kbGVyLm9wdGlvbiBpbnN0YW5jZW9mIE5hbWVkT3B0aW9uRGVmKSB7CiAgICAgICAgIE5hbWVkT3B0aW9uRGVmIGRlZiA9IChOYW1lZE9wdGlvbkRlZikgaGFuZGxlci5vcHRpb247Ci0gICAgICAgIGlmIChuYW1lLmVxdWFscyhkZWYubmFtZSgpKSkgewotICAgICAgICAgIHJldHVybiBoYW5kbGVyOwotICAgICAgICB9Ci0gICAgICAgIGZvciAoU3RyaW5nIGFsaWFzIDogZGVmLmFsaWFzZXMoKSkgewotICAgICAgICAgIGlmIChuYW1lLmVxdWFscyhhbGlhcykpIHsKLSAgICAgICAgICAgIHJldHVybiBoYW5kbGVyOworICAgICAgICBpZiAoIWRlZi5pc0FyZ3VtZW50KCkpIHsKKyAgICAgICAgICBtLnB1dChkZWYubmFtZSgpLCBoYW5kbGVyKTsKKyAgICAgICAgICBmb3IgKFN0cmluZyBhbGlhcyA6IGRlZi5hbGlhc2VzKCkpIHsKKyAgICAgICAgICAgIG0ucHV0KGFsaWFzLCBoYW5kbGVyKTsKICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgIH0KICAgICB9Ci0gICAgcmV0dXJuIG51bGw7CisgICAgcmV0dXJuIG07CiAgIH0KIAogICBwcml2YXRlIGJvb2xlYW4gdG9Cb29sZWFuKFN0cmluZyBuYW1lLCBTdHJpbmcgdmFsdWUpIHRocm93cyBDbWRMaW5lRXhjZXB0aW9uIHsKQEAgLTMyNCwxMSArMzQ3LDEwIEBACiAgICAgICByZXR1cm4gaGFuZGxlcjsKICAgICB9CiAKLSAgICBAU3VwcHJlc3NXYXJuaW5ncygicmF3dHlwZXMiKQogICAgIHByaXZhdGUgdm9pZCBlbnN1cmVPcHRpb25zSW5pdGlhbGl6ZWQoKSB7CiAgICAgICBpZiAob3B0aW9ucyA9PSBudWxsKSB7CiAgICAgICAgIGhlbHAgPSBuZXcgSGVscE9wdGlvbigpOwotICAgICAgICBvcHRpb25zID0gbmV3IEFycmF5TGlzdDxPcHRpb25IYW5kbGVyPigpOworICAgICAgICBvcHRpb25zID0gTGlzdHMubmV3QXJyYXlMaXN0KCk7CiAgICAgICAgIGFkZE9wdGlvbihoZWxwLCBoZWxwKTsKICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9nZXJyaXQtdXRpbC1zc2wvcG9tLnhtbCBiL2dlcnJpdC11dGlsLXNzbC9wb20ueG1sCmluZGV4IGJlZWRiOGYuLjY5YWUzYjUgMTAwNjQ0Ci0tLSBhL2dlcnJpdC11dGlsLXNzbC9wb20ueG1sCisrKyBiL2dlcnJpdC11dGlsLXNzbC9wb20ueG1sCkBAIC0yMiw3ICsyMiw3IEBACiAgIDxwYXJlbnQ+CiAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nZXJyaXQ8L2dyb3VwSWQ+CiAgICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KLSAgICA8dmVyc2lvbj4yLjUtU05BUFNIT1Q8L3ZlcnNpb24+CisgICAgPHZlcnNpb24+Mi42LVNOQVBTSE9UPC92ZXJzaW9uPgogICA8L3BhcmVudD4KIAogICA8YXJ0aWZhY3RJZD5nZXJyaXQtdXRpbC1zc2w8L2FydGlmYWN0SWQ+CmRpZmYgLS1naXQgYS9nZXJyaXQtd2FyL3BvbS54bWwgYi9nZXJyaXQtd2FyL3BvbS54bWwKaW5kZXggMWYzNzUwZS4uMGViYmM4YSAxMDA2NDQKLS0tIGEvZ2Vycml0LXdhci9wb20ueG1sCisrKyBiL2dlcnJpdC13YXIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8cGFyZW50PgogICAgIDxncm91cElkPmNvbS5nb29nbGUuZ2Vycml0PC9ncm91cElkPgogICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wYXJlbnQ8L2FydGlmYWN0SWQ+Ci0gICAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICAgIDx2ZXJzaW9uPjIuNi1TTkFQU0hPVDwvdmVyc2lvbj4KICAgPC9wYXJlbnQ+CiAKICAgPGFydGlmYWN0SWQ+Z2Vycml0LXdhcjwvYXJ0aWZhY3RJZD4KQEAgLTM2LDkgKzM2LDggQEAKICAgPGRlcGVuZGVuY2llcz4KICAgICA8ZGVwZW5kZW5jeT4KICAgICAgIDxncm91cElkPm9yZy5hcGFjaGUudG9tY2F0PC9ncm91cElkPgotICAgICAgPGFydGlmYWN0SWQ+c2VydmxldC1hcGk8L2FydGlmYWN0SWQ+Ci0gICAgICA8IS0tIGNvbXBpbGUsIG5vdCBwcm92aWRlZC4gb3VyIGVtYmVkZGVkIEpldHR5IG5lZWRzIHRoaXMgLS0+Ci0gICAgICA8c2NvcGU+Y29tcGlsZTwvc2NvcGU+CisgICAgICA8YXJ0aWZhY3RJZD50b21jYXQtc2VydmxldC1hcGk8L2FydGlmYWN0SWQ+CisgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgogICAgIDwvZGVwZW5kZW5jeT4KIAogICAgIDxkZXBlbmRlbmN5PgpAQCAtNTksMTQgKzU4LDEyIEBACiAgICAgPGRlcGVuZGVuY3k+CiAgICAgICA8Z3JvdXBJZD5ib3VuY3ljYXN0bGU8L2dyb3VwSWQ+CiAgICAgICA8YXJ0aWZhY3RJZD5iY3Byb3YtamRrMTU8L2FydGlmYWN0SWQ+Ci0gICAgICA8dmVyc2lvbj4xNDA8L3ZlcnNpb24+CiAgICAgICA8c2NvcGU+cHJvdmlkZWQ8L3Njb3BlPgogICAgIDwvZGVwZW5kZW5jeT4KIAogICAgIDxkZXBlbmRlbmN5PgogICAgICAgPGdyb3VwSWQ+Ym91bmN5Y2FzdGxlPC9ncm91cElkPgogICAgICAgPGFydGlmYWN0SWQ+YmNwZy1qZGsxNTwvYXJ0aWZhY3RJZD4KLSAgICAgIDx2ZXJzaW9uPjE0MDwvdmVyc2lvbj4KICAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+CiAgICAgPC9kZXBlbmRlbmN5PgogCkBAIC0xMDIsMTAgKzk5LDg5IEBACiAgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgICAgIDxhcnRpZmFjdElkPmdlcnJpdC1wZ208L2FydGlmYWN0SWQ+CiAgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8ZXhjbHVzaW9ucz4KKyAgICAgICAgPGV4Y2x1c2lvbj4KKyAgICAgICAgICA8Z3JvdXBJZD5vcmcuZWNsaXBzZS5qZXR0eTwvZ3JvdXBJZD4KKyAgICAgICAgICA8YXJ0aWZhY3RJZD5qZXR0eS1zZXJ2bGV0PC9hcnRpZmFjdElkPgorICAgICAgICA8L2V4Y2x1c2lvbj4KKyAgICAgIDwvZXhjbHVzaW9ucz4KKyAgICA8L2RlcGVuZGVuY3k+CisKKyAgICA8ZGVwZW5kZW5jeT4KKyAgICAgIDxncm91cElkPm9yZy5lY2xpcHNlLmpldHR5PC9ncm91cElkPgorICAgICAgPGFydGlmYWN0SWQ+amV0dHktc2VydmxldDwvYXJ0aWZhY3RJZD4KKyAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+CisgICAgPC9kZXBlbmRlbmN5PgorCisgICAgPGRlcGVuZGVuY3k+CisgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLnRvbWNhdDwvZ3JvdXBJZD4KKyAgICAgIDxhcnRpZmFjdElkPnNlcnZsZXQtYXBpPC9hcnRpZmFjdElkPgorICAgICAgPHNjb3BlPnByb3ZpZGVkPC9zY29wZT4KICAgICA8L2RlcGVuZGVuY3k+CiAgIDwvZGVwZW5kZW5jaWVzPgogCisgIDxwcm9maWxlcz4KKyAgICA8cHJvZmlsZT4KKyAgICAgIDxpZD5wbHVnaW5zPC9pZD4KKyAgICAgIDxhY3RpdmF0aW9uPgorICAgICAgICA8cHJvcGVydHk+CisgICAgICAgICAgPG5hbWU+IWdlcnJpdC5wbHVnaW5zLnNraXA8L25hbWU+CisgICAgICAgIDwvcHJvcGVydHk+CisgICAgICA8L2FjdGl2YXRpb24+CisgICAgICA8ZGVwZW5kZW5jaWVzPgorICAgICAgICA8IS0tIENPUkUgUExVR0lOIExJU1QgLS0+CisgICAgICAgIDxkZXBlbmRlbmN5PgorICAgICAgICAgIDxncm91cElkPmNvbS5nb29nbGVzb3VyY2UuZ2Vycml0LnBsdWdpbnMucmVwbGljYXRpb248L2dyb3VwSWQ+CisgICAgICAgICAgPGFydGlmYWN0SWQ+cmVwbGljYXRpb248L2FydGlmYWN0SWQ+CisgICAgICAgICAgPHZlcnNpb24+JHtwcm9qZWN0LnZlcnNpb259PC92ZXJzaW9uPgorICAgICAgICAgIDxzY29wZT5wcm92aWRlZDwvc2NvcGU+CisgICAgICAgIDwvZGVwZW5kZW5jeT4KKyAgICAgICAgPGRlcGVuZGVuY3k+CisgICAgICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZXNvdXJjZS5nZXJyaXQucGx1Z2lucy5yZXZpZXdub3RlczwvZ3JvdXBJZD4KKyAgICAgICAgICA8YXJ0aWZhY3RJZD5yZXZpZXdub3RlczwvYXJ0aWZhY3RJZD4KKyAgICAgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CisgICAgICAgICAgPHNjb3BlPnByb3ZpZGVkPC9zY29wZT4KKyAgICAgICAgPC9kZXBlbmRlbmN5PgorICAgICAgICA8ZGVwZW5kZW5jeT4KKyAgICAgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlc291cmNlLmdlcnJpdC5wbHVnaW5zLnZhbGlkYXRvcnM8L2dyb3VwSWQ+CisgICAgICAgICAgPGFydGlmYWN0SWQ+Y29tbWl0LW1lc3NhZ2UtbGVuZ3RoLXZhbGlkYXRvcjwvYXJ0aWZhY3RJZD4KKyAgICAgICAgICA8dmVyc2lvbj4ke3Byb2plY3QudmVyc2lvbn08L3ZlcnNpb24+CisgICAgICAgICAgPHNjb3BlPnByb3ZpZGVkPC9zY29wZT4KKyAgICAgICAgPC9kZXBlbmRlbmN5PgorICAgICAgPC9kZXBlbmRlbmNpZXM+CisgICAgPC9wcm9maWxlPgorICA8L3Byb2ZpbGVzPgorCiAgIDxidWlsZD4KKwk8cGx1Z2luTWFuYWdlbWVudD4KKwkgIDxwbHVnaW5zPgorCSAgICA8cGx1Z2luPgorCSAgICAgIDxncm91cElkPm9yZy5lY2xpcHNlLm0yZTwvZ3JvdXBJZD4KKwkgICAgICA8YXJ0aWZhY3RJZD5saWZlY3ljbGUtbWFwcGluZzwvYXJ0aWZhY3RJZD4KKwkgICAgICA8dmVyc2lvbj4xLjAuMDwvdmVyc2lvbj4KKwkgICAgICA8Y29uZmlndXJhdGlvbj4KKwkgICAgICAgIDxsaWZlY3ljbGVNYXBwaW5nTWV0YWRhdGE+CisJICAgICAgICAgIDxwbHVnaW5FeGVjdXRpb25zPgorCSAgICAgICAgICAgIDxwbHVnaW5FeGVjdXRpb24+CisJICAgICAgICAgICAgICA8cGx1Z2luRXhlY3V0aW9uRmlsdGVyPgorCSAgICAgICAgICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+CisJICAgICAgICAgICAgICAgIDxhcnRpZmFjdElkPm1hdmVuLWRlcGVuZGVuY3ktcGx1Z2luPC9hcnRpZmFjdElkPgorCSAgICAgICAgICAgICAgICA8dmVyc2lvblJhbmdlPlsyLjAsKTwvdmVyc2lvblJhbmdlPgorCSAgICAgICAgICAgICAgICA8Z29hbHM+CisJICAgICAgICAgICAgICAgICAgPGdvYWw+Y29weS1kZXBlbmRlbmNpZXM8L2dvYWw+CisJICAgICAgICAgICAgICAgICAgPGdvYWw+dW5wYWNrPC9nb2FsPmdvYWw+CisJICAgICAgICAgICAgICAgIDwvZ29hbHM+CisJICAgICAgICAgICAgICA8L3BsdWdpbkV4ZWN1dGlvbkZpbHRlcj4KKwkgICAgICAgICAgICAgIDxhY3Rpb24+CisJICAgICAgICAgICAgICAgIDxleGVjdXRlIC8+CisJICAgICAgICAgICAgICA8L2FjdGlvbj4KKwkgICAgICAgICAgICA8L3BsdWdpbkV4ZWN1dGlvbj4KKwkgICAgICAgICAgPC9wbHVnaW5FeGVjdXRpb25zPgorCSAgICAgICAgPC9saWZlY3ljbGVNYXBwaW5nTWV0YWRhdGE+CisJICAgICAgPC9jb25maWd1cmF0aW9uPgorCSAgICA8L3BsdWdpbj4KKwkgIDwvcGx1Z2lucz4KKwk8L3BsdWdpbk1hbmFnZW1lbnQ+CiAgICAgPHBsdWdpbnM+CiAgICAgICA8cGx1Z2luPgogICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+CkBAIC0xMzgsOSArMjE0LDU5IEBACiAKICAgICAgIDxwbHVnaW4+CiAgICAgICAgIDxncm91cElkPm9yZy5hcGFjaGUubWF2ZW4ucGx1Z2luczwvZ3JvdXBJZD4KKyAgICAgICAgPGFydGlmYWN0SWQ+bWF2ZW4tZGVwZW5kZW5jeS1wbHVnaW48L2FydGlmYWN0SWQ+CisgICAgICAgIDxleGVjdXRpb25zPgorICAgICAgICAgIDxleGVjdXRpb24+CisgICAgICAgICAgICA8aWQ+Y29weS1zZXJ2bGV0LWFwaTwvaWQ+CisgICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICAgICAgPGluY2x1ZGVHcm91cElkcz5vcmcuYXBhY2hlLnRvbWNhdCxvcmcuZWNsaXBzZS5qZXR0eTwvaW5jbHVkZUdyb3VwSWRzPgorICAgICAgICAgICAgICA8ZXhjbHVkZUFydGlmYWN0SWRzPnNlcnZsZXQtYXBpPC9leGNsdWRlQXJ0aWZhY3RJZHM+CisgICAgICAgICAgICA8L2NvbmZpZ3VyYXRpb24+CisgICAgICAgICAgICA8Z29hbHM+CisgICAgICAgICAgICAgIDxnb2FsPmNvcHktZGVwZW5kZW5jaWVzPC9nb2FsPgorICAgICAgICAgICAgPC9nb2Fscz4KKyAgICAgICAgICA8L2V4ZWN1dGlvbj4KKyAgICAgICAgICA8ZXhlY3V0aW9uPgorICAgICAgICAgICAgPGlkPmNvcHktcGx1Z2luczwvaWQ+CisgICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICAgICAgPCEtLSBDT1JFIFBMVUdJTiBMSVNUIC0tPgorICAgICAgICAgICAgICA8aW5jbHVkZUFydGlmYWN0SWRzPmNvbW1pdC1tZXNzYWdlLWxlbmd0aC12YWxpZGF0b3IscmVwbGljYXRpb24scmV2aWV3bm90ZXM8L2luY2x1ZGVBcnRpZmFjdElkcz4KKyAgICAgICAgICAgICAgPGluY2x1ZGVUeXBlcz5qYXI8L2luY2x1ZGVUeXBlcz4KKyAgICAgICAgICAgICAgPHN0cmlwVmVyc2lvbj50cnVlPC9zdHJpcFZlcnNpb24+CisgICAgICAgICAgICAgIDxvdXRwdXREaXJlY3Rvcnk+JHtwcm9qZWN0LmJ1aWxkLmRpcmVjdG9yeX0vJHtwcm9qZWN0LmJ1aWxkLmZpbmFsTmFtZX0vV0VCLUlORi9wbHVnaW5zPC9vdXRwdXREaXJlY3Rvcnk+CisgICAgICAgICAgICA8L2NvbmZpZ3VyYXRpb24+CisgICAgICAgICAgICA8Z29hbHM+CisgICAgICAgICAgICAgIDxnb2FsPmNvcHktZGVwZW5kZW5jaWVzPC9nb2FsPgorICAgICAgICAgICAgPC9nb2Fscz4KKyAgICAgICAgICA8L2V4ZWN1dGlvbj4KKyAgICAgICAgPC9leGVjdXRpb25zPgorICAgICAgPC9wbHVnaW4+CisKKyAgICAgIDxwbHVnaW4+CisgICAgICAgIDxncm91cElkPm9yZy5hcGFjaGUubWF2ZW4ucGx1Z2luczwvZ3JvdXBJZD4KICAgICAgICAgPGFydGlmYWN0SWQ+bWF2ZW4tYW50cnVuLXBsdWdpbjwvYXJ0aWZhY3RJZD4KICAgICAgICAgPGV4ZWN1dGlvbnM+CiAgICAgICAgICAgPGV4ZWN1dGlvbj4KKyAgICAgICAgICAgIDxpZD5jb3B5LXNlcnZsZXQtYXBpPC9pZD4KKyAgICAgICAgICAgIDxwaGFzZT5wcm9jZXNzLWNsYXNzZXM8L3BoYXNlPgorICAgICAgICAgICAgPGNvbmZpZ3VyYXRpb24+CisgICAgICAgICAgICAgIDx0YXJnZXQ+CisgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9InNyYyIgbG9jYXRpb249IiR7cHJvamVjdC5idWlsZC5kaXJlY3Rvcnl9L2RlcGVuZGVuY3kiIC8+CisgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImRzdCIgbG9jYXRpb249IiR7cHJvamVjdC5idWlsZC5kaXJlY3Rvcnl9LyR7cHJvamVjdC5idWlsZC5maW5hbE5hbWV9L1dFQi1JTkYvcGdtLWxpYiIgLz4KKworICAgICAgICAgICAgICAgIDxta2RpciBkaXI9IiR7ZHN0fSIgLz4KKyAgICAgICAgICAgICAgICA8Y29weSBvdmVyd3JpdGU9InRydWUiIHRvZGlyPSIke2RzdH0iPgorICAgICAgICAgICAgICAgICAgPGZpbGVzZXQgZGlyPSIke3NyY30iPgorICAgICAgICAgICAgICAgICAgICA8aW5jbHVkZSBuYW1lPSIqLmphciIgLz4KKyAgICAgICAgICAgICAgICAgIDwvZmlsZXNldD4KKyAgICAgICAgICAgICAgICA8L2NvcHk+CisgICAgICAgICAgICAgIDwvdGFyZ2V0PgorICAgICAgICAgICAgPC9jb25maWd1cmF0aW9uPgorICAgICAgICAgICAgPGdvYWxzPgorICAgICAgICAgICAgICA8Z29hbD5ydW48L2dvYWw+CisgICAgICAgICAgICA8L2dvYWxzPgorICAgICAgICAgIDwvZXhlY3V0aW9uPgorICAgICAgICAgIDxleGVjdXRpb24+CiAgICAgICAgICAgICA8aWQ+Y29weS1saWNlbnNlPC9pZD4KICAgICAgICAgICAgIDxwaGFzZT5wcm9jZXNzLWNsYXNzZXM8L3BoYXNlPgogICAgICAgICAgICAgPGNvbmZpZ3VyYXRpb24+CkBAIC0xNjEsNyArMjg3LDcgQEAKICAgICAgICAgICAgIDxpZD5pbmNsdWRlLWRvY3VtZW50YXRpb248L2lkPgogICAgICAgICAgICAgPHBoYXNlPnByb2Nlc3MtY2xhc3NlczwvcGhhc2U+CiAgICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KLSAgICAgICAgICAgICAgPHRhcmdldCBpZj0iZ2Vycml0LmluY2x1ZGUtZG9jdW1lbnRhdGlvbiI+CisgICAgICAgICAgICAgIDx0YXJnZXQgdW5sZXNzPSJnZXJyaXQuZG9jdW1lbnRhdGlvbi5za2lwIj4KICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0ic3JjIiBsb2NhdGlvbj0iJHtiYXNlZGlyfS8uLi9Eb2N1bWVudGF0aW9uIiAvPgogICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJvdXQiIGxvY2F0aW9uPSIke3Byb2plY3QuYnVpbGQuZGlyZWN0b3J5fS8ke3Byb2plY3QuYnVpbGQuZmluYWxOYW1lfSIgLz4KICAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0iZHN0IiBsb2NhdGlvbj0iJHtvdXR9L0RvY3VtZW50YXRpb24iIC8+CkBAIC0xODQsNiArMzEwLDMzIEBACiAgICAgICAgICAgICAgIDxnb2FsPnJ1bjwvZ29hbD4KICAgICAgICAgICAgIDwvZ29hbHM+CiAgICAgICAgICAgPC9leGVjdXRpb24+CisgICAgICAgICAgPGV4ZWN1dGlvbj4KKyAgICAgICAgICAgIDxpZD5pbmNsdWRlLXJlbGVhc2Utbm90ZXM8L2lkPgorICAgICAgICAgICAgPHBoYXNlPnByb2Nlc3MtY2xhc3NlczwvcGhhc2U+CisgICAgICAgICAgICA8Y29uZmlndXJhdGlvbj4KKyAgICAgICAgICAgICAgPHRhcmdldCB1bmxlc3M9ImdlcnJpdC5kb2N1bWVudGF0aW9uLnNraXAiPgorICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJzcmMiIGxvY2F0aW9uPSIke2Jhc2VkaXJ9Ly4uL1JlbGVhc2VOb3RlcyIgLz4KKyAgICAgICAgICAgICAgICA8cHJvcGVydHkgbmFtZT0ib3V0IiBsb2NhdGlvbj0iJHtwcm9qZWN0LmJ1aWxkLmRpcmVjdG9yeX0vJHtwcm9qZWN0LmJ1aWxkLmZpbmFsTmFtZX0iIC8+CisgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9ImRzdCIgbG9jYXRpb249IiR7b3V0fS9SZWxlYXNlTm90ZXMiIC8+CisKKyAgICAgICAgICAgICAgICA8ZXhlYyBkaXI9IiR7c3JjfSIgZXhlY3V0YWJsZT0ibWFrZSI+CisgICAgICAgICAgICAgICAgICA8YXJnIHZhbHVlPSJWRVJTSU9OPSR7cHJvamVjdC52ZXJzaW9ufSIgLz4KKyAgICAgICAgICAgICAgICAgIDxhcmcgdmFsdWU9ImNsZWFuIiAvPgorICAgICAgICAgICAgICAgICAgPGFyZyB2YWx1ZT0iYWxsIiAvPgorICAgICAgICAgICAgICAgIDwvZXhlYz4KKworICAgICAgICAgICAgICAgIDxta2RpciBkaXI9IiR7ZHN0fSIgLz4KKyAgICAgICAgICAgICAgICA8Y29weSBvdmVyd3JpdGU9InRydWUiIHRvZGlyPSIke2RzdH0iPgorICAgICAgICAgICAgICAgICAgPGZpbGVzZXQgZGlyPSIke3NyY30iPgorICAgICAgICAgICAgICAgICAgICA8aW5jbHVkZSBuYW1lPSIqLmh0bWwiIC8+CisgICAgICAgICAgICAgICAgICA8L2ZpbGVzZXQ+CisgICAgICAgICAgICAgICAgPC9jb3B5PgorICAgICAgICAgICAgICA8L3RhcmdldD4KKyAgICAgICAgICAgIDwvY29uZmlndXJhdGlvbj4KKyAgICAgICAgICAgIDxnb2Fscz4KKyAgICAgICAgICAgICAgPGdvYWw+cnVuPC9nb2FsPgorICAgICAgICAgICAgPC9nb2Fscz4KKyAgICAgICAgICA8L2V4ZWN1dGlvbj4KICAgICAgICAgPC9leGVjdXRpb25zPgogICAgICAgPC9wbHVnaW4+CiAgICAgPC9wbHVnaW5zPgpkaWZmIC0tZ2l0IGEvZ2Vycml0LXdhci9zcmMvbWFpbi9qYXZhL2NvbS9nb29nbGUvZ2Vycml0L2h0dHBkL1dlYkFwcEluaXRpYWxpemVyLmphdmEgYi9nZXJyaXQtd2FyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViQXBwSW5pdGlhbGl6ZXIuamF2YQppbmRleCAxYTU1NmMyLi5kMGI4YzM4IDEwMDY0NAotLS0gYS9nZXJyaXQtd2FyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViQXBwSW5pdGlhbGl6ZXIuamF2YQorKysgYi9nZXJyaXQtd2FyL3NyYy9tYWluL2phdmEvY29tL2dvb2dsZS9nZXJyaXQvaHR0cGQvV2ViQXBwSW5pdGlhbGl6ZXIuamF2YQpAQCAtMTgsNiArMTgsNyBAQAogaW1wb3J0IHN0YXRpYyBjb20uZ29vZ2xlLmluamVjdC5TdGFnZS5QUk9EVUNUSU9OOwogCiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuY29tbW9uLkNoYW5nZUhvb2tSdW5uZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuaHR0cGQuR2Vycml0VWlPcHRpb25zOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0Lmh0dHBkLmF1dGgub3BlbmlkLk9wZW5JZE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5odHRwZC5wbHVnaW5zLkh0dHBQbHVnaW5Nb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQubGlmZWN5Y2xlLkxpZmVjeWNsZU1hbmFnZXI7CkBAIC0yOCw2ICsyOSw3IEBACiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5BdXRoQ29uZmlnTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuQ2Fub25pY2FsV2ViVXJsTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0R2xvYmFsTW9kdWxlOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuR2Vycml0U2VydmVyQ29uZmlnTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5jb25maWcuTWFzdGVyTm9kZVN0YXJ0dXA7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLmNvbmZpZy5TaXRlUGF0aDsKQEAgLTM3LDEyICszOSwxNiBAQAogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5naXQuV29ya1F1ZXVlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlNpZ25lZFRva2VuRW1haWxUb2tlblZlcmlmaWVyOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5tYWlsLlNtdHBFbWFpbFNlbmRlcjsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGF0Y2guSW50cmFMaW5lV29ya2VyUG9vbDsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIucGx1Z2lucy5QbHVnaW5HdWljZUVudmlyb25tZW50OwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5wbHVnaW5zLlBsdWdpbk1vZHVsZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFTb3VyY2VNb2R1bGU7CiBpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5EYXRhU291cmNlUHJvdmlkZXI7CitpbXBvcnQgY29tLmdvb2dsZS5nZXJyaXQuc2VydmVyLnNjaGVtYS5EYXRhU291cmNlVHlwZTsKIGltcG9ydCBjb20uZ29vZ2xlLmdlcnJpdC5zZXJ2ZXIuc2NoZW1hLkRhdGFiYXNlTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuU2NoZW1hTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNlcnZlci5zY2hlbWEuU2NoZW1hVmVyc2lvbkNoZWNrOworaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoS2V5Q2FjaGVJbXBsOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuU3NoTW9kdWxlOwogaW1wb3J0IGNvbS5nb29nbGUuZ2Vycml0LnNzaGQuY29tbWFuZHMuTWFzdGVyQ29tbWFuZE1vZHVsZTsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5BYnN0cmFjdE1vZHVsZTsKQEAgLTU2LDYgKzYyLDcgQEAKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zZXJ2bGV0Lkd1aWNlU2VydmxldENvbnRleHRMaXN0ZW5lcjsKIGltcG9ydCBjb20uZ29vZ2xlLmluamVjdC5zcGkuTWVzc2FnZTsKIAoraW1wb3J0IG9yZy5lY2xpcHNlLmpnaXQubGliLkNvbmZpZzsKIGltcG9ydCBvcmcuc2xmNGouTG9nZ2VyOwogaW1wb3J0IG9yZy5zbGY0ai5Mb2dnZXJGYWN0b3J5OwogCkBAIC0xNDQsMTAgKzE1MSwzNSBAQAogICBwcml2YXRlIEluamVjdG9yIGNyZWF0ZURiSW5qZWN0b3IoKSB7CiAgICAgZmluYWwgTGlzdDxNb2R1bGU+IG1vZHVsZXMgPSBuZXcgQXJyYXlMaXN0PE1vZHVsZT4oKTsKICAgICBpZiAoc2l0ZVBhdGggIT0gbnVsbCkgewotICAgICAgbW9kdWxlcy5hZGQobmV3IExpZmVjeWNsZU1vZHVsZSgpIHsKKyAgICAgIE1vZHVsZSBzaXRlUGF0aE1vZHVsZSA9IG5ldyBBYnN0cmFjdE1vZHVsZSgpIHsKICAgICAgICAgQE92ZXJyaWRlCiAgICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKICAgICAgICAgICBiaW5kKEZpbGUuY2xhc3MpLmFubm90YXRlZFdpdGgoU2l0ZVBhdGguY2xhc3MpLnRvSW5zdGFuY2Uoc2l0ZVBhdGgpOworICAgICAgICB9CisgICAgICB9OworICAgICAgbW9kdWxlcy5hZGQoc2l0ZVBhdGhNb2R1bGUpOworCisgICAgICBNb2R1bGUgY29uZmlnTW9kdWxlID0gbmV3IEdlcnJpdFNlcnZlckNvbmZpZ01vZHVsZSgpOworICAgICAgbW9kdWxlcy5hZGQoY29uZmlnTW9kdWxlKTsKKworICAgICAgSW5qZWN0b3IgY2ZnSW5qZWN0b3IgPSBHdWljZS5jcmVhdGVJbmplY3RvcihzaXRlUGF0aE1vZHVsZSwgY29uZmlnTW9kdWxlKTsKKyAgICAgIENvbmZpZyBjZmcgPSBjZmdJbmplY3Rvci5nZXRJbnN0YW5jZShLZXkuZ2V0KENvbmZpZy5jbGFzcywKKyAgICAgICAgICBHZXJyaXRTZXJ2ZXJDb25maWcuY2xhc3MpKTsKKyAgICAgIFN0cmluZyBkYlR5cGUgPSBjZmcuZ2V0U3RyaW5nKCJkYXRhYmFzZSIsIG51bGwsICJ0eXBlIik7CisKKyAgICAgIGZpbmFsIERhdGFTb3VyY2VUeXBlIGRzdCA9IEd1aWNlLmNyZWF0ZUluamVjdG9yKG5ldyBEYXRhU291cmNlTW9kdWxlKCksCisgICAgICAgICAgY29uZmlnTW9kdWxlLCBzaXRlUGF0aE1vZHVsZSkuZ2V0SW5zdGFuY2UoCisgICAgICAgICAgICBLZXkuZ2V0KERhdGFTb3VyY2VUeXBlLmNsYXNzLCBOYW1lcy5uYW1lZChkYlR5cGUudG9Mb3dlckNhc2UoKSkpKTsKKyAgICAgIG1vZHVsZXMuYWRkKG5ldyBBYnN0cmFjdE1vZHVsZSgpIHsKKyAgICAgICAgQE92ZXJyaWRlCisgICAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICAgICAgICBiaW5kKERhdGFTb3VyY2VUeXBlLmNsYXNzKS50b0luc3RhbmNlKGRzdCk7CisgICAgICAgIH0KKyAgICAgIH0pOworCisgICAgICBtb2R1bGVzLmFkZChuZXcgTGlmZWN5Y2xlTW9kdWxlKCkgeworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHJvdGVjdGVkIHZvaWQgY29uZmlndXJlKCkgewogICAgICAgICAgIGJpbmQoRGF0YVNvdXJjZVByb3ZpZGVyLkNvbnRleHQuY2xhc3MpLnRvSW5zdGFuY2UoCiAgICAgICAgICAgICAgIERhdGFTb3VyY2VQcm92aWRlci5Db250ZXh0Lk1VTFRJX1VTRVIpOwogICAgICAgICAgIGJpbmQoS2V5LmdldChEYXRhU291cmNlLmNsYXNzLCBOYW1lcy5uYW1lZCgiUmV2aWV3RGIiKSkpLnRvUHJvdmlkZXIoCkBAIC0xNTUsNyArMTg3LDYgQEAKICAgICAgICAgICBsaXN0ZW5lcigpLnRvKERhdGFTb3VyY2VQcm92aWRlci5jbGFzcyk7CiAgICAgICAgIH0KICAgICAgIH0pOwotICAgICAgbW9kdWxlcy5hZGQobmV3IEdlcnJpdFNlcnZlckNvbmZpZ01vZHVsZSgpKTsKIAogICAgIH0gZWxzZSB7CiAgICAgICBtb2R1bGVzLmFkZChuZXcgTGlmZWN5Y2xlTW9kdWxlKCkgewpAQCAtMTk5LDExICsyMzAsMTEgQEAKICAgICBtb2R1bGVzLmFkZChuZXcgV29ya1F1ZXVlLk1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgQ2hhbmdlSG9va1J1bm5lci5Nb2R1bGUoKSk7CiAgICAgbW9kdWxlcy5hZGQobmV3IFJlY2VpdmVDb21taXRzRXhlY3V0b3JNb2R1bGUoKSk7CisgICAgbW9kdWxlcy5hZGQobmV3IEludHJhTGluZVdvcmtlclBvb2wuTW9kdWxlKCkpOwogICAgIG1vZHVsZXMuYWRkKGNmZ0luamVjdG9yLmdldEluc3RhbmNlKEdlcnJpdEdsb2JhbE1vZHVsZS5jbGFzcykpOwogICAgIG1vZHVsZXMuYWRkKG5ldyBEZWZhdWx0Q2FjaGVGYWN0b3J5Lk1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgU210cEVtYWlsU2VuZGVyLk1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgU2lnbmVkVG9rZW5FbWFpbFRva2VuVmVyaWZpZXIuTW9kdWxlKCkpOwotICAgIG1vZHVsZXMuYWRkKG5ldyBTaWduZWRUb2tlblJlc3RUb2tlblZlcmlmaWVyLk1vZHVsZSgpKTsKICAgICBtb2R1bGVzLmFkZChuZXcgUGx1Z2luTW9kdWxlKCkpOwogICAgIG1vZHVsZXMuYWRkKG5ldyBDYW5vbmljYWxXZWJVcmxNb2R1bGUoKSB7CiAgICAgICBAT3ZlcnJpZGUKQEAgLTIxMSw3ICsyNDIsMTQgQEAKICAgICAgICAgcmV0dXJuIEh0dHBDYW5vbmljYWxXZWJVcmxQcm92aWRlci5jbGFzczsKICAgICAgIH0KICAgICB9KTsKKyAgICBtb2R1bGVzLmFkZChTc2hLZXlDYWNoZUltcGwubW9kdWxlKCkpOwogICAgIG1vZHVsZXMuYWRkKG5ldyBNYXN0ZXJOb2RlU3RhcnR1cCgpKTsKKyAgICBtb2R1bGVzLmFkZChuZXcgQWJzdHJhY3RNb2R1bGUoKSB7CisgICAgICBAT3ZlcnJpZGUKKyAgICAgIHByb3RlY3RlZCB2b2lkIGNvbmZpZ3VyZSgpIHsKKyAgICAgICAgYmluZChHZXJyaXRVaU9wdGlvbnMuY2xhc3MpLnRvSW5zdGFuY2UobmV3IEdlcnJpdFVpT3B0aW9ucyhmYWxzZSkpOworICAgICAgfQorICAgIH0pOwogICAgIHJldHVybiBjZmdJbmplY3Rvci5jcmVhdGVDaGlsZEluamVjdG9yKG1vZHVsZXMpOwogICB9CiAKZGlmZiAtLWdpdCBhL2dlcnJpdC13YXIvc3JjL21haW4vcmVzb3VyY2VzL2xvZzRqLnByb3BlcnRpZXMgYi9nZXJyaXQtd2FyL3NyYy9tYWluL3Jlc291cmNlcy9sb2c0ai5wcm9wZXJ0aWVzCmluZGV4IDQ1ZjYzMGUuLjFmY2NhNmQgMTAwNjQ0Ci0tLSBhL2dlcnJpdC13YXIvc3JjL21haW4vcmVzb3VyY2VzL2xvZzRqLnByb3BlcnRpZXMKKysrIGIvZ2Vycml0LXdhci9zcmMvbWFpbi9yZXNvdXJjZXMvbG9nNGoucHJvcGVydGllcwpAQCAtMzgsMTAgKzM4LDggQEAKIAogIyBTaWxlbmNlIG5vbi1jcml0aWNhbCBtZXNzYWdlcyBmcm9tIG9wZW5pZDRqYXZhCiAjCitsb2c0ai5sb2dnZXIub3JnLmFwYWNoZS5odHRwPVdBUk4KIGxvZzRqLmxvZ2dlci5vcmcuYXBhY2hlLnhtbD1XQVJOCi1sb2c0ai5sb2dnZXIuaHR0cGNsaWVudC53aXJlPVdBUk4KLWxvZzRqLmxvZ2dlci5vcmcuYXBhY2hlLmNvbW1vbnMuaHR0cGNsaWVudD1XQVJOCi1sb2c0ai5sb2dnZXIub3JnLmFwYWNoZS5jb21tb25zLmh0dHBjbGllbnQuSHR0cE1ldGhvZEJhc2U9RVJST1IKIGxvZzRqLmxvZ2dlci5vcmcub3BlbmlkNGphdmE9V0FSTgogbG9nNGoubG9nZ2VyLm9yZy5vcGVuaWQ0amF2YS5jb25zdW1lci5Db25zdW1lck1hbmFnZXI9RkFUQUwKIGxvZzRqLmxvZ2dlci5vcmcub3BlbmlkNGphdmEuZGlzY292ZXJ5LkRpc2NvdmVyeT1FUlJPUgpAQCAtNTcsMyArNTUsNiBAQAogIyBTaWxlbmNlIG5vbi1jcml0aWNhbCBtZXNzYWdlcyBmcm9tIFZlbG9jaXR5CiAjCiBsb2c0ai5sb2dnZXIudmVsb2NpdHk9V0FSTgorCisjIFNpbGVuY2Ugbm9uLWNyaXRpY2FsIG1lc3NhZ2VzIGZyb20gYXBhY2hlLmh0dHAKK2xvZzRqLmxvZ2dlci5vcmcuYXBhY2hlLmh0dHA9V0FSTgpkaWZmIC0tZ2l0IGEvcGx1Z2lucy9SRUFETUUgYi9wbHVnaW5zL1JFQURNRQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wMGRmM2M1Ci0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9SRUFETUUKQEAgLTAsMCArMSwxMSBAQAorSWYgeW91IGFyZSBhZGRpbmcgYSBkaXJlY3RvcnkgaGVyZToKKworLSBTZWFyY2ggYWxsIHBvbS54bWwgZmlsZXMgZm9yICJDT1JFIFBMVUdJTiBMSVNUIi4KKy0gQWRkIHRoZSBuZXcgcGx1Z2luIHRvIHRoYXQgbG9jYXRpb24uCistIChvcHRpb25hbCkgVGhhbmsgdGhlIE1hdmVuIGRldmVsb3BlcnMgZm9yIG1ha2luZyB0aGlzIGVhc3kuCisKKy0gRW5zdXJlIHRoZSBwbHVnaW4ncyBwb20ueG1sIDx2ZXJzaW9uPiBpcyB0aGUgc2FtZSBhcyBHZXJyaXQncworICBvd24gcG9tLnhtbChzKS4gR2Vycml0IHdpbGwgb25seSBlbWJlZCBhIHBsdWdpbiB0aGF0IGhhcyB0aGUKKyAgc2FtZSB2ZXJzaW9uIGFzIGl0c2VsZi4KKworLSBSZWdpc3RlciB0aGUgcGx1Z2luIGFzIGEgc3VibW9kdWxlIHdpdGggZ2l0IHN1Ym1vZHVsZS4KZGlmZiAtLWdpdCBhL3BsdWdpbnMvY29tbWl0LW1lc3NhZ2UtbGVuZ3RoLXZhbGlkYXRvciBiL3BsdWdpbnMvY29tbWl0LW1lc3NhZ2UtbGVuZ3RoLXZhbGlkYXRvcgpuZXcgZmlsZSBtb2RlIDE2MDAwMAppbmRleCAwMDAwMDAwLi43NGVjNTRmCi0tLSAvZGV2L251bGwKKysrIGIvcGx1Z2lucy9jb21taXQtbWVzc2FnZS1sZW5ndGgtdmFsaWRhdG9yCkBAIC0wLDAgKzEgQEAKK1N1YnByb2plY3QgY29tbWl0IDc0ZWM1NGZlY2RkMzkzNjU0MWQ4NTE1N2E1ZGQyYjAyMmI0MTY5NDEKZGlmZiAtLWdpdCBhL3BsdWdpbnMvcmVwbGljYXRpb24gYi9wbHVnaW5zL3JlcGxpY2F0aW9uCm5ldyBmaWxlIG1vZGUgMTYwMDAwCmluZGV4IDAwMDAwMDAuLmVlNjg3ZDQKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL3JlcGxpY2F0aW9uCkBAIC0wLDAgKzEgQEAKK1N1YnByb2plY3QgY29tbWl0IGVlNjg3ZDQyYmZmN2QxYTgyNjBkNzgyNjU0MzkyYjUwYzY5NDIxNmUKZGlmZiAtLWdpdCBhL3BsdWdpbnMvcmV2aWV3bm90ZXMgYi9wbHVnaW5zL3Jldmlld25vdGVzCm5ldyBmaWxlIG1vZGUgMTYwMDAwCmluZGV4IDAwMDAwMDAuLjM3ZGI1Y2YKLS0tIC9kZXYvbnVsbAorKysgYi9wbHVnaW5zL3Jldmlld25vdGVzCkBAIC0wLDAgKzEgQEAKK1N1YnByb2plY3QgY29tbWl0IDM3ZGI1Y2ZiYjI3Mzc1YmZiZmFhYjIxZWVkNTIwNTA5ZWUxZDA3MTAKZGlmZiAtLWdpdCBhL3BvbS54bWwgYi9wb20ueG1sCmluZGV4IGVjYTQ5MDIuLmJlNWFjY2YgMTAwNjQ0Ci0tLSBhL3BvbS54bWwKKysrIGIvcG9tLnhtbApAQCAtMjIsNyArMjIsNyBAQAogICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KICAgPGFydGlmYWN0SWQ+Z2Vycml0LXBhcmVudDwvYXJ0aWZhY3RJZD4KICAgPHBhY2thZ2luZz5wb208L3BhY2thZ2luZz4KLSAgPHZlcnNpb24+Mi41LVNOQVBTSE9UPC92ZXJzaW9uPgorICA8dmVyc2lvbj4yLjYtU05BUFNIT1Q8L3ZlcnNpb24+CiAKICAgPG5hbWU+R2Vycml0IENvZGUgUmV2aWV3IC0gUGFyZW50PC9uYW1lPgogICA8dXJsPmh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9nZXJyaXQvPC91cmw+CkBAIC00NiwxNCArNDYsMTUgQEAKICAgPC9pc3N1ZU1hbmFnZW1lbnQ+CiAKICAgPHByb3BlcnRpZXM+Ci0gICAgPGpnaXRWZXJzaW9uPjIuMC4wLjIwMTIwNjEzMDkwMC1yLjIzLWdiM2RiZjE5PC9qZ2l0VmVyc2lvbj4KLSAgICA8Z3d0b3JtVmVyc2lvbj4xLjQ8L2d3dG9ybVZlcnNpb24+CisgICAgPGpnaXRWZXJzaW9uPjIuMy4xLjIwMTMwMjIwMTgzOC1yLjIwOC1nNzVlMWJkYjwvamdpdFZlcnNpb24+CisgICAgPGd3dG9ybVZlcnNpb24+MS42PC9nd3Rvcm1WZXJzaW9uPgogICAgIDxnd3Rqc29ucnBjVmVyc2lvbj4xLjM8L2d3dGpzb25ycGNWZXJzaW9uPgotICAgIDxnd3RleHB1aVZlcnNpb24+MS4yLjY8L2d3dGV4cHVpVmVyc2lvbj4KLSAgICA8Z3d0VmVyc2lvbj4yLjQuMDwvZ3d0VmVyc2lvbj4KKyAgICA8Z3d0ZXhwdWlWZXJzaW9uPjEuMy4yPC9nd3RleHB1aVZlcnNpb24+CisgICAgPGd3dFZlcnNpb24+Mi41LjA8L2d3dFZlcnNpb24+CisgICAgPGJvdW5jeUNhc3RsZVZlcnNpb24+MTQwPC9ib3VuY3lDYXN0bGVWZXJzaW9uPgogICAgIDxzbGY0alZlcnNpb24+MS42LjE8L3NsZjRqVmVyc2lvbj4KICAgICA8Z3VpY2VWZXJzaW9uPjMuMDwvZ3VpY2VWZXJzaW9uPgotICAgIDxqZXR0eVZlcnNpb24+Ny4yLjEudjIwMTAxMTExPC9qZXR0eVZlcnNpb24+CisgICAgPGpldHR5VmVyc2lvbj44LjEuNy52MjAxMjA5MTA8L2pldHR5VmVyc2lvbj4KIAogICAgIDxnd3QuY29tcGlsZVJlcG9ydD5mYWxzZTwvZ3d0LmNvbXBpbGVSZXBvcnQ+CiAKQEAgLTc2LDYgKzc3LDcgQEAKICAgICA8bW9kdWxlPmdlcnJpdC1jb21tb248L21vZHVsZT4KICAgICA8bW9kdWxlPmdlcnJpdC1jYWNoZS1oMjwvbW9kdWxlPgogICAgIDxtb2R1bGU+Z2Vycml0LWh0dHBkPC9tb2R1bGU+CisgICAgPG1vZHVsZT5nZXJyaXQtZ3d0dWk8L21vZHVsZT4KICAgICA8bW9kdWxlPmdlcnJpdC1sYXVuY2hlcjwvbW9kdWxlPgogICAgIDxtb2R1bGU+Z2Vycml0LW1haW48L21vZHVsZT4KICAgICA8bW9kdWxlPmdlcnJpdC1vcGVuaWQ8L21vZHVsZT4KQEAgLTg3LDI0ICs4OSwyOSBAQAogICAgIDxtb2R1bGU+Z2Vycml0LWd3dGRlYnVnPC9tb2R1bGU+CiAgICAgPG1vZHVsZT5nZXJyaXQtd2FyPC9tb2R1bGU+CiAKKyAgICA8bW9kdWxlPmdlcnJpdC1hY2NlcHRhbmNlLXRlc3RzPC9tb2R1bGU+CiAgICAgPG1vZHVsZT5nZXJyaXQtZXh0ZW5zaW9uLWFwaTwvbW9kdWxlPgotCi0gICAgPG1vZHVsZT5nZXJyaXQtZ3d0dWk8L21vZHVsZT4KKyAgICA8bW9kdWxlPmdlcnJpdC1wbHVnaW4tYXBpPC9tb2R1bGU+CisgICAgPG1vZHVsZT5nZXJyaXQtcGx1Z2luLWFyY2hldHlwZTwvbW9kdWxlPgorICAgIDxtb2R1bGU+Z2Vycml0LXBsdWdpbi1nd3R1aTwvbW9kdWxlPgorICAgIDxtb2R1bGU+Z2Vycml0LXBsdWdpbi1qcy1hcmNoZXR5cGU8L21vZHVsZT4KKyAgICA8bW9kdWxlPmdlcnJpdC1wbHVnaW4tZ3d0LWFyY2hldHlwZTwvbW9kdWxlPgogICA8L21vZHVsZXM+CiAKICAgPHByb2ZpbGVzPgogICAgIDxwcm9maWxlPgotICAgICAgPGlkPmFsbDwvaWQ+Ci0gICAgICA8bW9kdWxlcz4KLSAgICAgICAgPG1vZHVsZT5nZXJyaXQtcGx1Z2luLWFwaTwvbW9kdWxlPgotICAgICAgICA8bW9kdWxlPmdlcnJpdC1wbHVnaW4tYXJjaGV0eXBlPC9tb2R1bGU+Ci0gICAgICA8L21vZHVsZXM+Ci0gICAgPC9wcm9maWxlPgotICAgIDxwcm9maWxlPgorICAgICAgPGlkPnBsdWdpbnM8L2lkPgogICAgICAgPGFjdGl2YXRpb24+Ci0gICAgICAgIDxhY3RpdmVCeURlZmF1bHQ+dHJ1ZTwvYWN0aXZlQnlEZWZhdWx0PgorICAgICAgICA8cHJvcGVydHk+CisgICAgICAgICAgPG5hbWU+IWdlcnJpdC5wbHVnaW5zLnNraXA8L25hbWU+CisgICAgICAgIDwvcHJvcGVydHk+CiAgICAgICA8L2FjdGl2YXRpb24+Ci0gICAgICA8aWQ+bm8tcGx1Z2luczwvaWQ+CisgICAgICA8bW9kdWxlcz4KKyAgICAgICAgPCEtLSBDT1JFIFBMVUdJTiBMSVNUIC0tPgorICAgICAgICA8bW9kdWxlPnBsdWdpbnMvY29tbWl0LW1lc3NhZ2UtbGVuZ3RoLXZhbGlkYXRvcjwvbW9kdWxlPgorICAgICAgICA8bW9kdWxlPnBsdWdpbnMvcmVwbGljYXRpb248L21vZHVsZT4KKyAgICAgICAgPG1vZHVsZT5wbHVnaW5zL3Jldmlld25vdGVzPC9tb2R1bGU+CisgICAgICA8L21vZHVsZXM+CiAgICAgPC9wcm9maWxlPgogICA8L3Byb2ZpbGVzPgogCkBAIC0zNjksNyArMzc2LDEzIEBACiAgICAgICAgIDxwbHVnaW4+CiAgICAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS5tYXZlbi5wbHVnaW5zPC9ncm91cElkPgogICAgICAgICAgIDxhcnRpZmFjdElkPm1hdmVuLWRlcGVuZGVuY3ktcGx1Z2luPC9hcnRpZmFjdElkPgotICAgICAgICAgIDx2ZXJzaW9uPjIuMTwvdmVyc2lvbj4KKyAgICAgICAgICA8dmVyc2lvbj4yLjUuMTwvdmVyc2lvbj4KKyAgICAgICAgPC9wbHVnaW4+CisKKyAgICAgICAgPHBsdWdpbj4KKyAgICAgICAgICA8Z3JvdXBJZD5vcmcuYXBhY2hlLm1hdmVuLnBsdWdpbnM8L2dyb3VwSWQ+CisgICAgICAgICAgPGFydGlmYWN0SWQ+bWF2ZW4tc3VyZWZpcmUtcGx1Z2luPC9hcnRpZmFjdElkPgorICAgICAgICAgIDx2ZXJzaW9uPjIuMTM8L3ZlcnNpb24+CiAgICAgICAgIDwvcGx1Z2luPgogCiAgICAgICAgIDxwbHVnaW4+CkBAIC0zODEsNyArMzk0LDcgQEAKICAgICAgICAgPHBsdWdpbj4KICAgICAgICAgICA8Z3JvdXBJZD5vcmcuY29kZWhhdXMubW9qbzwvZ3JvdXBJZD4KICAgICAgICAgICA8YXJ0aWZhY3RJZD5nd3QtbWF2ZW4tcGx1Z2luPC9hcnRpZmFjdElkPgotICAgICAgICAgIDx2ZXJzaW9uPjIuNC4wPC92ZXJzaW9uPgorICAgICAgICAgIDx2ZXJzaW9uPjIuNS4wPC92ZXJzaW9uPgogICAgICAgICA8L3BsdWdpbj4KIAogICAgICAgICA8cGx1Z2luPgpAQCAtNDA5LDcgKzQyMiwxMCBAQAogICAgICAgICAgICAgICAgICAgICA8L2dvYWxzPgogICAgICAgICAgICAgICAgICAgPC9wbHVnaW5FeGVjdXRpb25GaWx0ZXI+CiAgICAgICAgICAgICAgICAgICA8YWN0aW9uPgotICAgICAgICAgICAgICAgICAgICA8aWdub3JlLz4KKyAgICAgICAgICAgICAgICAgICAgIDxleGVjdXRlPgorICAgICAgICAgICAgICAgICAgICAgIDxydW5PbkluY3JlbWVudGFsPmZhbHNlPC9ydW5PbkluY3JlbWVudGFsPgorICAgICAgICAgICAgICAgICAgICAgIDxydW5PbkNvbmZpZ3VyYXRpb24+dHJ1ZTwvcnVuT25Db25maWd1cmF0aW9uPgorICAgICAgICAgICAgICAgICAgICA8L2V4ZWN1dGU+CiAgICAgICAgICAgICAgICAgICA8L2FjdGlvbj4KICAgICAgICAgICAgICAgICA8L3BsdWdpbkV4ZWN1dGlvbj4KICAgICAgICAgICAgICAgICA8cGx1Z2luRXhlY3V0aW9uPgpAQCAtNDIyLDcgKzQzOCwxMCBAQAogICAgICAgICAgICAgICAgICAgICA8L2dvYWxzPgogICAgICAgICAgICAgICAgICAgPC9wbHVnaW5FeGVjdXRpb25GaWx0ZXI+CiAgICAgICAgICAgICAgICAgICA8YWN0aW9uPgotICAgICAgICAgICAgICAgICAgICA8aWdub3JlLz4KKyAgICAgICAgICAgICAgICAgICAgPGV4ZWN1dGU+CisgICAgICAgICAgICAgICAgICAgICAgPHJ1bk9uSW5jcmVtZW50YWw+ZmFsc2U8L3J1bk9uSW5jcmVtZW50YWw+CisgICAgICAgICAgICAgICAgICAgICAgPHJ1bk9uQ29uZmlndXJhdGlvbj50cnVlPC9ydW5PbkNvbmZpZ3VyYXRpb24+CisgICAgICAgICAgICAgICAgICAgPC9leGVjdXRlPgogICAgICAgICAgICAgICAgICAgPC9hY3Rpb24+CiAgICAgICAgICAgICAgICAgPC9wbHVnaW5FeGVjdXRpb24+CiAgICAgICAgICAgICAgIDwvcGx1Z2luRXhlY3V0aW9ucz4KQEAgLTQ3OCw3ICs0OTcsNyBAQAogICAgICAgPGRlcGVuZGVuY3k+CiAgICAgICAgIDxncm91cElkPmNvbS5nb29nbGUuZ3VhdmE8L2dyb3VwSWQ+CiAgICAgICAgIDxhcnRpZmFjdElkPmd1YXZhPC9hcnRpZmFjdElkPgotICAgICAgICA8dmVyc2lvbj4xMi4wLjE8L3ZlcnNpb24+CisgICAgICAgIDx2ZXJzaW9uPjE0LjA8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgpAQCAtNTYzLDcgKzU4Miw3IEBACiAgICAgICA8ZGVwZW5kZW5jeT4KICAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS5zc2hkPC9ncm91cElkPgogICAgICAgICA8YXJ0aWZhY3RJZD5zc2hkLWNvcmU8L2FydGlmYWN0SWQ+Ci0gICAgICAgIDx2ZXJzaW9uPjAuNS4xLXIxMDk1ODA5PC92ZXJzaW9uPgorICAgICAgICA8dmVyc2lvbj4wLjYuMDwvdmVyc2lvbj4KICAgICAgIDwvZGVwZW5kZW5jeT4KIAogICAgICAgPGRlcGVuZGVuY3k+CkBAIC02ODgsNyArNzA3LDEzIEBACiAgICAgICA8ZGVwZW5kZW5jeT4KICAgICAgICAgPGdyb3VwSWQ+Ym91bmN5Y2FzdGxlPC9ncm91cElkPgogICAgICAgICA8YXJ0aWZhY3RJZD5iY3BnLWpkazE1PC9hcnRpZmFjdElkPgotICAgICAgICA8dmVyc2lvbj4xNDA8L3ZlcnNpb24+CisgICAgICAgIDx2ZXJzaW9uPiR7Ym91bmN5Q2FzdGxlVmVyc2lvbn08L3ZlcnNpb24+CisgICAgICA8L2RlcGVuZGVuY3k+CisKKyAgICAgIDxkZXBlbmRlbmN5PgorICAgICAgICA8Z3JvdXBJZD5ib3VuY3ljYXN0bGU8L2dyb3VwSWQ+CisgICAgICAgIDxhcnRpZmFjdElkPmJjcHJvdi1qZGsxNTwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPHZlcnNpb24+JHtib3VuY3lDYXN0bGVWZXJzaW9ufTwvdmVyc2lvbj4KICAgICAgIDwvZGVwZW5kZW5jeT4KIAogICAgICAgPGRlcGVuZGVuY3k+CkBAIC03NjEsMTkgKzc4NiwxOSBAQAogICAgICAgPGRlcGVuZGVuY3k+CiAgICAgICAgIDxncm91cElkPmp1bml0PC9ncm91cElkPgogICAgICAgICA8YXJ0aWZhY3RJZD5qdW5pdDwvYXJ0aWZhY3RJZD4KLSAgICAgICAgPHZlcnNpb24+NC44LjE8L3ZlcnNpb24+CisgICAgICAgIDx2ZXJzaW9uPjQuMTE8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgogICAgICAgICA8Z3JvdXBJZD5jb20uaDJkYXRhYmFzZTwvZ3JvdXBJZD4KICAgICAgICAgPGFydGlmYWN0SWQ+aDI8L2FydGlmYWN0SWQ+Ci0gICAgICAgIDx2ZXJzaW9uPjEuMi4xNDc8L3ZlcnNpb24+CisgICAgICAgIDx2ZXJzaW9uPjEuMy4xNjg8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgogICAgICAgICA8Z3JvdXBJZD5wb3N0Z3Jlc3FsPC9ncm91cElkPgogICAgICAgICA8YXJ0aWZhY3RJZD5wb3N0Z3Jlc3FsPC9hcnRpZmFjdElkPgotICAgICAgICA8dmVyc2lvbj45LjAtODAxLmpkYmM0PC92ZXJzaW9uPgorICAgICAgICA8dmVyc2lvbj45LjEtOTAxLTEuamRiYzQ8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgpAQCAtNzgzLDggKzgwOCw4IEBACiAgICAgICAgIDxleGNsdXNpb25zPgogICAgICAgICAgIDxleGNsdXNpb24+CiAgICAgICAgICAgICA8IS0tIHVzZSBBcGFjaGUgamF2YXguc2VydmxldCBub3QgQ0RETCAtLT4KLSAgICAgICAgICAgIDxncm91cElkPmphdmF4LnNlcnZsZXQ8L2dyb3VwSWQ+Ci0gICAgICAgICAgICA8YXJ0aWZhY3RJZD5zZXJ2bGV0LWFwaTwvYXJ0aWZhY3RJZD4KKyAgICAgICAgICAgIDxncm91cElkPm9yZy5lY2xpcHNlLmpldHR5Lm9yYml0PC9ncm91cElkPgorICAgICAgICAgICAgPGFydGlmYWN0SWQ+amF2YXguc2VydmxldDwvYXJ0aWZhY3RJZD4KICAgICAgICAgICA8L2V4Y2x1c2lvbj4KICAgICAgICAgPC9leGNsdXNpb25zPgogICAgICAgPC9kZXBlbmRlbmN5PgpAQCAtODAyLDYgKzgyNywxMiBAQAogICAgICAgPC9kZXBlbmRlbmN5PgogCiAgICAgICA8ZGVwZW5kZW5jeT4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLmFwYWNoZS50b21jYXQ8L2dyb3VwSWQ+CisgICAgICAgIDxhcnRpZmFjdElkPnRvbWNhdC1zZXJ2bGV0LWFwaTwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPHZlcnNpb24+Ny4wLjMyPC92ZXJzaW9uPgorICAgICAgPC9kZXBlbmRlbmN5PgorCisgICAgICA8ZGVwZW5kZW5jeT4KICAgICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZS5nd3Q8L2dyb3VwSWQ+CiAgICAgICAgIDxhcnRpZmFjdElkPmd3dC1zZXJ2bGV0PC9hcnRpZmFjdElkPgogICAgICAgICA8dmVyc2lvbj4ke2d3dFZlcnNpb259PC92ZXJzaW9uPgpAQCAtODI2LDcgKzg1Nyw3IEBACiAgICAgICA8L2RlcGVuZGVuY3k+CiAKICAgICAgIDxkZXBlbmRlbmN5PgotICAgICAgICA8Z3JvdXBJZD5jb20uZ29vZ2xlLmdlcnJpdDwvZ3JvdXBJZD4KKyAgICAgICAgPGdyb3VwSWQ+Y29tLmdvb2dsZWNvZGUuanVuaXZlcnNhbGNoYXJkZXQ8L2dyb3VwSWQ+CiAgICAgICAgIDxhcnRpZmFjdElkPmp1bml2ZXJzYWxjaGFyZGV0PC9hcnRpZmFjdElkPgogICAgICAgICA8dmVyc2lvbj4xLjAuMzwvdmVyc2lvbj4KICAgICAgIDwvZGVwZW5kZW5jeT4KQEAgLTg0OCw2ICs4NzksMTcgQEAKICAgICAgICAgPGFydGlmYWN0SWQ+cGVnZG93bjwvYXJ0aWZhY3RJZD4KICAgICAgICAgPHZlcnNpb24+MS4xLjA8L3ZlcnNpb24+CiAgICAgICA8L2RlcGVuZGVuY3k+CisKKyAgICAgIDxkZXBlbmRlbmN5PgorICAgICAgICA8Z3JvdXBJZD5vcmcucGFyYm9pbGVkPC9ncm91cElkPgorICAgICAgICA8YXJ0aWZhY3RJZD5wYXJib2lsZWQtY29yZTwvYXJ0aWZhY3RJZD4KKyAgICAgICAgPHZlcnNpb24+MS4xLjM8L3ZlcnNpb24+CisgICAgICA8L2RlcGVuZGVuY3k+CisgICAgICA8ZGVwZW5kZW5jeT4KKyAgICAgICAgPGdyb3VwSWQ+b3JnLnBhcmJvaWxlZDwvZ3JvdXBJZD4KKyAgICAgICAgPGFydGlmYWN0SWQ+cGFyYm9pbGVkLWphdmE8L2FydGlmYWN0SWQ+CisgICAgICAgIDx2ZXJzaW9uPjEuMS4zPC92ZXJzaW9uPgorICAgICAgPC9kZXBlbmRlbmN5PgogICAgIDwvZGVwZW5kZW5jaWVzPgogICA8L2RlcGVuZGVuY3lNYW5hZ2VtZW50PgogCkBAIC04NjgsMTEgKzkxMCw2IEBACiAgICAgPC9yZXBvc2l0b3J5PgogCiAgICAgPHJlcG9zaXRvcnk+Ci0gICAgICA8aWQ+b2JqZWN0d2ViLXJlcG9zaXRvcnk8L2lkPgotICAgICAgPHVybD5odHRwOi8vbWF2ZW4ub2JqZWN0d2ViLm9yZy9tYXZlbjIvPC91cmw+Ci0gICAgPC9yZXBvc2l0b3J5PgotCi0gICAgPHJlcG9zaXRvcnk+CiAgICAgICA8aWQ+Y2xvamFycy1yZXBvPC9pZD4KICAgICAgIDx1cmw+aHR0cDovL2Nsb2phcnMub3JnL3JlcG88L3VybD4KICAgICA8L3JlcG9zaXRvcnk+CmRpZmYgLS1naXQgYS90b29scy9yZWxlYXNlLnNoIGIvdG9vbHMvcmVsZWFzZS5zaAppbmRleCBkZTE4MzU3Li44OGU0YTAwIDEwMDc1NQotLS0gYS90b29scy9yZWxlYXNlLnNoCisrKyBiL3Rvb2xzL3JlbGVhc2Uuc2gKQEAgLTEsMTYgKzEsMjUgQEAKICMhL2Jpbi9zaAogCi1pbmNsdWRlX2RvY3M9LURnZXJyaXQuaW5jbHVkZS1kb2N1bWVudGF0aW9uPTEKK2ZsYWdzPQogCiB3aGlsZSBbICQjIC1ndCAwIF0KIGRvCiAJY2FzZSAiJDEiIGluCiAJLS1uby1kb2N1bWVudGF0aW9ufC0td2l0aG91dC1kb2N1bWVudGF0aW9uKQotCQlpbmNsdWRlX2RvY3M9CisJCWZsYWdzPSIkZmxhZ3MgLURnZXJyaXQuZG9jdW1lbnRhdGlvbi5za2lwPXRydWUiCisJCXNoaWZ0CisJCTs7CisJLS1uby1wbHVnaW5zfC0td2l0aG91dC1wbHVnaW5zKQorCQlmbGFncz0iJGZsYWdzIC1EZ2Vycml0LnBsdWdpbnMuc2tpcD10cnVlIgorCQlzaGlmdAorCQk7OworCS0tbm8tdGVzdHN8LS13aXRob3V0LXRlc3RzKQorCQlmbGFncz0iJGZsYWdzIC1EZ2Vycml0LmFjY2VwdGFuY2UtdGVzdHMuc2tpcD10cnVlIgorCQlmbGFncz0iJGZsYWdzIC1EbWF2ZW4udGVzdHMuc2tpcD10cnVlIgogCQlzaGlmdAogCQk7OwogCSopCi0JCWVjaG8gPiYyICJ1c2FnZTogJDAgWy0td2l0aG91dC1kb2N1bWVudGF0aW9uXSIKKwkJZWNobyA+JjIgInVzYWdlOiAkMCBbLS1uby1kb2N1bWVudGF0aW9uXSBbLS1uby1wbHVnaW5zXSBbLS1uby10ZXN0c10iCiAJCWV4aXQgMQogCWVzYWMKIGRvbmUKQEAgLTI1LDcgKzM0LDcgQEAKIGZpCiAKIC4vdG9vbHMvdmVyc2lvbi5zaCAtLXJlbGVhc2UgJiYKLW12biBjbGVhbiBpbnN0YWxsICRpbmNsdWRlX2RvY3MgLVAgYWxsCittdm4gY2xlYW4gcGFja2FnZSB2ZXJpZnkgJGZsYWdzCiByYz0kPwogLi90b29scy92ZXJzaW9uLnNoIC0tcmVzZXQKIApkaWZmIC0tZ2l0IGEvdG9vbHMvdmVyc2lvbi5zaCBiL3Rvb2xzL3ZlcnNpb24uc2gKaW5kZXggZDNlNGNkNS4uZGVmMDk5ZCAxMDA3NTUKLS0tIGEvdG9vbHMvdmVyc2lvbi5zaAorKysgYi90b29scy92ZXJzaW9uLnNoCkBAIC02LDcgKzYsMTUgQEAKICMgSmF2YSBiYXNlZCBNYXZlbiBwbHVnaW4gc28gaXRzIGZ1bGx5IHBvcnRhYmxlLgogIwogCi1QT01fRklMRVM9JChnaXQgbHMtZmlsZXMgfCBncmVwIHBvbS54bWwgfCBncmVwIC12IGdlcnJpdC1wbHVnaW4tYXJjaGV0eXBlL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3BvbS54bWwpCitTRVJWRVJfUE9NUz0kKGdpdCBscy1maWxlcyB8IGdyZXAgcG9tLnhtbCB8IGdyZXAgLXYgL3NyYy9tYWluL3Jlc291cmNlcy9hcmNoZXR5cGUtcmVzb3VyY2VzL3BvbS54bWwpCitQT01fRklMRVM9JFNFUlZFUl9QT01TCisKKyMgQ09SRSBQTFVHSU4gTElTVAorUExVR0lOUz0iY29tbWl0LW1lc3NhZ2UtbGVuZ3RoLXZhbGlkYXRvciByZXBsaWNhdGlvbiByZXZpZXdub3RlcyIKK2ZvciBwIGluICRQTFVHSU5TCitkbworCVBPTV9GSUxFUz0iJFBPTV9GSUxFUyAkKGNkIHBsdWdpbnMvJHAgJiYgZ2l0IGxzLWZpbGVzIHwgZ3JlcCBwb20ueG1sIHwgc2VkIHMsXixwbHVnaW5zLyRwLywpIgorZG9uZQogCiBjYXNlICIkMSIgaW4KIC0tc25hcHNob3Q9KikKQEAgLTI3LDcgKzM1LDExIEBACiAJOzsKIAogLS1yZXNldCkKLQlnaXQgY2hlY2tvdXQgSEVBRCAtLSAkUE9NX0ZJTEVTCisJZ2l0IGNoZWNrb3V0IEhFQUQgLS0gJFNFUlZFUl9QT01TCisJZm9yIHAgaW4gJFBMVUdJTlMKKwlkbworCQkoY2QgcGx1Z2lucy8kcDsgZ2l0IGNoZWNrb3V0ICQoZ2l0IGxzLWZpbGVzIHwgZ3JlcCBwb20ueG1sKSkKKwlkb25lCiAJZXhpdCAkPwogCTs7CiAKQEAgLTQwLDcgKzUyLDcgQEAKIHYqKSBWPSQoZWNobyAiJFYiIHwgcGVybCAtcGUgcy9edi8vKSA7OwogZXNhYwogCi1wZXJsIC1waSAtZSAnCitwZXJsIC1waS5iYWsgLWUgJwogCWlmICgkQVJHViBuZSAkb2xkX2FyZ3YpIHsKIAkJJHNlZW5fdmVyc2lvbiA9IDA7CiAJCSRvbGRfYXJndiA9ICRBUkdWOwpAQCAtNTAsMyArNjIsOCBAQAogCQlzeyg8dmVyc2lvbj4pLiooPC92ZXJzaW9uPil9eyR7MX0nIiRWIickezJ9fTsKIAl9CiAJJyAkUE9NX0ZJTEVTCisKK2ZvciBwb20gaW4gJFBPTV9GSUxFUworZG8KKwlybSAtZiAke3BvbX0uYmFrCitkb25lCg==